@dirgha/code 1.20.15 → 1.20.27
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/auth/keypool.js +40 -26
- package/dist/auth/keypool.js.map +1 -1
- package/dist/auth/keystore.js +16 -11
- package/dist/auth/keystore.js.map +1 -1
- package/dist/cli/config.js +23 -2
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.d.ts +6 -5
- package/dist/cli/first-run.js +100 -42
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +13 -19
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.d.ts +4 -0
- package/dist/cli/interactive.js +54 -10
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +67 -18
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +4 -2
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/slash/fleet.js +19 -1
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/keys.js +49 -0
- package/dist/cli/slash/keys.js.map +1 -1
- package/dist/cli/slash/login.js +7 -3
- package/dist/cli/slash/login.js.map +1 -1
- package/dist/cli/slash/models.d.ts +1 -1
- package/dist/cli/slash/models.js +144 -18
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/provider.js +1 -1
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash.js +26 -10
- package/dist/cli/slash.js.map +1 -1
- package/dist/cli/subcommands/doctor.d.ts +1 -1
- package/dist/cli/subcommands/doctor.js +362 -84
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/keys.js +44 -0
- package/dist/cli/subcommands/keys.js.map +1 -1
- package/dist/cli/subcommands/login.js +8 -3
- package/dist/cli/subcommands/login.js.map +1 -1
- package/dist/cli/subcommands/telemetry.d.ts +2 -1
- package/dist/cli/subcommands/telemetry.js +47 -34
- package/dist/cli/subcommands/telemetry.js.map +1 -1
- package/dist/cli/update-check.d.ts +1 -0
- package/dist/cli/update-check.js +31 -7
- package/dist/cli/update-check.js.map +1 -1
- package/dist/context/branch.d.ts +2 -2
- package/dist/context/branch.js +40 -23
- package/dist/context/branch.js.map +1 -1
- package/dist/context/compaction.js +45 -22
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/git-state.js +31 -18
- package/dist/context/git-state.js.map +1 -1
- package/dist/context/knowledge.js +31 -20
- package/dist/context/knowledge.js.map +1 -1
- package/dist/context/memory.js +7 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/mode-enforcement.js +11 -2
- package/dist/context/mode-enforcement.js.map +1 -1
- package/dist/context/mode.js +67 -30
- package/dist/context/mode.js.map +1 -1
- package/dist/context/primer.js +15 -3
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.d.ts +1 -0
- package/dist/context/session.js +4 -1
- package/dist/context/session.js.map +1 -1
- package/dist/fleet/apply-back.js +5 -1
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -0
- package/dist/fleet/cli-command.js +15 -1
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/runner.js +35 -2
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad.js +1 -2
- package/dist/fleet/scratchpad.js.map +1 -1
- package/dist/fleet/state.d.ts +4 -0
- package/dist/fleet/state.js +11 -2
- package/dist/fleet/state.js.map +1 -1
- package/dist/fleet/templates.d.ts +4 -0
- package/dist/fleet/templates.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/intelligence/error-classifier.js +37 -8
- package/dist/intelligence/error-classifier.js.map +1 -1
- package/dist/intelligence/failover-chain.d.ts +24 -0
- package/dist/intelligence/failover-chain.js +79 -6
- package/dist/intelligence/failover-chain.js.map +1 -1
- package/dist/intelligence/health-monitor.d.ts +27 -0
- package/dist/intelligence/health-monitor.js +242 -0
- package/dist/intelligence/health-monitor.js.map +1 -0
- package/dist/intelligence/index.d.ts +7 -5
- package/dist/intelligence/index.js +7 -5
- package/dist/intelligence/index.js.map +1 -1
- package/dist/intelligence/prices.d.ts +6 -4
- package/dist/intelligence/prices.js +169 -40
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/intelligence/remote-catalogue.d.ts +31 -0
- package/dist/intelligence/remote-catalogue.js +174 -0
- package/dist/intelligence/remote-catalogue.js.map +1 -0
- package/dist/intelligence/remote-config.d.ts +26 -0
- package/dist/intelligence/remote-config.js +80 -0
- package/dist/intelligence/remote-config.js.map +1 -0
- package/dist/kernel/agent-loop.js +73 -16
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/lsp/client.js +29 -16
- package/dist/lsp/client.js.map +1 -1
- package/dist/lsp/detector.js +7 -6
- package/dist/lsp/detector.js.map +1 -1
- package/dist/mcp/client.d.ts +1 -1
- package/dist/mcp/client.js +19 -16
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/transport.js +46 -38
- package/dist/mcp/transport.js.map +1 -1
- package/dist/parity/scenarios.d.ts +3 -3
- package/dist/parity/scenarios.js +77 -36
- package/dist/parity/scenarios.js.map +1 -1
- package/dist/providers/anthropic-catalogue.d.ts +9 -0
- package/dist/providers/anthropic-catalogue.js +90 -0
- package/dist/providers/anthropic-catalogue.js.map +1 -0
- package/dist/providers/anthropic.js +3 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/catalogue.d.ts +34 -0
- package/dist/providers/catalogue.js +20 -0
- package/dist/providers/catalogue.js.map +1 -0
- package/dist/providers/cerebras-catalogue.d.ts +9 -0
- package/dist/providers/cerebras-catalogue.js +54 -0
- package/dist/providers/cerebras-catalogue.js.map +1 -0
- package/dist/providers/cohere-catalogue.d.ts +9 -0
- package/dist/providers/cohere-catalogue.js +54 -0
- package/dist/providers/cohere-catalogue.js.map +1 -0
- package/dist/providers/deepseek-catalogue.d.ts +15 -0
- package/dist/providers/deepseek-catalogue.js +81 -0
- package/dist/providers/deepseek-catalogue.js.map +1 -0
- package/dist/providers/deepseek.d.ts +4 -2
- package/dist/providers/deepseek.js +7 -23
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/dispatch.js +37 -28
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/providers/extra-providers.js +21 -0
- package/dist/providers/extra-providers.js.map +1 -1
- package/dist/providers/family-fallback.js +3 -3
- package/dist/providers/family-fallback.js.map +1 -1
- package/dist/providers/gemini-catalogue.d.ts +9 -0
- package/dist/providers/gemini-catalogue.js +73 -0
- package/dist/providers/gemini-catalogue.js.map +1 -0
- package/dist/providers/gemini.js +12 -3
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/groq-catalogue.d.ts +9 -0
- package/dist/providers/groq-catalogue.js +82 -0
- package/dist/providers/groq-catalogue.js.map +1 -0
- package/dist/providers/index.d.ts +11 -0
- package/dist/providers/index.js +29 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/mistral-catalogue.d.ts +9 -0
- package/dist/providers/mistral-catalogue.js +68 -0
- package/dist/providers/mistral-catalogue.js.map +1 -0
- package/dist/providers/nim-catalogue.d.ts +31 -0
- package/dist/providers/nim-catalogue.js +122 -0
- package/dist/providers/nim-catalogue.js.map +1 -0
- package/dist/providers/nvidia.js +33 -10
- package/dist/providers/nvidia.js.map +1 -1
- package/dist/providers/openai-catalogue.d.ts +9 -0
- package/dist/providers/openai-catalogue.js +82 -0
- package/dist/providers/openai-catalogue.js.map +1 -0
- package/dist/providers/openai-compat.js +4 -2
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/perplexity-catalogue.d.ts +10 -0
- package/dist/providers/perplexity-catalogue.js +69 -0
- package/dist/providers/perplexity-catalogue.js.map +1 -0
- package/dist/providers/together-catalogue.d.ts +9 -0
- package/dist/providers/together-catalogue.js +54 -0
- package/dist/providers/together-catalogue.js.map +1 -0
- package/dist/providers/xai-catalogue.d.ts +9 -0
- package/dist/providers/xai-catalogue.js +54 -0
- package/dist/providers/xai-catalogue.js.map +1 -0
- package/dist/safety/audit-log.d.ts +15 -0
- package/dist/safety/audit-log.js +21 -0
- package/dist/safety/audit-log.js.map +1 -1
- package/dist/state/db-telemetry.d.ts +21 -0
- package/dist/state/db-telemetry.js +106 -0
- package/dist/state/db-telemetry.js.map +1 -0
- package/dist/state/db.js +7 -4
- package/dist/state/db.js.map +1 -1
- package/dist/telemetry/gateway-push.d.ts +17 -0
- package/dist/telemetry/gateway-push.js +48 -0
- package/dist/telemetry/gateway-push.js.map +1 -0
- package/dist/telemetry/index.d.ts +9 -0
- package/dist/telemetry/index.js +9 -0
- package/dist/telemetry/index.js.map +1 -0
- package/dist/tools/browser.js +24 -16
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.d.ts +6 -1
- package/dist/tools/checkpoint.js +79 -62
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.js +1 -3
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/diff.js +25 -21
- package/dist/tools/diff.js.map +1 -1
- package/dist/tools/exec.d.ts +2 -0
- package/dist/tools/exec.js +13 -0
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.d.ts +3 -5
- package/dist/tools/fs-edit.js +8 -23
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +6 -8
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.d.ts +1 -1
- package/dist/tools/fs-read.js +37 -28
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.d.ts +1 -1
- package/dist/tools/fs-write.js +33 -33
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.js +12 -6
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +4 -3
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/multimodal.js +11 -12
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/rtk.js +22 -9
- package/dist/tools/rtk.js.map +1 -1
- package/dist/tools/search-glob.d.ts +1 -1
- package/dist/tools/search-glob.js +42 -24
- package/dist/tools/search-glob.js.map +1 -1
- package/dist/tools/search-grep.d.ts +1 -1
- package/dist/tools/search-grep.js +56 -32
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.d.ts +1 -1
- package/dist/tools/shell.js +78 -54
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.d.ts +5 -1
- package/dist/tui/ink/App.js +310 -73
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +23 -8
- 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 +22 -25
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +18 -16
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
- package/dist/tui/ink/components/ModelPicker.js +34 -26
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +3 -1
- package/dist/tui/ink/components/PasteCollapse.js +11 -9
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
- package/dist/tui/ink/components/SpinnerGlyph.js +34 -14
- package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.d.ts +7 -0
- package/dist/tui/ink/components/StatusBar.js +11 -5
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.d.ts +15 -4
- package/dist/tui/ink/components/ThinkingBlock.js +34 -17
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +23 -13
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/VirtualTranscript.d.ts +19 -0
- package/dist/tui/ink/components/VirtualTranscript.js +31 -0
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -0
- package/dist/tui/ink/index.d.ts +5 -1
- package/dist/tui/ink/index.js +19 -7
- package/dist/tui/ink/index.js.map +1 -1
- package/dist/tui/ink/markdown/syntax-highlight.d.ts +13 -0
- package/dist/tui/ink/markdown/syntax-highlight.js +91 -0
- package/dist/tui/ink/markdown/syntax-highlight.js.map +1 -0
- package/dist/tui/ink/use-declined-versions.d.ts +14 -0
- package/dist/tui/ink/use-declined-versions.js +61 -0
- package/dist/tui/ink/use-declined-versions.js.map +1 -0
- package/dist/tui/ink/use-elapsed.d.ts +6 -0
- package/dist/tui/ink/use-elapsed.js +46 -0
- package/dist/tui/ink/use-elapsed.js.map +1 -0
- package/dist/tui/ink/use-event-projection.js +12 -0
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-flicker-detector.d.ts +12 -0
- package/dist/tui/ink/use-flicker-detector.js +37 -0
- package/dist/tui/ink/use-flicker-detector.js.map +1 -0
- package/dist/tui/ink/use-overlays.js +16 -17
- package/dist/tui/ink/use-overlays.js.map +1 -1
- package/dist/tui/ink/use-render-metrics.d.ts +14 -0
- package/dist/tui/ink/use-render-metrics.js +97 -0
- package/dist/tui/ink/use-render-metrics.js.map +1 -0
- package/dist/tui/ink/use-startup-health.d.ts +10 -0
- package/dist/tui/ink/use-startup-health.js +125 -0
- package/dist/tui/ink/use-startup-health.js.map +1 -0
- package/dist/tui/ink/use-transcript-scroll.d.ts +19 -0
- package/dist/tui/ink/use-transcript-scroll.js +83 -0
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -0
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +60 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/fs.d.ts +10 -0
- package/dist/utils/fs.js +37 -0
- package/dist/utils/fs.js.map +1 -0
- package/package.json +1 -1
package/dist/auth/keypool.js
CHANGED
|
@@ -23,24 +23,26 @@
|
|
|
23
23
|
* `~/.dirgha/keypool.json.lock`. Stale locks (older than 30 s) are
|
|
24
24
|
* stolen so a crashed CLI can't wedge the file forever.
|
|
25
25
|
*/
|
|
26
|
-
import { chmod, mkdir, readFile, writeFile, stat, unlink } from
|
|
27
|
-
import { homedir } from
|
|
28
|
-
import { join } from
|
|
29
|
-
import { randomBytes } from
|
|
26
|
+
import { chmod, mkdir, readFile, writeFile, stat, unlink, rename, } from "node:fs/promises";
|
|
27
|
+
import { homedir } from "node:os";
|
|
28
|
+
import { join } from "node:path";
|
|
29
|
+
import { randomBytes } from "node:crypto";
|
|
30
30
|
const LOCK_TIMEOUT_MS = 30_000;
|
|
31
31
|
export function poolPath(home = homedir()) {
|
|
32
|
-
return join(home,
|
|
32
|
+
return join(home, ".dirgha", "keypool.json");
|
|
33
33
|
}
|
|
34
34
|
function lockPath(home = homedir()) {
|
|
35
|
-
return join(home,
|
|
35
|
+
return join(home, ".dirgha", "keypool.json.lock");
|
|
36
36
|
}
|
|
37
37
|
async function acquireLock(home) {
|
|
38
38
|
const lp = lockPath(home);
|
|
39
|
-
await mkdir(join(home,
|
|
39
|
+
await mkdir(join(home, ".dirgha"), { recursive: true });
|
|
40
40
|
for (let attempt = 0; attempt < 30; attempt++) {
|
|
41
41
|
try {
|
|
42
|
-
await writeFile(lp, String(process.pid), { flag:
|
|
43
|
-
return async () => {
|
|
42
|
+
await writeFile(lp, String(process.pid), { flag: "wx" });
|
|
43
|
+
return async () => {
|
|
44
|
+
await unlink(lp).catch(() => { });
|
|
45
|
+
};
|
|
44
46
|
}
|
|
45
47
|
catch {
|
|
46
48
|
const info = await stat(lp).catch(() => undefined);
|
|
@@ -48,32 +50,42 @@ async function acquireLock(home) {
|
|
|
48
50
|
await unlink(lp).catch(() => { });
|
|
49
51
|
continue;
|
|
50
52
|
}
|
|
51
|
-
await new Promise(r => setTimeout(r, 100));
|
|
53
|
+
await new Promise((r) => setTimeout(r, 100));
|
|
52
54
|
}
|
|
53
55
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
56
|
+
const info = await stat(lp).catch(() => undefined);
|
|
57
|
+
if (!info || Date.now() - info.mtimeMs > LOCK_TIMEOUT_MS) {
|
|
58
|
+
await writeFile(lp, String(process.pid));
|
|
59
|
+
return async () => {
|
|
60
|
+
await unlink(lp).catch(() => { });
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
throw new Error(`Could not acquire keypool lock after ${LOCK_TIMEOUT_MS}ms — lock held by another process`);
|
|
57
64
|
}
|
|
58
65
|
export async function readPool(home = homedir()) {
|
|
59
|
-
const text = await readFile(poolPath(home),
|
|
66
|
+
const text = await readFile(poolPath(home), "utf8").catch(() => "");
|
|
60
67
|
if (!text)
|
|
61
68
|
return {};
|
|
62
69
|
try {
|
|
63
70
|
const parsed = JSON.parse(text);
|
|
64
|
-
return parsed && typeof parsed ===
|
|
71
|
+
return parsed && typeof parsed === "object" ? parsed : {};
|
|
65
72
|
}
|
|
66
73
|
catch {
|
|
67
74
|
return {};
|
|
68
75
|
}
|
|
69
76
|
}
|
|
70
77
|
async function writePool(pool, home = homedir()) {
|
|
71
|
-
await mkdir(join(home,
|
|
72
|
-
|
|
78
|
+
await mkdir(join(home, ".dirgha"), { recursive: true });
|
|
79
|
+
const target = poolPath(home);
|
|
80
|
+
const tmp = `${target}.tmp-${randomBytes(4).toString("hex")}`;
|
|
81
|
+
await writeFile(tmp, JSON.stringify(pool, null, 2) + "\n", "utf8");
|
|
73
82
|
try {
|
|
74
|
-
await chmod(
|
|
83
|
+
await chmod(tmp, 0o600);
|
|
75
84
|
}
|
|
76
|
-
catch {
|
|
85
|
+
catch {
|
|
86
|
+
/* non-POSIX */
|
|
87
|
+
}
|
|
88
|
+
await rename(tmp, target);
|
|
77
89
|
}
|
|
78
90
|
export async function addEntry(envName, value, opts = {}) {
|
|
79
91
|
const home = opts.home ?? homedir();
|
|
@@ -82,7 +94,7 @@ export async function addEntry(envName, value, opts = {}) {
|
|
|
82
94
|
const pool = await readPool(home);
|
|
83
95
|
const list = pool[envName] ?? [];
|
|
84
96
|
const entry = {
|
|
85
|
-
id: randomBytes(3).toString(
|
|
97
|
+
id: randomBytes(3).toString("hex"),
|
|
86
98
|
value,
|
|
87
99
|
label: opts.label ?? `key-${list.length + 1}`,
|
|
88
100
|
priority: opts.priority ?? 0,
|
|
@@ -104,7 +116,7 @@ export async function removeEntry(envName, id, home = homedir()) {
|
|
|
104
116
|
try {
|
|
105
117
|
const pool = await readPool(home);
|
|
106
118
|
const list = pool[envName] ?? [];
|
|
107
|
-
const next = list.filter(e => e.id !== id);
|
|
119
|
+
const next = list.filter((e) => e.id !== id);
|
|
108
120
|
if (next.length === list.length)
|
|
109
121
|
return false;
|
|
110
122
|
if (next.length === 0)
|
|
@@ -140,7 +152,7 @@ export function pickEntry(pool, envName, now = new Date()) {
|
|
|
140
152
|
const list = pool[envName];
|
|
141
153
|
if (!list || list.length === 0)
|
|
142
154
|
return undefined;
|
|
143
|
-
const live = list.filter(e => !e.exhaustedUntil || new Date(e.exhaustedUntil) <= now);
|
|
155
|
+
const live = list.filter((e) => !e.exhaustedUntil || new Date(e.exhaustedUntil) <= now);
|
|
144
156
|
if (live.length === 0)
|
|
145
157
|
return undefined;
|
|
146
158
|
// Highest priority first; tie-break on least-recently-used so we
|
|
@@ -159,7 +171,7 @@ export async function markExhausted(envName, id, untilIso, home = homedir()) {
|
|
|
159
171
|
const release = await acquireLock(home);
|
|
160
172
|
try {
|
|
161
173
|
const pool = await readPool(home);
|
|
162
|
-
const entry = (pool[envName] ?? []).find(e => e.id === id);
|
|
174
|
+
const entry = (pool[envName] ?? []).find((e) => e.id === id);
|
|
163
175
|
if (!entry)
|
|
164
176
|
return;
|
|
165
177
|
entry.exhaustedUntil = untilIso;
|
|
@@ -176,13 +188,15 @@ export async function touchEntry(envName, id, home = homedir()) {
|
|
|
176
188
|
return;
|
|
177
189
|
try {
|
|
178
190
|
const pool = await readPool(home);
|
|
179
|
-
const entry = (pool[envName] ?? []).find(e => e.id === id);
|
|
191
|
+
const entry = (pool[envName] ?? []).find((e) => e.id === id);
|
|
180
192
|
if (!entry)
|
|
181
193
|
return;
|
|
182
194
|
entry.lastUsedAt = new Date().toISOString();
|
|
183
195
|
await writePool(pool, home);
|
|
184
196
|
}
|
|
185
|
-
catch {
|
|
197
|
+
catch {
|
|
198
|
+
/* swallow */
|
|
199
|
+
}
|
|
186
200
|
finally {
|
|
187
201
|
await release();
|
|
188
202
|
}
|
|
@@ -198,7 +212,7 @@ export async function hydrateEnvFromPool(env = process.env, home = homedir()) {
|
|
|
198
212
|
const pool = await readPool(home);
|
|
199
213
|
const hydrated = [];
|
|
200
214
|
for (const envName of Object.keys(pool)) {
|
|
201
|
-
if (env[envName] !== undefined && env[envName] !==
|
|
215
|
+
if (env[envName] !== undefined && env[envName] !== "")
|
|
202
216
|
continue;
|
|
203
217
|
const pick = pickEntry(pool, envName);
|
|
204
218
|
if (!pick)
|
package/dist/auth/keypool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keypool.js","sourceRoot":"","sources":["../../src/auth/keypool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"keypool.js","sourceRoot":"","sources":["../../src/auth/keypool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EACL,KAAK,EACL,KAAK,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,MAAM,EACN,MAAM,GACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAc1C,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,UAAU,QAAQ,CAAC,OAAe,OAAO,EAAE;IAC/C,OAAO,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,QAAQ,CAAC,OAAe,OAAO,EAAE;IACxC,OAAO,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;AACpD,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAY;IACrC,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACzD,OAAO,KAAK,IAAI,EAAE;gBAChB,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACnD,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,eAAe,EAAE,CAAC;gBACxD,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACjC,SAAS;YACX,CAAC;YACD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACnD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,eAAe,EAAE,CAAC;QACzD,MAAM,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,OAAO,KAAK,IAAI,EAAE;YAChB,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CACb,wCAAwC,eAAe,mCAAmC,CAC3F,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAe,OAAO,EAAE;IACrD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAS,CAAC;QACxC,OAAO,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,IAAU,EAAE,OAAe,OAAO,EAAE;IAC3D,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,GAAG,MAAM,QAAQ,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAC9D,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,eAAe;IACjB,CAAC;IACD,MAAM,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,OAAe,EACf,KAAa,EACb,OAA6D,EAAE;IAE/D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,KAAK,GAAc;YACvB,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YAClC,KAAK;YACL,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7C,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,CAAC;YAC5B,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACjC,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,IAAI;SACrB,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QACrB,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe,EACf,EAAU,EACV,OAAe,OAAO,EAAE;IAExB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC9C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;;YACvC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QAC1B,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,OAAe,OAAO,EAAE;IAExB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CACvB,IAAU,EACV,OAAe,EACf,MAAY,IAAI,IAAI,EAAE;IAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACjD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,GAAG,CAC9D,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACxC,iEAAiE;IACjE,gDAAgD;IAChD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjB,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;YAAE,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC9D,MAAM,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,MAAM,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,EAAU,EACV,QAAgB,EAChB,OAAe,OAAO,EAAE;IAExB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,KAAK,CAAC,cAAc,GAAG,QAAQ,CAAC;QAChC,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAe,EACf,EAAU,EACV,OAAe,OAAO,EAAE;IAExB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,KAAK,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,aAAa;IACf,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAyB,OAAO,CAAC,GAAG,EACpC,OAAe,OAAO,EAAE;IAExB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE;YAAE,SAAS;QAChE,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
package/dist/auth/keystore.js
CHANGED
|
@@ -7,14 +7,15 @@
|
|
|
7
7
|
* Real env vars take precedence over the file — letting users override
|
|
8
8
|
* a stored key for one invocation by exporting in the shell.
|
|
9
9
|
*/
|
|
10
|
-
import { chmod, mkdir, readFile, writeFile } from
|
|
11
|
-
import { homedir } from
|
|
12
|
-
import { join } from
|
|
10
|
+
import { chmod, mkdir, readFile, writeFile, rename } from "node:fs/promises";
|
|
11
|
+
import { homedir } from "node:os";
|
|
12
|
+
import { join } from "node:path";
|
|
13
|
+
import { randomBytes } from "node:crypto";
|
|
13
14
|
export function keyStorePath() {
|
|
14
|
-
return join(homedir(),
|
|
15
|
+
return join(homedir(), ".dirgha", "keys.json");
|
|
15
16
|
}
|
|
16
17
|
export async function readKeyStore(path = keyStorePath()) {
|
|
17
|
-
const text = await readFile(path,
|
|
18
|
+
const text = await readFile(path, "utf8").catch(() => "");
|
|
18
19
|
if (!text)
|
|
19
20
|
return {};
|
|
20
21
|
try {
|
|
@@ -33,9 +34,9 @@ export async function hydrateEnvFromKeyStore(env = process.env, path = keyStoreP
|
|
|
33
34
|
const store = await readKeyStore(path);
|
|
34
35
|
const hydrated = [];
|
|
35
36
|
for (const [name, value] of Object.entries(store)) {
|
|
36
|
-
if (typeof value !==
|
|
37
|
+
if (typeof value !== "string" || value.length === 0)
|
|
37
38
|
continue;
|
|
38
|
-
if (env[name] === undefined || env[name] ===
|
|
39
|
+
if (env[name] === undefined || env[name] === "") {
|
|
39
40
|
env[name] = value;
|
|
40
41
|
hydrated.push(name);
|
|
41
42
|
}
|
|
@@ -46,12 +47,16 @@ export async function hydrateEnvFromKeyStore(env = process.env, path = keyStoreP
|
|
|
46
47
|
export async function saveKey(envVar, value, path = keyStorePath()) {
|
|
47
48
|
const store = await readKeyStore(path);
|
|
48
49
|
store[envVar] = value;
|
|
49
|
-
await mkdir(join(homedir(),
|
|
50
|
-
|
|
50
|
+
await mkdir(join(homedir(), ".dirgha"), { recursive: true });
|
|
51
|
+
const tmp = `${path}.tmp-${randomBytes(4).toString("hex")}`;
|
|
52
|
+
await writeFile(tmp, JSON.stringify(store, null, 2) + "\n", "utf8");
|
|
51
53
|
try {
|
|
52
|
-
await chmod(
|
|
54
|
+
await chmod(tmp, 0o600);
|
|
53
55
|
}
|
|
54
|
-
catch {
|
|
56
|
+
catch {
|
|
57
|
+
/* non-POSIX (Windows) */
|
|
58
|
+
}
|
|
59
|
+
await rename(tmp, path);
|
|
55
60
|
process.env[envVar] = value;
|
|
56
61
|
}
|
|
57
62
|
//# sourceMappingURL=keystore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keystore.js","sourceRoot":"","sources":["../../src/auth/keystore.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"keystore.js","sourceRoot":"","sources":["../../src/auth/keystore.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1C,MAAM,UAAU,YAAY;IAC1B,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,YAAY,EAAE;IAE7B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAyB,OAAO,CAAC,GAAG,EACpC,OAAe,YAAY,EAAE;IAE7B,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAC9D,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YAChD,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,uFAAuF;AACvF,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAc,EACd,KAAa,EACb,OAAe,YAAY,EAAE;IAE7B,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IACvC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IACtB,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,GAAG,IAAI,QAAQ,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAC5D,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,yBAAyB;IAC3B,CAAC;IACD,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;AAC9B,CAAC"}
|
package/dist/cli/config.js
CHANGED
|
@@ -10,7 +10,7 @@ const CURRENT_SCHEMA = 1;
|
|
|
10
10
|
export const DEFAULT_CONFIG = {
|
|
11
11
|
schemaVersion: CURRENT_SCHEMA,
|
|
12
12
|
model: "moonshotai/kimi-k2.6",
|
|
13
|
-
cheapModel: "
|
|
13
|
+
cheapModel: "deepseek-ai/deepseek-v4-flash", // widely available via DeepSeek, NIM, and OpenRouter
|
|
14
14
|
summaryModel: "moonshotai/kimi-k2.5",
|
|
15
15
|
maxTurns: 16,
|
|
16
16
|
showThinking: false,
|
|
@@ -33,9 +33,21 @@ export async function loadConfig(cwd = process.cwd()) {
|
|
|
33
33
|
migrateConfigSchema(merged);
|
|
34
34
|
// Migrate any model IDs the upstream provider has dropped, so users
|
|
35
35
|
// with stale `~/.dirgha/config.json` don't 400 on every call.
|
|
36
|
+
const originalModel = merged.model;
|
|
37
|
+
const originalCheap = merged.cheapModel;
|
|
38
|
+
const originalSummary = merged.summaryModel;
|
|
36
39
|
merged.model = migrateDeprecatedModel(merged.model);
|
|
37
40
|
merged.cheapModel = migrateDeprecatedModel(merged.cheapModel);
|
|
38
41
|
merged.summaryModel = migrateDeprecatedModel(merged.summaryModel);
|
|
42
|
+
if (originalModel !== merged.model) {
|
|
43
|
+
process.stderr.write(`[dirgha] model "${originalModel}" migrated to "${merged.model}"\n`);
|
|
44
|
+
}
|
|
45
|
+
if (originalCheap !== merged.cheapModel) {
|
|
46
|
+
process.stderr.write(`[dirgha] cheapModel "${originalCheap}" migrated to "${merged.cheapModel}"\n`);
|
|
47
|
+
}
|
|
48
|
+
if (originalSummary !== merged.summaryModel) {
|
|
49
|
+
process.stderr.write(`[dirgha] summaryModel "${originalSummary}" migrated to "${merged.summaryModel}"\n`);
|
|
50
|
+
}
|
|
39
51
|
return merged;
|
|
40
52
|
}
|
|
41
53
|
async function readJson(path) {
|
|
@@ -69,6 +81,7 @@ function readEnvOverrides() {
|
|
|
69
81
|
}
|
|
70
82
|
function merge(...partials) {
|
|
71
83
|
const out = structuredClone(DEFAULT_CONFIG);
|
|
84
|
+
const arrayFields = new Set(["autoApproveTools"]);
|
|
72
85
|
for (const p of partials) {
|
|
73
86
|
if (!p)
|
|
74
87
|
continue;
|
|
@@ -76,7 +89,15 @@ function merge(...partials) {
|
|
|
76
89
|
const value = p[key];
|
|
77
90
|
if (value === undefined)
|
|
78
91
|
continue;
|
|
79
|
-
if (
|
|
92
|
+
if (arrayFields.has(key) &&
|
|
93
|
+
Array.isArray(value) &&
|
|
94
|
+
Array.isArray(out[key])) {
|
|
95
|
+
out[key] = [
|
|
96
|
+
...out[key],
|
|
97
|
+
...value,
|
|
98
|
+
];
|
|
99
|
+
}
|
|
100
|
+
else if (typeof value === "object" &&
|
|
80
101
|
value !== null &&
|
|
81
102
|
!Array.isArray(value)) {
|
|
82
103
|
out[key] = {
|
package/dist/cli/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAoHnE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,MAAM,CAAC,MAAM,cAAc,GAAiB;IAC1C,aAAa,EAAE,cAAc;IAC7B,KAAK,EAAE,sBAAsB;IAC7B,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/first-run.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* First-run detection and
|
|
2
|
+
* First-run detection and interactive key setup.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* If no API key is found, shows an interactive wizard that lets the user
|
|
5
|
+
* paste a key immediately (no restart needed). After saving, launches the
|
|
6
|
+
* TUI with a recommended free model so the first chat works in < 30 seconds.
|
|
7
|
+
*
|
|
8
|
+
* Also detects: OpenRouter free tokens, NVIDIA free tier, environment vars.
|
|
8
9
|
*/
|
|
9
10
|
export declare function checkFirstRun(): boolean;
|
|
10
11
|
export declare function showWelcomeWizard(): Promise<void>;
|
package/dist/cli/first-run.js
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* First-run detection and
|
|
2
|
+
* First-run detection and interactive key setup.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* If no API key is found, shows an interactive wizard that lets the user
|
|
5
|
+
* paste a key immediately (no restart needed). After saving, launches the
|
|
6
|
+
* TUI with a recommended free model so the first chat works in < 30 seconds.
|
|
7
|
+
*
|
|
8
|
+
* Also detects: OpenRouter free tokens, NVIDIA free tier, environment vars.
|
|
8
9
|
*/
|
|
9
10
|
import { join } from "node:path";
|
|
10
11
|
import { homedir } from "node:os";
|
|
11
12
|
import { existsSync, readFileSync } from "node:fs";
|
|
12
|
-
import { stdout } from "node:process";
|
|
13
|
+
import { stdout, stdin } from "node:process";
|
|
14
|
+
import { createInterface } from "node:readline";
|
|
15
|
+
import { saveKey } from "../auth/keystore.js";
|
|
16
|
+
import { defaultTheme, style } from "../tui/theme.js";
|
|
13
17
|
const ENV_KEYS = [
|
|
14
18
|
"OPENROUTER_API_KEY",
|
|
15
19
|
"ANTHROPIC_API_KEY",
|
|
@@ -17,6 +21,15 @@ const ENV_KEYS = [
|
|
|
17
21
|
"DEEPSEEK_API_KEY",
|
|
18
22
|
"NVIDIA_API_KEY",
|
|
19
23
|
"GEMINI_API_KEY",
|
|
24
|
+
"FIREWORKS_API_KEY",
|
|
25
|
+
"GROQ_API_KEY",
|
|
26
|
+
"MISTRAL_API_KEY",
|
|
27
|
+
"COHERE_API_KEY",
|
|
28
|
+
"CEREBRAS_API_KEY",
|
|
29
|
+
"TOGETHER_API_KEY",
|
|
30
|
+
"PERPLEXITY_API_KEY",
|
|
31
|
+
"XAI_API_KEY",
|
|
32
|
+
"ZAI_API_KEY",
|
|
20
33
|
];
|
|
21
34
|
const KEYSTORE_PATH = join(homedir(), ".dirgha", "keys.json");
|
|
22
35
|
export function checkFirstRun() {
|
|
@@ -41,46 +54,91 @@ export function checkFirstRun() {
|
|
|
41
54
|
}
|
|
42
55
|
return true;
|
|
43
56
|
}
|
|
57
|
+
// Key-by-prefix detection so users can paste any common key format.
|
|
58
|
+
const KEY_PREFIXES = {
|
|
59
|
+
"sk-or-v1": { name: "OpenRouter", url: "https://openrouter.ai/keys" },
|
|
60
|
+
"sk-ant": { name: "Anthropic", url: "https://console.anthropic.com" },
|
|
61
|
+
"sk-proj": { name: "OpenAI", url: "https://platform.openai.com/api-keys" },
|
|
62
|
+
"sk-": {
|
|
63
|
+
name: "OpenAI",
|
|
64
|
+
url: "https://platform.openai.com/api-keys",
|
|
65
|
+
},
|
|
66
|
+
"nvapi-": {
|
|
67
|
+
name: "NVIDIA NIM (free)",
|
|
68
|
+
url: "https://build.nvidia.com/settings/api-keys",
|
|
69
|
+
},
|
|
70
|
+
gsk_: { name: "Gemini", url: "https://aistudio.google.com/apikey" },
|
|
71
|
+
fw_: {
|
|
72
|
+
name: "Fireworks",
|
|
73
|
+
url: "https://fireworks.ai/account/api-keys",
|
|
74
|
+
},
|
|
75
|
+
mLzHL: {
|
|
76
|
+
name: "Mistral",
|
|
77
|
+
url: "https://console.mistral.ai/api-keys",
|
|
78
|
+
},
|
|
79
|
+
"coa-": {
|
|
80
|
+
name: "Cohere",
|
|
81
|
+
url: "https://dashboard.cohere.com/api-keys",
|
|
82
|
+
},
|
|
83
|
+
};
|
|
44
84
|
export async function showWelcomeWizard() {
|
|
45
|
-
const
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
const
|
|
49
|
-
const
|
|
50
|
-
const R = "\x1b[0m";
|
|
51
|
-
stdout.write(`\n`);
|
|
52
|
-
stdout.write(`${G} ╭─────────────────────────────────────────╮${R}\n`);
|
|
53
|
-
stdout.write(`${G} │${R} ${G}│${R}\n`);
|
|
54
|
-
stdout.write(`${G} │${R} ${C} ██████╗ ██╗██████╗ ██████╗ ██╗ ██╗ █████╗ ${G}│${R}\n`);
|
|
55
|
-
stdout.write(`${G} │${R} ${C} ██╔══██╗██║██╔══██╗██╔════╝ ██║ ██║██╔══██╗ ${G}│${R}\n`);
|
|
56
|
-
stdout.write(`${G} │${R} ${C} ██║ ██║██║██████╔╝██║ ███╗███████║███████║ ${G}│${R}\n`);
|
|
57
|
-
stdout.write(`${G} │${R} ${C} ██║ ██║██║██╔══██╗██║ ██║██╔══██║██╔══██║ ${G}│${R}\n`);
|
|
58
|
-
stdout.write(`${G} │${R} ${C} ██████╔╝██║██║ ██║╚██████╔╝██║ ██║██║ ██║ ${G}│${R}\n`);
|
|
59
|
-
stdout.write(`${G} │${R} ${C} ╚═════╝ ╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ${G}│${R}\n`);
|
|
60
|
-
stdout.write(`${G} │${R} ${G}│${R}\n`);
|
|
61
|
-
stdout.write(`${G} ╰─────────────────────────────────────────╯${R}\n`);
|
|
62
|
-
stdout.write(`\n`);
|
|
63
|
-
stdout.write(` ${B}Welcome to Dirgha!${R} Let's get you coding.\n`);
|
|
64
|
-
stdout.write(`\n`);
|
|
65
|
-
stdout.write(` ${B}Choose a provider to get started:${R}\n`);
|
|
66
|
-
stdout.write(`\n`);
|
|
67
|
-
stdout.write(` ${M}A)${R} OpenRouter — one key, 200+ models (easiest)\n`);
|
|
68
|
-
stdout.write(` → Get key: ${C}https://openrouter.ai/keys${R}\n`);
|
|
69
|
-
stdout.write(` → Then run: ${Y}/keys set OPENROUTER_API_KEY <your-key>${R}\n`);
|
|
70
|
-
stdout.write(`\n`);
|
|
71
|
-
stdout.write(` ${M}B)${R} NVIDIA NIM — free models, no credit card\n`);
|
|
72
|
-
stdout.write(` → Get key: ${C}https://build.nvidia.com/settings/api-keys${R}\n`);
|
|
73
|
-
stdout.write(` → Then run: ${Y}/keys set NVIDIA_API_KEY <your-key>${R}\n`);
|
|
85
|
+
const T = defaultTheme;
|
|
86
|
+
const bold = (s) => style(T.accent, s);
|
|
87
|
+
const accent = (s) => style(T.accent, s);
|
|
88
|
+
const success = (s) => style(T.success, s);
|
|
89
|
+
const warning = (s) => style(T.warning, s);
|
|
74
90
|
stdout.write(`\n`);
|
|
75
|
-
stdout.write(` ${
|
|
76
|
-
stdout.write(` → Run: ${Y}dirgha setup${R} (interactive wizard)\n`);
|
|
91
|
+
stdout.write(` ${bold("◆ DIRGHA CODE")}\n`);
|
|
77
92
|
stdout.write(`\n`);
|
|
78
|
-
stdout.write(` ${
|
|
79
|
-
stdout.write(` → ${Y}/model tencent/hy3-preview:free${R}\n`);
|
|
93
|
+
stdout.write(` ${bold("Welcome!")} Paste an API key to get started.\n`);
|
|
80
94
|
stdout.write(`\n`);
|
|
81
|
-
stdout.write(` ${
|
|
82
|
-
stdout.write(
|
|
83
|
-
stdout.write(`
|
|
95
|
+
stdout.write(` ${accent("Quick start options:")}\n`);
|
|
96
|
+
stdout.write(` ${success("OpenRouter")} (200+ models): ${accent("https://openrouter.ai/keys")}\n`);
|
|
97
|
+
stdout.write(` ${success("NVIDIA NIM")} (free tier): ${accent("https://build.nvidia.com")}\n`);
|
|
98
|
+
stdout.write(` ${success("DeepSeek")} (cheap + fast): ${accent("https://platform.deepseek.com")}\n`);
|
|
84
99
|
stdout.write(`\n`);
|
|
100
|
+
stdout.write(` Paste your key below (or press Enter to skip):\n`);
|
|
101
|
+
stdout.write(` > `);
|
|
102
|
+
const rl = createInterface({ input: stdin, output: stdout });
|
|
103
|
+
const key = await new Promise((resolve) => {
|
|
104
|
+
rl.once("line", (line) => {
|
|
105
|
+
rl.close();
|
|
106
|
+
resolve(line.trim());
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
if (key.length === 0) {
|
|
110
|
+
stdout.write(`\n ${warning("Skipped.")} Run ${accent("dirgha")} and use ${success("/keys set")} to add a key later.\n`);
|
|
111
|
+
stdout.write(` Free models available: ${accent("/model tencent/hy3-preview:free")}\n\n`);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
// Auto-detect provider from key prefix.
|
|
115
|
+
const envVar = detectProviderFromKey(key);
|
|
116
|
+
await saveKey(envVar, key);
|
|
117
|
+
stdout.write(`\n ${success("Key saved")} as ${bold(envVar)}.\n`);
|
|
118
|
+
stdout.write(` Starting Dirgha with a free model...\n\n`);
|
|
119
|
+
}
|
|
120
|
+
function detectProviderFromKey(key) {
|
|
121
|
+
for (const [prefix, info] of Object.entries(KEY_PREFIXES)) {
|
|
122
|
+
if (key.startsWith(prefix)) {
|
|
123
|
+
if (info.name === "OpenRouter")
|
|
124
|
+
return "OPENROUTER_API_KEY";
|
|
125
|
+
if (info.name === "Anthropic")
|
|
126
|
+
return "ANTHROPIC_API_KEY";
|
|
127
|
+
if (info.name === "OpenAI")
|
|
128
|
+
return "OPENAI_API_KEY";
|
|
129
|
+
if (info.name.includes("NVIDIA"))
|
|
130
|
+
return "NVIDIA_API_KEY";
|
|
131
|
+
if (info.name === "Gemini")
|
|
132
|
+
return "GEMINI_API_KEY";
|
|
133
|
+
if (info.name === "Fireworks")
|
|
134
|
+
return "FIREWORKS_API_KEY";
|
|
135
|
+
if (info.name === "Mistral")
|
|
136
|
+
return "MISTRAL_API_KEY";
|
|
137
|
+
if (info.name === "Cohere")
|
|
138
|
+
return "COHERE_API_KEY";
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
return "OPENROUTER_API_KEY"; // default fallback
|
|
85
143
|
}
|
|
86
144
|
//# sourceMappingURL=first-run.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-run.js","sourceRoot":"","sources":["../../src/cli/first-run.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"first-run.js","sourceRoot":"","sources":["../../src/cli/first-run.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,QAAQ,GAAG;IACf,oBAAoB;IACpB,mBAAmB;IACnB,gBAAgB;IAChB,kBAAkB;IAClB,gBAAgB;IAChB,gBAAgB;IAChB,mBAAmB;IACnB,cAAc;IACd,iBAAiB;IACjB,gBAAgB;IAChB,kBAAkB;IAClB,kBAAkB;IAClB,oBAAoB;IACpB,aAAa;IACb,aAAa;CACL,CAAC;AAEX,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AAE9D,MAAM,UAAU,aAAa;IAC3B,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAChD,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;gBACf,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA2B,CAAC;gBACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CACpD,CAAC;gBACF,IAAI,QAAQ;oBAAE,OAAO,KAAK,CAAC;YAC7B,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;IACjD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oEAAoE;AACpE,MAAM,YAAY,GAAkD;IAClE,UAAU,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,4BAA4B,EAAE;IACrE,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,+BAA+B,EAAE;IACrE,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,sCAAsC,EAAE;IAC1E,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,sCAAsC;KAC5C;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,mBAAmB;QACzB,GAAG,EAAE,4CAA4C;KAClD;IACD,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,oCAAoC,EAAE;IACnE,GAAG,EAAE;QACH,IAAI,EAAE,WAAW;QACjB,GAAG,EAAE,uCAAuC;KAC7C;IACD,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;QACf,GAAG,EAAE,qCAAqC;KAC3C;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,uCAAuC;KAC7C;CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,CAAC,GAAG,YAAY,CAAC;IACvB,MAAM,IAAI,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAE3D,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,qCAAqC,CAAC,CAAC;IACzE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,CAAC,KAAK,CACV,KAAK,OAAO,CAAC,YAAY,CAAC,mBAAmB,MAAM,CAAC,4BAA4B,CAAC,IAAI,CACtF,CAAC;IACF,MAAM,CAAC,KAAK,CACV,KAAK,OAAO,CAAC,YAAY,CAAC,oBAAoB,MAAM,CAAC,0BAA0B,CAAC,IAAI,CACrF,CAAC;IACF,MAAM,CAAC,KAAK,CACV,KAAK,OAAO,CAAC,UAAU,CAAC,uBAAuB,MAAM,CAAC,+BAA+B,CAAC,IAAI,CAC3F,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACnE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAErB,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QAChD,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACvB,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,KAAK,CACV,OAAO,OAAO,CAAC,UAAU,CAAC,QAAQ,MAAM,CAAC,QAAQ,CAAC,YAAY,OAAO,CAAC,WAAW,CAAC,wBAAwB,CAC3G,CAAC;QACF,MAAM,CAAC,KAAK,CACV,4BAA4B,MAAM,CAAC,iCAAiC,CAAC,MAAM,CAC5E,CAAC;QACF,OAAO;IACT,CAAC;IAED,wCAAwC;IACxC,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE3B,MAAM,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAW;IACxC,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;gBAAE,OAAO,oBAAoB,CAAC;YAC5D,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO,mBAAmB,CAAC;YAC1D,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,gBAAgB,CAAC;YACpD,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,OAAO,gBAAgB,CAAC;YAC1D,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,gBAAgB,CAAC;YACpD,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO,mBAAmB,CAAC;YAC1D,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;gBAAE,OAAO,iBAAiB,CAAC;YACtD,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,gBAAgB,CAAC;YACpD,MAAM;QACR,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,CAAC,mBAAmB;AAClD,CAAC"}
|