openmausbot 0.1.88 → 0.1.90

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

@@ -40,10 +40,10 @@ import { describeSpawnFailure, execCli, killCliTree, spawnCli } from "../../proc
 export function skipSubscriptionAuthForLocalInject(model) {
     return Boolean(decodeInjectId(model));
 }
-import { newEventId, newId } from "../../contracts.js";
+import { newEventId, newId, TurnNotStartedError } from "../../contracts.js";
 import { augmentedPath } from "../../env-path.js";
 import { supportsApprovalMode } from "../../../shared/approval-mode.js";
-import { parseAskQuestions, parseChoices, questionAnswersByQuestion } from "../../../shared/ask-question.js";
+import { MAX_QUESTION_TEXT, parseAskQuestions, parseChoices, questionAnswersByQuestion } from "../../../shared/ask-question.js";
 import { appendNative } from "../native.js";
 import { acpPermissionCommand, permissionLaunchCwd } from "../permission-command.js";
 import { commandSummary, toolDetailPreview } from "../../tool-summary.js";
@@ -51,6 +51,7 @@ import { extractMcpImages } from "../../mcp-tool-images.js";
 import { redactSecretsInText } from "../../redact.js";
 import { recoveryPromptFor } from "../../resume-recovery.js";
 import { sessionIdlePolicy } from "../session-idle.js";
+import { classifyError } from "../retry.js";
 /** ACP vendors put the actionable cause in error.data while keeping the
  * JSON-RPC message generic. Only surface known text fields, never a response
  * body/config dump, and redact before bounding the displayed diagnostic. */
@@ -98,6 +99,20 @@ const promptIdleTimeoutMs = () => {
     const ms = Number(raw);
     return Number.isFinite(ms) && ms > 0 ? ms : 0;
 };
