@aiden-ade/sandbox-agent 0.1.38 → 0.1.40

package/dist/index.cjs

@@ -15717,10 +15717,107 @@ function getCodexPermissionArgs(config) {
   const sandbox = shouldUseReadOnlyRuntimePermissions(config) ? "read-only" : "danger-full-access";
   return ["--ask-for-approval", "never", "--sandbox", sandbox];
 }
+var ERROR_SPECS = {
+  model_mismatch: {
+    message: "The selected model isn't available, or you don't have access to it. Pick a different model, then send your message again.",
+    recoveryClass: "user_fixable"
+  },
+  auth_invalid: {
+    message: "API key invalid or expired. Check your provider settings, then retry.",
+    recoveryClass: "user_fixable"
+  },
+  not_logged_in: {
+    message: "Not logged in to this provider. Sign in from provider settings, then retry.",
+    recoveryClass: "user_fixable"
+  },
+  not_authenticated: {
+    message: "The agent CLI isn't signed in on this runtime. Authenticate it there, then retry.",
+    recoveryClass: "needs_env"
+  },
+  auth_expired: {
+    message: "The provider connection expired. Reconnect it in Cloud settings, then restart or recreate the machine.",
+    recoveryClass: "user_fixable"
+  },
+  subscription_required: {
+    message: "This model requires a paid subscription. Switch to a supported model or upgrade your plan.",
+    recoveryClass: "user_fixable"
+  },
+  quota_exceeded: {
+    message: "API quota exceeded. Wait for it to reset or check your billing, then retry.",
+    recoveryClass: "user_fixable"
+  },
+  usage_limit: {
+    message: "Provider usage limit reached. Switch model or wait for the limit to reset, then retry.",
+    recoveryClass: "user_fixable"
+  },
+  context_length: {
+    message: "Context window exceeded \u2014 the conversation is too long. Start a new session or send a shorter message.",
+    recoveryClass: "user_fixable"
+  },
+  rate_limited: {
+    message: "Rate limited by the provider. Retrying automatically shortly.",
+    recoveryClass: "auto_recovering"
+  },
+  overloaded: {
+    message: "The provider is overloaded. Retrying automatically.",
+    recoveryClass: "auto_recovering"
+  },
+  network: {
+    message: "Network connection failed. Check your internet connection \u2014 retrying automatically.",
+    recoveryClass: "auto_recovering"
+  },
+  provider_timeout: {
+    message: "The provider timed out while continuing the turn. Send your message again; if it repeats, check network/API latency or reduce slow tool calls.",
+    recoveryClass: "retry"
+  },
+  resume_failed: {
+    message: "The previous session could not be resumed \u2014 its stored session was missing or expired. The next message starts a fresh session without earlier context.",
+    recoveryClass: "retry"
+  },
+  permission_denied: {
+    message: "Permission denied. Check file or command permissions on the runtime.",
+    recoveryClass: "needs_env"
+  },
+  out_of_memory: {
+    message: "Out of memory on the runtime. Close other work or use a larger machine, then retry.",
+    recoveryClass: "needs_env"
+  },
+  provider_error: {
+    message: "The provider returned an error. Send your message again to retry.",
+    recoveryClass: "retry"
+  },
+  unknown_cli_error: {
+    message: "The agent stopped unexpectedly. Send your message again to retry.",
+    recoveryClass: "retry"
+  }
+};
+function specForErrorKind(errorKind) {
+  const spec = ERROR_SPECS[errorKind];
+  return { message: spec.message, errorKind, recoveryClass: spec.recoveryClass };
+}
 function isLikelyProviderAuthError(stderr) {
   const lower = stderr.toLowerCase();
   return lower.includes("api key") || lower.includes("api_key") || lower.includes("invalid api key") || lower.includes("api key invalid") || lower.includes("unauthorized") || lower.includes("authentication failed") || lower.includes("authentication error") || lower.includes("provider settings") || lower.includes("invalid token") || lower.includes("token expired");
 }
