@namzu/sdk 32.0.0 → 33.0.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/CHANGELOG.md +127 -0
- package/dist/authorization/gate.d.ts +1 -1
- package/dist/authorization/gate.js +1 -1
- package/dist/connector/index.d.ts +1 -1
- package/dist/connector/index.d.ts.map +1 -1
- package/dist/connector/index.js +1 -1
- package/dist/connector/index.js.map +1 -1
- package/dist/connector/mcp/adapter.d.ts.map +1 -1
- package/dist/connector/mcp/adapter.js +71 -16
- package/dist/connector/mcp/adapter.js.map +1 -1
- package/dist/connector/mcp/client.d.ts.map +1 -1
- package/dist/connector/mcp/client.js +3 -2
- package/dist/connector/mcp/client.js.map +1 -1
- package/dist/connector/mcp/http-redirect.d.ts +17 -0
- package/dist/connector/mcp/http-redirect.d.ts.map +1 -0
- package/dist/connector/mcp/http-redirect.js +31 -0
- package/dist/connector/mcp/http-redirect.js.map +1 -0
- package/dist/connector/mcp/http-sse.d.ts.map +1 -1
- package/dist/connector/mcp/http-sse.js +5 -0
- package/dist/connector/mcp/http-sse.js.map +1 -1
- package/dist/connector/mcp/image-admission.d.ts +16 -0
- package/dist/connector/mcp/image-admission.d.ts.map +1 -0
- package/dist/connector/mcp/image-admission.js +288 -0
- package/dist/connector/mcp/image-admission.js.map +1 -0
- package/dist/connector/mcp/stdio.d.ts +13 -0
- package/dist/connector/mcp/stdio.d.ts.map +1 -1
- package/dist/connector/mcp/stdio.js +66 -23
- package/dist/connector/mcp/stdio.js.map +1 -1
- package/dist/connector/mcp/streamable-http.d.ts.map +1 -1
- package/dist/connector/mcp/streamable-http.js +3 -0
- package/dist/connector/mcp/streamable-http.js.map +1 -1
- package/dist/constants/tools/index.js +1 -1
- package/dist/constants/tools/index.js.map +1 -1
- package/dist/execution/base.d.ts +13 -0
- package/dist/execution/base.d.ts.map +1 -1
- package/dist/execution/base.js +103 -8
- package/dist/execution/base.js.map +1 -1
- package/dist/execution/errors.d.ts +12 -0
- package/dist/execution/errors.d.ts.map +1 -0
- package/dist/execution/errors.js +21 -0
- package/dist/execution/errors.js.map +1 -0
- package/dist/execution/factory.d.ts.map +1 -1
- package/dist/execution/factory.js +1 -0
- package/dist/execution/factory.js.map +1 -1
- package/dist/execution/hybrid.d.ts +5 -0
- package/dist/execution/hybrid.d.ts.map +1 -1
- package/dist/execution/hybrid.js +36 -16
- package/dist/execution/hybrid.js.map +1 -1
- package/dist/execution/index.d.ts +1 -0
- package/dist/execution/index.d.ts.map +1 -1
- package/dist/execution/index.js +1 -0
- package/dist/execution/index.js.map +1 -1
- package/dist/execution/local.d.ts +13 -0
- package/dist/execution/local.d.ts.map +1 -1
- package/dist/execution/local.js +145 -19
- package/dist/execution/local.js.map +1 -1
- package/dist/execution/output.d.ts +27 -0
- package/dist/execution/output.d.ts.map +1 -0
- package/dist/execution/output.js +105 -0
- package/dist/execution/output.js.map +1 -0
- package/dist/execution/remote.d.ts +26 -2
- package/dist/execution/remote.d.ts.map +1 -1
- package/dist/execution/remote.js +86 -15
- package/dist/execution/remote.js.map +1 -1
- package/dist/plugin/lifecycle.d.ts.map +1 -1
- package/dist/plugin/lifecycle.js +9 -3
- package/dist/plugin/lifecycle.js.map +1 -1
- package/dist/process/kill-tree.d.ts +11 -13
- package/dist/process/kill-tree.d.ts.map +1 -1
- package/dist/process/kill-tree.js +11 -13
- package/dist/process/kill-tree.js.map +1 -1
- package/dist/provider/fallback.d.ts.map +1 -1
- package/dist/provider/fallback.js +31 -0
- package/dist/provider/fallback.js.map +1 -1
- package/dist/provider/idle-timeout.d.ts.map +1 -1
- package/dist/provider/idle-timeout.js +5 -0
- package/dist/provider/idle-timeout.js.map +1 -1
- package/dist/provider/retry.d.ts.map +1 -1
- package/dist/provider/retry.js +5 -0
- package/dist/provider/retry.js.map +1 -1
- package/dist/public-runtime.d.ts +2 -2
- package/dist/public-runtime.d.ts.map +1 -1
- package/dist/public-runtime.js +2 -2
- package/dist/public-runtime.js.map +1 -1
- package/dist/registry/tool/execute.d.ts +7 -1
- package/dist/registry/tool/execute.d.ts.map +1 -1
- package/dist/registry/tool/execute.js +201 -54
- package/dist/registry/tool/execute.js.map +1 -1
- package/dist/run/command-gate.d.ts.map +1 -1
- package/dist/run/command-gate.js +11 -0
- package/dist/run/command-gate.js.map +1 -1
- package/dist/run/workspace-fingerprint.d.ts +4 -4
- package/dist/run/workspace-fingerprint.d.ts.map +1 -1
- package/dist/run/workspace-fingerprint.js +6 -4
- package/dist/run/workspace-fingerprint.js.map +1 -1
- package/dist/runtime/bidi/index.d.ts +1 -1
- package/dist/runtime/bidi/index.d.ts.map +1 -1
- package/dist/runtime/bidi/index.js +1 -1
- package/dist/runtime/bidi/index.js.map +1 -1
- package/dist/runtime/bidi/session.d.ts +19 -0
- package/dist/runtime/bidi/session.d.ts.map +1 -1
- package/dist/runtime/bidi/session.js +150 -26
- package/dist/runtime/bidi/session.js.map +1 -1
- package/dist/runtime/query/executor.d.ts +43 -1
- package/dist/runtime/query/executor.d.ts.map +1 -1
- package/dist/runtime/query/executor.js +626 -161
- package/dist/runtime/query/executor.js.map +1 -1
- package/dist/runtime/query/index.d.ts.map +1 -1
- package/dist/runtime/query/index.js +46 -4
- package/dist/runtime/query/index.js.map +1 -1
- package/dist/runtime/query/iteration/phases/tool-review.d.ts.map +1 -1
- package/dist/runtime/query/iteration/phases/tool-review.js +84 -22
- package/dist/runtime/query/iteration/phases/tool-review.js.map +1 -1
- package/dist/runtime/query/request-rich-content.d.ts.map +1 -1
- package/dist/runtime/query/request-rich-content.js +33 -13
- package/dist/runtime/query/request-rich-content.js.map +1 -1
- package/dist/runtime/query/resume-pending.d.ts +5 -1
- package/dist/runtime/query/resume-pending.d.ts.map +1 -1
- package/dist/runtime/query/resume-pending.js +66 -1
- package/dist/runtime/query/resume-pending.js.map +1 -1
- package/dist/runtime/query/tool-output-budget.d.ts.map +1 -1
- package/dist/runtime/query/tool-output-budget.js +45 -16
- package/dist/runtime/query/tool-output-budget.js.map +1 -1
- package/dist/runtime/query/tooling.d.ts +6 -0
- package/dist/runtime/query/tooling.d.ts.map +1 -1
- package/dist/runtime/query/tooling.js +4 -0
- package/dist/runtime/query/tooling.js.map +1 -1
- package/dist/sandbox/provider/local.d.ts.map +1 -1
- package/dist/sandbox/provider/local.js +193 -41
- package/dist/sandbox/provider/local.js.map +1 -1
- package/dist/scheduler/delegating.d.ts +2 -1
- package/dist/scheduler/delegating.d.ts.map +1 -1
- package/dist/scheduler/delegating.js +6 -5
- package/dist/scheduler/delegating.js.map +1 -1
- package/dist/scheduler/local.d.ts +2 -1
- package/dist/scheduler/local.d.ts.map +1 -1
- package/dist/scheduler/local.js +2 -2
- package/dist/scheduler/local.js.map +1 -1
- package/dist/session/workspace/driver.d.ts +12 -4
- package/dist/session/workspace/driver.d.ts.map +1 -1
- package/dist/session/workspace/git-worktree.d.ts +17 -3
- package/dist/session/workspace/git-worktree.d.ts.map +1 -1
- package/dist/session/workspace/git-worktree.js +153 -34
- package/dist/session/workspace/git-worktree.js.map +1 -1
- package/dist/skills/registry.d.ts +15 -0
- package/dist/skills/registry.d.ts.map +1 -1
- package/dist/skills/registry.js +33 -0
- package/dist/skills/registry.js.map +1 -1
- package/dist/tools/builtins/computer-use.d.ts.map +1 -1
- package/dist/tools/builtins/computer-use.js +39 -2
- package/dist/tools/builtins/computer-use.js.map +1 -1
- package/dist/tools/builtins/run-code.d.ts.map +1 -1
- package/dist/tools/builtins/run-code.js +9 -11
- package/dist/tools/builtins/run-code.js.map +1 -1
- package/dist/tools/builtins/skill.d.ts +2 -1
- package/dist/tools/builtins/skill.d.ts.map +1 -1
- package/dist/tools/builtins/skill.js +250 -6
- package/dist/tools/builtins/skill.js.map +1 -1
- package/dist/tools/coordinator/agent.d.ts.map +1 -1
- package/dist/tools/coordinator/agent.js +100 -30
- package/dist/tools/coordinator/agent.js.map +1 -1
- package/dist/types/agent/manager.d.ts +1 -1
- package/dist/types/agent/manager.d.ts.map +1 -1
- package/dist/types/agent/scheduler.d.ts +10 -1
- package/dist/types/agent/scheduler.d.ts.map +1 -1
- package/dist/types/authorization/index.d.ts +12 -12
- package/dist/types/bidi/index.d.ts +19 -2
- package/dist/types/bidi/index.d.ts.map +1 -1
- package/dist/types/computer-use/index.d.ts +18 -0
- package/dist/types/computer-use/index.d.ts.map +1 -1
- package/dist/types/connector/execution-context.d.ts +3 -1
- package/dist/types/connector/execution-context.d.ts.map +1 -1
- package/dist/types/execution/index.d.ts +43 -1
- package/dist/types/execution/index.d.ts.map +1 -1
- package/dist/types/hitl/index.d.ts +11 -0
- package/dist/types/hitl/index.d.ts.map +1 -1
- package/dist/types/hitl/index.js.map +1 -1
- package/dist/types/message/index.d.ts +1 -1
- package/dist/types/message/index.d.ts.map +1 -1
- package/dist/types/message/index.js +2 -1
- package/dist/types/message/index.js.map +1 -1
- package/dist/types/plugin/index.d.ts +14 -1
- package/dist/types/plugin/index.d.ts.map +1 -1
- package/dist/types/plugin/index.js +1 -0
- package/dist/types/plugin/index.js.map +1 -1
- package/dist/types/provider/interface.d.ts +14 -0
- package/dist/types/provider/interface.d.ts.map +1 -1
- package/dist/types/sandbox/index.d.ts +15 -10
- package/dist/types/sandbox/index.d.ts.map +1 -1
- package/dist/types/sandbox/index.js.map +1 -1
- package/dist/types/tool/index.d.ts +77 -6
- package/dist/types/tool/index.d.ts.map +1 -1
- package/dist/types/tool/index.js.map +1 -1
- package/dist/types/workspace/ref.d.ts +5 -0
- package/dist/types/workspace/ref.d.ts.map +1 -1
- package/dist/utils/abort.d.ts +8 -0
- package/dist/utils/abort.d.ts.map +1 -1
- package/dist/utils/abort.js +16 -0
- package/dist/utils/abort.js.map +1 -1
- package/package.json +4 -4
- package/src/authorization/gate.ts +1 -1
- package/src/connector/index.ts +2 -0
- package/src/connector/mcp/adapter.ts +82 -21
- package/src/connector/mcp/client.ts +2 -1
- package/src/connector/mcp/http-redirect.ts +32 -0
- package/src/connector/mcp/http-sse.ts +5 -0
- package/src/connector/mcp/image-admission.ts +272 -0
- package/src/connector/mcp/stdio.ts +63 -21
- package/src/connector/mcp/streamable-http.ts +3 -0
- package/src/constants/tools/index.ts +1 -1
- package/src/execution/base.ts +124 -7
- package/src/execution/errors.ts +24 -0
- package/src/execution/factory.ts +1 -0
- package/src/execution/hybrid.ts +47 -16
- package/src/execution/index.ts +1 -0
- package/src/execution/local.ts +164 -19
- package/src/execution/output.ts +104 -0
- package/src/execution/remote.ts +122 -17
- package/src/plugin/lifecycle.ts +9 -3
- package/src/process/kill-tree.ts +11 -13
- package/src/provider/fallback.ts +39 -0
- package/src/provider/idle-timeout.ts +8 -0
- package/src/provider/retry.ts +8 -0
- package/src/public-runtime.ts +7 -1
- package/src/registry/tool/execute.ts +230 -64
- package/src/run/command-gate.ts +12 -0
- package/src/run/workspace-fingerprint.ts +5 -4
- package/src/runtime/bidi/index.ts +1 -1
- package/src/runtime/bidi/session.ts +177 -28
- package/src/runtime/query/executor.ts +769 -163
- package/src/runtime/query/index.ts +53 -6
- package/src/runtime/query/iteration/phases/tool-review.ts +87 -23
- package/src/runtime/query/request-rich-content.ts +39 -14
- package/src/runtime/query/resume-pending.ts +83 -1
- package/src/runtime/query/tool-output-budget.ts +52 -17
- package/src/runtime/query/tooling.ts +10 -0
- package/src/sandbox/provider/local.ts +213 -45
- package/src/scheduler/delegating.ts +6 -5
- package/src/scheduler/local.ts +3 -2
- package/src/session/workspace/driver.ts +12 -4
- package/src/session/workspace/git-worktree.ts +173 -34
- package/src/skills/registry.ts +47 -0
- package/src/tools/builtins/computer-use.ts +45 -2
- package/src/tools/builtins/run-code.ts +9 -11
- package/src/tools/builtins/skill.ts +325 -7
- package/src/tools/coordinator/agent.ts +108 -33
- package/src/types/agent/manager.ts +1 -1
- package/src/types/agent/scheduler.ts +10 -1
- package/src/types/bidi/index.ts +19 -2
- package/src/types/computer-use/index.ts +19 -0
- package/src/types/connector/execution-context.ts +3 -0
- package/src/types/execution/index.ts +46 -1
- package/src/types/hitl/index.ts +11 -0
- package/src/types/message/index.ts +3 -2
- package/src/types/plugin/index.ts +15 -0
- package/src/types/provider/interface.ts +18 -0
- package/src/types/sandbox/index.ts +15 -10
- package/src/types/tool/index.ts +85 -6
- package/src/types/workspace/ref.ts +5 -0
- package/src/utils/abort.ts +18 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SCOPE_ATTRIBUTE } from '../../utils/log/types.js';
|
|
2
2
|
import { resolveLogger } from '../../utils/logger.js';
|
|
3
3
|
import { ConnectorHttpOperation, validateConnectorTimeoutMs } from '../http-operation.js';
|
|
4
|
+
import { refuseMcpHttpRedirect } from './http-redirect.js';
|
|
4
5
|
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
5
6
|
/**
|
|
6
7
|
* Trim trailing slashes without a regex.
|
|
@@ -88,8 +89,10 @@ export class HttpSseTransport {
|
|
|
88
89
|
...this.config.headers,
|
|
89
90
|
},
|
|
90
91
|
body: JSON.stringify(message),
|
|
92
|
+
redirect: 'manual',
|
|
91
93
|
signal: operation.signal,
|
|
92
94
|
}));
|
|
95
|
+
refuseMcpHttpRedirect(response, message.method);
|
|
93
96
|
if (!response.ok) {
|
|
94
97
|
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
|
95
98
|
}
|
|
@@ -165,8 +168,10 @@ export class HttpSseTransport {
|
|
|
165
168
|
Accept: 'text/event-stream',
|
|
166
169
|
...this.config.headers,
|
|
167
170
|
},
|
|
171
|
+
redirect: 'manual',
|
|
168
172
|
signal,
|
|
169
173
|
});
|
|
174
|
+
refuseMcpHttpRedirect(response);
|
|
170
175
|
if (!response.ok || !response.body) {
|
|
171
176
|
throw new Error(`SSE connection failed: HTTP ${response.status}`);
|
|
172
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-sse.js","sourceRoot":"","sources":["../../../src/connector/mcp/http-sse.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAe,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"http-sse.js","sourceRoot":"","sources":["../../../src/connector/mcp/http-sse.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { MCPContentBlock } from '../../types/connector/index.js';
|
|
2
|
+
type MCPImageBlock = Extract<MCPContentBlock, {
|
|
3
|
+
type: 'image';
|
|
4
|
+
}>;
|
|
5
|
+
/**
|
|
6
|
+
* Admit an MCP image batch atomically before any member becomes model input.
|
|
7
|
+
*
|
|
8
|
+
* A remote server controls the declared MIME and bytes. Canonical base64 is
|
|
9
|
+
* only an encoding property; the decoded value must also be a complete,
|
|
10
|
+
* bounded raster container whose format agrees with that declaration. One bad
|
|
11
|
+
* member withholds the complete batch so a model is never shown a partial
|
|
12
|
+
* result while the host retains every raw block for inspection.
|
|
13
|
+
*/
|
|
14
|
+
export declare function admitMcpImageBatch(images: readonly MCPImageBlock[]): boolean;
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=image-admission.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-admission.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/image-admission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAMrE,KAAK,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AA8PhE;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,GAAG,OAAO,CAE5E"}
|
|
@@ -0,0 +1,288 @@
|
|
|
1
|
+
const MAX_ENCODED_BYTES = 24 * 1024 * 1024;
|
|
2
|
+
const MAX_DIMENSION = 16_384;
|
|
3
|
+
const MAX_PIXELS = 40_000_000;
|
|
4
|
+
const IMAGE_MEDIA_TYPES = new Set([
|
|
5
|
+
'image/png',
|
|
6
|
+
'image/jpeg',
|
|
7
|
+
'image/webp',
|
|
8
|
+
'image/gif',
|
|
9
|
+
]);
|
|
10
|
+
function isImageMediaType(value) {
|
|
11
|
+
return IMAGE_MEDIA_TYPES.has(value);
|
|
12
|
+
}
|
|
13
|
+
function decodeCanonicalBase64(value) {
|
|
14
|
+
if (value.length === 0 || value.length > MAX_ENCODED_BYTES)
|
|
15
|
+
return null;
|
|
16
|
+
if (!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value)) {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
const decoded = Buffer.from(value, 'base64');
|
|
20
|
+
return decoded.toString('base64') === value ? decoded : null;
|
|
21
|
+
}
|
|
22
|
+
function dimensionsAreSafe(width, height) {
|
|
23
|
+
return (Number.isSafeInteger(width) &&
|
|
24
|
+
Number.isSafeInteger(height) &&
|
|
25
|
+
width > 0 &&
|
|
26
|
+
height > 0 &&
|
|
27
|
+
width <= MAX_DIMENSION &&
|
|
28
|
+
height <= MAX_DIMENSION &&
|
|
29
|
+
width * height <= MAX_PIXELS);
|
|
30
|
+
}
|
|
31
|
+
const crcTable = (() => {
|
|
32
|
+
const table = new Uint32Array(256);
|
|
33
|
+
for (let n = 0; n < 256; n += 1) {
|
|
34
|
+
let value = n;
|
|
35
|
+
for (let bit = 0; bit < 8; bit += 1) {
|
|
36
|
+
value = value & 1 ? 0xedb88320 ^ (value >>> 1) : value >>> 1;
|
|
37
|
+
}
|
|
38
|
+
table[n] = value >>> 0;
|
|
39
|
+
}
|
|
40
|
+
return table;
|
|
41
|
+
})();
|
|
42
|
+
function crc32(bytes, start, end) {
|
|
43
|
+
let crc = 0xffffffff;
|
|
44
|
+
for (let offset = start; offset < end; offset += 1) {
|
|
45
|
+
crc = (crcTable[(crc ^ (bytes[offset] ?? 0)) & 0xff] ?? 0) ^ (crc >>> 8);
|
|
46
|
+
}
|
|
47
|
+
return (crc ^ 0xffffffff) >>> 0;
|
|
48
|
+
}
|
|
49
|
+
function isPng(bytes) {
|
|
50
|
+
const buffer = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
51
|
+
if (bytes.length < 45 || !buffer.subarray(0, 8).equals(Buffer.from('89504e470d0a1a0a', 'hex'))) {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
let offset = 8;
|
|
55
|
+
let sawHeader = false;
|
|
56
|
+
let sawData = false;
|
|
57
|
+
while (offset + 12 <= bytes.length) {
|
|
58
|
+
const length = buffer.readUInt32BE(offset);
|
|
59
|
+
const typeStart = offset + 4;
|
|
60
|
+
const dataStart = typeStart + 4;
|
|
61
|
+
const dataEnd = dataStart + length;
|
|
62
|
+
const chunkEnd = dataEnd + 4;
|
|
63
|
+
if (dataEnd < dataStart || chunkEnd > bytes.length)
|
|
64
|
+
return false;
|
|
65
|
+
const type = buffer.toString('ascii', typeStart, dataStart);
|
|
66
|
+
if (buffer.readUInt32BE(dataEnd) !== crc32(bytes, typeStart, dataEnd))
|
|
67
|
+
return false;
|
|
68
|
+
if (!sawHeader) {
|
|
69
|
+
if (type !== 'IHDR' || length !== 13)
|
|
70
|
+
return false;
|
|
71
|
+
const width = buffer.readUInt32BE(dataStart);
|
|
72
|
+
const height = buffer.readUInt32BE(dataStart + 4);
|
|
73
|
+
if (!dimensionsAreSafe(width, height))
|
|
74
|
+
return false;
|
|
75
|
+
sawHeader = true;
|
|
76
|
+
}
|
|
77
|
+
else if (type === 'IHDR')
|
|
78
|
+
return false;
|
|
79
|
+
if (type === 'IDAT')
|
|
80
|
+
sawData = true;
|
|
81
|
+
if (type === 'IEND')
|
|
82
|
+
return length === 0 && sawHeader && sawData && chunkEnd === bytes.length;
|
|
83
|
+
offset = chunkEnd;
|
|
84
|
+
}
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
const JPEG_SOF_MARKERS = new Set([
|
|
88
|
+
0xc0, 0xc1, 0xc2, 0xc3, 0xc5, 0xc6, 0xc7, 0xc9, 0xca, 0xcb, 0xcd, 0xce, 0xcf,
|
|
89
|
+
]);
|
|
90
|
+
function isJpeg(bytes) {
|
|
91
|
+
const buffer = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
92
|
+
if (bytes.length < 11 || bytes[0] !== 0xff || bytes[1] !== 0xd8)
|
|
93
|
+
return false;
|
|
94
|
+
let offset = 2;
|
|
95
|
+
let sawFrame = false;
|
|
96
|
+
let sawScan = false;
|
|
97
|
+
let inScan = false;
|
|
98
|
+
while (offset < bytes.length) {
|
|
99
|
+
if (inScan && bytes[offset] !== 0xff) {
|
|
100
|
+
offset += 1;
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
if (bytes[offset] !== 0xff)
|
|
104
|
+
return false;
|
|
105
|
+
while (offset < bytes.length && bytes[offset] === 0xff)
|
|
106
|
+
offset += 1;
|
|
107
|
+
if (offset >= bytes.length)
|
|
108
|
+
return false;
|
|
109
|
+
const marker = bytes[offset] ?? 0;
|
|
110
|
+
offset += 1;
|
|
111
|
+
if (inScan && (marker === 0x00 || (marker >= 0xd0 && marker <= 0xd7)))
|
|
112
|
+
continue;
|
|
113
|
+
inScan = false;
|
|
114
|
+
if (marker === 0xd9)
|
|
115
|
+
return sawFrame && sawScan && offset === bytes.length;
|
|
116
|
+
if (marker === 0xd8 || marker === 0x01 || (marker >= 0xd0 && marker <= 0xd7))
|
|
117
|
+
continue;
|
|
118
|
+
if (offset + 2 > bytes.length)
|
|
119
|
+
return false;
|
|
120
|
+
const length = buffer.readUInt16BE(offset);
|
|
121
|
+
if (length < 2 || offset + length > bytes.length)
|
|
122
|
+
return false;
|
|
123
|
+
if (JPEG_SOF_MARKERS.has(marker)) {
|
|
124
|
+
if (length < 8)
|
|
125
|
+
return false;
|
|
126
|
+
const height = buffer.readUInt16BE(offset + 3);
|
|
127
|
+
const width = buffer.readUInt16BE(offset + 5);
|
|
128
|
+
if (!dimensionsAreSafe(width, height))
|
|
129
|
+
return false;
|
|
130
|
+
sawFrame = true;
|
|
131
|
+
}
|
|
132
|
+
offset += length;
|
|
133
|
+
if (marker === 0xda) {
|
|
134
|
+
sawScan = true;
|
|
135
|
+
inScan = true;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
140
|
+
function skipGifSubBlocks(bytes, start) {
|
|
141
|
+
let offset = start;
|
|
142
|
+
while (offset < bytes.length) {
|
|
143
|
+
const length = bytes[offset] ?? 0;
|
|
144
|
+
offset += 1;
|
|
145
|
+
if (length === 0)
|
|
146
|
+
return offset;
|
|
147
|
+
if (offset + length > bytes.length)
|
|
148
|
+
return null;
|
|
149
|
+
offset += length;
|
|
150
|
+
}
|
|
151
|
+
return null;
|
|
152
|
+
}
|
|
153
|
+
function isGif(bytes) {
|
|
154
|
+
const buffer = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
155
|
+
if (bytes.length < 14)
|
|
156
|
+
return false;
|
|
157
|
+
const signature = buffer.toString('ascii', 0, 6);
|
|
158
|
+
if (signature !== 'GIF87a' && signature !== 'GIF89a')
|
|
159
|
+
return false;
|
|
160
|
+
if (!dimensionsAreSafe(buffer.readUInt16LE(6), buffer.readUInt16LE(8)))
|
|
161
|
+
return false;
|
|
162
|
+
let offset = 13;
|
|
163
|
+
const packed = bytes[10] ?? 0;
|
|
164
|
+
if ((packed & 0x80) !== 0)
|
|
165
|
+
offset += 3 * 2 ** ((packed & 0x07) + 1);
|
|
166
|
+
if (offset > bytes.length)
|
|
167
|
+
return false;
|
|
168
|
+
let sawImage = false;
|
|
169
|
+
while (offset < bytes.length) {
|
|
170
|
+
const marker = bytes[offset] ?? 0;
|
|
171
|
+
offset += 1;
|
|
172
|
+
if (marker === 0x3b)
|
|
173
|
+
return sawImage && offset === bytes.length;
|
|
174
|
+
if (marker === 0x21) {
|
|
175
|
+
if (offset >= bytes.length)
|
|
176
|
+
return false;
|
|
177
|
+
offset += 1;
|
|
178
|
+
const next = skipGifSubBlocks(bytes, offset);
|
|
179
|
+
if (next === null)
|
|
180
|
+
return false;
|
|
181
|
+
offset = next;
|
|
182
|
+
continue;
|
|
183
|
+
}
|
|
184
|
+
if (marker !== 0x2c || offset + 9 > bytes.length)
|
|
185
|
+
return false;
|
|
186
|
+
const width = buffer.readUInt16LE(offset + 4);
|
|
187
|
+
const height = buffer.readUInt16LE(offset + 6);
|
|
188
|
+
if (!dimensionsAreSafe(width, height))
|
|
189
|
+
return false;
|
|
190
|
+
const imagePacked = bytes[offset + 8] ?? 0;
|
|
191
|
+
offset += 9;
|
|
192
|
+
if ((imagePacked & 0x80) !== 0)
|
|
193
|
+
offset += 3 * 2 ** ((imagePacked & 0x07) + 1);
|
|
194
|
+
if (offset >= bytes.length)
|
|
195
|
+
return false;
|
|
196
|
+
offset += 1;
|
|
197
|
+
const next = skipGifSubBlocks(bytes, offset);
|
|
198
|
+
if (next === null)
|
|
199
|
+
return false;
|
|
200
|
+
offset = next;
|
|
201
|
+
sawImage = true;
|
|
202
|
+
}
|
|
203
|
+
return false;
|
|
204
|
+
}
|
|
205
|
+
function readUInt24LE(bytes, offset) {
|
|
206
|
+
return (bytes[offset] ?? 0) | ((bytes[offset + 1] ?? 0) << 8) | ((bytes[offset + 2] ?? 0) << 16);
|
|
207
|
+
}
|
|
208
|
+
function webpDimensions(type, data) {
|
|
209
|
+
const buffer = Buffer.from(data.buffer, data.byteOffset, data.byteLength);
|
|
210
|
+
if (type === 'VP8X') {
|
|
211
|
+
if (data.length < 10)
|
|
212
|
+
return null;
|
|
213
|
+
return [readUInt24LE(data, 4) + 1, readUInt24LE(data, 7) + 1];
|
|
214
|
+
}
|
|
215
|
+
if (type === 'VP8L') {
|
|
216
|
+
if (data.length < 5 || data[0] !== 0x2f)
|
|
217
|
+
return null;
|
|
218
|
+
const bits = buffer.readUInt32LE(1);
|
|
219
|
+
return [(bits & 0x3fff) + 1, ((bits >>> 14) & 0x3fff) + 1];
|
|
220
|
+
}
|
|
221
|
+
if (type === 'VP8 ') {
|
|
222
|
+
if (data.length < 10 || data[3] !== 0x9d || data[4] !== 0x01 || data[5] !== 0x2a) {
|
|
223
|
+
return null;
|
|
224
|
+
}
|
|
225
|
+
return [buffer.readUInt16LE(6) & 0x3fff, buffer.readUInt16LE(8) & 0x3fff];
|
|
226
|
+
}
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
function isWebp(bytes) {
|
|
230
|
+
const buffer = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
231
|
+
if (bytes.length < 20 ||
|
|
232
|
+
buffer.toString('ascii', 0, 4) !== 'RIFF' ||
|
|
233
|
+
buffer.readUInt32LE(4) + 8 !== bytes.length ||
|
|
234
|
+
buffer.toString('ascii', 8, 12) !== 'WEBP') {
|
|
235
|
+
return false;
|
|
236
|
+
}
|
|
237
|
+
let offset = 12;
|
|
238
|
+
let dimensions = null;
|
|
239
|
+
let sawImagePayload = false;
|
|
240
|
+
while (offset + 8 <= bytes.length) {
|
|
241
|
+
const type = buffer.toString('ascii', offset, offset + 4);
|
|
242
|
+
const length = buffer.readUInt32LE(offset + 4);
|
|
243
|
+
const dataStart = offset + 8;
|
|
244
|
+
const dataEnd = dataStart + length;
|
|
245
|
+
if (dataEnd < dataStart || dataEnd > bytes.length)
|
|
246
|
+
return false;
|
|
247
|
+
const current = webpDimensions(type, bytes.subarray(dataStart, dataEnd));
|
|
248
|
+
if (current && dimensions === null)
|
|
249
|
+
dimensions = current;
|
|
250
|
+
if (type === 'VP8 ' || type === 'VP8L')
|
|
251
|
+
sawImagePayload = current !== null;
|
|
252
|
+
offset = dataEnd + (length & 1);
|
|
253
|
+
}
|
|
254
|
+
return (offset === bytes.length &&
|
|
255
|
+
dimensions !== null &&
|
|
256
|
+
sawImagePayload &&
|
|
257
|
+
dimensionsAreSafe(dimensions[0], dimensions[1]));
|
|
258
|
+
}
|
|
259
|
+
function imageIsAdmitted(block) {
|
|
260
|
+
if (!isImageMediaType(block.mimeType))
|
|
261
|
+
return false;
|
|
262
|
+
const bytes = decodeCanonicalBase64(block.data);
|
|
263
|
+
if (!bytes)
|
|
264
|
+
return false;
|
|
265
|
+
switch (block.mimeType) {
|
|
266
|
+
case 'image/png':
|
|
267
|
+
return isPng(bytes);
|
|
268
|
+
case 'image/jpeg':
|
|
269
|
+
return isJpeg(bytes);
|
|
270
|
+
case 'image/gif':
|
|
271
|
+
return isGif(bytes);
|
|
272
|
+
case 'image/webp':
|
|
273
|
+
return isWebp(bytes);
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
/**
|
|
277
|
+
* Admit an MCP image batch atomically before any member becomes model input.
|
|
278
|
+
*
|
|
279
|
+
* A remote server controls the declared MIME and bytes. Canonical base64 is
|
|
280
|
+
* only an encoding property; the decoded value must also be a complete,
|
|
281
|
+
* bounded raster container whose format agrees with that declaration. One bad
|
|
282
|
+
* member withholds the complete batch so a model is never shown a partial
|
|
283
|
+
* result while the host retains every raw block for inspection.
|
|
284
|
+
*/
|
|
285
|
+
export function admitMcpImageBatch(images) {
|
|
286
|
+
return images.length === 0 || images.every(imageIsAdmitted);
|
|
287
|
+
}
|
|
288
|
+
//# sourceMappingURL=image-admission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-admission.js","sourceRoot":"","sources":["../../../src/connector/mcp/image-admission.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAA;AAC1C,MAAM,aAAa,GAAG,MAAM,CAAA;AAC5B,MAAM,UAAU,GAAG,UAAU,CAAA;AAK7B,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAiB;IACjD,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,WAAW;CACX,CAAC,CAAA;AAEF,SAAS,gBAAgB,CAAC,KAAa;IACtC,OAAO,iBAAiB,CAAC,GAAG,CAAC,KAAuB,CAAC,CAAA;AACtD,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAa;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,iBAAiB;QAAE,OAAO,IAAI,CAAA;IACvE,IAAI,CAAC,kEAAkE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrF,OAAO,IAAI,CAAA;IACZ,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IAC5C,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAA;AAC7D,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,MAAc;IACvD,OAAO,CACN,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;QAC3B,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC;QAC5B,KAAK,GAAG,CAAC;QACT,MAAM,GAAG,CAAC;QACV,KAAK,IAAI,aAAa;QACtB,MAAM,IAAI,aAAa;QACvB,KAAK,GAAG,MAAM,IAAI,UAAU,CAC5B,CAAA;AACF,CAAC;AAED,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;IACtB,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,CAAA;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;YACrC,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAA;QAC7D,CAAC;QACD,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC,CAAA;IACvB,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC,CAAC,EAAE,CAAA;AAEJ,SAAS,KAAK,CAAC,KAAiB,EAAE,KAAa,EAAE,GAAW;IAC3D,IAAI,GAAG,GAAG,UAAU,CAAA;IACpB,KAAK,IAAI,MAAM,GAAG,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC;QACpD,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAA;IACzE,CAAC;IACD,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;AAChC,CAAC;AAED,SAAS,KAAK,CAAC,KAAiB;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC5E,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAChG,OAAO,KAAK,CAAA;IACb,CAAC;IACD,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,IAAI,SAAS,GAAG,KAAK,CAAA;IACrB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,OAAO,MAAM,GAAG,EAAE,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,CAAA;QAC5B,MAAM,SAAS,GAAG,SAAS,GAAG,CAAC,CAAA;QAC/B,MAAM,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;QAClC,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,CAAA;QAC5B,IAAI,OAAO,GAAG,SAAS,IAAI,QAAQ,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAChE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAC3D,IAAI,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC;YAAE,OAAO,KAAK,CAAA;QACnF,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,KAAK,EAAE;gBAAE,OAAO,KAAK,CAAA;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;YAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,SAAS,GAAG,CAAC,CAAC,CAAA;YACjD,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC;gBAAE,OAAO,KAAK,CAAA;YACnD,SAAS,GAAG,IAAI,CAAA;QACjB,CAAC;aAAM,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,KAAK,CAAA;QACxC,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,GAAG,IAAI,CAAA;QACnC,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,MAAM,KAAK,CAAC,IAAI,SAAS,IAAI,OAAO,IAAI,QAAQ,KAAK,KAAK,CAAC,MAAM,CAAA;QAC7F,MAAM,GAAG,QAAQ,CAAA;IAClB,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAChC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;CAC5E,CAAC,CAAA;AAEF,SAAS,MAAM,CAAC,KAAiB;IAChC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC5E,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7E,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,OAAO,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,CAAA;YACX,SAAQ;QACT,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI;YAAE,OAAO,KAAK,CAAA;QACxC,OAAO,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI;YAAE,MAAM,IAAI,CAAC,CAAA;QACnE,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,CAAA;QACX,IAAI,MAAM,IAAI,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAC;YAAE,SAAQ;QAC/E,MAAM,GAAG,KAAK,CAAA;QACd,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,QAAQ,IAAI,OAAO,IAAI,MAAM,KAAK,KAAK,CAAC,MAAM,CAAA;QAC1E,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC;YAAE,SAAQ;QACtF,IAAI,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC1C,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC9D,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,IAAI,MAAM,GAAG,CAAC;gBAAE,OAAO,KAAK,CAAA;YAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC7C,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC;gBAAE,OAAO,KAAK,CAAA;YACnD,QAAQ,GAAG,IAAI,CAAA;QAChB,CAAC;QACD,MAAM,IAAI,MAAM,CAAA;QAChB,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACrB,OAAO,GAAG,IAAI,CAAA;YACd,MAAM,GAAG,IAAI,CAAA;QACd,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAiB,EAAE,KAAa;IACzD,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,OAAO,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,CAAA;QACX,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO,MAAM,CAAA;QAC/B,IAAI,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAA;QAC/C,MAAM,IAAI,MAAM,CAAA;IACjB,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,SAAS,KAAK,CAAC,KAAiB;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC5E,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,KAAK,CAAA;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAChD,IAAI,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAClE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAA;IACpF,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;IAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACnE,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IACvC,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,OAAO,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,CAAA;QACX,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,QAAQ,IAAI,MAAM,KAAK,KAAK,CAAC,MAAM,CAAA;QAC/D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACrB,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM;gBAAE,OAAO,KAAK,CAAA;YACxC,MAAM,IAAI,CAAC,CAAA;YACX,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;YAC5C,IAAI,IAAI,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAA;YAC/B,MAAM,GAAG,IAAI,CAAA;YACb,SAAQ;QACT,CAAC;QACD,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC9C,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA;QACnD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,IAAI,CAAC,CAAA;QACX,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;QAC7E,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QACxC,MAAM,IAAI,CAAC,CAAA;QACX,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC5C,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,KAAK,CAAA;QAC/B,MAAM,GAAG,IAAI,CAAA;QACb,QAAQ,GAAG,IAAI,CAAA;IAChB,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED,SAAS,YAAY,CAAC,KAAiB,EAAE,MAAc;IACtD,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AACjG,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,IAAgB;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;IACzE,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE;YAAE,OAAO,IAAI,CAAA;QACjC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9D,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACnC,OAAO,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAC3D,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAClF,OAAO,IAAI,CAAA;QACZ,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAA;IAC1E,CAAC;IACD,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,SAAS,MAAM,CAAC,KAAiB;IAChC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;IAC5E,IACC,KAAK,CAAC,MAAM,GAAG,EAAE;QACjB,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM;QACzC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,MAAM;QAC3C,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,MAAM,EACzC,CAAC;QACF,OAAO,KAAK,CAAA;IACb,CAAC;IACD,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,UAAU,GAAqC,IAAI,CAAA;IACvD,IAAI,eAAe,GAAG,KAAK,CAAA;IAC3B,OAAO,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAA;QACzD,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,CAAA;QAC5B,MAAM,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;QAClC,IAAI,OAAO,GAAG,SAAS,IAAI,OAAO,GAAG,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC/D,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;QACxE,IAAI,OAAO,IAAI,UAAU,KAAK,IAAI;YAAE,UAAU,GAAG,OAAO,CAAA;QACxD,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM;YAAE,eAAe,GAAG,OAAO,KAAK,IAAI,CAAA;QAC1E,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAChC,CAAC;IACD,OAAO,CACN,MAAM,KAAK,KAAK,CAAC,MAAM;QACvB,UAAU,KAAK,IAAI;QACnB,eAAe;QACf,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAC/C,CAAA;AACF,CAAC;AAED,SAAS,eAAe,CAAC,KAAoB;IAC5C,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAA;IACnD,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC/C,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAA;IACxB,QAAQ,KAAK,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,WAAW;YACf,OAAO,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,KAAK,YAAY;YAChB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;QACrB,KAAK,WAAW;YACf,OAAO,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,KAAK,YAAY;YAChB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC;AACF,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAgC;IAClE,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;AAC5D,CAAC"}
|
|
@@ -18,6 +18,10 @@ export declare class StdioTransport implements MCPTransport {
|
|
|
18
18
|
private closeHandlers;
|
|
19
19
|
private errorHandlers;
|
|
20
20
|
private connected;
|
|
21
|
+
/** The response channel ended for this process generation. */
|
|
22
|
+
private retired;
|
|
23
|
+
/** Prevents a late event from an old child retiring its replacement. */
|
|
24
|
+
private generation;
|
|
21
25
|
/** True between kill and the process's own `close` event. */
|
|
22
26
|
private exitPending;
|
|
23
27
|
private buffer;
|
|
@@ -35,6 +39,15 @@ export declare class StdioTransport implements MCPTransport {
|
|
|
35
39
|
* sessions that kept their old client state alive.
|
|
36
40
|
*/
|
|
37
41
|
private clearHandlers;
|
|
42
|
+
/**
|
|
43
|
+
* Publish one terminal result for the current response channel.
|
|
44
|
+
*
|
|
45
|
+
* A child may close stdout and keep running. That is just as terminal for
|
|
46
|
+
* JSON-RPC as process exit: no pending or future request can receive a
|
|
47
|
+
* response. Keeping the child handle is intentional; `close()` still owns
|
|
48
|
+
* and reaps that process after the protocol session has been retired.
|
|
49
|
+
*/
|
|
50
|
+
private retire;
|
|
38
51
|
send(message: MCPJsonRpcMessage, options?: MCPTransportSendOptions): Promise<void>;
|
|
39
52
|
onMessage(handler: (message: MCPJsonRpcMessage) => void): void;
|
|
40
53
|
onClose(handler: () => void): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/stdio.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACZ,uBAAuB,EACvB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAyDlE;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC5B,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,GAAG,YAAY,CAAC,EAC3D,MAAM,GAAE,MAAM,CAAC,UAAwB,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxB;AAED,qBAAa,cAAe,YAAW,YAAY;
|
|
1
|
+
{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/stdio.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACZ,uBAAuB,EACvB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAyDlE;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC5B,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,KAAK,GAAG,YAAY,CAAC,EAC3D,MAAM,GAAE,MAAM,CAAC,UAAwB,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxB;AAED,qBAAa,cAAe,YAAW,YAAY;IAgBjD,OAAO,CAAC,QAAQ,CAAC,MAAM;IAfxB,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,eAAe,CAAkD;IACzE,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,SAAS,CAAQ;IACzB,8DAA8D;IAC9D,OAAO,CAAC,OAAO,CAAQ;IACvB,wEAAwE;IACxE,OAAO,CAAC,UAAU,CAAI;IACtB,6DAA6D;IAC7D,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,GAAG,CAAQ;gBAGD,MAAM,EAAE,uBAAuB,EAChD,GAAG,CAAC,EAAE,MAAM;IAKP,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuD5B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAMrB;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM;IAgBR,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxF,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;IAI9D,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI;IAIlC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI9C,WAAW,IAAI,OAAO;IAItB,OAAO,CAAC,aAAa;CAiBrB"}
|
|
@@ -78,6 +78,10 @@ export class StdioTransport {
|
|
|
78
78
|
closeHandlers = [];
|
|
79
79
|
errorHandlers = [];
|
|
80
80
|
connected = false;
|
|
81
|
+
/** The response channel ended for this process generation. */
|
|
82
|
+
retired = false;
|
|
83
|
+
/** Prevents a late event from an old child retiring its replacement. */
|
|
84
|
+
generation = 0;
|
|
81
85
|
/** True between kill and the process's own `close` event. */
|
|
82
86
|
exitPending = false;
|
|
83
87
|
buffer = '';
|
|
@@ -89,35 +93,44 @@ export class StdioTransport {
|
|
|
89
93
|
async connect() {
|
|
90
94
|
if (this.connected)
|
|
91
95
|
return;
|
|
92
|
-
|
|
96
|
+
// A protocol channel can end while its process stays alive. Reconnect
|
|
97
|
+
// must reap that old owner before publishing a new generation; otherwise
|
|
98
|
+
// both children remain live and teardown owns only the newest one.
|
|
99
|
+
if (this.process)
|
|
100
|
+
await this.close();
|
|
101
|
+
const generation = ++this.generation;
|
|
102
|
+
this.retired = false;
|
|
103
|
+
this.buffer = '';
|
|
104
|
+
const child = spawn(this.config.command, this.config.args ?? [], {
|
|
93
105
|
env: buildChildEnv(this.config),
|
|
94
106
|
cwd: this.config.cwd,
|
|
95
107
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
96
108
|
});
|
|
97
|
-
this.process
|
|
109
|
+
this.process = child;
|
|
110
|
+
child.stdout?.on('data', (chunk) => {
|
|
111
|
+
if (generation !== this.generation || this.retired)
|
|
112
|
+
return;
|
|
98
113
|
this.buffer += chunk.toString('utf-8');
|
|
99
114
|
this.processBuffer();
|
|
100
115
|
});
|
|
101
|
-
|
|
116
|
+
child.stdout?.once('end', () => this.retire(generation, 'close'));
|
|
117
|
+
child.stdout?.once('close', () => this.retire(generation, 'close'));
|
|
118
|
+
child.stdout?.once('error', (err) => this.retire(generation, 'error', err));
|
|
119
|
+
child.stderr?.on('data', (chunk) => {
|
|
102
120
|
this.log.warn('MCP server stderr', {
|
|
103
121
|
'namzu.mcp.stderr': chunk.toString('utf-8').trim(),
|
|
104
122
|
});
|
|
105
123
|
});
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
// After the notification, not before it: this event is what tells
|
|
112
|
-
// `MCPClient` the session ended.
|
|
124
|
+
child.stdin?.once('close', () => this.retire(generation, 'close'));
|
|
125
|
+
child.stdin?.once('error', (err) => this.retire(generation, 'error', err));
|
|
126
|
+
child.on('close', (code) => {
|
|
127
|
+
if (this.process === child)
|
|
128
|
+
this.process = null;
|
|
113
129
|
this.exitPending = false;
|
|
114
|
-
this.
|
|
115
|
-
|
|
116
|
-
this.process.on('error', (err) => {
|
|
117
|
-
this.connected = false;
|
|
118
|
-
for (const handler of this.errorHandlers)
|
|
119
|
-
handler(err);
|
|
130
|
+
this.log.info('MCP server process exited', { 'namzu.mcp.exit_code': code });
|
|
131
|
+
this.retire(generation, 'close');
|
|
120
132
|
});
|
|
133
|
+
child.on('error', (err) => this.retire(generation, 'error', err));
|
|
121
134
|
this.connected = true;
|
|
122
135
|
this.log.info('StdioTransport connected', {
|
|
123
136
|
'namzu.mcp.command': this.config.command,
|
|
@@ -150,8 +163,10 @@ export class StdioTransport {
|
|
|
150
163
|
// so both settle this, and two timers make a hang impossible: the
|
|
151
164
|
// first escalates to SIGKILL for a child ignoring SIGTERM, the second
|
|
152
165
|
// gives up waiting. Neither holds the event loop open.
|
|
153
|
-
if (child.pid === undefined)
|
|
166
|
+
if (child.pid === undefined) {
|
|
167
|
+
this.exitPending = false;
|
|
154
168
|
return;
|
|
169
|
+
}
|
|
155
170
|
await new Promise((resolve) => {
|
|
156
171
|
let settled = false;
|
|
157
172
|
const finish = () => {
|
|
@@ -162,18 +177,20 @@ export class StdioTransport {
|
|
|
162
177
|
clearTimeout(giveUp);
|
|
163
178
|
resolve();
|
|
164
179
|
};
|
|
165
|
-
child.once('
|
|
180
|
+
child.once('close', finish);
|
|
166
181
|
child.once('error', finish);
|
|
167
|
-
child.
|
|
182
|
+
if (child.exitCode === null && child.signalCode === null) {
|
|
183
|
+
child.kill('SIGTERM');
|
|
184
|
+
}
|
|
168
185
|
const escalate = setTimeout(() => child.kill('SIGKILL'), TERMINATE_GRACE_MS);
|
|
169
186
|
const giveUp = setTimeout(finish, TERMINATE_GRACE_MS * 2);
|
|
170
187
|
escalate.unref?.();
|
|
171
188
|
giveUp.unref?.();
|
|
172
189
|
});
|
|
173
|
-
|
|
174
|
-
//
|
|
175
|
-
//
|
|
176
|
-
// `
|
|
190
|
+
this.exitPending = false;
|
|
191
|
+
// The active generation's terminal stream/process event owns handler
|
|
192
|
+
// retirement. A reconnect can register its handlers before `connect()`
|
|
193
|
+
// reaps an already-retired child, so `close()` must not clear them here.
|
|
177
194
|
}
|
|
178
195
|
/**
|
|
179
196
|
* Drop every registered handler.
|
|
@@ -189,6 +206,32 @@ export class StdioTransport {
|
|
|
189
206
|
this.closeHandlers = [];
|
|
190
207
|
this.errorHandlers = [];
|
|
191
208
|
}
|
|
209
|
+
/**
|
|
210
|
+
* Publish one terminal result for the current response channel.
|
|
211
|
+
*
|
|
212
|
+
* A child may close stdout and keep running. That is just as terminal for
|
|
213
|
+
* JSON-RPC as process exit: no pending or future request can receive a
|
|
214
|
+
* response. Keeping the child handle is intentional; `close()` still owns
|
|
215
|
+
* and reaps that process after the protocol session has been retired.
|
|
216
|
+
*/
|
|
217
|
+
retire(generation, kind, error) {
|
|
218
|
+
if (generation !== this.generation || this.retired)
|
|
219
|
+
return;
|
|
220
|
+
this.retired = true;
|
|
221
|
+
this.connected = false;
|
|
222
|
+
this.buffer = '';
|
|
223
|
+
const closeHandlers = this.closeHandlers;
|
|
224
|
+
const errorHandlers = this.errorHandlers;
|
|
225
|
+
this.clearHandlers();
|
|
226
|
+
if (kind === 'error') {
|
|
227
|
+
const reason = error ?? new Error('MCP stdio transport failed');
|
|
228
|
+
for (const handler of errorHandlers)
|
|
229
|
+
handler(reason);
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
for (const handler of closeHandlers)
|
|
233
|
+
handler();
|
|
234
|
+
}
|
|
192
235
|
async send(message, options) {
|
|
193
236
|
options?.signal?.throwIfAborted();
|
|
194
237
|
if (!this.process?.stdin?.writable) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/connector/mcp/stdio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAO7D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAe,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EACN,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,GACnB,MAAM,oCAAoC,CAAA;AAE3C;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,aAAa,GAAsB;IACxC,cAAc;IACd,MAAM;IACN,MAAM;IACN,QAAQ;IACR,UAAU;IACV,IAAI;IACJ,SAAS;IACT,MAAM;IACN,OAAO;IACP,QAAQ;IACR,MAAM;IACN,SAAS;IACT,0EAA0E;IAC1E,sEAAsE;IACtE,GAAG,qBAAqB;CACxB,CAAA;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAC5B,MAA2D,EAC3D,SAA4B,OAAO,CAAC,GAAG;IAEvC,MAAM,GAAG,GAAG,sBAAsB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IACzD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAChD,uEAAuE;QACvE,sEAAsE;QACtE,kEAAkE;QAClE,IAAI,KAAK;YAAE,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IACD,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;IAC1C,OAAO,GAAG,CAAA;AACX,CAAC;AAED,MAAM,OAAO,cAAc;
|
|
1
|
+
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/connector/mcp/stdio.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamable-http.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/streamable-http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,iBAAiB,EACjB,gCAAgC,EAChC,YAAY,EACZ,uBAAuB,EACvB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"streamable-http.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/streamable-http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,iBAAiB,EACjB,gCAAgC,EAChC,YAAY,EACZ,uBAAuB,EACvB,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,uBAAuB,CAAA;AAMlE,qBAAa,uBAAwB,YAAW,YAAY;IAY1D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAXxB,OAAO,CAAC,eAAe,CAAkD;IACzE,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;gBAGhB,MAAM,EAAE,gCAAgC,EACzD,GAAG,CAAC,EAAE,MAAM;IASP,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB5B,sEAAsE;IACtE,OAAO,CAAC,aAAa;IAMf,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CxF,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;IAI9D,OAAO,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,IAAI;IAIlC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI9C,WAAW,IAAI,OAAO;IAItB,OAAO,CAAC,YAAY;IAcpB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,SAAS;IAyBjB,OAAO,CAAC,aAAa;YAOP,wBAAwB;CAsBtC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SCOPE_ATTRIBUTE } from '../../utils/log/types.js';
|
|
2
2
|
import { resolveLogger } from '../../utils/logger.js';
|
|
3
3
|
import { ConnectorHttpOperation, validateConnectorTimeoutMs } from '../http-operation.js';
|
|
4
|
+
import { refuseMcpHttpRedirect } from './http-redirect.js';
|
|
4
5
|
const DEFAULT_TIMEOUT_MS = 30_000;
|
|
5
6
|
export class StreamableHttpTransport {
|
|
6
7
|
config;
|
|
@@ -62,8 +63,10 @@ export class StreamableHttpTransport {
|
|
|
62
63
|
method: 'POST',
|
|
63
64
|
headers: this.buildHeaders(),
|
|
64
65
|
body: JSON.stringify(message),
|
|
66
|
+
redirect: 'manual',
|
|
65
67
|
signal: operation.signal,
|
|
66
68
|
}));
|
|
69
|
+
refuseMcpHttpRedirect(response, message.method);
|
|
67
70
|
if (!response.ok) {
|
|
68
71
|
throw new Error(`StreamableHttpTransport: HTTP ${response.status}: ${response.statusText}`);
|
|
69
72
|
}
|