openmausbot 0.1.92 → 0.1.94

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

@@ -34,6 +34,8 @@ import { newEventId, newId } from "../contracts.js";
 import { parseAskQuestions, parseChoices, questionAnswersByQuestion } from "../../shared/ask-question.js";
 import { decodeInjectId, encodeInjectId, hostApiKey, localHost, mergeLocalInject, } from "./local-inject.js";
 import { appendNative } from "./native.js";
+import { canUseMcpServer, parseToolScope } from "../../shared/tool-scope.js";
+import { gateServer, mcpStdioServer, resultBudget } from "../mcp-gate-config.js";
 const DRIVER_KIND = "piAgent";
 const PI_ARGS = ["--mode", "rpc", "--no-session"];
 const PI_MODEL_UPDATE_ARGS = ["update", "--models", "--no-approve"];
@@ -87,6 +89,9 @@ export function piThinkingLevel(effort) {
  * a JSON-RPC 2.0 stdio server the pi-mcp-extension consumes. Returns null when
  * there is nothing to mount (the common case). */
 export function buildMcpServers(turn) {
+    const parsed = parseToolScope(turn.toolScope);
+    if (!parsed.ok)
+        throw new Error(parsed.error);
     const servers = {};
     if (turn.integrations?.composio)
         servers.composio = { ...turn.integrations.composio };
@@ -112,6 +117,22 @@ export function buildMcpServers(turn) {
             env: { ...NODE_ENV_FLAG, DWEB_URL: turn.integrations.dweb.url },
         };
     }
+    if (turn.integrations?.browser)
+        servers.browser = { ...turn.integrations.browser };
+    for (const [name, server] of Object.entries(turn.integrations?.custom ?? {}))
+        servers[name] = { ...server, scope: "custom" };
+    for (const [name, server] of Object.entries(servers)) {
+        if (parsed.scope !== undefined && !canUseMcpServer(parsed.scope, name)) {
+            delete servers[name];
+            continue;
+        }
+        const gated = gateServer({ name, server, toolScope: parsed.scope, threadId: turn.threadId, budget: name in (turn.integrations?.custom ?? {}) ? resultBudget() : 0, nodeEnv: NODE_ENV_FLAG });
+        const stdio = gated ?? mcpStdioServer(server, { nodeEnv: NODE_ENV_FLAG });
+        if (!stdio)
+            throw new Error("Pi MCP server configuration is invalid");
+        const original = server;
+        servers[name] = { ...stdio, ...(original.scope ? { scope: original.scope } : {}) };
+    }
     return Object.keys(servers).length ? servers : null;
 }
 /** Pure parser: turn a `get_available_models` stdout blob into a catalog.
@@ -428,6 +449,10 @@ export const PiDriver = {
         });
         const sendTurn = async (turn) => {
             const { threadId } = turn;
+            const selection = parseToolScope(turn.toolScope);
+            if (!selection.ok)
+                throw new Error(selection.error);
+            const toolScope = selection.scope;
             if (active.has(threadId))
                 throw new Error("a turn is already running on this thread");
             // Per-bot Ask/Auto is authoritative for harness turns. Preserve the
@@ -469,10 +494,13 @@ export const PiDriver = {
             // into a 0600 temp file removed when the turn settles — never on argv.
             const mcpServers = buildMcpServers(turn);
             let mcpTempDir = null;
-            if (mcpServers) {
+            let scopeReadyPath;
+            if (mcpServers || toolScope !== undefined) {
                 mcpTempDir = mkdtempSync(join(tmpdir(), "omb-pi-mcp-"));
+                if (toolScope !== undefined)
+                    scopeReadyPath = join(mcpTempDir, "scope-ready.json");
                 try {
-                    writeFileSync(join(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers }), { mode: 0o600 });
+                    writeFileSync(join(mcpTempDir, "mcp.json"), JSON.stringify({ mcpServers: mcpServers ?? {}, toolScope, scopeReadyPath, approvalMode: turn.approvalMode }), { mode: 0o600 });
                 }
                 catch (err) {
                     // A failed write must not leave the temp dir behind — a partial file
@@ -486,7 +514,7 @@ export const PiDriver = {
                     throw err;
                 }
             }
-            const childArgs = mcpServers ? [...PI_ARGS, "-e", SPAWNED_PROXIES.piMcpExtension] : PI_ARGS;
+            const childArgs = mcpTempDir ? [...PI_ARGS, "-e", SPAWNED_PROXIES.piMcpExtension] : PI_ARGS;
             // spawnCli can throw synchronously (unresolvable CLI); if it does, the
             // 0600 temp file with the boat token / composio key / comms token must
             // not be left on disk — settle() never runs because no child existed.
@@ -498,7 +526,7 @@ export const PiDriver = {
                         env: piEnvironment({
                             ...process.env,
                             ...input.environment,
-                            ...(mcpServers && mcpTempDir ? { OMB_MCP_CONFIG: join(mcpTempDir, "mcp.json") } : {}),
+                            ...(mcpTempDir ? { OMB_MCP_CONFIG: join(mcpTempDir, "mcp.json") } : {}),
                         }),
                     });
                 }
@@ -962,6 +990,20 @@ export const PiDriver = {
                     /* keep going on the engine default */
                 }
             }
