openmausbot 0.1.87 → 0.1.89

package/dist-server/server/drivers/acp/grok.js

@@ -4,8 +4,8 @@
 // The generic protocol runtime lives in acp/core.ts; this file is only the
 // per-harness quirks. Verified against grok 1.0.0.
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
+import { harnessHome } from "../../env-path.js";
 import { decodeInjectId, hostApiKey, localHost, mergeLocalInject } from "../local-inject.js";
 import { createAcpDriver } from "./core.js";
 export const STATIC_GROK_MODELS = {
@@ -17,11 +17,6 @@ export const STATIC_GROK_MODELS = {
     ],
 };
 const SLUG = /^[a-z0-9][a-z0-9._-]*$/i;
-function grokHome(env) {
-    if (env.GROK_HOME)
-        return env.GROK_HOME;
-    return join(env.HOME || env.USERPROFILE || homedir(), ".grok");
-}
 function unquote(raw) {
     const value = raw.trim();
     if (value.length >= 2 && value.startsWith('"') && value.endsWith('"')) {
@@ -32,7 +27,7 @@ function unquote(raw) {
 /** Local slugs from ~/.grok/config.toml, plus the cloud defaults.
  *  `grok -m <slug>` already accepts these; the picker just didn't list them. */
 export function readGrokModelCatalog(env = process.env) {
-    const path = join(grokHome(env), "config.toml");
+    const path = join(env.GROK_HOME || harnessHome("grok", env), "config.toml");
     let text = "";
     try {
         text = readFileSync(path, "utf8");
@@ -114,7 +109,7 @@ export function ensureGrokInjectSlug(modelId, env = process.env) {
     const host = localHost(inject.host);
     if (!host)
         return modelId;
-    const path = join(grokHome(env), "config.toml");
+    const path = join(env.GROK_HOME || harnessHome("grok", env), "config.toml");
     let text = "";
     try {
         text = readFileSync(path, "utf8");
@@ -258,7 +253,7 @@ const support = {
     // an unauthenticated CLI is a user action, not something to paper over.
     pickAuthMethod: (methods) => (methods.some((m) => m.id === "cached_token") ? "cached_token" : null),
     authFailure: "fail",
-    isAuthenticated: () => existsSync(join(homedir(), ".grok", "auth.json")),
+    isAuthenticated: (env) => existsSync(join(harnessHome("grok", env), "auth.json")),
     // `--append-system-prompt`/`--rules` are accepted by the CLI but do NOT
     // reach the agent-stdio system prompt (verified against 1.0.0), so the
     // persona is prepended codex-style.

package/dist-server/server/drivers/acp/hermes.js

@@ -9,6 +9,7 @@ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { parse as parseYaml } from "yaml";
+import { harnessHome } from "../../env-path.js";
 import { resolveCli } from "../../procs.js";
 import { decodeInjectId, hostApiKey, INJECT_SEP, localHost, mergeLocalInject } from "../local-inject.js";
 import { createAcpDriver } from "./core.js";
@@ -25,9 +26,6 @@ export function bindHermesScreenshotCompat(env, modelId) {
     env[HERMES_OPENMAUS_SCREENSHOT_COMPAT] = "1";
     env[HERMES_OPENMAUS_SCREENSHOT_COMPAT_MODEL] = inject.model;
 }
-function hermesHome(env) {
-    return env.HERMES_HOME || join(env.HOME || env.USERPROFILE || homedir(), ".hermes");
-}
 function quoteYaml(value) {
     if (/^[\w./:+-]+$/.test(value))
         return value;
@@ -69,7 +67,7 @@ export function ensureHermesInjectProvider(modelId, env = process.env) {
     const host = localHost(inject.host);
     if (!host)
         return modelId;
-    const dir = hermesHome(env);
+    const dir = env.HERMES_HOME || harnessHome("hermes", env);
     mkdirSync(dir, { recursive: true });
     const path = join(dir, "config.yaml");
     let text = "";
@@ -199,7 +197,7 @@ function hermesConfigDefault(text) {
  * catalog exactly as it was for local-only setups.
  */
 export function hermesConfiguredModel(env = process.env) {
-    const dir = hermesHome(env);
+    const dir = env.HERMES_HOME || harnessHome("hermes", env);
     let secrets = "";
     try {
         secrets = readFileSync(join(dir, ".env"), "utf8");

package/dist-server/server/drivers/acp/opencode-go.js

@@ -6,6 +6,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { decodeInjectId, hostApiKey, localHost, mergeLocalInject } from "../local-inject.js";
 import { createAcpDriver } from "./core.js";
+import { titleCaseModelId } from "../../contracts.js";
 import { execCli } from "../../procs.js";
 const STATIC_MODELS = {
     default: "opencode/x-preview-f-free",
@@ -21,11 +22,7 @@ let lastSuccessfulCatalog = null;
 const MODEL_PROBE_TTL_MS = 30_000;
 const modelProbeCache = new Map();
 function labelForModel(id) {
-    return id
-        .split(/[-_.]+/g)
-        .filter(Boolean)
-        .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-        .join(" ");
+    return titleCaseModelId(id, /[-_.]+/);
 }
 function providerLabel(id) {
     if (id === "opencode")

package/dist-server/server/drivers/acp/qwen.js

@@ -3,30 +3,20 @@
 // Custom and are written into ~/.qwen/settings.json modelProviders.
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { createHash } from "node:crypto";
-import { homedir } from "node:os";
 import { join } from "node:path";
+import { qualifiedModelLabel } from "../../contracts.js";
+import { harnessHome } from "../../env-path.js";
 import { decodeInjectId, hostApiKey, localHost, mergeLocalInject } from "../local-inject.js";
 import { createAcpDriver } from "./core.js";
 const EMPTY = { default: "", options: [] };
-function qwenHome(env) {
-    const home = process.platform === "win32"
-        ? env.USERPROFILE || env.HOME || homedir()
-        : env.HOME || env.USERPROFILE || homedir();
-    return join(home, ".qwen");
-}
 function isRecord(value) {
     return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function qwenModelLabel(id, name) {
-    if (!name || name.toLocaleLowerCase().endsWith(id.toLocaleLowerCase()))
-        return id;
-    return `${id} — ${name}`;
-}
 const PROTOCOLS = new Set(["openai", "anthropic", "gemini", "vertex-ai"]);
 function readQwenRoutes(env) {
     let settings;
     try {
-        settings = JSON.parse(readFileSync(join(qwenHome(env), "settings.json"), "utf8"));
+        settings = JSON.parse(readFileSync(join(harnessHome("qwen", env), "settings.json"), "utf8"));
     }
     catch {
         return [];
@@ -102,7 +92,11 @@ function readQwenRoutes(env) {
 /** Public metadata only. Use Qwen's provider-qualified ACP selectors, not raw model IDs. */
 export function readQwenModelCatalog(env = process.env) {
     const options = readQwenRoutes(env).map(({ id, model, label, provider }) => ({
-        id, label: qwenModelLabel(model, label), custom: true, provider,
+        id,
+        label: qualifiedModelLabel(model, label, {
+            redundantWhen: (id, name) => name.toLocaleLowerCase().endsWith(id.toLocaleLowerCase()),
+        }),
+        custom: true, provider,
     }));
     return { default: options[0]?.id ?? "", options };
 }
@@ -117,7 +111,7 @@ export function ensureQwenInjectModel(modelId, env = process.env) {
     const host = localHost(inject.host);
     if (!host)
         return modelId;
-    const dir = qwenHome(env);
+    const dir = harnessHome("qwen", env);
     mkdirSync(dir, { recursive: true });
     const path = join(dir, "settings.json");
     let settings = {};
@@ -241,6 +235,9 @@ const support = {
     // A raw -m only changes the model within the saved provider. ACP switches
     // the complete route and confirms it before any prompt leaves OMB.
     spawnArgs: (config, turn) => ["--acp", ...qwenApprovalArgs(config.fullAuto, turn.approvalMode)],
+    // Qwen's live session/load returns its cached MCP clients, ignoring fresh
+    // credentials. Cold-load the same conversation when those inputs change.
+    restartOnMcpChange: true,
     selectModel: { configId: "model" },
     pickAuthMethod: () => null,
     authFailure: "continue",

package/dist-server/server/drivers/agents-call.js

@@ -7,8 +7,10 @@
 // Nothing here reads the environment or holds state of its own. The caller
 // passes a ToolCallContext, and the per-turn counters live on it.
 import { CREDENTIAL_TARGETS, isCredentialTargetId } from "../../shared/credential-request.js";
+import { parseOptionsCardInput, WATCHER_OPTIONS_CARD_BOT_ID } from "../../shared/options-card.js";
 import { normalizeCronSchedule } from "../../shared/routine-schedule.js";
 import { peerName } from "../peer-roster.js";
+import { renderPeerDeliveryReceipts } from "../peer-delivery.js";
 import { catalogProfileFromEnv, SHARED_COMPUTER_TOOL_NAMES, WEEKDAYS } from "./agents-catalog.js";
 import { harnessClientFromEnv } from "./agents-client.js";
 import { boundedAgentResult } from "./agents-result.js";
@@ -352,6 +354,29 @@ function recallSpeaker(hit) {
         return hit.from;
     return hit.role === "user" ? "user" : "you";
 }
+const isPeerDeliveryOutcome = (value) => value === "queued" || value === "injected" || value === "failed";
+/** The delivery receipt a peer-send answer carries, as one prose line.
+ * Unvalidated JSON stays out: a malformed receipt renders nothing rather
+ * than half a line of somebody else's text. */
+function deliveryNote(r) {
+    const receipt = r.receipt;
+    if (!receipt || typeof receipt !== "object")
+        return "";
+    const { botId, botName, outcome, detail, taskId, requestId } = receipt;
+    if (typeof botId !== "string" || !botId || typeof detail !== "string" || !detail)
+        return "";
+    if (!isPeerDeliveryOutcome(outcome))
+        return "";
+    const parsed = {
+        botId,
+        ...(typeof botName === "string" && botName ? { botName } : {}),
+        outcome,
+        detail,
+        ...(typeof taskId === "string" && taskId ? { taskId } : {}),
+        ...(typeof requestId === "string" && requestId ? { requestId } : {}),
+    };
+    return renderPeerDeliveryReceipts([parsed]);
+}
 /** When a recalled line was said, on the machine's own clock. `toISOString()`
  * answers in UTC, which disagrees with every other day the bot is shown: a
  * bare `since`/`until` date is read as local midnight (recent-work.ts
@@ -375,6 +400,49 @@ export async function callTool(name, args, context) {
     const { botId: BOT_ID, threadId: THREAD_ID, depth: DEPTH, externalRuntime: EXTERNAL_RUNTIME, coordinating: COORDINATING, turn } = context;
     const { delegationTaskIdsThisTurn } = turn;
     const { api, apiResponse } = context.client;
+    if (name === "vm_exec") {
+        const { ok, body } = await apiResponse("/api/internal/vm-exec", {
+            method: "POST",
+            body: JSON.stringify({ command: args.command, ...(typeof args.timeout_seconds === "number" ? { timeout_seconds: args.timeout_seconds } : {}) }),
+        });
+        if (!ok)
+            return { text: String(body.error ?? "Could not run that command."), isError: true };
+        const exitCode = Number(body.exitCode ?? 0);
+        const stdout = String(body.stdout ?? "");
+        const stderr = String(body.stderr ?? "");
+        const lines = [body.timedOut ? "The command was stopped: it ran past its time limit." : `exit code ${exitCode}`];
+        if (stdout)
+            lines.push("--- stdout ---", stdout.replace(/\s+$/, ""));
+        if (stderr)
+            lines.push("--- stderr ---", stderr.replace(/\s+$/, ""));
+        if (!stdout && !stderr && !body.timedOut)
+            lines.push("(no output)");
+        return { text: lines.join("\n"), ...(exitCode !== 0 || body.timedOut ? { isError: true } : {}) };
+    }
+    if (name === "attach_file") {
+        const { ok, body } = await apiResponse("/api/internal/attach-file", {
+            method: "POST",
+            body: JSON.stringify({ path: args.path, ...(typeof args.name === "string" ? { name: args.name } : {}) }),
+        });
+        if (!ok)
+            return { text: String(body.error ?? "Could not attach that file."), isError: true };
+        return { text: `Attached ${String(body.name ?? "the file")} (${Number(body.bytes ?? 0)} bytes). It now appears in the chat with a preview.` };
+    }
+    if (name === "create_options_card") {
+        if (BOT_ID !== WATCHER_OPTIONS_CARD_BOT_ID) {
+            return { text: "create_options_card is not enabled for this bot.", isError: true };
+        }
+        const parsed = parseOptionsCardInput(args);
+        if (!parsed.ok)
+            return { text: parsed.error, isError: true };
+        const result = await api("/api/internal/options-card", {
+            method: "POST",
+            body: JSON.stringify(parsed.value),
+        });
+        return {
+            text: `Rendered the native options card in this Watcher thread (message ${String(result.messageId ?? "created")}). Wait for the person's click or custom response; the card itself authorizes no external action.`,
+        };
+    }
     // Second lock. With sharing off the tool is not in the catalog, so a front
     // end already refuses the call as an unknown tool — the same answer a build
     // without the feature gives. This keeps the handler itself refusing if that
@@ -484,6 +552,7 @@ export async function callTool(name, args, context) {
     if (name === "post_to_room") {
         const groupId = String(args.group_id ?? "").trim();
         const message = String(args.message ?? "").trim();
+        const attachVoiceNote = args.attach_voice_note === true;
         if (!groupId || !message) {
             return { text: "post_to_room needs group_id (from list_rooms) and message.", isError: true };
         }
@@ -495,13 +564,13 @@ export async function callTool(name, args, context) {
         }
         const r = await api("/api/internal/post-to-room", {
             method: "POST",
-            body: JSON.stringify({ fromBotId: BOT_ID, fromThreadId: THREAD_ID, groupId, message }),
+            body: JSON.stringify({ fromBotId: BOT_ID, fromThreadId: THREAD_ID, groupId, message, attachVoiceNote }),
         });
         if (r.error)
             return { text: String(r.error), isError: true };
         turn.roomPostsThisTurn += 1;
         return {
-            text: `Posted in ${r.roomName ?? "the room"}. Nobody's turn was started, so expect no reply — tell the user it is posted.`,
+            text: `Posted in ${r.roomName ?? "the room"}${r.attachedVoiceNote ? " with the voice note attached" : ""}. Nobody's turn was started, so expect no reply — tell the user it is posted.`,
         };
     }
     if (name === "ask_bot") {
@@ -513,6 +582,7 @@ export async function callTool(name, args, context) {
             method: "POST",
             body: JSON.stringify({ fromBotId: BOT_ID, fromThreadId: THREAD_ID, toBotId, message, depth: DEPTH }),
         });
+        const note = deliveryNote(r);
         if (r.timeout) {
             // The peer's turn outlived the synchronous wait, so the harness
             // converted the ask into a delegation — the reply is not lost.
@@ -523,10 +593,25 @@ export async function callTool(name, args, context) {
             const amount = waitedSeconds < 60 ? waitedSeconds : Math.round(waitedSeconds / 60);
             const unit = waitedSeconds < 60 ? "second" : "minute";
             return {
-                text: `${r.toBotName ?? "That bot"} is still working after ${amount} ${unit}${amount === 1 ? "" : "s"} — the ask was converted to a delegation so the reply is not lost. Task id: ${taskId}. ${EXTERNAL_RUNTIME ? EXTERNAL_STATUS_GUIDANCE : "Finish your turn now; the result will be delivered to this conversation automatically. Use check_delegation in a later turn only if the user asks for status."}`,
+                text: `${r.toBotName ?? "That bot"} is still working after ${amount} ${unit}${amount === 1 ? "" : "s"} — the ask was converted to a delegation so the reply is not lost. Task id: ${taskId}. ${EXTERNAL_RUNTIME ? EXTERNAL_STATUS_GUIDANCE : "Finish your turn now; the result will be delivered to this conversation automatically. Use check_delegation in a later turn only if the user asks for status."}${note ? `\n\n${note}` : ""}`,
             };
         }
         if (r.busy) {
+            // Aside lane: the teammate was mid-turn on a seam-capable engine, so
+            // the harness folded the message into their running work as peer
+            // context. No new turn started and no reply is coming back through
+            // this call — the receipt says whether the words are already in the
+            // live turn or waiting for it to settle.
+            if (r.aside === "injected") {
+                return {
+                    text: `${r.toBotName ?? "That bot"} is mid-turn; your message was handed to them as an aside — peer context folded into their current work, not a request that interrupts or replies. Finish your turn and treat their eventual output as possibly informed by it.`,
+                };
+            }
+            if (r.aside === "queued") {
+                return {
+                    text: `${r.toBotName ?? "That bot"} is mid-turn; your aside is queued and will reach them as context when the turn settles. No reply is expected — finish your turn.`,
+                };
+            }
             // The harness queues the message as a delegation when it can; the
             // task id is the asker's claim ticket for the eventual reply.
             const taskId = String(r.taskId ?? "").trim();
@@ -534,14 +619,14 @@ export async function callTool(name, args, context) {
                 if (!EXTERNAL_RUNTIME)
                     delegationTaskIdsThisTurn.add(taskId);
                 return {
-                    text: `${r.toBotName ?? "That bot"} is busy right now, so your message was queued as a delegation instead — ${EXTERNAL_RUNTIME ? "it waits for the peer and any required approval" : "it runs after your current turn ends"}. Task id: ${taskId}. ${EXTERNAL_RUNTIME ? EXTERNAL_STATUS_GUIDANCE : "Finish your turn now; the result will be delivered to this conversation automatically. Use check_delegation in a later turn only if the user asks for status."}`,
+                    text: `${r.toBotName ?? "That bot"} is busy right now, so your message was queued as a delegation instead — ${EXTERNAL_RUNTIME ? "it waits for the peer and any required approval" : "it runs after your current turn ends"}. Task id: ${taskId}. ${EXTERNAL_RUNTIME ? EXTERNAL_STATUS_GUIDANCE : "Finish your turn now; the result will be delivered to this conversation automatically. Use check_delegation in a later turn only if the user asks for status."}${note ? `\n\n${note}` : ""}`,
                 };
             }
-            return { text: `That bot is busy right now — try again after it finishes.` };
+            return { text: `That bot is busy right now — try again after it finishes.${note ? `\n\n${note}` : ""}` };
         }
         if (r.error)
-            return { text: `Couldn't reach that bot: ${r.error}`, isError: true };
-        return { text: `${r.botName ?? "Bot"} replied:\n${r.text ?? "(no reply)"}` };
+            return { text: `Couldn't reach that bot: ${r.error}${note ? `\n\n${note}` : ""}`, isError: true };
+        return { text: `${r.botName ?? "Bot"} replied:\n${r.text ?? "(no reply)"}${note ? `\n\n${note}` : ""}` };
     }
     if (name === "delegate_bot") {
         const toBotId = String(args.bot_id ?? "").trim();
@@ -559,8 +644,9 @@ export async function callTool(name, args, context) {
         if (reason)
             body.reason = reason;
         const r = await api(`/api/internal/delegate-bot`, { method: "POST", body: JSON.stringify(body) });
+        const delivery = deliveryNote(r);
         if (r.error)
-            return { text: `Couldn't queue the delegation: ${r.error}`, isError: true };
+            return { text: `Couldn't queue the delegation: ${r.error}${delivery ? `\n\n${delivery}` : ""}`, isError: true };
         // Fire-and-forget by contract: the harness returns immediately, the
         // peer turn runs after our current turn finishes. The task id is the
         // bot's claim ticket for the outcome.
@@ -571,7 +657,7 @@ export async function callTool(name, args, context) {
         const suffix = taskId
             ? ` Task id: ${taskId}. ${EXTERNAL_RUNTIME ? EXTERNAL_STATUS_GUIDANCE : "Acknowledge the assignment and finish your turn; the result will be delivered to this conversation automatically. Do not check or wait for it in this turn."}`
             : "";
-        return { text: `${note}${suffix}` };
+        return { text: `${note}${suffix}${delivery ? `\n\n${delivery}` : ""}` };
     }
     if (name === "check_delegation" || name === "wait_delegation") {
         const taskId = String(args.task_id ?? "").trim();
@@ -745,6 +831,7 @@ export async function callTool(name, args, context) {
                 role,
                 instructions,
                 ...(args.modelSelection !== undefined ? { modelSelection: args.modelSelection } : {}),
+                ...(typeof args.cwd === "string" ? { cwd: args.cwd.trim() } : {}),
             }),
         });
         turn.createdThisTurn += 1;
@@ -923,6 +1010,13 @@ export async function callTool(name, args, context) {
         return confirmationResult(r, `${action.replace("_", " ")} on routine ${routineId}`);
     }
     if (name === "propose_profile") {
+        // A non-boolean toggle would be dropped silently while any valid half of
+        // the request went through, applying a partial proposal the model never
+        // described. Reject the whole call instead.
+        if ((args.notifications !== undefined && typeof args.notifications !== "boolean")
+            || (args.speakReplies !== undefined && typeof args.speakReplies !== "boolean")) {
+            return { text: "propose_profile notifications and speakReplies must be true or false.", isError: true };
+        }
         const changes = {};
         if (typeof args.name === "string")
             changes.name = args.name.trim();
@@ -934,8 +1028,12 @@ export async function callTool(name, args, context) {
             changes.soul = args.soul;
         if (typeof args.cwd === "string")
             changes.cwd = args.cwd.trim();
+        if (typeof args.notifications === "boolean")
+            changes.notifications = args.notifications;
+        if (typeof args.speakReplies === "boolean")
+            changes.speakReplies = args.speakReplies;
         if (!Object.keys(changes).length) {
-            return { text: "propose_profile needs at least one of name, title, description, soul, or cwd.", isError: true };
+            return { text: "propose_profile needs at least one of name, title, description, soul, cwd, notifications, or speakReplies.", isError: true };
         }
         const forBotId = String(args.for_bot_id ?? "").trim();
         const r = await api("/api/internal/profile-requests", {
@@ -951,6 +1049,35 @@ export async function callTool(name, args, context) {
         });
         return confirmationResult(r, "the profile change", "profile");
     }
+    if (name === "propose_model") {
+        const raw = args.model_selection;
+        const fields = typeof raw === "object" && raw !== null && !Array.isArray(raw) ? raw : null;
+        if (!fields || typeof fields.instanceId !== "string" || !fields.instanceId.trim() || typeof fields.model !== "string" || !fields.model.trim()) {
+            return { text: "propose_model needs model_selection with instanceId and model.", isError: true };
+        }
+        if ((fields.effort !== undefined && (typeof fields.effort !== "string" || !fields.effort.trim()))
+            || (fields.variant !== undefined && (typeof fields.variant !== "string" || !fields.variant.trim()))) {
+            return { text: "propose_model effort and variant must be non-empty strings when supplied.", isError: true };
+        }
+        const selection = { instanceId: fields.instanceId.trim(), model: fields.model.trim() };
+        if (typeof fields.effort === "string" && fields.effort.trim())
+            selection.effort = fields.effort.trim();
+        if (typeof fields.variant === "string" && fields.variant.trim())
+            selection.variant = fields.variant.trim();
+        const forBotId = String(args.for_bot_id ?? "").trim();
+        const r = await api("/api/internal/model-requests", {
+            method: "POST",
+            body: JSON.stringify({
+                fromBotId: BOT_ID,
+                fromThreadId: THREAD_ID,
+                modelSelection: selection,
+                reason: args.reason,
+                // JSON.stringify drops the key entirely when no target was named
+                forBotId: forBotId || undefined,
+            }),
+        });
+        return confirmationResult(r, "the default model change", "model");
+    }
     if (name === "memory_update") {
         if (!["append", "replace", "remove", "supersede"].includes(String(args.action))
             || (args.action !== "remove" && (typeof args.text !== "string" || !args.text.trim()))

package/dist-server/server/drivers/agents-catalog.js

@@ -11,6 +11,7 @@
 // agents-catalog-wire.test.ts: change a description or a schema on purpose,
 // then update the goldens there.
 import { CREDENTIAL_TARGETS } from "../../shared/credential-request.js";
+import { OPTIONS_CARD_LIMITS, WATCHER_OPTIONS_CARD_BOT_ID } from "../../shared/options-card.js";
 import { agentToolAnnotations } from "../agent-tool-policy.js";
 /** The profile a spawned proxy was given. Everything is off unless the
  * harness says "1". */
@@ -154,6 +155,26 @@ const PROPOSAL_OUTCOME = " Read the result: granted Full Access may apply the ch
 /** Every tool, in the order it is listed. Four peer tools are worded
  * differently for an external runtime, which may poll inside one process. */
 const toolDefinitions = (externalRuntime) => [
+    {
+        name: "create_options_card",
+        description: "Show the person a native card with 2-6 choices in this Watcher conversation. The card is passive: a click returns the selected words as a reply and never authorizes or performs an external action. Use it for Watcher's review and draft-selection steps, then wait for the person's response.",
+        inputSchema: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                title: { type: "string", minLength: 1, maxLength: OPTIONS_CARD_LIMITS.title },
+                subtitle: { type: "string", minLength: 1, maxLength: OPTIONS_CARD_LIMITS.subtitle },
+                options: {
+                    type: "array",
+                    minItems: OPTIONS_CARD_LIMITS.minOptions,
+                    maxItems: OPTIONS_CARD_LIMITS.maxOptions,
+                    uniqueItems: true,
+                    items: { type: "string", minLength: 1, maxLength: OPTIONS_CARD_LIMITS.option },
+                },
+            },
+            required: ["title", "subtitle", "options"],
+        },
+    },
     {
         name: "tool_result_read",
         description: "Read a missing portion of an oversized agents-tool result using the saved id and next offset from its notice. Returns at most 16,000 characters, only from this bot in this conversation. Use only when the preview is insufficient; do not load every page by default. Results expire after one hour, on app restart, or under cache pressure. This never reruns the original action.",
@@ -305,15 +326,42 @@ const toolDefinitions = (externalRuntime) => [
             required: ["title", "message"],
         },
     },
+    {
+        name: "vm_exec",
+        description: "Run a shell command inside your own Local VM (as the desktop user, starting in /home/cua/workspace) and get its exit code, stdout and stderr back as text. Use this for all command-line work in the VM: pip install --user, running a script, generating or converting a file, checking that a file exists. Do not type commands into a terminal window and read screenshots: that is slow and unreliable. GUI programs you start appear on the VM desktop. For a long job raise timeout_seconds (default 60, at most 300). Only available while you have a Local VM desktop.",
+        inputSchema: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                command: { type: "string", description: "The shell command to run, for example: python3 make_report.py && ls -l report.pdf" },
+                timeout_seconds: { type: "integer", minimum: 1, maximum: 300, description: "How long it may run before it is stopped. Default 60." },
+            },
+            required: ["command"],
+        },
+    },
+    {
+        name: "attach_file",
+        description: "Attach a finished file to the chat so the user can preview and download it: an image, video, audio clip, PDF, spreadsheet, slide deck or other document you made. Pass its path: a path inside your computer's /home/cua/workspace (for example /home/cua/workspace/report.pdf), or a file in your working folder. Do this instead of pasting a VM path as a link; a path inside a VM cannot be opened from chat. Supported: images (png, jpg, gif, webp), video (mp4, webm, mov), audio (mp3, m4a, aac, wav, ogg, opus, flac), pdf, Word/Excel/PowerPoint and OpenDocument files, and csv, tsv, txt, md, json, rtf. Up to 25 MB (images 10 MB). Finish writing the file first, then call this directly: it reports an error if the file is missing, so you do not need to list or open the folder to check.",
+        inputSchema: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                path: { type: "string", description: "The file's path, for example /home/cua/workspace/report.pdf." },
+                name: { type: "string", description: "Optional file name to show the user. Defaults to the file's own name." },
+            },
+            required: ["path"],
+        },
+    },
     {
         name: "post_to_room",
-        description: "Put one message into a shared room you belong to, for example when the user asks you to tell the team something. Get group_id from list_rooms. This posts and returns: no room member's turn starts, nobody replies, and nothing comes back except confirmation — so never use it to ask a question or hand out work (use ask_bot or delegate_bot for those). Post once, say it in full, and tell the user what you posted. If a post is refused, do not retry it: say what you wanted to post in your reply instead.",
+        description: "Put one message into a shared room you belong to, for example when the user asks you to tell the team something. Get group_id from list_rooms. This posts and returns: no room member's turn starts, nobody replies, and nothing comes back except confirmation — so never use it to ask a question or hand out work (use ask_bot or delegate_bot for those). Post once, say it in full, and tell the user what you posted. Set attach_voice_note true to attach this turn's voice note. If a post is refused, do not retry it: say what you wanted to post in your reply instead.",
         inputSchema: {
             type: "object",
             additionalProperties: false,
             properties: {
                 group_id: { type: "string", description: "The room's id, copied exactly from list_rooms." },
                 message: { type: "string", description: "The complete message to post, written for the room to read as it stands." },
+                attach_voice_note: { type: "boolean", description: "True to attach this turn's send_voice_note recording; the message is its caption. Call send_voice_note first." },
             },
             required: ["group_id", "message"],
         },
@@ -331,6 +379,11 @@ const toolDefinitions = (externalRuntime) => [
                         instanceId: { type: "string" }, model: { type: "string" },
                         effort: { type: "string" }, variant: { type: "string" },
                     }, required: ["instanceId", "model"] },
+                cwd: {
+                    type: "string",
+                    maxLength: 1024,
+                    description: "Absolute path of the folder this specialist's tools read and write in (for example /Users/me/Projects/site). It must already exist. Leave it out for the specialist's private workspace.",
+                },
             },
             required: ["name", "role", "instructions"],
         },
@@ -358,9 +411,10 @@ const toolDefinitions = (externalRuntime) => [
                                     name: { type: "string", maxLength: 100 }, title: { type: "string", maxLength: 200 },
                                     chiefOfStaff: { type: "boolean", description: "Appoint or remove this team's Chief. At most one Chief per team: explicitly demote the current Chief in the same plan when replacing them. Does not grant access to other teams or change execution permissions." },
                                     description: { type: "string", maxLength: 4000 }, soul: { type: "string", description: "Standing instructions; required with name/title/modelSelection for every new bot." },
+                                    cwd: { type: "string", maxLength: 1024, description: "Create only: absolute path of the folder the new bot's tools read and write in. It must already exist. Leave it out for a private workspace." },
                                     section: { type: "string", maxLength: 60, description: "Exact authorized existing team, or a team explicitly named in newTeams. Empty string means General." },
                                     modelSelection: { type: "object", additionalProperties: false, properties: {
-                                            instanceId: { type: "string" }, model: { type: "string" }, effort: { type: "string" },
+                                            instanceId: { type: "string" }, model: { type: "string" }, effort: { type: "string" }, variant: { type: "string" },
                                         }, required: ["instanceId", "model"] },
                                 } },
                         }, required: ["action", "fields"],
@@ -583,7 +637,7 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "propose_profile",
-        description: "Submit user-requested changes to your own name, title, description, standing instructions (SOUL.md), or working folder (cwd). Keep SOUL.md short — who you are and the rules you never break; put step-by-step procedure into a skill instead. A Chief of Staff may pass for_bot_id (from list_bots) for a requested change to another bot in its section." + PROPOSAL_OUTCOME,
+        description: "Submit user-requested changes to your own name, title, description, standing instructions (SOUL.md), working folder (cwd), or your alert and voice toggles (notifications, speakReplies). Keep SOUL.md short — who you are and the rules you never break; put step-by-step procedure into a skill instead. A Chief of Staff may pass for_bot_id (from list_bots) for a requested change to another bot in its section." + PROPOSAL_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
@@ -597,6 +651,14 @@ const toolDefinitions = (externalRuntime) => [
                     maxLength: 1024,
                     description: "Absolute path of the folder your tools read and write in (for example /Users/me/Projects/site). It must already exist. An empty string means your private workspace.",
                 },
+                notifications: {
+                    type: "boolean",
+                    description: "Completion and attention notifications for this bot on the host and paired clients.",
+                },
+                speakReplies: {
+                    type: "boolean",
+                    description: "Speak this bot's replies aloud as they settle, without being asked.",
+                },
                 reason: { type: "string", minLength: 1, maxLength: 500, description: "One sentence the user will see explaining why." },
                 for_bot_id: {
                     type: "string",
@@ -606,6 +668,34 @@ const toolDefinitions = (externalRuntime) => [
             required: ["reason"],
         },
     },
+    {
+        name: "propose_model",
+        description: "Submit a user-requested switch of this bot's default engine and model. Use the exact instance and model ids the person named, or for a Chief the ids from the team-setup catalog. The card warns about capabilities the switch gains or loses; existing threads keep their current models." + PROPOSAL_OUTCOME,
+        inputSchema: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                model_selection: {
+                    type: "object",
+                    additionalProperties: false,
+                    properties: {
+                        instanceId: { type: "string", minLength: 1, description: "Engine instance id, for example codex or claude." },
+                        model: { type: "string", minLength: 1, description: "Exact model id on that instance." },
+                        effort: { type: "string", description: "Optional effort level the instance offers; omit for the engine default." },
+                        variant: { type: "string", description: "Optional explicit model variant; choose this or effort, not both." },
+                    },
+                    required: ["instanceId", "model"],
+                    description: "The new default selection.",
+                },
+                reason: { type: "string", minLength: 1, maxLength: 500, description: "One sentence the user will see explaining why." },
+                for_bot_id: {
+                    type: "string",
+                    description: "Chief of Staff only: the id of another bot in your section whose default model this changes. Omit to change your own.",
+                },
+            },
+            required: ["model_selection", "reason"],
+        },
+    },
     {
         name: "skills_list",
         description: "List this bot's imported skills (enabled and disabled) and any staged skill writes waiting for the user to confirm. Use this before skill_manage to avoid duplicate names. Listing does not enable anything.",
@@ -662,12 +752,16 @@ const VOICE_TOOL_NAMES = new Set(["send_voice_note"]);
 const ROOM_ONLY_TOOLS = new Set(["list_room_targets", "coordinate_bots"]);
 const ROOM_REPLACED_TOOLS = new Set(["ask_bot", "delegate_bot", "check_delegation", "wait_delegation", "start_thread", "send_to_thread", "wait_thread"]);
 const EXTERNAL_TOOL_NAMES = new Set(["list_bots", "ask_bot", "delegate_bot", "check_delegation", "wait_delegation"]);
+const WATCHER_TOOL_NAMES = new Set(["create_options_card"]);
 /** The tools one turn is shown, exactly as tools/list serializes them. */
 export function availableTools(profile) {
     const TOOLS = toolDefinitions(profile.externalRuntime);
-    const AUTHORING_TOOLS = profile.skillAuthoring
+    const BOT_SCOPED_TOOLS = profile.botId === WATCHER_OPTIONS_CARD_BOT_ID
         ? TOOLS
-        : TOOLS.filter((tool) => !SKILL_TOOL_NAMES.has(tool.name));
+        : TOOLS.filter((tool) => !WATCHER_TOOL_NAMES.has(tool.name));
+    const AUTHORING_TOOLS = profile.skillAuthoring
+        ? BOT_SCOPED_TOOLS
+        : BOT_SCOPED_TOOLS.filter((tool) => !SKILL_TOOL_NAMES.has(tool.name));
     const SHAREABLE_TOOLS = profile.sharedComputers
         ? AUTHORING_TOOLS
         : AUTHORING_TOOLS.filter((tool) => !SHARED_COMPUTER_TOOL_NAMES.has(tool.name));
@@ -675,7 +769,7 @@ export function availableTools(profile) {
         ? SHAREABLE_TOOLS
         : SHAREABLE_TOOLS.filter((tool) => !VOICE_TOOL_NAMES.has(tool.name));
     return profile.externalRuntime
-        ? TOOLS.filter(tool => EXTERNAL_TOOL_NAMES.has(tool.name))
+        ? BOT_SCOPED_TOOLS.filter(tool => EXTERNAL_TOOL_NAMES.has(tool.name))
         : profile.coordinating
             ? VOICE_READY_TOOLS.filter(tool => !ROOM_REPLACED_TOOLS.has(tool.name) || (tool.name === "start_thread" && profile.ownThreadCreation))
                 .map(tool => tool.name === "start_thread" ? {