@openacp/cli 2026.41.1 → 2026.41.2

package/dist/cli.js

@@ -833,9 +833,7 @@ Register with \`ctx.registerMiddleware(hook, { priority?, handler })\`. Return \
 - \`session:afterDestroy\` \u2014 after session destroyed (sessionId, reason, durationMs, promptCount)
 
 ### Control
-- \`mode:beforeChange\` \u2014 before mode change (sessionId, fromMode, toMode)
 - \`config:beforeChange\` \u2014 before config change (sessionId, configId, oldValue, newValue)
-- \`model:beforeChange\` \u2014 before model change (sessionId, fromModel, toModel)
 - \`agent:beforeCancel\` \u2014 before agent cancellation (sessionId, reason)
 - \`agent:beforeSwitch\` \u2014 **blocking** before agent switch (sessionId, fromAgent, toAgent). Return null/false to block.
 - \`agent:afterSwitch\` \u2014 **fire-and-forget** after agent switch (sessionId, fromAgent, toAgent, resumed). Observational only.
@@ -3136,10 +3134,6 @@ var init_history_recorder = __esm({
             steps.push(step2);
             break;
           }
-          case "current_mode_update": {
-            steps.push({ type: "mode_change", modeId: event.modeId });
-            break;
-          }
           case "config_option_update": {
             for (const opt of event.options) {
               steps.push({
@@ -4570,7 +4564,7 @@ var init_cloudflare = __esm({
             settle(() => reject(new Error("Cloudflare tunnel timed out after 30s")));
           }, 3e4);
           try {
-            this.child = spawn(binaryPath, args2, { stdio: ["ignore", "pipe", "pipe"] });
+            this.child = spawn(binaryPath, args2, { stdio: ["ignore", "pipe", "pipe"], detached: true });
           } catch {
             clearTimeout(timeout);
             settle(() => reject(new Error(`Failed to start cloudflared at ${binaryPath}`)));
@@ -4606,11 +4600,16 @@ var init_cloudflare = __esm({
           });
         });
       }
-      async stop() {
+      async stop(force = false) {
         const child = this.child;
         if (!child) return;
         this.child = null;
         this.exitCallback = null;
+        if (force) {
+          child.kill("SIGKILL");
+          log3.info("Cloudflare tunnel force-killed");
+          return;
+        }
         child.kill("SIGTERM");
         const exited = await Promise.race([
           new Promise((resolve8) => child.on("exit", () => resolve8(true))),
@@ -4679,7 +4678,7 @@ var init_ngrok = __esm({
             settle(() => reject(new Error("ngrok tunnel timed out after 30s. Is ngrok installed?")));
           }, 3e4);
           try {
-            this.child = spawn2("ngrok", args2, { stdio: ["ignore", "pipe", "pipe"] });
+            this.child = spawn2("ngrok", args2, { stdio: ["ignore", "pipe", "pipe"], detached: true });
           } catch {
             clearTimeout(timeout);
             settle(() => reject(new Error(
@@ -4719,11 +4718,16 @@ var init_ngrok = __esm({
           });
         });
       }
-      async stop() {
+      async stop(force = false) {
         const child = this.child;
         if (!child) return;
         this.child = null;
         this.exitCallback = null;
+        if (force) {
+          child.kill("SIGKILL");
+          log4.info("ngrok tunnel force-killed");
+          return;
+        }
         child.kill("SIGTERM");
         const exited = await Promise.race([
           new Promise((resolve8) => child.on("exit", () => resolve8(true))),
@@ -4784,7 +4788,7 @@ var init_bore = __esm({
             settle(() => reject(new Error("Bore tunnel timed out after 30s. Is bore installed?")));
           }, 3e4);
           try {
-            this.child = spawn3("bore", args2, { stdio: ["ignore", "pipe", "pipe"] });
+            this.child = spawn3("bore", args2, { stdio: ["ignore", "pipe", "pipe"], detached: true });
           } catch {
             clearTimeout(timeout);
             settle(() => reject(new Error(
@@ -4824,11 +4828,16 @@ var init_bore = __esm({
           });
         });
       }
-      async stop() {
+      async stop(force = false) {
         const child = this.child;
         if (!child) return;
         this.child = null;
         this.exitCallback = null;
+        if (force) {
+          child.kill("SIGKILL");
+          log5.info("Bore tunnel force-killed");
+          return;
+        }
         child.kill("SIGTERM");
         const exited = await Promise.race([
           new Promise((resolve8) => child.on("exit", () => resolve8(true))),
@@ -4894,7 +4903,7 @@ var init_tailscale = __esm({
             settle(() => reject(new Error("Tailscale funnel timed out after 30s. Is tailscale installed?")));
           }, 3e4);
           try {
-            this.child = spawn4("tailscale", args2, { stdio: ["ignore", "pipe", "pipe"] });
+            this.child = spawn4("tailscale", args2, { stdio: ["ignore", "pipe", "pipe"], detached: true });
           } catch {
             clearTimeout(timeout);
             settle(() => reject(new Error(
@@ -4941,11 +4950,16 @@ var init_tailscale = __esm({
           });
         });
       }
-      async stop() {
+      async stop(force = false) {
         const child = this.child;
         if (!child) return;
         this.child = null;
         this.exitCallback = null;
+        if (force) {
+          child.kill("SIGKILL");
+          log6.info("Tailscale funnel force-killed");
+          return;
+        }
         child.kill("SIGTERM");
         const exited = await Promise.race([
           new Promise((resolve8) => child.on("exit", () => resolve8(true))),
@@ -5076,6 +5090,7 @@ var init_tunnel_registry = __esm({
           const entry = await this.add(port, opts, false);
           entry.retryCount = retryCount;
         } catch (err) {
+          if (this.shuttingDown) return;
           log7.error({ port, err: err.message, retry: retryCount }, "Tunnel retry failed");
           const failedEntry = {
             port,
@@ -5146,7 +5161,7 @@ var init_tunnel_registry = __esm({
         for (const [, live] of this.entries) {
           if (live.retryTimer) clearTimeout(live.retryTimer);
           if (live.process) {
-            stopPromises.push(live.process.stop().catch(() => {
+            stopPromises.push(live.process.stop(true).catch(() => {
             }));
           }
         }
@@ -6651,6 +6666,7 @@ async function createApiServer(options) {
           return { port: Number(url.port), host: url.hostname };
         } catch (err) {
           if (err?.code === "EADDRINUSE" && attempt < maxRetries && port < 65535) {
+            console.log(`[api-server] Port ${port} in use, trying ${port + 1}...`);
             port++;
             continue;
           }
@@ -6896,7 +6912,7 @@ var init_service = __esm({
 
 // src/plugins/api-server/schemas/sessions.ts
 import { z } from "zod";
-var ListSessionsQuerySchema, CreateSessionBodySchema, AdoptSessionBodySchema, PromptBodySchema, PermissionResponseBodySchema, DangerousModeBodySchema, UpdateSessionBodySchema, SessionIdParamSchema;
+var ListSessionsQuerySchema, CreateSessionBodySchema, AdoptSessionBodySchema, PromptBodySchema, PermissionResponseBodySchema, DangerousModeBodySchema, UpdateSessionBodySchema, SessionIdParamSchema, ConfigIdParamSchema, SetConfigOptionBodySchema, SetClientOverridesBodySchema;
 var init_sessions = __esm({
   "src/plugins/api-server/schemas/sessions.ts"() {
     "use strict";
@@ -6935,6 +6951,16 @@ var init_sessions = __esm({
     SessionIdParamSchema = z.object({
       sessionId: z.string().min(1)
     });
+    ConfigIdParamSchema = z.object({
+      sessionId: z.string().min(1),
+      configId: z.string().min(1)
+    });
+    SetConfigOptionBodySchema = z.object({
+      value: z.string()
+    });
+    SetClientOverridesBodySchema = z.object({
+      bypassPermissions: z.boolean().optional()
+    });
   }
 });
 
@@ -6954,15 +6980,12 @@ async function sessionRoutes(app, deps) {
         name: s.name ?? null,
         workspace: s.workingDirectory,
         createdAt: s.createdAt.toISOString(),
-        dangerousMode: s.dangerousMode,
+        dangerousMode: s.clientOverrides.bypassPermissions ?? false,
         queueDepth: s.queueDepth,
         promptRunning: s.promptRunning,
         lastActiveAt: deps.core.sessionManager.getSessionRecord(s.id)?.lastActiveAt ?? null,
         // ACP state
-        currentMode: s.currentMode ?? null,
-        currentModel: s.currentModel ?? null,
-        availableModes: s.availableModes?.length ? s.availableModes : void 0,
-        availableModels: s.availableModels?.length ? s.availableModels : void 0,
+        configOptions: s.configOptions?.length ? s.configOptions : void 0,
         capabilities: s.agentCapabilities ?? null
       }))
     };
@@ -6989,17 +7012,13 @@ async function sessionRoutes(app, deps) {
           name: session.name ?? null,
           workspace: session.workingDirectory,
           createdAt: session.createdAt.toISOString(),
-          dangerousMode: session.dangerousMode,
+          dangerousMode: session.clientOverrides.bypassPermissions ?? false,
           queueDepth: session.queueDepth,
           promptRunning: session.promptRunning,
           threadId: session.threadId,
           channelId: session.channelId,
           agentSessionId: session.agentSessionId,
           // ACP state
-          currentMode: session.currentMode ?? null,
-          currentModel: session.currentModel ?? null,
-          availableModes: session.availableModes?.length ? session.availableModes : void 0,
-          availableModels: session.availableModels?.length ? session.availableModels : void 0,
           configOptions: session.configOptions?.length ? session.configOptions : void 0,
           capabilities: session.agentCapabilities ?? null
         }
@@ -7173,9 +7192,9 @@ async function sessionRoutes(app, deps) {
         changes.voiceMode = body.voiceMode;
       }
       if (body.dangerousMode !== void 0) {
-        session.dangerousMode = body.dangerousMode;
+        session.clientOverrides.bypassPermissions = body.dangerousMode;
         await deps.core.sessionManager.patchRecord(sessionId, {
-          dangerousMode: body.dangerousMode
+          clientOverrides: session.clientOverrides
         });
         changes.dangerousMode = body.dangerousMode;
       }
@@ -7196,13 +7215,101 @@ async function sessionRoutes(app, deps) {
         );
       }
       const body = DangerousModeBodySchema.parse(request.body);
-      session.dangerousMode = body.enabled;
+      session.clientOverrides.bypassPermissions = body.enabled;
       await deps.core.sessionManager.patchRecord(sessionId, {
-        dangerousMode: body.enabled
+        clientOverrides: session.clientOverrides
       });
       return { ok: true, dangerousMode: body.enabled };
     }
   );
+  app.get(
+    "/:sessionId/config",
+    { preHandler: requireScopes("sessions:read") },
+    async (request) => {
+      const { sessionId: rawId } = SessionIdParamSchema.parse(request.params);
+      const sessionId = decodeURIComponent(rawId);
+      const session = deps.core.sessionManager.getSession(sessionId);
+      if (!session) {
+        throw new NotFoundError(
+          "SESSION_NOT_FOUND",
+          `Session "${sessionId}" not found`
+        );
+      }
+      return {
+        configOptions: session.configOptions,
+        clientOverrides: session.clientOverrides
+      };
+    }
+  );
+  app.put(
+    "/:sessionId/config/:configId",
+    { preHandler: requireScopes("sessions:write") },
+    async (request) => {
+      const { sessionId: rawId, configId } = ConfigIdParamSchema.parse(request.params);
+      const sessionId = decodeURIComponent(rawId);
+      const session = deps.core.sessionManager.getSession(sessionId);
+      if (!session) {
+        throw new NotFoundError(
+          "SESSION_NOT_FOUND",
+          `Session "${sessionId}" not found`
+        );
+      }
+      const body = SetConfigOptionBodySchema.parse(request.body);
+      const response = await session.agentInstance.setConfigOption(configId, {
+        type: "select",
+        value: body.value
+      });
+      if (response.configOptions) {
+        await session.updateConfigOptions(response.configOptions);
+      }
+      await deps.core.sessionManager.patchRecord(sessionId, {
+        acpState: session.toAcpStateSnapshot()
+      });
+      return {
+        configOptions: session.configOptions,
+        clientOverrides: session.clientOverrides
+      };
+    }
+  );
+  app.get(
+    "/:sessionId/config/overrides",
+    { preHandler: requireScopes("sessions:read") },
+    async (request) => {
+      const { sessionId: rawId } = SessionIdParamSchema.parse(request.params);
+      const sessionId = decodeURIComponent(rawId);
+      const session = deps.core.sessionManager.getSession(sessionId);
+      if (!session) {
+        throw new NotFoundError(
+          "SESSION_NOT_FOUND",
+          `Session "${sessionId}" not found`
+        );
+      }
+      return { clientOverrides: session.clientOverrides };
+    }
+  );
+  app.put(
+    "/:sessionId/config/overrides",
+    { preHandler: requireScopes("sessions:write") },
+    async (request) => {
+      const { sessionId: rawId } = SessionIdParamSchema.parse(request.params);
+      const sessionId = decodeURIComponent(rawId);
+      const session = deps.core.sessionManager.getSession(sessionId);
+      if (!session) {
+        throw new NotFoundError(
+          "SESSION_NOT_FOUND",
+          `Session "${sessionId}" not found`
+        );
+      }
+      const body = SetClientOverridesBodySchema.parse(request.body);
+      if (body.bypassPermissions !== void 0) {
+        session.clientOverrides.bypassPermissions = body.bypassPermissions;
+      }
+      await deps.core.sessionManager.patchRecord(sessionId, {
+        clientOverrides: session.clientOverrides
+      });
+      return { clientOverrides: session.clientOverrides };
+    }
+  );
   app.post(
     "/:sessionId/archive",
     { preHandler: requireScopes("sessions:write") },
@@ -7349,28 +7456,28 @@ import path21 from "path";
 import fs17 from "fs";
 import os10 from "os";
 function createInstanceContext(opts) {
-  const { id, root: root2, isGlobal } = opts;
+  const { id, root, isGlobal } = opts;
   return {
     id,
-    root: root2,
+    root,
     isGlobal,
     paths: {
-      config: path21.join(root2, "config.json"),
-      sessions: path21.join(root2, "sessions.json"),
-      agents: path21.join(root2, "agents.json"),
-      registryCache: path21.join(root2, "registry-cache.json"),
-      plugins: path21.join(root2, "plugins"),
-      pluginsData: path21.join(root2, "plugins", "data"),
-      pluginRegistry: path21.join(root2, "plugins.json"),
-      logs: path21.join(root2, "logs"),
-      pid: path21.join(root2, "openacp.pid"),
-      running: path21.join(root2, "running"),
-      apiPort: path21.join(root2, "api.port"),
-      apiSecret: path21.join(root2, "api-secret"),
-      bin: path21.join(root2, "bin"),
-      cache: path21.join(root2, "cache"),
-      tunnels: path21.join(root2, "tunnels.json"),
-      agentsDir: path21.join(root2, "agents")
+      config: path21.join(root, "config.json"),
+      sessions: path21.join(root, "sessions.json"),
+      agents: path21.join(root, "agents.json"),
+      registryCache: path21.join(root, "registry-cache.json"),
+      plugins: path21.join(root, "plugins"),
+      pluginsData: path21.join(root, "plugins", "data"),
+      pluginRegistry: path21.join(root, "plugins.json"),
+      logs: path21.join(root, "logs"),
+      pid: path21.join(root, "openacp.pid"),
+      running: path21.join(root, "running"),
+      apiPort: path21.join(root, "api.port"),
+      apiSecret: path21.join(root, "api-secret"),
+      bin: path21.join(root, "bin"),
+      cache: path21.join(root, "cache"),
+      tunnels: path21.join(root, "tunnels.json"),
+      agentsDir: path21.join(root, "agents")
     }
   };
 }
@@ -7412,22 +7519,22 @@ __export(config_registry_exports, {
 });
 import * as fs18 from "fs";
 import * as path22 from "path";
-function getFieldDef(path63) {
-  return CONFIG_REGISTRY.find((f) => f.path === path63);
+function getFieldDef(path65) {
+  return CONFIG_REGISTRY.find((f) => f.path === path65);
 }
 function getSafeFields() {
   return CONFIG_REGISTRY.filter((f) => f.scope === "safe");
 }
-function isHotReloadable(path63) {
-  const def = getFieldDef(path63);
+function isHotReloadable(path65) {
+  const def = getFieldDef(path65);
   return def?.hotReload ?? false;
 }
 function resolveOptions(def, config) {
   if (!def.options) return void 0;
   return typeof def.options === "function" ? def.options(config) : def.options;
 }
-function getConfigValue(config, path63) {
-  const parts = path63.split(".");
+function getConfigValue(config, path65) {
+  const parts = path65.split(".");
   let current = config;
   for (const part of parts) {
     if (current && typeof current === "object" && part in current) {
@@ -8392,14 +8499,14 @@ async function commandRoutes(app, deps) {
     if (!deps.commandRegistry) {
       return { commands: [] };
     }
-    const commands2 = deps.commandRegistry.getAll().map((cmd) => ({
+    const commands = deps.commandRegistry.getAll().map((cmd) => ({
       name: cmd.name,
       description: cmd.description,
       usage: cmd.usage ?? null,
       category: cmd.category,
       pluginName: cmd.pluginName ?? null
     }));
-    return { commands: commands2 };
+    return { commands };
   });
   app.post("/execute", { preHandler: requireScopes("commands:execute") }, async (request, reply) => {
     if (!deps.commandRegistry) {
@@ -8628,7 +8735,7 @@ function createApiServerPlugin() {
     version: "1.0.0",
     description: "REST API + SSE streaming server",
     essential: false,
-    permissions: ["services:register", "kernel:access", "events:read"],
+    permissions: ["services:register", "services:use", "kernel:access", "events:read"],
     async install(ctx) {
       const { settings, legacyConfig, terminal } = ctx;
       if (legacyConfig) {
@@ -8695,6 +8802,11 @@ function createApiServerPlugin() {
         port: config.port ?? 0,
         host: config.host ?? "127.0.0.1"
       };
+      console.log(`[api-server] setup() called \u2014 port=${apiConfig.port}, host=${apiConfig.host}, instanceRoot=${instanceRoot}`);
+      log13.info(
+        { port: apiConfig.port, host: apiConfig.host, instanceRoot },
+        "API server plugin setup \u2014 config loaded"
+      );
       portFilePath = path25.join(instanceRoot, "api.port");
       const secretFilePath = path25.join(instanceRoot, "api-secret");
       const jwtSecretFilePath = path25.join(instanceRoot, "jwt-secret");
@@ -8791,14 +8903,21 @@ function createApiServerPlugin() {
       ctx.registerService("api-server", apiService);
       cleanupInterval = setInterval(() => tokenStore.cleanup(), 60 * 60 * 1e3);
       ctx.on("system:ready", async () => {
+        console.log(`[api-server] system:ready fired \u2014 starting server on ${apiConfig.host}:${apiConfig.port}`);
+        log13.info(
+          { configPort: apiConfig.port, configHost: apiConfig.host },
+          "API server starting..."
+        );
         try {
           const addr = await server.start();
           actualPort = addr.port;
           writePortFile(portFilePath, actualPort);
           sseManager.setup();
           log13.info(
-            { host: addr.host, port: addr.port },
-            "API server listening"
+            { host: addr.host, port: addr.port, portFile: portFilePath },
+            "API server listening on http://%s:%d",
+            addr.host,
+            addr.port
           );
           if (apiConfig.host !== "127.0.0.1" && apiConfig.host !== "localhost") {
             log13.warn(
@@ -8806,7 +8925,7 @@ function createApiServerPlugin() {
             );
           }
         } catch (err) {
-          ctx.log.error(`API server failed to start: ${err}`);
+          log13.error({ err, configPort: apiConfig.port, configHost: apiConfig.host }, "API server failed to start");
         }
       });
     },
@@ -9266,7 +9385,7 @@ var init_sse_adapter = __esm({
         "@openacp/security": "^1.0.0",
         "@openacp/notifications": "^1.0.0"
       },
-      permissions: ["services:register", "kernel:access", "events:read"],
+      permissions: ["services:register", "services:use", "kernel:access", "events:read"],
       async setup(ctx) {
         const core = ctx.core;
         const apiServer = ctx.getService("api-server");
@@ -9627,8 +9746,8 @@ function formatToolSummary(name, rawInput, displaySummary) {
   }
   if (lowerName === "grep") {
     const pattern = args2.pattern ?? "";
-    const path63 = args2.path ?? "";
-    return pattern ? `\u{1F50D} Grep "${pattern}"${path63 ? ` in ${path63}` : ""}` : `\u{1F527} ${name}`;
+    const path65 = args2.path ?? "";
+    return pattern ? `\u{1F50D} Grep "${pattern}"${path65 ? ` in ${path65}` : ""}` : `\u{1F527} ${name}`;
   }
   if (lowerName === "glob") {
     const pattern = args2.pattern ?? "";
@@ -9662,8 +9781,8 @@ function formatToolTitle(name, rawInput, displayTitle) {
   }
   if (lowerName === "grep") {
     const pattern = args2.pattern ?? "";
-    const path63 = args2.path ?? "";
-    return pattern ? `"${pattern}"${path63 ? ` in ${path63}` : ""}` : name;
+    const path65 = args2.path ?? "";
+    return pattern ? `"${pattern}"${path65 ? ` in ${path65}` : ""}` : name;
   }
   if (lowerName === "glob") {
     return String(args2.pattern ?? name);
@@ -9951,14 +10070,15 @@ function setupDangerousModeCallbacks(bot, core) {
     const sessionId = ctx.callbackQuery.data.slice(2);
     const session = core.sessionManager.getSession(sessionId);
     if (session) {
-      session.dangerousMode = !session.dangerousMode;
+      const newDangerousMode2 = !session.clientOverrides.bypassPermissions;
+      session.clientOverrides.bypassPermissions = newDangerousMode2;
       log14.info(
-        { sessionId, dangerousMode: session.dangerousMode },
+        { sessionId, dangerousMode: newDangerousMode2 },
         "Dangerous mode toggled via button"
       );
-      core.sessionManager.patchRecord(sessionId, { dangerousMode: session.dangerousMode }).catch(() => {
+      core.sessionManager.patchRecord(sessionId, { clientOverrides: session.clientOverrides }).catch(() => {
       });
-      const toastText2 = session.dangerousMode ? "\u2620\uFE0F Dangerous mode enabled \u2014 permissions auto-approved" : "\u{1F510} Dangerous mode disabled \u2014 permissions shown normally";
+      const toastText2 = newDangerousMode2 ? "\u2620\uFE0F Dangerous mode enabled \u2014 permissions auto-approved" : "\u{1F510} Dangerous mode disabled \u2014 permissions shown normally";
       try {
         await ctx.answerCallbackQuery({ text: toastText2 });
       } catch {
@@ -9967,7 +10087,7 @@ function setupDangerousModeCallbacks(bot, core) {
         await ctx.editMessageReplyMarkup({
           reply_markup: buildSessionControlKeyboard(
             sessionId,
-            session.dangerousMode,
+            newDangerousMode2,
             session.voiceMode === "on"
           )
         });
@@ -9985,8 +10105,8 @@ function setupDangerousModeCallbacks(bot, core) {
       }
       return;
     }
-    const newDangerousMode = !(record.dangerousMode ?? false);
-    core.sessionManager.patchRecord(sessionId, { dangerousMode: newDangerousMode }).catch(() => {
+    const newDangerousMode = !(record.clientOverrides?.bypassPermissions ?? record.dangerousMode ?? false);
+    core.sessionManager.patchRecord(sessionId, { clientOverrides: { bypassPermissions: newDangerousMode } }).catch(() => {
     });
     log14.info(
       { sessionId, dangerousMode: newDangerousMode },
@@ -10017,19 +10137,19 @@ async function handleEnableDangerous(ctx, core) {
     });
     return;
   }
-  const session = core.sessionManager.getSessionByThread(
+  const session = await core.getOrResumeSession(
     "telegram",
     String(threadId)
   );
   if (session) {
-    if (session.dangerousMode) {
+    if (session.clientOverrides.bypassPermissions) {
       await ctx.reply("\u2620\uFE0F Dangerous mode is already enabled.", {
         parse_mode: "HTML"
       });
       return;
     }
-    session.dangerousMode = true;
-    core.sessionManager.patchRecord(session.id, { dangerousMode: true }).catch(() => {
+    session.clientOverrides.bypassPermissions = true;
+    core.sessionManager.patchRecord(session.id, { clientOverrides: session.clientOverrides }).catch(() => {
     });
   } else {
     const record = core.sessionManager.getRecordByThread(
@@ -10042,13 +10162,13 @@ async function handleEnableDangerous(ctx, core) {
       });
       return;
     }
-    if (record.dangerousMode) {
+    if (record.clientOverrides?.bypassPermissions ?? record.dangerousMode) {
       await ctx.reply("\u2620\uFE0F Dangerous mode is already enabled.", {
         parse_mode: "HTML"
       });
       return;
     }
-    core.sessionManager.patchRecord(record.sessionId, { dangerousMode: true }).catch(() => {
+    core.sessionManager.patchRecord(record.sessionId, { clientOverrides: { bypassPermissions: true } }).catch(() => {
     });
   }
   await ctx.reply(
@@ -10068,19 +10188,19 @@ async function handleDisableDangerous(ctx, core) {
     });
     return;
   }
-  const session = core.sessionManager.getSessionByThread(
+  const session = await core.getOrResumeSession(
     "telegram",
     String(threadId)
   );
   if (session) {
-    if (!session.dangerousMode) {
+    if (!session.clientOverrides.bypassPermissions) {
       await ctx.reply("\u{1F510} Dangerous mode is already disabled.", {
         parse_mode: "HTML"
       });
       return;
     }
-    session.dangerousMode = false;
-    core.sessionManager.patchRecord(session.id, { dangerousMode: false }).catch(() => {
+    session.clientOverrides.bypassPermissions = false;
+    core.sessionManager.patchRecord(session.id, { clientOverrides: session.clientOverrides }).catch(() => {
     });
   } else {
     const record = core.sessionManager.getRecordByThread(
@@ -10093,13 +10213,13 @@ async function handleDisableDangerous(ctx, core) {
       });
       return;
     }
-    if (!record.dangerousMode) {
+    if (!(record.clientOverrides?.bypassPermissions ?? record.dangerousMode)) {
       await ctx.reply("\u{1F510} Dangerous mode is already disabled.", {
         parse_mode: "HTML"
       });
       return;
     }
-    core.sessionManager.patchRecord(record.sessionId, { dangerousMode: false }).catch(() => {
+    core.sessionManager.patchRecord(record.sessionId, { clientOverrides: { bypassPermissions: false } }).catch(() => {
     });
   }
   await ctx.reply(
@@ -10149,7 +10269,7 @@ function setupTTSCallbacks(bot, core) {
       await ctx.editMessageReplyMarkup({
         reply_markup: buildSessionControlKeyboard(
           sessionId,
-          session.dangerousMode,
+          session.clientOverrides.bypassPermissions ?? false,
           newMode === "on"
         )
       });
@@ -10213,7 +10333,7 @@ async function handleOutputMode(ctx, core) {
       await ctx.reply("\u26A0\uFE0F This command must be used in a session topic.", { parse_mode: "HTML" });
       return;
     }
-    const session = core.sessionManager.getSessionByThread(
+    const session = await core.getOrResumeSession(
       "telegram",
       String(threadId)
     );
@@ -10522,7 +10642,7 @@ async function handleNewChat(ctx, core, chatId) {
     );
     return;
   }
-  const currentSession = core.sessionManager.getSessionByThread(
+  const currentSession = await core.getOrResumeSession(
     "telegram",
     String(threadId)
   );
@@ -10802,7 +10922,7 @@ async function handleCancel(ctx, core, assistant) {
 async function handleStatus(ctx, core) {
   const threadId = ctx.message?.message_thread_id;
   if (threadId) {
-    const session = core.sessionManager.getSessionByThread(
+    const session = await core.getOrResumeSession(
       "telegram",
       String(threadId)
     );
@@ -11188,8 +11308,8 @@ async function handleClear(ctx, assistant) {
     await ctx.reply(`\u274C Failed to clear: <code>${message}</code>`, { parse_mode: "HTML" });
   }
 }
-function buildSkillMessages(commands2) {
-  const sorted = [...commands2].sort((a, b) => a.name.localeCompare(b.name));
+function buildSkillMessages(commands) {
+  const sorted = [...commands].sort((a, b) => a.name.localeCompare(b.name));
   const header2 = "\u{1F6E0} <b>Available Skills</b>\n";
   const lines = sorted.map((c3) => `<code>/${c3.name}</code>`);
   const messages = [];
@@ -15272,8 +15392,12 @@ var init_send_queue = __esm({
           const result = await item.fn();
           item.resolve(result);
         } catch (err) {
-          this.config.onError?.(err instanceof Error ? err : new Error(String(err)));
-          item.reject(err);
+          if (err instanceof Error && "description" in err && typeof err.description === "string" && err.description.includes("message is not modified")) {
+            item.resolve(void 0);
+          } else {
+            this.config.onError?.(err instanceof Error ? err : new Error(String(err)));
+            item.reject(err);
+          }
         } finally {
           const now = Date.now();
           this.lastExec = now;
@@ -15474,6 +15598,7 @@ var init_streaming = __esm({
       flushTimer;
       flushPromise = Promise.resolve();
       lastSentBuffer = "";
+      lastSentHtml = "";
       displayTruncated = false;
       tracer;
       append(text6) {
@@ -15533,6 +15658,8 @@ var init_streaming = __esm({
             this.firstFlushPending = false;
           }
         } else {
+          if (html === this.lastSentHtml) return;
+          this.lastSentHtml = html;
           try {
             const result = await this.sendQueue.enqueue(
               () => this.bot.api.editMessageText(this.chatId, this.messageId, html, {
@@ -15767,7 +15894,7 @@ var init_skill_command_manager = __esm({
         this.sessionManager = sessionManager;
       }
       messages = /* @__PURE__ */ new Map();
-      async send(sessionId, threadId, commands2) {
+      async send(sessionId, threadId, commands) {
         if (!this.messages.has(sessionId)) {
           const record = this.sessionManager.getSessionRecord(sessionId);
           const platform2 = record?.platform;
@@ -15775,11 +15902,11 @@ var init_skill_command_manager = __esm({
             this.messages.set(sessionId, platform2.skillMsgId);
           }
         }
-        if (commands2.length === 0) {
+        if (commands.length === 0) {
           await this.cleanup(sessionId);
           return;
         }
-        const messages = buildSkillMessages(commands2);
+        const messages = buildSkillMessages(commands);
         const existingMsgId = this.messages.get(sessionId);
         if (existingMsgId) {
           try {
@@ -16417,10 +16544,10 @@ var init_adapter2 = __esm({
           const chatId = ctx.chat.id;
           const topicId = ctx.message.message_thread_id;
           try {
-            const sessionId = topicId != null ? this.core.sessionManager.getSessionByThread(
+            const sessionId = topicId != null ? (await this.core.getOrResumeSession(
               "telegram",
               String(topicId)
-            )?.id ?? null : null;
+            ))?.id ?? null : null;
             const response = await registry.execute(text6, {
               raw: "",
               sessionId,
@@ -16456,10 +16583,10 @@ var init_adapter2 = __esm({
           const chatId = ctx.chat.id;
           const topicId = ctx.callbackQuery.message?.message_thread_id;
           try {
-            const sessionId = topicId != null ? this.core.sessionManager.getSessionByThread(
+            const sessionId = topicId != null ? (await this.core.getOrResumeSession(
               "telegram",
               String(topicId)
-            )?.id ?? null : null;
+            ))?.id ?? null : null;
             const response = await registry.execute(command2, {
               raw: "",
               sessionId,
@@ -16541,7 +16668,7 @@ var init_adapter2 = __esm({
             });
             return;
           }
-          const session = this.core.sessionManager.getSessionByThread(
+          const session = await this.core.getOrResumeSession(
             "telegram",
             String(threadId)
           );
@@ -16813,10 +16940,10 @@ ${lines.join("\n")}`;
             );
             return;
           }