+            if (scopeReadyPath) {
+                let ready = false;
+                try {
+                    const receipt = JSON.parse(readFileSync(scopeReadyPath, "utf8"));
+                    ready = receipt.ok === true && JSON.stringify(receipt.toolScope) === JSON.stringify(toolScope);
+                }
+                catch { /* Missing or malformed readiness is never a grant. */ }
+                if (!ready) {
+                    const message = "Pi tool selection enforcement is unavailable. Update Pi and check the OpenMausBot extension before retrying.";
+                    emit({ ...base(threadId, turnId), type: "runtime.error", message });
+                    settle(false);
+                    throw new Error(message);
+                }
+            }
             // The stable/volatile split: the full prompt rides only the turn that
             // establishes - or re-instructs, after a soul edit - this pi session,
             // which previously re-sent the whole system prompt on every turn and
@@ -1086,6 +1128,8 @@ export const PiDriver = {
                     computerMcp: true,
                     composioMcp: true,
                     phoneMcp: true,
+                    customMcp: true,
+                    browserMcp: true,
                     // Host control (the user's real Mac) rides the pi-native permission
                     // card (`ctx.ui.confirm` → extension_ui_request) gated in the
                     // extension, so it is offered exactly when the other engines offer

package/dist-server/server/drivers/prompt-split.js

@@ -57,6 +57,8 @@ export function readPromptSplitReceipt(scope, key) {
                     stable: record.stable,
                     volatile: record.volatile,
                     ...(typeof record.turnsSinceFull === "number" ? { turnsSinceFull: record.turnsSinceFull } : {}),
+                    ...(typeof record.lastUsed === "number" && record.lastUsed > 0 ? { lastUsed: record.lastUsed } : {}),
+                    ...(typeof record.peakUsed === "number" && record.peakUsed > 0 ? { peakUsed: record.peakUsed } : {}),
                 };
             }
         }

package/dist-server/server/env-path.js

@@ -64,8 +64,9 @@ function knownDirs() {
  * invisible until it restarts, because Windows never pushes PATH changes
  * into a live process. Scanning the standard install locations recovers
  * those without a restart — `~/.grok/bin` (the x.ai installer) and
- * `%APPDATA%\npm` (global npm shims), plus `%LOCALAPPDATA%\agy\bin`, cover
- * every engine we ship an install command for. */
+ * `%APPDATA%\npm` (global npm shims), plus `%LOCALAPPDATA%\agy\bin` and
+ * `%LOCALAPPDATA%\cursor-agent`, cover every engine we ship an install
+ * command for. */
 function windowsKnownDirs() {
     const home = homedir();
     const appData = process.env.APPDATA ?? join(home, "AppData", "Roaming");
@@ -74,12 +75,15 @@ function windowsKnownDirs() {
         join(appData, "npm"), // npm -g shims: claude, codex
         join(home, ".grok", "bin"), // x.ai installer
         join(localAppData, "agy", "bin"), // Antigravity installer
+        // Cursor installer: cursor-agent.* and its `agent` copies (MOCA-272)
+        join(localAppData, "cursor-agent"),
         join(home, ".local", "bin"), // claude native installer
         join(home, ".claude", "local"),
         join(home, "bin"), // Factory droid installer (%USERPROFILE%\bin)
         join(home, ".bun", "bin"),
         join(home, ".deno", "bin"),
         join(home, "go", "bin"),
+        join(process.env.ProgramFiles ?? "C:\\Program Files", "Docker", "Docker", "resources", "bin"), // Docker Desktop installer
     ];
 }
 let cached = null;

package/dist-server/server/environment.js

@@ -102,6 +102,9 @@ export function environmentDescriptor(input) {
             // Never advertise a protocol this server would refuse: the routes are
             // gone unless features.sharedComputers is on, so the capability is too.
             ...(input.sharedComputers === true ? { sharedComputers: true } : {}),
+            // An OMB Cloud home: its pairing page says "Opening your Cloud…" and
+            // where to connect from, not "the code shown on the server".
+            ...(input.cloudHome === true ? { cloudHome: true } : {}),
             selfUpdate: input.desktopManaged ? "desktop-managed" : "operator",
             emailSignIn: input.emailSignIn === true,
         },

package/dist-server/server/guarded-requests.js

@@ -1,3 +1,4 @@
+import { isPersistentQuestionCard } from "../shared/ask-question.js";
 export function requestConflict(message = "The request no longer owns this conversation") {
     return Object.assign(new Error(message), { status: 409, code: "guarded_request_changed" });
 }
@@ -54,7 +55,7 @@ export function requestSourceForCard(messages, messageId) {
     return undefined;
 }
 export function requestNeedsInput(message) {
-    return Boolean((message.card?.requestId && !message.card.answered && !message.card.dismissed && !message.card.expired) ||
+    return Boolean((message.card?.requestId && !message.card.answered && !message.card.dismissed && !message.card.expired && !isPersistentQuestionCard(message.card)) ||
         (message.connector && !message.connector.dismissed && !message.connector.resumed && message.connector.status !== "connected") ||
         (message.secret && !message.secret.provided && !message.secret.dismissed && !message.secret.superseded));
 }