@slock-ai/daemon 0.48.1 → 0.49.0

package/dist/{chunk-RDRY2MW2.js → chunk-M4A5QPUN.js}

@@ -1,18 +1,14 @@
 import {
   DEFAULT_CHAT_BRIDGE_TOOL_TIMEOUT_MS,
-  SLOCK_HOME_ENV,
   buildWebSocketOptions,
   executeJsonRequest,
   executeResponseRequest,
-  listLegacySlockStatePaths,
-  logger,
-  resolveSlockHome,
-  resolveSlockHomePath
-} from "./chunk-B7XIMLOT.js";
+  logger
+} from "./chunk-KNMCE6WB.js";
 
 // src/core.ts
-import path15 from "path";
-import os7 from "os";
+import path16 from "path";
+import os8 from "os";
 import { createRequire } from "module";
 import { accessSync } from "fs";
 import { fileURLToPath } from "url";
@@ -481,6 +477,8 @@ function resolveSlockCliInvocation(toolName, input) {
       return { toolName: "list_server", input: {} };
     case "channel members":
       return { toolName: "list_channel_members", input: { channel: rest[0] } };
+    case "channel join":
+      return { toolName: "join_channel", input: { target: readOptionValue(rest, "--target") } };
     case "channel leave":
       return { toolName: "leave_channel", input: { target: readOptionValue(rest, "--target") } };
     case "task list":
@@ -766,21 +764,21 @@ var DISPLAY_PLAN_CONFIG = {
 };
 
 // src/agentProcessManager.ts
-import { mkdirSync as mkdirSync4, readdirSync as readdirSync3, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
+import { mkdirSync as mkdirSync4, readdirSync as readdirSync2, statSync as statSync2, writeFileSync as writeFileSync7 } from "fs";
 import { mkdir, writeFile, access, readdir as readdir2, stat as stat2, readFile, rm as rm2 } from "fs/promises";
 import { createHash as createHash2 } from "crypto";
-import path11 from "path";
-import os5 from "os";
+import path12 from "path";
+import os6 from "os";
 
 // src/drivers/claude.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync2, readdirSync, readFileSync, statSync, writeFileSync as writeFileSync2 } from "fs";
-import os from "os";
-import path3 from "path";
+import { existsSync as existsSync3, readdirSync, readFileSync, statSync, writeFileSync as writeFileSync2 } from "fs";
+import os2 from "os";
+import path4 from "path";
 
 // src/drivers/cliTransport.ts
 import { mkdirSync, writeFileSync } from "fs";
-import path from "path";
+import path2 from "path";
 
 // src/drivers/systemPrompt.ts
 function toolRef(prefix, name) {
@@ -858,27 +856,28 @@ Use the \`slock\` CLI for chat / task / attachment operations. The daemon inject
 2. **\`slock message send\`** \u2014 Send a message to a channel or DM.
 3. **\`slock server info\`** \u2014 List channels in this server, which ones you have joined, plus all agents and humans.
 4. **\`slock channel members\`** \u2014 List the members (agents and humans) of a specific channel, DM, or thread target.
-5. **\`slock channel leave\`** \u2014 Leave a regular channel you have joined. This only affects your own agent membership.
-6. **\`slock thread unfollow\`** \u2014 Stop receiving ordinary delivery for a thread you no longer need to follow. This only affects your own agent attention state.
-7. **\`slock message read\`** \u2014 Read past messages from a channel, DM, or thread. Supports \`before\` / \`after\` pagination and \`around\` for centered context.
-8. **\`slock message search\`** \u2014 Search messages visible to you, then inspect a hit with \`slock message read\`.
-9. **\`slock message react\`** \u2014 Add or remove your reaction on a message. Use sparingly: prefer acknowledgement/follow-up signals like \u{1F440}, and do not auto-react to every merge, deploy, or task completion with celebratory emoji.
-10. **\`slock task list\`** \u2014 View a channel's task board.
-11. **\`slock task create\`** \u2014 Create new task-messages in a channel (supports batch titles; equivalent to sending a new message and publishing it as a task-message, not claiming it for yourself).
-12. **\`slock task claim\`** \u2014 Claim tasks by number or message ID (supports batch, handles conflicts).
-13. **\`slock task unclaim\`** \u2014 Release your claim on a task.
-14. **\`slock task update\`** \u2014 Change a task's status (e.g. to in_review or done).
-15. **\`slock attachment upload\`** \u2014 Upload a file to attach to a message. Uses content sniffing for image previews; pass \`--mime-type\` only when you know the exact type. Returns an attachment ID to pass to \`slock message send\`.
-16. **\`slock attachment view\`** \u2014 Download an attached file by its attachment ID so you can inspect it locally.
-17. **\`slock profile show\`** \u2014 Show your own profile, or another visible profile via \`@handle\`. Mirrors the canonical Slock profile view.
-18. **\`slock profile update\`** \u2014 Update your own profile. Supports \`--avatar-file <path>\`, \`--display-name <name>\`, and \`--description <text>\`. Values must be non-empty. Provide at least one flag per call; multiple flags can be combined.
-19. **\`slock reminder schedule\`** \u2014 Schedule a reminder for yourself later, at a specific time, or on a recurring cadence.
-20. **\`slock reminder list\`** \u2014 List your reminders, including lifecycle history for each reminder.
-21. **\`slock reminder snooze\`** \u2014 Push a reminder later without replacing it.
-22. **\`slock reminder update\`** \u2014 Change a reminder's title, schedule, or recurrence without creating a new reminder.
-23. **\`slock reminder cancel\`** \u2014 Cancel one of your reminders by ID.
-24. **\`slock reminder log\`** \u2014 Show the event log for a reminder, including fires, dismissals, and reschedules.
-25. **\`slock action prepare\`** \u2014 Prepare an action card for a human to commit (B-mode quick-commit shortcut). Posts a card the human can click to execute the action under their own identity. Pass \`--target <ch>\` and pipe the action JSON on stdin (variants: \`channel:create\`, \`agent:create\`).
+5. **\`slock channel join\`** \u2014 Join a visible public channel. This only affects your own agent membership.
+6. **\`slock channel leave\`** \u2014 Leave a regular channel you have joined. This only affects your own agent membership.
+7. **\`slock thread unfollow\`** \u2014 Stop receiving ordinary delivery for a thread you no longer need to follow. This only affects your own agent attention state.
+8. **\`slock message read\`** \u2014 Read past messages from a channel, DM, or thread. Supports \`before\` / \`after\` pagination and \`around\` for centered context.
+9. **\`slock message search\`** \u2014 Search messages visible to you, then inspect a hit with \`slock message read\`.
+10. **\`slock message react\`** \u2014 Add or remove your reaction on a message. Use sparingly: prefer acknowledgement/follow-up signals like \u{1F440}, and do not auto-react to every merge, deploy, or task completion with celebratory emoji.
+11. **\`slock task list\`** \u2014 View a channel's task board.
+12. **\`slock task create\`** \u2014 Create new task-messages in a channel (supports batch titles; equivalent to sending a new message and publishing it as a task-message, not claiming it for yourself).
+13. **\`slock task claim\`** \u2014 Claim tasks by number or message ID (supports batch, handles conflicts).
+14. **\`slock task unclaim\`** \u2014 Release your claim on a task.
+15. **\`slock task update\`** \u2014 Change a task's status (e.g. to in_review or done).
+16. **\`slock attachment upload\`** \u2014 Upload a file to attach to a message. Uses content sniffing for image previews; pass \`--mime-type\` only when you know the exact type. Returns an attachment ID to pass to \`slock message send\`.
+17. **\`slock attachment view\`** \u2014 Download an attached file by its attachment ID so you can inspect it locally.
+18. **\`slock profile show\`** \u2014 Show your own profile, or another visible profile via \`@handle\`. Mirrors the canonical Slock profile view.
+19. **\`slock profile update\`** \u2014 Update your own profile. Supports \`--avatar-file <path>\`, \`--display-name <name>\`, and \`--description <text>\`. Values must be non-empty. Provide at least one flag per call; multiple flags can be combined.
+20. **\`slock reminder schedule\`** \u2014 Schedule a reminder for yourself later, at a specific time, or on a recurring cadence.
+21. **\`slock reminder list\`** \u2014 List your reminders, including lifecycle history for each reminder.
+22. **\`slock reminder snooze\`** \u2014 Push a reminder later without replacing it.
+23. **\`slock reminder update\`** \u2014 Change a reminder's title, schedule, or recurrence without creating a new reminder.
+24. **\`slock reminder cancel\`** \u2014 Cancel one of your reminders by ID.
+25. **\`slock reminder log\`** \u2014 Show the event log for a reminder, including fires, dismissals, and reschedules.
+26. **\`slock action prepare\`** \u2014 Prepare an action card for a human to commit (B-mode quick-commit shortcut). Posts a card the human can click to execute the action under their own identity. Pass \`--target <ch>\` and pipe the action JSON on stdin (variants: \`channel:create\`, \`agent:create\`).
 
 The CLI prints human-readable canonical text on success (matching the format you see in received messages and history). On failure it prints JSON to stderr:
 - failure \u2192 stderr \`{"ok":false,"code":"...","message":"..."}\` with non-zero exit
@@ -893,19 +892,20 @@ You have MCP tools from the "chat" server. Use ONLY these for communication:
 1. **${checkCmd}** \u2014 Non-blocking check for new messages. Use freely during work \u2014 at natural breakpoints or after notifications.
 2. **${sendCmd}** \u2014 Send a message to a channel or DM.
 3. **${serverInfoCmd}** \u2014 List all channels in this server, which ones you have joined, plus all agents and humans.
-4. **\`${t("leave_channel")}\`** \u2014 Leave a regular channel you have joined. This only affects your own agent membership.
-5. **${readCmd}** \u2014 Read past messages from a channel, DM, or thread. Supports \`before\` / \`after\` pagination and \`around\` for centered context.
-6. **\`${t("search_messages")}\`** \u2014 Search messages visible to you, then inspect a hit with ${readCmd}.
-7. **\`${t("list_tasks")}\`** \u2014 View a channel's task board.
-8. **${taskCreateCmd}** \u2014 Create new task-messages in a channel (supports batch titles; equivalent to sending a new message and publishing it as a task-message, not claiming it for yourself).
-9. **${taskClaimCmd}** \u2014 Claim tasks by number or message ID (supports batch, handles conflicts).
-10. **\`${t("unclaim_task")}\`** \u2014 Release your claim on a task.
-11. **${taskUpdateCmd}** \u2014 Change a task's status (e.g. to in_review or done).
-12. **\`${t("upload_file")}\`** \u2014 Upload a file up to 50MB to attach to a message. Returns an attachment ID to pass to ${sendCmd}. Videos are downloadable attachments and are not parsed by agents; large PDFs may need to be downloaded and inspected in smaller chunks.
-13. **\`${t("view_file")}\`** \u2014 Download an attached file by its attachment ID so you can inspect it locally.
-14. **${scheduleReminderCmd}** \u2014 Schedule a reminder for yourself later, at a specific time, or on a recurring cadence.
-15. **${listRemindersCmd}** \u2014 List your reminders.
-16. **${cancelReminderCmd}** \u2014 Cancel one of your reminders by ID.`;
+4. **\`${t("join_channel")}\`** \u2014 Join a visible public channel. This only affects your own agent membership.
+5. **\`${t("leave_channel")}\`** \u2014 Leave a regular channel you have joined. This only affects your own agent membership.
+6. **${readCmd}** \u2014 Read past messages from a channel, DM, or thread. Supports \`before\` / \`after\` pagination and \`around\` for centered context.
+7. **\`${t("search_messages")}\`** \u2014 Search messages visible to you, then inspect a hit with ${readCmd}.
+8. **\`${t("list_tasks")}\`** \u2014 View a channel's task board.
+9. **${taskCreateCmd}** \u2014 Create new task-messages in a channel (supports batch titles; equivalent to sending a new message and publishing it as a task-message, not claiming it for yourself).
+10. **${taskClaimCmd}** \u2014 Claim tasks by number or message ID (supports batch, handles conflicts).
+11. **\`${t("unclaim_task")}\`** \u2014 Release your claim on a task.
+12. **${taskUpdateCmd}** \u2014 Change a task's status (e.g. to in_review or done).
+13. **\`${t("upload_file")}\`** \u2014 Upload a file up to 50MB to attach to a message. Returns an attachment ID to pass to ${sendCmd}. Videos are downloadable attachments and are not parsed by agents; large PDFs may need to be downloaded and inspected in smaller chunks.
+14. **\`${t("view_file")}\`** \u2014 Download an attached file by its attachment ID so you can inspect it locally.
+15. **${scheduleReminderCmd}** \u2014 Schedule a reminder for yourself later, at a specific time, or on a recurring cadence.
+16. **${listRemindersCmd}** \u2014 List your reminders.
+17. **${cancelReminderCmd}** \u2014 Cancel one of your reminders by ID.`;
   const reminderSection = `### Reminders
 
 Use reminders for follow-up that depends on future state you cannot resolve now, whether user-requested or self-driven. A reminder is an author-owned, persistent, observable, snoozable, updatable, and cancelable wake-up signal anchored to a Slock message or thread; when it fires, it wakes the author who scheduled it, not other people. If anchored to a message or thread, the receipt/fire system message is visible in that surface, but wake ownership does not transfer. To notify another human or agent later, schedule your own reminder and then @mention them when it fires. Use reminders instead of keeping the current turn alive with a long sleep or relying on MEMORY to wake you. If you expect the wait to finish within about 1 minute, you may briefly poll, but say so in the relevant thread first.
@@ -926,6 +926,10 @@ Long message with "quotes", $vars, \`backticks\`, and code blocks.
 EOF
 \`\`\`
 
+If Slock says a message was not sent and was saved as a draft, choose one path:
+- To update the draft, use a normal \`slock message send --target <target>\` with the revised content.
+- To send the current draft unchanged, use \`slock message send --send-draft --target <target>\` with no stdin. Do not use \`--send-draft\` when changing content.
+
 **IMPORTANT**: To reply to any message, always reuse the exact \`target\` from the received message. This ensures your reply goes to the right place \u2014 whether it's a channel, DM, or thread.` : `### Sending messages
 
 - **Reply to a channel**: \`${t("send_message")}(target="#channel-name", content="...")\`
@@ -957,11 +961,11 @@ Threads are sub-conversations attached to a specific message. They let you discu
   const discoverySection = isCli ? `### Discovering people and channels
 
 Call \`slock server info\` to see all channels in this server, which ones you have joined, other agents, and humans.
-Visible public channels may appear even when \`joined=false\`. In that state you can still inspect them with \`slock message read\` and \`slock channel members\`, but you cannot send messages there or receive ordinary channel delivery until a human adds you to the channel. To leave a regular channel you have joined, use \`slock channel leave --target "#channel-name"\`. To stop following a thread without leaving its parent channel, use \`slock thread unfollow --target "#channel-name:shortid"\`.
+Visible public channels may appear even when \`joined=false\`. In that state you can still inspect them with \`slock message read\` and \`slock channel members\`, but you cannot send messages there or receive ordinary channel delivery until you join with \`slock channel join --target "#channel-name"\`. Private channels require a human with access to add you. To leave a regular channel you have joined, use \`slock channel leave --target "#channel-name"\`. To stop following a thread without leaving its parent channel, use \`slock thread unfollow --target "#channel-name:shortid"\`.
 Private channels are membership-gated. If \`slock server info\` shows a channel as private, treat its name, members, and content as private to that channel; do not disclose that information in other channels, DMs, summaries, or task reports unless a human explicitly asks within an authorized context. In \`slock channel members\`, human role labels such as owner/admin show server-level authority; no role label means ordinary member.` : `### Discovering people and channels
 
 Call ${serverInfoCmd} to see all channels in this server, which ones you have joined, other agents, and humans.
-Visible public channels may appear even when \`joined=false\`. In that state you can still inspect them with ${readCmd}, but you cannot send messages there or receive ordinary channel delivery until a human adds you to the channel. To leave a regular channel you have joined, use \`${t("leave_channel")}\`.
+Visible public channels may appear even when \`joined=false\`. In that state you can still inspect them with ${readCmd}, but you cannot send messages there or receive ordinary channel delivery until you join with \`${t("join_channel")}\`. Private channels require a human with access to add you. To leave a regular channel you have joined, use \`${t("leave_channel")}\`.
 Private channels are membership-gated. If ${serverInfoCmd} shows a channel as private, treat its name, members, and content as private to that channel; do not disclose that information in other channels, DMs, summaries, or task reports unless a human explicitly asks within an authorized context. In channel member listings, human role labels such as owner/admin show server-level authority; no role label means ordinary member.`;
   const channelAwarenessSection = isCli ? `### Channel awareness
 
@@ -1305,8 +1309,44 @@ ${config.description}. This may evolve.`;
 function buildCliSystemPrompt(config, opts) {
   return buildPrompt(config, "cli", opts);
 }
-function buildMcpSystemPrompt(config, opts) {
-  return buildPrompt(config, "mcp", opts);
+
+// src/slockHome.ts
+import os from "os";
+import path from "path";
+import { existsSync } from "fs";
+var SLOCK_HOME_ENV = "SLOCK_HOME";
+function resolveDefaultSlockHome(homeDir = os.homedir()) {
+  return path.resolve(path.join(homeDir, ".slock"));
+}
+function resolveSlockHome(env = process.env, homeDir = os.homedir()) {
+  const raw = env[SLOCK_HOME_ENV]?.trim();
+  const root = raw && raw.length > 0 ? raw : resolveDefaultSlockHome(homeDir);
+  return path.resolve(root);
+}
+function resolveSlockHomePath(childPath, slockHome = resolveSlockHome()) {
+  return path.join(slockHome, childPath);
+}
+function listLegacySlockStatePaths(slockHome = resolveSlockHome(), homeDir = os.homedir()) {
+  const defaultHome = resolveDefaultSlockHome(homeDir);
+  if (path.resolve(slockHome) === defaultHome) return [];
+  const candidates = [
+    {
+      path: path.join(defaultHome, "agents"),
+      destination: path.join(slockHome, "agents"),
+      description: "agent workspaces and per-agent runtime wrapper state"
+    },
+    {
+      path: path.join(defaultHome, "machines"),
+      destination: path.join(slockHome, "machines"),
+      description: "daemon machine locks, local traces, and machine-scoped state"
+    },
+    {
+      path: path.join(defaultHome, "attachments"),
+      destination: path.join(slockHome, "attachments"),
+      description: "chat bridge attachment download cache"
+    }
+  ];
+  return candidates.filter((candidate) => existsSync(candidate.path));
 }
 
 // src/drivers/cliTransport.ts
@@ -1332,23 +1372,23 @@ function prepareCliTransport(ctx, extraEnv = {}, platform = process.platform) {
   if (!ctx.slockCliPath) {
     throw new Error(`${ctx.config.runtime} driver: slockCliPath is required (daemon must inject it)`);
   }
-  const slockDir = path.join(ctx.workingDirectory, ".slock");
+  const slockDir = path2.join(ctx.workingDirectory, ".slock");
   mkdirSync(slockDir, { recursive: true });
-  const tokenFile = path.join(slockDir, "agent-token");
+  const tokenFile = path2.join(slockDir, "agent-token");
   writeFileSync(tokenFile, ctx.config.authToken || ctx.daemonApiKey, { mode: 384 });
-  const posixWrapper = path.join(slockDir, "slock");
+  const posixWrapper = path2.join(slockDir, "slock");
   const posixBody = `#!/usr/bin/env bash
 exec ${shellSingleQuote(process.execPath)} ${shellSingleQuote(ctx.slockCliPath)} "$@"
 `;
   writeFileSync(posixWrapper, posixBody, { mode: 493 });
   if (platform === "win32") {
-    const cmdWrapper = path.join(slockDir, "slock.cmd");
+    const cmdWrapper = path2.join(slockDir, "slock.cmd");
     const cmdBody = `@echo off\r
 "${process.execPath}" "${ctx.slockCliPath}" %*\r
 `;
     writeFileSync(cmdWrapper, cmdBody);
   }
-  const wrapperPath = platform === "win32" ? path.join(slockDir, "slock.cmd") : posixWrapper;
+  const wrapperPath = platform === "win32" ? path2.join(slockDir, "slock.cmd") : posixWrapper;
   const spawnEnv = {
     ...process.env,
     FORCE_COLOR: "0",
@@ -1360,7 +1400,7 @@ exec ${shellSingleQuote(process.execPath)} ${shellSingleQuote(ctx.slockCliPath)}
     ...ctx.launchId ? { SLOCK_AGENT_LAUNCH_ID: ctx.launchId } : {},
     SLOCK_SERVER_URL: ctx.config.serverUrl,
     SLOCK_AGENT_TOKEN_FILE: tokenFile,
-    PATH: `${slockDir}${path.delimiter}${process.env.PATH ?? ""}`
+    PATH: `${slockDir}${path2.delimiter}${process.env.PATH ?? ""}`
   };
   delete spawnEnv.SLOCK_AGENT_TOKEN;
   return {
@@ -1373,8 +1413,8 @@ exec ${shellSingleQuote(process.execPath)} ${shellSingleQuote(ctx.slockCliPath)}
 
 // src/drivers/probe.ts
 import { execFileSync } from "child_process";
-import { existsSync } from "fs";
-import path2 from "path";
+import { existsSync as existsSync2 } from "fs";
+import path3 from "path";
 function normalizeExecOutput(raw) {
   return Buffer.isBuffer(raw) ? raw.toString("utf8") : String(raw ?? "");
 }
@@ -1417,7 +1457,7 @@ function resolveCommandOnPath(command, deps = {}) {
   }
 }
 function firstExistingPath(candidates, deps = {}) {
-  const exists = deps.existsSyncFn ?? existsSync;
+  const exists = deps.existsSyncFn ?? existsSync2;
   for (const candidate of candidates) {
     if (exists(candidate)) return candidate;
   }
@@ -1439,11 +1479,11 @@ function readCommandVersion(command, args = [], deps = {}) {
 }
 function resolveHomePath(relativePath, deps = {}) {
   const homeDir = deps.homeDir ?? deps.env?.HOME ?? process.env.HOME ?? "";
-  return path2.join(homeDir, relativePath);
+  return path3.join(homeDir, relativePath);
 }
 
 // src/drivers/claude.ts
-var CLAUDE_DESKTOP_CLI_RELATIVE_PATH = path3.join("Applications", "Claude Code URL Handler.app", "Contents", "MacOS", "claude");
+var CLAUDE_DESKTOP_CLI_RELATIVE_PATH = path4.join("Applications", "Claude Code URL Handler.app", "Contents", "MacOS", "claude");
 var CLAUDE_DESKTOP_CLI_SYSTEM_PATH = "/Applications/Claude Code URL Handler.app/Contents/MacOS/claude";
 var CLAUDE_SYSTEM_PROMPT_FILE = "claude-system-prompt.md";
 var CLAUDE_MCP_CONFIG_FILE = "claude-mcp-config.json";
@@ -1499,27 +1539,27 @@ function readClaudeMcpServers(configPath, vars = {}) {
 }
 function resolveClaudeConfigDir(ctx, home) {
   const configured = ctx.config.envVars?.CLAUDE_CONFIG_DIR || process.env.CLAUDE_CONFIG_DIR;
-  return configured && path3.isAbsolute(configured) ? configured : path3.join(home, ".claude");
+  return configured && path4.isAbsolute(configured) ? configured : path4.join(home, ".claude");
 }
 function collectClaudeMcpConfigFiles(ctx, home) {
   const files = [];
   const pushIfFile = (candidate) => {
     try {
-      if (existsSync2(candidate) && statSync(candidate).isFile()) {
+      if (existsSync3(candidate) && statSync(candidate).isFile()) {
         files.push({ path: candidate });
       }
     } catch {
     }
   };
-  pushIfFile(path3.join(home, ".claude.json"));
-  pushIfFile(path3.join(ctx.workingDirectory, ".mcp.json"));
-  const pluginRoot = path3.join(resolveClaudeConfigDir(ctx, home), "plugins");
+  pushIfFile(path4.join(home, ".claude.json"));
+  pushIfFile(path4.join(ctx.workingDirectory, ".mcp.json"));
+  const pluginRoot = path4.join(resolveClaudeConfigDir(ctx, home), "plugins");
   try {
     for (const entry of readdirSync(pluginRoot)) {
-      const pluginPath = path3.join(pluginRoot, entry);
-      const configPath = path3.join(pluginPath, ".mcp.json");
+      const pluginPath = path4.join(pluginRoot, entry);
+      const configPath = path4.join(pluginPath, ".mcp.json");
       try {
-        if (existsSync2(configPath) && statSync(configPath).isFile()) {
+        if (existsSync3(configPath) && statSync(configPath).isFile()) {
           files.push({
             path: configPath,
             vars: { CLAUDE_PLUGIN_ROOT: pluginPath }
@@ -1623,7 +1663,7 @@ var ClaudeDriver = class {
       ]
     };
   }
-  buildRuntimeActionsMcpConfig(ctx, home = os.homedir()) {
+  buildRuntimeActionsMcpConfig(ctx, home = os2.homedir()) {
     const userMcpServers = buildClaudeUserMcpServers(ctx, home);
     if (Object.prototype.hasOwnProperty.call(userMcpServers, SLOCK_RUNTIME_ACTIONS_MCP_SERVER_NAME)) {
       logger.warn(
@@ -1637,9 +1677,9 @@ var ClaudeDriver = class {
       }
     });
   }
-  writeClaudeLaunchFiles(ctx, slockDir, home = os.homedir()) {
-    const systemPromptPath = path3.join(slockDir, CLAUDE_SYSTEM_PROMPT_FILE);
-    const mcpConfigPath = path3.join(slockDir, CLAUDE_MCP_CONFIG_FILE);
+  writeClaudeLaunchFiles(ctx, slockDir, home = os2.homedir()) {
+    const systemPromptPath = path4.join(slockDir, CLAUDE_SYSTEM_PROMPT_FILE);
+    const mcpConfigPath = path4.join(slockDir, CLAUDE_MCP_CONFIG_FILE);
     writeFileSync2(systemPromptPath, ctx.standingPrompt, { mode: 384 });
     writeFileSync2(mcpConfigPath, this.buildRuntimeActionsMcpConfig(ctx, home), { mode: 384 });
     return { systemPromptPath, mcpConfigPath };
@@ -1788,10 +1828,10 @@ var ClaudeDriver = class {
 };
 
 // src/drivers/codex.ts
-import { spawn as spawn2, execSync } from "child_process";
-import { existsSync as existsSync3, readFileSync as readFileSync2, readdirSync as readdirSync2 } from "fs";
-import os2 from "os";
-import path4 from "path";
+import { spawn as spawn2, execFileSync as execFileSync2, execSync } from "child_process";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+import os3 from "os";
+import path5 from "path";
 function getCodexNotificationErrorMessage(params) {
   const topLevelMessage = params?.message;
   if (typeof topLevelMessage === "string" && topLevelMessage.trim()) {
@@ -1804,9 +1844,9 @@ function getCodexNotificationErrorMessage(params) {
   return null;
 }
 function ensureGitRepoForCodex(workingDirectory, deps = {}) {
-  const existsSyncFn = deps.existsSyncFn ?? existsSync3;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync4;
   const execSyncFn = deps.execSyncFn ?? execSync;
-  const gitDir = path4.join(workingDirectory, ".git");
+  const gitDir = path5.join(workingDirectory, ".git");
   if (existsSyncFn(gitDir)) return;
   execSyncFn("git init", { cwd: workingDirectory, stdio: "pipe" });
   execSyncFn(
@@ -1818,28 +1858,44 @@ function ensureGitRepoForCodex(workingDirectory, deps = {}) {
   );
 }
 var CODEX_DESKTOP_BUNDLE_PATH = "/Applications/Codex.app/Contents/Resources/codex";
-function resolveWindowsSandboxRunner(deps = {}) {
-  const homeDir = deps.homeDir ?? os2.homedir();
-  const sandboxBinDir = path4.join(homeDir, ".codex", ".sandbox-bin");
-  if (!(deps.existsSyncFn ?? existsSync3)(sandboxBinDir)) return null;
+function isWindowsSandboxRunner(commandPath) {
+  return path5.basename(commandPath).toLowerCase().startsWith("codex-command-runner");
+}
+function resolveWindowsNpmCodexEntry(deps = {}) {
+  const existsSyncFn = deps.existsSyncFn ?? existsSync4;
+  const execFileSyncFn = deps.execFileSyncFn ?? execFileSync2;
+  const env = deps.env ?? process.env;
+  const winPath = path5.win32;
   try {
-    const files = readdirSync2(sandboxBinDir);
-    const runners = files.filter((f) => f.startsWith("codex-command-runner") && f.endsWith(".exe")).sort((a, b) => b.localeCompare(a));
-    if (runners.length > 0) return path4.join(sandboxBinDir, runners[0]);
+    const globalRoot = String(execFileSyncFn("npm", ["root", "-g"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      env
+    })).trim();
+    const candidate = winPath.join(globalRoot, "@openai", "codex", "bin", "codex.js");
+    if (existsSyncFn(candidate)) return candidate;
   } catch {
   }
+  const cmdPath = resolveCommandOnPath("codex", deps);
+  if (cmdPath) {
+    const candidate = winPath.join(winPath.dirname(cmdPath), "node_modules", "@openai", "codex", "bin", "codex.js");
+    if (existsSyncFn(candidate)) return candidate;
+  }
   return null;
 }
 function resolveCodexCommand(deps = {}) {
+  const platform = deps.platform ?? process.platform;
+  if (platform === "win32") {
+    const npmEntry = resolveWindowsNpmCodexEntry(deps);
+    if (npmEntry) return npmEntry;
+    const command = resolveCommandOnPath("codex", deps);
+    return command && !isWindowsSandboxRunner(command) ? command : null;
+  }
   const pathCommand = resolveCommandOnPath("codex", deps);
   if (pathCommand) return pathCommand;
-  const platform = deps.platform ?? process.platform;
   if (platform === "darwin") {
     return firstExistingPath([CODEX_DESKTOP_BUNDLE_PATH], deps);
   }
-  if (platform === "win32") {
-    return resolveWindowsSandboxRunner(deps);
-  }
   return null;
 }
 function probeCodex(deps = {}) {
@@ -1865,37 +1921,20 @@ function resolveCodexSpawn(commandArgs, deps = {}) {
   if ((deps.platform ?? process.platform) !== "win32") {
     return { command: resolveCodexCommand(deps) ?? "codex", args: commandArgs };
   }
-  let codexEntry = null;
-  try {
-    const globalRoot = execSync("npm root -g", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-    const candidate = path4.join(globalRoot, "@openai", "codex", "bin", "codex.js");
-    if (existsSync3(candidate)) codexEntry = candidate;
-  } catch {
-  }
-  if (!codexEntry) {
-    try {
-      const cmdPath = execSync("where codex", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim().split(/\r?\n/)[0];
-      const candidate = path4.join(path4.dirname(cmdPath), "node_modules", "@openai", "codex", "bin", "codex.js");
-      if (existsSync3(candidate)) codexEntry = candidate;
-    } catch {
-    }
+  const codexEntry = resolveWindowsNpmCodexEntry(deps);
+  if (codexEntry) {
+    return {
+      command: process.execPath,
+      args: [codexEntry, ...commandArgs]
+    };
   }
-  if (!codexEntry) {
-    const sandboxRunner = resolveWindowsSandboxRunner(deps);
-    if (sandboxRunner) {
-      return {
-        command: sandboxRunner,
-        args: commandArgs
-      };
-    }
-    throw new Error(
-      "Cannot resolve Codex CLI entry point on Windows. Ensure @openai/codex is installed globally via npm (npm i -g @openai/codex)."
-    );
+  const command = resolveCommandOnPath("codex", deps);
+  if (command && !isWindowsSandboxRunner(command)) {
+    return { command, args: commandArgs };
   }
-  return {
-    command: process.execPath,
-    args: [codexEntry, ...commandArgs]
-  };
+  throw new Error(
+    "Cannot resolve Codex CLI entry point on Windows. Install Codex Desktop or install @openai/codex globally via npm (npm i -g @openai/codex). Ignoring .codex/.sandbox-bin/codex-command-runner because it is a sandbox helper, not the Codex CLI."
+  );
 }
 function joinReasoningText(item) {
   const summary = Array.isArray(item.summary) ? item.summary.filter((entry) => typeof entry === "string") : [];
@@ -2303,9 +2342,9 @@ var CodexDriver = class {
     return detectCodexModels();
   }
 };
-function detectCodexModels(home = os2.homedir()) {
-  const cachePath = path4.join(home, ".codex", "models_cache.json");
-  const configPath = path4.join(home, ".codex", "config.toml");
+function detectCodexModels(home = os3.homedir()) {
+  const cachePath = path5.join(home, ".codex", "models_cache.json");
+  const configPath = path5.join(home, ".codex", "config.toml");
   let models = [];
   try {
     const raw = readFileSync2(cachePath, "utf8");
@@ -2335,16 +2374,10 @@ function detectCodexModels(home = os2.homedir()) {
 
 // src/drivers/copilot.ts
 import { spawn as spawn3 } from "child_process";
-import path5 from "path";
+import path6 from "path";
 import { writeFileSync as writeFileSync3 } from "fs";
 function buildCopilotSpawnEnv(ctx) {
-  return {
-    ...process.env,
-    FORCE_COLOR: "0",
-    NO_COLOR: "1",
-    ...ctx.config.envVars || {},
-    [SLOCK_HOME_ENV]: resolveSlockHome()
-  };
+  return prepareCliTransport(ctx, { NO_COLOR: "1" }).spawnEnv;
 }
 var CopilotDriver = class {
   id = "copilot";
@@ -2355,7 +2388,7 @@ var CopilotDriver = class {
     inFlightWake: "spawn_new"
   };
   communication = {
-    chat: "mcp_chat_bridge",
+    chat: "slock_cli",
     runtimeControl: "mcp_runtime_actions"
   };
   session = {
@@ -2368,23 +2401,39 @@ var CopilotDriver = class {
   supportsStdinNotification = false;
   mcpToolPrefix = "";
   busyDeliveryMode = "none";
+  usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
-  spawn(ctx) {
-    this.sessionId = ctx.config.sessionId || null;
-    this.sessionAnnounced = false;
+  buildRuntimeActionsMcpConfig(ctx) {
     const isTsSource = ctx.chatBridgePath.endsWith(".ts");
-    const mcpCommand = isTsSource ? "npx" : "node";
-    const mcpArgs = isTsSource ? ["tsx", ctx.chatBridgePath, "--agent-id", ctx.agentId, "--server-url", ctx.config.serverUrl, "--auth-token", ctx.config.authToken || ctx.daemonApiKey] : [ctx.chatBridgePath, "--agent-id", ctx.agentId, "--server-url", ctx.config.serverUrl, "--auth-token", ctx.config.authToken || ctx.daemonApiKey];
-    const mcpConfigPath = path5.join(ctx.workingDirectory, ".slock-copilot-mcp.json");
-    writeFileSync3(mcpConfigPath, JSON.stringify({
+    const command = isTsSource ? "npx" : "node";
+    const bridgeArgs = isTsSource ? ["tsx", ctx.chatBridgePath] : [ctx.chatBridgePath];
+    return JSON.stringify({
       mcpServers: {
         chat: {
-          command: mcpCommand,
-          args: mcpArgs
+          command,
+          args: [
+            ...bridgeArgs,
+            "--agent-id",
+            ctx.agentId,
+            "--server-url",
+            ctx.config.serverUrl,
+            "--auth-token",
+            ctx.config.authToken || ctx.daemonApiKey,
+            "--runtime",
+            this.id,
+            ...ctx.launchId ? ["--launch-id", ctx.launchId] : [],
+            "--runtime-actions-only"
+          ]
         }
       }
-    }), "utf8");
+    });
+  }
+  spawn(ctx) {
+    this.sessionId = ctx.config.sessionId || null;
+    this.sessionAnnounced = false;
+    const mcpConfigPath = path6.join(ctx.workingDirectory, ".slock-copilot-mcp.json");
+    writeFileSync3(mcpConfigPath, this.buildRuntimeActionsMcpConfig(ctx), "utf8");
     const args = [
       "--output-format",
       "json",
@@ -2485,12 +2534,14 @@ var CopilotDriver = class {
     return null;
   }
   buildSystemPrompt(config, _agentId) {
-    return buildMcpSystemPrompt(config, {
+    return buildCliTransportSystemPrompt(config, {
       toolPrefix: "",
       extraCriticalRules: [
-        "- Do NOT use shell commands to send or receive messages. The MCP tools handle everything."
+        "- Runtime Profile migration completion is the only exception to CLI-only operation: when a migration notice tells you to acknowledge with `runtime_profile_migration_done`, call the `runtime_profile_migration_done` tool with the exact `migration_key`; do not use `slock` CLI or reply in chat as the acknowledgment."
+      ],
+      postStartupNotes: [
+        "**Copilot runtime note:** Slock launches you as a per-turn process. Complete the current wake using `slock` CLI commands, then stop; the daemon will restart you when new messages arrive."
       ],
-      postStartupNotes: [],
       includeStdinNotificationSection: false,
       messageNotificationStyle: "poll"
     });
@@ -2499,16 +2550,10 @@ var CopilotDriver = class {
 
 // src/drivers/cursor.ts
 import { spawn as spawn4, spawnSync } from "child_process";
-import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync2, existsSync as existsSync4 } from "fs";
-import path6 from "path";
+import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync2, existsSync as existsSync5 } from "fs";
+import path7 from "path";
 function buildCursorSpawnEnv(ctx) {
-  return {
-    ...process.env,
-    FORCE_COLOR: "0",
-    NO_COLOR: "1",
-    ...ctx.config.envVars || {},
-    [SLOCK_HOME_ENV]: resolveSlockHome()
-  };
+  return prepareCliTransport(ctx, { NO_COLOR: "1" }).spawnEnv;
 }
 var CursorDriver = class {
   id = "cursor";
@@ -2519,7 +2564,7 @@ var CursorDriver = class {
     inFlightWake: "spawn_new"
   };
   communication = {
-    chat: "mcp_chat_bridge",
+    chat: "slock_cli",
     runtimeControl: "mcp_runtime_actions"
   };
   session = {
@@ -2532,23 +2577,39 @@ var CursorDriver = class {
   supportsStdinNotification = false;
   mcpToolPrefix = "mcp__chat__";
   busyDeliveryMode = "none";
-  spawn(ctx) {
-    const cursorDir = path6.join(ctx.workingDirectory, ".cursor");
-    if (!existsSync4(cursorDir)) {
-      mkdirSync2(cursorDir, { recursive: true });
-    }
+  usesSlockCliForCommunication = true;
+  buildRuntimeActionsMcpConfig(ctx) {
     const isTsSource = ctx.chatBridgePath.endsWith(".ts");
-    const mcpCommand = isTsSource ? "npx" : "node";
-    const mcpArgs = isTsSource ? ["tsx", ctx.chatBridgePath, "--agent-id", ctx.agentId, "--server-url", ctx.config.serverUrl, "--auth-token", ctx.config.authToken || ctx.daemonApiKey] : [ctx.chatBridgePath, "--agent-id", ctx.agentId, "--server-url", ctx.config.serverUrl, "--auth-token", ctx.config.authToken || ctx.daemonApiKey];
-    const mcpConfigPath = path6.join(cursorDir, "mcp.json");
-    writeFileSync4(mcpConfigPath, JSON.stringify({
+    const command = isTsSource ? "npx" : "node";
+    const bridgeArgs = isTsSource ? ["tsx", ctx.chatBridgePath] : [ctx.chatBridgePath];
+    return JSON.stringify({
       mcpServers: {
         chat: {
-          command: mcpCommand,
-          args: mcpArgs
+          command,
+          args: [
+            ...bridgeArgs,
+            "--agent-id",
+            ctx.agentId,
+            "--server-url",
+            ctx.config.serverUrl,
+            "--auth-token",
+            ctx.config.authToken || ctx.daemonApiKey,
+            "--runtime",
+            this.id,
+            ...ctx.launchId ? ["--launch-id", ctx.launchId] : [],
+            "--runtime-actions-only"
+          ]
         }
       }
-    }), "utf8");
+    });
+  }
+  spawn(ctx) {
+    const cursorDir = path7.join(ctx.workingDirectory, ".cursor");
+    if (!existsSync5(cursorDir)) {
+      mkdirSync2(cursorDir, { recursive: true });
+    }
+    const mcpConfigPath = path7.join(cursorDir, "mcp.json");
+    writeFileSync4(mcpConfigPath, this.buildRuntimeActionsMcpConfig(ctx), "utf8");
     const args = [
       "--print",
       "--output-format",
@@ -2631,12 +2692,14 @@ var CursorDriver = class {
     return null;
   }
   buildSystemPrompt(config, _agentId) {
-    return buildMcpSystemPrompt(config, {
+    return buildCliTransportSystemPrompt(config, {
       toolPrefix: "mcp__chat__",
       extraCriticalRules: [
-        "- Do NOT use bash/curl/sqlite to send or receive messages. The MCP tools handle everything."
+        "- Runtime Profile migration completion is the only exception to CLI-only operation: when a migration notice tells you to acknowledge with `runtime_profile_migration_done`, call the `runtime_profile_migration_done` tool with the exact `migration_key`; do not use `slock` CLI or reply in chat as the acknowledgment."
+      ],
+      postStartupNotes: [
+        "**Cursor runtime note:** Slock launches you as a per-turn process. Complete the current wake using `slock` CLI commands, then stop; the daemon will restart you when new messages arrive."
       ],
-      postStartupNotes: [],
       includeStdinNotificationSection: false,
       messageNotificationStyle: "poll"
     });
@@ -2685,9 +2748,9 @@ function runCursorModelsCommand() {
 }
 
 // src/drivers/gemini.ts
-import { execFileSync as execFileSync2, spawn as spawn5 } from "child_process";
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, writeFileSync as writeFileSync5 } from "fs";
-import path7 from "path";
+import { execFileSync as execFileSync3, spawn as spawn5 } from "child_process";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, writeFileSync as writeFileSync5 } from "fs";
+import path8 from "path";
 function buildGeminiSpawnEnv(ctx, platform = process.platform) {
   const { spawnEnv } = prepareCliTransport(ctx, { NO_COLOR: "1" }, platform);
   if (!Object.prototype.hasOwnProperty.call(ctx.config.envVars ?? {}, "GEMINI_CLI_TRUST_WORKSPACE")) {
@@ -2723,10 +2786,10 @@ function resolveGeminiSpawn(commandArgs, deps = {}) {
   if (platform !== "win32") {
     return { command: resolveCommandOnPath("gemini", deps) ?? "gemini", args: commandArgs };
   }
-  const execFileSyncFn = deps.execFileSyncFn ?? execFileSync2;
-  const existsSyncFn = deps.existsSyncFn ?? existsSync5;
+  const execFileSyncFn = deps.execFileSyncFn ?? execFileSync3;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync6;
   const env = deps.env ?? process.env;
-  const winPath = path7.win32;
+  const winPath = path8.win32;
   let geminiEntry = null;
   try {
     const globalRoot = normalizeExecOutput2(execFileSyncFn("npm", ["root", "-g"], {
@@ -2864,9 +2927,9 @@ var GeminiDriver = class {
     });
   }
   writeGeminiSettings(ctx) {
-    const geminiDir = path7.join(ctx.workingDirectory, ".gemini");
+    const geminiDir = path8.join(ctx.workingDirectory, ".gemini");
     mkdirSync3(geminiDir, { recursive: true });
-    const settingsPath = path7.join(geminiDir, "settings.json");
+    const settingsPath = path8.join(geminiDir, "settings.json");
     writeFileSync5(settingsPath, JSON.stringify(this.buildRuntimeActionsMcpSettings(ctx)), "utf8");
   }
   buildRuntimeActionsMcpSettings(ctx) {
@@ -2899,9 +2962,9 @@ var GeminiDriver = class {
 // src/drivers/kimi.ts
 import { randomUUID } from "crypto";
 import { spawn as spawn6 } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync6 } from "fs";
-import os3 from "os";
-import path8 from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync3, writeFileSync as writeFileSync6 } from "fs";
+import os4 from "os";
+import path9 from "path";
 var KIMI_WIRE_PROTOCOL_VERSION = "1.3";
 var KIMI_SYSTEM_PROMPT_FILE = ".slock-kimi-system.md";
 var KIMI_AGENT_FILE = ".slock-kimi-agent.yaml";
@@ -2922,7 +2985,7 @@ var KimiDriver = class {
     inFlightWake: "steer"
   };
   communication = {
-    chat: "mcp_chat_bridge",
+    chat: "slock_cli",
     runtimeControl: "mcp_runtime_actions"
   };
   session = {
@@ -2935,6 +2998,7 @@ var KimiDriver = class {
   supportsStdinNotification = true;
   mcpToolPrefix = "";
   busyDeliveryMode = "direct";
+  usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
   promptRequestId = null;
@@ -2950,7 +3014,8 @@ var KimiDriver = class {
       ctx.config.authToken || ctx.daemonApiKey,
       "--runtime",
       "kimi",
-      ...ctx.launchId ? ["--launch-id", ctx.launchId] : []
+      ...ctx.launchId ? ["--launch-id", ctx.launchId] : [],
+      "--runtime-actions-only"
     ];
   }
   spawn(ctx) {
@@ -2961,10 +3026,10 @@ var KimiDriver = class {
     const isTsSource = ctx.chatBridgePath.endsWith(".ts");
     const command = isTsSource ? "npx" : "node";
     const bridgeArgs = this.buildChatBridgeArgs(ctx);
-    const systemPromptPath = path8.join(ctx.workingDirectory, KIMI_SYSTEM_PROMPT_FILE);
-    const agentFilePath = path8.join(ctx.workingDirectory, KIMI_AGENT_FILE);
-    const mcpConfigPath = path8.join(ctx.workingDirectory, KIMI_MCP_FILE);
-    if (!isResume || !existsSync6(systemPromptPath)) {
+    const systemPromptPath = path9.join(ctx.workingDirectory, KIMI_SYSTEM_PROMPT_FILE);
+    const agentFilePath = path9.join(ctx.workingDirectory, KIMI_AGENT_FILE);
+    const mcpConfigPath = path9.join(ctx.workingDirectory, KIMI_MCP_FILE);
+    if (!isResume || !existsSync7(systemPromptPath)) {
       writeFileSync6(systemPromptPath, ctx.prompt, "utf8");
     }
     writeFileSync6(agentFilePath, [
@@ -2995,7 +3060,7 @@ var KimiDriver = class {
     if (ctx.config.model && ctx.config.model !== "default") {
       args.push("--model", ctx.config.model);
     }
-    const spawnEnv = { ...process.env, FORCE_COLOR: "0", NO_COLOR: "1" };
+    const spawnEnv = prepareCliTransport(ctx, { NO_COLOR: "1" }).spawnEnv;
     const proc = spawn6("kimi", args, {
       cwd: ctx.workingDirectory,
       stdio: ["pipe", "pipe", "pipe"],
@@ -3102,10 +3167,10 @@ var KimiDriver = class {
     });
   }
   buildSystemPrompt(config, _agentId) {
-    return buildMcpSystemPrompt(config, {
+    return buildCliTransportSystemPrompt(config, {
       toolPrefix: "",
       extraCriticalRules: [
-        "- Do NOT use shell commands to send or receive messages. The MCP tools handle everything."
+        "- Runtime Profile migration completion is the only exception to CLI-only operation: when a migration notice tells you to acknowledge with `runtime_profile_migration_done`, call the `runtime_profile_migration_done` tool with the exact `migration_key`; do not use `slock` CLI or reply in chat as the acknowledgment."
       ],
       postStartupNotes: [],
       includeStdinNotificationSection: true,
@@ -3116,8 +3181,8 @@ var KimiDriver = class {
     return detectKimiModels();
   }
 };
-function detectKimiModels(home = os3.homedir()) {
-  const configPath = path8.join(home, ".kimi", "config.toml");
+function detectKimiModels(home = os4.homedir()) {
+  const configPath = path9.join(home, ".kimi", "config.toml");
   let raw;
   try {
     raw = readFileSync3(configPath, "utf8");
@@ -3145,8 +3210,8 @@ function detectKimiModels(home = os3.homedir()) {
 // src/drivers/opencode.ts
 import { spawn as spawn7, spawnSync as spawnSync2 } from "child_process";
 import { readFileSync as readFileSync4 } from "fs";
-import os4 from "os";
-import path9 from "path";
+import os5 from "os";
+import path10 from "path";
 var CHAT_MCP_SERVER_NAME = "chat";
 var CHAT_MCP_TOOL_PREFIX = `${CHAT_MCP_SERVER_NAME}_`;
 var SLOCK_AGENT_NAME = "slock";
@@ -3193,8 +3258,8 @@ function parseUserOpenCodeConfig(ctx) {
   const raw = ctx.config.envVars?.OPENCODE_CONFIG_CONTENT;
   return parseOpenCodeConfigContent(raw);
 }
-function readLocalOpenCodeConfig(home = os4.homedir()) {
-  const configPath = path9.join(home, ".config", "opencode", "opencode.json");
+function readLocalOpenCodeConfig(home = os5.homedir()) {
+  const configPath = path10.join(home, ".config", "opencode", "opencode.json");
   try {
     return parseOpenCodeConfigContent(readFileSync4(configPath, "utf8"));
   } catch {
@@ -3242,7 +3307,7 @@ function mergeOpenCodeConfigs(localConfig, envConfig) {
     }
   };
 }
-function buildOpenCodeConfig(ctx, home = os4.homedir()) {
+function buildOpenCodeConfig(ctx, home = os5.homedir()) {
   const userConfig = mergeOpenCodeConfigs(readLocalOpenCodeConfig(home), parseUserOpenCodeConfig(ctx));
   const userAgents = recordField(userConfig.agent);
   const userSlockAgent = recordField(userAgents[SLOCK_AGENT_NAME]);
@@ -3267,7 +3332,7 @@ function buildOpenCodeConfig(ctx, home = os4.homedir()) {
     }
   };
 }
-function buildOpenCodeLaunchOptions(ctx, home = os4.homedir()) {
+function buildOpenCodeLaunchOptions(ctx, home = os5.homedir()) {
   const slock = prepareCliTransport(ctx, { NO_COLOR: "1" });
   const config = buildOpenCodeConfig(ctx, home);
   const env = {
@@ -3363,7 +3428,7 @@ function formatOpenCodeLabelToken(token) {
   if (/^\d/.test(token)) return token;
   return normalized.charAt(0).toUpperCase() + normalized.slice(1);
 }
-function detectOpenCodeModels(home = os4.homedir(), runCommand = runOpenCodeModelsCommand) {
+function detectOpenCodeModels(home = os5.homedir(), runCommand = runOpenCodeModelsCommand) {
   const commandResult = runCommand(home);
   if (commandResult.error || commandResult.status !== 0) return null;
   return parseOpenCodeModelsOutput(commandResult.stdout);
@@ -3547,7 +3612,7 @@ function getDriver(runtimeId) {
 
 // src/workspaces.ts
 import { readdir, rm, stat } from "fs/promises";
-import path10 from "path";
+import path11 from "path";
 function isValidWorkspaceDirectoryName(directoryName) {
   return !directoryName.includes("/") && !directoryName.includes("\\") && !directoryName.includes("..");
 }
@@ -3555,7 +3620,7 @@ function resolveWorkspaceDirectoryPath(dataDir, directoryName) {
   if (!isValidWorkspaceDirectoryName(directoryName)) {
     return null;
   }
-  return path10.join(dataDir, directoryName);
+  return path11.join(dataDir, directoryName);
 }
 function emptyWorkspaceDirectorySummary(latestMtime = /* @__PURE__ */ new Date(0)) {
   return {
@@ -3604,7 +3669,7 @@ async function summarizeWorkspaceDirectory(dirPath) {
     return summary;
   }
   const childSummaries = await Promise.all(
-    entries.map((entry) => summarizeWorkspaceEntry(path10.join(dirPath, entry.name), entry))
+    entries.map((entry) => summarizeWorkspaceEntry(path11.join(dirPath, entry.name), entry))
   );
   for (const childSummary of childSummaries) {
     summary = mergeWorkspaceDirectorySummaries(summary, childSummary);
@@ -3623,7 +3688,7 @@ async function scanWorkspaceDirectories(dataDir) {
       if (!entry.isDirectory()) {
         return null;
       }
-      const dirPath = path10.join(dataDir, entry.name);
+      const dirPath = path11.join(dataDir, entry.name);
       try {
         const summary = await summarizeWorkspaceDirectory(dirPath);
         return {
@@ -3780,6 +3845,12 @@ function readNonNegativeIntegerEnv(name, fallback) {
   if (!Number.isFinite(parsed) || parsed < 0) return fallback;
   return Math.floor(parsed);
 }
+function stalledRecoverySigtermTimeoutMs() {
+  return readNonNegativeIntegerEnv(
+    "SLOCK_DAEMON_STALLED_RECOVERY_SIGTERM_TIMEOUT_MS",
+    DEFAULT_STALLED_RECOVERY_SIGTERM_TIMEOUT_MS
+  );
+}
 function toLocalTime(iso) {
   const d = new Date(iso);
   if (isNaN(d.getTime())) return iso;
@@ -3814,19 +3885,19 @@ function findSessionJsonl(root, predicate) {
     if (depth < 0 || visited >= maxEntries) return null;
     let entries;
     try {
-      entries = readdirSync3(dir, { withFileTypes: true }).sort((a, b) => b.name.localeCompare(a.name));
+      entries = readdirSync2(dir, { withFileTypes: true }).sort((a, b) => b.name.localeCompare(a.name));
     } catch {
       return null;
     }
     for (const entry of entries) {
       if (++visited > maxEntries) return null;
       if (!entry.isFile() || !predicate(entry.name)) continue;
-      return path11.join(dir, entry.name);
+      return path12.join(dir, entry.name);
     }
     for (const entry of entries) {
       if (++visited > maxEntries) return null;
       if (!entry.isDirectory()) continue;
-      const found = visit(path11.join(dir, entry.name), depth - 1);
+      const found = visit(path12.join(dir, entry.name), depth - 1);
       if (found) return found;
     }
     return null;
@@ -3839,9 +3910,9 @@ function safeSessionFilename(value) {
 }
 function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
   try {
-    const dir = path11.join(fallbackDir, ".slock", "runtime-sessions");
+    const dir = path12.join(fallbackDir, ".slock", "runtime-sessions");
     mkdirSync4(dir, { recursive: true });
-    const filePath = path11.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
+    const filePath = path12.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
     writeFileSync7(filePath, JSON.stringify({
       type: "runtime_session_handoff",
       runtime,
@@ -3860,8 +3931,8 @@ function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
     return null;
   }
 }
-function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os5.homedir(), fallbackDir) {
-  const directPath = path11.isAbsolute(sessionId) ? sessionId : null;
+function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os6.homedir(), fallbackDir) {
+  const directPath = path12.isAbsolute(sessionId) ? sessionId : null;
   if (directPath) {
     try {
       if (statSync2(directPath).isFile()) {
@@ -3870,7 +3941,7 @@ function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os5.homedir(), f
     } catch {
     }
   }
-  const resolvedPath = runtime === "claude" ? findSessionJsonl(path11.join(homeDir, ".claude", "projects"), (filename) => filename === `${sessionId}.jsonl`) : runtime === "codex" ? findSessionJsonl(path11.join(homeDir, ".codex", "sessions"), (filename) => filename.endsWith(".jsonl") && filename.includes(sessionId)) : null;
+  const resolvedPath = runtime === "claude" ? findSessionJsonl(path12.join(homeDir, ".claude", "projects"), (filename) => filename === `${sessionId}.jsonl`) : runtime === "codex" ? findSessionJsonl(path12.join(homeDir, ".codex", "sessions"), (filename) => filename.endsWith(".jsonl") && filename.includes(sessionId)) : null;
   if (!resolvedPath && fallbackDir) {
     const fallback = writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir);
     if (fallback) return fallback;
@@ -4011,6 +4082,7 @@ var TRAJECTORY_COALESCE_MS = 350;
 var ACTIVITY_HEARTBEAT_MS = 6e4;
 var COMPACTION_STALE_MS = 5 * 6e4;
 var RUNTIME_PROGRESS_STALE_MS = 15 * 6e4;
+var DEFAULT_STALLED_RECOVERY_SIGTERM_TIMEOUT_MS = 1e4;
 var MAX_STDOUT_LINES = 8;
 var MAX_STDOUT_LINE_LENGTH = 240;
 var MAX_STDERR_LINES = 8;
@@ -4759,7 +4831,7 @@ var AgentProcessManager = class _AgentProcessManager {
     this.daemonApiKey = daemonApiKey;
     this.serverUrl = opts.serverUrl;
     this.dataDir = opts.dataDir || resolveSlockHomePath("agents");
-    this.runtimeSessionHomeDir = opts.runtimeSessionHomeDir || os5.homedir();
+    this.runtimeSessionHomeDir = opts.runtimeSessionHomeDir || os6.homedir();
     this.driverResolver = opts.driverResolver || getDriver;
     this.defaultAgentEnvVarsProvider = opts.defaultAgentEnvVarsProvider || null;
     this.tracer = opts.tracer ?? noopTracer;
@@ -5003,26 +5075,26 @@ var AgentProcessManager = class _AgentProcessManager {
     this.recordDaemonTrace("daemon.agent.spawn.started", this.startQueueTraceAttrs(agentId, config, wakeMessage, unreadSummary, resumePrompt, launchId));
     try {
       const driver = this.driverResolver(config.runtime || "claude");
-      const agentDataDir = path11.join(this.dataDir, agentId);
+      const agentDataDir = path12.join(this.dataDir, agentId);
       await mkdir(agentDataDir, { recursive: true });
       const runtimeConfig = withLocalRuntimeContext(config, agentId, agentDataDir);
-      const memoryMdPath = path11.join(agentDataDir, "MEMORY.md");
+      const memoryMdPath = path12.join(agentDataDir, "MEMORY.md");
       try {
         await access(memoryMdPath);
       } catch {
         const initialMemoryMd = buildInitialMemoryMd(runtimeConfig);
         await writeFile(memoryMdPath, initialMemoryMd);
       }
-      const notesDir = path11.join(agentDataDir, "notes");
+      const notesDir = path12.join(agentDataDir, "notes");
       await mkdir(notesDir, { recursive: true });
       if (getOnboardingSeedMode(config) === FIRST_CINDY_SEED_MODE) {
         const seedFiles = buildOnboardingSeedFiles();
         for (const { relativePath, content } of seedFiles) {
-          const fullPath = path11.join(agentDataDir, relativePath);
+          const fullPath = path12.join(agentDataDir, relativePath);
           try {
             await access(fullPath);
           } catch {
-            await mkdir(path11.dirname(fullPath), { recursive: true });
+            await mkdir(path12.dirname(fullPath), { recursive: true });
             await writeFile(fullPath, content);
           }
         }
@@ -5168,6 +5240,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         exitCode: null,
         exitSignal: null,
         expectedTerminationReason: null,
+        stalledRecoverySigtermTimer: null,
         runtimeProfileTurnControl: runtimeConfig.runtimeProfileControl ? runtimeProfileTurnControl(runtimeConfig.runtimeProfileControl.kind, runtimeConfig.runtimeProfileControl.key, "agent_config") : null,
         pendingTrajectory: null,
         gatedSteering: createGatedSteeringState()
@@ -5261,6 +5334,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
           if (ap.activityHeartbeat) {
             clearInterval(ap.activityHeartbeat);
           }
+          this.clearStalledRecoverySigtermWatchdog(ap);
           const finalCode = ap.exitCode ?? code;
           const finalSignal = ap.exitSignal ?? signal;
           const expectedTermination = Boolean(ap.expectedTerminationReason);
@@ -5496,6 +5570,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       clearInterval(ap.activityHeartbeat);
     }
     this.clearCompactionWatchdog(ap);
+    this.clearStalledRecoverySigtermWatchdog(ap);
     this.agents.delete(agentId);
     this.processExitTraceAttrs.set(ap.process, {
       stop_source: silent ? "daemon_internal" : "explicit_request",
@@ -5701,7 +5776,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     return true;
   }
   async resetWorkspace(agentId) {
-    const agentDataDir = path11.join(this.dataDir, agentId);
+    const agentDataDir = path12.join(this.dataDir, agentId);
     try {
       await rm2(agentDataDir, { recursive: true, force: true });
       logger.info(`[Agent ${agentId}] Workspace reset complete (${agentDataDir})`);
@@ -5738,7 +5813,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     return result;
   }
   buildRuntimeProfileReport(agentId, config, sessionId, launchId) {
-    const workspacePath = path11.join(this.dataDir, agentId);
+    const workspacePath = path12.join(this.dataDir, agentId);
     return {
       agentId,
       launchId,
@@ -5986,7 +6061,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   }
   // Workspace file browsing
   async getFileTree(agentId, dirPath) {
-    const agentDir = path11.join(this.dataDir, agentId);
+    const agentDir = path12.join(this.dataDir, agentId);
     try {
       await stat2(agentDir);
     } catch {
@@ -5994,8 +6069,8 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     }
     let targetDir = agentDir;
     if (dirPath) {
-      const resolved = path11.resolve(agentDir, dirPath);
-      if (!resolved.startsWith(agentDir + path11.sep) && resolved !== agentDir) {
+      const resolved = path12.resolve(agentDir, dirPath);
+      if (!resolved.startsWith(agentDir + path12.sep) && resolved !== agentDir) {
         return [];
       }
       targetDir = resolved;
@@ -6003,14 +6078,14 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     return this.listDirectoryChildren(targetDir, agentDir);
   }
   async readFile(agentId, filePath) {
-    const agentDir = path11.join(this.dataDir, agentId);
-    const resolved = path11.resolve(agentDir, filePath);
-    if (!resolved.startsWith(agentDir + path11.sep) && resolved !== agentDir) {
+    const agentDir = path12.join(this.dataDir, agentId);
+    const resolved = path12.resolve(agentDir, filePath);
+    if (!resolved.startsWith(agentDir + path12.sep) && resolved !== agentDir) {
       throw new Error("Access denied");
     }
     const info = await stat2(resolved);
     if (info.isDirectory()) throw new Error("Cannot read a directory");
-    const ext = path11.extname(resolved).toLowerCase();
+    const ext = path12.extname(resolved).toLowerCase();
     if (WORKSPACE_TEXT_EXTENSIONS.has(ext) || ext === "") {
       if (info.size > WORKSPACE_TEXT_FILE_MAX_BYTES) throw new Error("File too large");
       const content = await readFile(resolved, "utf-8");
@@ -6044,14 +6119,14 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   async listSkills(agentId, runtimeHint) {
     const agent = this.agents.get(agentId);
     const runtime = runtimeHint || agent?.config.runtime || "claude";
-    const home = os5.homedir();
-    const workspaceDir = path11.join(this.dataDir, agentId);
+    const home = os6.homedir();
+    const workspaceDir = path12.join(this.dataDir, agentId);
     const paths = _AgentProcessManager.SKILL_PATHS[runtime] || _AgentProcessManager.SKILL_PATHS.claude;
     const globalResults = await Promise.all(
-      paths.global.map((p) => this.scanSkillsDir(path11.join(home, p)))
+      paths.global.map((p) => this.scanSkillsDir(path12.join(home, p)))
     );
     const workspaceResults = await Promise.all(
-      paths.workspace.map((p) => this.scanSkillsDir(path11.join(workspaceDir, p)))
+      paths.workspace.map((p) => this.scanSkillsDir(path12.join(workspaceDir, p)))
     );
     const dedup = (skills) => {
       const seen = /* @__PURE__ */ new Set();
@@ -6080,7 +6155,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const skills = [];
     for (const entry of entries) {
       if (entry.isDirectory() || entry.isSymbolicLink()) {
-        const skillMd = path11.join(dir, entry.name, "SKILL.md");
+        const skillMd = path12.join(dir, entry.name, "SKILL.md");
         try {
           const content = await readFile(skillMd, "utf-8");
           const skill = this.parseSkillMd(entry.name, content);
@@ -6091,7 +6166,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
       } else if (entry.name.endsWith(".md")) {
         const cmdName = entry.name.replace(/\.md$/, "");
         try {
-          const content = await readFile(path11.join(dir, entry.name), "utf-8");
+          const content = await readFile(path12.join(dir, entry.name), "utf-8");
           const skill = this.parseSkillMd(cmdName, content);
           skill.sourcePath = dir;
           skills.push(skill);
@@ -6260,6 +6335,64 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     }
     ap.compactionStartedAt = null;
   }
+  clearStalledRecoverySigtermWatchdog(ap) {
+    if (!ap.stalledRecoverySigtermTimer) return;
+    clearTimeout(ap.stalledRecoverySigtermTimer);
+    ap.stalledRecoverySigtermTimer = null;
+  }
+  mergeProcessExitTraceAttrs(proc, attrs) {
+    this.processExitTraceAttrs.set(proc, {
+      ...this.processExitTraceAttrs.get(proc) ?? {},
+      ...attrs
+    });
+  }
+  startStalledRecoverySigtermWatchdog(agentId, ap, runtimeLabel, queuedMessagesAtSignal, staleForMs) {
+    this.clearStalledRecoverySigtermWatchdog(ap);
+    const timeoutMs = stalledRecoverySigtermTimeoutMs();
+    const processAtSignal = ap.process;
+    ap.stalledRecoverySigtermTimer = setTimeout(() => {
+      ap.stalledRecoverySigtermTimer = null;
+      const current = this.agents.get(agentId);
+      if (!current || current !== ap || current.process !== processAtSignal || current.expectedTerminationReason !== "stalled_recovery") {
+        return;
+      }
+      this.mergeProcessExitTraceAttrs(processAtSignal, {
+        stalled_recovery_sigterm_timeout: true,
+        stalled_recovery_sigterm_timeout_ms: timeoutMs
+      });
+      this.recordDaemonTrace("daemon.agent.stalled_recovery.sigterm_timeout", {
+        agentId,
+        launchId: current.launchId || void 0,
+        runtime: current.config.runtime,
+        model: current.config.model,
+        runtime_label: runtimeLabel,
+        queued_messages_count: current.inbox.length,
+        queued_messages_at_signal: queuedMessagesAtSignal,
+        stale_age_ms_at_signal: staleForMs,
+        timeout_ms: timeoutMs,
+        process_pid_present: typeof processAtSignal.pid === "number",
+        session_id_present: Boolean(current.sessionId),
+        supports_stdin_notification: current.driver.supportsStdinNotification,
+        busy_delivery_mode: current.driver.busyDeliveryMode
+      }, "error");
+      logger.warn(
+        `[Agent ${agentId}] Stalled ${runtimeLabel} runtime did not exit after SIGTERM within ${timeoutMs}ms; force killing`
+      );
+      try {
+        processAtSignal.kill("SIGKILL");
+      } catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
+        this.recordDaemonTrace("daemon.agent.stalled_recovery.sigkill_failed", {
+          agentId,
+          launchId: current.launchId || void 0,
+          runtime: current.config.runtime,
+          model: current.config.model,
+          reason
+        }, "error");
+        logger.warn(`[Agent ${agentId}] Failed to force kill stalled ${runtimeLabel} process: ${reason}`);
+      }
+    }, timeoutMs);
+  }
   startCompactionWatchdog(agentId, ap) {
     this.clearCompactionWatchdog(ap);
     const startedAt = Date.now();
@@ -6421,7 +6554,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
   tryFlushGatedSteering(agentId, ap, reason) {
     if (ap.driver.busyDeliveryMode !== "gated") return false;
     if (!ap.sessionId || ap.inbox.length === 0) return false;
-    if (reason === "tool_batch_complete") {
+    if (reason !== "turn_end") {
       if (ap.gatedSteering.toolBoundaryFlushDisabled) return false;
       if (ap.gatedSteering.compacting || ap.gatedSteering.outstandingToolUses > 0) return false;
     }
@@ -6430,7 +6563,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     const nextMessages = ap.inbox.splice(0, ap.inbox.length);
     ap.pendingNotificationCount = 0;
     ap.gatedSteering.lastFlushReason = reason;
-    if (reason === "tool_batch_complete") {
+    if (reason !== "turn_end") {
       ap.gatedSteering.inFlightBatch = {
         reason,
         messages: nextMessages
@@ -6448,12 +6581,46 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     if (this.deliverMessagesViaStdin(agentId, ap, nextMessages, reason === "turn_end" ? "idle" : "busy")) {
       return true;
     }
-    if (reason === "tool_batch_complete") {
+    if (reason !== "turn_end") {
       ap.gatedSteering.inFlightBatch = null;
     }
     ap.pendingNotificationCount += pendingNotificationCount || pendingMessages;
     return false;
   }
+  flushCompactionBoundaryMessages(agentId, ap) {
+    if (!ap.sessionId || !ap.driver.supportsStdinNotification || ap.inbox.length === 0) return false;
+    if (ap.driver.busyDeliveryMode === "gated") {
+      return this.tryFlushGatedSteering(agentId, ap, "compaction_finished");
+    }
+    if (ap.driver.busyDeliveryMode === "direct") {
+      const pendingMessages = ap.inbox.length;
+      const pendingNotificationCount = ap.pendingNotificationCount;
+      const nextMessages = ap.inbox.splice(0, ap.inbox.length);
+      ap.pendingNotificationCount = 0;
+      if (ap.notificationTimer) {
+        clearTimeout(ap.notificationTimer);
+        ap.notificationTimer = null;
+      }
+      this.recordRuntimeTraceEvent(agentId, ap, "runtime.compaction_boundary.flush", {
+        mode: "direct",
+        messageCount: nextMessages.length
+      });
+      if (this.deliverMessagesViaStdin(agentId, ap, nextMessages, "busy")) {
+        return true;
+      }
+      ap.pendingNotificationCount += pendingNotificationCount || pendingMessages;
+      return false;
+    }
+    if (ap.pendingNotificationCount > 0) {
+      if (ap.notificationTimer) {
+        clearTimeout(ap.notificationTimer);
+        ap.notificationTimer = null;
+      }
+      this.sendStdinNotification(agentId);
+      return true;
+    }
+    return false;
+  }
   clearGatedInFlightBatch(agentId, ap, reason) {
     if (ap.driver.busyDeliveryMode !== "gated" || !ap.gatedSteering.inFlightBatch) return;
     const messageCount = ap.gatedSteering.inFlightBatch.messages.length;
@@ -6538,8 +6705,10 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         expectedTerminationReason: "stalled_recovery",
         queued_messages_count: ap.inbox.length
       });
+      this.startStalledRecoverySigtermWatchdog(agentId, ap, runtimeLabel, ap.inbox.length, staleForMs);
       ap.process.kill("SIGTERM");
     } catch (err) {
+      this.clearStalledRecoverySigtermWatchdog(ap);
       const reason = err instanceof Error ? err.message : String(err);
       logger.warn(`[Agent ${agentId}] Failed to terminate stalled ${runtimeLabel} process: ${reason}`);
       return false;
@@ -6641,6 +6810,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
         if (ap) {
           ap.gatedSteering.compacting = false;
           this.setGatedSteeringPhase(agentId, ap, "assistant_continuation", { event: "compaction_finished" });
+          this.flushCompactionBoundaryMessages(agentId, ap);
           ap.isIdle = false;
         }
         break;
@@ -6784,6 +6954,18 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
     if (count === 0) return;
     if (ap.isIdle) return;
     if (!ap.sessionId) return;
+    if (ap.gatedSteering.compacting) {
+      this.recordRuntimeTraceEvent(agentId, ap, "runtime.compaction_boundary.delivery_suppressed", {
+        pendingNotificationCount: count,
+        pendingMessages: ap.inbox.length,
+        busyDeliveryMode: ap.driver.busyDeliveryMode
+      });
+      ap.pendingNotificationCount += count;
+      logger.info(
+        `[Agent ${agentId}] Suppressing stdin delivery until context compaction finishes; pending=${ap.inbox.length}`
+      );
+      return;
+    }
     if (ap.driver.busyDeliveryMode === "gated") {
       this.recordGatedSteeringEvent(agentId, ap, "suppress", {
         reason: "timer_notification_not_safe_boundary",
@@ -6934,8 +7116,8 @@ ${RESPONSE_TARGET_HINT}`);
     const nodes = [];
     for (const entry of entries) {
       if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
-      const fullPath = path11.join(dir, entry.name);
-      const relativePath = path11.relative(rootDir, fullPath);
+      const fullPath = path12.join(dir, entry.name);
+      const relativePath = path12.relative(rootDir, fullPath);
       let info;
       try {
         info = await stat2(fullPath);
@@ -7239,8 +7421,8 @@ var ReminderCache = class {
 // src/machineLock.ts
 import { createHash as createHash3, randomUUID as randomUUID2 } from "crypto";
 import { mkdirSync as mkdirSync5, readFileSync as readFileSync5, rmSync as rmSync2, statSync as statSync3, writeFileSync as writeFileSync8 } from "fs";
-import os6 from "os";
-import path12 from "path";
+import os7 from "os";
+import path13 from "path";
 var INCOMPLETE_LOCK_STALE_MS = 3e4;
 var DaemonMachineLockConflictError = class extends Error {
   code = "DAEMON_MACHINE_LOCK_HELD";
@@ -7262,7 +7444,7 @@ function resolveDefaultMachineStateRoot() {
   return resolveSlockHomePath("machines");
 }
 function ownerPath(lockDir) {
-  return path12.join(lockDir, "owner.json");
+  return path13.join(lockDir, "owner.json");
 }
 function readOwner(lockDir) {
   try {
@@ -7292,8 +7474,8 @@ function acquireDaemonMachineLock(options) {
   const rootDir = options.rootDir ?? resolveDefaultMachineStateRoot();
   const fingerprint = apiKeyFingerprint(options.apiKey);
   const lockId = getDaemonMachineLockId(options.apiKey);
-  const machineDir = path12.join(rootDir, lockId);
-  const lockDir = path12.join(machineDir, "daemon.lock");
+  const machineDir = path13.join(rootDir, lockId);
+  const lockDir = path13.join(machineDir, "daemon.lock");
   const token = randomUUID2();
   mkdirSync5(machineDir, { recursive: true });
   for (let attempt = 0; attempt < 2; attempt += 1) {
@@ -7302,7 +7484,7 @@ function acquireDaemonMachineLock(options) {
       const owner = {
         pid: process.pid,
         token,
-        hostname: os6.hostname(),
+        hostname: os7.hostname(),
         startedAt: (/* @__PURE__ */ new Date()).toISOString(),
         serverUrl: options.serverUrl,
         apiKeyFingerprint: fingerprint.slice(0, 16)
@@ -7345,8 +7527,8 @@ function acquireDaemonMachineLock(options) {
 }
 
 // src/localTraceSink.ts
-import { appendFileSync, mkdirSync as mkdirSync6, readdirSync as readdirSync4, rmSync as rmSync3, statSync as statSync4, writeFileSync as writeFileSync9 } from "fs";
-import path13 from "path";
+import { appendFileSync, mkdirSync as mkdirSync6, readdirSync as readdirSync3, rmSync as rmSync3, statSync as statSync4, writeFileSync as writeFileSync9 } from "fs";
+import path14 from "path";
 var DEFAULT_MAX_FILE_BYTES = 5 * 1024 * 1024;
 var DEFAULT_MAX_FILE_AGE_MS = 5 * 60 * 1e3;
 var DEFAULT_MAX_FILES = 8;
@@ -7382,7 +7564,7 @@ var LocalRotatingTraceSink = class {
   currentSize = 0;
   sequence = 0;
   constructor(options) {
-    this.traceDir = path13.join(options.machineDir, "traces");
+    this.traceDir = path14.join(options.machineDir, "traces");
     this.maxFileBytes = Math.max(1024, Math.floor(options.maxFileBytes ?? DEFAULT_MAX_FILE_BYTES));
     const baseAgeMs = Math.max(1e3, Math.floor(options.maxFileAgeMs ?? DEFAULT_MAX_FILE_AGE_MS));
     const ageJitterMs = Math.max(0, Math.floor(options.maxFileAgeJitterMs ?? 0));
@@ -7412,7 +7594,7 @@ var LocalRotatingTraceSink = class {
     const nowMs = this.nowMsProvider();
     const shouldRotateForAge = this.currentFileOpenedAtMs !== null && nowMs - this.currentFileOpenedAtMs >= this.maxFileAgeMs;
     if (!this.currentFile || this.currentSize + nextBytes > this.maxFileBytes || shouldRotateForAge) {
-      this.currentFile = path13.join(
+      this.currentFile = path14.join(
         this.traceDir,
         `daemon-trace-${safeTimestamp(nowMs)}-${process.pid}-${String(this.sequence++).padStart(4, "0")}.jsonl`
       );
@@ -7423,11 +7605,11 @@ var LocalRotatingTraceSink = class {
     }
   }
   pruneOldFiles() {
-    const files = readdirSync4(this.traceDir).filter((name) => name.startsWith("daemon-trace-") && name.endsWith(".jsonl")).sort();
+    const files = readdirSync3(this.traceDir).filter((name) => name.startsWith("daemon-trace-") && name.endsWith(".jsonl")).sort();
     const excess = files.length - this.maxFiles;
     if (excess <= 0) return;
     for (const file of files.slice(0, excess)) {
-      rmSync3(path13.join(this.traceDir, file), { force: true });
+      rmSync3(path14.join(this.traceDir, file), { force: true });
     }
   }
 };
@@ -7514,11 +7696,11 @@ function isDiagnosticErrorAttr(key) {
 import { createHash as createHash5, randomUUID as randomUUID3 } from "crypto";
 import { gzipSync } from "zlib";
 import { mkdir as mkdir2, readFile as readFile2, readdir as readdir3, stat as stat3, writeFile as writeFile2 } from "fs/promises";
-import path14 from "path";
+import path15 from "path";
 
 // src/directUploadCapability.ts
-function joinUrl(base, path16) {
-  return `${base.replace(/\/+$/, "")}${path16}`;
+function joinUrl(base, path17) {
+  return `${base.replace(/\/+$/, "")}${path17}`;
 }
 function jsonHeaders(apiKey) {
   return {
@@ -7737,7 +7919,7 @@ var DaemonTraceBundleUploader = class {
     }, nextMs);
   }
   async findUploadCandidates() {
-    const traceDir = path14.join(this.options.machineDir, "traces");
+    const traceDir = path15.join(this.options.machineDir, "traces");
     let names;
     try {
       names = await readdir3(traceDir);
@@ -7749,8 +7931,8 @@ var DaemonTraceBundleUploader = class {
     const currentFile = this.options.currentFileProvider?.();
     const candidates = [];
     for (const name of names.filter((entry) => entry.startsWith("daemon-trace-") && entry.endsWith(".jsonl")).sort()) {
-      const file = path14.join(traceDir, name);
-      if (currentFile && path14.resolve(file) === path14.resolve(currentFile)) continue;
+      const file = path15.join(traceDir, name);
+      if (currentFile && path15.resolve(file) === path15.resolve(currentFile)) continue;
       if (await this.isUploaded(file)) continue;
       try {
         const info = await stat3(file);
@@ -7824,8 +8006,8 @@ var DaemonTraceBundleUploader = class {
     }
   }
   uploadStatePath(file) {
-    const stateDir = path14.join(this.options.machineDir, "trace-uploads");
-    return path14.join(stateDir, `${path14.basename(file)}.uploaded.json`);
+    const stateDir = path15.join(this.options.machineDir, "trace-uploads");
+    return path15.join(stateDir, `${path15.basename(file)}.uploaded.json`);
   }
   async isUploaded(file) {
     try {
@@ -7837,9 +8019,9 @@ var DaemonTraceBundleUploader = class {
   }
   async markUploaded(file, metadata) {
     const stateFile = this.uploadStatePath(file);
-    await mkdir2(path14.dirname(stateFile), { recursive: true, mode: 448 });
+    await mkdir2(path15.dirname(stateFile), { recursive: true, mode: 448 });
     await writeFile2(stateFile, `${JSON.stringify({
-      file: path14.basename(file),
+      file: path15.basename(file),
       uploadedAt: (/* @__PURE__ */ new Date()).toISOString(),
       ...metadata
     }, null, 2)}
@@ -7878,23 +8060,23 @@ function readDaemonVersion(moduleUrl = import.meta.url) {
   }
 }
 function resolveChatBridgePath(moduleUrl = import.meta.url) {
-  const dirname = path15.dirname(fileURLToPath(moduleUrl));
-  const jsPath = path15.resolve(dirname, "chat-bridge.js");
+  const dirname = path16.dirname(fileURLToPath(moduleUrl));
+  const jsPath = path16.resolve(dirname, "chat-bridge.js");
   try {
     accessSync(jsPath);
     return jsPath;
   } catch {
-    return path15.resolve(dirname, "chat-bridge.ts");
+    return path16.resolve(dirname, "chat-bridge.ts");
   }
 }
 function resolveSlockCliPath(moduleUrl = import.meta.url) {
-  const thisDir = path15.dirname(fileURLToPath(moduleUrl));
-  const bundledDistPath = path15.resolve(thisDir, "cli", "index.js");
+  const thisDir = path16.dirname(fileURLToPath(moduleUrl));
+  const bundledDistPath = path16.resolve(thisDir, "cli", "index.js");
   try {
     accessSync(bundledDistPath);
     return bundledDistPath;
   } catch {
-    const workspaceDistPath = path15.resolve(thisDir, "..", "..", "cli", "dist", "index.js");
+    const workspaceDistPath = path16.resolve(thisDir, "..", "..", "cli", "dist", "index.js");
     accessSync(workspaceDistPath);
     return workspaceDistPath;
   }
@@ -8073,7 +8255,7 @@ var DaemonCore = class {
   }
   resolveMachineStateRoot() {
     if (this.options.machineStateDir) return this.options.machineStateDir;
-    if (this.options.dataDir) return path15.join(path15.dirname(this.options.dataDir), "machines");
+    if (this.options.dataDir) return path16.join(path16.dirname(this.options.dataDir), "machines");
     return resolveDefaultMachineStateRoot();
   }
   shouldEnableLocalTrace() {
@@ -8393,8 +8575,8 @@ var DaemonCore = class {
       capabilities: ["agent:start", "agent:stop", "agent:deliver", "workspace:files"],
       runtimes,
       runningAgents: runningAgentIds,
-      hostname: this.options.hostname ?? os7.hostname(),
-      os: this.options.osDescription ?? `${os7.platform()} ${os7.arch()}`,
+      hostname: this.options.hostname ?? os8.hostname(),
+      os: this.options.osDescription ?? `${os8.platform()} ${os8.arch()}`,
       daemonVersion: this.daemonVersion
     });
     this.recordDaemonTrace("daemon.ready.sent", {