@skaile/workspaces 6.4.0 → 6.5.0

package/dist/bridge/harnesses/codex.js

@@ -1,40 +1,38 @@
 import { CodexAppServerClient } from '../../chunk-KNY356I3.js';
 import { freshBudget, decide, spend } from '../../chunk-7EKQDY2T.js';
 import { managedCodexRegistryViolation, parseCodexCredential, prepareNativePolicy, prepareCodexInstance, codexInstanceEnvironment, isNativeApprovalPolicyActive, activateNativeApprovalPolicy, parseCodexRefreshResult, allowsNativeApprovalPath } from '../../chunk-HTGTNN2B.js';
-import { codexSessionHome, buildCodexConfigDocument, writeCodexConfigToml, codexProviderTableId } from '../../chunk-JSWMRYLM.js';
+import { codexSessionHome, buildCodexConfigDocument, codexLoginFile, usesCodexOwnAuth, codexProviderTableId, writeCodexConfigToml } from '../../chunk-OLHHN3NO.js';
 import { CodexNativeStateUnavailable } from '../../chunk-LOO5CB5M.js';
-import { fetchProviderModels } from '../../chunk-U3SXCVR7.js';
-import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage, RUNNER_AGENT_ENV_KEYS } from '../../chunk-6OHZUUR7.js';
+import { fetchProviderModels } from '../../chunk-ZUU2PLA3.js';
+import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage, RUNNER_AGENT_ENV_KEYS } from '../../chunk-5DE3DGVR.js';
 import '../../chunk-7DN6JKP2.js';
-import { AgentHarness, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryHarnessConfig } from '../../chunk-QSIFEHSN.js';
-import { BUILTIN_HARNESS_CATALOG, registryCredentialEnv, entryCredentialValue } from '../../chunk-QJQQNBVT.js';
+import { AgentHarness, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryHarnessConfig } from '../../chunk-E6UWI3TP.js';
+import { BUILTIN_HARNESS_CATALOG, registryCredentialEnv, unresolvedProviderCredentials, entryCredentialValue } from '../../chunk-NSIOBKDX.js';
 import '../../chunk-G5SUWZEU.js';
-import '../../chunk-6UP2EDFN.js';
-import '../../chunk-76FLBODK.js';
-import { loadHarnessSdk } from '../../chunk-ABVWUM2E.js';
+import '../../chunk-VT6G5AJV.js';
+import { loadHarnessSdk } from '../../chunk-UMLCKKIA.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-3ENE6ZOF.js';
+import '../../chunk-G4NCSYWR.js';
 import '../../chunk-5KRMNUL4.js';
 import '../../chunk-C5HFK34M.js';
 import '../../chunk-MWXYN6NY.js';
-import '../../chunk-6WQGJF65.js';
+import '../../chunk-IWKKTCXY.js';
 import '../../chunk-L5VSIPQD.js';
 import '../../chunk-VTETQCR6.js';
-import '../../chunk-U6S5CXKB.js';
-import '../../chunk-VV2DJT4I.js';
+import '../../chunk-23SG4JRV.js';
+import '../../chunk-AVFRFGM2.js';
 import '../../chunk-RVRB27AN.js';
-import '../../chunk-IZQOO6MN.js';
+import '../../chunk-V5KG6CCV.js';
 import '../../chunk-VSX2G7LA.js';
 import { resolveEntryBaseUrl, registryEntries } from '../../chunk-RXGPFAMN.js';
 import '../../chunk-DKXNKFKP.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
-import { isAbsolute, join, resolve, dirname, relative } from 'path';
+import { isAbsolute, join, dirname, relative } from 'path';
 import { isDeepStrictEqual } from 'util';
-import { existsSync, rmSync, readFileSync, mkdirSync, writeFileSync, realpathSync, statSync, symlinkSync, copyFileSync } from 'fs';
+import { rmSync, existsSync, readFileSync, mkdirSync, writeFileSync, realpathSync, statSync, symlinkSync, copyFileSync } from 'fs';
 import { randomUUID } from 'crypto';
