@kolisachint/hoocode-agent 0.4.33 → 0.4.35

package/dist/extensions/core/hoo-core.js

@@ -17,6 +17,7 @@
 import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { readdir } from "node:fs/promises";
+import { homedir } from "node:os";
 import { join, relative } from "node:path";
 import { createInterface } from "node:readline";
 import { Type } from "typebox";
@@ -382,8 +383,70 @@ function buildMcpSchema(tool) {
     }
     return Type.Object(shape);
 }
+/**
+ * Parse standard MCP config format (used by Claude Desktop, VS Code, etc.)
+ * into hoocode's McpServerConfig format.
+ */
+function parseStandardMcpConfig(config, _source) {
+    if (!config.mcpServers)
+        return [];
+    const servers = [];
+    for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
+        servers.push({
+            name,
+            command: serverConfig.command,
+            args: serverConfig.args,
+            env: serverConfig.env,
+        });
+    }
+    return servers;
+}
+/**
+ * Load MCP servers from a standard mcp.json file.
+ * Returns an array of McpServerConfig, or empty array if file doesn't exist or is invalid.
+ */
+function loadStandardMcpFile(filePath) {
+    if (!existsSync(filePath))
+        return [];
+    try {
+        const content = readFileSync(filePath, "utf8");
+        const config = JSON.parse(content);
+        return parseStandardMcpConfig(config, filePath);
+    }
+    catch {
+        return [];
+    }
+}
 export function setupMcpLoader(pi) {
     pi.on("session_start", async (_event, ctx) => {
+        const allServerConfigs = [];
+        const seenNames = new Set();
+        // 1. Load from standard mcp.json locations
+        // User-level: ~/.agents/mcp.json
+        const userAgentsConfig = loadStandardMcpFile(join(homedir(), ".agents", "mcp.json"));
+        for (const config of userAgentsConfig) {
+            if (!seenNames.has(config.name)) {
+                seenNames.add(config.name);
+                allServerConfigs.push(config);
+            }
+        }
+        // Project-level: ./.agents/mcp.json
+        const projectAgentsConfig = loadStandardMcpFile(join(ctx.cwd, ".agents", "mcp.json"));
+        for (const config of projectAgentsConfig) {
+            if (!seenNames.has(config.name)) {
+                seenNames.add(config.name);
+                allServerConfigs.push(config);
+            }
+        }
+        // Claude Desktop: ~/.config/claude/mcp.json
+        const claudeDesktopConfig = loadStandardMcpFile(join(homedir(), ".config", "claude", "mcp.json"));
+        for (const config of claudeDesktopConfig) {
+            if (!seenNames.has(config.name)) {
+                seenNames.add(config.name);
+                allServerConfigs.push(config);
+            }
+        }
+        // 2. Load from hoocode's per-server format (existing behavior)
         const searchDirs = [join(HOOCODE_DIR, "mcp-servers"), join(ctx.cwd, ".hoocode", "mcp-servers")];
         for (const dir of searchDirs) {
             if (!existsSync(dir))
@@ -409,53 +472,61 @@ export function setupMcpLoader(pi) {
                     ctx.ui.notify(`MCP: failed to parse "${file}": ${String(err)}`, "error");
                     continue;
                 }
-                try {
-                    const { tools } = await connectMcpServer(serverConfig);
-                    for (const tool of tools) {
-                        const toolName = `mcp_${serverConfig.name}_${tool.name}`;
-                        const schema = buildMcpSchema(tool);
-                        const capturedServer = serverConfig.name;
-                        const capturedTool = tool.name;
-                        pi.registerTool({
-                            name: toolName,
-                            label: `[MCP] ${serverConfig.name} › ${tool.name}`,
-                            description: tool.description,
-                            parameters: schema,
-                            async execute(_toolCallId, params, signal, _onUpdate) {
-                                const activeConn = mcpConnections.get(capturedServer);
-                                if (!activeConn) {
-                                    return {
-                                        content: [
-                                            {
-                                                type: "text",
-                                                text: `MCP server "${capturedServer}" is not connected`,
-                                            },
-                                        ],
-                                        details: undefined,
-                                    };
-                                }
-                                const abortPromise = new Promise((_, reject) => {
-                                    signal.addEventListener("abort", () => reject(new Error("Aborted")));
-                                });
-                                const result = await Promise.race([
-                                    activeConn.rpc("tools/call", {
-                                        name: capturedTool,
-                                        arguments: params,
-                                    }),
-                                    abortPromise,
-                                ]);
+                // Skip if already loaded from standard config
+                if (seenNames.has(serverConfig.name))
+                    continue;
+                seenNames.add(serverConfig.name);
+                allServerConfigs.push(serverConfig);
+            }
+        }
+        // 3. Connect to all servers and register tools
+        for (const serverConfig of allServerConfigs) {
+            try {
+                const { tools } = await connectMcpServer(serverConfig);
+                for (const tool of tools) {
+                    const toolName = `mcp_${serverConfig.name}_${tool.name}`;
+                    const schema = buildMcpSchema(tool);
+                    const capturedServer = serverConfig.name;
+                    const capturedTool = tool.name;
+                    pi.registerTool({
+                        name: toolName,
+                        label: `[MCP] ${serverConfig.name} › ${tool.name}`,
+                        description: tool.description,
+                        parameters: schema,
+                        async execute(_toolCallId, params, signal, _onUpdate) {
+                            const activeConn = mcpConnections.get(capturedServer);
+                            if (!activeConn) {
                                 return {
-                                    content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
+                                    content: [
+                                        {
+                                            type: "text",
+                                            text: `MCP server "${capturedServer}" is not connected`,
+                                        },
+                                    ],
                                     details: undefined,
                                 };
-                            },
-                        });
-                    }
-                    ctx.ui.notify(`MCP: connected "${serverConfig.name}" (${tools.length} tool${tools.length === 1 ? "" : "s"})`, "info");
-                }
-                catch (err) {
-                    ctx.ui.notify(`MCP: failed to connect "${serverConfig.name}": ${String(err)}`, "error");
+                            }
+                            const abortPromise = new Promise((_, reject) => {
+                                signal.addEventListener("abort", () => reject(new Error("Aborted")));
+                            });
+                            const result = await Promise.race([
+                                activeConn.rpc("tools/call", {
+                                    name: capturedTool,
+                                    arguments: params,
+                                }),
+                                abortPromise,
+                            ]);
+                            return {
+                                content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
+                                details: undefined,
+                            };
+                        },
+                    });
                 }
+                ctx.ui.notify(`MCP: connected "${serverConfig.name}" (${tools.length} tool${tools.length === 1 ? "" : "s"})`, "info");
+            }
+            catch (err) {
+                ctx.ui.notify(`MCP: failed to connect "${serverConfig.name}": ${String(err)}`, "error");
             }
         }
     });
@@ -762,7 +833,7 @@ export function setupMode(pi) {
     });
 }
 // ============================================================================
