@openacp/cli 2026.405.2 → 2026.406.2

package/dist/cli.js

@@ -1104,7 +1104,7 @@ Declare in \`permissions\` array. Only request what you need.
 
 Calling a method without the required permission throws \`PluginPermissionError\`.
 
-## Middleware Hooks (20 total)
+## Middleware Hooks (19 total)
 
 Register with \`ctx.registerMiddleware(hook, { priority?, handler })\`. Return \`null\` to block the flow, call \`next()\` to continue.
 
@@ -1757,6 +1757,104 @@ var init_security_guard = __esm({
   }
 });
 
+// src/core/events.ts
+var Hook, BusEvent, SessionEv;
+var init_events = __esm({
+  "src/core/events.ts"() {
+    "use strict";
+    Hook = {
+      // --- Message flow ---
+      /** Incoming message from any adapter — modifiable, can block. */
+      MESSAGE_INCOMING: "message:incoming",
+      /** Outgoing message before it reaches the adapter — modifiable, can block. */
+      MESSAGE_OUTGOING: "message:outgoing",
+      // --- Agent / turn lifecycle ---
+      /** Before a user prompt is sent to the agent — modifiable, can block. */
+      AGENT_BEFORE_PROMPT: "agent:beforePrompt",
+      /** Before an agent event is dispatched — modifiable, can block. */
+      AGENT_BEFORE_EVENT: "agent:beforeEvent",
+      /** After an agent event is dispatched — read-only, fire-and-forget. */
+      AGENT_AFTER_EVENT: "agent:afterEvent",
+      /** Before the current prompt is cancelled — modifiable, can block. */
+      AGENT_BEFORE_CANCEL: "agent:beforeCancel",
+      /** Before the agent is switched — modifiable, can block. */
+      AGENT_BEFORE_SWITCH: "agent:beforeSwitch",
+      /** After the agent has been switched — read-only, fire-and-forget. */
+      AGENT_AFTER_SWITCH: "agent:afterSwitch",
+      // --- Turn boundaries ---
+      /** Turn started — read-only, fire-and-forget. */
+      TURN_START: "turn:start",
+      /** Turn ended (always fires, even on error) — read-only, fire-and-forget. */
+      TURN_END: "turn:end",
+      // --- Session lifecycle ---
+      /** Before a new session is created — modifiable, can block. */
+      SESSION_BEFORE_CREATE: "session:beforeCreate",
+      /** After a session is destroyed — read-only, fire-and-forget. */
+      SESSION_AFTER_DESTROY: "session:afterDestroy",
+      // --- Permissions ---
+      /** Before a permission request is shown to the user — modifiable, can block. */
+      PERMISSION_BEFORE_REQUEST: "permission:beforeRequest",
+      /** After a permission request is resolved — read-only, fire-and-forget. */
+      PERMISSION_AFTER_RESOLVE: "permission:afterResolve",
+      // --- Config ---
+      /** Before config options change — modifiable, can block. */
+      CONFIG_BEFORE_CHANGE: "config:beforeChange",
+      // --- Filesystem (agent-level) ---
+      /** Before a file read operation — modifiable. */
+      FS_BEFORE_READ: "fs:beforeRead",
+      /** Before a file write operation — modifiable. */
+      FS_BEFORE_WRITE: "fs:beforeWrite",
+      // --- Terminal ---
+      /** Before a terminal session is created — modifiable, can block. */
+      TERMINAL_BEFORE_CREATE: "terminal:beforeCreate",
+      /** After a terminal session exits — read-only, fire-and-forget. */
+      TERMINAL_AFTER_EXIT: "terminal:afterExit"
+    };
+    BusEvent = {
+      // --- Session lifecycle ---
+      SESSION_CREATED: "session:created",
+      SESSION_UPDATED: "session:updated",
+      SESSION_DELETED: "session:deleted",
+      SESSION_ENDED: "session:ended",
+      SESSION_NAMED: "session:named",
+      SESSION_THREAD_READY: "session:threadReady",
+      SESSION_CONFIG_CHANGED: "session:configChanged",
+      SESSION_AGENT_SWITCH: "session:agentSwitch",
+      // --- Agent ---
+      AGENT_EVENT: "agent:event",
+      AGENT_PROMPT: "agent:prompt",
+      // --- Permissions ---
+      PERMISSION_REQUEST: "permission:request",
+      PERMISSION_RESOLVED: "permission:resolved",
+      // --- Message visibility ---
+      MESSAGE_QUEUED: "message:queued",
+      MESSAGE_PROCESSING: "message:processing",
+      // --- System lifecycle ---
+      KERNEL_BOOTED: "kernel:booted",
+      SYSTEM_READY: "system:ready",
+      SYSTEM_SHUTDOWN: "system:shutdown",
+      SYSTEM_COMMANDS_READY: "system:commands-ready",
+      // --- Plugin lifecycle ---
+      PLUGIN_LOADED: "plugin:loaded",
+      PLUGIN_FAILED: "plugin:failed",
+      PLUGIN_DISABLED: "plugin:disabled",
+      PLUGIN_UNLOADED: "plugin:unloaded",
+      // --- Usage ---
+      USAGE_RECORDED: "usage:recorded"
+    };
+    SessionEv = {
+      AGENT_EVENT: "agent_event",
+      PERMISSION_REQUEST: "permission_request",
+      SESSION_END: "session_end",
+      STATUS_CHANGE: "status_change",
+      NAMED: "named",
+      ERROR: "error",
+      PROMPT_COUNT_CHANGED: "prompt_count_changed",
+      TURN_STARTED: "turn_started"
+    };
+  }
+});
+
 // src/plugins/security/index.ts
 var security_exports = {};
 __export(security_exports, {
@@ -1855,7 +1953,7 @@ function createSecurityPlugin() {
         };
       };
       const guard = new SecurityGuard(getSecurityConfig, core.sessionManager);
-      ctx.registerMiddleware("message:incoming", {
+      ctx.registerMiddleware(Hook.MESSAGE_INCOMING, {
         handler: async (payload, next) => {
           const access2 = await guard.checkAccess(payload);
           if (!access2.allowed) {
@@ -1875,6 +1973,7 @@ var init_security = __esm({
   "src/plugins/security/index.ts"() {
     "use strict";
     init_security_guard();
+    init_events();
     security_default = createSecurityPlugin();
   }
 });
@@ -3427,7 +3526,7 @@ var init_history_recorder = __esm({
       }
       states = /* @__PURE__ */ new Map();
       debounceTimers = /* @__PURE__ */ new Map();
-      onBeforePrompt(sessionId, text6, attachments) {
+      onBeforePrompt(sessionId, text6, attachments, sourceAdapterId) {
         let state = this.states.get(sessionId);
         if (!state) {
           state = {
@@ -3445,6 +3544,9 @@ var init_history_recorder = __esm({
         if (attachments && attachments.length > 0) {
           userTurn.attachments = attachments.map(toHistoryAttachment);
         }
+        if (sourceAdapterId) {
+          userTurn.sourceAdapterId = sourceAdapterId;
+        }
         state.history.turns.push(userTurn);
         const assistantTurn = {
           index: state.history.turns.length,
@@ -3729,6 +3831,7 @@ var init_context = __esm({
     init_history_provider();
     init_history_recorder();
     init_history_store();
+    init_events();
     contextPlugin = {
       name: "@openacp/context",
       version: "1.0.0",
@@ -3772,35 +3875,35 @@ var init_context = __esm({
         manager.setHistoryStore(store);
         manager.registerFlusher((sessionId) => recorder.flush(sessionId));
         ctx.registerService("context", manager);
-        ctx.registerMiddleware("agent:beforePrompt", {
+        ctx.registerMiddleware(Hook.AGENT_BEFORE_PROMPT, {
           priority: 200,
           handler: async (payload, next) => {
-            recorder.onBeforePrompt(payload.sessionId, payload.text, payload.attachments);
+            recorder.onBeforePrompt(payload.sessionId, payload.text, payload.attachments, payload.sourceAdapterId);
             return next();
           }
         });
-        ctx.registerMiddleware("agent:afterEvent", {
+        ctx.registerMiddleware(Hook.AGENT_AFTER_EVENT, {
           priority: 200,
           handler: async (payload, next) => {
             recorder.onAfterEvent(payload.sessionId, payload.event);
             return next();
           }
         });
-        ctx.registerMiddleware("turn:end", {
+        ctx.registerMiddleware(Hook.TURN_END, {
           priority: 200,
           handler: async (payload, next) => {
             await recorder.onTurnEnd(payload.sessionId, payload.stopReason);
             return next();
           }
         });
-        ctx.registerMiddleware("permission:afterResolve", {
+        ctx.registerMiddleware(Hook.PERMISSION_AFTER_RESOLVE, {
           priority: 200,
           handler: async (payload, next) => {
             recorder.onPermissionResolved(payload.sessionId, payload.requestId, payload.decision);
             return next();
           }
         });
-        ctx.registerMiddleware("session:afterDestroy", {
+        ctx.registerMiddleware(Hook.SESSION_AFTER_DESTROY, {
           priority: 200,
           handler: async (payload, next) => {
             await recorder.onSessionDestroy(payload.sessionId);
@@ -7886,6 +7989,7 @@ var MAX_SSE_CONNECTIONS, SSEManager;
 var init_sse_manager = __esm({
   "src/plugins/api-server/sse-manager.ts"() {
     "use strict";
+    init_events();
     MAX_SSE_CONNECTIONS = 50;
     SSEManager = class {
       constructor(eventBus, getSessionStats, startedAt) {
@@ -7900,14 +8004,14 @@ var init_sse_manager = __esm({
       setup() {
         if (!this.eventBus) return;
         const events = [
-          "session:created",
-          "session:updated",
-          "session:deleted",
-          "agent:event",
-          "permission:request",
-          "permission:resolved",
-          "message:queued",
-          "message:processing"
+          BusEvent.SESSION_CREATED,
+          BusEvent.SESSION_UPDATED,
+          BusEvent.SESSION_DELETED,
+          BusEvent.AGENT_EVENT,
+          BusEvent.PERMISSION_REQUEST,
+          BusEvent.PERMISSION_RESOLVED,
+          BusEvent.MESSAGE_QUEUED,
+          BusEvent.MESSAGE_PROCESSING
         ];
         for (const eventName of events) {
           const handler = (data) => {
@@ -7970,12 +8074,12 @@ data: ${JSON.stringify(data)}
 
 `;
         const sessionEvents = [
-          "agent:event",
-          "permission:request",
-          "permission:resolved",
-          "session:updated",
-          "message:queued",
-          "message:processing"
+          BusEvent.AGENT_EVENT,
+          BusEvent.PERMISSION_REQUEST,
+          BusEvent.PERMISSION_RESOLVED,
+          BusEvent.SESSION_UPDATED,
+          BusEvent.MESSAGE_QUEUED,
+          BusEvent.MESSAGE_PROCESSING
         ];
         for (const res of this.sseConnections) {
           const filter = res.sessionFilter;
@@ -8167,10 +8271,7 @@ var init_sessions = __esm({
       limit: z.coerce.number().int().min(1).max(100).default(50),
       offset: z.coerce.number().int().min(0).default(0)
     });
-    WorkspaceNameSchema = z.string().optional().refine(
-      (v) => v === void 0 || !v.startsWith("/") && !v.startsWith("~"),
-      { message: "workspace must be a relative name, not an absolute path" }
-    );
+    WorkspaceNameSchema = z.string().optional();
     CreateSessionBodySchema = z.object({
       agent: z.string().max(200).optional(),
       workspace: WorkspaceNameSchema,
@@ -8185,7 +8286,7 @@ var init_sessions = __esm({
       channel: z.string().max(200).optional()
     });
     AttachmentInputSchema = z.object({
-      fileName: z.string().regex(/^[a-zA-Z0-9._-]+$/, "fileName must contain only alphanumeric, dot, dash, or underscore characters").max(255),
+      fileName: z.string().min(1).max(255),
       mimeType: z.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9!#$&\-^_]*\/[a-zA-Z0-9][a-zA-Z0-9!#$&\-^_.+]*$/, "mimeType must be a valid MIME type").max(200),
       data: z.string().max(15e6)
       // ~10 MB base64 ≈ 13.3 MB string
@@ -8317,15 +8418,22 @@ async function sessionRoutes(app, deps) {
     const channelId = adapterId ?? "api";
     const resolvedAgent = body.agent || deps.core.configManager.get().defaultAgent;
     const agentDef = deps.core.agentCatalog.resolve(resolvedAgent);
-    const resolvedWorkspace = deps.core.configManager.resolveWorkspace(
-      body.workspace || agentDef?.workingDirectory
-    );
+    let resolvedWorkspace;
+    try {
+      resolvedWorkspace = deps.core.configManager.resolveWorkspace(
+        body.workspace || agentDef?.workingDirectory
+      );
+    } catch (err) {
+      throw new BadRequestError(
+        "INVALID_WORKSPACE",
+        err instanceof Error ? err.message : "Invalid workspace path"
+      );
+    }
     const session = await deps.core.createSession({
       channelId,
       agentName: resolvedAgent,
       workingDirectory: resolvedWorkspace,
-      createThread: !!adapter,
-      initialName: `\u{1F504} ${resolvedAgent} \u2014 New Session`
+      createThread: !!adapter
     });
     return {
       sessionId: session.id,
@@ -8833,6 +8941,7 @@ var init_config2 = __esm({
       defaultAgent: z4.string(),
       workspace: z4.object({
         baseDir: z4.string().default("~/openacp-workspace"),
+        allowExternalWorkspaces: z4.boolean().default(true),
         security: z4.object({
           allowedPaths: z4.array(z4.string()).default([]),
           envWhitelist: z4.array(z4.string()).default([])
@@ -8953,13 +9062,22 @@ var init_config2 = __esm({
         if (input2.startsWith("/") || input2.startsWith("~")) {
           const resolved2 = expandHome3(input2);
           const base = expandHome3(this.config.workspace.baseDir);
-          if (resolved2 === base || resolved2.startsWith(base + path26.sep)) {
-            fs22.mkdirSync(resolved2, { recursive: true });
+          const isInternal = resolved2 === base || resolved2.startsWith(base + path26.sep);
+          if (!isInternal) {
+            if (!this.config.workspace.allowExternalWorkspaces) {
+              throw new Error(
+                `Workspace path "${input2}" is outside base directory "${this.config.workspace.baseDir}". Set allowExternalWorkspaces: true to allow this.`
+              );
+            }
+            if (!fs22.existsSync(resolved2)) {
+              throw new Error(
+                `Workspace path "${input2}" does not exist.`
+              );
+            }
             return resolved2;
           }
-          throw new Error(
-            `Workspace path "${input2}" is outside base directory "${this.config.workspace.baseDir}".`
-          );
+          fs22.mkdirSync(resolved2, { recursive: true });
+          return resolved2;
         }
         const name = input2.replace(/[^a-zA-Z0-9_-]/g, "");
         if (name !== input2) {
@@ -10183,7 +10301,7 @@ function createApiServerPlugin() {
       );
       ctx.registerService("api-server", apiService);
       cleanupInterval = setInterval(() => tokenStore.cleanup(), 60 * 60 * 1e3);
-      ctx.on("system:ready", async () => {
+      ctx.on(BusEvent.SYSTEM_READY, async () => {
         log15.info(
           { configPort: apiConfig.port, configHost: apiConfig.host },
           "API server starting..."
@@ -10235,6 +10353,7 @@ var log15, cachedVersion, api_server_default;
 var init_api_server = __esm({
   "src/plugins/api-server/index.ts"() {
     "use strict";
+    init_events();
     init_log();
     log15 = createChildLogger({ module: "api-server" });
     api_server_default = createApiServerPlugin();
@@ -10679,6 +10798,7 @@ var init_sse_adapter = __esm({
     init_event_buffer();
     init_adapter();
     init_routes();
+    init_events();
     _adapter = null;
     _connectionManager = null;
     plugin = {
@@ -10705,11 +10825,11 @@ var init_sse_adapter = __esm({
         _connectionManager = connectionManager;
         ctx.registerService("adapter:sse", adapter);
         const commandRegistry = ctx.getService("command-registry");
-        ctx.on("session:deleted", (data) => {
+        ctx.on(BusEvent.SESSION_DELETED, (data) => {
           const { sessionId } = data;
           eventBuffer.cleanup(sessionId);
         });
-        ctx.on("session:ended", (data) => {
+        ctx.on(BusEvent.SESSION_ENDED, (data) => {
           const { sessionId } = data;
           eventBuffer.cleanup(sessionId);
         });
@@ -12968,7 +13088,6 @@ var menu_exports = {};
 __export(menu_exports, {
   buildMenuKeyboard: () => buildMenuKeyboard,
   buildSkillMessages: () => buildSkillMessages,
-  handleClear: () => handleClear,
   handleHelp: () => handleHelp,
   handleMenu: () => handleMenu
 });
@@ -13029,31 +13148,11 @@ Each session gets its own topic \u2014 chat there to work with the agent.
 /bypass_permissions \u2014 Toggle bypass permissions
 /handoff \u2014 Continue session in terminal
 /archive \u2014 Archive session topic
-/clear \u2014 Clear assistant history
 
 \u{1F4AC} Need help? Just ask me in this topic!`,
     { parse_mode: "HTML" }
   );
 }
-async function handleClear(ctx, assistant) {
-  if (!assistant) {
-    await ctx.reply("\u26A0\uFE0F Assistant is not available.", { parse_mode: "HTML" });
-    return;
-  }
-  const threadId = ctx.message?.message_thread_id;
-  if (threadId !== assistant.topicId) {
-    await ctx.reply("\u2139\uFE0F /clear only works in the Assistant topic.", { parse_mode: "HTML" });
-    return;
-  }
-  await ctx.reply("\u{1F504} Clearing assistant history...", { parse_mode: "HTML" });
-  try {
-    await assistant.respawn();
-    await ctx.reply("\u2705 Assistant history cleared.", { parse_mode: "HTML" });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    await ctx.reply(`\u274C Failed to clear: <code>${message}</code>`, { parse_mode: "HTML" });
-  }
-}
 function buildSkillMessages(commands) {
   const sorted = [...commands].sort((a, b) => a.name.localeCompare(b.name));
   const header2 = "\u{1F6E0} <b>Available Skills</b>\n";
@@ -14578,7 +14677,10 @@ function setupAllCallbacks(bot, core, chatId, systemTopicIds, getAssistantSessio
     const menuRegistry = core.lifecycleManager?.serviceRegistry?.get("menu-registry");
     if (!menuRegistry) return;
     const item = menuRegistry.getItem(itemId);
-    if (!item) return;
+    if (!item) {
+      log25.warn({ itemId }, "Menu item not found in registry");
+      return;
+    }
     const topicId = ctx.callbackQuery.message?.message_thread_id;
     const registry = core.lifecycleManager?.serviceRegistry?.get("command-registry");
     switch (item.action.type) {
@@ -14662,7 +14764,7 @@ ${lines}`, { parse_mode: "HTML" }).catch(() => {
     }
   });
 }
-var STATIC_COMMANDS;
+var log25, STATIC_COMMANDS;
 var init_commands3 = __esm({
   "src/plugins/telegram/commands/index.ts"() {
     "use strict";
@@ -14675,6 +14777,7 @@ var init_commands3 = __esm({
     init_tunnel4();
     init_switch();
     init_telegram_overrides();
+    init_log();
     init_menu();
     init_menu();
     init_telegram_overrides();
@@ -14686,6 +14789,7 @@ var init_commands3 = __esm({
     init_settings();
     init_doctor2();
     init_resume();
+    log25 = createChildLogger({ module: "telegram-menu-callbacks" });
     STATIC_COMMANDS = [
       { command: "new", description: "Create new session" },
       { command: "newchat", description: "New chat, same agent & workspace" },
@@ -14698,7 +14802,6 @@ var init_commands3 = __esm({
       { command: "menu", description: "Show menu" },
       { command: "integrate", description: "Manage agent integrations" },
       { command: "handoff", description: "Continue this session in your terminal" },
-      { command: "clear", description: "Clear assistant history" },
       { command: "restart", description: "Restart OpenACP" },
       { command: "update", description: "Update to latest version and restart" },
       { command: "doctor", description: "Run system diagnostics" },
@@ -14721,14 +14824,14 @@ var init_commands3 = __esm({
 // src/plugins/telegram/permissions.ts
 import { InlineKeyboard as InlineKeyboard11 } from "grammy";
 import { nanoid as nanoid2 } from "nanoid";
-var log25, PermissionHandler;
+var log26, PermissionHandler;
 var init_permissions = __esm({
   "src/plugins/telegram/permissions.ts"() {
     "use strict";
     init_formatting();
     init_topics2();
     init_log();
-    log25 = createChildLogger({ module: "telegram-permissions" });
+    log26 = createChildLogger({ module: "telegram-permissions" });
     PermissionHandler = class {
       constructor(bot, chatId, getSession, sendNotification) {
         this.bot = bot;
@@ -14772,11 +14875,11 @@ ${escapeHtml4(request.description)}`,
         });
       }
       setupCallbackHandler() {
-        this.bot.on("callback_query:data", async (ctx) => {
+        this.bot.on("callback_query:data", async (ctx, next) => {
           const data = ctx.callbackQuery.data;
-          if (!data.startsWith("p:")) return;
+          if (!data.startsWith("p:")) return next();
           const parts = data.split(":");
-          if (parts.length < 3) return;
+          if (parts.length < 3) return next();
           const [, callbackKey, optionId] = parts;
           const pending = this.pending.get(callbackKey);
           if (!pending) {
@@ -14788,7 +14891,7 @@ ${escapeHtml4(request.description)}`,
           }
           const session = this.getSession(pending.sessionId);
           const isAllow = pending.options.find((o) => o.id === optionId)?.isAllow ?? false;
-          log25.info({ requestId: pending.requestId, optionId, isAllow }, "Permission responded");
+          log26.info({ requestId: pending.requestId, optionId, isAllow }, "Permission responded");
           if (session?.permissionGate.requestId === pending.requestId) {
             session.permissionGate.resolve(optionId);
           }
@@ -15242,7 +15345,7 @@ var init_display_spec_builder = __esm({
 });
 
 // src/plugins/telegram/activity.ts
-var log26, THINKING_REFRESH_MS, THINKING_MAX_MS, ThinkingIndicator, ToolCard, ActivityTracker;
+var log27, THINKING_REFRESH_MS, THINKING_MAX_MS, ThinkingIndicator, ToolCard, ActivityTracker;
 var init_activity = __esm({
   "src/plugins/telegram/activity.ts"() {
     "use strict";
@@ -15252,7 +15355,7 @@ var init_activity = __esm({
     init_stream_accumulator();
     init_stream_accumulator();
     init_display_spec_builder();
-    log26 = createChildLogger({ module: "telegram:activity" });
+    log27 = createChildLogger({ module: "telegram:activity" });
     THINKING_REFRESH_MS = 15e3;
     THINKING_MAX_MS = 3 * 60 * 1e3;
     ThinkingIndicator = class {
@@ -15293,7 +15396,7 @@ var init_activity = __esm({
             }
           }
         } catch (err) {
-          log26.warn({ err }, "ThinkingIndicator.show() failed");
+          log27.warn({ err }, "ThinkingIndicator.show() failed");
         } finally {
           this.sending = false;
         }
@@ -15461,7 +15564,7 @@ var init_activity = __esm({
             this.tracer?.log("telegram", { action: "telegram:delete:overflow", sessionId: this.sessionId, msgId: staleId });
           }
         } catch (err) {
-          log26.warn({ err }, "[ToolCard] send/edit failed");
+          log27.warn({ err }, "[ToolCard] send/edit failed");
         }
       }
     };
@@ -15565,7 +15668,7 @@ var init_activity = __esm({
         const entry = this.toolStateMap.merge(id, status, rawInput, content, viewerLinks, diffStats);
         if (!existed || !entry) return;
         if (viewerLinks || entry.viewerLinks) {
-          log26.debug({ toolId: id, status, hasIncomingLinks: !!viewerLinks, hasEntryLinks: !!entry.viewerLinks, entryLinks: entry.viewerLinks }, "toolUpdate: viewer links trace");
+          log27.debug({ toolId: id, status, hasIncomingLinks: !!viewerLinks, hasEntryLinks: !!entry.viewerLinks, entryLinks: entry.viewerLinks }, "toolUpdate: viewer links trace");
         }
         const spec = this.specBuilder.buildToolSpec(entry, this._outputMode, this.sessionContext);
         this.toolCard.updateFromSpec(spec);
@@ -15992,13 +16095,13 @@ var init_draft_manager = __esm({
 });
 
 // src/plugins/telegram/skill-command-manager.ts
-var log27, SkillCommandManager;
+var log28, SkillCommandManager;
 var init_skill_command_manager = __esm({
   "src/plugins/telegram/skill-command-manager.ts"() {
     "use strict";
     init_commands3();
     init_log();
-    log27 = createChildLogger({ module: "skill-commands" });
+    log28 = createChildLogger({ module: "skill-commands" });
     SkillCommandManager = class {
       // sessionId → pinned msgId
       constructor(bot, chatId, sendQueue, sessionManager) {
@@ -16064,7 +16167,7 @@ var init_skill_command_manager = __esm({
             disable_notification: true
           });
         } catch (err) {
-          log27.error({ err, sessionId }, "Failed to send skill commands");
+          log28.error({ err, sessionId }, "Failed to send skill commands");
         }
       }
       async cleanup(sessionId) {
@@ -16458,10 +16561,11 @@ function patchedFetch(input2, init) {
   }
   return fetch(input2, init);
 }
-var log28, TelegramAdapter;
+var log29, TelegramAdapter;
 var init_adapter2 = __esm({
   "src/plugins/telegram/adapter.ts"() {
     "use strict";
+    init_events();
     init_log();
     init_topics2();
     init_commands3();
@@ -16477,7 +16581,7 @@ var init_adapter2 = __esm({
     init_messaging_adapter();
     init_renderer2();
     init_output_mode_resolver();
-    log28 = createChildLogger({ module: "telegram" });
+    log29 = createChildLogger({ module: "telegram" });
     TelegramAdapter = class extends MessagingAdapter {
       name = "telegram";
       renderer = new TelegramRenderer();
@@ -16604,7 +16708,7 @@ var init_adapter2 = __esm({
         );
         this.bot.catch((err) => {
           const rootCause = err.error instanceof Error ? err.error : err;
-          log28.error({ err: rootCause }, "Telegram bot error");
+          log29.error({ err: rootCause }, "Telegram bot error");
         });
         this.bot.api.config.use(async (prev, method, payload, signal) => {
           const maxRetries = 3;
@@ -16622,7 +16726,7 @@ var init_adapter2 = __esm({
             if (rateLimitedMethods.includes(method)) {
               this.sendQueue.onRateLimited();
             }
-            log28.warn(
+            log29.warn(
               { method, retryAfter, attempt: attempt + 1 },
               "Rate limited by Telegram, retrying"
             );
@@ -16810,9 +16914,9 @@ ${p2}` : p2;
         this.setupRoutes();
         this.bot.start({
           allowed_updates: ["message", "callback_query"],
-          onStart: () => log28.info({ chatId: this.telegramConfig.chatId }, "Telegram bot started")
+          onStart: () => log29.info({ chatId: this.telegramConfig.chatId }, "Telegram bot started")
         });
-        log28.info(
+        log29.info(
           {
             chatId: this.telegramConfig.chatId,
             notificationTopicId: this.telegramConfig.notificationTopicId,
@@ -16826,12 +16930,12 @@ ${p2}` : p2;
           this.telegramConfig.chatId
         );
         if (prereqResult.ok) {
-          log28.info("Telegram adapter: prerequisites OK, initializing topic-dependent features");
+          log29.info("Telegram adapter: prerequisites OK, initializing topic-dependent features");
           await this.initTopicDependentFeatures();
         } else {
-          log28.warn({ issues: prereqResult.issues }, "Telegram adapter: prerequisites NOT met, starting watcher");
+          log29.warn({ issues: prereqResult.issues }, "Telegram adapter: prerequisites NOT met, starting watcher");
           for (const issue of prereqResult.issues) {
-            log28.warn({ issue }, "Telegram prerequisite not met");
+            log29.warn({ issue }, "Telegram prerequisite not met");
           }
           this.startPrerequisiteWatcher(prereqResult.issues);
         }
@@ -16847,7 +16951,7 @@ ${p2}` : p2;
           } catch (err) {
             if (attempt === maxRetries) throw err;
             const delay = baseDelayMs * Math.pow(2, attempt - 1);
-            log28.warn(
+            log29.warn(
               { err, attempt, maxRetries, delayMs: delay, operation: label },
               `${label} failed, retrying in ${delay}ms`
             );
@@ -16867,12 +16971,12 @@ ${p2}` : p2;
           }),
           "setMyCommands"
         ).catch((err) => {
-          log28.warn({ err }, "Failed to register Telegram commands after retries (non-critical)");
+          log29.warn({ err }, "Failed to register Telegram commands after retries (non-critical)");
         });
       }
       async initTopicDependentFeatures() {
         if (this._topicsInitialized) return;
-        log28.info(
+        log29.info(
           { notificationTopicId: this.telegramConfig.notificationTopicId, assistantTopicId: this.telegramConfig.assistantTopicId },
           "initTopicDependentFeatures: starting (existing IDs in config)"
         );
@@ -16897,7 +17001,7 @@ ${p2}` : p2;
         this.assistantTopicId = topics.assistantTopicId;
         this._systemTopicIds.notificationTopicId = topics.notificationTopicId;
         this._systemTopicIds.assistantTopicId = topics.assistantTopicId;
-        log28.info(
+        log29.info(
           { notificationTopicId: this.notificationTopicId, assistantTopicId: this.assistantTopicId },
           "initTopicDependentFeatures: topics ready"
         );
@@ -16928,16 +17032,16 @@ ${p2}` : p2;
           ).then((msg) => {
             if (msg) this.storeControlMsgId(sessionId, msg.message_id);
           }).catch((err) => {
-            log28.warn({ err, sessionId }, "Failed to send initial messages for new session");
+            log29.warn({ err, sessionId }, "Failed to send initial messages for new session");
           });
         };
-        this.core.eventBus.on("session:threadReady", this._threadReadyHandler);
+        this.core.eventBus.on(BusEvent.SESSION_THREAD_READY, this._threadReadyHandler);
         this._configChangedHandler = ({ sessionId }) => {
           this.updateControlMessage(sessionId).catch(() => {
           });
         };
         this.core.eventBus.on("session:configChanged", this._configChangedHandler);
-        log28.info({ assistantTopicId: this.assistantTopicId }, "initTopicDependentFeatures: sending welcome message");
+        log29.info({ assistantTopicId: this.assistantTopicId }, "initTopicDependentFeatures: sending welcome message");
         try {
           const config = this.core.configManager.get();
           const agents = this.core.agentManager.getAvailableAgents();
@@ -16959,17 +17063,17 @@ ${p2}` : p2;
               this.core.lifecycleManager?.serviceRegistry?.get("menu-registry")
             )
           });
-          log28.info("initTopicDependentFeatures: welcome message sent");
+          log29.info("initTopicDependentFeatures: welcome message sent");
         } catch (err) {
-          log28.warn({ err }, "Failed to send welcome message");
+          log29.warn({ err }, "Failed to send welcome message");
         }
         try {
-          await this.core.assistantManager.spawn("telegram", String(this.assistantTopicId));
+          await this.core.assistantManager.getOrSpawn("telegram", String(this.assistantTopicId));
         } catch (err) {
-          log28.error({ err }, "Failed to spawn assistant");
+          log29.error({ err }, "Failed to spawn assistant");
         }
         this._topicsInitialized = true;
-        log28.info("Telegram adapter fully initialized");
+        log29.info("Telegram adapter fully initialized");
       }
       startPrerequisiteWatcher(issues) {
         const setupMessage = `\u26A0\uFE0F <b>OpenACP needs setup before it can start.</b>
@@ -16980,7 +17084,7 @@ OpenACP will automatically retry until this is resolved.`;
         this.bot.api.sendMessage(this.telegramConfig.chatId, setupMessage, {
           parse_mode: "HTML"
         }).catch((err) => {
-          log28.warn({ err }, "Failed to send setup guidance to General topic");
+          log29.warn({ err }, "Failed to send setup guidance to General topic");
         });
         const schedule = [5e3, 1e4, 3e4];
         let attempt = 1;
@@ -16993,7 +17097,7 @@ OpenACP will automatically retry until this is resolved.`;
           );
           if (result.ok) {
             this._prerequisiteWatcher = null;
-            log28.info("Prerequisites met \u2014 completing Telegram adapter initialization");
+            log29.info("Prerequisites met \u2014 completing Telegram adapter initialization");
             try {
               await this.initTopicDependentFeatures();
               await this.bot.api.sendMessage(
@@ -17002,11 +17106,11 @@ OpenACP will automatically retry until this is resolved.`;
                 { parse_mode: "HTML" }
               );
             } catch (err) {
-              log28.error({ err }, "Failed to complete initialization after prerequisites met");
+              log29.error({ err }, "Failed to complete initialization after prerequisites met");
             }
             return;
           }
-          log28.debug({ issues: result.issues }, "Prerequisites not yet met, retrying");
+          log29.debug({ issues: result.issues }, "Prerequisites not yet met, retrying");
           const delay = schedule[Math.min(attempt, schedule.length - 1)];
           attempt++;
           this._prerequisiteWatcher = setTimeout(retry, delay);
@@ -17023,7 +17127,7 @@ OpenACP will automatically retry until this is resolved.`;
         }
         this.sessionTrackers.clear();
         if (this._threadReadyHandler) {
-          this.core.eventBus.off("session:threadReady", this._threadReadyHandler);
+          this.core.eventBus.off(BusEvent.SESSION_THREAD_READY, this._threadReadyHandler);
           this._threadReadyHandler = void 0;
         }
         if (this._configChangedHandler) {
@@ -17032,7 +17136,7 @@ OpenACP will automatically retry until this is resolved.`;
         }
         this.sendQueue.clear();
         await this.bot.stop();
-        log28.info("Telegram bot stopped");
+        log29.info("Telegram bot stopped");
       }
       // --- CommandRegistry response rendering ---
       async renderCommandResponse(response, chatId, topicId) {
@@ -17117,6 +17221,13 @@ ${lines.join("\n")}`;
       }
       setupRoutes() {
         this.bot.on("message:text", async (ctx) => {
+          if (!this._topicsInitialized) {
+            await ctx.reply(
+              "\u23F3 OpenACP is still setting up. Check the General topic for instructions."
+            ).catch(() => {
+            });
+            return;
+          }
           const threadId = ctx.message.message_thread_id;
           const text6 = ctx.message.text;
           if (!threadId) {
@@ -17149,7 +17260,7 @@ ${lines.join("\n")}`;
             threadId: String(threadId),
             userId: String(ctx.from.id),
             text: forwardText
-          }).catch((err) => log28.error({ err }, "handleMessage error"));
+          }).catch((err) => log29.error({ err }, "handleMessage error"));
         });
         this.bot.on("message:photo", async (ctx) => {
           const threadId = ctx.message.message_thread_id;
@@ -17238,7 +17349,7 @@ ${lines.join("\n")}`;
         if (session.archiving) return;
         const threadId = Number(session.threadId);
         if (!threadId || isNaN(threadId)) {
-          log28.warn(
+          log29.warn(
             { sessionId, threadId: session.threadId },
             "Session has no valid threadId, skipping message"
           );
@@ -17254,7 +17365,7 @@ ${lines.join("\n")}`;
             this._sessionThreadIds.delete(sessionId);
           }
         }).catch((err) => {
-          log28.warn({ err, sessionId }, "Dispatch queue error");
+          log29.warn({ err, sessionId }, "Dispatch queue error");
         });
         this._dispatchQueues.set(sessionId, next);
         await next;
@@ -17376,7 +17487,7 @@ ${lines.join("\n")}`;
           );
           usageMsgId = result?.message_id;
         } catch (err) {
-          log28.warn({ err, sessionId }, "Failed to send usage message");
+          log29.warn({ err, sessionId }, "Failed to send usage message");
         }
         if (this.notificationTopicId && sessionId !== this.core.assistantManager?.get("telegram")?.id) {
           const sess = this.core.sessionManager.getSession(sessionId);
@@ -17404,7 +17515,7 @@ Task completed.
         if (!content.attachment) return;
         const { attachment } = content;
         if (attachment.size > 50 * 1024 * 1024) {
-          log28.warn(
+          log29.warn(
             {
               sessionId,
               fileName: attachment.fileName,
@@ -17448,7 +17559,7 @@ Task completed.
             );
           }
         } catch (err) {
-          log28.error(
+          log29.error(
             { err, sessionId, fileName: attachment.fileName },
             "Failed to send attachment"
           );
@@ -17547,7 +17658,7 @@ Task completed.
       }
       async sendPermissionRequest(sessionId, request) {
         this.getTracer(sessionId)?.log("telegram", { action: "permission:send", sessionId, requestId: request.id, description: request.description });
-        log28.info({ sessionId, requestId: request.id }, "Permission request sent");
+        log29.info({ sessionId, requestId: request.id }, "Permission request sent");
         const session = this.core.sessionManager.getSession(sessionId);
         if (!session) return;
         await this.sendQueue.enqueue(
@@ -17557,7 +17668,7 @@ Task completed.
       async sendNotification(notification) {
         this.getTracer(notification.sessionId)?.log("telegram", { action: "notification:send", sessionId: notification.sessionId, type: notification.type });
         if (notification.sessionId === this.core.assistantManager?.get("telegram")?.id) return;
-        log28.info(
+        log29.info(
           { sessionId: notification.sessionId, type: notification.type },
           "Notification sent"
         );
@@ -17596,7 +17707,7 @@ Task completed.
       }
       async createSessionThread(sessionId, name) {
         this.getTracer(sessionId)?.log("telegram", { action: "thread:create", sessionId, name });
-        log28.info({ sessionId, name }, "Session topic created");
+        log29.info({ sessionId, name }, "Session topic created");
         return String(
           await createSessionTopic(this.bot, this.telegramConfig.chatId, name)
         );
@@ -17607,7 +17718,7 @@ Task completed.
         if (!session) return;
         const threadId = Number(session.threadId);
         if (!threadId) {
-          log28.debug({ sessionId, newName }, "Cannot rename thread \u2014 threadId not set yet");
+          log29.debug({ sessionId, newName }, "Cannot rename thread \u2014 threadId not set yet");
           return;
         }
         await renameSessionTopic(
@@ -17626,7 +17737,7 @@ Task completed.
         try {
           await this.bot.api.deleteForumTopic(this.telegramConfig.chatId, topicId);
         } catch (err) {
-          log28.warn(
+          log29.warn(
             { err, sessionId, topicId },
             "Failed to delete forum topic (may already be deleted)"
           );
@@ -17670,7 +17781,7 @@ Task completed.
           const buffer = Buffer.from(await response.arrayBuffer());
           return { buffer, filePath: file.file_path };
         } catch (err) {
-          log28.error({ err }, "Failed to download file from Telegram");
+          log29.error({ err }, "Failed to download file from Telegram");
           return null;
         }
       }
@@ -17691,7 +17802,7 @@ Task completed.
           try {
             buffer = await this.fileService.convertOggToWav(buffer);
           } catch (err) {
-            log28.warn({ err }, "OGG\u2192WAV conversion failed, saving original OGG");
+            log29.warn({ err }, "OGG\u2192WAV conversion failed, saving original OGG");
             fileName = "voice.ogg";
             mimeType = "audio/ogg";
             originalFilePath = void 0;
@@ -17723,7 +17834,7 @@ Task completed.
           userId: String(userId),
           text: text6,
           attachments: [att]
-        }).catch((err) => log28.error({ err }, "handleMessage error"));
+        }).catch((err) => log29.error({ err }, "handleMessage error"));
       }
       async cleanupSkillCommands(sessionId) {
         this._pendingSkillCommands.delete(sessionId);
@@ -18820,6 +18931,47 @@ var init_typed_emitter = __esm({
   }
 });
 
+// src/core/agents/attachment-blocks.ts
+function buildAttachmentNote(att, capabilities) {
+  const tooLarge = att.size > MAX_ATTACHMENT_SIZE;
+  if (tooLarge) {
+    const sizeMB = Math.round(att.size / 1024 / 1024);
+    return `[Attachment skipped: "${att.fileName}" is too large (${sizeMB}MB > 10MB limit)]`;
+  }
+  if (att.type === "image") {
+    if (!capabilities.image) {
+      return null;
+    }
+    if (!SUPPORTED_IMAGE_MIMES.has(att.mimeType)) {
+      return `[Attachment skipped: image format not supported (${att.mimeType})]`;
+    }
+    return null;
+  }
+  if (att.type === "audio") {
+    if (!capabilities.audio) {
+      return null;
+    }
+    return null;
+  }
+  return null;
+}
+var SUPPORTED_IMAGE_MIMES, MAX_ATTACHMENT_SIZE;
+var init_attachment_blocks = __esm({
+  "src/core/agents/attachment-blocks.ts"() {
+    "use strict";
+    SUPPORTED_IMAGE_MIMES = /* @__PURE__ */ new Set([
+      "image/jpeg",
+      "image/png",
+      "image/gif",
+      "image/webp",
+      "image/avif",
+      "image/heic",
+      "image/heif"
+    ]);
+    MAX_ATTACHMENT_SIZE = 10 * 1024 * 1024;
+  }
+});
+
 // src/core/sessions/terminal-manager.ts
 import { spawn as spawn7 } from "child_process";
 import { randomUUID } from "crypto";
@@ -18828,6 +18980,7 @@ var init_terminal_manager = __esm({
   "src/core/sessions/terminal-manager.ts"() {
     "use strict";
     init_env_filter();
+    init_events();
     TerminalManager = class {
       terminals = /* @__PURE__ */ new Map();
       maxOutputBytes;
@@ -18844,7 +18997,7 @@ var init_terminal_manager = __esm({
           for (const ev of termEnvArr) {
             envRecord[ev.name] = ev.value;
           }
-          const result = await middlewareChain.execute("terminal:beforeCreate", {
+          const result = await middlewareChain.execute(Hook.TERMINAL_BEFORE_CREATE, {
             sessionId,
             command: termCommand,
             args: termArgs,
@@ -18898,7 +19051,7 @@ var init_terminal_manager = __esm({
         childProcess.on("exit", (code, signal) => {
           state.exitStatus = { exitCode: code, signal };
           if (middlewareChain) {
-            middlewareChain.execute("terminal:afterExit", {
+            middlewareChain.execute(Hook.TERMINAL_AFTER_EXIT, {
               sessionId,
               terminalId,
               command: state.command,
@@ -19102,7 +19255,7 @@ function resolveAgentCommand(cmd) {
   }
   return { command: cmd, args: [] };
 }
-var log30, AgentInstance;
+var log31, AgentInstance;
 var init_agent_instance = __esm({
   "src/core/agents/agent-instance.ts"() {
     "use strict";
@@ -19112,11 +19265,13 @@ var init_agent_instance = __esm({
     init_stderr_capture();
     init_typed_emitter();
     init_read_text_file();
+    init_attachment_blocks();
     init_terminal_manager();
     init_mcp_manager();
     init_debug_tracer();
     init_log();
-    log30 = createChildLogger({ module: "agent-instance" });
+    init_events();
+    log31 = createChildLogger({ module: "agent-instance" });
     AgentInstance = class _AgentInstance extends TypedEmitter {
       connection;
       child;
@@ -19143,10 +19298,10 @@ var init_agent_instance = __esm({
         super();
         this.agentName = agentName;
       }
-      static async spawnSubprocess(agentDef, workingDirectory) {
+      static async spawnSubprocess(agentDef, workingDirectory, allowedPaths = []) {
         const instance = new _AgentInstance(agentDef.name);
         const resolved = resolveAgentCommand(agentDef.command);
-        log30.debug(
+        log31.debug(
           {
             agentName: agentDef.name,
             command: resolved.command,
@@ -19157,10 +19312,7 @@ var init_agent_instance = __esm({
         const ignorePatterns = PathGuard.loadIgnoreFile(workingDirectory);
         instance.pathGuard = new PathGuard({
           cwd: workingDirectory,
-          // allowedPaths is wired from workspace.security.allowedPaths config;
-          // spawnSubprocess would need to receive a SecurityConfig param to use it.
-          // Tracked as follow-up: pass workspace security config through spawn/resume call chain.
-          allowedPaths: [],
+          allowedPaths,
           ignorePatterns
         });
         instance.child = spawn8(
@@ -19231,14 +19383,14 @@ var init_agent_instance = __esm({
           }
         });
         if (initResponse.protocolVersion !== PROTOCOL_VERSION) {
-          log30.warn(
+          log31.warn(
             { expected: PROTOCOL_VERSION, got: initResponse.protocolVersion },
             "ACP protocol version mismatch \u2014 some features may not work correctly"
           );
         }
         instance.promptCapabilities = initResponse.agentCapabilities?.promptCapabilities;
         instance.agentCapabilities = initResponse.agentCapabilities;
-        log30.info(
+        log31.info(
           { promptCapabilities: instance.promptCapabilities ?? {} },
           "Agent prompt capabilities"
         );
@@ -19247,14 +19399,14 @@ var init_agent_instance = __esm({
       setupCrashDetection() {
         this.child.on("exit", (code, signal) => {
           if (this._destroying) return;
-          log30.info(
+          log31.info(
             { sessionId: this.sessionId, exitCode: code, signal },
             "Agent process exited"
           );
           if (signal === "SIGINT" || signal === "SIGTERM") return;
           if (code !== 0 && code !== null || signal) {
             const stderr = this.stderrCapture.getLastLines();
-            this.emit("agent_event", {
+            this.emit(SessionEv.AGENT_EVENT, {
               type: "error",
               message: signal ? `Agent killed by signal ${signal}
 ${stderr}` : `Agent crashed (exit code ${code})
@@ -19263,30 +19415,31 @@ ${stderr}`
           }
         });
         this.connection.closed.then(() => {
-          log30.debug({ sessionId: this.sessionId }, "ACP connection closed");
+          log31.debug({ sessionId: this.sessionId }, "ACP connection closed");
         });
       }
-      static async spawn(agentDef, workingDirectory, mcpServers) {
-        log30.debug(
+      static async spawn(agentDef, workingDirectory, mcpServers, allowedPaths) {
+        log31.debug(
           { agentName: agentDef.name, command: agentDef.command },
           "Spawning agent"
         );
         const spawnStart = Date.now();
         const instance = await _AgentInstance.spawnSubprocess(
           agentDef,
-          workingDirectory
+          workingDirectory,
+          allowedPaths
         );
         const resolvedMcp = _AgentInstance.mcpManager.resolve(mcpServers);
         const response = await instance.connection.newSession({
           cwd: workingDirectory,
           mcpServers: resolvedMcp
         });
-        log30.info(response, "newSession response");
+        log31.info(response, "newSession response");
         instance.sessionId = response.sessionId;
         instance.initialSessionResponse = response;
         instance.debugTracer = createDebugTracer(response.sessionId, workingDirectory);
         instance.setupCrashDetection();
-        log30.info(
+        log31.info(
           {
             sessionId: response.sessionId,
             durationMs: Date.now() - spawnStart,
@@ -19297,12 +19450,13 @@ ${stderr}`
         );
         return instance;
       }
-      static async resume(agentDef, workingDirectory, agentSessionId, mcpServers) {
-        log30.debug({ agentName: agentDef.name, agentSessionId }, "Resuming agent");
+      static async resume(agentDef, workingDirectory, agentSessionId, mcpServers, allowedPaths) {
+        log31.debug({ agentName: agentDef.name, agentSessionId }, "Resuming agent");
         const spawnStart = Date.now();
         const instance = await _AgentInstance.spawnSubprocess(
           agentDef,
-          workingDirectory
+          workingDirectory,
+          allowedPaths
         );
         const resolvedMcp = _AgentInstance.mcpManager.resolve(mcpServers);
         try {
@@ -19315,7 +19469,7 @@ ${stderr}`
             instance.sessionId = agentSessionId;
             instance.initialSessionResponse = response;
             instance.debugTracer = createDebugTracer(agentSessionId, workingDirectory);
-            log30.info(
+            log31.info(
               {
                 sessionId: agentSessionId,
                 durationMs: Date.now() - spawnStart,
@@ -19331,7 +19485,7 @@ ${stderr}`
             instance.sessionId = response.sessionId;
             instance.initialSessionResponse = response;
             instance.debugTracer = createDebugTracer(response.sessionId, workingDirectory);
-            log30.info(
+            log31.info(
               {
                 sessionId: response.sessionId,
                 durationMs: Date.now() - spawnStart,
@@ -19341,7 +19495,7 @@ ${stderr}`
             );
           }
         } catch (err) {
-          log30.warn(
+          log31.warn(
             { err, agentSessionId },
             "Resume failed, falling back to new session"
           );
@@ -19352,7 +19506,7 @@ ${stderr}`
           instance.sessionId = response.sessionId;
           instance.initialSessionResponse = response;
           instance.debugTracer = createDebugTracer(response.sessionId, workingDirectory);
-          log30.info(
+          log31.info(
             { sessionId: response.sessionId, durationMs: Date.now() - spawnStart },
             "Agent fallback spawn complete"
           );
@@ -19490,7 +19644,7 @@ ${stderr}`
                 return;
             }
             if (event !== null) {
-              self.emit("agent_event", event);
+              self.emit(SessionEv.AGENT_EVENT, event);
             }
           },
           // ── Permission requests ──────────────────────────────────────────────
@@ -19517,7 +19671,7 @@ ${stderr}`
               throw new Error(`[Access denied] ${pathCheck.reason}`);
             }
             if (self.middlewareChain) {
-              const result = await self.middlewareChain.execute("fs:beforeRead", { sessionId: self.sessionId, path: p2.path, line: p2.line, limit: p2.limit }, async (r) => r);
+              const result = await self.middlewareChain.execute(Hook.FS_BEFORE_READ, { sessionId: self.sessionId, path: p2.path, line: p2.line, limit: p2.limit }, async (r) => r);
               if (!result) return { content: "" };
               p2.path = result.path;
             }
@@ -19535,7 +19689,7 @@ ${stderr}`
               throw new Error(`[Access denied] ${pathCheck.reason}`);
             }
             if (self.middlewareChain) {
-              const result = await self.middlewareChain.execute("fs:beforeWrite", { sessionId: self.sessionId, path: writePath, content: writeContent }, async (r) => r);
+              const result = await self.middlewareChain.execute(Hook.FS_BEFORE_WRITE, { sessionId: self.sessionId, path: writePath, content: writeContent }, async (r) => r);
               if (!result) return {};
               writePath = result.path;
               writeContent = result.content;
@@ -19632,10 +19786,16 @@ ${stderr}`
       // ── Prompt & lifecycle ──────────────────────────────────────────────
       async prompt(text6, attachments) {
         const contentBlocks = [{ type: "text", text: text6 }];
-        const SUPPORTED_IMAGE_MIMES = /* @__PURE__ */ new Set(["image/jpeg", "image/png", "image/gif", "image/webp"]);
+        const capabilities = this.promptCapabilities ?? {};
         for (const att of attachments ?? []) {
-          const tooLarge = att.size > 10 * 1024 * 1024;
-          if (att.type === "image" && this.promptCapabilities?.image && !tooLarge && SUPPORTED_IMAGE_MIMES.has(att.mimeType)) {
+          const skipNote = buildAttachmentNote(att, capabilities);
+          if (skipNote !== null) {
+            contentBlocks[0].text += `
+
+${skipNote}`;
+            continue;
+          }
+          if (att.type === "image" && capabilities.image && SUPPORTED_IMAGE_MIMES.has(att.mimeType)) {
             const attCheck = this.pathGuard.validatePath(att.filePath, "read");
             if (!attCheck.allowed) {
               contentBlocks[0].text += `
@@ -19645,7 +19805,7 @@ ${stderr}`
             }
             const data = await fs40.promises.readFile(att.filePath);
             contentBlocks.push({ type: "image", data: data.toString("base64"), mimeType: att.mimeType });
-          } else if (att.type === "audio" && this.promptCapabilities?.audio && !tooLarge) {
+          } else if (att.type === "audio" && capabilities.audio) {
             const attCheck = this.pathGuard.validatePath(att.filePath, "read");
             if (!attCheck.allowed) {
               contentBlocks[0].text += `
@@ -19656,9 +19816,9 @@ ${stderr}`
             const data = await fs40.promises.readFile(att.filePath);
             contentBlocks.push({ type: "audio", data: data.toString("base64"), mimeType: att.mimeType });
           } else {
-            if ((att.type === "image" || att.type === "audio") && !tooLarge) {
-              log30.debug(
-                { type: att.type, capabilities: this.promptCapabilities ?? {} },
+            if (att.type === "image" || att.type === "audio") {
+              log31.debug(
+                { type: att.type, capabilities },
                 "Agent does not support %s content, falling back to file path",
                 att.type
               );
@@ -19721,15 +19881,15 @@ var init_agent_manager = __esm({
       getAgent(name) {
         return this.catalog.resolve(name);
       }
-      async spawn(agentName, workingDirectory) {
+      async spawn(agentName, workingDirectory, allowedPaths) {
         const agentDef = this.getAgent(agentName);
         if (!agentDef) throw new Error(`Agent "${agentName}" is not installed. Run "openacp agents install ${agentName}" to add it.`);
-        return AgentInstance.spawn(agentDef, workingDirectory);
+        return AgentInstance.spawn(agentDef, workingDirectory, void 0, allowedPaths);
       }
-      async resume(agentName, workingDirectory, agentSessionId) {
+      async resume(agentName, workingDirectory, agentSessionId, allowedPaths) {
         const agentDef = this.getAgent(agentName);
         if (!agentDef) throw new Error(`Agent "${agentName}" is not installed. Run "openacp agents install ${agentName}" to add it.`);
-        return AgentInstance.resume(agentDef, workingDirectory, agentSessionId);
+        return AgentInstance.resume(agentDef, workingDirectory, agentSessionId, void 0, allowedPaths);
       }
     };
   }
@@ -19926,6 +20086,7 @@ var init_session2 = __esm({
     init_permission_gate();
     init_log();
     init_turn_context();
+    init_events();
     moduleLog = createChildLogger({ module: "session" });
     TTS_PROMPT_INSTRUCTION = `
 
@@ -19954,7 +20115,15 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       }
       agentName;
       workingDirectory;
-      agentInstance;
+      _agentInstance;
+      get agentInstance() {
+        return this._agentInstance;
+      }
+      set agentInstance(agent) {
+        this._agentInstance = agent;
+        this.wireAgentRelay();
+        this.wireCommandsBuffer();
+      }
       agentSessionId = "";
       _status = "initializing";
       name;
@@ -19978,9 +20147,6 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       threadIds = /* @__PURE__ */ new Map();
       /** Active turn context — sealed on prompt dequeue, cleared on turn end */
       activeTurnContext = null;
-      /** The agentInstance for which the agent→session event relay is wired (prevents duplicate relays from multiple bridges).
-       *  When the agent is swapped, the relay must be re-wired to the new instance. */
-      agentRelaySource = null;
       permissionGate = new PermissionGate();
       queue;
       speechService;
@@ -20004,23 +20170,37 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
             this.log.error({ err }, "Prompt execution failed");
             const message = err instanceof Error ? err.message : String(err);
             this.fail(message);
-            this.emit("agent_event", { type: "error", message: `Prompt execution failed: ${message}` });
+            this.emit(SessionEv.AGENT_EVENT, { type: "error", message: `Prompt execution failed: ${message}` });
           }
         );
-        this.wireCommandsBuffer();
+      }
+      /** Wire the agent→session event relay on the current agentInstance.
+       *  Removes any previous relay first to avoid duplicates on agent switch.
+       *  This relay ensures session.emit("agent_event") fires for ALL sessions,
+       *  including headless API sessions that have no SessionBridge attached. */
+      agentRelayCleanup;
+      wireAgentRelay() {
+        this.agentRelayCleanup?.();
+        const instance = this._agentInstance;
+        const handler = (event) => {
+          this.emit(SessionEv.AGENT_EVENT, event);
+        };
+        instance.on(SessionEv.AGENT_EVENT, handler);
+        this.agentRelayCleanup = () => instance.off(SessionEv.AGENT_EVENT, handler);
       }
       /** Wire a listener on the current agentInstance to buffer commands_update events.
        *  Must be called after every agentInstance replacement (constructor + switchAgent). */
       commandsBufferCleanup;
       wireCommandsBuffer() {
         this.commandsBufferCleanup?.();
+        const instance = this._agentInstance;
         const handler = (event) => {
           if (event.type === "commands_update") {
             this.latestCommands = event.commands;
           }
         };
-        this.agentInstance.on("agent_event", handler);
-        this.commandsBufferCleanup = () => this.agentInstance.off("agent_event", handler);
+        instance.on(SessionEv.AGENT_EVENT, handler);
+        this.commandsBufferCleanup = () => instance.off(SessionEv.AGENT_EVENT, handler);
       }
       // --- State Machine ---
       get status() {
@@ -20034,12 +20214,12 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       fail(reason) {
         if (this._status === "error") return;
         this.transition("error");
-        this.emit("error", new Error(reason));
+        this.emit(SessionEv.ERROR, new Error(reason));
       }
       /** Transition to finished — from active only. Emits session_end for backward compat. */
       finish(reason) {
         this.transition("finished");
-        this.emit("session_end", reason ?? "completed");
+        this.emit(SessionEv.SESSION_END, reason ?? "completed");
       }
       /** Transition to cancelled — from active only (terminal session cancel) */
       markCancelled() {
@@ -20055,7 +20235,7 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
         }
         this._status = to;
         this.log.debug({ from, to }, "Session status transition");
-        this.emit("status_change", from, to);
+        this.emit(SessionEv.STATUS_CHANGE, from, to);
       }
       /** Number of prompts waiting in queue */
       get queueDepth() {
@@ -20077,8 +20257,8 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
       async enqueuePrompt(text6, attachments, routing, externalTurnId) {
         const turnId = externalTurnId ?? nanoid4(8);
         if (this.middlewareChain) {
-          const payload = { text: text6, attachments, sessionId: this.id };
-          const result = await this.middlewareChain.execute("agent:beforePrompt", payload, async (p2) => p2);
+          const payload = { text: text6, attachments, sessionId: this.id, sourceAdapterId: routing?.sourceAdapterId };
+          const result = await this.middlewareChain.execute(Hook.AGENT_BEFORE_PROMPT, payload, async (p2) => p2);
           if (!result) return turnId;
           text6 = result.text;
           attachments = result.attachments;
@@ -20093,9 +20273,9 @@ Additionally, include a [TTS]...[/TTS] block with a spoken-friendly summary of y
           routing?.responseAdapterId,
           turnId
         );
-        this.emit("turn_started", this.activeTurnContext);
+        this.emit(SessionEv.TURN_STARTED, this.activeTurnContext);
         this.promptCount++;
-        this.emit("prompt_count_changed", this.promptCount);
+        this.emit(SessionEv.PROMPT_COUNT_CHANGED, this.promptCount);
         if (this._status === "initializing" || this._status === "cancelled" || this._status === "error") {
           this.activate();
         }
@@ -20124,10 +20304,18 @@ ${text6}`;
           }
         } : null;
         if (accumulatorListener) {
-          this.on("agent_event", accumulatorListener);
+          this.on(SessionEv.AGENT_EVENT, accumulatorListener);
+        }
+        const mw = this.middlewareChain;
+        const afterEventListener = mw ? (event) => {
+          mw.execute(Hook.AGENT_AFTER_EVENT, { sessionId: this.id, event, outgoingMessage: { type: "text", text: "" } }, async (e) => e).catch(() => {
+          });
+        } : null;
+        if (afterEventListener) {
+          this.agentInstance.on(SessionEv.AGENT_EVENT, afterEventListener);
         }
         if (this.middlewareChain) {
-          this.middlewareChain.execute("turn:start", { sessionId: this.id, promptText: processed.text, promptNumber: this.promptCount }, async (p2) => p2).catch(() => {
+          this.middlewareChain.execute(Hook.TURN_START, { sessionId: this.id, promptText: processed.text, promptNumber: this.promptCount }, async (p2) => p2).catch(() => {
           });
         }
         let stopReason = "end_turn";
@@ -20148,10 +20336,13 @@ ${text6}`;
           promptError = err;
         } finally {
           if (accumulatorListener) {
-            this.off("agent_event", accumulatorListener);
+            this.off(SessionEv.AGENT_EVENT, accumulatorListener);
+          }
+          if (afterEventListener) {
+            this.agentInstance.off(SessionEv.AGENT_EVENT, afterEventListener);
           }
           if (this.middlewareChain) {
-            this.middlewareChain.execute("turn:end", { sessionId: this.id, stopReason, durationMs: Date.now() - promptStart }, async (p2) => p2).catch(() => {
+            this.middlewareChain.execute(Hook.TURN_END, { sessionId: this.id, stopReason, durationMs: Date.now() - promptStart }, async (p2) => p2).catch(() => {
             });
           }
           this.activeTurnContext = null;
@@ -20196,7 +20387,7 @@ ${text6}`;
             const audioBuffer = await fs41.promises.readFile(audioPath);
             const result = await this.speechService.transcribe(audioBuffer, audioMime);
             this.log.info({ provider: "stt", duration: result.duration }, "Voice transcribed");
-            this.emit("agent_event", {
+            this.emit(SessionEv.AGENT_EVENT, {
               type: "system_message",
               message: `\u{1F3A4} You said: ${result.text}`
             });
@@ -20205,7 +20396,7 @@ ${text6}`;
 ${result.text}` : result.text;
           } catch (err) {
             this.log.warn({ err }, "STT transcription failed, keeping audio attachment");
-            this.emit("agent_event", {
+            this.emit(SessionEv.AGENT_EVENT, {
               type: "error",
               message: `Voice transcription failed: ${err.message}`
             });
@@ -20239,12 +20430,12 @@ ${result.text}` : result.text;
               timeoutPromise
             ]);
             const base64 = result.audioBuffer.toString("base64");
-            this.emit("agent_event", {
+            this.emit(SessionEv.AGENT_EVENT, {
               type: "audio_content",
               data: base64,
               mimeType: result.mimeType
             });
-            this.emit("agent_event", { type: "tts_strip" });
+            this.emit(SessionEv.AGENT_EVENT, { type: "tts_strip" });
             this.log.info("TTS synthesis completed");
           } finally {
             clearTimeout(ttsTimer);
@@ -20259,19 +20450,19 @@ ${result.text}` : result.text;
         const captureHandler = (event) => {
           if (event.type === "text") title += event.content;
         };
-        this.pause((event) => event !== "agent_event");
-        this.agentInstance.on("agent_event", captureHandler);
+        this.pause((event) => event !== SessionEv.AGENT_EVENT);
+        this.agentInstance.on(SessionEv.AGENT_EVENT, captureHandler);
         try {
           await this.agentInstance.prompt(
             "Summarize this conversation in max 5 words for a topic title. Reply ONLY with the title, nothing else."
           );
           this.name = title.trim().slice(0, 50) || `Session ${this.id.slice(0, 6)}`;
           this.log.info({ name: this.name }, "Session auto-named");
-          this.emit("named", this.name);
+          this.emit(SessionEv.NAMED, this.name);
         } catch {
           this.name = `Session ${this.id.slice(0, 6)}`;
         } finally {
-          this.agentInstance.off("agent_event", captureHandler);
+          this.agentInstance.off(SessionEv.AGENT_EVENT, captureHandler);
           this.clearBuffer();
           this.resume();
         }
@@ -20333,7 +20524,7 @@ ${result.text}` : result.text;
       /** Set session name explicitly and emit 'named' event */
       setName(name) {
         this.name = name;
-        this.emit("named", name);
+        this.emit(SessionEv.NAMED, name);
       }
       /** Send a config option change to the agent and update local state from the response. */
       async setConfigOption(configId, value) {
@@ -20349,7 +20540,7 @@ ${result.text}` : result.text;
       }
       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);
+          const result = await this.middlewareChain.execute(Hook.CONFIG_BEFORE_CHANGE, { sessionId: this.id, configId: "options", oldValue: this.configOptions, newValue: options }, async (p2) => p2);
           if (!result) return;
         }
         this.configOptions = options;
@@ -20369,7 +20560,7 @@ ${result.text}` : result.text;
       /** Cancel the current prompt and clear the queue. Stays in active state. */
       async abortPrompt() {
         if (this.middlewareChain) {
-          const result = await this.middlewareChain.execute("agent:beforeCancel", { sessionId: this.id }, async (p2) => p2);
+          const result = await this.middlewareChain.execute(Hook.AGENT_BEFORE_CANCEL, { sessionId: this.id }, async (p2) => p2);
           if (!result) return;
         }
         this.queue.clear();
@@ -20410,7 +20601,6 @@ ${result.text}` : result.text;
         this.configOptions = [];
         this.latestCommands = null;
         this.applySpawnResponse(newAgent.initialSessionResponse, newAgent.agentCapabilities);
-        this.wireCommandsBuffer();
         this.log.info({ from: this.agentSwitchHistory.at(-1).agentName, to: agentName }, "Agent switched");
       }
       async destroy() {
@@ -20432,6 +20622,7 @@ var init_session_manager = __esm({
   "src/core/sessions/session-manager.ts"() {
     "use strict";
     init_session2();
+    init_events();
     SessionManager = class {
       sessions = /* @__PURE__ */ new Map();
       store;
@@ -20536,18 +20727,18 @@ var init_session_manager = __esm({
           }
         }
         if (this.middlewareChain) {
-          this.middlewareChain.execute("session:afterDestroy", { sessionId }, async (p2) => p2).catch(() => {
+          this.middlewareChain.execute(Hook.SESSION_AFTER_DESTROY, { sessionId }, async (p2) => p2).catch(() => {
           });
         }
       }
       listSessions(channelId) {
-        const all = Array.from(this.sessions.values());
+        const all = Array.from(this.sessions.values()).filter((s) => !s.isAssistant);
         if (channelId) return all.filter((s) => s.channelId === channelId);
         return all;
       }
       listAllSessions(channelId) {
         if (this.store) {
-          let records = this.store.list();
+          let records = this.store.list().filter((r) => !r.isAssistant);
           if (channelId) records = records.filter((r) => r.channelId === channelId);
           return records.map((record) => {
             const live2 = this.sessions.get(record.sessionId);
@@ -20587,7 +20778,7 @@ var init_session_manager = __esm({
             };
           });
         }
-        let live = Array.from(this.sessions.values());
+        let live = Array.from(this.sessions.values()).filter((s) => !s.isAssistant);
         if (channelId) live = live.filter((s) => s.channelId === channelId);
         return live.map((s) => ({
           id: s.id,
@@ -20608,7 +20799,7 @@ var init_session_manager = __esm({
       }
       listRecords(filter) {
         if (!this.store) return [];
-        let records = this.store.list();
+        let records = this.store.list().filter((r) => !r.isAssistant);
         if (filter?.statuses?.length) {
           records = records.filter((r) => filter.statuses.includes(r.status));
         }
@@ -20617,7 +20808,7 @@ var init_session_manager = __esm({
       async removeRecord(sessionId) {
         if (!this.store) return;
         await this.store.remove(sessionId);
-        this.eventBus?.emit("session:deleted", { sessionId });
+        this.eventBus?.emit(BusEvent.SESSION_DELETED, { sessionId });
       }
       /**
        * Graceful shutdown: persist session state without killing agent subprocesses.
@@ -20665,7 +20856,7 @@ var init_session_manager = __esm({
         this.sessions.clear();
         if (this.middlewareChain) {
           for (const sessionId of sessionIds) {
-            this.middlewareChain.execute("session:afterDestroy", { sessionId }, async (p2) => p2).catch(() => {
+            this.middlewareChain.execute(Hook.SESSION_AFTER_DESTROY, { sessionId }, async (p2) => p2).catch(() => {
             });
           }
         }
@@ -20675,14 +20866,15 @@ var init_session_manager = __esm({
 });
 
 // src/core/sessions/session-bridge.ts
-var log31, SessionBridge;
+var log32, SessionBridge;
 var init_session_bridge = __esm({
   "src/core/sessions/session-bridge.ts"() {
     "use strict";
     init_log();
     init_bypass_detection();
     init_turn_context();
-    log31 = createChildLogger({ module: "session-bridge" });
+    init_events();
+    log32 = createChildLogger({ module: "session-bridge" });
     SessionBridge = class {
       constructor(session, adapter, deps, adapterId) {
         this.session = session;
@@ -20706,21 +20898,21 @@ var init_session_bridge = __esm({
         try {
           const mw = this.deps.middlewareChain;
           if (mw) {
-            const result = await mw.execute("message:outgoing", { sessionId, message }, async (m) => m);
+            const result = await mw.execute(Hook.MESSAGE_OUTGOING, { sessionId, message }, async (m) => m);
             this.tracer?.log("core", { step: "middleware:outgoing", sessionId, hook: "message:outgoing", blocked: !result });
             if (!result) return;
             this.tracer?.log("core", { step: "dispatch", sessionId, message: result.message });
             this.adapter.sendMessage(sessionId, result.message).catch((err) => {
-              log31.error({ err, sessionId }, "Failed to send message to adapter");
+              log32.error({ err, sessionId }, "Failed to send message to adapter");
             });
           } else {
             this.tracer?.log("core", { step: "dispatch", sessionId, message });
             this.adapter.sendMessage(sessionId, message).catch((err) => {
-              log31.error({ err, sessionId }, "Failed to send message to adapter");
+              log32.error({ err, sessionId }, "Failed to send message to adapter");
             });
           }
         } catch (err) {
-          log31.error({ err, sessionId }, "Error in sendMessage middleware");
+          log32.error({ err, sessionId }, "Error in sendMessage middleware");
         }
       }
       /** Determine if this bridge should forward the given event based on turn routing. */
@@ -20735,17 +20927,11 @@ var init_session_bridge = __esm({
       connect() {
         if (this.connected) return;
         this.connected = true;
-        if (this.session.agentRelaySource !== this.session.agentInstance) {
-          this.listen(this.session.agentInstance, "agent_event", (event) => {
-            this.session.emit("agent_event", event);
-          });
-          this.session.agentRelaySource = this.session.agentInstance;
-        }
-        this.listen(this.session, "agent_event", (event) => {
+        this.listen(this.session, SessionEv.AGENT_EVENT, (event) => {
           if (this.shouldForward(event)) {
             this.dispatchAgentEvent(event);
           } else {
-            this.deps.eventBus?.emit("agent:event", { sessionId: this.session.id, event });
+            this.deps.eventBus?.emit(BusEvent.AGENT_EVENT, { sessionId: this.session.id, event });
           }
         });
         if (!this.session.agentInstance.onPermissionRequest || this.session.agentInstance.onPermissionRequest.__bridgeId === void 0) {
@@ -20755,47 +20941,51 @@ var init_session_bridge = __esm({
           handler.__bridgeId = this.adapterId;
           this.session.agentInstance.onPermissionRequest = handler;
         }
-        this.listen(this.session, "permission_request", async (request) => {
+        this.listen(this.session, SessionEv.PERMISSION_REQUEST, async (request) => {
           const current = this.session.agentInstance.onPermissionRequest;
           if (current?.__bridgeId === this.adapterId) return;
           if (!this.session.permissionGate.isPending) return;
           try {
             await this.adapter.sendPermissionRequest(this.session.id, request);
           } catch (err) {
-            log31.error({ err, sessionId: this.session.id, adapterId: this.adapterId }, "Failed to send permission request to adapter");
+            log32.error({ err, sessionId: this.session.id, adapterId: this.adapterId }, "Failed to send permission request to adapter");
           }
         });
-        this.listen(this.session, "status_change", (from, to) => {
+        this.listen(this.session, SessionEv.STATUS_CHANGE, (from, to) => {
           this.deps.sessionManager.patchRecord(this.session.id, {
             status: to,
             lastActiveAt: (/* @__PURE__ */ new Date()).toISOString()
           });
-          this.deps.eventBus?.emit("session:updated", {
-            sessionId: this.session.id,
-            status: to
-          });
+          if (!this.session.isAssistant) {
+            this.deps.eventBus?.emit(BusEvent.SESSION_UPDATED, {
+              sessionId: this.session.id,
+              status: to
+            });
+          }
           if (to === "finished") {
             queueMicrotask(() => this.disconnect());
           }
         });
-        this.listen(this.session, "named", async (name) => {
+        this.listen(this.session, SessionEv.NAMED, async (name) => {
           const record = this.deps.sessionManager.getSessionRecord(this.session.id);
           const alreadyNamed = !!record?.name;
           await this.deps.sessionManager.patchRecord(this.session.id, { name });
-          this.deps.eventBus?.emit("session:updated", {
-            sessionId: this.session.id,
-            name
-          });
+          if (!this.session.isAssistant) {
+            this.deps.eventBus?.emit(BusEvent.SESSION_UPDATED, {
+              sessionId: this.session.id,
+              name
+            });
+          }
           if (!alreadyNamed) {
             await this.adapter.renameSessionThread(this.session.id, name);
           }
         });
-        this.listen(this.session, "prompt_count_changed", (count) => {
+        this.listen(this.session, SessionEv.PROMPT_COUNT_CHANGED, (count) => {
           this.deps.sessionManager.patchRecord(this.session.id, { currentPromptCount: count });
         });
-        this.listen(this.session, "turn_started", (ctx) => {
+        this.listen(this.session, SessionEv.TURN_STARTED, (ctx) => {
           if (ctx.sourceAdapterId !== "sse" && ctx.sourceAdapterId !== "api") {
-            this.deps.eventBus?.emit("message:processing", {
+            this.deps.eventBus?.emit(BusEvent.MESSAGE_PROCESSING, {
               sessionId: this.session.id,
               turnId: ctx.turnId,
               sourceAdapterId: ctx.sourceAdapterId,
@@ -20804,10 +20994,10 @@ var init_session_bridge = __esm({
           }
         });
         if (this.session.latestCommands !== null) {
-          this.session.emit("agent_event", { type: "commands_update", commands: this.session.latestCommands });
+          this.session.emit(SessionEv.AGENT_EVENT, { type: "commands_update", commands: this.session.latestCommands });
         }
         if (this.session.configOptions.length > 0) {
-          this.session.emit("agent_event", { type: "config_option_update", options: this.session.configOptions });
+          this.session.emit(SessionEv.AGENT_EVENT, { type: "config_option_update", options: this.session.configOptions });
         }
       }
       disconnect() {
@@ -20827,29 +21017,23 @@ var init_session_bridge = __esm({
         const mw = this.deps.middlewareChain;
         if (mw) {
           try {
-            const result = await mw.execute("agent:beforeEvent", { sessionId: this.session.id, event }, async (e) => e);
+            const result = await mw.execute(Hook.AGENT_BEFORE_EVENT, { sessionId: this.session.id, event }, async (e) => e);
             this.tracer?.log("core", { step: "middleware:before", sessionId: this.session.id, hook: "agent:beforeEvent", blocked: !result });
             if (!result) return;
             const transformedEvent = result.event;
-            const outgoing = this.handleAgentEvent(transformedEvent);
-            mw.execute("agent:afterEvent", {
-              sessionId: this.session.id,
-              event: transformedEvent,
-              outgoingMessage: outgoing ?? { type: "text", text: "" }
-            }, async (e) => e).catch(() => {
-            });
+            this.handleAgentEvent(transformedEvent);
           } catch {
             try {
               this.handleAgentEvent(event);
             } catch (err) {
-              log31.error({ err, sessionId: this.session.id }, "Error handling agent event (middleware fallback)");
+              log32.error({ err, sessionId: this.session.id }, "Error handling agent event (middleware fallback)");
             }
           }
         } else {
           try {
             this.handleAgentEvent(event);
           } catch (err) {
-            log31.error({ err, sessionId: this.session.id }, "Error handling agent event");
+            log32.error({ err, sessionId: this.session.id }, "Error handling agent event");
           }
         }
       }
@@ -20913,7 +21097,7 @@ var init_session_bridge = __esm({
                   text: "",
                   attachment: att
                 });
-              }).catch((err) => log31.error({ err }, "Failed to save agent image"));
+              }).catch((err) => log32.error({ err }, "Failed to save agent image"));
             }
             break;
           }
@@ -20930,12 +21114,12 @@ var init_session_bridge = __esm({
                   text: "",
                   attachment: att
                 });
-              }).catch((err) => log31.error({ err }, "Failed to save agent audio"));
+              }).catch((err) => log32.error({ err }, "Failed to save agent audio"));
             }
             break;
           }
           case "commands_update":
-            log31.debug({ commands: event.commands }, "Commands available");
+            log32.debug({ commands: event.commands }, "Commands available");
             this.adapter.sendSkillCommands?.(this.session.id, event.commands);
             break;
           case "system_message":
@@ -20970,7 +21154,7 @@ var init_session_bridge = __esm({
             this.adapter.stripTTSBlock?.(this.session.id);
             break;
         }
-        this.deps.eventBus?.emit("agent:event", {
+        this.deps.eventBus?.emit(BusEvent.AGENT_EVENT, {
           sessionId: this.session.id,
           event
         });
@@ -20989,7 +21173,7 @@ var init_session_bridge = __esm({
         let permReq = request;
         if (mw) {
           const payload = { sessionId: this.session.id, request, autoResolve: void 0 };
-          const result = await mw.execute("permission:beforeRequest", payload, async (r) => r);
+          const result = await mw.execute(Hook.PERMISSION_BEFORE_REQUEST, payload, async (r) => r);
           if (!result) return "";
           permReq = result.request;
           if (result.autoResolve) {
@@ -20997,21 +21181,21 @@ var init_session_bridge = __esm({
             return result.autoResolve;
           }
         }
-        this.deps.eventBus?.emit("permission:request", {
+        this.deps.eventBus?.emit(BusEvent.PERMISSION_REQUEST, {
           sessionId: this.session.id,
           permission: permReq
         });
         const autoDecision = this.checkAutoApprove(permReq);
         if (autoDecision) {
-          this.session.emit("permission_request", permReq);
+          this.session.emit(SessionEv.PERMISSION_REQUEST, permReq);
           this.emitAfterResolve(mw, permReq.id, autoDecision, "system", startTime);
           return autoDecision;
         }
         const promise = this.session.permissionGate.setPending(permReq);
-        this.session.emit("permission_request", permReq);
+        this.session.emit(SessionEv.PERMISSION_REQUEST, permReq);
         await this.adapter.sendPermissionRequest(this.session.id, permReq);
         const optionId = await promise;
-        this.deps.eventBus?.emit("permission:resolved", {
+        this.deps.eventBus?.emit(BusEvent.PERMISSION_RESOLVED, {
           sessionId: this.session.id,
           requestId: permReq.id,
           decision: optionId,
@@ -21031,7 +21215,7 @@ var init_session_bridge = __esm({
         if (isAgentBypass || isClientBypass) {
           const allowOption = request.options.find((o) => o.isAllow);
           if (allowOption) {
-            log31.info(
+            log32.info(
               { sessionId: this.session.id, requestId: request.id, optionId: allowOption.id, agentBypass: !!isAgentBypass, clientBypass: !!isClientBypass },
               "Bypass mode: auto-approving permission"
             );
@@ -21043,7 +21227,7 @@ var init_session_bridge = __esm({
       /** Emit permission:afterResolve middleware hook (fire-and-forget) */
       emitAfterResolve(mw, requestId, decision, userId, startTime) {
         if (mw) {
-          mw.execute("permission:afterResolve", {
+          mw.execute(Hook.PERMISSION_AFTER_RESOLVE, {
             sessionId: this.session.id,
             requestId,
             decision,
@@ -21204,13 +21388,13 @@ function computeLineDiff(oldStr, newStr) {
     removed: Math.max(0, oldLines.length - prefixLen - suffixLen)
   };
 }
-var log32, BINARY_VIEWER_EXTENSIONS, MessageTransformer;
+var log33, BINARY_VIEWER_EXTENSIONS, MessageTransformer;
 var init_message_transformer = __esm({
   "src/core/message-transformer.ts"() {
     "use strict";
     init_extract_file_info();
     init_log();
-    log32 = createChildLogger({ module: "message-transformer" });
+    log33 = createChildLogger({ module: "message-transformer" });
     BINARY_VIEWER_EXTENSIONS = /* @__PURE__ */ new Set([
       ".wav",
       ".ogg",
@@ -21413,14 +21597,14 @@ var init_message_transformer = __esm({
           }
         }
         if (!this.tunnelService || !sessionContext) {
-          log32.debug(
+          log33.debug(
             { hasTunnel: !!this.tunnelService, hasCtx: !!sessionContext, kind },
             "enrichWithViewerLinks: skipping (no tunnel or session context)"
           );
           return;
         }
         const name = "name" in event ? event.name || "" : "";
-        log32.debug(
+        log33.debug(
           { name, kind, status: event.status, hasContent: !!event.content, hasRawInput: !!event.rawInput },
           "enrichWithViewerLinks: inspecting event"
         );
@@ -21432,7 +21616,7 @@ var init_message_transformer = __esm({
           event.meta
         );
         if (!fileInfo) {
-          log32.debug(
+          log33.debug(
             { name, kind, hasContent: !!event.content, hasRawInput: !!event.rawInput, hasMeta: !!event.meta },
             "enrichWithViewerLinks: extractFileInfo returned null"
           );
@@ -21440,15 +21624,15 @@ var init_message_transformer = __esm({
         }
         const fileExt = path45.extname(fileInfo.filePath).toLowerCase();
         if (BINARY_VIEWER_EXTENSIONS.has(fileExt)) {
-          log32.debug({ kind, filePath: fileInfo.filePath }, "enrichWithViewerLinks: skipping binary file");
+          log33.debug({ kind, filePath: fileInfo.filePath }, "enrichWithViewerLinks: skipping binary file");
           return;
         }
         const publicUrl = this.tunnelService.getPublicUrl();
         if (publicUrl.startsWith("http://localhost") || publicUrl.startsWith("http://127.0.0.1")) {
-          log32.debug({ kind, filePath: fileInfo.filePath }, "enrichWithViewerLinks: skipping (no public tunnel URL)");
+          log33.debug({ kind, filePath: fileInfo.filePath }, "enrichWithViewerLinks: skipping (no public tunnel URL)");
           return;
         }
-        log32.info(
+        log33.info(
           {
             name,
             kind,
@@ -21494,12 +21678,12 @@ var init_message_transformer = __esm({
 // src/core/sessions/session-store.ts
 import fs42 from "fs";
 import path46 from "path";
-var log33, DEBOUNCE_MS3, JsonFileSessionStore;
+var log34, DEBOUNCE_MS3, JsonFileSessionStore;
 var init_session_store = __esm({
   "src/core/sessions/session-store.ts"() {
     "use strict";
     init_log();
-    log33 = createChildLogger({ module: "session-store" });
+    log34 = createChildLogger({ module: "session-store" });
     DEBOUNCE_MS3 = 2e3;
     JsonFileSessionStore = class {
       records = /* @__PURE__ */ new Map();
@@ -21551,6 +21735,14 @@ var init_session_store = __esm({
         }
         return void 0;
       }
+      findAssistant(channelId) {
+        for (const record of this.records.values()) {
+          if (record.isAssistant === true && record.channelId === channelId) {
+            return record;
+          }
+        }
+        return void 0;
+      }
       list(channelId) {
         const all = [...this.records.values()];
         if (channelId) return all.filter((r) => r.channelId === channelId);
@@ -21593,7 +21785,7 @@ var init_session_store = __esm({
             fs42.readFileSync(this.filePath, "utf-8")
           );
           if (raw.version !== 1) {
-            log33.warn(
+            log34.warn(
               { version: raw.version },
               "Unknown session store version, skipping load"
             );
@@ -21602,9 +21794,9 @@ var init_session_store = __esm({
           for (const [id, record] of Object.entries(raw.sessions)) {
             this.records.set(id, this.migrateRecord(record));
           }
-          log33.debug({ count: this.records.size }, "Loaded session records");
+          log34.debug({ count: this.records.size }, "Loaded session records");
         } catch (err) {
-          log33.error({ err }, "Failed to load session store, backing up corrupt file");
+          log34.error({ err }, "Failed to load session store, backing up corrupt file");
           try {
             fs42.renameSync(this.filePath, `${this.filePath}.bak`);
           } catch {
@@ -21630,6 +21822,8 @@ var init_session_store = __esm({
         for (const [id, record] of this.records) {
           if (record.status === "active" || record.status === "initializing")
             continue;
+          if (record.isAssistant === true)
+            continue;
           const raw = record.lastActiveAt;
           if (!raw) continue;
           const lastActive = new Date(raw).getTime();
@@ -21640,7 +21834,7 @@ var init_session_store = __esm({
           }
         }
         if (removed > 0) {
-          log33.info({ removed }, "Cleaned up expired session records");
+          log34.info({ removed }, "Cleaned up expired session records");
           this.scheduleDiskWrite();
         }
       }
@@ -21655,13 +21849,14 @@ var init_session_store = __esm({
 });
 
 // src/core/sessions/session-factory.ts
-var log34, SessionFactory;
+var log35, SessionFactory;
 var init_session_factory = __esm({
   "src/core/sessions/session-factory.ts"() {
     "use strict";
     init_session2();
     init_log();
-    log34 = createChildLogger({ module: "session-factory" });
+    init_events();
+    log35 = createChildLogger({ module: "session-factory" });
     SessionFactory = class {
       constructor(agentManager, sessionManager, speechServiceAccessor, eventBus, instanceRoot) {
         this.agentManager = agentManager;
@@ -21703,7 +21898,7 @@ var init_session_factory = __esm({
             threadId: ""
             // threadId is assigned after session creation
           };
-          const result = await this.middlewareChain.execute("session:beforeCreate", payload, async (p2) => p2);
+          const result = await this.middlewareChain.execute(Hook.SESSION_BEFORE_CREATE, payload, async (p2) => p2);
           if (!result) throw new Error("Session creation blocked by middleware");
           createParams = {
             ...params,
@@ -21712,6 +21907,7 @@ var init_session_factory = __esm({
             channelId: result.channelId
           };
         }
+        const configAllowedPaths = this.configManager?.get().workspace?.security?.allowedPaths ?? [];
         let agentInstance;
         try {
           if (createParams.resumeAgentSessionId) {
@@ -21719,22 +21915,25 @@ var init_session_factory = __esm({
               agentInstance = await this.agentManager.resume(
                 createParams.agentName,
                 createParams.workingDirectory,
-                createParams.resumeAgentSessionId
+                createParams.resumeAgentSessionId,
+                configAllowedPaths
               );
             } catch (resumeErr) {
-              log34.warn(
+              log35.warn(
                 { agentName: createParams.agentName, resumeErr },
                 "Agent session resume failed, falling back to fresh spawn"
               );
               agentInstance = await this.agentManager.spawn(
                 createParams.agentName,
-                createParams.workingDirectory
+                createParams.workingDirectory,
+                configAllowedPaths
               );
             }
           } else {
             agentInstance = await this.agentManager.spawn(
               createParams.agentName,
-              createParams.workingDirectory
+              createParams.workingDirectory,
+              configAllowedPaths
             );
           }
         } catch (err) {
@@ -21766,7 +21965,7 @@ var init_session_factory = __esm({
             message: guidanceLines.join("\n")
           };
           const failedSessionId = createParams.existingSessionId ?? `failed-${Date.now()}`;
-          this.eventBus.emit("agent:event", {
+          this.eventBus.emit(BusEvent.AGENT_EVENT, {
             sessionId: failedSessionId,
             event: guidance
           });
@@ -21792,11 +21991,13 @@ var init_session_factory = __esm({
         }
         session.applySpawnResponse(agentInstance.initialSessionResponse, agentInstance.agentCapabilities);
         this.sessionManager.registerSession(session);
-        this.eventBus.emit("session:created", {
-          sessionId: session.id,
-          agent: session.agentName,
-          status: session.status
-        });
+        if (!session.isAssistant) {
+          this.eventBus.emit(BusEvent.SESSION_CREATED, {
+            sessionId: session.id,
+            agent: session.agentName,
+            status: session.status
+          });
+        }
         return session;
       }
       /**
@@ -21814,6 +22015,7 @@ var init_session_factory = __esm({
         if (!this.sessionStore || !this.createFullSession) return null;
         const record = this.sessionStore.get(sessionId);
         if (!record) return null;
+        if (record.isAssistant) return null;
         if (record.status === "error" || record.status === "cancelled") return null;
         const existing = this.resumeLocks.get(sessionId);
         if (existing) return existing;
@@ -21855,10 +22057,10 @@ var init_session_factory = __esm({
                 session.setAgentCapabilities(record.acpState.agentCapabilities);
               }
             }
-            log34.info({ sessionId }, "Lazy resume by ID successful");
+            log35.info({ sessionId }, "Lazy resume by ID successful");
             return session;
           } catch (err) {
-            log34.error({ err, sessionId }, "Lazy resume by ID failed");
+            log35.error({ err, sessionId }, "Lazy resume by ID failed");
             return null;
           } finally {
             this.resumeLocks.delete(sessionId);
@@ -21878,18 +22080,19 @@ var init_session_factory = __esm({
           (p2) => String(p2.topicId) === threadId || String(p2.threadId ?? "") === threadId
         );
         if (!record) {
-          log34.debug({ threadId, channelId }, "No session record found for thread");
+          log35.debug({ threadId, channelId }, "No session record found for thread");
           return null;
         }
+        if (record.isAssistant) return null;
         if (record.status === "error" || record.status === "cancelled") {
-          log34.warn(
+          log35.warn(
             { threadId, sessionId: record.sessionId, status: record.status },
             "Session record found but skipped (status: %s) \u2014 use /new to start a fresh session",
             record.status
           );
           return null;
         }
-        log34.info({ threadId, sessionId: record.sessionId, status: record.status }, "Lazy resume: found record, attempting resume");
+        log35.info({ threadId, sessionId: record.sessionId, status: record.status }, "Lazy resume: found record, attempting resume");
         const resumePromise = (async () => {
           try {
             const session = await this.createFullSession({
@@ -21930,7 +22133,7 @@ var init_session_factory = __esm({
             }
             const resumeFalledBack = record.agentSessionId && session.agentSessionId !== record.agentSessionId;
             if (resumeFalledBack) {
-              log34.info({ sessionId: session.id }, "Resume fell back to fresh spawn \u2014 injecting conversation history");
+              log35.info({ sessionId: session.id }, "Resume fell back to fresh spawn \u2014 injecting conversation history");
               const contextManager = this.getContextManager?.();
               if (contextManager) {
                 try {
@@ -21947,10 +22150,10 @@ var init_session_factory = __esm({
                 }
               }
             }
-            log34.info({ sessionId: session.id, threadId }, "Lazy resume successful");
+            log35.info({ sessionId: session.id, threadId }, "Lazy resume successful");
             return session;
           } catch (err) {
-            log34.error({ err, record }, "Lazy resume failed");
+            log35.error({ err, record }, "Lazy resume failed");
             const adapter = this.adapters?.get(channelId);
             if (adapter) {
               try {
@@ -21975,7 +22178,7 @@ var init_session_factory = __esm({
         }
         const config = this.configManager.get();
         const resolvedAgent = agentName || config.defaultAgent;
-        log34.info({ channelId, agentName: resolvedAgent }, "New session request");
+        log35.info({ channelId, agentName: resolvedAgent }, "New session request");
         const agentDef = this.agentCatalog.resolve(resolvedAgent);
         const resolvedWorkspace = this.configManager.resolveWorkspace(
           workspacePath || agentDef?.workingDirectory
@@ -22024,7 +22227,7 @@ var init_session_factory = __esm({
               params.contextOptions
             );
           } catch (err) {
-            log34.warn({ err }, "Context building failed, proceeding without context");
+            log35.warn({ err }, "Context building failed, proceeding without context");
           }
         }
         const session = await this.createFullSession({
@@ -22040,9 +22243,9 @@ var init_session_factory = __esm({
         return { session, contextResult };
       }
       wireSideEffects(session, deps) {
-        session.on("agent_event", (event) => {
+        session.on(SessionEv.AGENT_EVENT, (event) => {
           if (event.type !== "usage") return;
-          deps.eventBus.emit("usage:recorded", {
+          deps.eventBus.emit(BusEvent.USAGE_RECORDED, {
             sessionId: session.id,
             agentName: session.agentName,
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -22051,7 +22254,7 @@ var init_session_factory = __esm({
             cost: event.cost
           });
         });
-        session.on("status_change", (_from, to) => {
+        session.on(SessionEv.STATUS_CHANGE, (_from, to) => {
           if ((to === "finished" || to === "cancelled") && deps.tunnelService) {
             deps.tunnelService.stopBySession(session.id).then((stopped) => {
               for (const entry of stopped) {
@@ -22073,13 +22276,14 @@ var init_session_factory = __esm({
 });
 
 // src/core/agent-switch-handler.ts
-var log35, AgentSwitchHandler;
+var log36, AgentSwitchHandler;
 var init_agent_switch_handler = __esm({
   "src/core/agent-switch-handler.ts"() {
     "use strict";
     init_agent_registry();
     init_log();
-    log35 = createChildLogger({ module: "agent-switch" });
+    init_events();
+    log36 = createChildLogger({ module: "agent-switch" });
     AgentSwitchHandler = class {
       constructor(deps) {
         this.deps = deps;
@@ -22104,7 +22308,7 @@ var init_agent_switch_handler = __esm({
         if (!agentDef) throw new Error(`Agent "${toAgent}" is not installed`);
         const fromAgent = session.agentName;
         const middlewareChain = this.deps.getMiddlewareChain();
-        const result = await middlewareChain?.execute("agent:beforeSwitch", {
+        const result = await middlewareChain?.execute(Hook.AGENT_BEFORE_SWITCH, {
           sessionId,
           fromAgent,
           toAgent
@@ -22118,9 +22322,9 @@ var init_agent_switch_handler = __esm({
           type: "system_message",
           message: `Switching from ${fromAgent} to ${toAgent}...`
         };
-        session.emit("agent_event", startEvent);
-        eventBus.emit("agent:event", { sessionId, event: startEvent });
-        eventBus.emit("session:agentSwitch", {
+        session.emit(SessionEv.AGENT_EVENT, startEvent);
+        eventBus.emit(BusEvent.AGENT_EVENT, { sessionId, event: startEvent });
+        eventBus.emit(BusEvent.SESSION_AGENT_SWITCH, {
           sessionId,
           fromAgent,
           toAgent,
@@ -22144,19 +22348,20 @@ var init_agent_switch_handler = __esm({
         }
         const fromAgentSessionId = session.agentSessionId;
         const fileService = this.deps.getService("file-service");
+        const configAllowedPaths = configManager.get().workspace?.security?.allowedPaths ?? [];
         try {
           await session.switchAgent(toAgent, async () => {
             if (canResume) {
               try {
-                const instance2 = await agentManager.resume(toAgent, session.workingDirectory, lastEntry.agentSessionId);
+                const instance2 = await agentManager.resume(toAgent, session.workingDirectory, lastEntry.agentSessionId, configAllowedPaths);
                 if (fileService) instance2.addAllowedPath(fileService.baseDir);
                 resumed = true;
                 return instance2;
               } catch {
-                log35.warn({ sessionId, toAgent }, "Resume failed, falling back to new agent with context injection");
+                log36.warn({ sessionId, toAgent }, "Resume failed, falling back to new agent with context injection");
               }
             }
-            const instance = await agentManager.spawn(toAgent, session.workingDirectory);
+            const instance = await agentManager.spawn(toAgent, session.workingDirectory, configAllowedPaths);
             if (fileService) instance.addAllowedPath(fileService.baseDir);
             try {
               const contextService = this.deps.getService("context");
@@ -22180,9 +22385,9 @@ var init_agent_switch_handler = __esm({
             type: "system_message",
             message: resumed ? `Switched to ${toAgent} (resumed previous session).` : `Switched to ${toAgent} (new session).`
           };
-          session.emit("agent_event", successEvent);
-          eventBus.emit("agent:event", { sessionId, event: successEvent });
-          eventBus.emit("session:agentSwitch", {
+          session.emit(SessionEv.AGENT_EVENT, successEvent);
+          eventBus.emit(BusEvent.AGENT_EVENT, { sessionId, event: successEvent });
+          eventBus.emit(BusEvent.SESSION_AGENT_SWITCH, {
             sessionId,
             fromAgent,
             toAgent,
@@ -22195,9 +22400,9 @@ var init_agent_switch_handler = __esm({
             type: "system_message",
             message: `Failed to switch to ${toAgent}: ${errorMessage}`
           };
-          session.emit("agent_event", failedEvent);
-          eventBus.emit("agent:event", { sessionId, event: failedEvent });
-          eventBus.emit("session:agentSwitch", {
+          session.emit(SessionEv.AGENT_EVENT, failedEvent);
+          eventBus.emit(BusEvent.AGENT_EVENT, { sessionId, event: failedEvent });
+          eventBus.emit(BusEvent.SESSION_AGENT_SWITCH, {
             sessionId,
             fromAgent,
             toAgent,
@@ -22222,10 +22427,10 @@ var init_agent_switch_handler = __esm({
                 createBridge(session, adapter, adapterId).connect();
               }
             }
-            log35.warn({ sessionId, fromAgent, toAgent, err }, "Agent switch failed, rolled back to previous agent");
+            log36.warn({ sessionId, fromAgent, toAgent, err }, "Agent switch failed, rolled back to previous agent");
           } catch (rollbackErr) {
             session.fail(`Switch failed and rollback failed: ${rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr)}`);
-            log35.error({ sessionId, fromAgent, toAgent, err, rollbackErr }, "Agent switch failed and rollback also failed");
+            log36.error({ sessionId, fromAgent, toAgent, err, rollbackErr }, "Agent switch failed and rollback also failed");
           }
           throw err;
         }
@@ -22235,7 +22440,7 @@ var init_agent_switch_handler = __esm({
             if (adapter) {
               createBridge(session, adapter, adapterId).connect();
             } else {
-              log35.warn({ sessionId, adapterId }, "Adapter not available during switch reconnect, skipping bridge");
+              log36.warn({ sessionId, adapterId }, "Adapter not available during switch reconnect, skipping bridge");
             }
           }
         }
@@ -22246,7 +22451,7 @@ var init_agent_switch_handler = __esm({
           currentPromptCount: 0,
           agentSwitchHistory: session.agentSwitchHistory
         });
-        middlewareChain?.execute("agent:afterSwitch", {
+        middlewareChain?.execute(Hook.AGENT_AFTER_SWITCH, {
           sessionId,
           fromAgent,
           toAgent,
@@ -22268,12 +22473,12 @@ import * as fs43 from "fs";
 import * as path47 from "path";
 import * as os20 from "os";
 import { z as z10 } from "zod";
-var log36, InstalledAgentSchema, AgentStoreSchema, AgentStore;
+var log37, InstalledAgentSchema, AgentStoreSchema, AgentStore;
 var init_agent_store = __esm({
   "src/core/agents/agent-store.ts"() {
     "use strict";
     init_log();
-    log36 = createChildLogger({ module: "agent-store" });
+    log37 = createChildLogger({ module: "agent-store" });
     InstalledAgentSchema = z10.object({
       registryId: z10.string().nullable(),
       name: z10.string(),
@@ -22307,11 +22512,11 @@ var init_agent_store = __esm({
           if (result.success) {
             this.data = result.data;
           } else {
-            log36.warn({ errors: result.error.issues }, "Invalid agents.json, starting fresh");
+            log37.warn({ errors: result.error.issues }, "Invalid agents.json, starting fresh");
             this.data = { version: 1, installed: {} };
           }
         } catch (err) {
-          log36.warn({ err }, "Failed to read agents.json, starting fresh");
+          log37.warn({ err }, "Failed to read agents.json, starting fresh");
           this.data = { version: 1, installed: {} };
         }
       }
@@ -22353,7 +22558,7 @@ __export(agent_catalog_exports, {
 import * as fs44 from "fs";
 import * as path48 from "path";
 import * as os21 from "os";
-var log37, REGISTRY_URL2, DEFAULT_TTL_HOURS, AgentCatalog;
+var log38, REGISTRY_URL2, DEFAULT_TTL_HOURS, AgentCatalog;
 var init_agent_catalog = __esm({
   "src/core/agents/agent-catalog.ts"() {
     "use strict";
@@ -22361,7 +22566,7 @@ var init_agent_catalog = __esm({
     init_agent_installer();
     init_agent_dependencies();
     init_log();
-    log37 = createChildLogger({ module: "agent-catalog" });
+    log38 = createChildLogger({ module: "agent-catalog" });
     REGISTRY_URL2 = "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json";
     DEFAULT_TTL_HOURS = 24;
     AgentCatalog = class {
@@ -22382,7 +22587,7 @@ var init_agent_catalog = __esm({
       // --- Registry ---
       async fetchRegistry() {
         try {
-          log37.info("Fetching agent registry from CDN...");
+          log38.info("Fetching agent registry from CDN...");
           const response = await fetch(REGISTRY_URL2);
           if (!response.ok) throw new Error(`HTTP ${response.status}`);
           const data = await response.json();
@@ -22394,9 +22599,9 @@ var init_agent_catalog = __esm({
           };
           fs44.mkdirSync(path48.dirname(this.cachePath), { recursive: true });
           fs44.writeFileSync(this.cachePath, JSON.stringify(cache, null, 2), { mode: 384 });
-          log37.info({ count: this.registryAgents.length }, "Registry updated");
+          log38.info({ count: this.registryAgents.length }, "Registry updated");
         } catch (err) {
-          log37.warn({ err }, "Failed to fetch registry, using cached data");
+          log38.warn({ err }, "Failed to fetch registry, using cached data");
         }
       }
       async refreshRegistryIfStale() {
@@ -22557,7 +22762,7 @@ var init_agent_catalog = __esm({
           }
         }
         if (changed) {
-          log37.info("Enriched installed agents with registry data");
+          log38.info("Enriched installed agents with registry data");
         }
       }
       isCacheStale() {
@@ -22577,11 +22782,11 @@ var init_agent_catalog = __esm({
             const raw = JSON.parse(fs44.readFileSync(this.cachePath, "utf-8"));
             if (raw.data?.agents) {
               this.registryAgents = raw.data.agents;
-              log37.debug({ count: this.registryAgents.length }, "Loaded registry from cache");
+              log38.debug({ count: this.registryAgents.length }, "Loaded registry from cache");
               return;
             }
           } catch {
-            log37.warn("Failed to load registry cache");
+            log38.warn("Failed to load registry cache");
           }
         }
         try {
@@ -22594,13 +22799,13 @@ var init_agent_catalog = __esm({
             if (fs44.existsSync(candidate)) {
               const raw = JSON.parse(fs44.readFileSync(candidate, "utf-8"));
               this.registryAgents = raw.agents ?? [];
-              log37.debug({ count: this.registryAgents.length }, "Loaded registry from bundled snapshot");
+              log38.debug({ count: this.registryAgents.length }, "Loaded registry from bundled snapshot");
               return;
             }
           }
-          log37.warn("No registry data available (no cache, no snapshot)");
+          log38.warn("No registry data available (no cache, no snapshot)");
         } catch {
-          log37.warn("Failed to load bundled registry snapshot");
+          log38.warn("Failed to load bundled registry snapshot");
         }
       }
     };
@@ -22986,7 +23191,7 @@ function createPluginContext(opts) {
     }
   };
   const baseLog = opts.log ?? noopLog;
-  const log46 = typeof baseLog.child === "function" ? baseLog.child({ plugin: pluginName }) : baseLog;
+  const log47 = typeof baseLog.child === "function" ? baseLog.child({ plugin: pluginName }) : baseLog;
   const storageImpl = new PluginStorageImpl(storagePath);
   const storage = {
     async get(key) {
@@ -23013,7 +23218,7 @@ function createPluginContext(opts) {
   const ctx = {
     pluginName,
     pluginConfig,
-    log: log46,
+    log: log47,
     storage,
     on(event, handler) {
       requirePermission(permissions, "events:read", "on()");
@@ -23048,7 +23253,7 @@ function createPluginContext(opts) {
       const registry = serviceRegistry.get("command-registry");
       if (registry && typeof registry.register === "function") {
         registry.register(def, pluginName);
-        log46.debug(`Command '/${def.name}' registered`);
+        log47.debug(`Command '/${def.name}' registered`);
       }
     },
     async sendMessage(_sessionId, _content) {
@@ -23091,7 +23296,7 @@ function createPluginContext(opts) {
       const registry = serviceRegistry.get("field-registry");
       if (registry && typeof registry.register === "function") {
         registry.register(pluginName, fields);
-        log46.debug(`Registered ${fields.length} editable field(s) for ${pluginName}`);
+        log47.debug(`Registered ${fields.length} editable field(s) for ${pluginName}`);
       }
     },
     get sessions() {
@@ -23197,6 +23402,7 @@ var init_lifecycle_manager = __esm({
     init_middleware_chain();
     init_error_tracker();
     init_plugin_context();
+    init_events();
     SETUP_TIMEOUT_MS = 3e4;
     TEARDOWN_TIMEOUT_MS = 1e4;
     LifecycleManager = class {
@@ -23303,7 +23509,7 @@ var init_lifecycle_manager = __esm({
           }
           const registryEntry = this.pluginRegistry?.get(plugin2.name);
           if (registryEntry && registryEntry.enabled === false) {
-            this.eventBus?.emit("plugin:disabled", { name: plugin2.name });
+            this.eventBus?.emit(BusEvent.PLUGIN_DISABLED, { name: plugin2.name });
             continue;
           }
           if (registryEntry && plugin2.migrate && registryEntry.version !== plugin2.version && this.settingsManager) {
@@ -23346,7 +23552,7 @@ var init_lifecycle_manager = __esm({
             if (!validation.valid) {
               this._failed.add(plugin2.name);
               this.getPluginLogger(plugin2.name).error(`Settings validation failed: ${validation.errors?.join("; ")}`);
-              this.eventBus?.emit("plugin:failed", { name: plugin2.name, error: `Settings validation failed: ${validation.errors?.join("; ")}` });
+              this.eventBus?.emit(BusEvent.PLUGIN_FAILED, { name: plugin2.name, error: `Settings validation failed: ${validation.errors?.join("; ")}` });
               continue;
             }
           }
@@ -23369,13 +23575,13 @@ var init_lifecycle_manager = __esm({
             await withTimeout(plugin2.setup(ctx), SETUP_TIMEOUT_MS, `${plugin2.name}.setup()`);
             this.contexts.set(plugin2.name, ctx);
             this._loaded.add(plugin2.name);
-            this.eventBus?.emit("plugin:loaded", { name: plugin2.name, version: plugin2.version });
+            this.eventBus?.emit(BusEvent.PLUGIN_LOADED, { name: plugin2.name, version: plugin2.version });
           } 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) });
+            this.eventBus?.emit(BusEvent.PLUGIN_FAILED, { name: plugin2.name, error: String(err) });
           }
         }
       }
@@ -23396,7 +23602,7 @@ var init_lifecycle_manager = __esm({
         this._loaded.delete(name);
         this._failed.delete(name);
         this.loadOrder = this.loadOrder.filter((p2) => p2.name !== name);
-        this.eventBus?.emit("plugin:unloaded", { name });
+        this.eventBus?.emit(BusEvent.PLUGIN_UNLOADED, { name });
       }
       async shutdown() {
         const reversed = [...this.loadOrder].reverse();
@@ -23413,7 +23619,7 @@ var init_lifecycle_manager = __esm({
             ctx.cleanup();
             this.contexts.delete(plugin2.name);
           }
-          this.eventBus?.emit("plugin:unloaded", { name: plugin2.name });
+          this.eventBus?.emit(BusEvent.PLUGIN_UNLOADED, { name: plugin2.name });
         }
         this._loaded.clear();
         this.loadOrder = [];
@@ -23423,12 +23629,12 @@ var init_lifecycle_manager = __esm({
 });
 
 // src/core/menu-registry.ts
-var log38, MenuRegistry;
+var log39, MenuRegistry;
 var init_menu_registry = __esm({
   "src/core/menu-registry.ts"() {
     "use strict";
     init_log();
-    log38 = createChildLogger({ module: "menu-registry" });
+    log39 = createChildLogger({ module: "menu-registry" });
     MenuRegistry = class {
       items = /* @__PURE__ */ new Map();
       register(item) {
@@ -23447,7 +23653,7 @@ var init_menu_registry = __esm({
           try {
             return item.visible();
           } catch (err) {
-            log38.warn({ err, id: item.id }, "MenuItem visible() threw, hiding item");
+            log39.warn({ err, id: item.id }, "MenuItem visible() threw, hiding item");
             return false;
           }
         }).sort((a, b) => a.priority - b.priority);
@@ -23520,13 +23726,13 @@ Talk to users like a helpful assistant, not a CLI manual.`;
 });
 
 // src/core/assistant/assistant-registry.ts
-var log39, AssistantRegistry;
+var log40, AssistantRegistry;
 var init_assistant_registry = __esm({
   "src/core/assistant/assistant-registry.ts"() {
     "use strict";
     init_log();
     init_prompt_constants();
-    log39 = createChildLogger({ module: "assistant-registry" });
+    log40 = createChildLogger({ module: "assistant-registry" });
     AssistantRegistry = class {
       sections = /* @__PURE__ */ new Map();
       _instanceRoot = "";
@@ -23536,7 +23742,7 @@ var init_assistant_registry = __esm({
       }
       register(section) {
         if (this.sections.has(section.id)) {
-          log39.warn({ id: section.id }, "Assistant section overwritten");
+          log40.warn({ id: section.id }, "Assistant section overwritten");
         }
         this.sections.set(section.id, section);
       }
@@ -23561,7 +23767,7 @@ ${context}`);
               parts.push("```bash\n" + cmds + "\n```");
             }
           } catch (err) {
-            log39.warn({ err, sectionId: section.id }, "Assistant section buildContext() failed, skipping");
+            log40.warn({ err, sectionId: section.id }, "Assistant section buildContext() failed, skipping");
           }
         }
         parts.push(buildAssistantGuidelines(this._instanceRoot));
@@ -23572,33 +23778,37 @@ ${context}`);
 });
 
 // src/core/assistant/assistant-manager.ts
-var log40, AssistantManager;
+var log41, AssistantManager;
 var init_assistant_manager = __esm({
   "src/core/assistant/assistant-manager.ts"() {
     "use strict";
     init_log();
-    log40 = createChildLogger({ module: "assistant-manager" });
+    log41 = createChildLogger({ module: "assistant-manager" });
     AssistantManager = class {
       constructor(core, registry) {
         this.core = core;
         this.registry = registry;
       }
       sessions = /* @__PURE__ */ new Map();
-      respawning = /* @__PURE__ */ new Set();
       pendingSystemPrompts = /* @__PURE__ */ new Map();
-      async spawn(channelId, threadId) {
+      async getOrSpawn(channelId, threadId) {
+        const existing = this.core.sessionStore?.findAssistant(channelId);
         const session = await this.core.createSession({
           channelId,
           agentName: this.core.configManager.get().defaultAgent,
           workingDirectory: this.core.configManager.resolveWorkspace(),
           initialName: "Assistant",
           isAssistant: true,
-          threadId
+          threadId,
+          existingSessionId: existing?.sessionId
         });
         this.sessions.set(channelId, session);
         const systemPrompt = this.registry.buildSystemPrompt(channelId);
         this.pendingSystemPrompts.set(channelId, systemPrompt);
-        log40.info({ sessionId: session.id, channelId }, "Assistant spawned (system prompt deferred)");
+        log41.info(
+          { sessionId: session.id, channelId, reused: !!existing },
+          existing ? "Assistant session reused (system prompt deferred)" : "Assistant spawned (system prompt deferred)"
+        );
         return session;
       }
       get(channelId) {
@@ -23619,19 +23829,6 @@ var init_assistant_manager = __esm({
         }
         return false;
       }
-      async respawn(channelId, threadId) {
-        if (this.respawning.has(channelId)) {
-          return this.sessions.get(channelId);
-        }
-        this.respawning.add(channelId);
-        try {
-          const old = this.sessions.get(channelId);
-          if (old) await old.destroy();
-          return await this.spawn(channelId, threadId);
-        } finally {
-          this.respawning.delete(channelId);
-        }
-      }
     };
   }
 });
@@ -23844,7 +24041,7 @@ var init_core_items = __esm({
 import path51 from "path";
 import os23 from "os";
 import { nanoid as nanoid5 } from "nanoid";
-var log41, OpenACPCore;
+var log42, OpenACPCore;
 var init_core = __esm({
   "src/core/core.ts"() {
     "use strict";
@@ -23868,7 +24065,8 @@ var init_core = __esm({
     init_middleware_chain();
     init_error_tracker();
     init_log();
-    log41 = createChildLogger({ module: "core" });
+    init_events();
+    log42 = createChildLogger({ module: "core" });
     OpenACPCore = class {
       configManager;
       agentCatalog;
@@ -23983,7 +24181,7 @@ var init_core = __esm({
             if (configPath === "logging.level" && typeof value === "string") {
               const { setLogLevel: setLogLevel2 } = await Promise.resolve().then(() => (init_log(), log_exports));
               setLogLevel2(value);
-              log41.info({ level: value }, "Log level changed at runtime");
+              log42.info({ level: value }, "Log level changed at runtime");
             }
             if (configPath.startsWith("speech.")) {
               const speechSvc = this.lifecycleManager.serviceRegistry.get("speech");
@@ -24007,7 +24205,7 @@ var init_core = __esm({
                     }
                   };
                   speechSvc.refreshProviders(newSpeechConfig);
-                  log41.info("Speech service config updated at runtime (from plugin settings)");
+                  log42.info("Speech service config updated at runtime (from plugin settings)");
                 }
               }
             }
@@ -24037,14 +24235,14 @@ var init_core = __esm({
       }
       async start() {
         this.agentCatalog.refreshRegistryIfStale().catch((err) => {
-          log41.warn({ err }, "Background registry refresh failed");
+          log42.warn({ err }, "Background registry refresh failed");
         });
         const failures = [];
         for (const [name, adapter] of this.adapters.entries()) {
           try {
             await adapter.start();
           } catch (err) {
-            log41.error({ err, adapter: name }, `Adapter "${name}" failed to start`);
+            log42.error({ err, adapter: name }, `Adapter "${name}" failed to start`);
             failures.push({ name, error: err });
           }
         }
@@ -24092,7 +24290,7 @@ var init_core = __esm({
       }
       // --- Message Routing ---
       async handleMessage(message) {
-        log41.debug(
+        log42.debug(
           {
             channelId: message.channelId,
             threadId: message.threadId,
@@ -24102,7 +24300,7 @@ var init_core = __esm({
         );
         if (this.lifecycleManager?.middlewareChain) {
           const result = await this.lifecycleManager.middlewareChain.execute(
-            "message:incoming",
+            Hook.MESSAGE_INCOMING,
             message,
             async (msg) => msg
           );
@@ -24111,7 +24309,7 @@ var init_core = __esm({
         }
         const access2 = await this.securityGuard.checkAccess(message);
         if (!access2.allowed) {
-          log41.warn({ userId: message.userId, reason: access2.reason }, "Access denied");
+          log42.warn({ userId: message.userId, reason: access2.reason }, "Access denied");
           if (access2.reason.includes("Session limit")) {
             const adapter = this.adapters.get(message.channelId);
             if (adapter) {
@@ -24125,7 +24323,7 @@ var init_core = __esm({
         }
         let session = await this.sessionFactory.getOrResume(message.channelId, message.threadId);
         if (!session) {
-          log41.warn(
+          log42.warn(
             { channelId: message.channelId, threadId: message.threadId },
             "No session found for thread (in-memory miss + lazy resume returned null)"
           );
@@ -24154,9 +24352,10 @@ ${text6}`;
           }
         }
         const sourceAdapterId = message.routing?.sourceAdapterId ?? message.channelId;
+        const routing = sourceAdapterId !== message.routing?.sourceAdapterId ? { ...message.routing, sourceAdapterId } : message.routing;
         if (sourceAdapterId && sourceAdapterId !== "sse" && sourceAdapterId !== "api") {
           const turnId = nanoid5(8);
-          this.eventBus.emit("message:queued", {
+          this.eventBus.emit(BusEvent.MESSAGE_QUEUED, {
             sessionId: session.id,
             turnId,
             text: text6,
@@ -24165,9 +24364,9 @@ ${text6}`;
             timestamp: (/* @__PURE__ */ new Date()).toISOString(),
             queueDepth: session.queueDepth
           });
-          await session.enqueuePrompt(text6, message.attachments, message.routing, turnId);
+          await session.enqueuePrompt(text6, message.attachments, routing, turnId);
         } else {
-          await session.enqueuePrompt(text6, message.attachments, message.routing);
+          await session.enqueuePrompt(text6, message.attachments, routing);
         }
       }
       // --- Unified Session Creation Pipeline ---
@@ -24211,6 +24410,7 @@ ${text6}`;
           createdAt: session.createdAt.toISOString(),
           lastActiveAt: (/* @__PURE__ */ new Date()).toISOString(),
           name: session.name,
+          isAssistant: params.isAssistant,
           platform: platform2,
           platforms,
           firstAgent: session.firstAgent,
@@ -24223,10 +24423,10 @@ ${text6}`;
           const bridge = this.createBridge(session, adapter, session.channelId);
           bridge.connect();
           adapter.flushPendingSkillCommands?.(session.id).catch((err) => {
-            log41.warn({ err, sessionId: session.id }, "Failed to flush pending skill commands");
+            log42.warn({ err, sessionId: session.id }, "Failed to flush pending skill commands");
           });
           if (params.createThread && session.threadId) {
-            this.eventBus.emit("session:threadReady", {
+            this.eventBus.emit(BusEvent.SESSION_THREAD_READY, {
               sessionId: session.id,
               channelId: params.channelId,
               threadId: session.threadId
@@ -24237,26 +24437,56 @@ ${text6}`;
           session.agentInstance.onPermissionRequest = async (permRequest) => {
             const allowOption = permRequest.options.find((o) => o.isAllow);
             if (!allowOption) {
-              log41.warn(
+              log42.warn(
                 { sessionId: session.id, permissionId: permRequest.id, description: permRequest.description },
                 "Headless session has no allow option for permission request \u2014 skipping auto-approve, will time out"
               );
               return new Promise(() => {
               });
             }
-            log41.warn(
+            log42.warn(
               { sessionId: session.id, permissionId: permRequest.id, option: allowOption.id },
               `Auto-approving permission "${permRequest.description}" for headless session \u2014 no adapter connected`
             );
             return allowOption.id;
           };
+          session.on(SessionEv.NAMED, async (name) => {
+            await this.sessionManager.patchRecord(session.id, { name });
+            this.eventBus.emit(BusEvent.SESSION_UPDATED, { sessionId: session.id, name });
+          });
+          const mw = () => this.lifecycleManager?.middlewareChain;
+          session.on(SessionEv.AGENT_EVENT, async (event) => {
+            let processedEvent = event;
+            const chain = mw();
+            if (chain) {
+              const result = await chain.execute(Hook.AGENT_BEFORE_EVENT, { sessionId: session.id, event }, async (e) => e);
+              if (!result) return;
+              processedEvent = result.event;
+            }
+            if (processedEvent.type === "session_end") {
+              session.finish(processedEvent.reason);
+            } else if (processedEvent.type === "error") {
+              session.fail(processedEvent.message);
+            }
+            this.eventBus.emit(BusEvent.AGENT_EVENT, { sessionId: session.id, event: processedEvent });
+          });
+          session.on(SessionEv.STATUS_CHANGE, (_from, to) => {
+            this.sessionManager.patchRecord(session.id, {
+              status: to,
+              lastActiveAt: (/* @__PURE__ */ new Date()).toISOString()
+            });
+            this.eventBus.emit(BusEvent.SESSION_UPDATED, { sessionId: session.id, status: to });
+          });
+          session.on(SessionEv.PROMPT_COUNT_CHANGED, (count) => {
+            this.sessionManager.patchRecord(session.id, { currentPromptCount: count });
+          });
         }
         this.sessionFactory.wireSideEffects(session, {
           eventBus: this.eventBus,
           notificationManager: this.notificationManager,
           tunnelService: this._tunnelService
         });
-        log41.info(
+        log42.info(
           { sessionId: session.id, agentName: params.agentName },
           "Session created via pipeline"
         );
@@ -24706,18 +24936,6 @@ Prompts: ${session.promptCount}` };
       return { type: "list", title: "\u{1F4CB} Sessions", items };
     }
   });
-  registry.register({
-    name: "clear",
-    description: "Clear session history",
-    category: "system",
-    handler: async (args2) => {
-      if (!core.assistantManager) return { type: "error", message: "Assistant not available" };
-      const assistant = core.assistantManager.get(args2.channelId);
-      if (!assistant) return { type: "error", message: "No assistant session for this channel." };
-      await core.assistantManager.respawn(args2.channelId, assistant.threadId);
-      return { type: "text", text: "\u2705 Assistant history cleared." };
-    }
-  });
   registry.register({
     name: "newchat",
     description: "New chat, same agent & workspace",
@@ -25244,10 +25462,10 @@ function registerCategoryCommand(registry, core, category, commandName) {
       }
       try {
         await session.setConfigOption(configOption.id, { type: "select", value: raw });
-        core.eventBus.emit("session:configChanged", { sessionId: session.id });
+        core.eventBus.emit(BusEvent.SESSION_CONFIG_CHANGED, { sessionId: session.id });
         return { type: "text", text: labels.successMsg(match.name, configOption.name) };
       } catch (err) {
-        log42.error({ err, commandName, configId: configOption.id }, "setConfigOption failed");
+        log43.error({ err, commandName, configId: configOption.id }, "setConfigOption failed");
         const msg = err instanceof Error ? err.message : typeof err === "object" && err !== null && typeof err.message === "string" ? err.message : String(err);
         return { type: "error", message: `Could not change ${commandName}: ${msg}` };
       }
@@ -25306,13 +25524,13 @@ function registerDangerousCommand(registry, core) {
         try {
           const targetValue = wantOn ? bypassValue : nonBypassDefault;
           await session.setConfigOption(modeConfig.id, { type: "select", value: targetValue });
-          core.eventBus.emit("session:configChanged", { sessionId: session.id });
+          core.eventBus.emit(BusEvent.SESSION_CONFIG_CHANGED, { sessionId: session.id });
           return {
             type: "text",
             text: wantOn ? "\u2620\uFE0F **Bypass Permissions enabled** \u2014 all permission requests will be auto-approved. The agent can run any action without asking." : "\u{1F510} **Bypass Permissions disabled** \u2014 you will be asked to approve risky actions."
           };
         } catch (err) {
-          log42.error({ err }, "setConfigOption failed (bypass toggle)");
+          log43.error({ err }, "setConfigOption failed (bypass toggle)");
           const msg = err instanceof Error ? err.message : typeof err === "object" && err !== null && typeof err.message === "string" ? err.message : String(err);
           return { type: "error", message: `Could not toggle bypass: ${msg}` };
         }
@@ -25321,7 +25539,7 @@ function registerDangerousCommand(registry, core) {
       await core.sessionManager.patchRecord(session.id, {
         clientOverrides: { ...session.clientOverrides }
       });
-      core.eventBus.emit("session:configChanged", { sessionId: session.id });
+      core.eventBus.emit(BusEvent.SESSION_CONFIG_CHANGED, { sessionId: session.id });
       return {
         type: "text",
         text: wantOn ? "\u2620\uFE0F **Bypass Permissions enabled** (client-side) \u2014 all permission requests will be auto-approved.\n\n_Note: This agent doesn't natively support bypass mode, so OpenACP will auto-approve on your behalf._" : "\u{1F510} **Bypass Permissions disabled** \u2014 you will be asked to approve risky actions."
@@ -25336,14 +25554,15 @@ function registerConfigCommands(registry, _core) {
   registerCategoryCommand(registry, core, "thought_level", "thought");
   registerDangerousCommand(registry, core);
 }
-var log42, CATEGORY_LABELS;
+var log43, CATEGORY_LABELS;
 var init_config6 = __esm({
   "src/core/commands/config.ts"() {
     "use strict";
     init_log();
+    init_events();
     init_bypass_detection();
     init_bypass_detection();
-    log42 = createChildLogger({ module: "commands/config" });
+    log43 = createChildLogger({ module: "commands/config" });
     CATEGORY_LABELS = {
       mode: {
         menuTitle: (cur) => `Choose session mode (current: ${cur})`,
@@ -25755,7 +25974,7 @@ function installAutoStart(logDir2) {
       fs46.mkdirSync(dir, { recursive: true });
       fs46.writeFileSync(LAUNCHD_PLIST_PATH, plist);
       execFileSync8("launchctl", ["load", LAUNCHD_PLIST_PATH], { stdio: "pipe" });
-      log43.info("LaunchAgent installed");
+      log44.info("LaunchAgent installed");
       return { success: true };
     }
     if (process.platform === "linux") {
@@ -25765,13 +25984,13 @@ function installAutoStart(logDir2) {
       fs46.writeFileSync(SYSTEMD_SERVICE_PATH, unit);
       execFileSync8("systemctl", ["--user", "daemon-reload"], { stdio: "pipe" });
       execFileSync8("systemctl", ["--user", "enable", "openacp"], { stdio: "pipe" });
-      log43.info("systemd user service installed");
+      log44.info("systemd user service installed");
       return { success: true };
     }
     return { success: false, error: "Unsupported platform" };
   } catch (e) {
     const msg = e.message;
-    log43.error({ err: msg }, "Failed to install auto-start");
+    log44.error({ err: msg }, "Failed to install auto-start");
     return { success: false, error: msg };
   }
 }
@@ -25787,7 +26006,7 @@ function uninstallAutoStart() {
         } catch {
         }
         fs46.unlinkSync(LAUNCHD_PLIST_PATH);
-        log43.info("LaunchAgent removed");
+        log44.info("LaunchAgent removed");
       }
       return { success: true };
     }
@@ -25799,14 +26018,14 @@ function uninstallAutoStart() {
         }
         fs46.unlinkSync(SYSTEMD_SERVICE_PATH);
         execFileSync8("systemctl", ["--user", "daemon-reload"], { stdio: "pipe" });
-        log43.info("systemd user service removed");
+        log44.info("systemd user service removed");
       }
       return { success: true };
     }
     return { success: false, error: "Unsupported platform" };
   } catch (e) {
     const msg = e.message;
-    log43.error({ err: msg }, "Failed to uninstall auto-start");
+    log44.error({ err: msg }, "Failed to uninstall auto-start");
     return { success: false, error: msg };
   }
 }
@@ -25819,12 +26038,12 @@ function isAutoStartInstalled() {
   }
   return false;
 }
-var log43, LAUNCHD_LABEL, LAUNCHD_PLIST_PATH, SYSTEMD_SERVICE_PATH;
+var log44, LAUNCHD_LABEL, LAUNCHD_PLIST_PATH, SYSTEMD_SERVICE_PATH;
 var init_autostart = __esm({
   "src/cli/autostart.ts"() {
     "use strict";
     init_log();
-    log43 = createChildLogger({ module: "autostart" });
+    log44 = createChildLogger({ module: "autostart" });
     LAUNCHD_LABEL = "com.openacp.daemon";
     LAUNCHD_PLIST_PATH = path52.join(os24.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
     SYSTEMD_SERVICE_PATH = path52.join(os24.homedir(), ".config", "systemd", "user", "openacp.service");
@@ -25927,7 +26146,7 @@ async function setupIntegrations() {
       if (integration) {
         for (const item of integration.items) {
           const result = await item.install();
-          for (const log46 of result.logs) console.log(`  ${log46}`);
+          for (const log47 of result.logs) console.log(`  ${log47}`);
         }
       }
       console.log("Claude CLI integration installed.\n");
@@ -26620,7 +26839,7 @@ async function runSetup(configManager, opts) {
     const config = {
       instanceName,
       defaultAgent,
-      workspace: { ...workspace, security: { allowedPaths: [], envWhitelist: [] } },
+      workspace: { ...workspace, allowExternalWorkspaces: true, security: { allowedPaths: [], envWhitelist: [] } },
       logging: {
         level: "info",
         logDir: path56.join(instanceRoot, "logs"),
@@ -26869,14 +27088,14 @@ async function runPostUpgradeChecks(config) {
           const { ensureCloudflared: ensureCloudflared2 } = await Promise.resolve().then(() => (init_install_cloudflared(), install_cloudflared_exports));
           await ensureCloudflared2();
         } catch (err) {
-          log45.warn(
+          log46.warn(
             { err: err.message },
             "Could not install cloudflared. Tunnel may not work."
           );
         }
       } else {
         if (!commandExists(tunnelProvider)) {
-          log45.warn(
+          log46.warn(
             `Tunnel provider "${tunnelProvider}" is not installed. Install it or switch to cloudflare (free, auto-installed).`
           );
         }
@@ -26890,7 +27109,7 @@ async function runPostUpgradeChecks(config) {
     if (integration) {
       const allInstalled = integration.items.every((item) => item.isInstalled());
       if (!allInstalled) {
-        log45.info(
+        log46.info(
           'Claude CLI integration not installed. Run "openacp integrate claude" for session transfer + tunnel skill.'
         );
       }
@@ -26900,7 +27119,7 @@ async function runPostUpgradeChecks(config) {
           const { ensureJq: ensureJq2 } = await Promise.resolve().then(() => (init_install_jq(), install_jq_exports));
           await ensureJq2();
         } catch (err) {
-          log45.warn(
+          log46.warn(
             { err: err.message },
             "Could not install jq. Handoff hooks may not work."
           );
@@ -26910,7 +27129,7 @@ async function runPostUpgradeChecks(config) {
   } catch {
   }
   if (!commandExists("unzip")) {
-    log45.warn(
+    log46.warn(
       "unzip is not installed. Some agent installations (binary distribution) may fail. Install: brew install unzip (macOS) or apt install unzip (Linux)"
     );
   }
@@ -26923,20 +27142,20 @@ async function runPostUpgradeChecks(config) {
       (a) => a.distribution === "uvx"
     );
     if (hasUvxAgent && !commandExists("uvx")) {
-      log45.warn(
+      log46.warn(
         "uvx is not installed but you have Python-based agents. Install: pip install uv"
       );
     }
   } catch {
   }
 }
-var log45;
+var log46;
 var init_post_upgrade = __esm({
   "src/cli/post-upgrade.ts"() {
     "use strict";
     init_log();
     init_agent_dependencies();
-    log45 = createChildLogger({ module: "post-upgrade" });
+    log46 = createChildLogger({ module: "post-upgrade" });
   }
 });
 
@@ -27069,7 +27288,7 @@ async function startServer(opts) {
   serviceRegistry.register("field-registry", fieldRegistry, "core");
   registerSystemCommands(commandRegistry, core);
   try {
-    core.eventBus.emit("kernel:booted");
+    core.eventBus.emit(BusEvent.KERNEL_BOOTED);
     core.lifecycleManager.settingsManager = settingsManager;
     core.lifecycleManager.pluginRegistry = pluginRegistry;
     await core.lifecycleManager.boot(corePlugins);
@@ -27182,8 +27401,8 @@ async function startServer(opts) {
     if (tunnelSvc) {
       core.tunnelService = tunnelSvc;
     }
-    core.eventBus.emit("system:commands-ready", { commands: commandRegistry.getAll() });
-    core.eventBus.emit("system:ready");
+    core.eventBus.emit(BusEvent.SYSTEM_COMMANDS_READY, { commands: commandRegistry.getAll() });
+    core.eventBus.emit(BusEvent.SYSTEM_READY);
   } catch (err) {
     if (spinner4) {
       spinner4.fail("Plugin boot failed");
@@ -27419,6 +27638,7 @@ var init_main = __esm({
     init_commands4();
     init_instance_registry();
     init_plugin_field_registry();
+    init_events();
     RESTART_EXIT_CODE = 75;
     shuttingDown = false;
     isDirectExecution = process.argv[1]?.endsWith("main.js");
@@ -29165,6 +29385,15 @@ async function uninstallPlugin(name, purge, instanceRoot, json = false) {
 init_api_client();
 init_helpers();
 init_output();
+function extractApiError(data, fallback = "API request failed") {
+  const err = data.error;
+  if (!err) return fallback;
+  if (typeof err === "string") return err;
+  if (typeof err === "object" && err !== null && "message" in err) {
+    return String(err.message);
+  }
+  return fallback;
+}
 function printApiHelp() {
   console.log(`
 \x1B[1mopenacp api\x1B[0m \u2014 Interact with the running OpenACP daemon
@@ -29458,8 +29687,8 @@ Shows the version of the currently running daemon process.
       });
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29482,8 +29711,8 @@ Shows the version of the currently running daemon process.
       });
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess({ cancelled: true, sessionId });
@@ -29547,8 +29776,8 @@ Shows the version of the currently running daemon process.
         process.exit(1);
       }
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29594,8 +29823,8 @@ Shows the version of the currently running daemon process.
       });
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29610,8 +29839,8 @@ Shows the version of the currently running daemon process.
       const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}`);
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29648,8 +29877,8 @@ Shows the version of the currently running daemon process.
       });
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29659,8 +29888,8 @@ Shows the version of the currently running daemon process.
       const res = await call("/api/health");
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29685,8 +29914,8 @@ Shows the version of the currently running daemon process.
       const res = await call("/api/restart", { method: "POST" });
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess({ restarted: true });
@@ -29698,8 +29927,8 @@ Shows the version of the currently running daemon process.
         const res = await call("/api/config");
         const data = await res.json();
         if (!res.ok) {
-          if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-          console.error(`Error: ${data.error}`);
+          if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+          console.error(`Error: ${extractApiError(data)}`);
           process.exit(1);
         }
         if (json) jsonSuccess(data);
@@ -29724,8 +29953,8 @@ Shows the version of the currently running daemon process.
         });
         const data = await res.json();
         if (!res.ok) {
-          if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-          console.error(`Error: ${data.error}`);
+          if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+          console.error(`Error: ${extractApiError(data)}`);
           process.exit(1);
         }
         if (json) jsonSuccess(data);
@@ -29757,8 +29986,8 @@ Shows the version of the currently running daemon process.
       const res = await call("/api/tunnel");
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29782,8 +30011,8 @@ Shows the version of the currently running daemon process.
       });
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess({ sent: true });
@@ -29792,8 +30021,8 @@ Shows the version of the currently running daemon process.
       const res = await call("/api/version");
       const data = await res.json();
       if (!res.ok) {
-        if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-        console.error(`Error: ${data.error}`);
+        if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+        console.error(`Error: ${extractApiError(data)}`);
         process.exit(1);
       }
       if (json) jsonSuccess(data);
@@ -29810,8 +30039,8 @@ Shows the version of the currently running daemon process.
         const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config`);
         const data = await res.json();
         if (!res.ok) {
-          if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-          console.error(`Error: ${data.error}`);
+          if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+          console.error(`Error: ${extractApiError(data)}`);
           process.exit(1);
         }
         if (json) jsonSuccess(data);
@@ -29859,8 +30088,8 @@ Client overrides: ${JSON.stringify(clientOverrides)}`);
         });
         const data = await res.json();
         if (!res.ok) {
-          if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-          console.error(`Error: ${data.error}`);
+          if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+          console.error(`Error: ${extractApiError(data)}`);
           process.exit(1);
         }
         if (json) jsonSuccess(data);
@@ -29874,8 +30103,8 @@ Client overrides: ${JSON.stringify(clientOverrides)}`);
         const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config/overrides`);
         const data = await res.json();
         if (!res.ok) {
-          if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-          console.error(`Error: ${data.error}`);
+          if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+          console.error(`Error: ${extractApiError(data)}`);
           process.exit(1);
         }
         if (json) jsonSuccess(data);
@@ -29903,8 +30132,8 @@ Client overrides: ${JSON.stringify(clientOverrides)}`);
           });
           const data = await res.json();
           if (!res.ok) {
-            if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-            console.error(`Error: ${data.error}`);
+            if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+            console.error(`Error: ${extractApiError(data)}`);
             process.exit(1);
           }
           if (json) jsonSuccess(data);
@@ -29914,8 +30143,8 @@ Client overrides: ${JSON.stringify(clientOverrides)}`);
           const res = await call(`/api/sessions/${encodeURIComponent(sessionId)}/config/overrides`);
           const data = await res.json();
           if (!res.ok) {
-            if (json) jsonError(ErrorCodes.API_ERROR, String(data.error ?? "API request failed"));
-            console.error(`Error: ${data.error}`);
+            if (json) jsonError(ErrorCodes.API_ERROR, extractApiError(data));
+            console.error(`Error: ${extractApiError(data)}`);
             process.exit(1);
           }
           if (json) jsonSuccess(data);
@@ -30591,7 +30820,7 @@ agent-native handoff command such as /openacp:handoff.
     if (uninstall) {
       console.log(`Removing ${agent}/${item.id}...`);
       const result = await item.uninstall();
-      for (const log46 of result.logs) console.log(`  ${log46}`);
+      for (const log47 of result.logs) console.log(`  ${log47}`);
       if (result.success) {
         console.log(`  ${item.name} removed.`);
       } else {
@@ -30601,7 +30830,7 @@ agent-native handoff command such as /openacp:handoff.
     } else {
       console.log(`Installing ${agent}/${item.id}...`);
       const result = await item.install();
-      for (const log46 of result.logs) console.log(`  ${log46}`);
+      for (const log47 of result.logs) console.log(`  ${log47}`);
       if (result.success) {
         console.log(`  ${item.name} installed.`);
       } else {