atom-lite 0.1.0 → 0.5.1
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/CHANGELOG.md +57 -0
- package/README.md +58 -10
- package/dist/agent/loop.d.ts +11 -0
- package/dist/agent/loop.js +238 -47
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/model-turn.d.ts +37 -0
- package/dist/agent/model-turn.js +53 -0
- package/dist/agent/model-turn.js.map +1 -0
- package/dist/agent/turn-recorder.d.ts +33 -0
- package/dist/agent/turn-recorder.js +74 -0
- package/dist/agent/turn-recorder.js.map +1 -0
- package/dist/agent/types.d.ts +4 -0
- package/dist/cli/activity.d.ts +45 -0
- package/dist/cli/activity.js +141 -0
- package/dist/cli/activity.js.map +1 -0
- package/dist/cli/app.js +1234 -378
- package/dist/cli/app.js.map +1 -1
- package/dist/cli/approval-prompt.d.ts +24 -0
- package/dist/cli/approval-prompt.js +82 -0
- package/dist/cli/approval-prompt.js.map +1 -0
- package/dist/cli/banner.d.ts +5 -1
- package/dist/cli/banner.js +10 -4
- package/dist/cli/banner.js.map +1 -1
- package/dist/cli/commands.d.ts +92 -14
- package/dist/cli/commands.js +330 -52
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/diff.d.ts +1 -0
- package/dist/cli/diff.js +28 -0
- package/dist/cli/diff.js.map +1 -0
- package/dist/cli/input.d.ts +2 -0
- package/dist/cli/input.js +10 -0
- package/dist/cli/input.js.map +1 -0
- package/dist/cli/main.js +2 -2
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/mouse.d.ts +54 -0
- package/dist/cli/mouse.js +86 -0
- package/dist/cli/mouse.js.map +1 -0
- package/dist/cli/palette.d.ts +41 -0
- package/dist/cli/palette.js +212 -0
- package/dist/cli/palette.js.map +1 -0
- package/dist/cli/panel.d.ts +29 -0
- package/dist/cli/panel.js +48 -0
- package/dist/cli/panel.js.map +1 -0
- package/dist/cli/picker.d.ts +8 -0
- package/dist/cli/picker.js +26 -28
- package/dist/cli/picker.js.map +1 -1
- package/dist/cli/status-line.d.ts +6 -0
- package/dist/cli/status-line.js +21 -7
- package/dist/cli/status-line.js.map +1 -1
- package/dist/cli/stream-text.d.ts +4 -8
- package/dist/cli/stream-text.js +26 -12
- package/dist/cli/stream-text.js.map +1 -1
- package/dist/cli/theme.d.ts +48 -0
- package/dist/cli/theme.js +160 -0
- package/dist/cli/theme.js.map +1 -0
- package/dist/cli/tool-box.d.ts +41 -0
- package/dist/cli/tool-box.js +177 -0
- package/dist/cli/tool-box.js.map +1 -0
- package/dist/cli/transcript.d.ts +24 -1
- package/dist/cli/transcript.js +65 -2
- package/dist/cli/transcript.js.map +1 -1
- package/dist/cli/trust-prompt.d.ts +24 -0
- package/dist/cli/trust-prompt.js +89 -0
- package/dist/cli/trust-prompt.js.map +1 -0
- package/dist/config/defaults.d.ts +12 -0
- package/dist/config/defaults.js +12 -0
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/load.d.ts +2 -0
- package/dist/config/load.js +36 -0
- package/dist/config/load.js.map +1 -1
- package/dist/config/paths.d.ts +2 -0
- package/dist/config/paths.js +12 -1
- package/dist/config/paths.js.map +1 -1
- package/dist/config/schema.d.ts +53 -0
- package/dist/config/schema.js +33 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/config/write.d.ts +2 -0
- package/dist/config/write.js +9 -0
- package/dist/config/write.js.map +1 -1
- package/dist/context/builder.d.ts +7 -0
- package/dist/context/builder.js +11 -0
- package/dist/context/builder.js.map +1 -0
- package/dist/context/manager.d.ts +17 -3
- package/dist/context/manager.js +129 -41
- package/dist/context/manager.js.map +1 -1
- package/dist/extensions/api.d.ts +101 -0
- package/dist/extensions/api.js +219 -0
- package/dist/extensions/api.js.map +1 -0
- package/dist/extensions/discovery.d.ts +42 -0
- package/dist/extensions/discovery.js +326 -0
- package/dist/extensions/discovery.js.map +1 -0
- package/dist/extensions/loader.d.ts +68 -0
- package/dist/extensions/loader.js +353 -0
- package/dist/extensions/loader.js.map +1 -0
- package/dist/extensions/session-manager.d.ts +44 -0
- package/dist/extensions/session-manager.js +137 -0
- package/dist/extensions/session-manager.js.map +1 -0
- package/dist/extensions/tool-adapter.d.ts +12 -0
- package/dist/extensions/tool-adapter.js +157 -0
- package/dist/extensions/tool-adapter.js.map +1 -0
- package/dist/extensions/trust.d.ts +6 -0
- package/dist/extensions/trust.js +55 -0
- package/dist/extensions/trust.js.map +1 -0
- package/dist/extensions/types.d.ts +94 -0
- package/dist/extensions/types.js +2 -0
- package/dist/extensions/types.js.map +1 -0
- package/dist/extensions/ui.d.ts +21 -0
- package/dist/extensions/ui.js +75 -0
- package/dist/extensions/ui.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/mcp/client.d.ts +73 -0
- package/dist/mcp/client.js +363 -0
- package/dist/mcp/client.js.map +1 -0
- package/dist/mcp/format.d.ts +3 -0
- package/dist/mcp/format.js +37 -0
- package/dist/mcp/format.js.map +1 -0
- package/dist/mcp/index.d.ts +6 -0
- package/dist/mcp/index.js +7 -0
- package/dist/mcp/index.js.map +1 -0
- package/dist/mcp/manager.d.ts +53 -0
- package/dist/mcp/manager.js +349 -0
- package/dist/mcp/manager.js.map +1 -0
- package/dist/mcp/stdio-transport.d.ts +26 -0
- package/dist/mcp/stdio-transport.js +174 -0
- package/dist/mcp/stdio-transport.js.map +1 -0
- package/dist/mcp/tools.d.ts +22 -0
- package/dist/mcp/tools.js +162 -0
- package/dist/mcp/tools.js.map +1 -0
- package/dist/mcp/types.d.ts +92 -0
- package/dist/mcp/types.js +2 -0
- package/dist/mcp/types.js.map +1 -0
- package/dist/providers/factory.js +1 -0
- package/dist/providers/factory.js.map +1 -1
- package/dist/runtime/executor.d.ts +2 -0
- package/dist/runtime/executor.js +4 -0
- package/dist/runtime/executor.js.map +1 -0
- package/dist/runtime/scheduler.d.ts +4 -3
- package/dist/runtime/scheduler.js +7 -98
- package/dist/runtime/scheduler.js.map +1 -1
- package/dist/runtime/tool-executor.d.ts +18 -0
- package/dist/runtime/tool-executor.js +126 -0
- package/dist/runtime/tool-executor.js.map +1 -0
- package/dist/security/process.d.ts +10 -0
- package/dist/security/process.js +36 -0
- package/dist/security/process.js.map +1 -1
- package/dist/sessions/events.d.ts +9 -0
- package/dist/sessions/events.js +11 -6
- package/dist/sessions/events.js.map +1 -1
- package/dist/sessions/history.d.ts +18 -0
- package/dist/sessions/history.js +76 -0
- package/dist/sessions/history.js.map +1 -0
- package/dist/sessions/index.d.ts +2 -0
- package/dist/sessions/index.js +2 -0
- package/dist/sessions/index.js.map +1 -1
- package/dist/sessions/search.d.ts +16 -0
- package/dist/sessions/search.js +136 -0
- package/dist/sessions/search.js.map +1 -0
- package/dist/sessions/store.js +7 -4
- package/dist/sessions/store.js.map +1 -1
- package/dist/tools/bash.js +6 -3
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/edit.js +2 -1
- package/dist/tools/edit.js.map +1 -1
- package/dist/tools/types.d.ts +6 -0
- package/dist/types.d.ts +2 -1
- package/dist/types.js.map +1 -1
- package/package.json +3 -1
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
import { checkApproval } from "../runtime/approvals.js";
|
|
2
|
+
export const MCP_APPROVAL_REQUIRED = "MCP_APPROVAL_REQUIRED";
|
|
3
|
+
export const MCP_CALL_FAILED = "MCP_CALL_FAILED";
|
|
4
|
+
export const MCP_APPROVAL_PREFIX = "mcp";
|
|
5
|
+
/**
|
|
6
|
+
* Wrap one discovered MCP tool as an Atom-lite `Tool`. The execution path is
|
|
7
|
+
* the same as built-ins: it receives the normal context, honours approval
|
|
8
|
+
* policy, and returns the normal result shape.
|
|
9
|
+
*/
|
|
10
|
+
export class McpTool {
|
|
11
|
+
manager;
|
|
12
|
+
tool;
|
|
13
|
+
definition;
|
|
14
|
+
constructor(manager, tool) {
|
|
15
|
+
this.manager = manager;
|
|
16
|
+
this.tool = tool;
|
|
17
|
+
this.definition = {
|
|
18
|
+
name: tool.name,
|
|
19
|
+
description: tool.description,
|
|
20
|
+
parameters: tool.inputSchema,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
async execute(call, ctx) {
|
|
24
|
+
const args = (call.arguments ?? {});
|
|
25
|
+
const current = this.manager
|
|
26
|
+
.tools()
|
|
27
|
+
.find((t) => t.server === this.tool.server &&
|
|
28
|
+
t.remoteName === this.tool.remoteName);
|
|
29
|
+
const requiresApproval = current?.requiresApproval ?? this.tool.requiresApproval;
|
|
30
|
+
const callTimeoutMs = current?.callTimeoutMs ?? this.tool.callTimeoutMs;
|
|
31
|
+
if (requiresApproval) {
|
|
32
|
+
const approvals = ctx.approvals;
|
|
33
|
+
const request = {
|
|
34
|
+
command: `${MCP_APPROVAL_PREFIX} ${this.tool.server}/${this.tool.remoteName} ${JSON.stringify(args)}`,
|
|
35
|
+
cwd: ctx.workspace,
|
|
36
|
+
timeoutMs: callTimeoutMs,
|
|
37
|
+
sandboxed: true,
|
|
38
|
+
};
|
|
39
|
+
if (!approvals) {
|
|
40
|
+
return {
|
|
41
|
+
toolCallId: call.id,
|
|
42
|
+
name: this.tool.name,
|
|
43
|
+
content: `${MCP_APPROVAL_REQUIRED}: approvals unavailable`,
|
|
44
|
+
isError: true,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
const decision = await checkApproval(approvals, request);
|
|
48
|
+
if (!decision.allowed) {
|
|
49
|
+
return {
|
|
50
|
+
toolCallId: call.id,
|
|
51
|
+
name: this.tool.name,
|
|
52
|
+
content: `${MCP_APPROVAL_REQUIRED}: ${this.tool.server}/${this.tool.remoteName}`,
|
|
53
|
+
isError: true,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
try {
|
|
58
|
+
const result = await this.manager.callTool(this.tool.server, this.tool.remoteName, args, { signal: ctx.signal });
|
|
59
|
+
return {
|
|
60
|
+
toolCallId: call.id,
|
|
61
|
+
name: this.tool.name,
|
|
62
|
+
content: summariseMcpResult(result),
|
|
63
|
+
isError: Boolean(result?.isError),
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
68
|
+
if (message === "USER_CANCELLED") {
|
|
69
|
+
return {
|
|
70
|
+
toolCallId: call.id,
|
|
71
|
+
name: this.tool.name,
|
|
72
|
+
content: "USER_CANCELLED",
|
|
73
|
+
isError: true,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
return {
|
|
77
|
+
toolCallId: call.id,
|
|
78
|
+
name: this.tool.name,
|
|
79
|
+
content: `${MCP_CALL_FAILED}: ${message}`,
|
|
80
|
+
isError: true,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
export function createMcpTools(manager) {
|
|
86
|
+
return manager.tools().map((tool) => new McpTool(manager, tool));
|
|
87
|
+
}
|
|
88
|
+
/** Map an MCP tool result into the single string Atom-lite tools use. */
|
|
89
|
+
export function summariseMcpResult(result) {
|
|
90
|
+
if (result == null)
|
|
91
|
+
return "";
|
|
92
|
+
if (typeof result !== "object")
|
|
93
|
+
return String(result);
|
|
94
|
+
const record = result;
|
|
95
|
+
if (Array.isArray(record.content)) {
|
|
96
|
+
const parts = record.content.map((part) => {
|
|
97
|
+
if (!part || typeof part !== "object")
|
|
98
|
+
return String(part);
|
|
99
|
+
const typed = part;
|
|
100
|
+
if (typed.type === "text" && typeof typed.text === "string") {
|
|
101
|
+
return typed.text;
|
|
102
|
+
}
|
|
103
|
+
if (typed.type === "image") {
|
|
104
|
+
const mime = typeof typed.mimeType === "string" ? typed.mimeType : "image";
|
|
105
|
+
const bytes = byteLengthOf(typed.data);
|
|
106
|
+
return `[${mime} ${bytes} bytes]`;
|
|
107
|
+
}
|
|
108
|
+
if (typed.type === "audio") {
|
|
109
|
+
const mime = typeof typed.mimeType === "string" ? typed.mimeType : "audio";
|
|
110
|
+
const bytes = byteLengthOf(typed.data);
|
|
111
|
+
return `[${mime} ${bytes} bytes]`;
|
|
112
|
+
}
|
|
113
|
+
if (typed.type === "resource") {
|
|
114
|
+
const resource = typed.resource;
|
|
115
|
+
if (resource && typeof resource === "object") {
|
|
116
|
+
const r = resource;
|
|
117
|
+
const mime = typeof r.mimeType === "string" ? r.mimeType : "resource";
|
|
118
|
+
const bytes = byteLengthOf(r.blob);
|
|
119
|
+
return `[${mime} ${bytes} bytes]`;
|
|
120
|
+
}
|
|
121
|
+
return "[resource]";
|
|
122
|
+
}
|
|
123
|
+
if (typed.type === "resource_link") {
|
|
124
|
+
return typeof typed.uri === "string"
|
|
125
|
+
? `[resource_link ${typed.uri}]`
|
|
126
|
+
: "[resource_link]";
|
|
127
|
+
}
|
|
128
|
+
if (typeof typed.type === "string") {
|
|
129
|
+
const mime = typeof typed.mimeType === "string" ? typed.mimeType : typed.type;
|
|
130
|
+
const bytes = byteLengthOf(typed.data ?? typed.blob);
|
|
131
|
+
if (bytes > 0)
|
|
132
|
+
return `[${mime} ${bytes} bytes]`;
|
|
133
|
+
return `[${typed.type}]`;
|
|
134
|
+
}
|
|
135
|
+
return `[${JSON.stringify(typed).slice(0, 120)}]`;
|
|
136
|
+
});
|
|
137
|
+
return parts.join("\n").trim();
|
|
138
|
+
}
|
|
139
|
+
if (typeof record.result === "string")
|
|
140
|
+
return record.result;
|
|
141
|
+
try {
|
|
142
|
+
return JSON.stringify(record);
|
|
143
|
+
}
|
|
144
|
+
catch {
|
|
145
|
+
return String(record);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
function byteLengthOf(value) {
|
|
149
|
+
if (typeof value === "string") {
|
|
150
|
+
// MCP image/audio data is base64.
|
|
151
|
+
try {
|
|
152
|
+
return Buffer.byteLength(value, "base64");
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
return Buffer.byteLength(value, "utf8");
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (value instanceof Uint8Array)
|
|
159
|
+
return value.byteLength;
|
|
160
|
+
return 0;
|
|
161
|
+
}
|
|
162
|
+
//# sourceMappingURL=tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/mcp/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAIxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAC7D,MAAM,CAAC,MAAM,eAAe,GAAG,iBAAiB,CAAC;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAEzC;;;;GAIG;AACH,MAAM,OAAO,OAAO;IAIC;IACA;IAJV,UAAU,CAAqB;IAExC,YACmB,OAAmB,EACnB,IAAkB;QADlB,YAAO,GAAP,OAAO,CAAY;QACnB,SAAI,GAAJ,IAAI,CAAc;QAEnC,IAAI,CAAC,UAAU,GAAG;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,WAAW;SAC7B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAc,EAAE,GAAgB;QAC5C,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAA4B,CAAC;QAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO;aACzB,KAAK,EAAE;aACP,IAAI,CACH,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM;YAC7B,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,UAAU,CACxC,CAAC;QACJ,MAAM,gBAAgB,GACpB,OAAO,EAAE,gBAAgB,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAC1D,MAAM,aAAa,GACjB,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;QAEpD,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;YAChC,MAAM,OAAO,GAAG;gBACd,OAAO,EAAE,GAAG,mBAAmB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACrG,GAAG,EAAE,GAAG,CAAC,SAAS;gBAClB,SAAS,EAAE,aAAa;gBACxB,SAAS,EAAE,IAAI;aAChB,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,EAAE;oBACnB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;oBACpB,OAAO,EAAE,GAAG,qBAAqB,yBAAyB;oBAC1D,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACzD,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,EAAE;oBACnB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;oBACpB,OAAO,EAAE,GAAG,qBAAqB,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBAChF,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CACxC,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,IAAI,CAAC,IAAI,CAAC,UAAU,EACpB,IAAI,EACJ,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CACvB,CAAC;YACF,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACpB,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC;gBACnC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;aAClC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GACX,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;gBACjC,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,EAAE;oBACnB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;oBACpB,OAAO,EAAE,gBAAgB;oBACzB,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACpB,OAAO,EAAE,GAAG,eAAe,KAAK,OAAO,EAAE;gBACzC,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,OAAmB;IAChD,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,kBAAkB,CAAC,MAAe;IAChD,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IAC9B,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,MAAiC,CAAC;IACjD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAAE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,IAA+B,CAAC;YAC9C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5D,OAAO,KAAK,CAAC,IAAI,CAAC;YACpB,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC3B,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;gBAChE,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACvC,OAAO,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC;YACpC,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC3B,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;gBAChE,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACvC,OAAO,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC;YACpC,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;gBAChC,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC7C,MAAM,CAAC,GAAG,QAAmC,CAAC;oBAC9C,MAAM,IAAI,GACR,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC;oBAC3D,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACnC,OAAO,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC;gBACpC,CAAC;gBACD,OAAO,YAAY,CAAC;YACtB,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACnC,OAAO,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ;oBAClC,CAAC,CAAC,kBAAkB,KAAK,CAAC,GAAG,GAAG;oBAChC,CAAC,CAAC,iBAAiB,CAAC;YACxB,CAAC;YACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACnC,MAAM,IAAI,GACR,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACnE,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,KAAK,GAAG,CAAC;oBAAE,OAAO,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC;gBACjD,OAAO,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC;YAC3B,CAAC;YACD,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IAC5D,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,kCAAkC;QAClC,IAAI,CAAC;YACH,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,IAAI,KAAK,YAAY,UAAU;QAAE,OAAO,KAAK,CAAC,UAAU,CAAC;IACzD,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import type { McpServerConfig } from "../config/schema.js";
|
|
2
|
+
export type { McpServerConfig };
|
|
3
|
+
export type JsonRpcId = number | string;
|
|
4
|
+
export interface JsonRpcRequest {
|
|
5
|
+
jsonrpc: "2.0";
|
|
6
|
+
id: JsonRpcId;
|
|
7
|
+
method: string;
|
|
8
|
+
params?: unknown;
|
|
9
|
+
}
|
|
10
|
+
export interface JsonRpcNotification {
|
|
11
|
+
jsonrpc: "2.0";
|
|
12
|
+
method: string;
|
|
13
|
+
params?: unknown;
|
|
14
|
+
}
|
|
15
|
+
export interface JsonRpcSuccess {
|
|
16
|
+
jsonrpc: "2.0";
|
|
17
|
+
id: JsonRpcId;
|
|
18
|
+
result: unknown;
|
|
19
|
+
}
|
|
20
|
+
export interface JsonRpcFailure {
|
|
21
|
+
jsonrpc: "2.0";
|
|
22
|
+
id: JsonRpcId;
|
|
23
|
+
error: {
|
|
24
|
+
code: number;
|
|
25
|
+
message: string;
|
|
26
|
+
data?: unknown;
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
export type JsonRpcMessage = JsonRpcRequest | JsonRpcNotification | JsonRpcSuccess | JsonRpcFailure;
|
|
30
|
+
export interface McpTransportCloseInfo {
|
|
31
|
+
code?: number | null;
|
|
32
|
+
signal?: string | null;
|
|
33
|
+
}
|
|
34
|
+
export interface McpTransportHandlers {
|
|
35
|
+
onMessage(message: unknown): void;
|
|
36
|
+
onError(error: Error): void;
|
|
37
|
+
onClose(info: McpTransportCloseInfo): void;
|
|
38
|
+
}
|
|
39
|
+
/** A bidirectional JSON-RPC carrier. Tests inject a fake; production uses stdio. */
|
|
40
|
+
export interface McpTransport {
|
|
41
|
+
start(): Promise<void>;
|
|
42
|
+
send(message: unknown): void;
|
|
43
|
+
close(): void | Promise<void>;
|
|
44
|
+
setHandlers(handlers: McpTransportHandlers): void;
|
|
45
|
+
/** Optional diagnostic text (stderr) for connection failures. */
|
|
46
|
+
stderrText?(): string;
|
|
47
|
+
}
|
|
48
|
+
export type McpTransportFactory = (serverName: string, config: McpServerConfig) => McpTransport;
|
|
49
|
+
export interface McpRemoteTool {
|
|
50
|
+
name: string;
|
|
51
|
+
description?: string;
|
|
52
|
+
inputSchema?: Record<string, unknown>;
|
|
53
|
+
}
|
|
54
|
+
/** A discovered tool after namespacing and policy decoration. */
|
|
55
|
+
export interface McpToolState {
|
|
56
|
+
server: string;
|
|
57
|
+
remoteName: string;
|
|
58
|
+
/** Namespaced model-facing name: `mcp__<server>__<tool>`. */
|
|
59
|
+
name: string;
|
|
60
|
+
description: string;
|
|
61
|
+
inputSchema: Record<string, unknown>;
|
|
62
|
+
requiresApproval: boolean;
|
|
63
|
+
callTimeoutMs: number;
|
|
64
|
+
}
|
|
65
|
+
export type McpServerState = "disabled" | "idle" | "connecting" | "ready" | "failed" | "closed";
|
|
66
|
+
export interface McpServerStatus {
|
|
67
|
+
name: string;
|
|
68
|
+
state: McpServerState;
|
|
69
|
+
enabled: boolean;
|
|
70
|
+
requiresApproval: boolean;
|
|
71
|
+
toolCount: number;
|
|
72
|
+
tools: string[];
|
|
73
|
+
lastError?: string;
|
|
74
|
+
}
|
|
75
|
+
export type McpEvent = {
|
|
76
|
+
type: "mcp_server_connected";
|
|
77
|
+
server: string;
|
|
78
|
+
toolCount: number;
|
|
79
|
+
} | {
|
|
80
|
+
type: "mcp_server_failed";
|
|
81
|
+
server: string;
|
|
82
|
+
error: string;
|
|
83
|
+
} | {
|
|
84
|
+
type: "mcp_tools_changed";
|
|
85
|
+
server: string;
|
|
86
|
+
toolCount: number;
|
|
87
|
+
};
|
|
88
|
+
export interface McpCallResult {
|
|
89
|
+
content?: unknown;
|
|
90
|
+
isError?: boolean;
|
|
91
|
+
[key: string]: unknown;
|
|
92
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/mcp/types.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/providers/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,UAAU,cAAc,CAC5B,MAAc,EACd,WAAoB,EACpB,aAAsB;IAEtB,MAAM,IAAI,GAAG,WAAW,IAAI,MAAM,CAAC,eAAe,CAAC;IACnD,MAAM,IAAI,GAAI,MAAM,CAAC,SAAiC,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI;QACP,OAAO,IAAI,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,qCAAqC,EAAE,CAAC,CAAC,CAAC;IAC7E,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QACH,OAAO,IAAI,uBAAuB,CAAC;YACjC,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,0BAA0B;YACnD,KAAK,EAAE,aAAa,IAAI,IAAI,CAAC,KAAK;YAClC,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,IAAI,aAAa,CAAC;YACvB,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,wBAAwB;YACjD,KAAK,EAAE,aAAa,IAAI,IAAI,CAAC,KAAK;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QACH,OAAO,IAAI,aAAa,CAAC;YACvB,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,aAAa,IAAI,IAAI,CAAC,KAAK;YAClC,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,YAAY,CAAC;QACtB,EAAE,IAAI,EAAE,iBAAiB,IAAI,CAAC,IAAI,uBAAuB,EAAE;KAC5D,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/providers/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,UAAU,cAAc,CAC5B,MAAc,EACd,WAAoB,EACpB,aAAsB;IAEtB,MAAM,IAAI,GAAG,WAAW,IAAI,MAAM,CAAC,eAAe,CAAC;IACnD,MAAM,IAAI,GAAI,MAAM,CAAC,SAAiC,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI;QACP,OAAO,IAAI,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,qCAAqC,EAAE,CAAC,CAAC,CAAC;IAC7E,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QACH,OAAO,IAAI,uBAAuB,CAAC;YACjC,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,0BAA0B;YACnD,KAAK,EAAE,aAAa,IAAI,IAAI,CAAC,KAAK;YAClC,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,IAAI,aAAa,CAAC;YACvB,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,wBAAwB;YACjD,KAAK,EAAE,aAAa,IAAI,IAAI,CAAC,KAAK;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QACH,OAAO,IAAI,aAAa,CAAC;YACvB,EAAE,EAAE,IAAI;YACR,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK,EAAE,aAAa,IAAI,IAAI,CAAC,KAAK;YAClC,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,YAAY,CAAC;QACtB,EAAE,IAAI,EAAE,iBAAiB,IAAI,CAAC,IAAI,uBAAuB,EAAE;KAC5D,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/runtime/executor.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,MAAM,OAAO,QAAQ;CAEpB"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { ToolCall } from "../types.js";
|
|
2
2
|
import type { Tool, ToolContext } from "../tools/types.js";
|
|
3
3
|
import type { ToolResult } from "../tools/types.js";
|
|
4
|
-
import { LockManager
|
|
5
|
-
export
|
|
4
|
+
import { LockManager } from "./locks.js";
|
|
5
|
+
export { ToolExecutor } from "./tool-executor.js";
|
|
6
6
|
export { LockManager };
|
|
7
|
-
export type { Release };
|
|
7
|
+
export type { Release } from "./locks.js";
|
|
8
|
+
export declare function executeToolBatch(calls: ToolCall[], toolMap: Map<string, Tool>, ctx: ToolContext, maxParallel: number, signal: AbortSignal, lockManager?: LockManager, bashConcurrency?: "serial" | "parallel"): Promise<ToolResult[]>;
|
|
@@ -1,103 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ToolExecutor } from "./tool-executor.js";
|
|
2
2
|
import { LockManager } from "./locks.js";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
if (call.name === "bash")
|
|
6
|
-
return "__bash__";
|
|
7
|
-
const p = args.path ?? args.cwd ?? "";
|
|
8
|
-
const key = String(p);
|
|
9
|
-
return key === "" ? "" : resolve(workspace, key);
|
|
10
|
-
}
|
|
11
|
-
function isMutation(call) {
|
|
12
|
-
return call.name === "write" || call.name === "edit";
|
|
13
|
-
}
|
|
14
|
-
function isBash(call) {
|
|
15
|
-
return call.name === "bash";
|
|
16
|
-
}
|
|
3
|
+
export { ToolExecutor } from "./tool-executor.js";
|
|
4
|
+
export { LockManager };
|
|
17
5
|
export async function executeToolBatch(calls, toolMap, ctx, maxParallel, signal, lockManager, bashConcurrency = "serial") {
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const acquire = async (call) => {
|
|
22
|
-
if (isBash(call)) {
|
|
23
|
-
return bashConcurrency === "parallel"
|
|
24
|
-
? lm.acquireGlobalBarrier(signal)
|
|
25
|
-
: lm.acquireGlobal(signal);
|
|
26
|
-
}
|
|
27
|
-
if (call.name === "webfetch" || call.name === "websearch") {
|
|
28
|
-
// No file lock; network-only. Return a no-op release.
|
|
29
|
-
return () => { };
|
|
30
|
-
}
|
|
31
|
-
const key = resourceKey(call, ctx.workspace);
|
|
32
|
-
if (key === "")
|
|
33
|
-
return () => { };
|
|
34
|
-
if (isMutation(call))
|
|
35
|
-
return lm.acquireWrite(key, signal);
|
|
36
|
-
return lm.acquireRead(key, signal);
|
|
37
|
-
};
|
|
38
|
-
// Concurrency pool
|
|
39
|
-
let active = 0;
|
|
40
|
-
const queue = [];
|
|
41
|
-
function acquireSlot() {
|
|
42
|
-
return new Promise((resolve) => {
|
|
43
|
-
if (active < maxParallel) {
|
|
44
|
-
active++;
|
|
45
|
-
resolve();
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
queue.push(resolve);
|
|
49
|
-
}
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
|
-
function releaseSlot() {
|
|
53
|
-
if (queue.length > 0) {
|
|
54
|
-
const next = queue.shift();
|
|
55
|
-
next();
|
|
56
|
-
}
|
|
57
|
-
else {
|
|
58
|
-
active--;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
const tasks = calls.map((call, i) => {
|
|
62
|
-
return (async () => {
|
|
63
|
-
if (signal.aborted) {
|
|
64
|
-
results[i] = { toolCallId: call.id, name: call.name, content: "USER_CANCELLED", isError: true };
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
let release;
|
|
68
|
-
await acquireSlot();
|
|
69
|
-
try {
|
|
70
|
-
release = await acquire(call);
|
|
71
|
-
if (signal.aborted) {
|
|
72
|
-
results[i] = { toolCallId: call.id, name: call.name, content: "USER_CANCELLED", isError: true };
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
const tool = toolMap.get(call.name);
|
|
76
|
-
if (!tool) {
|
|
77
|
-
results[i] = { toolCallId: call.id, name: call.name, content: `TOOL_NOT_FOUND: ${call.name}`, isError: true };
|
|
78
|
-
}
|
|
79
|
-
else {
|
|
80
|
-
const r = await tool.execute(call, ctx);
|
|
81
|
-
results[i] = r;
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
catch (err) {
|
|
85
|
-
results[i] = {
|
|
86
|
-
toolCallId: call.id,
|
|
87
|
-
name: call.name,
|
|
88
|
-
content: `COMMAND_FAILED: ${err instanceof Error ? err.message : String(err)}`,
|
|
89
|
-
isError: true,
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
finally {
|
|
93
|
-
if (release)
|
|
94
|
-
release();
|
|
95
|
-
releaseSlot();
|
|
96
|
-
}
|
|
97
|
-
})();
|
|
6
|
+
const executor = new ToolExecutor({
|
|
7
|
+
maxParallelToolCalls: maxParallel,
|
|
8
|
+
bashConcurrency,
|
|
98
9
|
});
|
|
99
|
-
|
|
100
|
-
return results;
|
|
10
|
+
return executor.run(calls, { ...ctx, toolMap }, signal);
|
|
101
11
|
}
|
|
102
|
-
export { LockManager };
|
|
103
12
|
//# sourceMappingURL=scheduler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/runtime/scheduler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/runtime/scheduler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,CAAC;AAGvB,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAiB,EACjB,OAA0B,EAC1B,GAAgB,EAChB,WAAmB,EACnB,MAAmB,EACnB,WAAyB,EACzB,kBAAyC,QAAQ;IAEjD,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC;QAChC,oBAAoB,EAAE,WAAW;QACjC,eAAe;KAChB,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { ToolCall } from "../types.js";
|
|
2
|
+
import type { Tool, ToolContext } from "../tools/types.js";
|
|
3
|
+
import type { ToolResult } from "../tools/types.js";
|
|
4
|
+
import { LockManager } from "./locks.js";
|
|
5
|
+
export interface ToolExecutorOptions {
|
|
6
|
+
maxParallelToolCalls?: number;
|
|
7
|
+
bashConcurrency?: "serial" | "parallel";
|
|
8
|
+
limits?: unknown;
|
|
9
|
+
}
|
|
10
|
+
export declare class ToolExecutor {
|
|
11
|
+
private maxParallel;
|
|
12
|
+
private bashConcurrency;
|
|
13
|
+
constructor(options?: ToolExecutorOptions);
|
|
14
|
+
run(calls: ToolCall[], context: ToolContext & {
|
|
15
|
+
toolMap: Map<string, Tool>;
|
|
16
|
+
lockManager?: LockManager;
|
|
17
|
+
}, signal: AbortSignal): Promise<ToolResult[]>;
|
|
18
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { resolve } from "node:path";
|
|
2
|
+
import { LockManager } from "./locks.js";
|
|
3
|
+
function resourceKey(call, workspace) {
|
|
4
|
+
const args = call.arguments ?? {};
|
|
5
|
+
if (call.name === "bash")
|
|
6
|
+
return "__bash__";
|
|
7
|
+
const p = args.path ?? args.cwd ?? "";
|
|
8
|
+
const key = String(p);
|
|
9
|
+
return key === "" ? "" : resolve(workspace, key);
|
|
10
|
+
}
|
|
11
|
+
function isMutation(call) {
|
|
12
|
+
return call.name === "write" || call.name === "edit";
|
|
13
|
+
}
|
|
14
|
+
function isBash(call) {
|
|
15
|
+
return call.name === "bash";
|
|
16
|
+
}
|
|
17
|
+
function isRemote(call) {
|
|
18
|
+
return call.name.startsWith("mcp__");
|
|
19
|
+
}
|
|
20
|
+
export class ToolExecutor {
|
|
21
|
+
maxParallel;
|
|
22
|
+
bashConcurrency;
|
|
23
|
+
constructor(options = {}) {
|
|
24
|
+
this.maxParallel = options.maxParallelToolCalls ?? 4;
|
|
25
|
+
this.bashConcurrency = options.bashConcurrency ?? "serial";
|
|
26
|
+
}
|
|
27
|
+
async run(calls, context, signal) {
|
|
28
|
+
const toolMap = context.toolMap;
|
|
29
|
+
const lockManager = context.lockManager;
|
|
30
|
+
const ctx = context;
|
|
31
|
+
const lm = lockManager ?? new LockManager();
|
|
32
|
+
const n = calls.length;
|
|
33
|
+
const results = new Array(n);
|
|
34
|
+
const maxParallel = this.maxParallel;
|
|
35
|
+
const bashConcurrency = this.bashConcurrency;
|
|
36
|
+
const acquire = async (call) => {
|
|
37
|
+
if (isBash(call)) {
|
|
38
|
+
return bashConcurrency === "parallel"
|
|
39
|
+
? lm.acquireGlobalBarrier(signal)
|
|
40
|
+
: lm.acquireGlobal(signal);
|
|
41
|
+
}
|
|
42
|
+
if (call.name === "webfetch" || call.name === "websearch") {
|
|
43
|
+
return () => { };
|
|
44
|
+
}
|
|
45
|
+
if (isRemote(call)) {
|
|
46
|
+
return () => { };
|
|
47
|
+
}
|
|
48
|
+
const key = resourceKey(call, ctx.workspace);
|
|
49
|
+
if (key === "")
|
|
50
|
+
return () => { };
|
|
51
|
+
const tool = toolMap.get(call.name);
|
|
52
|
+
const readOnly = tool?.annotations?.readOnlyHint === true;
|
|
53
|
+
if (isMutation(call))
|
|
54
|
+
return lm.acquireWrite(key, signal);
|
|
55
|
+
// Extension tools: read-only hint => read lock; otherwise (including
|
|
56
|
+
// unclassified path-bearing tools) => write lock.
|
|
57
|
+
if (tool?.annotations !== undefined && !readOnly) {
|
|
58
|
+
return lm.acquireWrite(key, signal);
|
|
59
|
+
}
|
|
60
|
+
return lm.acquireRead(key, signal);
|
|
61
|
+
};
|
|
62
|
+
let active = 0;
|
|
63
|
+
const queue = [];
|
|
64
|
+
function acquireSlot() {
|
|
65
|
+
return new Promise((resolve) => {
|
|
66
|
+
if (active < maxParallel) {
|
|
67
|
+
active++;
|
|
68
|
+
resolve();
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
queue.push(resolve);
|
|
72
|
+
}
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
function releaseSlot() {
|
|
76
|
+
if (queue.length > 0) {
|
|
77
|
+
const next = queue.shift();
|
|
78
|
+
next();
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
active--;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
const tasks = calls.map((call, i) => {
|
|
85
|
+
return (async () => {
|
|
86
|
+
if (signal.aborted) {
|
|
87
|
+
results[i] = { toolCallId: call.id, name: call.name, content: "USER_CANCELLED", isError: true };
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
let release;
|
|
91
|
+
await acquireSlot();
|
|
92
|
+
try {
|
|
93
|
+
release = await acquire(call);
|
|
94
|
+
if (signal.aborted) {
|
|
95
|
+
results[i] = { toolCallId: call.id, name: call.name, content: "USER_CANCELLED", isError: true };
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const tool = toolMap.get(call.name);
|
|
99
|
+
if (!tool) {
|
|
100
|
+
results[i] = { toolCallId: call.id, name: call.name, content: `TOOL_NOT_FOUND: ${call.name}`, isError: true };
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
const r = await tool.execute(call, ctx);
|
|
104
|
+
results[i] = r;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
catch (err) {
|
|
108
|
+
results[i] = {
|
|
109
|
+
toolCallId: call.id,
|
|
110
|
+
name: call.name,
|
|
111
|
+
content: `COMMAND_FAILED: ${err instanceof Error ? err.message : String(err)}`,
|
|
112
|
+
isError: true,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
finally {
|
|
116
|
+
if (release)
|
|
117
|
+
release();
|
|
118
|
+
releaseSlot();
|
|
119
|
+
}
|
|
120
|
+
})();
|
|
121
|
+
});
|
|
122
|
+
await Promise.all(tasks);
|
|
123
|
+
return results;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
//# sourceMappingURL=tool-executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-executor.js","sourceRoot":"","sources":["../../src/runtime/tool-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,11 @@
|
|
|
1
1
|
export declare function defaultShell(): string;
|
|
2
|
+
/**
|
|
3
|
+
* Terminate a spawned child and, where possible, its whole process tree.
|
|
4
|
+
* POSIX: kill the process group (requires the child to have been spawned with
|
|
5
|
+
* `detached: true`). Windows: use `taskkill /T`.
|
|
6
|
+
*/
|
|
7
|
+
export declare function terminateProcessTree(child: {
|
|
8
|
+
pid?: number;
|
|
9
|
+
killed?: boolean;
|
|
10
|
+
kill(signal?: NodeJS.Signals | number): boolean;
|
|
11
|
+
}, signal?: NodeJS.Signals): void;
|
package/dist/security/process.js
CHANGED
|
@@ -1,8 +1,44 @@
|
|
|
1
1
|
// Process policy helpers (full implementation in later tickets).
|
|
2
|
+
import { execSync } from "node:child_process";
|
|
2
3
|
export function defaultShell() {
|
|
3
4
|
if (process.platform === "win32") {
|
|
4
5
|
return process.env.ComSpec ?? "cmd.exe";
|
|
5
6
|
}
|
|
6
7
|
return process.env.SHELL ?? "/bin/sh";
|
|
7
8
|
}
|
|
9
|
+
/**
|
|
10
|
+
* Terminate a spawned child and, where possible, its whole process tree.
|
|
11
|
+
* POSIX: kill the process group (requires the child to have been spawned with
|
|
12
|
+
* `detached: true`). Windows: use `taskkill /T`.
|
|
13
|
+
*/
|
|
14
|
+
export function terminateProcessTree(child, signal = "SIGTERM") {
|
|
15
|
+
const pid = child.pid;
|
|
16
|
+
if (!pid)
|
|
17
|
+
return;
|
|
18
|
+
if (process.platform === "win32") {
|
|
19
|
+
try {
|
|
20
|
+
execSync(`taskkill /PID ${pid} /T /F`, { stdio: "ignore" });
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
try {
|
|
24
|
+
child.kill();
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
// Ignore.
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
try {
|
|
33
|
+
process.kill(-pid, signal);
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
try {
|
|
37
|
+
child.kill(signal);
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
// Ignore.
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
8
44
|
//# sourceMappingURL=process.js.map
|