@dirgha/code 1.17.2 → 1.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +130 -45
- package/README.md +34 -25
- package/dist/cli/config.d.ts +2 -0
- package/dist/cli/config.js +16 -1
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/flows/tarball.js +26 -21
- package/dist/cli/flows/tarball.js.map +1 -1
- package/dist/cli/flows/wizard.d.ts +1 -1
- package/dist/cli/flows/wizard.js +282 -163
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +11 -3
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +77 -7
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/models-cmd.js +18 -20
- package/dist/cli/models-cmd.js.map +1 -1
- package/dist/cli/slash/fleet.d.ts +1 -1
- package/dist/cli/slash/fleet.js +25 -16
- package/dist/cli/slash/fleet.js.map +1 -1
- package/dist/cli/slash/fs.js +1 -3
- package/dist/cli/slash/fs.js.map +1 -1
- package/dist/cli/slash/models.js +3 -4
- package/dist/cli/slash/models.js.map +1 -1
- package/dist/cli/slash/paste.d.ts +1 -1
- package/dist/cli/slash/paste.js +87 -41
- package/dist/cli/slash/paste.js.map +1 -1
- package/dist/cli/slash/provider.js +2 -2
- package/dist/cli/slash/provider.js.map +1 -1
- package/dist/cli/slash/session.js +4 -1
- package/dist/cli/slash/session.js.map +1 -1
- package/dist/cli/subcommands/doctor.js +48 -0
- package/dist/cli/subcommands/doctor.js.map +1 -1
- package/dist/cli/subcommands/history.d.ts +8 -0
- package/dist/cli/subcommands/history.js +45 -0
- package/dist/cli/subcommands/history.js.map +1 -0
- package/dist/cli/subcommands/index.js +4 -0
- package/dist/cli/subcommands/index.js.map +1 -1
- package/dist/cli/subcommands/scaffold.js +6 -2
- package/dist/cli/subcommands/scaffold.js.map +1 -1
- package/dist/cli/subcommands/state.d.ts +8 -0
- package/dist/cli/subcommands/state.js +44 -0
- package/dist/cli/subcommands/state.js.map +1 -0
- package/dist/cli/subcommands/web.d.ts +1 -1
- package/dist/cli/subcommands/web.js +17 -14
- package/dist/cli/subcommands/web.js.map +1 -1
- package/dist/context/compaction.d.ts +3 -3
- package/dist/context/compaction.js +85 -37
- package/dist/context/compaction.js.map +1 -1
- package/dist/context/default-soul.md +5 -1
- package/dist/context/kb-init.d.ts +7 -0
- package/dist/context/kb-init.js +51 -0
- package/dist/context/kb-init.js.map +1 -0
- package/dist/context/ledger.js +3 -3
- package/dist/context/ledger.js.map +1 -1
- package/dist/context/memory.js +3 -0
- package/dist/context/memory.js.map +1 -1
- package/dist/context/primer.js +2 -0
- package/dist/context/primer.js.map +1 -1
- package/dist/context/session.js +5 -0
- package/dist/context/session.js.map +1 -1
- package/dist/daemon/server.d.ts +4 -0
- package/dist/daemon/server.js +81 -29
- package/dist/daemon/server.js.map +1 -1
- package/dist/fleet/apply-back.d.ts +1 -1
- package/dist/fleet/apply-back.js +90 -48
- package/dist/fleet/apply-back.js.map +1 -1
- package/dist/fleet/cli-command.d.ts +2 -2
- package/dist/fleet/cli-command.js +189 -72
- package/dist/fleet/cli-command.js.map +1 -1
- package/dist/fleet/dag.d.ts +38 -0
- package/dist/fleet/dag.js +77 -0
- package/dist/fleet/dag.js.map +1 -0
- package/dist/fleet/ledger-hook.d.ts +15 -0
- package/dist/fleet/ledger-hook.js +67 -0
- package/dist/fleet/ledger-hook.js.map +1 -0
- package/dist/fleet/runner.js +38 -5
- package/dist/fleet/runner.js.map +1 -1
- package/dist/fleet/scratchpad-tools.d.ts +13 -0
- package/dist/fleet/scratchpad-tools.js +73 -0
- package/dist/fleet/scratchpad-tools.js.map +1 -0
- package/dist/fleet/scratchpad.d.ts +28 -0
- package/dist/fleet/scratchpad.js +93 -0
- package/dist/fleet/scratchpad.js.map +1 -0
- package/dist/fleet/state.d.ts +37 -0
- package/dist/fleet/state.js +82 -0
- package/dist/fleet/state.js.map +1 -0
- package/dist/fleet/tripleshot.d.ts +2 -2
- package/dist/fleet/tripleshot.js +61 -48
- package/dist/fleet/tripleshot.js.map +1 -1
- package/dist/fleet/types.d.ts +4 -0
- package/dist/fleet/types.js.map +1 -1
- package/dist/fleet/worktree.d.ts +5 -0
- package/dist/fleet/worktree.js +82 -11
- package/dist/fleet/worktree.js.map +1 -1
- package/dist/hooks/config-bridge.d.ts +2 -2
- package/dist/hooks/config-bridge.js +49 -19
- package/dist/hooks/config-bridge.js.map +1 -1
- package/dist/integrations/arniko-client.d.ts +1 -1
- package/dist/integrations/arniko-client.js +32 -26
- package/dist/integrations/arniko-client.js.map +1 -1
- package/dist/intelligence/cost.js +13 -7
- package/dist/intelligence/cost.js.map +1 -1
- package/dist/intelligence/failover-chain.d.ts +27 -0
- package/dist/intelligence/failover-chain.js +70 -0
- package/dist/intelligence/failover-chain.js.map +1 -0
- package/dist/intelligence/models-dev-sync.js +10 -3
- package/dist/intelligence/models-dev-sync.js.map +1 -1
- package/dist/intelligence/prices.js +1 -1
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.js +74 -17
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/event-stream.d.ts +7 -2
- package/dist/kernel/event-stream.js +63 -9
- package/dist/kernel/event-stream.js.map +1 -1
- package/dist/kernel/message.d.ts +2 -2
- package/dist/kernel/message.js +45 -30
- package/dist/kernel/message.js.map +1 -1
- package/dist/kernel/types.d.ts +1 -1
- package/dist/lsp/client.js +16 -7
- package/dist/lsp/client.js.map +1 -1
- package/dist/providers/deepseek.d.ts +2 -2
- package/dist/providers/deepseek.js +21 -21
- package/dist/providers/deepseek.js.map +1 -1
- package/dist/providers/health.d.ts +4 -1
- package/dist/providers/health.js +24 -9
- package/dist/providers/health.js.map +1 -1
- package/dist/providers/http.d.ts +2 -0
- package/dist/providers/http.js +42 -22
- package/dist/providers/http.js.map +1 -1
- package/dist/providers/openai-compat.js +30 -27
- package/dist/providers/openai-compat.js.map +1 -1
- package/dist/providers/openrouter.d.ts +2 -2
- package/dist/providers/openrouter.js +25 -16
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/safety/approval-bus.js +1 -1
- package/dist/safety/approval-bus.js.map +1 -1
- package/dist/safety/policy.d.ts +3 -3
- package/dist/safety/policy.js +60 -47
- package/dist/safety/policy.js.map +1 -1
- package/dist/safety/sandbox/noop.d.ts +2 -2
- package/dist/safety/sandbox/noop.js +23 -15
- package/dist/safety/sandbox/noop.js.map +1 -1
- package/dist/safety/sandbox/seatbelt.d.ts +1 -1
- package/dist/safety/sandbox/seatbelt.js +16 -9
- package/dist/safety/sandbox/seatbelt.js.map +1 -1
- package/dist/state/db.d.ts +28 -0
- package/dist/state/db.js +129 -0
- package/dist/state/db.js.map +1 -0
- package/dist/state/index.d.ts +23 -0
- package/dist/state/index.js +119 -0
- package/dist/state/index.js.map +1 -0
- package/dist/subagents/delegator.d.ts +8 -0
- package/dist/subagents/delegator.js +22 -5
- package/dist/subagents/delegator.js.map +1 -1
- package/dist/telemetry/crash-report.js +111 -79
- package/dist/telemetry/crash-report.js.map +1 -1
- package/dist/tools/browser.d.ts +1 -1
- package/dist/tools/browser.js +62 -45
- package/dist/tools/browser.js.map +1 -1
- package/dist/tools/checkpoint.js +3 -0
- package/dist/tools/checkpoint.js.map +1 -1
- package/dist/tools/cron.d.ts +1 -1
- package/dist/tools/cron.js +61 -41
- package/dist/tools/cron.js.map +1 -1
- package/dist/tools/exec.js +36 -1
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/fs-edit.js +4 -1
- package/dist/tools/fs-edit.js.map +1 -1
- package/dist/tools/fs-ls.js +4 -1
- package/dist/tools/fs-ls.js.map +1 -1
- package/dist/tools/fs-read.js +4 -1
- package/dist/tools/fs-read.js.map +1 -1
- package/dist/tools/fs-write.js +4 -1
- package/dist/tools/fs-write.js.map +1 -1
- package/dist/tools/git.d.ts +1 -1
- package/dist/tools/git.js +45 -25
- package/dist/tools/git.js.map +1 -1
- package/dist/tools/index.d.ts +3 -1
- package/dist/tools/index.js +5 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/lsp-definition.js +10 -1
- package/dist/tools/lsp-definition.js.map +1 -1
- package/dist/tools/lsp-hover.js +10 -1
- package/dist/tools/lsp-hover.js.map +1 -1
- package/dist/tools/lsp-references.js +10 -1
- package/dist/tools/lsp-references.js.map +1 -1
- package/dist/tools/lsp-symbols.js +10 -1
- package/dist/tools/lsp-symbols.js.map +1 -1
- package/dist/tools/multimodal.d.ts +2 -2
- package/dist/tools/multimodal.js +141 -90
- package/dist/tools/multimodal.js.map +1 -1
- package/dist/tools/qmd.d.ts +15 -0
- package/dist/tools/qmd.js +107 -0
- package/dist/tools/qmd.js.map +1 -0
- package/dist/tools/registry.d.ts +5 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/rtk.d.ts +12 -0
- package/dist/tools/rtk.js +113 -0
- package/dist/tools/rtk.js.map +1 -0
- package/dist/tools/search-grep.js +1 -0
- package/dist/tools/search-grep.js.map +1 -1
- package/dist/tools/shell.js +25 -16
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/approval.d.ts +1 -1
- package/dist/tui/approval.js +38 -14
- package/dist/tui/approval.js.map +1 -1
- package/dist/tui/ink/App.js +88 -69
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/DenseToolMessage.js +2 -8
- package/dist/tui/ink/components/DenseToolMessage.js.map +1 -1
- package/dist/tui/ink/components/InputBox.js +1 -1
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/StatusBar.js +2 -21
- package/dist/tui/ink/components/StatusBar.js.map +1 -1
- package/dist/tui/ink/components/ThinkingBlock.js +3 -3
- package/dist/tui/ink/components/ThinkingBlock.js.map +1 -1
- package/dist/tui/ink/components/ToolBox.js +3 -23
- package/dist/tui/ink/components/ToolBox.js.map +1 -1
- package/dist/tui/ink/components/ToolGroup.js +2 -8
- package/dist/tui/ink/components/ToolGroup.js.map +1 -1
- package/dist/tui/ink/ink-approval-bus.js +4 -1
- package/dist/tui/ink/ink-approval-bus.js.map +1 -1
- package/dist/tui/ink/spinner-context.d.ts +3 -0
- package/dist/tui/ink/spinner-context.js +6 -0
- package/dist/tui/ink/spinner-context.js.map +1 -0
- package/dist/tui/ink/use-event-projection.js +142 -37
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/renderer.js +9 -1
- package/dist/tui/renderer.js.map +1 -1
- package/dist/web/ledger.d.ts +1 -1
- package/dist/web/ledger.js +44 -20
- package/dist/web/ledger.js.map +1 -1
- package/dist/web/server.js +4 -3
- package/dist/web/server.js.map +1 -1
- package/package.json +16 -12
- package/vendor/qmd/VERSION +3 -0
- package/vendor/rtk/CHECKSUMS.txt +6 -0
- package/vendor/rtk/VERSION +3 -0
- package/vendor/rtk/linux-x64/rtk +0 -0
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
* parsing is deterministic; we fall back to the first completed variant
|
|
12
12
|
* when the judge misbehaves.
|
|
13
13
|
*/
|
|
14
|
-
import type { FleetConfig, TripleshotResult } from
|
|
15
|
-
export interface TripleshotConfig extends Omit<FleetConfig,
|
|
14
|
+
import type { FleetConfig, TripleshotResult } from "./types.js";
|
|
15
|
+
export interface TripleshotConfig extends Omit<FleetConfig, "subtasks" | "concurrency"> {
|
|
16
16
|
/** Auto-apply the winner's diff to the parent tree via applyBack. */
|
|
17
17
|
autoMerge?: boolean;
|
|
18
18
|
/** Override the judge model; defaults to `plannerModel` or `model`. */
|
package/dist/fleet/tripleshot.js
CHANGED
|
@@ -11,27 +11,27 @@
|
|
|
11
11
|
* parsing is deterministic; we fall back to the first completed variant
|
|
12
12
|
* when the judge misbehaves.
|
|
13
13
|
*/
|
|
14
|
-
import { runFleet } from
|
|
15
|
-
import { applyBack } from
|
|
16
|
-
import { getHeadSha } from
|
|
17
|
-
import { execFile } from
|
|
18
|
-
import { promisify } from
|
|
19
|
-
import { ProviderRegistry } from
|
|
20
|
-
import { createEventStream } from
|
|
21
|
-
import { repairJSON } from
|
|
14
|
+
import { runFleet } from "./runner.js";
|
|
15
|
+
import { applyBack } from "./apply-back.js";
|
|
16
|
+
import { getHeadSha } from "./worktree.js";
|
|
17
|
+
import { execFile } from "node:child_process";
|
|
18
|
+
import { promisify } from "node:util";
|
|
19
|
+
import { ProviderRegistry } from "../providers/index.js";
|
|
20
|
+
import { createEventStream } from "../kernel/event-stream.js";
|
|
21
|
+
import { repairJSON } from "../utils/json-repair.js";
|
|
22
22
|
const pexec = promisify(execFile);
|
|
23
23
|
const VARIATIONS = [
|
|
24
24
|
{
|
|
25
|
-
id:
|
|
26
|
-
style:
|
|
25
|
+
id: "conservative",
|
|
26
|
+
style: "Prioritize minimal changes, safety, and backward compatibility. Prefer the smallest diff that satisfies the goal.",
|
|
27
27
|
},
|
|
28
28
|
{
|
|
29
|
-
id:
|
|
30
|
-
style:
|
|
29
|
+
id: "balanced",
|
|
30
|
+
style: "Balance correctness with cleanliness. Refactor only when it clearly improves readability and stay focused on the stated goal.",
|
|
31
31
|
},
|
|
32
32
|
{
|
|
33
|
-
id:
|
|
34
|
-
style:
|
|
33
|
+
id: "bold",
|
|
34
|
+
style: "Optimize for long-term code quality. Aggressively refactor adjacent code that is clearly improved by the change, without breaking public APIs.",
|
|
35
35
|
},
|
|
36
36
|
];
|
|
37
37
|
const JUDGE_SYSTEM = `You are a strict code-review judge. You will be shown a goal and up to 3 candidate diffs from variants named "conservative", "balanced", and "bold".
|
|
@@ -46,11 +46,11 @@ Output STRICT JSON only, no prose, no markdown:
|
|
|
46
46
|
{ "winner": "conservative|balanced|bold", "runner_up": "conservative|balanced|bold", "reason": "<1-2 sentences>" }`;
|
|
47
47
|
export async function runTripleshot(goal, config) {
|
|
48
48
|
const started = Date.now();
|
|
49
|
-
const subtasks = VARIATIONS.map(v => ({
|
|
49
|
+
const subtasks = VARIATIONS.map((v) => ({
|
|
50
50
|
id: `${v.id}`,
|
|
51
51
|
title: `[${v.id}] ${goal}`.slice(0, 80),
|
|
52
52
|
task: `${goal}\n\nStylistic guidance: ${v.style}`,
|
|
53
|
-
type:
|
|
53
|
+
type: "code",
|
|
54
54
|
}));
|
|
55
55
|
const fleetResult = await runFleet({
|
|
56
56
|
...config,
|
|
@@ -63,23 +63,25 @@ export async function runTripleshot(goal, config) {
|
|
|
63
63
|
const events = config.events ?? createEventStream();
|
|
64
64
|
const shots = [];
|
|
65
65
|
const repoRoot = fleetResult.worktrees[0]?.repoRoot;
|
|
66
|
-
const parentHead = repoRoot ? await getHeadSha(repoRoot) :
|
|
66
|
+
const parentHead = repoRoot ? await getHeadSha(repoRoot) : "";
|
|
67
67
|
for (const a of fleetResult.agents) {
|
|
68
|
-
if (a.status !==
|
|
68
|
+
if (a.status !== "completed")
|
|
69
69
|
continue;
|
|
70
|
-
const variant = VARIATIONS.find(v => a.id === v.id)?.id;
|
|
70
|
+
const variant = VARIATIONS.find((v) => a.id === v.id)?.id;
|
|
71
71
|
if (!variant)
|
|
72
72
|
continue;
|
|
73
|
-
let diff =
|
|
73
|
+
let diff = "";
|
|
74
74
|
try {
|
|
75
|
-
await pexec(
|
|
76
|
-
const { stdout } = await pexec(
|
|
75
|
+
await pexec("git", ["add", "-A"], { cwd: a.worktreePath });
|
|
76
|
+
const { stdout } = await pexec("git", ["diff", parentHead, "--"], {
|
|
77
77
|
cwd: a.worktreePath,
|
|
78
78
|
maxBuffer: 20 * 1024 * 1024,
|
|
79
79
|
});
|
|
80
80
|
diff = stdout;
|
|
81
81
|
}
|
|
82
|
-
catch {
|
|
82
|
+
catch {
|
|
83
|
+
/* skip empty */
|
|
84
|
+
}
|
|
83
85
|
if (diff.trim()) {
|
|
84
86
|
shots.push({ variant, agent: a, diff: diff.slice(0, 8000) });
|
|
85
87
|
}
|
|
@@ -90,7 +92,7 @@ export async function runTripleshot(goal, config) {
|
|
|
90
92
|
goal,
|
|
91
93
|
winner: null,
|
|
92
94
|
runnerUp: null,
|
|
93
|
-
reason:
|
|
95
|
+
reason: "No variant produced a diff",
|
|
94
96
|
shots: [],
|
|
95
97
|
agents: fleetResult.agents,
|
|
96
98
|
worktrees: fleetResult.worktrees,
|
|
@@ -100,8 +102,9 @@ export async function runTripleshot(goal, config) {
|
|
|
100
102
|
}
|
|
101
103
|
if (shots.length === 1) {
|
|
102
104
|
const only = shots[0];
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
+
const handle = handleFor(fleetResult.worktrees, only.agent.worktreePath);
|
|
106
|
+
const ab = config.autoMerge && handle
|
|
107
|
+
? await applyBack(handle, {
|
|
105
108
|
message: `triple: ${only.variant} (${goal.slice(0, 40)})`,
|
|
106
109
|
})
|
|
107
110
|
: undefined;
|
|
@@ -109,7 +112,7 @@ export async function runTripleshot(goal, config) {
|
|
|
109
112
|
goal,
|
|
110
113
|
winner: only.variant,
|
|
111
114
|
runnerUp: null,
|
|
112
|
-
reason:
|
|
115
|
+
reason: "Only one variant completed",
|
|
113
116
|
shots,
|
|
114
117
|
agents: fleetResult.agents,
|
|
115
118
|
worktrees: fleetResult.worktrees,
|
|
@@ -118,14 +121,18 @@ export async function runTripleshot(goal, config) {
|
|
|
118
121
|
durationMs: Date.now() - started,
|
|
119
122
|
};
|
|
120
123
|
}
|
|
121
|
-
const { winner, runnerUp, reason, usage: judgeUsage } = await askJudge(goal, shots, judgeModel, providers, events);
|
|
124
|
+
const { winner, runnerUp, reason, usage: judgeUsage, } = await askJudge(goal, shots, judgeModel, providers, events);
|
|
122
125
|
accumulate(tokens, judgeUsage);
|
|
123
126
|
let apply;
|
|
124
127
|
if (config.autoMerge && winner) {
|
|
125
|
-
const winShot = shots.find(s => s.variant === winner);
|
|
128
|
+
const winShot = shots.find((s) => s.variant === winner);
|
|
126
129
|
if (winShot) {
|
|
127
130
|
const handle = handleFor(fleetResult.worktrees, winShot.agent.worktreePath);
|
|
128
|
-
|
|
131
|
+
if (handle) {
|
|
132
|
+
apply = await applyBack(handle, {
|
|
133
|
+
message: `triple: ${winner} (${goal.slice(0, 40)})`,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
129
136
|
}
|
|
130
137
|
}
|
|
131
138
|
return {
|
|
@@ -143,7 +150,9 @@ export async function runTripleshot(goal, config) {
|
|
|
143
150
|
}
|
|
144
151
|
async function askJudge(goal, shots, judgeModel, providers, events) {
|
|
145
152
|
const prompt = `GOAL: ${goal}\n\n` +
|
|
146
|
-
shots
|
|
153
|
+
shots
|
|
154
|
+
.map((s) => `=== ${s.variant.toUpperCase()} ===\n${s.diff}\n`)
|
|
155
|
+
.join("\n") +
|
|
147
156
|
`\nPick the best variant. Output JSON only.`;
|
|
148
157
|
const provider = providers.forModel(judgeModel);
|
|
149
158
|
const streamEvents = [];
|
|
@@ -151,8 +160,8 @@ async function askJudge(goal, shots, judgeModel, providers, events) {
|
|
|
151
160
|
for await (const ev of provider.stream({
|
|
152
161
|
model: judgeModel,
|
|
153
162
|
messages: [
|
|
154
|
-
{ role:
|
|
155
|
-
{ role:
|
|
163
|
+
{ role: "system", content: JUDGE_SYSTEM },
|
|
164
|
+
{ role: "user", content: prompt },
|
|
156
165
|
],
|
|
157
166
|
})) {
|
|
158
167
|
streamEvents.push(ev);
|
|
@@ -168,11 +177,11 @@ async function askJudge(goal, shots, judgeModel, providers, events) {
|
|
|
168
177
|
};
|
|
169
178
|
}
|
|
170
179
|
const text = streamEvents
|
|
171
|
-
.filter((e) => e.type ===
|
|
172
|
-
.map(e => e.delta)
|
|
173
|
-
.join(
|
|
180
|
+
.filter((e) => e.type === "text_delta")
|
|
181
|
+
.map((e) => e.delta)
|
|
182
|
+
.join("");
|
|
174
183
|
const usage = streamEvents
|
|
175
|
-
.filter((e) => e.type ===
|
|
184
|
+
.filter((e) => e.type === "usage")
|
|
176
185
|
.reduce((acc, e) => ({
|
|
177
186
|
inputTokens: acc.inputTokens + e.inputTokens,
|
|
178
187
|
outputTokens: acc.outputTokens + e.outputTokens,
|
|
@@ -185,23 +194,30 @@ function parseVerdict(text, shots, usage) {
|
|
|
185
194
|
const defaultVerdict = {
|
|
186
195
|
winner: shots[0]?.variant ?? null,
|
|
187
196
|
runnerUp: shots[1]?.variant ?? null,
|
|
188
|
-
reason:
|
|
197
|
+
reason: "Judge output unparseable; defaulted to first completed variant.",
|
|
189
198
|
usage,
|
|
190
199
|
};
|
|
191
200
|
const match = /\{[\s\S]*?\}/.exec(text);
|
|
192
201
|
if (!match)
|
|
193
202
|
return defaultVerdict;
|
|
194
203
|
const parsed = repairJSON(match[0]);
|
|
195
|
-
if (!parsed || typeof parsed !==
|
|
204
|
+
if (!parsed || typeof parsed !== "object")
|
|
196
205
|
return defaultVerdict;
|
|
197
206
|
const rec = parsed;
|
|
198
207
|
const winner = isVariant(rec.winner) ? rec.winner : defaultVerdict.winner;
|
|
199
|
-
const runnerUp = isVariant(rec.runner_up)
|
|
200
|
-
|
|
201
|
-
|
|
208
|
+
const runnerUp = isVariant(rec.runner_up)
|
|
209
|
+
? rec.runner_up
|
|
210
|
+
: defaultVerdict.runnerUp;
|
|
211
|
+
const reason = typeof rec.reason === "string" ? rec.reason : "No reason given.";
|
|
212
|
+
return {
|
|
213
|
+
winner,
|
|
214
|
+
runnerUp: winner === runnerUp ? null : runnerUp,
|
|
215
|
+
reason,
|
|
216
|
+
usage,
|
|
217
|
+
};
|
|
202
218
|
}
|
|
203
219
|
function isVariant(v) {
|
|
204
|
-
return v ===
|
|
220
|
+
return v === "conservative" || v === "balanced" || v === "bold";
|
|
205
221
|
}
|
|
206
222
|
function accumulate(total, add) {
|
|
207
223
|
total.inputTokens += add.inputTokens;
|
|
@@ -210,13 +226,10 @@ function accumulate(total, add) {
|
|
|
210
226
|
total.costUsd += add.costUsd;
|
|
211
227
|
}
|
|
212
228
|
function handleFor(worktrees, path) {
|
|
213
|
-
const wt = worktrees.find(w => w.path === path);
|
|
214
|
-
if (!wt) {
|
|
215
|
-
throw new Error(`tripleshot: no worktree handle for path ${path}`);
|
|
216
|
-
}
|
|
229
|
+
const wt = worktrees.find((w) => w.path === path);
|
|
217
230
|
return wt;
|
|
218
231
|
}
|
|
219
232
|
function defaultModel() {
|
|
220
|
-
return process.env[
|
|
233
|
+
return process.env["DIRGHA_MODEL"] ?? "nvidia/minimaxai/minimax-m2.7";
|
|
221
234
|
}
|
|
222
235
|
//# sourceMappingURL=tripleshot.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tripleshot.js","sourceRoot":"","sources":["../../src/fleet/tripleshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,2BAA2B,CAAC;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AASrD,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAElC,MAAM,UAAU,GAAgD;IAC9D;QACE,EAAE,EAAE,cAAc;QAClB,KAAK,
|
|
1
|
+
{"version":3,"file":"tripleshot.js","sourceRoot":"","sources":["../../src/fleet/tripleshot.ts"],"names":[],"mappings":"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"}
|
package/dist/fleet/types.d.ts
CHANGED
|
@@ -101,6 +101,10 @@ export interface FleetConfig {
|
|
|
101
101
|
verbose?: boolean;
|
|
102
102
|
/** Optional per-subtask progress hook. */
|
|
103
103
|
onAgent?: (agent: FleetAgent) => void;
|
|
104
|
+
/** Run ID for checkpoint files. Auto-generated if omitted. */
|
|
105
|
+
runId?: string;
|
|
106
|
+
/** If true, worktrees are checked out from existing branches (resume mode). */
|
|
107
|
+
reuseBranch?: boolean;
|
|
104
108
|
}
|
|
105
109
|
/** Result of a fleet run. */
|
|
106
110
|
export interface FleetResult {
|
package/dist/fleet/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/fleet/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/fleet/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAgMH,4CAA4C;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,CAAC;IAClE,IAAI,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC;IACxD,MAAM,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC;IAC1E,IAAI,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC;IAC/F,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC;IAC5D,MAAM,EAAE,EAAE;CACX,CAAC"}
|
package/dist/fleet/worktree.d.ts
CHANGED
|
@@ -34,6 +34,11 @@ export interface CreateWorktreeOptions {
|
|
|
34
34
|
*
|
|
35
35
|
* Idempotent: if the target path already exists and git already knows
|
|
36
36
|
* about it, we return the existing handle instead of failing.
|
|
37
|
+
*
|
|
38
|
+
* Stale-branch recovery: if a prior fleet run was killed mid-way, the git
|
|
39
|
+
* branch ref survives even after the worktree directory was cleaned up.
|
|
40
|
+
* We detect this and force-delete the stale ref before re-creating so
|
|
41
|
+
* re-launch of the same goal never fails with "branch already exists".
|
|
37
42
|
*/
|
|
38
43
|
export declare function createWorktree(branch: string, opts: CreateWorktreeOptions): Promise<WorktreeHandle>;
|
|
39
44
|
/** Remove a worktree. Falls back to `rm -rf` if git refuses. */
|
package/dist/fleet/worktree.js
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* Worktrees are registered on process exit so SIGINT doesn't leave them
|
|
14
14
|
* stranded — see registerExitCleanup().
|
|
15
15
|
*/
|
|
16
|
-
import { execFile } from 'node:child_process';
|
|
16
|
+
import { execFile, execFileSync } from 'node:child_process';
|
|
17
17
|
import { existsSync, rmSync } from 'node:fs';
|
|
18
18
|
import { join } from 'node:path';
|
|
19
19
|
import { promisify } from 'node:util';
|
|
@@ -46,6 +46,11 @@ export async function getHeadSha(cwd) {
|
|
|
46
46
|
*
|
|
47
47
|
* Idempotent: if the target path already exists and git already knows
|
|
48
48
|
* about it, we return the existing handle instead of failing.
|
|
49
|
+
*
|
|
50
|
+
* Stale-branch recovery: if a prior fleet run was killed mid-way, the git
|
|
51
|
+
* branch ref survives even after the worktree directory was cleaned up.
|
|
52
|
+
* We detect this and force-delete the stale ref before re-creating so
|
|
53
|
+
* re-launch of the same goal never fails with "branch already exists".
|
|
49
54
|
*/
|
|
50
55
|
export async function createWorktree(branch, opts) {
|
|
51
56
|
const { repoRoot } = opts;
|
|
@@ -68,6 +73,14 @@ export async function createWorktree(branch, opts) {
|
|
|
68
73
|
catch { /* best effort */ }
|
|
69
74
|
}
|
|
70
75
|
}
|
|
76
|
+
// Ensure stale branch refs from killed prior runs don't block re-launch.
|
|
77
|
+
if (!opts.reuseBranch && await branchExists(repoRoot, branch)) {
|
|
78
|
+
await pruneStaleWorktreeForBranch(repoRoot, branch);
|
|
79
|
+
try {
|
|
80
|
+
await pexec('git', ['branch', '-D', branch], { cwd: repoRoot });
|
|
81
|
+
}
|
|
82
|
+
catch { /* already gone */ }
|
|
83
|
+
}
|
|
71
84
|
const args = opts.reuseBranch
|
|
72
85
|
? ['worktree', 'add', path, branch]
|
|
73
86
|
: ['worktree', 'add', '-b', branch, path, base];
|
|
@@ -77,6 +90,40 @@ export async function createWorktree(branch, opts) {
|
|
|
77
90
|
trackForCleanup(handle);
|
|
78
91
|
return handle;
|
|
79
92
|
}
|
|
93
|
+
/** Return true if the local branch ref exists. */
|
|
94
|
+
async function branchExists(repoRoot, branch) {
|
|
95
|
+
try {
|
|
96
|
+
await pexec('git', ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`], { cwd: repoRoot });
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
/** Remove any registered worktree still referencing `branch`, then prune. */
|
|
104
|
+
async function pruneStaleWorktreeForBranch(repoRoot, branch) {
|
|
105
|
+
try {
|
|
106
|
+
const { stdout } = await pexec('git', ['worktree', 'list', '--porcelain'], { cwd: repoRoot });
|
|
107
|
+
for (const block of stdout.trim().split(/\n\s*\n/)) {
|
|
108
|
+
const wtBranch = (/^branch (.+)$/m.exec(block)?.[1] ?? '').replace(/^refs\/heads\//, '');
|
|
109
|
+
if (wtBranch !== branch)
|
|
110
|
+
continue;
|
|
111
|
+
const wtPath = /^worktree (.+)$/m.exec(block)?.[1] ?? '';
|
|
112
|
+
if (wtPath) {
|
|
113
|
+
try {
|
|
114
|
+
rmSync(wtPath, { recursive: true, force: true });
|
|
115
|
+
}
|
|
116
|
+
catch { /* best effort */ }
|
|
117
|
+
try {
|
|
118
|
+
await pexec('git', ['worktree', 'remove', '--force', wtPath], { cwd: repoRoot });
|
|
119
|
+
}
|
|
120
|
+
catch { /* already gone */ }
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
await pexec('git', ['worktree', 'prune', '--expire=now'], { cwd: repoRoot });
|
|
124
|
+
}
|
|
125
|
+
catch { /* best effort */ }
|
|
126
|
+
}
|
|
80
127
|
/** Remove a worktree. Falls back to `rm -rf` if git refuses. */
|
|
81
128
|
export async function destroyWorktree(handle, force = false) {
|
|
82
129
|
untrackForCleanup(handle);
|
|
@@ -149,22 +196,46 @@ function installExitHandler() {
|
|
|
149
196
|
if (exitHandlerInstalled)
|
|
150
197
|
return;
|
|
151
198
|
exitHandlerInstalled = true;
|
|
152
|
-
|
|
153
|
-
|
|
199
|
+
// Synchronous cleanup of all tracked worktrees.
|
|
200
|
+
// Called from SIGINT/SIGTERM handlers AND the 'exit' event (idempotent via tracked.clear).
|
|
201
|
+
const cleanup = () => {
|
|
202
|
+
const handles = [...tracked];
|
|
203
|
+
tracked.clear(); // clear first so a re-entrant exit event is a no-op
|
|
204
|
+
for (const h of handles) {
|
|
205
|
+
// `git worktree remove --force` atomically deregisters the worktree from
|
|
206
|
+
// git's internal list AND removes the directory in one call. This avoids
|
|
207
|
+
// the rmSync + prune + branch-D ordering problem (git refuses branch -D
|
|
208
|
+
// on a branch that still has a registered worktree entry, and prune alone
|
|
209
|
+
// requires --expire=now to remove recently-deleted paths immediately).
|
|
210
|
+
try {
|
|
211
|
+
execFileSync('git', ['worktree', 'remove', '--force', h.path], { cwd: h.repoRoot, stdio: 'ignore' });
|
|
212
|
+
}
|
|
213
|
+
catch { /* best effort */ }
|
|
214
|
+
// Fallback in case the path still exists (e.g. worktree remove failed).
|
|
154
215
|
try {
|
|
155
216
|
rmSync(h.path, { recursive: true, force: true });
|
|
156
217
|
}
|
|
157
218
|
catch { /* best effort */ }
|
|
219
|
+
// Branch ref is now deletable since git no longer sees it as checked out.
|
|
220
|
+
try {
|
|
221
|
+
execFileSync('git', ['branch', '-D', h.branch], { cwd: h.repoRoot, stdio: 'ignore' });
|
|
222
|
+
}
|
|
223
|
+
catch { /* best effort */ }
|
|
158
224
|
}
|
|
159
|
-
tracked.clear();
|
|
160
|
-
if (signal) {
|
|
161
|
-
// Re-raise the signal so the default exit code is preserved.
|
|
162
|
-
process.kill(process.pid, signal);
|
|
163
|
-
}
|
|
164
225
|
};
|
|
165
|
-
|
|
166
|
-
process
|
|
167
|
-
|
|
226
|
+
// SIGINT/SIGTERM: clean up, set the conventional exit code, then let the
|
|
227
|
+
// process exit naturally via the 'exit' event (which calls cleanup again,
|
|
228
|
+
// but tracked is empty so it's a no-op). Avoid re-raising the signal —
|
|
229
|
+
// process.kill(pid, signal) delivers asynchronously, causing re-entrance.
|
|
230
|
+
const sigHandler = (signal) => {
|
|
231
|
+
cleanup();
|
|
232
|
+
process.exitCode = signal === 'SIGINT' ? 130 : 143;
|
|
233
|
+
process.exit();
|
|
234
|
+
};
|
|
235
|
+
process.once('SIGINT', () => sigHandler('SIGINT'));
|
|
236
|
+
process.once('SIGTERM', () => sigHandler('SIGTERM'));
|
|
237
|
+
// 'exit' catches any other termination path (uncaught exception, process.exit()).
|
|
238
|
+
process.once('exit', cleanup);
|
|
168
239
|
}
|
|
169
240
|
/**
|
|
170
241
|
* Make fleet-owned worktrees immune to cleanup. Useful after a successful
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/fleet/worktree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/fleet/worktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,6 @@
|
|
|
17
17
|
* `matcher` regex applied against the tool name. Hooks without a
|
|
18
18
|
* matcher fire for every call.
|
|
19
19
|
*/
|
|
20
|
-
import type { AgentHooks } from
|
|
21
|
-
import type { DirghaConfig } from
|
|
20
|
+
import type { AgentHooks } from "../kernel/types.js";
|
|
21
|
+
import type { DirghaConfig } from "../cli/config.js";
|
|
22
22
|
export declare function buildAgentHooksFromConfig(config: DirghaConfig): AgentHooks | undefined;
|
|
@@ -17,22 +17,37 @@
|
|
|
17
17
|
* `matcher` regex applied against the tool name. Hooks without a
|
|
18
18
|
* matcher fire for every call.
|
|
19
19
|
*/
|
|
20
|
-
import { spawn } from
|
|
20
|
+
import { spawn } from "node:child_process";
|
|
21
21
|
async function runHook(entry, payload, timeoutMs = 10_000) {
|
|
22
|
-
return new Promise(resolve => {
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
return new Promise((resolve) => {
|
|
23
|
+
const [bin, ...args] = entry.command.split(/\s+/);
|
|
24
|
+
const child = spawn(bin, args, {
|
|
25
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
26
|
+
shell: false,
|
|
27
|
+
});
|
|
28
|
+
let out = "";
|
|
29
|
+
let err = "";
|
|
26
30
|
let killed = false;
|
|
27
|
-
const t = setTimeout(() => {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
const t = setTimeout(() => {
|
|
32
|
+
killed = true;
|
|
33
|
+
child.kill("SIGTERM");
|
|
34
|
+
}, timeoutMs);
|
|
35
|
+
child.stdout.on("data", (d) => {
|
|
36
|
+
out += d.toString("utf8");
|
|
37
|
+
});
|
|
38
|
+
child.stderr.on("data", (d) => {
|
|
39
|
+
err += d.toString("utf8");
|
|
40
|
+
});
|
|
41
|
+
child.on("error", () => {
|
|
42
|
+
/* spawn failure handled by close handler */
|
|
43
|
+
});
|
|
31
44
|
// EPIPE on stdin is expected when the hook command doesn't read
|
|
32
45
|
// its input (e.g. `echo … && exit 1`). Listen to handle the error
|
|
33
46
|
// so it doesn't crash the parent.
|
|
34
|
-
child.stdin.on(
|
|
35
|
-
|
|
47
|
+
child.stdin.on("error", () => {
|
|
48
|
+
/* swallow EPIPE */
|
|
49
|
+
});
|
|
50
|
+
child.on("close", (code) => {
|
|
36
51
|
clearTimeout(t);
|
|
37
52
|
resolve({ exit: killed ? 124 : (code ?? 1), stdout: out, stderr: err });
|
|
38
53
|
});
|
|
@@ -40,7 +55,9 @@ async function runHook(entry, payload, timeoutMs = 10_000) {
|
|
|
40
55
|
child.stdin.write(JSON.stringify(payload));
|
|
41
56
|
child.stdin.end();
|
|
42
57
|
}
|
|
43
|
-
catch {
|
|
58
|
+
catch {
|
|
59
|
+
/* swallow */
|
|
60
|
+
}
|
|
44
61
|
});
|
|
45
62
|
}
|
|
46
63
|
function matches(entry, name) {
|
|
@@ -67,19 +84,23 @@ export function buildAgentHooksFromConfig(config) {
|
|
|
67
84
|
if (hasBeforeTurn) {
|
|
68
85
|
hooks.beforeTurn = async (turnIndex, messages) => {
|
|
69
86
|
for (const entry of cfg.before_turn) {
|
|
70
|
-
const r = await runHook(entry, {
|
|
87
|
+
const r = await runHook(entry, {
|
|
88
|
+
event: "before_turn",
|
|
89
|
+
turnIndex,
|
|
90
|
+
messages,
|
|
91
|
+
});
|
|
71
92
|
if (r.exit !== 0) {
|
|
72
93
|
process.stderr.write(`hook before_turn aborted: ${r.stderr.trim() || r.stdout.trim() || `exit=${r.exit}`}\n`);
|
|
73
|
-
return
|
|
94
|
+
return "abort";
|
|
74
95
|
}
|
|
75
96
|
}
|
|
76
|
-
return
|
|
97
|
+
return "continue";
|
|
77
98
|
};
|
|
78
99
|
}
|
|
79
100
|
if (hasAfterTurn) {
|
|
80
101
|
hooks.afterTurn = async (turnIndex, usage) => {
|
|
81
102
|
for (const entry of cfg.after_turn) {
|
|
82
|
-
await runHook(entry, { event:
|
|
103
|
+
await runHook(entry, { event: "after_turn", turnIndex, usage });
|
|
83
104
|
}
|
|
84
105
|
};
|
|
85
106
|
}
|
|
@@ -88,9 +109,14 @@ export function buildAgentHooksFromConfig(config) {
|
|
|
88
109
|
for (const entry of cfg.before_tool_call) {
|
|
89
110
|
if (!matches(entry, call.name))
|
|
90
111
|
continue;
|
|
91
|
-
const r = await runHook(entry, { event:
|
|
112
|
+
const r = await runHook(entry, { event: "before_tool_call", call });
|
|
92
113
|
if (r.exit !== 0) {
|
|
93
|
-
return {
|
|
114
|
+
return {
|
|
115
|
+
block: true,
|
|
116
|
+
reason: r.stderr.trim() ||
|
|
117
|
+
r.stdout.trim() ||
|
|
118
|
+
`hook ${entry.command} exited ${r.exit}`,
|
|
119
|
+
};
|
|
94
120
|
}
|
|
95
121
|
}
|
|
96
122
|
return undefined;
|
|
@@ -102,7 +128,11 @@ export function buildAgentHooksFromConfig(config) {
|
|
|
102
128
|
for (const entry of cfg.after_tool_call) {
|
|
103
129
|
if (!matches(entry, call.name))
|
|
104
130
|
continue;
|
|
105
|
-
const r = await runHook(entry, {
|
|
131
|
+
const r = await runHook(entry, {
|
|
132
|
+
event: "after_tool_call",
|
|
133
|
+
call,
|
|
134
|
+
result: current,
|
|
135
|
+
});
|
|
106
136
|
// Convention: zero exit = pass through unchanged; non-zero exit
|
|
107
137
|
// with stdout = replace the result content with stdout.
|
|
108
138
|
if (r.exit !== 0 && r.stdout.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-bridge.js","sourceRoot":"","sources":["../../src/hooks/config-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-bridge.js","sourceRoot":"","sources":["../../src/hooks/config-bridge.ts"],"names":[],"mappings":"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"}
|