@skaile/workspaces 5.7.0 → 5.9.0

package/dist/bridge/drivers/codex.js

@@ -1,35 +1,36 @@
 import { CodexAppServerClient } from '../../chunk-K4O6L3WH.js';
-import { managedCodexRegistryViolation, parseCodexCredential, prepareNativePolicy, prepareCodexInstance, codexInstanceEnvironment, isNativeApprovalPolicyActive, activateNativeApprovalPolicy, parseCodexRefreshResult, allowsNativeApprovalPath } from '../../chunk-HCYS7GFP.js';
+import { freshBudget, decide, spend } from '../../chunk-IZCR27MU.js';
+import { managedCodexRegistryViolation, parseCodexCredential, prepareNativePolicy, prepareCodexInstance, codexInstanceEnvironment, isNativeApprovalPolicyActive, activateNativeApprovalPolicy, parseCodexRefreshResult, allowsNativeApprovalPath } from '../../chunk-V2DXZYBB.js';
 import { CodexNativeStateUnavailable } from '../../chunk-LOO5CB5M.js';
-import { fetchProviderModels } from '../../chunk-GWXFSLBK.js';
-import { stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-XBSQ4KMC.js';
+import { fetchProviderModels } from '../../chunk-J7U3PIOE.js';
+import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-B4X2N7JQ.js';
 import '../../chunk-YROR332M.js';
-import { BUILTIN_DRIVER_CATALOG, AgentDriver, getBridgeLogger, registryCredentialEnv, entryCredentialValue, registryDriverConfig, getProviderPreset, providerCredentialEnvName } from '../../chunk-BTK7ECLH.js';
+import { BUILTIN_DRIVER_CATALOG, AgentDriver, TOOL_ALLOWLIST_UNSUPPORTED, getBridgeLogger, registryCredentialEnv, entryCredentialValue, registryDriverConfig, getProviderPreset, providerCredentialEnvName } from '../../chunk-5NNNV76P.js';
 import '../../chunk-6E6PKKAD.js';
-import '../../chunk-FRHE7FFB.js';
-import '../../chunk-OOLT6HGP.js';
+import '../../chunk-B6GIW55K.js';
+import '../../chunk-36AFURKZ.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-SWO25LTO.js';
-import '../../chunk-G67BOI2J.js';
+import '../../chunk-GB7WDMH2.js';
+import '../../chunk-PMECEZK3.js';
 import '../../chunk-5BEFNLOR.js';
 import '../../chunk-A2ULN3KX.js';
-import '../../chunk-LCU5U5IW.js';
+import '../../chunk-JAKOMFC6.js';
 import { globalSkaileDir } from '../../chunk-L5VSIPQD.js';
 import '../../chunk-CPSIPIX7.js';
-import '../../chunk-RVIZQ5XD.js';
+import '../../chunk-BTE2V4IW.js';
 import '../../chunk-RVRB27AN.js';
-import '../../chunk-TTPSDC2G.js';
-import '../../chunk-O7VPNKYN.js';
+import '../../chunk-GTILM2CI.js';
+import '../../chunk-QVNRCDTV.js';
 import '../../chunk-ICSCSM5D.js';
-import '../../chunk-JMKB7IB4.js';
+import '../../chunk-UMVKJM4Q.js';
 import { resolveEntryBaseUrl, registryEntries, parseModelRef, isEntryEnabled } from '../../chunk-MJHSLODD.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
-import { join, dirname, isAbsolute, relative } from 'path';
+import { isAbsolute, join, dirname, relative } from 'path';
 import { isDeepStrictEqual } from 'util';
-import { existsSync, readFileSync, mkdirSync, writeFileSync, rmSync, renameSync, realpathSync, statSync } from 'fs';
-import { createHash, randomUUID } from 'crypto';
+import { existsSync, readFileSync, mkdirSync, writeFileSync, realpathSync, statSync, rmSync, renameSync } from 'fs';
+import { randomUUID, createHash } from 'crypto';
 import * as z from 'zod';
 import { stringify } from 'smol-toml';
 
@@ -375,13 +376,32 @@ var ManagedCodexDriver = class extends AgentDriver {
   constructor(config) {
     super();
     this.config = config;
+    this.desired = {
+      model: config.model,
+      modelRef: config.modelRef,
+      thinking: config.thinking,
+      effort: config.effort,
+      registry: config.registry,
+      roles: config.roles
+    };
+    this.reconfig = new ReconfigureLedger({
+      config: () => this.desired,
+      onDesired: ({ model, thinking, effort }) => {
+        const fields = {};
+        if (model !== void 0) fields.model = model;
+        if (thinking !== void 0) fields.thinking = thinking;
+        if (effort !== void 0) fields.effort = effort;
+        this.pendingPatch = { ...this.pendingPatch, ...fields };
+      }
+    });
   }
   config;
   driverInfo = {
     id: "codex",
     name: "OpenAI Codex",
     modelAgnostic: false,
-    supportsInBandAbort: true
+    supportsInBandAbort: true,
+    capabilities: BUILTIN_DRIVER_CATALOG.codex?.capabilities
   };
   client;
   connecting;
@@ -419,7 +439,8 @@ var ManagedCodexDriver = class extends AgentDriver {
   queued = 0;
   admittedTurns = 0;
   loginCompleted;
-  startupRefreshUsed = false;
+  /** Recovery budget for the connection's startup (no active turn); reset on each start. */
+  startupRecovery = freshBudget();
   startupAuthAttempted = false;
   questions = new CodexQuestions((event) => this.event(event));
   get acceptsReplyAsPrompt() {
@@ -431,6 +452,9 @@ var ManagedCodexDriver = class extends AgentDriver {
   answerQuestion(answer, question, requestId) {
     return this.questions.answer(answer, question, requestId);
   }
+  /** The settings a later prompt will run on; `config` only takes them at the next turn. */
+  desired;
+  reconfig;
   get runtimeSessionId() {
     return this.threadId ?? this.lastThreadId;
   }
@@ -489,7 +513,7 @@ var ManagedCodexDriver = class extends AgentDriver {
     const generation = ++this.generation;
     const mcpReplies = /* @__PURE__ */ new WeakMap();
     this.controller = new AbortController();
-    this.startupRefreshUsed = false;
+    this.startupRecovery = freshBudget();
     this.startupAuthAttempted = false;
     const handlers = {
       "account/chatgptAuthTokens/refresh": async (params, signal) => {
@@ -719,10 +743,20 @@ var ManagedCodexDriver = class extends AgentDriver {
   }
   async refresh(params, signal) {
     const credential = this.credential;
-    if (!record2(params) || params.reason !== "unauthorized" || !credential || credential.kind !== "codex-subscription" || params.previousAccountId != null && params.previousAccountId !== credential.chatgptAccountId || !this.options?.refreshCredential || (this.active ? this.active.refreshUsed : this.startupRefreshUsed))
+    if (!record2(params) || params.reason !== "unauthorized" || !credential || credential.kind !== "codex-subscription" || params.previousAccountId != null && params.previousAccountId !== credential.chatgptAccountId || !this.options?.refreshCredential)
+      throw failure("CODEX_AUTH_UNAVAILABLE");
+    const active = this.active;
+    const budget = active ? active.recovery : this.startupRecovery;
+    const decision = decide(
+      { message: "unauthorized", authError: true, limitRejected: false, queryEnded: false },
+      budget,
+      { onAuthError: true, onLimitBlocked: false, resumableSessionId: false }
+    );
+    if (!("attempt" in decision) || decision.attempt !== "auth_refresh")
       throw failure("CODEX_AUTH_UNAVAILABLE");
-    if (this.active) this.active.refreshUsed = true;
-    else this.startupRefreshUsed = true;
+    const spent = spend(budget, "auth_refresh");
+    if (active) active.recovery = spent;
+    else this.startupRecovery = spent;
     const result = await this.options.refreshCredential(
       {
         kind: "codex-subscription",
@@ -751,6 +785,8 @@ var ManagedCodexDriver = class extends AgentDriver {
     return this.promptInput({ text: message });
   }
   promptInput(input) {
+    if (input.toolAllowlist !== void 0)
+      return Promise.reject(new Error(TOOL_ALLOWLIST_UNSUPPORTED));
     const message = structuredClone(input);
     const turnBudget = this.config.driverOptions?.codex?.managedRuntime?.nativeTurnBudget;
     if (this.killed || this.broken || this.resetting || this.queued >= 32 || turnBudget !== void 0 && this.admittedTurns >= turnBudget)
@@ -820,7 +856,7 @@ var ManagedCodexDriver = class extends AgentDriver {
       toolResults: [],
       toolItems: /* @__PURE__ */ new Set(),
       completedToolItems: /* @__PURE__ */ new Set(),
-      refreshUsed: false,
+      recovery: freshBudget(),
       usageBaseline: this.threadUsageTotal,
       actualModel: this.config.model
     };
@@ -904,8 +940,12 @@ var ManagedCodexDriver = class extends AgentDriver {
     });
     return this.resetting;
   }
+  /**
+   * Store a model / thinking / effort change; the next prompt merges it into the
+   * config before the turn starts, and a turn in flight keeps what it began with.
+   */
   reconfigure(patch) {
-    this.pendingPatch = { ...this.pendingPatch, ...patch };
+    return this.reconfig.reconfigure(patch);
   }
   closeGeneration() {
     const generation = ++this.generation;
@@ -1341,7 +1381,7 @@ var CodexDriver = class extends AgentDriver {
   };
   log = getBridgeLogger("codex");
   config;
-  managed;
+  reconfig = new ReconfigureLedger({ config: () => this.config });
   thread = null;
   running = false;
   abortController = null;
@@ -1353,34 +1393,27 @@ var CodexDriver = class extends AgentDriver {
   _lastTokens = null;
   constructor(config) {
     super();
+    if (isManagedCodexConfig(config)) throw new Error("CODEX_MANAGED_REQUIRES_FACTORY");
     this.config = config;
-    const codex = config.driverOptions?.codex;
-    if (codex?.managedRuntime || codex?.authSource !== void 0 && codex.authSource !== "local") {
-      this.managed = new ManagedCodexDriver(config);
-      this.managed.on("agent-event", (event) => this.emit("agent-event", event));
-    }
   }
   get runtimeSessionId() {
-    return this.managed ? this.managed.runtimeSessionId : this._runtimeSessionId;
-  }
-  get acceptsReplyAsPrompt() {
-    return !this.managed;
+    return this._runtimeSessionId;
   }
   async dispose() {
-    if (this.managed) return this.managed.dispose();
     this.kill();
   }
-  hasPendingQuestion() {
-    return this.managed?.hasPendingQuestion() ?? false;
-  }
-  answerQuestion(answer, question, requestId) {
-    return this.managed?.answerQuestion(answer, question, requestId) ?? false;
+  /**
+   * Store a model / thinking / effort change. The SDK thread is built from
+   * `config` in {@link start}, so the next thread start (first prompt, or after
+   * `resetSession()`) uses it; a thread already running keeps its options.
+   */
+  reconfigure(patch) {
+    return this.reconfig.reconfigure(patch);
   }
-  promptInput(input) {
-    return this.managed ? this.managed.promptInput(input) : super.promptInput(input);
+  getModel() {
+    return this.config.model;
   }
   async start() {
-    if (this.managed) return this.managed.start();
     if (this.thread) return;
     let sdk;
     try {
@@ -1435,7 +1468,6 @@ var CodexDriver = class extends AgentDriver {
     });
   }
   async prompt(message) {
-    if (this.managed) return this.managed.prompt(message);
     await this.start();
     if (!this.thread) throw new Error("Codex thread not initialized");
     if (this.running) throw new Error("Codex turn already in progress");
@@ -1481,18 +1513,12 @@ var CodexDriver = class extends AgentDriver {
     }
   }
   async abort() {
-    if (this.managed) return this.managed.abort();
     this.abortController?.abort();
   }
   get isRunning() {
-    if (this.managed) return this.managed.isRunning;
     return this.running;
   }
   kill() {
-    if (this.managed) {
-      this.managed.kill();
-      return;
-    }
     this.abortController?.abort();
     this.running = false;
     this.abortController = null;
@@ -1509,7 +1535,6 @@ var CodexDriver = class extends AgentDriver {
    * `OPENAI_API_KEY` is the last resort.
    */
   async listModels() {
-    if (this.managed) return this.managed.listModels();
     const selected = this.selectedProviderEntry();
     const sessionEnv = { ...process.env, ...this.config.env };
     const apiKey = selected ? entryCredentialValue(selected.id, selected.entry, { env: sessionEnv }) : sessionEnv.OPENAI_API_KEY;
@@ -1536,7 +1561,6 @@ var CodexDriver = class extends AgentDriver {
     return match ? { id: match[0], entry: match[1] } : void 0;
   }
   async resetSession() {
-    if (this.managed) return this.managed.resetSession();
     this.kill();
     this.config = { ...this.config, resumeSessionId: void 0 };
     this.thread = null;
@@ -1544,15 +1568,8 @@ var CodexDriver = class extends AgentDriver {
     this._lastTokens = null;
   }
   getTokenUsage() {
-    if (this.managed) return this.managed.getTokenUsage();
     return this._lastTokens;
   }
-  reconfigure(patch) {
-    this.managed?.reconfigure(patch);
-  }
-  getModel() {
-    return this.managed?.getModel();
-  }
   /**
    * Write a combined instructions file for Codex CLI's `model_instructions_file` config.
    * Combines the agent's pre-rendered identity (`.codex/skaile-agents/<agentName>.md`, written
@@ -1846,20 +1863,29 @@ var CodexDriver = class extends AgentDriver {
     };
   }
 };
+function isManagedCodexConfig(config) {
+  const codex = config.driverOptions?.codex;
+  return Boolean(
+    codex?.managedRuntime || codex?.authSource !== void 0 && codex.authSource !== "local"
+  );
+}
 var codexDriverTarget = {
   id: "codex",
   displayName: BUILTIN_DRIVER_CATALOG.codex?.name ?? "OpenAI Codex",
   apiVersion: 1,
   // Drivers take AgentConfig; passthrough — full schema validation is out of scope.
   configSchema: z.custom(() => true),
-  create: async (config, _ctx) => new CodexDriver(config),
-  listModels: async (registry, options) => new CodexDriver({
-    cwd: process.cwd(),
-    sessionId: "model-list",
-    ...registryDriverConfig(registry, options)
-  }).listModels()
+  create: async (config, _ctx) => isManagedCodexConfig(config) ? new ManagedCodexDriver(config) : new CodexDriver(config),
+  listModels: async (registry, options) => {
+    const config = {
+      cwd: process.cwd(),
+      sessionId: "model-list",
+      ...registryDriverConfig(registry, options)
+    };
+    return (isManagedCodexConfig(config) ? new ManagedCodexDriver(config) : new CodexDriver(config)).listModels();
+  }
 };
 
-export { CodexDriver, codexDriverTarget };
+export { CodexDriver, codexDriverTarget, isManagedCodexConfig };
 //# sourceMappingURL=codex.js.map
 //# sourceMappingURL=codex.js.map