claudish 7.35.0 → 7.36.0

package/dist/index.js

@@ -651,7 +651,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.35.0";
+var VERSION = "7.36.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -4611,9 +4611,12 @@ var OP_REF_RE, opHydratedVars, opSourceFailures, ENV_VAR_NAME_RE, sdkClientCache
   } catch {
     return false;
   }
-}, screenLockProbe, defaultAppLockProbe = () => false, appLockProbe, defaultOpAccountLister = () => {
+}, screenLockProbe, defaultAppLockProbe = () => false, appLockProbe, OP_PROBE_TIMEOUT_MS = 5000, defaultOpAccountLister = () => {
   try {
-    const res = spawnSync("op", ["account", "list", "--format=json"], { encoding: "utf-8" });
+    const res = spawnSync("op", ["account", "list", "--format=json"], {
+      encoding: "utf-8",
+      timeout: OP_PROBE_TIMEOUT_MS
+    });
     if (res.error || res.status !== 0)
       return null;
     const parsed = JSON.parse(res.stdout ?? "");
@@ -4639,7 +4642,10 @@ var OP_REF_RE, opHydratedVars, opSourceFailures, ENV_VAR_NAME_RE, sdkClientCache
   }
 }, defaultOpDefaultAccountProbe = () => {
   try {
-    const res = spawnSync("op", ["account", "get", "--format=json"], { encoding: "utf-8" });
+    const res = spawnSync("op", ["account", "get", "--format=json"], {
+      encoding: "utf-8",
+      timeout: OP_PROBE_TIMEOUT_MS
+    });
     if (res.error || res.status !== 0)
       return null;
     const parsed = JSON.parse(res.stdout ?? "");
@@ -29562,7 +29568,7 @@ class AntigravityProviderTransport {
     const servesClause = served.length > 0 ? `That tier currently serves: ${served.join(", ")}. ` : "";
     const tier = this._displayName || "Antigravity";
     const reason = capacityFallbacksExhausted ? `${this.modelName} could not be served after every Antigravity capacity fallback failed (${tier}, via ag@). ` + servesClause : `${this.modelName} is not served by your Antigravity tier (${tier}, via ag@). ` + servesClause;
-    const message = reason + `To use ${this.modelName}, go through the direct Gemini API instead \u2014 ` + `set GEMINI_API_KEY (get one at https://aistudio.google.com/app/apikey) and run ` + `google@${this.modelName}.`;
+    const message = reason + `To use ${this.modelName}, go through the direct Gemini API instead \u2014 ` + "set GEMINI_API_KEY (get one at https://aistudio.google.com/app/apikey) and run " + `google@${this.modelName}.`;
     const list = served.join(", ");
     const body = JSON.stringify({
       error: { code: 404, status: "NOT_FOUND", message }
@@ -29618,8 +29624,8 @@ ${lines.join(`
 }
 var CODE_ASSIST_BASE = "https://cloudcode-pa.googleapis.com", CODE_ASSIST_ENDPOINT, MAX_RETRY_ATTEMPTS = 3, DEFAULT_RATE_LIMIT_DELAY_MS = 1e4, REASONING_TIER_RANK;
 var init_antigravity = __esm(() => {
-  init_authority();
   init_antigravity_token();
+  init_authority();
   init_gemini_oauth();
   init_gemini_queue();
   init_logger();
@@ -32394,10 +32400,10 @@ var API_KEY_INFO, PROVIDER_DISPLAY_NAMES;
 var init_provider_resolver = __esm(() => {
   init_authority();
   init_model_parser();
+  init_onepassword();
   init_provider_definitions();
   init_provider_registry();
   init_remote_provider_registry();
-  init_onepassword();
   init_routing_hints();
   init_routing_rules();
   API_KEY_INFO = new Proxy({}, {
@@ -37352,10 +37358,24 @@ var init_glm_model_dialect = __esm(() => {
     }
     applyNativeReasoning(request, originalRequest) {
       const effort = this.resolveEffortLevel(originalRequest);
-      if (effort && this.isHybridThinkingModel()) {
-        const type = effort === "none" || effort === "minimal" ? "disabled" : "enabled";
-        request.thinking = { type };
-        log(`[GLMModelDialect] effort ${effort} -> thinking.type: ${type} for ${this.modelId}`);
+      const reasoning = this.lookupReasoningCapability();
+      if (effort && this.acceptsThinkingToggle(reasoning)) {
+        if (effort === "none" || effort === "minimal") {
+          request.thinking = { type: "disabled" };
+          if (request.reasoning_effort !== undefined)
+            delete request.reasoning_effort;
+          log(`[GLMModelDialect] effort ${effort} -> thinking.type: disabled for ${this.modelId}`);
+          return request;
+        }
+        request.thinking = { type: "enabled" };
+        if (reasoning?.control === "effort" && reasoning.efforts?.length) {
+          const level = this.clampToAdvertisedEffort(effort, reasoning);
+          if (level)
+            request.reasoning_effort = level;
+          log(`[GLMModelDialect] effort ${effort} -> thinking: enabled, reasoning_effort: ${level ?? "(none advertised)"} for ${this.modelId} (advertised: ${reasoning.efforts.join("/")})`);
+          return request;
+        }
+        log(`[GLMModelDialect] effort ${effort} -> thinking.type: enabled for ${this.modelId}`);
         return request;
       }
       if (request.thinking) {
@@ -37364,9 +37384,19 @@ var init_glm_model_dialect = __esm(() => {
       }
       return request;
     }
-    isHybridThinkingModel() {
-      const model = this.modelId.toLowerCase();
-      return /glm-4\.[56]/.test(model);
+    acceptsThinkingToggle(reasoning) {
+      if (reasoning)
+        return reasoning.supported !== false;
+      return this.looksLikeThinkingCapableGlm();
+    }
+    looksLikeThinkingCapableGlm() {
+      const bare = this.modelId.toLowerCase().split("/").pop() ?? "";
+      const match2 = /^glm-(\d+)(?:\.(\d+))?/.exec(bare);
+      if (!match2)
+        return false;
+      const major = Number(match2[1]);
+      const minor = match2[2] === undefined ? 0 : Number(match2[2]);
+      return major > 4 || major === 4 && minor >= 5;
     }
     shouldHandle(modelId) {
       return matchesModelFamily(modelId, "glm-") || matchesModelFamily(modelId, "chatglm-") || modelId.toLowerCase().includes("zhipu/");
@@ -38163,6 +38193,79 @@ ${text}`;
   };
 });
 
+// src/behavior/hooks.ts
+import { isAbsolute, resolve } from "path";
+function isBehaviorRule(value) {
+  return !!value && typeof value === "object" && typeof value.id === "string" && value.id.length > 0 && typeof value.appliesTo === "function" && (value.onRequest === undefined || typeof value.onRequest === "function") && (value.onToolCall === undefined || typeof value.onToolCall === "function");
+}
+function collectRules(mod) {
+  const found = [];
+  const consider = (v) => {
+    if (Array.isArray(v))
+      v.forEach(consider);
+    else if (isBehaviorRule(v))
+      found.push(v);
+  };
+  consider(mod?.default);
+  consider(mod?.rules);
+  for (const [key, value] of Object.entries(mod ?? {})) {
+    if (key === "default" || key === "rules")
+      continue;
+    consider(value);
+  }
+  return [...new Set(found)];
+}
+function shortName(path) {
+  const base = path.split("/").pop() ?? path;
+  return base.replace(/\.[cm]?[jt]s$/, "");
+}
+async function loadHookRules(paths, cwd = process.cwd()) {
+  if (!paths?.length)
+    return [];
+  const loaded = [];
+  const seen = new Set;
+  for (const raw2 of paths) {
+    const abs = isAbsolute(raw2) ? raw2 : resolve(cwd, raw2);
+    const rules = await importHook(abs, raw2);
+    for (const rule of rules)
+      namespaceInto(rule, abs, seen, loaded);
+  }
+  if (loaded.length > 0) {
+    logStderr(`[behavior] Loaded ${loaded.length} hook rule(s): ${loaded.map((r) => r.id).join(", ")}`);
+  }
+  return loaded;
+}
+async function importHook(abs, raw2) {
+  let mod;
+  try {
+    mod = await import(abs);
+  } catch (err) {
+    logStderr(`[behavior] Skipping hook ${raw2}: ${err instanceof Error ? err.message : err}`);
+    return [];
+  }
+  const rules = collectRules(mod);
+  if (rules.length === 0) {
+    logStderr(`[behavior] Hook ${raw2} exported no valid BehaviorRule \u2014 skipped`);
+  }
+  return rules;
+}
+function namespaceInto(rule, abs, seen, out) {
+  const namespaced = `hook:${shortName(abs)}/${rule.id}`;
+  if (seen.has(namespaced)) {
+    logStderr(`[behavior] Duplicate hook rule ${namespaced} \u2014 keeping the first`);
+    return;
+  }
+  seen.add(namespaced);
+  out.push({
+    ...rule,
+    id: namespaced,
+    defaultSeverity: rule.defaultSeverity ?? "warn"
+  });
+}
+var init_hooks = __esm(() => {
+  init_logger();
+});
+
 // ../../node_modules/.bun/zod@4.1.13/node_modules/zod/index.js
 var init_zod = __esm(() => {
   init_external2();
@@ -38402,6 +38505,20 @@ var init_journal = __esm(() => {
 });
 
 // src/behavior/telemetry/aggregate.ts
+var exports_aggregate = {};
+__export(exports_aggregate, {
+  spoolPendingSync: () => spoolPendingSync,
+  setTelemetryConsent: () => setTelemetryConsent,
+  setSessionContextWindow: () => setSessionContextWindow,
+  resetTelemetryState: () => resetTelemetryState,
+  recordTelemetryTurn: () => recordTelemetryTurn,
+  recordTelemetryDecision: () => recordTelemetryDecision,
+  pendingReports: () => pendingReports,
+  outboxPath: () => outboxPath,
+  contextFillPct: () => contextFillPct,
+  contextBucket: () => contextBucket,
+  TELEMETRY_SCHEMA_VERSION: () => TELEMETRY_SCHEMA_VERSION
+});
 import { createHash as createHash4, randomBytes as randomBytes4 } from "crypto";
 import { appendFileSync as appendFileSync3, mkdirSync as mkdirSync9 } from "fs";
 import { homedir as homedir19 } from "os";
@@ -38417,6 +38534,14 @@ function contextBucket(inputTokens) {
     return "150-200k";
   return "200k+";
 }
+function setSessionContextWindow(tokens) {
+  enforcedContextWindow = tokens > 0 ? tokens : 0;
+}
+function contextFillPct(peakTokens, window2 = enforcedContextWindow) {
+  if (!(window2 > 0) || !(peakTokens > 0))
+    return;
+  return Math.min(100, Math.max(0, Math.round(peakTokens / window2 * 100)));
+}
 function hashSessionId(rawSessionId, model) {
   return createHash4("sha256").update(`${SESSION_SALT}:${rawSessionId}:${model}`).digest("hex");
 }
@@ -38426,6 +38551,10 @@ function setTelemetryConsent(value) {
 function enabled() {
   return consent;
 }
+function resetTelemetryState() {
+  consent = false;
+  sessions.clear();
+}
 function stateFor(rawSessionId, model, provider) {
   const key = `${rawSessionId}|${model}`;
   let state = sessions.get(key);
@@ -38500,6 +38629,9 @@ function toReport(state) {
     model_id: state.model,
     provider_name: state.provider,
     context_bucket: contextBucket(state.maxInputTokens),
+    ...contextFillPct(state.maxInputTokens) !== undefined && {
+      context_fill_pct: contextFillPct(state.maxInputTokens)
+    },
     turns: state.turns,
     decisions: [...state.decisions.values()]
   };
@@ -38528,7 +38660,7 @@ function spoolPendingSync(path = outboxPath()) {
     return 0;
   }
 }
-var TELEMETRY_SCHEMA_VERSION = 1, SESSION_SALT, MAX_TRACKED_SESSIONS = 32, MAX_DECISION_KEYS = 200, sessions, consent = false;
+var TELEMETRY_SCHEMA_VERSION = 1, enforcedContextWindow = 0, SESSION_SALT, MAX_TRACKED_SESSIONS = 32, MAX_DECISION_KEYS = 200, sessions, consent = false;
 var init_aggregate = __esm(() => {
   init_logger();
   SESSION_SALT = randomBytes4(32).toString("hex");
@@ -38756,7 +38888,7 @@ __export(exports_upload, {
 });
 import { readFile as readFile2, rename as rename2, unlink, writeFile as writeFile2 } from "fs/promises";
 function sleep2(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 async function post(report) {
   const controller = new AbortController;
@@ -39317,79 +39449,6 @@ Do not invent a different filename, and do not derive one from the task. Claude
   PLAN_MODE_RULES = [planFilePathRule];
 });
 
-// src/behavior/hooks.ts
-import { isAbsolute, resolve } from "path";
-function isBehaviorRule(value) {
-  return !!value && typeof value === "object" && typeof value.id === "string" && value.id.length > 0 && typeof value.appliesTo === "function" && (value.onRequest === undefined || typeof value.onRequest === "function") && (value.onToolCall === undefined || typeof value.onToolCall === "function");
-}
-function collectRules(mod) {
-  const found = [];
-  const consider = (v) => {
-    if (Array.isArray(v))
-      v.forEach(consider);
-    else if (isBehaviorRule(v))
-      found.push(v);
-  };
-  consider(mod?.default);
-  consider(mod?.rules);
-  for (const [key, value] of Object.entries(mod ?? {})) {
-    if (key === "default" || key === "rules")
-      continue;
-    consider(value);
-  }
-  return [...new Set(found)];
-}
-function shortName(path) {
-  const base = path.split("/").pop() ?? path;
-  return base.replace(/\.[cm]?[jt]s$/, "");
-}
-async function loadHookRules(paths, cwd = process.cwd()) {
-  if (!paths?.length)
-    return [];
-  const loaded = [];
-  const seen = new Set;
-  for (const raw2 of paths) {
-    const abs = isAbsolute(raw2) ? raw2 : resolve(cwd, raw2);
-    const rules = await importHook(abs, raw2);
-    for (const rule of rules)
-      namespaceInto(rule, abs, seen, loaded);
-  }
-  if (loaded.length > 0) {
-    logStderr(`[behavior] Loaded ${loaded.length} hook rule(s): ${loaded.map((r) => r.id).join(", ")}`);
-  }
-  return loaded;
-}
-async function importHook(abs, raw2) {
-  let mod;
-  try {
-    mod = await import(abs);
-  } catch (err) {
-    logStderr(`[behavior] Skipping hook ${raw2}: ${err instanceof Error ? err.message : err}`);
-    return [];
-  }
-  const rules = collectRules(mod);
-  if (rules.length === 0) {
-    logStderr(`[behavior] Hook ${raw2} exported no valid BehaviorRule \u2014 skipped`);
-  }
-  return rules;
-}
-function namespaceInto(rule, abs, seen, out) {
-  const namespaced = `hook:${shortName(abs)}/${rule.id}`;
-  if (seen.has(namespaced)) {
-    logStderr(`[behavior] Duplicate hook rule ${namespaced} \u2014 keeping the first`);
-    return;
-  }
-  seen.add(namespaced);
-  out.push({
-    ...rule,
-    id: namespaced,
-    defaultSeverity: rule.defaultSeverity ?? "warn"
-  });
-}
-var init_hooks = __esm(() => {
-  init_logger();
-});
-
 // src/behavior/observer/corpus.ts
 import { appendFileSync as appendFileSync4, readFileSync as readFileSync12, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
 import { homedir as homedir21 } from "os";
@@ -43482,8 +43541,9 @@ function getRecoveryHint(status, errorText, providerName) {
 var STREAM_RETRY_DELAYS_MS;
 var init_composed_handler = __esm(() => {
   init_dialect_manager();
-  init_logger();
+  init_model_catalog();
   init_behavior();
+  init_logger();
   init_middleware();
   init_openai();
   init_vision_proxy();
@@ -43498,7 +43558,6 @@ var init_composed_handler = __esm(() => {
   init_anthropic_sse();
   init_gemini_sse();
   init_ollama_jsonl();
-  init_model_catalog();
   init_openai_responses_sse();
   init_openai_sse();
   init_token_tracker();
@@ -44521,7 +44580,7 @@ function readContextWindow(row) {
 }
 function readCreatedDate(row) {
   const raw2 = row.created;
-  const seconds = typeof raw2 === "number" ? raw2 : typeof raw2 === "string" ? Number(raw2) : NaN;
+  const seconds = typeof raw2 === "number" ? raw2 : typeof raw2 === "string" ? Number(raw2) : Number.NaN;
   if (!Number.isFinite(seconds))
     return;
   if (seconds < MIN_CREATED_SECONDS || seconds > MAX_CREATED_SECONDS)
@@ -45812,7 +45871,7 @@ class GeminiCodeAssistProviderTransport {
     const list = served.join(", ");
     const tier = this._displayName || "Gemini Code Assist";
     const reason = capacityFallbacksExhausted ? `${this.modelName} could not be served after every Gemini Code Assist capacity fallback failed (${tier}, via go@). ` + `That tier currently reports: ${list}. ` : `${this.modelName} is not served by your Gemini Code Assist tier (${tier}, via go@). ` + `That tier currently serves: ${list}. `;
-    const message = reason + `To use ${this.modelName}, go through the direct Gemini API instead \u2014 ` + `set GEMINI_API_KEY (get one at https://aistudio.google.com/app/apikey) and run ` + `google@${this.modelName}.`;
+    const message = reason + `To use ${this.modelName}, go through the direct Gemini API instead \u2014 ` + "set GEMINI_API_KEY (get one at https://aistudio.google.com/app/apikey) and run " + `google@${this.modelName}.`;
     const body = JSON.stringify({
       error: { code: 404, status: "NOT_FOUND", message }
     });
@@ -47500,6 +47559,8 @@ var init_proxy_server = __esm(() => {
   init_local_adapter();
   init_openrouter_api_format();
   init_authority();
+  init_hooks();
+  init_behavior();
   init_composed_handler();
   init_fallback_handler();
   init_native_handler();
@@ -47508,8 +47569,6 @@ var init_proxy_server = __esm(() => {
   init_model_loader();
   init_profile_config();
   init_api_key_map();
-  init_behavior();
-  init_hooks();
   init_custom_endpoints_loader();
   init_model_catalog_resolver();
   init_model_parser();
@@ -47776,7 +47835,7 @@ function classifyRunOutput(opts) {
   if (bgCeiling) {
     return {
       reason: "background_task_ceiling",
-      detail: `Claude Code terminated the turn after ${bgCeiling[1]}s waiting on background tasks, ` + `flushing only partial output. Set CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS=0 in the child ` + `environment to wait indefinitely, or tell the model not to spawn background work.`
+      detail: `Claude Code terminated the turn after ${bgCeiling[1]}s waiting on background tasks, ` + "flushing only partial output. Set CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS=0 in the child " + "environment to wait indefinitely, or tell the model not to spawn background work."
     };
   }
   const tailIsWholeOutput = outputSize <= STDOUT_TAIL_LIMIT;
@@ -48046,7 +48105,7 @@ async function runModels(sessionPath, opts = {}) {
             const stderr = rt?.getStderr() ?? "";
             const stdoutTail = rt?.getStdoutTail() ?? "";
             const bytes = rt?.getByteCount() ?? 0;
-            const detail = `Killed by the orchestrator after ${timeoutMs / 1000}s with ${bytes} B of stdout. ` + `In --quiet print mode the child emits its answer only at the end, so 0 B means ` + `"did not finish", not "produced nothing".`;
+            const detail = `Killed by the orchestrator after ${timeoutMs / 1000}s with ${bytes} B of stdout. ` + "In --quiet print mode the child emits its answer only at the end, so 0 B means " + `"did not finish", not "produced nothing".`;
             if (rt)
               persistErrorLog(rt.errorLogPath, `TIMEOUT: ${detail}`, stderr, stdoutTail);
             updateModelStatus(id, {
@@ -48446,7 +48505,7 @@ function formatTeamResult(status, sessionPath) {
       }
     }
     lines.push("actions:");
-    lines.push(`  full stderr/stdout for one failure  \u2192 Read the evidence path above`);
+    lines.push("  full stderr/stdout for one failure  \u2192 Read the evidence path above");
     lines.push(`  machine-readable status             \u2192 team(mode="status", path="${sessionPath}")`);
     lines.push(`  report a provider bug               \u2192 report_error(session_path="${sessionPath}")`);
   }
@@ -49731,8 +49790,8 @@ function maskKey2(key) {
 }
 var SKIP, PROVIDERS;
 var init_providers = __esm(() => {
-  init_source();
   init_antigravity_token();
+  init_source();
   init_oauth_registry();
   init_provider_definitions();
   SKIP = new Set(["qwen", "native-anthropic"]);
@@ -76065,6 +76124,10 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup) {
       const realWindow = await computeMainThreadContextWindow(config3);
       const contextEnv = resolveContextWindowEnv(realWindow, process.env);
       Object.assign(env, contextEnv.vars);
+      try {
+        const { setSessionContextWindow: setSessionContextWindow2 } = await Promise.resolve().then(() => (init_aggregate(), exports_aggregate));
+        setSessionContextWindow2(realWindow);
+      } catch {}
       if (contextEnv.notice && !config3.quiet) {
         console.error(contextEnv.notice);
       }
@@ -76123,7 +76186,7 @@ Or set CLAUDE_PATH to your custom installation:`);
       ttyFd = undefined;
     }
   } else if (config3.interactive && !process.stdout.isTTY && !process.stdin.isTTY) {
-    console.error("[claudish] An interactive session was requested but no terminal is attached " + "(stdin and stdout are both non-TTY). Pass a prompt argument, or use --stdin / -p " + "for non-interactive mode.");
+    console.error("[claudish] An interactive session was requested but no terminal is attached (stdin and stdout are both non-TTY). Pass a prompt argument, or use --stdin / -p for non-interactive mode.");
   }
   const stdio = ttyFd !== undefined ? [0, ttyFd, ttyFd] : "inherit";
   const proc = spawn4(spawnCommand, claudeArgs, {

package/package.json

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