claudish 7.32.0 → 7.33.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.33.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]+$/;
@@ -29656,11 +29726,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 +29828,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
@@ -33319,44 +33383,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 +47299,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 +48225,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 +48266,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 +48612,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 +48828,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 +49087,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 });
@@ -76367,7 +76439,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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "7.32.0",
+  "version": "7.33.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.33.0",
+    "@claudish/magmux-darwin-x64": "7.33.0",
+    "@claudish/magmux-linux-arm64": "7.33.0",
+    "@claudish/magmux-linux-x64": "7.33.0"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",