@dirgha/code 1.17.2 → 1.18.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/CHANGELOG.md +130 -45
- package/README.md +36 -25
- package/dist/cli/config.d.ts +2 -0
- package/dist/cli/config.js +16 -1
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/flows/tarball.js +26 -21
- package/dist/cli/flows/tarball.js.map +1 -1
- package/dist/cli/flows/wizard.d.ts +1 -1
- package/dist/cli/flows/wizard.js +282 -163
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +11 -3
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +82 -9
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/models-cmd.js +18 -20
- package/dist/cli/models-cmd.js.map +1 -1
- package/dist/cli/slash/fleet.d.ts +1 -1
- package/dist/cli/slash/fleet.js +25 -16
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/fs.js +1 -3
- package/dist/cli/slash/fs.js.map +1 -1
- package/dist/cli/slash/models.js +3 -4
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.d.ts +1 -1
- package/dist/cli/slash/paste.js +87 -41
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.js +2 -2
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/session.js +4 -1
- package/dist/cli/slash/session.js.map +1 -1
- package/dist/cli/slash.js +19 -6
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/doctor.js +48 -0
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/feature-setup.d.ts +13 -0
- package/dist/cli/subcommands/feature-setup.js +438 -0
- package/dist/cli/subcommands/feature-setup.js.map +1 -0
- package/dist/cli/subcommands/history.d.ts +8 -0
- package/dist/cli/subcommands/history.js +45 -0
- package/dist/cli/subcommands/history.js.map +1 -0
- package/dist/cli/subcommands/index.js +4 -0
- package/dist/cli/subcommands/index.js.map +1 -1
- package/dist/cli/subcommands/scaffold.js +6 -2
- package/dist/cli/subcommands/scaffold.js.map +1 -1
- package/dist/cli/subcommands/setup.d.ts +4 -0
- package/dist/cli/subcommands/setup.js +9 -1
- package/dist/cli/subcommands/setup.js.map +1 -1
- package/dist/cli/subcommands/state.d.ts +8 -0
- package/dist/cli/subcommands/state.js +44 -0
- package/dist/cli/subcommands/state.js.map +1 -0
- package/dist/cli/subcommands/web.d.ts +1 -1
- package/dist/cli/subcommands/web.js +17 -14
- package/dist/cli/subcommands/web.js.map +1 -1
- package/dist/context/compaction.d.ts +3 -3
- package/dist/context/compaction.js +85 -37
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +5 -1
- package/dist/context/kb-init.d.ts +7 -0
- package/dist/context/kb-init.js +51 -0
- package/dist/context/kb-init.js.map +1 -0
- package/dist/context/ledger.js +3 -3
- package/dist/context/ledger.js.map +1 -1
- package/dist/context/memory.js +3 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/primer.js +2 -0
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.js +5 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.d.ts +4 -0
- package/dist/daemon/server.js +81 -29
- package/dist/daemon/server.js.map +1 -1
- package/dist/fleet/apply-back.d.ts +1 -1
- package/dist/fleet/apply-back.js +90 -48
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -2
- package/dist/fleet/cli-command.js +189 -72
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/dag.d.ts +38 -0
- package/dist/fleet/dag.js +77 -0
- package/dist/fleet/dag.js.map +1 -0
- package/dist/fleet/ledger-hook.d.ts +15 -0
- package/dist/fleet/ledger-hook.js +67 -0
- package/dist/fleet/ledger-hook.js.map +1 -0
- package/dist/fleet/runner.js +38 -5
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad-tools.d.ts +13 -0
- package/dist/fleet/scratchpad-tools.js +73 -0
- package/dist/fleet/scratchpad-tools.js.map +1 -0
- package/dist/fleet/scratchpad.d.ts +28 -0
- package/dist/fleet/scratchpad.js +93 -0
- package/dist/fleet/scratchpad.js.map +1 -0
- package/dist/fleet/state.d.ts +37 -0
- package/dist/fleet/state.js +82 -0
- package/dist/fleet/state.js.map +1 -0
- package/dist/fleet/tripleshot.d.ts +2 -2
- package/dist/fleet/tripleshot.js +61 -48
- package/dist/fleet/tripleshot.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/fleet/worktree.d.ts +5 -0
- package/dist/fleet/worktree.js +82 -11
- package/dist/fleet/worktree.js.map +1 -1
- package/dist/hooks/config-bridge.d.ts +2 -2
- package/dist/hooks/config-bridge.js +49 -19
- package/dist/hooks/config-bridge.js.map +1 -1
- package/dist/integrations/arniko-client.d.ts +1 -1
- package/dist/integrations/arniko-client.js +32 -26
- package/dist/integrations/arniko-client.js.map +1 -1
- package/dist/intelligence/cost.js +13 -7
- package/dist/intelligence/cost.js.map +1 -1
- package/dist/intelligence/failover-chain.d.ts +27 -0
- package/dist/intelligence/failover-chain.js +70 -0
- package/dist/intelligence/failover-chain.js.map +1 -0
- package/dist/intelligence/models-dev-sync.js +10 -3
- package/dist/intelligence/models-dev-sync.js.map +1 -1
- package/dist/intelligence/prices.js +1 -1
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +74 -17
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/event-stream.d.ts +7 -2
- package/dist/kernel/event-stream.js +63 -9
- package/dist/kernel/event-stream.js.map +1 -1
- package/dist/kernel/message.d.ts +2 -2
- package/dist/kernel/message.js +45 -30
- package/dist/kernel/message.js.map +1 -1
- package/dist/kernel/types.d.ts +1 -1
- package/dist/lsp/client.js +16 -7
- package/dist/lsp/client.js.map +1 -1
- package/dist/providers/deepseek.d.ts +2 -2
- package/dist/providers/deepseek.js +21 -21
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/health.d.ts +4 -1
- package/dist/providers/health.js +24 -9
- package/dist/providers/health.js.map +1 -1
- package/dist/providers/http.d.ts +2 -0
- package/dist/providers/http.js +52 -24
- package/dist/providers/http.js.map +1 -1
- package/dist/providers/openai-compat.js +30 -27
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.d.ts +2 -2
- package/dist/providers/openrouter.js +25 -16
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/approval-bus.js +1 -1
- package/dist/safety/approval-bus.js.map +1 -1
- package/dist/safety/policy.d.ts +3 -3
- package/dist/safety/policy.js +60 -47
- package/dist/safety/policy.js.map +1 -1
- package/dist/safety/sandbox/noop.d.ts +2 -2
- package/dist/safety/sandbox/noop.js +23 -15
- package/dist/safety/sandbox/noop.js.map +1 -1
- package/dist/safety/sandbox/seatbelt.d.ts +1 -1
- package/dist/safety/sandbox/seatbelt.js +16 -9
- package/dist/safety/sandbox/seatbelt.js.map +1 -1
- package/dist/state/db.d.ts +29 -0
- package/dist/state/db.js +138 -0
- package/dist/state/db.js.map +1 -0
- package/dist/state/index.d.ts +23 -0
- package/dist/state/index.js +119 -0
- package/dist/state/index.js.map +1 -0
- package/dist/subagents/delegator.d.ts +8 -0
- package/dist/subagents/delegator.js +22 -5
- package/dist/subagents/delegator.js.map +1 -1
- package/dist/telemetry/crash-report.js +111 -79
- package/dist/telemetry/crash-report.js.map +1 -1
- package/dist/tools/browser.d.ts +1 -1
- package/dist/tools/browser.js +62 -45
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.js +3 -0
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.d.ts +1 -1
- package/dist/tools/cron.js +61 -41
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/exec.js +36 -1
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.js +4 -1
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +4 -1
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.js +4 -1
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.js +4 -1
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.d.ts +1 -1
- package/dist/tools/git.js +45 -25
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +5 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/lsp-definition.js +10 -1
- package/dist/tools/lsp-definition.js.map +1 -1
- package/dist/tools/lsp-hover.js +10 -1
- package/dist/tools/lsp-hover.js.map +1 -1
- package/dist/tools/lsp-references.js +10 -1
- package/dist/tools/lsp-references.js.map +1 -1
- package/dist/tools/lsp-symbols.js +10 -1
- package/dist/tools/lsp-symbols.js.map +1 -1
- package/dist/tools/multimodal.d.ts +2 -2
- package/dist/tools/multimodal.js +141 -90
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/qmd.d.ts +15 -0
- package/dist/tools/qmd.js +107 -0
- package/dist/tools/qmd.js.map +1 -0
- package/dist/tools/registry.d.ts +5 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.d.ts +12 -0
- package/dist/tools/rtk.js +113 -0
- package/dist/tools/rtk.js.map +1 -0
- package/dist/tools/search-grep.js +1 -0
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.js +25 -16
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/approval.d.ts +1 -1
- package/dist/tui/approval.js +38 -14
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.js +85 -71
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +9 -22
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +2 -0
- package/dist/tui/ink/components/InputBox.js +9 -14
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +18 -0
- package/dist/tui/ink/components/SpinnerGlyph.js +28 -0
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -0
- package/dist/tui/ink/components/StatusBar.js +4 -22
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.js +3 -3
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +6 -26
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/ToolGroup.js +4 -14
- package/dist/tui/ink/components/ToolGroup.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.js +4 -1
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/spinner-context.d.ts +5 -0
- package/dist/tui/ink/spinner-context.js +7 -0
- package/dist/tui/ink/spinner-context.js.map +1 -0
- package/dist/tui/ink/use-event-projection.js +142 -37
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/renderer.js +9 -1
- package/dist/tui/renderer.js.map +1 -1
- package/dist/web/ledger.d.ts +1 -1
- package/dist/web/ledger.js +44 -20
- package/dist/web/ledger.js.map +1 -1
- package/dist/web/server.js +4 -3
- package/dist/web/server.js.map +1 -1
- package/package.json +21 -12
- package/vendor/qmd/VERSION +3 -0
- package/vendor/rtk/CHECKSUMS.txt +6 -0
- package/vendor/rtk/VERSION +3 -0
- package/vendor/rtk/linux-x64/rtk +0 -0
package/dist/providers/health.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
const WINDOW_MS = 5 * 60 * 1000; // 5 min sliding window
|
|
2
|
-
// const HALF_LIFE_MS = 5 * 60 * 1000; // 5 min decay half-life
|
|
3
2
|
const windows = new Map();
|
|
4
3
|
const rateLimitHits = new Map();
|
|
5
4
|
const costFactors = {
|
|
@@ -21,10 +20,24 @@ const costFactors = {
|
|
|
21
20
|
xai: 1.0,
|
|
22
21
|
zai: 0.9,
|
|
23
22
|
};
|
|
23
|
+
// Periodic compaction to prevent unbounded map growth in daemon
|
|
24
|
+
// mode. unref() ensures the timer doesn't keep the process alive.
|
|
25
|
+
setInterval(() => {
|
|
26
|
+
const cutoff = Date.now() - WINDOW_MS;
|
|
27
|
+
for (const [provider, w] of windows) {
|
|
28
|
+
const pruned = w.filter((e) => e.time > cutoff);
|
|
29
|
+
if (pruned.length === 0) {
|
|
30
|
+
windows.delete(provider);
|
|
31
|
+
rateLimitHits.delete(provider);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
windows.set(provider, pruned);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}, 60_000).unref();
|
|
24
38
|
export function recordRequest(provider, ok, latMs) {
|
|
25
39
|
const w = windows.get(provider) ?? [];
|
|
26
40
|
w.push({ time: Date.now(), ok, latMs });
|
|
27
|
-
// Trim old entries
|
|
28
41
|
const cutoff = Date.now() - WINDOW_MS;
|
|
29
42
|
windows.set(provider, w.filter((e) => e.time > cutoff));
|
|
30
43
|
}
|
|
@@ -33,26 +46,28 @@ export function recordRateLimit(provider) {
|
|
|
33
46
|
}
|
|
34
47
|
export function healthScore(provider) {
|
|
35
48
|
const w = windows.get(provider) ?? [];
|
|
36
|
-
// Error dimension: 1.0 = no errors
|
|
37
49
|
const total = w.length || 1;
|
|
38
50
|
const errors = w.filter((e) => !e.ok).length;
|
|
39
51
|
const errorScore = 1.0 - errors / total;
|
|
40
|
-
|
|
41
|
-
|
|
52
|
+
const latencies = w
|
|
53
|
+
.filter((e) => e.ok && Number.isFinite(e.latMs))
|
|
54
|
+
.map((e) => e.latMs);
|
|
42
55
|
const avgLat = latencies.length > 0
|
|
43
56
|
? latencies.reduce((a, b) => a + b, 0) / latencies.length
|
|
44
|
-
:
|
|
57
|
+
: errors > 0
|
|
58
|
+
? 5000
|
|
59
|
+
: 1000;
|
|
45
60
|
const latScore = Math.max(0, 1.0 - avgLat / 5000);
|
|
46
|
-
// Rate limit dimension: decays over time
|
|
47
61
|
const rlHits = rateLimitHits.get(provider) ?? 0;
|
|
48
62
|
const decayFactor = Math.pow(0.5, rlHits);
|
|
49
63
|
const rlScore = decayFactor;
|
|
50
|
-
// Cost dimension: lower cost = higher score
|
|
51
64
|
const cost = costFactors[provider] ?? 1.0;
|
|
52
|
-
const costScore = 1.0 - cost / 2.0;
|
|
65
|
+
const costScore = Math.max(0, 1.0 - cost / 2.0);
|
|
53
66
|
return errorScore * 0.35 + latScore * 0.25 + rlScore * 0.2 + costScore * 0.2;
|
|
54
67
|
}
|
|
55
68
|
export function bestProvider(providers) {
|
|
69
|
+
if (providers.length === 0)
|
|
70
|
+
throw new Error("bestProvider requires at least one provider");
|
|
56
71
|
let best = providers[0];
|
|
57
72
|
let bestScore = healthScore(best);
|
|
58
73
|
for (let i = 1; i < providers.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/providers/health.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/providers/health.ts"],"names":[],"mappings":"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"}
|
package/dist/providers/http.d.ts
CHANGED
|
@@ -22,6 +22,8 @@ export interface SseRequest {
|
|
|
22
22
|
body: unknown;
|
|
23
23
|
extraHeaders?: Record<string, string>;
|
|
24
24
|
timeoutMs?: number;
|
|
25
|
+
/** Abort if no bytes received in this many ms (0 = disabled). Default 30s. */
|
|
26
|
+
stallTimeoutMs?: number;
|
|
25
27
|
signal?: AbortSignal;
|
|
26
28
|
providerName: string;
|
|
27
29
|
}
|
package/dist/providers/http.js
CHANGED
|
@@ -16,19 +16,20 @@
|
|
|
16
16
|
* sets Accept or Content-Type directly; extraHeaders is for custom
|
|
17
17
|
* provider-specific keys (e.g., organisation id) only.
|
|
18
18
|
*/
|
|
19
|
-
import { ProviderError } from
|
|
19
|
+
import { ProviderError } from "./iface.js";
|
|
20
20
|
const DEFAULT_TIMEOUT_MS = 60_000;
|
|
21
|
+
const DEFAULT_STALL_TIMEOUT_MS = 30_000;
|
|
21
22
|
function buildSseHeaders(apiKey, hasBody, extra) {
|
|
22
23
|
const headers = {
|
|
23
24
|
Authorization: `Bearer ${apiKey}`,
|
|
24
|
-
Accept:
|
|
25
|
+
Accept: "text/event-stream",
|
|
25
26
|
};
|
|
26
27
|
if (hasBody)
|
|
27
|
-
headers[
|
|
28
|
+
headers["Content-Type"] = "application/json";
|
|
28
29
|
if (extra) {
|
|
29
30
|
for (const [k, v] of Object.entries(extra)) {
|
|
30
31
|
const lower = k.toLowerCase();
|
|
31
|
-
if (lower ===
|
|
32
|
+
if (lower === "accept" || lower === "content-type")
|
|
32
33
|
continue;
|
|
33
34
|
headers[k] = v;
|
|
34
35
|
}
|
|
@@ -38,14 +39,14 @@ function buildSseHeaders(apiKey, hasBody, extra) {
|
|
|
38
39
|
function buildJsonHeaders(apiKey, hasBody, extra) {
|
|
39
40
|
const headers = {
|
|
40
41
|
Authorization: `Bearer ${apiKey}`,
|
|
41
|
-
Accept:
|
|
42
|
+
Accept: "application/json",
|
|
42
43
|
};
|
|
43
44
|
if (hasBody)
|
|
44
|
-
headers[
|
|
45
|
+
headers["Content-Type"] = "application/json";
|
|
45
46
|
if (extra) {
|
|
46
47
|
for (const [k, v] of Object.entries(extra)) {
|
|
47
48
|
const lower = k.toLowerCase();
|
|
48
|
-
if (lower ===
|
|
49
|
+
if (lower === "accept" || lower === "content-type")
|
|
49
50
|
continue;
|
|
50
51
|
headers[k] = v;
|
|
51
52
|
}
|
|
@@ -60,14 +61,14 @@ function linkedSignal(timeoutMs, external) {
|
|
|
60
61
|
if (external.aborted)
|
|
61
62
|
controller.abort(external.reason);
|
|
62
63
|
else
|
|
63
|
-
external.addEventListener(
|
|
64
|
+
external.addEventListener("abort", onExternal, { once: true });
|
|
64
65
|
}
|
|
65
66
|
return {
|
|
66
67
|
signal: controller.signal,
|
|
67
68
|
cancel: () => {
|
|
68
69
|
clearTimeout(timer);
|
|
69
70
|
if (external)
|
|
70
|
-
external.removeEventListener(
|
|
71
|
+
external.removeEventListener("abort", onExternal);
|
|
71
72
|
},
|
|
72
73
|
};
|
|
73
74
|
}
|
|
@@ -83,7 +84,7 @@ export async function* streamSSE(req) {
|
|
|
83
84
|
let response;
|
|
84
85
|
try {
|
|
85
86
|
response = await fetch(req.url, {
|
|
86
|
-
method:
|
|
87
|
+
method: "POST",
|
|
87
88
|
headers,
|
|
88
89
|
body: hasBody ? JSON.stringify(req.body) : undefined,
|
|
89
90
|
signal,
|
|
@@ -91,7 +92,11 @@ export async function* streamSSE(req) {
|
|
|
91
92
|
}
|
|
92
93
|
catch (err) {
|
|
93
94
|
cancel();
|
|
94
|
-
|
|
95
|
+
const msg = err?.message ?? String(err);
|
|
96
|
+
const hint = /fetch failed|ENOTFOUND|ECONNREFUSED/i.test(msg)
|
|
97
|
+
? ` — check your internet connection (target: ${req.url})`
|
|
98
|
+
: '';
|
|
99
|
+
throw new ProviderError(`Network error: ${msg}${hint}`, req.providerName, undefined, true);
|
|
95
100
|
}
|
|
96
101
|
if (!response.ok) {
|
|
97
102
|
const text = await safeReadText(response);
|
|
@@ -100,27 +105,44 @@ export async function* streamSSE(req) {
|
|
|
100
105
|
}
|
|
101
106
|
if (!response.body) {
|
|
102
107
|
cancel();
|
|
103
|
-
throw new ProviderError(
|
|
108
|
+
throw new ProviderError("Empty response body", req.providerName);
|
|
104
109
|
}
|
|
105
110
|
const reader = response.body.getReader();
|
|
106
|
-
const decoder = new TextDecoder(
|
|
107
|
-
let buffer =
|
|
111
|
+
const decoder = new TextDecoder("utf-8");
|
|
112
|
+
let buffer = "";
|
|
113
|
+
const stallMs = req.stallTimeoutMs ?? DEFAULT_STALL_TIMEOUT_MS;
|
|
114
|
+
let stallTimer;
|
|
108
115
|
try {
|
|
109
116
|
for (;;) {
|
|
110
|
-
|
|
117
|
+
stallTimer = undefined;
|
|
118
|
+
let result;
|
|
119
|
+
if (stallMs > 0) {
|
|
120
|
+
result = await Promise.race([
|
|
121
|
+
reader.read(),
|
|
122
|
+
new Promise((_, reject) => {
|
|
123
|
+
stallTimer = setTimeout(() => reject(new Error(`Stream stalled: no bytes received in ${stallMs}ms`)), stallMs);
|
|
124
|
+
}),
|
|
125
|
+
]);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
result = await reader.read();
|
|
129
|
+
}
|
|
130
|
+
if (stallTimer !== undefined)
|
|
131
|
+
clearTimeout(stallTimer);
|
|
132
|
+
const { value, done } = result;
|
|
111
133
|
if (done)
|
|
112
134
|
break;
|
|
113
135
|
buffer += decoder.decode(value, { stream: true });
|
|
114
136
|
let newlineIndex;
|
|
115
|
-
while ((newlineIndex = buffer.indexOf(
|
|
137
|
+
while ((newlineIndex = buffer.indexOf("\n")) >= 0) {
|
|
116
138
|
const rawLine = buffer.slice(0, newlineIndex);
|
|
117
139
|
buffer = buffer.slice(newlineIndex + 1);
|
|
118
|
-
const line = rawLine.endsWith(
|
|
140
|
+
const line = rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine;
|
|
119
141
|
if (line.length === 0)
|
|
120
142
|
continue;
|
|
121
|
-
if (line.startsWith(
|
|
143
|
+
if (line.startsWith(":"))
|
|
122
144
|
continue;
|
|
123
|
-
if (!line.startsWith(
|
|
145
|
+
if (!line.startsWith("data:"))
|
|
124
146
|
continue;
|
|
125
147
|
const payload = line.slice(5).trim();
|
|
126
148
|
if (payload.length === 0)
|
|
@@ -129,7 +151,7 @@ export async function* streamSSE(req) {
|
|
|
129
151
|
}
|
|
130
152
|
}
|
|
131
153
|
const tail = buffer.trim();
|
|
132
|
-
if (tail.startsWith(
|
|
154
|
+
if (tail.startsWith("data:")) {
|
|
133
155
|
const payload = tail.slice(5).trim();
|
|
134
156
|
if (payload.length > 0)
|
|
135
157
|
yield payload;
|
|
@@ -140,7 +162,9 @@ export async function* streamSSE(req) {
|
|
|
140
162
|
try {
|
|
141
163
|
reader.releaseLock();
|
|
142
164
|
}
|
|
143
|
-
catch {
|
|
165
|
+
catch {
|
|
166
|
+
/* noop */
|
|
167
|
+
}
|
|
144
168
|
}
|
|
145
169
|
}
|
|
146
170
|
/**
|
|
@@ -155,7 +179,7 @@ export async function postJSON(req) {
|
|
|
155
179
|
let response;
|
|
156
180
|
try {
|
|
157
181
|
response = await fetch(req.url, {
|
|
158
|
-
method:
|
|
182
|
+
method: "POST",
|
|
159
183
|
headers,
|
|
160
184
|
body: hasBody ? JSON.stringify(req.body) : undefined,
|
|
161
185
|
signal,
|
|
@@ -163,7 +187,11 @@ export async function postJSON(req) {
|
|
|
163
187
|
}
|
|
164
188
|
catch (err) {
|
|
165
189
|
cancel();
|
|
166
|
-
|
|
190
|
+
const msg = err?.message ?? String(err);
|
|
191
|
+
const hint = /fetch failed|ENOTFOUND|ECONNREFUSED/i.test(msg)
|
|
192
|
+
? ` — check your internet connection (target: ${req.url})`
|
|
193
|
+
: '';
|
|
194
|
+
throw new ProviderError(`Network error: ${msg}${hint}`, req.providerName, undefined, true);
|
|
167
195
|
}
|
|
168
196
|
if (!response.ok) {
|
|
169
197
|
const text = await safeReadText(response);
|
|
@@ -179,7 +207,7 @@ async function safeReadText(response) {
|
|
|
179
207
|
return await response.text();
|
|
180
208
|
}
|
|
181
209
|
catch {
|
|
182
|
-
return
|
|
210
|
+
return "<body unreadable>";
|
|
183
211
|
}
|
|
184
212
|
}
|
|
185
213
|
function isRetryableStatus(status) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/providers/http.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/providers/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,30 +30,34 @@ export async function* streamChatCompletions(opts) {
|
|
|
30
30
|
if (opts.extraBody)
|
|
31
31
|
Object.assign(body, opts.extraBody);
|
|
32
32
|
const state = new StreamState(opts.includeThinking ?? false);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
33
|
+
try {
|
|
34
|
+
for await (const payload of streamSSE({
|
|
35
|
+
providerName: opts.providerName,
|
|
36
|
+
url: opts.endpoint,
|
|
37
|
+
apiKey: opts.apiKey,
|
|
38
|
+
body,
|
|
39
|
+
extraHeaders: opts.extraHeaders,
|
|
40
|
+
signal: opts.signal,
|
|
41
|
+
timeoutMs: opts.timeoutMs,
|
|
42
|
+
})) {
|
|
43
|
+
if (payload === "[DONE]")
|
|
44
|
+
break;
|
|
45
|
+
let chunk;
|
|
46
|
+
try {
|
|
47
|
+
chunk = JSON.parse(payload);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
const repaired = repairJSON(payload);
|
|
51
|
+
if (!repaired || !repaired.choices)
|
|
52
|
+
continue;
|
|
53
|
+
chunk = repaired;
|
|
54
|
+
}
|
|
55
|
+
yield* state.ingest(chunk);
|
|
53
56
|
}
|
|
54
|
-
yield* state.ingest(chunk);
|
|
55
57
|
}
|
|
56
|
-
|
|
58
|
+
finally {
|
|
59
|
+
yield* state.finalise();
|
|
60
|
+
}
|
|
57
61
|
}
|
|
58
62
|
function toOpenAIMessages(messages) {
|
|
59
63
|
const out = [];
|
|
@@ -143,7 +147,6 @@ class StreamState {
|
|
|
143
147
|
// chunks. Once we see the open tag, accumulate until the close tag
|
|
144
148
|
// arrives. Anything before/after is text.
|
|
145
149
|
inThinkBlock = false;
|
|
146
|
-
thinkBuffer = "";
|
|
147
150
|
static THINK_OPEN_RE = /<(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
148
151
|
static THINK_CLOSE_RE = /<\/(?:think|thinking|reasoning|thought|REASONING_SCRATCHPAD)>/i;
|
|
149
152
|
/** Split a content delta into text + thinking pieces, honoring open <think> blocks across chunks. */
|
|
@@ -156,12 +159,10 @@ class StreamState {
|
|
|
156
159
|
const close = s.match(StreamState.THINK_CLOSE_RE);
|
|
157
160
|
if (!close || close.index === undefined) {
|
|
158
161
|
thinking += s;
|
|
159
|
-
this.thinkBuffer += s;
|
|
160
162
|
s = "";
|
|
161
163
|
break;
|
|
162
164
|
}
|
|
163
165
|
thinking += s.slice(0, close.index);
|
|
164
|
-
this.thinkBuffer = "";
|
|
165
166
|
this.inThinkBlock = false;
|
|
166
167
|
s = s.slice(close.index + close[0].length);
|
|
167
168
|
}
|
|
@@ -239,8 +240,10 @@ class StreamState {
|
|
|
239
240
|
id = tc.id;
|
|
240
241
|
this.toolIndexToId.set(index, id);
|
|
241
242
|
}
|
|
242
|
-
if (!id)
|
|
243
|
-
|
|
243
|
+
if (!id) {
|
|
244
|
+
id = `tc-${index}-${Date.now().toString(36)}`;
|
|
245
|
+
this.toolIndexToId.set(index, id);
|
|
246
|
+
}
|
|
244
247
|
let entry = this.toolOpen.get(id);
|
|
245
248
|
if (!entry) {
|
|
246
249
|
const name = tc.function?.name ?? "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compat.js","sourceRoot":"","sources":["../../src/providers/openai-compat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAoBrD,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAC1C,IAA6B;IAE7B,MAAM,IAAI,GAA4B;QACpC,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;QACzC,MAAM,EAAE,IAAI;QACZ,cAAc,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;KACxC,CAAC;IACF,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS;QAAE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACxE,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;QAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;IACnE,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtE,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM;YAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC;IACvC,CAAC;IACD,IAAI,IAAI,CAAC,SAAS;QAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAExD,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC,CAAC;IAE7D,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,SAAS,CAAC;YACpC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,QAAQ;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI;YACJ,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,EAAE,CAAC;YACH,IAAI,OAAO,KAAK,QAAQ;gBAAE,MAAM;YAChC,IAAI,KAA0B,CAAC;YAC/B,IAAI,CAAC;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAwB,CAAC;YACrD,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAwB,CAAC;gBAC5D,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO;oBAAE,SAAS;gBAC7C,KAAK,GAAG,QAAQ,CAAC;YACnB,CAAC;YACD,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;YAAS,CAAC;QACT,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAmB;IAC3C,MAAM,GAAG,GAAoB,EAAE,CAAC;IAChC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM;YAAE,SAAS;QAClC,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACpC,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;gBACvD,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;QAC1B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAa,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,MAAM,SAAS,GAA8B,EAAE,CAAC;YAChD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBACtB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM;oBAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;qBACrC,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU;oBAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;qBAClD,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC/B,SAAS,CAAC,IAAI,CAAC;wBACb,EAAE,EAAE,CAAC,CAAC,EAAE;wBACR,IAAI,EAAE,UAAU;wBAChB,QAAQ,EAAE;4BACR,IAAI,EAAE,CAAC,CAAC,IAAI;4BACZ,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;yBACzC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,MAAM,YAAY,GAAkB;gBAClC,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;gBACjD,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1D,qEAAqE;gBACrE,qEAAqE;gBACrE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;oBACtB,CAAC,CAAC,EAAE,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBAC3C,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;YACF,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACvB,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAkB,KAAK,CAAC,MAAM,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAChC,CAAC;QACF,MAAM,KAAK,GAAa,KAAK;aAC1B,MAAM,CACL,CAAC,CAAC,EAA+C,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CACtE;aACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;gBAC/C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;aACxB,CAAC,CAAC;QACL,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa;gBAAE,SAAS;YACvC,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,MAAM;gBACZ,YAAY,EAAE,CAAC,CAAC,SAAS;gBACzB,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CACpB,KAAuB,EACvB,QAAmC;IAEnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvB,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE;YACR,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW;YAC/D,UAAU,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SAChE;KACF,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,WAAW;IA8CK;IA7CZ,QAAQ,GAAG,KAAK,CAAC;IACjB,YAAY,GAAG,KAAK,CAAC;IACrB,QAAQ,GAAG,IAAI,GAAG,EAAkD,CAAC;IACrE,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC1C,YAAY,GAAG,KAAK,CAAC;IAC7B,gEAAgE;IAChE,mEAAmE;IACnE,0CAA0C;IAClC,YAAY,GAAG,KAAK,CAAC;IACrB,MAAM,CAAU,aAAa,GACnC,8DAA8D,CAAC;IACzD,MAAM,CAAU,cAAc,GACpC,gEAAgE,CAAC;IAEnE,qGAAqG;IAC7F,YAAY,CAAC,KAAa;QAChC,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,KAAK,CAAC;QACd,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;gBAClD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxC,QAAQ,IAAI,CAAC,CAAC;oBACd,CAAC,GAAG,EAAE,CAAC;oBACP,MAAM;gBACR,CAAC;gBACD,QAAQ,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC1B,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;gBAChD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACtC,IAAI,IAAI,CAAC,CAAC;oBACV,CAAC,GAAG,EAAE,CAAC;oBACP,MAAM;gBACR,CAAC;gBACD,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,YAAoB,eAAwB;QAAxB,oBAAe,GAAf,eAAe,CAAS;IAAG,CAAC;IAEhD,CAAC,MAAM,CAAC,KAA0B;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,KAAK,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAClC,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;QAEjC,qEAAqE;QACrE,iEAAiE;QACjE,qEAAqE;QACrE,mEAAmE;QACnE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,KAA2D,CAAC;YACtE,MAAM,CAAC,GACL,CAAC,OAAO,CAAC,CAAC,iBAAiB,KAAK,QAAQ,IAAI,CAAC,CAAC,iBAAiB,CAAC;gBAChE,CAAC,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,CAAC,SAAS,CAAC;gBAChD,EAAE,CAAC;YACL,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACvB,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;oBACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBAC3B,CAAC;gBACD,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClE,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;oBAC/B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;gBAC5B,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;oBAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACvB,CAAC;gBACD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;YACnD,CAAC;YACD,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAClB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACxB,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBACvB,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;oBACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBAC3B,CAAC;gBACD,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC;gBAC5B,IAAI,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACpC,CAAC;gBACD,IAAI,CAAC,EAAE,EAAE,CAAC;oBACR,EAAE,GAAG,MAAM,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACpC,CAAC;gBACD,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAClC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;oBACrC,KAAK,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;oBAC7B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAClB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;wBAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;oBACxB,CAAC;oBACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;wBACtB,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;wBAC/B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;oBAC5B,CAAC;oBACD,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;gBAC7C,CAAC;qBAAM,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;oBAC5C,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAChC,CAAC;gBACD,MAAM,SAAS,GAAG,EAAE,CAAC,QAAQ,EAAE,SAAS,IAAI,EAAE,CAAC;gBAC/C,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzB,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC;oBAChC,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;gBAC7D,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1B,CAAC;QACD,KAAK,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,CAAC,QAAQ;QACP,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEO,CAAC,SAAS;QAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACjD,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAEO,CAAC,cAAc,CAAC,KAA0B;QAChD,IAAI,IAAI,CAAC,YAAY;YAAE,OAAO;QAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,MAAM;YACJ,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,KAAK,CAAC,aAAa,IAAI,CAAC;YACrC,YAAY,EAAE,KAAK,CAAC,iBAAiB,IAAI,CAAC;YAC1C,YAAY,EAAE,KAAK,CAAC,qBAAqB,EAAE,aAAa,IAAI,CAAC;SAC9D,CAAC;IACJ,CAAC;;AAGH,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAiDD,KAAK,aAAa,CAAC"}
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
* surfaces (HTTP-Referer, X-Title).
|
|
6
6
|
* - Supports free-tier models via the ":free" suffix.
|
|
7
7
|
*/
|
|
8
|
-
import type { AgentEvent } from
|
|
9
|
-
import type { Provider, StreamRequest, ProviderConfig } from
|
|
8
|
+
import type { AgentEvent } from "../kernel/types.js";
|
|
9
|
+
import type { Provider, StreamRequest, ProviderConfig } from "./iface.js";
|
|
10
10
|
export declare class OpenRouterProvider implements Provider {
|
|
11
11
|
readonly id = "openrouter";
|
|
12
12
|
private readonly apiKey;
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
* surfaces (HTTP-Referer, X-Title).
|
|
6
6
|
* - Supports free-tier models via the ":free" suffix.
|
|
7
7
|
*/
|
|
8
|
-
import { ProviderError } from
|
|
9
|
-
import { streamChatCompletions } from
|
|
10
|
-
const DEFAULT_BASE =
|
|
8
|
+
import { ProviderError } from "./iface.js";
|
|
9
|
+
import { streamChatCompletions } from "./openai-compat.js";
|
|
10
|
+
const DEFAULT_BASE = "https://openrouter.ai/api/v1";
|
|
11
11
|
const TOOL_SUPPORT = [
|
|
12
12
|
/^inclusionai\/ling/,
|
|
13
13
|
/^anthropic\//,
|
|
@@ -22,36 +22,45 @@ const TOOL_SUPPORT = [
|
|
|
22
22
|
/^z-ai\//,
|
|
23
23
|
/^tencent\//,
|
|
24
24
|
];
|
|
25
|
-
|
|
25
|
+
// tencent/hy3-preview:free emits chain-of-thought as plain delta.content
|
|
26
|
+
// prose with no XML tags — it must be handled as a thinking model so the
|
|
27
|
+
// content is routed to thinking_delta rather than surfacing as visible text.
|
|
28
|
+
const THINKING_PATTERNS = [
|
|
29
|
+
/^deepseek-ai\//,
|
|
30
|
+
/^anthropic\/claude-opus/,
|
|
31
|
+
/^openai\/o[1-9]/,
|
|
32
|
+
/^tencent\/hy3/,
|
|
33
|
+
];
|
|
26
34
|
export class OpenRouterProvider {
|
|
27
|
-
id =
|
|
35
|
+
id = "openrouter";
|
|
28
36
|
apiKey;
|
|
29
37
|
baseUrl;
|
|
30
38
|
timeoutMs;
|
|
31
39
|
appName;
|
|
32
40
|
appUrl;
|
|
33
41
|
constructor(config) {
|
|
34
|
-
this.apiKey = config.apiKey ?? process.env.OPENROUTER_API_KEY ??
|
|
42
|
+
this.apiKey = config.apiKey ?? process.env.OPENROUTER_API_KEY ?? "";
|
|
35
43
|
if (!this.apiKey)
|
|
36
|
-
throw new ProviderError(
|
|
37
|
-
this.baseUrl = (config.baseUrl ?? DEFAULT_BASE).replace(/\/+$/,
|
|
44
|
+
throw new ProviderError("OPENROUTER_API_KEY is required", this.id);
|
|
45
|
+
this.baseUrl = (config.baseUrl ?? DEFAULT_BASE).replace(/\/+$/, "");
|
|
38
46
|
// OR's free-tier models (hy3, ling, etc.) can take 30–60 s for the
|
|
39
47
|
// first byte on long prompts; multi-turn coding sprints need more
|
|
40
48
|
// headroom. 300 s leaves the timer well above legitimate latency
|
|
41
49
|
// without making a genuine hang invisible.
|
|
42
50
|
this.timeoutMs = config.timeoutMs ?? 300_000;
|
|
43
|
-
this.appName = config.appName ??
|
|
44
|
-
this.appUrl = config.appUrl ??
|
|
51
|
+
this.appName = config.appName ?? "dirgha-cli";
|
|
52
|
+
this.appUrl = config.appUrl ?? "https://dirgha.ai";
|
|
45
53
|
}
|
|
46
54
|
supportsTools(modelId) {
|
|
47
|
-
const base = modelId.replace(/:free$/,
|
|
48
|
-
return TOOL_SUPPORT.some(rx => rx.test(base));
|
|
55
|
+
const base = modelId.replace(/:free$/, "").replace(/^openrouter\//, "");
|
|
56
|
+
return TOOL_SUPPORT.some((rx) => rx.test(base));
|
|
49
57
|
}
|
|
50
58
|
supportsThinking(modelId) {
|
|
51
|
-
|
|
59
|
+
const base = modelId.replace(/:free$/, "").replace(/^openrouter\//, "");
|
|
60
|
+
return THINKING_PATTERNS.some((rx) => rx.test(base));
|
|
52
61
|
}
|
|
53
62
|
stream(req) {
|
|
54
|
-
const model = req.model.replace(/^openrouter\//,
|
|
63
|
+
const model = req.model.replace(/^openrouter\//, "");
|
|
55
64
|
return streamChatCompletions({
|
|
56
65
|
providerName: this.id,
|
|
57
66
|
endpoint: `${this.baseUrl}/chat/completions`,
|
|
@@ -65,8 +74,8 @@ export class OpenRouterProvider {
|
|
|
65
74
|
timeoutMs: this.timeoutMs,
|
|
66
75
|
includeThinking: this.supportsThinking(req.model),
|
|
67
76
|
extraHeaders: {
|
|
68
|
-
|
|
69
|
-
|
|
77
|
+
"HTTP-Referer": this.appUrl,
|
|
78
|
+
"X-Title": this.appName,
|
|
70
79
|
},
|
|
71
80
|
});
|
|
72
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../src/providers/openrouter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,YAAY,GAAG,8BAA8B,CAAC;AAEpD,MAAM,YAAY,GAAG;IACnB,oBAAoB;IACpB,cAAc;IACd,WAAW;IACX,iBAAiB;IACjB,cAAc;IACd,eAAe;IACf,SAAS;IACT,aAAa;IACb,eAAe;IACf,eAAe,
|
|
1
|
+
{"version":3,"file":"openrouter.js","sourceRoot":"","sources":["../../src/providers/openrouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export function createApprovalBus(options = {}) {
|
|
|
22
22
|
if (deny.has(req.tool))
|
|
23
23
|
return 'deny_always';
|
|
24
24
|
if (approve.has(req.tool))
|
|
25
|
-
return '
|
|
25
|
+
return 'approve';
|
|
26
26
|
for (const sub of subscribers) {
|
|
27
27
|
const response = await sub(req);
|
|
28
28
|
if (response !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-bus.js","sourceRoot":"","sources":["../../src/safety/approval-bus.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAuBH,MAAM,UAAU,iBAAiB,CAAC,UAAwC,EAAE;IAC1E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAI,gBAAgB,GAAG,CAAC,QAAgB,EAAE,MAAe,EAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAErH,MAAM,GAAG,GAA4B;QACnC,gBAAgB,CAAC,QAAQ,EAAE,MAAM;YAC/B,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,OAAO,IAAI,CAAC;YACpC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,OAAO,KAAK,CAAC;YACxC,OAAO,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,GAAG;YACf,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,aAAa,CAAC;YAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"approval-bus.js","sourceRoot":"","sources":["../../src/safety/approval-bus.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAuBH,MAAM,UAAU,iBAAiB,CAAC,UAAwC,EAAE;IAC1E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAI,gBAAgB,GAAG,CAAC,QAAgB,EAAE,MAAe,EAAW,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAErH,MAAM,GAAG,GAA4B;QACnC,gBAAgB,CAAC,QAAQ,EAAE,MAAM;YAC/B,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,OAAO,IAAI,CAAC;YACpC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,OAAO,KAAK,CAAC;YACxC,OAAO,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,GAAG;YACf,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,aAAa,CAAC;YAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,SAAS,CAAC;YAC5C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC9B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC;gBAChC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,IAAI,QAAQ,KAAK,aAAa;wBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACnD,IAAI,QAAQ,KAAK,cAAc;wBAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACvD,OAAO,QAAQ,CAAC;gBAClB,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,SAAS,CAAC,UAAU;YAClB,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC5B,OAAO,GAAG,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,4BAA4B,CAAC,EAAE,IAAI,gBAAgB,GAAG,EAAE,CAAC,CAAC,CAAC;QAC3D,eAAe,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3E,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KAC3E,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/safety/policy.d.ts
CHANGED
|
@@ -4,15 +4,15 @@
|
|
|
4
4
|
* default ruleset ships in-code; user and project rules are merged at
|
|
5
5
|
* config load time.
|
|
6
6
|
*/
|
|
7
|
-
import type { PermissionCheck, PermissionDecision } from
|
|
7
|
+
import type { PermissionCheck, PermissionDecision } from "../tools/permission.js";
|
|
8
8
|
export interface PolicyRule {
|
|
9
9
|
id: string;
|
|
10
10
|
applies: {
|
|
11
11
|
tools?: string[];
|
|
12
|
-
actions?: PermissionCheck[
|
|
12
|
+
actions?: PermissionCheck["action"][];
|
|
13
13
|
};
|
|
14
14
|
when?: PolicyCondition;
|
|
15
|
-
effect:
|
|
15
|
+
effect: "allow" | "deny" | "require_approval";
|
|
16
16
|
reason: string;
|
|
17
17
|
}
|
|
18
18
|
export interface PolicyCondition {
|