omp-fabric 1.25.13 → 1.25.15

package/dist/index.js

@@ -72,7 +72,7 @@ import {
   resolveFabricIdentity,
   settleInPlacePrewalk,
   streamedToolCallName
-} from "./chunks/chunk-JJ6DFMCK.js";
+} from "./chunks/chunk-BD6FHI24.js";
 import "./chunks/chunk-7VIQNUPS.js";
 import {
   AgentTranscriptReader
@@ -583,6 +583,48 @@ var registerFabricActorHostEventObservers = (omp, observer) => {
   }
 };
 
+// src/capture/host-mcp-tools.ts
+var createHostMcpToolSource = () => {
+  let modules;
+  let cachedFrom;
+  let cached = [];
+  const current = () => {
+    try {
+      return modules?.instance()?.getTools() ?? [];
+    } catch {
+      return [];
+    }
+  };
+  return {
+    async load() {
+      if (modules) return;
+      try {
+        const [mcp, sdk] = await Promise.all([
+          import("@oh-my-pi/pi-coding-agent/mcp"),
+          import("@oh-my-pi/pi-coding-agent")
+        ]);
+        const manager = mcp.MCPManager;
+        const toDefinition = sdk.customToolToDefinition;
+        if (typeof manager?.instance === "function" && typeof toDefinition === "function") {
+          modules = { instance: () => manager.instance?.(), toDefinition };
+        }
+      } catch {
+        modules = void 0;
+      }
+    },
+    tools() {
+      const raw = current();
+      if (raw === cachedFrom) return cached;
+      cachedFrom = raw;
+      cached = modules ? raw.map((tool) => modules.toDefinition(tool)) : [];
+      return cached;
+    },
+    signature() {
+      return current().map((tool) => tool.name ?? "").join("\0");
+    }
+  };
+};
+
 // src/capture/interceptor.ts
 import { existsSync, readdirSync, readFileSync, realpathSync } from "node:fs";
 import path from "node:path";
@@ -734,7 +776,7 @@ var installRegisteredToolCapture = async (options) => {
       (tool) => tool.definition[ANCHOR_SYMBOL] === anchorToken || definitionDelegatesTo(tool.definition, options.anchorDefinition)
     );
     if (!anchor) return tools;
-    options.catalog.replace(tools, runner, policy, anchor.extensionPath);
+    options.catalog.replace(tools, runner, policy, anchor.extensionPath, options.hostMcpTools?.() ?? []);
     options.onCatalogRefresh?.();
     return tools;
   };
@@ -5652,14 +5694,24 @@ async function ompFabric(omp) {
     enabled: false,
     hideFromModel: false
   };
+  const hostMcpTools = createHostMcpToolSource();
+  await hostMcpTools.load();
+  let hostMcpSignature = "";
   const toolCapture = await installRegisteredToolCapture({
     anchorDefinition: fabricTool,
     catalog: capturedTools,
     initialPolicy: inactiveCapturePolicy,
+    hostMcpTools: () => {
+      hostMcpSignature = hostMcpTools.signature();
+      return hostMcpTools.tools();
+    },
     onCatalogRefresh: () => {
       scheduleOwnershipReassert();
     }
   });
+  const refreshHostMcpCapture = () => {
+    if (hostMcpTools.signature() !== hostMcpSignature) capturedTools.refresh();
+  };
   omp.registerTool(fabricTool);
   const applyFabricMode = () => {
     capturedTools.markResumed();
@@ -6067,6 +6119,7 @@ async function ompFabric(omp) {
   omp.on("before_agent_start", async (event, context) => {
     const fullCodeMode = state.cwd ? state.config.fullCodeMode : DEFAULT_FABRIC_CONFIG.fullCodeMode;
     const schemaMode = state.cwd ? state.config.schema.mode : DEFAULT_FABRIC_CONFIG.schema.mode;
+    refreshHostMcpCapture();
     reassertToolOwnership();
     const effectiveFullCodeMode = fullCodeMode || schemaMode === "enforce";
     if (!omp.getActiveTools().includes("fabric_exec")) return;