claudish 7.67.1 → 8.1.0

package/dist/index.js

@@ -731,7 +731,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "7.67.1";
+var VERSION = "8.1.0";
 
 // src/logger.ts
 var exports_logger = {};
@@ -27458,6 +27458,271 @@ var init_stdio2 = __esm(() => {
   init_stdio();
 });
 
+// src/providers/all-models-cache.ts
+import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname4, join as join7 } from "path";
+function readAllModelsCache(path = ALL_MODELS_CACHE_PATH) {
+  if (!existsSync5(path))
+    return null;
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync5(path, "utf-8"));
+  } catch {
+    return null;
+  }
+  if (!raw || typeof raw !== "object")
+    return null;
+  const data = raw;
+  const lastUpdated = typeof data.lastUpdated === "string" ? data.lastUpdated : new Date(0).toISOString();
+  const models = Array.isArray(data.models) ? data.models : [];
+  const entries = Array.isArray(data.entries) ? data.entries : [];
+  return {
+    version: 2,
+    lastUpdated,
+    entries,
+    models
+  };
+}
+function writeAllModelsCache(data, path = ALL_MODELS_CACHE_PATH) {
+  const existing = readAllModelsCache(path);
+  const merged = {
+    version: 2,
+    lastUpdated: data.lastUpdated ?? new Date().toISOString(),
+    entries: data.entries ?? existing?.entries ?? [],
+    models: data.models ?? existing?.models ?? []
+  };
+  mkdirSync5(dirname4(path), { recursive: true });
+  writeFileSync5(path, JSON.stringify(merged), "utf-8");
+}
+var ALL_MODELS_CACHE_PATH;
+var init_all_models_cache = __esm(() => {
+  ALL_MODELS_CACHE_PATH = join7(homedir7(), ".claudish", "all-models.json");
+});
+
+// src/providers/model-ordering.ts
+function extractVersionParts(modelId) {
+  const tokens = modelId.toLowerCase().split(/[\/_-]+/);
+  let started = false;
+  const parts = [];
+  for (const token of tokens) {
+    const match = token.match(/\d+(?:\.\d+)*/);
+    if (!match) {
+      if (started)
+        break;
+      continue;
+    }
+    if (!started && /^\d+b$/.test(token) && Number.parseInt(match[0], 10) > 10) {
+      continue;
+    }
+    if (!started) {
+      started = true;
+      for (const part of match[0].split(".")) {
+        parts.push(Number.parseInt(part, 10));
+      }
+      if (!/^\d+(?:\.\d+)*$/.test(token)) {
+        break;
+      }
+      continue;
+    }
+    if (!/^\d{1,2}(?:\.\d+)?$/.test(token)) {
+      break;
+    }
+    for (const part of token.split(".")) {
+      parts.push(Number.parseInt(part, 10));
+    }
+  }
+  return parts;
+}
+function compareVersionPartsDesc(a, b) {
+  const maxLength = Math.max(a.length, b.length);
+  for (let i = 0;i < maxLength; i++) {
+    const aPart = a[i] ?? -1;
+    const bPart = b[i] ?? -1;
+    if (aPart !== bPart) {
+      return bPart - aPart;
+    }
+  }
+  return 0;
+}
+function compareByReleaseDateDesc(a, b) {
+  const aReleaseRaw = a.releaseDate ? Date.parse(a.releaseDate) : 0;
+  const bReleaseRaw = b.releaseDate ? Date.parse(b.releaseDate) : 0;
+  const aRelease = Number.isNaN(aReleaseRaw) ? 0 : aReleaseRaw;
+  const bRelease = Number.isNaN(bReleaseRaw) ? 0 : bReleaseRaw;
+  if (aRelease !== bRelease) {
+    return bRelease - aRelease;
+  }
+  const aId = a.id ?? a.modelId ?? "";
+  const bId = b.id ?? b.modelId ?? "";
+  const versionCompare = compareVersionPartsDesc(extractVersionParts(aId), extractVersionParts(bId));
+  if (versionCompare !== 0) {
+    return versionCompare;
+  }
+  return aId.localeCompare(bId);
+}
+
+// src/adapters/model-catalog.ts
+function lookupModel(modelId, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry || entry.contextWindow === undefined)
+    return;
+  return {
+    modelId: entry.modelId,
+    contextWindow: entry.contextWindow,
+    supportsVision: entry.supportsVision,
+    releaseDate: entry.releaseDate
+  };
+}
+function lookupModelReasoning(modelId, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.reasoning;
+}
+function lookupModelTokenParam(modelId, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.tokenParam;
+}
+function lookupRouteReasoningMode(modelId, provider, cachePath) {
+  return findCacheEntry(modelId, cachePath)?.aggregators?.find((aggregator) => aggregator.provider === provider)?.reasoning?.mode;
+}
+function lookupFamilyDefaultVariant(familyId, provider, cachePath) {
+  const cache = readAllModelsCache(cachePath);
+  if (!cache)
+    return;
+  for (const entry of cache.entries) {
+    const rv = entry.routeVariant;
+    if (!rv?.isDefault)
+      continue;
+    if (rv.provider !== provider)
+      continue;
+    if (rv.familyId === familyId || rv.baseModelId === familyId)
+      return entry.modelId;
+  }
+  return;
+}
+function lookupVariantPresets(baseModelId, provider, cachePath) {
+  const cache = readAllModelsCache(cachePath);
+  if (!cache)
+    return [];
+  const wanted = stripVendorPrefix(baseModelId.toLowerCase());
+  const found = [];
+  for (const entry of cache.entries) {
+    const rv = entry.routeVariant;
+    if (!rv?.preset || !rv.baseModelId)
+      continue;
+    if (stripVendorPrefix(rv.baseModelId.toLowerCase()) !== wanted)
+      continue;
+    if (provider !== undefined && rv.provider !== provider)
+      continue;
+    found.push({ modelId: entry.modelId, preset: rv.preset, provider: rv.provider });
+  }
+  return found;
+}
+function lookupModelCapabilities(modelId, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry)
+    return;
+  return { supportsTools: entry.supportsTools, supportsThinking: entry.supportsThinking };
+}
+function lookupModelForProvider(modelId, provider, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry)
+    return;
+  return entry.aggregators?.find((a) => a.provider === provider)?.contextWindow ?? entry.contextWindow;
+}
+function resolveSubscriptionRouting(modelId, provider, cachePath) {
+  const entry = findCacheEntry(modelId, cachePath);
+  if (!entry)
+    return { kind: "unknown" };
+  if (entry.subscriptionPlans?.includes(provider)) {
+    const agg = entry.aggregators?.find((a) => a.provider === provider);
+    return agg?.externalId ? { kind: "serves", externalId: agg.externalId } : { kind: "unknown" };
+  }
+  return isSubscriptionPlan(provider, cachePath) ? { kind: "not-served" } : { kind: "unknown" };
+}
+function isSubscriptionPlan(provider, cachePath) {
+  const cache = readAllModelsCache(cachePath);
+  if (!cache)
+    return false;
+  return cache.entries.some((e) => e.subscriptionPlans?.includes(provider));
+}
+function stripVendorPrefix(lowerId) {
+  return lowerId.includes("/") ? lowerId.substring(lowerId.lastIndexOf("/") + 1) : lowerId;
+}
+function findCacheEntry(modelId, cachePath) {
+  if (modelId.includes("@")) {
+    throw new Error(`model-catalog lookup received provider-routed ID "${modelId}" \u2014 callers must strip the "@" prefix before calling`);
+  }
+  const cache = readAllModelsCache(cachePath);
+  if (!cache || cache.entries.length === 0)
+    return;
+  const lower = modelId.toLowerCase();
+  const unprefixed = stripVendorPrefix(lower);
+  for (const entry of cache.entries) {
+    const entryId = entry.modelId.toLowerCase();
+    const exactMatch = entryId === unprefixed || entryId === lower;
+    const aliasMatch = entry.aliases?.some((a) => a.toLowerCase() === unprefixed || a.toLowerCase() === lower);
+    if (exactMatch || aliasMatch) {
+      return entry;
+    }
+  }
+  return;
+}
+function classifyCatalogHit(entry, q) {
+  const id = entry.modelId.toLowerCase();
+  if (id === q || stripVendorPrefix(id) === q)
+    return { bucket: "exact" };
+  const aliases = entry.aliases ?? [];
+  const exactAlias = aliases.find((a) => a.toLowerCase() === q || stripVendorPrefix(a.toLowerCase()) === q);
+  if (exactAlias)
+    return { bucket: "exact", matchedAlias: exactAlias };
+  if (id.includes(q))
+    return { bucket: "id" };
+  const partialAlias = aliases.find((a) => a.toLowerCase().includes(q));
+  return partialAlias ? { bucket: "alias", matchedAlias: partialAlias } : undefined;
+}
+function searchCatalogModels(query, limit = 10, cachePath) {
+  const q = query.trim().toLowerCase();
+  if (!q)
+    return [];
+  const cache = readAllModelsCache(cachePath);
+  if (!cache || cache.entries.length === 0)
+    return [];
+  const exact = [];
+  const idPartial = [];
+  const aliasPartial = [];
+  for (const entry of cache.entries) {
+    const hit = classifyCatalogHit(entry, q);
+    if (!hit)
+      continue;
+    const ranked = {
+      entry,
+      match: {
+        modelId: entry.modelId,
+        aliases: entry.aliases ?? [],
+        subscriptionPlans: entry.subscriptionPlans ?? [],
+        ...hit.matchedAlias ? { matchedAlias: hit.matchedAlias } : {}
+      }
+    };
+    if (hit.bucket === "exact")
+      exact.push(ranked);
+    else if (hit.bucket === "id")
+      idPartial.push(ranked);
+    else
+      aliasPartial.push(ranked);
+  }
+  const byRelevance = (a, b) => {
+    const lengthDelta = a.entry.modelId.length - b.entry.modelId.length;
+    if (lengthDelta !== 0)
+      return lengthDelta;
+    return compareByReleaseDateDesc(a.entry, b.entry);
+  };
+  idPartial.sort(byRelevance);
+  aliasPartial.sort(byRelevance);
+  return [...exact, ...idPartial, ...aliasPartial].slice(0, limit).map((r) => r.match);
+}
+var init_model_catalog = __esm(() => {
+  init_all_models_cache();
+});
+
 // src/agent-availability.ts
 import { spawn } from "child_process";
 function parseAvailableAgents(output) {
@@ -27574,26 +27839,26 @@ __export(exports_profile_config, {
   setKeychainEnabled: () => setKeychainEnabled,
   setProfile: () => setProfile
 });
-import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync5 } from "fs";
-import { homedir as homedir7 } from "os";
-import { dirname as dirname4, join as join7, parse as parse6 } from "path";
+import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
+import { homedir as homedir8 } from "os";
+import { dirname as dirname5, join as join8, parse as parse6 } from "path";
 function activeConfigFile() {
   return activeGlobalConfigFile(CONFIG_FILE);
 }
 function ensureConfigDir() {
-  if (!existsSync5(CONFIG_DIR)) {
-    mkdirSync5(CONFIG_DIR, { recursive: true });
+  if (!existsSync6(CONFIG_DIR)) {
+    mkdirSync6(CONFIG_DIR, { recursive: true });
   }
 }
 function loadConfig() {
   const activeFile = activeConfigFile();
   if (!getConfigFileOverride())
     ensureConfigDir();
-  if (!existsSync5(activeFile)) {
+  if (!existsSync6(activeFile)) {
     return { ...DEFAULT_CONFIG };
   }
   try {
-    const content = readFileSync5(activeFile, "utf-8");
+    const content = readFileSync6(activeFile, "utf-8");
     const config2 = JSON.parse(content);
     const merged = {
       version: config2.version || DEFAULT_CONFIG.version,
@@ -27663,39 +27928,39 @@ function loadConfig() {
 function saveConfig(config2) {
   if (!getConfigFileOverride())
     ensureConfigDir();
-  writeFileSync5(activeConfigFile(), JSON.stringify(config2, null, 2), "utf-8");
+  writeFileSync6(activeConfigFile(), JSON.stringify(config2, null, 2), "utf-8");
 }
 function configExists() {
-  return existsSync5(CONFIG_FILE);
+  return existsSync6(CONFIG_FILE);
 }
 function getConfigPath() {
   return CONFIG_FILE;
 }
 function getLocalConfigPath() {
-  const home = homedir7();
+  const home = homedir8();
   let dir = process.cwd();
   const root = parse6(dir).root;
   while (dir !== root && dir !== home) {
-    const candidate = join7(dir, LOCAL_CONFIG_FILENAME);
-    if (existsSync5(candidate))
+    const candidate = join8(dir, LOCAL_CONFIG_FILENAME);
+    if (existsSync6(candidate))
       return candidate;
-    if (existsSync5(join7(dir, ".git"))) {
+    if (existsSync6(join8(dir, ".git"))) {
       return candidate;
     }
-    dir = dirname4(dir);
+    dir = dirname5(dir);
   }
-  return join7(process.cwd(), LOCAL_CONFIG_FILENAME);
+  return join8(process.cwd(), LOCAL_CONFIG_FILENAME);
 }
 function localConfigExists() {
-  return existsSync5(getLocalConfigPath());
+  return existsSync6(getLocalConfigPath());
 }
 function readProOnUltracode(paths = defaultScopedConfigPaths) {
   for (const pathFn of [paths.project, paths.global]) {
     try {
       const path = pathFn();
-      if (!existsSync5(path))
+      if (!existsSync6(path))
         continue;
-      const parsed = JSON.parse(readFileSync5(path, "utf-8"));
+      const parsed = JSON.parse(readFileSync6(path, "utf-8"));
       if (typeof parsed?.proOnUltracode === "boolean")
         return parsed.proOnUltracode;
     } catch {}
@@ -27704,17 +27969,17 @@ function readProOnUltracode(paths = defaultScopedConfigPaths) {
 }
 function isProjectDirectory() {
   const cwd = process.cwd();
-  return [".git", "package.json", "Cargo.toml", "go.mod", "pyproject.toml", ".claudish.json"].some((f) => existsSync5(join7(cwd, f)));
+  return [".git", "package.json", "Cargo.toml", "go.mod", "pyproject.toml", ".claudish.json"].some((f) => existsSync6(join8(cwd, f)));
 }
 function loadLocalConfig() {
   if (getConfigFileOverride())
     return null;
   const localPath = getLocalConfigPath();
-  if (!existsSync5(localPath)) {
+  if (!existsSync6(localPath)) {
     return null;
   }
   try {
-    const content = readFileSync5(localPath, "utf-8");
+    const content = readFileSync6(localPath, "utf-8");
     const config2 = JSON.parse(content);
     return {
       ...config2,
@@ -27732,7 +27997,7 @@ function saveLocalConfig(config2) {
   if (toWrite.routing !== undefined && Object.keys(toWrite.routing).length === 0) {
     delete toWrite.routing;
   }
-  writeFileSync5(getLocalConfigPath(), JSON.stringify(toWrite, null, 2), "utf-8");
+  writeFileSync6(getLocalConfigPath(), JSON.stringify(toWrite, null, 2), "utf-8");
 }
 function loadConfigForScope(scope) {
   if (scope === "local") {
@@ -27987,8 +28252,8 @@ function disableLocalProvider(providerName) {
 }
 var CONFIG_DIR, CONFIG_FILE, LOCAL_CONFIG_FILENAME = ".claudish.json", DEFAULT_CONFIG, defaultScopedConfigPaths;
 var init_profile_config = __esm(() => {
-  CONFIG_DIR = join7(homedir7(), ".claudish");
-  CONFIG_FILE = join7(CONFIG_DIR, "config.json");
+  CONFIG_DIR = join8(homedir8(), ".claudish");
+  CONFIG_FILE = join8(CONFIG_DIR, "config.json");
   DEFAULT_CONFIG = {
     version: "1.0.0",
     defaultProfile: "default",
@@ -28095,153 +28360,6 @@ var init_remote_provider_types = __esm(() => {
   };
 });
 
-// src/providers/all-models-cache.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
-import { homedir as homedir8 } from "os";
-import { dirname as dirname5, join as join8 } from "path";
-function readAllModelsCache(path = ALL_MODELS_CACHE_PATH) {
-  if (!existsSync6(path))
-    return null;
-  let raw;
-  try {
-    raw = JSON.parse(readFileSync6(path, "utf-8"));
-  } catch {
-    return null;
-  }
-  if (!raw || typeof raw !== "object")
-    return null;
-  const data = raw;
-  const lastUpdated = typeof data.lastUpdated === "string" ? data.lastUpdated : new Date(0).toISOString();
-  const models = Array.isArray(data.models) ? data.models : [];
-  const entries = Array.isArray(data.entries) ? data.entries : [];
-  return {
-    version: 2,
-    lastUpdated,
-    entries,
-    models
-  };
-}
-function writeAllModelsCache(data, path = ALL_MODELS_CACHE_PATH) {
-  const existing = readAllModelsCache(path);
-  const merged = {
-    version: 2,
-    lastUpdated: data.lastUpdated ?? new Date().toISOString(),
-    entries: data.entries ?? existing?.entries ?? [],
-    models: data.models ?? existing?.models ?? []
-  };
-  mkdirSync6(dirname5(path), { recursive: true });
-  writeFileSync6(path, JSON.stringify(merged), "utf-8");
-}
-var ALL_MODELS_CACHE_PATH;
-var init_all_models_cache = __esm(() => {
-  ALL_MODELS_CACHE_PATH = join8(homedir8(), ".claudish", "all-models.json");
-});
-
-// src/adapters/model-catalog.ts
-function lookupModel(modelId, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry || entry.contextWindow === undefined)
-    return;
-  return {
-    modelId: entry.modelId,
-    contextWindow: entry.contextWindow,
-    supportsVision: entry.supportsVision,
-    releaseDate: entry.releaseDate
-  };
-}
-function lookupModelReasoning(modelId, cachePath) {
-  return findCacheEntry(modelId, cachePath)?.reasoning;
-}
-function lookupModelTokenParam(modelId, cachePath) {
-  return findCacheEntry(modelId, cachePath)?.tokenParam;
-}
-function lookupFamilyDefaultVariant(familyId, provider, cachePath) {
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2)
-    return;
-  for (const entry of cache2.entries) {
-    const rv = entry.routeVariant;
-    if (!rv?.isDefault)
-      continue;
-    if (rv.provider !== provider)
-      continue;
-    if (rv.familyId === familyId || rv.baseModelId === familyId)
-      return entry.modelId;
-  }
-  return;
-}
-function lookupVariantPresets(baseModelId, provider, cachePath) {
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2)
-    return [];
-  const wanted = stripVendorPrefix(baseModelId.toLowerCase());
-  const found = [];
-  for (const entry of cache2.entries) {
-    const rv = entry.routeVariant;
-    if (!rv?.preset || !rv.baseModelId)
-      continue;
-    if (stripVendorPrefix(rv.baseModelId.toLowerCase()) !== wanted)
-      continue;
-    if (provider !== undefined && rv.provider !== provider)
-      continue;
-    found.push({ modelId: entry.modelId, preset: rv.preset, provider: rv.provider });
-  }
-  return found;
-}
-function lookupModelCapabilities(modelId, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry)
-    return;
-  return { supportsTools: entry.supportsTools, supportsThinking: entry.supportsThinking };
-}
-function lookupModelForProvider(modelId, provider, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry)
-    return;
-  return entry.aggregators?.find((a) => a.provider === provider)?.contextWindow ?? entry.contextWindow;
-}
-function resolveSubscriptionRouting(modelId, provider, cachePath) {
-  const entry = findCacheEntry(modelId, cachePath);
-  if (!entry)
-    return { kind: "unknown" };
-  if (entry.subscriptionPlans?.includes(provider)) {
-    const agg = entry.aggregators?.find((a) => a.provider === provider);
-    return agg?.externalId ? { kind: "serves", externalId: agg.externalId } : { kind: "unknown" };
-  }
-  return isSubscriptionPlan(provider, cachePath) ? { kind: "not-served" } : { kind: "unknown" };
-}
-function isSubscriptionPlan(provider, cachePath) {
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2)
-    return false;
-  return cache2.entries.some((e) => e.subscriptionPlans?.includes(provider));
-}
-function stripVendorPrefix(lowerId) {
-  return lowerId.includes("/") ? lowerId.substring(lowerId.lastIndexOf("/") + 1) : lowerId;
-}
-function findCacheEntry(modelId, cachePath) {
-  if (modelId.includes("@")) {
-    throw new Error(`model-catalog lookup received provider-routed ID "${modelId}" \u2014 callers must strip the "@" prefix before calling`);
-  }
-  const cache2 = readAllModelsCache(cachePath);
-  if (!cache2 || cache2.entries.length === 0)
-    return;
-  const lower = modelId.toLowerCase();
-  const unprefixed = stripVendorPrefix(lower);
-  for (const entry of cache2.entries) {
-    const entryId = entry.modelId.toLowerCase();
-    const exactMatch = entryId === unprefixed || entryId === lower;
-    const aliasMatch = entry.aliases?.some((a) => a.toLowerCase() === unprefixed || a.toLowerCase() === lower);
-    if (exactMatch || aliasMatch) {
-      return entry;
-    }
-  }
-  return;
-}
-var init_model_catalog = __esm(() => {
-  init_all_models_cache();
-});
-
 // src/adapters/tool-name-utils.ts
 function hashToolName(name) {
   let h1 = 3735928559;
@@ -39642,6 +39760,18 @@ var init_session_events = __esm(() => {
 
 // src/session-events/pro-injection.ts
 function resolveVariantPreset(bareModelName, provider, cachePath) {
+  const routeMode = lookupRouteReasoningMode(bareModelName, provider, cachePath);
+  if (routeMode) {
+    if (routeMode.status !== "supported" || !routeMode.values.includes("pro")) {
+      return;
+    }
+    return {
+      params: { reasoning: { mode: "pro" } },
+      provider,
+      preset: "reasoning.mode=pro",
+      sourceLabel: `route capability @ ${provider}`
+    };
+  }
   for (const variant of lookupVariantPresets(bareModelName, provider, cachePath)) {
     try {
       const params = parseModelParams(variant.preset);
@@ -39649,9 +39779,9 @@ function resolveVariantPreset(bareModelName, provider, cachePath) {
         continue;
       return {
         params,
-        variantModelId: variant.modelId,
         provider: variant.provider,
-        preset: variant.preset
+        preset: variant.preset,
+        sourceLabel: `variant ${variant.modelId} @ ${variant.provider}`
       };
     } catch {}
   }
@@ -39675,7 +39805,7 @@ function applyProInjection(requestPayload, opts) {
     if (!resolved)
       return false;
     deepMergeParams(requestPayload, resolved.params);
-    log(`[SessionEvents] ultracode active \u2192 preset ${resolved.preset} for ${opts.targetModel} ` + `(catalog variant ${resolved.variantModelId} @ ${resolved.provider}, session ${opts.sessionId})`);
+    log(`[SessionEvents] ultracode active \u2192 preset ${resolved.preset} for ${opts.targetModel} ` + `(catalog ${resolved.sourceLabel}, session ${opts.sessionId})`);
     return true;
   } catch {
     return false;
@@ -48403,10 +48533,12 @@ var init_team_stream_capture = __esm(() => {
 });
 
 // src/channel/stream-json-reducer.ts
-function reachesAnswer(parsedType8, isJson) {
+function reachesAnswer(parsedType8, isJson, keepUnrecognizedJson) {
   if (!isJson)
     return true;
-  return parsedType8 !== null && STREAM_JSON_EVENT_TYPES.has(parsedType8);
+  if (parsedType8 !== null && STREAM_JSON_EVENT_TYPES.has(parsedType8))
+    return true;
+  return keepUnrecognizedJson;
 }
 function labelFor(type, subtype) {
   if (type === null)
@@ -48478,6 +48610,9 @@ class StreamJsonReducer {
   get toolUseCount() {
     return this._toolUseCount;
   }
+  get idleMs() {
+    return Math.max(0, Date.now() - this.lastFrameAt);
+  }
   get terminalReason() {
     return this._terminalReason;
   }
@@ -48570,7 +48705,7 @@ class StreamJsonReducer {
     this.opts.onSemanticLine?.(line, labelFor(type, frame ? asString(frame.subtype) : null));
     if (frame && type !== null)
       this.applyFrame(frame, type);
-    if (!reachesAnswer(type, frame !== null))
+    if (!reachesAnswer(type, frame !== null, this.opts.keepUnrecognizedJson ?? false))
       return "";
     const prose = this.capture.write(terminated ? `${line}
 ` : line);
@@ -49319,6 +49454,16 @@ function resolveClaudishSpawn(env = process.env) {
 }
 var CLAUDISH_BIN_ENV = "CLAUDISH_BIN";
 
+// src/stdio-decode.ts
+import { StringDecoder } from "string_decoder";
+function decodeChunk(decoder, chunk) {
+  return typeof chunk === "string" ? chunk : decoder.write(chunk);
+}
+function newStdioDecoder() {
+  return new StringDecoder("utf8");
+}
+var init_stdio_decode = () => {};
+
 // src/team-stats.ts
 import { existsSync as existsSync19, readFileSync as readFileSync18, writeFileSync as writeFileSync10 } from "fs";
 import { join as join28 } from "path";
@@ -49494,22 +49639,25 @@ var init_team_stats = () => {};
 var exports_team_orchestrator = {};
 __export(exports_team_orchestrator, {
   DEFAULT_MIN_OUTPUT_BYTES: () => DEFAULT_MIN_OUTPUT_BYTES,
-  DEFAULT_STALL_SECONDS: () => DEFAULT_STALL_SECONDS2,
-  DRAIN_TIMEOUT_MS: () => DRAIN_TIMEOUT_MS,
-  GRACE_INTERVAL_MS: () => GRACE_INTERVAL_MS,
   STDOUT_TAIL_LIMIT: () => STDOUT_TAIL_LIMIT,
   TEAM_CAPTURE_ENV_VAR: () => TEAM_CAPTURE_ENV_VAR,
   aggregateVerdict: () => aggregateVerdict,
   buildJudgePrompt: () => buildJudgePrompt,
+  cancelTeamRun: () => cancelTeamRun,
   classifyRunOutput: () => classifyRunOutput,
   fisherYatesShuffle: () => fisherYatesShuffle,
   getStatus: () => getStatus,
   judgeResponses: () => judgeResponses,
   meaningfulStderr: () => meaningfulStderr,
   parseJudgeVotes: () => parseJudgeVotes,
+  readTeamInputFile: () => readTeamInputFile,
   resolveCaptureMode: () => resolveCaptureMode,
   runModels: () => runModels,
   setupSession: () => setupSession,
+  shutdownAllTeamRuns: () => shutdownAllTeamRuns,
+  startModels: () => startModels,
+  teamSlotActivity: () => teamSlotActivity,
+  teamSlotIdleSeconds: () => teamSlotIdleSeconds,
   validateSessionPath: () => validateSessionPath
 });
 import { spawn as spawn2 } from "child_process";
@@ -49521,12 +49669,57 @@ import {
   readdirSync as readdirSync5,
   writeFileSync as writeFileSync11
 } from "fs";
-import { join as join29, resolve as resolve3 } from "path";
+import { basename as basename2, join as join29, resolve as resolve3 } from "path";
 function resolveCaptureMode(explicit, env = process.env) {
   if (explicit)
     return explicit;
   return env[TEAM_CAPTURE_ENV_VAR]?.trim().toLowerCase() === "print" ? "print" : "stream-json";
 }
+function teamSlotIdleSeconds(teamSessionId) {
+  const run = liveTeamRuns.get(teamSessionId);
+  if (!run)
+    return null;
+  const out = {};
+  for (const slotId of run.processes.keys()) {
+    const idle = run.idleMsFor(slotId);
+    if (idle !== null)
+      out[slotId] = Math.round(idle / 1000);
+  }
+  return out;
+}
+function teamSlotActivity(teamSessionId) {
+  const run = liveTeamRuns.get(teamSessionId);
+  if (!run)
+    return null;
+  const out = {};
+  for (const slotId of run.processes.keys()) {
+    const activity = run.activityFor(slotId);
+    if (activity !== null)
+      out[slotId] = activity;
+  }
+  return out;
+}
+async function cancelTeamRun(teamSessionId, slotId) {
+  const run = liveTeamRuns.get(teamSessionId);
+  if (!run)
+    return { found: false, cancelled: [] };
+  const targets = slotId ? run.processes.has(slotId) ? [slotId] : [] : [...run.processes.keys()];
+  const cancelled = [];
+  for (const id of targets) {
+    const proc = run.processes.get(id);
+    if (!proc)
+      continue;
+    run.cancelledSlots.add(id);
+    await terminateChildTree(proc);
+    cancelled.push(id);
+  }
+  return { found: true, cancelled };
+}
+async function shutdownAllTeamRuns() {
+  await Promise.all([...liveTeamRuns.keys()].map((id) => cancelTeamRun(id).catch(() => {
+    return;
+  })));
+}
 function classifyRunOutput(opts) {
   const {
     outputSize,
@@ -49606,6 +49799,21 @@ function validateSessionPath(sessionPath) {
   }
   return resolved;
 }
+function readTeamInputFile(inputPath) {
+  const resolved = resolve3(inputPath);
+  const cwd = process.cwd();
+  if (!resolved.startsWith(`${cwd}/`) && resolved !== cwd) {
+    throw new Error(`Input file must be within current directory: ${inputPath}`);
+  }
+  if (!existsSync20(resolved)) {
+    throw new Error(`Input file not found: ${resolved}`);
+  }
+  const text = readFileSync19(resolved, "utf-8");
+  if (text.trim().length === 0) {
+    throw new Error(`Input file is empty: ${resolved}`);
+  }
+  return text;
+}
 function setupSession(sessionPath, models, input) {
   if (models.length === 0) {
     throw new Error("At least one model is required");
@@ -49672,8 +49880,7 @@ function readFullOutputIfNeeded(opts) {
     return;
   }
 }
-async function runModels(sessionPath, opts = {}) {
-  const timeoutMs = (opts.timeout ?? 300) * 1000;
+async function startModels(sessionPath, opts = {}) {
   assertValidRequirePattern(opts.requirePattern);
   const manifest = JSON.parse(readFileSync19(join29(sessionPath, "manifest.json"), "utf-8"));
   const statusPath = join29(sessionPath, "status.json");
@@ -49719,6 +49926,7 @@ async function runModels(sessionPath, opts = {}) {
   mkdirSync11(statsDir(sessionPath), { recursive: true });
   const processes = new Map;
   const runtimes = new Map;
+  const cancelledSlots = new Set;
   const sigintHandler = () => {
     for (const [, proc] of processes) {
       signalProcessTree(proc, "SIGTERM");
@@ -49730,6 +49938,7 @@ async function runModels(sessionPath, opts = {}) {
   for (const [anonId, entry] of Object.entries(manifest.models)) {
     const outputPath = join29(sessionPath, `response-${anonId}.md`);
     const errorLogPath = join29(sessionPath, "errors", `${anonId}.log`);
+    const upstreamErrorLogPath = join29(sessionPath, "errors", `${anonId}-upstream.jsonl`);
     const spawnModel = spawnPlan.pinned.get(entry.model) ?? entry.model;
     const args = [
       "--model",
@@ -49750,21 +49959,37 @@ async function runModels(sessionPath, opts = {}) {
       detached: KILL_PROCESS_GROUP,
       env: {
         ...process.env,
-        CLAUDISH_TOKEN_FILE: tokenFileFor(sessionPath, anonId)
+        [ENV.CLAUDISH_TOKEN_FILE]: tokenFileFor(sessionPath, anonId),
+        [UPSTREAM_ERROR_LOG_ENV]: upstreamErrorLogPath
       }
     });
+    let lastOutputAt = Date.now();
+    const stampLiveness = () => {
+      lastOutputAt = Date.now();
+    };
+    const stdoutDecoder = newStdioDecoder();
+    const stderrDecoder = newStdioDecoder();
+    proc.stdout?.on("data", stampLiveness);
+    proc.stderr?.on("data", stampLiveness);
     let byteCount = 0;
     let stdoutTail = "";
     const outputStream = createWriteStream(outputPath);
     let flushPartial = () => {};
+    let reducer = null;
     if (captureMode === "print") {
       proc.stdout?.on("data", (chunk) => {
         byteCount += chunk.length;
-        stdoutTail = (stdoutTail + chunk.toString()).slice(-STDOUT_TAIL_LIMIT);
+        stdoutTail = (stdoutTail + decodeChunk(stdoutDecoder, chunk)).slice(-STDOUT_TAIL_LIMIT);
       });
       proc.stdout?.pipe(outputStream);
     } else {
-      const capture = createAssistantTextCapture();
+      const slotReducer = new StreamJsonReducer({
+        sessionId: anonId,
+        stallSeconds: 0,
+        keepUnrecognizedJson: true,
+        callback: () => {}
+      });
+      reducer = slotReducer;
       const absorb = (text) => {
         if (text.length === 0)
           return;
@@ -49772,14 +49997,15 @@ async function runModels(sessionPath, opts = {}) {
         stdoutTail = (stdoutTail + text).slice(-STDOUT_TAIL_LIMIT);
         outputStream.write(text);
       };
-      proc.stdout?.on("data", (chunk) => absorb(capture.write(chunk.toString())));
-      flushPartial = () => absorb(capture.end());
+      proc.stdout?.on("data", (chunk) => absorb(slotReducer.feed(decodeChunk(stdoutDecoder, chunk))));
+      flushPartial = () => absorb(slotReducer.end());
       let captureFinalized = false;
       const finalizeCapture = () => {
         if (captureFinalized)
           return;
         captureFinalized = true;
-        absorb(capture.end());
+        absorb(slotReducer.end());
+        slotReducer.dispose();
         outputStream.end();
       };
       proc.stdout?.on("end", finalizeCapture);
@@ -49787,7 +50013,7 @@ async function runModels(sessionPath, opts = {}) {
     }
     let stderr = "";
     proc.stderr?.on("data", (chunk) => {
-      stderr += chunk.toString();
+      stderr += decodeChunk(stderrDecoder, chunk);
     });
     const command = `claudish ${args.join(" ")}`;
     runtimes.set(anonId, {
@@ -49796,6 +50022,8 @@ async function runModels(sessionPath, opts = {}) {
       getStderr: () => stderr,
       getStdoutTail: () => stdoutTail,
       getByteCount: () => byteCount,
+      getIdleMs: () => Math.max(0, Date.now() - lastOutputAt),
+      getActivity: () => reducer?.state ?? null,
       flushPartial: () => flushPartial()
     });
     proc.stdin?.write(inputContent);
@@ -49833,8 +50061,9 @@ async function runModels(sessionPath, opts = {}) {
         const failed = crashed || degraded !== null;
         const state = crashed ? "FAILED" : degraded ? "EMPTY" : "COMPLETED";
         if (failed) {
-          const reason = crashed ? "nonzero_exit" : degraded.reason;
-          const detail = crashed ? `Child exited with code ${exitCode}.` : degraded.detail;
+          const wasCancelled = cancelledSlots.has(anonId);
+          const reason = wasCancelled ? "cancelled" : crashed ? "nonzero_exit" : degraded.reason;
+          const detail = wasCancelled ? `Stopped on the caller's instruction via team(mode:"cancel"). ` + "Whatever the child had written up to that point is in its response file." : crashed ? `Child exited with code ${exitCode}.` : degraded.detail;
           persistErrorLog(errorLogPath, `${state}: ${detail}`, stderr, stdoutTail);
           updateModelStatus(anonId, {
             state,
@@ -49849,6 +50078,7 @@ async function runModels(sessionPath, opts = {}) {
               stderrSnippet: stderr ? redactSecrets(stderr).slice(-2000) : undefined,
               stdoutSnippet: stdoutTail ? redactSecrets(stdoutTail).slice(-2000) : undefined,
               errorLogPath,
+              upstreamErrorLogPath: existsSync20(upstreamErrorLogPath) ? upstreamErrorLogPath : undefined,
               workDir: sessionPath
             }
           });
@@ -49909,102 +50139,36 @@ async function runModels(sessionPath, opts = {}) {
   emitProgress();
   const progressHandle = setInterval(() => emitProgress("running"), POLL_MS);
   progressHandle.unref?.();
-  const graceEnabled = opts.graceExtension ?? true;
-  const maxGraceMs = Math.max(0, (opts.maxGraceSeconds ?? timeoutMs / 1000) * 1000);
-  const stallMs = Math.max(0, (opts.stallSeconds ?? DEFAULT_STALL_SECONDS2) * 1000);
-  const idleMsFor = (id) => {
-    const s = readTokenStats(sessionPath, id);
-    if (!s || typeof s.updated_at !== "number" || s.updated_at <= 0)
-      return null;
-    return Math.max(0, Date.now() - s.updated_at);
-  };
-  const graceStartedAt = new Map;
-  const graceUsedMs = (id, now2) => {
-    const start = graceStartedAt.get(id);
-    return start === undefined ? 0 : Math.max(0, now2 - start);
-  };
-  const runningIds = () => [...processes.keys()].filter((id) => statusCache.models[id]?.state === "RUNNING");
-  const timeoutModel = async (id, why) => {
-    const proc = processes.get(id);
-    if (!proc || statusCache.models[id]?.state !== "RUNNING")
-      return;
-    const rt = runtimes.get(id);
-    rt?.flushPartial();
-    const stderr = rt?.getStderr() ?? "";
-    const stdoutTail = rt?.getStdoutTail() ?? "";
-    const bytes2 = rt?.getByteCount() ?? 0;
-    const grace = graceUsedMs(id, Date.now());
-    const detail = `Killed by the orchestrator after ${(timeoutMs + grace) / 1000}s ` + `(deadline ${timeoutMs / 1000}s${grace ? ` + ${grace / 1000}s grace` : ""}) ` + `with ${bytes2} B of stdout \u2014 ${why}. ` + "That figure counts the ANSWER, not the wire format, so 0 B means the child had " + `not produced an assistant message yet \u2014 "did not finish", not "produced nothing".`;
-    if (rt)
-      persistErrorLog(rt.errorLogPath, `TIMEOUT: ${detail}`, stderr, stdoutTail);
-    updateModelStatus(id, {
-      state: "TIMEOUT",
-      completedAt: new Date().toISOString(),
-      outputSize: bytes2,
-      error: rt ? {
-        model: id,
-        command: rt.command,
-        reason: "timeout",
-        detail,
-        stderrSnippet: stderr ? redactSecrets(stderr).slice(-2000) : undefined,
-        stdoutSnippet: stdoutTail ? redactSecrets(stdoutTail).slice(-2000) : undefined,
-        errorLogPath: rt.errorLogPath,
-        workDir: sessionPath
-      } : undefined
-    });
-    opts.onStatusChange?.(id, statusCache.models[id]);
-    const stopped = await terminateChildTree(proc);
-    if (!stopped) {
-      persistErrorLog(rt?.errorLogPath ?? join29(sessionPath, "errors", `${id}.log`), "TIMEOUT: child survived SIGKILL \u2014 it may still be running and billing", stderr, stdoutTail);
+  const teamSessionId = basename2(sessionPath);
+  liveTeamRuns.set(teamSessionId, {
+    sessionPath,
+    processes,
+    idleMsFor: (slotId) => runtimes.get(slotId)?.getIdleMs() ?? null,
+    activityFor: (slotId) => runtimes.get(slotId)?.getActivity() ?? null,
+    cancelledSlots
+  });
+  const done = (async () => {
+    try {
+      await Promise.all(completionPromises);
+    } finally {
+      clearInterval(progressHandle);
+      emitProgress("settled");
+      process.off("SIGINT", sigintHandler);
+      liveTeamRuns.delete(teamSessionId);
     }
+    return statusCache;
+  })();
+  done.catch(() => {});
+  return {
+    teamSessionId,
+    sessionPath,
+    slots: Object.fromEntries(Object.entries(manifest.models).map(([anonId, entry]) => [entry.model, anonId])),
+    done
   };
-  const allDone = Promise.all(completionPromises);
-  let settled = false;
-  allDone.then(() => {
-    settled = true;
-  }, () => {
-    settled = true;
-  });
-  const deadlineWatcher = (async () => {
-    await delay(timeoutMs);
-    for (;; ) {
-      if (settled)
-        return;
-      const running = runningIds();
-      if (running.length === 0)
-        return;
-      const extended = [];
-      const now2 = Date.now();
-      for (const id of running) {
-        const idleMs = idleMsFor(id);
-        const usedGrace = graceUsedMs(id, now2);
-        if (!graceEnabled) {
-          await timeoutModel(id, "deadline reached (grace extension disabled)");
-        } else if (usedGrace >= maxGraceMs) {
-          await timeoutModel(id, `grace exhausted after ${Math.round(usedGrace / 1000)}s of extra time`);
-        } else if (idleMs === null) {
-          await timeoutModel(id, "deadline reached with no measurable progress to extend for");
-        } else if (idleMs >= stallMs) {
-          await timeoutModel(id, `no measurable progress for ${Math.round(idleMs / 1000)}s`);
-        } else {
-          if (!graceStartedAt.has(id))
-            graceStartedAt.set(id, now2);
-          extended.push(id);
-        }
-      }
-      if (extended.length === 0)
-        return;
-      emitProgress("running");
-      await delay(Math.min(GRACE_INTERVAL_MS, Math.max(1000, stallMs)));
-    }
-  })().catch(() => {});
-  await Promise.race([allDone, deadlineWatcher]);
-  if (!settled)
-    await Promise.race([allDone, delay(DRAIN_TIMEOUT_MS)]);
-  clearInterval(progressHandle);
-  emitProgress("settled");
-  process.off("SIGINT", sigintHandler);
-  return statusCache;
+}
+async function runModels(sessionPath, opts = {}) {
+  const handle = await startModels(sessionPath, opts);
+  return handle.done;
 }
 async function judgeResponses(sessionPath, opts = {}) {
   const responseFiles = readdirSync5(sessionPath).filter((f) => f.startsWith("response-") && f.endsWith(".md")).sort();
@@ -50186,16 +50350,17 @@ function formatVerdict(verdict, sessionPath) {
   }
   return output;
 }
-var TEAM_CAPTURE_ENV_VAR = "CLAUDISH_TEAM_CAPTURE", STDOUT_TAIL_LIMIT = 4000, API_ERROR_RE, BG_CEILING_RE, DEFAULT_MIN_OUTPUT_BYTES = 0, DRAIN_TIMEOUT_MS = 1e4, GRACE_INTERVAL_MS = 60000, DEFAULT_STALL_SECONDS2 = 90, delay = (ms) => new Promise((resolve4) => {
-  const t = setTimeout(resolve4, ms);
-  t.unref?.();
-}), BENIGN_STDERR_PATTERNS;
+var TEAM_CAPTURE_ENV_VAR = "CLAUDISH_TEAM_CAPTURE", liveTeamRuns, STDOUT_TAIL_LIMIT = 4000, API_ERROR_RE, BG_CEILING_RE, DEFAULT_MIN_OUTPUT_BYTES = 0, BENIGN_STDERR_PATTERNS;
 var init_team_orchestrator = __esm(() => {
   init_prehydrate();
+  init_stream_json_reducer();
+  init_config2();
+  init_upstream_error_capture();
   init_process_tree();
   init_redact();
+  init_stdio_decode();
   init_team_stats();
-  init_team_stream_capture();
+  liveTeamRuns = new Map;
   API_ERROR_RE = /\[API Error:\s*([^\]]{0,300})\]/i;
   BG_CEILING_RE = /Background tasks still running after (\d+)s; terminating/i;
   BENIGN_STDERR_PATTERNS = [/^\s*\[claude-code:unrecognized_model\]/];
@@ -50217,7 +50382,7 @@ import {
 } from "fs";
 import { homedir as homedir28 } from "os";
 import { join as join30, resolve as resolve4, sep } from "path";
-import { StringDecoder } from "string_decoder";
+import { StringDecoder as StringDecoder2 } from "string_decoder";
 function buildChannelSpawnArgs(opts) {
   return [
     "--model",
@@ -50248,9 +50413,6 @@ function assertNoReservedFlags(flags) {
     }
   }
 }
-function decodeChunk(decoder, chunk) {
-  return typeof chunk === "string" ? chunk : decoder.write(chunk);
-}
 function readTailText(path, maxBytes) {
   let fd = null;
   try {
@@ -50359,11 +50521,14 @@ class SessionManager {
       throw new Error(`Max sessions (${this.maxSessions}) reached`);
     }
     assertNoReservedFlags(opts.claudishFlags);
-    const sessionId2 = randomUUID4().slice(0, 8);
+    if (opts.sessionId !== undefined && this.sessions.has(opts.sessionId)) {
+      throw new Error(`Session id already in use: ${opts.sessionId}`);
+    }
+    const sessionId2 = opts.sessionId ?? randomUUID4().slice(0, 8);
     const claudeSessionId = randomUUID4();
     const timeout = Math.min(opts.timeoutSeconds ?? DEFAULT_TIMEOUT, MAX_TIMEOUT);
     const startedAt = new Date().toISOString();
-    const sessionDir = join30(this.sessionsDir, sessionId2);
+    const sessionDir = opts.sessionDir ?? join30(this.sessionsDir, sessionId2);
     mkdirSync12(sessionDir, { recursive: true });
     if (opts.prompt) {
       writeFileSync12(join30(sessionDir, "prompt.md"), opts.prompt, "utf-8");
@@ -50373,7 +50538,7 @@ class SessionManager {
       claudeSessionId,
       claudishFlags: opts.claudishFlags
     });
-    const tokenFile = join30(sessionDir, "tokens.json");
+    const tokenFile = opts.tokenFile ?? join30(sessionDir, "tokens.json");
     const eventLogPath = join30(sessionDir, "events.jsonl");
     const upstreamErrorLogPath = join30(sessionDir, "upstream-errors.jsonl");
     const cwd = opts.cwd ?? process.cwd();
@@ -50399,6 +50564,7 @@ class SessionManager {
         status: "starting",
         pid: proc.pid ?? null,
         startedAt,
+        idleSeconds: 0,
         completedAt: null,
         exitCode: null,
         turnsCompleted: 0,
@@ -50419,8 +50585,8 @@ class SessionManager {
       evictHandle: null,
       stderr: "",
       stderrTruncated: false,
-      stdoutDecoder: new StringDecoder("utf8"),
-      stderrDecoder: new StringDecoder("utf8"),
+      stdoutDecoder: new StringDecoder2("utf8"),
+      stderrDecoder: new StringDecoder2("utf8"),
       outputLogStream,
       sessionDir,
       eventLogPath,
@@ -50441,6 +50607,7 @@ class SessionManager {
     entry.reducer = new StreamJsonReducer({
       sessionId: sessionId2,
       stallSeconds: this.stallSeconds,
+      keepUnrecognizedJson: opts.keepUnrecognizedJson,
       callback: (sid, data) => {
         const current = this.sessions.get(sid);
         if (!current)
@@ -50527,6 +50694,7 @@ class SessionManager {
     if (!entry)
       return this.diskOutput(this.requireDiskRecord(sessionId2), tailLines);
     entry.info.elapsedSeconds = this.getElapsed(entry.info.startedAt);
+    entry.info.idleSeconds = entry.reducer ? Math.round(entry.reducer.idleMs / 1000) : null;
     this.refreshAccounting(entry);
     const lines = entry.scrollback.getLines(tailLines);
     return {
@@ -50537,7 +50705,8 @@ class SessionManager {
       totalLines: entry.scrollback.totalLines,
       turnsCompleted: entry.info.turnsCompleted,
       tokensUsed: entry.info.tokensUsed,
-      elapsedSeconds: entry.info.elapsedSeconds
+      elapsedSeconds: entry.info.elapsedSeconds,
+      idleSeconds: entry.info.idleSeconds
     };
   }
   getDiagnostics(sessionId2, eventLimit = DEFAULT_EVENT_LIMIT) {
@@ -50547,6 +50716,7 @@ class SessionManager {
       return this.diskDiagnostics(this.requireDiskRecord(sessionId2), limit);
     this.refreshAccounting(entry);
     entry.info.elapsedSeconds = this.getElapsed(entry.info.startedAt);
+    entry.info.idleSeconds = entry.reducer ? Math.round(entry.reducer.idleMs / 1000) : null;
     return {
       sessionId: sessionId2,
       status: entry.info.status,
@@ -50555,6 +50725,7 @@ class SessionManager {
       exitCode: entry.info.exitCode,
       terminalReason: entry.info.terminalReason,
       elapsedSeconds: entry.info.elapsedSeconds,
+      idleSeconds: entry.info.idleSeconds,
       timeoutSeconds: entry.timeoutSeconds,
       outputBytes: entry.proseBytes,
       turnsCompleted: entry.info.turnsCompleted,
@@ -50613,6 +50784,7 @@ class SessionManager {
         continue;
       if (!isTerminal2) {
         entry.info.elapsedSeconds = this.getElapsed(entry.info.startedAt);
+        entry.info.idleSeconds = entry.reducer ? Math.round(entry.reducer.idleMs / 1000) : null;
         this.refreshAccounting(entry);
       }
       sessions2.push({ ...entry.info });
@@ -50624,6 +50796,7 @@ class SessionManager {
     if (!entry)
       return this.requireDiskRecord(sessionId2).info;
     entry.info.elapsedSeconds = this.getElapsed(entry.info.startedAt);
+    entry.info.idleSeconds = entry.reducer ? Math.round(entry.reducer.idleMs / 1000) : null;
     this.refreshAccounting(entry);
     return { ...entry.info };
   }
@@ -50706,6 +50879,7 @@ class SessionManager {
         model: metaString(meta3?.model) ?? "unknown",
         spawnModel: metaString(meta3?.spawnModel),
         status: metaStatus(meta3?.status) ?? "failed",
+        idleSeconds: null,
         pid: null,
         startedAt,
         completedAt,
@@ -50735,7 +50909,8 @@ class SessionManager {
       totalLines: buffer.totalLines,
       turnsCompleted: record4.info.turnsCompleted,
       tokensUsed: record4.info.tokensUsed,
-      elapsedSeconds: record4.info.elapsedSeconds
+      elapsedSeconds: record4.info.elapsedSeconds,
+      idleSeconds: null
     };
   }
   diskDiagnostics(record4, limit) {
@@ -50753,6 +50928,7 @@ class SessionManager {
       exitCode: info.exitCode,
       terminalReason: info.terminalReason,
       elapsedSeconds: info.elapsedSeconds,
+      idleSeconds: null,
       timeoutSeconds: 0,
       outputBytes: diskProseBytes(outputTail, fileSize(outputLogPath)),
       turnsCompleted: info.turnsCompleted,
@@ -50912,6 +51088,7 @@ ${STDERR_TRUNCATION_MARKER} ${STDERR_SIDE_LIMIT} bytes per end \u2026
     entry.info.exitCode = code;
     entry.info.completedAt = at;
     entry.info.elapsedSeconds = this.getElapsed(entry.info.startedAt);
+    entry.info.idleSeconds = entry.reducer ? Math.round(entry.reducer.idleMs / 1000) : null;
     entry.stdinClosed = true;
     this.flushDecoders(entry);
     const priorVerdict = TERMINAL_STATUSES.includes(entry.info.status) ? entry.info.status : null;
@@ -51076,13 +51253,14 @@ ${STDERR_TRUNCATION_MARKER} ${STDERR_SIDE_LIMIT} bytes per end \u2026
     }
   }
 }
-var DEFAULT_MAX_SESSIONS = 20, DEFAULT_SCROLLBACK = 2000, DEFAULT_TIMEOUT = 600, MAX_TIMEOUT = 3600, KILL_GRACE_MS = 5000, TERMINAL_RETENTION_MS, MAX_TERMINAL_SESSIONS = 50, STDERR_SIDE_LIMIT, EVENT_LOG_LIMIT, EVENT_RING_SIZE = 200, EVENT_PREVIEW_CHARS = 800, DEFAULT_EVENT_LIMIT = 40, UPSTREAM_ERROR_TAIL_BYTES, STDERR_TRUNCATION_MARKER = "[claudish] \u2026 stderr truncated to", TERMINAL_STATUSES, KNOWN_STATUSES, SESSION_ID_RE, META_READ_LIMIT, OUTPUT_TAIL_BYTES, STDERR_READ_BYTES, EVENT_TAIL_BYTES, NO_TERMINAL_RECORD = "claudish_no_terminal_record", RESERVED_FLAG_ALIASES, TRANSPORT_BREAKING_FLAGS, RESERVED_CHILD_FLAGS, metaString = (v) => typeof v === "string" && v.length > 0 ? v : null, metaNumber = (v) => typeof v === "number" && Number.isFinite(v) ? v : null, metaStatus = (v) => typeof v === "string" && KNOWN_STATUSES.includes(v) ? v : null, CLAUDISH_NOTE_PREFIX = "[claudish] ";
+var DEFAULT_MAX_SESSIONS = 20, DRAIN_TIMEOUT_MS = 1e4, DEFAULT_SCROLLBACK = 2000, DEFAULT_TIMEOUT = 600, MAX_TIMEOUT = 3600, KILL_GRACE_MS = 5000, TERMINAL_RETENTION_MS, MAX_TERMINAL_SESSIONS = 50, STDERR_SIDE_LIMIT, EVENT_LOG_LIMIT, EVENT_RING_SIZE = 200, EVENT_PREVIEW_CHARS = 800, DEFAULT_EVENT_LIMIT = 40, UPSTREAM_ERROR_TAIL_BYTES, STDERR_TRUNCATION_MARKER = "[claudish] \u2026 stderr truncated to", TERMINAL_STATUSES, KNOWN_STATUSES, SESSION_ID_RE, META_READ_LIMIT, OUTPUT_TAIL_BYTES, STDERR_READ_BYTES, EVENT_TAIL_BYTES, NO_TERMINAL_RECORD = "claudish_no_terminal_record", RESERVED_FLAG_ALIASES, TRANSPORT_BREAKING_FLAGS, RESERVED_CHILD_FLAGS, metaString = (v) => typeof v === "string" && v.length > 0 ? v : null, metaNumber = (v) => typeof v === "number" && Number.isFinite(v) ? v : null, metaStatus = (v) => typeof v === "string" && KNOWN_STATUSES.includes(v) ? v : null, CLAUDISH_NOTE_PREFIX = "[claudish] ";
 var init_session_manager = __esm(() => {
   init_config2();
   init_upstream_error_capture();
   init_process_tree();
   init_redact();
   init_session_discovery();
+  init_stdio_decode();
   init_team_orchestrator();
   init_team_stats();
   init_scrollback_buffer();
@@ -51218,68 +51396,6 @@ var init_cache_ttl = __esm(() => {
   FIREBASE_CACHE_TTL_MS = FIREBASE_CACHE_TTL_HOURS * 60 * 60 * 1000;
 });
 
-// src/providers/model-ordering.ts
-function extractVersionParts(modelId) {
-  const tokens = modelId.toLowerCase().split(/[\/_-]+/);
-  let started = false;
-  const parts = [];
-  for (const token of tokens) {
-    const match = token.match(/\d+(?:\.\d+)*/);
-    if (!match) {
-      if (started)
-        break;
-      continue;
-    }
-    if (!started && /^\d+b$/.test(token) && Number.parseInt(match[0], 10) > 10) {
-      continue;
-    }
-    if (!started) {
-      started = true;
-      for (const part of match[0].split(".")) {
-        parts.push(Number.parseInt(part, 10));
-      }
-      if (!/^\d+(?:\.\d+)*$/.test(token)) {
-        break;
-      }
-      continue;
-    }
-    if (!/^\d{1,2}(?:\.\d+)?$/.test(token)) {
-      break;
-    }
-    for (const part of token.split(".")) {
-      parts.push(Number.parseInt(part, 10));
-    }
-  }
-  return parts;
-}
-function compareVersionPartsDesc(a, b) {
-  const maxLength = Math.max(a.length, b.length);
-  for (let i = 0;i < maxLength; i++) {
-    const aPart = a[i] ?? -1;
-    const bPart = b[i] ?? -1;
-    if (aPart !== bPart) {
-      return bPart - aPart;
-    }
-  }
-  return 0;
-}
-function compareByReleaseDateDesc(a, b) {
-  const aReleaseRaw = a.releaseDate ? Date.parse(a.releaseDate) : 0;
-  const bReleaseRaw = b.releaseDate ? Date.parse(b.releaseDate) : 0;
-  const aRelease = Number.isNaN(aReleaseRaw) ? 0 : aReleaseRaw;
-  const bRelease = Number.isNaN(bReleaseRaw) ? 0 : bReleaseRaw;
-  if (aRelease !== bRelease) {
-    return bRelease - aRelease;
-  }
-  const aId = a.id ?? a.modelId ?? "";
-  const bId = b.id ?? b.modelId ?? "";
-  const versionCompare = compareVersionPartsDesc(extractVersionParts(aId), extractVersionParts(bId));
-  if (versionCompare !== 0) {
-    return versionCompare;
-  }
-  return aId.localeCompare(bId);
-}
-
 // src/model-loader.ts
 import { existsSync as existsSync21, mkdirSync as mkdirSync13, readFileSync as readFileSync21, writeFileSync as writeFileSync13 } from "fs";
 import { homedir as homedir29 } from "os";
@@ -56440,7 +56556,7 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
   });
   tools.push({
     name: "search_models",
-    description: "Search all OpenRouter models by name, provider, or capability",
+    description: "Search OpenRouter's listing by name, provider, or capability, and cross-reference " + "claudish's own catalog. SCOPE: the listing covers OpenRouter only, so a name's " + "absence from it is NOT evidence the name is unroutable \u2014 subscription wire ids " + "(`k3`) and catalog aliases live outside that namespace and are reported separately " + "here. This tool cannot tell you which provider will serve a model or whether the " + "hop is subscription or metered; call `preflight` for that.",
     inputSchema: {
       type: "object",
       properties: {
@@ -56475,13 +56591,40 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
           return b.score - a.score;
         return compareByReleaseDateDesc(orderingKey(a.model), orderingKey(b.model));
       }).slice(0, maxResults);
+      const catalogMatches = searchCatalogModels(query, Math.max(maxResults, 5));
+      const renderCatalogSection = () => {
+        if (catalogMatches.length === 0)
+          return "";
+        let s = `
+## Catalog names (what claudish routes)
+
+`;
+        s += `| Bare name | Matched alias | Subscription plan |
+`;
+        s += `|-----------|---------------|-------------------|
+`;
+        for (const m of catalogMatches) {
+          const plans = m.subscriptionPlans.length > 0 ? m.subscriptionPlans.join(", ") : "-";
+          s += `| ${m.modelId} | ${m.matchedAlias ?? "-"} | ${plans} |
+`;
+        }
+        s += `
+Pass the **bare name**. Routing puts a subscription ahead of the metered API and ` + "rewrites the model to that plan's wire id for you. An aggregator-qualified id " + "(`moonshotai/...`, `accounts/fireworks/...`) pins that aggregator and bills per token.\n";
+        return s;
+      };
       if (results.length === 0) {
-        return {
-          content: [{ type: "text", text: `No models found matching "${query}"` }]
-        };
+        const catalog = renderCatalogSection();
+        const text = catalog ? `No OpenRouter listing matches "${query}", but claudish's catalog knows these:
+${catalog}` : `No models found matching "${query}".
+
+` + "This searched OpenRouter's listing only. Subscription wire ids and catalog " + "aliases are not in it, so this is not proof the name is unroutable. Call " + "`list_models` for the recommended set, or `preflight` to test a specific name " + "against real routing.";
+        return { content: [{ type: "text", text }] };
       }
       let output = `# Search Results for "${query}"
 
+`;
+      output += `## OpenRouter listing
+
 `;
       output += `| Model | Provider | Pricing | Context |
 `;
@@ -56497,8 +56640,13 @@ Tokens: ${result.usage.input} input, ${result.usage.output} output`;
         output += `| ${model.id} | ${provider} | ${pricing} | ${context} |
 `;
       }
+      output += renderCatalogSection();
+      const suggested = catalogMatches[0]?.modelId ?? results[0].model.id;
       output += `
-Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
+Use with: run_prompt(model="${suggested}", prompt="your prompt")`;
+      output += `
+
+To learn which provider would actually serve \`${suggested}\`, and whether that ` + "hop is covered by a subscription or billed per token, call " + `\`preflight({models: ["${suggested}"]})\`. This listing cannot answer that.`;
       return { content: [{ type: "text", text: output }] };
     }
   });
@@ -56687,14 +56835,18 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
   });
   tools.push({
     name: "team",
-    description: "Run AI models on a task with anonymized outputs and optional blind judging. Modes: 'run' (execute models), 'judge' (blind-vote on existing outputs), 'run-and-judge' (full pipeline), 'status' (check progress).",
+    description: "Run AI models on a task with anonymized outputs and optional blind judging. " + "Modes: 'run' (START the models and return a slot map immediately \u2014 it does NOT " + "wait), 'status' (per-slot state, plus how long each slot has been silent), " + "'cancel' (stop one slot or the whole run), 'judge' (blind-vote on existing " + "outputs), 'run-and-judge' (the blocking pipeline). " + "NO SLOT IS EVER KILLED ON A TIMER. A team slot is a full Claude Code session and " + "may work for a long time; a slot inside a build or test suite emits nothing for " + "minutes and is working, not stuck. Poll 'status', judge the silence against the " + "task you set, and use 'cancel' if you decide a slot is wedged.",
     inputSchema: {
       type: "object",
       properties: {
         mode: {
           type: "string",
-          enum: ["run", "judge", "run-and-judge", "status"],
-          description: "Operation mode"
+          enum: ["run", "judge", "run-and-judge", "status", "cancel"],
+          description: "Operation mode. 'run' STARTS the models and returns immediately with a " + "slot map \u2014 it does not wait. Poll 'status' for progress, then 'judge' once " + "the slots have finished. 'run-and-judge' is the blocking pipeline and holds " + "the call open for the whole run. 'cancel' stops one slot or the whole run."
+        },
+        slot: {
+          type: "string",
+          description: "For 'cancel': the anonymised slot id to stop (e.g. '02'), from the slot map " + "'run' returned. Omit to cancel every slot in the run."
         },
         path: {
           type: "string",
@@ -56710,11 +56862,14 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
           items: { type: "string" },
           description: "Model IDs to use as judges (default: same as runners)"
         },
+        input_file: {
+          type: "string",
+          description: "PREFERRED. Path to a file holding the task prompt, relative to the working " + "directory. Use this rather than `input` for anything longer than a sentence: " + "a prompt passed inline is echoed verbatim in the caller's terminal, where a " + "200-line review brief buries every other argument and makes the call " + "unreadable. Write the brief to the session directory first (input.md is the " + "conventional name) and point here."
+        },
         input: {
           type: "string",
-          description: "Task prompt text (or place input.md in the session directory before calling)"
+          description: "Task prompt as inline text. Prefer `input_file` \u2014 inline text is rendered in " + "full in the caller's terminal. Passing both is an error. If neither is given, " + "an input.md already present in the session directory is used."
         },
-        timeout: { type: "number", description: "Per-model timeout in seconds (default: 300)" },
         require_pattern: {
           type: "string",
           description: "Regex the response MUST match, or the slot is reported FAILED (state EMPTY, " + "reason 'shape_mismatch') instead of succeeded. Strongly recommended whenever " + "your prompt mandates an output shape \u2014 e.g. '```vote' for a voting panel. " + "Exit code 0 is not a success oracle: it is 0 on API errors and on a child " + "that simply never followed the format. Answers are no longer LOST to print " + "mode (every assistant message is captured), so a mismatch now means the model " + "did not produce the shape, not that the shape was discarded."
@@ -56742,8 +56897,12 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
         const path = args.path;
         const models = args.models;
         const judges = args.judges;
-        const input = args.input;
-        const timeout = args.timeout;
+        const inlineInput = args.input;
+        const inputFile = args.input_file;
+        if (inlineInput !== undefined && inputFile !== undefined) {
+          throw new Error("Pass `input_file` or `input`, not both. Prefer `input_file` \u2014 inline text is " + "rendered verbatim in the caller's terminal.");
+        }
+        const input = inputFile !== undefined ? readTeamInputFile(inputFile) : inlineInput;
         const requirePattern = args.require_pattern;
         const minOutputBytes = args.min_output_bytes;
         const childFlags = buildChildClaudeFlags(args.agent, args.claude_flags);
@@ -56752,7 +56911,6 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
         const teamSessionId = resolved.split("/").filter(Boolean).pop() ?? "team";
         const teamCreatedAt = new Date().toISOString();
         const runOpts = {
-          timeout,
           requirePattern,
           minOutputBytes,
           claudeFlags: childFlags,
@@ -56773,9 +56931,51 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
             if (!models?.length)
               throw new Error("'models' is required for 'run' mode");
             setupSession(resolved, models, input);
-            const status = await runModels(resolved, runOpts);
+            const handle = await startModels(resolved, runOpts);
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: JSON.stringify({
+                    started: true,
+                    team_session_id: handle.teamSessionId,
+                    session_path: handle.sessionPath,
+                    slots: handle.slots,
+                    next: {
+                      status: `team(mode:"status", path:"${handle.sessionPath}")`,
+                      cancel: `team(mode:"cancel", path:"${handle.sessionPath}", slot:"<id>")`,
+                      judge: `team(mode:"judge", path:"${handle.sessionPath}") once every slot has finished`
+                    },
+                    note: "Nothing terminates a slot on a timer. `status` reports how many " + "seconds each slot has been silent; a slot inside a long build is " + "quiet and working. You decide whether to cancel."
+                  }, null, 2)
+                }
+              ]
+            };
+          }
+          case "cancel": {
+            const slot = args.slot;
+            const teamSessionId2 = resolved.split("/").filter(Boolean).pop() ?? "team";
+            const result = await cancelTeamRun(teamSessionId2, slot);
+            if (!result.found) {
+              return {
+                content: [
+                  {
+                    type: "text",
+                    text: JSON.stringify({
+                      cancelled: [],
+                      note: "No live run for that path. It already settled (read `status`), or " + "it was started by a different process \u2014 this server can only stop " + "children it spawned."
+                    })
+                  }
+                ]
+              };
+            }
             return {
-              content: [{ type: "text", text: formatTeamResult(status, resolved) }]
+              content: [
+                {
+                  type: "text",
+                  text: JSON.stringify({ cancelled: result.cancelled }, null, 2)
+                }
+              ]
             };
           }
           case "judge": {
@@ -56792,7 +56992,25 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
           }
           case "status": {
             const status = getStatus(resolved);
-            return { content: [{ type: "text", text: JSON.stringify(status, null, 2) }] };
+            const teamSessionId2 = resolved.split("/").filter(Boolean).pop() ?? "team";
+            const idle = teamSlotIdleSeconds(teamSessionId2);
+            const settled = !Object.values(status.models).some((m) => m.state === "RUNNING");
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: JSON.stringify({
+                    ...status,
+                    idle_seconds_by_slot: idle,
+                    activity_by_slot: teamSlotActivity(teamSessionId2),
+                    ...idle ? {
+                      note: "idle_seconds_by_slot is how long each slot has been silent; " + "read it against activity_by_slot. Silence in tool_executing " + "is a build or test suite running, and is not a failure " + 'signal. Nothing cancels on your behalf \u2014 use mode:"cancel" ' + "if you decide to."
+                    } : {},
+                    ...settled ? { summary: formatTeamResult(status, resolved) } : {}
+                  }, null, 2)
+                }
+              ]
+            };
           }
           default:
             throw new Error(`Unknown mode: ${mode}`);
@@ -57112,7 +57330,7 @@ Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}`
   });
   tools.push({
     name: "list_sessions",
-    description: "List all active channel sessions. Optionally include completed sessions.",
+    description: "List all active channel sessions. Optionally include completed sessions. " + "Each session reports `idleSeconds`: how long since the child last emitted " + "anything. Nothing kills a session for being idle \u2014 a child inside a long " + "Bash call is silent and working \u2014 so this is yours to judge against the " + "task you set, and `cancel_session` is yours to call if the answer is no.",
     inputSchema: {
       type: "object",
       properties: {
@@ -57132,7 +57350,7 @@ Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}`
   });
   tools.push({
     name: "get_diagnostics",
-    description: "Explain what a channel session actually did \u2014 stderr, upstream error bodies, the " + "recent event frames, the resolved model chain, accounting, and the paths to the " + "full records. Call this FIRST whenever a session fails, times out, or completes " + "with empty or surprising output; it needs no re-run and no debug flag.",
+    description: "Explain what a channel session actually did \u2014 stderr, upstream error bodies, the " + "recent event frames, the resolved model chain, accounting, and the paths to the " + "full records. Call this FIRST whenever a session fails, times out, or completes " + "with empty or surprising output; it needs no re-run and no debug flag. " + "`idleSeconds` reports how long since the child last emitted a frame, and is " + "null once the session is no longer live. It is information, never a verdict: " + "claudish does not terminate a session for silence.",
     inputSchema: {
       type: "object",
       properties: {
@@ -57289,6 +57507,7 @@ Call get_diagnostics with session_id: "${sessionId2}" for the stderr, the upstre
   await server.connect(transport);
   process.on("SIGTERM", () => {
     sessionManager.shutdownAll().catch(() => {});
+    shutdownAllTeamRuns().catch(() => {});
   });
 }
 function startMcpServer() {
@@ -57331,6 +57550,7 @@ var init_mcp_server = __esm(() => {
   init_server2();
   init_stdio2();
   init_types();
+  init_model_catalog();
   init_agent_availability();
   init_prehydrate();
   init_diagnostics();
@@ -57356,7 +57576,8 @@ var init_mcp_server = __esm(() => {
   ALL_MODELS_CACHE_PATH2 = join34(CLAUDISH_CACHE_DIR, "all-models.json");
   NEXT_STEP = {
     nonzero_exit: "read the evidence log, then retry or drop the model",
-    timeout: "raise `timeout`, or pick a faster model",
+    cancelled: "you stopped this slot; nothing is wrong with it. Re-run it if you still want its vote",
+    timeout: "grid mode only \u2014 magmux ended the pane. The orchestrator has no deadline",
     api_error: "retry once, or route via a different provider (or@<model>)",
     background_task_ceiling: "set CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS=0 for children, or forbid background work in the prompt",
     empty_output: "retry once; if it repeats, drop the model",
@@ -58239,7 +58460,8 @@ Options (run / run-and-judge):
   --path <dir>        Session directory (default: .)
   --models <a,b,...>  Comma-separated model IDs to run
   --input <text>      Task prompt (or create input.md in --path beforehand)
-  --timeout <secs>    Timeout per model in seconds (default: 300)
+  --timeout <secs>    Grid modes only: magmux's own per-pane timeout (default: 300).
+                      json mode has no deadline \u2014 nothing kills a working model.
   --grid              Show all models in a magmux grid with live output + status bar
 
 Options (judge / run-and-judge):
@@ -58306,7 +58528,6 @@ async function teamCommand(args) {
       if (effectiveMode === "json") {
         setupSession(sessionPath, models, input);
         const runStatus = await runModels(sessionPath, {
-          timeout,
           onStatusChange: (id, s) => {
             process.stderr.write(`[team] ${id}: ${s.state}
 `);
@@ -58335,7 +58556,6 @@ async function teamCommand(args) {
       }
       setupSession(sessionPath, models, input);
       const status = await runModels(sessionPath, {
-        timeout,
         onStatusChange: (id, s) => {
           process.stderr.write(`[team] ${id}: ${s.state}
 `);
@@ -66218,9 +66438,9 @@ var require_internal = __commonJS(function(exports, module) {
   }
   InternalCodec.prototype.encoder = InternalEncoder;
   InternalCodec.prototype.decoder = InternalDecoder;
-  var StringDecoder2 = __require("string_decoder").StringDecoder;
+  var StringDecoder3 = __require("string_decoder").StringDecoder;
   function InternalDecoder(options, codec2) {
-    this.decoder = new StringDecoder2(codec2.enc);
+    this.decoder = new StringDecoder3(codec2.enc);
   }
   InternalDecoder.prototype.write = function(buf) {
     if (!Buffer2.isBuffer(buf)) {
@@ -86111,7 +86331,7 @@ var init_widgets = __esm(() => {
 
 // src/session/conversation.ts
 import { closeSync as closeSync9, openSync as openSync9, readSync as readSync4, statSync as statSync9 } from "fs";
-import { StringDecoder as StringDecoder2 } from "string_decoder";
+import { StringDecoder as StringDecoder3 } from "string_decoder";
 function looksLikeTurn(line) {
   const assistant = line.includes('"type":"assistant"');
   if (!assistant && !line.includes('"type":"user"'))
@@ -86168,7 +86388,7 @@ function readConversation(file2, opts = {}) {
     const size = statSync9(file2).size;
     fd = openSync9(file2, "r");
     const buf = Buffer.allocUnsafe(chunkBytes);
-    const decoder = new StringDecoder2("utf-8");
+    const decoder = new StringDecoder3("utf-8");
     let pending = "";
     let pos = 0;
     const consume = (line) => {
@@ -88463,7 +88683,6 @@ async function runCli() {
         const { setupSession: setupSession2, runModels: runModels2 } = await Promise.resolve().then(() => (init_team_orchestrator(), exports_team_orchestrator));
         setupSession2(sessionPath, cliConfig.team, prompt);
         const status2 = await runModels2(sessionPath, {
-          timeout: 300,
           claudeFlags: ["--json"]
         });
         const result = { ...status2, responses: {} };