+/** Keep a turn's set of running tool calls in step with the agent's
+ * `tool_call` / `tool_call_update` notifications: a call is running from
+ * the first update that is not terminal until one that is. A `tool_call`
+ * without a status is pending (ACP's default); a `tool_call_update` without
+ * one leaves the call as it was. */
+function trackRunningTool(current, update, defaultStatus) {
+    if (typeof update.toolCallId !== "string" || !update.toolCallId)
+        return;
+    const status = update.status ?? defaultStatus;
+    if (status === "completed" || status === "failed")
+        current.runningTools.delete(update.toolCallId);
+    else if (status === "pending" || status === "in_progress")
+        current.runningTools.add(update.toolCallId);
+}
 const CLIENT_FILE_MAX_BYTES = 8 * 1024 * 1024;
 function acpVariantOption(result) {
     const option = (Array.isArray(result?.configOptions) ? result.configOptions : []).find((entry) => entry?.type === "select" && typeof entry.id === "string"
@@ -260,7 +275,7 @@ export function createAcpDriver(support) {
                 };
                 const allowedCredentials = new Set(support.credentialEnv ?? []);
                 // two lists, one rule: foreign PROVIDER keys must not flip a CLI's
-                // billing off its own login, and WORKSPACE credentials (box token,
+                // billing off its own login, and WORKSPACE credentials (boat token,
                 // voice key, …) are the harness's secrets — riding along in
                 // `...process.env` is not a grant. A driver keeps only what its
                 // credentialEnv allowlist names.
@@ -296,6 +311,23 @@ export function createAcpDriver(support) {
             // contract prompts the live session instead of paying the handshake
             // again. An idle session closes after SESSION_IDLE_MS of quiet.
             const sessions = new Map();
+            // Closing removes a session from the pool, not its native writer lease.
+            // Retain every closing Qwen child until its process tree is gone, even
+            // when Stop or a failed turn lets another turn start during cleanup.
+            const retiring = new Map();
+            const retireChild = async (threadId, child) => {
+                let children = retiring.get(threadId);
+                if (!children)
+                    retiring.set(threadId, children = new Set());
+                children.add(child);
+                const stopped = await killCliTree(child);
+                if (stopped) {
+                    children.delete(child);
+                    if (!children.size && retiring.get(threadId) === children)
+                        retiring.delete(threadId);
+                }
+                return stopped;
+            };
             const { idleMs: SESSION_IDLE_MS } = sessionIdlePolicy("ACP");
             const closeSession = (threadId, why) => {
                 const session = sessions.get(threadId);
@@ -308,16 +340,20 @@ export function createAcpDriver(support) {
                 // a new turn must never adopt a closing session
                 sessions.delete(threadId);
                 session.acp.close();
-                // stdin EOF asks the agent to exit; EOF is not a guaranteed exit
-                // signal for ACP agents, so insist after a grace period
+                // EOF is not a guaranteed exit signal. Qwen must be tracked before
+                // another turn can resume its history; other agents keep their grace.
                 try {
                     session.child.stdin.end();
                 }
                 catch { }
-                const kill = setTimeout(() => {
-                    void killCliTree(session.child);
-                }, 5_000);
-                kill.unref?.();
+                if (support.restartOnMcpChange)
+                    void retireChild(threadId, session.child);
+                else {
+                    const kill = setTimeout(() => {
+                        void killCliTree(session.child);
+                    }, 5_000);
+                    kill.unref?.();
+                }
             };
             const armIdle = (threadId) => {
                 const session = sessions.get(threadId);
@@ -403,7 +439,7 @@ export function createAcpDriver(support) {
                 }
                 // The bot's computer, mounted exactly like the Claude driver does:
                 // host and sandbox Cua connections expose Cua Driver's own MCP server.
-                // (A cloud box is not mounted here at all: a cloud turn runs ON the box.)
+                // (A cloud boat is not mounted here at all: a cloud turn runs ON the boat.)
                 if (turn.integrations?.localComputer) {
                     const local = turn.integrations.localComputer;
                     servers.push({
@@ -436,6 +472,7 @@ export function createAcpDriver(support) {
                 if (!current || current.state.settled)
                     return;
                 current.state.settled = true;
+                current.acknowledge();
                 if (current.interruptTimer)
                     clearTimeout(current.interruptTimer);
                 for (const finish of current.asks.values())
@@ -521,8 +558,9 @@ export function createAcpDriver(support) {
                         if (idleTimer)
                             clearTimeout(idleTimer);
                         idleTimer = setTimeout(() => {
-                            // Waiting for a person is not an unresponsive agent.
-                            if (session.current?.asks.size) {
+                            // Waiting for a person, or for a tool the agent is running,
+                            // is not an unresponsive agent.
+                            if (session.current?.asks.size || session.current?.runningTools.size) {
                                 armIdle();
                                 return;
                             }
@@ -639,6 +677,7 @@ export function createAcpDriver(support) {
                 // server→client permission request → canonical request.opened,
                 // answered fail-closed for the running turn
                 const handleServerRequest = (msg, current) => {
+                    current.state.startupActivity = true;
                     if (msg.method === "fs/read_text_file" || msg.method === "fs/write_text_file") {
                         void handleClientFileRequest(msg);
                         return;
@@ -683,7 +722,8 @@ export function createAcpDriver(support) {
                     }
                     const tool = kind === "execute" ? "shell" : kind === "edit" ? "edit" : kind || "tool";
                     const isShellCommand = !isQuestion && kind === "execute" && !/^mcp(?:__|[.:])/i.test(String(toolCall.title ?? ""));
-                    const summary = String(toolCall.rawInput?.command ?? toolCall.title ?? tool).slice(0, 200);
+                    const rawSummary = String(toolCall.rawInput?.command ?? toolCall.title ?? tool);
+                    const summary = rawSummary.slice(0, isQuestion ? MAX_QUESTION_TEXT : 200);
                     // One structured question beside the flat choices: the richer card
                     // renders from it while older clients keep answering through
                     // `choices`. Built once here so the emit and the answer path can
@@ -778,6 +818,9 @@ export function createAcpDriver(support) {
                             current.receiveModelVariants(p.update);
                         return;
                     }
+                    if (current && ["agent_message_chunk", "agent_thought_chunk", "tool_call", "tool_call_update"].includes(p.update?.sessionUpdate)) {
+                        current.state.startupActivity = true;
+                    }
                     if (!current || !current.state.promptSent)
                         return;
                     const u = p.update ?? {};
@@ -811,6 +854,7 @@ export function createAcpDriver(support) {
                         }
                         case "tool_call": {
                             current.flushAssistantText();
+                            trackRunningTool(current, u, "pending");
                             emit({
                                 ...base(threadId, current.turnId),
                                 type: "item.started",
@@ -823,6 +867,7 @@ export function createAcpDriver(support) {
                             break;
                         }
                         case "tool_call_update": {
+                            trackRunningTool(current, u);
                             if (u.status === "completed" || u.status === "failed") {
                                 current.state.producedItem = true;
                                 emit({
@@ -1010,8 +1055,8 @@ export function createAcpDriver(support) {
                 // transformEnv-policy supports (opencode). mcpServers are session
                 // establishment inputs — they ride session/new and session/load over
                 // the wire — and the harness mints fresh integration bearer tokens
-                // every turn, so they must not respawn the process; a change instead
-                // re-establishes the session below (see sessionKey).
+                // every turn. Most agents apply changes on live load; those that cache
+                // the old MCP clients must resume on a fresh process (see sessionKey).
                 // The env the spawned child actually receives is part of the
                 // contract too, and arrives hashed as envFingerprint for the same
                 // reason.
@@ -1030,7 +1075,8 @@ export function createAcpDriver(support) {
                 }
                 const pooled = sessions.get(threadId);
                 let session;
-                if (pooled && !pooled.dead && !pooled.closing && pooled.contractKey === contractKey) {
+                if (pooled && !pooled.dead && !pooled.closing && pooled.contractKey === contractKey
+                    && (!support.restartOnMcpChange || pooled.sessionKey === sessionKey)) {
                     // adoption cancels the idle countdown — a running turn is not quiet
                     if (pooled.idleTimer)
                         clearTimeout(pooled.idleTimer);
@@ -1053,7 +1099,13 @@ export function createAcpDriver(support) {
                 // respawns the child, every wire call must reach the live record, so
                 // nothing captures the connection off it.
                 const request = (method, params, timeoutMs, receive, idleMs, idleMessage) => session.acp.request(method, params, timeoutMs, receive, idleMs, idleMessage);
-                const state = { settled: false, promptSent: false, text: "", producedItem: false };
+                const state = { settled: false, promptSent: false, text: "", producedItem: false, startupActivity: false, stopped: false };
+                let acknowledge = () => { };
+                let rejectStartup = (_error) => { };
+                const startupAck = turn.startupRecovery ? new Promise((resolve, reject) => {
+                    acknowledge = () => resolve({ turnId });
+                    rejectStartup = reject;
+                }) : null;
                 const asks = new Map();
                 const modelOf = (result) => {
                     const option = (Array.isArray(result?.configOptions) ? result.configOptions : []).find((entry) => entry?.id === (support.selectModel?.configId ?? "model"));
@@ -1101,12 +1153,15 @@ export function createAcpDriver(support) {
                     turnConfig,
                     controlsHost,
                     state,
+                    acknowledge,
                     asks,
+                    runningTools: new Set(),
                     interruptTimer: null,
                     flushAssistantText,
                     receiveModelVariants,
                 };
                 const interrupt = () => {
+                    state.stopped = true;
                     if (session.sessionId) {
                         session.acp.send({ jsonrpc: "2.0", method: "session/cancel", params: { sessionId: session.sessionId } });
                         if (current.interruptTimer)
@@ -1123,7 +1178,7 @@ export function createAcpDriver(support) {
                         closeSession(threadId, "stop");
                     }
                 };
-                active.set(threadId, { stop: () => closeSession(threadId, "stop"), interrupt, turnId, asks });
+                active.set(threadId, { stop: () => { state.stopped = true; closeSession(threadId, "stop"); }, interrupt, turnId, asks });
                 emit({ ...base(threadId, turnId), type: "turn.started" });
                 session.current = current;
                 (async () => {
@@ -1134,6 +1189,19 @@ export function createAcpDriver(support) {
                         // Returns whether this runtime accepts image prompts, for the
                         // prompt phase below.
                         const handshake = async () => {
+                            // Also covers timeout/reset/re-establishment, not just rotated
+                            // MCP credentials. Stop remains wired while cleanup is pending.
+                            for (const child of retiring.get(threadId) ?? []) {
+                                const stopped = await retireChild(threadId, child);
+                                if (state.settled || session.closing)
+                                    throw new Error("session closed");
+                                if (!stopped) {
+                                    closeSession(threadId, "replace-failed");
+                                    throw new Error(`${support.displayName} could not close its previous tool session. Try again.`);
+                                }
+                            }
+                            if (state.settled || session.closing)
+                                throw new Error("session closed");
                             if (!session.initResult) {
                                 session.initResult = await request("initialize", {
                                     protocolVersion: 1,
@@ -1356,10 +1424,13 @@ export function createAcpDriver(support) {
                         if (turn.variant !== undefined && requestedVariantOption().currentValue !== turn.variant) {
                             throw new Error(`${support.displayName} changed variant before the prompt`);
                         }
+                        if (state.settled || state.stopped || session.closing)
+                            throw new Error("turn stopped");
                         state.promptSent = true;
+                        acknowledge();
                         const promptIdleMs = promptIdleTimeoutMs();
-                        const result = await request("session/prompt", { sessionId, prompt: [{ type: "text", text }, ...imageBlocks] }, undefined, undefined, promptIdleMs, `${DRIVER_KIND} went fully silent ${Math.round(promptIdleMs / 1000)} s after the message and the turn was stopped. ` +
-                            "Raise OPENMAUS_ACP_PROMPT_IDLE_TIMEOUT_MS if this model legitimately takes longer to answer.");
+                        const result = await request("session/prompt", { sessionId, prompt: [{ type: "text", text }, ...imageBlocks] }, undefined, undefined, promptIdleMs, `${DRIVER_KIND} sent nothing for ${Math.round(promptIdleMs / 1000)} s with no tool running, so the turn was stopped as stuck. ` +
+                            "Send the message again to retry. On a self-hosted server, OPENMAUS_ACP_PROMPT_IDLE_TIMEOUT_MS sets this limit (0 turns it off).");
                         if (pendingSplitReceipt) {
                             // session/prompt resolving is the acceptance boundary: a
                             // rejected prompt leaves the receipt unwritten, so the next
@@ -1405,6 +1476,35 @@ export function createAcpDriver(support) {
                             // fallback for existing ACP supports.
                             const needsAuth = code === "invalid_credentials" || code === "inactive_subscription"
                                 || message === support.loginNote;
+                            const failure = classifyError({ text: message });
+                            const transientStartup = failure.transient || (failure.reason === "unknown" && code === "upstream_outage");
+                            const denied = /\b(?:(?:permission|access) denied|(?:approval|permission) (?:required|denied|rejected)|requires? (?:approval|permission)|policy (?:restriction|violation)|(?:blocked|denied|restricted) by (?:the )?policy)\b/i.test(message);
+                            if (turn.startupRecovery && transientStartup && !needsAuth && !denied && (!code || code === "upstream_outage")
+                                && ![-32700, -32600, -32601, -32602].includes(e?.code)
+                                && !state.promptSent && !state.startupActivity && !state.producedItem && !state.text
+                                && !state.stopped && !session.closing && !asks.size && !current.runningTools.size) {
+                                // Quiesce before killing: the child's close event must not
+                                // publish a terminal completion before the harness can recover.
+                                state.settled = true;
+                                session.current = null;
+                                if (current.interruptTimer)
+                                    clearTimeout(current.interruptTimer);
+                                closeSession(threadId, "startup-recovery");
+                                const stopped = await killCliTree(session.child).catch(() => false);
+                                if (current.interruptTimer)
+                                    clearTimeout(current.interruptTimer);
+                                active.delete(threadId);
+                                if (stopped && !state.stopped) {
+                                    rejectStartup(new TurnNotStartedError(turnId, message));
+                                    return;
+                                }
+                                acknowledge();
+                                if (!state.stopped)
+                                    emit({ ...base(threadId, turnId), type: "runtime.error", message });
+                                emit({ ...base(threadId, turnId), type: "turn.completed", ok: state.stopped,
+                                    stopReason: state.stopped ? "cancelled" : "rpc_error", cost: null });
+                                return;
+                            }
                             emit({
                                 ...base(threadId, turnId),
                                 type: "runtime.error",
@@ -1424,7 +1524,7 @@ export function createAcpDriver(support) {
                         }
                     }
                 })();
-                return { turnId };
+                return startupAck ?? { turnId };
             };
             const snapshot = async () => {
                 const env = childEnv();
@@ -1481,6 +1581,10 @@ export function createAcpDriver(support) {
                         // idle pooled sessions have no running turn — close them too
                         for (const threadId of Array.from(sessions.keys()))
                             closeSession(threadId, "stopAll");
+                        for (const [threadId, children] of retiring) {
+                            for (const child of children)
+                                void retireChild(threadId, child);
+                        }
                     },
                     onEvent: (listener) => {
                         listeners.add(listener);
@@ -1492,6 +1596,10 @@ export function createAcpDriver(support) {
                         stop();
                     for (const threadId of Array.from(sessions.keys()))
                         closeSession(threadId, "dispose");
+                    for (const [threadId, children] of retiring) {
+                        for (const child of children)
+                            void retireChild(threadId, child);
+                    }
                     listeners.clear();
                 },
             };

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

@@ -235,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

@@ -278,7 +278,7 @@ function routineFields(args) {
     const runOn = destination(args.run_on ?? args.runOn);
     const timeoutMinutes = args.timeout_minutes ?? args.timeoutMinutes;
     if (runOn != null && runOn !== "maus" && runOn !== "cloud") {
-        return { fields, error: 'Use run_on="maus" for the bot’s current model and configured computer (including VPS), or run_on="box" only for the Box-hosted agent. Legacy "cloud" also means Box.' };
+        return { fields, error: 'Use run_on="maus" for the bot’s current model and configured computer (including VPS), or run_on="box" only for the Boat-hosted agent. Legacy "cloud" also means Boat.' };
     }
     if (timeoutMinutes != null && (typeof timeoutMinutes !== "number" || !Number.isInteger(timeoutMinutes) || timeoutMinutes < 5 || timeoutMinutes > 240)) {
         return { fields, error: "timeout_minutes must be a whole number from 5 to 240. Use clear_timeout to remove a limit." };
@@ -982,11 +982,14 @@ export async function callTool(name, args, context) {
         if (!routineId || !action) {
             return { text: "propose_routine_action needs a routine_id and supported action.", isError: true };
         }
+        const forBotId = String(args.for_bot_id ?? "").trim();
         const body = {
             fromBotId: BOT_ID,
             fromThreadId: THREAD_ID,
             action,
             routineId,
+            // JSON.stringify drops the key entirely when no target was named
+            ...(forBotId ? { forBotId } : {}),
         };
         if (action === "update") {
             if (!jsonRecord(args.changes)) {
@@ -1098,6 +1101,7 @@ export async function callTool(name, args, context) {
                 action: args.action,
                 text: args.text,
                 oldText: args.old_text,
+                ...(typeof args.until === "string" && args.until.trim() ? { until: args.until.trim() } : {}),
             }),
         });
         if (r.error || r.ok !== true) {

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

@@ -128,8 +128,9 @@ const ROUTINE_FIELDS_SCHEMA = {
     schedule: ROUTINE_SCHEDULE_SCHEMA,
     run_on: {
         type: "string",
+        // "box" is Boat's historical run_on destination id (agents wire contract).
         enum: ["maus", "box"],
-        description: "Default maus keeps the bot's selected model and configured computer, INCLUDING a self-hosted VPS. Omit this field for normal schedules. box explicitly switches the agent to the Box-hosted runner; it requires Box setup and is not the generic cloud/VPS option. Legacy cloud values from list_routines mean box, not VPS.",
+        description: "Default maus keeps the bot's selected model and configured computer, INCLUDING a self-hosted VPS. Omit this field for normal schedules. box explicitly switches the agent to the Boat-hosted runner; it requires Boat setup and is not the generic cloud/VPS option. Legacy cloud values from list_routines mean box, not VPS.",
     },
     timeout_minutes: {
         type: "integer",
@@ -293,7 +294,7 @@ const toolDefinitions = (externalRuntime) => [
         description: "Choose where this conversation does computer work. Call with no arguments to inspect actual available choices and the current place. For a task needing computer interaction, select the requested place, or auto to choose a suitable configured computer without asking the user to use menus. OpenMausBot reuses an existing computer first; with a configured provider it can start or provision one when needed. Do not provision for ordinary chat or just to inspect availability. A pending result means end this turn immediately: OpenMausBot updates the conversation selector and resumes the original request with that computer's real tools. Do not use the old tools after requesting a switch, repeat the task, or claim the action is done. This cannot change permissions, override Off, or switch a teammate/routine/channel.",
         inputSchema: { type: "object", additionalProperties: false, properties: {
                 surface: { type: "string", enum: ["auto", "cloud", "vm", "local", "browser"],
-                    description: "auto = suitable configured computer, cloud = remote Box/VPS, vm = isolated Local VM, local = user's own desktop, browser = built-in browser. Omit to list." },
+                    description: "auto = suitable configured computer, cloud = remote Boat/VPS, vm = isolated Local VM, local = user's own desktop, browser = built-in browser. Omit to list." },
             } },
     },
     {
@@ -523,6 +524,7 @@ const toolDefinitions = (externalRuntime) => [
                 action: { type: "string", enum: ["append", "replace", "remove", "supersede"] },
                 text: { type: "string", minLength: 1, description: "Non-blank new text for append, replace, or supersede: the fact itself, without a date or bullet. Omit for remove; use remove to delete a passage." },
                 old_text: { type: "string", minLength: 1, description: "Exact unique existing passage for replace, supersede, or remove. Omit for append." },
+                until: { type: "string", pattern: "^\\d{4}-\\d{2}-\\d{2}$", description: "Optional, for append or supersede: YYYY-MM-DD, the last day a temporary fact holds (an exam this weekend, a trip next week). After that day the entry is hidden from your memory." },
             },
             required: ["action"],
         },
@@ -614,12 +616,16 @@ const toolDefinitions = (externalRuntime) => [
     },
     {
         name: "propose_routine_action",
-        description: "Prepare a user-requested change to one of this bot's existing routines. Use list_routines first to get the routine id." + PROPOSAL_OUTCOME,
+        description: "Prepare a user-requested change to one of this bot's existing routines. Use list_routines first to get the routine id. If the user asks to change ANOTHER bot's routine and that bot is in your section, call list_bots and pass that bot's id as for_bot_id; the routine keeps its owner and every run keeps that bot's engine and permissions." + PROPOSAL_OUTCOME,
         inputSchema: {
             type: "object",
             additionalProperties: false,
             properties: {
                 routine_id: { type: "string", minLength: 1, description: "Routine id from list_routines." },
+                for_bot_id: {
+                    type: "string",
+                    description: "Only when the requested change targets ANOTHER bot's routine and that bot is in your section: that bot's id from list_bots. Learn the routine id from that bot's own routines (it can run list_routines). Omit to change one of your own routines.",
+                },
                 action: {
                     type: "string",
                     enum: ["update", "pause", "resume", "run_now", "delete"],

package/dist-server/server/drivers/{boxagent.js → boatagent.js}

@@ -1,9 +1,10 @@
 import { newEventId, newId } from "../contracts.js";
 import { appendNative } from "./native.js";
 import { OMB_ASK_TOOL, answerWithoutPreamble, askQuestionSummary, capAnswerEcho, ombAskProtocolPrompt, parseOmbAskQuestions, questionChoices, stripOmbAskBlock, } from "../../shared/ask-question.js";
+// "boxAgent" is Boat's historical driver kind (catalog and wire); keep it.
 const DRIVER_KIND = "boxAgent";
 // overridable so tests and a dev backend can be pointed at instead of the live provider
-const BOX_API = process.env.OMB_BOX_API || "https://ascii.dev/api/box/v1";
+const BOAT_API = process.env.OMB_BOX_API || "https://ascii.dev/api/box/v1";
 const MODELS = {
     default: "claude-fable-5",
     options: [
@@ -15,14 +16,14 @@ const MODELS = {
 /** Any fence whose info string names the ask protocol, even when its body
  * does not parse: the marker for "the model tried to ask and failed". */
 const ASK_FENCE_ANY = /(^|\n)[ \t]{0,3}(`{3,}|~{3,})[ \t]*omb-ask\b/;
-/** The box runs every harness boat.dev ships (claude-code, codex, pi, opencode,
+/** The boat runs every harness boat.dev ships (claude-code, codex, pi, opencode,
  * prime-agent, kimi). Which one a model id belongs to comes from the public
  * catalog, `GET /api/provider-models` at the API root: an object keyed by
  * harness, each with its `models`. A bot that arrives here from another engine
  * carries that engine's model id, so this is what lets it keep its model. */
 let catalog = null;
 async function loadCatalog() {
-    const root = BOX_API.replace(/\/api\/box\/v1\/?$/, "");
+    const root = BOAT_API.replace(/\/api\/box\/v1\/?$/, "");
     catalog = await fetch(`${root}/api/provider-models`, { signal: AbortSignal.timeout(15_000) })
         .then((res) => (res.ok ? res.json() : null))
         .catch(() => null);
@@ -44,7 +45,7 @@ function decodeConfig(raw) {
         ...(typeof o.askTimeoutMs === "number" ? { askTimeoutMs: o.askTimeoutMs } : {}),
     };
 }
-export const BoxAgentDriver = {
+export const BoatAgentDriver = {
     driverKind: DRIVER_KIND,
     metadata: { displayName: "Computer", supportsMultipleInstances: false },
     models: MODELS,
@@ -74,7 +75,7 @@ export const BoxAgentDriver = {
             createdAt: new Date().toISOString(),
         });
         const api = async (path, opts = {}) => {
-            const res = await fetch(`${BOX_API}${path}`, {
+            const res = await fetch(`${BOAT_API}${path}`, {
                 ...opts,
                 headers: { authorization: `Bearer ${token}`, "content-type": "application/json", ...opts.headers },
                 signal: opts.signal ?? AbortSignal.timeout(30_000),
@@ -120,7 +121,7 @@ export const BoxAgentDriver = {
                 });
                 appendNative(threadId, { dir: "out", source: "box.prompt", msg: { model, prompt: promptText, response: started } });
                 // real shape (2026-08): {type:"prompt.queued", promptId, promptRun:{id,…},
-                // id:<box id>} — never fall back to the bare id, it's the box's
+                // id:<boat id>} — never fall back to the bare id, it's the boat's
                 return started?.promptRun?.id ?? started?.prompt?.id ?? started?.promptId ?? null;
             };
             const promptId = await postPrompt(prompt);
@@ -149,7 +150,7 @@ export const BoxAgentDriver = {
                 const seen = new Set();
                 let lastText = "";
                 let pendingText = "";
-                /** Why the box could not answer (login expired, model refused, …). */
+                /** Why the boat could not answer (login expired, model refused, …). */
                 let problem = null;
                 /** Emit unflushed deltas as assistant_text and reset pendingText.
                  * The omb-ask block is protocol, not prose: it streamed raw (the
@@ -229,7 +230,7 @@ export const BoxAgentDriver = {
                         return { ok: ok && !cancelled, stopReason: cancelled ? "interrupted" : stopReason };
                     }
                     // The turn is still open, so this prompt continues it: same turnId,
-                    // same accounting, and the answer reaches the box the way the ask
+                    // same accounting, and the answer reaches the boat the way the ask
                     // contract promised — Q:/A: blocks, capped for echo.
                     const continuation = [
                         capAnswerEcho(answerWithoutPreamble(reply)),
@@ -238,7 +239,7 @@ export const BoxAgentDriver = {
                     ].join("\n");
                     const nextPromptId = await postPrompt(continuation);
                     // Stop can land while the continuation POST is in flight: the
-                    // interrupt inside cancel() then hits a box with no active run,
+                    // interrupt inside cancel() then hits a boat with no active run,
                     // and the continuation would start after it. Interrupt the run
                     // that just started before ending the turn.
                     if (cancelled) {
@@ -247,9 +248,9 @@ export const BoxAgentDriver = {
                     }
                     return await settleRun(nextPromptId);
                 };
-                /** Poll one box run to its settle. */
+                /** Poll one boat run to its settle. */
                 const settleRun = async (runPromptId) => {
-                    const startedAt = Date.now(); // one 30-min ceiling per box run, ask chains included
+                    const startedAt = Date.now(); // one 30-min ceiling per boat run, ask chains included
                     lastText = "";
                     pendingText = "";
                     problem = null;
@@ -355,7 +356,7 @@ export const BoxAgentDriver = {
         };
         const snapshot = async () => {
             if (!token) {
-                return { state: "unavailable", reason: 'no Box token — add {"box":{"token":"…"}} to ~/.openmausbot/config.json' };
+                return { state: "unavailable", reason: 'no Boat token — add {"box":{"token":"…"}} to ~/.openmausbot/config.json' };
             }
             try {
                 await api("/me");
@@ -374,7 +375,7 @@ export const BoxAgentDriver = {
             snapshot,
             adapter: {
                 provider: DRIVER_KIND,
-                capabilities: { sessionModelSwitch: "in-session" },
+                capabilities: { sessionModelSwitch: "in-session", remoteAgent: true, usesCloudComputer: true },
                 sendTurn,
                 interruptTurn: async (threadId) => active.get(threadId)?.cancel(),
                 respondToRequest: async (threadId, requestId, decision) => {

package/dist-server/server/drivers/builtIn.js

@@ -1,5 +1,5 @@
 import { AntigravityDriver } from "./antigravity.js";
-import { BoxAgentDriver } from "./boxagent.js";
+import { BoatAgentDriver } from "./boatagent.js";
 import { ClaudeDriver } from "./claude.js";
 import { CodexDriver } from "./codex.js";
 import { GrokDriver } from "./grok.js";
@@ -32,7 +32,7 @@ export const BUILT_IN_DRIVERS = [
     ClaudeDriver,
     CodexDriver,
     AntigravityDriver,
-    BoxAgentDriver,
+    BoatAgentDriver,
     MinimaxDriver,
     MistralDriver,
 ];

package/dist-server/server/drivers/{chat-box-tools.js → chat-boat-tools.js}

@@ -1,4 +1,4 @@
-import { isolatedRemoteCommand, runCommand, screenshotBox } from "../box.js";
+import { isolatedRemoteCommand, runCommand, screenshotBoat } from "../boat.js";
 import { createControlClient, CONTROL_REFUSAL_PLAIN } from "../control-client.js";
 const coordinate = { type: "integer", minimum: 0, maximum: 32767 };
 const tool = (name, description, properties = {}, required = []) => ({ name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } });
@@ -19,7 +19,7 @@ const buttons = { left: 1, middle: 2, right: 3 };
 const scrollButtons = { up: 4, down: 5, left: 6, right: 7 };
 /** Uses only the leased descriptor supplied by the harness. Schema validation
  * and user approval happen in the shared chat tool executor before this call. */
-export class ChatBoxClient {
+export class ChatBoatClient {
     closed = false;
     control;
     descriptor;
@@ -45,7 +45,7 @@ export class ChatBoxClient {
         const config = { box: { token: this.descriptor.token } };
         const id = this.descriptor.boxId;
         if (name === "screenshot") {
-            const shot = await screenshotBox(config, "", id, { signal, nativeSize: true });
+            const shot = await screenshotBoat(config, "", id, { signal, nativeSize: true });
             signal.throwIfAborted();
             return { content: [{ type: "image", mimeType: "image/jpeg", data: shot.png }] };
         }

package/dist-server/server/drivers/chat-mcp-tools.js

@@ -7,7 +7,7 @@ import { stripControlPlaneEnv } from "../config.js";
 import { augmentedPath } from "../env-path.js";
 import { killCliTree, spawnCli } from "../procs.js";
 import { chatImage } from "./chat-images.js";
-import { ChatBoxClient } from "./chat-box-tools.js";
+import { ChatBoatClient } from "./chat-boat-tools.js";
 /** The transport cannot safely continue this turn. A dispatched operation may
  * already have taken effect, so callers must not retry it through a new round. */
 export class ChatToolSessionError extends Error {
@@ -314,7 +314,7 @@ export async function mountChatTools(integrations, signal, computerUse = false)
                 throw aborted();
             // Every mounted MCP server can return images when the caller enables
             // image delivery, including custom servers. Text stays bounded below.
-            const client = "boxId" in descriptor ? new ChatBoxClient(descriptor) : new ChatMcpClient(descriptor, computerUse);
+            const client = "boxId" in descriptor ? new ChatBoatClient(descriptor) : new ChatMcpClient(descriptor, computerUse);
             clients.push(client);
             return { name, client, tools: await client.tools(signal) };
         }));