@openacp/cli 2026.403.7 → 2026.403.8

package/dist/cli.js

@@ -11411,7 +11411,7 @@ var BYPASS_KEYWORDS;
 var init_bypass_detection = __esm({
   "src/core/utils/bypass-detection.ts"() {
     "use strict";
-    BYPASS_KEYWORDS = ["bypass", "dangerous", "auto_accept"];
+    BYPASS_KEYWORDS = ["bypass", "dangerous", "auto_accept", "yolo"];
   }
 });
 
@@ -18884,12 +18884,18 @@ ${stderr}`
           cwd: workingDirectory,
           mcpServers: resolvedMcp
         });
+        log29.info(response, "newSession response");
         instance.sessionId = response.sessionId;
         instance.initialSessionResponse = response;
         instance.debugTracer = createDebugTracer(response.sessionId, workingDirectory);
         instance.setupCrashDetection();
         log29.info(
-          { sessionId: response.sessionId, durationMs: Date.now() - spawnStart },
+          {
+            sessionId: response.sessionId,
+            durationMs: Date.now() - spawnStart,
+            configOptions: response.configOptions ?? [],
+            agentCapabilities: instance.agentCapabilities ?? null
+          },
           "Agent spawn complete"
         );
         return instance;
@@ -18901,24 +18907,47 @@ ${stderr}`
           agentDef,
           workingDirectory
         );