-import { homedir } from 'os';
 import * as z from 'zod';
 
 var invalid = () => new Error("CODEX_INPUT_INVALID");
@@ -245,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((resolve2, reject) => {
+    return new Promise((resolve, 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) resolve2(result);
+        if (result && !signal.aborted) resolve(result);
         else reject(new Error("CODEX_INPUT_CANCELLED"));
       };
       this.pending = {
@@ -726,8 +724,8 @@ var ManagedCodexHarness = class extends AgentHarness {
       if (result.type !== "apiKey") throw failure("CODEX_AUTH_UNAVAILABLE");
       return;
     }
-    const completion = new Promise((resolve2, reject) => {
-      this.loginCompleted = { resolve: resolve2, reject };
+    const completion = new Promise((resolve, reject) => {
+      this.loginCompleted = { resolve, reject };
     });
     const wait = bounded(completion, this.controller.signal, timeout);
     void wait.catch(() => {
@@ -834,11 +832,11 @@ var ManagedCodexHarness = class extends AgentHarness {
     }
     let finish;
     let readyNow;
-    const ready = new Promise((resolve2) => {
-      readyNow = resolve2;
+    const ready = new Promise((resolve) => {
+      readyNow = resolve;
     });
-    const done = new Promise((resolve2) => {
-      finish = resolve2;
+    const done = new Promise((resolve) => {
+      finish = resolve;
     });
     const active = {
       controller: new AbortController(),
@@ -1348,11 +1346,6 @@ function buildCodexChildEnv(parent, codexHome) {
   out.CODEX_HOME = codexHome;
   return out;
 }
-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 });
@@ -1363,12 +1356,12 @@ function linkCodexLogin(codexHome, loginFile) {
     copyFileSync(loginFile, target);
   }
 }
-function missingCodexCredential(build, env, loginFile) {
+function missingCodexCredential(build, env, loginFile, unresolved) {
   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 harness: the AI provider entry '${build.providerId}' has no credential; export the variable its credential names (see \`skaile providers test ${build.providerId}\`)`;
+    return `codex harness: the AI provider entry '${build.providerId}' has no credential${unresolved ? ` (${unresolved})` : ""}; export the variable its credential names (see \`skaile providers test ${build.providerId}\`)`;
   }
   if (env.OPENAI_API_KEY || env.CODEX_API_KEY || loginFile) return void 0;
   return "codex harness 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";
@@ -1442,7 +1435,6 @@ var CodexHarness = class extends AgentHarness {
       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)
       this.log.debug("codex cannot address an AI provider entry", {
@@ -1457,11 +1449,21 @@ var CodexHarness = class extends AgentHarness {
     stripRunnerPrivateEnv(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 (usesCodexOwnAuth(build, env, loginFile)) {
+      delete build.document.model_provider;
+      delete build.document.model_providers[codexProviderTableId("openai")];
+      this.log.debug("codex uses its own auth: the openai entry has no credential");
+    }
+    const unresolved = build.providerId && this.config.registry ? unresolvedProviderCredentials(this.config.registry, {
+      env: { ...process.env, ...env },
+      providerId: build.providerId
+    })[0]?.reason : void 0;
+    const missing = missingCodexCredential(build, env, loginFile, unresolved);
     if (missing) {
       this.log.error("codex credential missing", { reason: missing });
       throw Object.assign(new Error(missing), { category: "config", hint: missing });
     }
+    writeCodexConfigToml(codexHome, build.document);
     if (loginFile) linkCodexLogin(codexHome, loginFile);
     else rmSync(join(codexHome, "auth.json"), { force: true });
     const instructionsFile = this.writeInstructionsFile();
@@ -1918,6 +1920,6 @@ var codexHarnessTarget = {
   }
 };
 
-export { CodexHarness, codexHarnessTarget, codexLoginFile, isManagedCodexConfig };
+export { CodexHarness, codexHarnessTarget, isManagedCodexConfig };
 //# sourceMappingURL=codex.js.map
 //# sourceMappingURL=codex.js.map