@skaile/workspaces 5.12.0 → 5.13.0

package/dist/bridge/drivers/codex.js

@@ -2,35 +2,36 @@ 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-NJXR5OAM.js';
+import { fetchProviderModels } from '../../chunk-B7CZYFB2.js';
 import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-B4X2N7JQ.js';
 import '../../chunk-YROR332M.js';
-import { BUILTIN_DRIVER_CATALOG, AgentDriver, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryCredentialEnv, entryCredentialValue, registryDriverConfig, getProviderPreset, providerCredentialEnvName } from '../../chunk-MF54ZHWT.js';
+import { BUILTIN_DRIVER_CATALOG, AgentDriver, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryCredentialEnv, entryCredentialValue, registryDriverConfig, getProviderPreset, providerCredentialEnvName } from '../../chunk-BVJU2GKE.js';
 import '../../chunk-6E6PKKAD.js';
-import '../../chunk-6VLHITAM.js';
-import { installCommandFor } from '../../chunk-T5TSLSRO.js';
+import '../../chunk-57SF6W6E.js';
+import { installCommandFor } from '../../chunk-BF422IDP.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-SHQMPGOL.js';
-import '../../chunk-PMECEZK3.js';
+import '../../chunk-QO7CR3KB.js';
+import '../../chunk-D54T2F54.js';
 import '../../chunk-5BEFNLOR.js';
 import '../../chunk-A2ULN3KX.js';
-import '../../chunk-PNOGX36L.js';
+import '../../chunk-L3ZGYSWY.js';
 import { globalSkaileDir } from '../../chunk-L5VSIPQD.js';
-import '../../chunk-CPSIPIX7.js';
-import '../../chunk-CTP3XBMF.js';
+import '../../chunk-IG5LZ3WU.js';
+import '../../chunk-IY5E7Y5W.js';
 import '../../chunk-RVRB27AN.js';
-import '../../chunk-XTVSNWLL.js';
-import '../../chunk-PNTXHTBC.js';
+import '../../chunk-M3P4BYRK.js';
+import '../../chunk-J4OYIYFQ.js';
 import '../../chunk-ICSCSM5D.js';
 import '../../chunk-DKXNKFKP.js';
 import { resolveEntryBaseUrl, registryEntries, parseModelRef, isEntryEnabled } from '../../chunk-MJHSLODD.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
-import { isAbsolute, join, dirname, relative } from 'path';
+import { isAbsolute, join, resolve, dirname, relative } from 'path';
 import { isDeepStrictEqual } from 'util';
-import { existsSync, readFileSync, mkdirSync, writeFileSync, realpathSync, statSync, rmSync, renameSync } from 'fs';
+import { existsSync, rmSync, readFileSync, mkdirSync, writeFileSync, realpathSync, statSync, renameSync, symlinkSync, copyFileSync } from 'fs';
 import { randomUUID, createHash } from 'crypto';
+import { homedir } from 'os';
 import * as z from 'zod';
 import { stringify } from 'smol-toml';
 
