orquesta-cli 0.2.108 → 0.2.112

package/dist/tools/mcp/mcp-config.js

@@ -0,0 +1,87 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { configManager } from '../../core/config/config-manager.js';
+import { logger } from '../../utils/logger.js';
+function normalizeEntry(name, raw) {
+    if (!name || typeof name !== 'string' || !raw || typeof raw !== 'object')
+        return null;
+    const e = raw;
+    const enabled = e.enabled === false || e.disabled === true ? false : true;
+    const cfg = {
+        name,
+        enabled,
+        ...(e.command ? { command: e.command } : {}),
+        ...(Array.isArray(e.args) ? { args: e.args } : {}),
+        ...(e.env && typeof e.env === 'object' ? { env: e.env } : {}),
+        ...(e.cwd ? { cwd: e.cwd } : {}),
+        ...(e.url ? { url: e.url } : {}),
+        ...(e.headers && typeof e.headers === 'object' ? { headers: e.headers } : {}),
+    };
+    if (!cfg.command && !cfg.url) {
+        logger.warn('MCP server entry has neither command nor url; skipping', { name });
+        return null;
+    }
+    return cfg;
+}
+function parseFile(filePath) {
+    let raw;
+    try {
+        raw = fs.readFileSync(filePath, 'utf8');
+    }
+    catch {
+        return [];
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (err) {
+        logger.warn('MCP config file is not valid JSON; skipping', {
+            filePath,
+            error: err instanceof Error ? err.message : String(err),
+        });
+        return [];
+    }
+    return normalizeSource(parsed);
+}
+export function normalizeSource(parsed) {
+    if (parsed == null || typeof parsed !== 'object')
+        return [];
+    if (Array.isArray(parsed)) {
+        return parsed
+            .map((entry) => {
+            const name = entry?.name;
+            return name ? normalizeEntry(name, entry) : null;
+        })
+            .filter((x) => x !== null);
+    }
+    const obj = parsed;
+    const map = obj.mcpServers && typeof obj.mcpServers === 'object' ? obj.mcpServers : obj;
+    const out = [];
+    for (const [name, entry] of Object.entries(map)) {
+        if (!entry || typeof entry !== 'object')
+            continue;
+        const cfg = normalizeEntry(name, entry);
+        if (cfg)
+            out.push(cfg);
+    }
+    return out;
+}
+export function loadMcpServerConfigs(cwd = process.cwd()) {
+    const byName = new Map();
+    const add = (servers) => {
+        for (const s of servers)
+            byName.set(s.name, s);
+    };
+    try {
+        const global = configManager.getConfig().mcpServers;
+        if (Array.isArray(global))
+            add(normalizeSource(global));
+    }
+    catch {
+    }
+    add(parseFile(path.join(cwd, '.mcp.json')));
+    add(parseFile(path.join(cwd, '.orquesta', 'mcp.json')));
+    return Array.from(byName.values()).filter((s) => s.enabled !== false);
+}
+//# sourceMappingURL=mcp-config.js.map

package/dist/types/index.d.ts

@@ -128,6 +128,22 @@ export interface OrchestrationConfig {
     worktreeIsolation?: boolean;
     singleAgentMode?: boolean;
 }
+export interface McpServerConfig {
+    name: string;
+    command?: string;
+    args?: string[];
+    env?: Record<string, string>;
+    cwd?: string;
+    url?: string;
+    headers?: Record<string, string>;
+    enabled?: boolean;
+}
+export interface LspServerConfig {
+    id: string;
+    extensions: string[];
+    command: string;
+    args: string[];
+}
 export interface OpenConfig {
     version: string;
     currentEndpoint?: string;
@@ -143,6 +159,11 @@ export interface OpenConfig {
     safeEnvVars?: string[];
     orquesta?: OrquestaConfig;
     orchestration?: OrchestrationConfig;
+    mcpServers?: McpServerConfig[];
+    lspServers?: LspServerConfig[];
+    lsp?: {
+        enabled?: boolean;
+    };
 }
 export interface TodoItem {
     id: string;

package/dist/ui/components/PlanExecuteApp.js

@@ -640,6 +640,29 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo, resumeL
         if (key.ctrl && inputChar === 'o') {
             setShowLogFiles(prev => !prev);
         }
+        if (key.ctrl && inputChar === 's') {
+            if (showSessionBrowser ||
+                showSettings ||
+                showSetupWizard ||
+                fileBrowserState.showFileBrowser ||
+                commandBrowserState.showCommandBrowser ||
+                planExecutionState.askUserRequest ||
+                pendingToolApproval) {
+                return;
+            }
+            const text = input.trim();
+            if (text) {
+                if (isProcessing) {
+                    addLog({ type: 'user_input', content: `(⚡ steering now — picked up at next step) ${text}` });
+                    setPendingUserMessage(text);
+                    setInput('');
+                }
+                else {
+                    handleSubmitRef.current?.(text);
+                }
+            }
+            return;
+        }
     });
     const handleFileSelect = useCallback((filePaths) => {
         logger.debug('File selected', { filePaths });
@@ -1486,14 +1509,14 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo, resumeL
                             }
                             setInput(value);
                         }, onSubmit: handleSubmit, onHistoryPrev: isAnyPanelOpen ? undefined : handleHistoryPrev, onHistoryNext: isAnyPanelOpen ? undefined : handleHistoryNext, placeholder: isProcessing
-                            ? "AI is working..."
+                            ? "AI is working... (type + Ctrl+S to steer now)"
                             : showSessionBrowser
                                 ? "Select a session or press ESC..."
                                 : showSettings
                                     ? "Press ESC to close settings..."
                                     : showDocsBrowser
                                         ? "Select a doc source or press ESC..."
-                                        : "Type your message... (@ files, / commands, Alt+Enter newline)", focus: !showSessionBrowser && !showSettings && !showDocsBrowser && !planExecutionState.askUserRequest && updatePhase === 'hidden' })),
+                                        : "Type your message... (@ files, / commands, Alt+Enter newline, Ctrl+S send)", focus: !showSessionBrowser && !showSettings && !showDocsBrowser && !planExecutionState.askUserRequest && updatePhase === 'hidden' })),
                 input.length > 0 && (React.createElement(Text, { color: input.length > 4000 ? 'red' : input.length > 2000 ? 'yellow' : 'gray', dimColor: true }, input.length.toLocaleString())))),
         fileBrowserState.showFileBrowser && !isProcessing && (React.createElement(Box, { marginTop: 0 }, fileBrowserState.isLoadingFiles ? (React.createElement(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1 },
             React.createElement(Spinner, { type: "dots" }),

package/dist/ui/hooks/slashCommandProcessor.js

@@ -8,6 +8,14 @@ export const SLASH_COMMANDS = [
         name: '/clear',
         description: 'Clear conversation and TODOs',
     },
+    {
+        name: '/undo',
+        description: 'Revert the file changes from the last turn',
+    },
+    {
+        name: '/redo',
+        description: 'Re-apply the changes undone by /undo',
+    },
     {
         name: '/compact',
         description: 'Compact conversation to free up context',
@@ -49,6 +57,15 @@ export const SLASH_COMMANDS = [
         description: 'Enable/disable optional tools (Browser, Background)',
         aliases: ['/tools'],
     },
+    {
+        name: '/mcp',
+        description: 'List connected MCP servers and their tools',
+    },
+    {
+        name: '/lsp',
+        description: 'LSP diagnostics after edits: status | on | off',
+        argsHint: 'on | off',
+    },
     {
         name: '/usage',
         description: 'Show token usage statistics',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orquesta-cli",
-  "version": "0.2.108",
+  "version": "0.2.112",
   "description": "Orquesta CLI - AI-powered coding assistant with team collaboration",
   "type": "module",
   "main": "dist/index.js",
@@ -92,6 +92,7 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.32.1",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "axios": "^1.6.2",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",