@skaile/workspaces 5.14.0 → 5.15.0

package/dist/bridge/drivers/codex.js

@@ -2,26 +2,26 @@ import { CodexAppServerClient } from '../../chunk-K4O6L3WH.js';
 import { freshBudget, decide, spend } from '../../chunk-IZCR27MU.js';
 import { managedCodexRegistryViolation, parseCodexCredential, prepareNativePolicy, prepareCodexInstance, codexInstanceEnvironment, isNativeApprovalPolicyActive, activateNativeApprovalPolicy, parseCodexRefreshResult, allowsNativeApprovalPath } from '../../chunk-PHRNUTSG.js';
 import { CodexNativeStateUnavailable } from '../../chunk-LOO5CB5M.js';
-import { fetchProviderModels } from '../../chunk-YFIHFJEB.js';
+import { fetchProviderModels } from '../../chunk-GLMKS6V6.js';
 import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-B4X2N7JQ.js';
 import '../../chunk-YROR332M.js';
-import { AgentDriver, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryDriverConfig } from '../../chunk-DWRYUWOK.js';
-import { BUILTIN_DRIVER_CATALOG, registryCredentialEnv, entryCredentialValue, getProviderPreset, providerCredentialEnvName } from '../../chunk-6VIVUBNN.js';
+import { AgentDriver, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryDriverConfig } from '../../chunk-4AKR4XPQ.js';
+import { BUILTIN_DRIVER_CATALOG, registryCredentialEnv, entryCredentialValue, getProviderPreset, providerCredentialEnvName } from '../../chunk-GQ5OYFVD.js';
 import '../../chunk-6E6PKKAD.js';
-import '../../chunk-57SF6W6E.js';
-import { installCommandFor } from '../../chunk-OX2W5YF3.js';
+import '../../chunk-MGM5EJQQ.js';
+import { loadDriverSdk } from '../../chunk-4QINFQ27.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-TYUJPQNX.js';
+import '../../chunk-X7DIT65W.js';
 import '../../chunk-D54T2F54.js';
 import '../../chunk-5BEFNLOR.js';
 import '../../chunk-A2ULN3KX.js';
-import '../../chunk-CAPKENNF.js';
+import '../../chunk-J76LDUDS.js';
 import { globalSkaileDir } from '../../chunk-L5VSIPQD.js';
 import '../../chunk-IG5LZ3WU.js';
-import '../../chunk-IY5E7Y5W.js';
+import '../../chunk-ANSZULXH.js';
 import '../../chunk-RVRB27AN.js';
-import '../../chunk-M3P4BYRK.js';
-import '../../chunk-J4OYIYFQ.js';
+import '../../chunk-SP5NGNBV.js';
+import '../../chunk-VY6NTFE7.js';
 import '../../chunk-ICSCSM5D.js';
 import '../../chunk-DKXNKFKP.js';
 import { resolveEntryBaseUrl, registryEntries, parseModelRef, isEntryEnabled } from '../../chunk-MJHSLODD.js';
@@ -1384,6 +1384,57 @@ function writeCodexConfigToml(home, document) {
   return path;
 }
 
+// bridge/src/codex/friendly-error.ts
+function unwrapErrorBody(raw) {
+  const start = raw.indexOf("{");
+  if (start < 0) return raw;
+  try {
+    const body = JSON.parse(raw.slice(start));
+    const inner = typeof body.error === "object" ? body.error?.message : body.error;
+    const text2 = inner ?? body.message;
+    if (typeof text2 === "string" && text2.length > 0) return text2;
+  } catch {
+  }
+  return raw;
+}
+function friendlyCodexError(raw) {
+  const text2 = unwrapErrorBody(raw);
+  const chatgpt = /'([^']+)' model is not supported when using Codex with a ChatGPT account/i.exec(
+    text2
+  );
+  if (chatgpt) {
+    return {
+      message: `codex driver: the model '${chatgpt[1]}' is not available with a ChatGPT login.`,
+      category: "model",
+      hint: "Update @openai/codex-sdk to the 0.16x line, pass --model with a model your login allows, or set OPENAI_API_KEY."
+    };
+  }
+  if (/newer version of codex|requires a newer version|update codex/i.test(text2)) {
+    return {
+      message: `codex driver: the selected model needs a newer Codex than the installed @openai/codex-sdk.`,
+      category: "model",
+      hint: "Update @openai/codex-sdk to the 0.16x line (npm i @openai/codex-sdk@latest)."
+    };
+  }
+  if (/invalid_api_key|incorrect api key|\b401\b[^.]*unauthorized|unauthorized[^.]*\b401\b/i.test(raw)) {
+    return {
+      message: "codex driver: the API key was rejected (401).",
+      category: "auth",
+      hint: "Check OPENAI_API_KEY (or sign in again with `codex login`)."
+    };
+  }
+  const reconnecting = /^Reconnecting\.\.\.\s*\d+\/\d+\s*\(([\s\S]*)\)\s*$/.exec(raw.trim());
+  if (reconnecting) {
+    const reason = (reconnecting[1] ?? "").split(/[{\n]/, 1)[0]?.replace(/[\s:,]+$/, "") ?? "";
+    return {
+      message: `codex driver: could not reach the model endpoint${reason ? ` (${reason})` : ""}.`,
+      category: "network",
+      hint: "Check the network and the provider's status, then run again."
+    };
+  }
+  return null;
+}
+
 // bridge/src/drivers/codex.ts
 function buildCodexChildEnv(parent, codexHome) {
   const out = {};
@@ -1473,12 +1524,15 @@ var CodexDriver = class extends AgentDriver {
     if (this.thread) return;
     let sdk;
     try {
-      sdk = await import('@openai/codex-sdk');
+      sdk = await loadDriverSdk(
+        "@openai/codex-sdk",
+        this.config.cwd,
+        () => import('@openai/codex-sdk'),
+        "Codex SDK"
+      );
     } catch (err) {
       this.log.error("codex SDK load failed", err);
-      throw new Error(
-        `Codex SDK not installed. Run: ${installCommandFor("@openai/codex-sdk", this.config.cwd)}`
-      );
+      throw err;
     }
     const codexHome = codexSessionHome(this.config);
     const build = buildCodexConfigDocument({
@@ -1496,7 +1550,7 @@ var CodexDriver = class extends AgentDriver {
     writeCodexConfigToml(codexHome, build.document);
     for (const warning of build.warnings) this.log.warn("codex model selection", { warning });
     for (const entry of build.skipped)
-      this.log.warn("codex cannot address an AI provider entry", {
+      this.log.debug("codex cannot address an AI provider entry", {
         provider: entry.id,
         reason: entry.reason
       });
@@ -1913,7 +1967,17 @@ var CodexDriver = class extends AgentDriver {
     }
     return { arguments: value };
   }
-  classifyErrorMessage(message) {
+  classifyErrorMessage(rawMessage) {
+    const friendly = friendlyCodexError(rawMessage);
+    if (friendly) {
+      return {
+        message: friendly.message,
+        category: friendly.category,
+        retryable: false,
+        hint: friendly.hint
+      };
+    }
+    const message = rawMessage;
     const generic = classifyGenericErrorMessage(message);
     if (generic) {
       const hint = generic.category === "auth" ? "Check your OpenAI API key configuration in settings or environment." : generic.category === "rate_limit" ? "Codex hit an OpenAI rate limit. Wait briefly and try again." : generic.category === "model" ? "The selected Codex model is unavailable. Choose a different model." : "A network error occurred while talking to Codex.";