@particle-academy/agent-integrations 0.50.0 → 0.52.0

package/dist/index.cjs

@@ -60,13 +60,23 @@ var ToolRegistry = class {
      */
     this.withdrawn = /* @__PURE__ */ new Set();
   }
-  registerTool(definition, handler) {
-    this.tools.set(definition.name, { definition, handler });
-    this.withdrawn.delete(definition.name);
+  registerTool(definition, handler, options = {}) {
+    const name = definition.name;
+    const { owner, replace = false } = options;
+    const held = this.tools.get(name);
+    if (held && !replace && (owner === void 0 || held.owner !== owner)) {
+      throw new Error(
+        `Tool "${name}" is already registered by ${describeOwner(held.owner)}; ${describeOwner(owner)} cannot register it too. Two registrants for one name would leave the first one listed but unreachable. Give one of them a different tool name, dispose the first registration, or pass { replace: true } to take the name over deliberately.`
+      );
+    }
+    const record = owner === void 0 ? { definition, handler } : { definition, handler, owner };
+    this.tools.set(name, record);
+    this.withdrawn.delete(name);
     this.onToolsChanged();
     return () => {
-      if (this.tools.delete(definition.name)) {
-        this.withdrawn.add(definition.name);
+      if (this.tools.get(name) === record) {
+        this.tools.delete(name);
+        this.withdrawn.add(name);
         this.onToolsChanged();
       }
     };
@@ -95,6 +105,9 @@ var ToolRegistry = class {
   onToolsChanged() {
   }
 };
+function describeOwner(owner) {
+  return owner === void 0 ? "an unnamed registrant (pass { owner } to registerTool to identify it)" : `"${owner}"`;
+}
 
 // src/mcp/server.ts
 var MicroMcpServer = class extends ToolRegistry {
@@ -434,7 +447,7 @@ function registerTuiBridge(host, options) {
       } catch (error) {
         return errorResult(error instanceof Error ? error.message : String(error));
       }
-    }));
+    }, { owner: "tui" }));
   };
   const publish = async (surfaceId, type, payload, actor = defaultActor, priority = "normal") => options.eventStore.append({ appId: options.appId, sessionId: options.sessionId, surfaceId, type, payload, actor, priority });
   register("tui_surfaces_list", "List addressable Fancy TUI surfaces and commands.", {}, [], () => options.registry.list().map((surface) => ({ id: surface.id, kind: surface.kind, label: surface.label, commands: surface.commands?.map((command) => ({ name: command.name, description: command.description, policy: command.policy ?? "execute", inputSchema: command.inputSchema })) ?? [] })));
@@ -514,6 +527,7 @@ function registerTuiBridge(host, options) {
 
 // src/undo/undo-tools.ts
 var installedHosts = /* @__PURE__ */ new WeakSet();
+var UNDO_TOOLS_OWNER = "agent-undo";
 function ensureUndoToolsRegistered(host, options = {}) {
   if (installedHosts.has(host)) return;
   installedHosts.add(host);
@@ -538,7 +552,8 @@ function registerUndoTools(host, options = {}) {
         const entry = await fancyAutoCommon.undoOne(agentOf(args));
         if (!entry) return errorResult("Nothing to undo.");
         return textResult(`Undid: ${entry.label}`, { entry: serialize(entry) });
-      }
+      },
+      { owner: UNDO_TOOLS_OWNER }
     )
   );
   disposers.push(
@@ -556,7 +571,8 @@ function registerUndoTools(host, options = {}) {
         const entry = await fancyAutoCommon.redoOne(agentOf(args));
         if (!entry) return errorResult("Nothing to redo.");
         return textResult(`Redid: ${entry.label}`, { entry: serialize(entry) });
-      }
+      },
+      { owner: UNDO_TOOLS_OWNER }
     )
   );
   disposers.push(
@@ -574,7 +590,8 @@ function registerUndoTools(host, options = {}) {
         const history = fancyAutoCommon.readHistory(agentOf(args)).map(serialize);
         const text = history.map((e) => `${new Date(e.timestamp).toISOString()} ${e.bridgeId} ${e.action}: ${e.label}`).join("\n");
         return textResult(text || "(empty)", history);
-      }
+      },
+      { owner: UNDO_TOOLS_OWNER }
     )
   );
   return () => disposers.forEach((d) => d());
