machine-bridge-mcp 0.12.2 → 0.14.0

package/src/local/runtime.mjs

@@ -7,7 +7,7 @@ import path, { basename, dirname, isAbsolute, join, relative, resolve, sep } fro
 import { RelayConnection } from "./relay-connection.mjs";
 import { applyUpdateHunks, parsePatchEnvelope } from "./patch.mjs";
 import { executionEnv, workspaceShellCommand } from "./shell.mjs";
-import { MAX_COMMAND_BYTES, ProcessSessionManager, terminateProcessTree, validateArgv } from "./process-sessions.mjs";
+import { MAX_COMMAND_BYTES, ProcessSessionManager, terminateProcessTree, terminateProcessTreeWithEscalation, validateArgv } from "./process-sessions.mjs";
 export { MAX_COMMAND_BYTES } from "./process-sessions.mjs";
 import { allToolNames, assertCanonicalFullPolicy, isCanonicalFullPolicy, MCP_PROTOCOL_VERSION, MCP_SUPPORTED_PROTOCOL_VERSIONS, normalizePolicy, POLICY_PROFILES, SERVER_NAME, toolNamesForPolicy } from "./tools.mjs";
 import { classifyOperationalError } from "./log.mjs";
@@ -17,6 +17,7 @@ import { expandHome } from "./state.mjs";
 import { AgentContextManager } from "./agent-context.mjs";
 import { AppAutomationManager } from "./app-automation.mjs";
 import { BrowserBridgeManager } from "./browser-bridge.mjs";
+import { CapabilityObserver } from "./capability-observer.mjs";
 import { readBoundedRegularFileSync } from "./secure-file.mjs";
 
 export const MAX_WRITE_BYTES = 5 * 1024 * 1024;
