@mcpc-tech/cli 0.1.25 → 0.1.26

package/bin/mcpc.cjs

@@ -2372,19 +2372,9 @@ var Response2 = class _Response {
 });
 Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
-var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = import_crypto.default;
 }
-global.fetch = (info, init) => {
-  init = {
-    // Disable compression handling so people can return the result of a fetch
-    // directly in the loader without messing with the Content-Encoding header.
-    compress: false,
-    ...init
-  };
-  return webFetch(info, init);
-};
 var outgoingEnded = Symbol("outgoingEnded");
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
@@ -10212,7 +10202,16 @@ var MCPSamplingLanguageModel = class {
    * Generate a response using MCP's createMessage capability
    */
   async doGenerate(options) {
-    const messages = this.convertMessages(options.prompt);
+    const useNativeTools = this.supportsSamplingTools();
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Client supports native tools: ${useNativeTools}`
+    });
+    const messages = this.convertMessages(options.prompt, useNativeTools);
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Converted messages for MCP: ${JSON.stringify(messages)}`
+    });
     let systemPrompt;
     for (const msg of options.prompt) {
       if (msg.role === "system") {
@@ -10220,7 +10219,10 @@ var MCPSamplingLanguageModel = class {
         break;
       }
     }
-    const useNativeTools = this.supportsSamplingTools();
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Client supports native tools: ${useNativeTools}`
+    });
     systemPrompt = this.injectResponseFormatInstructions(systemPrompt, options.responseFormat, useNativeTools);
     systemPrompt = this.injectToolInstructions(systemPrompt, options.tools, useNativeTools);
     const createMessageParams = {
@@ -10234,8 +10236,34 @@ var MCPSamplingLanguageModel = class {
       createMessageParams.toolChoice = {
         mode: "auto"
       };
+      this.server.sendLoggingMessage({
+        level: "info",
+        data: `Converted ${options.tools.length} tools to MCP format: ${JSON.stringify(createMessageParams.tools?.map((t) => t.name))}`
+      });
+    } else if (options.tools && options.tools.length > 0) {
+      this.server.sendLoggingMessage({
+        level: "info",
+        data: `Tools provided but not using native mode - injecting into system prompt instead`
+      });
     }
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Calling createMessage with params: ${JSON.stringify({
+        hasSystemPrompt: !!systemPrompt,
+        hasTools: !!createMessageParams.tools,
+        toolCount: createMessageParams.tools?.length || 0,
+        createMessageParams
+      }, null, 2)}`
+    });
     const result = await this.server.createMessage(createMessageParams);
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `createMessage result: ${JSON.stringify({
+        contentType: result.content.type,
+        stopReason: result.stopReason,
+        text: result.content
+      })}`
+    });
     const content = [];
     if (useNativeTools) {
       const contentArray = Array.isArray(result.content) ? result.content : [
@@ -10353,8 +10381,52 @@ var MCPSamplingLanguageModel = class {
   /**
    * Convert AI SDK messages to MCP sampling format
    */
-  convertMessages(prompt) {
-    return convertAISDKToMCPMessages(prompt);
+  convertMessages(prompt, useNativeTools) {
+    if (!useNativeTools) {
+      return convertAISDKToMCPMessages(prompt);
+    }
+    const messages = [];
+    for (const msg of prompt) {
+      if (msg.role === "system") continue;
+      const role = msg.role === "assistant" ? "assistant" : "user";
+      const contentBlocks = [];
+      for (const part of msg.content) {
+        if (part.type === "text") {
+          contentBlocks.push({
+            type: "text",
+            text: part.text
+          });
+        } else if (part.type === "tool-call") {
+          const call = part;
+          contentBlocks.push({
+            type: "tool_use",
+            id: call.toolCallId,
+            name: call.toolName,
+            input: call.args ?? call.input ?? {}
+          });
+        } else if (part.type === "tool-result") {
+          const result = part;
+          contentBlocks.push({
+            type: "tool_result",
+            toolUseId: result.toolCallId,
+            // TODO: Handle different result types properly
+            content: [
+              {
+                type: "text",
+                text: result.output.type === "text" ? result.output.value?.toString() : JSON.stringify(result.output)
+              }
+            ]
+          });
+        }
+      }
+      if (contentBlocks.length > 0) {
+        messages.push({
+          role,
+          content: contentBlocks
+        });
+      }
+    }
+    return messages;
   }
   /**
    * Map MCP stop reason to AI SDK finish reason
@@ -10367,7 +10439,12 @@ var MCPSamplingLanguageModel = class {
    */
   supportsSamplingTools() {
     const capabilities = this.server.getClientCapabilities();
-    return !!capabilities?.sampling?.tools;
+    const supportsTools = !!capabilities?.sampling?.tools;
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Client capabilities check: sampling=${!!capabilities?.sampling}, tools=${supportsTools}`
+    });
+    return supportsTools;
   }
   /**
    * Convert AI SDK tools to MCP Tool format
@@ -10433,8 +10510,16 @@ IMPORTANT: You MUST respond with valid JSON only. Do not include any text before
       return systemPrompt;
     }
     if (useNativeTools) {
+      this.server.sendLoggingMessage({
+        level: "info",
+        data: `Using native tools mode - skipping XML tool injection`
+      });
       return systemPrompt;
     }
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Injecting ${tools.length} tools into system prompt (fallback mode)`
+    });
     let enhanced = systemPrompt || "";
     const toolsPrompt = `
 
@@ -10445,7 +10530,7 @@ You have access to the following tools. To use a tool, respond with this XML for
 </use_tool>
 
 Follow the JSON schema definition for each tool's parameters.
-You can use multiple tools in one response. You can include text before tool calls, but do NOT include text after tool calls - wait for the tool results first.
+You can use multiple tools in one response. DO NOT include text before or after tool calls - wait for the tool results first.
 
 Tools:`;
     const toolDescriptions = tools.map((tool2) => {
@@ -12062,15 +12147,18 @@ function createSearchPlugin(options = {}) {
   const allowedSearchDir = options.allowedDir || (0, import_node_os2.tmpdir)();
   const timeoutMs = options.timeoutMs || 3e4;
   const global2 = options.global ?? true;
+  const agentName = options.agentName;
+  const toolName = agentName ? `${agentName}__search-tool-result` : "search-tool-result";
   const activeTimeouts = /* @__PURE__ */ new Set();
   return {
     name: "plugin-search",
     version: "1.0.0",
     configureServer: (server) => {
-      const defaultDescription = `Search for text patterns in files and directories. Use this to find specific content, code, or information within files. Provide a simple literal string or a regular expression. If your pattern is a regex, ensure it's valid; otherwise use quotes or escape special characters to treat it as a literal string.
+      const defaultDescription = agentName ? `Search for text patterns in files for the "${agentName}" agent. Use this to find specific content within large tool results. Provide a simple literal string or a regular expression.
+Only search within the allowed directory: ${allowedSearchDir}` : `Search for text patterns in files and directories. Use this to find specific content, code, or information within files. Provide a simple literal string or a regular expression. If your pattern is a regex, ensure it's valid; otherwise use quotes or escape special characters to treat it as a literal string.
 Only search within the allowed directory: ${allowedSearchDir}`;
       const toolDescription = options.toolDescription || defaultDescription;
-      server.tool("search-tool-result", toolDescription, jsonSchema({
+      server.tool(toolName, toolDescription, jsonSchema({
         type: "object",
         properties: {
           pattern: {
@@ -12285,27 +12373,33 @@ function createLargeResultPlugin(options = {}) {
   const maxSize = options.maxSize || 8e3;
   const previewSize = options.previewSize || 4e3;
   let tempDir = options.tempDir || null;
-  const configuredServers = /* @__PURE__ */ new Map();
+  let serverRef = null;
+  let agentName = null;
   const defaultSearchDescription = `Search within large tool result files that were saved due to size limits. Use when: a tool result was saved to file because it exceeded the context limit. Do NOT use this tool before calling the actual tool first. Provide specific keywords or patterns related to the content you're looking for.`;
-  const searchConfig = {
-    maxResults: options.search?.maxResults || 15,
-    maxOutputSize: options.search?.maxOutputSize || 4e3,
-    toolDescription: options.search?.toolDescription || defaultSearchDescription,
-    global: true
-  };
   return {
     name: "plugin-large-result-handler",
     version: "1.0.0",
     dependencies: [],
-    configureServer: async (server) => {
-      if (!configuredServers.has(server)) {
+    configureServer: (server) => {
+      serverRef = server;
+    },
+    composeStart: async (context2) => {
+      agentName = context2.serverName;
+      if (serverRef) {
+        const searchConfig = {
+          maxResults: options.search?.maxResults || 15,
+          maxOutputSize: options.search?.maxOutputSize || 4e3,
+          toolDescription: options.search?.toolDescription || defaultSearchDescription,
+          global: true,
+          agentName
+        };
         const searchPlugin = createSearchPlugin(searchConfig);
-        await server.addPlugin(searchPlugin);
-        configuredServers.set(server, true);
+        await serverRef.addPlugin(searchPlugin);
       }
     },
     transformTool: (tool2, context2) => {
       const originalExecute = tool2.execute;
+      const searchToolName = agentName ? `${agentName}__search-tool-result` : "search-tool-result";
       tool2.execute = async (args) => {
         try {
           const result = await originalExecute(args);
@@ -12337,7 +12431,7 @@ ${preview}
 \`\`\`
 
 **To read/understand the full content:**
-- Use the \`search-tool-result\` tool with pattern: \`search-tool-result {"pattern": "your-search-term"}\`
+- Use the \`${searchToolName}\` tool with pattern: \`${searchToolName} {"pattern": "your-search-term"}\`
 - Search supports regex patterns for advanced queries`
               }
             ]
@@ -12351,7 +12445,8 @@ ${preview}
       return tool2;
     },
     dispose: () => {
-      configuredServers.clear();
+      serverRef = null;
+      agentName = null;
       tempDir = null;
     }
   };

package/bin/mcpc.mjs

@@ -2380,19 +2380,9 @@ var Response2 = class _Response {
 });
 Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
-var webFetch = global.fetch;
 if (typeof global.crypto === "undefined") {
   global.crypto = crypto2;
 }
-global.fetch = (info, init) => {
-  init = {
-    // Disable compression handling so people can return the result of a fetch
-    // directly in the loader without messing with the Content-Encoding header.
-    compress: false,
-    ...init
-  };
-  return webFetch(info, init);
-};
 var outgoingEnded = Symbol("outgoingEnded");
 
 // __mcpc__cli_latest/node_modules/@mcpc/cli/src/config/loader.js
@@ -10220,7 +10210,16 @@ var MCPSamplingLanguageModel = class {
    * Generate a response using MCP's createMessage capability
    */
   async doGenerate(options) {
-    const messages = this.convertMessages(options.prompt);
+    const useNativeTools = this.supportsSamplingTools();
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Client supports native tools: ${useNativeTools}`
+    });
+    const messages = this.convertMessages(options.prompt, useNativeTools);
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Converted messages for MCP: ${JSON.stringify(messages)}`
+    });
     let systemPrompt;
     for (const msg of options.prompt) {
       if (msg.role === "system") {
@@ -10228,7 +10227,10 @@ var MCPSamplingLanguageModel = class {
         break;
       }
     }
-    const useNativeTools = this.supportsSamplingTools();
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Client supports native tools: ${useNativeTools}`
+    });
     systemPrompt = this.injectResponseFormatInstructions(systemPrompt, options.responseFormat, useNativeTools);
     systemPrompt = this.injectToolInstructions(systemPrompt, options.tools, useNativeTools);
     const createMessageParams = {
@@ -10242,8 +10244,34 @@ var MCPSamplingLanguageModel = class {
       createMessageParams.toolChoice = {
         mode: "auto"
       };
+      this.server.sendLoggingMessage({
+        level: "info",
+        data: `Converted ${options.tools.length} tools to MCP format: ${JSON.stringify(createMessageParams.tools?.map((t) => t.name))}`
+      });
+    } else if (options.tools && options.tools.length > 0) {
+      this.server.sendLoggingMessage({
+        level: "info",
+        data: `Tools provided but not using native mode - injecting into system prompt instead`
+      });
     }
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Calling createMessage with params: ${JSON.stringify({
+        hasSystemPrompt: !!systemPrompt,
+        hasTools: !!createMessageParams.tools,
+        toolCount: createMessageParams.tools?.length || 0,
+        createMessageParams
+      }, null, 2)}`
+    });
     const result = await this.server.createMessage(createMessageParams);
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `createMessage result: ${JSON.stringify({
+        contentType: result.content.type,
+        stopReason: result.stopReason,
+        text: result.content
+      })}`
+    });
     const content = [];
     if (useNativeTools) {
       const contentArray = Array.isArray(result.content) ? result.content : [
@@ -10361,8 +10389,52 @@ var MCPSamplingLanguageModel = class {
   /**
    * Convert AI SDK messages to MCP sampling format
    */
-  convertMessages(prompt) {
-    return convertAISDKToMCPMessages(prompt);
+  convertMessages(prompt, useNativeTools) {
+    if (!useNativeTools) {
+      return convertAISDKToMCPMessages(prompt);
+    }
+    const messages = [];
+    for (const msg of prompt) {
+      if (msg.role === "system") continue;
+      const role = msg.role === "assistant" ? "assistant" : "user";
+      const contentBlocks = [];
+      for (const part of msg.content) {
+        if (part.type === "text") {
+          contentBlocks.push({
+            type: "text",
+            text: part.text
+          });
+        } else if (part.type === "tool-call") {
+          const call = part;
+          contentBlocks.push({
+            type: "tool_use",
+            id: call.toolCallId,
+            name: call.toolName,
+            input: call.args ?? call.input ?? {}
+          });
+        } else if (part.type === "tool-result") {
+          const result = part;
+          contentBlocks.push({
+            type: "tool_result",
+            toolUseId: result.toolCallId,
+            // TODO: Handle different result types properly
+            content: [
+              {
+                type: "text",
+                text: result.output.type === "text" ? result.output.value?.toString() : JSON.stringify(result.output)
+              }
+            ]
+          });
+        }
+      }
+      if (contentBlocks.length > 0) {
+        messages.push({
+          role,
+          content: contentBlocks
+        });
+      }
+    }
+    return messages;
   }
   /**
    * Map MCP stop reason to AI SDK finish reason
@@ -10375,7 +10447,12 @@ var MCPSamplingLanguageModel = class {
    */
   supportsSamplingTools() {
     const capabilities = this.server.getClientCapabilities();
-    return !!capabilities?.sampling?.tools;
+    const supportsTools = !!capabilities?.sampling?.tools;
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Client capabilities check: sampling=${!!capabilities?.sampling}, tools=${supportsTools}`
+    });
+    return supportsTools;
   }
   /**
    * Convert AI SDK tools to MCP Tool format
@@ -10441,8 +10518,16 @@ IMPORTANT: You MUST respond with valid JSON only. Do not include any text before
       return systemPrompt;
     }
     if (useNativeTools) {
+      this.server.sendLoggingMessage({
+        level: "info",
+        data: `Using native tools mode - skipping XML tool injection`
+      });
       return systemPrompt;
     }
+    this.server.sendLoggingMessage({
+      level: "info",
+      data: `Injecting ${tools.length} tools into system prompt (fallback mode)`
+    });
     let enhanced = systemPrompt || "";
     const toolsPrompt = `
 
@@ -10453,7 +10538,7 @@ You have access to the following tools. To use a tool, respond with this XML for
 </use_tool>
 
 Follow the JSON schema definition for each tool's parameters.
-You can use multiple tools in one response. You can include text before tool calls, but do NOT include text after tool calls - wait for the tool results first.
+You can use multiple tools in one response. DO NOT include text before or after tool calls - wait for the tool results first.
 
 Tools:`;
     const toolDescriptions = tools.map((tool2) => {
@@ -12069,15 +12154,18 @@ function createSearchPlugin(options = {}) {
   const allowedSearchDir = options.allowedDir || tmpdir();
   const timeoutMs = options.timeoutMs || 3e4;
   const global2 = options.global ?? true;
+  const agentName = options.agentName;
+  const toolName = agentName ? `${agentName}__search-tool-result` : "search-tool-result";
   const activeTimeouts = /* @__PURE__ */ new Set();
   return {
     name: "plugin-search",
     version: "1.0.0",
     configureServer: (server) => {
-      const defaultDescription = `Search for text patterns in files and directories. Use this to find specific content, code, or information within files. Provide a simple literal string or a regular expression. If your pattern is a regex, ensure it's valid; otherwise use quotes or escape special characters to treat it as a literal string.
+      const defaultDescription = agentName ? `Search for text patterns in files for the "${agentName}" agent. Use this to find specific content within large tool results. Provide a simple literal string or a regular expression.
+Only search within the allowed directory: ${allowedSearchDir}` : `Search for text patterns in files and directories. Use this to find specific content, code, or information within files. Provide a simple literal string or a regular expression. If your pattern is a regex, ensure it's valid; otherwise use quotes or escape special characters to treat it as a literal string.
 Only search within the allowed directory: ${allowedSearchDir}`;
       const toolDescription = options.toolDescription || defaultDescription;
-      server.tool("search-tool-result", toolDescription, jsonSchema({
+      server.tool(toolName, toolDescription, jsonSchema({
         type: "object",
         properties: {
           pattern: {
@@ -12292,27 +12380,33 @@ function createLargeResultPlugin(options = {}) {
   const maxSize = options.maxSize || 8e3;
   const previewSize = options.previewSize || 4e3;
   let tempDir = options.tempDir || null;
-  const configuredServers = /* @__PURE__ */ new Map();
+  let serverRef = null;
+  let agentName = null;
   const defaultSearchDescription = `Search within large tool result files that were saved due to size limits. Use when: a tool result was saved to file because it exceeded the context limit. Do NOT use this tool before calling the actual tool first. Provide specific keywords or patterns related to the content you're looking for.`;
-  const searchConfig = {
-    maxResults: options.search?.maxResults || 15,
-    maxOutputSize: options.search?.maxOutputSize || 4e3,
-    toolDescription: options.search?.toolDescription || defaultSearchDescription,
-    global: true
-  };
   return {
     name: "plugin-large-result-handler",
     version: "1.0.0",
     dependencies: [],
-    configureServer: async (server) => {
-      if (!configuredServers.has(server)) {
+    configureServer: (server) => {
+      serverRef = server;
+    },
+    composeStart: async (context2) => {
+      agentName = context2.serverName;
+      if (serverRef) {
+        const searchConfig = {
+          maxResults: options.search?.maxResults || 15,
+          maxOutputSize: options.search?.maxOutputSize || 4e3,
+          toolDescription: options.search?.toolDescription || defaultSearchDescription,
+          global: true,
+          agentName
+        };
         const searchPlugin = createSearchPlugin(searchConfig);
-        await server.addPlugin(searchPlugin);
-        configuredServers.set(server, true);
+        await serverRef.addPlugin(searchPlugin);
       }
     },
     transformTool: (tool2, context2) => {
       const originalExecute = tool2.execute;
+      const searchToolName = agentName ? `${agentName}__search-tool-result` : "search-tool-result";
       tool2.execute = async (args) => {
         try {
           const result = await originalExecute(args);
@@ -12344,7 +12438,7 @@ ${preview}
 \`\`\`
 
 **To read/understand the full content:**
-- Use the \`search-tool-result\` tool with pattern: \`search-tool-result {"pattern": "your-search-term"}\`
+- Use the \`${searchToolName}\` tool with pattern: \`${searchToolName} {"pattern": "your-search-term"}\`
 - Search supports regex patterns for advanced queries`
               }
             ]
@@ -12358,7 +12452,8 @@ ${preview}
       return tool2;
     },
     dispose: () => {
-      configuredServers.clear();
+      serverRef = null;
+      agentName = null;
       tempDir = null;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpc-tech/cli",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "homepage": "https://jsr.io/@mcpc/cli",
   "dependencies": {
     "@hono/zod-openapi": "^0.19.2",