@dirgha/code 1.6.0 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +5 -15
- package/LICENSE +21 -101
- package/README.md +9 -15
- package/dist_v2/cli/config.d.ts +0 -1
- package/dist_v2/cli/config.js.map +1 -1
- package/dist_v2/cli/main.js +4 -8
- package/dist_v2/cli/main.js.map +1 -1
- package/dist_v2/kernel/agent-loop.d.ts +38 -8
- package/dist_v2/kernel/agent-loop.js +57 -18
- package/dist_v2/kernel/agent-loop.js.map +1 -1
- package/dist_v2/kernel/index.d.ts +1 -0
- package/dist_v2/kernel/index.js +1 -0
- package/dist_v2/kernel/index.js.map +1 -1
- package/dist_v2/kernel/message.d.ts +17 -1
- package/dist_v2/kernel/message.js +26 -0
- package/dist_v2/kernel/message.js.map +1 -1
- package/dist_v2/kernel/queues.d.ts +82 -0
- package/dist_v2/kernel/queues.js +105 -0
- package/dist_v2/kernel/queues.js.map +1 -0
- package/dist_v2/kernel/types.d.ts +29 -0
- package/dist_v2/providers/faux.d.ts +99 -0
- package/dist_v2/providers/faux.js +153 -0
- package/dist_v2/providers/faux.js.map +1 -0
- package/package.json +6 -16
- package/CREDITS.md +0 -46
package/CHANGELOG.md
CHANGED
|
@@ -1,16 +1,6 @@
|
|
|
1
1
|
# Dirgha CLI — Changelog
|
|
2
2
|
|
|
3
|
-
## 1.
|
|
4
|
-
|
|
5
|
-
### Added
|
|
6
|
-
|
|
7
|
-
- **Local model provider** — first-class llama.cpp + Ollama support. New `LlamaCppProvider` at `src_v2/providers/llamacpp.ts` (default `http://localhost:8080/v1`, `LLAMACPP_URL` override). Model ids prefixed `llamacpp/…` route there; `ollama/…` continues to route to the existing Ollama provider.
|
|
8
|
-
- **Setup wizard — Local option.** New "Local (llama.cpp / Ollama)" step in `dirgha setup` (option 2, right after Dirgha hosted). Auto-probes both `localhost:11434` and `localhost:8080`, lists installed models from each (`/api/tags` + `/v1/models`), and falls through with placeholder + install hints when neither server is up.
|
|
9
|
-
- **`dirgha doctor` — Local probes.** Added Ollama (`http://localhost:11434/api/tags`) and llama.cpp (`http://localhost:8080/v1/models`) checks; warn (not fail) when not running, since local servers are optional.
|
|
10
|
-
- **Hardware-aware model recommendation.** New `dirgha hardware` subcommand (alias `sysinfo` / `system`) detects CPU cores, RAM, NVIDIA VRAM, AVX2, then ranks the top 5 GGUF models that fit. The Local step in `dirgha setup` runs the same probe and surfaces top-3 download-able models when neither local server is up. Catalogue: 9 ungated Q4_K_M GGUFs from `bartowski/` and `unsloth/` on HuggingFace, refreshed Apr 2026 (Qwen 3.5, Phi-4, Gemma 4, Mistral Small 3.2). `--json` emits the full profile + recommendations.
|
|
11
|
-
- **Five pillars.** README intro + `package.json` description rewritten to surface the new local-models pillar alongside BYOK, parallel agents, persistent memory, and skills.
|
|
12
|
-
|
|
13
|
-
## 1.4.0 — 2026-04-25
|
|
3
|
+
## 1.3.0 — 2026-04-25
|
|
14
4
|
|
|
15
5
|
### Added
|
|
16
6
|
|
|
@@ -49,7 +39,7 @@
|
|
|
49
39
|
|
|
50
40
|
### Dogfood evidence
|
|
51
41
|
|
|
52
|
-
The 1.
|
|
42
|
+
The 1.3.0 features were built using `dirgha -m hy3` (Tencent Hunyuan-3 preview, free via OR) as the implementation worker. The promo video at `/tmp/dirgha-promo/renders/dirgha-promo_2026-04-25_19-19-09.mp4` was authored by hy3 from a brief and rendered by hyperframes 0.4.26.
|
|
53
43
|
|
|
54
44
|
## 0.2.0-beta.1 (2026-04-24) — new core + NVIDIA streaming fix
|
|
55
45
|
|
|
@@ -96,8 +86,8 @@ Second-generation CLI core under `src_v2/`, shipped as the `dirgha-v2` binary al
|
|
|
96
86
|
- **Universal `--json`** — every command supports both `dirgha --json <cmd>` and `<cmd> --json`; output envelope is `{data, text, exitCode, command, timestamp, meta: {durationMs}}`
|
|
97
87
|
- **`/side <prompt>`** — Codex-style ephemeral sub-agent fork; doesn't pollute main history
|
|
98
88
|
- **Modal `/help`** — searchable overlay (type to filter, ↑↓ scroll, q/Esc close)
|
|
99
|
-
- **Spinner + elapsed time** on in-flight tool cells
|
|
100
|
-
- **Inline paste-collapse** — long pastes render as `[paste: N lines]` with first-line preview
|
|
89
|
+
- **Spinner + elapsed time** on in-flight tool cells (Codex pattern)
|
|
90
|
+
- **Inline paste-collapse** — long pastes render as `[paste: N lines]` with first-line preview (Hermes pattern)
|
|
101
91
|
- **Paste-burst detector** — Windows/terminal-safe; rapid `\n`-bursts coalesce instead of early-submitting
|
|
102
92
|
- **Fleet indicator** in status bar — `fleet × N` when ≥2 tools run in parallel
|
|
103
93
|
- **Auto-generated SKILL.md** on every `npm run build` (57 commands documented)
|
|
@@ -134,7 +124,7 @@ Second-generation CLI core under `src_v2/`, shipped as the `dirgha-v2` binary al
|
|
|
134
124
|
|
|
135
125
|
### Under the hood — standard terminology lock-in
|
|
136
126
|
|
|
137
|
-
Adopted industry-standard terms from the multi-agent workspace ecosystem audit (ccpm, claudio, genie, devteam, citadel, maw, agent-worktree):
|
|
127
|
+
Adopted industry-standard terms from the multi-agent workspace ecosystem audit (multica, ccpm, claudio, genie, devteam, citadel, maw, agent-worktree):
|
|
138
128
|
|
|
139
129
|
| Term | Meaning |
|
|
140
130
|
|---|---|
|
package/LICENSE
CHANGED
|
@@ -1,101 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
### The Change Date
|
|
23
|
-
|
|
24
|
-
The Change Date is two years from the date We make a version of the Licensed
|
|
25
|
-
Work available to the public under these terms.
|
|
26
|
-
|
|
27
|
-
### The Change License
|
|
28
|
-
|
|
29
|
-
The Change License is the MIT License.
|
|
30
|
-
|
|
31
|
-
### Permitted Purposes
|
|
32
|
-
|
|
33
|
-
A "Permitted Purpose" is any purpose other than a Competing Use. A "Competing
|
|
34
|
-
Use" means making the Licensed Work available to others in a commercial
|
|
35
|
-
product or service that:
|
|
36
|
-
|
|
37
|
-
1. substitutes for the use of the Licensed Work;
|
|
38
|
-
|
|
39
|
-
2. substitutes for any other product or service We offer using the Licensed
|
|
40
|
-
Work that exists as of the date We make the Licensed Work available; or
|
|
41
|
-
|
|
42
|
-
3. offers the same or substantially similar functionality as the Licensed
|
|
43
|
-
Work.
|
|
44
|
-
|
|
45
|
-
Permitted Purposes specifically include using the Licensed Work:
|
|
46
|
-
|
|
47
|
-
1. for your internal use and access;
|
|
48
|
-
|
|
49
|
-
2. for non-commercial education;
|
|
50
|
-
|
|
51
|
-
3. for non-commercial research; and
|
|
52
|
-
|
|
53
|
-
4. in connection with professional services that you provide to a licensee
|
|
54
|
-
using the Licensed Work in accordance with these terms.
|
|
55
|
-
|
|
56
|
-
### Notices
|
|
57
|
-
|
|
58
|
-
You must ensure that anyone who gets a copy of any part of the Licensed Work
|
|
59
|
-
from you also gets a copy of these terms or the URL for them above, as well
|
|
60
|
-
as the following copyright notice:
|
|
61
|
-
|
|
62
|
-
> This Licensed Work is made available under the Functional Source License,
|
|
63
|
-
> Version 1.1, MIT Future License (FSL-1.1-MIT).
|
|
64
|
-
|
|
65
|
-
### Redistribution
|
|
66
|
-
|
|
67
|
-
The Licensed Work may be redistributed under the MIT License upon the Change
|
|
68
|
-
Date, or any earlier date on which We elect to make the Licensed Work
|
|
69
|
-
available under the MIT License.
|
|
70
|
-
|
|
71
|
-
### Disclaimer
|
|
72
|
-
|
|
73
|
-
THE LICENSED WORK IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND,
|
|
74
|
-
INCLUDING ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
|
75
|
-
PURPOSE, NON-INFRINGEMENT, TITLE, OR NON-INTERFERENCE. IN NO EVENT WILL WE
|
|
76
|
-
HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE LICENSED WORK,
|
|
77
|
-
INCLUDING INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, EVEN IF
|
|
78
|
-
WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
|
|
79
|
-
|
|
80
|
-
## Use Grant
|
|
81
|
-
|
|
82
|
-
Subject to these terms, We grant you a non-exclusive, worldwide, royalty-free,
|
|
83
|
-
non-transferable, non-sublicensable right to use, copy, modify, create
|
|
84
|
-
derivative works, publish, and redistribute the Licensed Work for any
|
|
85
|
-
Permitted Purpose.
|
|
86
|
-
|
|
87
|
-
If you violate these terms, or if you sue anyone over patents that you think
|
|
88
|
-
may apply to the Licensed Work for a Permitted Purpose, these terms will
|
|
89
|
-
terminate automatically, your license under these terms will end, and you
|
|
90
|
-
must stop using the Licensed Work.
|
|
91
|
-
|
|
92
|
-
## Future License
|
|
93
|
-
|
|
94
|
-
On the Change Date, We will make the Licensed Work available under the terms
|
|
95
|
-
of the Change License, and the license granted above will terminate. After
|
|
96
|
-
the Change Date, you may use the Licensed Work under the terms of the Change
|
|
97
|
-
License without the restrictions set forth in these terms.
|
|
98
|
-
|
|
99
|
-
Any modifications or derivative works that you make under these terms may be
|
|
100
|
-
redistributed under either these terms or, after the Change Date, under the
|
|
101
|
-
Change License.
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2025 Dirgha AI
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -6,19 +6,15 @@
|
|
|
6
6
|
[](./LICENSE)
|
|
7
7
|
[](https://dirgha.ai/contribute)
|
|
8
8
|
|
|
9
|
-
**Dirgha Code is a CLI coding agent built
|
|
9
|
+
**Dirgha Code is a CLI coding agent built on four pillars: BYOK, persistent memory, parallel agents, and scanned skills.**
|
|
10
10
|
|
|
11
11
|
</div>
|
|
12
12
|
|
|
13
13
|
## What it is
|
|
14
14
|
|
|
15
|
-
A terminal coding assistant that reads your codebase, edits files, runs tests, commits, and audits every step. It runs on your keys
|
|
15
|
+
A terminal coding assistant that reads your codebase, edits files, runs tests, commits, and audits every step. It runs on your keys, on your machine, with your transcripts staying local until you choose otherwise. When a model rate-limits or times out, the loop swaps to the next-priority key in your pool and resumes from the partial transcript. Your work doesn't vanish when an API hiccups.
|
|
16
16
|
|
|
17
|
-
## The
|
|
18
|
-
|
|
19
|
-
### Local models — run entirely offline
|
|
20
|
-
|
|
21
|
-
First-class llama.cpp and Ollama support. The setup wizard auto-probes `localhost:8080` and `localhost:11434`, lists installed models, and sets one as your default — no API key, no telemetry, no per-token cost. Use `llamacpp/<model>` or `ollama/<model>` ids anywhere a hosted model id would go. `dirgha doctor` reports both servers' health alongside the hosted providers. Mix and match: route easy turns to a local model, escalate hard ones to a frontier API in the same session.
|
|
17
|
+
## The four pillars
|
|
22
18
|
|
|
23
19
|
### BYOK across 17 providers
|
|
24
20
|
|
|
@@ -47,13 +43,10 @@ SKILL.md packs are portable Markdown agents — share one git URL, anyone can `d
|
|
|
47
43
|
|
|
48
44
|
```bash
|
|
49
45
|
npm install -g @dirgha/code # or: pnpm add -g @dirgha/code
|
|
50
|
-
|
|
51
|
-
dirgha "say ok in one word"
|
|
46
|
+
export NVIDIA_API_KEY=nvapi-… # or OPENROUTER_API_KEY, ANTHROPIC_API_KEY, …
|
|
47
|
+
dirgha "say ok in one word" -m deepseek
|
|
52
48
|
```
|
|
53
49
|
|
|
54
|
-
Or skip the wizard and go straight to a key: `export NVIDIA_API_KEY=nvapi-…` (any of the 17 providers — see below).
|
|
55
|
-
For 100% local: install [Ollama](https://ollama.com) or [llama.cpp](https://github.com/ggerganov/llama.cpp), then run `dirgha setup` and pick **Local**.
|
|
56
|
-
|
|
57
50
|
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>"`.
|
|
58
51
|
|
|
59
52
|
## What's in the box
|
|
@@ -74,8 +67,7 @@ The interactive TUI is `dirgha` with no args. Resume a session with `dirgha resu
|
|
|
74
67
|
| | |
|
|
75
68
|
|---|---|
|
|
76
69
|
| Tests | **40/40** offline in ~16 s. CI green is a precondition for any PR. |
|
|
77
|
-
|
|
|
78
|
-
| 112 skills | Scanned by the heuristic prompt-injection / supply-chain check at install + load. |
|
|
70
|
+
| Parity | **9.82 / 10** mean across 22 capability dimensions scored against the leading reference CLIs. Sum-of-gaps = 0. Every closure cites a code path AND a runnable test. |
|
|
79
71
|
|
|
80
72
|
## Why this exists
|
|
81
73
|
|
|
@@ -93,6 +85,8 @@ The opposite assumption is the right one. Your laptop is the unit of sovereignty
|
|
|
93
85
|
| Architecture efficiency | [`docs/memory/architecture-efficiency.md`](./docs/memory/architecture-efficiency.md) |
|
|
94
86
|
| Skill security | [`docs/agents/skill-security.md`](./docs/agents/skill-security.md) |
|
|
95
87
|
| Files & search contract | [`docs/agents/files-and-search.md`](./docs/agents/files-and-search.md) |
|
|
88
|
+
| Parity scoreboard | [`docs/parity/CLI_PARITY_MATRIX.md`](./docs/parity/CLI_PARITY_MATRIX.md) |
|
|
89
|
+
| Design system | [`DESIGN.md`](./DESIGN.md) |
|
|
96
90
|
| Per-release notes | [`changelog/`](./changelog) |
|
|
97
91
|
|
|
98
92
|
## Contributing
|
|
@@ -108,7 +102,7 @@ A few specific ways to plug in:
|
|
|
108
102
|
- **Suggest providers.** If your favourite provider isn't in the 17 we support, open an issue and tell us which one + the env var. Most are a single config-blob diff.
|
|
109
103
|
- **Write a skill.** SKILL.md packs work across compatible agent CLIs. Publish a git repo, share the URL, anyone can `dirgha skills install <url>`.
|
|
110
104
|
- **Write a plugin.** TypeScript extensions API takes ~20 lines for a real tool. We're keen to feature good ones — drop a link.
|
|
111
|
-
- **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`.
|
|
105
|
+
- **Send a PR.** Read [`docs/parity/CLI_PARITY_MATRIX.md`](./docs/parity/CLI_PARITY_MATRIX.md) — the highest-gap row is the most important work. 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`.
|
|
112
106
|
|
|
113
107
|
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.
|
|
114
108
|
|
package/dist_v2/cli/config.d.ts
CHANGED
|
@@ -34,7 +34,6 @@ export interface DirghaConfig {
|
|
|
34
34
|
/**
|
|
35
35
|
* TUI colour palette. Defaults to 'dark'. Users switch via /theme at
|
|
36
36
|
* runtime; the preference is persisted to ~/.dirgha/config.json.
|
|
37
|
-
* Accepts the full 12-theme catalogue from `src_v2/tui/theme.ts`.
|
|
38
37
|
*/
|
|
39
38
|
theme?: 'dark' | 'light' | 'none' | 'midnight' | 'ocean' | 'solarized' | 'warm' | 'violet-storm' | 'cosmic' | 'nord' | 'ember' | 'sakura' | 'obsidian-gold' | 'crimson';
|
|
40
39
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src_v2/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;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src_v2/cli/config.ts"],"names":[],"mappings":"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"}
|
package/dist_v2/cli/main.js
CHANGED
|
@@ -203,8 +203,6 @@ async function main() {
|
|
|
203
203
|
if (stdin.isTTY && await isFirstRun()) {
|
|
204
204
|
const { runWizard } = await import('./flows/wizard.js');
|
|
205
205
|
const code = await runWizard([]);
|
|
206
|
-
// If they completed setup, fall through into the REPL so they
|
|
207
|
-
// can immediately use what they just configured. Otherwise exit.
|
|
208
206
|
if (code !== 0)
|
|
209
207
|
exit(code);
|
|
210
208
|
}
|
|
@@ -295,15 +293,15 @@ async function main() {
|
|
|
295
293
|
// this, the agent has zero project awareness — it's the parity
|
|
296
294
|
// matrix's #1 gap to close.
|
|
297
295
|
let mode = await resolveMode();
|
|
298
|
-
// CLI-level overrides
|
|
299
|
-
// surface-level form of "skip every approval", more discoverable
|
|
300
|
-
// than `DIRGHA_MODE=yolo`.
|
|
296
|
+
// CLI-level overrides: --yolo / --mode <name> beat the persisted mode.
|
|
301
297
|
if (flags.yolo === true)
|
|
302
298
|
mode = 'yolo';
|
|
303
299
|
if (typeof flags.mode === 'string' && ['plan', 'act', 'yolo', 'verify', 'ask'].includes(flags.mode)) {
|
|
304
300
|
mode = flags.mode;
|
|
305
301
|
}
|
|
306
|
-
|
|
302
|
+
// Surface auto-approve flag for hooks/audit; mode-enforcement handles
|
|
303
|
+
// the actual gate logic. Reading it here keeps the value next to mode.
|
|
304
|
+
void isAutoApprove(mode);
|
|
307
305
|
// Audit: record session start so `dirgha audit search <model>` /
|
|
308
306
|
// `audit list` can surface every dirgha invocation, not just turns.
|
|
309
307
|
// Lives after mode-resolve so we can include it in the entry.
|
|
@@ -407,7 +405,6 @@ async function main() {
|
|
|
407
405
|
events,
|
|
408
406
|
contextTransform: compactionTransform,
|
|
409
407
|
errorClassifier,
|
|
410
|
-
autoApprove,
|
|
411
408
|
...(composedHooks !== undefined ? { hooks: composedHooks } : {}),
|
|
412
409
|
});
|
|
413
410
|
// Runtime failover: if the agent loop errored (5xx, timeout, etc.)
|
|
@@ -434,7 +431,6 @@ async function main() {
|
|
|
434
431
|
events,
|
|
435
432
|
contextTransform: compactionTransform,
|
|
436
433
|
errorClassifier,
|
|
437
|
-
autoApprove,
|
|
438
434
|
...(composedHooks !== undefined ? { hooks: composedHooks } : {}),
|
|
439
435
|
});
|
|
440
436
|
}
|
package/dist_v2/cli/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src_v2/cli/main.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src_v2/cli/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,38 @@
|
|
|
10
10
|
* before any retry decision; there is no string matching.
|
|
11
11
|
* 4. Context transform (compaction, skill injection) is invoked once per
|
|
12
12
|
* turn before the provider call, never mid-stream.
|
|
13
|
+
* 5. Steering and follow-up queues allow mid-flight control (see queues.ts).
|
|
13
14
|
*/
|
|
14
|
-
import type { Message, AgentResult, ToolDefinition, Provider, ToolExecutor, ApprovalBus, ErrorClassifier, AgentHooks } from './types.js';
|
|
15
|
+
import type { Message, AgentMessage, AgentResult, ToolDefinition, Provider, ToolExecutor, ApprovalBus, ErrorClassifier, AgentHooks } from './types.js';
|
|
15
16
|
import type { EventStream } from './event-stream.js';
|
|
17
|
+
/**
|
|
18
|
+
* Controller interface for mid-flight agent steering and follow-up.
|
|
19
|
+
*
|
|
20
|
+
* Exposed via `cfg.controller` so callers can inject messages without
|
|
21
|
+
* changing the return type of `runAgentLoop` (which remains
|
|
22
|
+
* `Promise<AgentResult>` for backwards compatibility).
|
|
23
|
+
*
|
|
24
|
+
* Usage:
|
|
25
|
+
* const controller = { steer: (msg) => {}, followUp: (msg) => {} };
|
|
26
|
+
* const result = await runAgentLoop({ ...cfg, controller });
|
|
27
|
+
* // Later, from another context:
|
|
28
|
+
* controller.steer({ role: 'user', content: 'Stop and do this instead' });
|
|
29
|
+
*/
|
|
30
|
+
export interface AgentController {
|
|
31
|
+
/** Queue a steering message (drain mode: all). Replaces current turn. */
|
|
32
|
+
steer: (msg: AgentMessage) => void;
|
|
33
|
+
/** Queue a follow-up message (drain mode: one-at-a-time). Runs after current turn. */
|
|
34
|
+
followUp: (msg: AgentMessage) => void;
|
|
35
|
+
}
|
|
16
36
|
export interface AgentLoopConfig {
|
|
17
37
|
sessionId: string;
|
|
18
38
|
model: string;
|
|
19
|
-
|
|
39
|
+
/**
|
|
40
|
+
* Initial transcript. Plain `Message[]` is accepted (a `Message` is a
|
|
41
|
+
* structural `AgentMessage` since `ui` and `hidden` are optional), so
|
|
42
|
+
* existing callers keep working unchanged.
|
|
43
|
+
*/
|
|
44
|
+
messages: AgentMessage[];
|
|
20
45
|
tools: ToolDefinition[];
|
|
21
46
|
maxTurns: number;
|
|
22
47
|
provider: Provider;
|
|
@@ -25,16 +50,21 @@ export interface AgentLoopConfig {
|
|
|
25
50
|
approvalBus?: ApprovalBus;
|
|
26
51
|
errorClassifier?: ErrorClassifier;
|
|
27
52
|
hooks?: AgentHooks;
|
|
53
|
+
/**
|
|
54
|
+
* Per-turn context transform. Receives the full transcript (post-projection
|
|
55
|
+
* to `Message[]`) and returns the messages to actually send to the model.
|
|
56
|
+
* Kept on `Message[]` so existing transforms (compaction, etc.) need no
|
|
57
|
+
* changes.
|
|
58
|
+
*/
|
|
28
59
|
contextTransform?: (messages: Message[]) => Promise<Message[]>;
|
|
29
60
|
toolConcurrency?: 'serial' | 'parallel';
|
|
30
61
|
signal?: AbortSignal;
|
|
31
62
|
/**
|
|
32
|
-
*
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
* git mutations, etc.).
|
|
63
|
+
* Optional controller for mid-flight steering and follow-up.
|
|
64
|
+
* When provided, the caller can inject messages via `steer()` and `followUp()`.
|
|
65
|
+
* The controller object is populated with function references during loop
|
|
66
|
+
* initialisation (mutated in-place so the caller sees them).
|
|
37
67
|
*/
|
|
38
|
-
|
|
68
|
+
controller?: AgentController;
|
|
39
69
|
}
|
|
40
70
|
export declare function runAgentLoop(cfg: AgentLoopConfig): Promise<AgentResult>;
|
|
@@ -10,34 +10,48 @@
|
|
|
10
10
|
* before any retry decision; there is no string matching.
|
|
11
11
|
* 4. Context transform (compaction, skill injection) is invoked once per
|
|
12
12
|
* turn before the provider call, never mid-stream.
|
|
13
|
+
* 5. Steering and follow-up queues allow mid-flight control (see queues.ts).
|
|
13
14
|
*/
|
|
14
|
-
import { assembleTurn, extractToolUses, appendToolResults } from './message.js';
|
|
15
|
+
import { assembleTurn, extractToolUses, appendToolResults, convertToLlm } from './message.js';
|
|
16
|
+
import { SteeringQueue, FollowUpQueue } from './queues.js';
|
|
15
17
|
export async function runAgentLoop(cfg) {
|
|
16
18
|
const events = cfg.events;
|
|
17
19
|
const history = [...cfg.messages];
|
|
18
20
|
const totals = { inputTokens: 0, outputTokens: 0, cachedTokens: 0, costUsd: 0 };
|
|
19
21
|
let stopReason = 'end_turn';
|
|
20
22
|
let turnCount = 0;
|
|
23
|
+
// Initialise steering and follow-up queues.
|
|
24
|
+
const steeringQueue = new SteeringQueue();
|
|
25
|
+
const followUpQueue = new FollowUpQueue();
|
|
26
|
+
// Populate the controller object in-place so the caller can use it.
|
|
27
|
+
if (cfg.controller) {
|
|
28
|
+
cfg.controller.steer = (msg) => steeringQueue.enqueue(msg);
|
|
29
|
+
cfg.controller.followUp = (msg) => followUpQueue.enqueue(msg);
|
|
30
|
+
}
|
|
21
31
|
events.emit({ type: 'agent_start', sessionId: cfg.sessionId, model: cfg.model });
|
|
22
32
|
try {
|
|
23
|
-
for (let turnIndex = 0; turnIndex < cfg.maxTurns;
|
|
33
|
+
for (let turnIndex = 0; turnIndex < cfg.maxTurns;) {
|
|
24
34
|
if (cfg.signal?.aborted) {
|
|
25
35
|
stopReason = 'aborted';
|
|
26
36
|
break;
|
|
27
37
|
}
|
|
28
38
|
if (cfg.hooks?.beforeTurn) {
|
|
29
|
-
|
|
39
|
+
// Project to Message[] so hooks observe exactly what the LLM does
|
|
40
|
+
// (no ui/hidden leakage via covariant assignability).
|
|
41
|
+
const decision = await cfg.hooks.beforeTurn(turnIndex, convertToLlm(history));
|
|
30
42
|
if (decision === 'abort') {
|
|
31
43
|
stopReason = 'aborted';
|
|
32
44
|
break;
|
|
33
45
|
}
|
|
34
46
|
}
|
|
35
|
-
turnCount = turnIndex + 1;
|
|
36
47
|
const turnId = `t${turnIndex}-${Date.now().toString(36)}`;
|
|
37
48
|
events.emit({ type: 'turn_start', turnId, turnIndex });
|
|
49
|
+
// Projection boundary: strip UI-only metadata + drop hidden messages
|
|
50
|
+
// before either the optional contextTransform or the provider call.
|
|
51
|
+
const llmMessages = convertToLlm(history);
|
|
38
52
|
const messagesForCall = cfg.contextTransform
|
|
39
|
-
? await cfg.contextTransform(
|
|
40
|
-
:
|
|
53
|
+
? await cfg.contextTransform(llmMessages)
|
|
54
|
+
: llmMessages;
|
|
41
55
|
const streamEvents = [];
|
|
42
56
|
try {
|
|
43
57
|
for await (const ev of cfg.provider.stream({
|
|
@@ -51,16 +65,6 @@ export async function runAgentLoop(cfg) {
|
|
|
51
65
|
}
|
|
52
66
|
}
|
|
53
67
|
catch (err) {
|
|
54
|
-
// An AbortError mid-stream is a clean cancellation, not a
|
|
55
|
-
// failure. Distinguish so callers (and `dirgha audit`) see
|
|
56
|
-
// `stopReason: 'aborted'` instead of misleading 'error'.
|
|
57
|
-
const isAbort = ((err instanceof Error && (err.name === 'AbortError' || /aborted|abort/i.test(err.message)))
|
|
58
|
-
|| cfg.signal?.aborted === true);
|
|
59
|
-
if (isAbort) {
|
|
60
|
-
stopReason = 'aborted';
|
|
61
|
-
events.emit({ type: 'turn_end', turnId, stopReason });
|
|
62
|
-
break;
|
|
63
|
-
}
|
|
64
68
|
const classified = cfg.errorClassifier?.classify(err, cfg.provider.id, cfg.model);
|
|
65
69
|
events.emit({
|
|
66
70
|
type: 'error',
|
|
@@ -77,12 +81,43 @@ export async function runAgentLoop(cfg) {
|
|
|
77
81
|
totals.outputTokens += assembled.outputTokens;
|
|
78
82
|
totals.cachedTokens += assembled.cachedTokens;
|
|
79
83
|
history.push(assembled.message);
|
|
84
|
+
// After provider stream completes, drain steering queue.
|
|
85
|
+
// If non-empty, push steered messages to history and continue looping
|
|
86
|
+
// (don't break on end_turn — the steered message becomes the next prompt).
|
|
87
|
+
const steeredMessages = steeringQueue.drain();
|
|
88
|
+
if (steeredMessages && steeredMessages.length > 0) {
|
|
89
|
+
// Remove the assistant message we just added (the steered message replaces it).
|
|
90
|
+
history.pop();
|
|
91
|
+
// Push the steered messages instead.
|
|
92
|
+
history.push(...steeredMessages);
|
|
93
|
+
// Re-run the loop without incrementing turnIndex
|
|
94
|
+
// (the steered message is the new prompt for the same turn).
|
|
95
|
+
events.emit({ type: 'turn_end', turnId, stopReason: 'tool_use' });
|
|
96
|
+
await cfg.hooks?.afterTurn?.(turnIndex, totals);
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
// No steering — check if we're done or need tool execution.
|
|
80
100
|
const toolUses = extractToolUses(assembled.message);
|
|
81
101
|
if (toolUses.length === 0) {
|
|
102
|
+
// Check for follow-up messages before breaking.
|
|
103
|
+
// If a follow-up exists, it becomes the next turn.
|
|
104
|
+
const followUpMessages = followUpQueue.drain();
|
|
105
|
+
if (followUpMessages) {
|
|
106
|
+
history.push(...followUpMessages);
|
|
107
|
+
turnCount = turnIndex + 1;
|
|
108
|
+
events.emit({ type: 'turn_end', turnId, stopReason: 'tool_use' });
|
|
109
|
+
await cfg.hooks?.afterTurn?.(turnIndex, totals);
|
|
110
|
+
turnIndex++;
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
// No follow-up, we're done.
|
|
114
|
+
turnCount = turnIndex + 1;
|
|
82
115
|
events.emit({ type: 'turn_end', turnId, stopReason: 'end_turn' });
|
|
83
116
|
await cfg.hooks?.afterTurn?.(turnIndex, totals);
|
|
84
117
|
break;
|
|
85
118
|
}
|
|
119
|
+
// Execute tool calls and continue to next turn.
|
|
120
|
+
turnCount = turnIndex + 1;
|
|
86
121
|
const toolResults = await executeToolCalls(toolUses, cfg, events);
|
|
87
122
|
const appended = appendToolResults(history, toolResults.map(r => ({
|
|
88
123
|
toolUseId: r.call.id,
|
|
@@ -93,12 +128,16 @@ export async function runAgentLoop(cfg) {
|
|
|
93
128
|
history.push(...appended);
|
|
94
129
|
events.emit({ type: 'turn_end', turnId, stopReason: 'tool_use' });
|
|
95
130
|
await cfg.hooks?.afterTurn?.(turnIndex, totals);
|
|
131
|
+
// Only increment turnIndex if we're not being steered.
|
|
132
|
+
turnIndex++;
|
|
96
133
|
}
|
|
97
134
|
}
|
|
98
135
|
finally {
|
|
99
136
|
events.emit({ type: 'agent_end', sessionId: cfg.sessionId, stopReason, usage: totals });
|
|
100
137
|
}
|
|
101
|
-
|
|
138
|
+
// Project to Message[] on return — AgentResult.messages is typed Message[],
|
|
139
|
+
// so honor that contract here. Sprint B/C can widen later if needed.
|
|
140
|
+
return { messages: convertToLlm(history), usage: totals, stopReason, turnCount, sessionId: cfg.sessionId };
|
|
102
141
|
}
|
|
103
142
|
async function executeToolCalls(toolUses, cfg, events) {
|
|
104
143
|
const run = async (call) => {
|
|
@@ -113,7 +152,7 @@ async function executeToolCalls(toolUses, cfg, events) {
|
|
|
113
152
|
input = decision.replaceInput;
|
|
114
153
|
}
|
|
115
154
|
}
|
|
116
|
-
if (cfg.approvalBus?.requiresApproval(call.name, input)
|
|
155
|
+
if (cfg.approvalBus?.requiresApproval(call.name, input)) {
|
|
117
156
|
const decision = await cfg.approvalBus.request({
|
|
118
157
|
id: call.id,
|
|
119
158
|
tool: call.name,
|