claudish 7.31.0 → 7.33.0

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.31.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) => {
@@ -36651,6 +36677,7 @@ data: ${JSON.stringify(d)}
               output_tokens: state.usage?.completion_tokens || 0
             }
           });
+          behavior?.onTurnEnd?.();
           send("message_stop", { type: "message_stop" });
         }
         if (onTokenUpdate) {
@@ -36717,6 +36744,7 @@ data: ${JSON.stringify(d)}
                   });
                 }
                 if (delta.reasoning_content) {
+                  behavior?.onAssistantText?.(delta.reasoning_content, "reasoning");
                   state.lastActivity = Date.now();
                   if (!state.reasoningStarted) {
                     state.reasoningIdx = state.curIdx++;
@@ -36734,6 +36762,8 @@ data: ${JSON.stringify(d)}
                   });
                 }
                 const txt = delta.content || "";
+                if (txt)
+                  behavior?.onAssistantText?.(txt, "text");
                 log(`[Streaming] Text chunk: "${txt.substring(0, 30).replace(/\n/g, "\\n")}" (${txt.length} chars)`);
                 if (txt) {
                   state.lastActivity = Date.now();
@@ -38191,24 +38221,44 @@ function parseBehaviorConfig(raw2) {
   }
   return result.data;
 }
-function resolveSeverity(ruleId, defaultSeverity, config2) {
+function resolveSeverity(ruleId, defaultSeverity, config2, modelId) {
   const rules = config2.rules;
   if (!rules)
     return defaultSeverity;
-  const exact = rules[ruleId];
-  if (exact)
-    return exact;
+  if (modelId) {
+    const scoped = bestMatch(rules, ruleId, modelId);
+    if (scoped)
+      return scoped;
+  }
+  return bestMatch(rules, ruleId, undefined) ?? defaultSeverity;
+}
+function bestMatch(rules, ruleId, modelId) {
   let best = null;
-  for (const [pattern, severity] of Object.entries(rules)) {
-    if (!pattern.includes("*"))
+  for (const [key, severity] of Object.entries(rules)) {
+    const { model: keyModel, rule: keyRule } = parseRuleKey(key);
+    if (!scopeMatches(keyModel, modelId))
       continue;
-    if (!globMatches(pattern, ruleId))
+    if (!globMatches(keyRule, ruleId))
       continue;
-    const len = pattern.replace(/\*/g, "").length;
-    if (!best || len > best.len)
-      best = { len, severity };
+    const score = specificity(keyRule);
+    if (!best || score > best.score)
+      best = { score, severity };
   }
-  return best ? best.severity : defaultSeverity;
+  return best ? best.severity : null;
+}
+function parseRuleKey(key) {
+  const sep = key.indexOf(":");
+  if (sep <= 0 || key.startsWith("hook:"))
+    return { rule: key };
+  return { model: key.slice(0, sep), rule: key.slice(sep + 1) };
+}
+function scopeMatches(keyModel, modelId) {
+  if (modelId === undefined)
+    return keyModel === undefined;
+  return keyModel !== undefined && globMatches(keyModel, modelId);
+}
+function specificity(pattern) {
+  return pattern.includes("*") ? pattern.replace(/\*/g, "").length : Number.MAX_SAFE_INTEGER;
 }
 function globMatches(pattern, value) {
   const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
@@ -38235,6 +38285,41 @@ var init_config = __esm(() => {
 });
 
 // src/behavior/harness.ts
+function extractAvailableSkills(systemText) {
+  if (!systemText)
+    return [];
+  const start = SKILL_SECTION.exec(systemText);
+  if (!start)
+    return [];
+  const out = [];
+  const body = systemText.slice(start.index + start[0].length);
+  for (const line of body.split(`
+`)) {
+    const trimmed = line.trim();
+    if (!trimmed)
+      continue;
+    const m = SKILL_LINE.exec(trimmed);
+    if (!m) {
+      if (out.length > 0)
+        break;
+      continue;
+    }
+    out.push({ name: m[1], description: m[2].trim() });
+  }
+  return out;
+}
+function extractSessionId(claudeRequest) {
+  const raw2 = claudeRequest?.metadata?.user_id;
+  if (typeof raw2 !== "string")
+    return;
+  try {
+    const parsed = JSON.parse(raw2);
+    const id = parsed?.session_id;
+    return typeof id === "string" && id.length > 0 ? id : undefined;
+  } catch {
+    return;
+  }
+}
 function textOf(value) {
   if (!value)
     return "";
@@ -38286,7 +38371,7 @@ function detectHarnessFacts(claudeRequest) {
   }
   return facts;
 }
-var PLAN_PATH_PATTERNS, PLAN_MODE_HINT;
+var PLAN_PATH_PATTERNS, PLAN_MODE_HINT, SKILL_SECTION, SKILL_LINE;
 var init_harness = __esm(() => {
   PLAN_PATH_PATTERNS = [
     /You should create your plan at\s+(\S+?\.md)/,
@@ -38294,10 +38379,12 @@ var init_harness = __esm(() => {
     /Read-only except plan file\s*\(([^)]+\.md)\)/
   ];
   PLAN_MODE_HINT = /plan file|create your plan at|Plan mode is active|Plan mode still active/i;
+  SKILL_SECTION = /The following skills are available[^\n]*\n/;
+  SKILL_LINE = /^-\s+([a-z0-9][a-z0-9:_-]*):\s*(.+)$/i;
 });
 
 // src/behavior/journal.ts
-import { appendFile as appendFile2, mkdir, stat } from "fs/promises";
+import { appendFile as appendFile2, mkdir, readFile, rename, stat, writeFile } from "fs/promises";
 import { homedir as homedir18 } from "os";
 import { dirname as dirname6, join as join18 } from "path";
 function classifyPath(observed, expected) {
@@ -38313,28 +38400,46 @@ function classifyPath(observed, expected) {
 function journalPath() {
   return join18(homedir18(), ".claudish", "behavior-journal.jsonl");
 }
+async function prune(path) {
+  const content = await readFile(path, "utf8");
+  const lines = content.split(`
+`).filter(Boolean);
+  let kept = 0;
+  let firstKept = lines.length;
+  for (let i = lines.length - 1;i >= 0; i--) {
+    const cost = Buffer.byteLength(lines[i]) + 1;
+    if (kept + cost > PRUNE_TO_BYTES)
+      break;
+    kept += cost;
+    firstKept = i;
+  }
+  const survivors = lines.slice(firstKept);
+  const tmp = `${path}.pruning`;
+  await writeFile(tmp, survivors.length ? `${survivors.join(`
+`)}
+` : "");
+  await rename(tmp, path);
+  log(`[behavior:journal] pruned ${lines.length - survivors.length} of ${lines.length} entries ` + `to stay under ${Math.round(MAX_JOURNAL_BYTES / 1e6)}MB`);
+}
 async function recordDecision(entry, path = journalPath()) {
   try {
     const size = await stat(path).then((s) => s.size, () => 0);
-    if (size > MAX_JOURNAL_BYTES) {
-      if (!capWarned) {
-        capWarned = true;
-        log(`[behavior:journal] ${path} exceeded ${Math.round(MAX_JOURNAL_BYTES / 1e6)}MB \u2014 ` + "no longer recording. Archive or delete it to resume.");
-      }
-      return;
-    }
     if (size === 0)
       await mkdir(dirname6(path), { recursive: true }).catch(() => {});
+    if (size > MAX_JOURNAL_BYTES) {
+      await prune(path).catch((err) => log(`[behavior:journal] prune failed: ${err}`));
+    }
     await appendFile2(path, `${JSON.stringify(entry)}
 `);
   } catch (err) {
     log(`[behavior:journal] could not record: ${err}`);
   }
 }
-var MAX_JOURNAL_BYTES, capWarned = false;
+var MAX_JOURNAL_BYTES, PRUNE_TO_BYTES;
 var init_journal = __esm(() => {
   init_logger();
   MAX_JOURNAL_BYTES = 32 * 1024 * 1024;
+  PRUNE_TO_BYTES = Math.floor(MAX_JOURNAL_BYTES * 0.6);
 });
 
 // src/behavior/observer/digest.ts
@@ -38551,13 +38656,23 @@ class BehaviorSession {
   modelId;
   providerName;
   config;
+  engine;
   facts = { planModeActive: false };
   bufferedTools = new Set;
-  constructor(active, modelId, providerName, config2 = {}) {
+  textBuf = "";
+  reasoningBuf = "";
+  toolsCalled = [];
+  sessionId;
+  systemText = "";
+  get watchesOutput() {
+    return this.active.some((a) => typeof a.rule.onModelOutput === "function");
+  }
+  constructor(active, modelId, providerName, config2 = {}, engine = { queueCorrection() {}, drainCorrections: () => [] }) {
     this.active = active;
     this.modelId = modelId;
     this.providerName = providerName;
     this.config = config2;
+    this.engine = engine;
   }
   get observerOn() {
     return this.config.observer?.enabled === true && (this.config.observer.mode ?? "suggest") !== "off";
@@ -38591,7 +38706,26 @@ class BehaviorSession {
     if (this.active.length === 0)
       return;
     this.facts = detectHarnessFacts(claudeRequest);
+    this.sessionId = extractSessionId(claudeRequest);
+    this.systemText = typeof claudeRequest?.system === "string" ? claudeRequest.system : String(claudeRequest?.system ?? "");
+    this.facts.sessionId = this.sessionId;
+    this.facts.skills = extractAvailableSkills(this.systemText);
     this.armBuffering();
+    if (this.sessionId) {
+      for (const text of this.engine.drainCorrections(this.sessionId)) {
+        this.applyAction("behavior/pending-correction", "fix", { type: "injectSystemNote", text }, {
+          modelId: this.modelId,
+          providerName: this.providerName,
+          isNativeAnthropic: false,
+          claudeRequest,
+          claudeTools,
+          tools,
+          messages,
+          systemText: this.systemText,
+          harness: this.facts
+        });
+      }
+    }
     const ctx = {
       modelId: this.modelId,
       providerName: this.providerName,
@@ -38600,6 +38734,7 @@ class BehaviorSession {
       claudeTools,
       tools,
       messages,
+      systemText: this.systemText,
       harness: this.facts
     };
     for (const { rule, severity } of this.active) {
@@ -38619,6 +38754,66 @@ class BehaviorSession {
   interceptsTool(toolName) {
     return this.bufferedTools.has(toolName);
   }
+  observeText(text, kind = "text") {
+    if (!this.watchesOutput || !text)
+      return;
+    const buf = kind === "reasoning" ? this.reasoningBuf : this.textBuf;
+    if (buf.length >= MAX_OBSERVED_CHARS)
+      return;
+    if (kind === "reasoning")
+      this.reasoningBuf += text;
+    else
+      this.textBuf += text;
+  }
+  observeToolCall(toolName) {
+    if (!this.watchesOutput)
+      return;
+    if (this.toolsCalled.length < MAX_OBSERVED_TOOLS)
+      this.toolsCalled.push(toolName);
+  }
+  finishTurn() {
+    if (!this.watchesOutput)
+      return;
+    const ctx = {
+      modelId: this.modelId,
+      providerName: this.providerName,
+      text: this.textBuf,
+      reasoning: this.reasoningBuf,
+      toolsCalled: this.toolsCalled,
+      harness: this.facts
+    };
+    for (const { rule, severity } of this.active) {
+      if (!rule.onModelOutput)
+        continue;
+      let actions = [];
+      try {
+        actions = rule.onModelOutput(ctx) ?? [];
+      } catch (err) {
+        log(`[behavior] rule ${rule.id} onModelOutput threw: ${err}`);
+        continue;
+      }
+      for (const action of actions) {
+        if (action.type === "warn") {
+          log(`[behavior] ${rule.id} (output): ${action.message}`);
+          this.journal("model_output", "warned", { ruleId: rule.id, note: action.message });
+          continue;
+        }
+        if (action.type !== "injectSystemNote")
+          continue;
+        if (severity !== "fix") {
+          this.journal("model_output", "warned", { ruleId: rule.id, note: "correction withheld" });
+          continue;
+        }
+        if (this.sessionId)
+          this.engine.queueCorrection(this.sessionId, action.text);
+        this.journal("model_output", "matched", { ruleId: rule.id, note: "correction queued" });
+        log(`[behavior] ${rule.id} queued a correction for the next request`);
+      }
+    }
+    this.textBuf = "";
+    this.reasoningBuf = "";
+    this.toolsCalled = [];
+  }
   repairToolCall(toolName, rawArgs) {
     if (!this.bufferedTools.has(toolName))
       return null;
@@ -38786,15 +38981,32 @@ ${action.text}`;
 class BehaviorEngine {
   config;
   rules;
+  corrections = new Map;
   constructor(config2, rules) {
     this.config = config2;
     this.rules = rules;
   }
+  queueCorrection(key, text) {
+    const list = this.corrections.get(key) ?? [];
+    list.push(text);
+    this.corrections.set(key, list);
+    while (this.corrections.size > MAX_TRACKED_CONVERSATIONS) {
+      const oldest = this.corrections.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.corrections.delete(oldest);
+    }
+  }
+  drainCorrections(key) {
+    const list = this.corrections.get(key) ?? [];
+    this.corrections.delete(key);
+    return list;
+  }
   startSession(params) {
     const active = [];
     if (!params.isNativeAnthropic) {
       for (const rule of this.rules) {
-        const severity = resolveSeverity(rule.id, rule.defaultSeverity, this.config);
+        const severity = resolveSeverity(rule.id, rule.defaultSeverity, this.config, params.modelId);
         if (severity === "off")
           continue;
         let applies = false;
@@ -38811,14 +39023,16 @@ class BehaviorEngine {
     if (active.length > 0) {
       log(`[behavior] ${active.length} rule(s) active for ${params.modelId}: ` + active.map((a) => `${a.rule.id}=${a.severity}`).join(", "));
     }
-    return new BehaviorSession(active, params.modelId, params.providerName, this.config);
+    return new BehaviorSession(active, params.modelId, params.providerName, this.config, this);
   }
 }
+var MAX_OBSERVED_CHARS, MAX_OBSERVED_TOOLS = 200, MAX_TRACKED_CONVERSATIONS = 64;
 var init_engine = __esm(() => {
   init_logger();
   init_config();
   init_harness();
   init_journal();
+  MAX_OBSERVED_CHARS = 64 * 1024;
 });
 
 // src/behavior/rules/plan-mode.ts
@@ -41248,11 +41462,13 @@ data: ${JSON.stringify({
                   }
                   if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
                     const txt = data.delta.text || "";
+                    opts.onAssistantText?.(txt, "text");
                     textChunks++;
                     log(`[AnthropicSSE] Text chunk: "${txt.substring(0, 30).replace(/\n/g, "\\n")}" (${txt.length} chars)`);
                   }
                   if (data.type === "content_block_start" && data.content_block?.type === "tool_use") {
                     toolUseBlocks++;
+                    opts.onToolCallObserved?.(data.content_block.name);
                     log(`[AnthropicSSE] Tool use: ${data.content_block.name}`);
                   }
                   if (data.type === "message_delta" && data.delta?.stop_reason) {
@@ -41292,10 +41508,12 @@ data: ${JSON.stringify({
                   outputTokens = data.usage.output_tokens || outputTokens;
                 }
                 if (data.type === "content_block_delta" && data.delta?.type === "text_delta") {
+                  opts.onAssistantText?.(data.delta.text || "", "text");
                   textChunks++;
                 }
                 if (data.type === "content_block_start" && data.content_block?.type === "tool_use") {
                   toolUseBlocks++;
+                  opts.onToolCallObserved?.(data.content_block.name);
                   log(`[AnthropicSSE] Tool use: ${data.content_block.name}`);
                 }
                 if (data.type === "message_delta" && data.delta?.stop_reason) {
@@ -41306,6 +41524,7 @@ data: ${JSON.stringify({
           }
         }
         log(`[AnthropicSSE] Stream complete for ${opts.modelName}: ${totalLines} lines, ${textChunks} text chunks, ${toolUseBlocks} tool_use blocks, stop_reason=${stopReason}${filterThinking ? `, filtered ${thinkingBlocksSuppressed} thinking blocks` : ""}`);
+        opts.onTurnEnd?.();
         if (opts.onTokenUpdate) {
           opts.onTokenUpdate(inputTokens, outputTokens);
         }
@@ -41434,6 +41653,7 @@ data: ${JSON.stringify(data)}
               output_tokens: outputTokens
             }
           });
+          opts.onTurnEnd?.();
           send("message_stop", { type: "message_stop" });
         }
         if (!isClosed) {
@@ -41541,6 +41761,7 @@ data: ${JSON.stringify(data)}
                     const toolIdx = toolCalls.size;
                     const toolId = `toolu_${Date.now()}_${toolIdx}`;
                     const blockIndex = curIdx++;
+                    opts.onToolCallObserved?.(part.functionCall.name);
                     let args = JSON.stringify(part.functionCall.args || {});
                     if (opts.repairToolArgs) {
                       try {
@@ -41879,6 +42100,7 @@ data: ${JSON.stringify(data)}
                 log(`[ResponsesSSE] Event: ${event.type}`);
               }
               if (event.type === "response.output_text.delta") {
+                opts.onAssistantText?.(event.delta ?? "", "text");
                 closeReasoning();
                 if (textIdx < 0) {
                   textIdx = curIdx++;
@@ -41914,6 +42136,7 @@ data: ${JSON.stringify(data)}
                     functionCalls.set(itemId, fnCallData);
                   }
                   openToolBlocks.add(fnCallData);
+                  opts.onToolCallObserved?.(fnName);
                   if (pendingReasoning.length > 0) {
                     rememberReasoningForCall(callId, pendingReasoning);
                     pendingReasoning = [];
@@ -41926,6 +42149,7 @@ data: ${JSON.stringify(data)}
                   hasToolUse = true;
                 }
               } else if (event.type === "response.reasoning_summary_text.delta") {
+                opts.onAssistantText?.(event.delta ?? "", "reasoning");
                 const summaryIndex = typeof event.summary_index === "number" ? event.summary_index : 0;
                 if (reasoningIdx < 0) {
                   closeText();
@@ -42088,6 +42312,7 @@ data: ${JSON.stringify(data)}
         if (opts.middlewareManager) {
           await opts.middlewareManager.afterStreamComplete(opts.modelName, streamMetadata);
         }
+        opts.onTurnEnd?.();
         safeClose();
       } catch (error46) {
         if (pingInterval) {
@@ -42904,7 +43129,10 @@ class ComposedHandler {
       case "openai-sse":
         return createStreamingResponseHandler(c, response, adapter, this.bareModelName, this.middlewareManager, onTokenUpdate, claudeRequest.tools, toolNameMap, priorInputTokens, behaviorSession && {
           shouldBufferTool: (name) => behaviorSession.interceptsTool(name),
-          onToolCall: (name, argsJson) => behaviorSession.repairToolCall(name, argsJson)
+          onToolCall: (name, argsJson) => behaviorSession.repairToolCall(name, argsJson),
+          onAssistantText: (text, kind) => behaviorSession.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession.observeToolCall(name),
+          onTurnEnd: () => behaviorSession.finishTurn()
         });
       case "openai-responses-sse":
         return createResponsesStreamHandler(c, response, {
@@ -42916,7 +43144,10 @@ class ComposedHandler {
           priorInputTokens,
           middlewareManager: this.middlewareManager,
           shouldBufferTool: (name) => behaviorSession?.interceptsTool(name) ?? false,
-          onToolCall: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null
+          onToolCall: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null,
+          onAssistantText: (text, kind) => behaviorSession?.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession?.observeToolCall(name),
+          onTurnEnd: () => behaviorSession?.finishTurn()
         });
       case "anthropic-sse":
         return createAnthropicPassthroughStream(c, response, {
@@ -42924,7 +43155,10 @@ class ComposedHandler {
           onTokenUpdate,
           adapter: this.modelAdapter ?? adapter,
           shouldBufferTool: (name) => behaviorSession?.interceptsTool(name) ?? false,
-          repairToolArgs: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null
+          repairToolArgs: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null,
+          onAssistantText: (text, kind) => behaviorSession?.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession?.observeToolCall(name),
+          onTurnEnd: () => behaviorSession?.finishTurn()
         });
       case "gemini-sse": {
         const onToolCall = (toolId, name, thoughtSignature) => {
@@ -42939,6 +43173,9 @@ class ComposedHandler {
           onTokenUpdate,
           onToolCall,
           repairToolArgs: (name, argsJson) => behaviorSession?.repairToolCall(name, argsJson) ?? null,
+          onAssistantText: (text, kind) => behaviorSession?.observeText(text, kind),
+          onToolCallObserved: (name) => behaviorSession?.observeToolCall(name),
+          onTurnEnd: () => behaviorSession?.finishTurn(),
           unwrapResponse: this.options.unwrapGeminiResponse,
           priorInputTokens
         });
@@ -47062,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";
@@ -47950,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.",
@@ -47984,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
@@ -48330,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
@@ -48546,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
@@ -48805,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 });
@@ -48981,6 +49264,28 @@ Behavior rules
     console.log(`  ${dim2(`observer model: ${obs.model}`)}`);
   console.log();
 }
+function printByModel(records) {
+  const byModel = new Map;
+  for (const r of records) {
+    const m = r.model ?? "unknown";
+    const e = byModel.get(m) ?? { ok: 0, degraded: 0 };
+    if (r.outcome === "degraded")
+      e.degraded++;
+    else
+      e.ok++;
+    byModel.set(m, e);
+  }
+  if (byModel.size === 0)
+    return;
+  console.log(bold2(`  by model (degraded / ok)
+`));
+  const ranked = [...byModel.entries()].sort((a, b) => b[1].degraded - a[1].degraded || b[1].ok - a[1].ok);
+  for (const [model, v] of ranked) {
+    const flag = v.degraded > 0 ? yellow(String(v.degraded)) : dim2(String(v.degraded));
+    console.log(`    ${model.padEnd(26)} ${flag} / ${v.ok}`);
+  }
+  console.log();
+}
 function showCorpus(write, json2) {
   const result = buildCorpus({ write });
   if (json2) {
@@ -48999,25 +49304,7 @@ Behavior divergence corpus
   console.log(`  ${yellow("degraded (no plan)")}  : ${degraded.length}`);
   console.log(`  of those, a rule would have fired on ${catchable.length}
 `);
-  const byModel = new Map;
-  for (const r of result.records) {
-    const m = r.model ?? "unknown";
-    const e = byModel.get(m) ?? { ok: 0, degraded: 0 };
-    if (r.outcome === "degraded")
-      e.degraded++;
-    else
-      e.ok++;
-    byModel.set(m, e);
-  }
-  if (byModel.size > 0) {
-    console.log(bold2(`  by model (degraded / ok)
-`));
-    for (const [model, v] of [...byModel.entries()].sort((a, b) => b[1].degraded - a[1].degraded || b[1].ok - a[1].ok)) {
-      const flag = v.degraded > 0 ? yellow(String(v.degraded)) : dim2("0");
-      console.log(`    ${model.padEnd(26)} ${flag} / ${v.ok}`);
-    }
-    console.log();
-  }
+  printByModel(result.records);
   if (result.outputPath) {
     console.log(dim2(`  appended to ${result.outputPath}
 `));
@@ -49043,9 +49330,9 @@ async function behaviorCommand(argv) {
     default:
       console.error(`Unknown action "${action}".
 
-` + `Usage:
-` + `  claudish behavior rules  [--json]
-` + `  claudish behavior corpus [--write] [--json]
+Usage:
+  claudish behavior rules  [--json]
+  claudish behavior corpus [--write] [--json]
 `);
       process.exit(1);
   }
@@ -74829,9 +75116,9 @@ function managedSettingsPath() {
   }
   return "/etc/claude-code/managed-settings.json";
 }
-function managedSettingsForcesClaudeAi(readFile = readFileSync24) {
+function managedSettingsForcesClaudeAi(readFile2 = readFileSync24) {
   try {
-    const raw2 = readFile(managedSettingsPath(), "utf-8");
+    const raw2 = readFile2(managedSettingsPath(), "utf-8");
     const parsed = JSON.parse(raw2);
     return parsed.forceLoginMethod === "claudeai";
   } catch {
@@ -76152,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.31.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.31.0",
-    "@claudish/magmux-darwin-x64": "7.31.0",
-    "@claudish/magmux-linux-arm64": "7.31.0",
-    "@claudish/magmux-linux-x64": "7.31.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",