@buildautomaton/cli 0.1.36 → 0.1.37

package/dist/index.js

@@ -22935,6 +22935,16 @@ function isClaudeCodePermissionMode(value) {
   return MODE_SET.has(value);
 }
 
+// ../types/src/codex-permission-mode.ts
+function isCodexPermissionMode(value) {
+  return value.trim() !== "";
+}
+function normalizeCodexPermissionModeInput(raw) {
+  if (typeof raw !== "string") return null;
+  const t = raw.trim();
+  return isCodexPermissionMode(t) ? t : null;
+}
+
 // ../types/src/cli-permission-mode.ts
 var CLI_PERMISSION_MODE_DEFAULT = "default";
 var CLI_PERMISSION_MODE_DANGEROUS = "dangerous";
@@ -23006,6 +23016,7 @@ function buildCliAutoApprovedPermissionRpcResult(requestParams) {
 // ../types/src/agent-config.ts
 var AGENT_CONFIG_CLAUDE_PERMISSION_MODE_KEY = "claude_permission_mode";
 var AGENT_CONFIG_CLI_PERMISSION_MODE_KEY = "cli_permission_mode";
+var AGENT_CONFIG_CODEX_PERMISSION_MODE_KEY = "codex_permission_mode";
 var AGENT_CONFIG_AGENT_MODEL_KEY = "agent_model";
 function getClaudePermissionModeFromAgentConfig(config2) {
   if (!config2) return null;
@@ -23018,6 +23029,10 @@ function getCliPermissionModeFromAgentConfig(config2) {
   if (!config2) return CLI_PERMISSION_MODE_DEFAULT;
   return normalizeCliPermissionModeInput(config2[AGENT_CONFIG_CLI_PERMISSION_MODE_KEY]);
 }
+function getCodexPermissionModeFromAgentConfig(config2) {
+  if (!config2) return null;
+  return normalizeCodexPermissionModeInput(config2[AGENT_CONFIG_CODEX_PERMISSION_MODE_KEY]);
+}
 function getAgentModelFromAgentConfig(config2) {
   if (!config2) return null;
   const cur = config2[AGENT_CONFIG_AGENT_MODEL_KEY];
@@ -23080,8 +23095,60 @@ async function applyClaudePermissionFromAcpSession(params) {
   }
 }
 
-// src/agents/acp/apply-acp-model-from-agent-session.ts
+// src/agents/acp/codex-acp-permission-from-session.ts
 function flattenSelectOptions2(options) {
+  if (options == null || options.length === 0) return [];
+  const first2 = options[0];
+  if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
+    return options.flatMap(
+      (g) => Array.isArray(g.options) ? g.options : []
+    );
+  }
+  return options;
+}
+function pickModeConfigOption2(configOptions) {
+  if (configOptions == null || configOptions.length === 0) return null;
+  const byCategory = configOptions.find((o) => o.category === "mode");
+  if (byCategory) return byCategory;
+  return configOptions.find((o) => o.id === "mode") ?? null;
+}
+async function applyCodexPermissionFromAcpSession(params) {
+  const { sessionId, agentConfig, configOptions, modes, setSessionConfigOption, setSessionMode, logDebug: logDebug2 } = params;
+  const desiredMode = getCodexPermissionModeFromAgentConfig(agentConfig);
+  if (desiredMode == null) return;
+  const modeOpt = pickModeConfigOption2(configOptions ?? null);
+  if (modeOpt != null) {
+    const flat = flattenSelectOptions2(modeOpt.options);
+    const allowed = flat.some((o) => o.value === desiredMode);
+    if (allowed && modeOpt.currentValue !== desiredMode) {
+      try {
+        logDebug2(
+          `[Agent] Codex: sending ACP session/set_config_option (mode) configId=${JSON.stringify(modeOpt.id)} value=${JSON.stringify(desiredMode)} was=${JSON.stringify(modeOpt.currentValue)} sessionId=${sessionId.slice(0, 8)}\u2026`
+        );
+        await setSessionConfigOption({ sessionId, configId: modeOpt.id, value: desiredMode });
+      } catch (e) {
+        logDebug2(`[Agent] Codex: session/set_config_option failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+    }
+    return;
+  }
+  if (modes?.availableModes?.length) {
+    const allowed = modes.availableModes.some((m) => m.id === desiredMode);
+    if (allowed && desiredMode !== modes.currentModeId) {
+      try {
+        logDebug2(
+          `[Agent] Codex: sending ACP session/set_mode modeId=${JSON.stringify(desiredMode)} was=${JSON.stringify(modes.currentModeId ?? null)} sessionId=${sessionId.slice(0, 8)}\u2026`
+        );
+        await setSessionMode({ sessionId, modeId: desiredMode });
+      } catch (e) {
+        logDebug2(`[Agent] Codex: session/set_mode failed: ${e instanceof Error ? e.message : String(e)}`);
+      }
+    }
+  }
+}
+
+// src/agents/acp/apply-acp-model-from-agent-session.ts
+function flattenSelectOptions3(options) {
   if (options == null || options.length === 0) return [];
   const first2 = options[0];
   if (first2 != null && typeof first2 === "object" && "group" in first2 && first2.group != null) {
@@ -23106,7 +23173,7 @@ async function applyAcpModelFromAcpSession(params) {
   if (desired == null) return;
   const modelOpt = pickModelConfigOption(configOptions ?? null);
   if (modelOpt == null) return;
-  const flat = flattenSelectOptions2(modelOpt.options);
+  const flat = flattenSelectOptions3(modelOpt.options);
   const allowed = flat.some((o) => o.value === desired);
   if (!allowed) return;
   if (modelOpt.currentValue === desired) return;
@@ -23186,12 +23253,41 @@ function parseAcpInitAgentCapabilities(initResult) {
 }
 
 // src/agents/acp/clients/shared/bootstrap-acp-wire-session.ts
+function configOptionsWithModes(configOptions, modes) {
+  const modeState = modes && typeof modes === "object" ? modes : null;
+  if (!modeState?.availableModes?.length) return configOptions;
+  const hasModeConfig = Array.isArray(configOptions) && configOptions.some((raw) => {
+    if (raw == null || typeof raw !== "object" || Array.isArray(raw)) return false;
+    const o = raw;
+    return o.category === "mode" || o.id === "mode";
+  });
+  if (hasModeConfig) return configOptions;
+  return [
+    ...configOptions ?? [],
+    {
+      id: "mode",
+      name: "Mode",
+      type: "select",
+      category: "mode",
+      currentValue: modeState.currentModeId ?? null,
+      options: modeState.availableModes.map((m) => {
+        const r = m;
+        return {
+          value: m.id,
+          name: m.name ?? m.id,
+          ...typeof r.description === "string" && r.description.trim() !== "" ? { description: r.description.trim() } : {}
+        };
+      })
+    }
+  ];
+}
 async function bootstrapAcpWireSession(transport, ctx, initializeRequest) {
   const initResult = await transport.initialize(initializeRequest);
   const { canResume, canLoad, promptSupportsImage } = parseAcpInitAgentCapabilities(initResult);
   ctx.agentPromptImageSupported = promptSupportsImage;
   await transport.afterInitialize?.();
   const established = await establishAcpSessionWithTransport(transport, ctx, canResume, canLoad);
+  established.configOptions = configOptionsWithModes(established.configOptions, established.modes);
   const sessionId = established.sessionId;
   ctx.onAcpSessionEstablished?.({
     acpSessionId: sessionId,
@@ -23214,6 +23310,22 @@ async function bootstrapAcpWireSession(transport, ctx, initializeRequest) {
       logDebug: ctx.logDebug
     });
   }
+  if (ctx.backendAgentType === "codex-acp") {
+    const cfg = ctx.agentConfig != null && typeof ctx.agentConfig === "object" && !Array.isArray(ctx.agentConfig) ? ctx.agentConfig : null;
+    const configOptionsTyped = established.configOptions;
+    const modesTyped = established.modes;
+    await applyCodexPermissionFromAcpSession({
+      sessionId,
+      agentConfig: cfg,
+      configOptions: configOptionsForPermission(ctx.getActiveConfigOptions, configOptionsTyped),
+      modes: modesTyped,
+      setSessionConfigOption: transport.setSessionConfigOption ? (p) => transport.setSessionConfigOption(p) : async () => {
+      },
+      setSessionMode: transport.setSessionMode ? (p) => transport.setSessionMode(p) : async () => {
+      },
+      logDebug: ctx.logDebug
+    });
+  }
   const cfgAll = ctx.agentConfig != null && typeof ctx.agentConfig === "object" && !Array.isArray(ctx.agentConfig) ? ctx.agentConfig : null;
   const configOptionsForModel = established.configOptions;
   if (transport.setSessionConfigOption) {
@@ -23964,7 +24076,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.36".length > 0 ? "0.1.36" : "0.0.0-dev";
+var CLI_VERSION = "0.1.37".length > 0 ? "0.1.37" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -30940,13 +31052,18 @@ function isCodexAcpCommand(command) {
   const i = command.indexOf("@zed-industries/codex-acp");
   return i >= 0 && (i === 0 || command[i - 1] === "npx" || command[i - 1] === "bunx");
 }
-function buildCodexAcpSpawnCommand(base, _sessionMode) {
+function buildCodexAcpSpawnCommand(base, _sessionMode, _agentConfig) {
   return [...base];
 }
 async function createCodexAcpClient(options) {
   const base = options.command?.length && options.command.some((a) => a.includes("codex-acp")) ? options.command : [...DEFAULT_CODEX_ACP_COMMAND];
-  const command = buildCodexAcpSpawnCommand(base, options.sessionMode);
-  return createSdkStdioAcpClient({ ...options, command });
+  const command = buildCodexAcpSpawnCommand(base, options.sessionMode, options.agentConfig);
+  return createSdkStdioAcpClient({
+    ...options,
+    command,
+    /** Codex ACP can ignore `session/cancel`; mirror Claude Code's subprocess fallback. */
+    killSubprocessAfterCancelMs: options.killSubprocessAfterCancelMs ?? 2500
+  });
 }
 
 // src/agents/acp/clients/cursor/cursor-acp-client.ts
@@ -31344,7 +31461,7 @@ function resolveAgentCommand(preferredAgentType) {
       command,
       label: preferredAgentType,
       createClient: createCodexAcpClient,
-      spawnCommandForSession: (sessionMode, _agentConfig) => buildCodexAcpSpawnCommand(command, sessionMode)
+      spawnCommandForSession: (sessionMode, agentConfig) => buildCodexAcpSpawnCommand(command, sessionMode, agentConfig)
     };
   }
   if (useKiroAcp(preferredAgentType, command)) {