@@ -45,6 +46,8 @@ const RUNTIME_TOOL_HANDLERS = Object.freeze({
   browser_status: (runtime, _args, context) => runtime.browserBridgeManager.status(context),
   pair_browser_extension: (runtime, args, context) => runtime.browserBridgeManager.pair(args, context),
   browser_list_tabs: (runtime, args, context) => runtime.browserBridgeManager.listTabs(args, context),
+  browser_manage_tabs: (runtime, args, context) => runtime.browserBridgeManager.manageTabs(args, context),
+  browser_wait: (runtime, args, context) => runtime.browserBridgeManager.wait(args, context),
   browser_get_source: (runtime, args, context) => runtime.browserBridgeManager.getSource(args, context),
   browser_inspect_page: (runtime, args, context) => runtime.browserBridgeManager.inspectPage(args, context),
   browser_action: (runtime, args, context) => runtime.browserBridgeManager.act(args, context),
@@ -85,7 +88,7 @@ export function runtimeToolHandlerNames() {
 }
 
 export class LocalRuntime {
-  constructor({ workerUrl = "", secret = "", expectedRelayVersion = "", workspace, policy, logger = console, onSuperseded = null, onFatal = null, jobRoot = "", resources = {}, resourceStatePath = "", browserStateRoot = "", agentHome = process.env.HOME || process.env.USERPROFILE || "", codexHome = process.env.CODEX_HOME || "", recoverJobs = true }) {
+  constructor({ workerUrl = "", secret = "", expectedRelayVersion = "", workspace, policy, logger = console, onSuperseded = null, onFatal = null, jobRoot = "", resources = {}, resourceStatePath = "", browserStateRoot = "", agentHome = process.env.HOME || process.env.USERPROFILE || "", codexHome = process.env.CODEX_HOME || "", recoverJobs = true, applicationAutomation = {} }) {
     const remoteWorkerUrl = workerUrl ? String(workerUrl) : "";
     const remoteSecret = secret || "";
     this.workspaceInput = resolve(workspace || process.cwd());
@@ -100,6 +103,7 @@ export class LocalRuntime {
     this.callProcesses = new Map();
     this.cancelledCalls = new Set();
     this.mutationQueue = Promise.resolve();
+    this.capabilityObserver = new CapabilityObserver();
     this.runtimeDir = createRuntimeDir();
     if (typeof jobRoot !== "string" || !jobRoot.trim()) throw new Error("persistent managed-job root is required");
     this.managedJobManager = new ManagedJobManager({
@@ -139,6 +143,7 @@ export class LocalRuntime {
     const readResourceText = (name) => this.readLocalResourceText(name);
     const readResourceBinary = (name) => this.readLocalResourceBinary(name);
     this.appAutomationManager = new AppAutomationManager({
+      ...applicationAutomation,
       policy: this.policy,
       displayPath: (value) => this.displayPath(value),
       runProcess,
@@ -198,9 +203,11 @@ export class LocalRuntime {
         per_tool_events: "debug-only",
         default_logs_include_tool_failures: false,
         tool_arguments_or_results_logged: false,
+        capability_routing: this.capabilityObserver.snapshot(),
       },
       runtime: {
         environment: this.policy.minimalEnv ? "isolated-minimal" : "full-parent",
+        relay: this.relay?.status?.() || null,
         runtime_dir: this.policy.exposeAbsolutePaths ? this.runtimeDir : "<private-runtime-dir>",
         process_sessions: this.processSessionManager.status(),
         managed_jobs: this.managedJobManager.status(),
@@ -323,14 +330,8 @@ export class LocalRuntime {
     this.cancelledCalls.add(callId);
     this.processSessionManager.notifyCancellation();
     this.browserBridgeManager?.cancelCall(callId);
-    for (const child of this.callProcesses.get(callId) || []) terminateProcessTree(child, "SIGTERM");
     const children = [...(this.callProcesses.get(callId) || [])];
-    if (children.length) {
-      const timer = setTimeout(() => {
-        for (const child of children) if (this.activeProcesses.has(child)) terminateProcessTree(child, "SIGKILL");
-      }, 2000);
-      timer.unref?.();
-    }
+    for (const child of children) terminateProcessTreeWithEscalation(child);
     this.logger.debug?.("tool call cancellation requested", { call_id: shortCallId(callId), reason });
   }
 
@@ -351,6 +352,7 @@ export class LocalRuntime {
       gitRoot: git.code === 0 ? this.displayPath(git.stdout.trim()) : "",
       policy: this.policy,
       tools: ["server_info", ...this.tools()],
+      capabilityRouting: this.capabilityObserver.snapshot(),
       topLevel: top.entries || [],
     };
   }
@@ -795,13 +797,14 @@ export class LocalRuntime {
         status_tool: "browser_status",
       } : null,
     };
+    this.capabilityObserver.recordBootstrap(bootstrap);
     return bootstrap;
   }
 
   async resolveTaskCapabilities(args = {}, context = {}) {
     const result = await this.agentContextManager.resolveTaskCapabilities(args, context);
     const task = String(args.task || "");
-    if (/app|application|gui|window|应用|软件|窗口|界面/i.test(task) && this.policy.profile === "full") {
+    if (this.policy.profile === "full") {
       const applications = await this.appAutomationManager.listApplications({ query: "", max_results: 500 }, context).catch(() => ({ applications: [] }));
       const lower = task.toLowerCase();
       result.application_matches = applications.applications
@@ -813,7 +816,12 @@ export class LocalRuntime {
     } else {
       result.application_matches = [];
     }
+    if (result.application_matches.length) {
+      result.recommended_tools = [...new Set([...result.recommended_tools, "list_local_applications", "open_local_application", "inspect_local_application", "operate_local_application"])];
+    }
     result.browser_backend = this.policy.profile === "full" ? { tool: "browser_status", existing_profile: true, extension_bridge: true } : null;
+    result.routing_observability = "Call server_info or project_overview to verify that bootstrap and task capability resolution reached the local runtime.";
+    this.capabilityObserver.recordResolution(task, result);
     return result;
   }
 
@@ -873,12 +881,9 @@ export class LocalRuntime {
 
   terminateActiveProcesses(signal = "SIGTERM", escalate = false) {
     const children = [...this.activeProcesses];
-    for (const child of children) terminateProcessTree(child, signal);
-    if (escalate && signal !== "SIGKILL" && children.length) {
-      const timer = setTimeout(() => {
-        for (const child of children) if (this.activeProcesses.has(child)) terminateProcessTree(child, "SIGKILL");
-      }, 2000);
-      timer.unref?.();
+    for (const child of children) {
+      if (escalate && signal !== "SIGKILL") terminateProcessTreeWithEscalation(child);
+      else terminateProcessTree(child, signal);
     }
   }
 
@@ -911,14 +916,12 @@ export class LocalRuntime {
       let killTimer = null;
       const timer = setTimeout(() => {
         timedOut = true;
-        terminateProcessTree(child, "SIGTERM");
-        killTimer = setTimeout(() => terminateProcessTree(child, "SIGKILL"), 2000);
-        killTimer.unref?.();
+        killTimer = terminateProcessTreeWithEscalation(child);
       }, timeoutMs);
       timer.unref?.();
       const cleanup = () => {
         clearTimeout(timer);
-        if (killTimer) clearTimeout(killTimer);
+        if (killTimer && !timedOut) clearTimeout(killTimer);
         this.activeProcesses.delete(child);
         if (context.callId) {
           const set = this.callProcesses.get(context.callId);

package/src/shared/tool-catalog.json

@@ -57,7 +57,7 @@
   {
     "name": "resolve_task_capabilities",
     "title": "Resolve task capabilities",
-    "description": "Rescan built-in and automatic project context, local instruction files, skills, registered commands, applications, and browser capability metadata; rank the capabilities relevant to the current task and optionally load the best skill.",
+    "description": "Rescan built-in and automatic project context, local instruction files, skills, explicit and automatic package commands, installed applications, and browser capability metadata; rank the capabilities relevant to the current task and optionally load the best skill.",
     "availability": "always",
     "annotations": {
       "readOnlyHint": true,
@@ -385,6 +385,55 @@
       }
     }
   },
+  {
+    "name": "browser_manage_tabs",
+    "title": "Manage browser tabs",
+    "description": "Create, activate, or close tabs in the paired existing browser profile.",
+    "availability": "full",
+    "annotations": {
+      "readOnlyHint": false,
+      "destructiveHint": true,
+      "idempotentHint": false,
+      "openWorldHint": true
+    },
+    "inputSchema": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "action": {
+          "type": "string",
+          "enum": [
+            "new",
+            "activate",
+            "close"
+          ]
+        },
+        "tab_id": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "Required for activate and close."
+        },
+        "url": {
+          "type": "string",
+          "maxLength": 32768,
+          "description": "Optional absolute http, https, or file URL for a new tab."
+        },
+        "active": {
+          "type": "boolean",
+          "default": true
+        },
+        "timeout_seconds": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 120,
+          "default": 30
+        }
+      },
+      "required": [
+        "action"
+      ]
+    }
+  },
   {
     "name": "browser_get_source",
     "title": "Read browser page source",
@@ -473,10 +522,115 @@
       }
     }
   },
+  {
+    "name": "browser_wait",
+    "title": "Wait for browser state",
+    "description": "Wait until all supplied URL, load, text, and element-state conditions are satisfied in an existing browser tab.",
+    "availability": "full",
+    "annotations": {
+      "readOnlyHint": true,
+      "destructiveHint": false,
+      "idempotentHint": true,
+      "openWorldHint": true
+    },
+    "inputSchema": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "tab_id": {
+          "type": "integer",
+          "minimum": 1
+        },
+        "frame_id": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "selector": {
+          "type": "object",
+          "properties": {
+            "ref": {
+              "type": "string",
+              "maxLength": 100,
+              "description": "Stable element reference returned by browser_inspect_page for the same document and frame."
+            },
+            "css": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "id": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "name": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "label": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "text": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "role": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "placeholder": {
+              "type": "string",
+              "maxLength": 2000
+            },
+            "index": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 10000
+            }
+          },
+          "additionalProperties": false
+        },
+        "state": {
+          "type": "string",
+          "enum": [
+            "attached",
+            "detached",
+            "visible",
+            "hidden",
+            "enabled",
+            "editable",
+            "checked",
+            "unchecked"
+          ],
+          "description": "Element state to wait for. Defaults to visible only when selector is supplied."
+        },
+        "text": {
+          "type": "string",
+          "maxLength": 4000
+        },
+        "url_contains": {
+          "type": "string",
+          "maxLength": 32768
+        },
+        "load_state": {
+          "type": "string",
+          "enum": [
+            "domcontentloaded",
+            "complete"
+          ]
+        },
+        "timeout_seconds": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 120,
+          "default": 30
+        }
+      }
+    }
+  },
   {
     "name": "browser_action",
     "title": "Operate browser page",
-    "description": "Perform one structured navigation or DOM action in the user's existing browser tab without accepting arbitrary JavaScript.",
+    "description": "Perform one structured navigation or page action in the user's existing browser tab, with automatic actionability waits and optional fixed DevTools input, without accepting arbitrary JavaScript.",
     "availability": "full",
     "annotations": {
       "readOnlyHint": false,
@@ -506,12 +660,21 @@
             "submit",
             "reload",
             "back",
-            "forward"
+            "forward",
+            "double_click",
+            "hover",
+            "type_text",
+            "scroll_into_view"
           ]
         },
         "selector": {
           "type": "object",
           "properties": {
+            "ref": {
+              "type": "string",
+              "maxLength": 100,
+              "description": "Stable element reference returned by browser_inspect_page for the same document and frame."
+            },
             "css": {
               "type": "string",
               "maxLength": 2000
@@ -582,6 +745,22 @@
         "frame_id": {
           "type": "integer",
           "minimum": 0
+        },
+        "input_mode": {
+          "type": "string",
+          "enum": [
+            "auto",
+            "trusted",
+            "dom"
+          ],
+          "default": "auto",
+          "description": "Use fixed DevTools Input commands when possible, require them, or use DOM events only."
+        },
+        "element_timeout_seconds": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 60,
+          "default": 10
         }
       },
       "required": [
@@ -618,6 +797,11 @@
               "selector": {
                 "type": "object",
                 "properties": {
+                  "ref": {
+                    "type": "string",
+                    "maxLength": 100,
+                    "description": "Stable element reference returned by browser_inspect_page for the same document and frame."
+                  },
                   "css": {
                     "type": "string",
                     "maxLength": 2000
@@ -691,6 +875,11 @@
         "submit_selector": {
           "type": "object",
           "properties": {
+            "ref": {
+              "type": "string",
+              "maxLength": 100,
+              "description": "Stable element reference returned by browser_inspect_page for the same document and frame."
+            },
             "css": {
               "type": "string",
               "maxLength": 2000
@@ -745,6 +934,12 @@
         "frame_id": {
           "type": "integer",
           "minimum": 0
+        },
+        "element_timeout_seconds": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 60,
+          "default": 10
         }
       },
       "required": [
@@ -815,6 +1010,11 @@
         "selector": {
           "type": "object",
           "properties": {
+            "ref": {
+              "type": "string",
+              "maxLength": 100,
+              "description": "Stable element reference returned by browser_inspect_page for the same document and frame."
+            },
             "css": {
               "type": "string",
               "maxLength": 2000
@@ -885,6 +1085,12 @@
         "frame_id": {
           "type": "integer",
           "minimum": 0
+        },
+        "element_timeout_seconds": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 60,
+          "default": 10
         }
       },
       "required": [
@@ -897,7 +1103,7 @@
   {
     "name": "agent_context",
     "title": "Load agent context",
-    "description": "Discover built-in defaults, bounded automatic project facts, Codex-compatible global/root-to-target instruction precedence, progressively disclosed local skills, and registered commands for a target path.",
+    "description": "Discover built-in defaults, bounded automatic project facts, Codex-compatible global/root-to-target instruction precedence, progressively disclosed local skills, explicit commands, and safe automatic package-script command aliases for a target path.",
     "availability": "always",
     "annotations": {
       "readOnlyHint": true,
@@ -1001,7 +1207,7 @@
   {
     "name": "list_local_commands",
     "title": "List registered local commands",
-    "description": "List commands registered by hierarchical .machine-bridge/agent.json manifests for the selected target path.",
+    "description": "List effective direct-argv commands from project manifests and safe automatic package-script aliases, including provenance and timeout limits.",
     "availability": "always",
     "annotations": {
       "readOnlyHint": true,
@@ -1024,7 +1230,7 @@
   {
     "name": "run_local_command",
     "title": "Run registered local command",
-    "description": "Execute a named command registered in .machine-bridge/agent.json as a direct argv process without shell parsing. Manifest timeout and argument policy remain authoritative.",
+    "description": "Run an effective manifest or automatic package-script command through its fixed argv, cwd, timeout ceiling, and extra-argument policy.",
     "availability": "direct-exec",
     "annotations": {
       "readOnlyHint": false,

package/src/worker/index.ts

@@ -3,7 +3,7 @@ import toolCatalog from "../shared/tool-catalog.json";
 import serverMetadata from "../shared/server-metadata.json";
 
 const SERVER_NAME = String(serverMetadata.name);
-const SERVER_VERSION = "0.12.2";
+const SERVER_VERSION = "0.14.0";
 const MCP_PROTOCOL_VERSION = String(serverMetadata.protocolVersion);
 const MCP_SUPPORTED_PROTOCOL_VERSIONS = serverMetadata.supportedProtocolVersions.map((value) => String(value));
 const JSONRPC_VERSION = "2.0";
@@ -817,6 +817,7 @@ export class BridgeRoom extends DurableObject<BridgeEnv> {
       client.last_used_at = now;
 
       const code = randomToken("mcp_code");
+      const redirectLocation = authorizationRedirectLocation(redirectUri, code, state);
       store.codes[code] = {
         client_id: clientId,
         redirect_uri: redirectUri,
@@ -829,9 +830,7 @@ export class BridgeRoom extends DurableObject<BridgeEnv> {
       pruneRecordByExpiry(store.codes, MAX_OAUTH_CODES);
       await this.ctx.storage.put("oauth", store);
 
-      const params = new URLSearchParams({ code });
-      if (state) params.set("state", state);
-      return oauthRedirect(`${redirectUri}${redirectUri.includes("?") ? "&" : "?"}${params.toString()}`);
+      return oauthRedirect(redirectLocation);
     });
   }
 
@@ -996,11 +995,11 @@ function methodNotAllowed(allow: string): Response {
   });
 }
 
-function oauthRedirect(location: string): Response {
+function oauthRedirect(location: URL): Response {
   return new Response(null, {
-    status: 302,
+    status: 303,
     headers: {
-      location,
+      location: location.href,
       "cache-control": "no-store",
       "referrer-policy": "no-referrer",
       "x-content-type-options": "nosniff",
@@ -1008,6 +1007,13 @@ function oauthRedirect(location: string): Response {
   });
 }
 
+function authorizationRedirectLocation(redirectUri: string, code: string, state: string): URL {
+  const location = new URL(redirectUri);
+  location.searchParams.append("code", code);
+  if (state) location.searchParams.append("state", state);
+  return location;
+}
+
 function isFreshDaemonCandidate(connectedAt: string): boolean {
   const timestamp = Date.parse(connectedAt);
   if (!Number.isFinite(timestamp)) return false;
@@ -1187,7 +1193,7 @@ function daemonToolTimeoutMs(name: string, args: Record<string, unknown>): numbe
   const configurable = new Set([
     "exec_command", "run_process", "run_local_command", "open_local_application",
     "inspect_local_application", "operate_local_application", "browser_list_tabs",
-    "browser_get_source", "browser_inspect_page", "browser_action", "browser_fill_form",
+    "browser_manage_tabs", "browser_wait", "browser_get_source", "browser_inspect_page", "browser_action", "browser_fill_form",
     "browser_screenshot", "browser_upload_files",
   ]);
   if (!configurable.has(name)) return 60_000;