@probelabs/probe 0.6.0-rc235 → 0.6.0-rc236

package/build/agent/ProbeAgent.js

@@ -839,7 +839,12 @@ export class ProbeAgent {
       delegationManager: this.delegationManager,  // Per-instance delegation limits
       outputBuffer: this._outputBuffer,
       concurrencyLimiter: this.concurrencyLimiter,  // Global AI concurrency limiter
-      isToolAllowed
+      isToolAllowed,
+      // Lazy MCP getters — MCP is initialized after tools are created, so we use
+      // getter functions that resolve at call-time to get the current MCP state
+      getMcpBridge: () => this.mcpBridge,
+      getMcpTools: () => this.mcpBridge?.mcpTools || {},
+      isMcpToolAllowed: (toolName) => this._isMcpToolAllowed(toolName),
     };
 
     // Create base tools

package/build/agent/index.js

@@ -10508,7 +10508,12 @@ var init_vercel = __esm({
             if (outline) {
               extractOptions.format = "xml";
             }
-            return await extract(extractOptions);
+            const extractResult = await extract(extractOptions);
+            if (resolutionBase && typeof extractResult === "string") {
+              const wsPrefix = resolutionBase.endsWith("/") ? resolutionBase : resolutionBase + "/";
+              return extractResult.split(wsPrefix).join("");
+            }
+            return extractResult;
           } catch (error) {
             console.error("Delegated search failed, falling back to raw search:", error);
             try {
@@ -28898,25 +28903,56 @@ function createExecutePlanTool(options) {
   const tracer = options.tracer || null;
   const sessionStore = options.sessionStore || {};
   const outputBuffer = options.outputBuffer || null;
-  if (options.toolImplementations) {
-    runtimeOptions = { ...options, tracer, sessionStore, outputBuffer };
-    llmCallFn = options.llmCall;
-  } else {
-    llmCallFn = buildLLMCall(options);
-    runtimeOptions = {
-      toolImplementations: buildToolImplementations(options),
-      llmCall: llmCallFn,
-      mcpBridge: options.mcpBridge || null,
-      mcpTools: options.mcpTools || {},
-      mapConcurrency: options.mapConcurrency || 5,
-      timeoutMs: options.timeoutMs || 3e5,
-      maxLoopIterations: options.maxLoopIterations || 5e3,
-      tracer,
-      sessionStore,
-      outputBuffer
-    };
+  const getMcpBridge = options.getMcpBridge || (() => options.mcpBridge || null);
+  const getMcpTools = options.getMcpTools || (() => options.mcpTools || {});
+  const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
+  let cachedMcpBridge = null;
+  let runtime = null;
+  function buildRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    const currentMcpTools = getMcpTools();
+    const filteredMcpTools = {};
+    for (const [name, tool5] of Object.entries(currentMcpTools)) {
+      if (isMcpToolAllowed(name)) {
+        filteredMcpTools[name] = tool5;
+      }
+    }
+    if (options.toolImplementations) {
+      runtimeOptions = {
+        ...options,
+        tracer,
+        sessionStore,
+        outputBuffer,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools
+      };
+      llmCallFn = options.llmCall;
+    } else {
+      llmCallFn = llmCallFn || buildLLMCall(options);
+      runtimeOptions = {
+        toolImplementations: buildToolImplementations(options),
+        llmCall: llmCallFn,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+        mapConcurrency: options.mapConcurrency || 5,
+        timeoutMs: options.timeoutMs || 3e5,
+        maxLoopIterations: options.maxLoopIterations || 5e3,
+        tracer,
+        sessionStore,
+        outputBuffer
+      };
+    }
+    cachedMcpBridge = currentMcpBridge;
+    runtime = createDSLRuntime(runtimeOptions);
+    return runtime;
+  }
+  function getRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    if (!runtime || cachedMcpBridge !== currentMcpBridge) {
+      buildRuntime();
+    }
+    return runtime;
   }
-  const runtime = createDSLRuntime(runtimeOptions);
   const maxRetries = options.maxRetries ?? 2;
   return tool4({
     description: "Execute a JavaScript DSL program to orchestrate tool calls. Use for batch processing, paginated APIs, multi-step workflows where intermediate data is large. Write simple synchronous-looking code \u2014 do NOT use async/await.",
@@ -28982,7 +29018,7 @@ Original error: ${lastError}`;
               return finalOutput;
             }
           }
-          const result = await runtime.execute(currentCode, description);
+          const result = await getRuntime().execute(currentCode, description);
           if (result.status === "success") {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
             planSpan?.setAttributes?.({
@@ -81422,7 +81458,12 @@ var init_ProbeAgent = __esm({
           outputBuffer: this._outputBuffer,
           concurrencyLimiter: this.concurrencyLimiter,
           // Global AI concurrency limiter
-          isToolAllowed
+          isToolAllowed,
+          // Lazy MCP getters — MCP is initialized after tools are created, so we use
+          // getter functions that resolve at call-time to get the current MCP state
+          getMcpBridge: () => this.mcpBridge,
+          getMcpTools: () => this.mcpBridge?.mcpTools || {},
+          isMcpToolAllowed: (toolName) => this._isMcpToolAllowed(toolName)
         };
         const baseTools = createTools(configOptions);
         const wrappedTools = createWrappedTools(baseTools);

package/build/tools/executePlan.js

@@ -175,28 +175,77 @@ export function createExecutePlanTool(options) {
   // Output buffer for direct-to-user content (bypasses LLM context window)
   const outputBuffer = options.outputBuffer || null;
 
-  if (options.toolImplementations) {
-    // Direct DSL options — used by tests and manual scripts
-    runtimeOptions = { ...options, tracer, sessionStore, outputBuffer };
-    llmCallFn = options.llmCall;
-  } else {
-    // Agent configOptions — build everything from the agent's config
-    llmCallFn = buildLLMCall(options);
-    runtimeOptions = {
-      toolImplementations: buildToolImplementations(options),
-      llmCall: llmCallFn,
-      mcpBridge: options.mcpBridge || null,
-      mcpTools: options.mcpTools || {},
-      mapConcurrency: options.mapConcurrency || 5,
-      timeoutMs: options.timeoutMs || 300000,
-      maxLoopIterations: options.maxLoopIterations || 5000,
-      tracer,
-      sessionStore,
-      outputBuffer,
-    };
+  // Lazy MCP getters — when using agent configOptions, MCP may be initialized after
+  // this tool is created. We use getters to resolve MCP state at execution time.
+  const getMcpBridge = options.getMcpBridge || (() => options.mcpBridge || null);
+  const getMcpTools = options.getMcpTools || (() => options.mcpTools || {});
+  const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
+
+  // Track which MCP bridge the current runtime was built with
+  let cachedMcpBridge = null;
+  let runtime = null;
+
+  /**
+   * Build or rebuild the DSL runtime.
+   * Called lazily on first execute() and when MCP bridge changes.
+   */
+  function buildRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    const currentMcpTools = getMcpTools();
+
+    // Filter MCP tools through allowedTools
+    const filteredMcpTools = {};
+    for (const [name, tool] of Object.entries(currentMcpTools)) {
+      if (isMcpToolAllowed(name)) {
+        filteredMcpTools[name] = tool;
+      }
+    }
+
+    if (options.toolImplementations) {
+      // Direct DSL options — used by tests and manual scripts
+      runtimeOptions = {
+        ...options,
+        tracer,
+        sessionStore,
+        outputBuffer,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+      };
+      llmCallFn = options.llmCall;
+    } else {
+      // Agent configOptions — build everything from the agent's config
+      llmCallFn = llmCallFn || buildLLMCall(options);
+      runtimeOptions = {
+        toolImplementations: buildToolImplementations(options),
+        llmCall: llmCallFn,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+        mapConcurrency: options.mapConcurrency || 5,
+        timeoutMs: options.timeoutMs || 300000,
+        maxLoopIterations: options.maxLoopIterations || 5000,
+        tracer,
+        sessionStore,
+        outputBuffer,
+      };
+    }
+
+    cachedMcpBridge = currentMcpBridge;
+    runtime = createDSLRuntime(runtimeOptions);
+    return runtime;
+  }
+
+  /**
+   * Get or rebuild the runtime if MCP state has changed.
+   */
+  function getRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    // Rebuild runtime if MCP bridge changed (null -> bridge, or different bridge)
+    if (!runtime || cachedMcpBridge !== currentMcpBridge) {
+      buildRuntime();
+    }
+    return runtime;
   }
 
-  const runtime = createDSLRuntime(runtimeOptions);
   const maxRetries = options.maxRetries ?? 2;
 
   return tool({
@@ -272,7 +321,7 @@ RULES REMINDER:
             }
           }
 
-          const result = await runtime.execute(currentCode, description);
+          const result = await getRuntime().execute(currentCode, description);
 
           if (result.status === 'success') {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);

package/build/tools/vercel.js

@@ -283,7 +283,15 @@ export const searchTool = (options = {}) => {
 					extractOptions.format = 'xml';
 				}
 
-				return await extract(extractOptions);
+				const extractResult = await extract(extractOptions);
+
+				// Strip workspace root prefix from extract output so paths are relative
+				if (resolutionBase && typeof extractResult === 'string') {
+					const wsPrefix = resolutionBase.endsWith('/') ? resolutionBase : resolutionBase + '/';
+					return extractResult.split(wsPrefix).join('');
+				}
+
+				return extractResult;
 			} catch (error) {
 				console.error('Delegated search failed, falling back to raw search:', error);
 				try {

package/cjs/agent/ProbeAgent.cjs

@@ -37619,7 +37619,12 @@ var init_vercel = __esm({
             if (outline) {
               extractOptions.format = "xml";
             }
-            return await extract(extractOptions);
+            const extractResult = await extract(extractOptions);
+            if (resolutionBase && typeof extractResult === "string") {
+              const wsPrefix = resolutionBase.endsWith("/") ? resolutionBase : resolutionBase + "/";
+              return extractResult.split(wsPrefix).join("");
+            }
+            return extractResult;
           } catch (error2) {
             console.error("Delegated search failed, falling back to raw search:", error2);
             try {
@@ -56009,25 +56014,56 @@ function createExecutePlanTool(options) {
   const tracer = options.tracer || null;
   const sessionStore = options.sessionStore || {};
   const outputBuffer = options.outputBuffer || null;
-  if (options.toolImplementations) {
-    runtimeOptions = { ...options, tracer, sessionStore, outputBuffer };
-    llmCallFn = options.llmCall;
-  } else {
-    llmCallFn = buildLLMCall(options);
-    runtimeOptions = {
-      toolImplementations: buildToolImplementations(options),
-      llmCall: llmCallFn,
-      mcpBridge: options.mcpBridge || null,
-      mcpTools: options.mcpTools || {},
-      mapConcurrency: options.mapConcurrency || 5,
-      timeoutMs: options.timeoutMs || 3e5,
-      maxLoopIterations: options.maxLoopIterations || 5e3,
-      tracer,
-      sessionStore,
-      outputBuffer
-    };
+  const getMcpBridge = options.getMcpBridge || (() => options.mcpBridge || null);
+  const getMcpTools = options.getMcpTools || (() => options.mcpTools || {});
+  const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
+  let cachedMcpBridge = null;
+  let runtime = null;
+  function buildRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    const currentMcpTools = getMcpTools();
+    const filteredMcpTools = {};
+    for (const [name14, tool5] of Object.entries(currentMcpTools)) {
+      if (isMcpToolAllowed(name14)) {
+        filteredMcpTools[name14] = tool5;
+      }
+    }
+    if (options.toolImplementations) {
+      runtimeOptions = {
+        ...options,
+        tracer,
+        sessionStore,
+        outputBuffer,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools
+      };
+      llmCallFn = options.llmCall;
+    } else {
+      llmCallFn = llmCallFn || buildLLMCall(options);
+      runtimeOptions = {
+        toolImplementations: buildToolImplementations(options),
+        llmCall: llmCallFn,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+        mapConcurrency: options.mapConcurrency || 5,
+        timeoutMs: options.timeoutMs || 3e5,
+        maxLoopIterations: options.maxLoopIterations || 5e3,
+        tracer,
+        sessionStore,
+        outputBuffer
+      };
+    }
+    cachedMcpBridge = currentMcpBridge;
+    runtime = createDSLRuntime(runtimeOptions);
+    return runtime;
+  }
+  function getRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    if (!runtime || cachedMcpBridge !== currentMcpBridge) {
+      buildRuntime();
+    }
+    return runtime;
   }
-  const runtime = createDSLRuntime(runtimeOptions);
   const maxRetries = options.maxRetries ?? 2;
   return (0, import_ai4.tool)({
     description: "Execute a JavaScript DSL program to orchestrate tool calls. Use for batch processing, paginated APIs, multi-step workflows where intermediate data is large. Write simple synchronous-looking code \u2014 do NOT use async/await.",
@@ -56093,7 +56129,7 @@ Original error: ${lastError}`;
               return finalOutput;
             }
           }
-          const result = await runtime.execute(currentCode, description);
+          const result = await getRuntime().execute(currentCode, description);
           if (result.status === "success") {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
             planSpan?.setAttributes?.({
@@ -108100,7 +108136,12 @@ var init_ProbeAgent = __esm({
           outputBuffer: this._outputBuffer,
           concurrencyLimiter: this.concurrencyLimiter,
           // Global AI concurrency limiter
-          isToolAllowed
+          isToolAllowed,
+          // Lazy MCP getters — MCP is initialized after tools are created, so we use
+          // getter functions that resolve at call-time to get the current MCP state
+          getMcpBridge: () => this.mcpBridge,
+          getMcpTools: () => this.mcpBridge?.mcpTools || {},
+          isMcpToolAllowed: (toolName) => this._isMcpToolAllowed(toolName)
         };
         const baseTools = createTools(configOptions);
         const wrappedTools = createWrappedTools(baseTools);

package/cjs/index.cjs

@@ -94428,7 +94428,12 @@ var init_ProbeAgent = __esm({
           outputBuffer: this._outputBuffer,
           concurrencyLimiter: this.concurrencyLimiter,
           // Global AI concurrency limiter
-          isToolAllowed
+          isToolAllowed,
+          // Lazy MCP getters — MCP is initialized after tools are created, so we use
+          // getter functions that resolve at call-time to get the current MCP state
+          getMcpBridge: () => this.mcpBridge,
+          getMcpTools: () => this.mcpBridge?.mcpTools || {},
+          isMcpToolAllowed: (toolName) => this._isMcpToolAllowed(toolName)
         };
         const baseTools = createTools(configOptions);
         const wrappedTools = createWrappedTools(baseTools);
@@ -98909,7 +98914,12 @@ var init_vercel = __esm({
             if (outline) {
               extractOptions.format = "xml";
             }
-            return await extract(extractOptions);
+            const extractResult = await extract(extractOptions);
+            if (resolutionBase && typeof extractResult === "string") {
+              const wsPrefix = resolutionBase.endsWith("/") ? resolutionBase : resolutionBase + "/";
+              return extractResult.split(wsPrefix).join("");
+            }
+            return extractResult;
           } catch (error2) {
             console.error("Delegated search failed, falling back to raw search:", error2);
             try {
@@ -110696,25 +110706,56 @@ function createExecutePlanTool(options) {
   const tracer = options.tracer || null;
   const sessionStore = options.sessionStore || {};
   const outputBuffer = options.outputBuffer || null;
-  if (options.toolImplementations) {
-    runtimeOptions = { ...options, tracer, sessionStore, outputBuffer };
-    llmCallFn = options.llmCall;
-  } else {
-    llmCallFn = buildLLMCall(options);
-    runtimeOptions = {
-      toolImplementations: buildToolImplementations(options),
-      llmCall: llmCallFn,
-      mcpBridge: options.mcpBridge || null,
-      mcpTools: options.mcpTools || {},
-      mapConcurrency: options.mapConcurrency || 5,
-      timeoutMs: options.timeoutMs || 3e5,
-      maxLoopIterations: options.maxLoopIterations || 5e3,
-      tracer,
-      sessionStore,
-      outputBuffer
-    };
+  const getMcpBridge = options.getMcpBridge || (() => options.mcpBridge || null);
+  const getMcpTools = options.getMcpTools || (() => options.mcpTools || {});
+  const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
+  let cachedMcpBridge = null;
+  let runtime = null;
+  function buildRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    const currentMcpTools = getMcpTools();
+    const filteredMcpTools = {};
+    for (const [name14, tool5] of Object.entries(currentMcpTools)) {
+      if (isMcpToolAllowed(name14)) {
+        filteredMcpTools[name14] = tool5;
+      }
+    }
+    if (options.toolImplementations) {
+      runtimeOptions = {
+        ...options,
+        tracer,
+        sessionStore,
+        outputBuffer,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools
+      };
+      llmCallFn = options.llmCall;
+    } else {
+      llmCallFn = llmCallFn || buildLLMCall(options);
+      runtimeOptions = {
+        toolImplementations: buildToolImplementations(options),
+        llmCall: llmCallFn,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+        mapConcurrency: options.mapConcurrency || 5,
+        timeoutMs: options.timeoutMs || 3e5,
+        maxLoopIterations: options.maxLoopIterations || 5e3,
+        tracer,
+        sessionStore,
+        outputBuffer
+      };
+    }
+    cachedMcpBridge = currentMcpBridge;
+    runtime = createDSLRuntime(runtimeOptions);
+    return runtime;
+  }
+  function getRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    if (!runtime || cachedMcpBridge !== currentMcpBridge) {
+      buildRuntime();
+    }
+    return runtime;
   }
-  const runtime = createDSLRuntime(runtimeOptions);
   const maxRetries = options.maxRetries ?? 2;
   return (0, import_ai6.tool)({
     description: "Execute a JavaScript DSL program to orchestrate tool calls. Use for batch processing, paginated APIs, multi-step workflows where intermediate data is large. Write simple synchronous-looking code \u2014 do NOT use async/await.",
@@ -110780,7 +110821,7 @@ Original error: ${lastError}`;
               return finalOutput;
             }
           }
-          const result = await runtime.execute(currentCode, description);
+          const result = await getRuntime().execute(currentCode, description);
           if (result.status === "success") {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
             planSpan?.setAttributes?.({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc235",
+  "version": "0.6.0-rc236",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/ProbeAgent.js

@@ -839,7 +839,12 @@ export class ProbeAgent {
       delegationManager: this.delegationManager,  // Per-instance delegation limits
       outputBuffer: this._outputBuffer,
       concurrencyLimiter: this.concurrencyLimiter,  // Global AI concurrency limiter
-      isToolAllowed
+      isToolAllowed,
+      // Lazy MCP getters — MCP is initialized after tools are created, so we use
+      // getter functions that resolve at call-time to get the current MCP state
+      getMcpBridge: () => this.mcpBridge,
+      getMcpTools: () => this.mcpBridge?.mcpTools || {},
+      isMcpToolAllowed: (toolName) => this._isMcpToolAllowed(toolName),
     };
 
     // Create base tools

package/src/tools/executePlan.js

@@ -175,28 +175,77 @@ export function createExecutePlanTool(options) {
   // Output buffer for direct-to-user content (bypasses LLM context window)
   const outputBuffer = options.outputBuffer || null;
 
-  if (options.toolImplementations) {
-    // Direct DSL options — used by tests and manual scripts
-    runtimeOptions = { ...options, tracer, sessionStore, outputBuffer };
-    llmCallFn = options.llmCall;
-  } else {
-    // Agent configOptions — build everything from the agent's config
-    llmCallFn = buildLLMCall(options);
-    runtimeOptions = {
-      toolImplementations: buildToolImplementations(options),
-      llmCall: llmCallFn,
-      mcpBridge: options.mcpBridge || null,
-      mcpTools: options.mcpTools || {},
-      mapConcurrency: options.mapConcurrency || 5,
-      timeoutMs: options.timeoutMs || 300000,
-      maxLoopIterations: options.maxLoopIterations || 5000,
-      tracer,
-      sessionStore,
-      outputBuffer,
-    };
+  // Lazy MCP getters — when using agent configOptions, MCP may be initialized after
+  // this tool is created. We use getters to resolve MCP state at execution time.
+  const getMcpBridge = options.getMcpBridge || (() => options.mcpBridge || null);
+  const getMcpTools = options.getMcpTools || (() => options.mcpTools || {});
+  const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
+
+  // Track which MCP bridge the current runtime was built with
+  let cachedMcpBridge = null;
+  let runtime = null;
+
+  /**
+   * Build or rebuild the DSL runtime.
+   * Called lazily on first execute() and when MCP bridge changes.
+   */
+  function buildRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    const currentMcpTools = getMcpTools();
+
+    // Filter MCP tools through allowedTools
+    const filteredMcpTools = {};
+    for (const [name, tool] of Object.entries(currentMcpTools)) {
+      if (isMcpToolAllowed(name)) {
+        filteredMcpTools[name] = tool;
+      }
+    }
+
+    if (options.toolImplementations) {
+      // Direct DSL options — used by tests and manual scripts
+      runtimeOptions = {
+        ...options,
+        tracer,
+        sessionStore,
+        outputBuffer,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+      };
+      llmCallFn = options.llmCall;
+    } else {
+      // Agent configOptions — build everything from the agent's config
+      llmCallFn = llmCallFn || buildLLMCall(options);
+      runtimeOptions = {
+        toolImplementations: buildToolImplementations(options),
+        llmCall: llmCallFn,
+        mcpBridge: currentMcpBridge,
+        mcpTools: filteredMcpTools,
+        mapConcurrency: options.mapConcurrency || 5,
+        timeoutMs: options.timeoutMs || 300000,
+        maxLoopIterations: options.maxLoopIterations || 5000,
+        tracer,
+        sessionStore,
+        outputBuffer,
+      };
+    }
+
+    cachedMcpBridge = currentMcpBridge;
+    runtime = createDSLRuntime(runtimeOptions);
+    return runtime;
+  }
+
+  /**
+   * Get or rebuild the runtime if MCP state has changed.
+   */
+  function getRuntime() {
+    const currentMcpBridge = getMcpBridge();
+    // Rebuild runtime if MCP bridge changed (null -> bridge, or different bridge)
+    if (!runtime || cachedMcpBridge !== currentMcpBridge) {
+      buildRuntime();
+    }
+    return runtime;
   }
 
-  const runtime = createDSLRuntime(runtimeOptions);
   const maxRetries = options.maxRetries ?? 2;
 
   return tool({
@@ -272,7 +321,7 @@ RULES REMINDER:
             }
           }
 
-          const result = await runtime.execute(currentCode, description);
+          const result = await getRuntime().execute(currentCode, description);
 
           if (result.status === 'success') {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);

package/src/tools/vercel.js

@@ -283,7 +283,15 @@ export const searchTool = (options = {}) => {
 					extractOptions.format = 'xml';
 				}
 
-				return await extract(extractOptions);
+				const extractResult = await extract(extractOptions);
+
+				// Strip workspace root prefix from extract output so paths are relative
+				if (resolutionBase && typeof extractResult === 'string') {
+					const wsPrefix = resolutionBase.endsWith('/') ? resolutionBase : resolutionBase + '/';
+					return extractResult.split(wsPrefix).join('');
+				}
+
+				return extractResult;
 			} catch (error) {
 				console.error('Delegated search failed, falling back to raw search:', error);
 				try {