@dirgha/code 1.20.39 → 1.22.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.
Files changed (217) hide show
  1. package/CHANGELOG.md +0 -57
  2. package/README.md +4 -8
  3. package/dist/auth/keypool.js +26 -40
  4. package/dist/auth/keypool.js.map +1 -1
  5. package/dist/auth/keystore.js +11 -16
  6. package/dist/auth/keystore.js.map +1 -1
  7. package/dist/cli/config.d.ts +5 -8
  8. package/dist/cli/config.js +3 -24
  9. package/dist/cli/config.js.map +1 -1
  10. package/dist/cli/first-run.js +24 -40
  11. package/dist/cli/first-run.js.map +1 -1
  12. package/dist/cli/flows/wizard.js +18 -12
  13. package/dist/cli/flows/wizard.js.map +1 -1
  14. package/dist/cli/interactive.d.ts +0 -4
  15. package/dist/cli/interactive.js +1 -29
  16. package/dist/cli/interactive.js.map +1 -1
  17. package/dist/cli/main.js +18 -69
  18. package/dist/cli/main.js.map +1 -1
  19. package/dist/cli/slash/fleet.js +1 -19
  20. package/dist/cli/slash/fleet.js.map +1 -1
  21. package/dist/cli/slash/models.js +2 -4
  22. package/dist/cli/slash/models.js.map +1 -1
  23. package/dist/cli/slash/paste.js +7 -4
  24. package/dist/cli/slash/paste.js.map +1 -1
  25. package/dist/cli/slash.js +10 -26
  26. package/dist/cli/slash.js.map +1 -1
  27. package/dist/cli/subcommands/audit.js +8 -28
  28. package/dist/cli/subcommands/audit.js.map +1 -1
  29. package/dist/cli/subcommands/doctor.d.ts +0 -4
  30. package/dist/cli/subcommands/doctor.js +21 -51
  31. package/dist/cli/subcommands/doctor.js.map +1 -1
  32. package/dist/cli/subcommands/feature-setup.js +6 -6
  33. package/dist/cli/subcommands/feature-setup.js.map +1 -1
  34. package/dist/cli/subcommands/memory.js +0 -23
  35. package/dist/cli/subcommands/memory.js.map +1 -1
  36. package/dist/cli/subcommands/telemetry.d.ts +1 -2
  37. package/dist/cli/subcommands/telemetry.js +34 -47
  38. package/dist/cli/subcommands/telemetry.js.map +1 -1
  39. package/dist/context/branch.d.ts +2 -2
  40. package/dist/context/branch.js +23 -40
  41. package/dist/context/branch.js.map +1 -1
  42. package/dist/context/compaction.js +21 -44
  43. package/dist/context/compaction.js.map +1 -1
  44. package/dist/context/git-state.js +18 -31
  45. package/dist/context/git-state.js.map +1 -1
  46. package/dist/context/knowledge.js +20 -31
  47. package/dist/context/knowledge.js.map +1 -1
  48. package/dist/context/memory.js +1 -8
  49. package/dist/context/memory.js.map +1 -1
  50. package/dist/context/mode-enforcement.js +1 -11
  51. package/dist/context/mode-enforcement.js.map +1 -1
  52. package/dist/context/mode.js +30 -67
  53. package/dist/context/mode.js.map +1 -1
  54. package/dist/context/primer.js +3 -15
  55. package/dist/context/primer.js.map +1 -1
  56. package/dist/fleet/apply-back.js +1 -5
  57. package/dist/fleet/apply-back.js.map +1 -1
  58. package/dist/fleet/cli-command.d.ts +0 -2
  59. package/dist/fleet/cli-command.js +1 -15
  60. package/dist/fleet/cli-command.js.map +1 -1
  61. package/dist/fleet/runner.js +2 -35
  62. package/dist/fleet/runner.js.map +1 -1
  63. package/dist/fleet/scratchpad.js +2 -1
  64. package/dist/fleet/scratchpad.js.map +1 -1
  65. package/dist/fleet/state.d.ts +0 -4
  66. package/dist/fleet/state.js +2 -11
  67. package/dist/fleet/state.js.map +1 -1
  68. package/dist/fleet/templates.d.ts +0 -4
  69. package/dist/fleet/templates.js.map +1 -1
  70. package/dist/fleet/types.d.ts +0 -4
  71. package/dist/fleet/types.js.map +1 -1
  72. package/dist/intelligence/failover-chain.js +1 -10
  73. package/dist/intelligence/failover-chain.js.map +1 -1
  74. package/dist/intelligence/prices.d.ts +4 -6
  75. package/dist/intelligence/prices.js +10 -36
  76. package/dist/intelligence/prices.js.map +1 -1
  77. package/dist/kernel/agent-loop.js +17 -60
  78. package/dist/kernel/agent-loop.js.map +1 -1
  79. package/dist/lsp/client.js +16 -29
  80. package/dist/lsp/client.js.map +1 -1
  81. package/dist/lsp/detector.js +6 -7
  82. package/dist/lsp/detector.js.map +1 -1
  83. package/dist/mcp/client.d.ts +1 -1
  84. package/dist/mcp/client.js +16 -19
  85. package/dist/mcp/client.js.map +1 -1
  86. package/dist/mcp/transport.js +38 -46
  87. package/dist/mcp/transport.js.map +1 -1
  88. package/dist/providers/deepseek.js +1 -1
  89. package/dist/providers/deepseek.js.map +1 -1
  90. package/dist/providers/dispatch.js +1 -15
  91. package/dist/providers/dispatch.js.map +1 -1
  92. package/dist/providers/index.d.ts +0 -11
  93. package/dist/providers/index.js +2 -29
  94. package/dist/providers/index.js.map +1 -1
  95. package/dist/providers/nvidia.js +1 -1
  96. package/dist/providers/nvidia.js.map +1 -1
  97. package/dist/providers/openai-compat.js +2 -4
  98. package/dist/providers/openai-compat.js.map +1 -1
  99. package/dist/providers/openrouter.js +1 -1
  100. package/dist/providers/openrouter.js.map +1 -1
  101. package/dist/safety/audit-log.d.ts +0 -15
  102. package/dist/safety/audit-log.js +0 -21
  103. package/dist/safety/audit-log.js.map +1 -1
  104. package/dist/state/db-telemetry.js +1 -11
  105. package/dist/state/db-telemetry.js.map +1 -1
  106. package/dist/state/db.js +1 -53
  107. package/dist/state/db.js.map +1 -1
  108. package/dist/tools/browser.js +16 -24
  109. package/dist/tools/browser.js.map +1 -1
  110. package/dist/tools/checkpoint.d.ts +1 -6
  111. package/dist/tools/checkpoint.js +62 -79
  112. package/dist/tools/checkpoint.js.map +1 -1
  113. package/dist/tools/cron.js +3 -1
  114. package/dist/tools/cron.js.map +1 -1
  115. package/dist/tools/diff.js +21 -25
  116. package/dist/tools/diff.js.map +1 -1
  117. package/dist/tools/exec.d.ts +0 -2
  118. package/dist/tools/exec.js +0 -13
  119. package/dist/tools/exec.js.map +1 -1
  120. package/dist/tools/fs-edit.d.ts +5 -3
  121. package/dist/tools/fs-edit.js +23 -8
  122. package/dist/tools/fs-edit.js.map +1 -1
  123. package/dist/tools/fs-ls.js +8 -6
  124. package/dist/tools/fs-ls.js.map +1 -1
  125. package/dist/tools/fs-read.d.ts +1 -1
  126. package/dist/tools/fs-read.js +28 -37
  127. package/dist/tools/fs-read.js.map +1 -1
  128. package/dist/tools/fs-write.d.ts +1 -1
  129. package/dist/tools/fs-write.js +33 -33
  130. package/dist/tools/fs-write.js.map +1 -1
  131. package/dist/tools/git.js +6 -12
  132. package/dist/tools/git.js.map +1 -1
  133. package/dist/tools/index.d.ts +2 -5
  134. package/dist/tools/index.js +4 -7
  135. package/dist/tools/index.js.map +1 -1
  136. package/dist/tools/multimodal.js +12 -11
  137. package/dist/tools/multimodal.js.map +1 -1
  138. package/dist/tools/rtk.js +9 -22
  139. package/dist/tools/rtk.js.map +1 -1
  140. package/dist/tools/search-glob.d.ts +1 -1
  141. package/dist/tools/search-glob.js +24 -42
  142. package/dist/tools/search-glob.js.map +1 -1
  143. package/dist/tools/search-grep.d.ts +1 -1
  144. package/dist/tools/search-grep.js +32 -56
  145. package/dist/tools/search-grep.js.map +1 -1
  146. package/dist/tools/shell.d.ts +1 -7
  147. package/dist/tools/shell.js +61 -114
  148. package/dist/tools/shell.js.map +1 -1
  149. package/dist/tui/ink/App.d.ts +1 -2
  150. package/dist/tui/ink/App.js +72 -178
  151. package/dist/tui/ink/App.js.map +1 -1
  152. package/dist/tui/ink/components/DenseToolMessage.js +3 -20
  153. package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
  154. package/dist/tui/ink/components/InputBox.js +15 -16
  155. package/dist/tui/ink/components/InputBox.js.map +1 -1
  156. package/dist/tui/ink/components/KeySetOverlay.d.ts +1 -1
  157. package/dist/tui/ink/components/KeySetOverlay.js +16 -18
  158. package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
  159. package/dist/tui/ink/components/Logo.d.ts +0 -20
  160. package/dist/tui/ink/components/Logo.js +1 -67
  161. package/dist/tui/ink/components/Logo.js.map +1 -1
  162. package/dist/tui/ink/components/ModelPicker.d.ts +2 -2
  163. package/dist/tui/ink/components/ModelPicker.js +26 -34
  164. package/dist/tui/ink/components/ModelPicker.js.map +1 -1
  165. package/dist/tui/ink/components/PasteCollapse.d.ts +1 -3
  166. package/dist/tui/ink/components/PasteCollapse.js +9 -11
  167. package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
  168. package/dist/tui/ink/components/SpinnerGlyph.d.ts +4 -4
  169. package/dist/tui/ink/components/SpinnerGlyph.js +14 -34
  170. package/dist/tui/ink/components/SpinnerGlyph.js.map +1 -1
  171. package/dist/tui/ink/components/StatusBar.js +2 -0
  172. package/dist/tui/ink/components/StatusBar.js.map +1 -1
  173. package/dist/tui/ink/components/ThinkingBlock.d.ts +4 -15
  174. package/dist/tui/ink/components/ThinkingBlock.js +17 -34
  175. package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
  176. package/dist/tui/ink/components/ToolBox.js +13 -21
  177. package/dist/tui/ink/components/ToolBox.js.map +1 -1
  178. package/dist/tui/ink/components/VirtualTranscript.d.ts +1 -1
  179. package/dist/tui/ink/components/VirtualTranscript.js +3 -5
  180. package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
  181. package/dist/tui/ink/index.js +1 -17
  182. package/dist/tui/ink/index.js.map +1 -1
  183. package/dist/tui/ink/theme-context.js +3 -6
  184. package/dist/tui/ink/theme-context.js.map +1 -1
  185. package/dist/tui/ink/use-declined-versions.js +2 -6
  186. package/dist/tui/ink/use-declined-versions.js.map +1 -1
  187. package/dist/tui/ink/use-elapsed.d.ts +1 -9
  188. package/dist/tui/ink/use-elapsed.js +2 -17
  189. package/dist/tui/ink/use-elapsed.js.map +1 -1
  190. package/dist/tui/ink/use-event-projection.d.ts +0 -2
  191. package/dist/tui/ink/use-event-projection.js +2 -21
  192. package/dist/tui/ink/use-event-projection.js.map +1 -1
  193. package/dist/tui/ink/use-flicker-detector.js +0 -9
  194. package/dist/tui/ink/use-flicker-detector.js.map +1 -1
  195. package/dist/tui/ink/use-overlays.js +17 -16
  196. package/dist/tui/ink/use-overlays.js.map +1 -1
  197. package/dist/tui/ink/use-render-metrics.js +5 -18
  198. package/dist/tui/ink/use-render-metrics.js.map +1 -1
  199. package/package.json +6 -5
  200. package/dist/telemetry/gateway-push.d.ts +0 -17
  201. package/dist/telemetry/gateway-push.js +0 -48
  202. package/dist/telemetry/gateway-push.js.map +0 -1
  203. package/dist/telemetry/index.d.ts +0 -9
  204. package/dist/telemetry/index.js +0 -9
  205. package/dist/telemetry/index.js.map +0 -1
  206. package/dist/tools/github.d.ts +0 -13
  207. package/dist/tools/github.js +0 -257
  208. package/dist/tools/github.js.map +0 -1
  209. package/dist/tui/ink/markdown/syntax-highlight.d.ts +0 -13
  210. package/dist/tui/ink/markdown/syntax-highlight.js +0 -91
  211. package/dist/tui/ink/markdown/syntax-highlight.js.map +0 -1
  212. package/dist/utils/env.d.ts +0 -1
  213. package/dist/utils/env.js +0 -60
  214. package/dist/utils/env.js.map +0 -1
  215. package/dist/utils/fs.d.ts +0 -10
  216. package/dist/utils/fs.js +0 -37
  217. package/dist/utils/fs.js.map +0 -1