-          const sessionId = this.core.sessionManager.getSessionByThread(
+          const sessionId = (await this.core.getOrResumeSession(
             "telegram",
             String(threadId)
-          )?.id;
+          ))?.id;
           if (sessionId) {
             this.getTracer(sessionId)?.log("telegram", { action: "incoming:message", sessionId, userId: String(ctx.from?.id), text: ctx.message?.text });
             await this.draftManager.finalize(sessionId, this.assistantSession?.id);
@@ -17282,33 +17409,33 @@ Task completed.
           );
         }
       }
-      async sendSkillCommands(sessionId, commands2) {
+      async sendSkillCommands(sessionId, commands) {
         if (sessionId === this.assistantSession?.id) return;
         const session = this.core.sessionManager.getSession(sessionId);
         if (!session) return;
         const threadId = Number(session.threadId);
         if (!threadId) {
-          this._pendingSkillCommands.set(sessionId, commands2);
+          this._pendingSkillCommands.set(sessionId, commands);
           return;
         }
-        await this.skillManager.send(sessionId, threadId, commands2);
+        await this.skillManager.send(sessionId, threadId, commands);
       }
       /** Flush any skill commands that were queued before threadId was available */
       async flushPendingSkillCommands(sessionId) {
-        const commands2 = this._pendingSkillCommands.get(sessionId);
-        if (!commands2) return;
+        const commands = this._pendingSkillCommands.get(sessionId);
+        if (!commands) return;
         this._pendingSkillCommands.delete(sessionId);
         const session = this.core.sessionManager.getSession(sessionId);
         if (!session) return;
         const threadId = Number(session.threadId);
         if (!threadId) return;
-        await this.skillManager.send(sessionId, threadId, commands2);
+        await this.skillManager.send(sessionId, threadId, commands);
       }
-      resolveSessionId(threadId) {
-        return this.core.sessionManager.getSessionByThread(
+      async resolveSessionId(threadId) {
+        return (await this.core.getOrResumeSession(
           "telegram",
           String(threadId)
-        )?.id;
+        ))?.id;
       }
       async downloadTelegramFile(fileId) {
         try {
@@ -17329,7 +17456,7 @@ Task completed.
         if (!downloaded) return;
         let buffer = downloaded.buffer;
         let originalFilePath;
-        const sessionId = this.resolveSessionId(threadId) || "unknown";
+        const sessionId = await this.resolveSessionId(threadId) || "unknown";
         if (convertOggToWav) {
           const oggAtt = await this.fileService.saveFile(
             sessionId,
@@ -17364,7 +17491,7 @@ Task completed.
           }
           return;
         }
-        const sid = this.resolveSessionId(threadId);
+        const sid = await this.resolveSessionId(threadId);
         if (sid) await this.draftManager.finalize(sid, this.assistantSession?.id);
         this.core.handleMessage({
           channelId: "telegram",
@@ -17893,11 +18020,11 @@ __export(api_client_exports, {
 import * as fs32 from "fs";
 import * as path33 from "path";
 import * as os14 from "os";
-function defaultPortFile(root2) {
-  return path33.join(root2 ?? DEFAULT_ROOT, "api.port");
+function defaultPortFile(root) {
+  return path33.join(root ?? DEFAULT_ROOT, "api.port");
 }
-function defaultSecretFile(root2) {
-  return path33.join(root2 ?? DEFAULT_ROOT, "api-secret");
+function defaultSecretFile(root) {
+  return path33.join(root ?? DEFAULT_ROOT, "api-secret");
 }
 function readApiPort(portFilePath, instanceRoot) {
   const filePath = portFilePath ?? defaultPortFile(instanceRoot);
@@ -17987,17 +18114,16 @@ var init_suggest = __esm({
 import fs33 from "fs";
 import path34 from "path";
 import os15 from "os";
-function printInstanceHint(root2) {
+function printInstanceHint(root) {
   const globalRoot = getGlobalRoot();
-  const isGlobal = root2 === globalRoot;
-  const displayPath = root2.replace(os15.homedir(), "~");
+  const isGlobal = root === globalRoot;
+  const displayPath = root.replace(os15.homedir(), "~");
   const label = isGlobal ? "global" : "local";
-  console.log(`  Instance: ${displayPath} (${label})`);
+  console.log(`  Workspace: ${label} \u2014 ${displayPath}`);
   if (isGlobal) {
     const localRoot = path34.join(process.cwd(), ".openacp");
     if (fs33.existsSync(localRoot)) {
-      const localDisplay = localRoot.replace(os15.homedir(), "~");
-      console.log(`  \x1B[2mhint: local instance found at ${localDisplay} \u2014 use --local to use it\x1B[0m`);
+      console.log(`  \x1B[2mhint: local workspace exists in current directory \u2014 use --local to use it\x1B[0m`);
     }
   }
 }
@@ -18029,16 +18155,16 @@ import { spawn as spawn5 } from "child_process";
 import * as fs34 from "fs";
 import * as path35 from "path";
 import * as os16 from "os";
-function getPidPath(root2) {
-  const base = root2 ?? DEFAULT_ROOT2;
+function getPidPath(root) {
+  const base = root ?? DEFAULT_ROOT2;
   return path35.join(base, "openacp.pid");
 }
-function getLogDir(root2) {
-  const base = root2 ?? DEFAULT_ROOT2;
+function getLogDir(root) {
+  const base = root ?? DEFAULT_ROOT2;
   return path35.join(base, "logs");
 }
-function getRunningMarker(root2) {
-  const base = root2 ?? DEFAULT_ROOT2;
+function getRunningMarker(root) {
+  const base = root ?? DEFAULT_ROOT2;
   return path35.join(base, "running");
 }
 function writePidFile(pidPath, pid) {
@@ -18174,19 +18300,19 @@ async function stopDaemon(pidPath = getPidPath(), instanceRoot) {
   }
   return { stopped: false, pid, error: "Process did not exit after SIGKILL (possible uninterruptible I/O). PID file retained." };
 }
-function markRunning(root2) {
-  const marker = getRunningMarker(root2);
+function markRunning(root) {
+  const marker = getRunningMarker(root);
   fs34.mkdirSync(path35.dirname(marker), { recursive: true });
   fs34.writeFileSync(marker, "");
 }
-function clearRunning(root2) {
+function clearRunning(root) {
   try {
-    fs34.unlinkSync(getRunningMarker(root2));
+    fs34.unlinkSync(getRunningMarker(root));
   } catch {
   }
 }
-function shouldAutoStart(root2) {
-  return fs34.existsSync(getRunningMarker(root2));
+function shouldAutoStart(root) {
+  return fs34.existsSync(getRunningMarker(root));
 }
 var DEFAULT_ROOT2;
 var init_daemon2 = __esm({
@@ -18205,7 +18331,7 @@ __export(stop_exports, {
 import path37 from "path";
 import os18 from "os";
 async function cmdStop(args2 = [], instanceRoot) {
-  const root2 = instanceRoot ?? path37.join(os18.homedir(), ".openacp");
+  const root = instanceRoot ?? path37.join(os18.homedir(), ".openacp");
   if (wantsHelp(args2)) {
     console.log(`
 \x1B[1mopenacp stop\x1B[0m \u2014 Stop the background daemon
@@ -18218,7 +18344,7 @@ Sends a stop signal to the running OpenACP daemon process.
     return;
   }
   const { stopDaemon: stopDaemon2, getPidPath: getPidPath2 } = await Promise.resolve().then(() => (init_daemon2(), daemon_exports));
-  const result = await stopDaemon2(getPidPath2(root2), root2);
+  const result = await stopDaemon2(getPidPath2(root), root);
   if (result.stopped) {
     console.log(`OpenACP daemon stopped (was PID ${result.pid})`);
   } else {
@@ -18600,10 +18726,10 @@ function resolveAgentCommand(cmd) {
   if (ownDir !== process.cwd()) {
     searchRoots.push(ownDir);
   }
-  for (const root2 of searchRoots) {
+  for (const root of searchRoots) {
     const packageDirs = [
-      path39.resolve(root2, "node_modules", "@zed-industries", cmd, "dist", "index.js"),
-      path39.resolve(root2, "node_modules", cmd, "dist", "index.js")
+      path39.resolve(root, "node_modules", "@zed-industries", cmd, "dist", "index.js"),
+      path39.resolve(root, "node_modules", cmd, "dist", "index.js")
     ];
     for (const jsPath of packageDirs) {
       if (fs36.existsSync(jsPath)) {
@@ -18611,8 +18737,8 @@ function resolveAgentCommand(cmd) {
       }
     }
   }
-  for (const root2 of searchRoots) {
-    const localBin = path39.resolve(root2, "node_modules", ".bin", cmd);
+  for (const root of searchRoots) {
+    const localBin = path39.resolve(root, "node_modules", ".bin", cmd);
     if (fs36.existsSync(localBin)) {
       const content = fs36.readFileSync(localBin, "utf-8");
       if (content.startsWith("#!/usr/bin/env node")) {
@@ -18953,14 +19079,6 @@ ${stderr}`
                 };
                 break;
               }
-              case "current_mode_update": {
-                const cm = update;
-                event = {
-                  type: "current_mode_update",
-                  modeId: cm.currentModeId
-                };
-                break;
-              }
               case "config_option_update": {
                 const co = update;
                 event = {
@@ -18978,10 +19096,10 @@ ${stderr}`
                 break;
               }
               // NOTE: model_update is NOT a session update type in the ACP SDK schema.
-              // Model changes are applied via the unstable_setSessionModel() method and
-              // the response is synchronous — the SDK does not push a model_update
-              // notification to the client. Therefore AgentEvent "model_update" cannot
-              // originate from sessionUpdate and must be emitted by callers of setModel()
+              // Model changes are applied via setSessionConfigOption() and the response
+              // is synchronous — the SDK does not push a model_update notification to
+              // the client. Therefore AgentEvent "model_update" cannot originate from
+              // sessionUpdate and must be emitted by callers of setConfigOption()
               // if they need to propagate the change downstream.
               default:
                 return;
@@ -19063,9 +19181,6 @@ ${stderr}`
         };
       }
       // ── New ACP methods ──────────────────────────────────────────────────
-      async setMode(modeId) {
-        await this.connection.setSessionMode({ sessionId: this.sessionId, modeId });
-      }
       async setConfigOption(configId, value) {
         return await this.connection.setSessionConfigOption({
           sessionId: this.sessionId,
@@ -19073,12 +19188,6 @@ ${stderr}`
           ...value
         });
       }
-      async setModel(modelId) {
-        await this.connection.unstable_setSessionModel({
-          sessionId: this.sessionId,
-          modelId
-        });
-      }
       async listSessions(cwd, cursor) {
         return await this.connection.listSessions({
           cwd: cwd ?? null,
@@ -19376,12 +19485,8 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       name;
       createdAt = /* @__PURE__ */ new Date();
       voiceMode = "off";
-      dangerousMode = false;
-      currentMode;
-      availableModes = [];
       configOptions = [];
-      currentModel;
-      availableModels = [];
+      clientOverrides = {};
       agentCapabilities;
       archiving = false;
       promptCount = 0;
@@ -19675,34 +19780,28 @@ ${result.text}` : result.text;
         }
       }
       // --- ACP Mode / Config / Model State ---
-      setInitialAcpState(state) {
-        if (state.modes) {
-          this.currentMode = state.modes.currentModeId;
-          this.availableModes = state.modes.availableModes;
-        }
-        if (state.configOptions) {
-          this.configOptions = state.configOptions;
-        }
-        if (state.models) {
-          this.currentModel = state.models.currentModelId;
-          this.availableModels = state.models.availableModels;
-        }
-        if (state.agentCapabilities) {
-          this.agentCapabilities = state.agentCapabilities;
-        }
+      setInitialConfigOptions(options) {
+        this.configOptions = options ?? [];
+      }
+      setAgentCapabilities(caps) {
+        this.agentCapabilities = caps;
+      }
+      getConfigOption(id) {
+        return this.configOptions.find((o) => o.id === id);
+      }
+      getConfigByCategory(category) {
+        return this.configOptions.find((o) => o.category === category);
+      }
+      getConfigValue(id) {
+        const option = this.getConfigOption(id);
+        if (!option) return void 0;
+        return String(option.currentValue);
       }
       /** Set session name explicitly and emit 'named' event */
       setName(name) {
         this.name = name;
         this.emit("named", name);
       }
-      async updateMode(modeId) {
-        if (this.middlewareChain) {
-          const result = await this.middlewareChain.execute("mode:beforeChange", { sessionId: this.id, fromMode: this.currentMode, toMode: modeId }, async (p2) => p2);
-          if (!result) return;
-        }
-        this.currentMode = modeId;
-      }
       async updateConfigOptions(options) {
         if (this.middlewareChain) {
           const result = await this.middlewareChain.execute("config:beforeChange", { sessionId: this.id, configId: "options", oldValue: this.configOptions, newValue: options }, async (p2) => p2);
@@ -19710,21 +19809,10 @@ ${result.text}` : result.text;
         }
         this.configOptions = options;
       }
-      async updateModel(modelId) {
-        if (this.middlewareChain) {
-          const result = await this.middlewareChain.execute("model:beforeChange", { sessionId: this.id, fromModel: this.currentModel, toModel: modelId }, async (p2) => p2);
-          if (!result) return;
-        }
-        this.currentModel = modelId;
-      }
       /** Snapshot of current ACP state for persistence */
       toAcpStateSnapshot() {
         return {
-          currentMode: this.currentMode,
-          availableModes: this.availableModes.length > 0 ? this.availableModes : void 0,
           configOptions: this.configOptions.length > 0 ? this.configOptions : void 0,
-          currentModel: this.currentModel,
-          availableModels: this.availableModels.length > 0 ? this.availableModels : void 0,
           agentCapabilities: this.agentCapabilities
         };
       }
@@ -19774,10 +19862,6 @@ ${result.text}` : result.text;
         this.agentSessionId = newAgent.sessionId;
         this.promptCount = 0;
         this.agentCapabilities = void 0;
-        this.currentMode = void 0;
-        this.availableModes = [];
-        this.currentModel = void 0;
-        this.availableModels = [];
         this.configOptions = [];
         this.log.info({ from: this.agentSwitchHistory.at(-1).agentName, to: agentName }, "Agent switched");
       }
@@ -19832,7 +19916,7 @@ var init_session_manager = __esm({
             createdAt: session.createdAt.toISOString(),
             lastActiveAt: (/* @__PURE__ */ new Date()).toISOString(),
             name: session.name,
-            dangerousMode: false,
+            clientOverrides: {},
             platform: {}
           });
         }
@@ -19964,12 +20048,26 @@ var init_session_manager = __esm({
   }
 });
 
+// src/core/utils/bypass-detection.ts
+function isPermissionBypass(value) {
+  const lower = value.toLowerCase();
+  return BYPASS_KEYWORDS.some((kw) => lower.includes(kw));
+}
+var BYPASS_KEYWORDS;
+var init_bypass_detection = __esm({
+  "src/core/utils/bypass-detection.ts"() {
+    "use strict";
+    BYPASS_KEYWORDS = ["bypass", "dangerous", "skip", "dontask", "dont_ask", "auto_accept"];
+  }
+});
+
 // src/core/sessions/session-bridge.ts
 var log29, SessionBridge;
 var init_session_bridge = __esm({
   "src/core/sessions/session-bridge.ts"() {
     "use strict";
     init_log();
+    init_bypass_detection();
     log29 = createChildLogger({ module: "session-bridge" });
     SessionBridge = class {
       constructor(session, adapter, deps) {
@@ -20128,12 +20226,12 @@ var init_session_bridge = __esm({
             break;
           case "image_content": {
             if (this.deps.fileService) {
-              const fs51 = this.deps.fileService;
+              const fs53 = this.deps.fileService;
               const sid = this.session.id;
               const { data, mimeType } = event;
               const buffer = Buffer.from(data, "base64");
-              const ext = fs51.extensionFromMime(mimeType);
-              fs51.saveFile(sid, `agent-image${ext}`, buffer, mimeType).then((att) => {
+              const ext = fs53.extensionFromMime(mimeType);
+              fs53.saveFile(sid, `agent-image${ext}`, buffer, mimeType).then((att) => {
                 this.sendMessage(sid, {
                   type: "attachment",
                   text: "",
@@ -20145,12 +20243,12 @@ var init_session_bridge = __esm({
           }
           case "audio_content": {
             if (this.deps.fileService) {
-              const fs51 = this.deps.fileService;
+              const fs53 = this.deps.fileService;
               const sid = this.session.id;
               const { data, mimeType } = event;
               const buffer = Buffer.from(data, "base64");
-              const ext = fs51.extensionFromMime(mimeType);
-              fs51.saveFile(sid, `agent-audio${ext}`, buffer, mimeType).then((att) => {
+              const ext = fs53.extensionFromMime(mimeType);
+              fs53.saveFile(sid, `agent-audio${ext}`, buffer, mimeType).then((att) => {
                 this.sendMessage(sid, {
                   type: "attachment",
                   text: "",
@@ -20175,24 +20273,12 @@ var init_session_bridge = __esm({
             outgoing = this.deps.messageTransformer.transform(event);
             this.sendMessage(this.session.id, outgoing);
             break;
-          case "current_mode_update":
-            this.session.updateMode(event.modeId);
-            this.persistAcpState();
-            outgoing = this.deps.messageTransformer.transform(event);
-            this.sendMessage(this.session.id, outgoing);
-            break;
           case "config_option_update":
             this.session.updateConfigOptions(event.options);
             this.persistAcpState();
             outgoing = this.deps.messageTransformer.transform(event);
             this.sendMessage(this.session.id, outgoing);
             break;
-          case "model_update":
-            this.session.updateModel(event.modelId);
-            this.persistAcpState();
-            outgoing = this.deps.messageTransformer.transform(event);
-            this.sendMessage(this.session.id, outgoing);
-            break;
           case "user_message_chunk":
             outgoing = this.deps.messageTransformer.transform(event);
             this.sendMessage(this.session.id, outgoing);
@@ -20212,7 +20298,7 @@ var init_session_bridge = __esm({
         });
         return outgoing;
       }
-      /** Persist current ACP state (mode, config, model) to session store as cache */
+      /** Persist current ACP state (configOptions, agentCapabilities) to session store as cache */
       persistAcpState() {
         this.deps.sessionManager.patchRecord(this.session.id, {
           acpState: this.session.toAcpStateSnapshot()
@@ -20267,12 +20353,17 @@ var init_session_bridge = __esm({
               return allowOption.id;
             }
           }
-          if (this.session.dangerousMode) {
+          const modeOption = this.session.getConfigByCategory("mode");
+          const isAgentBypass = modeOption && isPermissionBypass(
+            typeof modeOption.currentValue === "string" ? modeOption.currentValue : ""
+          );
+          const isClientBypass = this.session.clientOverrides.bypassPermissions;
+          if (isAgentBypass || isClientBypass) {
             const allowOption = permReq.options.find((o) => o.isAllow);
             if (allowOption) {
               log29.info(
-                { sessionId: this.session.id, requestId: permReq.id, optionId: allowOption.id },
-                "Dangerous mode: auto-approving permission"
+                { sessionId: this.session.id, requestId: permReq.id, optionId: allowOption.id, agentBypass: !!isAgentBypass, clientBypass: !!isClientBypass },
+                "Bypass mode: auto-approving permission"
               );
               if (mw) {
                 mw.execute("permission:afterResolve", {
@@ -20596,24 +20687,12 @@ var init_message_transformer = __esm({
               text: `Session updated: ${event.title ?? ""}`.trim(),
               metadata: { title: event.title, updatedAt: event.updatedAt }
             };
-          case "current_mode_update":
-            return {
-              type: "mode_change",
-              text: `Mode: ${event.modeId}`,
-              metadata: { modeId: event.modeId }
-            };
           case "config_option_update":
             return {
               type: "config_update",
               text: "Config updated",
               metadata: { options: event.options }
             };
-          case "model_update":
-            return {
-              type: "model_update",
-              text: `Model: ${event.modelId}`,
-              metadata: { modelId: event.modelId }
-            };
           case "user_message_chunk":
             return {
               type: "user_replay",
@@ -21009,16 +21088,14 @@ var init_session_factory = __esm({
         }
         const resp = agentInstance.initialSessionResponse;
         if (resp) {
-          session.setInitialAcpState({
-            modes: resp.modes ?? null,
-            configOptions: resp.configOptions ?? null,
-            models: resp.models ?? null,
-            agentCapabilities: agentInstance.agentCapabilities ?? null
-          });
+          if (resp.configOptions) {
+            session.setInitialConfigOptions(resp.configOptions);
+          }
+          if (agentInstance.agentCapabilities) {
+            session.setAgentCapabilities(agentInstance.agentCapabilities);
+          }
         } else if (agentInstance.agentCapabilities) {
-          session.setInitialAcpState({
-            agentCapabilities: agentInstance.agentCapabilities
-          });
+          session.setAgentCapabilities(agentInstance.agentCapabilities);
         }
         this.sessionManager.registerSession(session);
         this.eventBus.emit("session:created", {
@@ -21068,18 +21145,21 @@ var init_session_factory = __esm({
               threadId
             });
             session.activate();
-            session.dangerousMode = record.dangerousMode ?? false;
+            if (record.clientOverrides) {
+              session.clientOverrides = record.clientOverrides;
+            } else if (record.dangerousMode) {
+              session.clientOverrides = { bypassPermissions: true };
+            }
             if (record.firstAgent) session.firstAgent = record.firstAgent;
             if (record.agentSwitchHistory) session.agentSwitchHistory = record.agentSwitchHistory;
             if (record.currentPromptCount != null) session.promptCount = record.currentPromptCount;
             if (record.acpState) {
-              const s = record.acpState;
-              session.setInitialAcpState({
-                modes: s.currentMode && s.availableModes ? { currentModeId: s.currentMode, availableModes: s.availableModes } : null,
-                configOptions: s.configOptions ?? null,
-                models: s.currentModel && s.availableModels ? { currentModelId: s.currentModel, availableModels: s.availableModels } : null,
-                agentCapabilities: s.agentCapabilities ?? null
-              });
+              if (record.acpState.configOptions) {
+                session.setInitialConfigOptions(record.acpState.configOptions);
+              }
+              if (record.acpState.agentCapabilities) {
+                session.setAgentCapabilities(record.acpState.agentCapabilities);
+              }
             }
             log32.info({ sessionId: session.id, threadId }, "Lazy resume successful");
             return session;
@@ -22655,6 +22735,7 @@ var init_lifecycle_manager = __esm({
           } catch (err) {
             this._failed.add(plugin2.name);
             ctx.cleanup();
+            console.error(`[lifecycle] Plugin ${plugin2.name} setup() FAILED:`, err);
             this.getPluginLogger(plugin2.name).error(`setup() failed: ${err}`);
             this.eventBus?.emit("plugin:failed", { name: plugin2.name, error: String(err) });
           }
@@ -22951,6 +23032,13 @@ var init_core = __esm({
             { channelId: message.channelId, threadId: message.threadId },
             "No session found for thread (in-memory miss + lazy resume returned null)"
           );
+          const adapter = this.adapters.get(message.channelId);
+          if (adapter) {
+            await adapter.sendMessage(message.threadId, {
+              type: "error",
+              text: "\u26A0\uFE0F No active session in this topic. Use /new to start one."
+            });
+          }
           return;
         }
         this.sessionManager.patchRecord(session.id, {
@@ -23638,6 +23726,162 @@ var init_switch2 = __esm({
   }
 });
 
+// src/core/commands/config.ts
+function flattenChoices(options) {
+  const result = [];
+  for (const item of options) {
+    if ("group" in item && "options" in item) {
+      result.push(...item.options);
+    } else {
+      result.push(item);
+    }
+  }
+  return result;
+}
+function registerCategoryCommand(registry, core, category, commandName, notSupportedMsg) {
+  registry.register({
+    name: commandName,
+    description: `Set ${commandName} for this session`,
+    usage: `[value]`,
+    category: "system",
+    handler: async (args2) => {
+      if (!args2.sessionId) {
+        return { type: "error", message: "\u26A0\uFE0F No active session." };
+      }
+      const session = core.sessionManager.getSession(args2.sessionId);
+      if (!session) {
+        return { type: "error", message: "\u26A0\uFE0F Session not found." };
+      }
+      const configOption = session.getConfigByCategory(category);
+      if (!configOption || configOption.type !== "select") {
+        return { type: "error", message: `\u26A0\uFE0F ${notSupportedMsg}` };
+      }
+      const choices = flattenChoices(configOption.options);
+      const raw = args2.raw.trim();
+      if (!raw) {
+        return {
+          type: "menu",
+          title: configOption.name,
+          options: choices.map((c3) => ({
+            label: c3.value === configOption.currentValue ? `\u2705 ${c3.label}` : c3.label,
+            command: `/${commandName} ${c3.value}`,
+            hint: c3.description
+          }))
+        };
+      }
+      const match = choices.find((c3) => c3.value === raw);
+      if (!match) {
+        const valid = choices.map((c3) => c3.value).join(", ");
+        return { type: "error", message: `\u26A0\uFE0F Invalid value "${raw}". Valid: ${valid}` };
+      }
+      if (session.middlewareChain) {
+        const result = await session.middlewareChain.execute("config:beforeChange", {
+          sessionId: session.id,
+          configId: configOption.id,
+          oldValue: configOption.currentValue,
+          newValue: raw
+        }, async (p2) => p2);
+        if (!result) return { type: "error", message: `Config change blocked by middleware.` };
+      }
+      try {
+        const response = await session.agentInstance.setConfigOption(
+          configOption.id,
+          { type: "select", value: raw }
+        );
+        if (response.configOptions) {
+          session.configOptions = response.configOptions;
+        }
+        return { type: "text", text: `${configOption.name} set to ${match.label}.` };
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        return { type: "error", message: `\u26A0\uFE0F Failed to set ${commandName}: ${msg}` };
+      }
+    }
+  });
+}
+function registerDangerousCommand(registry, core) {
+  registry.register({
+    name: "dangerous",
+    description: "Toggle dangerous mode (bypass permissions)",
+    usage: "[on|off]",
+    category: "system",
+    handler: async (args2) => {
+      if (!args2.sessionId) {
+        return { type: "error", message: "\u26A0\uFE0F No active session." };
+      }
+      const session = core.sessionManager.getSession(args2.sessionId);
+      if (!session) {
+        return { type: "error", message: "\u26A0\uFE0F Session not found." };
+      }
+      const raw = args2.raw.trim().toLowerCase();
+      const modeConfig = session.getConfigByCategory("mode");
+      let bypassValue;
+      let nonBypassDefault;
+      if (modeConfig && modeConfig.type === "select") {
+        const choices = flattenChoices(modeConfig.options);
+        bypassValue = choices.find((c3) => isPermissionBypass(c3.value))?.value;
+        nonBypassDefault = choices.find((c3) => !isPermissionBypass(c3.value))?.value;
+      }
+      const isCurrentlyDangerous = bypassValue ? modeConfig.type === "select" && isPermissionBypass(modeConfig.currentValue) : !!session.clientOverrides.bypassPermissions;
+      if (!raw) {
+        const status = isCurrentlyDangerous ? "on" : "off";
+        const toggleCmd = isCurrentlyDangerous ? "/dangerous off" : "/dangerous on";
+        const toggleLabel = isCurrentlyDangerous ? "Turn off" : "Turn on";
+        return {
+          type: "menu",
+          title: `Dangerous mode: ${status}`,
+          options: [{ label: toggleLabel, command: toggleCmd }]
+        };
+      }
+      if (raw !== "on" && raw !== "off") {
+        return { type: "error", message: "\u26A0\uFE0F Usage: /dangerous [on|off]" };
+      }
+      const wantOn = raw === "on";
+      if (bypassValue && modeConfig) {
+        try {
+          const targetValue = wantOn ? bypassValue : nonBypassDefault;
+          const response = await session.agentInstance.setConfigOption(
+            modeConfig.id,
+            { type: "select", value: targetValue }
+          );
+          if (response.configOptions) {
+            session.configOptions = response.configOptions;
+          }
+          return {
+            type: "text",
+            text: `Dangerous mode ${wantOn ? "enabled" : "disabled"}.`
+          };
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          return { type: "error", message: `\u26A0\uFE0F Failed: ${msg}` };
+        }
+      }
+      session.clientOverrides.bypassPermissions = wantOn;
+      await core.sessionManager.patchRecord(session.id, {
+        clientOverrides: { ...session.clientOverrides }
+      });
+      return {
+        type: "text",
+        text: `Dangerous mode ${wantOn ? "enabled" : "disabled"} (client-side bypass).`
+      };
+    }
+  });
+}
+function registerConfigCommands(registry, _core) {
+  const core = _core;
+  registerCategoryCommand(registry, core, "mode", "mode", "Agent does not support mode selection.");
+  registerCategoryCommand(registry, core, "model", "model", "Agent does not support model selection.");
+  registerCategoryCommand(registry, core, "thought_level", "thought", "Agent does not support thought level.");
+  registerDangerousCommand(registry, core);
+}
+var init_config5 = __esm({
+  "src/core/commands/config.ts"() {
+    "use strict";
+    init_bypass_detection();
+    init_bypass_detection();
+  }
+});
+
 // src/core/commands/index.ts
 function registerSystemCommands(registry, core) {
   registerSessionCommands(registry, core);
@@ -23646,6 +23890,7 @@ function registerSystemCommands(registry, core) {
   registerHelpCommand(registry, core);
   registerMenuCommand(registry, core);
   registerSwitchCommands(registry);
+  registerConfigCommands(registry, core);
 }
 var init_commands4 = __esm({
   "src/core/commands/index.ts"() {
@@ -23656,6 +23901,7 @@ var init_commands4 = __esm({
     init_help();
     init_menu2();
     init_switch2();
+    init_config5();
   }
 });
 
@@ -23681,17 +23927,34 @@ var init_instance_registry = __esm({
           const parsed = JSON.parse(raw);
           if (parsed.version === 1 && parsed.instances) {
             this.data = parsed;
+            this.deduplicate();
           }
         } catch {
         }
       }
+      /** Remove duplicate entries that point to the same root, keeping the first one */
+      deduplicate() {
+        const seen = /* @__PURE__ */ new Set();
+        const toRemove = [];
+        for (const [id, entry] of Object.entries(this.data.instances)) {
+          if (seen.has(entry.root)) {
+            toRemove.push(id);
+          } else {
+            seen.add(entry.root);
+          }
+        }
+        if (toRemove.length > 0) {
+          for (const id of toRemove) delete this.data.instances[id];
+          this.save();
+        }
+      }
       save() {
         const dir = path47.dirname(this.registryPath);
         fs43.mkdirSync(dir, { recursive: true });
         fs43.writeFileSync(this.registryPath, JSON.stringify(this.data, null, 2));
       }
-      register(id, root2) {
-        this.data.instances[id] = { id, root: root2 };
+      register(id, root) {
+        this.data.instances[id] = { id, root };
       }
       remove(id) {
         delete this.data.instances[id];
@@ -23699,8 +23962,8 @@ var init_instance_registry = __esm({
       get(id) {
         return this.data.instances[id];
       }
-      getByRoot(root2) {
-        return Object.values(this.data.instances).find((e) => e.root === root2);
+      getByRoot(root) {
+        return Object.values(this.data.instances).find((e) => e.root === root);
       }
       list() {
         return Object.values(this.data.instances);
@@ -23958,14 +24221,15 @@ var init_setup_agents = __esm({
 // src/core/setup/setup-workspace.ts
 import * as clack4 from "@clack/prompts";
 async function setupWorkspace(opts) {
-  const { existing, stepNum, totalSteps } = opts ?? {};
+  const { existing, stepNum, totalSteps, isGlobal } = opts ?? {};
   if (stepNum != null && totalSteps != null) {
     console.log(step(stepNum, totalSteps, "Workspace"));
   }
+  const defaultDir = isGlobal === false ? process.cwd() : "~/openacp-workspace";
   const baseDir = guardCancel2(
     await clack4.text({
-      message: "Base directory for workspaces:",
-      initialValue: existing ?? "~/openacp-workspace",
+      message: "Base directory for agent workspaces:",
+      initialValue: existing ?? defaultDir,
       validate: (val) => (val ?? "").toString().trim().length > 0 ? void 0 : "Path cannot be empty"
     })
   );
@@ -24491,9 +24755,81 @@ var init_instance_copy = __esm({
   }
 });
 
+// src/core/setup/git-protect.ts
+import fs46 from "fs";
+import path51 from "path";
+function protectLocalInstance(projectDir) {
+  ensureGitignore(projectDir);
+  ensureClaudeMd(projectDir);
+  printSecurityWarning();
+}
+function ensureGitignore(projectDir) {
+  const gitignorePath = path51.join(projectDir, ".gitignore");
+  const entry = ".openacp";
+  if (fs46.existsSync(gitignorePath)) {
+    const content = fs46.readFileSync(gitignorePath, "utf-8");
+    const lines = content.split("\n").map((l) => l.trim());
+    if (lines.includes(entry) || lines.includes(".openacp")) {
+      return;
+    }
+    const separator = content.endsWith("\n") ? "" : "\n";
+    fs46.appendFileSync(gitignorePath, `${separator}
+# OpenACP local workspace (contains secrets)
+${entry}
+`);
+  } else {
+    fs46.writeFileSync(gitignorePath, `# OpenACP local workspace (contains secrets)
+${entry}
+`);
+  }
+}
+function ensureClaudeMd(projectDir) {
+  const claudeMdPath = path51.join(projectDir, "CLAUDE.md");
+  const marker = "## Local OpenACP Workspace";
+  if (fs46.existsSync(claudeMdPath)) {
+    const content = fs46.readFileSync(claudeMdPath, "utf-8");
+    if (content.includes(marker)) {
+      return;
+    }
+    const separator = content.endsWith("\n") ? "" : "\n";
+    fs46.appendFileSync(claudeMdPath, `${separator}
+## Local OpenACP Workspace
+
+The \`.openacp/\` directory contains a local OpenACP workspace with secrets (bot tokens, API keys). Do not read, commit, or reference files inside it.
+`);
+  } else {
+    fs46.writeFileSync(claudeMdPath, `# CLAUDE.md
+
+## Local OpenACP Workspace
+
+The \`.openacp/\` directory contains a local OpenACP workspace with secrets (bot tokens, API keys). Do not read, commit, or reference files inside it.
+`);
+  }
+}
+function printSecurityWarning() {
+  const red = "\x1B[1;91m";
+  const yellow = "\x1B[1;33m";
+  const reset = "\x1B[0m";
+  const dim3 = "\x1B[2m";
+  console.log("");
+  console.log(`${red}  \u26A0  SECURITY WARNING${reset}`);
+  console.log(`${red}  \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501${reset}`);
+  console.log(`${yellow}  .openacp/ contains bot tokens and API secrets.${reset}`);
+  console.log(`${yellow}  It has been added to .gitignore automatically.${reset}`);
+  console.log(`${dim3}  Verify before committing: git status${reset}`);
+  console.log(`${red}  \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501${reset}`);
+  console.log("");
+}
+var init_git_protect = __esm({
+  "src/core/setup/git-protect.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/setup/wizard.ts
-import * as path51 from "path";
-import * as fs46 from "fs";
+import * as path52 from "path";
+import * as fs47 from "fs";
+import * as os25 from "os";
 import * as clack8 from "@clack/prompts";
 async function fetchCommunityAdapters() {
   try {
@@ -24522,23 +24858,24 @@ async function runSetup(configManager, opts) {
     const isGlobal = instanceRoot === getGlobalRoot();
     let instanceName = opts?.instanceName;
     if (!instanceName) {
-      const defaultName = isGlobal ? "Main" : `openacp-${Date.now()}`;
+      const defaultName = isGlobal ? "Global workspace" : path52.basename(path52.dirname(instanceRoot));
+      const locationHint = isGlobal ? "global (~/.openacp)" : `local (${instanceRoot.replace(/\/.openacp$/, "").replace(os25.homedir(), "~")})`;
       const nameResult = await clack8.text({
-        message: "Give this setup a name",
-        defaultValue: defaultName,
+        message: `Name for this workspace (${locationHint})`,
+        initialValue: defaultName,
         validate: (v) => !v?.trim() ? "Name cannot be empty" : void 0
       });
       if (clack8.isCancel(nameResult)) return false;
       instanceName = nameResult.trim();
     }
     const globalRoot = getGlobalRoot();
-    const registryPath = path51.join(globalRoot, "instances.json");
+    const registryPath = path52.join(globalRoot, "instances.json");
     const instanceRegistry = new InstanceRegistry(registryPath);
     await instanceRegistry.load();
     let didCopy = false;
     if (opts?.from) {
-      const fromRoot = path51.join(opts.from, ".openacp");
-      if (fs46.existsSync(path51.join(fromRoot, "config.json"))) {
+      const fromRoot = path52.join(opts.from, ".openacp");
+      if (fs47.existsSync(path52.join(fromRoot, "config.json"))) {
         const inheritableMap = buildInheritableKeysMap();
         await copyInstance(fromRoot, instanceRoot, { inheritableKeys: inheritableMap });
         didCopy = true;
@@ -24549,11 +24886,26 @@ async function runSetup(configManager, opts) {
     }
     if (!didCopy) {
       const existingInstances = instanceRegistry.list().filter(
-        (e) => fs46.existsSync(path51.join(e.root, "config.json")) && e.root !== instanceRoot
+        (e) => fs47.existsSync(path52.join(e.root, "config.json")) && e.root !== instanceRoot
       );
       if (existingInstances.length > 0) {
+        let singleLabel;
+        if (existingInstances.length === 1) {
+          const e = existingInstances[0];
+          let name = e.id;
+          try {
+            const cfg = JSON.parse(fs47.readFileSync(path52.join(e.root, "config.json"), "utf-8"));
+            if (cfg.instanceName) name = cfg.instanceName;
+          } catch {
+          }
+          const isGlobalEntry = e.root === getGlobalRoot();
+          const displayPath = e.root.replace(os25.homedir(), "~");
+          const type = isGlobalEntry ? "global" : "local";
+          singleLabel = `${name} workspace (${type} \u2014 ${displayPath})`;
+        }
+        const confirmMsg = singleLabel ? `Copy config from ${singleLabel}?` : "Copy config from an existing workspace?";
         const shouldCopy = await clack8.confirm({
-          message: "Use settings from an existing setup as a starting point?",
+          message: confirmMsg,
           initialValue: true
         });
         if (clack8.isCancel(shouldCopy)) return false;
@@ -24563,16 +24915,18 @@ async function runSetup(configManager, opts) {
             sourceRoot = existingInstances[0].root;
           } else {
             const choice = await clack8.select({
-              message: "Which setup to copy from?",
+              message: "Which workspace to copy from?",
               options: existingInstances.map((e) => {
                 let name = e.id;
                 try {
-                  const cfg = JSON.parse(fs46.readFileSync(path51.join(e.root, "config.json"), "utf-8"));
+                  const cfg = JSON.parse(fs47.readFileSync(path52.join(e.root, "config.json"), "utf-8"));
                   if (cfg.instanceName) name = cfg.instanceName;
                 } catch {
                 }
-                const displayPath = e.root.replace(/\/.openacp$/, "");
-                return { value: e.root, label: `${name} (${displayPath})` };
+                const isGlobalEntry = e.root === getGlobalRoot();
+                const displayPath = e.root.replace(os25.homedir(), "~");
+                const type = isGlobalEntry ? "global" : "local";
+                return { value: e.root, label: `${name} workspace (${type} \u2014 ${displayPath})` };
               })
             });
             if (clack8.isCancel(choice)) return false;
@@ -24642,10 +24996,10 @@ async function runSetup(configManager, opts) {
       if (channelId.startsWith("official:")) {
         const npmPackage = channelId.slice("official:".length);
         const { execFileSync: execFileSync8 } = await import("child_process");
-        const pluginsDir = path51.join(instanceRoot, "plugins");
-        const nodeModulesDir = path51.join(pluginsDir, "node_modules");
-        const installedPath = path51.join(nodeModulesDir, npmPackage);
-        if (!fs46.existsSync(installedPath)) {
+        const pluginsDir = path52.join(instanceRoot, "plugins");
+        const nodeModulesDir = path52.join(pluginsDir, "node_modules");
+        const installedPath = path52.join(nodeModulesDir, npmPackage);
+        if (!fs47.existsSync(installedPath)) {
           try {
             clack8.log.step(`Installing ${npmPackage}...`);
             execFileSync8("npm", ["install", npmPackage, "--prefix", pluginsDir, "--save"], {
@@ -24658,9 +25012,9 @@ async function runSetup(configManager, opts) {
           }
         }
         try {
-          const installedPkgPath = path51.join(nodeModulesDir, npmPackage, "package.json");
-          const installedPkg = JSON.parse(fs46.readFileSync(installedPkgPath, "utf-8"));
-          const pluginModule = await import(path51.join(nodeModulesDir, npmPackage, installedPkg.main ?? "dist/index.js"));
+          const installedPkgPath = path52.join(nodeModulesDir, npmPackage, "package.json");
+          const installedPkg = JSON.parse(fs47.readFileSync(installedPkgPath, "utf-8"));
+          const pluginModule = await import(path52.join(nodeModulesDir, npmPackage, installedPkg.main ?? "dist/index.js"));
           const plugin2 = pluginModule.default;
           if (plugin2?.install) {
             const installCtx = createInstallContext2({
@@ -24690,8 +25044,8 @@ async function runSetup(configManager, opts) {
       if (channelId.startsWith("community:")) {
         const npmPackage = channelId.slice("community:".length);
         const { execFileSync: execFileSync8 } = await import("child_process");
-        const pluginsDir = path51.join(instanceRoot, "plugins");
-        const nodeModulesDir = path51.join(pluginsDir, "node_modules");
+        const pluginsDir = path52.join(instanceRoot, "plugins");
+        const nodeModulesDir = path52.join(pluginsDir, "node_modules");
         try {
           execFileSync8("npm", ["install", npmPackage, "--prefix", pluginsDir, "--save"], {
             stdio: "inherit",
@@ -24703,9 +25057,9 @@ async function runSetup(configManager, opts) {
         }
         try {
           const { readFileSync: readFileSync18 } = await import("fs");
-          const installedPkgPath = path51.join(nodeModulesDir, npmPackage, "package.json");
+          const installedPkgPath = path52.join(nodeModulesDir, npmPackage, "package.json");
           const installedPkg = JSON.parse(readFileSync18(installedPkgPath, "utf-8"));
-          const pluginModule = await import(path51.join(nodeModulesDir, npmPackage, installedPkg.main ?? "dist/index.js"));
+          const pluginModule = await import(path52.join(nodeModulesDir, npmPackage, installedPkg.main ?? "dist/index.js"));
           const plugin2 = pluginModule.default;
           if (plugin2?.install) {
             const installCtx = createInstallContext2({
@@ -24737,7 +25091,7 @@ async function runSetup(configManager, opts) {
     const { defaultAgent } = await setupAgents();
     await setupIntegrations();
     currentStep++;
-    const workspace = await setupWorkspace({ stepNum: currentStep, totalSteps });
+    const workspace = await setupWorkspace({ stepNum: currentStep, totalSteps, isGlobal });
     let runMode = "foreground";
     let autoStart = false;
     if (!opts?.skipRunMode) {
@@ -24760,7 +25114,7 @@ async function runSetup(configManager, opts) {
       security,
       logging: {
         level: "info",
-        logDir: path51.join(instanceRoot, "logs"),
+        logDir: path52.join(instanceRoot, "logs"),
         maxFileSize: "10m",
         maxFiles: 7,
         sessionLogRetentionDays: 30
@@ -24806,9 +25160,17 @@ async function runSetup(configManager, opts) {
       await registerBuiltinPlugins(settingsManager, pluginRegistry);
       await pluginRegistry.save();
     }
-    const id = instanceRegistry.uniqueId(generateSlug(instanceName));
-    instanceRegistry.register(id, instanceRoot);
-    await instanceRegistry.save();
+    const existingEntry = instanceRegistry.getByRoot(instanceRoot);
+    if (!existingEntry) {
+      const id = instanceRegistry.uniqueId(generateSlug(instanceName));
+      instanceRegistry.register(id, instanceRoot);
+      await instanceRegistry.save();
+    }
+    const isLocal = instanceRoot !== path52.join(getGlobalRoot());
+    if (isLocal) {
+      const projectDir = path52.dirname(instanceRoot);
+      protectLocalInstance(projectDir);
+    }
     clack8.outro(`Config saved to ${configManager.getConfigPath()}`);
     if (!opts?.skipRunMode) {
       console.log(ok("Starting OpenACP..."));
@@ -24942,6 +25304,7 @@ var init_wizard = __esm({
     init_instance_registry();
     init_instance_context();
     init_instance_copy();
+    init_git_protect();
   }
 });
 
@@ -25092,8 +25455,8 @@ var dev_loader_exports = {};
 __export(dev_loader_exports, {
   DevPluginLoader: () => DevPluginLoader
 });
-import fs47 from "fs";
-import path52 from "path";
+import fs48 from "fs";
+import path53 from "path";
 var loadCounter, DevPluginLoader;
 var init_dev_loader = __esm({
   "src/core/plugin/dev-loader.ts"() {
@@ -25102,15 +25465,15 @@ var init_dev_loader = __esm({
     DevPluginLoader = class {
       pluginPath;
       constructor(pluginPath) {
-        this.pluginPath = path52.resolve(pluginPath);
+        this.pluginPath = path53.resolve(pluginPath);
       }
       async load() {
-        const distIndex = path52.join(this.pluginPath, "dist", "index.js");
-        const srcIndex = path52.join(this.pluginPath, "src", "index.ts");
-        if (!fs47.existsSync(distIndex) && !fs47.existsSync(srcIndex)) {
+        const distIndex = path53.join(this.pluginPath, "dist", "index.js");
+        const srcIndex = path53.join(this.pluginPath, "src", "index.ts");
+        if (!fs48.existsSync(distIndex) && !fs48.existsSync(srcIndex)) {
           throw new Error(`Plugin not found at ${this.pluginPath}. Expected dist/index.js or src/index.ts`);
         }
-        if (!fs47.existsSync(distIndex)) {
+        if (!fs48.existsSync(distIndex)) {
           throw new Error(`Built plugin not found at ${distIndex}. Run 'npm run build' first.`);
         }
         const cacheBuster = `v=${Date.now()}-${++loadCounter}`;
@@ -25125,7 +25488,7 @@ var init_dev_loader = __esm({
         return this.pluginPath;
       }
       getDistPath() {
-        return path52.join(this.pluginPath, "dist");
+        return path53.join(this.pluginPath, "dist");
       }
     };
   }
@@ -25137,8 +25500,8 @@ __export(main_exports, {
   RESTART_EXIT_CODE: () => RESTART_EXIT_CODE,
   startServer: () => startServer
 });
-import path53 from "path";
-import fs48 from "fs";
+import path54 from "path";
+import fs49 from "fs";
 async function startServer(opts) {
   const ctx = opts?.instanceContext ?? createInstanceContext({
     id: "main",
@@ -25219,25 +25582,25 @@ async function startServer(opts) {
         try {
           let modulePath;
           if (name.startsWith("/") || name.startsWith(".")) {
-            const resolved = path53.resolve(name);
-            const pkgPath = path53.join(resolved, "package.json");
-            const pkg = JSON.parse(await fs48.promises.readFile(pkgPath, "utf-8"));
-            modulePath = path53.join(resolved, pkg.main || "dist/index.js");
+            const resolved = path54.resolve(name);
+            const pkgPath = path54.join(resolved, "package.json");
+            const pkg = JSON.parse(await fs49.promises.readFile(pkgPath, "utf-8"));
+            modulePath = path54.join(resolved, pkg.main || "dist/index.js");
           } else {
-            const nodeModulesDir = path53.join(ctx.paths.plugins, "node_modules");
-            let pkgDir = path53.join(nodeModulesDir, name);
-            if (!fs48.existsSync(path53.join(pkgDir, "package.json"))) {
+            const nodeModulesDir = path54.join(ctx.paths.plugins, "node_modules");
+            let pkgDir = path54.join(nodeModulesDir, name);
+            if (!fs49.existsSync(path54.join(pkgDir, "package.json"))) {
               let found = false;
-              const scopes = fs48.existsSync(nodeModulesDir) ? fs48.readdirSync(nodeModulesDir).filter((d) => d.startsWith("@")) : [];
+              const scopes = fs49.existsSync(nodeModulesDir) ? fs49.readdirSync(nodeModulesDir).filter((d) => d.startsWith("@")) : [];
               for (const scope of scopes) {
-                const scopeDir = path53.join(nodeModulesDir, scope);
-                const pkgs = fs48.readdirSync(scopeDir);
+                const scopeDir = path54.join(nodeModulesDir, scope);
+                const pkgs = fs49.readdirSync(scopeDir);
                 for (const pkg2 of pkgs) {
-                  const candidateDir = path53.join(scopeDir, pkg2);
-                  const candidatePkgPath = path53.join(candidateDir, "package.json");
-                  if (fs48.existsSync(candidatePkgPath)) {
+                  const candidateDir = path54.join(scopeDir, pkg2);
+                  const candidatePkgPath = path54.join(candidateDir, "package.json");
+                  if (fs49.existsSync(candidatePkgPath)) {
                     try {
-                      const candidatePkg = JSON.parse(fs48.readFileSync(candidatePkgPath, "utf-8"));
+                      const candidatePkg = JSON.parse(fs49.readFileSync(candidatePkgPath, "utf-8"));
                       const pluginName = candidatePkg.openacp?.pluginName;
                       if (pluginName === name) {
                         pkgDir = candidateDir;
@@ -25251,9 +25614,9 @@ async function startServer(opts) {
                 if (found) break;
               }
             }
-            const pkgJsonPath = path53.join(pkgDir, "package.json");
-            const pkg = JSON.parse(await fs48.promises.readFile(pkgJsonPath, "utf-8"));
-            modulePath = path53.join(pkgDir, pkg.main || "dist/index.js");
+            const pkgJsonPath = path54.join(pkgDir, "package.json");
+            const pkg = JSON.parse(await fs49.promises.readFile(pkgJsonPath, "utf-8"));
+            modulePath = path54.join(pkgDir, pkg.main || "dist/index.js");
           }
           log.debug({ plugin: name, modulePath }, "Loading community plugin");
           const mod = await import(modulePath);
@@ -25284,7 +25647,7 @@ async function startServer(opts) {
         if (!opts.noWatch) {
           const distPath = devLoader.getDistPath();
           let reloadTimer = null;
-          fs48.watch(distPath, { recursive: true }, (_eventType, filename) => {
+          fs49.watch(distPath, { recursive: true }, (_eventType, filename) => {
             if (!filename?.endsWith(".js")) return;
             if (reloadTimer) clearTimeout(reloadTimer);
             reloadTimer = setTimeout(async () => {
@@ -25362,21 +25725,21 @@ async function startServer(opts) {
       if (isDaemon) {
         const { spawn: spawnChild } = await import("child_process");
         const { expandHome: expandHome4 } = await Promise.resolve().then(() => (init_config2(), config_exports));
-        const fs51 = await import("fs");
+        const fs53 = await import("fs");
         const pathMod2 = await import("path");
         const cliPath = pathMod2.resolve(process.argv[1]);
         const resolvedLogDir = expandHome4(config.logging.logDir);
-        fs51.mkdirSync(resolvedLogDir, { recursive: true });
+        fs53.mkdirSync(resolvedLogDir, { recursive: true });
         const logFile = pathMod2.join(resolvedLogDir, "openacp.log");
-        const out = fs51.openSync(logFile, "a");
-        const err = fs51.openSync(logFile, "a");
+        const out = fs53.openSync(logFile, "a");
+        const err = fs53.openSync(logFile, "a");
         const child = spawnChild(process.execPath, [cliPath, "--daemon-child"], {
           detached: true,
           stdio: ["ignore", out, err],
           env: { ...process.env, OPENACP_SKIP_UPDATE_CHECK: "1" }
         });
-        fs51.closeSync(out);
-        fs51.closeSync(err);
+        fs53.closeSync(out);
+        fs53.closeSync(err);
         child.unref();
         log.info({ newPid: child.pid }, "Respawned daemon for restart");
       } else if (!process.env.OPENACP_DEV_LOOP) {
@@ -25405,7 +25768,7 @@ async function startServer(opts) {
   await core.start();
   try {
     const globalRoot = getGlobalRoot();
-    const registryPath = path53.join(globalRoot, "instances.json");
+    const registryPath = path54.join(globalRoot, "instances.json");
     const instanceReg = new InstanceRegistry(registryPath);
     await instanceReg.load();
     if (!instanceReg.getByRoot(ctx.root)) {
@@ -25553,10 +25916,10 @@ var restart_exports = {};
 __export(restart_exports, {
   cmdRestart: () => cmdRestart
 });
-import path54 from "path";
-import os25 from "os";
+import path55 from "path";
+import os26 from "os";
 async function cmdRestart(args2 = [], instanceRoot) {
-  const root2 = instanceRoot ?? path54.join(os25.homedir(), ".openacp");
+  const root = instanceRoot ?? path55.join(os26.homedir(), ".openacp");
   if (wantsHelp(args2)) {
     console.log(`
 \x1B[1mopenacp restart\x1B[0m \u2014 Restart the background daemon
@@ -25581,8 +25944,8 @@ Stops the running daemon (if any) and starts a new one.
   const { ConfigManager: ConfigManager2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
   const { checkAndPromptUpdate: checkAndPromptUpdate2 } = await Promise.resolve().then(() => (init_version(), version_exports));
   await checkAndPromptUpdate2();
-  const pidPath = getPidPath2(root2);
-  const stopResult = await stopDaemon2(pidPath, root2);
+  const pidPath = getPidPath2(root);
+  const stopResult = await stopDaemon2(pidPath, root);
   if (stopResult.stopped) {
     console.log(`Stopped daemon (was PID ${stopResult.pid})`);
   }
@@ -25595,23 +25958,23 @@ Stops the running daemon (if any) and starts a new one.
   const config = cm.get();
   const useForeground = forceForeground || !forceDaemon && config.runMode !== "daemon";
   if (useForeground) {
-    markRunning2(root2);
-    printInstanceHint(root2);
+    markRunning2(root);
+    printInstanceHint(root);
     console.log("Starting in foreground mode...");
     const { startServer: startServer2 } = await Promise.resolve().then(() => (init_main(), main_exports));
     const ctx = createInstanceContext({
       id: "default",
-      root: root2,
-      isGlobal: root2 === getGlobalRoot()
+      root,
+      isGlobal: root === getGlobalRoot()
     });
     await startServer2({ instanceContext: ctx });
   } else {
-    const result = startDaemon2(pidPath, config.logging.logDir, root2);
+    const result = startDaemon2(pidPath, config.logging.logDir, root);
     if ("error" in result) {
       console.error(result.error);
       process.exit(1);
     }
-    printInstanceHint(root2);
+    printInstanceHint(root);
     console.log(`OpenACP daemon started (PID ${result.pid})`);
   }
 }
@@ -25631,9 +25994,9 @@ __export(status_exports, {
   formatInstanceStatus: () => formatInstanceStatus,
   readInstanceInfo: () => readInstanceInfo
 });
-import fs49 from "fs";
-import path55 from "path";
-import os26 from "os";
+import fs50 from "fs";
+import path56 from "path";
+import os27 from "os";
 async function cmdStatus(args2 = [], instanceRoot) {
   if (args2.includes("--all")) {
     await showAllInstances();
@@ -25644,16 +26007,16 @@ async function cmdStatus(args2 = [], instanceRoot) {
     await showInstanceById(args2[idIdx + 1]);
     return;
   }
-  const root2 = instanceRoot ?? getGlobalRoot();
-  await showSingleInstance(root2);
+  const root = instanceRoot ?? getGlobalRoot();
+  await showSingleInstance(root);
 }
 async function showAllInstances() {
-  const registryPath = path55.join(getGlobalRoot(), "instances.json");
+  const registryPath = path56.join(getGlobalRoot(), "instances.json");
   const registry = new InstanceRegistry(registryPath);
   await registry.load();
   const instances = registry.list();
   if (instances.length === 0) {
-    console.log("No instances registered.");
+    console.log("No workspaces registered.");
     return;
   }
   console.log("");
@@ -25665,7 +26028,7 @@ async function showAllInstances() {
     const mode = info.pid ? info.runMode === "daemon" ? "daemon" : "fg" : "\u2014";
     const api = info.apiPort ? String(info.apiPort) : "\u2014";
     const tunnel = info.tunnelPort ? String(info.tunnelPort) : "\u2014";
-    const dir = entry.root.replace(/\/.openacp$/, "").replace(os26.homedir(), "~");
+    const dir = entry.root.replace(/\/.openacp$/, "").replace(os27.homedir(), "~");
     const channels = info.channels.join(", ") || "\u2014";
     const name = info.name ?? entry.id;
     console.log(`  ${status.padEnd(10)} ${entry.id.padEnd(16)} ${name.padEnd(16)} ${dir.padEnd(20)} ${mode.padEnd(8)} ${channels.padEnd(10)} ${api.padEnd(6)} ${tunnel}`);
@@ -25673,18 +26036,18 @@ async function showAllInstances() {
   console.log("");
 }
 async function showInstanceById(id) {
-  const registryPath = path55.join(getGlobalRoot(), "instances.json");
+  const registryPath = path56.join(getGlobalRoot(), "instances.json");
   const registry = new InstanceRegistry(registryPath);
   await registry.load();
   const entry = registry.get(id);
   if (!entry) {
-    console.error(`Instance "${id}" not found.`);
+    console.error(`Workspace "${id}" not found.`);
     process.exit(1);
   }
   await showSingleInstance(entry.root);
 }
-async function showSingleInstance(root2) {
-  const info = readInstanceInfo(root2);
+async function showSingleInstance(root) {
+  const info = readInstanceInfo(root);
   if (info.pid) {
     console.log(`OpenACP is running (PID ${info.pid})`);
     if (info.name) console.log(`  Name: ${info.name}`);
@@ -25695,7 +26058,7 @@ async function showSingleInstance(root2) {
     console.log("OpenACP is not running.");
   }
 }
-function readInstanceInfo(root2) {
+function readInstanceInfo(root) {
   const result = {
     name: null,
     pid: null,
@@ -25705,13 +26068,13 @@ function readInstanceInfo(root2) {
     channels: []
   };
   try {
-    const config = JSON.parse(fs49.readFileSync(path55.join(root2, "config.json"), "utf-8"));
+    const config = JSON.parse(fs50.readFileSync(path56.join(root, "config.json"), "utf-8"));
     result.name = config.instanceName ?? null;
     result.runMode = config.runMode ?? null;
   } catch {
   }
   try {
-    const pid = parseInt(fs49.readFileSync(path55.join(root2, "openacp.pid"), "utf-8").trim());
+    const pid = parseInt(fs50.readFileSync(path56.join(root, "openacp.pid"), "utf-8").trim());
     if (!isNaN(pid)) {
       process.kill(pid, 0);
       result.pid = pid;
@@ -25719,19 +26082,19 @@ function readInstanceInfo(root2) {
   } catch {
   }
   try {
-    const port = parseInt(fs49.readFileSync(path55.join(root2, "api.port"), "utf-8").trim());
+    const port = parseInt(fs50.readFileSync(path56.join(root, "api.port"), "utf-8").trim());
     if (!isNaN(port)) result.apiPort = port;
   } catch {
   }
   try {
-    const tunnels = JSON.parse(fs49.readFileSync(path55.join(root2, "tunnels.json"), "utf-8"));
+    const tunnels = JSON.parse(fs50.readFileSync(path56.join(root, "tunnels.json"), "utf-8"));
     const entries = Object.values(tunnels);
     const systemEntry = entries.find((t) => t.type === "system");
     if (systemEntry?.port) result.tunnelPort = systemEntry.port;
   } catch {
   }
   try {
-    const plugins = JSON.parse(fs49.readFileSync(path55.join(root2, "plugins.json"), "utf-8"));
+    const plugins = JSON.parse(fs50.readFileSync(path56.join(root, "plugins.json"), "utf-8"));
     const adapters = ["@openacp/telegram", "@openacp/discord", "@openacp/slack"];
     for (const name of adapters) {
       if (plugins.installed?.[name] && plugins.installed[name].enabled !== false) {
@@ -25742,15 +26105,15 @@ function readInstanceInfo(root2) {
   }
   return result;
 }
-function formatInstanceStatus(root2) {
-  const info = readInstanceInfo(root2);
+function formatInstanceStatus(root) {
+  const info = readInstanceInfo(root);
   if (!info.pid) return null;
-  const displayRoot = root2.replace(os26.homedir(), "~");
-  const isGlobal = root2 === getGlobalRoot();
+  const isGlobal = root === getGlobalRoot();
+  const displayPath = root.replace(os27.homedir(), "~");
   const label = isGlobal ? "global" : "local";
   const lines = [];
   lines.push(`  PID:       ${info.pid}`);
-  lines.push(`  Instance:  ${displayRoot} (${label})`);
+  lines.push(`  Workspace: ${info.name ?? "unknown"} (${label} \u2014 ${displayPath})`);
   lines.push(`  Mode:      ${info.runMode ?? "unknown"}`);
   if (info.channels.length > 0) lines.push(`  Channels:  ${info.channels.join(", ")}`);
   if (info.apiPort) lines.push(`  API:       port ${info.apiPort}`);
@@ -25814,7 +26177,7 @@ var config_editor_exports = {};
 __export(config_editor_exports, {
   runConfigEditor: () => runConfigEditor
 });
-import * as path56 from "path";
+import * as path57 from "path";
 import * as clack9 from "@clack/prompts";
 async function select8(opts) {
   const result = await clack9.select({
@@ -25974,14 +26337,14 @@ async function editDiscord(_config, _updates) {
     const { SettingsManager: SettingsManager2 } = await Promise.resolve().then(() => (init_settings_manager(), settings_manager_exports));
     const { createInstallContext: createInstallContext2 } = await Promise.resolve().then(() => (init_install_context(), install_context_exports));
     const { getGlobalRoot: getGlobalRoot2 } = await Promise.resolve().then(() => (init_instance_context(), instance_context_exports));
-    const root2 = getGlobalRoot2();
-    const basePath = path56.join(root2, "plugins");
+    const root = getGlobalRoot2();
+    const basePath = path57.join(root, "plugins");
     const settingsManager = new SettingsManager2(basePath);
     const ctx = createInstallContext2({
       pluginName: plugin2.name,
       settingsManager,
       basePath,
-      instanceRoot: root2
+      instanceRoot: root
     });
     await plugin2.configure(ctx);
   } else {
@@ -26438,17 +26801,17 @@ ${c2.cyan}${c2.bold}OpenACP Config Editor${c2.reset}`);
 async function sendConfigViaApi(port, updates) {
   const { apiCall: call } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
   const paths = flattenToPaths(updates);
-  for (const { path: path63, value } of paths) {
+  for (const { path: path65, value } of paths) {
     const res = await call(port, "/api/config", {
       method: "PATCH",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ path: path63, value })
+      body: JSON.stringify({ path: path65, value })
     });
     const data = await res.json();
     if (!res.ok) {
-      console.log(warn2(`Failed to update ${path63}: ${data.error}`));
+      console.log(warn2(`Failed to update ${path65}: ${data.error}`));
     } else if (data.needsRestart) {
-      console.log(warn2(`${path63} updated \u2014 restart required`));
+      console.log(warn2(`${path65} updated \u2014 restart required`));
     }
   }
 }
@@ -26551,9 +26914,78 @@ var init_interactive_menu = __esm({
   }
 });
 
+// src/cli/instance-prompt.ts
+var instance_prompt_exports = {};
+__export(instance_prompt_exports, {
+  promptForInstance: () => promptForInstance
+});
+import fs52 from "fs";
+import path63 from "path";
+import os31 from "os";
+async function promptForInstance(opts) {
+  const globalRoot = getGlobalRoot();
+  const globalConfigExists = fs52.existsSync(path63.join(globalRoot, "config.json"));
+  const cwd = process.cwd();
+  const localRoot = path63.join(cwd, ".openacp");
+  if (!globalConfigExists) return globalRoot;
+  const isTTY = process.stdin.isTTY && process.stdout.isTTY;
+  if (!isTTY) return globalRoot;
+  const registryPath = path63.join(globalRoot, "instances.json");
+  const registry = new InstanceRegistry(registryPath);
+  registry.load();
+  const instances = registry.list().filter((e) => fs52.existsSync(e.root));
+  const instanceOptions = instances.map((e) => {
+    let name = e.id;
+    try {
+      const raw = fs52.readFileSync(path63.join(e.root, "config.json"), "utf-8");
+      const parsed = JSON.parse(raw);
+      if (parsed.instanceName) name = parsed.instanceName;
+    } catch {
+    }
+    const isGlobal = e.root === globalRoot;
+    const displayPath = e.root.replace(os31.homedir(), "~");
+    const type = isGlobal ? "global" : "local";
+    return { value: e.root, label: `${name} workspace (${type} \u2014 ${displayPath})` };
+  });
+  if (instanceOptions.length === 0) {
+    const globalDisplay = globalRoot.replace(os31.homedir(), "~");
+    instanceOptions.push({ value: globalRoot, label: `Global workspace (${globalDisplay})` });
+  }
+  if (instanceOptions.length === 1 && !opts.allowCreate) {
+    return instanceOptions[0].value;
+  }
+  const options = instanceOptions.map((o) => ({
+    value: o.value,
+    label: o.label
+  }));
+  if (opts.allowCreate) {
+    const localDisplay = localRoot.replace(os31.homedir(), "~");
+    options.push({ value: localRoot, label: `New local workspace (${localDisplay})` });
+  }
+  const clack10 = await import("@clack/prompts");
+  const choice = await clack10.select({
+    message: "How would you like to run OpenACP?",
+    options
+  });
+  if (clack10.isCancel(choice)) {
+    process.exit(0);
+  }
+  if (choice === localRoot) {
+    console.log(`\x1B[2mTip: next time use \`openacp --local\`\x1B[0m`);
+  }
+  return choice;
+}
+var init_instance_prompt = __esm({
+  "src/cli/instance-prompt.ts"() {
+    "use strict";
+    init_instance_context();
+    init_instance_registry();
+  }
+});
+
 // src/cli.ts
 import { setDefaultAutoSelectFamily } from "net";
-import path62 from "path";
+import path64 from "path";
 
 // src/cli/commands/help.ts
 function printHelp() {
@@ -26633,12 +27065,12 @@ Connect messaging platforms (Telegram, Discord) to 28+ AI coding agents via ACP
   openacp api health                   System health check
   openacp api restart                  Restart daemon
 
-\x1B[1mInstance Flags:\x1B[0m
-  --local              Use setup in current directory
-  --global             Use main setup (~/.openacp)
-  --dir <path>         Use setup in specified directory
-  --from <path>        Copy settings from existing setup (on create)
-  --name <name>        Set instance name (on create)
+\x1B[1mWorkspace Flags:\x1B[0m
+  --local              Use workspace in current directory
+  --global             Use global workspace (~/.openacp)
+  --dir <path>         Use workspace at specified directory
+  --from <path>        Copy settings from existing workspace (on create)
+  --name <name>        Set workspace name (on create)
 
 \x1B[2mMore info: https://github.com/Open-ACP/OpenACP\x1B[0m
 `);
@@ -26657,8 +27089,8 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 async function cmdInstall(args2, instanceRoot) {
-  const root2 = instanceRoot ?? path.join(os.homedir(), ".openacp");
-  const pluginsDir = path.join(root2, "plugins");
+  const root = instanceRoot ?? path.join(os.homedir(), ".openacp");
+  const pluginsDir = path.join(root, "plugins");
   if (wantsHelp(args2)) {
     console.log(`
 \x1B[1mopenacp install\x1B[0m \u2014 Install a plugin adapter
@@ -26698,8 +27130,8 @@ import * as fs2 from "fs";
 import * as path2 from "path";
 import * as os2 from "os";
 async function cmdUninstall(args2, instanceRoot) {
-  const root2 = instanceRoot ?? path2.join(os2.homedir(), ".openacp");
-  const pluginsDir = path2.join(root2, "plugins");
+  const root = instanceRoot ?? path2.join(os2.homedir(), ".openacp");
+  const pluginsDir = path2.join(root, "plugins");
   if (wantsHelp(args2)) {
     console.log(`
 \x1B[1mopenacp uninstall\x1B[0m \u2014 Remove a plugin adapter
@@ -26744,11 +27176,11 @@ Shows all plugins registered in the plugin registry.
 `);
     return;
   }
-  const os30 = await import("os");
-  const path63 = await import("path");
+  const os32 = await import("os");
+  const path65 = await import("path");
   const { PluginRegistry: PluginRegistry2 } = await Promise.resolve().then(() => (init_plugin_registry(), plugin_registry_exports));
-  const root2 = instanceRoot ?? path63.join(os30.homedir(), ".openacp");
-  const registryPath = path63.join(root2, "plugins.json");
+  const root = instanceRoot ?? path65.join(os32.homedir(), ".openacp");
+  const registryPath = path65.join(root, "plugins.json");
   const registry = new PluginRegistry2(registryPath);
   await registry.load();
   const plugins = registry.list();
@@ -26859,11 +27291,11 @@ async function cmdPlugin(args2 = [], instanceRoot) {
   }
 }
 async function setPluginEnabled(name, enabled, instanceRoot) {
-  const os30 = await import("os");
-  const path63 = await import("path");
+  const os32 = await import("os");
+  const path65 = await import("path");
   const { PluginRegistry: PluginRegistry2 } = await Promise.resolve().then(() => (init_plugin_registry(), plugin_registry_exports));
-  const root2 = instanceRoot ?? path63.join(os30.homedir(), ".openacp");
-  const registryPath = path63.join(root2, "plugins.json");
+  const root = instanceRoot ?? path65.join(os32.homedir(), ".openacp");
+  const registryPath = path65.join(root, "plugins.json");
   const registry = new PluginRegistry2(registryPath);
   await registry.load();
   const entry = registry.get(name);
@@ -26876,8 +27308,8 @@ async function setPluginEnabled(name, enabled, instanceRoot) {
   console.log(`Plugin ${name} ${enabled ? "enabled" : "disabled"}. Restart to apply.`);
 }
 async function configurePlugin(name, instanceRoot) {
-  const os30 = await import("os");
-  const path63 = await import("path");
+  const os32 = await import("os");
+  const path65 = await import("path");
   const { corePlugins: corePlugins2 } = await Promise.resolve().then(() => (init_core_plugins(), core_plugins_exports));
   const { SettingsManager: SettingsManager2 } = await Promise.resolve().then(() => (init_settings_manager(), settings_manager_exports));
   const { createInstallContext: createInstallContext2 } = await Promise.resolve().then(() => (init_install_context(), install_context_exports));
@@ -26886,8 +27318,8 @@ async function configurePlugin(name, instanceRoot) {
     console.error(`Plugin "${name}" not found.`);
     process.exit(1);
   }
-  const root2 = instanceRoot ?? path63.join(os30.homedir(), ".openacp");
-  const basePath = path63.join(root2, "plugins", "data");
+  const root = instanceRoot ?? path65.join(os32.homedir(), ".openacp");
+  const basePath = path65.join(root, "plugins", "data");
   const settingsManager = new SettingsManager2(basePath);
   const ctx = createInstallContext2({ pluginName: name, settingsManager, basePath });
   if (plugin2.configure) {
@@ -26899,14 +27331,14 @@ async function configurePlugin(name, instanceRoot) {
   }
 }
 async function installPlugin(input2, instanceRoot) {
-  const os30 = await import("os");
-  const path63 = await import("path");
+  const os32 = await import("os");
+  const path65 = await import("path");
   const { execFileSync: execFileSync8 } = await import("child_process");
   const { getCurrentVersion: getCurrentVersion2 } = await Promise.resolve().then(() => (init_version(), version_exports));
   const { SettingsManager: SettingsManager2 } = await Promise.resolve().then(() => (init_settings_manager(), settings_manager_exports));
   const { createInstallContext: createInstallContext2 } = await Promise.resolve().then(() => (init_install_context(), install_context_exports));
   const { PluginRegistry: PluginRegistry2 } = await Promise.resolve().then(() => (init_plugin_registry(), plugin_registry_exports));
-  const root2 = instanceRoot ?? path63.join(os30.homedir(), ".openacp");
+  const root = instanceRoot ?? path65.join(os32.homedir(), ".openacp");
   let pkgName;
   let pkgVersion;
   if (input2.startsWith("@")) {
@@ -26951,9 +27383,9 @@ async function installPlugin(input2, instanceRoot) {
   console.log(`Installing ${installSpec}...`);
   const { corePlugins: corePlugins2 } = await Promise.resolve().then(() => (init_core_plugins(), core_plugins_exports));
   const builtinPlugin = corePlugins2.find((p2) => p2.name === pkgName);
-  const basePath = path63.join(root2, "plugins", "data");
+  const basePath = path65.join(root, "plugins", "data");
   const settingsManager = new SettingsManager2(basePath);
-  const registryPath = path63.join(root2, "plugins.json");
+  const registryPath = path65.join(root, "plugins.json");
   const pluginRegistry = new PluginRegistry2(registryPath);
   await pluginRegistry.load();
   if (builtinPlugin) {
@@ -26972,8 +27404,8 @@ async function installPlugin(input2, instanceRoot) {
     console.log(`\u2713 ${builtinPlugin.name} installed! Restart to activate.`);
     return;
   }
-  const pluginsDir = path63.join(root2, "plugins");
-  const nodeModulesDir = path63.join(pluginsDir, "node_modules");
+  const pluginsDir = path65.join(root, "plugins");
+  const nodeModulesDir = path65.join(pluginsDir, "node_modules");
   try {
     execFileSync8("npm", ["install", installSpec, "--prefix", pluginsDir, "--save"], {
       stdio: "inherit",
@@ -26986,8 +27418,8 @@ async function installPlugin(input2, instanceRoot) {
   const cliVersion = getCurrentVersion2();
   const isLocalPath = pkgName.startsWith("/") || pkgName.startsWith(".");
   try {
-    const pluginRoot = isLocalPath ? path63.resolve(pkgName) : path63.join(nodeModulesDir, pkgName);
-    const installedPkgPath = path63.join(pluginRoot, "package.json");
+    const pluginRoot = isLocalPath ? path65.resolve(pkgName) : path65.join(nodeModulesDir, pkgName);
+    const installedPkgPath = path65.join(pluginRoot, "package.json");
     const { readFileSync: readFileSync18 } = await import("fs");
     const installedPkg = JSON.parse(readFileSync18(installedPkgPath, "utf-8"));
     const minVersion = installedPkg.engines?.openacp?.replace(/[>=^~\s]/g, "");
@@ -27000,7 +27432,7 @@ async function installPlugin(input2, instanceRoot) {
 `);
       }
     }
-    const pluginModule = await import(path63.join(pluginRoot, installedPkg.main ?? "dist/index.js"));
+    const pluginModule = await import(path65.join(pluginRoot, installedPkg.main ?? "dist/index.js"));
     const plugin2 = pluginModule.default;
     if (plugin2?.install) {
       const ctx = createInstallContext2({ pluginName: plugin2.name ?? pkgName, settingsManager, basePath });
@@ -27027,12 +27459,12 @@ async function installPlugin(input2, instanceRoot) {
   }
 }
 async function uninstallPlugin(name, purge, instanceRoot) {
-  const os30 = await import("os");
-  const path63 = await import("path");
-  const fs51 = await import("fs");
+  const os32 = await import("os");
+  const path65 = await import("path");
+  const fs53 = await import("fs");
   const { PluginRegistry: PluginRegistry2 } = await Promise.resolve().then(() => (init_plugin_registry(), plugin_registry_exports));
-  const root2 = instanceRoot ?? path63.join(os30.homedir(), ".openacp");
-  const registryPath = path63.join(root2, "plugins.json");
+  const root = instanceRoot ?? path65.join(os32.homedir(), ".openacp");
+  const registryPath = path65.join(root, "plugins.json");
   const registry = new PluginRegistry2(registryPath);
   await registry.load();
   const entry = registry.get(name);
@@ -27050,7 +27482,7 @@ async function uninstallPlugin(name, purge, instanceRoot) {
     if (plugin2?.uninstall) {
       const { SettingsManager: SettingsManager2 } = await Promise.resolve().then(() => (init_settings_manager(), settings_manager_exports));
       const { createInstallContext: createInstallContext2 } = await Promise.resolve().then(() => (init_install_context(), install_context_exports));
-      const basePath = path63.join(root2, "plugins", "data");
+      const basePath = path65.join(root, "plugins", "data");
       const settingsManager = new SettingsManager2(basePath);
       const ctx = createInstallContext2({ pluginName: name, settingsManager, basePath });
       await plugin2.uninstall(ctx, { purge });
@@ -27058,8 +27490,8 @@ async function uninstallPlugin(name, purge, instanceRoot) {
   } catch {
   }
   if (purge) {
-    const pluginDir = path63.join(root2, "plugins", name);
-    fs51.rmSync(pluginDir, { recursive: true, force: true });
+    const pluginDir = path65.join(root, "plugins", name);
+    fs53.rmSync(pluginDir, { recursive: true, force: true });
   }
   registry.remove(name);
   await registry.save();
@@ -27087,6 +27519,12 @@ function printApiHelp() {
   openacp api cancel <id>                  Cancel a session
   openacp api dangerous <id> on|off        Toggle dangerous mode
 
+\x1B[1mSession Config Commands:\x1B[0m
+  openacp api session-config <id>                    List all config options
+  openacp api session-config <id> set <opt> <value>  Set a config option
+  openacp api session-config <id> overrides          Show clientOverrides
+  openacp api session-config <id> dangerous [on|off] Toggle bypassPermissions
+
 \x1B[1mTopic Commands:\x1B[0m
   openacp api topics [--status s1,s2]      List topics
   openacp api delete-topic <id> [--force]  Delete a topic
@@ -27298,6 +27736,26 @@ Sends a restart signal to the running daemon.
   openacp api version
 
 Shows the version of the currently running daemon process.
+`,
+      "session-config": `
+\x1B[1mopenacp api session-config\x1B[0m \u2014 Manage session config options
+
+\x1B[1mUsage:\x1B[0m
+  openacp api session-config <id>                    List all config options
+  openacp api session-config <id> set <opt> <value>  Set a config option
+  openacp api session-config <id> overrides          Show clientOverrides
+  openacp api session-config <id> dangerous [on|off] Toggle bypassPermissions
+
+\x1B[1mArguments:\x1B[0m
+  <id>            Session ID
+  <opt>           Config option ID (from list)
+  <value>         New value for the config option
+
+\x1B[1mExamples:\x1B[0m
+  openacp api session-config abc123
+  openacp api session-config abc123 set model claude-opus-4-5
+  openacp api session-config abc123 overrides
+  openacp api session-config abc123 dangerous on
 `
     };
     const help = apiSubHelp[subCmd];
@@ -27627,6 +28085,126 @@ Shows the version of the currently running daemon process.
         process.exit(1);
       }
       console.log(`Daemon version: ${data.version}`);
+    } else if (subCmd === "session-config") {
+      const sessionId = args2[2];
+      if (!sessionId) {
+        console.error("Usage: openacp api session-config <session-id> [set <opt> <value> | overrides | dangerous [on|off]]");
+        process.exit(1);
+      }
+      const configSubCmd = args2[3];
+      if (!configSubCmd || configSubCmd === "list") {
+        const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config`);
+        const data = await res.json();
+        if (!res.ok) {
+          console.error(`Error: ${data.error}`);
+          process.exit(1);
+        }
+        const configOptions = data.configOptions;
+        const clientOverrides = data.clientOverrides;
+        if (!configOptions || configOptions.length === 0) {
+          console.log("No config options available for this session.");
+        } else {
+          console.log(`Config options for session ${sessionId}:
+`);
+          for (const opt of configOptions) {
+            const desc = opt.description ? `  ${opt.description}` : "";
+            console.log(`  [${opt.id}]  ${opt.name}  (${opt.type})  current: ${opt.currentValue}${desc}`);
+            if (opt.type === "select") {
+              const options = opt.options;
+              if (options && options.length > 0) {
+                const choices = options.flatMap((o) => {
+                  if ("group" in o) {
+                    const groupOpts = o.options;
+                    return groupOpts?.map((c3) => `${c3.value} (${c3.label})`) ?? [];
+                  }
+                  return [`${o.value} (${o.label})`];
+                });
+                console.log(`    choices: ${choices.join(", ")}`);
+              }
+            }
+          }
+        }
+        if (clientOverrides && Object.keys(clientOverrides).length > 0) {
+          console.log(`
+Client overrides: ${JSON.stringify(clientOverrides)}`);
+        }
+      } else if (configSubCmd === "set") {
+        const configId = args2[4];
+        const value = args2[5];
+        if (!configId || value === void 0) {
+          console.error("Usage: openacp api session-config <session-id> set <config-id> <value>");
+          process.exit(1);
+        }
+        const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config/${encodeURIComponent(configId)}`, {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ value })
+        });
+        const data = await res.json();
+        if (!res.ok) {
+          console.error(`Error: ${data.error}`);
+          process.exit(1);
+        }
+        console.log(`Config option "${configId}" updated to "${value}"`);
+        const configOptions = data.configOptions;
+        const updated = configOptions?.find((o) => o.id === configId);
+        if (updated) {
+          console.log(`  Current value: ${updated.currentValue}`);
+        }
+      } else if (configSubCmd === "overrides") {
+        const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config/overrides`);
+        const data = await res.json();
+        if (!res.ok) {
+          console.error(`Error: ${data.error}`);
+          process.exit(1);
+        }
+        const overrides = data.clientOverrides;
+        if (!overrides || Object.keys(overrides).length === 0) {
+          console.log("No client overrides set.");
+        } else {
+          console.log(`Client overrides for session ${sessionId}:`);
+          for (const [key, val] of Object.entries(overrides)) {
+            console.log(`  ${key}: ${val}`);
+          }
+        }
+      } else if (configSubCmd === "dangerous") {
+        const toggle = args2[4];
+        if (toggle && toggle !== "on" && toggle !== "off") {
+          console.error("Usage: openacp api session-config <session-id> dangerous [on|off]");
+          process.exit(1);
+        }
+        if (toggle) {
+          const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config/overrides`, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ bypassPermissions: toggle === "on" })
+          });
+          const data = await res.json();
+          if (!res.ok) {
+            console.error(`Error: ${data.error}`);
+            process.exit(1);
+          }
+          const state = toggle === "on" ? "enabled" : "disabled";
+          console.log(`bypassPermissions ${state} for session ${sessionId}`);
+        } else {
+          const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config/overrides`);
+          const data = await res.json();
+          if (!res.ok) {
+            console.error(`Error: ${data.error}`);
+            process.exit(1);
+          }
+          const overrides = data.clientOverrides;
+          const bypass = overrides?.bypassPermissions;
+          console.log(`bypassPermissions: ${bypass ?? false}`);
+        }
+      } else {
+        console.error(`Unknown session-config subcommand: ${configSubCmd}`);
+        console.log("  openacp api session-config <id>                    List config options");
+        console.log("  openacp api session-config <id> set <opt> <value>  Set a config option");
+        console.log("  openacp api session-config <id> overrides          Show clientOverrides");
+        console.log("  openacp api session-config <id> dangerous [on|off] Toggle bypassPermissions");
+        process.exit(1);
+      }
     } else {
       const { suggestMatch: suggestMatch2 } = await Promise.resolve().then(() => (init_suggest(), suggest_exports));
       const apiSubcommands = [
@@ -27646,7 +28224,8 @@ Shows the version of the currently running daemon process.
         "adapters",
         "tunnel",
         "notify",
-        "version"
+        "version",
+        "session-config"
       ];
       const suggestion = suggestMatch2(subCmd ?? "", apiSubcommands);
       console.error(`Unknown api command: ${subCmd || "(none)"}
@@ -27673,7 +28252,7 @@ init_instance_hint();
 import path36 from "path";
 import os17 from "os";
 async function cmdStart(args2 = [], instanceRoot) {
-  const root2 = instanceRoot ?? path36.join(os17.homedir(), ".openacp");
+  const root = instanceRoot ?? path36.join(os17.homedir(), ".openacp");
   if (wantsHelp(args2)) {
     console.log(`
 \x1B[1mopenacp start\x1B[0m \u2014 Start OpenACP as a background daemon
@@ -27695,16 +28274,16 @@ Requires an existing config \u2014 run 'openacp' first to set up.
   await checkAndPromptUpdate();
   const { startDaemon: startDaemon2, getPidPath: getPidPath2 } = await Promise.resolve().then(() => (init_daemon2(), daemon_exports));
   const { ConfigManager: ConfigManager2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
-  const cm = new ConfigManager2(path36.join(root2, "config.json"));
+  const cm = new ConfigManager2(path36.join(root, "config.json"));
   if (await cm.exists()) {
     await cm.load();
     const config = cm.get();
-    const result = startDaemon2(getPidPath2(root2), config.logging.logDir, root2);
+    const result = startDaemon2(getPidPath2(root), config.logging.logDir, root);
     if ("error" in result) {
       console.error(result.error);
       process.exit(1);
     }
-    printInstanceHint(root2);
+    printInstanceHint(root);
     console.log(`OpenACP daemon started (PID ${result.pid})`);
   } else {
     console.error('No config found. Run "openacp" first to set up.');
@@ -27854,18 +28433,18 @@ start fresh with the setup wizard. The daemon must be stopped first.
 `);
     return;
   }
-  const os30 = await import("os");
-  const path63 = await import("path");
-  const root2 = instanceRoot ?? path63.join(os30.homedir(), ".openacp");
+  const os32 = await import("os");
+  const path65 = await import("path");
+  const root = instanceRoot ?? path65.join(os32.homedir(), ".openacp");
   const { getStatus: getStatus2, getPidPath: getPidPath2 } = await Promise.resolve().then(() => (init_daemon2(), daemon_exports));
-  const status = getStatus2(getPidPath2(root2));
+  const status = getStatus2(getPidPath2(root));
   if (status.running) {
     console.error("OpenACP is running. Stop it first: openacp stop");
     process.exit(1);
   }
   const clack10 = await import("@clack/prompts");
   const yes = await clack10.confirm({
-    message: `This will delete all OpenACP data (${root2}). You will need to set up again. Continue?`,
+    message: `This will delete all OpenACP data (${root}). You will need to set up again. Continue?`,
     initialValue: false
   });
   if (clack10.isCancel(yes) || !yes) {
@@ -27874,8 +28453,8 @@ start fresh with the setup wizard. The daemon must be stopped first.
   }
   const { uninstallAutoStart: uninstallAutoStart2 } = await Promise.resolve().then(() => (init_autostart(), autostart_exports));
   uninstallAutoStart2();
-  const fs51 = await import("fs");
-  fs51.rmSync(root2, { recursive: true, force: true });
+  const fs53 = await import("fs");
+  fs53.rmSync(root, { recursive: true, force: true });
   console.log("Reset complete. Run `openacp` to set up again.");
 }
 
@@ -28620,16 +29199,16 @@ Tunnel Management:
 }
 
 // src/cli/commands/onboard.ts
-import * as path57 from "path";
+import * as path58 from "path";
 async function cmdOnboard(instanceRoot) {
   const { ConfigManager: ConfigManager2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
   const { SettingsManager: SettingsManager2 } = await Promise.resolve().then(() => (init_settings_manager(), settings_manager_exports));
   const { PluginRegistry: PluginRegistry2 } = await Promise.resolve().then(() => (init_plugin_registry(), plugin_registry_exports));
   const { getGlobalRoot: getGlobalRoot2 } = await Promise.resolve().then(() => (init_instance_context(), instance_context_exports));
   const OPENACP_DIR = instanceRoot ?? getGlobalRoot2();
-  const PLUGINS_DATA_DIR = path57.join(OPENACP_DIR, "plugins", "data");
-  const REGISTRY_PATH = path57.join(OPENACP_DIR, "plugins.json");
-  const cm = new ConfigManager2(path57.join(OPENACP_DIR, "config.json"));
+  const PLUGINS_DATA_DIR = path58.join(OPENACP_DIR, "plugins", "data");
+  const REGISTRY_PATH = path58.join(OPENACP_DIR, "plugins.json");
+  const cm = new ConfigManager2(path58.join(OPENACP_DIR, "config.json"));
   const settingsManager = new SettingsManager2(PLUGINS_DATA_DIR);
   const pluginRegistry = new PluginRegistry2(REGISTRY_PATH);
   await pluginRegistry.load();
@@ -28646,12 +29225,12 @@ async function cmdOnboard(instanceRoot) {
 init_version();
 init_instance_context();
 init_instance_hint();
-import path58 from "path";
-import os27 from "os";
+import path59 from "path";
+import os28 from "os";
 async function cmdDefault(command2, instanceRoot) {
-  const root2 = instanceRoot ?? path58.join(os27.homedir(), ".openacp");
-  const pluginsDataDir = path58.join(root2, "plugins", "data");
-  const registryPath = path58.join(root2, "plugins.json");
+  const root = instanceRoot ?? path59.join(os28.homedir(), ".openacp");
+  const pluginsDataDir = path59.join(root, "plugins", "data");
+  const registryPath = path59.join(root, "plugins.json");
   const forceForeground = command2 === "--foreground";
   if (command2 && !command2.startsWith("-")) {
     const { suggestMatch: suggestMatch2 } = await Promise.resolve().then(() => (init_suggest(), suggest_exports));
@@ -28683,7 +29262,7 @@ async function cmdDefault(command2, instanceRoot) {
   }
   await checkAndPromptUpdate();
   const { ConfigManager: ConfigManager2 } = await Promise.resolve().then(() => (init_config2(), config_exports));
-  const configPath = path58.join(root2, "config.json");
+  const configPath = path59.join(root, "config.json");
   const cm = new ConfigManager2(configPath);
   if (!await cm.exists()) {
     const { SettingsManager: SettingsManager2 } = await Promise.resolve().then(() => (init_settings_manager(), settings_manager_exports));
@@ -28692,44 +29271,44 @@ async function cmdDefault(command2, instanceRoot) {
     const pluginRegistry = new PluginRegistry2(registryPath);
     await pluginRegistry.load();
     const { runSetup: runSetup2 } = await Promise.resolve().then(() => (init_setup(), setup_exports));
-    const shouldStart = await runSetup2(cm, { settingsManager, pluginRegistry, instanceRoot: root2 });
+    const shouldStart = await runSetup2(cm, { settingsManager, pluginRegistry, instanceRoot: root });
     if (!shouldStart) process.exit(0);
   }
   await cm.load();
   const config = cm.get();
   if (!forceForeground && config.runMode === "daemon") {
     const { isProcessRunning: isProcessRunning2, getPidPath: getPidPath2, startDaemon: startDaemon2 } = await Promise.resolve().then(() => (init_daemon2(), daemon_exports));
-    const pidPath = getPidPath2(root2);
+    const pidPath = getPidPath2(root);
     if (isProcessRunning2(pidPath)) {
-      await showAlreadyRunningMenu(root2);
+      await showAlreadyRunningMenu(root);
       return;
     }
-    const result = startDaemon2(pidPath, config.logging.logDir, root2);
+    const result = startDaemon2(pidPath, config.logging.logDir, root);
     if ("error" in result) {
       console.error(result.error);
       process.exit(1);
     }
-    printInstanceHint(root2);
+    printInstanceHint(root);
     console.log(`OpenACP daemon started (PID ${result.pid})`);
     return;
   }
   const { markRunning: markRunning2 } = await Promise.resolve().then(() => (init_daemon2(), daemon_exports));
-  markRunning2(root2);
-  printInstanceHint(root2);
+  markRunning2(root);
+  printInstanceHint(root);
   const { startServer: startServer2 } = await Promise.resolve().then(() => (init_main(), main_exports));
   const ctx = createInstanceContext({
     id: "default",
-    root: root2,
-    isGlobal: root2 === getGlobalRoot()
+    root,
+    isGlobal: root === getGlobalRoot()
   });
   await startServer2({ instanceContext: ctx });
 }
-async function showAlreadyRunningMenu(root2) {
+async function showAlreadyRunningMenu(root) {
   const { formatInstanceStatus: formatInstanceStatus2 } = await Promise.resolve().then(() => (init_status(), status_exports));
   console.log("");
   console.log("\x1B[1mOpenACP is already running\x1B[0m");
   console.log("");
-  const status = formatInstanceStatus2(root2);
+  const status = formatInstanceStatus2(root);
   if (status) {
     for (const line of status.lines) {
       console.log(line);
@@ -28743,7 +29322,7 @@ async function showAlreadyRunningMenu(root2) {
       label: "Restart",
       action: async () => {
         const { cmdRestart: cmdRestart2 } = await Promise.resolve().then(() => (init_restart(), restart_exports));
-        await cmdRestart2([], root2);
+        await cmdRestart2([], root);
       }
     },
     {
@@ -28751,7 +29330,7 @@ async function showAlreadyRunningMenu(root2) {
       label: "Stop",
       action: async () => {
         const { cmdStop: cmdStop2 } = await Promise.resolve().then(() => (init_stop(), stop_exports));
-        await cmdStop2([], root2);
+        await cmdStop2([], root);
       }
     },
     {
@@ -28765,7 +29344,7 @@ async function showAlreadyRunningMenu(root2) {
       label: "Restart in foreground",
       action: async () => {
         const { cmdRestart: cmdRestart2 } = await Promise.resolve().then(() => (init_restart(), restart_exports));
-        await cmdRestart2(["--foreground"], root2);
+        await cmdRestart2(["--foreground"], root);
       }
     },
     {
@@ -28773,7 +29352,7 @@ async function showAlreadyRunningMenu(root2) {
       label: "View logs",
       action: async () => {
         const { cmdLogs: cmdLogs2 } = await Promise.resolve().then(() => (init_logs(), logs_exports));
-        await cmdLogs2([], root2);
+        await cmdLogs2([], root);
       }
     }
   ]);
@@ -28785,8 +29364,8 @@ async function showAlreadyRunningMenu(root2) {
 
 // src/cli/commands/dev.ts
 init_helpers();
-import fs50 from "fs";
-import path59 from "path";
+import fs51 from "fs";
+import path60 from "path";
 async function cmdDev(args2 = []) {
   if (wantsHelp(args2)) {
     console.log(`
@@ -28813,13 +29392,13 @@ async function cmdDev(args2 = []) {
     console.error("Error: missing plugin path. Usage: openacp dev <plugin-path>");
     process.exit(1);
   }
-  const pluginPath = path59.resolve(pluginPathArg);
-  if (!fs50.existsSync(pluginPath)) {
+  const pluginPath = path60.resolve(pluginPathArg);
+  if (!fs51.existsSync(pluginPath)) {
     console.error(`Error: plugin path does not exist: ${pluginPath}`);
     process.exit(1);
   }
-  const tsconfigPath = path59.join(pluginPath, "tsconfig.json");
-  const hasTsconfig = fs50.existsSync(tsconfigPath);
+  const tsconfigPath = path60.join(pluginPath, "tsconfig.json");
+  const hasTsconfig = fs51.existsSync(tsconfigPath);
   if (hasTsconfig) {
     console.log("Compiling plugin TypeScript...");
     const { execSync: execSync5 } = await import("child_process");
@@ -28860,10 +29439,10 @@ async function cmdDev(args2 = []) {
 
 // src/cli/commands/attach.ts
 init_helpers();
-import path60 from "path";
-import os28 from "os";
+import path61 from "path";
+import os29 from "os";
 async function cmdAttach(args2 = [], instanceRoot) {
-  const root2 = instanceRoot ?? path60.join(os28.homedir(), ".openacp");
+  const root = instanceRoot ?? path61.join(os29.homedir(), ".openacp");
   if (wantsHelp(args2)) {
     console.log(`
 \x1B[1mopenacp attach\x1B[0m \u2014 Attach to a running daemon
@@ -28881,7 +29460,7 @@ Press Ctrl+C to detach.
     return;
   }
   const { formatInstanceStatus: formatInstanceStatus2 } = await Promise.resolve().then(() => (init_status(), status_exports));
-  const status = formatInstanceStatus2(root2);
+  const status = formatInstanceStatus2(root);
   if (!status) {
     console.log("OpenACP is not running.");
     process.exit(1);
@@ -28897,15 +29476,15 @@ Press Ctrl+C to detach.
   console.log("");
   const { spawn: spawn8 } = await import("child_process");
   const { expandHome: expandHome4 } = await Promise.resolve().then(() => (init_config2(), config_exports));
-  let logDir2 = path60.join(root2, "logs");
+  let logDir2 = path61.join(root, "logs");
   try {
-    const configPath = path60.join(root2, "config.json");
+    const configPath = path61.join(root, "config.json");
     const { readFileSync: readFileSync18 } = await import("fs");
     const config = JSON.parse(readFileSync18(configPath, "utf-8"));
     if (config.logging?.logDir) logDir2 = expandHome4(config.logging.logDir);
   } catch {
   }
-  const logFile = path60.join(logDir2, "openacp.log");
+  const logFile = path61.join(logDir2, "openacp.log");
   const tail = spawn8("tail", ["-f", "-n", "50", logFile], { stdio: "inherit" });
   tail.on("error", (err) => {
     console.error(`Cannot tail log file: ${err.message}`);
@@ -28916,8 +29495,8 @@ Press Ctrl+C to detach.
 // src/cli/commands/remote.ts
 init_api_client();
 init_instance_registry();
-import path61 from "path";
-import os29 from "os";
+import path62 from "path";
+import os30 from "os";
 import qrcode from "qrcode-terminal";
 async function cmdRemote(args2, instanceRoot) {
   const role = extractFlag(args2, "--role") ?? "admin";
@@ -28930,12 +29509,12 @@ async function cmdRemote(args2, instanceRoot) {
   const scopes = scopesRaw ? scopesRaw.split(",").map((s) => s.trim()) : void 0;
   let resolvedInstanceRoot2 = instanceRoot;
   if (instanceId) {
-    const registryPath = path61.join(os29.homedir(), ".openacp", "instances.json");
+    const registryPath = path62.join(os30.homedir(), ".openacp", "instances.json");
     const registry = new InstanceRegistry(registryPath);
     await registry.load();
     const entry = registry.get(instanceId);
     if (!entry) {
-      console.error(`Instance "${instanceId}" not found. Run "openacp status" to see running instances.`);
+      console.error(`Workspace "${instanceId}" not found. Run "openacp status" to see workspaces.`);
       process.exit(1);
     }
     resolvedInstanceRoot2 = entry.root;
@@ -29105,41 +29684,34 @@ resolvedInstanceRoot = resolveInstanceRoot({
   global: flags.global,
   cwd: process.cwd()
 });
-var root = resolvedInstanceRoot ?? getGlobalRoot();
-var commands = {
+var noInstanceCommands = {
   "--help": async () => printHelp(),
   "-h": async () => printHelp(),
   "--version": () => cmdVersion(),
   "-v": () => cmdVersion(),
-  "install": () => cmdInstall(args, root),
-  "uninstall": () => cmdUninstall(args, root),
-  "plugins": () => cmdPlugins(args, root),
-  "plugin": () => cmdPlugin(args, root),
-  "api": () => cmdApi(args, root),
-  "start": () => cmdStart(args, root),
-  "stop": () => cmdStop(args, root),
-  "restart": () => cmdRestart(args, root),
-  "status": () => cmdStatus(args, root),
-  "logs": () => cmdLogs(args, root),
-  "config": () => cmdConfig(args, root),
-  "reset": () => cmdReset(args, root),
   "update": () => cmdUpdate(args),
   "adopt": () => cmdAdopt(args),
   "integrate": () => cmdIntegrate(args),
-  "doctor": () => cmdDoctor(args, root),
-  "agents": () => cmdAgents(args, root),
-  "tunnel": () => cmdTunnel(args, root),
-  "onboard": () => cmdOnboard(root),
-  "dev": () => cmdDev(args),
-  "attach": () => cmdAttach(args, root),
-  "remote": () => cmdRemote(args, root),
-  "--daemon-child": async () => {
+  "dev": () => cmdDev(args)
+};
+async function resolveRoot(allowCreate) {
+  if (resolvedInstanceRoot) return resolvedInstanceRoot;
+  const { promptForInstance: promptForInstance2 } = await Promise.resolve().then(() => (init_instance_prompt(), instance_prompt_exports));
+  return promptForInstance2({ allowCreate });
+}
+async function main() {
+  const noInstance = command ? noInstanceCommands[command] : void 0;
+  if (noInstance) {
+    await noInstance();
+    return;
+  }
+  if (command === "--daemon-child") {
     const { startServer: startServer2 } = await Promise.resolve().then(() => (init_main(), main_exports));
     const envRoot = process.env.OPENACP_INSTANCE_ROOT;
     if (envRoot) {
       const { createInstanceContext: createInstanceContext2, getGlobalRoot: getGlobal } = await Promise.resolve().then(() => (init_instance_context(), instance_context_exports));
       const { InstanceRegistry: InstanceRegistry2 } = await Promise.resolve().then(() => (init_instance_registry(), instance_registry_exports));
-      const registry = new InstanceRegistry2(path62.join(getGlobal(), "instances.json"));
+      const registry = new InstanceRegistry2(path64.join(getGlobal(), "instances.json"));
       await registry.load();
       const entry = registry.getByRoot(envRoot);
       const id = entry?.id ?? "unknown";
@@ -29152,13 +29724,34 @@ var commands = {
     } else {
       await startServer2();
     }
+    return;
   }
-};
-async function main() {
-  const handler = command ? commands[command] : void 0;
+  const instanceCommands = {
+    "install": (r) => cmdInstall(args, r),
+    "uninstall": (r) => cmdUninstall(args, r),
+    "plugins": (r) => cmdPlugins(args, r),
+    "plugin": (r) => cmdPlugin(args, r),
+    "api": (r) => cmdApi(args, r),
+    "start": (r) => cmdStart(args, r),
+    "stop": (r) => cmdStop(args, r),
+    "restart": (r) => cmdRestart(args, r),
+    "status": (r) => cmdStatus(args, r),
+    "logs": (r) => cmdLogs(args, r),
+    "config": (r) => cmdConfig(args, r),
+    "reset": (r) => cmdReset(args, r),
+    "doctor": (r) => cmdDoctor(args, r),
+    "agents": (r) => cmdAgents(args, r),
+    "tunnel": (r) => cmdTunnel(args, r),
+    "onboard": (r) => cmdOnboard(r),
+    "attach": (r) => cmdAttach(args, r),
+    "remote": (r) => cmdRemote(args, r)
+  };
+  const handler = command ? instanceCommands[command] : void 0;
   if (handler) {
-    await handler();
+    const root = await resolveRoot(false);
+    await handler(root);
   } else {
+    const root = await resolveRoot(true);
     await cmdDefault(command, root);
   }
 }