@aiden-ade/sandbox-agent 0.1.57 → 0.1.58

package/dist/index.cjs

@@ -11774,6 +11774,9 @@ function cacheResolvedCli(command, resolvedPath) {
     negativeResolutionExpiry.delete(command);
   }
 }
+function cliResolutionCacheKey(command, env) {
+  return [command, env.PATH ?? "", env.HOME ?? env.USERPROFILE ?? "", env.PATHEXT ?? ""].join("\0");
+}
 function getCachedResolvedCli(command) {
   const cached2 = resolvedCliCache.get(command);
   if (cached2 === null) {
@@ -11878,23 +11881,21 @@ function windowsCommandCandidates(command, pathExt) {
   const extensions = pathExt.split(";").map((ext) => ext.trim()).filter(Boolean);
   return [trimmed, ...extensions.map((ext) => `${trimmed}${ext}`)];
 }
-function augmentCliPath(env) {
+function augmentCliPath(env, includeSystemPaths = true) {
   const home = env.HOME || env.USERPROFILE || (0, import_node_os.homedir)();
   const isWin = (0, import_node_os.platform)() === "win32";
-  const extraPaths = isWin ? [
+  const userPaths = isWin ? [
     (0, import_node_path.join)(home, "AppData", "Roaming", "npm"),
     (0, import_node_path.join)(home, "AppData", "Local", "Programs", "Microsoft", "WindowsApps"),
-    (0, import_node_path.join)(home, ".local", "bin"),
-    "C:\\Program Files\\nodejs",
-    "C:\\Program Files\\Git\\cmd"
+    (0, import_node_path.join)(home, ".local", "bin")
   ] : [
     (0, import_node_path.join)(home, ".local", "bin"),
     (0, import_node_path.join)(home, ".local", "node", "bin"),
     (0, import_node_path.join)(home, ".bun", "bin"),
-    (0, import_node_path.join)(home, ".cargo", "bin"),
-    "/opt/homebrew/bin",
-    "/usr/local/bin"
+    (0, import_node_path.join)(home, ".cargo", "bin")
   ];
+  const systemPaths = isWin ? ["C:\\Program Files\\nodejs", "C:\\Program Files\\Git\\cmd"] : ["/opt/homebrew/bin", "/usr/local/bin"];
+  const extraPaths = includeSystemPaths ? [...userPaths, ...systemPaths] : userPaths;
   const basePath = env.PATH ?? "";
   const existing = new Set(splitPath(basePath));
   const missing = extraPaths.filter((dir) => !existing.has(dir));
@@ -11904,18 +11905,18 @@ function augmentCliPath(env) {
     PATH: missing.length > 0 ? `${missing.join(pathSeparator())}${pathSeparator()}${basePath}` : basePath
   };
 }
-function resolveCliExecutable(command, env = getDaemonCliEnvironment()) {
+function resolveCliExecutable(command, env) {
   const trimmed = command.trim();
   if (!trimmed) return null;
-  const cached2 = getCachedResolvedCli(trimmed);
+  const enriched = augmentCliPath(env ?? getDaemonCliEnvironment(), env === void 0);
+  const cacheKey = cliResolutionCacheKey(trimmed, enriched);
+  const cached2 = getCachedResolvedCli(cacheKey);
   if (cached2 === null) return null;
   if (cached2 && isRunnableFile(cached2)) return cached2;
   if ((trimmed.includes("/") || trimmed.includes("\\")) && isRunnableFile(trimmed)) {
-    cacheResolvedCli(trimmed, trimmed);
+    cacheResolvedCli(cacheKey, trimmed);
     return trimmed;
   }
-  const enriched = augmentCliPath(env);
-  const home = enriched.HOME || enriched.USERPROFILE || (0, import_node_os.homedir)();
   const isWin = (0, import_node_os.platform)() === "win32";
   const pathExt = enriched.PATHEXT ?? (isWin ? ".EXE;.CMD;.BAT;.COM" : "");
   const commandNames = [trimmed, ...CLI_COMMAND_ALIASES[trimmed] ?? []];
@@ -11931,28 +11932,22 @@ function resolveCliExecutable(command, env = getDaemonCliEnvironment()) {
     for (const dir of splitPath(enriched.PATH)) {
       candidates.push((0, import_node_path.join)(dir, name));
     }
-    candidates.push((0, import_node_path.join)(home, ".local", "bin", name), (0, import_node_path.join)(home, ".local", "node", "bin", name));
-    if (!isWin) {
-      candidates.push((0, import_node_path.join)("/opt/homebrew/bin", name), (0, import_node_path.join)("/usr/local/bin", name));
-    } else {
-      candidates.push((0, import_node_path.join)(home, "AppData", "Roaming", "npm", name));
-    }
   }
   const seen = /* @__PURE__ */ new Set();
   for (const candidate of candidates) {
     if (seen.has(candidate)) continue;
     seen.add(candidate);
     if (isRunnableFile(candidate)) {
-      cacheResolvedCli(trimmed, candidate);
+      cacheResolvedCli(cacheKey, candidate);
       return candidate;
     }
   }
   const viaWhere = resolveViaWhere(trimmed, enriched);
   if (viaWhere) {
-    cacheResolvedCli(trimmed, viaWhere);
+    cacheResolvedCli(cacheKey, viaWhere);
     return viaWhere;
   }
-  cacheResolvedCli(trimmed, null);
+  cacheResolvedCli(cacheKey, null);
   return null;
 }
 function normalizeDiscoverableProvider(provider) {
@@ -11963,49 +11958,52 @@ function normalizeDiscoverableProvider(provider) {
   }
   return null;
 }
-function resolveProviderCliCommand(provider, env = getDaemonCliEnvironment()) {
+function resolveProviderCliCommand(provider, env) {
   const normalized = normalizeDiscoverableProvider(provider);
   if (!normalized) return null;
+  const cliEnv = env ?? getDaemonCliEnvironment();
   const spec = PROVIDER_CLI_COMMANDS[normalized];
-  const override = spec.envVars.map((name) => process.env[name]?.trim() || env[name]?.trim()).find(Boolean);
+  const override = spec.envVars.map((name) => process.env[name]?.trim() || cliEnv[name]?.trim()).find(Boolean);
   if (override) {
-    const resolved2 = resolveCliExecutable(override, env) ?? (isRunnableFile(override) ? override : null);
-    if (resolved2) cacheResolvedCli(spec.command, resolved2);
-    return resolved2;
+    const resolved = resolveCliExecutable(override, cliEnv) ?? (isRunnableFile(override) ? override : null);
+    return resolved;
   }
-  const resolved = resolveCliExecutable(spec.command, env);
-  if (resolved) cacheResolvedCli(spec.command, resolved);
-  return resolved;
+  return resolveCliExecutable(spec.command, cliEnv);
 }
-function resolveBackendRuntimeCommand(backendKind, env = getDaemonCliEnvironment()) {
+function resolveBackendRuntimeCommand(backendKind, env) {
   if (!backendKind) return void 0;
   const command = BACKEND_CLI_COMMANDS[backendKind];
   if (!command) return void 0;
-  const cached2 = getCachedResolvedCli(command);
-  if (cached2 === null) return void 0;
-  if (cached2 && isRunnableFile(cached2)) return cached2;
+  const cliEnv = env ?? getDaemonCliEnvironment();
   const spec = Object.values(PROVIDER_CLI_COMMANDS).find((entry) => entry.command === command);
-  const envOverride = spec ? spec.envVars.map((name) => env[name]?.trim()).find(Boolean) : void 0;
-  const resolved = resolveCliExecutable(envOverride?.trim() || command, env);
-  cacheResolvedCli(command, resolved);
+  const envOverride = spec ? spec.envVars.map((name) => cliEnv[name]?.trim()).find(Boolean) : void 0;
+  const resolved = resolveCliExecutable(envOverride?.trim() || command, cliEnv);
   return resolved ?? void 0;
 }
 function invalidateResolvedCli(command) {
   const trimmed = command.trim();
   if (trimmed) {
-    resolvedCliCache.delete(trimmed);
-    negativeResolutionExpiry.delete(trimmed);
+    const prefix = `${trimmed}\0`;
+    for (const cacheKey of resolvedCliCache.keys()) {
+      if (cacheKey === trimmed || cacheKey.startsWith(prefix)) resolvedCliCache.delete(cacheKey);
+    }
+    for (const cacheKey of negativeResolutionExpiry.keys()) {
+      if (cacheKey === trimmed || cacheKey.startsWith(prefix)) {
+        negativeResolutionExpiry.delete(cacheKey);
+      }
+    }
   }
 }
-function revalidateBackendRuntimeCommand(backendKind, env = getDaemonCliEnvironment()) {
+function revalidateBackendRuntimeCommand(backendKind, env) {
   if (!backendKind) return void 0;
   const command = BACKEND_CLI_COMMANDS[backendKind];
   if (!command) return void 0;
+  const cliEnv = env ?? getDaemonCliEnvironment();
   invalidateResolvedCli(command);
   const spec = Object.values(PROVIDER_CLI_COMMANDS).find((entry) => entry.command === command);
-  const envOverride = spec ? spec.envVars.map((name) => env[name]?.trim()).find(Boolean) : void 0;
+  const envOverride = spec ? spec.envVars.map((name) => cliEnv[name]?.trim()).find(Boolean) : void 0;
   if (envOverride) invalidateResolvedCli(envOverride);
-  return resolveBackendRuntimeCommand(backendKind, env);
+  return resolveBackendRuntimeCommand(backendKind, cliEnv);
 }
 
 // src/cli-help.ts
@@ -12325,7 +12323,7 @@ function describeError(error2) {
 }
 
 // src/version.ts
-var AGENT_VERSION = "0.1.57";
+var AGENT_VERSION = "0.1.58";
 
 // src/daemon-worktree.ts
 var import_node_child_process3 = require("child_process");
@@ -19564,7 +19562,8 @@ function inferEffortLevelsForModel(harness, modelId) {
   return [];
 }
 function resolveWireEffort(input) {
-  const allowed = input.effortLevels && input.effortLevels.length > 0 ? input.effortLevels : inferEffortLevelsForModel(input.harness, input.modelId);
+  const reportedEffortLevels = input.effortLevels?.filter(isEffortLevel);
+  const allowed = reportedEffortLevels && reportedEffortLevels.length > 0 ? reportedEffortLevels : inferEffortLevelsForModel(input.harness, input.modelId);
   const clamped = clampEffortToSupported(input.selectedEffortLevel, allowed);
   if (!clamped)
     return null;
@@ -19696,11 +19695,15 @@ var ENTRIES = [
   // Persisted by the same Antigravity build that shipped display-name ids.
   ["claude-opus-4-6-thinking", "Opus 4.6 Thinking", "previous"],
   ["claude-opus-4-7", "Opus 4.7", "previous"],
+  ["claude-opus-4-7-fast", "Opus 4.7 Fast", "fast"],
   ["claude-opus-4-6", "Opus 4.6", "previous"],
+  ["claude-opus-4-6-fast", "Opus 4.6 Fast", "fast"],
   ["claude-opus-4-5", "Opus 4.5", "previous"],
   ["claude-opus-4-1", "Opus 4.1", "previous"],
+  ["claude-opus-4-0", "Opus 4.0", "previous"],
   ["claude-sonnet-4-5", "Sonnet 4.5", "previous"],
   ["claude-sonnet-4", "Sonnet 4", "previous"],
+  ["claude-sonnet-4-0", "Sonnet 4.0", "previous"],
   // OpenAI
   ["gpt-5-6-sol", "GPT-5.6 Sol", "frontier"],
   ["gpt-5-6-terra", "GPT-5.6 Terra", "frontier"],
@@ -19723,6 +19726,7 @@ var ENTRIES = [
   ["gpt-5-codex", "GPT-5 Codex", "previous"],
   ["gpt-5-mini", "GPT-5 Mini", "previous"],
   ["gpt-5-nano", "GPT-5 Nano", "previous"],
+  ["gpt-oss-120b", "GPT OSS 120B", "balanced"],
   // Google
   ["gemini-3-1-pro", "Gemini 3.1 Pro", "frontier"],
   ["gemini-3-pro", "Gemini 3 Pro", "frontier"],
@@ -19767,6 +19771,9 @@ var ENTRIES = [
   // OpenCode Zen free tier
   ["big-pickle", "Big Pickle", "balanced"],
   ["hy3-free", "Hy3 Free", "balanced"],
+  ["laguna-s-2-1-free", "Laguna S 2.1 Free", "balanced"],
+  ["ling-3-0-tiny-free", "Ling 3.0 Tiny Free", "fast"],
+  ["longcat-2-0-free", "LongCat 2.0 Free", "balanced"],
   ["mimo-v2-5-free", "MiMo V2.5 Free", "balanced"],
   ["nemotron-3-ultra-free", "Nemotron 3 Ultra Free", "balanced"],
   ["north-mini-code-free", "North Mini Code Free", "fast"],
@@ -19924,62 +19931,6 @@ function getCursorModelCollapseKey(modelId) {
     return modelId.trim();
   return parsed.baseId;
 }
-function getCursorCatalogCollapseKey(modelId) {
-  const trimmed = modelId.trim();
-  if (trimmed.endsWith("-medium-thinking")) {
-    return trimmed.slice(0, -"-medium-thinking".length);
-  }
-  let key = getCursorModelCollapseKey(trimmed);
-  if (key.endsWith("-thinking")) {
-    key = getCursorModelCollapseKey(key.slice(0, -"-thinking".length));
-  }
-  return key;
-}
-function mergeContextWindows(existing, discovered) {
-  const merged = /* @__PURE__ */ new Set([...existing ?? [], ...discovered ?? []]);
-  return Array.from(merged);
-}
-function mergeModelCapabilities(preferred, other) {
-  const contextWindows = mergeContextWindows(preferred.capabilities?.contextWindows, other.capabilities?.contextWindows);
-  const effortLevels = mergeEffortLevels(preferred.capabilities?.effortLevels, new Set(other.capabilities?.effortLevels ?? []));
-  if (contextWindows.length === 0 && effortLevels.length === 0)
-    return preferred;
-  return {
-    ...preferred,
-    capabilities: {
-      contextWindows,
-      effortLevels,
-      ...preferred.capabilities?.defaultContext ? { defaultContext: preferred.capabilities.defaultContext } : {},
-      ...preferred.capabilities?.defaultEffort ? { defaultEffort: preferred.capabilities.defaultEffort } : {},
-      ...preferred.capabilities?.supportsAttachments !== void 0 ? { supportsAttachments: preferred.capabilities.supportsAttachments } : {}
-    }
-  };
-}
-function collapseCursorCatalogModels(catalogModels) {
-  const mergedByKey = /* @__PURE__ */ new Map();
-  for (const model of catalogModels) {
-    const key = getCursorCatalogCollapseKey(model.id);
-    const canonical = key === model.id ? model : { ...model, id: key };
-    const existing = mergedByKey.get(key);
-    if (!existing) {
-      mergedByKey.set(key, canonical);
-      continue;
-    }
-    const preferred = existing.id.endsWith("-thinking") ? canonical : existing;
-    const secondary = preferred === existing ? canonical : existing;
-    mergedByKey.set(key, mergeModelCapabilities(preferred, secondary));
-  }
-  const seen = /* @__PURE__ */ new Set();
-  const result = [];
-  for (const model of catalogModels) {
-    const key = getCursorCatalogCollapseKey(model.id);
-    if (seen.has(key))
-      continue;
-    seen.add(key);
-    result.push(mergedByKey.get(key));
-  }
-  return result;
-}
 function collapseCursorDiscoveredModelIds(modelIds) {
   const keys = /* @__PURE__ */ new Set();
   for (const id of modelIds) {
@@ -19989,16 +19940,6 @@ function collapseCursorDiscoveredModelIds(modelIds) {
   }
   return Array.from(keys);
 }
-function mergeEffortLevels(existing, discovered) {
-  const merged = new Set(existing ?? []);
-  for (const level of discovered)
-    merged.add(level);
-  return orderEffortLevels(merged);
-}
-function orderEffortLevels(levels) {
-  const set2 = levels instanceof Set ? levels : new Set(levels);
-  return EFFORT_LEVELS.filter((level) => set2.has(level));
-}
 function lookupKnownModelCapabilities(modelId) {
   for (const catalog of [AVAILABLE_MODELS, CURSOR_AGENT_MODELS]) {
     const capabilities = catalog.find((model) => model.id === modelId)?.capabilities;
@@ -20178,13 +20119,33 @@ var FREE_ATTACHMENT = {
   billing: "free",
   capabilities: { contextWindows: [], effortLevels: [], supportsAttachments: true }
 };
+function freeTextWithVariants(effortLevels) {
+  return {
+    billing: "free",
+    capabilities: { contextWindows: [], effortLevels, supportsAttachments: false }
+  };
+}
 var OPENCODE_ZEN_MODELS = defineProviderModels([
   { id: "opencode/big-pickle", ...FREE_TEXT },
-  { id: "opencode/deepseek-v4-flash-free", ...FREE_TEXT },
+  {
+    id: "opencode/deepseek-v4-flash-free",
+    ...freeTextWithVariants(["low", "high", "max"])
+  },
+  {
+    id: "opencode/laguna-s-2.1-free",
+    ...freeTextWithVariants(["low", "medium", "high"])
+  },
+  { id: "opencode/ling-3.0-tiny-free", ...FREE_TEXT },
+  {
+    id: "opencode/longcat-2.0-free",
+    ...freeTextWithVariants(["low", "medium", "high"])
+  },
   { id: "opencode/mimo-v2.5-free", ...FREE_ATTACHMENT },
-  { id: "opencode/hy3-free", ...FREE_TEXT },
   { id: "opencode/nemotron-3-ultra-free", ...FREE_TEXT },
-  { id: "opencode/north-mini-code-free", ...FREE_TEXT },
+  { id: "opencode/north-mini-code-free", ...freeTextWithVariants(["none", "high"]) },
+  // Retained for environments whose OpenCode build still reports it. Billing
+  // metadata also keeps it in the free pre-boot fallback without a second id list.
+  { id: "opencode/hy3-free", ...FREE_TEXT },
   { id: "opencode/claude-fable-5", ...PAID },
   { id: "opencode/claude-opus-4-8", ...PAID },
   { id: "opencode/claude-opus-4-7", ...PAID },
@@ -20232,18 +20193,17 @@ var OPENCODE_ZEN_MODELS = defineProviderModels([
   { id: "opencode/qwen3.5-plus", ...PAID }
 ]);
 
+// ../shared/dist/agent-selection/catalog/models/supatest.js
+var SUPATEST_CLI_MODELS = defineProviderModels([
+  { id: "small" },
+  { id: "medium" },
+  { id: "premium" },
+  { id: "claude-sonnet-4-5" },
+  { id: "claude-opus-4-5" },
+  { id: "claude-haiku-4-5" }
+]);
+
 // ../shared/dist/agent-selection/catalog/models/picker-fallback.js
-var CLAUDE_5_EFFORT = [
-  "minimal",
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "max"
-];
-var CODEX_54_EFFORT = ["low", "medium", "high"];
-var ANTIGRAVITY_EFFORT = ["minimal", "low", "medium", "high", "max"];
-var SONNET_46_THINKING_EFFORT = ["low", "medium", "high", "xhigh"];
 function caps(effortLevels, contextWindows = []) {
   return { contextWindows, effortLevels };
 }
@@ -20255,61 +20215,56 @@ function slugModel(providerKind, id, contextWindows) {
   };
 }
 var CLAUDE_CLI_PICKER_FALLBACK_MODELS = defineProviderModels([
-  slugModel("claude_cli", ""),
-  slugModel("claude_cli", "claude-sonnet-5", ["200k", "1m"]),
-  slugModel("claude_cli", "claude-4.6-sonnet", ["1m"]),
-  slugModel("claude_cli", "claude-fable-5", ["1m"]),
-  slugModel("claude_cli", "claude-opus-4-8", ["200k", "1m"])
+  { id: "", capabilities: caps([]) },
+  ...[
+    "claude-sonnet-5",
+    "claude-opus-4-8",
+    "claude-opus-5",
+    "claude-fable-5",
+    "claude-sonnet-4-6",
+    "claude-sonnet-4-5",
+    "claude-opus-4-5",
+    "claude-opus-4-1",
+    "claude-opus-4-0",
+    "claude-sonnet-4-0",
+    "claude-haiku-4-5",
+    "claude-opus-4-6-fast",
+    "claude-opus-4-7-fast",
+    "sonnet",
+    "opus",
+    "haiku",
+    "fable"
+  ].map((id) => slugModel("claude_cli", id))
 ]);
 var CODEX_APP_SERVER_PICKER_FALLBACK_MODELS = defineProviderModels([
-  slugModel("codex_app_server", "gpt-5.6-sol"),
-  slugModel("codex_app_server", "gpt-5.6-terra"),
-  slugModel("codex_app_server", "gpt-5.6-luna"),
-  slugModel("codex_app_server", "gpt-5.5", ["1m"]),
-  slugModel("codex_app_server", "gpt-5.3-codex-spark")
+  { id: "gpt-5.6-sol", capabilities: caps(GPT_5_6_ULTRA_EFFORT_LEVELS) },
+  {
+    id: "gpt-5.6-terra",
+    capabilities: caps(GPT_5_6_ULTRA_EFFORT_LEVELS)
+  },
+  { id: "gpt-5.6-luna", capabilities: caps(GPT_5_6_EFFORT_LEVELS) },
+  { id: "gpt-5.5", capabilities: caps(CODEX_5X_EFFORT_LEVELS, ["1m"]) },
+  { id: "gpt-5.4", capabilities: caps(CODEX_5X_EFFORT_LEVELS) },
+  { id: "gpt-5.4-mini", capabilities: caps(CODEX_5X_EFFORT_LEVELS) },
+  { id: "gpt-5.3-codex-spark", capabilities: caps(CODEX_5X_EFFORT_LEVELS) }
 ]);
 var ANTIGRAVITY_CLI_PICKER_FALLBACK_MODELS = defineProviderModels([
   { id: "", capabilities: caps([]) },
-  { id: "gemini-3.5-flash", capabilities: caps(ANTIGRAVITY_EFFORT) },
-  { id: "gemini-3.1-pro", capabilities: caps(ANTIGRAVITY_EFFORT) },
-  { id: "gemini-3-flash", capabilities: caps(ANTIGRAVITY_EFFORT) },
-  // Display-name id shipped by an earlier build and persisted into
-  // `provider_configs.models`; see the note in antigravity.ts. It canonicalises
-  // onto `claude-sonnet-4-6-thinking`, so it now shares Cursor's label.
-  {
-    id: "Claude Sonnet 4.6 (Thinking)",
-    capabilities: caps(SONNET_46_THINKING_EFFORT, ["1m"])
-  }
+  { id: "gemini-3.6-flash", capabilities: caps(["low", "medium", "high"]) },
+  { id: "gemini-3.5-flash", capabilities: caps(["low", "medium", "high"]) },
+  { id: "gemini-3.1-pro", capabilities: caps(["low", "high"]) },
+  { id: "claude-sonnet-4-6" },
+  { id: "claude-opus-4-6-thinking" },
+  { id: "gpt-oss-120b", capabilities: caps(["medium"]) }
 ]);
-var CURSOR_AGENT_PICKER_FALLBACK_MODELS = collapseCursorCatalogModels(CURSOR_AGENT_MODELS);
+var CURSOR_AGENT_PICKER_FALLBACK_MODELS = CURSOR_AGENT_MODELS;
 var OPENCODE_CLI_PICKER_FALLBACK_MODELS = OPENCODE_ZEN_MODELS.filter((model) => model.billing === "free");
-var COPILOT_FALLBACK_IDS = [
-  "auto",
-  "claude-sonnet-4.6",
-  "gpt-5.4",
-  "gpt-5.4-mini",
-  "gpt-5.3-codex"
-];
-var COPILOT_CLI_PICKER_FALLBACK_MODELS = defineProviderModels(COPILOT_FALLBACK_IDS.map((id) => {
-  const fromCatalog = COPILOT_CLI_MODELS.find((model) => model.id === id);
-  if (!fromCatalog)
-    return { id };
-  const inferred = id.startsWith("gpt-") ? inferSlugModelCapabilities("codex_app_server", id) : inferSlugModelCapabilities("claude_cli", id);
-  const capabilities = inferred ?? fromCatalog.capabilities;
-  return { id, ...capabilities ? { capabilities } : {} };
-}));
-var DROID_CLI_PICKER_FALLBACK_MODELS = [...DROID_CLI_MODELS];
-var KIMI_CLI_PICKER_FALLBACK_MODELS = defineProviderModels([
-  { id: "kimi-latest" },
-  { id: "kimi-k2.6", capabilities: caps(CLAUDE_5_EFFORT) },
-  { id: "kimi-k2.6-thinking", capabilities: caps(SONNET_46_THINKING_EFFORT) }
-]);
-var GROK_CLI_PICKER_FALLBACK_MODELS = defineProviderModels(GROK_CLI_MODELS.map((model) => ({ id: model.id, capabilities: caps(CODEX_54_EFFORT) })));
-var SUPATEST_CLI_PICKER_FALLBACK_MODELS = defineProviderModels([
-  { id: "medium" },
-  { id: "premium" },
-  slugModel("claude_cli", "claude-sonnet-5", ["200k", "1m"])
-]);
+var COPILOT_CLI_PICKER_FALLBACK_MODELS = COPILOT_CLI_MODELS;
+var DROID_CLI_PICKER_FALLBACK_MODELS = DROID_CLI_MODELS;
+var KIMI_CLI_PICKER_FALLBACK_MODELS = KIMI_CLI_MODELS;
+var GROK_CLI_PICKER_FALLBACK_MODELS = GROK_CLI_MODELS;
+var SUPATEST_PICKER_MODEL_IDS = /* @__PURE__ */ new Set(["small", "medium", "premium"]);
+var SUPATEST_CLI_PICKER_FALLBACK_MODELS = SUPATEST_CLI_MODELS.filter((model) => SUPATEST_PICKER_MODEL_IDS.has(model.id));
 var PROVIDER_PICKER_FALLBACK_MODELS = {
   claude_cli: CLAUDE_CLI_PICKER_FALLBACK_MODELS,
   codex_app_server: CODEX_APP_SERVER_PICKER_FALLBACK_MODELS,
@@ -20326,16 +20281,6 @@ function getProviderPickerFallbackModels(providerKind) {
   return PROVIDER_PICKER_FALLBACK_MODELS[providerKind] ?? [];
 }
 
-// ../shared/dist/agent-selection/catalog/models/supatest.js
-var SUPATEST_CLI_MODELS = defineProviderModels([
-  { id: "small" },
-  { id: "medium" },
-  { id: "premium" },
-  { id: "claude-sonnet-4-5" },
-  { id: "claude-opus-4-5" },
-  { id: "claude-haiku-4-5" }
-]);
-
 // ../shared/dist/agent-selection/catalog/models/index.js
 var PROVIDER_MODELS = {
   claude_cli: CLAUDE_CLI_SEED_MODELS,
@@ -20479,8 +20424,37 @@ var PROVIDERS = [
 ];
 var SELECTABLE_PROVIDERS = PROVIDERS.filter((provider) => provider.selectable);
 var PROVIDER_BY_KIND = new Map(PROVIDERS.map((provider) => [provider.kind, provider]));
+function isOpenCodeProviderKind(kind) {
+  return kind === "opencode_cli" || kind === "opencode_serve";
+}
 var WORKFLOW_ELIGIBLE_PROVIDER_KINDS = PROVIDERS.filter((provider) => provider.workflowEligible).map((provider) => provider.kind);
 
+// ../shared/dist/agent-selection/discovery/model-variants.js
+var MAX_MODEL_VARIANT_LENGTH = 256;
+function hasControlCharacters(value2) {
+  for (let index = 0; index < value2.length; index += 1) {
+    const code = value2.charCodeAt(index);
+    if (code <= 31 || code === 127)
+      return true;
+  }
+  return false;
+}
+function normalizeDiscoveredModelVariants(values) {
+  const normalized = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const value2 of values) {
+    if (typeof value2 !== "string")
+      continue;
+    const trimmed = value2.trim();
+    if (!trimmed || trimmed.length > MAX_MODEL_VARIANT_LENGTH || hasControlCharacters(trimmed) || seen.has(trimmed)) {
+      continue;
+    }
+    seen.add(trimmed);
+    normalized.push(trimmed);
+  }
+  return normalized;
+}
+
 // ../shared/dist/runtime-discovered-models.js
 var OPENCODE_ZEN_MODEL_BY_ID = new Map(OPENCODE_ZEN_MODELS.map((model) => [model.id, model]));
 var DROID_MODEL_ID_PATTERN = /^(?:claude-(?:sonnet|opus|haiku|fable)-[a-z0-9][a-z0-9.-]*|gpt-[a-z0-9][a-z0-9.-]*|gemini-[a-z0-9][a-z0-9.-]*|glm-[a-z0-9][a-z0-9.-]*|kimi-[a-z0-9][a-z0-9.-]*)$/i;
@@ -20517,7 +20491,7 @@ function catalogModelsForProvider(providerKind, modelsFromConfig) {
     return withRegistryNames(catalog);
   if (DISCOVERY_SEED_PROVIDERS.has(providerKind)) {
     const configById = new Map(modelsFromConfig.map((model) => [model.id, model]));
-    const merged = catalog.map((entry) => configById.get(entry.id) ?? entry);
+    const merged = catalog.map((entry) => ({ ...entry, ...configById.get(entry.id) ?? {} }));
     const spineIds = new Set(catalog.map((entry) => entry.id));
     for (const entry of modelsFromConfig) {
       if (spineIds.has(entry.id))
@@ -20543,7 +20517,7 @@ function collapseDiscoveredModelIdsForProvider(providerKind, discoveredModelIds)
   if (providerKind === "droid_cli") {
     return discoveredModelIds.map((id) => id.trim()).filter(isValidDroidModelId);
   }
-  if (providerKind === "opencode_cli" || providerKind === "opencode_serve") {
+  if (isOpenCodeProviderKind(providerKind)) {
     const keys = /* @__PURE__ */ new Set();
     for (const id of discoveredModelIds) {
       const trimmed = id.trim();
@@ -27068,6 +27042,35 @@ function unwrapOpenCodeTaskOutput(output) {
   if (error2?.[1] !== void 0) return error2[1].trim();
   return output;
 }
+function mapOpencodePartDelta(partId, field, delta, context, state, opts = {}) {
+  if (!partId || field !== "text") return false;
+  const type = state.opencodePartTypeById?.get(partId);
+  if (type !== "text" && type !== "reasoning" && type !== "thinking") return false;
+  if (!delta) return true;
+  const parentToolUseId = opts.parentToolUseId ?? void 0;
+  if (type === "text") {
+    state.opencodeTextByPartId ??= /* @__PURE__ */ new Map();
+    const previous2 = state.opencodeTextByPartId.get(partId) ?? "";
+    state.opencodeTextByPartId.set(partId, previous2 + delta);
+    state.summary += delta;
+    if (parentToolUseId) {
+      void context.presenter.onAssistantText(delta, parentToolUseId);
+    } else {
+      void context.presenter.onAssistantText(delta);
+    }
+    return true;
+  }
+  state.opencodeReasoningByPartId ??= /* @__PURE__ */ new Map();
+  const previous = state.opencodeReasoningByPartId.get(partId) ?? "";
+  state.opencodeReasoningByPartId.set(partId, previous + delta);
+  state.iterations = Math.max(state.iterations, 1);
+  if (parentToolUseId) {
+    void context.presenter.onThinking(delta, parentToolUseId);
+  } else {
+    void context.presenter.onThinking(delta);
+  }
+  return true;
+}
 function emitOpenCodeToolPart(presenter, state, part, opts) {
   const stateRecord = getRecord(part.state);
   const status = getString(stateRecord?.status);
@@ -27097,6 +27100,11 @@ function emitOpenCodeToolPart(presenter, state, part, opts) {
 function mapOpencodePart(part, context, state, opts = {}) {
   const presenter = context.presenter;
   const type = getString(part.type);
+  const partId = getOpenCodePartId(part);
+  if (partId && type) {
+    state.opencodePartTypeById ??= /* @__PURE__ */ new Map();
+    state.opencodePartTypeById.set(partId, type);
+  }
   switch (type) {
     case "step-start": {
       state.iterations += 1;
@@ -27106,10 +27114,14 @@ function mapOpencodePart(part, context, state, opts = {}) {
     case "text": {
       const text = typeof part.text === "string" ? part.text : "";
       if (text) {
-        const delta = resolveOpenCodeTextDelta(text, getOpenCodePartId(part), state);
+        const delta = resolveOpenCodeTextDelta(text, partId, state);
         if (delta) {
           state.summary += delta;
-          void presenter.onAssistantText(delta);
+          if (opts.parentToolUseId) {
+            void presenter.onAssistantText(delta, opts.parentToolUseId);
+          } else {
+            void presenter.onAssistantText(delta);
+          }
         }
       }
       return true;
@@ -27120,10 +27132,14 @@ function mapOpencodePart(part, context, state, opts = {}) {
     case "thinking": {
       const text = typeof part.text === "string" ? part.text : "";
       if (!text) return true;
-      const delta = resolveOpenCodeReasoningDelta(text, getOpenCodePartId(part), state);
+      const delta = resolveOpenCodeReasoningDelta(text, partId, state);
       if (!delta) return true;
       state.iterations = Math.max(state.iterations, 1);
-      void presenter.onThinking(delta);
+      if (opts.parentToolUseId) {
+        void presenter.onThinking(delta, opts.parentToolUseId);
+      } else {
+        void presenter.onThinking(delta);
+      }
       return true;
     }
     case "tool": {
@@ -27501,6 +27517,18 @@ async function sendPrompt(baseUrl, sessionId, context, parts2, signal) {
     throw new Error(`OpenCode prompt request failed: HTTP ${response.status} ${text}`.trim());
   }
 }
+async function consumeOpenCodeEventsDuringPrompt(events, promptRequest, closeEvents, handleEvent) {
+  const promptOutcome = { error: null };
+  const observedPromptRequest = promptRequest.catch((error2) => {
+    promptOutcome.error = error2 instanceof Error ? error2.message : String(error2);
+    closeEvents();
+  });
+  for await (const event of events) {
+    if (handleEvent(event)) break;
+  }
+  await observedPromptRequest;
+  return promptOutcome.error;
+}
 async function replyToPermission(baseUrl, requestId, reply, signal) {
   await fetch(`${baseUrl}/permission/${encodeURIComponent(requestId)}/reply`, {
     method: "POST",
@@ -27616,23 +27644,20 @@ function createOpencodeServeBackend(command = "opencode") {
           context.abortController.signal
         );
         sseClose = connection.close;
-        const promptError = await sendPrompt(
+        const promptRequest = sendPrompt(
           server.baseUrl,
           sessionId,
           runContext,
           parts2,
           context.abortController.signal
-        ).then(() => null).catch((error2) => ({
-          message: error2 instanceof Error ? error2.message : String(error2)
-        }));
-        if (context.abortController.signal.aborted) {
-        } else if (promptError) {
-          state.error = promptError.message;
-          void context.presenter.onError(promptError.message);
-        } else {
-          for await (const event of connection.events) {
-            if (aborted2) break;
-            const done = handleOpenCodeServeEvent(
+        );
+        const promptError = await consumeOpenCodeEventsDuringPrompt(
+          connection.events,
+          promptRequest,
+          connection.close,
+          (event) => {
+            if (aborted2) return true;
+            return handleOpenCodeServeEvent(
               event,
               sessionId,
               runContext,
@@ -27640,8 +27665,11 @@ function createOpencodeServeBackend(command = "opencode") {
               readOnly,
               server.baseUrl
             );
-            if (done) break;
           }
+        );
+        if (!context.abortController.signal.aborted && promptError) {
+          state.error = promptError;
+          void context.presenter.onError(promptError);
         }
         return buildAgentResult(state, sessionId, aborted2);
       } catch (error2) {
@@ -27709,8 +27737,16 @@ function handleOpenCodeChildSessionEvent(event, eventSessionId, context, state,
       mapOpencodePart(part, context, state, { parentToolUseId });
       return false;
     }
-    case "message.part.delta":
+    case "message.part.delta": {
+      const messageId = getString(properties.messageID);
+      if (messageId && state.opencodeUserMessageIds?.has(messageId)) return false;
+      const partId = getString(properties.partID);
+      const field = getString(properties.field);
+      const delta = typeof properties.delta === "string" ? properties.delta : "";
+      const parentToolUseId = resolveChildSessionLauncherToolId(state, eventSessionId);
+      mapOpencodePartDelta(partId, field, delta, context, state, { parentToolUseId });
       return false;
+    }
     case "permission.asked": {
       decideAndReplyToPermission(
         context.presenter,
@@ -27771,10 +27807,15 @@ function handleOpenCodeServeEvent(event, sessionId, context, state, readOnly, ba
       mapOpencodePart(part, context, state);
       return false;
     }
-    // Live token-by-token streaming is explicitly out of scope — only the
-    // start/complete snapshots from message.part.updated are consumed.
-    case "message.part.delta":
+    case "message.part.delta": {
+      const messageId = getString(properties.messageID);
+      if (messageId && state.opencodeUserMessageIds?.has(messageId)) return false;
+      const partId = getString(properties.partID);
+      const field = getString(properties.field);
+      const delta = typeof properties.delta === "string" ? properties.delta : "";
+      mapOpencodePartDelta(partId, field, delta, context, state);
       return false;
+    }
     case "permission.asked": {
       decideAndReplyToPermission(
         context.presenter,
@@ -30901,6 +30942,7 @@ var ANTIGRAVITY_MODEL_DISCOVERY_TIMEOUT_MS = 12e3;
 var OPENCODE_ZEN_MODEL_IDS = OPENCODE_ZEN_MODELS.map((model) => model.id);
 var CLAUDE_MODEL_ID_PATTERN = /claude-(?:sonnet|opus|haiku|fable)-[a-z0-9][a-z0-9-]*/g;
 var CLAUDE_MODEL_ALIASES = ["sonnet", "opus", "haiku", "fable"];
+var CLAUDE_MODEL_ALIAS_SET = new Set(CLAUDE_MODEL_ALIASES);
 var CLAUDE_MODEL_QUALIFIER_SEGMENTS = /* @__PURE__ */ new Set(["fast", "thinking", "latest", "preview"]);
 var PROTECTED_CATALOG_MODEL_IDS = new Set(
   AVAILABLE_MODELS.map((model) => model.id).filter((id) => id.length > 0)
@@ -30941,10 +30983,7 @@ function normalizeCodexReasoningEffort(effort) {
   const normalized = effort.trim().toLowerCase();
   if (!normalized) return null;
   if (normalized === "none") return "minimal";
-  if (normalized === "minimal" || normalized === "low" || normalized === "medium" || normalized === "high" || normalized === "xhigh" || normalized === "max" || normalized === "ultra") {
-    return normalized;
-  }
-  return null;
+  return isEffortLevel(normalized) ? normalized : null;
 }
 function extractCodexDiscoveredModelIdsFromDebugJson(value2) {
   if (!value2 || typeof value2 !== "object") return [];
@@ -30973,17 +31012,6 @@ function extractCodexDiscoveredModelIdsFromDebugJson(value2) {
   return [...new Set(ids)];
 }
 var OPENCODE_MODEL_ID_LINE_PATTERN = /^[a-z0-9][\w.-]*\/[\w.-]+$/i;
-var OPENCODE_KNOWN_VARIANT_KEYS = /* @__PURE__ */ new Set([
-  "minimal",
-  "none",
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "extra-high",
-  "max",
-  "ultra"
-]);
 function parseOpenCodeVerboseModelOutput(text) {
   const entries = [];
   const lines = text.split(/\r?\n/);
@@ -31028,10 +31056,16 @@ function parseOpenCodeVerboseModelOutput(text) {
     if (endLineIdx === -1) break;
     try {
       const obj = JSON.parse(buffer);
+      const inputCost = obj.cost?.input;
+      const outputCost = obj.cost?.output;
+      const hasNumericCost = typeof inputCost === "number" || typeof outputCost === "number";
       entries.push({
         id: line,
         reasoning: obj.capabilities?.reasoning === true,
-        variants: obj.variants ? Object.keys(obj.variants) : []
+        variants: obj.variants ? Object.keys(obj.variants) : [],
+        ...hasNumericCost ? {
+          billing: inputCost === 0 && outputCost === 0 ? "free" : "paid"
+        } : {}
       });
     } catch {
     }
@@ -31039,34 +31073,18 @@ function parseOpenCodeVerboseModelOutput(text) {
   }
   return entries;
 }
-function extractOpenCodeModelCapabilitiesFromVerboseOutput(text) {
-  return parseOpenCodeVerboseModelOutput(text).filter((entry) => entry.id.startsWith("opencode/")).map((entry) => ({
+function openCodeCapabilitiesFromEntries(entries) {
+  return entries.filter((entry) => entry.id.startsWith("opencode/")).map((entry) => ({
     id: entry.id,
-    variants: entry.reasoning ? entry.variants.filter((variant) => {
-      const trimmed = variant.trim();
-      return Boolean(trimmed) && trimmed.length <= 256 && !Array.from(trimmed).some((character) => {
-        const code = character.charCodeAt(0);
-        return code <= 31 || code === 127;
-      });
-    }) : []
+    variants: entry.reasoning ? normalizeDiscoveredModelVariants(entry.variants) : []
   }));
 }
-function extractOpenCodeDiscoveredModelIdsFromVerboseOutput(text) {
-  const entries = extractOpenCodeModelCapabilitiesFromVerboseOutput(text);
-  const ids = [];
+function openCodeBillingFromEntries(entries) {
+  const billing = {};
   for (const entry of entries) {
-    const knownVariants = entry.variants.filter(
-      (variant) => OPENCODE_KNOWN_VARIANT_KEYS.has(variant)
-    );
-    if (knownVariants.length === 0) {
-      ids.push(entry.id);
-      continue;
-    }
-    for (const variant of knownVariants) {
-      ids.push(`${entry.id}-${variant}`);
-    }
+    if (entry.id.startsWith("opencode/") && entry.billing) billing[entry.id] = entry.billing;
   }
-  return [...new Set(ids)];
+  return billing;
 }
 function extractModelIdsFromText(value2) {
   const ansiPattern = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
@@ -31078,19 +31096,22 @@ function extractModelIdsFromText(value2) {
 }
 function extractModelIdsFromLabeledList(value2) {
   const ansiPattern = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
-  const ignoredLinePattern = /^(available models|models|usage|error|warning:)/i;
+  const ignoredLinePattern = /^(available models|fetching available models|models|usage|error|warning:)/i;
   const ids = [];
   for (const rawLine of value2.split(/\r?\n/)) {
     const line = rawLine.replace(ansiPattern, "").trim();
     if (!line || ignoredLinePattern.test(line)) continue;
     const dashIdx = line.indexOf(" - ");
-    const id = (dashIdx >= 0 ? line.slice(0, dashIdx) : line).trim();
+    const tabIdx = line.indexOf("	");
+    const separatorIndexes = [dashIdx, tabIdx].filter((index) => index >= 0);
+    const separatorIdx = separatorIndexes.length > 0 ? Math.min(...separatorIndexes) : -1;
+    const id = (separatorIdx >= 0 ? line.slice(0, separatorIdx) : line).trim();
     if (id) ids.push(id);
   }
   return [...new Set(ids)];
 }
 function isValidClaudeModelId(id) {
-  if (CLAUDE_MODEL_ALIASES.includes(id)) return true;
+  if (CLAUDE_MODEL_ALIAS_SET.has(id)) return true;
   const match = id.match(/^claude-(sonnet|opus|haiku|fable)-([a-z0-9][a-z0-9-]*)$/);
   if (!match) return false;
   if (id.includes(".")) return false;
@@ -31186,17 +31207,27 @@ async function discoverOpenCodeModels(executable, env) {
     MODEL_DISCOVERY_TIMEOUT_MS
   );
   if (verbose && !verbose.error && verbose.status === 0 && verbose.stdout.trim()) {
-    const withEffort = extractOpenCodeDiscoveredModelIdsFromVerboseOutput(verbose.stdout);
-    if (withEffort.length > 0) return withEffort;
+    const entries = parseOpenCodeVerboseModelOutput(verbose.stdout);
+    const modelCapabilities = openCodeCapabilitiesFromEntries(entries);
+    if (modelCapabilities.length > 0) {
+      const modelBilling = openCodeBillingFromEntries(entries);
+      return {
+        models: modelCapabilities.map(({ id }) => id),
+        modelVariants: Object.fromEntries(
+          modelCapabilities.map(({ id, variants }) => [id, variants])
+        ),
+        ...Object.keys(modelBilling).length > 0 ? { modelBilling } : {}
+      };
+    }
   }
   const plain = await probeJsonOrTextModels(executable, env, [["models"]]);
-  if (plain.length > 0) return plain;
+  if (plain.length > 0) return { models: plain };
   const legacy = await probeJsonOrTextModels(executable, env, [
     ["models", "--json"],
     ["models", "list", "--json"],
     ["model", "list", "--json"]
   ]);
-  return legacy.length > 0 ? legacy : OPENCODE_ZEN_MODEL_IDS;
+  return { models: legacy.length > 0 ? legacy : OPENCODE_ZEN_MODEL_IDS };
 }
 async function discoverAntigravityModels(executable, env) {
   return probeJsonOrTextModels(executable, env, [["models"]], {
@@ -31236,13 +31267,14 @@ var CATALOG_ONLY_PROVIDERS = /* @__PURE__ */ new Set(["supatest_cli", "droid_cli
 function supportsProviderModelDiscovery(provider) {
   return provider === "opencode_serve" || provider in CATALOG_MODEL_IDS_BY_PROVIDER;
 }
-async function discoverProviderModels(provider, executable, env) {
+async function discoverProviderModelDetails(provider, executable, env) {
   if (CATALOG_ONLY_PROVIDERS.has(provider)) {
-    return getCatalogModelIds(provider);
+    return { models: getCatalogModelIds(provider) };
   }
   let probed = [];
-  if (provider === "opencode_cli" || provider === "opencode_serve") {
-    probed = await discoverOpenCodeModels(executable, env);
+  if (isOpenCodeProviderKind(provider)) {
+    const discovered = await discoverOpenCodeModels(executable, env);
+    if (discovered.models.length > 0) return discovered;
   } else if (provider === "antigravity_cli") {
     probed = await discoverAntigravityModels(executable, env);
   } else if (provider === "cursor_agent_cli") {
@@ -31254,8 +31286,8 @@ async function discoverProviderModels(provider, executable, env) {
   } else if (provider === "kimi_cli" || provider === "grok_cli") {
     probed = await discoverGenericModels(executable, env);
   }
-  if (probed.length > 0) return probed;
-  return getCatalogModelIds(provider);
+  if (probed.length > 0) return { models: probed };
+  return { models: getCatalogModelIds(provider) };
 }
 
 // src/daemon-provider-scan.ts
@@ -31328,9 +31360,9 @@ function refreshSingleProviderModels(provider, executable, env) {
   if (inFlight) return inFlight;
   const probe = (async () => {
     try {
-      const models = await discoverProviderModels(provider, executable, env);
-      if (models.length > 0 || !providerModelCache.has(cacheKey)) {
-        providerModelCache.set(cacheKey, models);
+      const discovery = await discoverProviderModelDetails(provider, executable, env);
+      if (discovery.models.length > 0 || !providerModelCache.has(cacheKey)) {
+        providerModelCache.set(cacheKey, discovery);
       }
     } finally {
       providerModelProbesInFlight.delete(cacheKey);
@@ -31387,13 +31419,15 @@ function discoverCapabilities() {
         providerAvailabilitySeen.delete(provider);
       }
       const version2 = providerVersionCache.get(provider);
-      const models = executable ? providerModelCache.get(providerModelCacheKey(provider, executable)) ?? [] : [];
+      const modelDiscovery = executable ? providerModelCache.get(providerModelCacheKey(provider, executable)) : void 0;
       const auth2 = available ? providerAuthCache.get(provider) : void 0;
       return {
         provider,
         available,
         ...version2 ? { version: version2 } : {},
-        models,
+        models: modelDiscovery?.models ?? [],
+        ...modelDiscovery?.modelVariants ? { modelVariants: modelDiscovery.modelVariants } : {},
+        ...modelDiscovery?.modelBilling ? { modelBilling: modelDiscovery.modelBilling } : {},
         lastCheckedAt: now,
         ...auth2 ? {
           authStatus: auth2.status,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiden-ade/sandbox-agent",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "type": "module",
   "description": "Alan agent runtime — cloud sandbox and local daemon (alan-agent CLI)",
   "bin": {