fix: address PR review feedback

- Use getControlSiloUrl() for /customers/ endpoints (control silo, not region-scoped)
- Replace stderr.write() with consola logger in seer-trial.ts
- Move instanceof SeerError check into isTrialEligible() (accepts unknown)
- Fix timezone bug: use setUTCHours in getTrialStatus()
- Soften unconditional trial hint wording in SeerError.format()
- Update seer-trial tests for new API (logger mocks, 2-arg signature)

Author: BYK

src/bin.ts

@@ -2,12 +2,7 @@ import { isatty } from "node:tty";
 import { run } from "@stricli/core";
 import { app } from "./app.js";
 import { buildContext } from "./context.js";
-import {
-  AuthError,
-  formatError,
-  getExitCode,
-  SeerError,
-} from "./lib/errors.js";
+import { AuthError, formatError, getExitCode } from "./lib/errors.js";
 import { error } from "./lib/formatters/colors.js";
 import { runInteractiveLogin } from "./lib/interactive-login.js";
 import { getEnvLogLevel, setLogLevel } from "./lib/logger.js";
@@ -58,13 +53,13 @@ async function executeWithSeerTrialPrompt(args: string[]): Promise<void> {
   try {
     await runCommand(args);
   } catch (err) {
-    if (err instanceof SeerError && isTrialEligible(err)) {
-      // isTrialEligible ensures orgSlug is defined
+    // isTrialEligible handles instanceof SeerError check + reason + orgSlug + TTY
+    if (isTrialEligible(err)) {
+      // isTrialEligible narrows err to SeerError with defined orgSlug
       const started = await promptAndStartTrial(
         // biome-ignore lint/style/noNonNullAssertion: isTrialEligible guarantees orgSlug is defined
         err.orgSlug!,
-        err.reason,
-        process.stderr
+        err.reason
       );
 
       if (started) {

src/lib/api-client.ts

@@ -1707,9 +1707,9 @@ export async function triggerSolutionPlanning(
 export async function getProductTrials(
   orgSlug: string
 ): Promise<ProductTrial[]> {
-  const regionUrl = await resolveOrgRegion(orgSlug);
+  // /customers/ is a control silo endpoint (billing), not region-scoped
   const { data } = await apiRequestToRegion<CustomerTrialInfo>(
-    regionUrl,
+    getControlSiloUrl(),
     `/customers/${orgSlug}/`,
     { schema: CustomerTrialInfoSchema }
   );
@@ -1730,14 +1730,18 @@ export async function startProductTrial(
   orgSlug: string,
   category: string
 ): Promise<void> {
-  const regionUrl = await resolveOrgRegion(orgSlug);
-  await apiRequestToRegion(regionUrl, `/customers/${orgSlug}/product-trial/`, {
-    method: "PUT",
-    body: {
-      referrer: "sentry-cli",
-      productTrial: { category, reasonCode: 0 },
-    },
-  });
+  // /customers/ is a control silo endpoint (billing), not region-scoped
+  await apiRequestToRegion(
+    getControlSiloUrl(),
+    `/customers/${orgSlug}/product-trial/`,
+    {
+      method: "PUT",
+      body: {
+        referrer: "sentry-cli",
+        productTrial: { category, reasonCode: 0 },
+      },
+    }
+  );
 }
 
 // User functions

src/lib/errors.ts

@@ -371,7 +371,11 @@ export class SeerError extends CliError {
   }
 
   override format(): string {
-    const trialHint = "\n\nOr start a free trial:\n  sentry trial start seer";
+    // Soften trial hint — we can't check availability synchronously,
+    // so use "check" language rather than "start" to avoid misleading
+    // users whose trial is already expired
+    const trialHint =
+      "\n\nYou may be eligible for a free trial:\n  sentry trial list";
 
     // When org slug is known, provide direct URLs to settings
     if (this.orgSlug) {

src/lib/seer-trial.ts

@@ -13,9 +13,9 @@
 import { isatty } from "node:tty";
 
 import { getProductTrials, startProductTrial } from "./api-client.js";
-import type { SeerError, SeerErrorReason } from "./errors.js";
-import { success } from "./formatters/colors.js";
+import { SeerError, type SeerErrorReason } from "./errors.js";
 import { logger } from "./logger.js";
+import { buildBillingUrl } from "./sentry-urls.js";
 import { findAvailableTrial } from "./trials.js";
 
 /** Seer error reasons eligible for trial prompt */
@@ -31,17 +31,21 @@ const REASON_CONTEXT: Record<string, string> = {
 };
 
 /**
- * Check whether a SeerError is eligible for a trial prompt.
+ * Check whether an error is a trial-eligible SeerError.
+ *
+ * Performs the `instanceof SeerError` check internally so callers
+ * can pass any caught error without narrowing first.
  *
  * Only `no_budget` and `not_enabled` are eligible — `ai_disabled` is
  * an explicit admin decision that a trial wouldn't override.
  * Requires orgSlug (needed for API calls) and interactive terminal.
  *
- * @param error - The SeerError to check
- * @returns true if the error is eligible for a trial prompt
+ * @param error - Any caught error
+ * @returns true if the error is a SeerError eligible for a trial prompt
  */
-export function isTrialEligible(error: SeerError): boolean {
+export function isTrialEligible(error: unknown): error is SeerError {
   return (
+    error instanceof SeerError &&
     TRIAL_ELIGIBLE_REASONS.has(error.reason) &&
     error.orgSlug !== undefined &&
     isatty(0)
@@ -56,16 +60,18 @@ export function isTrialEligible(error: SeerError): boolean {
  * 2. Show context message + prompt user for confirmation
  * 3. Start the trial via API
  *
+ * Uses consola logger for all output (not raw stderr writes).
+ *
  * @param orgSlug - Organization slug
  * @param reason - The SeerError reason (for context message)
- * @param stderr - Stderr stream for messages
  * @returns true if trial was started successfully, false otherwise
  */
 export async function promptAndStartTrial(
   orgSlug: string,
-  reason: SeerErrorReason,
-  stderr: NodeJS.WriteStream
+  reason: SeerErrorReason
 ): Promise<boolean> {
+  const log = logger.withTag("seer");
+
   // 1. Check trial availability (graceful failure → return false)
   let trial: ReturnType<typeof findAvailableTrial> extends infer T ? T : never;
   try {
@@ -77,18 +83,22 @@ export async function promptAndStartTrial(
   }
 
   if (!trial) {
-    // No trial available — fall through to normal error
+    // No trial available (expired or already used)
+    log.info(
+      "No Seer trial available. If you've already used your trial, " +
+        "consider upgrading your plan to continue using Seer."
+    );
+    log.info(`  ${buildBillingUrl(orgSlug, "seer")}`);
     return false;
   }
 
   // 2. Show context and prompt
-  const context = REASON_CONTEXT[reason] ?? "";
+  const context = REASON_CONTEXT[reason];
   if (context) {
-    stderr.write(`${context}\n`);
+    log.info(context);
   }
 
   const daysText = trial.lengthDays ? `${trial.lengthDays}-day ` : "";
-  const log = logger.withTag("seer");
   const confirmed = await log.prompt(
     `A free ${daysText}Seer trial is available. Start trial?`,
     { type: "confirm", initial: true }
@@ -101,14 +111,15 @@ export async function promptAndStartTrial(
 
   // 3. Start trial using the category from the available trial
   try {
-    stderr.write("\nStarting Seer trial...\n");
+    log.info("Starting Seer trial...");
     await startProductTrial(orgSlug, trial.category);
-    stderr.write(`${success("✓")} Seer trial activated!\n`);
+    log.success("Seer trial activated!");
     return true;
   } catch {
-    stderr.write(
-      "Failed to start trial. Please try again or visit your Sentry settings.\n"
+    log.warn(
+      "Failed to start trial. Please try again or visit your Sentry settings:"
     );
+    log.warn(`  ${buildBillingUrl(orgSlug, "seer")}`);
     return false;
   }
 }

src/lib/trials.ts

@@ -143,8 +143,8 @@ export function getTrialStatus(trial: ProductTrial): TrialStatus {
   if (trial.endDate) {
     const end = new Date(trial.endDate);
     const now = new Date();
-    // Compare date-only (ignore time) — trial ends at end of endDate
-    end.setHours(23, 59, 59, 999);
+    // Compare date-only (ignore time) — trial ends at end of endDate UTC
+    end.setUTCHours(23, 59, 59, 999);
     if (now > end) {
       return "expired";
     }