@pentoshi/clai 4.8.4 → 4.9.0
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/README.md +69 -3
- package/dist/agent/finalize-gate.js +0 -9
- package/dist/agent/finalize-gate.js.map +1 -1
- package/dist/agent/plan-mode-reminders.js +5 -5
- package/dist/agent/plan-mode-reminders.js.map +1 -1
- package/dist/agent/plan-tool.d.ts +1 -0
- package/dist/agent/plan-tool.js +50 -21
- package/dist/agent/plan-tool.js.map +1 -1
- package/dist/agent/reliability-policy.d.ts +9 -0
- package/dist/agent/reliability-policy.js +36 -1
- package/dist/agent/reliability-policy.js.map +1 -1
- package/dist/agent/runner.d.ts +4 -0
- package/dist/agent/runner.js +193 -116
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/task-analyzer.d.ts +8 -18
- package/dist/agent/task-analyzer.js +75 -182
- package/dist/agent/task-analyzer.js.map +1 -1
- package/dist/agent/task-evidence.js +10 -0
- package/dist/agent/task-evidence.js.map +1 -1
- package/dist/agent/tool-call-parser.js +14 -13
- package/dist/agent/tool-call-parser.js.map +1 -1
- package/dist/app/adapters/current-agent-adapter.d.ts +5 -1
- package/dist/app/adapters/current-agent-adapter.js +2 -1
- package/dist/app/adapters/current-agent-adapter.js.map +1 -1
- package/dist/app/commands/catalog.js +5 -0
- package/dist/app/commands/catalog.js.map +1 -1
- package/dist/app/controllers/session-compact-helper.js +3 -6
- package/dist/app/controllers/session-compact-helper.js.map +1 -1
- package/dist/app/ports/transcript-item.d.ts +4 -0
- package/dist/classic/app/ClassicApp.js +1 -1
- package/dist/classic/app/ClassicApp.js.map +1 -1
- package/dist/classic/app/action-handlers.js +4 -0
- package/dist/classic/app/action-handlers.js.map +1 -1
- package/dist/classic/app/app-wiring.js +1 -0
- package/dist/classic/app/app-wiring.js.map +1 -1
- package/dist/classic/app/wiring-lifecycle.js +1 -0
- package/dist/classic/app/wiring-lifecycle.js.map +1 -1
- package/dist/classic/blocks/compacted-lines.js +3 -0
- package/dist/classic/blocks/compacted-lines.js.map +1 -1
- package/dist/classic/blocks/thinking-lines.js +11 -2
- package/dist/classic/blocks/thinking-lines.js.map +1 -1
- package/dist/classic/bootstrap/start-classic.js +3 -0
- package/dist/classic/bootstrap/start-classic.js.map +1 -1
- package/dist/classic/chrome/Composer.d.ts +6 -0
- package/dist/classic/chrome/Composer.js +2 -3
- package/dist/classic/chrome/Composer.js.map +1 -1
- package/dist/classic/chrome/composer-controller.d.ts +6 -1
- package/dist/classic/chrome/composer-controller.js +18 -8
- package/dist/classic/chrome/composer-controller.js.map +1 -1
- package/dist/classic/chrome/editor-view.d.ts +2 -1
- package/dist/classic/chrome/editor-view.js +1 -1
- package/dist/classic/chrome/editor-view.js.map +1 -1
- package/dist/classic/chrome/status-rows.js +3 -2
- package/dist/classic/chrome/status-rows.js.map +1 -1
- package/dist/classic/panels/TextEditorPanel.d.ts +3 -0
- package/dist/classic/panels/TextEditorPanel.js +7 -0
- package/dist/classic/panels/TextEditorPanel.js.map +1 -0
- package/dist/classic/panels/panel-controller.js +28 -1
- package/dist/classic/panels/panel-controller.js.map +1 -1
- package/dist/classic/panels/panel-effect.d.ts +3 -0
- package/dist/classic/panels/panel-effect.js.map +1 -1
- package/dist/classic/panels/panel-effects.js +3 -0
- package/dist/classic/panels/panel-effects.js.map +1 -1
- package/dist/classic/panels/panel-host.js +3 -0
- package/dist/classic/panels/panel-host.js.map +1 -1
- package/dist/classic/panels/panel-types.d.ts +2 -0
- package/dist/classic/panels/secret-panel.d.ts +1 -1
- package/dist/classic/panels/secret-panel.js +4 -2
- package/dist/classic/panels/secret-panel.js.map +1 -1
- package/dist/classic/panels/text-editor-panel.d.ts +33 -0
- package/dist/classic/panels/text-editor-panel.js +101 -0
- package/dist/classic/panels/text-editor-panel.js.map +1 -0
- package/dist/llm/adapters/anthropic-tools.d.ts +2 -1
- package/dist/llm/adapters/anthropic-tools.js +55 -4
- package/dist/llm/adapters/anthropic-tools.js.map +1 -1
- package/dist/llm/anthropic.js +1 -1
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/aws-mantle.js +2 -0
- package/dist/llm/aws-mantle.js.map +1 -1
- package/dist/llm/meta.js +62 -68
- package/dist/llm/meta.js.map +1 -1
- package/dist/llm/provider.js +7 -7
- package/dist/llm/request-plan.js +7 -2
- package/dist/llm/request-plan.js.map +1 -1
- package/dist/llm/tool-protocol.d.ts +1 -0
- package/dist/llm/tool-protocol.js +7 -0
- package/dist/llm/tool-protocol.js.map +1 -1
- package/dist/mcp/client.d.ts +27 -0
- package/dist/mcp/client.js +119 -0
- package/dist/mcp/client.js.map +1 -0
- package/dist/mcp/config-file.d.ts +35 -0
- package/dist/mcp/config-file.js +217 -0
- package/dist/mcp/config-file.js.map +1 -0
- package/dist/mcp/discovery.d.ts +4 -0
- package/dist/mcp/discovery.js +409 -0
- package/dist/mcp/discovery.js.map +1 -0
- package/dist/mcp/format.d.ts +17 -0
- package/dist/mcp/format.js +122 -0
- package/dist/mcp/format.js.map +1 -0
- package/dist/mcp/index.d.ts +15 -0
- package/dist/mcp/index.js +16 -0
- package/dist/mcp/index.js.map +1 -0
- package/dist/mcp/jsonrpc.d.ts +40 -0
- package/dist/mcp/jsonrpc.js +175 -0
- package/dist/mcp/jsonrpc.js.map +1 -0
- package/dist/mcp/manager.d.ts +36 -0
- package/dist/mcp/manager.js +300 -0
- package/dist/mcp/manager.js.map +1 -0
- package/dist/mcp/mentions.d.ts +9 -0
- package/dist/mcp/mentions.js +44 -0
- package/dist/mcp/mentions.js.map +1 -0
- package/dist/mcp/names.d.ts +15 -0
- package/dist/mcp/names.js +59 -0
- package/dist/mcp/names.js.map +1 -0
- package/dist/mcp/results.d.ts +6 -0
- package/dist/mcp/results.js +182 -0
- package/dist/mcp/results.js.map +1 -0
- package/dist/mcp/runtime.d.ts +107 -0
- package/dist/mcp/runtime.js +505 -0
- package/dist/mcp/runtime.js.map +1 -0
- package/dist/mcp/substitution.d.ts +13 -0
- package/dist/mcp/substitution.js +74 -0
- package/dist/mcp/substitution.js.map +1 -0
- package/dist/mcp/transport-http.d.ts +53 -0
- package/dist/mcp/transport-http.js +433 -0
- package/dist/mcp/transport-http.js.map +1 -0
- package/dist/mcp/transport-stdio.d.ts +39 -0
- package/dist/mcp/transport-stdio.js +268 -0
- package/dist/mcp/transport-stdio.js.map +1 -0
- package/dist/mcp/transport.d.ts +20 -0
- package/dist/mcp/transport.js +44 -0
- package/dist/mcp/transport.js.map +1 -0
- package/dist/mcp/types.d.ts +179 -0
- package/dist/mcp/types.js +30 -0
- package/dist/mcp/types.js.map +1 -0
- package/dist/mcp/validation.d.ts +16 -0
- package/dist/mcp/validation.js +222 -0
- package/dist/mcp/validation.js.map +1 -0
- package/dist/modes/agent.d.ts +2 -0
- package/dist/modes/agent.js.map +1 -1
- package/dist/noninteractive/start-noninteractive.js +4 -0
- package/dist/noninteractive/start-noninteractive.js.map +1 -1
- package/dist/prompts/embedded.js +2 -2
- package/dist/prompts/embedded.js.map +1 -1
- package/dist/prompts/index.d.ts +3 -0
- package/dist/prompts/index.js +70 -55
- package/dist/prompts/index.js.map +1 -1
- package/dist/prompts/system.agent.md +34 -10
- package/dist/prompts/system.ask.md +8 -0
- package/dist/safety/classifier.js +4 -0
- package/dist/safety/classifier.js.map +1 -1
- package/dist/store/logs.js +17 -6
- package/dist/store/logs.js.map +1 -1
- package/dist/store/plan.d.ts +2 -0
- package/dist/store/plan.js.map +1 -1
- package/dist/store/session-workspace.js +2 -1
- package/dist/store/session-workspace.js.map +1 -1
- package/dist/tools/definitions.js +18 -0
- package/dist/tools/definitions.js.map +1 -1
- package/dist/tools/external-tools.d.ts +30 -0
- package/dist/tools/external-tools.js +52 -0
- package/dist/tools/external-tools.js.map +1 -0
- package/dist/tools/registry.js +36 -5
- package/dist/tools/registry.js.map +1 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.js +3 -0
- package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
- package/dist/tui-v2/components/completion/completion-menu.d.ts +4 -6
- package/dist/tui-v2/components/completion/completion-menu.js +34 -16
- package/dist/tui-v2/components/completion/completion-menu.js.map +1 -1
- package/dist/tui-v2/components/composer/composer-input-box.js +3 -1
- package/dist/tui-v2/components/composer/composer-input-box.js.map +1 -1
- package/dist/tui-v2/components/modal/secret-modal.js +6 -4
- package/dist/tui-v2/components/modal/secret-modal.js.map +1 -1
- package/dist/tui-v2/components/modal/text-editor-modal.d.ts +19 -0
- package/dist/tui-v2/components/modal/text-editor-modal.js +85 -0
- package/dist/tui-v2/components/modal/text-editor-modal.js.map +1 -0
- package/dist/tui-v2/components/overlay/overlay-host.js +2 -1
- package/dist/tui-v2/components/overlay/overlay-host.js.map +1 -1
- package/dist/tui-v2/components/transcript/compacted-row.js +12 -3
- package/dist/tui-v2/components/transcript/compacted-row.js.map +1 -1
- package/dist/tui-v2/components/transcript/thinking-block.d.ts +9 -1
- package/dist/tui-v2/components/transcript/thinking-block.js +253 -49
- package/dist/tui-v2/components/transcript/thinking-block.js.map +1 -1
- package/dist/tui-v2/components/transcript/thinking-presentation.d.ts +46 -0
- package/dist/tui-v2/components/transcript/thinking-presentation.js +84 -0
- package/dist/tui-v2/components/transcript/thinking-presentation.js.map +1 -0
- package/dist/tui-v2/components/transcript/transcript-row.d.ts +2 -0
- package/dist/tui-v2/components/transcript/transcript-row.js +7 -2
- package/dist/tui-v2/components/transcript/transcript-row.js.map +1 -1
- package/dist/tui-v2/components/transcript/transcript-view.js +195 -83
- package/dist/tui-v2/components/transcript/transcript-view.js.map +1 -1
- package/dist/tui-v2/composer/composer-editor.js +54 -39
- package/dist/tui-v2/composer/composer-editor.js.map +1 -1
- package/dist/tui-v2/composer/composer-highlight.d.ts +20 -0
- package/dist/tui-v2/composer/composer-highlight.js +97 -0
- package/dist/tui-v2/composer/composer-highlight.js.map +1 -0
- package/dist/tui-v2/composer/textarea-keybindings.d.ts +5 -0
- package/dist/tui-v2/composer/textarea-keybindings.js +12 -0
- package/dist/tui-v2/composer/textarea-keybindings.js.map +1 -1
- package/dist/ui/mentions.js +4 -1
- package/dist/ui/mentions.js.map +1 -1
- package/dist/ui-core/actions/action-id.d.ts +1 -1
- package/dist/ui-core/actions/action-id.js +1 -0
- package/dist/ui-core/actions/action-id.js.map +1 -1
- package/dist/ui-core/actions/format-shortcuts.js +5 -0
- package/dist/ui-core/actions/format-shortcuts.js.map +1 -1
- package/dist/ui-core/actions/keymap.js +3 -0
- package/dist/ui-core/actions/keymap.js.map +1 -1
- package/dist/ui-core/bootstrap/composition-root.d.ts +3 -0
- package/dist/ui-core/bootstrap/composition-root.js +5 -1
- package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
- package/dist/ui-core/commands/command-handlers.js +2 -0
- package/dist/ui-core/commands/command-handlers.js.map +1 -1
- package/dist/ui-core/commands/mcp-commands.d.ts +3 -0
- package/dist/ui-core/commands/mcp-commands.js +310 -0
- package/dist/ui-core/commands/mcp-commands.js.map +1 -0
- package/dist/ui-core/commands/picker-commands.d.ts +1 -1
- package/dist/ui-core/commands/picker-commands.js +2 -2
- package/dist/ui-core/commands/picker-commands.js.map +1 -1
- package/dist/ui-core/commands/session-commands.js +1 -0
- package/dist/ui-core/commands/session-commands.js.map +1 -1
- package/dist/ui-core/composer/completion-viewport.d.ts +40 -0
- package/dist/ui-core/composer/completion-viewport.js +105 -0
- package/dist/ui-core/composer/completion-viewport.js.map +1 -0
- package/dist/ui-core/controllers/overlay-controller.d.ts +24 -3
- package/dist/ui-core/controllers/overlay-controller.js +35 -4
- package/dist/ui-core/controllers/overlay-controller.js.map +1 -1
- package/dist/ui-core/rendering/artifact-pager-source.d.ts +1 -0
- package/dist/ui-core/rendering/artifact-pager-source.js +67 -1
- package/dist/ui-core/rendering/artifact-pager-source.js.map +1 -1
- package/dist/ui-core/rendering/duration.d.ts +3 -1
- package/dist/ui-core/rendering/duration.js +14 -0
- package/dist/ui-core/rendering/duration.js.map +1 -1
- package/dist/ui-core/rendering/exit-summary.js +4 -4
- package/dist/ui-core/rendering/format-help.js +4 -0
- package/dist/ui-core/rendering/format-help.js.map +1 -1
- package/dist/ui-core/rendering/intro-header.js +4 -4
- package/dist/ui-core/rendering/open-tool-output.js +90 -32
- package/dist/ui-core/rendering/open-tool-output.js.map +1 -1
- package/dist/ui-core/rendering/theme.d.ts +5 -3
- package/dist/ui-core/rendering/theme.js +8 -4
- package/dist/ui-core/rendering/theme.js.map +1 -1
- package/dist/ui-core/rendering/wordmark.d.ts +2 -2
- package/dist/ui-core/rendering/wordmark.js +62 -62
- package/dist/ui-core/rendering/wordmark.js.map +1 -1
- package/dist/ui-core/state/thinking-copy.d.ts +13 -0
- package/dist/ui-core/state/thinking-copy.js +33 -0
- package/dist/ui-core/state/thinking-copy.js.map +1 -0
- package/dist/ui-core/state/transcript-hydrate.js +20 -0
- package/dist/ui-core/state/transcript-hydrate.js.map +1 -1
- package/dist/ui-core/state/transcript-reducer.js +140 -62
- package/dist/ui-core/state/transcript-reducer.js.map +1 -1
- package/dist/ui-core/state/transcript-store.d.ts +10 -0
- package/dist/ui-core/state/transcript-store.js +235 -31
- package/dist/ui-core/state/transcript-store.js.map +1 -1
- package/dist/ui-core/state/transcript-types.d.ts +10 -0
- package/dist/ui-core/state/transcript-types.js +1 -0
- package/dist/ui-core/state/transcript-types.js.map +1 -1
- package/dist/ui-core/state/transcript-window.d.ts +32 -0
- package/dist/ui-core/state/transcript-window.js +63 -0
- package/dist/ui-core/state/transcript-window.js.map +1 -0
- package/dist/version.generated.d.ts +2 -2
- package/dist/version.generated.js +2 -2
- package/package.json +1 -1
- package/dist/tui-v2/composer/skill-highlight.d.ts +0 -3
- package/dist/tui-v2/composer/skill-highlight.js +0 -63
- package/dist/tui-v2/composer/skill-highlight.js.map +0 -1
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { McpTransportError } from "./transport.js";
|
|
2
|
+
export const MCP_MAX_FRAME_BYTES = 16 * 1024 * 1024;
|
|
3
|
+
export class JsonRpcError extends Error {
|
|
4
|
+
code;
|
|
5
|
+
data;
|
|
6
|
+
constructor(payload) {
|
|
7
|
+
super(payload.message);
|
|
8
|
+
this.name = "JsonRpcError";
|
|
9
|
+
this.code = payload.code;
|
|
10
|
+
this.data = payload.data;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
export function createRequest(id, method, params) {
|
|
14
|
+
return params === undefined
|
|
15
|
+
? { jsonrpc: "2.0", id, method }
|
|
16
|
+
: { jsonrpc: "2.0", id, method, params };
|
|
17
|
+
}
|
|
18
|
+
export function createNotification(method, params) {
|
|
19
|
+
return params === undefined
|
|
20
|
+
? { jsonrpc: "2.0", method }
|
|
21
|
+
: { jsonrpc: "2.0", method, params };
|
|
22
|
+
}
|
|
23
|
+
export function encodeMessage(message) {
|
|
24
|
+
return JSON.stringify(message);
|
|
25
|
+
}
|
|
26
|
+
export function encodeLine(message) {
|
|
27
|
+
return `${JSON.stringify(message)}\n`;
|
|
28
|
+
}
|
|
29
|
+
export function isJsonRpcResponse(value) {
|
|
30
|
+
if (typeof value !== "object" || value === null)
|
|
31
|
+
return false;
|
|
32
|
+
const record = value;
|
|
33
|
+
if (record.jsonrpc !== "2.0")
|
|
34
|
+
return false;
|
|
35
|
+
if (!("id" in record))
|
|
36
|
+
return false;
|
|
37
|
+
return "result" in record || "error" in record;
|
|
38
|
+
}
|
|
39
|
+
export function isJsonRpcSuccess(value) {
|
|
40
|
+
return "result" in value;
|
|
41
|
+
}
|
|
42
|
+
export function isJsonRpcFailure(value) {
|
|
43
|
+
return "error" in value;
|
|
44
|
+
}
|
|
45
|
+
export function isJsonRpcRequest(value) {
|
|
46
|
+
if (typeof value !== "object" || value === null)
|
|
47
|
+
return false;
|
|
48
|
+
const record = value;
|
|
49
|
+
return record.jsonrpc === "2.0" && typeof record.method === "string" && "id" in record;
|
|
50
|
+
}
|
|
51
|
+
export function isJsonRpcNotification(value) {
|
|
52
|
+
if (typeof value !== "object" || value === null)
|
|
53
|
+
return false;
|
|
54
|
+
const record = value;
|
|
55
|
+
return (record.jsonrpc === "2.0" &&
|
|
56
|
+
typeof record.method === "string" &&
|
|
57
|
+
!("id" in record));
|
|
58
|
+
}
|
|
59
|
+
export function parseMessage(line) {
|
|
60
|
+
const trimmed = line.trim();
|
|
61
|
+
if (trimmed.length === 0)
|
|
62
|
+
return undefined;
|
|
63
|
+
let parsed;
|
|
64
|
+
try {
|
|
65
|
+
parsed = JSON.parse(trimmed);
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
if (isJsonRpcResponse(parsed) ||
|
|
71
|
+
isJsonRpcRequest(parsed) ||
|
|
72
|
+
isJsonRpcNotification(parsed)) {
|
|
73
|
+
return parsed;
|
|
74
|
+
}
|
|
75
|
+
return undefined;
|
|
76
|
+
}
|
|
77
|
+
export function resultOrThrow(response) {
|
|
78
|
+
if (isJsonRpcFailure(response))
|
|
79
|
+
throw new JsonRpcError(response.error);
|
|
80
|
+
return response.result;
|
|
81
|
+
}
|
|
82
|
+
export class LineDecoder {
|
|
83
|
+
buffer = "";
|
|
84
|
+
decoder = new TextDecoder();
|
|
85
|
+
maxBytes;
|
|
86
|
+
constructor(maxBytes = MCP_MAX_FRAME_BYTES) {
|
|
87
|
+
this.maxBytes = maxBytes > 0 ? maxBytes : MCP_MAX_FRAME_BYTES;
|
|
88
|
+
}
|
|
89
|
+
push(chunk) {
|
|
90
|
+
this.buffer +=
|
|
91
|
+
typeof chunk === "string" ? chunk : this.decoder.decode(chunk, { stream: true });
|
|
92
|
+
const lines = [];
|
|
93
|
+
let index = this.buffer.indexOf("\n");
|
|
94
|
+
while (index !== -1) {
|
|
95
|
+
const line = this.buffer.slice(0, index).replace(/\r$/, "");
|
|
96
|
+
this.buffer = this.buffer.slice(index + 1);
|
|
97
|
+
if (line.length > 0)
|
|
98
|
+
lines.push(line);
|
|
99
|
+
index = this.buffer.indexOf("\n");
|
|
100
|
+
}
|
|
101
|
+
if (this.buffer.length > this.maxBytes) {
|
|
102
|
+
this.buffer = "";
|
|
103
|
+
throw new McpTransportError("too-large", `MCP message exceeded the ${this.maxBytes}-byte line framing limit before a newline arrived.`);
|
|
104
|
+
}
|
|
105
|
+
return lines;
|
|
106
|
+
}
|
|
107
|
+
flush() {
|
|
108
|
+
const remaining = this.buffer.replace(/\r$/, "");
|
|
109
|
+
this.buffer = "";
|
|
110
|
+
return remaining.length > 0 ? [remaining] : [];
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
export class SseDecoder {
|
|
114
|
+
buffer = "";
|
|
115
|
+
decoder = new TextDecoder();
|
|
116
|
+
maxBytes;
|
|
117
|
+
constructor(maxBytes = MCP_MAX_FRAME_BYTES) {
|
|
118
|
+
this.maxBytes = maxBytes > 0 ? maxBytes : MCP_MAX_FRAME_BYTES;
|
|
119
|
+
}
|
|
120
|
+
push(chunk) {
|
|
121
|
+
this.buffer +=
|
|
122
|
+
typeof chunk === "string" ? chunk : this.decoder.decode(chunk, { stream: true });
|
|
123
|
+
const events = [];
|
|
124
|
+
let boundary = this.nextBoundary();
|
|
125
|
+
while (boundary) {
|
|
126
|
+
const block = this.buffer.slice(0, boundary.index);
|
|
127
|
+
this.buffer = this.buffer.slice(boundary.index + boundary.length);
|
|
128
|
+
const parsed = this.parseBlock(block);
|
|
129
|
+
if (parsed)
|
|
130
|
+
events.push(parsed);
|
|
131
|
+
boundary = this.nextBoundary();
|
|
132
|
+
}
|
|
133
|
+
if (this.buffer.length > this.maxBytes) {
|
|
134
|
+
this.buffer = "";
|
|
135
|
+
throw new McpTransportError("too-large", `MCP SSE event exceeded the ${this.maxBytes}-byte framing limit before a boundary arrived.`);
|
|
136
|
+
}
|
|
137
|
+
return events;
|
|
138
|
+
}
|
|
139
|
+
nextBoundary() {
|
|
140
|
+
const lf = this.buffer.indexOf("\n\n");
|
|
141
|
+
const crlf = this.buffer.indexOf("\r\n\r\n");
|
|
142
|
+
if (lf === -1 && crlf === -1)
|
|
143
|
+
return undefined;
|
|
144
|
+
if (crlf !== -1 && (lf === -1 || crlf < lf)) {
|
|
145
|
+
return { index: crlf, length: 4 };
|
|
146
|
+
}
|
|
147
|
+
return { index: lf, length: 2 };
|
|
148
|
+
}
|
|
149
|
+
parseBlock(block) {
|
|
150
|
+
let event = "message";
|
|
151
|
+
const dataLines = [];
|
|
152
|
+
let id;
|
|
153
|
+
for (const rawLine of block.split(/\r?\n/)) {
|
|
154
|
+
if (rawLine.length === 0 || rawLine.startsWith(":"))
|
|
155
|
+
continue;
|
|
156
|
+
const colon = rawLine.indexOf(":");
|
|
157
|
+
const field = colon === -1 ? rawLine : rawLine.slice(0, colon);
|
|
158
|
+
let value = colon === -1 ? "" : rawLine.slice(colon + 1);
|
|
159
|
+
if (value.startsWith(" "))
|
|
160
|
+
value = value.slice(1);
|
|
161
|
+
if (field === "event")
|
|
162
|
+
event = value;
|
|
163
|
+
else if (field === "data")
|
|
164
|
+
dataLines.push(value);
|
|
165
|
+
else if (field === "id")
|
|
166
|
+
id = value;
|
|
167
|
+
}
|
|
168
|
+
if (dataLines.length === 0)
|
|
169
|
+
return undefined;
|
|
170
|
+
return id === undefined
|
|
171
|
+
? { event, data: dataLines.join("\n") }
|
|
172
|
+
: { event, data: dataLines.join("\n"), id };
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=jsonrpc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonrpc.js","sourceRoot":"","sources":["../../src/mcp/jsonrpc.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAEpD,MAAM,OAAO,YAAa,SAAQ,KAAK;IAC5B,IAAI,CAAS;IACb,IAAI,CAAU;IACvB,YAAY,OAA4B;QACtC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,UAAU,aAAa,CAC3B,EAAa,EACb,MAAc,EACd,MAAgB;IAEhB,OAAO,MAAM,KAAK,SAAS;QACzB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE;QAChC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,MAAgB;IAEhB,OAAO,MAAM,KAAK,SAAS;QACzB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE;QAC5B,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAuB;IACnD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAuB;IAChD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACpC,OAAO,QAAQ,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAsB;IACrD,OAAO,QAAQ,IAAI,KAAK,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAsB;IACrD,OAAO,OAAO,IAAI,KAAK,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,OAAO,MAAM,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,IAAI,MAAM,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,OAAO,CACL,MAAM,CAAC,OAAO,KAAK,KAAK;QACxB,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;QACjC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,CAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IACE,iBAAiB,CAAC,MAAM,CAAC;QACzB,gBAAgB,CAAC,MAAM,CAAC;QACxB,qBAAqB,CAAC,MAAM,CAAC,EAC7B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAyB;IACrD,IAAI,gBAAgB,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvE,OAAO,QAAQ,CAAC,MAAM,CAAC;AACzB,CAAC;AAED,MAAM,OAAO,WAAW;IACd,MAAM,GAAG,EAAE,CAAC;IACH,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAC5B,QAAQ,CAAS;IAElC,YAAY,WAAmB,mBAAmB;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAChE,CAAC;IAED,IAAI,CAAC,KAA0B;QAC7B,IAAI,CAAC,MAAM;YACT,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACnF,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,iBAAiB,CACzB,WAAW,EACX,4BAA4B,IAAI,CAAC,QAAQ,oDAAoD,CAC9F,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,CAAC;CACF;AAQD,MAAM,OAAO,UAAU;IACb,MAAM,GAAG,EAAE,CAAC;IACH,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAC5B,QAAQ,CAAS;IAElC,YAAY,WAAmB,mBAAmB;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAChE,CAAC;IAED,IAAI,CAAC,KAA0B;QAC7B,IAAI,CAAC,MAAM;YACT,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACnF,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,OAAO,QAAQ,EAAE,CAAC;YAChB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,MAAM;gBAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACjC,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,iBAAiB,CACzB,WAAW,EACX,8BAA8B,IAAI,CAAC,QAAQ,gDAAgD,CAC5F,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,YAAY;QAClB,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7C,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC;YAAE,OAAO,SAAS,CAAC;QAC/C,IAAI,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC;YAC5C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAClC,CAAC;IAEO,UAAU,CAAC,KAAa;QAC9B,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,IAAI,EAAsB,CAAC;QAC3B,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC/D,IAAI,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACzD,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,KAAK,KAAK,OAAO;gBAAE,KAAK,GAAG,KAAK,CAAC;iBAChC,IAAI,KAAK,KAAK,MAAM;gBAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC5C,IAAI,KAAK,KAAK,IAAI;gBAAE,EAAE,GAAG,KAAK,CAAC;QACtC,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC7C,OAAO,EAAE,KAAK,SAAS;YACrB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACvC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAChD,CAAC;CACF"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { type McpClientOptions } from "./client.js";
|
|
2
|
+
import { type McpTransport } from "./transport.js";
|
|
3
|
+
import type { McpDiscoveryOptions, McpDiscoveryResult, McpNormalizedResult, McpRequestOptions, McpServerDefinition, McpSnapshot, McpToolMetadata } from "./types.js";
|
|
4
|
+
export type McpTransportFactory = (definition: McpServerDefinition) => McpTransport;
|
|
5
|
+
export interface McpManagerOptions {
|
|
6
|
+
readonly discovery?: McpDiscoveryOptions | undefined;
|
|
7
|
+
readonly connectConcurrency?: number | undefined;
|
|
8
|
+
readonly connectTimeoutMs?: number | undefined;
|
|
9
|
+
readonly requestTimeoutMs?: number | undefined;
|
|
10
|
+
readonly transportFactory?: McpTransportFactory | undefined;
|
|
11
|
+
readonly clientOptions?: McpClientOptions | undefined;
|
|
12
|
+
}
|
|
13
|
+
export declare class McpManager {
|
|
14
|
+
private readonly options;
|
|
15
|
+
private readonly connections;
|
|
16
|
+
private discovery;
|
|
17
|
+
constructor(options?: McpManagerOptions);
|
|
18
|
+
private get connectTimeoutMs();
|
|
19
|
+
private get requestTimeoutMs();
|
|
20
|
+
private createTransport;
|
|
21
|
+
getDiscovery(): McpDiscoveryResult;
|
|
22
|
+
refresh(options?: {
|
|
23
|
+
force?: boolean;
|
|
24
|
+
}): Promise<McpSnapshot>;
|
|
25
|
+
forceRefresh(): Promise<McpSnapshot>;
|
|
26
|
+
reconnect(name: string): Promise<McpSnapshot>;
|
|
27
|
+
private connect;
|
|
28
|
+
private reconcileToolNames;
|
|
29
|
+
private disposeConnection;
|
|
30
|
+
closeAll(): Promise<void>;
|
|
31
|
+
snapshot(): McpSnapshot;
|
|
32
|
+
private toStatus;
|
|
33
|
+
getTool(name: string): McpToolMetadata | undefined;
|
|
34
|
+
listTools(): McpToolMetadata[];
|
|
35
|
+
callTool(name: string, args: Record<string, unknown>, options?: McpRequestOptions): Promise<McpNormalizedResult>;
|
|
36
|
+
}
|
|
@@ -0,0 +1,300 @@
|
|
|
1
|
+
import { discoverMcpServers } from "./discovery.js";
|
|
2
|
+
import { McpClient } from "./client.js";
|
|
3
|
+
import { redactSecrets } from "./format.js";
|
|
4
|
+
import { toToolMetadata } from "./results.js";
|
|
5
|
+
import { allocateWireNames, canonicalToolName, toolIdentity, } from "./names.js";
|
|
6
|
+
import { McpTransportError } from "./transport.js";
|
|
7
|
+
import { StdioTransport } from "./transport-stdio.js";
|
|
8
|
+
import { LegacySseTransport, StreamableHttpTransport, } from "./transport-http.js";
|
|
9
|
+
const DEFAULT_CONNECT_CONCURRENCY = 4;
|
|
10
|
+
const DEFAULT_CONNECT_TIMEOUT_MS = 30_000;
|
|
11
|
+
const DEFAULT_REQUEST_TIMEOUT_MS = 60_000;
|
|
12
|
+
async function runBounded(items, limit, worker) {
|
|
13
|
+
if (items.length === 0)
|
|
14
|
+
return;
|
|
15
|
+
let index = 0;
|
|
16
|
+
const size = Math.max(1, Math.min(limit, items.length));
|
|
17
|
+
const runners = Array.from({ length: size }, async () => {
|
|
18
|
+
while (index < items.length) {
|
|
19
|
+
const current = items[index++];
|
|
20
|
+
await worker(current);
|
|
21
|
+
}
|
|
22
|
+
});
|
|
23
|
+
await Promise.all(runners);
|
|
24
|
+
}
|
|
25
|
+
export class McpManager {
|
|
26
|
+
options;
|
|
27
|
+
connections = new Map();
|
|
28
|
+
discovery = {
|
|
29
|
+
servers: [],
|
|
30
|
+
shadowed: [],
|
|
31
|
+
invalid: [],
|
|
32
|
+
sources: [],
|
|
33
|
+
warnings: [],
|
|
34
|
+
};
|
|
35
|
+
constructor(options = {}) {
|
|
36
|
+
this.options = options;
|
|
37
|
+
}
|
|
38
|
+
get connectTimeoutMs() {
|
|
39
|
+
return this.options.connectTimeoutMs ?? DEFAULT_CONNECT_TIMEOUT_MS;
|
|
40
|
+
}
|
|
41
|
+
get requestTimeoutMs() {
|
|
42
|
+
return this.options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
|
|
43
|
+
}
|
|
44
|
+
createTransport(definition) {
|
|
45
|
+
if (this.options.transportFactory)
|
|
46
|
+
return this.options.transportFactory(definition);
|
|
47
|
+
const config = definition.config;
|
|
48
|
+
if (config.transport === "stdio") {
|
|
49
|
+
return new StdioTransport(config, { requestTimeoutMs: this.requestTimeoutMs });
|
|
50
|
+
}
|
|
51
|
+
const httpOptions = { requestTimeoutMs: this.requestTimeoutMs };
|
|
52
|
+
if (config.transport === "sse")
|
|
53
|
+
return new LegacySseTransport(config, httpOptions);
|
|
54
|
+
return new StreamableHttpTransport(config, httpOptions);
|
|
55
|
+
}
|
|
56
|
+
getDiscovery() {
|
|
57
|
+
return this.discovery;
|
|
58
|
+
}
|
|
59
|
+
async refresh(options = {}) {
|
|
60
|
+
this.discovery = discoverMcpServers(this.options.discovery ?? {});
|
|
61
|
+
const next = new Map();
|
|
62
|
+
for (const definition of this.discovery.servers)
|
|
63
|
+
next.set(definition.name, definition);
|
|
64
|
+
for (const [name, state] of [...this.connections]) {
|
|
65
|
+
if (!next.has(name)) {
|
|
66
|
+
await this.disposeConnection(state);
|
|
67
|
+
this.connections.delete(name);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
const toConnect = [];
|
|
71
|
+
for (const definition of this.discovery.servers) {
|
|
72
|
+
if (definition.disabled) {
|
|
73
|
+
const existing = this.connections.get(definition.name);
|
|
74
|
+
if (existing)
|
|
75
|
+
await this.disposeConnection(existing);
|
|
76
|
+
this.connections.set(definition.name, {
|
|
77
|
+
definition,
|
|
78
|
+
client: undefined,
|
|
79
|
+
status: "disabled",
|
|
80
|
+
tools: [],
|
|
81
|
+
detail: "disabled by configuration",
|
|
82
|
+
serverInfo: undefined,
|
|
83
|
+
protocolVersion: undefined,
|
|
84
|
+
});
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
const existing = this.connections.get(definition.name);
|
|
88
|
+
const reusable = existing !== undefined &&
|
|
89
|
+
existing.status === "ready" &&
|
|
90
|
+
existing.definition.signature === definition.signature &&
|
|
91
|
+
options.force !== true;
|
|
92
|
+
if (reusable) {
|
|
93
|
+
existing.definition = definition;
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
if (existing)
|
|
97
|
+
await this.disposeConnection(existing);
|
|
98
|
+
this.connections.set(definition.name, {
|
|
99
|
+
definition,
|
|
100
|
+
client: undefined,
|
|
101
|
+
status: "connecting",
|
|
102
|
+
tools: [],
|
|
103
|
+
detail: undefined,
|
|
104
|
+
serverInfo: undefined,
|
|
105
|
+
protocolVersion: undefined,
|
|
106
|
+
});
|
|
107
|
+
toConnect.push(definition);
|
|
108
|
+
}
|
|
109
|
+
await runBounded(toConnect, this.options.connectConcurrency ?? DEFAULT_CONNECT_CONCURRENCY, (definition) => this.connect(definition));
|
|
110
|
+
return this.snapshot();
|
|
111
|
+
}
|
|
112
|
+
forceRefresh() {
|
|
113
|
+
return this.refresh({ force: true });
|
|
114
|
+
}
|
|
115
|
+
async reconnect(name) {
|
|
116
|
+
const definition = this.discovery.servers.find((server) => server.name === name) ??
|
|
117
|
+
this.connections.get(name)?.definition;
|
|
118
|
+
if (!definition)
|
|
119
|
+
return this.snapshot();
|
|
120
|
+
const existing = this.connections.get(name);
|
|
121
|
+
if (existing)
|
|
122
|
+
await this.disposeConnection(existing);
|
|
123
|
+
if (definition.disabled) {
|
|
124
|
+
this.connections.set(name, {
|
|
125
|
+
definition,
|
|
126
|
+
client: undefined,
|
|
127
|
+
status: "disabled",
|
|
128
|
+
tools: [],
|
|
129
|
+
detail: "disabled by configuration",
|
|
130
|
+
serverInfo: undefined,
|
|
131
|
+
protocolVersion: undefined,
|
|
132
|
+
});
|
|
133
|
+
return this.snapshot();
|
|
134
|
+
}
|
|
135
|
+
this.connections.set(name, {
|
|
136
|
+
definition,
|
|
137
|
+
client: undefined,
|
|
138
|
+
status: "connecting",
|
|
139
|
+
tools: [],
|
|
140
|
+
detail: undefined,
|
|
141
|
+
serverInfo: undefined,
|
|
142
|
+
protocolVersion: undefined,
|
|
143
|
+
});
|
|
144
|
+
await this.connect(definition);
|
|
145
|
+
return this.snapshot();
|
|
146
|
+
}
|
|
147
|
+
async connect(definition) {
|
|
148
|
+
const state = this.connections.get(definition.name);
|
|
149
|
+
if (!state)
|
|
150
|
+
return;
|
|
151
|
+
let client;
|
|
152
|
+
try {
|
|
153
|
+
const transport = this.createTransport(definition);
|
|
154
|
+
client = new McpClient(transport, this.options.clientOptions ?? {});
|
|
155
|
+
const init = await client.initialize({ timeoutMs: this.connectTimeoutMs });
|
|
156
|
+
state.client = client;
|
|
157
|
+
state.serverInfo = init.serverInfo;
|
|
158
|
+
state.protocolVersion = init.protocolVersion;
|
|
159
|
+
try {
|
|
160
|
+
const descriptors = await client.listTools({ timeoutMs: this.connectTimeoutMs });
|
|
161
|
+
const selected = descriptors
|
|
162
|
+
.filter((descriptor) => definition.toolSelection === "all" ||
|
|
163
|
+
definition.toolSelection.includes(descriptor.name))
|
|
164
|
+
.filter((descriptor, index, list) => list.findIndex((candidate) => candidate.name === descriptor.name) === index)
|
|
165
|
+
.sort((a, b) => a.name.localeCompare(b.name));
|
|
166
|
+
const allocated = allocateWireNames(selected.map((descriptor) => ({
|
|
167
|
+
serverName: definition.name,
|
|
168
|
+
toolName: descriptor.name,
|
|
169
|
+
})));
|
|
170
|
+
state.tools = selected.map((descriptor) => toToolMetadata(definition.name, descriptor, allocated.get(toolIdentity(definition.name, descriptor.name))));
|
|
171
|
+
state.status = "ready";
|
|
172
|
+
state.detail = undefined;
|
|
173
|
+
}
|
|
174
|
+
catch (error) {
|
|
175
|
+
state.status = "degraded";
|
|
176
|
+
state.tools = [];
|
|
177
|
+
state.detail = describeError(error, definition.secretValues);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
catch (error) {
|
|
181
|
+
state.status = "error";
|
|
182
|
+
state.tools = [];
|
|
183
|
+
state.detail = describeError(error, definition.secretValues);
|
|
184
|
+
if (client)
|
|
185
|
+
await client.close().catch(() => undefined);
|
|
186
|
+
state.client = undefined;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
reconcileToolNames() {
|
|
190
|
+
const all = [...this.connections.values()].flatMap((state) => state.status === "ready"
|
|
191
|
+
? state.tools.map((tool) => ({
|
|
192
|
+
serverName: tool.serverName,
|
|
193
|
+
toolName: tool.toolName,
|
|
194
|
+
}))
|
|
195
|
+
: []);
|
|
196
|
+
const allocated = allocateWireNames(all);
|
|
197
|
+
for (const state of this.connections.values()) {
|
|
198
|
+
state.tools = state.tools.map((tool) => ({
|
|
199
|
+
...tool,
|
|
200
|
+
canonicalName: canonicalToolName(tool.serverName, tool.toolName),
|
|
201
|
+
wireName: allocated.get(toolIdentity(tool.serverName, tool.toolName)) ??
|
|
202
|
+
tool.wireName,
|
|
203
|
+
}));
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
async disposeConnection(state) {
|
|
207
|
+
const client = state.client;
|
|
208
|
+
state.client = undefined;
|
|
209
|
+
if (client)
|
|
210
|
+
await client.close().catch(() => undefined);
|
|
211
|
+
}
|
|
212
|
+
async closeAll() {
|
|
213
|
+
const states = [...this.connections.values()];
|
|
214
|
+
this.connections.clear();
|
|
215
|
+
await Promise.all(states.map((state) => this.disposeConnection(state)));
|
|
216
|
+
}
|
|
217
|
+
snapshot() {
|
|
218
|
+
this.reconcileToolNames();
|
|
219
|
+
const statuses = [];
|
|
220
|
+
const tools = [];
|
|
221
|
+
const byCanonical = new Map();
|
|
222
|
+
const byWire = new Map();
|
|
223
|
+
const ordered = [...this.connections.values()].sort((a, b) => a.definition.name.localeCompare(b.definition.name));
|
|
224
|
+
for (const state of ordered) {
|
|
225
|
+
statuses.push(this.toStatus(state));
|
|
226
|
+
if (state.status === "ready") {
|
|
227
|
+
for (const tool of state.tools) {
|
|
228
|
+
if (byCanonical.has(tool.canonicalName))
|
|
229
|
+
continue;
|
|
230
|
+
byCanonical.set(tool.canonicalName, tool);
|
|
231
|
+
byWire.set(tool.wireName, tool);
|
|
232
|
+
tools.push(tool);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
const snapshot = {
|
|
237
|
+
createdAt: Date.now(),
|
|
238
|
+
statuses: Object.freeze(statuses),
|
|
239
|
+
tools: Object.freeze(tools),
|
|
240
|
+
toolsByCanonicalName: byCanonical,
|
|
241
|
+
toolsByWireName: byWire,
|
|
242
|
+
shadowed: this.discovery.shadowed,
|
|
243
|
+
invalid: this.discovery.invalid,
|
|
244
|
+
};
|
|
245
|
+
return Object.freeze(snapshot);
|
|
246
|
+
}
|
|
247
|
+
toStatus(state) {
|
|
248
|
+
const base = {
|
|
249
|
+
name: state.definition.name,
|
|
250
|
+
status: state.status,
|
|
251
|
+
transport: state.definition.config.transport,
|
|
252
|
+
source: state.definition.source,
|
|
253
|
+
toolCount: state.tools.length,
|
|
254
|
+
signature: state.definition.signature,
|
|
255
|
+
};
|
|
256
|
+
return {
|
|
257
|
+
...base,
|
|
258
|
+
...(state.detail !== undefined ? { detail: state.detail } : {}),
|
|
259
|
+
...(state.serverInfo !== undefined ? { serverInfo: state.serverInfo } : {}),
|
|
260
|
+
...(state.protocolVersion !== undefined ? { protocolVersion: state.protocolVersion } : {}),
|
|
261
|
+
};
|
|
262
|
+
}
|
|
263
|
+
getTool(name) {
|
|
264
|
+
this.reconcileToolNames();
|
|
265
|
+
for (const state of this.connections.values()) {
|
|
266
|
+
if (state.status !== "ready")
|
|
267
|
+
continue;
|
|
268
|
+
const found = state.tools.find((tool) => tool.canonicalName === name || tool.wireName === name);
|
|
269
|
+
if (found)
|
|
270
|
+
return found;
|
|
271
|
+
}
|
|
272
|
+
return undefined;
|
|
273
|
+
}
|
|
274
|
+
listTools() {
|
|
275
|
+
return this.snapshot().tools.slice();
|
|
276
|
+
}
|
|
277
|
+
async callTool(name, args, options = {}) {
|
|
278
|
+
const tool = this.getTool(name);
|
|
279
|
+
if (!tool) {
|
|
280
|
+
throw new McpTransportError("protocol", `Unknown MCP tool "${name}".`);
|
|
281
|
+
}
|
|
282
|
+
const state = this.connections.get(tool.serverName);
|
|
283
|
+
if (!state || !state.client || state.status !== "ready") {
|
|
284
|
+
throw new McpTransportError("closed", `MCP server "${tool.serverName}" is not ready.`);
|
|
285
|
+
}
|
|
286
|
+
return await state.client.callTool(tool.toolName, args, {
|
|
287
|
+
timeoutMs: this.requestTimeoutMs,
|
|
288
|
+
...options,
|
|
289
|
+
});
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
function describeError(error, secretValues = []) {
|
|
293
|
+
const text = error instanceof McpTransportError
|
|
294
|
+
? `${error.kind}: ${error.message}`
|
|
295
|
+
: error instanceof Error
|
|
296
|
+
? error.message
|
|
297
|
+
: String(error);
|
|
298
|
+
return redactSecrets(text, secretValues);
|
|
299
|
+
}
|
|
300
|
+
//# sourceMappingURL=manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export interface McpMentionRange {
|
|
2
|
+
readonly start: number;
|
|
3
|
+
readonly end: number;
|
|
4
|
+
readonly name: string;
|
|
5
|
+
}
|
|
6
|
+
export declare function formatMcpToken(name: string): string;
|
|
7
|
+
export declare function hasMcpMentionSyntax(text: string): boolean;
|
|
8
|
+
export declare function findMcpMentions(text: string, known: ReadonlySet<string>): McpMentionRange[];
|
|
9
|
+
export declare function mcpMentionNames(text: string, known: ReadonlySet<string>): string[];
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
const TOKEN_RE = /(^|[^\w:/\\.-])@mcp:([A-Za-z0-9][A-Za-z0-9_.-]*)/g;
|
|
2
|
+
const TRAILING_PUNCTUATION = /[._-]+$/;
|
|
3
|
+
export function formatMcpToken(name) {
|
|
4
|
+
return `@mcp:${name}`;
|
|
5
|
+
}
|
|
6
|
+
export function hasMcpMentionSyntax(text) {
|
|
7
|
+
return text.includes("@mcp:");
|
|
8
|
+
}
|
|
9
|
+
function resolveName(raw, known) {
|
|
10
|
+
let candidate = raw;
|
|
11
|
+
while (candidate.length > 0) {
|
|
12
|
+
if (known.has(candidate))
|
|
13
|
+
return candidate;
|
|
14
|
+
const trimmed = candidate.replace(TRAILING_PUNCTUATION, "");
|
|
15
|
+
if (trimmed === candidate)
|
|
16
|
+
return undefined;
|
|
17
|
+
candidate = trimmed;
|
|
18
|
+
}
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
export function findMcpMentions(text, known) {
|
|
22
|
+
if (!text || known.size === 0 || !hasMcpMentionSyntax(text))
|
|
23
|
+
return [];
|
|
24
|
+
const out = [];
|
|
25
|
+
const pattern = new RegExp(TOKEN_RE.source, TOKEN_RE.flags);
|
|
26
|
+
let match;
|
|
27
|
+
while ((match = pattern.exec(text)) !== null) {
|
|
28
|
+
const lead = match[1] ?? "";
|
|
29
|
+
const raw = match[2] ?? "";
|
|
30
|
+
const name = resolveName(raw, known);
|
|
31
|
+
if (!name)
|
|
32
|
+
continue;
|
|
33
|
+
const start = match.index + lead.length;
|
|
34
|
+
out.push({ start, end: start + formatMcpToken(name).length, name });
|
|
35
|
+
}
|
|
36
|
+
return out;
|
|
37
|
+
}
|
|
38
|
+
export function mcpMentionNames(text, known) {
|
|
39
|
+
const seen = new Set();
|
|
40
|
+
for (const mention of findMcpMentions(text, known))
|
|
41
|
+
seen.add(mention.name);
|
|
42
|
+
return [...seen];
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=mentions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mentions.js","sourceRoot":"","sources":["../../src/mcp/mentions.ts"],"names":[],"mappings":"AAMA,MAAM,QAAQ,GAAG,mDAAmD,CAAC;AACrE,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAEvC,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,QAAQ,IAAI,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,WAAW,CAAC,GAAW,EAAE,KAA0B;IAC1D,IAAI,SAAS,GAAG,GAAG,CAAC;IACpB,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;QAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QAC5D,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC5C,SAAS,GAAG,OAAO,CAAC;IACtB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,IAAY,EACZ,KAA0B;IAE1B,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACvE,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,IAAI,KAA6B,CAAC;IAClC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,IAAY,EACZ,KAA0B;IAE1B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AACnB,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export declare const MCP_CANONICAL_PREFIX: "mcp.";
|
|
2
|
+
export declare const MCP_WIRE_PREFIX: "mcp_";
|
|
3
|
+
export declare const MCP_WIRE_MAX_LENGTH = 64;
|
|
4
|
+
export declare function canonicalToolName(serverName: string, toolName: string): string;
|
|
5
|
+
export declare function isCanonicalToolName(value: string): boolean;
|
|
6
|
+
export declare function toolIdentity(serverName: string, toolName: string): string;
|
|
7
|
+
export interface WireNameInput {
|
|
8
|
+
readonly serverName: string;
|
|
9
|
+
readonly toolName: string;
|
|
10
|
+
}
|
|
11
|
+
export declare class WireNameAllocator {
|
|
12
|
+
private readonly used;
|
|
13
|
+
assign(input: WireNameInput): string;
|
|
14
|
+
}
|
|
15
|
+
export declare function allocateWireNames(inputs: readonly WireNameInput[]): Map<string, string>;
|