+        const resolvedMcp = _AgentInstance.mcpManager.resolve(mcpServers);
         try {
-          const response = await instance.connection.unstable_resumeSession({
-            sessionId: agentSessionId,
-            cwd: workingDirectory
-          });
-          instance.sessionId = response.sessionId;
-          instance.initialSessionResponse = response;
-          instance.debugTracer = createDebugTracer(response.sessionId, workingDirectory);
-          log29.info(
-            { sessionId: response.sessionId, durationMs: Date.now() - spawnStart },
-            "Agent resume complete"
-          );
+          if (instance.agentCapabilities?.loadSession) {
+            const response = await instance.connection.loadSession({
+              sessionId: agentSessionId,
+              cwd: workingDirectory,
+              mcpServers: resolvedMcp
+            });
+            instance.sessionId = agentSessionId;
+            instance.initialSessionResponse = response;
+            instance.debugTracer = createDebugTracer(agentSessionId, workingDirectory);
+            log29.info(
+              {
+                sessionId: agentSessionId,
+                durationMs: Date.now() - spawnStart,
+                agentCapabilities: instance.agentCapabilities ?? null
+              },
+              "Agent load complete"
+            );
+          } else {
+            const response = await instance.connection.unstable_resumeSession({
+              sessionId: agentSessionId,
+              cwd: workingDirectory
+            });
+            instance.sessionId = response.sessionId;
+            instance.initialSessionResponse = response;
+            instance.debugTracer = createDebugTracer(response.sessionId, workingDirectory);
+            log29.info(
+              {
+                sessionId: response.sessionId,
+                durationMs: Date.now() - spawnStart,
+                agentCapabilities: instance.agentCapabilities ?? null
+              },
+              "Agent resume complete"
+            );
+          }
         } catch (err) {
           log29.warn(
             { err, agentSessionId },
             "Resume failed, falling back to new session"
           );
-          const resolvedMcp = _AgentInstance.mcpManager.resolve(mcpServers);
           const response = await instance.connection.newSession({
             cwd: workingDirectory,
             mcpServers: resolvedMcp
@@ -19149,11 +19178,31 @@ ${stderr}`
       }
       // ── New ACP methods ──────────────────────────────────────────────────
       async setConfigOption(configId, value) {
-        return await this.connection.setSessionConfigOption({
-          sessionId: this.sessionId,
-          configId,
-          ...value
-        });
+        try {
+          return await this.connection.setSessionConfigOption({
+            sessionId: this.sessionId,
+            configId,
+            ...value
+          });
+        } catch (err) {
+          if (typeof err === "object" && err !== null && err.code === -32601) {
+            if (configId === "mode" && value.type === "select") {
+              await this.connection.setSessionMode({
+                sessionId: this.sessionId,
+                modeId: value.value
+              });
+              return { configOptions: [] };
+            }
+            if (configId === "model" && value.type === "select") {
+              await this.connection.unstable_setSessionModel({
+                sessionId: this.sessionId,
+                modelId: value.value
+              });
+              return { configOptions: [] };
+            }
+          }
+          throw err;
+        }
       }
       async listSessions(cwd, cursor) {
         return await this.connection.listSessions({
@@ -19499,6 +19548,7 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
           (err) => {
             this.log.error({ err }, "Prompt execution failed");
             const message = err instanceof Error ? err.message : String(err);
+            this.fail(message);
             this.emit("agent_event", { type: "error", message: `Prompt execution failed: ${message}` });
           }
         );
@@ -19753,6 +19803,42 @@ ${result.text}` : result.text;
       setAgentCapabilities(caps) {
         this.agentCapabilities = caps;
       }
+      /**
+       * Hydrate configOptions and agentCapabilities from a spawn response.
+       * Handles both the native configOptions format and legacy modes/models fields.
+       */
+      applySpawnResponse(resp, caps) {
+        if (caps) this.agentCapabilities = caps;
+        if (!resp) return;
+        if (resp.configOptions) {
+          this.configOptions = resp.configOptions;
+          return;
+        }
+        const legacyOptions = [];
+        if (resp.modes) {
+          const m = resp.modes;
+          legacyOptions.push({
+            id: "mode",
+            name: "Mode",
+            category: "mode",
+            type: "select",
+            currentValue: m.currentModeId,
+            options: m.availableModes.map((x) => ({ value: x.id, name: x.name, description: x.description }))
+          });
+        }
+        if (resp.models) {
+          const m = resp.models;
+          legacyOptions.push({
+            id: "model",
+            name: "Model",
+            category: "model",
+            type: "select",
+            currentValue: m.currentModelId,
+            options: m.availableModels.map((x) => ({ value: x.modelId ?? x.id, name: x.name, description: x.description }))
+          });
+        }
+        if (legacyOptions.length > 0) this.configOptions = legacyOptions;
+      }
       getConfigOption(id) {
         return this.configOptions.find((o) => o.id === id);
       }
@@ -19772,8 +19858,13 @@ ${result.text}` : result.text;
       /** Send a config option change to the agent and update local state from the response. */
       async setConfigOption(configId, value) {
         const response = await this.agentInstance.setConfigOption(configId, value);
-        if (response.configOptions) {
+        if (response.configOptions && response.configOptions.length > 0) {
           await this.updateConfigOptions(response.configOptions);
+        } else if (value.type === "select") {
+          const updated = this.configOptions.map(
+            (o) => o.id === configId && o.type === "select" ? { ...o, currentValue: value.value } : o
+          );
+          await this.updateConfigOptions(updated);
         }
       }
       async updateConfigOptions(options) {
@@ -19837,6 +19928,8 @@ ${result.text}` : result.text;
         this.promptCount = 0;
         this.agentCapabilities = void 0;
         this.configOptions = [];
+        this.latestCommands = null;
+        this.applySpawnResponse(newAgent.initialSessionResponse, newAgent.agentCapabilities);
         this.log.info({ from: this.agentSwitchHistory.at(-1).agentName, to: agentName }, "Agent switched");
       }
       async destroy() {
@@ -20116,6 +20209,9 @@ var init_session_bridge = __esm({
         if (this.session.latestCommands !== null) {
           this.session.emit("agent_event", { type: "commands_update", commands: this.session.latestCommands });
         }
+        if (this.session.configOptions.length > 0) {
+          this.session.emit("agent_event", { type: "config_option_update", options: this.session.configOptions });
+        }
       }
       disconnect() {
         if (!this.connected) return;
@@ -21057,17 +21153,7 @@ var init_session_factory = __esm({
         if (createParams.initialName) {
           session.name = createParams.initialName;
         }
-        const resp = agentInstance.initialSessionResponse;
-        if (resp) {
-          if (resp.configOptions) {
-            session.setInitialConfigOptions(resp.configOptions);
-          }
-          if (agentInstance.agentCapabilities) {
-            session.setAgentCapabilities(agentInstance.agentCapabilities);
-          }
-        } else if (agentInstance.agentCapabilities) {
-          session.setAgentCapabilities(agentInstance.agentCapabilities);
-        }
+        session.applySpawnResponse(agentInstance.initialSessionResponse, agentInstance.agentCapabilities);
         this.sessionManager.registerSession(session);
         this.eventBus.emit("session:created", {
           sessionId: session.id,
@@ -22155,7 +22241,7 @@ function createPluginContext(opts) {
     }
   };
   const baseLog = opts.log ?? noopLog;
-  const log44 = typeof baseLog.child === "function" ? baseLog.child({ plugin: pluginName }) : baseLog;
+  const log45 = typeof baseLog.child === "function" ? baseLog.child({ plugin: pluginName }) : baseLog;
   const storageImpl = new PluginStorageImpl(storagePath);
   const storage = {
     async get(key) {
@@ -22182,7 +22268,7 @@ function createPluginContext(opts) {
   const ctx = {
     pluginName,
     pluginConfig,
-    log: log44,
+    log: log45,
     storage,
     on(event, handler) {
       requirePermission(permissions, "events:read", "on()");
@@ -22217,7 +22303,7 @@ function createPluginContext(opts) {
       const registry = serviceRegistry.get("command-registry");
       if (registry && typeof registry.register === "function") {
         registry.register(def, pluginName);
-        log44.debug(`Command '/${def.name}' registered`);
+        log45.debug(`Command '/${def.name}' registered`);
       }
     },
     async sendMessage(_sessionId, _content) {
@@ -24284,13 +24370,18 @@ function registerCategoryCommand(registry, core, category, commandName) {
           configOption.id,
           { type: "select", value: raw }
         );
-        if (response.configOptions) {
+        if (response.configOptions && response.configOptions.length > 0) {
           session.configOptions = response.configOptions;
+        } else {
+          session.configOptions = session.configOptions.map(
+            (o) => o.id === configOption.id && o.type === "select" ? { ...o, currentValue: raw } : o
+          );
         }
         core.eventBus.emit("session:configChanged", { sessionId: session.id });
         return { type: "text", text: labels.successMsg(match.name, configOption.name) };
       } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+        log41.error({ err, commandName, configId: configOption.id }, "setConfigOption failed");
+        const msg = err instanceof Error ? err.message : typeof err === "object" && err !== null && typeof err.message === "string" ? err.message : String(err);
         return { type: "error", message: `Could not change ${commandName}: ${msg}` };
       }
     }
@@ -24351,8 +24442,12 @@ function registerDangerousCommand(registry, core) {
             modeConfig.id,
             { type: "select", value: targetValue }
           );
-          if (response.configOptions) {
+          if (response.configOptions && response.configOptions.length > 0) {
             session.configOptions = response.configOptions;
+          } else {
+            session.configOptions = session.configOptions.map(
+              (o) => o.id === modeConfig.id && o.type === "select" ? { ...o, currentValue: targetValue } : o
+            );
           }
           core.eventBus.emit("session:configChanged", { sessionId: session.id });
           return {
@@ -24360,7 +24455,8 @@ function registerDangerousCommand(registry, core) {
             text: wantOn ? "\u2620\uFE0F **Bypass Permissions enabled** \u2014 all permission requests will be auto-approved. The agent can run any action without asking." : "\u{1F510} **Bypass Permissions disabled** \u2014 you will be asked to approve risky actions."
           };
         } catch (err) {
-          const msg = err instanceof Error ? err.message : String(err);
+          log41.error({ err }, "setConfigOption failed (bypass toggle)");
+          const msg = err instanceof Error ? err.message : typeof err === "object" && err !== null && typeof err.message === "string" ? err.message : String(err);
           return { type: "error", message: `Could not toggle bypass: ${msg}` };
         }
       }
@@ -24383,12 +24479,14 @@ function registerConfigCommands(registry, _core) {
   registerCategoryCommand(registry, core, "thought_level", "thought");
   registerDangerousCommand(registry, core);
 }
-var CATEGORY_LABELS;
+var log41, CATEGORY_LABELS;
 var init_config6 = __esm({
   "src/core/commands/config.ts"() {
     "use strict";
+    init_log();
     init_bypass_detection();
     init_bypass_detection();
+    log41 = createChildLogger({ module: "commands/config" });
     CATEGORY_LABELS = {
       mode: {
         menuTitle: (cur) => `Choose session mode (current: ${cur})`,
@@ -24781,7 +24879,7 @@ function installAutoStart(logDir2) {
       fs46.mkdirSync(dir, { recursive: true });
       fs46.writeFileSync(LAUNCHD_PLIST_PATH, plist);
       execFileSync7("launchctl", ["load", LAUNCHD_PLIST_PATH], { stdio: "pipe" });
-      log41.info("LaunchAgent installed");
+      log42.info("LaunchAgent installed");
       return { success: true };
     }
     if (process.platform === "linux") {
@@ -24791,13 +24889,13 @@ function installAutoStart(logDir2) {
       fs46.writeFileSync(SYSTEMD_SERVICE_PATH, unit);
       execFileSync7("systemctl", ["--user", "daemon-reload"], { stdio: "pipe" });
       execFileSync7("systemctl", ["--user", "enable", "openacp"], { stdio: "pipe" });
-      log41.info("systemd user service installed");
+      log42.info("systemd user service installed");
       return { success: true };
     }
     return { success: false, error: "Unsupported platform" };
   } catch (e) {
     const msg = e.message;
-    log41.error({ err: msg }, "Failed to install auto-start");
+    log42.error({ err: msg }, "Failed to install auto-start");
     return { success: false, error: msg };
   }
 }
@@ -24813,7 +24911,7 @@ function uninstallAutoStart() {
         } catch {
         }
         fs46.unlinkSync(LAUNCHD_PLIST_PATH);
-        log41.info("LaunchAgent removed");
+        log42.info("LaunchAgent removed");
       }
       return { success: true };
     }
@@ -24825,14 +24923,14 @@ function uninstallAutoStart() {
         }
         fs46.unlinkSync(SYSTEMD_SERVICE_PATH);
         execFileSync7("systemctl", ["--user", "daemon-reload"], { stdio: "pipe" });
-        log41.info("systemd user service removed");
+        log42.info("systemd user service removed");
       }
       return { success: true };
     }
     return { success: false, error: "Unsupported platform" };
   } catch (e) {
     const msg = e.message;
-    log41.error({ err: msg }, "Failed to uninstall auto-start");
+    log42.error({ err: msg }, "Failed to uninstall auto-start");
     return { success: false, error: msg };
   }
 }
@@ -24845,12 +24943,12 @@ function isAutoStartInstalled() {
   }
   return false;
 }
-var log41, LAUNCHD_LABEL, LAUNCHD_PLIST_PATH, SYSTEMD_SERVICE_PATH;
+var log42, LAUNCHD_LABEL, LAUNCHD_PLIST_PATH, SYSTEMD_SERVICE_PATH;
 var init_autostart = __esm({
   "src/cli/autostart.ts"() {
     "use strict";
     init_log();
-    log41 = createChildLogger({ module: "autostart" });
+    log42 = createChildLogger({ module: "autostart" });
     LAUNCHD_LABEL = "com.openacp.daemon";
     LAUNCHD_PLIST_PATH = path53.join(os24.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
     SYSTEMD_SERVICE_PATH = path53.join(os24.homedir(), ".config", "systemd", "user", "openacp.service");
@@ -24953,7 +25051,7 @@ async function setupIntegrations() {
       if (integration) {
         for (const item of integration.items) {
           const result = await item.install();
-          for (const log44 of result.logs) console.log(`  ${log44}`);
+          for (const log45 of result.logs) console.log(`  ${log45}`);
         }
       }
       console.log("Claude CLI integration installed.\n");
@@ -25911,14 +26009,14 @@ async function runPostUpgradeChecks(config) {
         const { ensureCloudflared: ensureCloudflared2 } = await Promise.resolve().then(() => (init_install_cloudflared(), install_cloudflared_exports));
         await ensureCloudflared2();
       } catch (err) {
-        log43.warn(
+        log44.warn(
           { err: err.message },
           "Could not install cloudflared. Tunnel may not work."
         );
       }
     } else {
       if (!commandExists(config.tunnel.provider)) {
-        log43.warn(
+        log44.warn(
           `Tunnel provider "${config.tunnel.provider}" is not installed. Install it or switch to cloudflare (free, auto-installed).`
         );
       }
@@ -25930,7 +26028,7 @@ async function runPostUpgradeChecks(config) {
     if (integration) {
       const allInstalled = integration.items.every((item) => item.isInstalled());
       if (!allInstalled) {
-        log43.info(
+        log44.info(
           'Claude CLI integration not installed. Run "openacp integrate claude" for session transfer + tunnel skill.'
         );
       }
@@ -25940,7 +26038,7 @@ async function runPostUpgradeChecks(config) {
           const { ensureJq: ensureJq2 } = await Promise.resolve().then(() => (init_install_jq(), install_jq_exports));
           await ensureJq2();
         } catch (err) {
-          log43.warn(
+          log44.warn(
             { err: err.message },
             "Could not install jq. Handoff hooks may not work."
           );
@@ -25950,7 +26048,7 @@ async function runPostUpgradeChecks(config) {
   } catch {
   }
   if (!commandExists("unzip")) {
-    log43.warn(
+    log44.warn(
       "unzip is not installed. Some agent installations (binary distribution) may fail. Install: brew install unzip (macOS) or apt install unzip (Linux)"
     );
   }
@@ -25963,20 +26061,20 @@ async function runPostUpgradeChecks(config) {
       (a) => a.distribution === "uvx"
     );
     if (hasUvxAgent && !commandExists("uvx")) {
-      log43.warn(
+      log44.warn(
         "uvx is not installed but you have Python-based agents. Install: pip install uv"
       );
     }
   } catch {
   }
 }
-var log43;
+var log44;
 var init_post_upgrade = __esm({
   "src/cli/post-upgrade.ts"() {
     "use strict";
     init_log();
     init_agent_dependencies();
-    log43 = createChildLogger({ module: "post-upgrade" });
+    log44 = createChildLogger({ module: "post-upgrade" });
   }
 });
 
@@ -29711,7 +29809,7 @@ a "Handoff" slash command to Claude Code.
     if (uninstall) {
       console.log(`Removing ${agent}/${item.id}...`);
       const result = await item.uninstall();
-      for (const log44 of result.logs) console.log(`  ${log44}`);
+      for (const log45 of result.logs) console.log(`  ${log45}`);
       if (result.success) {
         console.log(`  ${item.name} removed.`);
       } else {
@@ -29721,7 +29819,7 @@ a "Handoff" slash command to Claude Code.
     } else {
       console.log(`Installing ${agent}/${item.id}...`);
       const result = await item.install();
-      for (const log44 of result.logs) console.log(`  ${log44}`);
+      for (const log45 of result.logs) console.log(`  ${log45}`);
       if (result.success) {
         console.log(`  ${item.name} installed.`);
       } else {