@dirgha/code 1.23.0 → 1.24.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/flows/wizard.js +1 -0
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +16 -0
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +14 -6
- 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 +9 -2
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/models.js +335 -5
- package/dist/cli/slash/models.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/context/_fts.js +4 -1
- package/dist/context/_fts.js.map +1 -1
- package/dist/daemon/server.js +17 -3
- package/dist/daemon/server.js.map +1 -1
- package/dist/intelligence/prices.js +9 -1
- 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 +46 -10
- 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/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/dispatch.d.ts +1 -1
- package/dist/providers/dispatch.js +10 -1
- 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 +5 -0
- package/dist/providers/index.js +14 -0
- 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/openai-compat.d.ts +1 -0
- package/dist/providers/openai-compat.js +30 -9
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.js +4 -1
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/state/db.js +22 -0
- 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/tools/checkpoint.js +16 -2
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/git.js +2 -1
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/multimodal.js +21 -5
- 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/rtk.js +8 -2
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.js +10 -6
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/shell.js +5 -5
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/approval.js +31 -3
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.js +31 -7
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +4 -0
- package/dist/tui/ink/components/InputBox.js +32 -7
- package/dist/tui/ink/components/InputBox.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/StatusBar.d.ts +3 -7
- package/dist/tui/ink/components/StatusBar.js +2 -9
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/index.js +19 -13
- 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/use-overlays.js +13 -9
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +7 -0
- package/dist/tui/ink/use-tool-progress.js +43 -0
- package/dist/tui/ink/use-tool-progress.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.js +9 -5
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
- package/package.json +3 -2
package/dist/cli/slash/models.js
CHANGED
|
@@ -56,7 +56,7 @@ const RECOMMENDED = new Set([
|
|
|
56
56
|
]);
|
|
57
57
|
function configured(provider) {
|
|
58
58
|
const env = ENV_FOR_PROVIDER[provider] ?? "";
|
|
59
|
-
return !env || Boolean(process.env[env]?.length);
|
|
59
|
+
return !env || Boolean(process.env[env]?.trim().length);
|
|
60
60
|
}
|
|
61
61
|
function contextLabel(tokens) {
|
|
62
62
|
if (tokens >= 1_000_000)
|
|
@@ -121,7 +121,7 @@ function enrichCatalogue() {
|
|
|
121
121
|
id: pp.model,
|
|
122
122
|
provider: pp.provider,
|
|
123
123
|
contextWindow: pp.contextWindow ?? 128_000,
|
|
124
|
-
tools: pp.supportsTools
|
|
124
|
+
tools: pp.supportsTools === true,
|
|
125
125
|
thinkingMode: pp.supportsThinking ? "opt-in" : "none",
|
|
126
126
|
inputPerM: pp.inputPerM,
|
|
127
127
|
outputPerM: pp.outputPerM,
|
|
@@ -129,29 +129,359 @@ function enrichCatalogue() {
|
|
|
129
129
|
}
|
|
130
130
|
return [...byId.values()];
|
|
131
131
|
}
|
|
132
|
+
const KNOWN_PREFIXES = [
|
|
133
|
+
"anthropic.",
|
|
134
|
+
"openai.",
|
|
135
|
+
"google/",
|
|
136
|
+
"gemini-",
|
|
137
|
+
"nvidia.",
|
|
138
|
+
"deepseek.",
|
|
139
|
+
"mistral.",
|
|
140
|
+
"cohere.",
|
|
141
|
+
"cerebras.",
|
|
142
|
+
"together.",
|
|
143
|
+
"perplexity.",
|
|
144
|
+
"xai-",
|
|
145
|
+
"groq.",
|
|
146
|
+
"ollama.",
|
|
147
|
+
"llamacpp.",
|
|
148
|
+
];
|
|
149
|
+
// Explicit vendor→provider map for vendor/model-style IDs.
|
|
150
|
+
// These vendors' models live on NVIDIA NIM (or another specific provider)
|
|
151
|
+
// and would otherwise fall through to openrouter incorrectly.
|
|
152
|
+
const VENDOR_TO_PROVIDER = {
|
|
153
|
+
"deepseek-ai": "nvidia",
|
|
154
|
+
"moonshotai": "nvidia",
|
|
155
|
+
"qwen": "nvidia",
|
|
156
|
+
"mistralai": "nvidia",
|
|
157
|
+
"meta": "nvidia",
|
|
158
|
+
"nvidia": "nvidia",
|
|
159
|
+
"nv-mistralai": "nvidia",
|
|
160
|
+
"google": "gemini",
|
|
161
|
+
"openai": "openai",
|
|
162
|
+
"anthropic": "anthropic",
|
|
163
|
+
"cohere": "cohere",
|
|
164
|
+
"mistral": "mistral",
|
|
165
|
+
};
|
|
166
|
+
function detectProvider(id) {
|
|
167
|
+
if (id.endsWith(":free"))
|
|
168
|
+
return "openrouter";
|
|
169
|
+
if (id.includes("/")) {
|
|
170
|
+
const vendor = id.split("/")[0].toLowerCase();
|
|
171
|
+
if (VENDOR_TO_PROVIDER[vendor])
|
|
172
|
+
return VENDOR_TO_PROVIDER[vendor];
|
|
173
|
+
const lower = id.toLowerCase();
|
|
174
|
+
for (const prefix of KNOWN_PREFIXES) {
|
|
175
|
+
if (lower.startsWith(prefix)) {
|
|
176
|
+
return prefix.replace(/[.\-/]/g, "");
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
return "openrouter";
|
|
180
|
+
}
|
|
181
|
+
for (const prefix of KNOWN_PREFIXES) {
|
|
182
|
+
if (id.toLowerCase().startsWith(prefix)) {
|
|
183
|
+
return prefix.replace(/[.\-/]/g, "");
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return "openrouter";
|
|
187
|
+
}
|
|
188
|
+
async function testModel(id) {
|
|
189
|
+
const provider = detectProvider(id);
|
|
190
|
+
const envKey = ENV_FOR_PROVIDER[provider];
|
|
191
|
+
const apiKey = envKey ? process.env[envKey]?.trim() : undefined;
|
|
192
|
+
if (!apiKey) {
|
|
193
|
+
const needed = envKey ?? "OPENROUTER_API_KEY";
|
|
194
|
+
return `⚠ Cannot test model — ${needed} is not set. Use /keys set ${needed} <key> first.`;
|
|
195
|
+
}
|
|
196
|
+
const start = performance.now();
|
|
197
|
+
let url;
|
|
198
|
+
let body;
|
|
199
|
+
let headers;
|
|
200
|
+
if (provider === "openrouter") {
|
|
201
|
+
url = "https://openrouter.ai/api/v1/chat/completions";
|
|
202
|
+
headers = {
|
|
203
|
+
Authorization: `Bearer ${apiKey}`,
|
|
204
|
+
"Content-Type": "application/json",
|
|
205
|
+
"HTTP-Referer": "https://openrouter.ai",
|
|
206
|
+
"X-Title": "Dirgha",
|
|
207
|
+
};
|
|
208
|
+
body = {
|
|
209
|
+
model: id,
|
|
210
|
+
messages: [{ role: "user", content: "hi" }],
|
|
211
|
+
max_tokens: 1,
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
else if (provider === "openai") {
|
|
215
|
+
url = "https://api.openai.com/v1/chat/completions";
|
|
216
|
+
headers = {
|
|
217
|
+
Authorization: `Bearer ${apiKey}`,
|
|
218
|
+
"Content-Type": "application/json",
|
|
219
|
+
};
|
|
220
|
+
body = {
|
|
221
|
+
model: id,
|
|
222
|
+
messages: [{ role: "user", content: "hi" }],
|
|
223
|
+
max_tokens: 1,
|
|
224
|
+
};
|
|
225
|
+
}
|
|
226
|
+
else if (provider === "anthropic") {
|
|
227
|
+
url = "https://api.anthropic.com/v1/messages";
|
|
228
|
+
headers = {
|
|
229
|
+
"x-api-key": apiKey,
|
|
230
|
+
"anthropic-version": "2023-06-01",
|
|
231
|
+
"Content-Type": "application/json",
|
|
232
|
+
};
|
|
233
|
+
body = {
|
|
234
|
+
model: id,
|
|
235
|
+
max_tokens: 1,
|
|
236
|
+
messages: [{ role: "user", content: "hi" }],
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
else if (provider === "gemini") {
|
|
240
|
+
const geminiModel = id.replace(/^google\//, "");
|
|
241
|
+
url = `https://generativelanguage.googleapis.com/v1beta/models/${encodeURIComponent(geminiModel)}:generateContent?key=${apiKey}`;
|
|
242
|
+
headers = { "Content-Type": "application/json" };
|
|
243
|
+
body = {
|
|
244
|
+
contents: [{ role: "user", parts: [{ text: "hi" }] }],
|
|
245
|
+
generationConfig: { maxOutputTokens: 1 },
|
|
246
|
+
};
|
|
247
|
+
}
|
|
248
|
+
else if (provider === "deepseek") {
|
|
249
|
+
url = "https://api.deepseek.com/v1/chat/completions";
|
|
250
|
+
headers = {
|
|
251
|
+
Authorization: `Bearer ${apiKey}`,
|
|
252
|
+
"Content-Type": "application/json",
|
|
253
|
+
};
|
|
254
|
+
body = {
|
|
255
|
+
model: id,
|
|
256
|
+
messages: [{ role: "user", content: "hi" }],
|
|
257
|
+
max_tokens: 1,
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
else if (provider === "groq") {
|
|
261
|
+
url = "https://api.groq.com/openai/v1/chat/completions";
|
|
262
|
+
headers = {
|
|
263
|
+
Authorization: `Bearer ${apiKey}`,
|
|
264
|
+
"Content-Type": "application/json",
|
|
265
|
+
};
|
|
266
|
+
body = {
|
|
267
|
+
model: id,
|
|
268
|
+
messages: [{ role: "user", content: "hi" }],
|
|
269
|
+
max_tokens: 1,
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
else if (provider === "mistral") {
|
|
273
|
+
url = "https://api.mistral.ai/v1/chat/completions";
|
|
274
|
+
headers = {
|
|
275
|
+
Authorization: `Bearer ${apiKey}`,
|
|
276
|
+
"Content-Type": "application/json",
|
|
277
|
+
};
|
|
278
|
+
body = {
|
|
279
|
+
model: id,
|
|
280
|
+
messages: [{ role: "user", content: "hi" }],
|
|
281
|
+
max_tokens: 1,
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
else if (provider === "cohere") {
|
|
285
|
+
url = "https://api.cohere.ai/v1/chat";
|
|
286
|
+
headers = {
|
|
287
|
+
Authorization: `Bearer ${apiKey}`,
|
|
288
|
+
"Content-Type": "application/json",
|
|
289
|
+
};
|
|
290
|
+
body = {
|
|
291
|
+
model: id,
|
|
292
|
+
message: "hi",
|
|
293
|
+
max_tokens: 1,
|
|
294
|
+
};
|
|
295
|
+
}
|
|
296
|
+
else if (provider === "nvidia") {
|
|
297
|
+
url = "https://integrate.api.nvidia.com/v1/chat/completions";
|
|
298
|
+
headers = {
|
|
299
|
+
Authorization: `Bearer ${apiKey}`,
|
|
300
|
+
"Content-Type": "application/json",
|
|
301
|
+
};
|
|
302
|
+
body = {
|
|
303
|
+
model: id,
|
|
304
|
+
messages: [{ role: "user", content: "hi" }],
|
|
305
|
+
max_tokens: 1,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
else if (provider === "cerebras") {
|
|
309
|
+
url = "https://api.cerebras.ai/v1/chat/completions";
|
|
310
|
+
headers = {
|
|
311
|
+
Authorization: `Bearer ${apiKey}`,
|
|
312
|
+
"Content-Type": "application/json",
|
|
313
|
+
};
|
|
314
|
+
body = {
|
|
315
|
+
model: id,
|
|
316
|
+
messages: [{ role: "user", content: "hi" }],
|
|
317
|
+
max_tokens: 1,
|
|
318
|
+
};
|
|
319
|
+
}
|
|
320
|
+
else if (provider === "together") {
|
|
321
|
+
url = "https://api.together.xyz/v1/chat/completions";
|
|
322
|
+
headers = {
|
|
323
|
+
Authorization: `Bearer ${apiKey}`,
|
|
324
|
+
"Content-Type": "application/json",
|
|
325
|
+
};
|
|
326
|
+
body = {
|
|
327
|
+
model: id,
|
|
328
|
+
messages: [{ role: "user", content: "hi" }],
|
|
329
|
+
max_tokens: 1,
|
|
330
|
+
};
|
|
331
|
+
}
|
|
332
|
+
else if (provider === "xai") {
|
|
333
|
+
url = "https://api.x.ai/v1/chat/completions";
|
|
334
|
+
headers = {
|
|
335
|
+
Authorization: `Bearer ${apiKey}`,
|
|
336
|
+
"Content-Type": "application/json",
|
|
337
|
+
};
|
|
338
|
+
body = {
|
|
339
|
+
model: id,
|
|
340
|
+
messages: [{ role: "user", content: "hi" }],
|
|
341
|
+
max_tokens: 1,
|
|
342
|
+
};
|
|
343
|
+
}
|
|
344
|
+
else if (provider === "perplexity") {
|
|
345
|
+
url = "https://api.perplexity.ai/chat/completions";
|
|
346
|
+
headers = {
|
|
347
|
+
Authorization: `Bearer ${apiKey}`,
|
|
348
|
+
"Content-Type": "application/json",
|
|
349
|
+
};
|
|
350
|
+
body = {
|
|
351
|
+
model: id,
|
|
352
|
+
messages: [{ role: "user", content: "hi" }],
|
|
353
|
+
max_tokens: 1,
|
|
354
|
+
};
|
|
355
|
+
}
|
|
356
|
+
else {
|
|
357
|
+
// Unknown provider — try OpenRouter as default
|
|
358
|
+
url = "https://openrouter.ai/api/v1/chat/completions";
|
|
359
|
+
headers = {
|
|
360
|
+
Authorization: `Bearer ${apiKey}`,
|
|
361
|
+
"Content-Type": "application/json",
|
|
362
|
+
"HTTP-Referer": "https://openrouter.ai",
|
|
363
|
+
"X-Title": "Dirgha",
|
|
364
|
+
};
|
|
365
|
+
body = {
|
|
366
|
+
model: id,
|
|
367
|
+
messages: [{ role: "user", content: "hi" }],
|
|
368
|
+
max_tokens: 1,
|
|
369
|
+
};
|
|
370
|
+
}
|
|
371
|
+
try {
|
|
372
|
+
const res = await fetch(url, {
|
|
373
|
+
method: "POST",
|
|
374
|
+
headers,
|
|
375
|
+
body: JSON.stringify(body),
|
|
376
|
+
});
|
|
377
|
+
const elapsed = Math.round(performance.now() - start);
|
|
378
|
+
if (!res.ok) {
|
|
379
|
+
const text = await res.text().catch(() => "");
|
|
380
|
+
let detail;
|
|
381
|
+
try {
|
|
382
|
+
const json = JSON.parse(text);
|
|
383
|
+
detail = json.error?.message ?? json.detail ?? text;
|
|
384
|
+
}
|
|
385
|
+
catch {
|
|
386
|
+
detail = text || res.statusText;
|
|
387
|
+
}
|
|
388
|
+
return `❌ Model test failed (${elapsed}ms) — ${res.status} ${res.statusText}\n${detail}`;
|
|
389
|
+
}
|
|
390
|
+
return `✅ Model "${id}" responded successfully in ${elapsed}ms.`;
|
|
391
|
+
}
|
|
392
|
+
catch (err) {
|
|
393
|
+
const elapsed = Math.round(performance.now() - start);
|
|
394
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
395
|
+
return `❌ Model test error (${elapsed}ms) — ${msg}`;
|
|
396
|
+
}
|
|
397
|
+
}
|
|
132
398
|
export const modelsCommand = {
|
|
133
399
|
name: "models",
|
|
400
|
+
aliases: ["mod"],
|
|
134
401
|
description: "List models and optionally switch the current one",
|
|
135
402
|
async execute(args, ctx) {
|
|
136
403
|
const all = enrichCatalogue();
|
|
137
404
|
const ordered = [...all];
|
|
138
405
|
if (args.length > 0) {
|
|
139
406
|
const first = args[0];
|
|
407
|
+
// "test" subcommand
|
|
408
|
+
if (first === "test") {
|
|
409
|
+
if (args.length < 2) {
|
|
410
|
+
return "Usage: /models test <model-id>";
|
|
411
|
+
}
|
|
412
|
+
const testId = args.slice(1).join(" ");
|
|
413
|
+
return testModel(testId);
|
|
414
|
+
}
|
|
415
|
+
// "search" subcommand
|
|
416
|
+
if (first === "search") {
|
|
417
|
+
if (args.length < 2) {
|
|
418
|
+
return "Usage: /models search <query>";
|
|
419
|
+
}
|
|
420
|
+
const query = args.slice(1).join(" ");
|
|
421
|
+
const apiKey = process.env.OPENROUTER_API_KEY?.trim();
|
|
422
|
+
if (!apiKey) {
|
|
423
|
+
return "⚠ OPENROUTER_API_KEY is not set. Use /keys set OPENROUTER_API_KEY <key> first to search models.";
|
|
424
|
+
}
|
|
425
|
+
try {
|
|
426
|
+
const res = await fetch("https://openrouter.ai/api/v1/models", {
|
|
427
|
+
headers: {
|
|
428
|
+
Authorization: `Bearer ${apiKey}`,
|
|
429
|
+
},
|
|
430
|
+
});
|
|
431
|
+
if (!res.ok) {
|
|
432
|
+
return `Failed to fetch models: ${res.status} ${res.statusText}`;
|
|
433
|
+
}
|
|
434
|
+
const json = await res.json();
|
|
435
|
+
const models = json.data ?? [];
|
|
436
|
+
const lowerQ = query.toLowerCase();
|
|
437
|
+
const filtered = models
|
|
438
|
+
.filter((m) => m.id.toLowerCase().includes(lowerQ))
|
|
439
|
+
.slice(0, 15);
|
|
440
|
+
if (filtered.length === 0) {
|
|
441
|
+
return `No models found matching "${query}".`;
|
|
442
|
+
}
|
|
443
|
+
const lines = [];
|
|
444
|
+
lines.push(` ${"ID".padEnd(42)} ${"Context".padEnd(10)} ${"Prompt/1M tokens"}`);
|
|
445
|
+
lines.push(` ${"─".repeat(42)} ${"─".repeat(10)} ${"─".repeat(16)}`);
|
|
446
|
+
for (const m of filtered) {
|
|
447
|
+
const ctxStr = m.context_length
|
|
448
|
+
? contextLabel(m.context_length)
|
|
449
|
+
: "—";
|
|
450
|
+
const priceStr = m.pricing?.prompt ?? "—";
|
|
451
|
+
lines.push(` ${m.id.padEnd(42)} ${ctxStr.padEnd(10)} ${priceStr}`);
|
|
452
|
+
}
|
|
453
|
+
return lines.join("\n");
|
|
454
|
+
}
|
|
455
|
+
catch (err) {
|
|
456
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
457
|
+
return `Search failed: ${msg}`;
|
|
458
|
+
}
|
|
459
|
+
}
|
|
140
460
|
if (/^\d+$/.test(first)) {
|
|
141
461
|
const idx = Number.parseInt(first, 10) - 1;
|
|
142
462
|
if (idx >= 0 && idx < ordered.length) {
|
|
143
463
|
const chosen = ordered[idx];
|
|
144
|
-
ctx.setModel(chosen.id);
|
|
464
|
+
await ctx.setModel(chosen.id);
|
|
145
465
|
return `Model set to ${chosen.id} (${chosen.provider}).`;
|
|
146
466
|
}
|
|
147
467
|
return `Index out of range. There are ${ordered.length} models.`;
|
|
148
468
|
}
|
|
149
469
|
const match = ordered.find((p) => p.id === first);
|
|
150
470
|
if (match) {
|
|
151
|
-
ctx.setModel(match.id);
|
|
471
|
+
await ctx.setModel(match.id);
|
|
152
472
|
return `Model set to ${match.id} (${match.provider}).`;
|
|
153
473
|
}
|
|
154
|
-
|
|
474
|
+
// Unknown model ID — set it anyway and detect the provider
|
|
475
|
+
const provider = detectProvider(first);
|
|
476
|
+
const envKey = ENV_FOR_PROVIDER[provider];
|
|
477
|
+
const keySet = envKey ? Boolean(process.env[envKey]?.trim().length) : true;
|
|
478
|
+
await ctx.setModel(first);
|
|
479
|
+
if (keySet) {
|
|
480
|
+
return `Model set to ${first} via ${provider}.\nNote: not in catalogue — no pricing data.`;
|
|
481
|
+
}
|
|
482
|
+
else {
|
|
483
|
+
return `Model set to ${first} via ${provider}.\nNote: not in catalogue — no pricing data.\n⚠ Set ${envKey ?? "OPENROUTER_API_KEY"} first: /keys set ${envKey ?? "OPENROUTER_API_KEY"} <key>`;
|
|
484
|
+
}
|
|
155
485
|
}
|
|
156
486
|
const lines = [];
|
|
157
487
|
lines.push(" Rec Model Provider Context Tools Thinking Price (in/out per 1M)");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/cli/slash/models.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/cli/slash/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* `add-provider` skill so the agent can
|
|
9
9
|
* do the file edits if asked.
|
|
10
10
|
* /provider doctor [name] — quick reachability check
|
|
11
|
+
* /provider add-custom — instructions for adding a custom provider
|
|
11
12
|
*
|
|
12
13
|
* Adding a provider is a one-time operation that spans 6 files; the
|
|
13
14
|
* skill doc at src/skills/add-provider.md is the canonical recipe so a
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* `add-provider` skill so the agent can
|
|
9
9
|
* do the file edits if asked.
|
|
10
10
|
* /provider doctor [name] — quick reachability check
|
|
11
|
+
* /provider add-custom — instructions for adding a custom provider
|
|
11
12
|
*
|
|
12
13
|
* Adding a provider is a one-time operation that spans 6 files; the
|
|
13
14
|
* skill doc at src/skills/add-provider.md is the canonical recipe so a
|
|
@@ -17,6 +18,7 @@ import { readFile } from 'node:fs/promises';
|
|
|
17
18
|
import { join, dirname } from 'node:path';
|
|
18
19
|
import { fileURLToPath } from 'node:url';
|
|
19
20
|
import { isKnownProvider } from '../../providers/dispatch.js';
|
|
21
|
+
import { CUSTOM_PROVIDERS } from '../../providers/custom-provider.js';
|
|
20
22
|
/**
|
|
21
23
|
* Provider id → human label + best-for blurb. Source of truth for the
|
|
22
24
|
* /provider list output; kept here (not in dispatch.ts) because dispatch
|
|
@@ -61,10 +63,26 @@ export const providerCommand = {
|
|
|
61
63
|
}
|
|
62
64
|
return await formatAdd(name);
|
|
63
65
|
}
|
|
66
|
+
if (sub === 'add-custom') {
|
|
67
|
+
return ('Create ~/.dirgha/providers.json (array format):\n\n' +
|
|
68
|
+
'[\n' +
|
|
69
|
+
' {\n' +
|
|
70
|
+
' "id": "my-vllm",\n' +
|
|
71
|
+
' "label": "My vLLM Server",\n' +
|
|
72
|
+
' "baseUrl": "http://localhost:8000/v1",\n' +
|
|
73
|
+
' "apiKey": "sk-optional",\n' +
|
|
74
|
+
' "models": ["llama-3-8b", "codellama-13b"],\n' +
|
|
75
|
+
' "supportsTools": true,\n' +
|
|
76
|
+
' "supportsThinking": false\n' +
|
|
77
|
+
' }\n' +
|
|
78
|
+
']\n\n' +
|
|
79
|
+
'Use it: /model my-vllm/llama-3-8b\n' +
|
|
80
|
+
'Loaded once at startup — restart dirgha to pick up changes.');
|
|
81
|
+
}
|
|
64
82
|
if (sub === 'doctor' || sub === 'check') {
|
|
65
83
|
return 'Run `dirgha doctor` for a full health report (reachability + auth per provider).';
|
|
66
84
|
}
|
|
67
|
-
return `unknown subcommand: ${sub}\nTry: /provider list | /provider add <name> | /provider doctor`;
|
|
85
|
+
return `unknown subcommand: ${sub}\nTry: /provider list | /provider add <name> | /provider add-custom | /provider doctor`;
|
|
68
86
|
},
|
|
69
87
|
};
|
|
70
88
|
function formatList() {
|
|
@@ -90,10 +108,24 @@ function formatList() {
|
|
|
90
108
|
const envCell = (meta.env ?? '— (local)').padEnd(20);
|
|
91
109
|
out.push(` ${badge} ${idCell} ${labelCell} ${envCell} ${meta.blurb}`);
|
|
92
110
|
}
|
|
111
|
+
// Custom providers section
|
|
112
|
+
if (CUSTOM_PROVIDERS.size > 0) {
|
|
113
|
+
out.push('');
|
|
114
|
+
out.push('Custom providers:');
|
|
115
|
+
for (const [id, cfg] of CUSTOM_PROVIDERS.entries()) {
|
|
116
|
+
const badge = '\x1b[32m✓\x1b[0m';
|
|
117
|
+
const idCell = id.padEnd(12);
|
|
118
|
+
const labelCell = (cfg.entry.label ?? '').padEnd(20);
|
|
119
|
+
const baseUrlCell = (cfg.entry.baseUrl ?? '').padEnd(30);
|
|
120
|
+
const models = (cfg.entry.models ?? []).join(', ');
|
|
121
|
+
out.push(` ${badge} ${idCell} ${labelCell} ${baseUrlCell} models: ${models}`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
93
124
|
out.push('');
|
|
94
125
|
out.push('Legend: ✓ = configured (env var set or local), ⚠ = key not set.');
|
|
95
126
|
out.push('Add a key: dirgha keys add <ENV_VAR> <key>');
|
|
96
127
|
out.push('Add a new provider: /provider add <name>');
|
|
128
|
+
out.push('Add a custom provider: /provider add-custom');
|
|
97
129
|
return out.join('\n');
|
|
98
130
|
}
|
|
99
131
|
function isConfigured(id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/cli/slash/provider.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/cli/slash/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/context/_fts.js
CHANGED
|
@@ -105,11 +105,14 @@ export async function openFtsIndex(opts) {
|
|
|
105
105
|
const r = row;
|
|
106
106
|
if (typeof r.id !== 'string' || typeof r.title !== 'string')
|
|
107
107
|
continue;
|
|
108
|
+
const score = typeof r.score === 'number' ? r.score : 0;
|
|
109
|
+
if (score >= 0)
|
|
110
|
+
continue; // bm25 scores are always negative; 0 means no real hit
|
|
108
111
|
hits.push({
|
|
109
112
|
id: r.id,
|
|
110
113
|
title: r.title,
|
|
111
114
|
snippet: typeof r.snippet === 'string' ? r.snippet : '',
|
|
112
|
-
score
|
|
115
|
+
score,
|
|
113
116
|
});
|
|
114
117
|
}
|
|
115
118
|
return hits;
|
package/dist/context/_fts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_fts.js","sourceRoot":"","sources":["../../src/context/_fts.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"_fts.js","sourceRoot":"","sources":["../../src/context/_fts.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/server.js
CHANGED
|
@@ -206,6 +206,7 @@ export class DaemonServer {
|
|
|
206
206
|
const sanitized = this.opts.registry.sanitize({ descriptionLimit: 200 });
|
|
207
207
|
const done = (async () => {
|
|
208
208
|
try {
|
|
209
|
+
const savedCount = active.history.length;
|
|
209
210
|
const result = await runAgentLoop({
|
|
210
211
|
sessionId: params.sessionId,
|
|
211
212
|
model: this.opts.config.model,
|
|
@@ -217,10 +218,23 @@ export class DaemonServer {
|
|
|
217
218
|
events,
|
|
218
219
|
signal: this.abort.signal,
|
|
219
220
|
});
|
|
220
|
-
const savedCount = active.history.length;
|
|
221
221
|
active.history.length = 0;
|
|
222
222
|
active.history.push(...result.messages);
|
|
223
|
-
|
|
223
|
+
// If compaction occurred inside runAgentLoop, result.messages may be
|
|
224
|
+
// shorter than savedCount (old index is invalid). In that case persist
|
|
225
|
+
// the entire post-compaction history so nothing is lost.
|
|
226
|
+
//
|
|
227
|
+
// Length comparison alone is unreliable: compaction could remove N
|
|
228
|
+
// messages while the loop adds N new ones, leaving result.messages.length
|
|
229
|
+
// equal to savedCount even though the content changed entirely (Q3 case).
|
|
230
|
+
// Safe rule: only take the slice when result strictly grew (pure append).
|
|
231
|
+
// If result.messages.length <= savedCount, either compaction occurred or
|
|
232
|
+
// the turn produced zero net messages — re-persist everything to be safe.
|
|
233
|
+
// The session append is idempotent for duplicates, so the cost is low.
|
|
234
|
+
const newMessages = result.messages.length > savedCount
|
|
235
|
+
? result.messages.slice(savedCount)
|
|
236
|
+
: result.messages; // compaction or no-op: re-persist full post-loop history
|
|
237
|
+
for (const msg of newMessages) {
|
|
224
238
|
await active.session.append({
|
|
225
239
|
type: "message",
|
|
226
240
|
ts: new Date().toISOString(),
|
|
@@ -241,10 +255,10 @@ export class DaemonServer {
|
|
|
241
255
|
}
|
|
242
256
|
})();
|
|
243
257
|
const tracked = done;
|
|
258
|
+
this.inFlight.add(tracked);
|
|
244
259
|
tracked.finally(() => {
|
|
245
260
|
this.inFlight.delete(tracked);
|
|
246
261
|
});
|
|
247
|
-
this.inFlight.add(tracked);
|
|
248
262
|
return { streamId };
|
|
249
263
|
}
|
|
250
264
|
writeResult(id, result) {
|