centaurus-cli 2.9.0 → 2.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli-adapter.d.ts +78 -0
- package/dist/cli-adapter.d.ts.map +1 -1
- package/dist/cli-adapter.js +566 -165
- package/dist/cli-adapter.js.map +1 -1
- package/dist/config/build-config.d.ts +1 -1
- package/dist/config/build-config.js +1 -1
- package/dist/config/mcp-config-manager.d.ts +21 -0
- package/dist/config/mcp-config-manager.d.ts.map +1 -1
- package/dist/config/mcp-config-manager.js +184 -1
- package/dist/config/mcp-config-manager.js.map +1 -1
- package/dist/config/models.d.ts +1 -0
- package/dist/config/models.d.ts.map +1 -1
- package/dist/config/models.js +7 -2
- package/dist/config/models.js.map +1 -1
- package/dist/config/slash-commands.d.ts.map +1 -1
- package/dist/config/slash-commands.js +5 -3
- package/dist/config/slash-commands.js.map +1 -1
- package/dist/index.js +66 -11
- package/dist/index.js.map +1 -1
- package/dist/mcp/mcp-command-handler.d.ts +34 -3
- package/dist/mcp/mcp-command-handler.d.ts.map +1 -1
- package/dist/mcp/mcp-command-handler.js +171 -83
- package/dist/mcp/mcp-command-handler.js.map +1 -1
- package/dist/mcp/mcp-server-manager.d.ts.map +1 -1
- package/dist/mcp/mcp-server-manager.js +9 -23
- package/dist/mcp/mcp-server-manager.js.map +1 -1
- package/dist/mcp/mcp-tool-wrapper.d.ts.map +1 -1
- package/dist/mcp/mcp-tool-wrapper.js +42 -5
- package/dist/mcp/mcp-tool-wrapper.js.map +1 -1
- package/dist/services/ai-service-client.d.ts +6 -1
- package/dist/services/ai-service-client.d.ts.map +1 -1
- package/dist/services/ai-service-client.js +6 -6
- package/dist/services/ai-service-client.js.map +1 -1
- package/dist/services/api-client.d.ts +20 -0
- package/dist/services/api-client.d.ts.map +1 -1
- package/dist/services/api-client.js +35 -0
- package/dist/services/api-client.js.map +1 -1
- package/dist/services/input-detection-agent.d.ts +40 -0
- package/dist/services/input-detection-agent.d.ts.map +1 -0
- package/dist/services/input-detection-agent.js +213 -0
- package/dist/services/input-detection-agent.js.map +1 -0
- package/dist/services/input-requirement-detector.d.ts +28 -0
- package/dist/services/input-requirement-detector.d.ts.map +1 -0
- package/dist/services/input-requirement-detector.js +203 -0
- package/dist/services/input-requirement-detector.js.map +1 -0
- package/dist/services/monitored-shell-manager.d.ts +120 -0
- package/dist/services/monitored-shell-manager.d.ts.map +1 -0
- package/dist/services/monitored-shell-manager.js +239 -0
- package/dist/services/monitored-shell-manager.js.map +1 -0
- package/dist/services/session-quota-manager.d.ts +101 -0
- package/dist/services/session-quota-manager.d.ts.map +1 -0
- package/dist/services/session-quota-manager.js +242 -0
- package/dist/services/session-quota-manager.js.map +1 -0
- package/dist/services/shell-input-agent.d.ts +89 -0
- package/dist/services/shell-input-agent.d.ts.map +1 -0
- package/dist/services/shell-input-agent.js +361 -0
- package/dist/services/shell-input-agent.js.map +1 -0
- package/dist/services/sub-agent-manager.d.ts +139 -0
- package/dist/services/sub-agent-manager.d.ts.map +1 -0
- package/dist/services/sub-agent-manager.js +517 -0
- package/dist/services/sub-agent-manager.js.map +1 -0
- package/dist/tools/background-command.d.ts.map +1 -1
- package/dist/tools/background-command.js +33 -13
- package/dist/tools/background-command.js.map +1 -1
- package/dist/tools/command.d.ts.map +1 -1
- package/dist/tools/command.js +78 -4
- package/dist/tools/command.js.map +1 -1
- package/dist/tools/file-ops.d.ts.map +1 -1
- package/dist/tools/file-ops.js +33 -19
- package/dist/tools/file-ops.js.map +1 -1
- package/dist/tools/get-diff.d.ts.map +1 -1
- package/dist/tools/get-diff.js +5 -2
- package/dist/tools/get-diff.js.map +1 -1
- package/dist/tools/grep-search.d.ts.map +1 -1
- package/dist/tools/grep-search.js +41 -15
- package/dist/tools/grep-search.js.map +1 -1
- package/dist/tools/plan-mode.js +3 -3
- package/dist/tools/plan-mode.js.map +1 -1
- package/dist/tools/registry.js +1 -1
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/sub-agent.d.ts +9 -0
- package/dist/tools/sub-agent.d.ts.map +1 -0
- package/dist/tools/sub-agent.js +232 -0
- package/dist/tools/sub-agent.js.map +1 -0
- package/dist/tools/task-complete.d.ts.map +1 -1
- package/dist/tools/task-complete.js +14 -32
- package/dist/tools/task-complete.js.map +1 -1
- package/dist/ui/components/App.d.ts +45 -0
- package/dist/ui/components/App.d.ts.map +1 -1
- package/dist/ui/components/App.js +598 -95
- package/dist/ui/components/App.js.map +1 -1
- package/dist/ui/components/CircularSelectInput.d.ts +24 -0
- package/dist/ui/components/CircularSelectInput.d.ts.map +1 -0
- package/dist/ui/components/CircularSelectInput.js +71 -0
- package/dist/ui/components/CircularSelectInput.js.map +1 -0
- package/dist/ui/components/ErrorBoundary.d.ts +3 -2
- package/dist/ui/components/ErrorBoundary.d.ts.map +1 -1
- package/dist/ui/components/ErrorBoundary.js +29 -1
- package/dist/ui/components/ErrorBoundary.js.map +1 -1
- package/dist/ui/components/InputBox.d.ts +4 -0
- package/dist/ui/components/InputBox.d.ts.map +1 -1
- package/dist/ui/components/InputBox.js +40 -2
- package/dist/ui/components/InputBox.js.map +1 -1
- package/dist/ui/components/InteractiveShell.d.ts +6 -0
- package/dist/ui/components/InteractiveShell.d.ts.map +1 -1
- package/dist/ui/components/InteractiveShell.js +57 -6
- package/dist/ui/components/InteractiveShell.js.map +1 -1
- package/dist/ui/components/MCPAddScreen.d.ts +13 -0
- package/dist/ui/components/MCPAddScreen.d.ts.map +1 -0
- package/dist/ui/components/MCPAddScreen.js +54 -0
- package/dist/ui/components/MCPAddScreen.js.map +1 -0
- package/dist/ui/components/MCPListScreen.d.ts +17 -0
- package/dist/ui/components/MCPListScreen.d.ts.map +1 -0
- package/dist/ui/components/MCPListScreen.js +50 -0
- package/dist/ui/components/MCPListScreen.js.map +1 -0
- package/dist/ui/components/MCPServerListScreen.d.ts +16 -0
- package/dist/ui/components/MCPServerListScreen.d.ts.map +1 -0
- package/dist/ui/components/MCPServerListScreen.js +59 -0
- package/dist/ui/components/MCPServerListScreen.js.map +1 -0
- package/dist/ui/components/MonitorModeAIPanel.d.ts +23 -0
- package/dist/ui/components/MonitorModeAIPanel.d.ts.map +1 -0
- package/dist/ui/components/MonitorModeAIPanel.js +69 -0
- package/dist/ui/components/MonitorModeAIPanel.js.map +1 -0
- package/dist/ui/components/MultiLineInput.d.ts +13 -0
- package/dist/ui/components/MultiLineInput.d.ts.map +1 -0
- package/dist/ui/components/MultiLineInput.js +223 -0
- package/dist/ui/components/MultiLineInput.js.map +1 -0
- package/dist/ui/components/StatusBar.d.ts +2 -0
- package/dist/ui/components/StatusBar.d.ts.map +1 -1
- package/dist/ui/components/StatusBar.js +33 -2
- package/dist/ui/components/StatusBar.js.map +1 -1
- package/dist/ui/components/ToolExecutionMessage.d.ts.map +1 -1
- package/dist/ui/components/ToolExecutionMessage.js +271 -12
- package/dist/ui/components/ToolExecutionMessage.js.map +1 -1
- package/dist/ui/components/VersionUpdatePrompt.d.ts.map +1 -1
- package/dist/ui/components/VersionUpdatePrompt.js +3 -2
- package/dist/ui/components/VersionUpdatePrompt.js.map +1 -1
- package/dist/utils/editor-utils.d.ts +3 -3
- package/dist/utils/editor-utils.d.ts.map +1 -1
- package/dist/utils/editor-utils.js +15 -12
- package/dist/utils/editor-utils.js.map +1 -1
- package/dist/utils/input-classifier.d.ts.map +1 -1
- package/dist/utils/input-classifier.js +1 -0
- package/dist/utils/input-classifier.js.map +1 -1
- package/dist/utils/terminal-output.d.ts.map +1 -1
- package/dist/utils/terminal-output.js +198 -171
- package/dist/utils/terminal-output.js.map +1 -1
- package/package.json +2 -1
|
@@ -1,16 +1,47 @@
|
|
|
1
|
-
import { MCPConfigManager } from '../config/mcp-config-manager.js';
|
|
1
|
+
import { MCPConfigManager, MCPServerConfig } from '../config/mcp-config-manager.js';
|
|
2
2
|
import { MCPServerManager } from './mcp-server-manager.js';
|
|
3
3
|
import { ToolRegistry } from '../tools/registry.js';
|
|
4
4
|
export declare class MCPCommandHandler {
|
|
5
5
|
private mcpConfigManager;
|
|
6
6
|
private mcpServerManager;
|
|
7
7
|
private toolRegistry;
|
|
8
|
+
private onShowMCPAddScreen?;
|
|
9
|
+
private onShowMCPRemoveScreen?;
|
|
10
|
+
private onShowMCPEnableScreen?;
|
|
11
|
+
private onShowMCPDisableScreen?;
|
|
12
|
+
private onShowMCPListScreen?;
|
|
8
13
|
constructor(mcpConfigManager: MCPConfigManager, mcpServerManager: MCPServerManager, toolRegistry: ToolRegistry);
|
|
14
|
+
setOnShowMCPAddScreen(callback: () => void): void;
|
|
15
|
+
setOnShowMCPRemoveScreen(callback: (servers: MCPServerConfig[]) => void): void;
|
|
16
|
+
setOnShowMCPEnableScreen(callback: (servers: MCPServerConfig[]) => void): void;
|
|
17
|
+
setOnShowMCPDisableScreen(callback: (servers: MCPServerConfig[]) => void): void;
|
|
18
|
+
setOnShowMCPListScreen(callback: (servers: Array<{
|
|
19
|
+
name: string;
|
|
20
|
+
enabled: boolean;
|
|
21
|
+
status: 'connected' | 'disconnected' | 'error' | 'connecting';
|
|
22
|
+
tools: Array<{
|
|
23
|
+
name: string;
|
|
24
|
+
}>;
|
|
25
|
+
}>) => void): void;
|
|
9
26
|
initializeMCP(): Promise<void>;
|
|
10
27
|
handleCommand(args: string[]): Promise<string>;
|
|
11
28
|
private handleList;
|
|
12
|
-
private
|
|
29
|
+
private handleRemove;
|
|
30
|
+
private handleEnable;
|
|
31
|
+
private handleDisable;
|
|
13
32
|
private handleRefresh;
|
|
14
|
-
|
|
33
|
+
addServer(config: MCPServerConfig): {
|
|
34
|
+
success: boolean;
|
|
35
|
+
error?: string;
|
|
36
|
+
};
|
|
37
|
+
removeServer(name: string): void;
|
|
38
|
+
enableServer(name: string): void;
|
|
39
|
+
disableServer(name: string): void;
|
|
40
|
+
validateServerConfig(jsonString: string): {
|
|
41
|
+
valid: boolean;
|
|
42
|
+
config?: MCPServerConfig;
|
|
43
|
+
error?: string;
|
|
44
|
+
};
|
|
45
|
+
getConfigManager(): MCPConfigManager;
|
|
15
46
|
}
|
|
16
47
|
//# sourceMappingURL=mcp-command-handler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-command-handler.d.ts","sourceRoot":"","sources":["../../src/mcp/mcp-command-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-command-handler.d.ts","sourceRoot":"","sources":["../../src/mcp/mcp-command-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,qBAAa,iBAAiB;IAQtB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,YAAY;IATxB,OAAO,CAAC,kBAAkB,CAAC,CAAa;IACxC,OAAO,CAAC,qBAAqB,CAAC,CAAuC;IACrE,OAAO,CAAC,qBAAqB,CAAC,CAAuC;IACrE,OAAO,CAAC,sBAAsB,CAAC,CAAuC;IACtE,OAAO,CAAC,mBAAmB,CAAC,CAA8J;gBAG9K,gBAAgB,EAAE,gBAAgB,EAClC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY;IAItC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAIjD,wBAAwB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,GAAG,IAAI;IAI9E,wBAAwB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,GAAG,IAAI;IAI9E,yBAAyB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,GAAG,IAAI;IAI/E,sBAAsB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO,GAAG,YAAY,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,KAAK,IAAI,GAAG,IAAI;IAI7L,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B9B,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAqCpD,OAAO,CAAC,UAAU;IAiElB,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,aAAa;YAcP,aAAa;IA4F3B,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IASxE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIjC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAItG,gBAAgB,IAAI,gBAAgB;CAGvC"}
|
|
@@ -4,11 +4,32 @@ export class MCPCommandHandler {
|
|
|
4
4
|
mcpConfigManager;
|
|
5
5
|
mcpServerManager;
|
|
6
6
|
toolRegistry;
|
|
7
|
+
onShowMCPAddScreen;
|
|
8
|
+
onShowMCPRemoveScreen;
|
|
9
|
+
onShowMCPEnableScreen;
|
|
10
|
+
onShowMCPDisableScreen;
|
|
11
|
+
onShowMCPListScreen;
|
|
7
12
|
constructor(mcpConfigManager, mcpServerManager, toolRegistry) {
|
|
8
13
|
this.mcpConfigManager = mcpConfigManager;
|
|
9
14
|
this.mcpServerManager = mcpServerManager;
|
|
10
15
|
this.toolRegistry = toolRegistry;
|
|
11
16
|
}
|
|
17
|
+
// Callback setters for UI screens
|
|
18
|
+
setOnShowMCPAddScreen(callback) {
|
|
19
|
+
this.onShowMCPAddScreen = callback;
|
|
20
|
+
}
|
|
21
|
+
setOnShowMCPRemoveScreen(callback) {
|
|
22
|
+
this.onShowMCPRemoveScreen = callback;
|
|
23
|
+
}
|
|
24
|
+
setOnShowMCPEnableScreen(callback) {
|
|
25
|
+
this.onShowMCPEnableScreen = callback;
|
|
26
|
+
}
|
|
27
|
+
setOnShowMCPDisableScreen(callback) {
|
|
28
|
+
this.onShowMCPDisableScreen = callback;
|
|
29
|
+
}
|
|
30
|
+
setOnShowMCPListScreen(callback) {
|
|
31
|
+
this.onShowMCPListScreen = callback;
|
|
32
|
+
}
|
|
12
33
|
async initializeMCP() {
|
|
13
34
|
try {
|
|
14
35
|
// Auto-connect to configured servers
|
|
@@ -39,88 +60,119 @@ export class MCPCommandHandler {
|
|
|
39
60
|
return '## MCP (Model Context Protocol) Server Management\n\n' +
|
|
40
61
|
'Available subcommands:\n\n' +
|
|
41
62
|
'/mcp list - List configured MCP servers and tools\n' +
|
|
42
|
-
'/mcp desc - List servers and tools with descriptions\n' +
|
|
43
|
-
'/mcp status - Show connection status of all servers\n' +
|
|
44
63
|
'/mcp refresh - Restart all MCP servers\n' +
|
|
45
|
-
'/mcp
|
|
64
|
+
'/mcp add - Add a new MCP server\n' +
|
|
65
|
+
'/mcp remove - Remove an MCP server\n' +
|
|
66
|
+
'/mcp enable - Enable a disabled server\n' +
|
|
67
|
+
'/mcp disable - Disable an enabled server\n\n' +
|
|
46
68
|
'Type any subcommand for more details.';
|
|
47
69
|
}
|
|
48
70
|
switch (subcommand) {
|
|
49
71
|
case 'list':
|
|
50
|
-
return this.handleList(
|
|
51
|
-
case 'desc':
|
|
52
|
-
return this.handleList(true, false);
|
|
53
|
-
case 'status':
|
|
54
|
-
return this.handleStatus();
|
|
72
|
+
return this.handleList();
|
|
55
73
|
case 'refresh':
|
|
56
74
|
return await this.handleRefresh();
|
|
57
|
-
case '
|
|
58
|
-
|
|
75
|
+
case 'add':
|
|
76
|
+
if (this.onShowMCPAddScreen) {
|
|
77
|
+
this.onShowMCPAddScreen();
|
|
78
|
+
return ''; // UI will handle display
|
|
79
|
+
}
|
|
80
|
+
return '❌ MCP add screen not available. Please restart the CLI.';
|
|
81
|
+
case 'remove':
|
|
82
|
+
return this.handleRemove();
|
|
83
|
+
case 'enable':
|
|
84
|
+
return this.handleEnable();
|
|
85
|
+
case 'disable':
|
|
86
|
+
return this.handleDisable();
|
|
59
87
|
default:
|
|
60
88
|
return `❌ Unknown MCP subcommand: ${subcommand}\nType /mcp for help.`;
|
|
61
89
|
}
|
|
62
90
|
}
|
|
63
|
-
handleList(
|
|
91
|
+
handleList() {
|
|
64
92
|
const servers = this.mcpConfigManager.getAllServers();
|
|
65
93
|
if (servers.length === 0) {
|
|
66
94
|
return '## No MCP Servers Configured\n\n' +
|
|
67
95
|
`Configuration file: \`${this.mcpConfigManager.getConfigPath()}\`\n\n` +
|
|
68
|
-
'
|
|
69
|
-
'Use `/mcp config` for an example configuration.';
|
|
96
|
+
'Use `/mcp add` to add your first MCP server.';
|
|
70
97
|
}
|
|
98
|
+
// Prepare data for the list screen
|
|
99
|
+
const listData = servers.map(serverConfig => {
|
|
100
|
+
const statuses = this.mcpServerManager.getStatus(serverConfig.name);
|
|
101
|
+
const status = statuses[0];
|
|
102
|
+
const tools = status?.tools || [];
|
|
103
|
+
return {
|
|
104
|
+
name: serverConfig.name,
|
|
105
|
+
enabled: serverConfig.enabled !== false,
|
|
106
|
+
status: serverConfig.enabled === false ? 'disconnected' : (status?.status || 'disconnected'),
|
|
107
|
+
tools: tools.map(t => ({ name: t.name }))
|
|
108
|
+
};
|
|
109
|
+
});
|
|
110
|
+
if (this.onShowMCPListScreen) {
|
|
111
|
+
this.onShowMCPListScreen(listData);
|
|
112
|
+
return ''; // UI will handle display
|
|
113
|
+
}
|
|
114
|
+
// Fallback to text output if screen not available
|
|
71
115
|
let output = '## MCP Servers and Tools\n\n';
|
|
72
116
|
for (const serverConfig of servers) {
|
|
73
117
|
const statuses = this.mcpServerManager.getStatus(serverConfig.name);
|
|
74
118
|
const status = statuses[0];
|
|
75
119
|
const tools = status?.tools || [];
|
|
76
|
-
const statusIcon =
|
|
77
|
-
status?.status === '
|
|
78
|
-
|
|
120
|
+
const statusIcon = serverConfig.enabled === false ? '⏸️' :
|
|
121
|
+
status?.status === 'connected' ? '✅' :
|
|
122
|
+
status?.status === 'error' ? '❌' : '⚠️';
|
|
123
|
+
const enabledLabel = serverConfig.enabled === false ? ' (disabled)' : '';
|
|
124
|
+
output += `### ${statusIcon} ${serverConfig.name}${enabledLabel}\n\n`;
|
|
79
125
|
output += `- **Command**: \`${serverConfig.command}\`\n`;
|
|
80
|
-
|
|
126
|
+
if (serverConfig.args && serverConfig.args.length > 0) {
|
|
127
|
+
output += `- **Args**: \`${serverConfig.args.join(' ')}\`\n`;
|
|
128
|
+
}
|
|
129
|
+
output += `- **Status**: ${serverConfig.enabled === false ? 'disabled' : (status?.status || 'unknown')}\n`;
|
|
81
130
|
output += `- **Tools**: ${tools.length}\n\n`;
|
|
82
131
|
if (tools.length > 0) {
|
|
83
132
|
for (const tool of tools) {
|
|
84
133
|
output += ` - **${tool.name}**`;
|
|
85
|
-
if (
|
|
134
|
+
if (tool.description) {
|
|
86
135
|
output += `: ${tool.description}`;
|
|
87
136
|
}
|
|
88
137
|
output += '\n';
|
|
89
|
-
if (showSchema && tool.inputSchema) {
|
|
90
|
-
output += ' ```json\n';
|
|
91
|
-
output += ` ${JSON.stringify(tool.inputSchema, null, 2).replace(/\n/g, '\n ')}\n`;
|
|
92
|
-
output += ' ```\n';
|
|
93
|
-
}
|
|
94
138
|
}
|
|
95
139
|
output += '\n';
|
|
96
140
|
}
|
|
97
141
|
}
|
|
98
142
|
return output;
|
|
99
143
|
}
|
|
100
|
-
|
|
101
|
-
const
|
|
102
|
-
if (
|
|
103
|
-
return '
|
|
104
|
-
'Add servers to your MCP configuration and run `/mcp refresh`.\n\n' +
|
|
105
|
-
'Use `/mcp config` for more information.';
|
|
106
|
-
}
|
|
107
|
-
let output = '## MCP Server Status\n\n';
|
|
108
|
-
for (const status of statuses) {
|
|
109
|
-
const icon = status.status === 'connected' ? '✅' :
|
|
110
|
-
status.status === 'error' ? '❌' :
|
|
111
|
-
status.status === 'connecting' ? '⏳' : '⚠️';
|
|
112
|
-
output += `${icon} **${status.name}**: ${status.status}\n`;
|
|
113
|
-
if (status.error) {
|
|
114
|
-
output += ` Error: ${status.error}\n`;
|
|
115
|
-
}
|
|
116
|
-
if (status.uptime && status.status === 'connected') {
|
|
117
|
-
const minutes = Math.floor(status.uptime / 60);
|
|
118
|
-
const seconds = status.uptime % 60;
|
|
119
|
-
output += ` Uptime: ${minutes}m ${seconds}s\n`;
|
|
120
|
-
}
|
|
121
|
-
output += ` Tools: ${status.tools.length}\n\n`;
|
|
144
|
+
handleRemove() {
|
|
145
|
+
const servers = this.mcpConfigManager.getAllServers();
|
|
146
|
+
if (servers.length === 0) {
|
|
147
|
+
return '❌ No MCP servers to remove.\n\nUse `/mcp add` to add servers first.';
|
|
122
148
|
}
|
|
123
|
-
|
|
149
|
+
if (this.onShowMCPRemoveScreen) {
|
|
150
|
+
this.onShowMCPRemoveScreen(servers);
|
|
151
|
+
return ''; // UI will handle display
|
|
152
|
+
}
|
|
153
|
+
return '❌ MCP remove screen not available. Please restart the CLI.';
|
|
154
|
+
}
|
|
155
|
+
handleEnable() {
|
|
156
|
+
const disabledServers = this.mcpConfigManager.getAllServers().filter(s => s.enabled === false);
|
|
157
|
+
if (disabledServers.length === 0) {
|
|
158
|
+
return '✅ All MCP servers are already enabled.\n\nUse `/mcp list` to see all servers.';
|
|
159
|
+
}
|
|
160
|
+
if (this.onShowMCPEnableScreen) {
|
|
161
|
+
this.onShowMCPEnableScreen(disabledServers);
|
|
162
|
+
return ''; // UI will handle display
|
|
163
|
+
}
|
|
164
|
+
return '❌ MCP enable screen not available. Please restart the CLI.';
|
|
165
|
+
}
|
|
166
|
+
handleDisable() {
|
|
167
|
+
const enabledServers = this.mcpConfigManager.getAllServers().filter(s => s.enabled !== false);
|
|
168
|
+
if (enabledServers.length === 0) {
|
|
169
|
+
return '⚠️ All MCP servers are already disabled.\n\nUse `/mcp list` to see all servers.';
|
|
170
|
+
}
|
|
171
|
+
if (this.onShowMCPDisableScreen) {
|
|
172
|
+
this.onShowMCPDisableScreen(enabledServers);
|
|
173
|
+
return ''; // UI will handle display
|
|
174
|
+
}
|
|
175
|
+
return '❌ MCP disable screen not available. Please restart the CLI.';
|
|
124
176
|
}
|
|
125
177
|
async handleRefresh() {
|
|
126
178
|
try {
|
|
@@ -147,49 +199,85 @@ export class MCPCommandHandler {
|
|
|
147
199
|
// Continue with other servers
|
|
148
200
|
}
|
|
149
201
|
}
|
|
202
|
+
// Get all servers (including disabled ones) for comprehensive status
|
|
203
|
+
const allServers = this.mcpConfigManager.getAllServers();
|
|
150
204
|
const statuses = this.mcpServerManager.getStatus();
|
|
151
|
-
|
|
152
|
-
const
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
205
|
+
// Create a map for quick status lookup
|
|
206
|
+
const statusMap = new Map(statuses.map(s => [s.name, s]));
|
|
207
|
+
// Categorize servers
|
|
208
|
+
const connectedServers = [];
|
|
209
|
+
const disabledServers = [];
|
|
210
|
+
const errorServers = [];
|
|
211
|
+
for (const server of allServers) {
|
|
212
|
+
if (server.enabled === false) {
|
|
213
|
+
disabledServers.push(server.name);
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
const status = statusMap.get(server.name);
|
|
217
|
+
if (status?.status === 'connected') {
|
|
218
|
+
connectedServers.push(server.name);
|
|
219
|
+
}
|
|
220
|
+
else if (status?.status === 'error') {
|
|
221
|
+
errorServers.push(server.name);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
let output = '✓ MCP servers refreshed!\n\n';
|
|
226
|
+
// Connected & Enabled section
|
|
227
|
+
if (connectedServers.length > 0) {
|
|
228
|
+
output += `**Connected & Enabled** (${connectedServers.length}):\n`;
|
|
229
|
+
for (const name of connectedServers) {
|
|
230
|
+
output += ` - ${name}\n`;
|
|
231
|
+
}
|
|
232
|
+
output += '\n';
|
|
233
|
+
}
|
|
234
|
+
// Disabled section
|
|
235
|
+
if (disabledServers.length > 0) {
|
|
236
|
+
output += `**Disabled** (${disabledServers.length}):\n`;
|
|
237
|
+
for (const name of disabledServers) {
|
|
238
|
+
output += ` - ${name}\n`;
|
|
239
|
+
}
|
|
240
|
+
output += '\n';
|
|
241
|
+
}
|
|
242
|
+
// Errors section
|
|
243
|
+
if (errorServers.length > 0) {
|
|
244
|
+
output += `**Errors** (${errorServers.length}):\n`;
|
|
245
|
+
for (const name of errorServers) {
|
|
246
|
+
output += ` - ${name}\n`;
|
|
247
|
+
}
|
|
248
|
+
output += '\n';
|
|
249
|
+
}
|
|
250
|
+
output += `Use \`/mcp list\` for details.`;
|
|
251
|
+
return output;
|
|
157
252
|
}
|
|
158
253
|
catch (error) {
|
|
159
254
|
return `❌ Failed to refresh MCP servers: ${error.message}`;
|
|
160
255
|
}
|
|
161
256
|
}
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
'- `enabled`: Enable/disable server (default: true)\n\n' +
|
|
187
|
-
'### Next Steps\n\n' +
|
|
188
|
-
'1. Edit the configuration file\n' +
|
|
189
|
-
'2. Add your MCP servers to `mcp_servers`\n' +
|
|
190
|
-
'3. Run `/mcp refresh` to load them\n' +
|
|
191
|
-
'4. Use `/mcp status` to verify connections\n' +
|
|
192
|
-
'5. Use `/mcp list` to see available tools';
|
|
257
|
+
// Server management methods (called by CLI adapter after UI interaction)
|
|
258
|
+
addServer(config) {
|
|
259
|
+
try {
|
|
260
|
+
this.mcpConfigManager.addServer(config);
|
|
261
|
+
return { success: true };
|
|
262
|
+
}
|
|
263
|
+
catch (error) {
|
|
264
|
+
return { success: false, error: error.message };
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
removeServer(name) {
|
|
268
|
+
this.mcpConfigManager.removeServer(name);
|
|
269
|
+
}
|
|
270
|
+
enableServer(name) {
|
|
271
|
+
this.mcpConfigManager.enableServer(name);
|
|
272
|
+
}
|
|
273
|
+
disableServer(name) {
|
|
274
|
+
this.mcpConfigManager.disableServer(name);
|
|
275
|
+
}
|
|
276
|
+
validateServerConfig(jsonString) {
|
|
277
|
+
return this.mcpConfigManager.validateServerConfigJSON(jsonString);
|
|
278
|
+
}
|
|
279
|
+
getConfigManager() {
|
|
280
|
+
return this.mcpConfigManager;
|
|
193
281
|
}
|
|
194
282
|
}
|
|
195
283
|
//# sourceMappingURL=mcp-command-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-command-handler.js","sourceRoot":"","sources":["../../src/mcp/mcp-command-handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,OAAO,iBAAiB;
|
|
1
|
+
{"version":3,"file":"mcp-command-handler.js","sourceRoot":"","sources":["../../src/mcp/mcp-command-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-manager.d.ts","sourceRoot":"","sources":["../../src/mcp/mcp-server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGlE,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,GAAG,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO,GAAG,YAAY,CAAC;IAC9D,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,gBAAgB;IACzB,OAAO,CAAC,OAAO,CAA8F;IAC7G,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,UAAU,CAAkC;IAE9C,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-server-manager.d.ts","sourceRoot":"","sources":["../../src/mcp/mcp-server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGlE,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,GAAG,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,GAAG,cAAc,GAAG,OAAO,GAAG,YAAY,CAAC;IAC9D,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,gBAAgB;IACzB,OAAO,CAAC,OAAO,CAA8F;IAC7G,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,UAAU,CAAkC;IAE9C,OAAO,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA8D/C,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3C,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,eAAe,EAAE;IASjD,OAAO,CAAC,YAAY;IAWd,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBlD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAcvE,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAcxD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;CAI3C"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
2
2
|
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
|
|
3
|
-
import { spawn } from 'child_process';
|
|
4
3
|
import { logWarning } from '../utils/logger.js';
|
|
5
4
|
export class MCPServerManager {
|
|
6
5
|
servers = new Map();
|
|
@@ -14,29 +13,12 @@ export class MCPServerManager {
|
|
|
14
13
|
status: 'connecting',
|
|
15
14
|
tools: []
|
|
16
15
|
});
|
|
17
|
-
//
|
|
18
|
-
const serverProcess = spawn(config.command, config.args || [], {
|
|
19
|
-
env: { ...process.env, ...config.env },
|
|
20
|
-
stdio: ['pipe', 'pipe', 'pipe']
|
|
21
|
-
});
|
|
22
|
-
// Handle process errors
|
|
23
|
-
serverProcess.on('error', (error) => {
|
|
24
|
-
this.statuses.set(config.name, {
|
|
25
|
-
name: config.name,
|
|
26
|
-
status: 'error',
|
|
27
|
-
tools: [],
|
|
28
|
-
error: `Process error: ${error.message}`
|
|
29
|
-
});
|
|
30
|
-
});
|
|
31
|
-
serverProcess.stderr?.on('data', (data) => {
|
|
32
|
-
// Log stderr to file instead of console to keep UI clean
|
|
33
|
-
logWarning(`[MCP ${config.name}] stderr: ${data.toString().trim()}`);
|
|
34
|
-
});
|
|
35
|
-
// Create transport
|
|
16
|
+
// Create transport with stderr suppressed to prevent logs in terminal
|
|
36
17
|
const transport = new StdioClientTransport({
|
|
37
18
|
command: config.command,
|
|
38
19
|
args: config.args || [],
|
|
39
|
-
env: config.env
|
|
20
|
+
env: { ...process.env, ...config.env },
|
|
21
|
+
stderr: 'ignore' // Suppress stderr output to terminal
|
|
40
22
|
});
|
|
41
23
|
// Create client
|
|
42
24
|
const client = new Client({
|
|
@@ -54,8 +36,12 @@ export class MCPServerManager {
|
|
|
54
36
|
description: tool.description,
|
|
55
37
|
inputSchema: tool.inputSchema
|
|
56
38
|
}));
|
|
57
|
-
// Store client
|
|
58
|
-
this.servers.set(config.name, {
|
|
39
|
+
// Store client (transport manages the process internally)
|
|
40
|
+
this.servers.set(config.name, {
|
|
41
|
+
client,
|
|
42
|
+
process: transport.process, // Access internal process for cleanup
|
|
43
|
+
config
|
|
44
|
+
});
|
|
59
45
|
this.startTimes.set(config.name, Date.now());
|
|
60
46
|
// Update status
|
|
61
47
|
this.statuses.set(config.name, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server-manager.js","sourceRoot":"","sources":["../../src/mcp/mcp-server-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-server-manager.js","sourceRoot":"","sources":["../../src/mcp/mcp-server-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-tool-wrapper.d.ts","sourceRoot":"","sources":["../../src/mcp/mcp-tool-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAwB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-tool-wrapper.d.ts","sourceRoot":"","sources":["../../src/mcp/mcp-tool-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAwB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AA2CpE;;;GAGG;AACH,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,gBAAgB,GAChC,IAAI,CA6DN;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACjC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,OAAO,EAAE,EAChB,aAAa,EAAE,gBAAgB,GAChC,IAAI,EAAE,CAER"}
|
|
@@ -1,17 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Sanitize JSON Schema for Gemini compatibility
|
|
3
|
+
* Removes properties that Gemini doesn't support
|
|
4
|
+
*/
|
|
5
|
+
function sanitizeSchemaForGemini(schema) {
|
|
6
|
+
if (!schema || typeof schema !== 'object') {
|
|
7
|
+
return schema;
|
|
8
|
+
}
|
|
9
|
+
// Create a copy to avoid mutating the original
|
|
10
|
+
const sanitized = Array.isArray(schema) ? [...schema] : { ...schema };
|
|
11
|
+
// Remove unsupported properties
|
|
12
|
+
const unsupportedProps = [
|
|
13
|
+
'exclusiveMinimum',
|
|
14
|
+
'exclusiveMaximum',
|
|
15
|
+
'const',
|
|
16
|
+
'contentMediaType',
|
|
17
|
+
'contentEncoding',
|
|
18
|
+
'examples',
|
|
19
|
+
'$schema',
|
|
20
|
+
'$id',
|
|
21
|
+
'$ref',
|
|
22
|
+
'definitions',
|
|
23
|
+
'$defs'
|
|
24
|
+
];
|
|
25
|
+
for (const prop of unsupportedProps) {
|
|
26
|
+
delete sanitized[prop];
|
|
27
|
+
}
|
|
28
|
+
// Recursively sanitize nested objects
|
|
29
|
+
for (const key in sanitized) {
|
|
30
|
+
if (typeof sanitized[key] === 'object' && sanitized[key] !== null) {
|
|
31
|
+
sanitized[key] = sanitizeSchemaForGemini(sanitized[key]);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return sanitized;
|
|
35
|
+
}
|
|
1
36
|
/**
|
|
2
37
|
* Create a Tool wrapper for an MCP tool
|
|
3
38
|
* This allows MCP tools to be registered in the Centaurus tool registry
|
|
4
39
|
*/
|
|
5
40
|
export function createMCPToolWrapper(serverName, mcpTool, serverManager) {
|
|
41
|
+
// Sanitize the input schema to remove Gemini-incompatible properties
|
|
42
|
+
const sanitizedSchema = sanitizeSchemaForGemini(mcpTool.inputSchema || {
|
|
43
|
+
type: 'object',
|
|
44
|
+
properties: {},
|
|
45
|
+
required: []
|
|
46
|
+
});
|
|
6
47
|
return {
|
|
7
48
|
schema: {
|
|
8
49
|
name: `mcp_${serverName}_${mcpTool.name}`,
|
|
9
50
|
description: mcpTool.description || `${mcpTool.name} from ${serverName} MCP server`,
|
|
10
|
-
parameters:
|
|
11
|
-
type: 'object',
|
|
12
|
-
properties: {},
|
|
13
|
-
required: []
|
|
14
|
-
}
|
|
51
|
+
parameters: sanitizedSchema
|
|
15
52
|
},
|
|
16
53
|
async execute(args, context) {
|
|
17
54
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-tool-wrapper.js","sourceRoot":"","sources":["../../src/mcp/mcp-tool-wrapper.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,
|
|
1
|
+
{"version":3,"file":"mcp-tool-wrapper.js","sourceRoot":"","sources":["../../src/mcp/mcp-tool-wrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export interface Message {
|
|
|
15
15
|
tool_call_id?: string;
|
|
16
16
|
tool_calls?: ToolCall[];
|
|
17
17
|
thinking?: string;
|
|
18
|
+
thinkingSignature?: string;
|
|
18
19
|
}
|
|
19
20
|
/**
|
|
20
21
|
* Tool call from AI model
|
|
@@ -48,7 +49,11 @@ export interface ThoughtChunk {
|
|
|
48
49
|
type: 'thought';
|
|
49
50
|
content: string;
|
|
50
51
|
}
|
|
51
|
-
export
|
|
52
|
+
export interface ThinkingSignatureChunk {
|
|
53
|
+
type: 'thinking_signature';
|
|
54
|
+
signature: string;
|
|
55
|
+
}
|
|
56
|
+
export type StreamChunk = TextChunk | ToolCallChunk | DoneChunk | ErrorChunk | ThoughtChunk | ThinkingSignatureChunk;
|
|
52
57
|
/**
|
|
53
58
|
* AI Service Client for streaming chat requests to backend
|
|
54
59
|
*/
|