@aiden-ade/sandbox-agent 0.1.39 → 0.1.41

package/dist/index.cjs

@@ -14590,9 +14590,9 @@ function getAlanAgentPrompt(agentId) {
   return getAgentSystemPrompt(agentId);
 }
 
-// ../shared/dist/types/frontend.js
+// ../shared/dist/effort.js
 var EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh", "max", "ultra"];
-var CLAUDE_48_EFFORT_LEVELS = [
+var CLAUDE_EFFORT_LEVELS = [
   "minimal",
   "low",
   "medium",
@@ -14600,20 +14600,144 @@ var CLAUDE_48_EFFORT_LEVELS = [
   "xhigh",
   "max"
 ];
-var CLAUDE_5_EFFORT_LEVELS = [
+var CODEX_5X_EFFORT_LEVELS = ["low", "medium", "high", "xhigh"];
+var GPT_5_5_EFFORT_LEVELS = [
   "minimal",
+  "low",
+  "medium",
+  "high",
+  "xhigh"
+];
+var GPT_5_4_EFFORT_LEVELS = ["low", "medium", "high"];
+var GPT_5_6_EFFORT_LEVELS = [
   "low",
   "medium",
   "high",
   "xhigh",
   "max"
 ];
-var CODEX_5X_EFFORT_LEVELS = [
+var GPT_5_6_ULTRA_EFFORT_LEVELS = [
   "low",
   "medium",
   "high",
-  "xhigh"
+  "xhigh",
+  "max",
+  "ultra"
+];
+var ATOMIC_MODEL_IDS = /* @__PURE__ */ new Set([
+  "gpt-5.1-codex-max",
+  "opencode/gpt-5.1-codex-max"
+]);
+var EFFORT_SUFFIXES = [
+  { suffix: "-extra-high", level: "xhigh" },
+  { suffix: "-xhigh", level: "xhigh" },
+  { suffix: "-ultra", level: "ultra" },
+  { suffix: "-max", level: "max" },
+  { suffix: "-high", level: "high" },
+  { suffix: "-medium", level: "medium" },
+  { suffix: "-low", level: "low" },
+  { suffix: "-none", level: "minimal" },
+  { suffix: "-minimal", level: "minimal" }
 ];
+function isAtomicModelId(modelId) {
+  return ATOMIC_MODEL_IDS.has(modelId.trim());
+}
+function isEffortLevel(value2) {
+  return EFFORT_LEVELS.includes(value2);
+}
+var EFFORT_RANK = {
+  minimal: 0,
+  low: 1,
+  medium: 2,
+  high: 3,
+  xhigh: 4,
+  max: 5,
+  ultra: 6
+};
+function clampEffortToSupported(requested, allowed) {
+  if (!requested?.trim() || allowed.length === 0)
+    return null;
+  const normalized = requested.trim().toLowerCase();
+  if (!isEffortLevel(normalized))
+    return null;
+  if (allowed.includes(normalized))
+    return normalized;
+  const targetRank = EFFORT_RANK[normalized];
+  let best = null;
+  for (const level of allowed) {
+    if (EFFORT_RANK[level] <= targetRank) {
+      if (!best || EFFORT_RANK[level] > EFFORT_RANK[best])
+        best = level;
+    }
+  }
+  return best ?? allowed[0] ?? null;
+}
+function inferEffortLevelsForModel(harness, modelId) {
+  const id = collapseModelIdToBase(modelId);
+  if (harness === "claude_cli" || id.startsWith("claude-") || id === "sonnet" || id === "opus") {
+    if (id === "haiku" || id.startsWith("claude-haiku-"))
+      return [];
+    return CLAUDE_EFFORT_LEVELS;
+  }
+  if (id === "gpt-5.5")
+    return GPT_5_5_EFFORT_LEVELS;
+  if (id === "gpt-5.4" || id === "gpt-5.4-mini")
+    return GPT_5_4_EFFORT_LEVELS;
+  if (/^gpt-5\.6-/.test(id)) {
+    const hasUltra = id.includes("-sol") || id.includes("-terra");
+    return hasUltra ? GPT_5_6_ULTRA_EFFORT_LEVELS : GPT_5_6_EFFORT_LEVELS;
+  }
+  if (id.includes("codex") || /^gpt-5\.[0-3]/.test(id))
+    return CODEX_5X_EFFORT_LEVELS;
+  return [];
+}
+function resolveWireEffort(input) {
+  const allowed = input.effortLevels && input.effortLevels.length > 0 ? input.effortLevels : inferEffortLevelsForModel(input.harness, input.modelId);
+  const clamped = clampEffortToSupported(input.selectedEffortLevel, allowed);
+  if (!clamped)
+    return null;
+  if (input.harness === "cursor_agent_cli" && clamped === "minimal")
+    return "none";
+  if (input.harness === "claude_cli" && clamped === "minimal")
+    return "low";
+  return clamped;
+}
+function parseModelEffortSuffix(modelId) {
+  const trimmed = modelId.trim();
+  if (!trimmed)
+    return { baseId: "", effort: null, fast: false };
+  if (isAtomicModelId(trimmed)) {
+    return { baseId: trimmed, effort: null, fast: false };
+  }
+  let id = trimmed;
+  let fast = false;
+  if (id.endsWith("-fast")) {
+    const withoutFast = id.slice(0, -"-fast".length);
+    if (isAtomicModelId(withoutFast)) {
+      return { baseId: withoutFast, effort: null, fast: true };
+    }
+    fast = true;
+    id = withoutFast;
+  }
+  if (isAtomicModelId(id)) {
+    return { baseId: id, effort: null, fast };
+  }
+  for (const { suffix, level } of EFFORT_SUFFIXES) {
+    if (id.endsWith(suffix)) {
+      return { baseId: id.slice(0, -suffix.length), effort: level, fast };
+    }
+  }
+  return { baseId: id, effort: null, fast };
+}
+function collapseModelIdToBase(modelId) {
+  const parsed = parseModelEffortSuffix(modelId);
+  if (parsed.fast && !parsed.effort)
+    return modelId.trim();
+  return parsed.baseId;
+}
+
+// ../shared/dist/types/frontend.js
+var CLAUDE_5_EFFORT_LEVELS = CLAUDE_EFFORT_LEVELS;
 var AVAILABLE_MODELS = [
   {
     id: "",
@@ -14628,7 +14752,7 @@ var AVAILABLE_MODELS = [
   {
     id: "claude-opus-4-8",
     name: "Opus 4.8",
-    capabilities: { contextWindows: ["200k", "1m"], effortLevels: CLAUDE_48_EFFORT_LEVELS }
+    capabilities: { contextWindows: ["200k", "1m"], effortLevels: CLAUDE_5_EFFORT_LEVELS }
   },
   {
     id: "claude-haiku-4-5",
@@ -14867,51 +14991,8 @@ function findModelDef(providerKind, modelId) {
 }
 
 // ../shared/dist/cursor-agent-models.js
-var CLAUDE_5_EFFORT_LEVELS2 = [
-  "minimal",
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "max"
-];
-var CODEX_5X_EFFORT_LEVELS2 = ["low", "medium", "high", "xhigh"];
-var GPT_5_5_EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh"];
-var GPT_5_4_EFFORT_LEVELS = ["low", "medium", "high"];
-var GPT_5_6_EFFORT_LEVELS = [
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "max",
-  "ultra"
-];
-var CURSOR_EFFORT_SUFFIXES = [
-  { suffix: "-extra-high", level: "xhigh" },
-  { suffix: "-xhigh", level: "xhigh" },
-  { suffix: "-ultra", level: "ultra" },
-  { suffix: "-max", level: "max" },
-  { suffix: "-high", level: "high" },
-  { suffix: "-medium", level: "medium" },
-  { suffix: "-low", level: "low" },
-  { suffix: "-none", level: "minimal" }
-];
-function parseCursorModelId(modelId) {
-  let id = modelId.trim();
-  let fast = false;
-  if (id.endsWith("-fast")) {
-    fast = true;
-    id = id.slice(0, -"-fast".length);
-  }
-  for (const { suffix, level } of CURSOR_EFFORT_SUFFIXES) {
-    if (id.endsWith(suffix)) {
-      return { baseId: id.slice(0, -suffix.length), effort: level, fast };
-    }
-  }
-  return { baseId: id, effort: null, fast };
-}
 function getCursorModelCollapseKey(modelId) {
-  const parsed = parseCursorModelId(modelId);
+  const parsed = parseModelEffortSuffix(modelId);
   if (parsed.fast && !parsed.effort)
     return modelId.trim();
   return parsed.baseId;
@@ -15017,11 +15098,11 @@ function inferSlugModelCapabilities(providerKind, modelId) {
       const hasUltra = id.includes("-sol") || id.includes("-terra");
       return {
         contextWindows: [],
-        effortLevels: hasUltra ? GPT_5_6_EFFORT_LEVELS : GPT_5_6_EFFORT_LEVELS.filter((level) => level !== "ultra")
+        effortLevels: hasUltra ? GPT_5_6_ULTRA_EFFORT_LEVELS : GPT_5_6_EFFORT_LEVELS
       };
     }
     if (id.includes("codex") || /^gpt-5\.[0-3]/.test(id)) {
-      return { contextWindows: [], effortLevels: CODEX_5X_EFFORT_LEVELS2 };
+      return { contextWindows: [], effortLevels: CODEX_5X_EFFORT_LEVELS };
     }
     return void 0;
   }
@@ -15030,10 +15111,10 @@ function inferSlugModelCapabilities(providerKind, modelId) {
       return { contextWindows: ["200k"], effortLevels: [] };
     }
     if (id === "claude-opus-4-8") {
-      return { contextWindows: ["200k", "1m"], effortLevels: CLAUDE_5_EFFORT_LEVELS2 };
+      return { contextWindows: ["200k", "1m"], effortLevels: CLAUDE_EFFORT_LEVELS };
     }
     if (id === "sonnet" || id === "opus" || id === "fable" || /^claude-(sonnet|opus|fable)-/.test(id)) {
-      return { contextWindows: ["200k", "1m"], effortLevels: CLAUDE_5_EFFORT_LEVELS2 };
+      return { contextWindows: ["200k", "1m"], effortLevels: CLAUDE_EFFORT_LEVELS };
     }
     return void 0;
   }
@@ -15840,20 +15921,27 @@ function classifyCliErrorDetailed(stderr, _exitCode, opts) {
   }
   const haystack = [stderr, ...opts?.extraSignals ?? []].join("\n").toLowerCase();
   const has = (...needles) => needles.some((n) => haystack.includes(n));
+  if (has("codex cli connection expired", "reconnect openai codex"))
+    return specForErrorKind("auth_expired");
+  if (has("codex connection to openai timed out")) return specForErrorKind("provider_timeout");
   if (has("authentication required", "not authenticated"))
     return specForErrorKind("not_authenticated");
   if (has("out of usage", "increase your limit")) return specForErrorKind("usage_limit");
   if (has("no chat found", "chat not found", "session not found", "could not resume"))
     return specForErrorKind("resume_failed");
   if (has("rate_limit", "rate limit", "429")) return specForErrorKind("rate_limited");
-  if (isLikelyProviderAuthError(haystack)) return specForErrorKind("auth_invalid");
+  if (has("authentication_failed", "authentication error", "authentication failed") || isLikelyProviderAuthError(haystack))
+    return specForErrorKind("auth_invalid");
   if (has(
     "not logged in",
     "login required",
     "please sign in",
     "please log in",
     "sign in to",
-    "log in to"
+    "log in to",
+    // Claude prompts the user to re-auth with the /login slash command.
+    "run /login",
+    "please run /login"
   ))
     return specForErrorKind("not_logged_in");
   if (has(
@@ -17340,11 +17428,15 @@ function createClaudeCliBackend(command = "claude", defaultArgs = []) {
       if (context.config.teamId?.trim() && await cliSupportsFlag(command, "--approve-mcps", context.env)) {
         args.push("--approve-mcps");
       }
-      const baseModel = context.config.selectedModel?.trim();
+      const baseModel = collapseModelIdToBase(context.config.selectedModel?.trim() || "");
       if (baseModel) {
         args.push("--model", buildClaudeModelArg(baseModel, context.config.selectedContextWindow));
       }
-      const claudeEffort = context.config.selectedEffortLevel?.trim();
+      const claudeEffort = resolveWireEffort({
+        harness: "claude_cli",
+        modelId: baseModel,
+        selectedEffortLevel: context.config.selectedEffortLevel
+      });
       if (claudeEffort) {
         args.push("--effort", claudeEffort);
       }
@@ -17865,8 +17957,14 @@ var parseCodexStructuredLine = createStructuredLineParser(
   "codex_app_server",
   handleCodexStructuredEvent
 );
-function buildCodexEffortArgs(selectedEffortLevel) {
-  const level = selectedEffortLevel?.trim();
+function buildCodexEffortArgs(selectedEffortLevel, options) {
+  const modelId = collapseModelIdToBase(options?.modelId?.trim() || "");
+  const level = resolveWireEffort({
+    harness: "codex_app_server",
+    modelId,
+    selectedEffortLevel,
+    effortLevels: options?.effortLevels
+  });
   if (!level) return [];
   return ["-c", `model_reasoning_effort=${level}`];
 }
@@ -17916,8 +18014,11 @@ function createCodexRuntimeBackend(command = "codex", defaultArgs = []) {
           startupTimeoutMs: CODEX_STARTUP_TIMEOUT_MS,
           buildArgs: (ctx) => {
             const resumeId = resumableSessionId;
-            const modelArgs = ctx.config.selectedModel?.trim() ? ["--model", ctx.config.selectedModel.trim()] : [];
-            const effortArgs = buildCodexEffortArgs(ctx.config.selectedEffortLevel);
+            const selectedModel = collapseModelIdToBase(ctx.config.selectedModel?.trim() || "");
+            const modelArgs = selectedModel ? ["--model", selectedModel] : [];
+            const effortArgs = buildCodexEffortArgs(ctx.config.selectedEffortLevel, {
+              modelId: selectedModel
+            });
             const permissionArgs = getCodexPermissionArgs(ctx.config);
             const imageArgs = imagePaths.flatMap((p) => ["--image", p]);
             const baseArgs = resumeId ? [
@@ -18221,58 +18322,48 @@ var parseCursorStructuredLine = createStructuredLineParser(
   "cursor_agent_cli",
   handleCursorStructuredEvent
 );
-var CURSOR_EFFORT_SUFFIXES2 = [
-  { suffix: "-extra-high", level: "xhigh" },
-  { suffix: "-xhigh", level: "xhigh" },
-  { suffix: "-max", level: "max" },
-  { suffix: "-high", level: "high" },
-  { suffix: "-medium", level: "medium" },
-  { suffix: "-low", level: "low" },
-  { suffix: "-none", level: "minimal" }
-];
-function parseCursorModelId2(modelId) {
-  let id = modelId.trim();
-  let fast = false;
-  if (id.endsWith("-fast")) {
-    fast = true;
-    id = id.slice(0, -"-fast".length);
-  }
-  for (const { suffix, level } of CURSOR_EFFORT_SUFFIXES2) {
-    if (id.endsWith(suffix)) {
-      return { baseId: id.slice(0, -suffix.length), effort: level, fast };
-    }
-  }
-  return { baseId: id, effort: null, fast };
-}
-function cursorEffortForBracket(level) {
-  if (level === "minimal") return "none";
-  return level;
-}
-function asEffortLevel(value2, allowed) {
-  if (!value2) return null;
-  return allowed.includes(value2) ? value2 : null;
-}
 function asContextWindow(value2) {
   if (value2 === "1m" || value2 === "200k") return value2;
   return null;
 }
+function cursorEffortSuffix(level, baseId) {
+  if (level === "minimal") return "-none";
+  if (level === "xhigh") {
+    if (/^gpt-5\.5(?:-|$)/.test(baseId)) return "-extra-high";
+    return "-xhigh";
+  }
+  if (level === "ultra") return "-max";
+  return `-${level}`;
+}
 function buildCursorAgentModelArg(modelId, options) {
   const trimmed = modelId.trim();
   if (!trimmed) return trimmed;
-  const parsed = parseCursorModelId2(trimmed);
+  const parsed = parseModelEffortSuffix(trimmed);
   if (parsed.fast && !parsed.effort) return trimmed;
+  const baseId = collapseModelIdToBase(trimmed);
   const effortLevels = options?.effortLevels ?? [];
-  const overrides = [];
-  const contextWindow = asContextWindow(options?.selectedContextWindow);
-  if (contextWindow === "1m") {
-    overrides.push("context=1m");
+  const wireEffort = resolveWireEffort({
+    harness: "cursor_agent_cli",
+    modelId: baseId,
+    selectedEffortLevel: options?.selectedEffortLevel,
+    effortLevels
+  });
+  let id = baseId;
+  if (wireEffort) {
+    const alanLevel = wireEffort === "none" ? "minimal" : wireEffort;
+    if (isEffortLevel(alanLevel)) {
+      const allowed = effortLevels.length === 0 || effortLevels.includes(alanLevel) || alanLevel === "minimal" && effortLevels.includes("minimal");
+      if (allowed) {
+        id = `${baseId}${cursorEffortSuffix(alanLevel, baseId)}`;
+      }
+    }
   }
-  const effort = asEffortLevel(options?.selectedEffortLevel, effortLevels);
-  if (effort) {
-    overrides.push(`effort=${cursorEffortForBracket(effort)}`);
+  const contextWindow = asContextWindow(options?.selectedContextWindow);
+  if (contextWindow === "1m" && id === baseId) {
+    return `${baseId}[context=1m]`;
   }
-  if (overrides.length === 0) return parsed.baseId;
-  return `${parsed.baseId}[${overrides.join(",")}]`;
+  if (parsed.fast) return `${id}-fast`;
+  return id;
 }
 function isCursorAgentCliModelId(model) {
   return model === "auto" || /^composer-/.test(model) || /^gpt-/.test(model) || /^claude-/.test(model) || /^gemini-/.test(model) || /^grok-/.test(model) || /^kimi-/.test(model);
@@ -18352,7 +18443,7 @@ function createCursorAgentCliBackend(command = "cursor-agent", defaultArgs = [])
             }
             const model = ctx.config.selectedModel?.trim();
             if (model && isDispatchableCursorModel(model)) {
-              const modelDef = findModelDef("cursor_agent_cli", model);
+              const modelDef = findModelDef("cursor_agent_cli", model) ?? findModelDef("cursor_agent_cli", model.replace(/-fast$/, ""));
               args.push(
                 "--model",
                 buildCursorAgentModelArg(model, {
@@ -22436,7 +22527,7 @@ var RunStartGate = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.39";
+var AGENT_VERSION = "0.1.41";
 
 // src/workspace-relocation.ts
 var import_node_child_process3 = require("child_process");

package/package.json

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