claudish 7.32.0 → 7.34.0

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.32.0";
+var VERSION = "7.34.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -912,6 +912,22 @@ var init_logger = __esm(() => {
 });
 
 // src/startup-trace.ts
+var exports_startup_trace = {};
+__export(exports_startup_trace, {
+  traceSpan: () => traceSpan,
+  suppressStartupTraceTerminalOutput: () => suppressStartupTraceTerminalOutput,
+  setStartupAuthKind: () => setStartupAuthKind,
+  finalizeStartupTrace: () => finalizeStartupTrace,
+  beginSpan: () => beginSpan,
+  beginQueuedSpan: () => beginQueuedSpan,
+  addSpanMeta: () => addSpanMeta,
+  __resetStartupTraceForTests: () => __resetStartupTraceForTests,
+  __getStartupSpansForTests: () => __getStartupSpansForTests,
+  __configureStartupTraceForTests: () => __configureStartupTraceForTests,
+  STARTUP_METRICS_MAX_LINES: () => STARTUP_METRICS_MAX_LINES,
+  STARTUP_METRICS_FILE: () => STARTUP_METRICS_FILE,
+  SLOW_START_THRESHOLD_MS: () => SLOW_START_THRESHOLD_MS
+});
 import { appendFileSync, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
 import { homedir as homedir3 } from "os";
 import { dirname, join as join3 } from "path";
@@ -1166,6 +1182,25 @@ function finalizeStartupTrace(context, opts = {}) {
     } catch {}
   } catch {}
 }