+function mapProviderApiError(errorCode, apiStatus) {
+  const code = errorCode?.trim().toLowerCase();
+  if (code) {
+    if (code.includes("model_not_found") || code.includes("model_not_available")) {
+      return "model_mismatch";
+    }
+    if (code.includes("authentication") || code.includes("permission_error")) return "auth_invalid";
+    if (code.includes("rate_limit")) return "rate_limited";
+    if (code.includes("overloaded")) return "overloaded";
+    if (code.includes("insufficient_quota") || code.includes("billing")) return "quota_exceeded";
+  }
+  if (typeof apiStatus === "number") {
+    if (apiStatus === 404) return "model_mismatch";
+    if (apiStatus === 401 || apiStatus === 403) return "auth_invalid";
+    if (apiStatus === 429) return "rate_limited";
+    if (apiStatus >= 500) return "overloaded";
+  }
+  return null;
+}
 function normalizeCodexCliErrorMessage(message) {
   const lower = message.toLowerCase();
   if (lower.includes("reconnecting") && lower.includes("request timed out")) {
@@ -15731,40 +15828,80 @@ function normalizeCodexCliErrorMessage(message) {
   }
   return message;
 }
-function classifyCliError(stderr, exitCode) {
+function classifyCliErrorDetailed(stderr, _exitCode, opts) {
   const normalizedCodexError = normalizeCodexCliErrorMessage(stderr);
-  if (normalizedCodexError !== stderr) return normalizedCodexError;
-  const lower = stderr.toLowerCase();
-  if (lower.includes("authentication required") || lower.includes("not authenticated"))
-    return "Cursor Agent is not authenticated. Log in with `cursor-agent login` on this machine, then retry.";
-  if (lower.includes("out of usage") || lower.includes("increase your limit"))
-    return "Provider usage limit reached. Switch model/plan or wait for the limit to reset, then retry.";
-  if (lower.includes("no chat found") || lower.includes("chat not found") || lower.includes("session not found") || lower.includes("could not resume"))
-    return "The previous session could not be resumed \u2014 the CLI's stored session was missing or expired. The next message starts a fresh session without earlier context.";
-  if (lower.includes("rate_limit") || lower.includes("rate limit") || lower.includes("429"))
-    return "Rate limited by API. Try again shortly.";
-  if (isLikelyProviderAuthError(stderr))
-    return "API key invalid or expired. Check your provider settings.";
-  if (lower.includes("not logged in") || lower.includes("login required") || lower.includes("please sign in") || lower.includes("please log in") || lower.includes("sign in to") || lower.includes("log in to"))
-    return "Not logged in. Please authenticate with this provider first.";
-  if (lower.includes("model not supported") || lower.includes("unsupported model") || lower.includes("model not found") || lower.includes("model not available") || lower.includes("model is not available") || lower.includes("invalid model") || lower.includes("unknown model") || lower.includes("no such model") || lower.includes("llm not set"))
-    return "Model not supported by this provider. Check your provider's model list.";
-  if (lower.includes("subscription") || lower.includes("paid plan") || lower.includes("plan required") || lower.includes("upgrade your plan") || lower.includes("only supports free") || lower.includes("not available on your") || lower.includes("requires a paid"))
-    return "This model requires a paid subscription. Switch to a supported model or upgrade your plan.";
-  if (lower.includes("quota exceeded") || lower.includes("quota limit") || lower.includes("daily limit") || lower.includes("monthly limit") || lower.includes("usage limit"))
-    return "API quota exceeded. Wait for it to reset or check your billing.";
-  if (lower.includes("overloaded") || lower.includes("503") || lower.includes("service unavailable"))
-    return "API is overloaded. Will retry automatically.";
-  if (lower.includes("context_length") || lower.includes("too long") || lower.includes("max tokens") || lower.includes("context window"))
-    return "Context window exceeded. Try a shorter prompt or start a new session.";
-  if (lower.includes("econnrefused") || lower.includes("network") || lower.includes("enotfound") || lower.includes("timeout") || lower.includes("etimedout"))
-    return "Network connection failed. Check your internet connection.";
-  if (lower.includes("permission denied") || lower.includes("eacces"))
-    return "Permission denied. Check file or command permissions.";
-  if (lower.includes("out of memory") || lower.includes("enomem"))
-    return "Out of memory. Close other applications and try again.";
+  if (normalizedCodexError !== stderr) {
+    const kind = /timed out/i.test(normalizedCodexError) ? "provider_timeout" : "auth_expired";
+    return {
+      message: normalizedCodexError,
+      errorKind: kind,
+      recoveryClass: ERROR_SPECS[kind].recoveryClass
+    };
+  }
+  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 (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",
+    // Claude prompts the user to re-auth with the /login slash command.
+    "run /login",
+    "please run /login"
+  ))
+    return specForErrorKind("not_logged_in");
+  if (has(
+    "model not supported",
+    "unsupported model",
+    "model not found",
+    "model not available",
+    "model is not available",
+    "invalid model",
+    "unknown model",
+    "no such model",
+    "llm not set",
+    // Claude Code phrasings (safety net; the structured decoder catches these first).
+    "issue with the selected model",
+    "may not exist or you may not have access"
+  ))
+    return specForErrorKind("model_mismatch");
+  if (has(
+    "subscription",
+    "paid plan",
+    "plan required",
+    "upgrade your plan",
+    "only supports free",
+    "not available on your",
+    "requires a paid"
+  ))
+    return specForErrorKind("subscription_required");
+  if (has("quota exceeded", "quota limit", "daily limit", "monthly limit", "usage limit"))
+    return specForErrorKind("quota_exceeded");
+  if (has("overloaded", "503", "service unavailable")) return specForErrorKind("overloaded");
+  if (has("context_length", "too long", "max tokens", "context window"))
+    return specForErrorKind("context_length");
+  if (has("econnrefused", "network", "enotfound", "timeout", "etimedout"))
+    return specForErrorKind("network");
+  if (has("permission denied", "eacces")) return specForErrorKind("permission_denied");
+  if (has("out of memory", "enomem")) return specForErrorKind("out_of_memory");
   const raw = stderr.trim().slice(0, 200);
-  return raw || `Process exited with code ${exitCode}`;
+  if (raw) {
+    return { message: raw, errorKind: "unknown_cli_error", recoveryClass: "unknown" };
+  }
+  return specForErrorKind("unknown_cli_error");
 }
 function isTransientError(errorMessage) {
   const lower = errorMessage.toLowerCase();
@@ -16204,13 +16341,34 @@ function createGenericCliBackend(options) {
         };
       }
       const summary = state.summary.trim() || state.error?.trim() || (failed ? "Task failed" : "Task completed");
+      let classifiedError;
+      let classifiedErrorKind;
+      let classifiedRecoveryClass;
+      if (failed) {
+        if (state.errorKind && state.error?.trim()) {
+          classifiedError = state.error.trim();
+          classifiedErrorKind = state.errorKind;
+          classifiedRecoveryClass = state.recoveryClass;
+        } else {
+          const detailed = classifyCliErrorDetailed(
+            state.error?.trim() || stderrText || "",
+            exitCode,
+            { extraSignals: state.summary ? [state.summary] : void 0 }
+          );
+          classifiedError = detailed.message;
+          classifiedErrorKind = detailed.errorKind;
+          classifiedRecoveryClass = detailed.recoveryClass;
+        }
+      }
       return {
         success: !failed,
         summary,
         filesModified: [],
         planFilesCreated: [],
         iterations: Math.max(state.iterations, 1),
-        error: failed ? classifyCliError(state.error?.trim() || stderrText || "", exitCode) : void 0,
+        error: classifiedError,
+        ...classifiedErrorKind ? { errorKind: classifiedErrorKind } : {},
+        ...classifiedRecoveryClass ? { recoveryClass: classifiedRecoveryClass } : {},
         providerSessionId: state.runtimeSessionId,
         runtimeSessionId: state.runtimeSessionId,
         backendKind: options.kind,
@@ -16884,6 +17042,9 @@ function handleClaudeStructuredEvent(parsed, context, state) {
   if (typeof parsed.session_id === "string") {
     state.runtimeSessionId = parsed.session_id;
   }
+  if (typeof parsed.error === "string" && parsed.error.trim()) {
+    state.providerErrorCode = parsed.error.trim();
+  }
   const parentToolUseId = typeof parsed.parent_tool_use_id === "string" ? parsed.parent_tool_use_id : null;
   switch (type) {
     case "system": {
@@ -17096,6 +17257,27 @@ function handleClaudeStructuredEvent(parsed, context, state) {
           })
         );
       }
+      const isApiError = parsed.is_error === true || parsed.terminal_reason === "api_error" || typeof parsed.api_error_status === "number";
+      if (isApiError && !state.error) {
+        const apiStatus = typeof parsed.api_error_status === "number" ? parsed.api_error_status : void 0;
+        state.apiErrorStatus = apiStatus;
+        const mappedKind = mapProviderApiError(state.providerErrorCode, apiStatus);
+        const spec = mappedKind ? specForErrorKind(mappedKind) : specForErrorKind("provider_error");
+        state.error = mappedKind || typeof parsed.result !== "string" || !parsed.result.trim() ? spec.message : parsed.result.trim();
+        state.errorKind = spec.errorKind;
+        state.recoveryClass = spec.recoveryClass;
+        console.error(
+          "[claude_cli] result flagged API error:",
+          JSON.stringify({
+            is_error: parsed.is_error,
+            terminal_reason: parsed.terminal_reason,
+            api_error_status: parsed.api_error_status,
+            providerErrorCode: state.providerErrorCode,
+            mappedKind,
+            result: typeof parsed.result === "string" ? parsed.result.slice(0, 200) : void 0
+          })
+        );
+      }
       debugAskLog(
         `[claude_cli] result event \u2014 pendingAskUserToolIds size=${presenter.pendingAskUserToolIds?.size ?? "undefined"}, hasOwnProp=${Object.hasOwn(presenter, "pendingAskUserToolIds")}`
       );
@@ -21829,6 +22011,10 @@ 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_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)
+);
 var CATALOG_MODEL_IDS_BY_PROVIDER = Object.fromEntries(
   Object.entries(PROVIDER_MODELS).map(([provider, models]) => [
     provider,
@@ -21919,15 +22105,22 @@ function extractModelIdsFromLabeledList(value2) {
 }
 function isValidClaudeModelId(id) {
   if (CLAUDE_MODEL_ALIASES.includes(id)) return true;
-  if (!/^claude-(sonnet|opus|haiku|fable)-[a-z0-9][a-z0-9-]*$/.test(id)) return false;
+  const match = id.match(/^claude-(sonnet|opus|haiku|fable)-([a-z0-9][a-z0-9-]*)$/);
+  if (!match) return false;
   if (id.includes(".")) return false;
   if (/-\d{8}$/.test(id)) return false;
   if (/-v\d+$/.test(id)) return false;
+  for (const segment of match[2].split("-")) {
+    if (/^\d+$/.test(segment)) continue;
+    if (CLAUDE_MODEL_QUALIFIER_SEGMENTS.has(segment)) continue;
+    return false;
+  }
   return true;
 }
 function filterClaudePrefixModelIds(ids) {
   const set = new Set(ids);
   return ids.filter((id) => {
+    if (PROTECTED_CATALOG_MODEL_IDS.has(id)) return true;
     for (const other of set) {
       if (other !== id && other.startsWith(`${id}-`)) return false;
     }
@@ -22250,7 +22443,7 @@ var RunStartGate = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.38";
+var AGENT_VERSION = "0.1.40";
 
 // 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.38",
+  "version": "0.1.40",
   "type": "module",
   "description": "Alan agent runtime — cloud sandbox and local daemon (alan-agent CLI)",
   "bin": {