@@ -242,13 +243,13 @@ var CodexQuestions = class {
     approval = approval ? structuredClone(approval) : void 0;
     const id = randomUUID();
     const eventId = params.itemId ?? `local-consent:${id}`;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const abort = () => finish();
       const finish = (result) => {
         if (this.pending?.id !== id) return;
         this.pending = void 0;
         signal.removeEventListener("abort", abort);
-        if (result && !signal.aborted) resolve(result);
+        if (result && !signal.aborted) resolve2(result);
         else reject(new Error("CODEX_INPUT_CANCELLED"));
       };
       this.pending = {
@@ -723,8 +724,8 @@ var ManagedCodexDriver = class extends AgentDriver {
       if (result.type !== "apiKey") throw failure("CODEX_AUTH_UNAVAILABLE");
       return;
     }
-    const completion = new Promise((resolve, reject) => {
-      this.loginCompleted = { resolve, reject };
+    const completion = new Promise((resolve2, reject) => {
+      this.loginCompleted = { resolve: resolve2, reject };
     });
     const wait = bounded(completion, this.controller.signal, timeout);
     void wait.catch(() => {
@@ -831,11 +832,11 @@ var ManagedCodexDriver = class extends AgentDriver {
     }
     let finish;
     let readyNow;
-    const ready = new Promise((resolve) => {
-      readyNow = resolve;
+    const ready = new Promise((resolve2) => {
+      readyNow = resolve2;
     });
-    const done = new Promise((resolve) => {
-      finish = resolve;
+    const done = new Promise((resolve2) => {
+      finish = resolve2;
     });
     const active = {
       controller: new AbortController(),
@@ -1282,6 +1283,14 @@ var ENV_DELIVERED_CREDENTIALS = {
   bearer: true,
   command: true
 };
+function selectionNamesEntry(input, selected, registry) {
+  if (selected.role && selected.modelId !== void 0) return true;
+  const selector = input.modelRef?.trim() || input.model?.trim() || "";
+  if (selector.startsWith(`${selected.providerId}/`)) return true;
+  const entry = registryEntries(registry).find(([id]) => id === selected.providerId)?.[1];
+  const modelId = selected.modelId;
+  return modelId !== void 0 && (entry?.model_map?.[modelId] !== void 0 || entry?.capabilities?.[modelId] !== void 0);
+}
 function renderCodexProviderTable(id, entry) {
   if (!isEntryEnabled(entry)) return { skipped: "entry is disabled" };
   if (entry.kind !== "llm" && entry.kind !== "embed")
@@ -1326,7 +1335,18 @@ function buildCodexConfigDocument(input) {
   if (!selected) return { document, skipped, warnings: [] };
   const warnings = selected.warnings;
   const tableId = codexProviderTableId(selected.providerId);
-  if (!document.model_providers[tableId]) return { document, skipped, warnings };
+  if (!document.model_providers[tableId]) {
+    const reason = skipped.find((s) => s.id === selected.providerId)?.reason;
+    if (reason && selectionNamesEntry(input, selected, input.registry)) {
+      return {
+        document,
+        skipped,
+        warnings,
+        unaddressable: { id: selected.providerId, reason }
+      };
+    }
+    return { document, skipped, warnings };
+  }
   document.model_provider = tableId;
   if (selected.providerModelId) document.model = selected.providerModelId;
   return {
@@ -1381,15 +1401,30 @@ function buildCodexChildEnv(parent, codexHome) {
   out.CODEX_HOME = codexHome;
   return out;
 }
-function missingCodexCredential(build, env) {
+function codexLoginFile(env) {
+  const home = env.CODEX_HOME?.trim() || join(env.HOME || homedir(), ".codex");
+  const file = join(home, "auth.json");
+  return existsSync(file) ? resolve(file) : void 0;
+}
+function linkCodexLogin(codexHome, loginFile) {
+  const target = join(codexHome, "auth.json");
+  mkdirSync(codexHome, { recursive: true, mode: 448 });
+  rmSync(target, { force: true });
+  try {
+    symlinkSync(loginFile, target);
+  } catch {
+    copyFileSync(loginFile, target);
+  }
+}
+function missingCodexCredential(build, env, loginFile) {
   const table = build.providerId ? build.document.model_providers[codexProviderTableId(build.providerId)] : void 0;
   if (table) {
     if (table.requires_openai_auth) return void 0;
     if (!table.env_key || env[table.env_key]) return void 0;
     return `codex driver: the AI provider entry '${build.providerId}' has no credential; export the variable its credential names (see \`skaile providers test ${build.providerId}\`)`;
   }
-  if (env.OPENAI_API_KEY || env.CODEX_API_KEY) return void 0;
-  return "codex driver needs OPENAI_API_KEY (or an AI provider entry with a credential); a ChatGPT login of the codex CLI is not shared with skaile";
+  if (env.OPENAI_API_KEY || env.CODEX_API_KEY || loginFile) return void 0;
+  return "codex driver needs OPENAI_API_KEY, or the codex CLI's ChatGPT login (run `codex login`; ~/.codex/auth.json), or an AI provider entry with a credential";
 }
 var CodexDriver = class extends AgentDriver {
   driverInfo = {
@@ -1451,6 +1486,12 @@ var CodexDriver = class extends AgentDriver {
       model: this.config.model,
       roles: this.config.roles
     });
+    if (build.unaddressable) {
+      const { id, reason } = build.unaddressable;
+      const message = `AI provider '${id}' cannot be used with the codex driver: ${reason}. Pick a model of another provider.`;
+      this.log.error("codex cannot address the selected AI provider", { provider: id, reason });
+      throw Object.assign(new Error(message), { category: "config", hint: message });
+    }
     writeCodexConfigToml(codexHome, build.document);
     for (const warning of build.warnings) this.log.warn("codex model selection", { warning });
     for (const entry of build.skipped)
@@ -1464,11 +1505,15 @@ var CodexDriver = class extends AgentDriver {
       registryCredentialEnv(this.config.registry ?? {}, { env: { ...process.env, ...env } })
     );
     stripRunnerPrivateEnv(env);
-    const missing = missingCodexCredential(build, env);
+    const hasKey = Boolean(env.OPENAI_API_KEY || env.CODEX_API_KEY);
+    const loginFile = hasKey ? void 0 : codexLoginFile({ ...process.env, ...this.config.env });
+    const missing = missingCodexCredential(build, env, loginFile);
     if (missing) {
       this.log.error("codex credential missing", { reason: missing });
       throw Object.assign(new Error(missing), { category: "config", hint: missing });
     }
+    if (loginFile) linkCodexLogin(codexHome, loginFile);
+    else rmSync(join(codexHome, "auth.json"), { force: true });
     const instructionsFile = this.writeInstructionsFile();
     const client = new sdk.Codex({
       apiKey: env.OPENAI_API_KEY,
@@ -1913,6 +1958,6 @@ var codexDriverTarget = {
   }
 };
 
-export { CodexDriver, codexDriverTarget, isManagedCodexConfig };
+export { CodexDriver, codexDriverTarget, codexLoginFile, isManagedCodexConfig };
 //# sourceMappingURL=codex.js.map
 //# sourceMappingURL=codex.js.map