+function __configureStartupTraceForTests(overrides) {
+  seams = { ...defaultSeams(), ...overrides };
+  spans = [];
+  finalized = false;
+  authKind = "none";
+  terminalSuppressed = false;
+  suppressedLogSink = undefined;
+}
+function __resetStartupTraceForTests() {
+  seams = defaultSeams();
+  spans = [];
+  finalized = false;
+  authKind = "none";
+  terminalSuppressed = false;
+  suppressedLogSink = undefined;
+}
+function __getStartupSpansForTests() {
+  return spans.map((s) => ({ ...s, meta: s.meta ? { ...s.meta } : undefined }));
+}
 var STARTUP_METRICS_FILE, STARTUP_METRICS_MAX_LINES = 500, SLOW_START_THRESHOLD_MS = 8000, MAX_BUFFERED_SPANS = 500, seams, spans, finalized = false, authKind = "none", terminalSuppressed = false, suppressedLogSink;
 var init_startup_trace = __esm(() => {
   STARTUP_METRICS_FILE = join3(homedir3(), ".claudish", "startup-metrics.jsonl");
@@ -1173,6 +1208,17 @@ var init_startup_trace = __esm(() => {
   spans = [];
 });
 
+// src/env-placeholder.ts
+function realValue(v) {
+  if (!v)
+    return;
+  return UNEXPANDED_PLACEHOLDER.test(v.trim()) ? undefined : v;
+}
+var UNEXPANDED_PLACEHOLDER;
+var init_env_placeholder = __esm(() => {
+  UNEXPANDED_PLACEHOLDER = /^\$\{[^}]*\}$/;
+});
+
 // src/providers/onepassword-handshake-lock.ts
 import { closeSync, mkdirSync as mkdirSync3, openSync, readFileSync as readFileSync3, rmSync, statSync, writeSync } from "fs";
 import { homedir as homedir4 } from "os";
@@ -3785,6 +3831,7 @@ __export(exports_onepassword, {
   resetSdkClientCache: () => resetSdkClientCache,
   resetOpFailures: () => resetOpFailures,
   renderOpFailureNotice: () => renderOpFailureNotice,
+  renderOpFailureBlock: () => renderOpFailureBlock,
   recordOpHydratedVars: () => recordOpHydratedVars,
   recordOpFailure: () => recordOpFailure,
   readEnvironment: () => readEnvironment,
@@ -3809,6 +3856,7 @@ __export(exports_onepassword, {
   detectSdkAuth: () => detectSdkAuth,
   defaultSdkClientFactory: () => defaultSdkClientFactory,
   defaultScreenLockProbe: () => defaultScreenLockProbe,
+  defaultOpDefaultAccountProbe: () => defaultOpDefaultAccountProbe,
   defaultOpAccountLister: () => defaultOpAccountLister,
   defaultAppLockProbe: () => defaultAppLockProbe,
   currentLockCause: () => currentLockCause,
@@ -3847,9 +3895,12 @@ function wasOpAuthorizationDenied() {
   return opSourceFailures.some((f) => /denied authorization/i.test(f.message));
 }
 function renderOpFailureNotice(envVar) {
+  return renderOpFailureBlock(`for ${envVar} this run`);
+}
+function renderOpFailureBlock(subject) {
   if (opSourceFailures.length === 0)
     return [];
-  const lines = [`1Password was consulted for ${envVar} this run and failed:`];
+  const lines = [`1Password was consulted ${subject} and failed:`];
   for (const f of opSourceFailures) {
     const where = f.source ? `${f.kind} ${f.source}` : f.kind;
     lines.push(`  ${where} \u2014 ${f.message.split(`
@@ -4373,7 +4424,7 @@ function detectSdkAuth(env = process.env) {
 }
 function resolveDesktopAccount(opts = {}) {
   const env = opts.env ?? process.env;
-  const envAccount = env.OP_ACCOUNT?.trim();
+  const envAccount = realValue(env.OP_ACCOUNT)?.trim();
   if (envAccount)
     return { accountName: envAccount };
   const configAccount = opts.configAccount?.trim();
@@ -4393,10 +4444,17 @@ function resolveDesktopAccount(opts = {}) {
   if (opts.interactive) {
     return { needsPicker: accounts };
   }
+  const probe = opts.opDefaultAccountProbe ?? defaultOpDefaultAccountProbe;
+  const defaultUuid = probe();
+  if (defaultUuid) {
+    const match = accounts.find((a) => a.account_uuid === defaultUuid);
+    if (match)
+      return { accountName: match.url };
+  }
   const listing = accounts.map((a) => `  - ${a.url}${a.email ? ` (${a.email})` : ""}`).join(`
 `);
   return {
-    error: `Multiple 1Password accounts are available and this is a non-interactive session, so claudish can't prompt you to pick one. ${remediation}
+    error: `Multiple 1Password accounts are available, this is a non-interactive session, and \`op\` could not name a default account. ${remediation}
 Accounts:
 ${listing}`
   };
@@ -4410,7 +4468,8 @@ async function resolveSdkAuth(opts = {}) {
     env,
     configAccount: opts.configAccount,
     interactive: opts.interactive,
-    opAccountLister: opts.opAccountLister
+    opAccountLister: opts.opAccountLister,
+    opDefaultAccountProbe: opts.opDefaultAccountProbe
   });
   if ("accountName" in result) {
     return { kind: "desktop", accountName: result.accountName };
@@ -4578,8 +4637,19 @@ var OP_REF_RE, opHydratedVars, opSourceFailures, ENV_VAR_NAME_RE, sdkClientCache
   } catch {
     return null;
   }
+}, defaultOpDefaultAccountProbe = () => {
+  try {
+    const res = spawnSync("op", ["account", "get", "--format=json"], { encoding: "utf-8" });
+    if (res.error || res.status !== 0)
+      return null;
+    const parsed = JSON.parse(res.stdout ?? "");
+    return typeof parsed.id === "string" && parsed.id ? parsed.id : null;
+  } catch {
+    return null;
+  }
 };
 var init_onepassword = __esm(() => {
+  init_env_placeholder();
   init_startup_trace();
   init_onepassword_handshake_lock();
   OP_REF_RE = /^op:\/\/[^\s]+$/;
@@ -27713,7 +27783,7 @@ var init_provider_definitions = __esm(() => {
       apiKeyEnvVar: "",
       apiKeyDescription: "Antigravity (shared OAuth token)",
       apiKeyUrl: "https://antigravity.google/",
-      oauthLoginSlug: "gemini",
+      oauthLoginSlug: "antigravity",
       shortcuts: ["ag", "antigravity", "go"],
       shortestPrefix: "ag",
       legacyPrefixes: [
@@ -28303,31 +28373,25 @@ function locateAgyBinary() {
   const fallback = join8(homedir8(), ".local", "bin", "agy");
   return existsSync6(fallback) ? fallback : null;
 }
-function defaultExtractCreds() {
+function defaultDeleteStore() {
+  if (process.platform !== "darwin")
+    return;
+  try {
+    execFileSync("security", ["delete-generic-password", "-s", KC_SERVICE, "-a", KC_ACCOUNT], {
+      stdio: ["ignore", "ignore", "ignore"]
+    });
+  } catch {}
+}
+function defaultRunAgyRefresh() {
   const agy = locateAgyBinary();
-  if (!agy) {
-    logStderr("[Antigravity] Could not locate the `agy` binary \u2014 self-refresh is unavailable.");
-    return [];
-  }
-  let dump;
+  if (!agy)
+    return;
   try {
-    dump = execFileSync("strings", [agy], {
-      encoding: "utf8",
-      maxBuffer: 128 * 1024 * 1024
+    execFileSync(agy, ["models"], {
+      stdio: ["ignore", "ignore", "ignore"],
+      timeout: AGY_REFRESH_TIMEOUT_MS
     });
-  } catch {
-    logStderr("[Antigravity] `strings` failed on the agy binary \u2014 self-refresh is unavailable.");
-    return [];
-  }
-  const clientIds = Array.from(new Set(dump.match(/[0-9]{6,}-[a-z0-9]+\.apps\.googleusercontent\.com/g) ?? []));
-  const secrets = Array.from(new Set(dump.match(/GOCSPX-[A-Za-z0-9_-]{20,}/g) ?? []));
-  const combos = [];
-  for (const clientId of clientIds) {
-    for (const clientSecret of secrets) {
-      combos.push({ clientId, clientSecret });
-    }
-  }
-  return combos;
+  } catch {}
 }
 function parseRecord(raw) {
   if (!raw)
@@ -28347,9 +28411,6 @@ function parseRecord(raw) {
     return null;
   }
 }
-function encodeRecord(rec) {
-  return PREFIX + Buffer.from(JSON.stringify(rec), "utf8").toString("base64");
-}
 function readSharedAntigravityToken(deps = defaultDeps) {
   const rec = parseRecord(deps.readStore());
   return rec ? rec.token : null;
@@ -28367,14 +28428,9 @@ function hasSharedAntigravityToken(deps = defaultDeps) {
   cachedHasToken = { at: now, value };
   return value;
 }
-function writeSharedAntigravityToken(tok, deps = defaultDeps) {
-  const existing = parseRecord(deps.readStore());
-  const base = existing ?? { token: tok };
-  const merged = {
-    ...base,
-    token: { ...base.token, ...tok }
-  };
-  deps.writeStore(encodeRecord(merged));
+function deleteSharedAntigravityToken(deps = defaultDeps) {
+  (deps.deleteStore ?? defaultDeleteStore)();
+  _resetAntigravityTokenState();
 }
 function needsRefresh(tok, now) {
   const expMs = Date.parse(tok.expiry);
@@ -28382,57 +28438,25 @@ function needsRefresh(tok, now) {
     return true;
   return now >= expMs - EXPIRY_SKEW_MS;
 }
-async function refreshToken(tok, deps) {
-  const combos = cachedCred ? [cachedCred] : deps.extractCreds();
-  if (combos.length === 0) {
-    throw new Error("[Antigravity] Access token expired and no OAuth client credentials could be extracted " + "from the `agy` binary to refresh it. Re-run the Antigravity CLI to refresh your session, " + "or use g@<model> with GEMINI_API_KEY.");
-  }
-  let lastStatus = 0;
-  let lastBody = "";
-  for (const cred of combos) {
-    const res = await deps.fetch(REFRESH_ENDPOINT, {
-      method: "POST",
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      body: new URLSearchParams({
-        client_id: cred.clientId,
-        client_secret: cred.clientSecret,
-        refresh_token: tok.refresh_token,
-        grant_type: "refresh_token"
-      })
-    });
-    if (res.ok) {
-      cachedCred = cred;
-      const j = await res.json();
-      const expiry = new Date(deps.now() + j.expires_in * 1000).toISOString();
-      return {
-        access_token: j.access_token,
-        token_type: tok.token_type || "Bearer",
-        refresh_token: j.refresh_token || tok.refresh_token,
-        expiry
-      };
-    }
-    lastStatus = res.status;
-    lastBody = await res.text().catch(() => "");
-  }
-  throw new Error(`[Antigravity] Token refresh failed for all ${combos.length} client-cred combo(s) ` + `(last HTTP ${lastStatus}${lastBody ? `: ${lastBody.slice(0, 200)}` : ""}). ` + "Re-run the Antigravity CLI to refresh your session, or use g@<model> with GEMINI_API_KEY.");
-}
 async function resolveValidToken(deps) {
   if (process.platform !== "darwin") {
     throw new Error("[Antigravity] The shared Antigravity token store is macOS-only for now. " + "Use g@<model> with GEMINI_API_KEY on this platform.");
   }
   const rec = parseRecord(deps.readStore());
   if (!rec) {
-    throw new Error("[Antigravity] No Antigravity session found. Install Antigravity and sign in " + "(the `agy` CLI), or use g@<model> with GEMINI_API_KEY " + "(get one at https://aistudio.google.com/app/apikey).");
+    throw new Error("[Antigravity] No Antigravity session found. Sign in with `claudish login antigravity`, " + "or use g@<model> with GEMINI_API_KEY " + "(get one at https://aistudio.google.com/app/apikey).");
+  }
+  if (!needsRefresh(rec.token, deps.now())) {
+    return rec.token.access_token;
   }
-  const tok = rec.token;
-  if (!needsRefresh(tok, deps.now())) {
-    return tok.access_token;
+  log("[Antigravity] Access token expired/near-expiry \u2014 asking the Antigravity CLI to refresh.");
+  deps.runAgyRefresh();
+  const refreshedRec = parseRecord(deps.readStore());
+  if (refreshedRec && !needsRefresh(refreshedRec.token, deps.now())) {
+    log("[Antigravity] Shared token refreshed by the Antigravity CLI.");
+    return refreshedRec.token.access_token;
   }
-  log("[Antigravity] Access token expired/near-expiry \u2014 refreshing.");
-  const refreshed = await refreshToken(tok, deps);
-  writeSharedAntigravityToken(refreshed, deps);
-  log("[Antigravity] Token refreshed and written back to the shared store.");
-  return refreshed.access_token;
+  throw new Error("[Antigravity] Antigravity session expired and couldn't be refreshed. " + "Run `claudish login antigravity` (installs/authenticates the Antigravity CLI).");
 }
 function getValidAntigravityAccessToken(deps = defaultDeps) {
   if (inFlight)
@@ -28442,14 +28466,18 @@ function getValidAntigravityAccessToken(deps = defaultDeps) {
   });
   return inFlight;
 }
-var KC_SERVICE = "gemini", KC_ACCOUNT = "antigravity", PREFIX = "go-keyring-base64:", REFRESH_ENDPOINT = "https://oauth2.googleapis.com/token", EXPIRY_SKEW_MS = 120000, defaultDeps, cachedHasToken = null, HAS_TOKEN_TTL_MS = 5000, cachedCred = null, inFlight = null;
+function _resetAntigravityTokenState() {
+  inFlight = null;
+  cachedHasToken = null;
+}
+var KC_SERVICE = "gemini", KC_ACCOUNT = "antigravity", PREFIX = "go-keyring-base64:", EXPIRY_SKEW_MS = 120000, AGY_REFRESH_TIMEOUT_MS = 40000, defaultDeps, cachedHasToken = null, HAS_TOKEN_TTL_MS = 5000, inFlight = null;
 var init_antigravity_token = __esm(() => {
   init_logger();
   defaultDeps = {
     readStore: defaultReadStore,
     writeStore: defaultWriteStore,
-    extractCreds: defaultExtractCreds,
-    fetch: (input, init) => fetch(input, init),
+    deleteStore: defaultDeleteStore,
+    runAgyRefresh: defaultRunAgyRefresh,
     now: () => Date.now()
   };
 });
@@ -29656,11 +29684,6 @@ var init_antigravity_credential = __esm(() => {
 import { existsSync as existsSync8 } from "fs";
 import { homedir as homedir10 } from "os";
 import { join as join10 } from "path";
-function realValue(v) {
-  if (!v)
-    return;
-  return UNEXPANDED_PLACEHOLDER.test(v.trim()) ? undefined : v;
-}
 
 class ApiKeyCredentialProvider {
   catalogName;
@@ -29763,11 +29786,10 @@ class ApiKeyCredentialProvider {
     return { headers };
   }
 }
-var UNEXPANDED_PLACEHOLDER;
 var init_api_key_credential = __esm(() => {
+  init_env_placeholder();
   init_profile_config();
   init_op_source();
-  UNEXPANDED_PLACEHOLDER = /^\$\{[^}]*\}$/;
 });
 
 // src/auth/codex-oauth.ts
@@ -31510,6 +31532,7 @@ var init_routing_hints = __esm(() => {
     kimi: { loginFlag: "login kimi", apiKeyEnvVar: "MOONSHOT_API_KEY" },
     google: { loginFlag: "login gemini", apiKeyEnvVar: "GEMINI_API_KEY" },
     "gemini-codeassist": { loginFlag: "login gemini", apiKeyEnvVar: "GEMINI_API_KEY" },
+    antigravity: { loginFlag: "login antigravity" },
     openai: { apiKeyEnvVar: "OPENAI_API_KEY" },
     "openai-codex": { loginFlag: "login codex", apiKeyEnvVar: "OPENAI_CODEX_API_KEY" },
     minimax: { apiKeyEnvVar: "MINIMAX_API_KEY" },
@@ -33319,44 +33342,6 @@ async function isPortAvailable(port) {
 }
 var init_port_manager = () => {};
 
-// src/redact.ts
-function isPlaceholder(value) {
-  return PLACEHOLDER.test(value.trim());
-}
-function redactSecrets(text) {
-  if (!text)
-    return "";
-  let out = text;
-  out = out.replace(ASSIGNMENT_RE, (match, lhs, value) => isPlaceholder(value) ? match : `${lhs}${MASK}`);
-  for (const { re } of TOKEN_PATTERNS) {
-    out = out.replace(re, (match) => {
-      const scheme = /^(Bearer|Basic|Token)\s/.exec(match);
-      return scheme ? `${scheme[1]} ${MASK}` : MASK;
-    });
-  }
-  return out;
-}
-function sanitizeForReport(text) {
-  if (!text)
-    return "";
-  return redactSecrets(text).replace(/\/Users\/[^/\s]+/g, "/Users/***").replace(/\/home\/[^/\s]+/g, "/home/***").replace(/[A-Z]:\\Users\\[^\\\s]+/gi, "C:\\Users\\***").replace(/[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/g, "***@***.***");
-}
-var MASK = "***REDACTED***", PLACEHOLDER, ASSIGNMENT_RE, TOKEN_PATTERNS;
-var init_redact = __esm(() => {
-  PLACEHOLDER = /^(['"`]?)(your[-_a-z0-9]*|<[^>]*>|\.\.\.|x{3,}|\*{3,}|REDACTED|CHANGEME|TODO|\$\{[^}]*\}|)(['"`]?)$/i;
-  ASSIGNMENT_RE = /(["']?\b[A-Z][A-Z0-9_]*(?:_API_KEY|_KEY|_TOKEN|_SECRET|_PASSWORD)\b["']?\s*[:=]\s*)(["'`]?\$\{[^}]*\}["'`]?|["'`]?[^\s"'`,}]+["'`]?)/g;
-  TOKEN_PATTERNS = [
-    { name: "sk", re: /\bsk-[A-Za-z0-9_-]{16,}/g },
-    { name: "google", re: /\bAIza[A-Za-z0-9_-]{20,}/g },
-    { name: "xai", re: /\bxai-[A-Za-z0-9_-]{16,}/g },
-    { name: "github", re: /\bgh[posur]_[A-Za-z0-9]{20,}/g },
-    { name: "aws", re: /\bAKIA[0-9A-Z]{12,}/g },
-    { name: "jwt", re: /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}/g },
-    { name: "zhipu", re: /\b[0-9a-f]{32}\.[A-Za-z0-9]{16}\b/g },
-    { name: "bearer", re: /\b(?:Bearer|Basic|Token)\s+[A-Za-z0-9_.\-+/=]{12,}/g }
-  ];
-});
-
 // ../../node_modules/.bun/hono@4.10.6/node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
@@ -47273,6 +47258,44 @@ var init_proxy_server = __esm(() => {
   };
 });
 
+// src/redact.ts
+function isPlaceholder(value) {
+  return PLACEHOLDER.test(value.trim());
+}
+function redactSecrets(text) {
+  if (!text)
+    return "";
+  let out = text;
+  out = out.replace(ASSIGNMENT_RE, (match2, lhs, value) => isPlaceholder(value) ? match2 : `${lhs}${MASK}`);
+  for (const { re } of TOKEN_PATTERNS) {
+    out = out.replace(re, (match2) => {
+      const scheme = /^(Bearer|Basic|Token)\s/.exec(match2);
+      return scheme ? `${scheme[1]} ${MASK}` : MASK;
+    });
+  }
+  return out;
+}
+function sanitizeForReport(text) {
+  if (!text)
+    return "";
+  return redactSecrets(text).replace(/\/Users\/[^/\s]+/g, "/Users/***").replace(/\/home\/[^/\s]+/g, "/home/***").replace(/[A-Z]:\\Users\\[^\\\s]+/gi, "C:\\Users\\***").replace(/[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/g, "***@***.***");
+}
+var MASK = "***REDACTED***", PLACEHOLDER, ASSIGNMENT_RE, TOKEN_PATTERNS;
+var init_redact = __esm(() => {
+  PLACEHOLDER = /^(['"`]?)(your[-_a-z0-9]*|<[^>]*>|\.\.\.|x{3,}|\*{3,}|REDACTED|CHANGEME|TODO|\$\{[^}]*\}|)(['"`]?)$/i;
+  ASSIGNMENT_RE = /(["']?\b[A-Z][A-Z0-9_]*(?:_API_KEY|_KEY|_TOKEN|_SECRET|_PASSWORD)\b["']?\s*[:=]\s*)(["'`]?\$\{[^}]*\}["'`]?|["'`]?[^\s"'`,}]+["'`]?)/g;
+  TOKEN_PATTERNS = [
+    { name: "sk", re: /\bsk-[A-Za-z0-9_-]{16,}/g },
+    { name: "google", re: /\bAIza[A-Za-z0-9_-]{20,}/g },
+    { name: "xai", re: /\bxai-[A-Za-z0-9_-]{16,}/g },
+    { name: "github", re: /\bgh[posur]_[A-Za-z0-9]{20,}/g },
+    { name: "aws", re: /\bAKIA[0-9A-Z]{12,}/g },
+    { name: "jwt", re: /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}/g },
+    { name: "zhipu", re: /\b[0-9a-f]{32}\.[A-Za-z0-9]{16}\b/g },
+    { name: "bearer", re: /\b(?:Bearer|Basic|Token)\s+[A-Za-z0-9_.\-+/=]{12,}/g }
+  ];
+});
+
 // src/team-stats.ts
 import { existsSync as existsSync18, readFileSync as readFileSync16, writeFileSync as writeFileSync11 } from "fs";
 import { join as join25 } from "path";
@@ -48161,6 +48184,13 @@ function formatTeamResult(status, sessionPath) {
 }
 function defineTools(sessionManager, notifyChannel) {
   const tools = [];
+  function withOpFailureContext(message, subject) {
+    const block = renderOpFailureBlock(subject);
+    return block.length === 0 ? message : `${message}
+
+${block.join(`
+`)}`;
+  }
   tools.push({
     name: "run_prompt",
     description: "Run a prompt through any model \u2014 supports all providers (Kimi, GLM, Qwen, MiniMax, Gemini, GPT, Grok, etc.) with auto-routing, fallback chains, and custom routing rules.",
@@ -48195,10 +48225,10 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
           content: [
             {
               type: "text",
-              text: `Error: ${errMsg}
+              text: withOpFailureContext(`Error: ${errMsg}
 
 ---
-**To report this error**, use the \`report_error\` tool with \`error_type: "provider_failure"\` and \`model: "${args.model}"\`.`
+**To report this error**, use the \`report_error\` tool with \`error_type: "provider_failure"\` and \`model: "${args.model}"\`.`, `while routing ${args.model}`)
             }
           ],
           isError: true
@@ -48541,7 +48571,7 @@ Use with: run_prompt(model="${results2[0].model.id}", prompt="your prompt")`;
           content: [
             {
               type: "text",
-              text: `Error: ${error46 instanceof Error ? error46.message : String(error46)}`
+              text: withOpFailureContext(`Error: ${error46 instanceof Error ? error46.message : String(error46)}`, "while running the team")
             }
           ],
           isError: true
@@ -48757,10 +48787,10 @@ Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}`
           content: [
             {
               type: "text",
-              text: `Error creating session: ${errMsg}
+              text: withOpFailureContext(`Error creating session: ${errMsg}
 
 ---
-**To report this error**, use the \`report_error\` tool with \`error_type: "provider_failure"\` and \`model: "${args.model}"\`.`
+**To report this error**, use the \`report_error\` tool with \`error_type: "provider_failure"\` and \`model: "${args.model}"\`.`, `while routing ${args.model}`)
             }
           ],
           isError: true
@@ -49016,9 +49046,10 @@ var init_mcp_server = __esm(() => {
   init_channel();
   init_model_loader();
   init_port_manager();
-  init_redact();
+  init_onepassword();
   init_provider_definitions();
   init_proxy_server();
+  init_redact();
   init_team_orchestrator();
   import_dotenv2 = __toESM(require_main(), 1);
   import_dotenv2.config({ quiet: true });
@@ -61770,6 +61801,163 @@ var init_dist16 = __esm(() => {
   init_dist15();
 });
 
+// src/auth/antigravity-oauth.ts
+import { spawnSync as spawnSync3 } from "child_process";
+import { existsSync as existsSync22, unlinkSync as unlinkSync7 } from "fs";
+import { homedir as homedir26 } from "os";
+import { join as join28 } from "path";
+async function defaultSuggestModel() {
+  try {
+    const tok = readSharedAntigravityToken();
+    if (!tok)
+      return "<model>";
+    const { projectId } = await setupAntigravityUser(tok.access_token);
+    const { servedIds, defaultId } = await getServedAntigravityModels(tok.access_token, projectId);
+    return defaultId || servedIds[0] || "<model>";
+  } catch {
+    return "<model>";
+  }
+}
+function printManualInstall() {
+  console.log("\nInstall the Antigravity CLI, then retry `claudish login antigravity`:");
+  console.log(`  ${INSTALL_CMD}`);
+  console.log(`  Docs: ${INSTALL_DOCS}`);
+}
+async function defaultConfirmInstall() {
+  const { confirm } = await Promise.resolve().then(() => (init_dist16(), exports_dist));
+  return confirm({
+    message: `Install the Antigravity CLI now? (runs: ${INSTALL_CMD})`,
+    default: true
+  });
+}
+function defaultRunInstall() {
+  const res = spawnSync3("bash", ["-c", INSTALL_CMD], { stdio: "inherit" });
+  return !res.error && res.status === 0;
+}
+function defaultRunAgyAuth(agyPath, interactive) {
+  if (interactive) {
+    spawnSync3(agyPath, [], { stdio: "inherit" });
+  } else {
+    spawnSync3(agyPath, ["-p", "hello", "--print-timeout", "3m"], { stdio: "inherit" });
+  }
+}
+async function pollForToken(deps) {
+  const deadline = deps.now() + deps.timing.graceMs;
+  for (;; ) {
+    const tok = deps.readToken();
+    if (tok)
+      return tok;
+    if (deps.now() >= deadline)
+      return null;
+    const remaining = deadline - deps.now();
+    await deps.sleep(Math.min(deps.timing.intervalMs, Math.max(0, remaining)));
+  }
+}
+
+class AntigravityOAuth {
+  static instance = null;
+  static getInstance() {
+    if (!AntigravityOAuth.instance) {
+      AntigravityOAuth.instance = new AntigravityOAuth;
+    }
+    return AntigravityOAuth.instance;
+  }
+  constructor() {}
+  async login(depsOverride = {}) {
+    const deps = { ...defaultLoginDeps, ...depsOverride };
+    log("[AntigravityOAuth] Starting agy-delegated login");
+    if (deps.hasToken()) {
+      console.log(`\u2705 Already authenticated with Antigravity. Use: claudish --model ag@${await (deps.suggestModel ?? defaultSuggestModel)()}`);
+      return deps.exit(0);
+    }
+    let agyPath = deps.locateAgy();
+    if (!agyPath) {
+      console.log("\nThe Antigravity CLI (`agy`) is required to sign in to Antigravity.");
+      console.log(`claudish delegates Antigravity sign-in to agy \u2014 agy holds the current OAuth secret
+` + "and writes the session to the shared keychain store that claudish reads.");
+      if (!deps.isInteractive()) {
+        printManualInstall();
+        return deps.exit(0);
+      }
+      const proceed = await deps.confirmInstall();
+      if (!proceed) {
+        printManualInstall();
+        return deps.exit(0);
+      }
+      console.log(`
+Installing the Antigravity CLI\u2026
+`);
+      if (!deps.runInstall()) {
+        console.log(`
+\u274C Antigravity CLI installation failed.`);
+        printManualInstall();
+        return deps.exit(0);
+      }
+      agyPath = deps.locateAgy();
+      if (!agyPath) {
+        console.log(`
+\u274C Antigravity CLI still not found after install.`);
+        printManualInstall();
+        return deps.exit(0);
+      }
+    }
+    console.log(`
+Launching the Antigravity CLI to sign in \u2014 complete the sign-in in your browser.
+` + `claudish will detect the session automatically.
+`);
+    deps.runAgyAuth(agyPath, false);
+    let token = await pollForToken(deps);
+    if (!token) {
+      console.log(`
+No session detected yet. Starting the Antigravity CLI interactively \u2014
+` + "sign in, then exit agy (its `/quit` command or Ctrl-C) to return here.\n");
+      deps.runAgyAuth(agyPath, true);
+      token = await pollForToken(deps);
+    }
+    if (token) {
+      deps.onAuthenticated();
+      console.log(`
+\u2705 Authenticated with Antigravity. Use: claudish --model ag@${await (deps.suggestModel ?? defaultSuggestModel)()}`);
+      return deps.exit(0);
+    }
+    console.log("\nNo Antigravity session detected. Run `agy` and sign in, then retry `claudish login antigravity`.");
+    return deps.exit(0);
+  }
+  async logout(deps) {
+    deleteSharedAntigravityToken(deps);
+    try {
+      const tokenFile = join28(homedir26(), ".gemini", "antigravity-cli", "antigravity-oauth-token");
+      if (existsSync22(tokenFile))
+        unlinkSync7(tokenFile);
+    } catch {}
+    log("[AntigravityOAuth] Antigravity session cleared (keychain + agy token file)");
+  }
+}
+var INSTALL_CMD = "curl -fsSL https://antigravity.google/cli/install.sh | bash", INSTALL_DOCS = "https://antigravity.google/docs/cli/install", defaultLoginDeps;
+var init_antigravity_oauth = __esm(() => {
+  init_logger();
+  init_antigravity_token();
+  init_gemini_oauth();
+  defaultLoginDeps = {
+    locateAgy: locateAgyBinary,
+    hasToken: () => readSharedAntigravityToken() != null,
+    readToken: () => {
+      _resetAntigravityTokenState();
+      return readSharedAntigravityToken();
+    },
+    suggestModel: defaultSuggestModel,
+    confirmInstall: defaultConfirmInstall,
+    runInstall: defaultRunInstall,
+    runAgyAuth: defaultRunAgyAuth,
+    onAuthenticated: () => _resetAntigravityTokenState(),
+    isInteractive: () => Boolean(process.stdin.isTTY),
+    now: () => Date.now(),
+    sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+    exit: (code) => process.exit(code),
+    timing: { graceMs: 1e4, intervalMs: 500 }
+  };
+});
+
 // src/auth/auth-commands.ts
 var exports_auth_commands = {};
 __export(exports_auth_commands, {
@@ -61777,7 +61965,7 @@ __export(exports_auth_commands, {
   loginCommand: () => loginCommand
 });
 function getAuthStatus(provider) {
-  const hasCredentials = provider.registryKeys.some((k) => hasOAuthCredentials(k));
+  const hasCredentials = provider.registryKeys.some((k) => hasOAuthCredentials(k)) || provider.name === "antigravity" && hasSharedAntigravityToken();
   return hasCredentials ? "logged in" : "not logged in";
 }
 async function selectProvider(action) {
@@ -61834,11 +62022,20 @@ async function logoutCommand(providerArg) {
 var AUTH_PROVIDERS;
 var init_auth_commands = __esm(() => {
   init_dist16();
+  init_antigravity_oauth();
+  init_antigravity_token();
   init_codex_oauth();
   init_gemini_oauth();
   init_kimi_oauth();
   init_oauth_registry();
   AUTH_PROVIDERS = [
+    {
+      name: "antigravity",
+      displayName: "Antigravity",
+      prefix: "ag@, antigravity@",
+      getInstance: () => AntigravityOAuth.getInstance(),
+      registryKeys: ["antigravity"]
+    },
     {
       name: "gemini",
       displayName: "Gemini Code Assist",
@@ -61987,11 +62184,11 @@ async function geminiQuotaHandler() {
   }
 }
 async function codexQuotaHandler() {
-  const { readFileSync: readFileSync21, existsSync: existsSync22 } = await import("fs");
-  const { join: join28 } = await import("path");
-  const { homedir: homedir26 } = await import("os");
-  const credPath = join28(homedir26(), ".claudish", "codex-oauth.json");
-  if (!existsSync22(credPath)) {
+  const { readFileSync: readFileSync21, existsSync: existsSync23 } = await import("fs");
+  const { join: join29 } = await import("path");
+  const { homedir: homedir27 } = await import("os");
+  const credPath = join29(homedir27(), ".claudish", "codex-oauth.json");
+  if (!existsSync23(credPath)) {
     console.error(`${RED}No Codex credentials found.${R} Run: ${B}claudish login codex${R}`);
     process.exit(1);
   }
@@ -62047,8 +62244,8 @@ async function codexQuotaHandler() {
   }
   let modelSlugs = [];
   try {
-    const modelsPath = join28(homedir26(), ".codex", "models_cache.json");
-    if (existsSync22(modelsPath)) {
+    const modelsPath = join29(homedir27(), ".codex", "models_cache.json");
+    if (existsSync23(modelsPath)) {
       const cache2 = JSON.parse(readFileSync21(modelsPath, "utf-8"));
       modelSlugs = (cache2.models || []).map((m) => m.slug || m.id).filter(Boolean);
     }
@@ -63335,7 +63532,7 @@ function annotateOAuthHint(result, provider, isOAuth) {
     return result;
   if (result.state === "live")
     return result;
-  const loginCommand2 = provider === "gemini-codeassist" ? "claudish login gemini" : provider === "vertex" ? "gcloud auth application-default login" : undefined;
+  const loginCommand2 = provider === "gemini-codeassist" ? "claudish login gemini" : provider === "antigravity" ? "claudish login antigravity" : provider === "vertex" ? "gcloud auth application-default login" : undefined;
   if (!loginCommand2)
     return result;
   if (result.httpStatus === 403)
@@ -65937,22 +66134,22 @@ __export(exports_cli, {
 });
 import {
   copyFileSync as copyFileSync2,
-  existsSync as existsSync22,
+  existsSync as existsSync23,
   mkdirSync as mkdirSync13,
   readFileSync as readFileSync21,
   readdirSync as readdirSync5,
-  unlinkSync as unlinkSync7,
+  unlinkSync as unlinkSync8,
   writeFileSync as writeFileSync15
 } from "fs";
-import { homedir as homedir26 } from "os";
-import { dirname as dirname9, join as join28 } from "path";
+import { homedir as homedir27 } from "os";
+import { dirname as dirname9, join as join29 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function getVersion3() {
   return VERSION;
 }
 function clearAllModelCaches() {
-  const cacheDir = join28(homedir26(), ".claudish");
-  if (!existsSync22(cacheDir))
+  const cacheDir = join29(homedir27(), ".claudish");
+  if (!existsSync23(cacheDir))
     return;
   const cachePatterns = ["pricing-cache.json", "recommended-models-cache.json"];
   let cleared = 0;
@@ -65960,7 +66157,7 @@ function clearAllModelCaches() {
     const files = readdirSync5(cacheDir);
     for (const file2 of files) {
       if (cachePatterns.includes(file2)) {
-        unlinkSync7(join28(cacheDir, file2));
+        unlinkSync8(join29(cacheDir, file2));
         cleared++;
       }
     }
@@ -66370,8 +66567,8 @@ Usage:  claudish --models --provider <slug>`);
     });
     config3.resolvedDefaultProvider = resolved;
     if (resolved.legacyAutoPromoted && !config3.quiet) {
-      const markerFile = join28(homedir26(), ".claudish", ".legacy-litellm-hint-shown");
-      if (!existsSync22(markerFile)) {
+      const markerFile = join29(homedir27(), ".claudish", ".legacy-litellm-hint-shown");
+      if (!existsSync23(markerFile)) {
         const hint = buildLegacyHint(resolved);
         if (hint) {
           console.error(hint);
@@ -67445,7 +67642,7 @@ ${h("MORE INFO")}
 }
 function printAIAgentGuide() {
   try {
-    const guidePath = join28(__dirname3, "../AI_AGENT_GUIDE.md");
+    const guidePath = join29(__dirname3, "../AI_AGENT_GUIDE.md");
     const guideContent = readFileSync21(guidePath, "utf-8");
     console.log(guideContent);
   } catch (error46) {
@@ -67462,19 +67659,19 @@ async function initializeClaudishSkill() {
   console.log(`\uD83D\uDD27 Initializing Claudish skill in current project...
 `);
   const cwd = process.cwd();
-  const claudeDir = join28(cwd, ".claude");
-  const skillsDir = join28(claudeDir, "skills");
-  const claudishSkillDir = join28(skillsDir, "claudish-usage");
-  const skillFile = join28(claudishSkillDir, "SKILL.md");
-  if (existsSync22(skillFile)) {
+  const claudeDir = join29(cwd, ".claude");
+  const skillsDir = join29(claudeDir, "skills");
+  const claudishSkillDir = join29(skillsDir, "claudish-usage");
+  const skillFile = join29(claudishSkillDir, "SKILL.md");
+  if (existsSync23(skillFile)) {
     console.log("\u2705 Claudish skill already installed at:");
     console.log(`   ${skillFile}
 `);
     console.log("\uD83D\uDCA1 To reinstall, delete the file and run 'claudish --init' again.");
     return;
   }
-  const sourceSkillPath = join28(__dirname3, "../skills/claudish-usage/SKILL.md");
-  if (!existsSync22(sourceSkillPath)) {
+  const sourceSkillPath = join29(__dirname3, "../skills/claudish-usage/SKILL.md");
+  if (!existsSync23(sourceSkillPath)) {
     console.error("\u274C Error: Claudish skill file not found in installation.");
     console.error(`   Expected at: ${sourceSkillPath}`);
     console.error(`
@@ -67483,15 +67680,15 @@ async function initializeClaudishSkill() {
     process.exit(1);
   }
   try {
-    if (!existsSync22(claudeDir)) {
+    if (!existsSync23(claudeDir)) {
       mkdirSync13(claudeDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/ directory");
     }
-    if (!existsSync22(skillsDir)) {
+    if (!existsSync23(skillsDir)) {
       mkdirSync13(skillsDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/skills/ directory");
     }
-    if (!existsSync22(claudishSkillDir)) {
+    if (!existsSync23(claudishSkillDir)) {
       mkdirSync13(claudishSkillDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/skills/claudish-usage/ directory");
     }
@@ -67576,30 +67773,30 @@ __export(exports_update_checker, {
   clearCache: () => clearCache,
   checkForUpdates: () => checkForUpdates
 });
-import { existsSync as existsSync23, mkdirSync as mkdirSync14, readFileSync as readFileSync22, unlinkSync as unlinkSync8, writeFileSync as writeFileSync16 } from "fs";
-import { homedir as homedir27, platform as platform2, tmpdir } from "os";
-import { join as join29 } from "path";
+import { existsSync as existsSync24, mkdirSync as mkdirSync14, readFileSync as readFileSync22, unlinkSync as unlinkSync9, writeFileSync as writeFileSync16 } from "fs";
+import { homedir as homedir28, platform as platform2, tmpdir } from "os";
+import { join as join30 } from "path";
 function getCacheFilePath() {
   let cacheDir;
   if (isWindows) {
-    const localAppData = process.env.LOCALAPPDATA || join29(homedir27(), "AppData", "Local");
-    cacheDir = join29(localAppData, "claudish");
+    const localAppData = process.env.LOCALAPPDATA || join30(homedir28(), "AppData", "Local");
+    cacheDir = join30(localAppData, "claudish");
   } else {
-    cacheDir = join29(homedir27(), ".cache", "claudish");
+    cacheDir = join30(homedir28(), ".cache", "claudish");
   }
   try {
-    if (!existsSync23(cacheDir)) {
+    if (!existsSync24(cacheDir)) {
       mkdirSync14(cacheDir, { recursive: true });
     }
-    return join29(cacheDir, "update-check.json");
+    return join30(cacheDir, "update-check.json");
   } catch {
-    return join29(tmpdir(), "claudish-update-check.json");
+    return join30(tmpdir(), "claudish-update-check.json");
   }
 }
 function readCache() {
   try {
     const cachePath = getCacheFilePath();
-    if (!existsSync23(cachePath)) {
+    if (!existsSync24(cachePath)) {
       return null;
     }
     const data = JSON.parse(readFileSync22(cachePath, "utf-8"));
@@ -67625,8 +67822,8 @@ function isCacheValid(cache2) {
 function clearCache() {
   try {
     const cachePath = getCacheFilePath();
-    if (existsSync23(cachePath)) {
-      unlinkSync8(cachePath);
+    if (existsSync24(cachePath)) {
+      unlinkSync9(cachePath);
     }
   } catch {}
 }
@@ -68510,11 +68707,11 @@ var init_local_liveness = __esm(() => {
 });
 
 // src/providers/probe-catalog.ts
-import { existsSync as existsSync24, mkdirSync as mkdirSync15, readFileSync as readFileSync23, writeFileSync as writeFileSync17 } from "fs";
-import { homedir as homedir28 } from "os";
-import { dirname as dirname10, join as join30 } from "path";
+import { existsSync as existsSync25, mkdirSync as mkdirSync15, readFileSync as readFileSync23, writeFileSync as writeFileSync17 } from "fs";
+import { homedir as homedir29 } from "os";
+import { dirname as dirname10, join as join31 } from "path";
 function readProbeModelsCache(path2 = PROBE_MODELS_CACHE_PATH) {
-  if (!existsSync24(path2))
+  if (!existsSync25(path2))
     return null;
   let raw2;
   try {
@@ -68647,7 +68844,7 @@ function isValidResponse(raw2) {
 var PROBE_MODELS_URL = "https://us-central1-claudish-6da10.cloudfunctions.net/probeModels", CACHE_TTL_MS4, FETCH_TIMEOUT_MS3 = 15000, PROBE_MODELS_CACHE_PATH, _inFlight = null;
 var init_probe_catalog = __esm(() => {
   CACHE_TTL_MS4 = 60 * 60 * 1000;
-  PROBE_MODELS_CACHE_PATH = join30(homedir28(), ".claudish", "probe-models.json");
+  PROBE_MODELS_CACHE_PATH = join31(homedir29(), ".claudish", "probe-models.json");
 });
 
 // src/tui/constants.ts
@@ -74845,13 +75042,15 @@ var exports_tui = {};
 __export(exports_tui, {
   startConfigTui: () => startConfigTui
 });
-import { spawnSync as spawnSync3 } from "child_process";
+import { spawnSync as spawnSync4 } from "child_process";
 import { createCliRenderer as createCliRenderer2 } from "@opentui/core";
 import { createRoot as createRoot2 } from "@opentui/react";
 import { jsxDEV as jsxDEV17 } from "@opentui/react/jsx-dev-runtime";
 async function startConfigTui() {
   setStderrQuiet(true);
-  const loginRequest = { slug: null };
+  const loginRequest = {
+    slug: null
+  };
   const requestLogin = (slug) => {
     loginRequest.slug = slug;
   };
@@ -74871,7 +75070,7 @@ async function startConfigTui() {
     console.log(`
 Launching: claudish login ${slug}
 `);
-    const result = spawnSync3(process.argv[0], [process.argv[1], "login", slug], {
+    const result = spawnSync4(process.argv[0], [process.argv[1], "login", slug], {
       stdio: "inherit"
     });
     if (result.error) {
@@ -74883,7 +75082,10 @@ Launching: claudish login ${slug}
 \u274C Login exited with status ${result.status}
 `);
     } else {
-      if (slug === "gemini") {
+      if (slug === "antigravity") {
+        _resetAntigravityTokenState();
+        invalidateProbeProxyHandlers("antigravity");
+      } else if (slug === "gemini") {
         reloadGeminiCredentials();
         invalidateProbeProxyHandlers("google");
         invalidateProbeProxyHandlers("gemini-codeassist");
@@ -74904,6 +75106,7 @@ Returning to config\u2026
 }
 var isDirectRun = false;
 var init_tui = __esm(() => {
+  init_antigravity_token();
   init_codex_oauth();
   init_gemini_oauth();
   init_kimi_oauth();
@@ -74992,17 +75195,17 @@ __export(exports_claude_runner, {
 import { spawn as spawn4 } from "child_process";
 import {
   closeSync as closeSync5,
-  existsSync as existsSync25,
+  existsSync as existsSync26,
   mkdirSync as mkdirSync16,
   openSync as openSync5,
   readFileSync as readFileSync24,
   readdirSync as readdirSync6,
   statSync as statSync5,
-  unlinkSync as unlinkSync9,
+  unlinkSync as unlinkSync10,
   writeFileSync as writeFileSync18
 } from "fs";
-import { homedir as homedir29, tmpdir as tmpdir2 } from "os";
-import { dirname as dirname11, join as join31 } from "path";
+import { homedir as homedir30, tmpdir as tmpdir2 } from "os";
+import { dirname as dirname11, join as join32 } from "path";
 import { isatty } from "tty";
 function releaseTerminalIsolation() {
   if (!restoreTerminal)
@@ -75037,7 +75240,7 @@ function isProxyAuthMode(config3) {
 }
 function managedSettingsPath() {
   if (isWindows2()) {
-    return join31(process.env.PROGRAMDATA || "C:\\ProgramData", "ClaudeCode", "managed-settings.json");
+    return join32(process.env.PROGRAMDATA || "C:\\ProgramData", "ClaudeCode", "managed-settings.json");
   }
   if (process.platform === "darwin") {
     return "/Library/Application Support/ClaudeCode/managed-settings.json";
@@ -75058,9 +75261,9 @@ function isWindows2() {
 }
 function createStatusLineScript(tokenFilePath) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
-  const claudishDir = join31(homeDir, ".claudish");
+  const claudishDir = join32(homeDir, ".claudish");
   const timestamp = Date.now();
-  const scriptPath = join31(claudishDir, `status-${timestamp}.js`);
+  const scriptPath = join32(claudishDir, `status-${timestamp}.js`);
   const escapedTokenPath = tokenFilePath.replace(/\\/g, "\\\\");
   const script = `
 const fs = require('fs');
@@ -75215,11 +75418,11 @@ function cleanupStaleTokenFiles(dir, now = Date.now(), maxAgeMs = STALE_TOKEN_FI
     if (!name.startsWith("tokens-") || !name.endsWith(".json"))
       continue;
     scanned++;
-    const full = join31(dir, name);
+    const full = join32(dir, name);
     try {
       if (statSync5(full).mtimeMs >= cutoff)
         continue;
-      unlinkSync9(full);
+      unlinkSync10(full);
       removed++;
     } catch {}
   }
@@ -75244,13 +75447,13 @@ function parseSettingsArgSafe(value) {
 }
 function userSettingsFileCandidates(cwd) {
   return [
-    join31(homedir29(), ".claude", "settings.json"),
-    join31(cwd, ".claude", "settings.json"),
-    join31(cwd, ".claude", "settings.local.json")
+    join32(homedir30(), ".claude", "settings.json"),
+    join32(cwd, ".claude", "settings.json"),
+    join32(cwd, ".claude", "settings.local.json")
   ];
 }
 function discoverUserStatusLineCommand(claudeArgs = [], cwd = process.cwd()) {
-  const sources = userSettingsFileCandidates(cwd).filter((file2) => existsSync25(file2));
+  const sources = userSettingsFileCandidates(cwd).filter((file2) => existsSync26(file2));
   const idx = claudeArgs.indexOf("--settings");
   const settingsArg = idx === -1 ? undefined : claudeArgs[idx + 1];
   if (settingsArg)
@@ -75287,13 +75490,13 @@ function buildChainedStatusCommand(userCommand, claudishBody, claudishSegment) {
 }
 function createTempSettingsFile(_modelDisplay, port, proxyAuthMode, userStatusLineCommand) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
-  const claudishDir = join31(homeDir, ".claudish");
+  const claudishDir = join32(homeDir, ".claudish");
   try {
     mkdirSync16(claudishDir, { recursive: true });
   } catch {}
   const timestamp = Date.now();
-  const tempPath = join31(claudishDir, `settings-${timestamp}.json`);
-  const tokenFilePath = join31(claudishDir, `tokens-${port}.json`);
+  const tempPath = join32(claudishDir, `settings-${timestamp}.json`);
+  const tokenFilePath = join32(claudishDir, `tokens-${port}.json`);
   cleanupStaleTokenFiles(claudishDir);
   initializeTokenFile(tokenFilePath);
   let statusCommand;
@@ -75560,8 +75763,8 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
     console.error("Install it from: https://claude.com/claude-code");
     console.error(`
 Or set CLAUDE_PATH to your custom installation:`);
-    const home = homedir29();
-    const localPath = isWindows2() ? join31(home, ".claude", "local", "claude.exe") : join31(home, ".claude", "local", "claude");
+    const home = homedir30();
+    const localPath = isWindows2() ? join32(home, ".claude", "local", "claude.exe") : join32(home, ".claude", "local", "claude");
     console.error(`  export CLAUDE_PATH=${localPath}`);
     process.exit(1);
   }
@@ -75612,7 +75815,7 @@ Or set CLAUDE_PATH to your custom installation:`);
   });
   releaseTerminalIsolation();
   try {
-    unlinkSync9(tempSettingsPath);
+    unlinkSync10(tempSettingsPath);
   } catch {}
   return exitCode;
 }
@@ -75632,7 +75835,7 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
         } catch {}
       }
       try {
-        unlinkSync9(tempSettingsPath);
+        unlinkSync10(tempSettingsPath);
       } catch {}
       process.exit(0);
     });
@@ -75641,23 +75844,23 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
 async function findClaudeBinary() {
   const isWindows3 = process.platform === "win32";
   if (process.env.CLAUDE_PATH) {
-    if (existsSync25(process.env.CLAUDE_PATH)) {
+    if (existsSync26(process.env.CLAUDE_PATH)) {
       return process.env.CLAUDE_PATH;
     }
   }
-  const home = homedir29();
-  const localPath = isWindows3 ? join31(home, ".claude", "local", "claude.exe") : join31(home, ".claude", "local", "claude");
-  if (existsSync25(localPath)) {
+  const home = homedir30();
+  const localPath = isWindows3 ? join32(home, ".claude", "local", "claude.exe") : join32(home, ".claude", "local", "claude");
+  if (existsSync26(localPath)) {
     return localPath;
   }
   if (isWindows3) {
     const windowsPaths = [
-      join31(home, "AppData", "Roaming", "npm", "claude.cmd"),
-      join31(home, ".npm-global", "claude.cmd"),
-      join31(home, "node_modules", ".bin", "claude.cmd")
+      join32(home, "AppData", "Roaming", "npm", "claude.cmd"),
+      join32(home, ".npm-global", "claude.cmd"),
+      join32(home, "node_modules", ".bin", "claude.cmd")
     ];
     for (const path2 of windowsPaths) {
-      if (existsSync25(path2)) {
+      if (existsSync26(path2)) {
         return path2;
       }
     }
@@ -75665,14 +75868,14 @@ async function findClaudeBinary() {
     const commonPaths = [
       "/usr/local/bin/claude",
       "/opt/homebrew/bin/claude",
-      join31(home, ".npm-global/bin/claude"),
-      join31(home, ".local/bin/claude"),
-      join31(home, "node_modules/.bin/claude"),
+      join32(home, ".npm-global/bin/claude"),
+      join32(home, ".local/bin/claude"),
+      join32(home, "node_modules/.bin/claude"),
       "/data/data/com.termux/files/usr/bin/claude",
-      join31(home, "../usr/bin/claude")
+      join32(home, "../usr/bin/claude")
     ];
     for (const path2 of commonPaths) {
-      if (existsSync25(path2)) {
+      if (existsSync26(path2)) {
         return path2;
       }
     }
@@ -75732,18 +75935,18 @@ __export(exports_diag_output, {
   NullDiagOutput: () => NullDiagOutput,
   LogFileDiagOutput: () => LogFileDiagOutput
 });
-import { createWriteStream as createWriteStream3, mkdirSync as mkdirSync17, unlinkSync as unlinkSync10, writeFileSync as writeFileSync19 } from "fs";
-import { homedir as homedir30 } from "os";
-import { join as join32 } from "path";
+import { createWriteStream as createWriteStream3, mkdirSync as mkdirSync17, unlinkSync as unlinkSync11, writeFileSync as writeFileSync19 } from "fs";
+import { homedir as homedir31 } from "os";
+import { join as join33 } from "path";
 function getClaudishDir() {
-  const dir = join32(homedir30(), ".claudish");
+  const dir = join33(homedir31(), ".claudish");
   try {
     mkdirSync17(dir, { recursive: true });
   } catch {}
   return dir;
 }
 function getDiagLogPath() {
-  return join32(getClaudishDir(), `diag-${process.pid}.log`);
+  return join33(getClaudishDir(), `diag-${process.pid}.log`);
 }
 
 class LogFileDiagOutput {
@@ -75771,7 +75974,7 @@ class LogFileDiagOutput {
       this.stream.end();
     } catch {}
     try {
-      unlinkSync10(this.logPath);
+      unlinkSync11(this.logPath);
     } catch {}
   }
   getLogPath() {
@@ -75954,9 +76157,9 @@ __export(exports_team_grid, {
 });
 import { spawn as spawn5 } from "child_process";
 import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync26, readFileSync as readFileSync25, writeFileSync as writeFileSync20 } from "fs";
+import { existsSync as existsSync27, readFileSync as readFileSync25, writeFileSync as writeFileSync20 } from "fs";
 import { connect as netConnect } from "net";
-import { dirname as dirname12, join as join33 } from "path";
+import { dirname as dirname12, join as join34 } from "path";
 import { setTimeout as wait } from "timers/promises";
 import { fileURLToPath as fileURLToPath3 } from "url";
 function resolveRouteInfo(modelId) {
@@ -76050,18 +76253,18 @@ function buildPaneHeader(model, prompt, bg) {
 function findMagmuxBinary() {
   const thisFile = fileURLToPath3(import.meta.url);
   const thisDir = dirname12(thisFile);
-  const pkgRoot = join33(thisDir, "..");
+  const pkgRoot = join34(thisDir, "..");
   const platform3 = process.platform;
   const arch = process.arch;
-  const bundledMagmux = join33(pkgRoot, "native", `magmux-${platform3}-${arch}`);
-  if (existsSync26(bundledMagmux))
+  const bundledMagmux = join34(pkgRoot, "native", `magmux-${platform3}-${arch}`);
+  if (existsSync27(bundledMagmux))
     return bundledMagmux;
   try {
     const pkgName = `@claudish/magmux-${platform3}-${arch}`;
     let searchDir = pkgRoot;
     for (let i = 0;i < 5; i++) {
-      const candidate = join33(searchDir, "node_modules", pkgName, "bin", "magmux");
-      if (existsSync26(candidate))
+      const candidate = join34(searchDir, "node_modules", pkgName, "bin", "magmux");
+      if (existsSync27(candidate))
         return candidate;
       const parent = dirname12(searchDir);
       if (parent === searchDir)
@@ -76080,7 +76283,7 @@ function findMagmuxBinary() {
 async function subscribeToMagmux(sockPath, onEvent) {
   let client = null;
   for (let attempt = 0;attempt < 40; attempt++) {
-    if (existsSync26(sockPath)) {
+    if (existsSync27(sockPath)) {
       try {
         client = await new Promise((resolve4, reject) => {
           const s = netConnect(sockPath);
@@ -76167,9 +76370,9 @@ async function runWithGrid(sessionPath, models, input, opts) {
   const keep = opts?.keep ?? false;
   const manifest = setupSession(sessionPath, models, input);
   const startedAt = new Date().toISOString();
-  const gridfilePath = join33(sessionPath, "gridfile.txt");
-  const prompt = readFileSync25(join33(sessionPath, "input.md"), "utf-8").replace(/'/g, "'\\''").replace(/\n/g, " ");
-  const rawPrompt = readFileSync25(join33(sessionPath, "input.md"), "utf-8");
+  const gridfilePath = join34(sessionPath, "gridfile.txt");
+  const prompt = readFileSync25(join34(sessionPath, "input.md"), "utf-8").replace(/'/g, "'\\''").replace(/\n/g, " ");
+  const rawPrompt = readFileSync25(join34(sessionPath, "input.md"), "utf-8");
   const usedBannerColors = new Set;
   const gridLines = Object.entries(manifest.models).map(([anonId]) => {
     const model = manifest.models[anonId].model;
@@ -76200,7 +76403,7 @@ async function runWithGrid(sessionPath, models, input, opts) {
   });
   const [{ results: results2 }] = await Promise.all([subscription, procExit]);
   const status = buildTeamStatus(manifest, startedAt, results2?.panes ?? null);
-  const statusPath = join33(sessionPath, "status.json");
+  const statusPath = join34(sessionPath, "status.json");
   writeFileSync20(statusPath, JSON.stringify(status, null, 2), "utf-8");
   return status;
 }
@@ -76224,8 +76427,8 @@ var init_team_grid = __esm(() => {
 init_op_source();
 init_startup_trace();
 var import_dotenv3 = __toESM(require_main(), 1);
-import { existsSync as existsSync27, readFileSync as readFileSync26 } from "fs";
-import { join as join34, resolve as resolve4 } from "path";
+import { existsSync as existsSync28, readFileSync as readFileSync26 } from "fs";
+import { join as join35, resolve as resolve4 } from "path";
 import_dotenv3.config({ quiet: true });
 function classifyStartupKind() {
   const argv = process.argv.slice(2);
@@ -76324,7 +76527,7 @@ async function applyConfigOverride() {
   const { planConfigOverride: planConfigOverride2, setConfigFileOverride: setConfigFileOverride2 } = await Promise.resolve().then(() => exports_config_override);
   const plan = planConfigOverride2(process.argv.slice(2), process.env, {
     resolve: resolve4,
-    exists: existsSync27
+    exists: existsSync28
   });
   if (plan.kind === "none")
     return;
@@ -76367,7 +76570,13 @@ var isLegacyGeminiLogout = args.includes("--gemini-logout");
 var isLegacyKimiLogin = args.includes("--kimi-login");
 var isLegacyKimiLogout = args.includes("--kimi-logout");
 if (isMcpMode) {
-  Promise.resolve().then(() => (init_mcp_server(), exports_mcp_server)).then((mcp) => mcp.startMcpServer());
+  Promise.resolve().then(() => (init_mcp_server(), exports_mcp_server)).then(async (mcp) => {
+    mcp.startMcpServer();
+    if (process.env.CLAUDISH_STARTUP_TRACE === "1") {
+      const { finalizeStartupTrace: finalizeStartupTrace2 } = await Promise.resolve().then(() => (init_startup_trace(), exports_startup_trace));
+      finalizeStartupTrace2("mcp", { quiet: true });
+    }
+  });
 } else if (isServeCommand) {
   const serveArgIndex = args.indexOf("serve");
   Promise.resolve().then(() => (init_serve_command(), exports_serve_command)).then((m) => m.serveCommand(args.slice(serveArgIndex + 1)).catch((e) => {
@@ -76473,7 +76682,7 @@ async function runCli() {
         process.exit(1);
       }
       const mode = cliConfig.teamMode ?? "default";
-      const sessionPath = join34(process.cwd(), `.claudish-team-${Date.now()}`);
+      const sessionPath = join35(process.cwd(), `.claudish-team-${Date.now()}`);
       if (mode === "json") {
         const { setupSession: setupSession2, runModels: runModels2 } = await Promise.resolve().then(() => (init_team_orchestrator(), exports_team_orchestrator));
         setupSession2(sessionPath, cliConfig.team, prompt);
@@ -76483,7 +76692,7 @@ async function runCli() {
         });
         const result = { ...status2, responses: {} };
         for (const anonId of Object.keys(status2.models)) {
-          const responsePath = join34(sessionPath, `response-${anonId}.md`);
+          const responsePath = join35(sessionPath, `response-${anonId}.md`);
           try {
             const raw2 = readFileSync26(responsePath, "utf-8").trim();
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.32.0",
+  "version": "7.34.0",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "7.32.0",
-    "@claudish/magmux-darwin-x64": "7.32.0",
-    "@claudish/magmux-linux-arm64": "7.32.0",
-    "@claudish/magmux-linux-x64": "7.32.0"
+    "@claudish/magmux-darwin-arm64": "7.34.0",
+    "@claudish/magmux-darwin-x64": "7.34.0",
+    "@claudish/magmux-linux-arm64": "7.34.0",
+    "@claudish/magmux-linux-x64": "7.34.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",