@dirgha/code 1.17.1 → 1.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +130 -45
- package/README.md +34 -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 +77 -7
- 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/login.d.ts +2 -2
- package/dist/cli/slash/login.js +8 -8
- package/dist/cli/slash/login.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/subcommands/doctor.js +48 -0
- package/dist/cli/subcommands/doctor.js.map +1 -1
- 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/login.d.ts +1 -1
- package/dist/cli/subcommands/login.js +42 -34
- package/dist/cli/subcommands/login.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/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/integrations/device-auth.js +53 -42
- package/dist/integrations/device-auth.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 +42 -22
- 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 +28 -0
- package/dist/state/db.js +129 -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 +88 -69
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +2 -8
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +1 -1
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.js +2 -21
- 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 +3 -23
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/ToolGroup.js +2 -8
- 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 +3 -0
- package/dist/tui/ink/spinner-context.js +6 -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 +16 -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
|
@@ -4,17 +4,17 @@
|
|
|
4
4
|
* bootstrap() entry attempts to bring up the docker-compose file that
|
|
5
5
|
* ships in the user's `~/.dirgha/arniko/` directory.
|
|
6
6
|
*/
|
|
7
|
-
import { readFile, stat } from
|
|
8
|
-
import { resolve } from
|
|
9
|
-
import { spawn } from
|
|
10
|
-
import { jsonRequest, IntegrationError } from
|
|
7
|
+
import { readFile, stat } from "node:fs/promises";
|
|
8
|
+
import { resolve } from "node:path";
|
|
9
|
+
import { spawn } from "node:child_process";
|
|
10
|
+
import { jsonRequest, IntegrationError } from "./http.js";
|
|
11
11
|
export function createArnikoClient(opts = {}) {
|
|
12
|
-
const baseUrl = opts.baseUrl ?? process.env.DIRGHA_ARNIKO_URL ??
|
|
12
|
+
const baseUrl = opts.baseUrl ?? process.env.DIRGHA_ARNIKO_URL ?? "http://localhost:3010";
|
|
13
13
|
const timeoutMs = opts.timeoutMs ?? 60_000;
|
|
14
14
|
return {
|
|
15
15
|
async isAvailable() {
|
|
16
16
|
try {
|
|
17
|
-
await jsonRequest({ baseUrl, path:
|
|
17
|
+
await jsonRequest({ baseUrl, path: "/healthz", timeoutMs: 2000 });
|
|
18
18
|
return true;
|
|
19
19
|
}
|
|
20
20
|
catch {
|
|
@@ -24,11 +24,15 @@ export function createArnikoClient(opts = {}) {
|
|
|
24
24
|
async scanCode(code, taskId) {
|
|
25
25
|
return jsonRequest({
|
|
26
26
|
baseUrl,
|
|
27
|
-
path:
|
|
28
|
-
method:
|
|
27
|
+
path: "/api/arniko/scans",
|
|
28
|
+
method: "POST",
|
|
29
29
|
body: {
|
|
30
|
-
tools: [
|
|
31
|
-
target: {
|
|
30
|
+
tools: ["semgrep", "trufflehog"],
|
|
31
|
+
target: {
|
|
32
|
+
type: "code",
|
|
33
|
+
identifier: taskId ?? "inline",
|
|
34
|
+
metadata: { code },
|
|
35
|
+
},
|
|
32
36
|
},
|
|
33
37
|
timeoutMs,
|
|
34
38
|
});
|
|
@@ -40,37 +44,39 @@ export function createArnikoClient(opts = {}) {
|
|
|
40
44
|
throw new IntegrationError(`Path does not exist: ${path}`);
|
|
41
45
|
return jsonRequest({
|
|
42
46
|
baseUrl,
|
|
43
|
-
path:
|
|
44
|
-
method:
|
|
47
|
+
path: "/api/arniko/scans",
|
|
48
|
+
method: "POST",
|
|
45
49
|
body: {
|
|
46
|
-
tools: scanOpts.tools ?? [
|
|
47
|
-
target: { type:
|
|
50
|
+
tools: scanOpts.tools ?? ["semgrep", "trufflehog"],
|
|
51
|
+
target: { type: "path", identifier: abs, metadata: {} },
|
|
48
52
|
},
|
|
49
53
|
timeoutMs,
|
|
50
54
|
});
|
|
51
55
|
},
|
|
52
56
|
async scanDiff(diffPath, diffOpts = {}) {
|
|
53
|
-
const diff = await readFile(diffPath,
|
|
57
|
+
const diff = await readFile(diffPath, "utf8");
|
|
54
58
|
return jsonRequest({
|
|
55
59
|
baseUrl,
|
|
56
|
-
path:
|
|
57
|
-
method:
|
|
60
|
+
path: "/api/arniko/scans",
|
|
61
|
+
method: "POST",
|
|
58
62
|
body: {
|
|
59
|
-
tools: diffOpts.tools ?? [
|
|
60
|
-
target: { type:
|
|
63
|
+
tools: diffOpts.tools ?? ["semgrep", "trufflehog"],
|
|
64
|
+
target: { type: "diff", identifier: diffPath, metadata: { diff } },
|
|
61
65
|
},
|
|
62
66
|
timeoutMs,
|
|
63
67
|
});
|
|
64
68
|
},
|
|
65
69
|
async bootstrap(composePath) {
|
|
66
|
-
return new Promise(resolveBootstrap => {
|
|
67
|
-
const child = spawn(
|
|
70
|
+
return new Promise((resolveBootstrap) => {
|
|
71
|
+
const child = spawn("docker", ["compose", "-f", composePath, "up", "-d"], { stdio: "pipe" });
|
|
68
72
|
const errChunks = [];
|
|
69
|
-
child.stderr.on(
|
|
70
|
-
child.on(
|
|
71
|
-
child.on(
|
|
73
|
+
child.stderr.on("data", (b) => errChunks.push(b));
|
|
74
|
+
child.on("error", (err) => resolveBootstrap({ started: false, message: err.message }));
|
|
75
|
+
child.on("exit", (code) => resolveBootstrap({
|
|
72
76
|
started: code === 0,
|
|
73
|
-
message: code === 0
|
|
77
|
+
message: code === 0
|
|
78
|
+
? "docker compose up -d exited 0"
|
|
79
|
+
: Buffer.concat(errChunks).toString("utf8"),
|
|
74
80
|
}));
|
|
75
81
|
});
|
|
76
82
|
},
|
|
@@ -78,7 +84,7 @@ export function createArnikoClient(opts = {}) {
|
|
|
78
84
|
const counts = { critical: 0, high: 0, medium: 0, low: 0 };
|
|
79
85
|
for (const f of result.findings)
|
|
80
86
|
counts[f.severity]++;
|
|
81
|
-
const verdict = result.passed ?
|
|
87
|
+
const verdict = result.passed ? "PASS" : "FAIL";
|
|
82
88
|
return `security: ${verdict} · maturity=${result.maturityScore.toFixed(2)} · C=${counts.critical} H=${counts.high} M=${counts.medium} L=${counts.low}`;
|
|
83
89
|
},
|
|
84
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arniko-client.js","sourceRoot":"","sources":["../../src/integrations/arniko-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAyB1D,MAAM,UAAU,kBAAkB,CAAC,OAA4B,EAAE;IAC/D,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"arniko-client.js","sourceRoot":"","sources":["../../src/integrations/arniko-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,46 +12,49 @@
|
|
|
12
12
|
* - CLI subcommands (`dirgha login`, `dirgha logout`).
|
|
13
13
|
* - Billing preflight (`preRequestCheck` reads the bearer).
|
|
14
14
|
*/
|
|
15
|
-
import { chmod, mkdir, readFile, rename, stat, unlink, writeFile, open } from
|
|
16
|
-
import { homedir } from
|
|
17
|
-
import { dirname, join } from
|
|
18
|
-
const DEFAULT_API_BASE =
|
|
15
|
+
import { chmod, mkdir, readFile, rename, stat, unlink, writeFile, open, } from "node:fs/promises";
|
|
16
|
+
import { homedir } from "node:os";
|
|
17
|
+
import { dirname, join } from "node:path";
|
|
18
|
+
const DEFAULT_API_BASE = "https://api.dirgha.ai";
|
|
19
19
|
const POLL_INTERVAL_MS = 2_000;
|
|
20
20
|
const POLL_TIMEOUT_MS = 15 * 60 * 1_000;
|
|
21
21
|
const TOKEN_TTL_MS = 30 * 24 * 60 * 60 * 1_000;
|
|
22
22
|
function resolveApiBase(apiBase) {
|
|
23
23
|
const raw = apiBase ?? process.env.DIRGHA_API_BASE ?? DEFAULT_API_BASE;
|
|
24
|
-
return raw.replace(/\/+$/,
|
|
24
|
+
return raw.replace(/\/+$/, "");
|
|
25
25
|
}
|
|
26
26
|
function credentialsPath() {
|
|
27
|
-
return join(homedir(),
|
|
27
|
+
return join(homedir(), ".dirgha", "credentials.json");
|
|
28
28
|
}
|
|
29
29
|
function redact(err) {
|
|
30
30
|
const message = err instanceof Error ? err.message : String(err);
|
|
31
|
-
return message.replace(/Bearer\s+[\w.-]+/gi,
|
|
31
|
+
return message.replace(/Bearer\s+[\w.-]+/gi, "Bearer [REDACTED]");
|
|
32
32
|
}
|
|
33
33
|
export async function startDeviceAuth(apiBase) {
|
|
34
34
|
const base = resolveApiBase(apiBase);
|
|
35
35
|
let response;
|
|
36
36
|
try {
|
|
37
|
-
response = await fetch(`${base}/api/auth/device/
|
|
38
|
-
method:
|
|
39
|
-
headers: {
|
|
40
|
-
|
|
37
|
+
response = await fetch(`${base}/api/auth/device/request`, {
|
|
38
|
+
method: "POST",
|
|
39
|
+
headers: {
|
|
40
|
+
"Content-Type": "application/json",
|
|
41
|
+
Accept: "application/json",
|
|
42
|
+
},
|
|
43
|
+
body: JSON.stringify({ client_id: "dirgha-cli" }),
|
|
41
44
|
});
|
|
42
45
|
}
|
|
43
46
|
catch (err) {
|
|
44
|
-
throw new Error(`device/
|
|
47
|
+
throw new Error(`device/request request failed: ${redact(err)}`);
|
|
45
48
|
}
|
|
46
49
|
if (!response.ok) {
|
|
47
|
-
throw new Error(`device/
|
|
50
|
+
throw new Error(`device/request failed: HTTP ${response.status}`);
|
|
48
51
|
}
|
|
49
52
|
const data = (await response.json());
|
|
50
53
|
const deviceCode = data.device_code;
|
|
51
54
|
const userCode = data.user_code;
|
|
52
55
|
const verifyUri = data.verification_uri ?? data.verification_url;
|
|
53
56
|
if (!deviceCode || !userCode || !verifyUri) {
|
|
54
|
-
throw new Error(
|
|
57
|
+
throw new Error("device/request returned malformed payload");
|
|
55
58
|
}
|
|
56
59
|
return {
|
|
57
60
|
deviceCode,
|
|
@@ -68,10 +71,12 @@ export async function pollDeviceAuth(deviceCode, apiBase, opts = {}) {
|
|
|
68
71
|
while (Date.now() < deadline) {
|
|
69
72
|
let response;
|
|
70
73
|
try {
|
|
71
|
-
response = await fetch(`${base}/api/auth/device/poll`, {
|
|
72
|
-
method:
|
|
73
|
-
headers: {
|
|
74
|
-
|
|
74
|
+
response = await fetch(`${base}/api/auth/device/poll?device_code=${encodeURIComponent(deviceCode)}`, {
|
|
75
|
+
method: "GET",
|
|
76
|
+
headers: {
|
|
77
|
+
Accept: "application/json",
|
|
78
|
+
"Content-Type": "application/json",
|
|
79
|
+
},
|
|
75
80
|
});
|
|
76
81
|
}
|
|
77
82
|
catch (err) {
|
|
@@ -82,29 +87,31 @@ export async function pollDeviceAuth(deviceCode, apiBase, opts = {}) {
|
|
|
82
87
|
continue;
|
|
83
88
|
}
|
|
84
89
|
if (response.status === 410)
|
|
85
|
-
throw new Error(
|
|
90
|
+
throw new Error("device code expired");
|
|
86
91
|
if (response.status === 403)
|
|
87
|
-
throw new Error(
|
|
92
|
+
throw new Error("device code denied");
|
|
88
93
|
if (response.ok) {
|
|
89
94
|
const data = (await response.json());
|
|
90
|
-
if (data.status ===
|
|
95
|
+
if (data.status === "authorized" && data.token) {
|
|
91
96
|
return {
|
|
92
97
|
token: data.token,
|
|
93
|
-
userId: data.user?.id ??
|
|
94
|
-
email: data.user?.email ??
|
|
98
|
+
userId: data.user?.id ?? "unknown",
|
|
99
|
+
email: data.user?.email ?? "unknown",
|
|
95
100
|
};
|
|
96
101
|
}
|
|
97
|
-
if (data.status ===
|
|
98
|
-
throw new Error(
|
|
99
|
-
if (data.status ===
|
|
100
|
-
throw new Error(
|
|
102
|
+
if (data.status === "denied")
|
|
103
|
+
throw new Error("device code denied");
|
|
104
|
+
if (data.status === "expired")
|
|
105
|
+
throw new Error("device code expired");
|
|
101
106
|
}
|
|
102
|
-
else if (response.status !== 202 &&
|
|
107
|
+
else if (response.status !== 202 &&
|
|
108
|
+
response.status !== 425 &&
|
|
109
|
+
response.status !== 428) {
|
|
103
110
|
throw new Error(`device/poll failed: HTTP ${response.status}`);
|
|
104
111
|
}
|
|
105
112
|
await sleep(intervalMs);
|
|
106
113
|
}
|
|
107
|
-
throw new Error(
|
|
114
|
+
throw new Error("device/poll timed out");
|
|
108
115
|
}
|
|
109
116
|
export async function saveToken(token, userId, email) {
|
|
110
117
|
const path = credentialsPath();
|
|
@@ -120,9 +127,9 @@ export async function saveToken(token, userId, email) {
|
|
|
120
127
|
// then rename into place — avoids a world-readable window where any local
|
|
121
128
|
// process could read the JWT between writeFile and chmod.
|
|
122
129
|
try {
|
|
123
|
-
const fh = await open(tmp,
|
|
130
|
+
const fh = await open(tmp, "w", 0o600);
|
|
124
131
|
try {
|
|
125
|
-
await fh.writeFile(JSON.stringify(payload, null, 2),
|
|
132
|
+
await fh.writeFile(JSON.stringify(payload, null, 2), "utf8");
|
|
126
133
|
}
|
|
127
134
|
finally {
|
|
128
135
|
await fh.close();
|
|
@@ -132,17 +139,19 @@ export async function saveToken(token, userId, email) {
|
|
|
132
139
|
catch {
|
|
133
140
|
// Fallback path for platforms where open+mode isn't supported (e.g. Windows):
|
|
134
141
|
// write first, then chmod. The window is unavoidable there.
|
|
135
|
-
await writeFile(path, JSON.stringify(payload, null, 2),
|
|
142
|
+
await writeFile(path, JSON.stringify(payload, null, 2), "utf8");
|
|
136
143
|
try {
|
|
137
144
|
await chmod(path, 0o600);
|
|
138
145
|
}
|
|
139
|
-
catch {
|
|
146
|
+
catch {
|
|
147
|
+
/* non-POSIX */
|
|
148
|
+
}
|
|
140
149
|
await unlink(tmp).catch(() => undefined);
|
|
141
150
|
}
|
|
142
151
|
}
|
|
143
152
|
export async function loadToken() {
|
|
144
153
|
const path = credentialsPath();
|
|
145
|
-
const text = await readFile(path,
|
|
154
|
+
const text = await readFile(path, "utf8").catch(() => undefined);
|
|
146
155
|
if (!text)
|
|
147
156
|
return null;
|
|
148
157
|
try {
|
|
@@ -169,7 +178,7 @@ export async function clearToken() {
|
|
|
169
178
|
* Logs a single line to stderr on a successful move. Silent on no-op.
|
|
170
179
|
*/
|
|
171
180
|
export async function migrateLegacyAuth() {
|
|
172
|
-
const legacyPath = join(homedir(),
|
|
181
|
+
const legacyPath = join(homedir(), ".dirgha", "auth.json");
|
|
173
182
|
const targetPath = credentialsPath();
|
|
174
183
|
const legacyInfo = await stat(legacyPath).catch(() => undefined);
|
|
175
184
|
if (!legacyInfo || !legacyInfo.isFile() || legacyInfo.size === 0)
|
|
@@ -177,7 +186,7 @@ export async function migrateLegacyAuth() {
|
|
|
177
186
|
const targetInfo = await stat(targetPath).catch(() => undefined);
|
|
178
187
|
if (targetInfo && targetInfo.size > 0)
|
|
179
188
|
return false;
|
|
180
|
-
const text = await readFile(legacyPath,
|
|
189
|
+
const text = await readFile(legacyPath, "utf8").catch(() => undefined);
|
|
181
190
|
if (!text)
|
|
182
191
|
return false;
|
|
183
192
|
let parsed;
|
|
@@ -192,20 +201,22 @@ export async function migrateLegacyAuth() {
|
|
|
192
201
|
await mkdir(dirname(targetPath), { recursive: true });
|
|
193
202
|
const payload = {
|
|
194
203
|
token: parsed.jwt,
|
|
195
|
-
userId: parsed.userId ??
|
|
196
|
-
email:
|
|
204
|
+
userId: parsed.userId ?? "unknown",
|
|
205
|
+
email: "unknown",
|
|
197
206
|
expiresAt: parsed.expiresAt ?? new Date(Date.now() + TOKEN_TTL_MS).toISOString(),
|
|
198
207
|
};
|
|
199
|
-
await writeFile(targetPath, JSON.stringify(payload, null, 2),
|
|
208
|
+
await writeFile(targetPath, JSON.stringify(payload, null, 2), "utf8");
|
|
200
209
|
try {
|
|
201
210
|
await chmod(targetPath, 0o600);
|
|
202
211
|
}
|
|
203
|
-
catch {
|
|
212
|
+
catch {
|
|
213
|
+
/* non-POSIX */
|
|
214
|
+
}
|
|
204
215
|
await rename(legacyPath, `${legacyPath}.migrated`).catch(() => undefined);
|
|
205
|
-
process.stderr.write(
|
|
216
|
+
process.stderr.write("[auth] migrated legacy credentials\n");
|
|
206
217
|
return true;
|
|
207
218
|
}
|
|
208
219
|
function sleep(ms) {
|
|
209
|
-
return new Promise(resolve => setTimeout(resolve, ms));
|
|
220
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
210
221
|
}
|
|
211
222
|
//# sourceMappingURL=device-auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-auth.js","sourceRoot":"","sources":["../../src/integrations/device-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"device-auth.js","sourceRoot":"","sources":["../../src/integrations/device-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,20 +9,26 @@ export function createCostTracker() {
|
|
|
9
9
|
const records = [];
|
|
10
10
|
return {
|
|
11
11
|
record(provider, model, usage, sessionId) {
|
|
12
|
+
const safeInt = (n) => Number.isFinite(n) && n >= 0 ? Math.round(n) : 0;
|
|
13
|
+
const safeTokens = {
|
|
14
|
+
inputTokens: safeInt(usage.inputTokens),
|
|
15
|
+
outputTokens: safeInt(usage.outputTokens),
|
|
16
|
+
cachedTokens: safeInt(usage.cachedTokens),
|
|
17
|
+
};
|
|
12
18
|
const price = findPrice(provider, model);
|
|
13
19
|
const costUsd = price
|
|
14
|
-
? (
|
|
15
|
-
+ (
|
|
16
|
-
+ (
|
|
20
|
+
? (safeTokens.inputTokens / 1_000_000) * price.inputPerM
|
|
21
|
+
+ (safeTokens.outputTokens / 1_000_000) * price.outputPerM
|
|
22
|
+
+ (safeTokens.cachedTokens / 1_000_000) * (price.cachedInputPerM ?? 0)
|
|
17
23
|
: 0;
|
|
18
24
|
const rec = {
|
|
19
25
|
sessionId,
|
|
20
26
|
provider,
|
|
21
27
|
model,
|
|
22
|
-
inputTokens:
|
|
23
|
-
outputTokens:
|
|
24
|
-
cachedTokens:
|
|
25
|
-
costUsd,
|
|
28
|
+
inputTokens: safeTokens.inputTokens,
|
|
29
|
+
outputTokens: safeTokens.outputTokens,
|
|
30
|
+
cachedTokens: safeTokens.cachedTokens,
|
|
31
|
+
costUsd: Number.isFinite(costUsd) ? costUsd : 0,
|
|
26
32
|
ts: new Date().toISOString(),
|
|
27
33
|
};
|
|
28
34
|
records.push(rec);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cost.js","sourceRoot":"","sources":["../../src/intelligence/cost.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAoBxC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAiB,EAAE,CAAC;IAEjC,OAAO;QACL,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS;YACtC,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,KAAK;gBACnB,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"cost.js","sourceRoot":"","sources":["../../src/intelligence/cost.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Failover cascade engine. Multi-tier model substitution when the
|
|
3
|
+
* primary provider returns 4xx/5xx, rate-limits, or times out.
|
|
4
|
+
*
|
|
5
|
+
* Strategy:
|
|
6
|
+
* 1. primary — user's chosen model (tier 1)
|
|
7
|
+
* 2. secondary — same-family fallback (tier 2)
|
|
8
|
+
* 3. tertiary — family-alternatives registry (tier 3)
|
|
9
|
+
* 4. freeFallback — always-available free-tier model (tier 4)
|
|
10
|
+
*
|
|
11
|
+
* Health-aware: skips tiers whose provider health score is below
|
|
12
|
+
* the minimum threshold.
|
|
13
|
+
*/
|
|
14
|
+
export interface FailoverTier {
|
|
15
|
+
model: string;
|
|
16
|
+
reason: string;
|
|
17
|
+
}
|
|
18
|
+
export interface FailoverChain {
|
|
19
|
+
tiers: FailoverTier[];
|
|
20
|
+
exhausted: boolean;
|
|
21
|
+
}
|
|
22
|
+
export interface FailoverOptions {
|
|
23
|
+
healthThreshold?: number;
|
|
24
|
+
healthScores?: Record<string, number>;
|
|
25
|
+
maxTiers?: number;
|
|
26
|
+
}
|
|
27
|
+
export declare function buildFailoverChain(modelId: string, opts?: FailoverOptions): FailoverChain;
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Failover cascade engine. Multi-tier model substitution when the
|
|
3
|
+
* primary provider returns 4xx/5xx, rate-limits, or times out.
|
|
4
|
+
*
|
|
5
|
+
* Strategy:
|
|
6
|
+
* 1. primary — user's chosen model (tier 1)
|
|
7
|
+
* 2. secondary — same-family fallback (tier 2)
|
|
8
|
+
* 3. tertiary — family-alternatives registry (tier 3)
|
|
9
|
+
* 4. freeFallback — always-available free-tier model (tier 4)
|
|
10
|
+
*
|
|
11
|
+
* Health-aware: skips tiers whose provider health score is below
|
|
12
|
+
* the minimum threshold.
|
|
13
|
+
*/
|
|
14
|
+
import { lookupModel, PRICES } from "../intelligence/prices.js";
|
|
15
|
+
import { familyAlternatives } from "../providers/family-fallback.js";
|
|
16
|
+
export function buildFailoverChain(modelId, opts = {}) {
|
|
17
|
+
const maxTiers = opts.maxTiers ?? 4;
|
|
18
|
+
const healthThreshold = opts.healthThreshold ?? -1;
|
|
19
|
+
const seen = new Set();
|
|
20
|
+
const tiers = [];
|
|
21
|
+
tiers.push({ model: modelId, reason: "user-selected" });
|
|
22
|
+
seen.add(modelId);
|
|
23
|
+
if (tiers.length >= maxTiers)
|
|
24
|
+
return { tiers, exhausted: false };
|
|
25
|
+
// Tier 2 — same-family alternatives from the catalogue
|
|
26
|
+
const price = lookupModel(modelId);
|
|
27
|
+
if (price?.family) {
|
|
28
|
+
const familyModels = PRICES.filter((p) => p.family === price.family &&
|
|
29
|
+
!seen.has(p.model) &&
|
|
30
|
+
p.provider !== price.provider).sort((a, b) => a.outputPerM + a.inputPerM - (b.outputPerM + b.inputPerM));
|
|
31
|
+
for (const m of familyModels) {
|
|
32
|
+
if (!isHealthy(m.provider, opts.healthScores, healthThreshold))
|
|
33
|
+
continue;
|
|
34
|
+
if (seen.has(m.model))
|
|
35
|
+
continue;
|
|
36
|
+
seen.add(m.model);
|
|
37
|
+
tiers.push({
|
|
38
|
+
model: m.model,
|
|
39
|
+
reason: `same-family/${price.family}`,
|
|
40
|
+
});
|
|
41
|
+
if (tiers.length >= maxTiers)
|
|
42
|
+
return { tiers, exhausted: false };
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// Tier 3 — familyAlternatives registry (cross-family provider map)
|
|
46
|
+
const fam = familyAlternatives(modelId);
|
|
47
|
+
for (const alt of fam) {
|
|
48
|
+
if (seen.has(alt.model))
|
|
49
|
+
continue;
|
|
50
|
+
if (!isHealthy(alt.provider, opts.healthScores, healthThreshold))
|
|
51
|
+
continue;
|
|
52
|
+
seen.add(alt.model);
|
|
53
|
+
tiers.push({ model: alt.model, reason: `family-registry` });
|
|
54
|
+
if (tiers.length >= maxTiers)
|
|
55
|
+
return { tiers, exhausted: false };
|
|
56
|
+
}
|
|
57
|
+
// Tier 4 — first free model as last resort
|
|
58
|
+
const free = PRICES.find((p) => p.outputPerM === 0 && p.inputPerM === 0 && !seen.has(p.model));
|
|
59
|
+
if (free && !seen.has(free.model)) {
|
|
60
|
+
tiers.push({ model: free.model, reason: "free-fallback" });
|
|
61
|
+
}
|
|
62
|
+
return { tiers, exhausted: tiers.length <= 1 };
|
|
63
|
+
}
|
|
64
|
+
function isHealthy(provider, scores, threshold) {
|
|
65
|
+
if (threshold < 0)
|
|
66
|
+
return true;
|
|
67
|
+
const score = scores?.[provider] ?? 1;
|
|
68
|
+
return score >= threshold;
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=failover-chain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failover-chain.js","sourceRoot":"","sources":["../../src/intelligence/failover-chain.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,8 +96,15 @@ export async function getCatalogue(ttlMs = 86400000) {
|
|
|
96
96
|
if (age < ttlMs)
|
|
97
97
|
return cached;
|
|
98
98
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
99
|
+
try {
|
|
100
|
+
const fresh = await fetchModelsDev();
|
|
101
|
+
await writeCache(fresh);
|
|
102
|
+
return fresh;
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
if (cached)
|
|
106
|
+
return cached;
|
|
107
|
+
throw new Error("Failed to fetch model catalogue and no local cache available.");
|
|
108
|
+
}
|
|
102
109
|
}
|
|
103
110
|
//# sourceMappingURL=models-dev-sync.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models-dev-sync.js","sourceRoot":"","sources":["../../src/intelligence/models-dev-sync.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"models-dev-sync.js","sourceRoot":"","sources":["../../src/intelligence/models-dev-sync.ts"],"names":[],"mappings":"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"}
|