@dirgha/code 1.43.1 → 1.43.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/dist/cli/config.d.ts +17 -0
- package/dist/cli/config.js +14 -16
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +1 -1
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +1 -1
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/main.js +8 -25
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +1 -1
- package/dist/cli/setup.js.map +1 -1
- package/dist/fleet/worktree.js +49 -2
- package/dist/fleet/worktree.js.map +1 -1
- package/dist/gpu/market.js +43 -17
- package/dist/gpu/market.js.map +1 -1
- package/dist/intelligence/prices.js +2 -7
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/message.js +10 -0
- package/dist/kernel/message.js.map +1 -1
- package/dist/orchestra/agent/dirgha.d.ts +2 -0
- package/dist/orchestra/agent/dirgha.js +1 -0
- package/dist/orchestra/agent/dirgha.js.map +1 -1
- package/dist/orchestra/agent/manager.d.ts +2 -0
- package/dist/orchestra/agent/manager.js +74 -1
- package/dist/orchestra/agent/manager.js.map +1 -1
- package/dist/orchestra/orchestration/log.js +7 -2
- package/dist/orchestra/orchestration/log.js.map +1 -1
- package/dist/providers/deepseek-catalogue.js +1 -1
- package/dist/providers/deepseek-catalogue.js.map +1 -1
- package/dist/providers/dispatch.js +3 -5
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/tools/fs-edit.js +17 -7
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-read.js +20 -5
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.js +16 -6
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tui/ink/components/ApprovalPrompt.js +1 -1
- package/dist/tui/ink/components/ApprovalPrompt.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +29 -3
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.js +11 -1
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/OpenRouterCompanyPicker.js +3 -1
- package/dist/tui/ink/components/OpenRouterCompanyPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +2 -2
- package/dist/tui/ink/components/PasteCollapse.js +2 -2
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/ProviderPicker.js +11 -1
- package/dist/tui/ink/components/ProviderPicker.js.map +1 -1
- package/dist/tui/ink/components/SlashComplete.js +5 -6
- package/dist/tui/ink/components/SlashComplete.js.map +1 -1
- package/dist/tui/ink/use-event-projection.js +13 -7
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/fleet/worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/fleet/worktree.ts"],"names":[],"mappings":"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"}
|
package/dist/gpu/market.js
CHANGED
|
@@ -32,7 +32,7 @@ export async function postGPUListing(listing) {
|
|
|
32
32
|
body: JSON.stringify({
|
|
33
33
|
title: `${listing.gpuType} GPU compute`,
|
|
34
34
|
description: `${listing.gpuType} - ${listing.vramGb}GB VRAM - $${listing.pricePerHr}/hr`,
|
|
35
|
-
category: "
|
|
35
|
+
category: "compute",
|
|
36
36
|
price: listing.pricePerHr,
|
|
37
37
|
currency: "USD",
|
|
38
38
|
metadata: { gpuType: listing.gpuType, vramGb: listing.vramGb, provider: listing.provider, region: listing.region },
|
|
@@ -41,19 +41,19 @@ export async function postGPUListing(listing) {
|
|
|
41
41
|
return data;
|
|
42
42
|
}
|
|
43
43
|
export async function listGPUListings(minVramGb, maxPrice) {
|
|
44
|
-
|
|
44
|
+
// Server-side filter: only fetch GPU compute listings
|
|
45
|
+
const data = await apiFetch("/api/bucky/listings?type=compute");
|
|
45
46
|
const listings = Array.isArray(data) ? data : data.listings ?? data.data ?? [];
|
|
46
47
|
return listings
|
|
47
|
-
.filter((l) => l.category === "gpu-compute" || l.metadata?.gpuType)
|
|
48
48
|
.map((l) => ({
|
|
49
49
|
id: l.id,
|
|
50
|
-
gpuType: l
|
|
51
|
-
vramGb: l
|
|
52
|
-
pricePerHr: l.price ?? 0,
|
|
53
|
-
provider: l.
|
|
54
|
-
region: l
|
|
55
|
-
available: l.
|
|
56
|
-
createdBy: l.
|
|
50
|
+
gpuType: parseGpuType(l),
|
|
51
|
+
vramGb: parseVram(l),
|
|
52
|
+
pricePerHr: l.price_usd ?? l.price ?? 0,
|
|
53
|
+
provider: l.seller_id ?? "self",
|
|
54
|
+
region: parseRegion(l),
|
|
55
|
+
available: l.is_public !== false, // backend uses is_public boolean, not status
|
|
56
|
+
createdBy: l.seller_id,
|
|
57
57
|
}))
|
|
58
58
|
.filter((l) => {
|
|
59
59
|
if (minVramGb && l.vramGb < minVramGb)
|
|
@@ -63,16 +63,42 @@ export async function listGPUListings(minVramGb, maxPrice) {
|
|
|
63
63
|
return l.available;
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
|
+
/** Extract GPU model from listing name, description, or tags. */
|
|
67
|
+
function parseGpuType(l) {
|
|
68
|
+
// Check name/description for known GPU patterns
|
|
69
|
+
const text = `${l.name ?? ""} ${l.title ?? ""} ${l.description ?? ""}`.toUpperCase();
|
|
70
|
+
const match = text.match(/\b(A100|H100|RTX\s*\d{3,4}|V100|T4|L40S?|A6000|MI\d{3}X?)\b/i);
|
|
71
|
+
if (match)
|
|
72
|
+
return match[1].replace(/\s+/, " ");
|
|
73
|
+
return l.name ?? l.title ?? "unknown";
|
|
74
|
+
}
|
|
75
|
+
/** Extract VRAM from description or content metadata. */
|
|
76
|
+
function parseVram(l) {
|
|
77
|
+
const text = `${l.name ?? ""} ${l.description ?? ""}`;
|
|
78
|
+
const match = text.match(/(\d+)\s*GB\s*(?:VRAM|vram)/i);
|
|
79
|
+
if (match)
|
|
80
|
+
return parseInt(match[1], 10);
|
|
81
|
+
if (l.content?.vram_gb)
|
|
82
|
+
return Number(l.content.vram_gb);
|
|
83
|
+
return 0;
|
|
84
|
+
}
|
|
85
|
+
/** Extract region from listing description or content metadata. */
|
|
86
|
+
function parseRegion(l) {
|
|
87
|
+
if (l.content?.location)
|
|
88
|
+
return l.content.location;
|
|
89
|
+
const text = l.description ?? "";
|
|
90
|
+
const match = text.match(/\b(Mumbai|Delhi|Bangalore|Singapore|Frankfurt|London|NYC|US-?East|US-?West|EU)\b/i);
|
|
91
|
+
return match ? match[1] : undefined;
|
|
92
|
+
}
|
|
66
93
|
export async function postGPUJob(job) {
|
|
67
94
|
const data = await apiFetch("/api/bucky/jobs", {
|
|
68
95
|
method: "POST",
|
|
69
96
|
body: JSON.stringify({
|
|
70
|
-
|
|
97
|
+
listing_id: job.listingId,
|
|
71
98
|
title: `GPU job: ${job.gpuType}`,
|
|
72
99
|
description: `GPU compute: ${job.gpuType} for ${job.durationHrs}h`,
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
metadata: { gpuType: job.gpuType, durationHrs: job.durationHrs },
|
|
100
|
+
budget_sats: 0,
|
|
101
|
+
metadata: { gpuType: job.gpuType, durationHrs: job.durationHrs, totalCost: job.totalCost },
|
|
76
102
|
}),
|
|
77
103
|
});
|
|
78
104
|
return data;
|
|
@@ -82,10 +108,10 @@ export async function getGPUJobStatus(jobId) {
|
|
|
82
108
|
return {
|
|
83
109
|
id: data.id,
|
|
84
110
|
gpuType: data.metadata?.gpuType ?? "unknown",
|
|
85
|
-
listingId: data.
|
|
111
|
+
listingId: data.listing_id ?? "",
|
|
86
112
|
durationHrs: data.metadata?.durationHrs ?? 0,
|
|
87
|
-
totalCost: data.
|
|
88
|
-
status: data.status === "active" ? "running" : data.status,
|
|
113
|
+
totalCost: data.metadata?.totalCost ?? data.budget_sats ?? 0,
|
|
114
|
+
status: data.status === "active" || data.status === "open" ? "running" : data.status,
|
|
89
115
|
};
|
|
90
116
|
}
|
|
91
117
|
export async function settleGPUJob(jobId) {
|
package/dist/gpu/market.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"market.js","sourceRoot":"","sources":["../../src/gpu/market.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAE3D,MAAM,OAAO,GAAG,uBAAuB,CAAC;AAExC,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,UAAuB,EAAE;IAC7D,MAAM,KAAK,GAAG,MAAM,SAAS,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;QAClC,GAAI,OAAO,CAAC,OAAkC;KAC/C,CAAC;IACF,IAAI,KAAK,EAAE,KAAK;QAAE,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,CAAC,KAAK,EAAE,CAAC;IAErE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,IAAI,EAAE,EAAE;QAC3C,GAAG,OAAO;QACV,OAAO;QACP,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACpB,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAmB;IACtD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,qBAAqB,EAAE;QACjD,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,cAAc;YACvC,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,MAAM,OAAO,CAAC,MAAM,cAAc,OAAO,CAAC,UAAU,KAAK;YACxF,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"market.js","sourceRoot":"","sources":["../../src/gpu/market.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAE3D,MAAM,OAAO,GAAG,uBAAuB,CAAC;AAExC,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,UAAuB,EAAE;IAC7D,MAAM,KAAK,GAAG,MAAM,SAAS,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;QAClC,GAAI,OAAO,CAAC,OAAkC;KAC/C,CAAC;IACF,IAAI,KAAK,EAAE,KAAK;QAAE,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,CAAC,KAAK,EAAE,CAAC;IAErE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,IAAI,EAAE,EAAE;QAC3C,GAAG,OAAO;QACV,OAAO;QACP,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;AACpB,CAAC;AAaD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAmB;IACtD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,qBAAqB,EAAE;QACjD,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,cAAc;YACvC,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,MAAM,OAAO,CAAC,MAAM,cAAc,OAAO,CAAC,UAAU,KAAK;YACxF,QAAQ,EAAE,SAAS;YACnB,KAAK,EAAE,OAAO,CAAC,UAAU;YACzB,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;SACnH,CAAC;KACH,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,SAAkB,EAAE,QAAiB;IACzE,sDAAsD;IACtD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,kCAAkC,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAC/E,OAAO,QAAQ;SACZ,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAChB,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;QACxB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;QACpB,UAAU,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC;QACvC,QAAQ,EAAE,CAAC,CAAC,SAAS,IAAI,MAAM;QAC/B,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QACtB,SAAS,EAAE,CAAC,CAAC,SAAS,KAAK,KAAK,EAAE,6CAA6C;QAC/E,SAAS,EAAE,CAAC,CAAC,SAAS;KACvB,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,CAAa,EAAE,EAAE;QACxB,IAAI,SAAS,IAAI,CAAC,CAAC,MAAM,GAAG,SAAS;YAAE,OAAO,KAAK,CAAC;QACpD,IAAI,QAAQ,IAAI,CAAC,CAAC,UAAU,GAAG,QAAQ;YAAE,OAAO,KAAK,CAAC;QACtD,OAAO,CAAC,CAAC,SAAS,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,iEAAiE;AACjE,SAAS,YAAY,CAAC,CAAM;IAC1B,gDAAgD;IAChD,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC;IACrF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;IACzF,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/C,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;AACxC,CAAC;AAED,yDAAyD;AACzD,SAAS,SAAS,CAAC,CAAM;IACvB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACxD,IAAI,KAAK;QAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,mEAAmE;AACnE,SAAS,WAAW,CAAC,CAAM;IACzB,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ;QAAE,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACnD,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,mFAAmF,CAAC,CAAC;IAC9G,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAkC;IACjE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE;QAC7C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,UAAU,EAAE,GAAG,CAAC,SAAS;YACzB,KAAK,EAAE,YAAY,GAAG,CAAC,OAAO,EAAE;YAChC,WAAW,EAAE,gBAAgB,GAAG,CAAC,OAAO,QAAQ,GAAG,CAAC,WAAW,GAAG;YAClE,WAAW,EAAE,CAAC;YACd,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE;SAC3F,CAAC;KACH,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,KAAa;IACjD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC;IACxD,OAAO;QACL,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,IAAI,SAAS;QAC5C,SAAS,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE;QAChC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,IAAI,CAAC;QAC5C,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC;QAC5D,MAAM,EAAE,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;KACrF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAa;IAC9C,MAAM,QAAQ,CAAC,mBAAmB,KAAK,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC"}
|
|
@@ -1034,13 +1034,11 @@ const MODEL_FAILOVERS = {
|
|
|
1034
1034
|
"minimaxai/minimax-m2": "minimaxai/minimax-m2.7",
|
|
1035
1035
|
"deepseek-ai/deepseek-v3.1-terminus": "deepseek-ai/deepseek-v4-pro",
|
|
1036
1036
|
"deepseek-ai/deepseek-v3.2": "deepseek-ai/deepseek-v4-pro",
|
|
1037
|
-
//
|
|
1038
|
-
"deepseek-ai/deepseek-v4-
|
|
1039
|
-
"deepseek-v4-flash": "deepseek-v4-pro",
|
|
1037
|
+
// deepseek-v4-pro → v4-flash fallback for transient errors
|
|
1038
|
+
"deepseek-ai/deepseek-v4-pro": "deepseek-ai/deepseek-v4-flash",
|
|
1040
1039
|
// NIM → OpenRouter mirror (transient failure fallback)
|
|
1041
1040
|
"qwen/qwen3-next-80b-a3b-instruct": "qwen/qwen3-235b-a22b-thinking-2507",
|
|
1042
1041
|
"meta/llama-3.3-70b-instruct": "qwen/qwen3-coder:free",
|
|
1043
|
-
"deepseek-ai/deepseek-v4-pro": "deepseek-ai/deepseek-v4-flash",
|
|
1044
1042
|
// Anthropic-native → OpenRouter mirror (no key needed if OR set)
|
|
1045
1043
|
"claude-opus-4-7": "anthropic/claude-opus-4-7",
|
|
1046
1044
|
"claude-sonnet-4-6": "anthropic/claude-sonnet-4-6",
|
|
@@ -1075,9 +1073,6 @@ const DEPRECATED_MODELS = new Set([
|
|
|
1075
1073
|
"minimaxai/minimax-m2",
|
|
1076
1074
|
"deepseek-ai/deepseek-v3.1-terminus",
|
|
1077
1075
|
"deepseek-ai/deepseek-v3.2",
|
|
1078
|
-
// Hangs on NIM — auto-demote to pro variant
|
|
1079
|
-
"deepseek-ai/deepseek-v4-flash",
|
|
1080
|
-
"deepseek-v4-flash",
|
|
1081
1076
|
]);
|
|
1082
1077
|
export function migrateDeprecatedModel(modelId) {
|
|
1083
1078
|
if (DEPRECATED_MODELS.has(modelId)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prices.js","sourceRoot":"","sources":["../../src/intelligence/prices.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prices.js","sourceRoot":"","sources":["../../src/intelligence/prices.ts"],"names":[],"mappings":"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"}
|
package/dist/kernel/message.js
CHANGED
|
@@ -107,6 +107,16 @@ export function assembleTurn(events) {
|
|
|
107
107
|
}
|
|
108
108
|
flushText();
|
|
109
109
|
flushThinking();
|
|
110
|
+
// Recovery: flush any buffered tool calls that were opened but never closed.
|
|
111
|
+
for (const [id, entry] of toolJsonBuf) {
|
|
112
|
+
parts.push({
|
|
113
|
+
type: "tool_use",
|
|
114
|
+
id,
|
|
115
|
+
name: entry.name,
|
|
116
|
+
input: safeParse(entry.json),
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
toolJsonBuf.clear();
|
|
110
120
|
return {
|
|
111
121
|
message: { role: "assistant", content: parts },
|
|
112
122
|
inputTokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/kernel/message.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/kernel/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ export interface DirghaAgentOptions {
|
|
|
8
8
|
extraArgs?: string[];
|
|
9
9
|
/** Working directory. */
|
|
10
10
|
cwd?: string;
|
|
11
|
+
/** Extra environment variables to pass to the agent. */
|
|
12
|
+
env?: Record<string, string | undefined>;
|
|
11
13
|
}
|
|
12
14
|
/**
|
|
13
15
|
* Spawn a dirgha agent subprocess for a given task.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirgha.js","sourceRoot":"","sources":["../../../src/orchestra/agent/dirgha.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"dirgha.js","sourceRoot":"","sources":["../../../src/orchestra/agent/dirgha.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;AAW7D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAa,EACb,IAAY,EACZ,OAA2B,EAAE;IAE7B,MAAM,IAAI,GAAa,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhB,MAAM,SAAS,GAAiB;QAC9B,OAAO,EAAE,QAAQ;QACjB,IAAI;QACJ,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,CAAC;IAEF,OAAO,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAe,EACf,OAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;QACzE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -27,6 +27,8 @@ export interface SpawnOptions {
|
|
|
27
27
|
cwd?: string;
|
|
28
28
|
/** Environment variables. */
|
|
29
29
|
env?: Record<string, string | undefined>;
|
|
30
|
+
/** Spawn timeout in ms (default 120 000). SIGTERM on timeout, SIGKILL after 3 s. */
|
|
31
|
+
timeoutMs?: number;
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
34
|
* Spawn an agent subprocess and wire it into the session registry + log.
|
|
@@ -12,8 +12,49 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import { spawn } from "node:child_process";
|
|
14
14
|
import { randomUUID } from "node:crypto";
|
|
15
|
+
import { safeEnvironment } from "../../utils/env.js";
|
|
15
16
|
import { registry } from "../core/registry.js";
|
|
16
17
|
import { writeLog } from "../orchestration/log.js";
|
|
18
|
+
/** Env var names for known LLM providers that spawned agents need. */
|
|
19
|
+
const LLM_PROVIDER_KEY_VARS = Object.freeze([
|
|
20
|
+
"OPENAI_API_KEY",
|
|
21
|
+
"ANTHROPIC_API_KEY",
|
|
22
|
+
"GEMINI_API_KEY",
|
|
23
|
+
"GOOGLE_API_KEY",
|
|
24
|
+
"DEEPSEEK_API_KEY",
|
|
25
|
+
"OPENROUTER_API_KEY",
|
|
26
|
+
"NVIDIA_API_KEY",
|
|
27
|
+
"MISTRAL_API_KEY",
|
|
28
|
+
"COHERE_API_KEY",
|
|
29
|
+
"CEREBRAS_API_KEY",
|
|
30
|
+
"TOGETHER_API_KEY",
|
|
31
|
+
"PERPLEXITY_API_KEY",
|
|
32
|
+
"XAI_API_KEY",
|
|
33
|
+
"GROQ_API_KEY",
|
|
34
|
+
"ZAI_API_KEY",
|
|
35
|
+
"GLM_API_KEY",
|
|
36
|
+
"FIREWORKS_API_KEY",
|
|
37
|
+
]);
|
|
38
|
+
/**
|
|
39
|
+
* Build the environment for a spawned agent: safe-clean parent env
|
|
40
|
+
* plus any LLM provider keys the parent has set.
|
|
41
|
+
*/
|
|
42
|
+
function buildSpawnEnv(extraEnv) {
|
|
43
|
+
const env = { ...safeEnvironment() };
|
|
44
|
+
// Pass through known LLM provider keys from the parent.
|
|
45
|
+
for (const key of LLM_PROVIDER_KEY_VARS) {
|
|
46
|
+
const val = process.env[key];
|
|
47
|
+
if (val)
|
|
48
|
+
env[key] = val;
|
|
49
|
+
}
|
|
50
|
+
if (extraEnv) {
|
|
51
|
+
for (const [k, v] of Object.entries(extraEnv)) {
|
|
52
|
+
if (v !== undefined)
|
|
53
|
+
env[k] = v;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return env;
|
|
57
|
+
}
|
|
17
58
|
/**
|
|
18
59
|
* Spawn an agent subprocess and wire it into the session registry + log.
|
|
19
60
|
* Returns the agent id and the child process handle.
|
|
@@ -45,7 +86,7 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
|
|
|
45
86
|
try {
|
|
46
87
|
child = spawn(command, args, {
|
|
47
88
|
cwd: opts.cwd,
|
|
48
|
-
env:
|
|
89
|
+
env: buildSpawnEnv(opts.env),
|
|
49
90
|
stdio: ["pipe", "pipe", "pipe"],
|
|
50
91
|
});
|
|
51
92
|
}
|
|
@@ -80,9 +121,39 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
|
|
|
80
121
|
writeLog(sessionId, agentId, "output", { line, stream: "stderr" });
|
|
81
122
|
}
|
|
82
123
|
});
|
|
124
|
+
// Spawn timeout: kill the child if it hasn't exited within timeoutMs.
|
|
125
|
+
const timeoutMs = opts.timeoutMs ?? 120_000;
|
|
126
|
+
let timeoutHandle;
|
|
127
|
+
if (timeoutMs > 0) {
|
|
128
|
+
timeoutHandle = setTimeout(() => {
|
|
129
|
+
const elapsed = Date.now() - now;
|
|
130
|
+
registry.updateAgent(sessionId, agentId, {
|
|
131
|
+
status: "failed",
|
|
132
|
+
exitCode: -3,
|
|
133
|
+
elapsedMs: elapsed,
|
|
134
|
+
});
|
|
135
|
+
writeLog(sessionId, agentId, "exit", {
|
|
136
|
+
code: -3,
|
|
137
|
+
elapsedMs: elapsed,
|
|
138
|
+
reason: `spawn timeout after ${timeoutMs}ms`,
|
|
139
|
+
});
|
|
140
|
+
try {
|
|
141
|
+
child.kill("SIGTERM");
|
|
142
|
+
}
|
|
143
|
+
catch { /* already dead */ }
|
|
144
|
+
setTimeout(() => {
|
|
145
|
+
try {
|
|
146
|
+
child.kill("SIGKILL");
|
|
147
|
+
}
|
|
148
|
+
catch { /* already dead */ }
|
|
149
|
+
}, 3000);
|
|
150
|
+
}, timeoutMs);
|
|
151
|
+
}
|
|
83
152
|
// Wait for exit.
|
|
84
153
|
const done = new Promise((resolve) => {
|
|
85
154
|
child.on("exit", (code) => {
|
|
155
|
+
if (timeoutHandle)
|
|
156
|
+
clearTimeout(timeoutHandle);
|
|
86
157
|
const elapsed = Date.now() - now;
|
|
87
158
|
registry.updateAgent(sessionId, agentId, {
|
|
88
159
|
status: code === 0 ? "done" : "failed",
|
|
@@ -93,6 +164,8 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
|
|
|
93
164
|
resolve(code ?? -1);
|
|
94
165
|
});
|
|
95
166
|
child.on("error", (err) => {
|
|
167
|
+
if (timeoutHandle)
|
|
168
|
+
clearTimeout(timeoutHandle);
|
|
96
169
|
registry.updateAgent(sessionId, agentId, {
|
|
97
170
|
status: "failed",
|
|
98
171
|
exitCode: -2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/orchestra/agent/manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/orchestra/agent/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,10 +26,15 @@ export function createLog(sessionId) {
|
|
|
26
26
|
export function appendLog(entry) {
|
|
27
27
|
try {
|
|
28
28
|
const path = logPath(entry.sessionId);
|
|
29
|
+
const dir = tmpdir();
|
|
30
|
+
if (!existsSync(dir))
|
|
31
|
+
mkdirSync(dir, { recursive: true });
|
|
29
32
|
appendFileSync(path, JSON.stringify(entry) + "\n", "utf-8");
|
|
30
33
|
}
|
|
31
|
-
catch {
|
|
32
|
-
// Non-fatal — log writes must never crash the orchestrator
|
|
34
|
+
catch (err) {
|
|
35
|
+
// Non-fatal — log writes must never crash the orchestrator,
|
|
36
|
+
// but surface the error so root cause is visible.
|
|
37
|
+
process.stderr.write(`[orchestra] log write failed: ${err.message}\n`);
|
|
33
38
|
}
|
|
34
39
|
}
|
|
35
40
|
/** Convenience: build and write a structured entry in one call. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,8CAA8C;AAC9C,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,SAAS,SAAS,CAAC,CAAC;AACzD,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,SAAS,CAAC,SAAiB;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,SAAS,CAAC,KAAe;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAAC,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,6 @@ export const DEEPSEEK_CATALOGUE = [
|
|
|
22
22
|
inputPerM: 0.27,
|
|
23
23
|
outputPerM: 1.10,
|
|
24
24
|
cachedInputPerM: 0.07,
|
|
25
|
-
defaultModel: true,
|
|
26
25
|
notes: 'aka deepseek-v3; general-purpose flagship',
|
|
27
26
|
tags: ['coding'],
|
|
28
27
|
},
|
|
@@ -55,6 +54,7 @@ export const DEEPSEEK_CATALOGUE = [
|
|
|
55
54
|
inputPerM: 0.43,
|
|
56
55
|
outputPerM: 0.87,
|
|
57
56
|
cachedInputPerM: 0.11,
|
|
57
|
+
defaultModel: true,
|
|
58
58
|
notes: 'flagship v4 model; api.deepseek.com direct',
|
|
59
59
|
tags: ['agents'],
|
|
60
60
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek-catalogue.js","sourceRoot":"","sources":["../../src/providers/deepseek-catalogue.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,uBAAuB,GAAG,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;AAE7E,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACnD;QACE,EAAE,EAAE,eAAe;QACnB,KAAK,EAAE,oBAAoB;QAC3B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,KAAK;QACtB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,MAAM;QACpB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,
|
|
1
|
+
{"version":3,"file":"deepseek-catalogue.js","sourceRoot":"","sources":["../../src/providers/deepseek-catalogue.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,uBAAuB,GAAG,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;AAE7E,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACnD;QACE,EAAE,EAAE,eAAe;QACnB,KAAK,EAAE,oBAAoB;QAC3B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,KAAK;QACtB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,MAAM;QACpB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,2CAA2C;QAClD,IAAI,EAAE,CAAC,QAAQ,CAAC;KACjB;IACD;QACE,EAAE,EAAE,mBAAmB;QACvB,KAAK,EAAE,wBAAwB;QAC/B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,MAAM;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,WAAW;QACzB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,6CAA6C;QACpD,IAAI,EAAE,CAAC,WAAW,CAAC;KACpB;IACD;QACE,EAAE,EAAE,iBAAiB;QACrB,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,MAAM;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,QAAQ;QACtB,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,4CAA4C;QACnD,IAAI,EAAE,CAAC,QAAQ,CAAC;KACjB;IACD;QACE,EAAE,EAAE,mBAAmB;QACvB,KAAK,EAAE,mBAAmB;QAC1B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,MAAM;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,QAAQ;QACtB,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,0CAA0C;QACjD,IAAI,EAAE,CAAC,MAAM,CAAC;KACf;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAEhE,mDAAmD;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
* "nvidia/..."); bare ids fall through to the catch-all rules at the
|
|
7
7
|
* end.
|
|
8
8
|
*/
|
|
9
|
-
import { migrateDeprecatedModel } from "../intelligence/prices.js";
|
|
10
9
|
import { NIM_CATALOGUE } from "./nim-catalogue.js";
|
|
11
10
|
// Specific model IDs that NVIDIA NIM serves — derived from the NIM_CATALOGUE
|
|
12
11
|
// so there is a single source of truth. Also include NIM-hosted models that
|
|
@@ -104,15 +103,14 @@ const RULES = [
|
|
|
104
103
|
},
|
|
105
104
|
];
|
|
106
105
|
export function routeModel(modelId) {
|
|
107
|
-
const migrated = migrateDeprecatedModel(modelId);
|
|
108
106
|
for (const rule of RULES) {
|
|
109
|
-
if (rule.match(
|
|
107
|
+
if (rule.match(modelId))
|
|
110
108
|
return rule.provider;
|
|
111
109
|
}
|
|
112
|
-
throw new Error(`No provider configured for model "${
|
|
110
|
+
throw new Error(`No provider configured for model "${modelId}". Add a routing rule in providers/dispatch.ts.`);
|
|
113
111
|
}
|
|
114
112
|
export function resolveModelForDispatch(modelId) {
|
|
115
|
-
return
|
|
113
|
+
return modelId;
|
|
116
114
|
}
|
|
117
115
|
export function isKnownProvider(id) {
|
|
118
116
|
return (id === "anthropic" ||
|