-// Scaffold commands — /new-skill and /new-agent
+// Scaffold commands — /new-skill, /new-agent, and /new-command
 // ============================================================================
 /** Validates a resource name: lowercase a-z, 0-9, hyphens, no leading/trailing/double hyphens. */
 function validateResourceName(name) {
@@ -860,6 +931,46 @@ function setupScaffold(pi) {
             ctx.ui.notify(`Agent created: ${join(".hoocode", "agents", `${name}.md`)}\nEdit the file, then run /reload to activate it.`, "info");
         },
     });
+    // ── /new-command <name> ───────────────────────────────────────────────────
+    // Creates .hoocode/commands/<name>.md with a slash-command prompt-template
+    // frontmatter (name, description, argument-hint) so it is ready to edit and
+    // picked up on next reload. Body supports $1, $@, $ARGUMENTS placeholders.
+    pi.registerCommand("new-command", {
+        description: "Scaffold a new slash command. Usage: /new-command <name>",
+        getArgumentCompletions: () => [],
+        handler: async (args, ctx) => {
+            const name = args.trim();
+            const error = validateResourceName(name);
+            if (error) {
+                ctx.ui.notify(`/new-command: ${error}. Usage: /new-command <name>`, "warning");
+                return;
+            }
+            const commandsDir = join(ctx.cwd, ".hoocode", "commands");
+            const commandFile = join(commandsDir, `${name}.md`);
+            if (existsSync(commandFile)) {
+                ctx.ui.notify(`/new-command: ${commandFile} already exists`, "warning");
+                return;
+            }
+            mkdirSync(commandsDir, { recursive: true });
+            writeFileSync(commandFile, [
+                "---",
+                `name: ${name}`,
+                "description: |",
+                `  TODO: describe what /${name} does and when to use it.`,
+                `  Usage: /${name} <args>`,
+                "argument-hint: <args>",
+                "---",
+                `Run the /${name} command with arguments: **$ARGUMENTS**.`,
+                "",
+                "TODO: write the instructions here. Placeholders you can use:",
+                "- $1, $2, ... for positional arguments",
+                "- $@ or $ARGUMENTS for all arguments",
+                `- $${"{"}@:N} / $${"{"}@:N:L} for bash-style slices`,
+                "",
+            ].join("\n"), "utf8");
+            ctx.ui.notify(`Command created: ${join(".hoocode", "commands", `${name}.md`)}\nEdit the file, then run /reload to activate it.`, "info");
+        },
+    });
 }
 // ============================================================================
 // D. Options pane — ask_options tool