@@ -588,6 +605,34 @@ function serialize(entry) {
   };
 }
 
+// src/bridges/forms.ts
+init_registry();
+
+// src/bridges/host-commit.ts
+function hostErrorMessage(e, fallback) {
+  let msg;
+  if (e instanceof Error) msg = e.message;
+  else if (typeof e === "string") msg = e;
+  else if (e && typeof e === "object" && typeof e.message === "string") {
+    msg = e.message;
+  }
+  const firstFrame = msg ? msg.search(/\n\s+at\s/) : -1;
+  if (msg && firstFrame >= 0) msg = msg.slice(0, firstFrame);
+  msg = msg?.trim();
+  return msg ? msg : fallback;
+}
+async function commit(run, fallback) {
+  try {
+    const r = await run();
+    if (r && typeof r === "object" && r.ok === false) {
+      return { ok: false, error: hostErrorMessage(r.error, fallback) };
+    }
+    return { ok: true };
+  } catch (e) {
+    return { ok: false, error: hostErrorMessage(e, fallback) };
+  }
+}
+
 // src/bridges/forms.ts
 var DEFAULT_AGENT = { id: "agent", name: "Agent", color: "#a855f7" };
 function registerFormBridge(host, options) {
@@ -595,8 +640,36 @@ function registerFormBridge(host, options) {
   const agent = { ...DEFAULT_AGENT, ...options.agent ?? {} };
   const pendingMode = options.pendingMode ?? true;
   const disposers = [];
+  const bridgeId = `form:${adapter.id}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const formId = adapter.id;
+  let disposed = false;
+  const onDispose = /* @__PURE__ */ new Set();
+  const CLOSED = /* @__PURE__ */ Symbol("form-closed");
+  const untilClosed = (p) => {
+    if (disposed) {
+      p.catch(() => {
+      });
+      return Promise.resolve(CLOSED);
+    }
+    return new Promise((resolve, reject) => {
+      const close = () => resolve(CLOSED);
+      onDispose.add(close);
+      p.then(
+        (v) => {
+          onDispose.delete(close);
+          resolve(v);
+        },
+        (e) => {
+          onDispose.delete(close);
+          reject(e);
+        }
+      );
+    });
+  };
+  const closedUnknown = (what) => errorResult(
+    `Form "${formId}" was closed before the host confirmed ${what}, so whether it was applied is unknown. Do not assume it was. If the form is open again, read it back (form_get_values) before retrying.`
+  );
   const target = (args) => ({
     kind: "form",
     screenId: adapter.screenId,
@@ -608,7 +681,7 @@ function registerFormBridge(host, options) {
       try {
         return await handler(args);
       } catch (e) {
-        return errorResult(e instanceof Error ? e.message : String(e));
+        return errorResult(hostErrorMessage(e, `${name} failed.`));
       }
     };
     const final = isMutation ? wrapToolWithActivity(wrapped, {
@@ -625,7 +698,8 @@ function registerFormBridge(host, options) {
           description,
           inputSchema: { type: "object", properties, required, additionalProperties: false }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -675,11 +749,15 @@ function registerFormBridge(host, options) {
       value: { description: "Value to set. Type depends on the field's `type`." }
     },
     ["field", "value"],
-    (args) => {
+    async (args) => {
       const name = String(args.field ?? "");
       const fieldDef = adapter.getFields().find((f) => f.name === name);
       if (!fieldDef) return errorResult(`Unknown field: ${name}`);
-      adapter.setValue(name, args.value);
+      const done = await untilClosed(
+        commit(() => adapter.setValue(name, args.value), `Host refused the write to "${name}".`)
+      );
+      if (done === CLOSED) return closedUnknown(`the write to "${name}"`);
+      if (!done.ok) return errorResult(done.error);
       return textResult(`${name} \u2190 ${JSON.stringify(args.value)}`, { field: name, value: args.value });
     },
     true
@@ -689,16 +767,52 @@ function registerFormBridge(host, options) {
     "Set multiple fields atomically. Pass a `values` object keyed by field name.",
     { values: { type: "object" } },
     ["values"],
-    (args) => {
+    async (args) => {
       const values = args.values && typeof args.values === "object" ? args.values : {};
       const fields = adapter.getFields();
       const known = new Set(fields.map((f) => f.name));
       const unknownKeys = Object.keys(values).filter((k) => !known.has(k));
       if (unknownKeys.length) return errorResult(`Unknown fields: ${unknownKeys.join(", ")}`);
-      if (adapter.setValues) {
-        adapter.setValues(values);
+      const setValues = adapter.setValues;
+      if (setValues) {
+        const done = await untilClosed(commit(() => setValues(values), "Host refused the write."));
+        if (done === CLOSED) return closedUnknown("the write");
+        if (!done.ok) return errorResult(done.error);
       } else {
-        for (const [k, v] of Object.entries(values)) adapter.setValue(k, v);
+        const keys = Object.keys(values);
+        const committed = [];
+        for (const [i, k] of keys.entries()) {
+          const done = await untilClosed(
+            commit(() => adapter.setValue(k, values[k]), `Host refused the write to "${k}".`)
+          );
+          if (done === CLOSED) {
+            return {
+              ...closedUnknown(`the write to "${k}"`),
+              structuredContent: { committed, pending: k, notAttempted: keys.slice(i + 1) }
+            };
+          }
+          if (!done.ok) {
+            const state = { committed, failed: k, notAttempted: keys.slice(i + 1) };
+            if (committed.length) {
+              fancyAutoCommon.emitActivity({
+                agentId: agent.id,
+                agentName: agent.name,
+                agentColor: agent.color,
+                target: target({}),
+                action: "form_set_values",
+                timestamp: Date.now(),
+                meta: state
+              });
+            }
+            return {
+              ...errorResult(
+                `"${k}" was refused: ${done.error} ` + (committed.length ? `Already committed and NOT rolled back: ${committed.join(", ")}. ` : "Nothing was committed. ") + (state.notAttempted.length ? `Not attempted: ${state.notAttempted.join(", ")}.` : "")
+              ),
+              structuredContent: state
+            };
+          }
+          committed.push(k);
+        }
       }
       return textResult(`Set ${Object.keys(values).length} field(s)`, { values });
     },
@@ -728,25 +842,34 @@ function registerFormBridge(host, options) {
     async () => {
       if (!adapter.submit) return errorResult("Host did not provide a submit implementation.");
       if (pendingMode && adapter.confirm) {
-        const ok = await adapter.confirm({
+        const confirm = adapter.confirm;
+        const ok = await untilClosed(Promise.resolve().then(() => confirm({
           action: "submit",
           form: formId,
           title: adapter.title,
           values: adapter.getValues()
-        });
+        })));
+        if (ok === CLOSED) {
+          return errorResult(`Form "${formId}" was closed before the submit was confirmed. Nothing was submitted.`);
+        }
         if (!ok) return errorResult("Declined by user");
       }
-      const result = await adapter.submit();
-      if (!result.ok) return errorResult(result.error ?? "Submit failed");
+      const submit = adapter.submit;
+      const result = await untilClosed(Promise.resolve().then(() => submit()));
+      if (result === CLOSED) return closedUnknown("the submit");
+      if (!result.ok) return errorResult(hostErrorMessage(result.error, "Submit failed"));
       return textResult("Submitted", { values: result.values });
     },
     true
   );
   return {
-    id: `form:${formId}`,
+    id: bridgeId,
     title: adapter.title ?? formId,
     dispose: () => {
+      disposed = true;
       for (const d of disposers) d();
+      for (const close of [...onDispose]) close();
+      onDispose.clear();
     }
   };
 }
@@ -757,6 +880,7 @@ function registerSheetsBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT2, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = "sheets";
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (sheetId, address) => ({
     kind: "sheet",
@@ -786,7 +910,8 @@ function registerSheetsBridge(host, options) {
           description,
           inputSchema: { type: "object", properties, required, additionalProperties: false }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -966,7 +1091,7 @@ function registerSheetsBridge(host, options) {
     (args) => target(getSheetId(args), String(args.address ?? ""))
   );
   return {
-    id: "sheets",
+    id: bridgeId,
     title: "Sheets",
     dispose: () => {
       for (const d of disposers) d();
@@ -1105,6 +1230,7 @@ function registerCodeBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT3, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = `code:${adapter.id}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = {
     kind: "code",
@@ -1144,7 +1270,8 @@ function registerCodeBridge(host, options) {
           description,
           inputSchema: { type: "object", properties, required, additionalProperties: false }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -1292,7 +1419,7 @@ function registerCodeBridge(host, options) {
     false
   );
   return {
-    id: `code:${adapter.id}`,
+    id: bridgeId,
     title: adapter.title ?? adapter.id,
     dispose: () => {
       for (const d of disposers) d();
@@ -1306,6 +1433,7 @@ function registerChartsBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT4, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = `chart:${adapter.id}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = {
     kind: "chart",
@@ -1331,7 +1459,8 @@ function registerChartsBridge(host, options) {
     disposers.push(
       host.registerTool(
         { name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -1407,7 +1536,7 @@ function registerChartsBridge(host, options) {
     true
   );
   return {
-    id: `chart:${adapter.id}`,
+    id: bridgeId,
     title: adapter.title ?? adapter.id,
     dispose: () => {
       for (const d of disposers) d();
@@ -1421,6 +1550,7 @@ function registerGridBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT5, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = `grid:${adapter.id}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (part) => ({
     kind: "grid",
@@ -1450,7 +1580,8 @@ function registerGridBridge(host, options) {
           description,
           inputSchema: { type: "object", properties, required, additionalProperties: false }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -1608,7 +1739,7 @@ function registerGridBridge(host, options) {
     );
   }
   return {
-    id: `grid:${adapter.id}`,
+    id: bridgeId,
     title: adapter.title ?? adapter.id,
     dispose: () => {
       for (const d of disposers) d();
@@ -1623,6 +1754,7 @@ function registerSceneBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT6, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = `scene:${adapter.id}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (objectId) => ({
     kind: "scene",
@@ -1648,7 +1780,8 @@ function registerSceneBridge(host, options) {
     disposers.push(
       host.registerTool(
         { name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -1801,7 +1934,7 @@ function registerSceneBridge(host, options) {
     true
   );
   return {
-    id: `scene:${adapter.id}`,
+    id: bridgeId,
     title: adapter.title ?? adapter.id,
     dispose: () => {
       for (const d of disposers) d();
@@ -1818,33 +1951,11 @@ function parseTriple(v) {
 // src/bridges/screens.ts
 init_registry();
 var DEFAULT_AGENT7 = { id: "agent", name: "Agent", color: "#a855f7" };
-function hostErrorMessage(e, fallback) {
-  let msg;
-  if (e instanceof Error) msg = e.message;
-  else if (typeof e === "string") msg = e;
-  else if (e && typeof e === "object" && typeof e.message === "string") {
-    msg = e.message;
-  }
-  const firstFrame = msg ? msg.search(/\n\s+at\s/) : -1;
-  if (msg && firstFrame >= 0) msg = msg.slice(0, firstFrame);
-  msg = msg?.trim();
-  return msg ? msg : fallback;
-}
-async function commit(run, fallback) {
-  try {
-    const r = await run();
-    if (r && typeof r === "object" && r.ok === false) {
-      return { ok: false, error: hostErrorMessage(r.error, fallback) };
-    }
-    return { ok: true };
-  } catch (e) {
-    return { ok: false, error: hostErrorMessage(e, fallback) };
-  }
-}
 function registerScreensBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT7, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = "screens";
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (screenId) => ({
     kind: "screens",
@@ -1868,7 +1979,8 @@ function registerScreensBridge(host, options) {
     disposers.push(
       host.registerTool(
         { name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -2037,7 +2149,7 @@ function registerScreensBridge(host, options) {
     (args) => target(String(args.screen ?? ""))
   );
   return {
-    id: "screens",
+    id: bridgeId,
     title: "Screens",
     dispose: () => {
       for (const d of disposers) d();
@@ -2051,6 +2163,7 @@ function registerSlidesBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT8, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = "slides";
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const deckTarget = () => ({
     kind: "deck",
@@ -2097,7 +2210,8 @@ function registerSlidesBridge(host, options) {
             additionalProperties: false
           }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -2462,7 +2576,7 @@ function registerSlidesBridge(host, options) {
     (args) => elementTarget(str(args?.slideId), str(args?.elementId))
   );
   return {
-    id: "slides",
+    id: bridgeId,
     title: "Slides",
     dispose: () => {
       for (const d of disposers.splice(0)) d();
@@ -2497,6 +2611,7 @@ function registerMapBridge(host, options) {
   const { adapter } = options;
   const agent = { ...DEFAULT_AGENT9, ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = "map";
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const mTarget = (args, result) => ({
     kind: "map",
@@ -2528,7 +2643,8 @@ function registerMapBridge(host, options) {
             additionalProperties: false
           }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -2807,7 +2923,7 @@ function registerMapBridge(host, options) {
     }
   );
   return {
-    id: "map",
+    id: bridgeId,
     title: "Map",
     dispose: () => {
       for (const d of disposers) d();
@@ -2819,6 +2935,7 @@ function registerMapBridge(host, options) {
 function registerGitBridge(host, options) {
   const agent = { id: "agent", name: "Agent", color: "#a855f7", ...options.agent ?? {} };
   const disposers = [];
+  const bridgeId = "git";
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const reg = (name, description, properties, required, handler, mutation2 = false) => {
     const wrapped = async (args) => {
@@ -2838,7 +2955,7 @@ function registerGitBridge(host, options) {
       name,
       description,
       inputSchema: { type: "object", properties, required, additionalProperties: false }
-    }, final));
+    }, final, { owner: bridgeId }));
   };
   reg("git_status", "Read normalized working-tree and branch status.", {}, [], async () => {
     const result = await options.adapter.status();
@@ -2899,7 +3016,7 @@ function registerGitBridge(host, options) {
     draft: { type: "boolean" },
     apply: { type: "boolean" }
   }, ["title", "sourceBranch", "targetBranch"]);
-  return { id: "git", title: "Git", dispose: () => disposers.forEach((dispose) => dispose()) };
+  return { id: bridgeId, title: "Git", dispose: () => disposers.forEach((dispose) => dispose()) };
 }
 
 // src/bridges/files.ts
@@ -2943,6 +3060,7 @@ function registerFilesBridge(host, options) {
   const agent = { ...DEFAULT_AGENT10, ...options.agent ?? {} };
   const pendingMode = options.pendingMode ?? true;
   const disposers = [];
+  const bridgeId = "files";
   const guard = (path) => {
     if (options.root !== void 0) assertPathWithinRoot(options.root, path);
     return path;
@@ -2978,7 +3096,8 @@ function registerFilesBridge(host, options) {
             additionalProperties: false
           }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -3168,7 +3287,7 @@ function registerFilesBridge(host, options) {
     fTarget
   );
   return {
-    id: "files",
+    id: bridgeId,
     title: "Files",
     dispose: () => {
       for (const d of disposers) d();
@@ -3184,6 +3303,7 @@ function registerTerminalBridge(host, options) {
   const pendingMode = options.pendingMode ?? true;
   const screenId = options.screenId ?? options.adapter?.screenId;
   const disposers = [];
+  const bridgeId = "terminal";
   const staged = /* @__PURE__ */ new Map();
   let seq = 0;
   ensureUndoToolsRegistered(host);
@@ -3250,7 +3370,8 @@ function registerTerminalBridge(host, options) {
           description,
           inputSchema: { type: "object", properties, required, additionalProperties: false }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -3447,7 +3568,7 @@ function registerTerminalBridge(host, options) {
     );
   }
   return {
-    id: "terminal",
+    id: bridgeId,
     title: "Terminal",
     dispose: () => {
       disposers.forEach((d) => d());
@@ -3492,6 +3613,7 @@ function registerNavigationBridge(host, options) {
   const agent = { ...DEFAULT_AGENT12, ...options.agent ?? {} };
   const pendingMode = options.pendingMode ?? true;
   const disposers = [];
+  const bridgeId = "navigation";
   let groundedRevision = null;
   const staleIntent = async () => {
     const current = await adapter.getRevision?.();
@@ -3535,7 +3657,8 @@ function registerNavigationBridge(host, options) {
           description,
           inputSchema: { type: "object", properties, required, additionalProperties: false }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -3771,7 +3894,7 @@ function registerNavigationBridge(host, options) {
     (args) => target(`Submit ${String(args.handle ?? "")}`, String(args.handle ?? ""))
   );
   return {
-    id: "navigation",
+    id: bridgeId,
     title: "Co-browsing",
     dispose: () => {
       for (const d of disposers) d();
@@ -3789,6 +3912,7 @@ function registerCatalogBridge(host, options) {
   const pendingMode = options.pendingMode ?? true;
   const catalogId = adapter.id ?? "catalog";
   const disposers = [];
+  const bridgeId = `catalog:${catalogId}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (elementId, label) => ({
     kind: "custom",
@@ -3814,7 +3938,8 @@ function registerCatalogBridge(host, options) {
     disposers.push(
       host.registerTool(
         { name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -4088,7 +4213,7 @@ function registerCatalogBridge(host, options) {
     (args) => target(str4(args.priceId), `checkout ${str4(args.priceId)}`)
   );
   return {
-    id: `catalog:${catalogId}`,
+    id: bridgeId,
     title: adapter.title ?? "Catalog",
     dispose: () => {
       for (const d of disposers.splice(0)) d();
@@ -4106,6 +4231,7 @@ function registerFeaturesBridge(host, options) {
   const pendingMode = options.pendingMode ?? true;
   const featuresId = adapter.id ?? "features";
   const disposers = [];
+  const bridgeId = `features:${featuresId}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (elementId, label) => ({
     kind: "custom",
@@ -4131,7 +4257,8 @@ function registerFeaturesBridge(host, options) {
     disposers.push(
       host.registerTool(
         { name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -4306,7 +4433,7 @@ function registerFeaturesBridge(host, options) {
     (args) => target(str5(args.feature), `consume ${str5(args.feature)}`)
   );
   return {
-    id: `features:${featuresId}`,
+    id: bridgeId,
     title: adapter.title ?? "Features",
     dispose: () => {
       for (const d of disposers.splice(0)) d();
@@ -4341,6 +4468,7 @@ function registerPasskeyBridge(host, options) {
   const agent = { ...DEFAULT_AGENT15, ...options.agent ?? {} };
   const surfaceId = adapter.id ?? "passkeys";
   const disposers = [];
+  const bridgeId = `passkeys:${surfaceId}`;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   const target = (elementId, label) => ({
     kind: "custom",
@@ -4375,7 +4503,8 @@ function registerPasskeyBridge(host, options) {
             additionalProperties: false
           }
         },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -4496,7 +4625,7 @@ function registerPasskeyBridge(host, options) {
     (args) => target(void 0, `begin enrollment${args.name ? ` (${str6(args.name)})` : ""}`)
   );
   return {
-    id: `passkeys:${surfaceId}`,
+    id: bridgeId,
     title: adapter.title ?? "Passkeys",
     dispose: () => {
       for (const d of disposers.splice(0)) d();
@@ -4512,6 +4641,7 @@ function registerDocBridge(host, options) {
   const makeNode = options.makeNode ?? (({ id, type, parent, order }, props) => ({ id, type, parent, order, props }));
   const describeNode = options.describeNode ?? ((n) => ({ id: n.id, type: n.type, parent: n.parent, props: Object.keys(n.props ?? {}) }));
   const disposers = [];
+  const bridgeId = surface;
   ensureUndoToolsRegistered(host, { defaultAgentId: agent.id });
   let idSeq = 0;
   const mintId = () => {
@@ -4572,7 +4702,8 @@ function registerDocBridge(host, options) {
     disposers.push(
       host.registerTool(
         { name, description, inputSchema: { type: "object", properties, required, additionalProperties: false } },
-        final
+        final,
+        { owner: bridgeId }
       )
     );
   };
@@ -4747,7 +4878,7 @@ function registerDocBridge(host, options) {
     false
   );
   return {
-    id: surface,
+    id: bridgeId,
     title: surface,
     dispose: () => {
       for (const d of disposers) d();
@@ -4900,7 +5031,9 @@ function registerScreenDocBridge(host, options) {
         authored.length ? `${authored.length} addressable, ${syntheticCount} positional` : `no addressable ids \u2014 all ${syntheticCount} nodes are positional`,
         { addressable: authored, syntheticCount }
       );
-    })
+    }),
+    // Same registrant as the doc bridge above, which registers under its surface.
+    { owner: surface }
   );
   return {
     id: surface,