package/CHANGELOG.md CHANGED
@@ -2,63 +2,6 @@
2
2
 
3
3
  All notable changes are tracked here. Format loosely follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); we use [Semantic Versioning](https://semver.org/).
4
4
 
5
- ## [1.20.39](https://github.com/Dirgha-AI/dirgha-code/compare/v1.20.38...v1.20.39) (2026-05-08)
6
-
7
-
8
- ### Bug Fixes
9
-
10
- * **tui:** default alt buffer off + emit OSC terminal title ([1f7dbb4](https://github.com/Dirgha-AI/dirgha-code/commit/1f7dbb41ac8eb4fbfad5b0a8ec5f8ab2f0a68336))
11
-
12
- ## [1.20.38](https://github.com/Dirgha-AI/dirgha-code/compare/v1.20.37...v1.20.38) (2026-05-08)
13
-
14
-
15
- ### Bug Fixes
16
-
17
- * **tui:** upgrade ink 5→7 + react 18→19 for synchronized output (DECSET 2026) ([cf9eb4f](https://github.com/Dirgha-AI/dirgha-code/commit/cf9eb4f3beb50ac7517c6aa4b10114b3c6b6739c))
18
-
19
- ## [1.20.37](https://github.com/Dirgha-AI/dirgha-code/compare/v1.20.36...v1.20.37) (2026-05-08)
20
-
21
-
22
- ### Bug Fixes
23
-
24
- * **tui:** stop 1Hz body pulse from idle ToolBox elapsed subscriptions ([c734d97](https://github.com/Dirgha-AI/dirgha-code/commit/c734d976b0cf5953518b19d74148ef19d6fe04de))
25
-
26
- ## [1.20.36](https://github.com/Dirgha-AI/dirgha-code/compare/v1.20.35...v1.20.36) (2026-05-08)
27
-
28
-
29
- ### Bug Fixes
30
-
31
- * **tui+kernel:** logo re-emit flicker + TTFT retry storm ([4dc8448](https://github.com/Dirgha-AI/dirgha-code/commit/4dc8448eb9343baf3e996a0ade05f44e0ec5075a))
32
-
33
- ## [1.20.35](https://github.com/Dirgha-AI/dirgha-code/compare/v1.20.34...v1.20.35) (2026-05-08)
34
-
35
-
36
- ### Bug Fixes
37
-
38
- * **cli:** YOLO mode interactive env propagation + jitter stability test harness ([6a5aec0](https://github.com/Dirgha-AI/dirgha-code/commit/6a5aec038e17a5cc9c913a6045a967788f939789))
39
- * **smoke:** repair nightly Provider Smoke matrix ([a59469f](https://github.com/Dirgha-AI/dirgha-code/commit/a59469f42ca81948cc95803f0d6d1352a187e141))
40
-
41
- ## [1.20.34] — 2026-05-08
42
-
43
- ### Fixed
44
-
45
- - **5-min total-request timeout was too lenient.** `nvidia.ts`, `openrouter.ts`, and `deepseek.ts` defaulted `timeoutMs` to 300_000. Combined with the 30 s mid-stream stall detector that's effectively the worst-case wait a user can hit on a stuck upstream — verified live: `meta/llama-4-maverick-17b-128e-instruct` on NIM hangs 300 s on tool-call requests before erroring out. Lowered to 90_000 across all three adapters: enough headroom for any single-turn LLM response, but the user now waits ≤90 s on a wedged provider instead of 5 min.
46
- - **`buildFailoverChain` could auto-pick known-broken free models.** Two free NIM models reliably hung in the 2026-05-08 audit: `minimaxai/minimax-m2.7` (60 s timeout, 0 bytes) and `meta/llama-4-maverick-17b-128e-instruct` (300 s on tool calls). `src/intelligence/failover-chain.ts` now soft-blacklists both from the free-fallback tier so a primary failure doesn't auto-route onto a wedged model. They remain in `dirgha models list` for manual `--model` selection.
47
- - **`dirgha doctor` cleans up legacy `doctor-probe-<ts>` pollution on first run.** v1.20.33 stopped *creating* timestamped probe entries (singleton id now), but machines upgraded from earlier versions still carried the old pile. `checkMemoryStore` now sweeps any id matching `^doctor-probe-\d+` before writing the singleton, so a single doctor invocation cleans up the backlog.
48
- - **`dirgha doctor` exit code now gates on local checks only by default.** Pre-fix, an invalid Anthropic key (or any remote-auth failure) caused exit 1, breaking the use of `dirgha doctor` as a CI smoke probe. Now: default exit considers only local checks (`node`, `git`, `dirgha-home`, `terminal`, `lsp`, `cron`, `disk-space`, `session-store`, `memory-store`, `db-errors`); pass `--strict` to restore the union behaviour.
49
- - **TUI spinner now shows "warming up" hint on slow first-token.** The `GeneratingIndicator` rendered a static `generating…` for the entire duration of the agent turn. On free-tier NIM models with 10-30 s time-to-first-token (Kimi K2.6 routinely) new users assumed the CLI was stuck. The indicator now shows elapsed seconds and, after 5 s of zero output tokens, switches to `warming up · 12s · first token can take 10-30s on free models`. Flips back to `generating · Xs` once tokens flow.
50
-
51
- ## [1.20.33] — 2026-05-08
52
-
53
- ### Fixed
54
-
55
- - **SQLite was disabled by an ESM/CJS bug.** `src/state/db.ts` called bare `require("better-sqlite3")` from inside an ES Module. At runtime this threw `ReferenceError: require is not defined`, which the `catch` rewrote as `SQLite unavailable (optional feature) — run "dirgha setup --features" to install.`. Every CLI invocation failed to open `~/.dirgha/dirgha.db`, even though the native module is bundled with `@dirgha/code` and the database file already existed and was healthy. On affected machines, message persistence had been silently failing for an unknown number of releases. Replaced with `createRequire(import.meta.url)`. Same fix applied to dormant `require()` calls in `src/cli/slash/paste.ts` and `src/cli/subcommands/feature-setup.ts`.
56
- - **Spurious "DB writes failing" warning.** `src/state/db-telemetry.ts` armed the stderr warning at `failedWrites >= 10` and persisted that counter across processes, so once an environment crossed the threshold every future run printed the warning forever. The warning also lacked the actual cause. Now the warning includes `telemetry.lastError` (so users see what to fix), and `failedWrites` resets to 0 on the first successful write of the process.
57
- - **`dirgha audit tail` hung in non-TTY contexts.** The subcommand always installed `fs.watch` and waited for SIGINT, so any pipe / script / CI invocation blocked indefinitely. Added `--no-follow` and `-n N` (`--last N`) flags; default to no-follow when `process.stdout.isTTY` is `false`, matching the `journalctl` / `kubectl logs` pattern. The `(following — Ctrl-C to stop)` hint is now suppressed in non-follow mode.
58
- - **`dirgha doctor` playwright check was cwd-dependent.** Spawned `node -e "require('playwright')"` whose subprocess inherited `process.cwd()`, so the resolution matched `<cwd>/node_modules/playwright` and gave false negatives anywhere outside the CLI's own checkout. Replaced with an in-process `createRequire(import.meta.url).resolve("playwright")` probe rooted at the CLI's install location.
59
- - **`dirgha doctor` polluted user memory.** `checkSessionStore` and `checkMemoryStore` wrote a probe entry with id `doctor-probe-${Date.now()}` on every invocation, accumulating in `~/.dirgha/memory/` (one machine had 18 of them, drowning user-authored entries in `dirgha memory list`). Switched to a fixed singleton id `doctor-probe` plus best-effort cleanup; each doctor run now leaves at most one probe entry behind.
60
- - **`dirgha memory add "<long human string>"` was hard-rejected.** A single positional containing spaces, colons, or other non-id characters failed with `Invalid memory key …` (also the wrong noun: the help and rest of the codebase say `id`). Now: when only one positional is supplied and it isn't a valid id, the CLI auto-slugifies it (lowercase, runs of non-id chars → dash, trim, cap at 60 chars, fallback `memory-<unix-ms>`), uses the slug as id and the original string as description, and prints `(slugified from "...")` so the user sees what happened. The two-arg form is unchanged. Validation error message now says "id" not "key".
61
-
62
5
  ## [1.20.10] — 2026-05-03
63
6
 
64
7
  ### Fixed
package/README.md CHANGED
@@ -49,10 +49,6 @@ Information flows up. Old context gets distilled, not discarded.
49
49
 
50
50
  `dirgha fleet launch "<goal>"` decomposes the goal into N independent tasks, spawns each in its own git worktree, runs them in parallel, and merges the winners back. `dirgha fleet triple "<goal>"` runs three approaches and lets a judge pick. `dirgha fleet dag "step1..." "step2..." "step3..."` chains agents sequentially with cumulative context propagation — each step builds on the previous one's output. Inside any session, the agent can call the `task` tool to dispatch a fresh sub-agent with its own context budget for a sub-problem — no compaction loss on the parent.
51
51
 
52
- ### GitHub — native, not shelled
53
-
54
- `dirgha` ships a `github` tool that wraps `gh` CLI: create and list PRs (`pr_create`, `pr_list`), create and list issues (`issue_create`, `issue_list`), inspect repos (`repo_view`). The agent can open a PR in the same turn it finishes a fix — no copy-pasting URLs. Requires `gh` installed and authenticated (`gh auth login`). The `git` tool handles commit / push / status / diff; `github` handles the GitHub layer on top.
55
-
56
52
  ### Skills, scanned
57
53
 
58
54
  SKILL.md packs are portable Markdown agents — share one git URL, anyone can `dirgha skills install <url>`. Every third-party skill is scanned at install AND load time by a heuristic prompt-injection / supply-chain check. Critical findings block. Today: 112 installed across 4 packs, 74 allow · 36 warn · 2 block. TypeScript / ESM plugins are the sibling concept — drop a `.mjs` at `~/.dirgha/extensions/<name>/index.mjs` and register tools, slashes, subcommands, or lifecycle hooks in ~20 lines.
@@ -78,7 +74,7 @@ The interactive TUI is `dirgha` with no args. Resume a session with `dirgha resu
78
74
  | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
79
75
  | **17 providers** | anthropic, openai, gemini, openrouter, nvidia, fireworks, deepseek, groq, cerebras, together, deepinfra, mistral, xai, perplexity, cohere, kimi, zai |
80
76
  | **34 model aliases** | `kimi`, `opus`, `sonnet`, `haiku`, `gemini`, `flash`, `deepseek`, `llama`, `ling`, `hy3`, … resolved before routing |
81
- | **18 built-in tools** | `fs_read`, `fs_write`, `fs_edit`, `fs_ls`, `shell`, `git`, `github`, `search_grep`, `search_glob`, `browser`, `checkpoint`, `cron`, `task`, `go_to_definition`, `find_references`, `hover_documentation`, `document_symbols`, `qmd_search` |
77
+ | **12 built-in tools** | `fs_read`, `fs_write`, `fs_edit`, `fs_ls`, `shell`, `search_grep`, `search_glob`, `git`, `browser`, `checkpoint`, `cron`, `task` |
82
78
  | **20 slash commands** | `/account`, `/clear`, `/compact`, `/cost`, `/fleet`, `/keys`, `/login`, `/memory`, `/mode`, `/models`, `/resume`, `/session`, `/status`, `/theme`, `/upgrade`, … |
83
79
  | **18 subcommands** | `audit`, `audit-codebase`, `cost`, `kb`, `keys`, `ledger`, `login`, `models`, `resume`, `skills`, `undo`, `update`, `verify`, … |
84
80
  | **4 modes** | `act` · `plan` (read-only thinking) · `verify` (read-only audit) · `ask` (read-only Q&A) |
@@ -89,10 +85,10 @@ The interactive TUI is `dirgha` with no args. Resume a session with `dirgha resu
89
85
 
90
86
  | | |
91
87
  | -------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
92
- | Tests | **232 vitest + 41 offline** in ~40 s. TS 0 errors, ESLint 0 warnings. CI green is a precondition for any PR. |
88
+ | Tests | **104/104** in ~8 s. TS 0 errors, ESLint 0 warnings. CI green is a precondition for any PR. |
93
89
  | 17 providers | Multi-key BYOK pool with cooldown rotation, 4-tier failover cascade, health scoring with compaction. |
94
- | 18 built-in tools | Per-tool timeout enforcement. Shell 300s (PTY streaming via `streamOutput`), reads 30s, default 60s. |
95
- | Mode enforcement | `git`, `shell`, `fs_write`, `fs_edit`, `browser` are write-gated in `plan` / `verify` / `ask` modes at the kernel hook layer — not just prompt nudging. |
90
+ | 12 built-in tools | Per-tool timeout enforcement. Shell 300s, reads 30s, default 60s. |
91
+ | 16 vulnerability classes fixed in v1.18 | Path traversal (memory/session/scaffold), API key overlay isolation, NaN cost poisoning, LSP timer leak, model routing mismatch, web URL routing, stale-cache fallback, and more. |
96
92
 
97
93
  ## Why this exists
98
94
 
@@ -23,26 +23,24 @@
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, rename, } from "node:fs/promises";
27
- import { homedir } from "node:os";
28
- import { join } from "node:path";
29
- import { randomBytes } from "node:crypto";
26
+ import { chmod, mkdir, readFile, writeFile, stat, unlink } 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, ".dirgha", "keypool.json");
32
+ return join(home, '.dirgha', 'keypool.json');
33
33
  }
34
34
  function lockPath(home = homedir()) {
35
- return join(home, ".dirgha", "keypool.json.lock");
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, ".dirgha"), { recursive: true });
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: "wx" });
43
- return async () => {
44
- await unlink(lp).catch(() => { });
45
- };
42
+ await writeFile(lp, String(process.pid), { flag: 'wx' });
43
+ return async () => { await unlink(lp).catch(() => { }); };
46
44
  }
47
45
  catch {
48
46
  const info = await stat(lp).catch(() => undefined);
@@ -50,42 +48,32 @@ async function acquireLock(home) {
50
48
  await unlink(lp).catch(() => { });
51
49
  continue;
52
50
  }
53
- await new Promise((r) => setTimeout(r, 100));
51
+ await new Promise(r => setTimeout(r, 100));
54
52
  }
55
53
  }
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`);
54
+ // Fall through — last-resort overwrite to avoid deadlock.
55
+ await writeFile(lp, String(process.pid));
56
+ return async () => { await unlink(lp).catch(() => { }); };
64
57
  }
65
58
  export async function readPool(home = homedir()) {
66
- const text = await readFile(poolPath(home), "utf8").catch(() => "");
59
+ const text = await readFile(poolPath(home), 'utf8').catch(() => '');
67
60
  if (!text)
68
61
  return {};
69
62
  try {
70
63
  const parsed = JSON.parse(text);
71
- return parsed && typeof parsed === "object" ? parsed : {};
64
+ return parsed && typeof parsed === 'object' ? parsed : {};
72
65
  }
73
66
  catch {
74
67
  return {};
75
68
  }
76
69
  }
77
70
  async function writePool(pool, home = homedir()) {
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");
71
+ await mkdir(join(home, '.dirgha'), { recursive: true });
72
+ await writeFile(poolPath(home), JSON.stringify(pool, null, 2) + '\n', 'utf8');
82
73
  try {
83
- await chmod(tmp, 0o600);
74
+ await chmod(poolPath(home), 0o600);
84
75
  }
85
- catch {
86
- /* non-POSIX */
87
- }
88
- await rename(tmp, target);
76
+ catch { /* non-POSIX */ }
89
77
  }
90
78
  export async function addEntry(envName, value, opts = {}) {
91
79
  const home = opts.home ?? homedir();
@@ -94,7 +82,7 @@ export async function addEntry(envName, value, opts = {}) {
94
82
  const pool = await readPool(home);
95
83
  const list = pool[envName] ?? [];
96
84
  const entry = {
97
- id: randomBytes(3).toString("hex"),
85
+ id: randomBytes(3).toString('hex'),
98
86
  value,
99
87
  label: opts.label ?? `key-${list.length + 1}`,
100
88
  priority: opts.priority ?? 0,
@@ -116,7 +104,7 @@ export async function removeEntry(envName, id, home = homedir()) {
116
104
  try {
117
105
  const pool = await readPool(home);
118
106
  const list = pool[envName] ?? [];
119
- const next = list.filter((e) => e.id !== id);
107
+ const next = list.filter(e => e.id !== id);
120
108
  if (next.length === list.length)
121
109
  return false;
122
110
  if (next.length === 0)
@@ -152,7 +140,7 @@ export function pickEntry(pool, envName, now = new Date()) {
152
140
  const list = pool[envName];
153
141
  if (!list || list.length === 0)
154
142
  return undefined;
155
- const live = list.filter((e) => !e.exhaustedUntil || new Date(e.exhaustedUntil) <= now);
143
+ const live = list.filter(e => !e.exhaustedUntil || new Date(e.exhaustedUntil) <= now);
156
144
  if (live.length === 0)
157
145
  return undefined;
158
146
  // Highest priority first; tie-break on least-recently-used so we
@@ -171,7 +159,7 @@ export async function markExhausted(envName, id, untilIso, home = homedir()) {
171
159
  const release = await acquireLock(home);
172
160
  try {
173
161
  const pool = await readPool(home);
174
- const entry = (pool[envName] ?? []).find((e) => e.id === id);
162
+ const entry = (pool[envName] ?? []).find(e => e.id === id);
175
163
  if (!entry)
176
164
  return;
177
165
  entry.exhaustedUntil = untilIso;
@@ -188,15 +176,13 @@ export async function touchEntry(envName, id, home = homedir()) {
188
176
  return;
189
177
  try {
190
178
  const pool = await readPool(home);
191
- const entry = (pool[envName] ?? []).find((e) => e.id === id);
179
+ const entry = (pool[envName] ?? []).find(e => e.id === id);
192
180
  if (!entry)
193
181
  return;
194
182
  entry.lastUsedAt = new Date().toISOString();
195
183
  await writePool(pool, home);
196
184
  }
197
- catch {
198
- /* swallow */
199
- }
185
+ catch { /* swallow */ }
200
186
  finally {
201
187
  await release();
202
188
  }
@@ -212,7 +198,7 @@ export async function hydrateEnvFromPool(env = process.env, home = homedir()) {
212
198
  const pool = await readPool(home);
213
199
  const hydrated = [];
214
200
  for (const envName of Object.keys(pool)) {
215
- if (env[envName] !== undefined && env[envName] !== "")
201
+ if (env[envName] !== undefined && env[envName] !== '')
216
202
  continue;
217
203
  const pick = pickEntry(pool, envName);
218
204
  if (!pick)
@@ -1 +1 @@
1
- {"version":3,"file":"keypool.js","sourceRoot":"","sources":["../../src/auth/keypool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keypool.js","sourceRoot":"","sources":["../../src/auth/keypool.ts"],"names":[],"mappings":"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"}
@@ -7,15 +7,14 @@
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, rename } from "node:fs/promises";
11
- import { homedir } from "node:os";
12
- import { join } from "node:path";
13
- import { randomBytes } from "node:crypto";
10
+ import { chmod, mkdir, readFile, writeFile } from 'node:fs/promises';
11
+ import { homedir } from 'node:os';
12
+ import { join } from 'node:path';
14
13
  export function keyStorePath() {
15
- return join(homedir(), ".dirgha", "keys.json");
14
+ return join(homedir(), '.dirgha', 'keys.json');
16
15
  }
17
16
  export async function readKeyStore(path = keyStorePath()) {
18
- const text = await readFile(path, "utf8").catch(() => "");
17
+ const text = await readFile(path, 'utf8').catch(() => '');
19
18
  if (!text)
20
19
  return {};
21
20
  try {
@@ -34,9 +33,9 @@ export async function hydrateEnvFromKeyStore(env = process.env, path = keyStoreP
34
33
  const store = await readKeyStore(path);
35
34
  const hydrated = [];
36
35
  for (const [name, value] of Object.entries(store)) {
37
- if (typeof value !== "string" || value.length === 0)
36
+ if (typeof value !== 'string' || value.length === 0)
38
37
  continue;
39
- if (env[name] === undefined || env[name] === "") {
38
+ if (env[name] === undefined || env[name] === '') {
40
39
  env[name] = value;
41
40
  hydrated.push(name);
42
41
  }
@@ -47,16 +46,12 @@ export async function hydrateEnvFromKeyStore(env = process.env, path = keyStoreP
47
46
  export async function saveKey(envVar, value, path = keyStorePath()) {
48
47
  const store = await readKeyStore(path);
49
48
  store[envVar] = value;
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");
49
+ await mkdir(join(homedir(), '.dirgha'), { recursive: true });
50
+ await writeFile(path, JSON.stringify(store, null, 2) + '\n', 'utf8');
53
51
  try {
54
- await chmod(tmp, 0o600);
52
+ await chmod(path, 0o600);
55
53
  }
56
- catch {
57
- /* non-POSIX (Windows) */
58
- }
59
- await rename(tmp, path);
54
+ catch { /* non-POSIX (Windows) */ }
60
55
  process.env[envVar] = value;
61
56
  }
62
57
  //# 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,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"}
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;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC,MAAM,UAAU,YAAY;IAC1B,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAe,YAAY,EAAE;IAC9D,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;QAAC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AACnE,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAAyB,OAAO,CAAC,GAAG,EAAE,OAAe,YAAY,EAAE;IAC9G,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,CAAC,MAAc,EAAE,KAAa,EAAE,OAAe,YAAY,EAAE;IACxF,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,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IACrE,IAAI,CAAC;QAAC,MAAM,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;AAC9B,CAAC"}
@@ -41,14 +41,11 @@ export interface DirghaConfig {
41
41
  */
42
42
  theme?: "readable" | "dark" | "light" | "none" | "midnight" | "ocean" | "solarized" | "warm" | "violet-storm" | "cosmic" | "nord" | "ember" | "sakura" | "obsidian-gold" | "crimson" | "dracula" | "github-dark" | "tokyonight" | "atom-one-dark" | "ayu-dark";
43
43
  /**
44
- * When true, the Ink TUI enters the terminal alternate buffer
45
- * (`\\x1b[?1049h`) on startup and exits (`\\x1b[?1049l`) on quit —
46
- * giving a clean exit (terminal looks like dirgha never ran) at the
47
- * cost of breaking native terminal scrollback, mouse-wheel selection,
48
- * and copy. Default is now false (matches gemini-cli, claude-code,
49
- * bash/zsh) so wheel-scroll, copy/paste and scrollback work natively.
50
- * Set to true if you prefer the clean-exit experience and accept the
51
- * trade-off.
44
+ * When true (default), the Ink TUI enters the terminal alternate buffer
45
+ * (`\\x1b[?1049h`) on startup and exits (`\\x1b[?1049l`) on quit.
46
+ * This eliminates the "flashing background" effect caused by Ink frames
47
+ * writing over accumulated scrollback in the main buffer. Set to false
48
+ * if you need scrollback access during the session.
52
49
  */
53
50
  alternateBuffer?: boolean;
54
51
  /**
@@ -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: "deepseek-ai/deepseek-v4-flash", // widely available via DeepSeek, NIM, and OpenRouter
13
+ cheapModel: "meta/llama-3.1-8b-instruct",
14
14
  summaryModel: "moonshotai/kimi-k2.5",
15
15
  maxTurns: 16,
16
16
  showThinking: false,
@@ -20,7 +20,7 @@ export const DEFAULT_CONFIG = {
20
20
  compaction: { triggerTokens: 120_000, preserveLastTurns: 6 },
21
21
  telemetry: { enabled: false },
22
22
  kbAutoInject: true,
23
- alternateBuffer: false,
23
+ alternateBuffer: true,
24
24
  };
25
25
  export async function loadConfig(cwd = process.cwd()) {
26
26
  const userPath = join(homedir(), ".dirgha", "config.json");
@@ -33,21 +33,9 @@ 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;
39
36
  merged.model = migrateDeprecatedModel(merged.model);
40
37
  merged.cheapModel = migrateDeprecatedModel(merged.cheapModel);
41
38
  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
- }
51
39
  return merged;
52
40
  }
53
41
  async function readJson(path) {
@@ -81,7 +69,6 @@ function readEnvOverrides() {
81
69
  }
82
70
  function merge(...partials) {
83
71
  const out = structuredClone(DEFAULT_CONFIG);
84
- const arrayFields = new Set(["autoApproveTools"]);
85
72
  for (const p of partials) {
86
73
  if (!p)
87
74
  continue;
@@ -89,15 +76,7 @@ function merge(...partials) {
89
76
  const value = p[key];
90
77
  if (value === undefined)
91
78
  continue;
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" &&
79
+ if (typeof value === "object" &&
101
80
  value !== null &&
102
81
  !Array.isArray(value)) {
103
82
  out[key] = {
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,6 @@ import { existsSync, readFileSync } from "node:fs";
13
13
  import { stdout, stdin } from "node:process";
14
14
  import { createInterface } from "node:readline";
15
15
  import { saveKey } from "../auth/keystore.js";
16
- import { defaultTheme, style } from "../tui/theme.js";
17
16
  const ENV_KEYS = [
18
17
  "OPENROUTER_API_KEY",
19
18
  "ANTHROPIC_API_KEY",
@@ -27,7 +26,6 @@ const ENV_KEYS = [
27
26
  "COHERE_API_KEY",
28
27
  "CEREBRAS_API_KEY",
29
28
  "TOGETHER_API_KEY",
30
- "PERPLEXITY_API_KEY",
31
29
  "XAI_API_KEY",
32
30
  "ZAI_API_KEY",
33
31
  ];
@@ -60,42 +58,30 @@ const KEY_PREFIXES = {
60
58
  "sk-ant": { name: "Anthropic", url: "https://console.anthropic.com" },
61
59
  "sk-proj": { name: "OpenAI", url: "https://platform.openai.com/api-keys" },
62
60
  "sk-": {
63
- name: "OpenAI",
64
- url: "https://platform.openai.com/api-keys",
61
+ name: "OpenAI / DeepSeek",
62
+ url: "https://platform.deepseek.com/api_keys",
65
63
  },
66
64
  "nvapi-": {
67
65
  name: "NVIDIA NIM (free)",
68
66
  url: "https://build.nvidia.com/settings/api-keys",
69
67
  },
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
- },
68
+ gsk_: { name: "Gemini / Groq", url: "https://aistudio.google.com/apikey" },
83
69
  };
84
70
  export async function showWelcomeWizard() {
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);
71
+ const B = "\x1b[1m";
72
+ const C = "\x1b[36m";
73
+ const G = "\x1b[32m";
74
+ const Y = "\x1b[33m";
75
+ const R = "\x1b[0m";
90
76
  stdout.write(`\n`);
91
- stdout.write(` ${bold("◆ DIRGHA CODE")}\n`);
77
+ stdout.write(` ${B}◆ DIRGHA CODE${R}\n`);
92
78
  stdout.write(`\n`);
93
- stdout.write(` ${bold("Welcome!")} Paste an API key to get started.\n`);
79
+ stdout.write(` ${B}Welcome!${R} Paste an API key to get started.\n`);
94
80
  stdout.write(`\n`);
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`);
81
+ stdout.write(` ${C}Quick start options:${R}\n`);
82
+ stdout.write(` ${G}OpenRouter${R} (200+ models): ${C}https://openrouter.ai/keys${R}\n`);
83
+ stdout.write(` ${G}NVIDIA NIM${R} (free tier): ${C}https://build.nvidia.com${R}\n`);
84
+ stdout.write(` ${G}DeepSeek${R} (cheap + fast): ${C}https://platform.deepseek.com${R}\n`);
99
85
  stdout.write(`\n`);
100
86
  stdout.write(` Paste your key below (or press Enter to skip):\n`);
101
87
  stdout.write(` > `);
@@ -107,15 +93,19 @@ export async function showWelcomeWizard() {
107
93
  });
108
94
  });
109
95
  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`);
96
+ stdout.write(`\n ${Y}Skipped.${R} Run ${C}dirgha${R} and use ${Y}/keys set${R} to add a key later.\n`);
97
+ stdout.write(` Free models available: ${C}/model tencent/hy3-preview:free${R}\n\n`);
112
98
  return;
113
99
  }
114
100
  // Auto-detect provider from key prefix.
115
101
  const envVar = detectProviderFromKey(key);
116
102
  await saveKey(envVar, key);
117
- stdout.write(`\n ${success("Key saved")} as ${bold(envVar)}.\n`);
103
+ stdout.write(`\n ${G}Key saved${R} as ${B}${envVar}${R}.\n`);
118
104
  stdout.write(` Starting Dirgha with a free model...\n\n`);
105
+ // Set a recommended free starting model so the first chat works immediately.
106
+ if (!process.env["DIRGHA_MODEL"]) {
107
+ process.env["DIRGHA_MODEL"] = "deepseek-ai/deepseek-v4-flash";
108
+ }
119
109
  }
120
110
  function detectProviderFromKey(key) {
121
111
  for (const [prefix, info] of Object.entries(KEY_PREFIXES)) {
@@ -124,18 +114,12 @@ function detectProviderFromKey(key) {
124
114
  return "OPENROUTER_API_KEY";
125
115
  if (info.name === "Anthropic")
126
116
  return "ANTHROPIC_API_KEY";
127
- if (info.name === "OpenAI")
128
- return "OPENAI_API_KEY";
117
+ if (info.name === "OpenAI / DeepSeek")
118
+ return "DEEPSEEK_API_KEY";
129
119
  if (info.name.includes("NVIDIA"))
130
120
  return "NVIDIA_API_KEY";
131
- if (info.name === "Gemini")
121
+ if (info.name.includes("Gemini / Groq"))
132
122
  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
123
  break;
140
124
  }
141
125
  }
@@ -1 +1 @@
1
- {"version":3,"file":"first-run.js","sourceRoot":"","sources":["../../src/cli/first-run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"first-run.js","sourceRoot":"","sources":["../../src/cli/first-run.ts"],"names":[],"mappings":"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"}