@dirgha/code 1.22.0 → 1.24.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 +171 -0
- package/README.md +8 -4
- package/dist/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.d.ts +36 -5
- package/dist/cli/config.js +31 -3
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +40 -24
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +13 -18
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +61 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -23
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +1 -0
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/slash/fleet.js +28 -3
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/index.d.ts +2 -1
- package/dist/cli/slash/index.js +3 -1
- package/dist/cli/slash/index.js.map +1 -1
- package/dist/cli/slash/models.js +339 -7
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.js +4 -7
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.d.ts +1 -0
- package/dist/cli/slash/provider.js +33 -1
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/sandbox.d.ts +21 -0
- package/dist/cli/slash/sandbox.js +84 -0
- package/dist/cli/slash/sandbox.js.map +1 -0
- package/dist/cli/slash.d.ts +5 -0
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/audit.js +28 -8
- package/dist/cli/subcommands/audit.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +4 -0
- package/dist/cli/subcommands/doctor.js +117 -21
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.js +6 -6
- package/dist/cli/subcommands/feature-setup.js.map +1 -1
- package/dist/cli/subcommands/memory.js +23 -0
- package/dist/cli/subcommands/memory.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/_fts.js +4 -1
- package/dist/context/_fts.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +44 -21
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +1 -0
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +8 -1
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -1
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.d.ts +17 -0
- package/dist/context/primer.js +50 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +4 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.js +17 -3
- package/dist/daemon/server.js.map +1 -1
- package/dist/embeddings/iface.d.ts +26 -0
- package/dist/embeddings/iface.js +15 -0
- package/dist/embeddings/iface.js.map +1 -0
- package/dist/embeddings/local.d.ts +24 -0
- package/dist/embeddings/local.js +112 -0
- package/dist/embeddings/local.js.map +1 -0
- package/dist/embeddings/remote.d.ts +31 -0
- package/dist/embeddings/remote.js +88 -0
- package/dist/embeddings/remote.js.map +1 -0
- package/dist/embeddings/select.d.ts +24 -0
- package/dist/embeddings/select.js +39 -0
- package/dist/embeddings/select.js.map +1 -0
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/failover-chain.js +10 -1
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +45 -11
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/abort-utils.d.ts +4 -0
- package/dist/kernel/abort-utils.js +45 -0
- package/dist/kernel/abort-utils.js.map +1 -0
- package/dist/kernel/agent-loop.js +104 -25
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/tool-timeout.d.ts +27 -0
- package/dist/kernel/tool-timeout.js +53 -0
- package/dist/kernel/tool-timeout.js.map +1 -0
- package/dist/kernel/types.d.ts +3 -0
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/custom-provider.d.ts +31 -0
- package/dist/providers/custom-provider.js +72 -0
- package/dist/providers/custom-provider.js.map +1 -0
- package/dist/providers/deepseek.js +1 -1
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +25 -2
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/family-fallback.js +5 -0
- package/dist/providers/family-fallback.js.map +1 -1
- package/dist/providers/gemini.js +33 -3
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/index.d.ts +16 -0
- package/dist/providers/index.js +43 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/machine1.d.ts +30 -0
- package/dist/providers/machine1.js +341 -0
- package/dist/providers/machine1.js.map +1 -0
- package/dist/providers/nvidia.js +1 -1
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-compat.d.ts +1 -0
- package/dist/providers/openai-compat.js +32 -9
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +5 -2
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db-telemetry.js +11 -1
- package/dist/state/db-telemetry.js.map +1 -1
- package/dist/state/db.d.ts +7 -0
- package/dist/state/db.js +147 -3
- package/dist/state/db.js.map +1 -1
- package/dist/state/index.js +8 -4
- package/dist/state/index.js.map +1 -1
- package/dist/state/sync-index.d.ts +74 -0
- package/dist/state/sync-index.js +246 -0
- package/dist/state/sync-index.js.map +1 -0
- package/dist/state/transaction.d.ts +62 -0
- package/dist/state/transaction.js +65 -0
- package/dist/state/transaction.js.map +1 -0
- package/dist/state/vec.d.ts +28 -0
- package/dist/state/vec.js +113 -0
- package/dist/state/vec.js.map +1 -0
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +94 -63
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/db-workspace-info.d.ts +10 -0
- package/dist/tools/db-workspace-info.js +76 -0
- package/dist/tools/db-workspace-info.js.map +1 -0
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +6 -1
- package/dist/tools/exec.js +46 -4
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +13 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/github.d.ts +13 -0
- package/dist/tools/github.js +257 -0
- package/dist/tools/github.js.map +1 -0
- package/dist/tools/graph-neighbors.d.ts +9 -0
- package/dist/tools/graph-neighbors.js +77 -0
- package/dist/tools/graph-neighbors.js.map +1 -0
- package/dist/tools/graph-traverse.d.ts +10 -0
- package/dist/tools/graph-traverse.js +90 -0
- package/dist/tools/graph-traverse.js.map +1 -0
- package/dist/tools/index.d.ts +10 -2
- package/dist/tools/index.js +17 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/kb-search.d.ts +13 -0
- package/dist/tools/kb-search.js +113 -0
- package/dist/tools/kb-search.js.map +1 -0
- package/dist/tools/multimodal.js +30 -15
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/permission.js +5 -4
- package/dist/tools/permission.js.map +1 -1
- package/dist/tools/registry.d.ts +10 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.js +28 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +46 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +7 -1
- package/dist/tools/shell.js +178 -61
- package/dist/tools/shell.js.map +1 -1
- package/dist/tools/transactional-write.d.ts +10 -0
- package/dist/tools/transactional-write.js +132 -0
- package/dist/tools/transactional-write.js.map +1 -0
- package/dist/tui/approval.js +31 -3
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.d.ts +2 -1
- package/dist/tui/ink/App.js +333 -79
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +20 -3
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +4 -0
- package/dist/tui/ink/components/InputBox.js +38 -21
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +18 -16
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/Logo.d.ts +20 -0
- package/dist/tui/ink/components/Logo.js +67 -1
- package/dist/tui/ink/components/Logo.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +3 -1
- package/dist/tui/ink/components/PasteCollapse.js +11 -9
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js +1 -1
- package/dist/tui/ink/components/PromptQueueIndicator.js.map +1 -1
- package/dist/tui/ink/components/SandboxPicker.d.ts +18 -0
- package/dist/tui/ink/components/SandboxPicker.js +77 -0
- package/dist/tui/ink/components/SandboxPicker.js.map +1 -0
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +3 -7
- package/dist/tui/ink/components/StatusBar.js +2 -11
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
- package/dist/tui/ink/components/ThinkingBlock.js +34 -17
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +21 -13
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +1 -1
- package/dist/tui/ink/components/VirtualTranscript.js +5 -3
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/index.js +36 -14
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.d.ts +2 -0
- package/dist/tui/ink/ink-approval-bus.js +10 -0
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/markdown/display.js +9 -2
- package/dist/tui/ink/markdown/display.js.map +1 -1
- package/dist/tui/ink/markdown/split-point.js +8 -13
- package/dist/tui/ink/markdown/split-point.js.map +1 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
- package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
- package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
- package/dist/tui/ink/theme-context.js +6 -3
- package/dist/tui/ink/theme-context.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +6 -2
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-elapsed.d.ts +9 -1
- package/dist/tui/ink/use-elapsed.js +17 -2
- package/dist/tui/ink/use-elapsed.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +10 -0
- package/dist/tui/ink/use-event-projection.js +111 -12
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.js +9 -0
- package/dist/tui/ink/use-flicker-detector.js.map +1 -1
- package/dist/tui/ink/use-overlays.d.ts +2 -2
- package/dist/tui/ink/use-overlays.js +20 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +18 -5
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +7 -0
- package/dist/tui/ink/use-tool-progress.js +39 -0
- package/dist/tui/ink/use-tool-progress.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.js +14 -6
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +12 -8
package/dist/mcp/client.js
CHANGED
|
@@ -13,8 +13,8 @@ export class DefaultMcpClient {
|
|
|
13
13
|
// 30 s default — enough for slow MCP tools, short enough that a
|
|
14
14
|
// server crash during a request can't hang the parent forever.
|
|
15
15
|
this.requestTimeoutMs = opts.requestTimeoutMs ?? 30_000;
|
|
16
|
-
this.transport.onMessage(msg => this.handle(msg));
|
|
17
|
-
this.transport.onClose?.(() => this.failPending(
|
|
16
|
+
this.transport.onMessage((msg) => this.handle(msg));
|
|
17
|
+
this.transport.onClose?.(() => this.failPending("transport closed"));
|
|
18
18
|
}
|
|
19
19
|
failPending(reason) {
|
|
20
20
|
for (const [, slot] of this.pending) {
|
|
@@ -24,37 +24,40 @@ export class DefaultMcpClient {
|
|
|
24
24
|
this.pending.clear();
|
|
25
25
|
}
|
|
26
26
|
async initialize() {
|
|
27
|
-
return await this.request(
|
|
28
|
-
protocolVersion:
|
|
27
|
+
return await this.request("initialize", {
|
|
28
|
+
protocolVersion: "2024-11-05",
|
|
29
29
|
capabilities: { tools: {} },
|
|
30
|
-
clientInfo: { name:
|
|
30
|
+
clientInfo: { name: "dirgha-cli", version: "0.2.0" },
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
async listTools() {
|
|
34
|
-
const result = await this.request(
|
|
34
|
+
const result = await this.request("tools/list");
|
|
35
35
|
return result.tools ?? [];
|
|
36
36
|
}
|
|
37
37
|
async callTool(name, arguments_) {
|
|
38
|
-
return await this.request(
|
|
38
|
+
return await this.request("tools/call", {
|
|
39
|
+
name,
|
|
40
|
+
arguments: arguments_,
|
|
41
|
+
});
|
|
39
42
|
}
|
|
40
43
|
async close() {
|
|
41
44
|
for (const [, pending] of this.pending) {
|
|
42
45
|
clearTimeout(pending.timer);
|
|
43
|
-
pending.reject(new Error(
|
|
46
|
+
pending.reject(new Error("Client closed"));
|
|
44
47
|
}
|
|
45
48
|
this.pending.clear();
|
|
46
49
|
await this.transport.close();
|
|
47
50
|
}
|
|
48
51
|
async request(method, params) {
|
|
49
52
|
const id = this.nextId++;
|
|
50
|
-
const message = { jsonrpc:
|
|
53
|
+
const message = { jsonrpc: "2.0", id, method, params };
|
|
51
54
|
const promise = new Promise((resolve, reject) => {
|
|
52
55
|
const timer = setTimeout(() => {
|
|
53
56
|
this.pending.delete(id);
|
|
54
57
|
reject(new Error(`MCP request timed out after ${this.requestTimeoutMs}ms (method=${method})`));
|
|
55
58
|
}, this.requestTimeoutMs);
|
|
56
|
-
timer.unref
|
|
57
|
-
this.pending.set(id, { resolve: v => resolve(v), reject, timer });
|
|
59
|
+
timer.unref();
|
|
60
|
+
this.pending.set(id, { resolve: (v) => resolve(v), reject, timer });
|
|
58
61
|
});
|
|
59
62
|
try {
|
|
60
63
|
await this.transport.send(message);
|
|
@@ -84,10 +87,10 @@ export class DefaultMcpClient {
|
|
|
84
87
|
}
|
|
85
88
|
}
|
|
86
89
|
function isResponse(v) {
|
|
87
|
-
return typeof v ===
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
return (typeof v === "object" &&
|
|
91
|
+
v !== null &&
|
|
92
|
+
"jsonrpc" in v &&
|
|
93
|
+
v.jsonrpc === "2.0" &&
|
|
94
|
+
"id" in v);
|
|
92
95
|
}
|
|
93
96
|
//# sourceMappingURL=client.js.map
|
package/dist/mcp/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0CH,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/mcp/client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0CH,MAAM,OAAO,gBAAgB;IAajB;IAZF,MAAM,GAAG,CAAC,CAAC;IACX,OAAO,GAAG,IAAI,GAAG,EAOtB,CAAC;IACI,gBAAgB,CAAS;IAEjC,YACU,SAAoB,EAC5B,OAAsC,EAAE;QADhC,cAAS,GAAT,SAAS,CAAW;QAG5B,gEAAgE;QAChE,+DAA+D;QAC/D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,MAAM,CAAC;QACxD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACvE,CAAC;IAEO,WAAW,CAAC,MAAc;QAChC,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACpC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,MAAM,IAAI,CAAC,OAAO,CAAmB,YAAY,EAAE;YACxD,eAAe,EAAE,YAAY;YAC7B,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;YAC3B,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE;SACrD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAuB,YAAY,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,IAAY,EACZ,UAAmB;QAEnB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAoB,YAAY,EAAE;YACzD,IAAI;YACJ,SAAS,EAAE,UAAU;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK;QACT,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACvC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,OAAO,CAAI,MAAc,EAAE,MAAgB;QACvD,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,OAAO,GAAmB,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QACvE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACxB,MAAM,CACJ,IAAI,KAAK,CACP,+BAA+B,IAAI,CAAC,gBAAgB,cAAc,MAAM,GAAG,CAC5E,CACF,CAAC;YACJ,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC1B,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,IAAI,EAAE,CAAC;gBACT,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1B,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,GAAY;QACzB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,GAAG,CAAC,KAAK;YACX,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;;YAClE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACF;AAED,SAAS,UAAU,CAAC,CAAU;IAC5B,OAAO,CACL,OAAO,CAAC,KAAK,QAAQ;QACrB,CAAC,KAAK,IAAI;QACV,SAAS,IAAI,CAAC;QACb,CAAyB,CAAC,OAAO,KAAK,KAAK;QAC5C,IAAI,IAAI,CAAC,CACV,CAAC;AACJ,CAAC"}
|
package/dist/mcp/transport.js
CHANGED
|
@@ -3,13 +3,14 @@
|
|
|
3
3
|
* stdin/stdout) for local servers. Remote HTTP/SSE transport can be
|
|
4
4
|
* added later by implementing the same Transport interface.
|
|
5
5
|
*/
|
|
6
|
-
import { spawn } from
|
|
6
|
+
import { spawn } from "node:child_process";
|
|
7
|
+
import { safeEnvironment } from "../utils/env.js";
|
|
7
8
|
export class StdioTransport {
|
|
8
9
|
opts;
|
|
9
10
|
child = null;
|
|
10
11
|
handlers = [];
|
|
11
12
|
closeHandlers = [];
|
|
12
|
-
buffer =
|
|
13
|
+
buffer = "";
|
|
13
14
|
ready;
|
|
14
15
|
constructor(opts) {
|
|
15
16
|
this.opts = opts;
|
|
@@ -19,26 +20,29 @@ export class StdioTransport {
|
|
|
19
20
|
return new Promise((resolve, reject) => {
|
|
20
21
|
try {
|
|
21
22
|
const child = spawn(this.opts.command, this.opts.args ?? [], {
|
|
22
|
-
env: { ...
|
|
23
|
+
env: { ...safeEnvironment(), ...this.opts.env },
|
|
23
24
|
cwd: this.opts.cwd,
|
|
24
|
-
stdio: [
|
|
25
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
25
26
|
});
|
|
26
27
|
this.child = child;
|
|
27
|
-
child.stdout
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
child.
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
if (!child.stdout || !child.stdin) {
|
|
29
|
+
reject(new Error(`MCP server ${this.opts.command} stdio is not piped`));
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
child.stdout.on("data", (buf) => this.onData(buf));
|
|
33
|
+
child.stderr.on("data", (buf) => {
|
|
34
|
+
process.stderr.write(`[mcp:${this.opts.command}] ${buf.toString("utf8")}`);
|
|
35
|
+
});
|
|
36
|
+
child.stdin.on("error", () => {
|
|
37
|
+
/* swallow EPIPE / ECONNRESET */
|
|
38
|
+
});
|
|
39
|
+
child.on("error", (err) => reject(err));
|
|
40
|
+
child.on("exit", () => {
|
|
35
41
|
this.child = null;
|
|
36
|
-
// Notify upper layers so pending requests can be rejected
|
|
37
|
-
// immediately rather than waiting for the request timeout.
|
|
38
42
|
for (const cb of this.closeHandlers)
|
|
39
43
|
cb();
|
|
40
44
|
});
|
|
41
|
-
child.on(
|
|
45
|
+
child.on("spawn", () => resolve());
|
|
42
46
|
}
|
|
43
47
|
catch (err) {
|
|
44
48
|
reject(err);
|
|
@@ -46,12 +50,12 @@ export class StdioTransport {
|
|
|
46
50
|
});
|
|
47
51
|
}
|
|
48
52
|
onData(buf) {
|
|
49
|
-
this.buffer += buf.toString(
|
|
50
|
-
let
|
|
51
|
-
while ((
|
|
52
|
-
const line = this.buffer.slice(0,
|
|
53
|
-
this.buffer = this.buffer.slice(
|
|
54
|
-
if (!line
|
|
53
|
+
this.buffer += buf.toString("utf8");
|
|
54
|
+
let nl;
|
|
55
|
+
while ((nl = this.buffer.indexOf("\n")) >= 0) {
|
|
56
|
+
const line = this.buffer.slice(0, nl).trimEnd();
|
|
57
|
+
this.buffer = this.buffer.slice(nl + 1);
|
|
58
|
+
if (!line)
|
|
55
59
|
continue;
|
|
56
60
|
try {
|
|
57
61
|
const parsed = JSON.parse(line);
|
|
@@ -59,17 +63,16 @@ export class StdioTransport {
|
|
|
59
63
|
h(parsed);
|
|
60
64
|
}
|
|
61
65
|
catch {
|
|
62
|
-
|
|
66
|
+
/* skip malformed */
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
70
|
async send(message) {
|
|
67
71
|
await this.ready;
|
|
68
72
|
if (!this.child || !this.child.stdin)
|
|
69
|
-
throw new Error(
|
|
73
|
+
throw new Error("Transport is closed");
|
|
70
74
|
await new Promise((resolve, reject) => {
|
|
71
|
-
|
|
72
|
-
this.child.stdin.write(data, err => err ? reject(err) : resolve());
|
|
75
|
+
this.child.stdin.write(JSON.stringify(message) + "\n", (err) => (err ? reject(err) : resolve()));
|
|
73
76
|
});
|
|
74
77
|
}
|
|
75
78
|
onMessage(handler) {
|
|
@@ -108,13 +111,16 @@ export class HttpTransport {
|
|
|
108
111
|
closed = false;
|
|
109
112
|
constructor(opts) {
|
|
110
113
|
this.opts = opts;
|
|
114
|
+
if (typeof fetch !== "function") {
|
|
115
|
+
throw new Error("HttpTransport requires a global fetch API (Node 18+ or a polyfill)");
|
|
116
|
+
}
|
|
111
117
|
}
|
|
112
118
|
async send(message) {
|
|
113
119
|
if (this.closed)
|
|
114
|
-
throw new Error(
|
|
120
|
+
throw new Error("HttpTransport is closed");
|
|
115
121
|
const headers = {
|
|
116
|
-
|
|
117
|
-
Accept:
|
|
122
|
+
"Content-Type": "application/json",
|
|
123
|
+
Accept: "application/json, text/event-stream",
|
|
118
124
|
...(this.opts.headers ?? {}),
|
|
119
125
|
};
|
|
120
126
|
// Token resolution: bearerProvider beats bearerToken so OAuth
|
|
@@ -129,7 +135,7 @@ export class HttpTransport {
|
|
|
129
135
|
let resp;
|
|
130
136
|
try {
|
|
131
137
|
resp = await fetch(this.opts.url, {
|
|
132
|
-
method:
|
|
138
|
+
method: "POST",
|
|
133
139
|
headers,
|
|
134
140
|
body: JSON.stringify(message),
|
|
135
141
|
signal: ac.signal,
|
|
@@ -139,20 +145,20 @@ export class HttpTransport {
|
|
|
139
145
|
clearTimeout(timer);
|
|
140
146
|
}
|
|
141
147
|
if (!resp.ok)
|
|
142
|
-
throw new Error(`MCP HTTP ${resp.status}: ${await resp.text().catch(() =>
|
|
143
|
-
const ctype = resp.headers.get(
|
|
144
|
-
if (ctype.includes(
|
|
148
|
+
throw new Error(`MCP HTTP ${resp.status}: ${await resp.text().catch(() => "")}`);
|
|
149
|
+
const ctype = resp.headers.get("content-type") ?? "";
|
|
150
|
+
if (ctype.includes("application/json")) {
|
|
145
151
|
const body = await resp.json();
|
|
146
152
|
for (const h of this.handlers)
|
|
147
153
|
h(body);
|
|
148
154
|
return;
|
|
149
155
|
}
|
|
150
|
-
if (ctype.includes(
|
|
156
|
+
if (ctype.includes("text/event-stream") && resp.body) {
|
|
151
157
|
// Parse SSE: each block is `event: foo\ndata: {...}\n\n`.
|
|
152
158
|
// We only act on `data:` lines that JSON-parse cleanly.
|
|
153
159
|
const reader = resp.body.getReader();
|
|
154
160
|
const decoder = new TextDecoder();
|
|
155
|
-
let buf =
|
|
161
|
+
let buf = "";
|
|
156
162
|
while (true) {
|
|
157
163
|
const { value, done } = await reader.read();
|
|
158
164
|
if (done)
|
|
@@ -160,11 +166,11 @@ export class HttpTransport {
|
|
|
160
166
|
buf += decoder.decode(value, { stream: true });
|
|
161
167
|
// Process complete events (terminated by blank line).
|
|
162
168
|
let idx;
|
|
163
|
-
while ((idx = buf.indexOf(
|
|
169
|
+
while ((idx = buf.indexOf("\n\n")) >= 0) {
|
|
164
170
|
const block = buf.slice(0, idx);
|
|
165
171
|
buf = buf.slice(idx + 2);
|
|
166
|
-
for (const line of block.split(
|
|
167
|
-
if (!line.startsWith(
|
|
172
|
+
for (const line of block.split("\n")) {
|
|
173
|
+
if (!line.startsWith("data:"))
|
|
168
174
|
continue;
|
|
169
175
|
const payload = line.slice(5).trim();
|
|
170
176
|
if (!payload)
|
|
@@ -174,7 +180,9 @@ export class HttpTransport {
|
|
|
174
180
|
for (const h of this.handlers)
|
|
175
181
|
h(parsed);
|
|
176
182
|
}
|
|
177
|
-
catch {
|
|
183
|
+
catch {
|
|
184
|
+
/* skip non-JSON SSE comments */
|
|
185
|
+
}
|
|
178
186
|
}
|
|
179
187
|
}
|
|
180
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/mcp/transport.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/mcp/transport.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAiBlD,MAAM,OAAO,cAAc;IAOL;IANZ,KAAK,GAAwB,IAAI,CAAC;IAClC,QAAQ,GAAsC,EAAE,CAAC;IACjD,aAAa,GAAsB,EAAE,CAAC;IACtC,MAAM,GAAG,EAAE,CAAC;IACZ,KAAK,CAAgB;IAE7B,YAAoB,IAA2B;QAA3B,SAAI,GAAJ,IAAI,CAAuB;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK;QACX,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE;oBAC3D,GAAG,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC/C,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;oBAClB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;iBAChC,CAAC,CAAC;gBACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;gBACnB,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;oBAClC,MAAM,CACJ,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,OAAO,qBAAqB,CAAC,CAChE,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3D,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE;oBACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CACrD,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBAC3B,gCAAgC;gBAClC,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;oBAClB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa;wBAAE,EAAE,EAAE,CAAC;gBAC5C,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,GAAW;QACxB,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,EAAU,CAAC;QACf,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ;oBAAE,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBACP,oBAAoB;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAgB;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK;YAClC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,CAAC,KAAsB,CAAC,KAAM,CAAC,KAAK,CACvC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,EAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CACzC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,OAAmC;QAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,CAAC,OAAmB;QACzB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa;YAAE,EAAE,EAAE,CAAC;IAC5C,CAAC;CACF;AAmBD;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,aAAa;IAIJ;IAHZ,QAAQ,GAAsC,EAAE,CAAC;IACjD,MAAM,GAAG,KAAK,CAAC;IAEvB,YAAoB,IAA0B;QAA1B,SAAI,GAAJ,IAAI,CAAsB;QAC5C,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAgB;QACzB,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC5D,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,kBAAkB;YAClC,MAAM,EAAE,qCAAqC;YAC7C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;SAC7B,CAAC;QACF,8DAA8D;QAC9D,iEAAiE;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc;YACpC,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACnD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1B,IAAI,KAAK;YAAE,OAAO,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAC;QAErD,MAAM,EAAE,GAAG,IAAI,eAAe,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;QAC1E,IAAI,IAAc,CAAC;QACnB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC7B,MAAM,EAAE,EAAE,CAAC,MAAM;aAClB,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAChE,CAAC;QAEJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACrD,IAAI,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ;gBAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACrD,0DAA0D;YAC1D,wDAAwD;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;YAClC,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI;oBAAE,MAAM;gBAChB,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC/C,sDAAsD;gBACtD,IAAI,GAAW,CAAC;gBAChB,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;oBAChC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;oBACzB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;4BAAE,SAAS;wBACxC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;wBACrC,IAAI,CAAC,OAAO;4BAAE,SAAS;wBACvB,IAAI,CAAC;4BACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;4BAC5C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ;gCAAE,CAAC,CAAC,MAAM,CAAC,CAAC;wBAC3C,CAAC;wBAAC,MAAM,CAAC;4BACP,gCAAgC;wBAClC,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,SAAS,CAAC,OAAmC;QAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;CACF"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { AgentEvent } from "../kernel/types.js";
|
|
2
|
+
import type { Provider, StreamRequest } from "./iface.js";
|
|
3
|
+
/** Configuration entry loaded from ~/.dirgha/providers.json */
|
|
4
|
+
export interface CustomProviderEntry {
|
|
5
|
+
id: string;
|
|
6
|
+
label: string;
|
|
7
|
+
baseUrl: string;
|
|
8
|
+
apiKey?: string;
|
|
9
|
+
models?: string[];
|
|
10
|
+
supportsTools?: boolean;
|
|
11
|
+
supportsThinking?: boolean;
|
|
12
|
+
timeoutMs?: number;
|
|
13
|
+
stallTimeoutMs?: number;
|
|
14
|
+
}
|
|
15
|
+
/** Runtime provider that talks to any OpenAI‑compatible server */
|
|
16
|
+
export declare class CustomProvider implements Provider {
|
|
17
|
+
readonly id: string;
|
|
18
|
+
readonly entry: CustomProviderEntry;
|
|
19
|
+
constructor(entry: CustomProviderEntry);
|
|
20
|
+
supportsTools(): boolean;
|
|
21
|
+
supportsThinking(): boolean;
|
|
22
|
+
stream(req: StreamRequest): AsyncIterable<AgentEvent>;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Read the user‑level providers file and instantiate a map of
|
|
26
|
+
* CustomProvider objects. Failures (file missing, parse error, …)
|
|
27
|
+
* are silently swallowed – an empty Map is returned.
|
|
28
|
+
*/
|
|
29
|
+
export declare function loadCustomProviders(): Map<string, CustomProvider>;
|
|
30
|
+
/** Singleton provider map, populated once at module load */
|
|
31
|
+
export declare const CUSTOM_PROVIDERS: Map<string, CustomProvider>;
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { readFileSync } from "node:fs";
|
|
2
|
+
import { homedir } from "node:os";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { streamChatCompletions } from "./openai-compat.js";
|
|
5
|
+
/** Runtime provider that talks to any OpenAI‑compatible server */
|
|
6
|
+
export class CustomProvider {
|
|
7
|
+
id;
|
|
8
|
+
entry;
|
|
9
|
+
constructor(entry) {
|
|
10
|
+
this.entry = entry;
|
|
11
|
+
this.id = entry.id;
|
|
12
|
+
}
|
|
13
|
+
supportsTools() {
|
|
14
|
+
return this.entry.supportsTools ?? true;
|
|
15
|
+
}
|
|
16
|
+
supportsThinking() {
|
|
17
|
+
return this.entry.supportsThinking ?? false;
|
|
18
|
+
}
|
|
19
|
+
async *stream(req) {
|
|
20
|
+
// Escape regex metacharacters in the provider id to avoid injection
|
|
21
|
+
const escapedId = this.id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
22
|
+
const model = req.model.replace(new RegExp(`^${escapedId}/`), "");
|
|
23
|
+
// Build a safe environment variable name (replace non-alphanumeric with underscore)
|
|
24
|
+
const safeId = this.entry.id.toUpperCase().replace(/[^A-Z0-9]/g, '_');
|
|
25
|
+
const apiKey = this.entry.apiKey ??
|
|
26
|
+
process.env[`CUSTOM_${safeId}_API_KEY`] ??
|
|
27
|
+
"";
|
|
28
|
+
const endpoint = `${this.entry.baseUrl.replace(/\/+$/, "")}/chat/completions`;
|
|
29
|
+
const timeoutMs = this.entry.timeoutMs ?? 90_000;
|
|
30
|
+
const stallTimeoutMs = this.entry.stallTimeoutMs ?? 90_000;
|
|
31
|
+
yield* streamChatCompletions({
|
|
32
|
+
providerName: this.id,
|
|
33
|
+
endpoint,
|
|
34
|
+
apiKey,
|
|
35
|
+
model,
|
|
36
|
+
messages: req.messages,
|
|
37
|
+
tools: this.supportsTools() ? req.tools : undefined,
|
|
38
|
+
temperature: req.temperature,
|
|
39
|
+
maxTokens: req.maxTokens,
|
|
40
|
+
signal: req.signal,
|
|
41
|
+
timeoutMs,
|
|
42
|
+
stallTimeoutMs,
|
|
43
|
+
includeThinking: this.supportsThinking(),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Read the user‑level providers file and instantiate a map of
|
|
49
|
+
* CustomProvider objects. Failures (file missing, parse error, …)
|
|
50
|
+
* are silently swallowed – an empty Map is returned.
|
|
51
|
+
*/
|
|
52
|
+
export function loadCustomProviders() {
|
|
53
|
+
const path = join(homedir(), ".dirgha", "providers.json");
|
|
54
|
+
try {
|
|
55
|
+
const raw = readFileSync(path, { encoding: "utf-8" });
|
|
56
|
+
const entries = JSON.parse(raw);
|
|
57
|
+
if (!Array.isArray(entries))
|
|
58
|
+
return new Map();
|
|
59
|
+
const map = new Map();
|
|
60
|
+
for (const entry of entries) {
|
|
61
|
+
if (entry.id)
|
|
62
|
+
map.set(entry.id, new CustomProvider(entry));
|
|
63
|
+
}
|
|
64
|
+
return map;
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
return new Map();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
/** Singleton provider map, populated once at module load */
|
|
71
|
+
export const CUSTOM_PROVIDERS = loadCustomProviders();
|
|
72
|
+
//# sourceMappingURL=custom-provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"custom-provider.js","sourceRoot":"","sources":["../../src/providers/custom-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ export class DeepSeekProvider {
|
|
|
34
34
|
this.baseUrl = (config.baseUrl ?? DEFAULT_BASE).replace(/\/+$/, "");
|
|
35
35
|
// Reasoning models can take 30–60 s on first-token. Match OpenRouter's
|
|
36
36
|
// headroom so multi-turn coding sprints don't cancel themselves.
|
|
37
|
-
this.timeoutMs = config.timeoutMs ??
|
|
37
|
+
this.timeoutMs = config.timeoutMs ?? 90_000;
|
|
38
38
|
}
|
|
39
39
|
supportsTools() {
|
|
40
40
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../src/providers/deepseek.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAEjG,MAAM,YAAY,GAAG,6BAA6B,CAAC;AAEnD,2DAA2D;AAC3D,4EAA4E;AAC5E,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AAE3F,0EAA0E;AAC1E,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,MAAM,OAAO,gBAAgB;IAClB,EAAE,GAAG,UAAU,CAAC;IACR,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,SAAS,CAAS;IAEnC,YAAY,SAAyB,EAAE;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,MAAM;YACd,MAAM,IAAI,aAAa,CAAC,8BAA8B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,YAAY,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACpE,uEAAuE;QACvE,iEAAiE;QACjE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,
|
|
1
|
+
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../src/providers/deepseek.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAEjG,MAAM,YAAY,GAAG,6BAA6B,CAAC;AAEnD,2DAA2D;AAC3D,4EAA4E;AAC5E,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AAE3F,0EAA0E;AAC1E,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,MAAM,OAAO,gBAAgB;IAClB,EAAE,GAAG,UAAU,CAAC;IACR,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,SAAS,CAAS;IAEnC,YAAY,SAAyB,EAAE;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,MAAM;YACd,MAAM,IAAI,aAAa,CAAC,8BAA8B,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,YAAY,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACpE,uEAAuE;QACvE,iEAAiE;QACjE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC;IAC9C,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,OAAe;QAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC,CAAC;QAChE,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,YAAY,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,GAAkB;QACvB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC,CAAC;QACnE,OAAO,qBAAqB,CAAC;YAC3B,YAAY,EAAE,IAAI,CAAC,EAAE;YACrB,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,mBAAmB;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK;YACL,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACnD,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,eAAe,EACb,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK;SAC7D,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* "nvidia/..."); bare ids fall through to the catch-all rules at the
|
|
7
7
|
* end.
|
|
8
8
|
*/
|
|
9
|
-
export type ProviderId = "anthropic" | "openai" | "gemini" | "openrouter" | "nvidia" | "ollama" | "llamacpp" | "fireworks" | "deepseek" | "mistral" | "cohere" | "cerebras" | "together" | "perplexity" | "xai" | "groq" | "zai";
|
|
9
|
+
export type ProviderId = "anthropic" | "openai" | "gemini" | "openrouter" | "nvidia" | "ollama" | "llamacpp" | "fireworks" | "deepseek" | "mistral" | "cohere" | "cerebras" | "together" | "perplexity" | "xai" | "groq" | "zai" | "machine1";
|
|
10
10
|
export declare function routeModel(modelId: string): ProviderId;
|
|
11
11
|
export declare function resolveModelForDispatch(modelId: string): string;
|
|
12
12
|
export declare function isKnownProvider(id: string): id is ProviderId;
|
|
@@ -21,6 +21,20 @@ const NVIDIA_NIM_MODELS = new Set([
|
|
|
21
21
|
"mistralai/mistral-nemotron",
|
|
22
22
|
"mistralai/devstral-2-123b-instruct-2512",
|
|
23
23
|
]);
|
|
24
|
+
// RULE ORDERING INVARIANTS (must be preserved — tested by dispatch.test.ts):
|
|
25
|
+
// 1. Exact native-ID prefix rules (claude-, gpt-, gemini-) come FIRST so
|
|
26
|
+
// they never match via the catch-all OR rule.
|
|
27
|
+
// 2. Explicit vendor-prefix rules (deepseek-ai/, ollama/, fireworks/, etc.)
|
|
28
|
+
// come BEFORE the NVIDIA NIM catalogue rule so user-chosen providers are
|
|
29
|
+
// never hijacked by the catalogue.
|
|
30
|
+
// 3. The NIM catalogue rule (exact-set match against NVIDIA_NIM_MODELS)
|
|
31
|
+
// comes BEFORE the catch-all because those catalogued model IDs would
|
|
32
|
+
// otherwise fall through to OpenRouter.
|
|
33
|
+
// 4. Local/extra-provider explicit-prefix rules (ollama/, llamacpp/,
|
|
34
|
+
// fireworks/, mistral/, cohere/, etc.) come AFTER NIM but BEFORE the
|
|
35
|
+
// catch-all so users can explicitly pick these providers.
|
|
36
|
+
// 5. The catch-all (any `/` or `:free` suffix) MUST be last so it only
|
|
37
|
+
// fires when no other rule has matched.
|
|
24
38
|
const RULES = [
|
|
25
39
|
// Native, no-prefix model IDs go to first-party APIs.
|
|
26
40
|
{ match: (id) => id.startsWith("claude-"), provider: "anthropic" },
|
|
@@ -42,6 +56,14 @@ const RULES = [
|
|
|
42
56
|
// Specific NVIDIA NIM models — after explicit prefixes so vendor-prefix
|
|
43
57
|
// deepseek/ai/, anthropic/, etc. are never hijacked by the NIM catalogue.
|
|
44
58
|
{ match: (id) => NVIDIA_NIM_MODELS.has(id), provider: "nvidia" },
|
|
59
|
+
// Machine 1 — Dirgha's local industrial intelligence model.
|
|
60
|
+
// Matches "machine1", "machine1:latest", and the explicit "machine1/" prefix.
|
|
61
|
+
{
|
|
62
|
+
match: (id) => id === "machine1" ||
|
|
63
|
+
id === "machine1:latest" ||
|
|
64
|
+
id.startsWith("machine1/"),
|
|
65
|
+
provider: "machine1",
|
|
66
|
+
},
|
|
45
67
|
// Local & explicit-prefix providers.
|
|
46
68
|
{ match: (id) => id.startsWith("ollama/"), provider: "ollama" },
|
|
47
69
|
{ match: (id) => id.startsWith("llamacpp/"), provider: "llamacpp" },
|
|
@@ -71,7 +93,7 @@ const RULES = [
|
|
|
71
93
|
// OpenRouter (anthropic/, openai/, google/, deepseek/, moonshotai/,
|
|
72
94
|
// minimax/, qwen/, tencent/, z-ai/, inclusionai/, etc.).
|
|
73
95
|
{
|
|
74
|
-
match: (id) => id.includes("/") || id.
|
|
96
|
+
match: (id) => id.includes("/") || id.endsWith(":free"),
|
|
75
97
|
provider: "openrouter",
|
|
76
98
|
},
|
|
77
99
|
];
|
|
@@ -103,6 +125,7 @@ export function isKnownProvider(id) {
|
|
|
103
125
|
id === "perplexity" ||
|
|
104
126
|
id === "xai" ||
|
|
105
127
|
id === "groq" ||
|
|
106
|
-
id === "zai"
|
|
128
|
+
id === "zai" ||
|
|
129
|
+
id === "machine1");
|
|
107
130
|
}
|
|
108
131
|
//# sourceMappingURL=dispatch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,10 @@ const FAMILIES = {
|
|
|
37
37
|
{ provider: "openrouter", model: "minimax/minimax-m2.7" },
|
|
38
38
|
{ provider: "openrouter", model: "minimax/minimax-m2.5:free" },
|
|
39
39
|
],
|
|
40
|
+
ring: [
|
|
41
|
+
{ provider: "openrouter", model: "inclusionai/ring-2.6-1t:free" },
|
|
42
|
+
{ provider: "openrouter", model: "inclusionai/ling-2.6-1t:free" },
|
|
43
|
+
],
|
|
40
44
|
mistral: [
|
|
41
45
|
{ provider: "mistral", model: "mistral-large-2" },
|
|
42
46
|
{ provider: "openrouter", model: "mistralai/mistral-large-2512" },
|
|
@@ -55,6 +59,7 @@ const FAMILY_PATTERNS = [
|
|
|
55
59
|
},
|
|
56
60
|
{ family: "qwen", test: (id) => id.includes("qwen") },
|
|
57
61
|
{ family: "minimax", test: (id) => id.includes("minimax") },
|
|
62
|
+
{ family: "ring", test: (id) => id.includes("ring") && id.includes("inclusionai") },
|
|
58
63
|
{ family: "mistral", test: (id) => id.includes("mistral") },
|
|
59
64
|
];
|
|
60
65
|
export function detectFamily(modelId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"family-fallback.js","sourceRoot":"","sources":["../../src/providers/family-fallback.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"family-fallback.js","sourceRoot":"","sources":["../../src/providers/family-fallback.ts"],"names":[],"mappings":"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"}
|
package/dist/providers/gemini.js
CHANGED
|
@@ -149,6 +149,19 @@ function makeTimeoutSignal(timeoutMs, external) {
|
|
|
149
149
|
};
|
|
150
150
|
}
|
|
151
151
|
function buildGeminiBody(req, thinkingParam = null) {
|
|
152
|
+
// Build toolUseId → toolName map from all assistant messages so tool_result
|
|
153
|
+
// parts can emit the correct functionResponse.name (Gemini requires the
|
|
154
|
+
// function name, not the call ID, to correlate responses to declarations).
|
|
155
|
+
const toolIdToName = new Map();
|
|
156
|
+
for (const msg of req.messages) {
|
|
157
|
+
if (msg.role !== 'assistant')
|
|
158
|
+
continue;
|
|
159
|
+
const raw = typeof msg.content === 'string' ? [] : msg.content;
|
|
160
|
+
for (const p of raw) {
|
|
161
|
+
if (p.type === 'tool_use')
|
|
162
|
+
toolIdToName.set(p.id, p.name);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
152
165
|
const contents = [];
|
|
153
166
|
let systemInstruction;
|
|
154
167
|
for (const msg of req.messages) {
|
|
@@ -162,10 +175,27 @@ function buildGeminiBody(req, thinkingParam = null) {
|
|
|
162
175
|
const parts = [];
|
|
163
176
|
const raw = typeof msg.content === 'string' ? [{ type: 'text', text: msg.content }] : msg.content;
|
|
164
177
|
for (const p of raw) {
|
|
165
|
-
if (p.type === 'text')
|
|
178
|
+
if (p.type === 'text') {
|
|
166
179
|
parts.push({ text: p.text });
|
|
167
|
-
|
|
168
|
-
|
|
180
|
+
}
|
|
181
|
+
else if (p.type === 'tool_use') {
|
|
182
|
+
// Bug 2: assistant tool_use parts must become functionCall entries;
|
|
183
|
+
// previously they were silently dropped, producing parts:[] → HTTP 400.
|
|
184
|
+
parts.push({ functionCall: { name: p.name, args: p.input ?? {} } });
|
|
185
|
+
}
|
|
186
|
+
else if (p.type === 'tool_result') {
|
|
187
|
+
// Bug 3: tool results must be functionResponse, not plain text.
|
|
188
|
+
// Gemini requires the original function declaration name (e.g. "get_weather"),
|
|
189
|
+
// not the call ID (e.g. "toolu_01ABC"), to correlate the response.
|
|
190
|
+
// Fall back to toolUseId if the map has no entry (graceful degradation).
|
|
191
|
+
const resolvedName = toolIdToName.get(p.toolUseId ?? '') ?? p.toolUseId ?? '';
|
|
192
|
+
parts.push({
|
|
193
|
+
functionResponse: {
|
|
194
|
+
name: resolvedName,
|
|
195
|
+
response: { result: p.content },
|
|
196
|
+
},
|
|
197
|
+
});
|
|
198
|
+
}
|
|
169
199
|
}
|
|
170
200
|
contents.push({ role: msg.role === 'assistant' ? 'model' : 'user', parts });
|
|
171
201
|
}
|