@slock-ai/daemon 0.57.5 → 0.57.7

package/dist/{chunk-BGWXECWO.js → chunk-XQ3HLMCZ.js}

@@ -1,6 +1,6 @@
 // src/core.ts
-import path15 from "path";
-import os7 from "os";
+import path16 from "path";
+import os8 from "os";
 import { createRequire as createRequire2 } from "module";
 import { accessSync } from "fs";
 import { fileURLToPath } from "url";
@@ -1504,11 +1504,11 @@ var DISPLAY_PLAN_CONFIG = {
 };
 
 // src/agentProcessManager.ts
-import { mkdirSync as mkdirSync3, readdirSync as readdirSync2, statSync, writeFileSync as writeFileSync4 } from "fs";
+import { mkdirSync as mkdirSync4, readdirSync as readdirSync2, statSync, writeFileSync as writeFileSync4 } from "fs";
 import { mkdir, writeFile, access, readdir as readdir2, stat as stat2, readFile, rm as rm2 } from "fs/promises";
 import { createHash as createHash3 } 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";
@@ -1842,9 +1842,6 @@ function buildSlockCliGuideSections(options) {
 }
 
 // src/drivers/systemPrompt.ts
-function toolRef(prefix, name) {
-  return `${prefix}${name}`;
-}
 function runtimeContextLines(config) {
   const ctx = config.runtimeContext;
   if (!ctx) return [];
@@ -1866,10 +1863,8 @@ function runtimeContextLines(config) {
   if (ctx.workspacePath) lines.push(`- Workspace: ${ctx.workspacePath}`);
   return lines.length > 4 ? lines : [];
 }
-function buildPrompt(config, variant, opts) {
-  const isCli = variant === "cli";
-  const t = (name) => toolRef(opts.toolPrefix, name);
-  const taskClaimCmd = isCli ? "`slock task claim`" : `\`${t("claim_tasks")}\``;
+function buildPrompt(config, opts) {
+  const taskClaimCmd = "`slock task claim`";
   const cliGuideSections = buildSlockCliGuideSections({
     // The daemon prompt audience is always managed-runner regardless of
     // CLI vs MCP variant — both are daemon-spawned. The self-hosted-runner
@@ -1881,162 +1876,42 @@ function buildPrompt(config, variant, opts) {
     },
     taskClaimCmd
   });
-  const sendCmd = isCli ? "`slock message send`" : `\`${t("send_message")}\``;
-  const readCmd = isCli ? "`slock message read`" : `\`${t("read_history")}\``;
-  const checkCmd = isCli ? "`slock message check`" : `\`${t("check_messages")}\``;
-  const inboxCheckCmd = isCli ? "`slock inbox check`" : checkCmd;
-  const taskCreateCmd = isCli ? "`slock task create`" : `\`${t("create_tasks")}\``;
-  const taskUpdateCmd = isCli ? "`slock task update`" : `\`${t("update_task_status")}\``;
-  const serverInfoCmd = isCli ? "`slock server info`" : `\`${t("list_server")}\``;
-  const scheduleReminderCmd = isCli ? "`slock reminder schedule`" : `\`${t("schedule_reminder")}\``;
-  const listRemindersCmd = isCli ? "`slock reminder list`" : `\`${t("list_reminders")}\``;
-  const cancelReminderCmd = isCli ? "`slock reminder cancel`" : `\`${t("cancel_reminder")}\``;
+  const checkCmd = "`slock message check`";
+  const inboxCheckCmd = "`slock inbox check`";
   const messageDeliveryText = opts.includeStdinNotificationSection ? "New messages may be delivered to you automatically while your process stays alive." : "The daemon will automatically restart you when new messages arrive.";
-  const criticalRules = isCli ? [
+  const noConcreteMessageStartupStep = opts.includeStdinNotificationSection ? `3. If there is no concrete incoming message to handle but this turn includes a Slock inbox notice: the notice means messages exist that you have not seen \u2014 their bodies are withheld to avoid flooding you, not absent (unobserved is not the same as nonexistent). Whether and when to read them is your judgment, now or later; ${checkCmd} reads them and the notice metadata (who, where, how many) helps you triage. Never derive "no work" from a content-free notice alone \u2014 if you choose not to read, that is a deferral to report honestly, not a conclusion that nothing is pending. If there is neither a concrete message nor an inbox notice, stop and wait. ${messageDeliveryText}` : `3. If there is no concrete incoming message to handle, stop and wait. ${messageDeliveryText}`;
+  const criticalRules = [
     "- Always communicate through `slock` CLI commands. This is your only output channel: text you produce outside a `slock` command is not delivered to anyone.",
     ...opts.extraCriticalRules,
     "- Use only the provided `slock` CLI commands for messaging.",
     "- Do not combine multiple `slock` CLI commands in one shell command. Run one `slock` command per tool call, read its output, then decide the next command.",
     "- Always claim a task via `slock task claim` before starting work on it. If the claim fails, move on to a different task."
-  ] : [
-    `- Always communicate through ${sendCmd}. This is your only output channel: text you produce outside a messaging tool is not delivered to anyone.`,
-    ...opts.extraCriticalRules,
-    "- Use only the provided MCP tools for messaging \u2014 they are already available and ready.",
-    `- Always claim a task via ${taskClaimCmd} before starting work on it. If the claim fails, move on to a different task.`
   ];
   const runtimeProfileControl = config.runtimeProfileControl?.kind === "daemon_release_notice" ? config.runtimeProfileControl : null;
   const runtimeProfileControlStartupStep = runtimeProfileControl ? [
     "0. If this system prompt contains a **Runtime Profile Control** section, read that notice first. It is informational only; no runtime control action or chat reply is required. Do not read MEMORY.md, check messages, or respond to inbox messages before reading it."
   ] : [];
-  const startupSteps = isCli ? [
+  const startupSteps = [
     ...runtimeProfileControlStartupStep,
     "1. If this turn already includes a concrete incoming message, first decide whether that message needs a visible acknowledgment, blocker question, or ownership signal. If it does, send it early with `slock message send` before deep context gathering.",
     "2. Read MEMORY.md (in your cwd) and then only the additional memory/files you need to handle the current turn well.",
-    `3. If there is no concrete incoming message to handle, stop and wait. ${messageDeliveryText}`,
+    noConcreteMessageStartupStep,
     "4. When you receive a message, process it and reply with `slock message send`.",
     "5. **Complete ALL your work before stopping.** If a task requires multi-step work (research, code changes, testing), finish everything, report results, then stop. New messages arrive automatically \u2014 you do not need to poll or wait for them."
-  ] : [
-    ...runtimeProfileControlStartupStep,
-    `1. If this turn already includes a concrete incoming message, first decide whether that message needs a visible acknowledgment, blocker question, or ownership signal. If it does, send it early with ${sendCmd} before deep context gathering.`,
-    "2. Read MEMORY.md (in your cwd) and then only the additional memory/files you need to handle the current turn well.",
-    `3. If there is no concrete incoming message to handle, stop and wait. ${messageDeliveryText}`,
-    `4. When you receive a message, process it and reply with ${sendCmd}.`,
-    "5. **Complete ALL your work before stopping.** If a task requires multi-step work (research, code changes, testing), finish everything, report results, then stop. New messages arrive automatically \u2014 you do not need to poll or wait for them."
   ];
-  const communicationSection = isCli ? cliGuideSections.communication : `## Communication \u2014 MCP tools ONLY
-
-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("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 credentialHygieneSection = isCli ? cliGuideSections.credentialHygiene : `### Credential hygiene
-
-**Never paste credentials into public Slock channels, public-channel threads, or public-channel task/attachment fields.** Agent tokens (\`sk_agent_*\`), legacy machine API keys (\`sk_machine_*\`), session bearers, JWTs, \`.env\` files, or \`credential.json\` contents must not appear in public channel chat. DMs and private channels are allowed for authorized secret handoff, but verify the audience first. If you accidentally paste one into a public channel, immediately tell the credential owner so they can rotate it.
-
-If a tool or error output contains credential-shaped strings, redact them to \`sk_agent_<redacted>\` / \`sk_machine_<redacted>\` shape before posting to a public channel.`;
-  const reminderSection = isCli ? cliGuideSections.reminders : `### 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.
-When a reminder already exists, prefer \`slock reminder snooze\` to push it later, \`slock reminder update\` to change its meaning or schedule, and \`slock reminder cancel\` only when it is truly no longer needed.
-Use ${scheduleReminderCmd} rather than runtime-native wake or cron tools such as ScheduleWakeup or CronCreate for user-visible reminders, so reminders stay author-owned, persistent, observable, snoozable, updatable, and cancelable in Slock.
-Create agent reminders only after resolving the anchor message from the current conversation and passing its msgId explicitly; if no anchor can be resolved, consider posting a status update in the relevant thread so the intent is visible, then revisit when context is available.`;
-  const sendingMessagesSection = isCli ? cliGuideSections.sendingMessages : `### Sending messages
-
-- **Reply to a channel**: \`${t("send_message")}(target="#channel-name", content="...")\`
-- **Reply to a DM**: \`${t("send_message")}(target="dm:@peer-name", content="...")\`
-- **Reply in a thread**: \`${t("send_message")}(target="#channel:shortid", content="...")\` or \`${t("send_message")}(target="dm:@peer:shortid", content="...")\`
-- **Start a NEW DM**: \`${t("send_message")}(target="dm:@person-name", 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.`;
-  const threadsSection = isCli ? cliGuideSections.threads : `### Threads
-
-Threads are sub-conversations attached to a specific message. They let you discuss a topic without cluttering the main channel.
-
-- **Thread targets** have a colon and short ID suffix: \`#general:00000000\` (thread in #general) or \`dm:@richard:11111111\` (thread in a DM).
-- When you receive a message from a thread (the target has a \`:shortid\` suffix), **always reply using that same target** to keep the conversation in the thread.
-- **Start a new thread**: Use the \`msg=\` field from the header as the thread suffix. For example, if you see \`[target=#general msg=00000000 ...]\`, call \`${t("send_message")}(target="#general:00000000", content="...")\`. The thread will be auto-created if it doesn't exist yet. Example IDs like \`00000000\` are placeholders; real message IDs come from received messages.
-- When you send a message, the response includes the message ID. You can use it to start a thread on your own message.
-- You can read thread history via ${readCmd} with the same thread target.
-- Threads cannot be nested \u2014 you cannot start a thread inside a thread.`;
-  const discoverySection = isCli ? cliGuideSections.discovery : `### 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 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 ? cliGuideSections.channelAwareness : `### Channel awareness
-
-Each channel has a **name** and optionally a **description** that define its purpose (visible via ${serverInfoCmd}). Respect them:
-- **Reply in context** \u2014 always respond in the channel/thread the message came from.
-- **Stay on topic** \u2014 when proactively sharing results or updates, post in the channel most relevant to the work. Don't scatter messages across unrelated channels.
-- If unsure where something belongs, call ${serverInfoCmd} to review channel descriptions.`;
-  const thirdPartyIntegrationsSection = isCli ? `### Third-party integrations
-
-If a built-in Slock app or registered third-party service requires login, use Slock Agent Login through the CLI instead of asking the human to copy tokens or complete human OAuth for you. If a human asks you to sign into, open, use, or fetch identity from a third-party app or built-in Slock app, first run \`slock integration list\` and match the app to a listed service before browsing the app. Use \`slock integration login --service <service>\` to provision or reuse your agent login for that service. If the service exposes an agent behavior manifest and you need to run its local CLI, run \`slock integration env --service <service>\` before invoking that CLI; if it prints exports, apply them first so service credentials stay under a per-agent profile HOME/XDG tree instead of the host user's global HOME. If it reports that no local env is required, do not invent HOME/XDG overrides. If it fails, do not run that local CLI with the host user's HOME; report that the service manifest is unsupported. Slock does not execute commands from remote manifests automatically. If the CLI reports that the \`integration\` command is unknown, the local daemon/CLI is too old for Slock Agent Login; report that the machine must be upgraded/restarted instead of calling internal HTTP endpoints yourself. When the command returns \`Agent login ready\` or \`Already logged in\`, the agent-side login is ready. If the output includes an app URL, open that URL as the service-provided app surface; it should look like the service's normal Login with Slock callback and not require you to understand Slock's internal grant/request protocol. Do not crawl third-party routes looking for a session before trying the registered-service login path. Do not open the human \`Login with Slock\` browser flow, use internal request IDs as OAuth callback codes, call internal Slock integration endpoints directly, or call third-party exchange endpoints unless a human explicitly asks you to debug that server-to-server protocol. If the service or human asks for your Slock Agent identity card, use \`slock profile show\`. Third-party pages may show \`Login with Slock\`; for agent-facing access, prefer the listed service / Slock Agent Login path.` : `### Third-party integrations
-
-If a built-in Slock app or registered third-party service requires login, use Slock Agent Login through the available registered-service interface instead of asking the human to copy tokens or complete human OAuth for you. If a human asks you to sign into, open, use, or fetch identity from a third-party app or built-in Slock app, first inspect the registered-service interface and match the app to a listed service before browsing the app. Once the registered-service interface reports the agent login is ready, the agent-side login is ready. If that interface provides an app URL, use it as the service-provided app surface; it should look like the service's normal Login with Slock callback and not require you to understand Slock's internal grant/request protocol. Do not crawl third-party routes looking for a session before trying the registered-service login path. Do not open the human \`Login with Slock\` browser flow or treat internal request IDs as OAuth callback codes unless a human explicitly asks you to debug that server-to-server protocol. If the service or human asks for your Slock Agent identity card, use your Slock profile view. Third-party pages may show \`Login with Slock\`; for agent-facing access, prefer the listed service / Slock Agent Login path.`;
-  const readingHistorySection = isCli ? cliGuideSections.readingHistory : `### Reading history
-
-Use ${readCmd} with the \`channel\` parameter set to \`"#channel-name"\`, \`"dm:@peer-name"\`, or a thread target like \`"#channel:shortid"\`.
-
-To jump directly to a specific hit with nearby context, pass \`around\` set to a message ID or seq number.`;
-  const historicalReferenceSection = isCli ? cliGuideSections.historicalReferences : `### Historical references
-
-When a user refers to prior Slock discussion and the relevant context is not already available, first use \`${t("search_messages")}\` and ${readCmd} to find the original thread, decision, or owner before answering. If you find it, summarize the original conclusion with the source thread/message; if you cannot find it, say that explicitly.`;
-  const tasksSection = isCli ? cliGuideSections.tasks : `### Tasks
-
-When someone sends a message that asks you to do something \u2014 fix a bug, write code, review a PR, deploy, investigate an issue \u2014 that is work. Claim it before you start.
-
-**Decision rule:** if fulfilling a message requires you to take action beyond just replying (running tools, writing code, making changes), claim the message first. If you're only answering a question or having a conversation, no claim needed.
-
-**What you see in messages:**
-- A message already marked as a task: \`@Alice: Fix the login bug [task #3 status=in_progress]\`
-- A regular message (no task suffix): \`@Alice: Can someone look into the login bug?\`
-- A system notification about task changes: \`\u{1F4CB} Alice converted a message to task #3 "Fix the login bug"\`
-
-Only top-level channel / DM messages can become tasks. Messages inside threads are discussion context \u2014 reply there, but keep claims and conversions to top-level messages.
-
-${readCmd} shows messages in their current state. If a message was later converted to a task, it will show the \`[task #N ...]\` suffix.
-
-**Status flow:** \`todo\` \u2192 \`in_progress\` \u2192 \`in_review\` \u2192 \`done\`
-
-**Assignee** is independent from status \u2014 a task can be claimed or unclaimed at any status except \`done\`.
-
-**Workflow:**
-1. Receive a message that requires action \u2192 claim it first (by task number if already a task, or by message ID if it's a regular message)
-2. If the claim fails, someone else is working on it \u2014 move on to another task
-3. Post updates in the task's thread via ${sendCmd} with \`target="#channel:msgShortId"\`
-4. When done, set status to \`in_review\` so a human can validate via ${taskUpdateCmd}
-5. After approval (e.g. "looks good", "merge it"), set status to \`done\`
-
-**What ${taskCreateCmd} really means:**
-- Tasks live in the same chat flow as messages. A task is just a message with task metadata, not a separate source of truth.
-- ${taskCreateCmd} is a convenience helper for a specific sequence: create a brand-new message, then publish that new message as a task-message.
-- ${taskCreateCmd} only creates the task \u2014 to own it, call ${taskClaimCmd} afterward.
-- Typical uses for ${taskCreateCmd} are breaking down a larger task into parallel subtasks, or batch-creating genuinely new work for others to claim.
-- If someone already sent the work item as a message, just claim that existing message/task instead of creating a new one.
-- If the work already exists as a message, reuse it via ${taskClaimCmd} with the message ID.
-
-**Creating new tasks:**
-- The task system exists to prevent duplicate work. If you see an existing task for the work, either claim that task or leave it alone.
-- If a message already shows a \`[task #N ...]\` suffix, claim \`#N\` if it is yours to take; otherwise move on.
-- Before calling ${taskCreateCmd}, first check whether the work already exists on the task board or is already being handled.
-- Reuse existing tasks and threads instead of creating duplicates.
-- Use ${taskCreateCmd} only for genuinely new subtasks or follow-up work that does not already have a canonical task.`;
+  const communicationSection = cliGuideSections.communication;
+  const credentialHygieneSection = cliGuideSections.credentialHygiene;
+  const reminderSection = cliGuideSections.reminders;
+  const sendingMessagesSection = cliGuideSections.sendingMessages;
+  const threadsSection = cliGuideSections.threads;
+  const discoverySection = cliGuideSections.discovery;
+  const channelAwarenessSection = cliGuideSections.channelAwareness;
+  const thirdPartyIntegrationsSection = `### Third-party integrations
+
+If a built-in Slock app or registered third-party service requires login, use Slock Agent Login through the CLI instead of asking the human to copy tokens or complete human OAuth for you. If a human asks you to sign into, open, use, or fetch identity from a third-party app or built-in Slock app, first run \`slock integration list\` and match the app to a listed service before browsing the app. Use \`slock integration login --service <service>\` to provision or reuse your agent login for that service. If the service exposes an agent behavior manifest and you need to run its local CLI, run \`slock integration env --service <service>\` before invoking that CLI; if it prints exports, apply them first so service credentials stay under a per-agent profile HOME/XDG tree instead of the host user's global HOME. If it reports that no local env is required, do not invent HOME/XDG overrides. If it fails, do not run that local CLI with the host user's HOME; report that the service manifest is unsupported. Slock does not execute commands from remote manifests automatically. If the CLI reports that the \`integration\` command is unknown, the local daemon/CLI is too old for Slock Agent Login; report that the machine must be upgraded/restarted instead of calling internal HTTP endpoints yourself. When the command returns \`Agent login ready\` or \`Already logged in\`, the agent-side login is ready. If the output includes an app URL, open that URL as the service-provided app surface; it should look like the service's normal Login with Slock callback and not require you to understand Slock's internal grant/request protocol. Do not crawl third-party routes looking for a session before trying the registered-service login path. Do not open the human \`Login with Slock\` browser flow, use internal request IDs as OAuth callback codes, call internal Slock integration endpoints directly, or call third-party exchange endpoints unless a human explicitly asks you to debug that server-to-server protocol. If the service or human asks for your Slock Agent identity card, use \`slock profile show\`. Third-party pages may show \`Login with Slock\`; for agent-facing access, prefer the listed service / Slock Agent Login path.`;
+  const readingHistorySection = cliGuideSections.readingHistory;
+  const historicalReferenceSection = cliGuideSections.historicalReferences;
+  const tasksSection = cliGuideSections.tasks;
   let prompt = `You are "${config.displayName || config.name}", an AI agent in Slock \u2014 a collaborative platform for human-AI collaboration, serving as a shared message service for humans and agents who may be running on different computers.
 
 ## Who you are
@@ -2150,10 +2025,11 @@ While you are working, the daemon may write a batched, content-free inbox update
 
 How to handle these:
 - Treat the notification as a non-urgent signal that new Slock messages are waiting; it does not include the message content and does not require an immediate interruption.
-- Keep working until a natural breakpoint. If you then choose to inspect pending targets, call ${inboxCheckCmd}; use ${checkCmd} / ${readCmd} when you choose to inspect message content.
+- A content-free notice means messages exist that you have not seen \u2014 not that there is no content or no action. Whether and when to read them is your judgment, now or later; ${checkCmd} is one cheap command and the notice metadata helps you triage. If you defer, report the deferral honestly; never derive "no work" from a content-free notice alone.
+- Keep working until a natural breakpoint. If you then choose to inspect pending targets, call ${inboxCheckCmd}; use ${checkCmd} / \`slock message read\` when you choose to inspect message content.
 - If a message you explicitly read is higher priority, pivot to it. If not, continue your current work.`;
     } else {
-      const notifyExample = isCli ? `\`[Slock inbox notice:\\nInbox update: N unread messages total; M changed targets\\n#channel  pending: K messages ...]\`` : `\`[Slock inbox notice:\\nInbox update: N unread messages total; M changed targets\\n#channel  pending: K messages ...]\``;
+      const notifyExample = `\`[Slock inbox notice:\\nInbox update: N unread messages total; M changed targets\\n#channel  pending: K messages ...]\``;
       prompt += `
 
 ## Message Notifications
@@ -2164,7 +2040,8 @@ ${notifyExample}
 
 How to handle these:
 - The notice is target-scoped and content-free. Its header may show total unread/pending count, while detail rows list the targets changed by this update; it never includes message bodies.
-- Do not interrupt the current step just because a notice arrived. At a natural breakpoint, call ${inboxCheckCmd} if you choose to inspect pending targets, or use ${checkCmd} / ${readCmd} when you choose to inspect message content.
+- A content-free notice means messages exist that you have not seen \u2014 not that there is no content or no action. Whether and when to read them is your judgment, now or later; ${checkCmd} is one cheap command and the notice metadata helps you triage. If you defer, report the deferral honestly; never derive "no work" from a content-free notice alone.
+- Do not interrupt the current step just because a notice arrived. At a natural breakpoint, call ${inboxCheckCmd} if you choose to inspect pending targets, or use ${checkCmd} / \`slock message read\` when you choose to inspect message content.
 - If a message you explicitly read is higher priority, you may pivot to it. If not, continue your current work.`;
     }
   }
@@ -2177,7 +2054,7 @@ ${config.description}. This may evolve.`;
   return prompt;
 }
 function buildCliSystemPrompt(config, opts) {
-  return buildPrompt(config, "cli", opts);
+  return buildPrompt(config, opts);
 }
 
 // src/slockHome.ts
@@ -3407,6 +3284,7 @@ function routeFamilyForPath(pathname) {
   if (pathname === "/internal/agent-api/tasks/claim") return "tasks/claim";
   if (pathname === "/internal/agent-api/tasks/update-status") return "tasks/update";
   if (pathname === "/internal/agent-api/tasks" || pathname.startsWith("/internal/agent-api/tasks/")) return "tasks";
+  if (/^\/internal\/agent-api\/attachments\/[^/]+\/comments/.test(pathname)) return "agent-api/attachments/comments";
   if (pathname.startsWith("/internal/agent-api/attachments/")) return "agent-api/attachments";
   if (/^\/internal\/agent-api\/messages\/[^/]+\/resolve$/.test(pathname)) return "agent-api/messages/resolve";
   if (/^\/internal\/agent-api\/messages\/[^/]+\/reactions$/.test(pathname)) return "agent-api/messages/reactions";
@@ -4469,6 +4347,52 @@ function buildClaudeSpawnSpec(claudeCommand, platform = process.platform) {
   };
 }
 
+// src/drivers/claudeProviderIsolation.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, symlinkSync } from "fs";
+import os2 from "os";
+import path5 from "path";
+function isClaudeCustomProviderConfig(config) {
+  const launchRuntimeFields = runtimeConfigToLaunchFields(config);
+  return launchRuntimeFields.runtime === "claude" && Boolean(launchRuntimeFields.envVars?.ANTHROPIC_BASE_URL) && Boolean(launchRuntimeFields.envVars?.ANTHROPIC_API_KEY);
+}
+function getClaudeProviderStatePaths(workingDirectory) {
+  const root = path5.join(workingDirectory, ".slock", "claude-provider");
+  const home = path5.join(root, "home");
+  return {
+    root,
+    home,
+    configDir: path5.join(home, ".claude")
+  };
+}
+function linkIfPresent(source, target) {
+  try {
+    if (!existsSync3(source) || existsSync3(target)) return;
+    mkdirSync2(path5.dirname(target), { recursive: true, mode: 448 });
+    symlinkSync(source, target, "dir");
+  } catch {
+  }
+}
+function ensureClaudeProviderStatePaths(workingDirectory, hostClaudeHome = path5.join(os2.homedir(), ".claude")) {
+  const paths = getClaudeProviderStatePaths(workingDirectory);
+  mkdirSync2(paths.home, { recursive: true, mode: 448 });
+  mkdirSync2(paths.configDir, { recursive: true, mode: 448 });
+  linkIfPresent(path5.join(hostClaudeHome, "skills"), path5.join(paths.configDir, "skills"));
+  linkIfPresent(path5.join(hostClaudeHome, "commands"), path5.join(paths.configDir, "commands"));
+  return paths;
+}
+function buildClaudeProviderIsolationEnv(ctx) {
+  if (!isClaudeCustomProviderConfig(ctx.config)) {
+    return {};
+  }
+  const paths = ensureClaudeProviderStatePaths(ctx.workingDirectory);
+  return {
+    HOME: paths.home,
+    USERPROFILE: paths.home,
+    CLAUDE_CONFIG_DIR: paths.configDir,
+    CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST: "1"
+  };
+}
+
 // src/drivers/claude.ts
 var ClaudeDriver = class {
   id = "claude";
@@ -4489,8 +4413,6 @@ var ClaudeDriver = class {
     toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
   };
   supportsStdinNotification = true;
-  mcpToolPrefix = "";
-  usesSlockCliForCommunication = true;
   // Claude Code supports same-turn steering, but raw stdin injection at an
   // arbitrary busy instant can collide with active signed thinking blocks. The
   // daemon therefore gates busy delivery on Claude stream-json boundaries.
@@ -4504,7 +4426,10 @@ var ClaudeDriver = class {
     return buildClaudeArgs(config, opts);
   }
   async spawn(ctx) {
-    const { slockDir, tokenFile, spawnEnv } = await prepareCliTransport(ctx);
+    const { slockDir, tokenFile, spawnEnv } = await prepareCliTransport(
+      ctx,
+      buildClaudeProviderIsolationEnv(ctx)
+    );
     const systemPromptPath = writeClaudeSystemPromptFile(ctx.standingPrompt, slockDir);
     const args = this.buildClaudeArgs(ctx.config, {
       standingPromptFilePath: systemPromptPath
@@ -4550,7 +4475,6 @@ var ClaudeDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       postStartupNotes: [
         "**Claude runtime note:** While you are busy, Slock batches inbox-count notifications instead of injecting message content. Use `slock message check` at natural breakpoints to pull the pending messages before side-effect actions that depend on current context."
@@ -4563,9 +4487,9 @@ var ClaudeDriver = class {
 
 // src/drivers/codex.ts
 import { spawn as spawn2, execFileSync as execFileSync2, execSync } from "child_process";
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-import os2 from "os";
-import path5 from "path";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+import os3 from "os";
+import path6 from "path";
 
 // src/runtimeTurnState.ts
 var RuntimeTurnState = class {
@@ -4722,16 +4646,17 @@ function rawResponseItemProgressEvent(message) {
 function nonEmptyString2(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
+function codexMcpToolName(item) {
+  const tool = nonEmptyString2(item.tool) ?? "unknown";
+  const server = nonEmptyString2(item.server);
+  return server ? `mcp_${server}_${tool}` : `mcp_${tool}`;
+}
 var CodexEventNormalizer = class {
-  mcpToolPrefix;
   currentThreadId = null;
   sessionAnnounced = false;
   streamedAgentMessageIds = /* @__PURE__ */ new Set();
   streamedReasoningIds = /* @__PURE__ */ new Set();
   turnState = new RuntimeTurnState();
-  constructor(opts) {
-    this.mcpToolPrefix = opts.mcpToolPrefix;
-  }
   reset(opts = {}) {
     this.currentThreadId = opts.threadId ?? null;
     this.turnState.reset();
@@ -4891,11 +4816,11 @@ var CodexEventNormalizer = class {
             break;
           case "mcpToolCall":
             if (isStarted) {
-              const toolName = item.server === "chat" ? `${this.mcpToolPrefix}${item.tool}` : `${this.mcpToolPrefix.replace(/_$/, "")}_${item.server}_${item.tool}`;
+              const toolName = codexMcpToolName(item);
               events.push({ kind: "tool_call", name: toolName, input: item.arguments });
             }
             if (isCompleted) {
-              const toolName = item.server === "chat" ? `${this.mcpToolPrefix}${item.tool}` : `${this.mcpToolPrefix.replace(/_$/, "")}_${item.server}_${item.tool}`;
+              const toolName = codexMcpToolName(item);
               events.push({ kind: "tool_output", name: toolName });
               this.turnState.markToolBoundary();
             }
@@ -4951,9 +4876,9 @@ var CodexEventNormalizer = class {
 
 // src/drivers/codex.ts
 function ensureGitRepoForCodex(workingDirectory, deps = {}) {
-  const existsSyncFn = deps.existsSyncFn ?? existsSync3;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync4;
   const execSyncFn = deps.execSyncFn ?? execSync;
-  const gitDir = path5.join(workingDirectory, ".git");
+  const gitDir = path6.join(workingDirectory, ".git");
   if (existsSyncFn(gitDir)) return;
   execSyncFn("git init", { cwd: workingDirectory, stdio: "pipe" });
   execSyncFn(
@@ -4966,13 +4891,13 @@ function ensureGitRepoForCodex(workingDirectory, deps = {}) {
 }
 var CODEX_DESKTOP_BUNDLE_PATH = "/Applications/Codex.app/Contents/Resources/codex";
 function isWindowsSandboxRunner(commandPath) {
-  return path5.basename(commandPath).toLowerCase().startsWith("codex-command-runner");
+  return path6.basename(commandPath).toLowerCase().startsWith("codex-command-runner");
 }
 function resolveWindowsNpmCodexEntry(deps = {}) {
-  const existsSyncFn = deps.existsSyncFn ?? existsSync3;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync4;
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync2;
   const env = deps.env ?? process.env;
-  const winPath = path5.win32;
+  const winPath = path6.win32;
   try {
     const globalRoot = String(execFileSyncFn("npm", ["root", "-g"], {
       encoding: "utf8",
@@ -4991,10 +4916,10 @@ function resolveWindowsNpmCodexEntry(deps = {}) {
   return null;
 }
 function resolveWindowsCodexDesktopEntry(deps = {}) {
-  const existsSyncFn = deps.existsSyncFn ?? existsSync3;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync4;
   const env = deps.env ?? process.env;
   const homeDir = deps.homeDir;
-  const winPath = path5.win32;
+  const winPath = path6.win32;
   const candidates = [
     env.LOCALAPPDATA ? winPath.join(env.LOCALAPPDATA, "OpenAI", "Codex", "bin", "codex.exe") : null,
     env.USERPROFILE ? winPath.join(env.USERPROFILE, "AppData", "Local", "OpenAI", "Codex", "bin", "codex.exe") : null,
@@ -5082,8 +5007,6 @@ var CodexDriver = class {
     toLaunchSpec: (modelId) => ({ params: { model: modelId } })
   };
   supportsStdinNotification = true;
-  mcpToolPrefix = "mcp_chat_";
-  usesSlockCliForCommunication = true;
   busyDeliveryMode = "direct";
   supportsNativeStandingPrompt = true;
   probe() {
@@ -5130,7 +5053,7 @@ var CodexDriver = class {
   initializeRequestId = null;
   pendingThreadRequest = null;
   initialTurnStarted = false;
-  normalizer = new CodexEventNormalizer({ mcpToolPrefix: this.mcpToolPrefix });
+  normalizer = new CodexEventNormalizer();
   async spawn(ctx) {
     ensureGitRepoForCodex(ctx.workingDirectory);
     const { spawnEnv } = await prepareCliTransport(ctx, { NO_COLOR: "1" });
@@ -5222,7 +5145,6 @@ var CodexDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       postStartupNotes: [
         "**IMPORTANT**: Your process stays alive across turns. While you are working, Slock may write batched inbox-count notifications into the current turn; call `slock message check` at natural breakpoints to read the pending messages."
@@ -5266,9 +5188,9 @@ var CodexDriver = class {
     return detectCodexModels();
   }
 };
-function detectCodexModels(home = os2.homedir()) {
-  const cachePath = path5.join(home, ".codex", "models_cache.json");
-  const configPath = path5.join(home, ".codex", "config.toml");
+function detectCodexModels(home = os3.homedir()) {
+  const cachePath = path6.join(home, ".codex", "models_cache.json");
+  const configPath = path6.join(home, ".codex", "config.toml");
   let models = [];
   try {
     const raw = readFileSync2(cachePath, "utf8");
@@ -5362,9 +5284,7 @@ var AntigravityDriver = class {
     toLaunchSpec: (_modelId) => ({ args: [] })
   };
   supportsStdinNotification = false;
-  mcpToolPrefix = "";
   busyDeliveryMode = "none";
-  usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
   probe() {
@@ -5412,7 +5332,6 @@ var AntigravityDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       postStartupNotes: [
         "**Antigravity 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."
@@ -5451,9 +5370,7 @@ var CopilotDriver = class {
     toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
   };
   supportsStdinNotification = false;
-  mcpToolPrefix = "";
   busyDeliveryMode = "none";
-  usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
   async spawn(ctx) {
@@ -5559,7 +5476,6 @@ var CopilotDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       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."
@@ -5596,9 +5512,7 @@ var CursorDriver = class {
     toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
   };
   supportsStdinNotification = false;
-  mcpToolPrefix = "mcp__chat__";
   busyDeliveryMode = "none";
-  usesSlockCliForCommunication = true;
   async spawn(ctx) {
     const args = [
       "--print",
@@ -5684,7 +5598,6 @@ var CursorDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "mcp__chat__",
       extraCriticalRules: [],
       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."
@@ -5745,8 +5658,8 @@ function runCursorModelsCommand() {
 
 // src/drivers/gemini.ts
 import { execFileSync as execFileSync3, spawn as spawn6 } from "child_process";
-import { existsSync as existsSync4 } from "fs";
-import path6 from "path";
+import { existsSync as existsSync5 } from "fs";
+import path7 from "path";
 async function buildGeminiSpawnEnv(ctx, platform = process.platform) {
   const { spawnEnv } = await prepareCliTransport(ctx, { NO_COLOR: "1" }, platform);
   const launchEnvVars = runtimeConfigToLaunchFields(ctx.config).envVars;
@@ -5788,9 +5701,9 @@ function resolveGeminiSpawn(commandArgs, deps = {}) {
     return { command: resolveCommandOnPath("gemini", deps) ?? "gemini", args: commandArgs };
   }
   const execFileSyncFn = deps.execFileSyncFn ?? execFileSync3;
-  const existsSyncFn = deps.existsSyncFn ?? existsSync4;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync5;
   const env = deps.env ?? process.env;
-  const winPath = path6.win32;
+  const winPath = path7.win32;
   let geminiEntry = null;
   try {
     const globalRoot = normalizeExecOutput2(execFileSyncFn("npm", ["root", "-g"], {
@@ -5844,9 +5757,7 @@ var GeminiDriver = class {
     toLaunchSpec: (modelId) => modelId && modelId !== "default" ? { args: ["--model", modelId] } : { args: [] }
   };
   supportsStdinNotification = false;
-  mcpToolPrefix = "";
   busyDeliveryMode = "none";
-  usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
   async spawn(ctx) {
@@ -5915,7 +5826,6 @@ var GeminiDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       postStartupNotes: [
         "**Gemini 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."
@@ -5929,9 +5839,9 @@ var GeminiDriver = class {
 // src/drivers/kimi.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { spawn as spawn7 } from "child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import os3 from "os";
-import path7 from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import os4 from "os";
+import path8 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";
@@ -5969,9 +5879,7 @@ var KimiDriver = class {
     toLaunchSpec: (modelId) => ({ args: ["--model", modelId] })
   };
   supportsStdinNotification = true;
-  mcpToolPrefix = "";
   busyDeliveryMode = "direct";
-  usesSlockCliForCommunication = true;
   sessionId = null;
   sessionAnnounced = false;
   promptRequestId = null;
@@ -5980,9 +5888,9 @@ var KimiDriver = class {
     this.sessionId = ctx.config.sessionId || randomUUID2();
     this.sessionAnnounced = false;
     this.promptRequestId = randomUUID2();
-    const systemPromptPath = path7.join(ctx.workingDirectory, KIMI_SYSTEM_PROMPT_FILE);
-    const agentFilePath = path7.join(ctx.workingDirectory, KIMI_AGENT_FILE);
-    if (!isResume || !existsSync5(systemPromptPath)) {
+    const systemPromptPath = path8.join(ctx.workingDirectory, KIMI_SYSTEM_PROMPT_FILE);
+    const agentFilePath = path8.join(ctx.workingDirectory, KIMI_AGENT_FILE);
+    if (!isResume || !existsSync6(systemPromptPath)) {
       writeFileSync3(systemPromptPath, ctx.prompt, "utf8");
     }
     writeFileSync3(agentFilePath, [
@@ -6117,7 +6025,6 @@ var KimiDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       postStartupNotes: [],
       includeStdinNotificationSection: true,
@@ -6128,8 +6035,8 @@ var KimiDriver = class {
     return detectKimiModels();
   }
 };
-function detectKimiModels(home = os3.homedir()) {
-  const configPath = path7.join(home, ".kimi", "config.toml");
+function detectKimiModels(home = os4.homedir()) {
+  const configPath = path8.join(home, ".kimi", "config.toml");
   let raw;
   try {
     raw = readFileSync3(configPath, "utf8");
@@ -6156,11 +6063,9 @@ function detectKimiModels(home = os3.homedir()) {
 
 // src/drivers/opencode.ts
 import { spawn as spawn8, spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync6, readFileSync as readFileSync4 } from "fs";
-import os4 from "os";
-import path8 from "path";
-var CHAT_MCP_SERVER_NAME = "chat";
-var CHAT_MCP_TOOL_PREFIX = `${CHAT_MCP_SERVER_NAME}_`;
+import { existsSync as existsSync7, readFileSync as readFileSync4 } from "fs";
+import os5 from "os";
+import path9 from "path";
 var SLOCK_AGENT_NAME = "slock";
 var NO_MESSAGE_PROMPT = "No new messages are pending. Stop now.";
 var FIRST_MESSAGE_TASK_PREFIX = "First message task (system-triggered):";
@@ -6188,8 +6093,8 @@ function parseUserOpenCodeConfig(ctx) {
   const raw = runtimeConfigToLaunchFields(ctx.config).envVars?.OPENCODE_CONFIG_CONTENT;
   return parseOpenCodeConfigContent(raw);
 }
-function readLocalOpenCodeConfig(home = os4.homedir()) {
-  const configPath = path8.join(home, ".config", "opencode", "opencode.json");
+function readLocalOpenCodeConfig(home = os5.homedir()) {
+  const configPath = path9.join(home, ".config", "opencode", "opencode.json");
   try {
     return parseOpenCodeConfigContent(readFileSync4(configPath, "utf8"));
   } catch {
@@ -6249,7 +6154,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]);
@@ -6267,7 +6172,7 @@ function buildOpenCodeConfig(ctx, home = os4.homedir()) {
     mcp: recordField(userConfig.mcp)
   };
 }
-async function buildOpenCodeLaunchOptions(ctx, home = os4.homedir(), version = null) {
+async function buildOpenCodeLaunchOptions(ctx, home = os5.homedir(), version = null) {
   const slock = await prepareCliTransport(ctx, { NO_COLOR: "1" });
   const config = buildOpenCodeConfig(ctx, home);
   const env = {
@@ -6366,7 +6271,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);
@@ -6387,11 +6292,11 @@ function runOpenCodeModelsCommand(home, deps = {}) {
   };
 }
 function isWindowsCommandShim(commandPath) {
-  const ext = path8.win32.extname(commandPath).toLowerCase();
+  const ext = path9.win32.extname(commandPath).toLowerCase();
   return ext === ".cmd" || ext === ".bat";
 }
 function opencodePackageEntryCandidates(packageRoot) {
-  const winPath = path8.win32;
+  const winPath = path9.win32;
   return [
     winPath.join(packageRoot, "bin", "opencode.exe"),
     winPath.join(packageRoot, "bin", "opencode.js"),
@@ -6400,16 +6305,16 @@ function opencodePackageEntryCandidates(packageRoot) {
   ];
 }
 function openCodeSpecForEntry(entry, commandArgs) {
-  if (path8.win32.extname(entry).toLowerCase() === ".exe") {
+  if (path9.win32.extname(entry).toLowerCase() === ".exe") {
     return { command: entry, args: commandArgs, shell: false };
   }
   return { command: process.execPath, args: [entry, ...commandArgs], shell: false };
 }
 function resolveWindowsOpenCodePackageEntry(commandPath, deps = {}) {
-  const existsSyncFn = deps.existsSyncFn ?? existsSync6;
+  const existsSyncFn = deps.existsSyncFn ?? existsSync7;
   const execFileSyncFn = deps.execFileSyncFn;
   const env = deps.env ?? process.env;
-  const winPath = path8.win32;
+  const winPath = path9.win32;
   const candidates = [];
   if (execFileSyncFn) {
     try {
@@ -6437,7 +6342,7 @@ function resolveWindowsOpenCodePackageEntry(commandPath, deps = {}) {
 function extractWindowsShimTargets(commandPath, deps = {}) {
   if (!isWindowsCommandShim(commandPath)) return [];
   const readFileSyncFn = deps.readFileSyncFn ?? readFileSync4;
-  const commandDir = path8.win32.dirname(commandPath);
+  const commandDir = path9.win32.dirname(commandPath);
   let raw;
   try {
     raw = String(readFileSyncFn(commandPath, "utf8"));
@@ -6448,7 +6353,7 @@ function extractWindowsShimTargets(commandPath, deps = {}) {
   const dp0Pattern = /%~dp0\\?([^"\r\n]*?opencode\.(?:exe|js|mjs|cjs))/gi;
   for (const match of raw.matchAll(dp0Pattern)) {
     const relative = match[1]?.replace(/^\\+/, "");
-    if (relative) candidates.push(path8.win32.normalize(path8.win32.join(commandDir, relative)));
+    if (relative) candidates.push(path9.win32.normalize(path9.win32.join(commandDir, relative)));
   }
   return candidates;
 }
@@ -6462,7 +6367,7 @@ function resolveOpenCodeSpawn(commandArgs, deps = {}) {
     };
   }
   const command = resolveCommandOnPath("opencode", deps);
-  if (command && path8.win32.extname(command).toLowerCase() === ".exe") {
+  if (command && path9.win32.extname(command).toLowerCase() === ".exe") {
     return { command, args: commandArgs, shell: false };
   }
   const packageEntry = resolveWindowsOpenCodePackageEntry(command, deps);
@@ -6487,7 +6392,6 @@ function isSystemFirstMessageTask(message) {
 }
 function buildOpenCodeSystemPrompt(config) {
   return buildCliTransportSystemPrompt(config, {
-    toolPrefix: CHAT_MCP_TOOL_PREFIX,
     extraCriticalRules: [],
     postStartupNotes: [
       "**OpenCode 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."
@@ -6532,11 +6436,9 @@ var OpenCodeDriver = class {
     }
   };
   supportsStdinNotification = false;
-  mcpToolPrefix = CHAT_MCP_TOOL_PREFIX;
   busyDeliveryMode = "none";
   terminateProcessOnTurnEnd = true;
   deferSpawnUntilMessage = true;
-  usesSlockCliForCommunication = true;
   shouldDeferWakeMessage(message) {
     return isSystemFirstMessageTask(message);
   }
@@ -6570,7 +6472,7 @@ var OpenCodeDriver = class {
     if (unsupportedMessage) {
       throw new Error(unsupportedMessage);
     }
-    const launch = await buildOpenCodeLaunchOptions(ctx, os4.homedir(), version);
+    const launch = await buildOpenCodeLaunchOptions(ctx, os5.homedir(), version);
     const spawnSpec = resolveOpenCodeSpawn(launch.args);
     const proc = spawn8(spawnSpec.command, spawnSpec.args, {
       cwd: ctx.workingDirectory,
@@ -6637,8 +6539,8 @@ var OpenCodeDriver = class {
 // src/drivers/pi.ts
 import { randomUUID as randomUUID3 } from "crypto";
 import { EventEmitter } from "events";
-import { mkdirSync as mkdirSync2, readdirSync } from "fs";
-import path9 from "path";
+import { mkdirSync as mkdirSync3, readdirSync } from "fs";
+import path10 from "path";
 import {
   AuthStorage,
   createBashTool,
@@ -6665,7 +6567,7 @@ function createPiSdkEventMappingState(sessionId = null) {
   };
 }
 function buildPiSessionDir(workingDirectory) {
-  return path9.join(workingDirectory, PI_SESSION_DIR);
+  return path10.join(workingDirectory, PI_SESSION_DIR);
 }
 async function buildPiSpawnEnv(ctx) {
   return (await prepareCliTransport(ctx, { NO_COLOR: "1" })).spawnEnv;
@@ -6687,7 +6589,7 @@ function findPiSessionFile(sessionDir, sessionId) {
   }
   const suffix = `_${sessionId}.jsonl`;
   const match = entries.find((entry) => entry.endsWith(suffix));
-  return match ? path9.join(sessionDir, match) : null;
+  return match ? path10.join(sessionDir, match) : null;
 }
 function detectPiModelsFromRegistry(modelRegistry) {
   const models = [];
@@ -6840,11 +6742,11 @@ var PI_IDLE_PROMPT_RETRY_MS = 25;
 var PI_IDLE_PROMPT_MAX_WAIT_MS = 1e3;
 async function createPiAgentSessionForContext(ctx, sessionId) {
   const sessionDir = buildPiSessionDir(ctx.workingDirectory);
-  mkdirSync2(sessionDir, { recursive: true });
+  mkdirSync3(sessionDir, { recursive: true });
   const spawnEnv = await buildPiSpawnEnv(ctx);
   const agentDir = spawnEnv.PI_CODING_AGENT_DIR || getAgentDir();
-  const authStorage = AuthStorage.create(path9.join(agentDir, "auth.json"));
-  const modelRegistry = ModelRegistry.create(authStorage, path9.join(agentDir, "models.json"));
+  const authStorage = AuthStorage.create(path10.join(agentDir, "auth.json"));
+  const modelRegistry = ModelRegistry.create(authStorage, path10.join(agentDir, "models.json"));
   const launchRuntimeFields = runtimeConfigToLaunchFields(ctx.config);
   const model = resolvePiModelFromRegistry(launchRuntimeFields.model, modelRegistry);
   if (launchRuntimeFields.model && launchRuntimeFields.model !== "default" && !model) {
@@ -7087,9 +6989,7 @@ var PiDriver = class {
     toLaunchSpec: (modelId) => ({ params: { model: modelId } })
   };
   supportsStdinNotification = true;
-  mcpToolPrefix = "";
   busyDeliveryMode = "direct";
-  usesSlockCliForCommunication = true;
   sessionId = null;
   get currentSessionId() {
     return this.sessionId;
@@ -7120,7 +7020,6 @@ var PiDriver = class {
   }
   buildSystemPrompt(config, _agentId) {
     return buildCliTransportSystemPrompt(config, {
-      toolPrefix: "",
       extraCriticalRules: [],
       postStartupNotes: [
         "**Pi runtime note:** Slock keeps Pi running as a persistent SDK session. While you are working, Slock may send inbox-count notifications into the current turn; call `slock message check` at natural breakpoints."
@@ -7294,7 +7193,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("..");
 }
@@ -7302,7 +7201,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 {
@@ -7351,7 +7250,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);
@@ -7370,7 +7269,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 {
@@ -7921,12 +7820,12 @@ function findSessionJsonl(root, predicate) {
     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;
@@ -7939,9 +7838,9 @@ function safeSessionFilename(value) {
 }
 function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
   try {
-    const dir = path11.join(fallbackDir, ".slock", "runtime-sessions");
-    mkdirSync3(dir, { recursive: true });
-    const filePath = path11.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
+    const dir = path12.join(fallbackDir, ".slock", "runtime-sessions");
+    mkdirSync4(dir, { recursive: true });
+    const filePath = path12.join(dir, `${runtime}-${safeSessionFilename(sessionId)}.jsonl`);
     writeFileSync4(filePath, JSON.stringify({
       type: "runtime_session_handoff",
       runtime,
@@ -7960,8 +7859,20 @@ function writeRuntimeSessionHandoff(runtime, sessionId, fallbackDir) {
     return null;
   }
 }
-function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os5.homedir(), fallbackDir) {
-  const directPath = path11.isAbsolute(sessionId) ? sessionId : null;
+function resolveRuntimeHomeDir(config, defaultHomeDir, workspacePath) {
+  if (isClaudeCustomProviderConfig(config)) {
+    return getClaudeProviderStatePaths(workspacePath).home;
+  }
+  return defaultHomeDir;
+}
+function ensureRuntimeHomeDir(config, defaultHomeDir, workspacePath) {
+  if (isClaudeCustomProviderConfig(config)) {
+    return ensureClaudeProviderStatePaths(workspacePath).home;
+  }
+  return defaultHomeDir;
+}
+function resolveRuntimeSessionRef(runtime, sessionId, homeDir = os6.homedir(), fallbackDir) {
+  const directPath = path12.isAbsolute(sessionId) ? sessionId : null;
   if (directPath) {
     try {
       if (statSync(directPath).isFile()) {
@@ -7970,7 +7881,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;
@@ -8031,13 +7942,7 @@ function formatThreadContextMessage(message) {
   const senderType = formatVisibleActorType(message.sender_type);
   return `- [msg=${msgId} time=${time}${senderType}] ${formatSenderHandle(message)}: ${message.content}`;
 }
-function mcpToolName(driver, name) {
-  return `${driver?.mcpToolPrefix ?? ""}${name}`;
-}
-function communicationCommand(driver, name) {
-  if (!driver?.usesSlockCliForCommunication) {
-    return mcpToolName(driver, name);
-  }
+function communicationCommand(name) {
   switch (name) {
     case "send_message":
       return "slock message send";
@@ -8051,18 +7956,18 @@ function communicationCommand(driver, name) {
       return `slock ${name.replace(/_/g, " ")}`;
   }
 }
-function dynamicReplyInstruction(driver) {
-  return driver?.usesSlockCliForCommunication ? "reply using `slock message send --target <exact target>`" : `reply with ${communicationCommand(driver, "send_message")}`;
+function dynamicReplyInstruction() {
+  return "reply using `slock message send --target <exact target>`";
 }
-function dynamicClaimInstruction(driver) {
-  return driver?.usesSlockCliForCommunication ? "claim the relevant task with `slock task claim`" : `claim the relevant task with ${communicationCommand(driver, "claim_tasks")}`;
+function dynamicClaimInstruction() {
+  return "claim the relevant task with `slock task claim`";
 }
-function formatIncomingMessage(message, driver) {
+function formatIncomingMessage(message) {
   const threadJoinPrefix = message.thread_join_context ? [
     `[Slock thread context: you were added to a new thread via @mention.]`,
     `parent: ${message.thread_join_context.parent_target}`,
     `thread: ${message.thread_join_context.thread_target}`,
-    `suggested next step: ${driver?.usesSlockCliForCommunication ? `slock message read --channel "${message.thread_join_context.suggested_read_history_target}"` : `${communicationCommand(driver, "read_history")}(channel="${message.thread_join_context.suggested_read_history_target}")`}`,
+    `suggested next step: slock message read --channel "${message.thread_join_context.suggested_read_history_target}"`,
     "",
     "Parent message:",
     formatThreadContextMessage(message.thread_join_context.parent_message),
@@ -9017,7 +8922,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;
@@ -9919,7 +9824,7 @@ var AgentProcessManager = class _AgentProcessManager {
         );
         wakeMessage = void 0;
       }
-      const agentDataDir = path11.join(this.dataDir, agentId);
+      const agentDataDir = path12.join(this.dataDir, agentId);
       await mkdir(agentDataDir, { recursive: true });
       let runtimeConfig = withLocalRuntimeContext(config, agentId, agentDataDir);
       const legacyRuntimeProfileControl = runtimeConfig.runtimeProfileControl?.kind === "migration" ? runtimeConfig.runtimeProfileControl : null;
@@ -9933,23 +9838,23 @@ var AgentProcessManager = class _AgentProcessManager {
         );
         runtimeConfig = { ...runtimeConfig, runtimeProfileControl: null };
       }
-      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);
           }
         }
@@ -9973,7 +9878,7 @@ var AgentProcessManager = class _AgentProcessManager {
         if (transientWakeMessage) {
           prompt = `System notice received:
 
-${formatIncomingMessage(wakeMessage, driver)}
+${formatIncomingMessage(wakeMessage)}
 
 Respond as appropriate. Complete all your work before stopping.
 ${RESPONSE_TARGET_HINT}`;
@@ -10007,7 +9912,7 @@ Use the inbox/read commands at a natural breakpoint if you choose to inspect tho
         }
         prompt += `
 
-Use ${communicationCommand(driver, "read_history")} to catch up on the channels listed above, then stop. Read each listed channel at most once unless a read fails. Do NOT call ${communicationCommand(driver, "check_messages")} in this mode. If the history reveals a direct request, assignment, @mention, review request, or task clearly addressed to you, switch into active handling instead of stopping: ${dynamicReplyInstruction(driver)} and ${dynamicClaimInstruction(driver)} before starting work. Otherwise, do NOT send any message in this mode. ${getMessageDeliveryText(driver)}`;
+Use ${communicationCommand("read_history")} to catch up on the channels listed above, then stop. Read each listed channel at most once unless a read fails. Do NOT call ${communicationCommand("check_messages")} in this mode. If the history reveals a direct request, assignment, @mention, review request, or task clearly addressed to you, switch into active handling instead of stopping: ${dynamicReplyInstruction()} and ${dynamicClaimInstruction()} before starting work. Otherwise, do NOT send any message in this mode. ${getMessageDeliveryText(driver)}`;
         promptSource = "resume_unread_summary";
       } else if (isResume) {
         prompt = `No new messages while you were away. Nothing to do \u2014 just stop. ${getMessageDeliveryText(driver)}`;
@@ -11085,7 +10990,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})`);
@@ -11146,7 +11051,8 @@ 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);
+    const runtimeHomeDir = resolveRuntimeHomeDir(config, this.runtimeSessionHomeDir, workspacePath);
     return {
       agentId,
       launchId,
@@ -11160,7 +11066,7 @@ Use ${communicationCommand(driver, "read_history")} to catch up on the channels
           path: workspacePath,
           reachable: true
         },
-        sessionRef: sessionId ? resolveRuntimeSessionRef(config.runtime, sessionId, this.runtimeSessionHomeDir, workspacePath) : null
+        sessionRef: sessionId ? resolveRuntimeSessionRef(config.runtime, sessionId, runtimeHomeDir, workspacePath) : null
       }
     };
   }
@@ -11439,7 +11345,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 {
@@ -11447,8 +11353,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;
@@ -11456,14 +11362,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");
@@ -11496,15 +11402,17 @@ 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 idle = this.idleAgentConfigs.get(agentId);
+    const config = agent?.config ?? idle?.config ?? null;
+    const runtime = runtimeHint || config?.runtime || "claude";
+    const workspaceDir = path12.join(this.dataDir, agentId);
+    const home = config ? ensureRuntimeHomeDir(config, os6.homedir(), workspaceDir) : os6.homedir();
     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();
@@ -11533,7 +11441,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);
@@ -11544,7 +11452,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);
@@ -12948,12 +12856,12 @@ ${formatAgentInboxDelta(inboxRows, { totalPendingMessages: inboxCount })}]`;
     const traceSource = options.transient ? `stdin_${mode}_transient_delivery` : `stdin_${mode}_delivery`;
     const prompt = formatRuntimeProfileControlPrompt(messages) ?? (messages.length === 1 ? `New message received:
 
-${formatIncomingMessage(messages[0], ap.driver)}
+${formatIncomingMessage(messages[0])}
 
 Respond as appropriate. Complete all your work before stopping.
 ${RESPONSE_TARGET_HINT}` : `New messages received:
 
-${messages.map((message) => formatIncomingMessage(message, ap.driver)).join("\n")}
+${messages.map((message) => formatIncomingMessage(message)).join("\n")}
 
 Respond as appropriate. Complete all your work before stopping.
 ${RESPONSE_TARGET_HINT}`);
@@ -13024,8 +12932,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);
@@ -13399,9 +13307,9 @@ var ReminderCache = class {
 
 // src/machineLock.ts
 import { createHash as createHash4, randomUUID as randomUUID4 } from "crypto";
-import { mkdirSync as mkdirSync4, readFileSync as readFileSync5, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
-import os6 from "os";
-import path12 from "path";
+import { mkdirSync as mkdirSync5, readFileSync as readFileSync5, rmSync as rmSync3, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
+import os7 from "os";
+import path13 from "path";
 var INCOMPLETE_LOCK_STALE_MS = 3e4;
 var DaemonMachineLockConflictError = class extends Error {
   code = "DAEMON_MACHINE_LOCK_HELD";
@@ -13423,7 +13331,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 {
@@ -13453,17 +13361,17 @@ 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 = randomUUID4();
-  mkdirSync4(machineDir, { recursive: true });
+  mkdirSync5(machineDir, { recursive: true });
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
-      mkdirSync4(lockDir);
+      mkdirSync5(lockDir);
       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)
@@ -13514,8 +13422,8 @@ function acquireDaemonMachineLock(options) {
 }
 
 // src/localTraceSink.ts
-import { appendFileSync, mkdirSync as mkdirSync5, readdirSync as readdirSync3, rmSync as rmSync4, statSync as statSync3, writeFileSync as writeFileSync6 } from "fs";
-import path13 from "path";
+import { appendFileSync, mkdirSync as mkdirSync6, readdirSync as readdirSync3, rmSync as rmSync4, statSync as statSync3, writeFileSync as writeFileSync6 } 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;
@@ -13552,7 +13460,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));
@@ -13578,11 +13486,11 @@ var LocalRotatingTraceSink = class {
     return this.currentFile;
   }
   ensureFile(nextBytes) {
-    mkdirSync5(this.traceDir, { recursive: true, mode: 448 });
+    mkdirSync6(this.traceDir, { recursive: true, mode: 448 });
     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`
       );
@@ -13597,7 +13505,7 @@ var LocalRotatingTraceSink = class {
     const excess = files.length - this.maxFiles;
     if (excess <= 0) return;
     for (const file of files.slice(0, excess)) {
-      rmSync4(path13.join(this.traceDir, file), { force: true });
+      rmSync4(path14.join(this.traceDir, file), { force: true });
     }
   }
 };
@@ -13688,7 +13596,7 @@ function isDiagnosticErrorAttr(key) {
 import { createHash as createHash6, randomUUID as randomUUID5 } 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/chatBridgeRequest.ts
 var DEFAULT_CHAT_BRIDGE_TOOL_TIMEOUT_MS = Number.parseInt(
@@ -13788,8 +13696,8 @@ async function executeResponseRequest(url, init, {
 }
 
 // src/directUploadCapability.ts
-function joinUrl(base, path16) {
-  return `${base.replace(/\/+$/, "")}${path16}`;
+function joinUrl(base, path17) {
+  return `${base.replace(/\/+$/, "")}${path17}`;
 }
 function jsonHeaders(apiKey) {
   return {
@@ -14008,7 +13916,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);
@@ -14020,8 +13928,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);
@@ -14095,8 +14003,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 {
@@ -14108,9 +14016,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)}
@@ -14232,17 +14140,28 @@ function readDaemonVersion(moduleUrl = import.meta.url) {
   }
 }
 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;
   }
 }
+function resolveSlockCliPathOrEmpty(moduleUrl = import.meta.url) {
+  try {
+    return resolveSlockCliPath(moduleUrl);
+  } catch {
+    return "";
+  }
+}
+async function runBundledSlockCli(argv) {
+  process.argv = [process.execPath, "slock", ...argv];
+  await import("./dist-CYKZS5JA.js");
+}
 function detectRuntimes(tracer = noopTracer) {
   const ids = [];
   const versions = {};
@@ -14392,7 +14311,7 @@ var DaemonCore = class {
     this.options = options;
     this.daemonVersion = options.daemonVersion ?? readDaemonVersion();
     this.computerVersion = (process.env.SLOCK_COMPUTER_VERSION || "").trim() || null;
-    this.slockCliPath = options.slockCliPath ?? resolveSlockCliPath();
+    this.slockCliPath = options.slockCliPath ?? resolveSlockCliPathOrEmpty();
     this.slockHome = resolveSlockHome();
     process.env[SLOCK_HOME_ENV] = this.slockHome;
     this.injectedTracer = Boolean(options.tracer);
@@ -14427,7 +14346,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() {
@@ -14454,7 +14373,7 @@ var DaemonCore = class {
       sink: this.localTraceSink
     }));
     this.agentManager.setTracer(this.tracer);
-    this.agentManager.setCliTransportTraceDir(path15.join(machineDir, "traces"));
+    this.agentManager.setCliTransportTraceDir(path16.join(machineDir, "traces"));
   }
   installTraceBundleUploader(machineDir) {
     if (!this.shouldEnableLocalTrace()) return;
@@ -14890,18 +14809,29 @@ var DaemonCore = class {
       case "computer:restart":
       case "computer:upgrade": {
         const action = msg.type === "computer:restart" ? "restart" : "upgrade";
+        const requestId = msg.requestId;
         this.recordDaemonTrace("daemon.computer_control.received", {
           action,
-          handled: Boolean(this.options.onComputerControl)
+          handled: Boolean(this.options.onComputerControl),
+          ...requestId ? { request_id: requestId } : {}
         });
         if (this.options.onComputerControl) {
-          try {
-            this.options.onComputerControl(action);
-          } catch (err) {
+          const ctx = {
+            requestId,
+            emitUpgradeProgress: (ev) => {
+              if (!requestId) return;
+              this.connection.send({ type: "computer:upgrade:progress", requestId, ...ev });
+            },
+            emitUpgradeDone: (ev) => {
+              if (!requestId) return;
+              this.connection.send({ type: "computer:upgrade:done", requestId, ...ev });
+            }
+          };
+          void Promise.resolve().then(() => this.options.onComputerControl(action, ctx)).catch((err) => {
             logger.error(
               `[Daemon] computer:${action} control handler failed: ${err instanceof Error ? err.message : String(err)}`
             );
-          }
+          });
         } else {
           logger.info(`[Daemon] Ignoring computer:${action} \u2014 not launched by a Computer service.`);
         }
@@ -14931,8 +14861,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.computerVersion ? { computerVersion: this.computerVersion } : {}
     });
@@ -14942,6 +14872,22 @@ var DaemonCore = class {
       idle_agents_count: idleAgentSessions.length,
       runtime_profile_reports_count: runtimeProfileReports.length
     });
+    if (this.options.onComputerUpgradeReconcile) {
+      void Promise.resolve().then(
+        () => this.options.onComputerUpgradeReconcile((done) => {
+          this.connection.send({ type: "computer:upgrade:done", ...done });
+          this.recordDaemonTrace("daemon.computer_upgrade.reconciled", {
+            request_id: done.requestId,
+            ok: done.ok,
+            ...done.newVersion ? { new_version: done.newVersion } : {}
+          });
+        })
+      ).catch((err) => {
+        logger.error(
+          `[Daemon] computer upgrade reconcile failed: ${err instanceof Error ? err.message : String(err)}`
+        );
+      });
+    }
     for (const agentId of runningAgentIds) {
       const sessionId = this.agentManager.getAgentSessionId(agentId);
       const launchId = this.agentManager.getAgentLaunchId(agentId);
@@ -15004,6 +14950,8 @@ export {
   parseDaemonCliArgs,
   readDaemonVersion,
   resolveSlockCliPath,
+  resolveSlockCliPathOrEmpty,
+  runBundledSlockCli,
   detectRuntimes,
   DaemonCore
 };