cliskill 1.1.4 → 1.1.6

package/dist/bootstrap/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-V73UZD27.js";
+} from "../chunk-6PBITIPP.js";
 import "../chunk-S7IQHES2.js";
 export {
   runCli

package/dist/{chunk-V73UZD27.js → chunk-6PBITIPP.js}

@@ -8247,15 +8247,16 @@ Examples of the kind of risky actions that warrant user confirmation:
 }
 function getUsingYourToolsSection() {
   return `# Using your tools
- - Do NOT use the ${BASH} to run commands when a relevant dedicated tool is provided. Using dedicated tools allows the user to better understand and review your work. This is CRITICAL to assisting the user:
+  - Do NOT use the ${BASH} to run commands when a relevant dedicated tool is provided. Using dedicated tools allows the user to better understand and review your work. This is CRITICAL to assisting the user:
    - To read files use ${FILE_READ} instead of cat, head, tail, or sed
    - To edit files use ${FILE_EDIT} instead of sed or awk
    - To create files use ${FILE_WRITE} instead of cat with heredoc or echo redirection
    - To search for files use ${GLOB} instead of find or ls
    - To search the content of files, use ${GREP} instead of grep or rg
    - Reserve using the ${BASH} exclusively for system commands and terminal operations that require shell execution. If you are unsure and there is a relevant dedicated tool, default to using the dedicated tool.
- - Break down and manage your work with the ${TODO_WRITE} tool. These tools are helpful for planning your work and helping the user track your progress. Mark each task as completed as soon as you are done with the task. Do not batch up multiple tasks before marking them as completed.
- - You can call multiple tools in a single response. If you intend to call multiple tools and there are no dependencies between them, make all independent tool calls in parallel. Maximize use of parallel tool calls where possible to increase efficiency. However, if some tool calls depend on previous calls to inform dependent values, do NOT call these tools in parallel and instead call them sequentially.`;
+  - Break down and manage your work with the ${TODO_WRITE} tool. These tools are helpful for planning your work and helping the user track your progress. Mark each task as completed as soon as you are done with the task. Do not batch up multiple tasks before marking them as completed.
+  - You can call multiple tools in a single response. If you intend to call multiple tools and there are no dependencies between them, make all independent tool calls in parallel. Maximize use of parallel tool calls where possible to increase efficiency. However, if some tool calls depend on previous calls to inform dependent values, do NOT call these tools in parallel and instead call them sequentially.
+  - In addition to the built-in tools listed above, you may have access to MCP (Model Context Protocol) tools from external servers. If an "MCP Tools" section appears in your system prompt, those tools are available to you. When the user asks about your tools or capabilities, include MCP tools in your response \u2014 do NOT claim you have no external tools if MCP tools are listed.`;
 }
 function getAgentToolSection() {
   return ` - Use the ${AGENT} tool with specialized sub-agents when the task at hand benefits from parallelization or when you need to protect the main context window from excessive results. Importantly, avoid duplicating work that sub-agents are already doing \u2014 if you delegate research to a sub-agent, do not also perform the same searches yourself.`;
@@ -8324,6 +8325,42 @@ You have been invoked in the following environment:
  - Hostname: ${hostname()}
  - Shell: ${isWin ? "cmd.exe (use Windows-compatible commands)" : "bash/zsh"}`;
 }
+function buildMcpToolsSection(servers, failedServers = []) {
+  if (servers.length === 0 && failedServers.length === 0) return "";
+  const lines = [
+    "# MCP (Model Context Protocol) Tools",
+    "",
+    "You have access to tools from MCP (Model Context Protocol) servers.",
+    "These are external tools provided by MCP services that extend your capabilities beyond the built-in tools.",
+    "Use them like any other tool when they are relevant to the task.",
+    "",
+    "IMPORTANT: When the user asks about your available tools, MCP capabilities, or what external services you can access,",
+    "you MUST include the MCP tools listed below in your response. Do NOT claim you have no MCP tools if this section exists.",
+    ""
+  ];
+  if (servers.length > 0) {
+    lines.push("## Connected MCP Servers");
+    lines.push("");
+    for (const server of servers) {
+      lines.push(`### ${server.name}`);
+      for (const tool of server.tools) {
+        lines.push(`- **${tool.name}**: ${tool.description}`);
+      }
+      lines.push("");
+    }
+  }
+  if (failedServers.length > 0) {
+    lines.push("## MCP Servers (Connection Failed)");
+    lines.push("");
+    for (const failed of failedServers) {
+      lines.push(`- **${failed.name}**: ${failed.error}`);
+    }
+    lines.push("");
+    lines.push("The above MCP servers are configured but failed to connect. Inform the user if they ask about MCP.");
+    lines.push("");
+  }
+  return lines.join("\n");
+}
 function buildSystemPrompt() {
   return [
     getIntroSection(),
@@ -8919,7 +8956,10 @@ function buildModelRouter(adapterRegistry, config) {
   });
 }
 async function connectMcpServers(config, toolRegistry) {
-  if (config.mcpServers.length === 0) return null;
+  const failedServers = [];
+  if (config.mcpServers.length === 0) {
+    return { manager: null, failedServers };
+  }
   const mcpManager = new MCPConnectionManager();
   let connectedCount = 0;
   for (const serverConfig of config.mcpServers) {
@@ -8933,10 +8973,14 @@ async function connectMcpServers(config, toolRegistry) {
       });
       connectedCount++;
     } catch (err) {
-      console.error(`MCP server "${serverConfig.name}" connection failed: ${err.message}`);
+      const message = err.message;
+      console.error(`MCP server "${serverConfig.name}" connection failed: ${message}`);
+      failedServers.push({ name: serverConfig.name, error: message });
     }
   }
