@dirgha/code 1.20.39 → 1.22.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 +0 -57
- package/README.md +4 -8
- package/dist/auth/keypool.js +26 -40
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +11 -16
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.d.ts +5 -8
- package/dist/cli/config.js +3 -24
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +24 -40
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +18 -12
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +0 -4
- package/dist/cli/interactive.js +1 -29
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +18 -69
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/slash/fleet.js +1 -19
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/models.js +2 -4
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.js +7 -4
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash.js +10 -26
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/audit.js +8 -28
- package/dist/cli/subcommands/audit.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +0 -4
- package/dist/cli/subcommands/doctor.js +21 -51
- 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 +0 -23
- package/dist/cli/subcommands/memory.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +1 -2
- package/dist/cli/subcommands/telemetry.js +34 -47
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +23 -40
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +21 -44
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/git-state.js +18 -31
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +20 -31
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +1 -8
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +1 -11
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +30 -67
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.js +3 -15
- package/dist/context/primer.js.map +1 -1
- package/dist/fleet/apply-back.js +1 -5
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +0 -2
- package/dist/fleet/cli-command.js +1 -15
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +2 -35
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +2 -1
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +0 -4
- package/dist/fleet/state.js +2 -11
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +0 -4
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +0 -4
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/failover-chain.js +1 -10
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/prices.d.ts +4 -6
- package/dist/intelligence/prices.js +10 -36
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +17 -60
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/lsp/client.js +16 -29
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +6 -7
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +16 -19
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +38 -46
- package/dist/mcp/transport.js.map +1 -1
- package/dist/providers/deepseek.js +1 -1
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.js +1 -15
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/index.d.ts +0 -11
- package/dist/providers/index.js +2 -29
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/nvidia.js +1 -1
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-compat.js +2 -4
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +1 -1
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/audit-log.d.ts +0 -15
- package/dist/safety/audit-log.js +0 -21
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db-telemetry.js +1 -11
- package/dist/state/db-telemetry.js.map +1 -1
- package/dist/state/db.js +1 -53
- package/dist/state/db.js.map +1 -1
- package/dist/tools/browser.js +16 -24
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +1 -6
- package/dist/tools/checkpoint.js +62 -79
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +3 -1
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/diff.js +21 -25
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +0 -2
- package/dist/tools/exec.js +0 -13
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +5 -3
- package/dist/tools/fs-edit.js +23 -8
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +8 -6
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +28 -37
- 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 +6 -12
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +2 -5
- package/dist/tools/index.js +4 -7
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/multimodal.js +12 -11
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/rtk.js +9 -22
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +24 -42
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +32 -56
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -7
- package/dist/tools/shell.js +61 -114
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.d.ts +1 -2
- package/dist/tui/ink/App.js +72 -178
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +3 -20
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +15 -16
- 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 +16 -18
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/Logo.d.ts +0 -20
- package/dist/tui/ink/components/Logo.js +1 -67
- 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 +26 -34
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +1 -3
- package/dist/tui/ink/components/PasteCollapse.js +9 -11
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +14 -34
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.js +2 -0
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +4 -15
- package/dist/tui/ink/components/ThinkingBlock.js +17 -34
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +13 -21
- 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 +3 -5
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/index.js +1 -17
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/theme-context.js +3 -6
- package/dist/tui/ink/theme-context.js.map +1 -1
- package/dist/tui/ink/use-declined-versions.js +2 -6
- package/dist/tui/ink/use-declined-versions.js.map +1 -1
- package/dist/tui/ink/use-elapsed.d.ts +1 -9
- package/dist/tui/ink/use-elapsed.js +2 -17
- package/dist/tui/ink/use-elapsed.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +0 -2
- package/dist/tui/ink/use-event-projection.js +2 -21
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.js +0 -9
- package/dist/tui/ink/use-flicker-detector.js.map +1 -1
- package/dist/tui/ink/use-overlays.js +17 -16
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.js +5 -18
- package/dist/tui/ink/use-render-metrics.js.map +1 -1
- package/package.json +6 -5
- package/dist/telemetry/gateway-push.d.ts +0 -17
- package/dist/telemetry/gateway-push.js +0 -48
- package/dist/telemetry/gateway-push.js.map +0 -1
- package/dist/telemetry/index.d.ts +0 -9
- package/dist/telemetry/index.js +0 -9
- package/dist/telemetry/index.js.map +0 -1
- package/dist/tools/github.d.ts +0 -13
- package/dist/tools/github.js +0 -257
- package/dist/tools/github.js.map +0 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +0 -13
- package/dist/tui/ink/markdown/syntax-highlight.js +0 -91
- package/dist/tui/ink/markdown/syntax-highlight.js.map +0 -1
- package/dist/utils/env.d.ts +0 -1
- package/dist/utils/env.js +0 -60
- package/dist/utils/env.js.map +0 -1
- package/dist/utils/fs.d.ts +0 -10
- package/dist/utils/fs.js +0 -37
- package/dist/utils/fs.js.map +0 -1
package/dist/lsp/client.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { pathToFileURL } from "node:url";
|
|
3
3
|
import path from "node:path";
|
|
4
|
-
import { safeEnvironment } from "../utils/env.js";
|
|
5
4
|
// ── Symbol kind labels ─────────────────────────────────────────────────────
|
|
6
5
|
const SYMBOL_KIND_LABELS = {
|
|
7
6
|
1: "File",
|
|
@@ -185,13 +184,11 @@ export async function createLspClient(serverId, command, args, root, cwd) {
|
|
|
185
184
|
const proc = spawn(command, args, {
|
|
186
185
|
cwd: cwd || root,
|
|
187
186
|
stdio: ["pipe", "pipe", "pipe"],
|
|
188
|
-
env:
|
|
187
|
+
env: { ...process.env },
|
|
189
188
|
});
|
|
190
189
|
const connection = createLspConnection(proc);
|
|
191
190
|
if (proc.stderr) {
|
|
192
|
-
proc.stderr.
|
|
193
|
-
process.stderr.write(`[lsp:${serverId}] ${chunk.toString("utf8")}`);
|
|
194
|
-
});
|
|
191
|
+
proc.stderr.resume();
|
|
195
192
|
}
|
|
196
193
|
proc.on("exit", (code, signal) => {
|
|
197
194
|
const reason = signal != null
|
|
@@ -205,18 +202,9 @@ export async function createLspClient(serverId, command, args, root, cwd) {
|
|
|
205
202
|
const diagnostics = new Map();
|
|
206
203
|
connection.onNotification("textDocument/publishDiagnostics", (params) => {
|
|
207
204
|
const p = params;
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
fpath = new URL(p.uri).pathname;
|
|
212
|
-
}
|
|
213
|
-
catch {
|
|
214
|
-
fpath = p.uri;
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
218
|
-
fpath = p.uri;
|
|
219
|
-
}
|
|
205
|
+
const fpath = p.uri.startsWith("file://")
|
|
206
|
+
? new URL(p.uri).pathname
|
|
207
|
+
: p.uri;
|
|
220
208
|
diagnostics.set(fpath, p.diagnostics ?? []);
|
|
221
209
|
});
|
|
222
210
|
const initResult = await Promise.race([
|
|
@@ -248,23 +236,22 @@ export async function createLspClient(serverId, command, args, root, cwd) {
|
|
|
248
236
|
if (openedFiles.has(filePath))
|
|
249
237
|
return;
|
|
250
238
|
openedFiles.add(filePath);
|
|
251
|
-
const languageId = LANGUAGE_MAP[path.extname(filePath)] ?? "plaintext";
|
|
252
|
-
let text;
|
|
253
239
|
try {
|
|
254
240
|
const fs = await import("node:fs/promises");
|
|
255
|
-
text = await fs.readFile(filePath, "utf8");
|
|
241
|
+
const text = await fs.readFile(filePath, "utf8");
|
|
242
|
+
const languageId = LANGUAGE_MAP[path.extname(filePath)] ?? "plaintext";
|
|
243
|
+
await connection.sendNotification("textDocument/didOpen", {
|
|
244
|
+
textDocument: {
|
|
245
|
+
uri: pathToFileURL(filePath).href,
|
|
246
|
+
languageId,
|
|
247
|
+
version: 0,
|
|
248
|
+
text,
|
|
249
|
+
},
|
|
250
|
+
});
|
|
256
251
|
}
|
|
257
252
|
catch {
|
|
258
|
-
|
|
253
|
+
/* file may not exist yet */
|
|
259
254
|
}
|
|
260
|
-
await connection.sendNotification("textDocument/didOpen", {
|
|
261
|
-
textDocument: {
|
|
262
|
-
uri: pathToFileURL(filePath).href,
|
|
263
|
-
languageId,
|
|
264
|
-
version: 0,
|
|
265
|
-
text,
|
|
266
|
-
},
|
|
267
|
-
});
|
|
268
255
|
}
|
|
269
256
|
const client = {
|
|
270
257
|
serverId,
|
package/dist/lsp/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/lsp/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/lsp/client.ts"],"names":[],"mappings":"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"}
|
package/dist/lsp/detector.js
CHANGED
|
@@ -1,23 +1,22 @@
|
|
|
1
1
|
import { execSync } from "node:child_process";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import fs from "node:fs";
|
|
4
|
-
const whichCache = new Map();
|
|
5
4
|
function which(cmd) {
|
|
6
|
-
const cached = whichCache.get(cmd);
|
|
7
|
-
if (cached !== undefined)
|
|
8
|
-
return cached;
|
|
9
5
|
try {
|
|
10
6
|
const result = execSync(process.platform === "win32" ? `where ${cmd}` : `command -v ${cmd}`, { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
|
|
11
|
-
whichCache.set(cmd, result || null);
|
|
12
7
|
return result || null;
|
|
13
8
|
}
|
|
14
9
|
catch {
|
|
15
|
-
whichCache.set(cmd, null);
|
|
16
10
|
return null;
|
|
17
11
|
}
|
|
18
12
|
}
|
|
19
13
|
function existsSync(p) {
|
|
20
|
-
|
|
14
|
+
try {
|
|
15
|
+
return fs.existsSync(p);
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
return false;
|
|
19
|
+
}
|
|
21
20
|
}
|
|
22
21
|
function findUp(dir, targets) {
|
|
23
22
|
let current = path.resolve(dir);
|
package/dist/lsp/detector.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../src/lsp/detector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAYzB,
|
|
1
|
+
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../src/lsp/detector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAYzB,SAAS,KAAK,CAAC,GAAW;IACxB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CACrB,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,cAAc,GAAG,EAAE,EACnE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CACtD,CAAC,IAAI,EAAE,CAAC;QACT,OAAO,MAAM,IAAI,IAAI,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,CAAS;IAC3B,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,MAAM,CAAC,GAAW,EAAE,OAAiB;IAC5C,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;IACtC,OAAO,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACrC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAAE,OAAO,OAAO,CAAC;QAC7D,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,OAAO;YAAE,MAAM;QAC9B,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,iBAAiB,GAAuB;IAC5C,EAAE,EAAE,YAAY;IAChB,IAAI,EAAE,4BAA4B;IAClC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAC1E,OAAO,EAAE,4BAA4B;IACrC,IAAI,EAAE,CAAC,SAAS,CAAC;IACjB,MAAM;QACJ,OAAO,KAAK,CAAC,4BAA4B,CAAC,KAAK,IAAI,CAAC;IACtD,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACpC,mBAAmB;YACnB,gBAAgB;YAChB,WAAW;YACX,WAAW;YACX,cAAc;YACd,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,MAAM,cAAc,GAAuB;IACzC,EAAE,EAAE,SAAS;IACb,IAAI,EAAE,yBAAyB;IAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,oBAAoB;IAC7B,IAAI,EAAE,CAAC,SAAS,CAAC;IACjB,MAAM;QACJ,OAAO,KAAK,CAAC,oBAAoB,CAAC,KAAK,IAAI,CAAC;IAC9C,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACpC,gBAAgB;YAChB,UAAU;YACV,WAAW;YACX,kBAAkB;YAClB,SAAS;YACT,oBAAoB;SACrB,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,MAAM,oBAAoB,GAAuB;IAC/C,EAAE,EAAE,eAAe;IACnB,IAAI,EAAE,+BAA+B;IACrC,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,eAAe;IACxB,IAAI,EAAE,EAAE;IACR,MAAM;QACJ,OAAO,KAAK,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;IACzC,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QAC5B,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;QACxC,OAAO,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACnD,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAAE,OAAO,OAAO,CAAC;YACtD,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,OAAO;gBAAE,MAAM;YAC9B,OAAO,GAAG,MAAM,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC;AAEF,MAAM,YAAY,GAAuB;IACvC,EAAE,EAAE,OAAO;IACX,IAAI,EAAE,4BAA4B;IAClC,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,EAAE;IACR,MAAM;QACJ,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IACjC,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3C,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAyB;IACjD,iBAAiB;IACjB,cAAc;IACd,oBAAoB;IACpB,YAAY;CACb,CAAC;AAEF,MAAM,YAAY,GAAG,IAAI,GAAG,EAA8B,CAAC;AAC3D,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;IACnC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,QAAgB;IAEhB,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,QAAgB,EAChB,MAA0B;IAE1B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/C,CAAC"}
|
package/dist/mcp/client.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* correlation by id and a simple notification fan-out. Sufficient for
|
|
4
4
|
* initialize / tools/list / tools/call and resources/read.
|
|
5
5
|
*/
|
|
6
|
-
import { Transport } from
|
|
6
|
+
import { Transport } from './transport.js';
|
|
7
7
|
export interface McpClient {
|
|
8
8
|
initialize(): Promise<InitializeResult>;
|
|
9
9
|
listTools(): Promise<McpTool[]>;
|
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(
|
|
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,40 +24,37 @@ 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(
|
|
39
|
-
name,
|
|
40
|
-
arguments: arguments_,
|
|
41
|
-
});
|
|
38
|
+
return await this.request('tools/call', { name, arguments: arguments_ });
|
|
42
39
|
}
|
|
43
40
|
async close() {
|
|
44
41
|
for (const [, pending] of this.pending) {
|
|
45
42
|
clearTimeout(pending.timer);
|
|
46
|
-
pending.reject(new Error(
|
|
43
|
+
pending.reject(new Error('Client closed'));
|
|
47
44
|
}
|
|
48
45
|
this.pending.clear();
|
|
49
46
|
await this.transport.close();
|
|
50
47
|
}
|
|
51
48
|
async request(method, params) {
|
|
52
49
|
const id = this.nextId++;
|
|
53
|
-
const message = { jsonrpc:
|
|
50
|
+
const message = { jsonrpc: '2.0', id, method, params };
|
|
54
51
|
const promise = new Promise((resolve, reject) => {
|
|
55
52
|
const timer = setTimeout(() => {
|
|
56
53
|
this.pending.delete(id);
|
|
57
54
|
reject(new Error(`MCP request timed out after ${this.requestTimeoutMs}ms (method=${method})`));
|
|
58
55
|
}, this.requestTimeoutMs);
|
|
59
|
-
timer.unref();
|
|
60
|
-
this.pending.set(id, { resolve:
|
|
56
|
+
timer.unref?.();
|
|
57
|
+
this.pending.set(id, { resolve: v => resolve(v), reject, timer });
|
|
61
58
|
});
|
|
62
59
|
try {
|
|
63
60
|
await this.transport.send(message);
|
|
@@ -87,10 +84,10 @@ export class DefaultMcpClient {
|
|
|
87
84
|
}
|
|
88
85
|
}
|
|
89
86
|
function isResponse(v) {
|
|
90
|
-
return
|
|
91
|
-
v !== null
|
|
92
|
-
|
|
93
|
-
v.jsonrpc ===
|
|
94
|
-
|
|
87
|
+
return typeof v === 'object'
|
|
88
|
+
&& v !== null
|
|
89
|
+
&& 'jsonrpc' in v
|
|
90
|
+
&& v.jsonrpc === '2.0'
|
|
91
|
+
&& 'id' in v;
|
|
95
92
|
}
|
|
96
93
|
//# 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":"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"}
|
package/dist/mcp/transport.js
CHANGED
|
@@ -3,14 +3,13 @@
|
|
|
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
|
|
7
|
-
import { safeEnvironment } from "../utils/env.js";
|
|
6
|
+
import { spawn } from 'node:child_process';
|
|
8
7
|
export class StdioTransport {
|
|
9
8
|
opts;
|
|
10
9
|
child = null;
|
|
11
10
|
handlers = [];
|
|
12
11
|
closeHandlers = [];
|
|
13
|
-
buffer =
|
|
12
|
+
buffer = '';
|
|
14
13
|
ready;
|
|
15
14
|
constructor(opts) {
|
|
16
15
|
this.opts = opts;
|
|
@@ -20,29 +19,26 @@ export class StdioTransport {
|
|
|
20
19
|
return new Promise((resolve, reject) => {
|
|
21
20
|
try {
|
|
22
21
|
const child = spawn(this.opts.command, this.opts.args ?? [], {
|
|
23
|
-
env: { ...
|
|
22
|
+
env: { ...process.env, ...this.opts.env },
|
|
24
23
|
cwd: this.opts.cwd,
|
|
25
|
-
stdio: [
|
|
24
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
26
25
|
});
|
|
27
26
|
this.child = child;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
child.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
child.stdin.on("error", () => {
|
|
37
|
-
/* swallow EPIPE / ECONNRESET */
|
|
38
|
-
});
|
|
39
|
-
child.on("error", (err) => reject(err));
|
|
40
|
-
child.on("exit", () => {
|
|
27
|
+
child.stdout.on('data', (buf) => this.onData(buf));
|
|
28
|
+
child.stderr.on('data', () => { });
|
|
29
|
+
// EPIPE on stdin is expected if the subprocess crashes early
|
|
30
|
+
// (e.g. /bin/false exits before we write). Listen so the
|
|
31
|
+
// unhandled 'error' event doesn't tear down the parent.
|
|
32
|
+
child.stdin.on('error', () => { });
|
|
33
|
+
child.on('error', err => reject(err));
|
|
34
|
+
child.on('exit', () => {
|
|
41
35
|
this.child = null;
|
|
36
|
+
// Notify upper layers so pending requests can be rejected
|
|
37
|
+
// immediately rather than waiting for the request timeout.
|
|
42
38
|
for (const cb of this.closeHandlers)
|
|
43
39
|
cb();
|
|
44
40
|
});
|
|
45
|
-
child.on(
|
|
41
|
+
child.on('spawn', () => resolve());
|
|
46
42
|
}
|
|
47
43
|
catch (err) {
|
|
48
44
|
reject(err);
|
|
@@ -50,12 +46,12 @@ export class StdioTransport {
|
|
|
50
46
|
});
|
|
51
47
|
}
|
|
52
48
|
onData(buf) {
|
|
53
|
-
this.buffer += buf.toString(
|
|
54
|
-
let
|
|
55
|
-
while ((
|
|
56
|
-
const line = this.buffer.slice(0,
|
|
57
|
-
this.buffer = this.buffer.slice(
|
|
58
|
-
if (!line)
|
|
49
|
+
this.buffer += buf.toString('utf8');
|
|
50
|
+
let idx;
|
|
51
|
+
while ((idx = this.buffer.indexOf('\n')) >= 0) {
|
|
52
|
+
const line = this.buffer.slice(0, idx);
|
|
53
|
+
this.buffer = this.buffer.slice(idx + 1);
|
|
54
|
+
if (!line.trim())
|
|
59
55
|
continue;
|
|
60
56
|
try {
|
|
61
57
|
const parsed = JSON.parse(line);
|
|
@@ -63,16 +59,17 @@ export class StdioTransport {
|
|
|
63
59
|
h(parsed);
|
|
64
60
|
}
|
|
65
61
|
catch {
|
|
66
|
-
|
|
62
|
+
continue;
|
|
67
63
|
}
|
|
68
64
|
}
|
|
69
65
|
}
|
|
70
66
|
async send(message) {
|
|
71
67
|
await this.ready;
|
|
72
68
|
if (!this.child || !this.child.stdin)
|
|
73
|
-
throw new Error(
|
|
69
|
+
throw new Error('Transport is closed');
|
|
74
70
|
await new Promise((resolve, reject) => {
|
|
75
|
-
|
|
71
|
+
const data = `${JSON.stringify(message)}\n`;
|
|
72
|
+
this.child.stdin.write(data, err => err ? reject(err) : resolve());
|
|
76
73
|
});
|
|
77
74
|
}
|
|
78
75
|
onMessage(handler) {
|
|
@@ -111,16 +108,13 @@ export class HttpTransport {
|
|
|
111
108
|
closed = false;
|
|
112
109
|
constructor(opts) {
|
|
113
110
|
this.opts = opts;
|
|
114
|
-
if (typeof fetch !== "function") {
|
|
115
|
-
throw new Error("HttpTransport requires a global fetch API (Node 18+ or a polyfill)");
|
|
116
|
-
}
|
|
117
111
|
}
|
|
118
112
|
async send(message) {
|
|
119
113
|
if (this.closed)
|
|
120
|
-
throw new Error(
|
|
114
|
+
throw new Error('HttpTransport is closed');
|
|
121
115
|
const headers = {
|
|
122
|
-
|
|
123
|
-
Accept:
|
|
116
|
+
'Content-Type': 'application/json',
|
|
117
|
+
Accept: 'application/json, text/event-stream',
|
|
124
118
|
...(this.opts.headers ?? {}),
|
|
125
119
|
};
|
|
126
120
|
// Token resolution: bearerProvider beats bearerToken so OAuth
|
|
@@ -135,7 +129,7 @@ export class HttpTransport {
|
|
|
135
129
|
let resp;
|
|
136
130
|
try {
|
|
137
131
|
resp = await fetch(this.opts.url, {
|
|
138
|
-
method:
|
|
132
|
+
method: 'POST',
|
|
139
133
|
headers,
|
|
140
134
|
body: JSON.stringify(message),
|
|
141
135
|
signal: ac.signal,
|
|
@@ -145,20 +139,20 @@ export class HttpTransport {
|
|
|
145
139
|
clearTimeout(timer);
|
|
146
140
|
}
|
|
147
141
|
if (!resp.ok)
|
|
148
|
-
throw new Error(`MCP HTTP ${resp.status}: ${await resp.text().catch(() =>
|
|
149
|
-
const ctype = resp.headers.get(
|
|
150
|
-
if (ctype.includes(
|
|
142
|
+
throw new Error(`MCP HTTP ${resp.status}: ${await resp.text().catch(() => '')}`);
|
|
143
|
+
const ctype = resp.headers.get('content-type') ?? '';
|
|
144
|
+
if (ctype.includes('application/json')) {
|
|
151
145
|
const body = await resp.json();
|
|
152
146
|
for (const h of this.handlers)
|
|
153
147
|
h(body);
|
|
154
148
|
return;
|
|
155
149
|
}
|
|
156
|
-
if (ctype.includes(
|
|
150
|
+
if (ctype.includes('text/event-stream') && resp.body) {
|
|
157
151
|
// Parse SSE: each block is `event: foo\ndata: {...}\n\n`.
|
|
158
152
|
// We only act on `data:` lines that JSON-parse cleanly.
|
|
159
153
|
const reader = resp.body.getReader();
|
|
160
154
|
const decoder = new TextDecoder();
|
|
161
|
-
let buf =
|
|
155
|
+
let buf = '';
|
|
162
156
|
while (true) {
|
|
163
157
|
const { value, done } = await reader.read();
|
|
164
158
|
if (done)
|
|
@@ -166,11 +160,11 @@ export class HttpTransport {
|
|
|
166
160
|
buf += decoder.decode(value, { stream: true });
|
|
167
161
|
// Process complete events (terminated by blank line).
|
|
168
162
|
let idx;
|
|
169
|
-
while ((idx = buf.indexOf(
|
|
163
|
+
while ((idx = buf.indexOf('\n\n')) >= 0) {
|
|
170
164
|
const block = buf.slice(0, idx);
|
|
171
165
|
buf = buf.slice(idx + 2);
|
|
172
|
-
for (const line of block.split(
|
|
173
|
-
if (!line.startsWith(
|
|
166
|
+
for (const line of block.split('\n')) {
|
|
167
|
+
if (!line.startsWith('data:'))
|
|
174
168
|
continue;
|
|
175
169
|
const payload = line.slice(5).trim();
|
|
176
170
|
if (!payload)
|
|
@@ -180,9 +174,7 @@ export class HttpTransport {
|
|
|
180
174
|
for (const h of this.handlers)
|
|
181
175
|
h(parsed);
|
|
182
176
|
}
|
|
183
|
-
catch {
|
|
184
|
-
/* skip non-JSON SSE comments */
|
|
185
|
-
}
|
|
177
|
+
catch { /* skip non-JSON SSE comments */ }
|
|
186
178
|
}
|
|
187
179
|
}
|
|
188
180
|
}
|
|
@@ -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":"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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 ?? 300_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,OAAO,CAAC;IAC/C,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"}
|
|
@@ -21,20 +21,6 @@ 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.
|
|
38
24
|
const RULES = [
|
|
39
25
|
// Native, no-prefix model IDs go to first-party APIs.
|
|
40
26
|
{ match: (id) => id.startsWith("claude-"), provider: "anthropic" },
|
|
@@ -85,7 +71,7 @@ const RULES = [
|
|
|
85
71
|
// OpenRouter (anthropic/, openai/, google/, deepseek/, moonshotai/,
|
|
86
72
|
// minimax/, qwen/, tencent/, z-ai/, inclusionai/, etc.).
|
|
87
73
|
{
|
|
88
|
-
match: (id) => id.includes("/") || id.
|
|
74
|
+
match: (id) => id.includes("/") || id.includes(":free"),
|
|
89
75
|
provider: "openrouter",
|
|
90
76
|
},
|
|
91
77
|
];
|
|
@@ -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;AA0BnD,6EAA6E;AAC7E,4EAA4E;AAC5E,8EAA8E;AAC9E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAS;IACxC,kCAAkC;IAClC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjC,wDAAwD;IACxD,wCAAwC;IACxC,gCAAgC;IAChC,mCAAmC;IACnC,4BAA4B;IAC5B,yCAAyC;CAC1C,CAAC,CAAC;AAEH,
|
|
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;AA0BnD,6EAA6E;AAC7E,4EAA4E;AAC5E,8EAA8E;AAC9E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAS;IACxC,kCAAkC;IAClC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjC,wDAAwD;IACxD,wCAAwC;IACxC,gCAAgC;IAChC,mCAAmC;IACnC,4BAA4B;IAC5B,yCAAyC;CAC1C,CAAC,CAAC;AAEH,MAAM,KAAK,GAAkB;IAC3B,sDAAsD;IACtD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE;IAClE;QACE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QACpE,QAAQ,EAAE,QAAQ;KACnB;IACD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC/D,sEAAsE;IACtE,wEAAwE;IACxE,oEAAoE;IACpE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE;IACtE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE;IAC1E,4CAA4C;IAC5C;QACE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CACZ,+DAA+D,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1E,QAAQ,EAAE,UAAU;KACrB;IACD,wEAAwE;IACxE,0EAA0E;IAC1E,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAChE,qCAAqC;IACrC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC/D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE;IACnE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE;IACrE,sEAAsE;IACtE,oEAAoE;IACpE,sEAAsE;IACtE,qEAAqE;IACrE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE;IACjE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC/D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE;IACnE;QACE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;QACzE,QAAQ,EAAE,UAAU;KACrB;IACD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE;IACvE;QACE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CACZ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACvE,QAAQ,EAAE,KAAK;KAChB;IACD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE;IAC3D;QACE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CACZ,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;QAC1E,QAAQ,EAAE,KAAK;KAChB;IACD,kEAAkE;IAClE,oEAAoE;IACpE,yDAAyD;IACzD;QACE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;QACvD,QAAQ,EAAE,YAAY;KACvB;CACF,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACjD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACjD,CAAC;IACD,MAAM,IAAI,KAAK,CACb,qCAAqC,QAAQ,iDAAiD,CAC/F,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,EAAU;IACxC,OAAO,CACL,EAAE,KAAK,WAAW;QAClB,EAAE,KAAK,QAAQ;QACf,EAAE,KAAK,QAAQ;QACf,EAAE,KAAK,YAAY;QACnB,EAAE,KAAK,QAAQ;QACf,EAAE,KAAK,QAAQ;QACf,EAAE,KAAK,UAAU;QACjB,EAAE,KAAK,WAAW;QAClB,EAAE,KAAK,UAAU;QACjB,EAAE,KAAK,SAAS;QAChB,EAAE,KAAK,QAAQ;QACf,EAAE,KAAK,UAAU;QACjB,EAAE,KAAK,UAAU;QACjB,EAAE,KAAK,YAAY;QACnB,EAAE,KAAK,KAAK;QACZ,EAAE,KAAK,MAAM;QACb,EAAE,KAAK,KAAK,CACb,CAAC;AACJ,CAAC"}
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* are lazy-constructed; missing API keys surface only on first use.
|
|
6
6
|
*/
|
|
7
7
|
import type { Provider, ProviderConfig } from "./iface.js";
|
|
8
|
-
import { type ProviderId } from "./dispatch.js";
|
|
9
8
|
import { type RateLimitOptions } from "./rate-limiter.js";
|
|
10
9
|
export * from "./iface.js";
|
|
11
10
|
export * from "./dispatch.js";
|
|
@@ -48,17 +47,7 @@ export interface ProviderRegistryConfig {
|
|
|
48
47
|
export declare class ProviderRegistry {
|
|
49
48
|
private config;
|
|
50
49
|
private cache;
|
|
51
|
-
/** Timestamp in ms (performance.now) when each provider was cached. */
|
|
52
|
-
private cacheTime;
|
|
53
|
-
/** Invalidate cached providers older than this many ms (30 min). */
|
|
54
|
-
private static readonly CACHE_TTL_MS;
|
|
55
50
|
constructor(config?: ProviderRegistryConfig);
|
|
56
|
-
/** Force-evict a cached provider so the next call to forModel
|
|
57
|
-
* re-constructs it with the latest config. Call this after updating
|
|
58
|
-
* API keys or other provider settings mid-session. */
|
|
59
|
-
invalidate(providerId: ProviderId): void;
|
|
60
|
-
/** Evict all cached providers (e.g. after bulk config reload). */
|
|
61
|
-
invalidateAll(): void;
|
|
62
51
|
forModel(modelId: string): Provider;
|
|
63
52
|
private maybeRateLimit;
|
|
64
53
|
private construct;
|