@dirgha/code 1.43.2 → 1.43.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,30 @@
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.43.4] — unreleased (prepared 2026-11-19)
6
+
7
+ Maintenance release. No runtime source changes.
8
+
9
+ ### Security
10
+
11
+ * **deps:** bump transitive `tar` 7.5.15 → 7.5.23, `ws` 8.20.0 → 8.23.0 and `protobufjs` 8.2.0 → 8.8.1 (lockfile only) to clear one critical and two high npm audit advisories. The four remaining high advisories in `sharp` (libvips/libheif/librsvg), pulled in by `kokoro-js` and the optional `@xenova/transformers`, are cleared by forcing `sharp` 0.35.5 via `overrides`. Verified: the publish gate (`npm audit --audit-level=high --omit=dev --omit=optional`) exits 0 with "found 0 vulnerabilities" on npm 10 and 11, and kokoro-js on-device TTS was smoke-tested with sharp 0.35.5 (9.05 s WAV generated on Windows CPU). Note: making `kokoro-js` optional alone does not clear the gate — npm audit reports optional-chain advisories even with `--omit=optional`.
12
+
13
+ ### Packaging
14
+
15
+ * **package:** `license` is now the SPDX id `FSL-1.1-MIT` (was `SEE LICENSE IN LICENSE`).
16
+ * **package:** `engines.node` is now `>=22`, matching what the `ink@7` dependency already required. Node 18 and 20 were never supported in practice.
17
+ * **package:** `kokoro-js` (on-device TTS) moves from `dependencies` to `optionalDependencies`. The TTS tool already degrades gracefully when it is absent (dynamic import in `src/tools/studio.ts`); install `kokoro-js` alongside Dirgha Code to enable on-device speech. This keeps the default install lighter and the voice stack swappable.
18
+ * **package:** add keywords for local and offline use (`ollama`, `llama.cpp`, `local-llm`, `offline`, `mcp`, `terminal`).
19
+ * **repo:** rebuilt the committed `dist/` so it matches the source and the published 1.43.3 tarball; removed stray `a.out` and `probe.txt` from the repo root.
20
+
21
+ ### Documentation
22
+
23
+ * **readme:** refresh positioning (open source) and counts from the code (tests, tools, slash commands, subcommands, aliases, catalogue, source size) and npm (21,876 downloads, 127 versions as of 2026-11-19); replace the static test badge with the live CI badge.
24
+ * **readme:** add an offline quickstart for Ollama and llama.cpp, and a Related projects section (LOKAHI, Ahimsa AI, Synthetic Humanism, Startup Agent Skills).
25
+ * **docs:** the Windows guide now states Node 22 or later.
26
+
27
+ This file has no entries for most releases between 1.25.0 and 1.43.3. For those, see the [GitHub releases](https://github.com/Dirgha-AI/dirgha-code/releases) (each links a compare view) and the git history.
28
+
5
29
  ## [1.42.3] — 2026-04-25
6
30
 
7
31
  ### Bug Fixes
package/README.md CHANGED
@@ -3,17 +3,18 @@
3
3
  # Dirgha Code
4
4
 
5
5
  [![npm](https://img.shields.io/npm/v/@dirgha/code?style=flat-square&color=000)](https://www.npmjs.com/package/@dirgha/code)
6
- [![Tests](https://img.shields.io/badge/tests-472%20passed-brightgreen?style=flat-square)](https://github.com/Dirgha-AI/dirgha-code/actions)
6
+ [![npm downloads](https://img.shields.io/npm/dt/@dirgha/code?style=flat-square&color=000)](https://www.npmjs.com/package/@dirgha/code)
7
+ [![CI](https://github.com/Dirgha-AI/dirgha-code/actions/workflows/ci.yml/badge.svg)](https://github.com/Dirgha-AI/dirgha-code/actions/workflows/ci.yml)
7
8
  [![License](https://img.shields.io/badge/license-FSL--1.1--MIT-d4a373?style=flat-square)](./LICENSE)
8
9
  [![Sponsor](https://img.shields.io/badge/sponsor-%E2%99%A1-c25a4f?style=flat-square)](https://dirgha.ai/contribute)
9
10
 
10
- **Dirgha Code is the open-source CLI coding agent — 17 providers, BYOK, offline-capable, parallel agents, persistent memory, security-audited. One install command. No vendor lock-in.**
11
+ **Dirgha Code is an open-source CLI coding agent. It works with 17 model providers on your own keys, or fully offline with Ollama or llama.cpp, and adds parallel agents and persistent memory. One install command.**
11
12
 
12
13
  </div>
13
14
 
14
15
  ## The Seed: Why the CLI Comes First
15
16
 
16
- Every operating system starts with a kernel. Dirgha Code — the open-source command-line agent — is the kernel of Dirgha AI OS. It is the smallest, most installable, most hackable piece of the stack: one install command, runs fully offline, ships under FSL → MIT.
17
+ Every operating system starts with a kernel. Dirgha Code, the open-source command-line agent, is the kernel of Dirgha AI OS. It is the smallest and easiest piece of the stack to install and change: one install command, runs fully offline.
17
18
 
18
19
  By design, the CLI is the entry point for every developer — whether you're on a 10 Gbps fiber line or a shared 4G hotspot, in a WeWork in Bengaluru or a basement in Berlin. No browser, no paid account, no telemetry by default. Just `npm install -g @dirgha/code` and a terminal.
19
20
 
@@ -31,9 +32,9 @@ First-class llama.cpp and Ollama support. The setup wizard auto-probes `localhos
31
32
 
32
33
  ### BYOK across 17 providers
33
34
 
34
- Anthropic, OpenAI, Gemini, OpenRouter, NVIDIA NIM, Fireworks, DeepSeek (native), Mistral, Cohere, Cerebras, Together, Perplexity, xAI (Grok), Groq, Z.AI / GLM, plus local Ollama and llama.cpp. Drop multiple keys per provider into a pool — Dirgha rotates with priority + LRU + cooldown when one hits a 429. When a model 4xx/5xxs mid-turn, an inline `[y/n/p=picker]` failover prompt suggests a known-good substitute (via `findFailover` in `prices.ts`) and re-runs the failed turn against it. Other tools just dead-end.
35
+ Anthropic, OpenAI, Gemini, OpenRouter, NVIDIA NIM, Fireworks, DeepSeek (native), Mistral, Cohere, Cerebras, Together, Perplexity, xAI (Grok), Groq, Z.AI / GLM, plus local Ollama and llama.cpp. Drop multiple keys per provider into a pool — Dirgha rotates with priority + LRU + cooldown when one hits a 429. When a model 4xx/5xxs mid-turn, an inline `[y/n/p=picker]` failover prompt suggests a known-good substitute (via `findFailover` in `prices.ts`) and re-runs the failed turn against it.
35
36
 
36
- The model picker is two-step (gemini-cli style): pick a provider card → pick a model within that provider. 104 models in the catalogue, refreshed against the live OpenRouter registry on every release.
37
+ The model picker is two-step (gemini-cli style): pick a provider card → pick a model within that provider. The built-in catalogue lists 110 models (`src/intelligence/prices.ts`); `dirgha models refresh` fetches the live model lists from your configured providers.
37
38
 
38
39
  ### Persistent memory that compounds
39
40
 
@@ -56,43 +57,69 @@ Information flows up. Old context gets distilled, not discarded.
56
57
 
57
58
  ### Skills, scanned
58
59
 
59
- 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.
60
+ 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; lesser findings show a warning. 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.
60
61
 
61
62
  ## Install
62
63
 
64
+ Requires Node.js 22 or later.
65
+
63
66
  ```bash
64
67
  npm install -g @dirgha/code # or: pnpm add -g @dirgha/code
65
68
  dirgha setup # 3-step wizard: pick provider (local works too) → auth → model
66
69
  dirgha "say ok in one word"
67
70
  ```
68
71
 
69
- Or skip the wizard and go straight to a key: `export NVIDIA_API_KEY=nvapi-…` (any of the 17 providers — see below).
70
- For 100% local: install [Ollama](https://ollama.com) or [llama.cpp](https://github.com/ggerganov/llama.cpp), then run `dirgha setup` and pick **Local**.
72
+ Or skip the wizard and go straight to a key: `export NVIDIA_API_KEY=nvapi-…` (any of the 17 providers, see below).
71
73
 
72
74
  **Windows users**: See the [Windows installation guide](docs/windows-installation.md) for setup of optional features.
73
75
 
74
76
  The interactive TUI is `dirgha` with no args. Resume a session with `dirgha resume <id>`. Fan a parallel sub-agent fleet with `dirgha fleet launch "<goal>"`.
75
77
 
78
+ ### Offline quickstart (local models, no API key)
79
+
80
+ Dirgha Code talks to local models through their OpenAI-compatible endpoints, so prompts and code stay on your machine. Pick one runtime.
81
+
82
+ **Ollama** (default endpoint `http://localhost:11434/v1`):
83
+
84
+ ```bash
85
+ # install Ollama from https://ollama.com, then:
86
+ ollama pull qwen2.5-coder:7b
87
+ dirgha -m ollama/qwen2.5-coder:7b "list the files in this folder and summarise them"
88
+ ```
89
+
90
+ **llama.cpp** (default endpoint `http://localhost:8080/v1`):
91
+
92
+ ```bash
93
+ # build or download llama.cpp from https://github.com/ggml-org/llama.cpp, then:
94
+ llama-server -m ./models/qwen2.5-coder-7b-instruct-q4_k_m.gguf --port 8080 --jinja
95
+ dirgha -m llamacpp/qwen2.5-coder-7b-instruct "list the files in this folder and summarise them"
96
+ ```
97
+
98
+ If llama-server runs on another host or port, set `LLAMACPP_URL` (for example `export LLAMACPP_URL=http://127.0.0.1:9000/v1`).
99
+
100
+ To make a local model the default, run `dirgha setup` and pick **Local**; the wizard probes both ports and lists installed models. `dirgha doctor` shows whether each local server is reachable. Tool calling depends on the model: small models may answer in plain text instead of calling tools, so start with a coder-tuned model of 7B parameters or more.
101
+
76
102
  ## What's in the box
77
103
 
78
104
  | | |
79
105
  | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
80
- | **17 providers** | anthropic, openai, gemini, openrouter, nvidia, fireworks, deepseek, groq, cerebras, together, deepinfra, mistral, xai, perplexity, cohere, kimi, zai |
81
- | **34 model aliases** | `kimi`, `opus`, `sonnet`, `haiku`, `gemini`, `flash`, `deepseek`, `llama`, `ling`, `hy3`, … resolved before routing |
82
- | **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` |
83
- | **20 slash commands** | `/account`, `/clear`, `/compact`, `/cost`, `/fleet`, `/keys`, `/login`, `/memory`, `/mode`, `/models`, `/resume`, `/session`, `/status`, `/theme`, `/upgrade`, … |
84
- | **18 subcommands** | `audit`, `audit-codebase`, `cost`, `kb`, `keys`, `ledger`, `login`, `models`, `resume`, `skills`, `undo`, `update`, `verify`, … |
106
+ | **17 providers** | anthropic, openai, gemini, openrouter, nvidia, fireworks, deepseek, groq, cerebras, together, mistral, xai, perplexity, cohere, zai, plus local ollama and llamacpp |
107
+ | **24 model aliases** | `opus`, `sonnet`, `haiku`, `gpt5`, `gemini`, `flash`, `kimi`, … resolved before routing (`dirgha models` lists them) |
108
+ | **34 built-in tools** | files (`fs_read`, `fs_write`, `fs_edit`, `fs_ls`), `shell`, `git`, `github`, search (`search_grep`, `search_glob`), `browser`, `checkpoint`, `cron`, LSP (`go_to_definition`, `find_references`, `hover_documentation`, `document_symbols`), knowledge (`qmd_search`, `kb_search`, graph tools), media and GPU tools; the `task` sub-agent tool is added per session |
109
+ | **31 slash commands** | `/account`, `/clear`, `/compact`, `/cost`, `/fleet`, `/keys`, `/login`, `/memory`, `/mode`, `/models`, `/resume`, `/session`, `/status`, `/theme`, `/upgrade`, … |
110
+ | **36 subcommands** | `ask`, `audit`, `chat`, `doctor`, `keys`, `login`, `models`, `resume`, `setup`, `skills`, `update`, `verify`, … (`dirgha --help`), plus `dirgha fleet` |
85
111
  | **4 modes** | `act` · `plan` (read-only thinking) · `verify` (read-only audit) · `ask` (read-only Q&A) |
86
112
  | **MCP** | stdio + HTTP/SSE + `bearerProvider` async OAuth rotation |
87
- | **Source** | ~14.5 K LOC across 23 modules in `src/`. Hard rule: every src file ≤ 200 lines. |
113
+ | **Source** | About 54K lines of TypeScript (excluding tests) across 32 top-level modules in `src/`. |
88
114
 
89
115
  ## Numbers worth checking
90
116
 
91
117
  | | |
92
118
  | -------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
93
- | Tests | **232 vitest + 41 offline** in ~40 s. TS 0 errors, ESLint 0 warnings. CI green is a precondition for any PR. |
119
+ | Tests | **484 vitest tests** in 41 files (`npm test`) plus **45 offline CLI suites** (`npm run test:cli:offline`, 41 run without network). TypeScript 0 errors, ESLint 0 warnings. CI must pass before a PR merges. |
120
+ | npm | 21,876 downloads and 127 published versions since April 2026 (npm registry and downloads API, checked 19 Nov 2026). |
94
121
  | 17 providers | Multi-key BYOK pool with cooldown rotation, 4-tier failover cascade, health scoring with compaction. |
95
- | 18 built-in tools | Per-tool timeout enforcement. Shell 300s (PTY streaming via `streamOutput`), reads 30s, default 60s. |
122
+ | 34 built-in tools | Per-tool timeout enforcement. Shell 300s (PTY streaming via `streamOutput`), reads 30s, default 60s. |
96
123
  | 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. |
97
124
  | **GPU compute** | 4 providers (Vast, Akash, Spheron, RunPod), cheapest-auto-select, budget caps, audit log, agent tools, CLI subcommand, web UI at [`dirgha.ai/app/gpu`](https://dirgha.ai/app/gpu) |
98
125
 
@@ -100,7 +127,7 @@ The interactive TUI is `dirgha` with no args. Resume a session with `dirgha resu
100
127
 
101
128
  Frontier coding assistants are closed SaaS, charging per-seat, piping your repository through someone else's telemetry. The assumption is that the intelligence must live at the vendor.
102
129
 
103
- The opposite assumption is the right one. Your laptop is the unit of sovereignty. Your keys, your wallet, your session log, your tool executions live on your machine until you choose to hit a network. Providers are swappable. The agent loop is open source.
130
+ The opposite assumption is the right one. Your laptop is the unit of sovereignty. Your keys, your wallet, your session log, your tool executions live on your machine until you choose to hit a network. Providers are swappable. The agent loop's source is public and each release becomes MIT-licensed two years after it ships.
104
131
 
105
132
  ## Documentation
106
133
 
@@ -130,11 +157,18 @@ A few specific ways to plug in:
130
157
  - **Write a plugin.** TypeScript extensions API takes ~20 lines for a real tool. We're keen to feature good ones — drop a link.
131
158
  - **Send a PR.** Every PR adds a `.changeset/<random-name>.md` describing what changed and at what semver tier. Tests must stay green: `npm run test:cli:offline`.
132
159
 
133
- We're a small team. We answer issues. We accept PRs from first-time contributors. If something feels off about the project, the docs, or the experience — tell us.
160
+ We're a small team. We answer issues. We accept PRs from first-time contributors. If something feels off about the project, the docs, or the experience, tell us.
161
+
162
+ ## Related projects
163
+
164
+ - [**LOKAHI**](https://github.com/Dirgha-AI/lokahi) (Apache-2.0, v0.1.4): a gate that checks each MCP tool call against a signed, community-written manifest before it runs. Reference implementation, not yet independently reviewed.
165
+ - [**Ahimsa AI**](https://github.com/Dirgha-AI/ahimsa-ai) (MIT): a design-time impact assessment (AIA v1.1) that compiles approved projects into LOKAHI manifests.
166
+ - [**Synthetic Humanism**](https://github.com/Dirgha-AI/synthetic-humanism) (MIT): the essays behind LOKAHI and Ahimsa AI, plus a benchmark that runs both against 20 documented AI failures.
167
+ - [**Startup Agent Skills**](https://github.com/salikshah/startup-agent-skills) (MIT): SKILL.md packs for startup strategy, growth and positioning, tested against Dirgha Code and other agent CLIs.
134
168
 
135
169
  ## License
136
170
 
137
- [FSL-1.1-MIT](./LICENSE) — Functional Source License with a 2-year sunset to MIT.
171
+ [FSL-1.1-MIT](./LICENSE): the Functional Source License. You can use, modify and redistribute the code for any purpose except offering a competing commercial product. Two years after each release is published, that release converts to the MIT License. See [LICENSING.md](./LICENSING.md) for details.
138
172
 
139
173
  ---
140
174
 
@@ -8,6 +8,8 @@ export interface DirghaAgentOptions {
8
8
  extraArgs?: string[];
9
9
  /** Working directory. */
10
10
  cwd?: string;
11
+ /** Extra environment variables to pass to the agent. */
12
+ env?: Record<string, string | undefined>;
11
13
  }
12
14
  /**
13
15
  * Spawn a dirgha agent subprocess for a given task.
@@ -17,6 +17,7 @@ export async function spawnDirghaAgent(sessionId, label, task, opts = {}) {
17
17
  command: "dirgha",
18
18
  args,
19
19
  cwd: opts.cwd,
20
+ env: opts.env,
20
21
  };
21
22
  return spawnAgent(sessionId, label, task, "dirgha", spawnOpts);
22
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dirgha.js","sourceRoot":"","sources":["../../../src/orchestra/agent/dirgha.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;AAS7D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAa,EACb,IAAY,EACZ,OAA2B,EAAE;IAE7B,MAAM,IAAI,GAAa,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhB,MAAM,SAAS,GAAiB;QAC9B,OAAO,EAAE,QAAQ;QACjB,IAAI;QACJ,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,CAAC;IAEF,OAAO,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAe,EACf,OAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;QACzE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"dirgha.js","sourceRoot":"","sources":["../../../src/orchestra/agent/dirgha.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAqB,MAAM,cAAc,CAAC;AAW7D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAa,EACb,IAAY,EACZ,OAA2B,EAAE;IAE7B,MAAM,IAAI,GAAa,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACnD,IAAI,IAAI,CAAC,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEhB,MAAM,SAAS,GAAiB;QAC9B,OAAO,EAAE,QAAQ;QACjB,IAAI;QACJ,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,CAAC;IAEF,OAAO,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,KAAe,EACf,OAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;QACzE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -27,6 +27,8 @@ export interface SpawnOptions {
27
27
  cwd?: string;
28
28
  /** Environment variables. */
29
29
  env?: Record<string, string | undefined>;
30
+ /** Spawn timeout in ms (default 120 000). SIGTERM on timeout, SIGKILL after 3 s. */
31
+ timeoutMs?: number;
30
32
  }
31
33
  /**
32
34
  * Spawn an agent subprocess and wire it into the session registry + log.
@@ -15,6 +15,46 @@ import { randomUUID } from "node:crypto";
15
15
  import { safeEnvironment } from "../../utils/env.js";
16
16
  import { registry } from "../core/registry.js";
17
17
  import { writeLog } from "../orchestration/log.js";
18
+ /** Env var names for known LLM providers that spawned agents need. */
19
+ const LLM_PROVIDER_KEY_VARS = Object.freeze([
20
+ "OPENAI_API_KEY",
21
+ "ANTHROPIC_API_KEY",
22
+ "GEMINI_API_KEY",
23
+ "GOOGLE_API_KEY",
24
+ "DEEPSEEK_API_KEY",
25
+ "OPENROUTER_API_KEY",
26
+ "NVIDIA_API_KEY",
27
+ "MISTRAL_API_KEY",
28
+ "COHERE_API_KEY",
29
+ "CEREBRAS_API_KEY",
30
+ "TOGETHER_API_KEY",
31
+ "PERPLEXITY_API_KEY",
32
+ "XAI_API_KEY",
33
+ "GROQ_API_KEY",
34
+ "ZAI_API_KEY",
35
+ "GLM_API_KEY",
36
+ "FIREWORKS_API_KEY",
37
+ ]);
38
+ /**
39
+ * Build the environment for a spawned agent: safe-clean parent env
40
+ * plus any LLM provider keys the parent has set.
41
+ */
42
+ function buildSpawnEnv(extraEnv) {
43
+ const env = { ...safeEnvironment() };
44
+ // Pass through known LLM provider keys from the parent.
45
+ for (const key of LLM_PROVIDER_KEY_VARS) {
46
+ const val = process.env[key];
47
+ if (val)
48
+ env[key] = val;
49
+ }
50
+ if (extraEnv) {
51
+ for (const [k, v] of Object.entries(extraEnv)) {
52
+ if (v !== undefined)
53
+ env[k] = v;
54
+ }
55
+ }
56
+ return env;
57
+ }
18
58
  /**
19
59
  * Spawn an agent subprocess and wire it into the session registry + log.
20
60
  * Returns the agent id and the child process handle.
@@ -46,7 +86,7 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
46
86
  try {
47
87
  child = spawn(command, args, {
48
88
  cwd: opts.cwd,
49
- env: { ...safeEnvironment(), ...opts.env },
89
+ env: buildSpawnEnv(opts.env),
50
90
  stdio: ["pipe", "pipe", "pipe"],
51
91
  });
52
92
  }
@@ -81,9 +121,39 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
81
121
  writeLog(sessionId, agentId, "output", { line, stream: "stderr" });
82
122
  }
83
123
  });
124
+ // Spawn timeout: kill the child if it hasn't exited within timeoutMs.
125
+ const timeoutMs = opts.timeoutMs ?? 120_000;
126
+ let timeoutHandle;
127
+ if (timeoutMs > 0) {
128
+ timeoutHandle = setTimeout(() => {
129
+ const elapsed = Date.now() - now;
130
+ registry.updateAgent(sessionId, agentId, {
131
+ status: "failed",
132
+ exitCode: -3,
133
+ elapsedMs: elapsed,
134
+ });
135
+ writeLog(sessionId, agentId, "exit", {
136
+ code: -3,
137
+ elapsedMs: elapsed,
138
+ reason: `spawn timeout after ${timeoutMs}ms`,
139
+ });
140
+ try {
141
+ child.kill("SIGTERM");
142
+ }
143
+ catch { /* already dead */ }
144
+ setTimeout(() => {
145
+ try {
146
+ child.kill("SIGKILL");
147
+ }
148
+ catch { /* already dead */ }
149
+ }, 3000);
150
+ }, timeoutMs);
151
+ }
84
152
  // Wait for exit.
85
153
  const done = new Promise((resolve) => {
86
154
  child.on("exit", (code) => {
155
+ if (timeoutHandle)
156
+ clearTimeout(timeoutHandle);
87
157
  const elapsed = Date.now() - now;
88
158
  registry.updateAgent(sessionId, agentId, {
89
159
  status: code === 0 ? "done" : "failed",
@@ -94,6 +164,8 @@ export async function spawnAgent(sessionId, label, task, adapter, opts = {}) {
94
164
  resolve(code ?? -1);
95
165
  });
96
166
  child.on("error", (err) => {
167
+ if (timeoutHandle)
168
+ clearTimeout(timeoutHandle);
97
169
  registry.updateAgent(sessionId, agentId, {
98
170
  status: "failed",
99
171
  exitCode: -2,
@@ -1 +1 @@
1
- {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/orchestra/agent/manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/orchestra/agent/manager.ts"],"names":[],"mappings":"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"}
@@ -26,10 +26,15 @@ export function createLog(sessionId) {
26
26
  export function appendLog(entry) {
27
27
  try {
28
28
  const path = logPath(entry.sessionId);
29
+ const dir = tmpdir();
30
+ if (!existsSync(dir))
31
+ mkdirSync(dir, { recursive: true });
29
32
  appendFileSync(path, JSON.stringify(entry) + "\n", "utf-8");
30
33
  }
31
- catch {
32
- // Non-fatal — log writes must never crash the orchestrator.
34
+ catch (err) {
35
+ // Non-fatal — log writes must never crash the orchestrator,
36
+ // but surface the error so root cause is visible.
37
+ process.stderr.write(`[orchestra] log write failed: ${err.message}\n`);
33
38
  }
34
39
  }
35
40
  /** Convenience: build and write a structured entry in one call. */
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,8CAA8C;AAC9C,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,SAAS,SAAS,CAAC,CAAC;AACzD,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,SAAS,CAAC,SAAiB;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,SAAS,CAAC,KAAe;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,4DAA4D;IAC9D,CAAC;AACH,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,QAAQ,CACtB,SAAiB,EACjB,OAAe,EACf,KAAwB,EACxB,UAAmC,EAAE;IAErC,SAAS,CAAC;QACR,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,OAAO,GAAG;aACP,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,OAAO,CACrB,SAAiB,EACjB,IAAY,EAAE,EACd,MAAiC;IAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACnD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,14 @@
8
8
  import { readFile, stat, writeFile } from "node:fs/promises";
9
9
  import { summariseDiff, unifiedDiff } from "./diff.js";
10
10
  import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
11
+ function resolvePath(raw) {
12
+ const filePath = typeof raw.filePath === "string" ? raw.filePath : undefined;
13
+ const path = typeof raw.path === "string" ? raw.path : undefined;
14
+ const resolved = path ?? filePath;
15
+ if (!resolved)
16
+ throw new Error("fs_edit requires 'path' or 'filePath'");
17
+ return resolved;
18
+ }
11
19
  export const fsEditTool = {
12
20
  name: "fs_edit",
13
21
  description: "Replace an exact substring in a file. Fails on ambiguity (multiple matches) unless replaceAll is set. Use larger context around oldString to disambiguate.",
@@ -15,22 +23,24 @@ export const fsEditTool = {
15
23
  type: "object",
16
24
  properties: {
17
25
  path: { type: "string" },
26
+ filePath: { type: "string", description: "Alias for `path`." },
18
27
  oldString: { type: "string" },
19
28
  newString: { type: "string" },
20
29
  replaceAll: { type: "boolean" },
21
30
  },
22
- required: ["path", "oldString", "newString"],
31
+ required: ["oldString", "newString"],
23
32
  },
24
33
  requiresApproval: () => true,
25
34
  async execute(rawInput, ctx) {
26
35
  const input = rawInput;
27
- const check = isValidCwdPath(ctx.cwd, input.path, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
36
+ const resolvedPath = resolvePath(rawInput);
37
+ const check = isValidCwdPath(ctx.cwd, resolvedPath, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
28
38
  if (!check.valid)
29
39
  return { content: check.error, isError: true };
30
40
  const abs = check.resolved;
31
41
  const info = await stat(abs).catch(() => undefined);
32
42
  if (!info || !info.isFile())
33
- return { content: `No such file: ${input.path}`, isError: true };
43
+ return { content: `No such file: ${resolvedPath}`, isError: true };
34
44
  const before = await readFile(abs, "utf8");
35
45
  const oldString = decodeLiteralUnicodeEscapes(input.oldString);
36
46
  const newString = decodeLiteralUnicodeEscapes(input.newString);
@@ -43,7 +53,7 @@ export const fsEditTool = {
43
53
  const exactCount = countOccurrences(before, oldString);
44
54
  if (exactCount === 0) {
45
55
  return {
46
- content: `oldString not found in ${input.path}. Provide more surrounding context or verify the file.`,
56
+ content: `oldString not found in ${resolvedPath}. Provide more surrounding context or verify the file.`,
47
57
  isError: true,
48
58
  };
49
59
  }
@@ -57,12 +67,12 @@ export const fsEditTool = {
57
67
  ? splitJoin(before, oldString, newString)
58
68
  : before.replace(oldString, newString);
59
69
  const diff = unifiedDiff(before, after, {
60
- fromLabel: input.path,
61
- toLabel: input.path,
70
+ fromLabel: resolvedPath,
71
+ toLabel: resolvedPath,
62
72
  });
63
73
  const { added, removed } = summariseDiff(diff);
64
74
  await writeFile(abs, after, "utf8");
65
- const summary = `Edited ${input.path}: ${input.replaceAll ? exactCount : 1} replacement(s) (+${added} / -${removed})`;
75
+ const summary = `Edited ${resolvedPath}: ${input.replaceAll ? exactCount : 1} replacement(s) (+${added} / -${removed})`;
66
76
  const content = diff ? `${summary}\n\n${diff}` : summary;
67
77
  return {
68
78
  content,
@@ -1 +1 @@
1
- {"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs-edit.js","sourceRoot":"","sources":["../../src/tools/fs-edit.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,15 @@
6
6
  import { readFile, stat } from "node:fs/promises";
7
7
  import { isValidCwdPath, isBinary } from "../utils/fs.js";
8
8
  const MAX_BYTES = 2 * 1024 * 1024;
9
+ /** Resolve the canonical path from `filePath` or `path`, failing if neither is set. */
10
+ function resolvePath(raw) {
11
+ const filePath = typeof raw.filePath === "string" ? raw.filePath : undefined;
12
+ const path = typeof raw.path === "string" ? raw.path : undefined;
13
+ const resolved = path ?? filePath;
14
+ if (!resolved)
15
+ throw new Error("fs_read requires 'path' or 'filePath'");
16
+ return resolved;
17
+ }
9
18
  export const fsReadTool = {
10
19
  name: "fs_read",
11
20
  description: "Read a text file from disk. Returns contents with 1-based line numbers. Use offset/limit to page through large files.",
@@ -16,6 +25,10 @@ export const fsReadTool = {
16
25
  type: "string",
17
26
  description: "Absolute or cwd-relative path to the file.",
18
27
  },
28
+ filePath: {
29
+ type: "string",
30
+ description: "Alias for `path`. Use path or filePath interchangeably.",
31
+ },
19
32
  offset: {
20
33
  type: "integer",
21
34
  minimum: 1,
@@ -27,19 +40,21 @@ export const fsReadTool = {
27
40
  description: "Maximum number of lines to return.",
28
41
  },
29
42
  },
30
- required: ["path"],
43
+ // Either path or filePath must be present; the execute handler validates.
44
+ required: [],
31
45
  },
32
46
  async execute(rawInput, ctx) {
33
47
  const input = rawInput;
34
- const check = isValidCwdPath(ctx.cwd, input.path, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
48
+ const resolvedPath = resolvePath(rawInput);
49
+ const check = isValidCwdPath(ctx.cwd, resolvedPath, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
35
50
  if (!check.valid)
36
51
  return { content: check.error, isError: true };
37
52
  const abs = check.resolved;
38
53
  const info = await stat(abs).catch(() => undefined);
39
54
  if (!info)
40
- return { content: `No such file: ${input.path}`, isError: true };
55
+ return { content: `No such file: ${resolvedPath}`, isError: true };
41
56
  if (!info.isFile())
42
- return { content: `Not a file: ${input.path}`, isError: true };
57
+ return { content: `Not a file: ${resolvedPath}`, isError: true };
43
58
  if (info.size > MAX_BYTES) {
44
59
  return {
45
60
  content: `File too large (${info.size} bytes, max ${MAX_BYTES}). Use offset/limit.`,
@@ -49,7 +64,7 @@ export const fsReadTool = {
49
64
  const buffer = await readFile(abs);
50
65
  if (isBinary(buffer))
51
66
  return {
52
- content: `File appears to be binary: ${input.path}`,
67
+ content: `File appears to be binary: ${resolvedPath}`,
53
68
  isError: true,
54
69
  };
55
70
  const text = buffer.toString("utf8");
@@ -1 +1 @@
1
- {"version":3,"file":"fs-read.js","sourceRoot":"","sources":["../../src/tools/fs-read.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fs-read.js","sourceRoot":"","sources":["../../src/tools/fs-read.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,14 @@ import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
8
8
  import { dirname } from "node:path";
9
9
  import { summariseDiff, unifiedDiff } from "./diff.js";
10
10
  import { decodeLiteralUnicodeEscapes, isValidCwdPath } from "../utils/fs.js";
11
+ function resolvePath(raw) {
12
+ const filePath = typeof raw.filePath === "string" ? raw.filePath : undefined;
13
+ const path = typeof raw.path === "string" ? raw.path : undefined;
14
+ const resolved = path ?? filePath;
15
+ if (!resolved)
16
+ throw new Error("fs_write requires 'path' or 'filePath'");
17
+ return resolved;
18
+ }
11
19
  export const fsWriteTool = {
12
20
  name: "fs_write",
13
21
  description: "Write content to a file. Creates parent directories when createDirs is true. Overwrites existing files.",
@@ -15,18 +23,20 @@ export const fsWriteTool = {
15
23
  type: "object",
16
24
  properties: {
17
25
  path: { type: "string" },
26
+ filePath: { type: "string", description: "Alias for `path`." },
18
27
  content: { type: "string" },
19
28
  createDirs: {
20
29
  type: "boolean",
21
30
  description: "Create parent directories if they do not exist.",
22
31
  },
23
32
  },
24
- required: ["path", "content"],
33
+ required: ["content"],
25
34
  },
26
35
  requiresApproval: () => true,
27
36
  async execute(rawInput, ctx) {
28
37
  const input = rawInput;
29
- const check = isValidCwdPath(ctx.cwd, input.path, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
38
+ const resolvedPath = resolvePath(rawInput);
39
+ const check = isValidCwdPath(ctx.cwd, resolvedPath, { allowOutside: ctx.autoApprove === true && (ctx.sandboxMode === 'off' || ctx.sandboxMode == null) });
30
40
  if (!check.valid)
31
41
  return { content: check.error, isError: true };
32
42
  const abs = check.resolved;
@@ -40,14 +50,14 @@ export const fsWriteTool = {
40
50
  await mkdir(dirname(abs), { recursive: true });
41
51
  const sanitized = decodeLiteralUnicodeEscapes(input.content);
42
52
  const diff = unifiedDiff(before, sanitized, {
43
- fromLabel: input.path,
44
- toLabel: input.path,
53
+ fromLabel: resolvedPath,
54
+ toLabel: resolvedPath,
45
55
  });
46
56
  const { added, removed } = summariseDiff(diff);
47
57
  await writeFile(abs, sanitized, "utf8");
48
58
  const summary = existed
49
- ? `Updated ${input.path} (+${added} / -${removed})`
50
- : `Created ${input.path} (${sanitized.length} bytes)`;
59
+ ? `Updated ${resolvedPath} (+${added} / -${removed})`
60
+ : `Created ${resolvedPath} (${sanitized.length} bytes)`;
51
61
  return {
52
62
  content: summary,
53
63
  data: {
@@ -1 +1 @@
1
- {"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQ7E,MAAM,CAAC,MAAM,WAAW,GAAS;IAC/B,IAAI,EAAE,UAAU;IAChB,WAAW,EACT,yGAAyG;IAC3G,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,UAAU,EAAE;gBACV,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,iDAAiD;aAC/D;SACF;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC9B;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,KAAK,CAAC,OAAO,CACX,QAAiB,EACjB,GAAG;QAIH,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,KAAK,IAAI,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;QACxJ,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACjE,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC3B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC;aAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,OAAO;YAAE,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAC7C,IAAI,KAAK,CAAC,UAAU;YAAE,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1E,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE;YAC1C,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,OAAO,EAAE,KAAK,CAAC,IAAI;SACpB,CAAC,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,OAAO;YACrB,CAAC,CAAC,WAAW,KAAK,CAAC,IAAI,MAAM,KAAK,OAAO,OAAO,GAAG;YACnD,CAAC,CAAC,WAAW,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,SAAS,CAAC;QAExD,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC;gBAClD,KAAK;gBACL,OAAO;aACR;YACD,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,EAAE,IAAI,EAAE;SACnB,CAAC;IACJ,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"fs-write.js","sourceRoot":"","sources":["../../src/tools/fs-write.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dirgha/code",
3
- "version": "1.43.2",
3
+ "version": "1.43.4",
4
4
  "description": "CLI coding agent for complex agentic workflows and long-horizon development. Local models (llama.cpp / Ollama), BYOK across 17 providers, parallel agents, persistent memory, scanned skills.",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -42,13 +42,13 @@
42
42
  "dependencies": {
43
43
  "ink": "^7.0.2",
44
44
  "ink-text-input": "^6.0.0",
45
- "kokoro-js": "^1.2.1",
46
45
  "react": "^19.2.0"
47
46
  },
48
47
  "optionalDependencies": {
49
48
  "@xenova/transformers": "^2.17.2",
50
49
  "better-sqlite3": "12.9.0",
51
50
  "chokidar": "^5.0.0",
51
+ "kokoro-js": "^1.2.1",
52
52
  "sqlite-vec": "^0.1.9"
53
53
  },
54
54
  "devDependencies": {
@@ -64,10 +64,11 @@
64
64
  },
65
65
  "overrides": {
66
66
  "esbuild": ">=0.25.0",
67
- "protobufjs": ">=7.5.5"
67
+ "protobufjs": ">=7.5.5",
68
+ "sharp": "^0.35.5"
68
69
  },
69
70
  "engines": {
70
- "node": ">=18.0.0"
71
+ "node": ">=22.0.0"
71
72
  },
72
73
  "keywords": [
73
74
  "cli",
@@ -79,7 +80,13 @@
79
80
  "tool-calling",
80
81
  "openrouter",
81
82
  "anthropic",
82
- "openai"
83
+ "openai",
84
+ "ollama",
85
+ "llama.cpp",
86
+ "local-llm",
87
+ "offline",
88
+ "mcp",
89
+ "terminal"
83
90
  ],
84
91
  "homepage": "https://github.com/Dirgha-AI/dirgha-code",
85
92
  "repository": {
@@ -90,5 +97,5 @@
90
97
  "url": "https://github.com/Dirgha-AI/dirgha-code/issues"
91
98
  },
92
99
  "author": "Dirgha AI Team",
93
- "license": "SEE LICENSE IN LICENSE"
100
+ "license": "FSL-1.1-MIT"
94
101
  }