@openeryc/pi-coding-agent 0.75.37 → 0.75.39

package/dist/modes/interactive/interactive-mode.js

@@ -50,6 +50,7 @@ import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
+import { McpSelectorComponent } from "./components/mcp-selector.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
@@ -2022,14 +2023,19 @@ export class InteractiveMode {
                 return;
             }
             if (text === "/mcp") {
-                this.handleMcpCommand();
                 this.editor.setText("");
+                this.showMcpSelector();
                 return;
             }
             if (text.startsWith("/mcp ")) {
                 const name = text.slice(5).trim();
-                this.handleMcpToggle(name);
                 this.editor.setText("");
+                this.showMcpSelector(name);
+                return;
+            }
+            if (text === "/skills") {
+                this.editor.setText("");
+                this.showSkillsSelector();
                 return;
             }
             if (text === "/usage") {
@@ -3204,6 +3210,7 @@ export class InteractiveMode {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
+            this.ui.requestRender();
         };
         const { component, focus } = create(done);
         this.editorContainer.clear();
@@ -4408,84 +4415,75 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();
     }
-    handleMcpCommand(highlightServer) {
-        const configuredServers = this.settingsManager.getMcpServers();
+    showMcpSelector(highlightServer) {
+        const configured = this.settingsManager.getMcpServers();
         const allTools = this.session.getAllTools();
         const mcpTools = allTools.filter((t) => t.name.startsWith("mcp_"));
-        const toolsByServer = new Map();
+        const toolCountByServer = new Map();
         for (const tool of mcpTools) {
             const rest = tool.name.slice(4);
-            const secondUnderscore = rest.indexOf("_");
-            const serverName = secondUnderscore === -1 ? rest : rest.slice(0, secondUnderscore);
-            const existing = toolsByServer.get(serverName);
-            if (existing) {
-                existing.push(tool);
-            }
-            else {
-                toolsByServer.set(serverName, [tool]);
-            }
-        }
-        this.chatContainer.addChild(new Spacer(1));
-        if (!configuredServers || Object.keys(configuredServers).length === 0) {
+            const idx = rest.indexOf("_");
+            const srv = idx === -1 ? rest : rest.slice(0, idx);
+            toolCountByServer.set(srv, (toolCountByServer.get(srv) ?? 0) + 1);
+        }
+        const items = (configured ? Object.entries(configured) : []).map(([name, cfg]) => {
+            const disabled = cfg.enabled === false;
+            const connected = (toolCountByServer.get(name) ?? 0) > 0;
+            const transport = cfg.url ? (cfg.transport ?? "sse") : cfg.command ? "stdio" : "unknown";
+            return {
+                name,
+                status: disabled ? "disabled" : connected ? "connected" : "disconnected",
+                toolCount: toolCountByServer.get(name) ?? 0,
+                transport,
+            };
+        });
+        if (items.length === 0) {
+            this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Text(`${theme.bold("MCP Servers")}\n\n${theme.fg("dim", "No MCP servers configured. Add 'mcpServers' to settings.json.")}`, 1, 0));
             this.ui.requestRender();
             return;
         }
-        let info = `${theme.bold("MCP Servers")}\n`;
-        info += `${theme.fg("dim", "Use /mcp <name> to toggle or view details")}\n\n`;
-        let idx = 0;
-        for (const [serverName, config] of Object.entries(configuredServers)) {
-            const tools = toolsByServer.get(serverName) ?? [];
-            const disabled = config.enabled === false;
-            const connected = tools.length > 0;
-            let status;
-            if (disabled) {
-                status = theme.fg("muted", "disabled");
-            }
-            else if (connected) {
-                status = theme.fg("success", "connected");
+        if (highlightServer) {
+            const server = configured?.[highlightServer];
+            if (server) {
+                const currentEnabled = server.enabled !== false;
+                this.settingsManager.setMcpServerEnabled(highlightServer, !currentEnabled);
+                this.session.reloadMcp();
             }
-            else {
-                status = theme.fg("warning", "disconnected");
-            }
-            const toggleHint = disabled ? "[/mcp " + serverName + " to enable]" : "[/mcp " + serverName + " to disable]";
-            const transport = config.url ? (config.transport ?? "sse") : config.command ? "stdio" : "unknown";
-            const toolCount = tools.length;
-            info += `${theme.bold(++idx + ". " + serverName)} ${status}  ${theme.fg("dim", toggleHint)}\n`;
-            info += `${theme.fg("dim", `   Transport: ${transport}  |  Tools: ${toolCount}`)}\n`;
-            if (config.command) {
-                const cmd = config.args ? `${config.command} ${config.args.join(" ")}` : config.command;
-                info += `${theme.fg("dim", `   Command: ${cmd}`)}\n`;
-            }
-            if (config.url) {
-                info += `${theme.fg("dim", `   URL: ${config.url}`)}\n`;
-            }
-            // Show detailed tool list only for highlighted server
-            if (highlightServer === serverName && connected) {
-                for (const tool of tools) {
-                    const desc = tool.description ? ` - ${tool.description.split("\n")[0].slice(0, 80)}` : "";
-                    info += `${theme.fg("dim", `     ${tool.name}${desc}`)}\n`;
-                }
-            }
-            info += "\n";
         }
-        this.chatContainer.addChild(new Text(info, 1, 0));
-        this.ui.requestRender();
+        this.showSelector((done) => {
+            const selector = new McpSelectorComponent(items, async (name) => {
+                const server = configured?.[name];
+                if (!server)
+                    return;
+                const currentEnabled = server.enabled !== false;
+                this.settingsManager.setMcpServerEnabled(name, !currentEnabled);
+                await this.session.reloadMcp();
+                done();
+                this.showStatus(`${name} ${currentEnabled ? "disabled" : "enabled"}`);
+            }, () => done());
+            return { component: selector, focus: selector };
+        });
     }
-    async handleMcpToggle(serverName) {
-        const mcpServers = this.settingsManager.getMcpServers();
-        if (!mcpServers || !mcpServers[serverName]) {
+    showSkillsSelector() {
+        const skills = this.session.resourceLoader.getSkills().skills;
+        if (skills.length === 0) {
             this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Text(theme.fg("warning", `MCP server "${serverName}" not found.`), 1, 0));
+            this.chatContainer.addChild(new Text(theme.fg("dim", "No skills loaded."), 1, 0));
             this.ui.requestRender();
             return;
         }
-        const currentEnabled = mcpServers[serverName].enabled !== false;
-        this.settingsManager.setMcpServerEnabled(serverName, !currentEnabled);
-        await this.session.reloadMcp();
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(`${theme.bold(serverName)} ${theme.fg(currentEnabled ? "muted" : "success", currentEnabled ? "disabled" : "enabled")}`, 1, 0));
-        this.handleMcpCommand(serverName);
+        this.showSelector((done) => {
+            const selector = new McpSelectorComponent(skills.map((s) => ({
+                name: s.name,
+                status: s.disableModelInvocation ? "disabled" : "connected",
+                toolCount: 0,
+                transport: s.description.slice(0, 60),
+            })), (_name) => {
+                done();
+            }, () => done());
+            return { component: selector, focus: selector };
+        });
     }
     async handleUsageCommand() {
         this.showStatus("Loading usage stats...");