-  if (connectedCount === 0) return null;
+  if (connectedCount === 0) {
+    return { manager: null, failedServers };
+  }
   const registeredTools = await registerMCPTools(mcpManager, (tool) => {
     try {
       toolRegistry.register(tool);
@@ -8947,7 +8991,26 @@ async function connectMcpServers(config, toolRegistry) {
     console.log(`  MCP: ${connectedCount} server(s) connected, ${registeredTools.length} tool(s) loaded`);
   }
   mcpManager.registerShutdownHandlers();
-  return mcpManager;
+  return { manager: mcpManager, failedServers };
+}
+async function buildMcpSystemSection(mcpResult) {
+  const { manager, failedServers } = mcpResult;
+  if (!manager) {
+    return buildMcpToolsSection([], failedServers);
+  }
+  const servers = [];
+  for (const serverName of manager.getConnectedServers()) {
+    const tools = await manager.getToolsForServer(serverName);
+    if (tools.length === 0) continue;
+    servers.push({
+      name: serverName,
+      tools: tools.map((t) => ({
+        name: `mcp_${serverName}_${t.name}`,
+        description: t.description ?? `MCP tool: ${t.name}`
+      }))
+    });
+  }
+  return buildMcpToolsSection(servers, failedServers);
 }
 async function runTuiRepl(config) {
   const adapterRegistry = new AdapterRegistry();
@@ -8961,7 +9024,10 @@ async function runTuiRepl(config) {
   const adapter = config.defaultProvider ? adapterRegistry.get(config.defaultProvider) : adapterRegistry.getAll()[0];
   const modelRouter = buildModelRouter(adapterRegistry, config);
   const toolRegistry = createDefaultToolRegistry(modelRouter);
-  const mcpManager = await connectMcpServers(config, toolRegistry);
+  const mcpResult = await connectMcpServers(config, toolRegistry);
+  const mcpSection = await buildMcpSystemSection(mcpResult);
+  const baseSystemPrompt = config.systemPrompt ?? buildSystemPrompt();
+  const systemPrompt = mcpSection ? baseSystemPrompt + "\n\n" + mcpSection : baseSystemPrompt;
   ensureDataDir();
   const sessionSaver = new SessionSaver();
   await sessionSaver.init();
@@ -8980,7 +9046,7 @@ async function runTuiRepl(config) {
       adapter,
       toolRegistry,
       config,
-      systemPrompt: config.systemPrompt ?? buildSystemPrompt(),
+      systemPrompt,
       cwd: process.cwd(),
       abortSignal: activeAbortController.signal,
       onPermissionRequest: async () => true,
@@ -9059,7 +9125,10 @@ async function runBasicRepl(config) {
 `);
   }
   const toolRegistry = createDefaultToolRegistry(modelRouter);
-  await connectMcpServers(config, toolRegistry);
+  const mcpResult = await connectMcpServers(config, toolRegistry);
+  const mcpSection = await buildMcpSystemSection(mcpResult);
+  const baseSystemPrompt = config.systemPrompt ?? buildSystemPrompt();
+  const systemPrompt = mcpSection ? baseSystemPrompt + "\n\n" + mcpSection : baseSystemPrompt;
   const abortController = new AbortController();
   ensureDataDir();
   const sessionSaver = new SessionSaver();
@@ -9140,7 +9209,7 @@ async function runBasicRepl(config) {
         adapter,
         toolRegistry,
         config,
-        systemPrompt: config.systemPrompt ?? buildSystemPrompt(),
+        systemPrompt,
         cwd: process.cwd(),
         abortSignal: abortController.signal,
         onPermissionRequest: async (operation, details) => {
@@ -12194,4 +12263,4 @@ export {
   MCPConnectionManager,
   runCli
 };
-//# sourceMappingURL=chunk-V73UZD27.js.map
+//# sourceMappingURL=chunk-6PBITIPP.js.map