@dirgha/code 1.17.1 → 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/login.d.ts +2 -2
- package/dist/cli/slash/login.js +8 -8
- package/dist/cli/slash/login.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/login.d.ts +1 -1
- package/dist/cli/subcommands/login.js +42 -34
- package/dist/cli/subcommands/login.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/integrations/device-auth.js +53 -42
- package/dist/integrations/device-auth.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
package/dist/daemon/server.js
CHANGED
|
@@ -12,6 +12,9 @@ import { createToolExecutor } from "../tools/exec.js";
|
|
|
12
12
|
export class DaemonServer {
|
|
13
13
|
opts;
|
|
14
14
|
active = new Map();
|
|
15
|
+
inFlight = new Set();
|
|
16
|
+
state = "running";
|
|
17
|
+
abort = new AbortController();
|
|
15
18
|
started = Date.now();
|
|
16
19
|
totalUsage = {
|
|
17
20
|
inputTokens: 0,
|
|
@@ -44,6 +47,10 @@ export class DaemonServer {
|
|
|
44
47
|
});
|
|
45
48
|
}
|
|
46
49
|
async handle(req) {
|
|
50
|
+
if (this.state !== "running" && req.method !== "daemon.shutdown") {
|
|
51
|
+
this.writeError(req.id, -32000, "Server is shutting down");
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
47
54
|
try {
|
|
48
55
|
switch (req.method) {
|
|
49
56
|
case "daemon.health":
|
|
@@ -51,7 +58,7 @@ export class DaemonServer {
|
|
|
51
58
|
return;
|
|
52
59
|
case "daemon.shutdown":
|
|
53
60
|
this.writeResult(req.id, { ok: true });
|
|
54
|
-
|
|
61
|
+
await this.gracefulShutdown();
|
|
55
62
|
return;
|
|
56
63
|
case "session.start":
|
|
57
64
|
this.writeResult(req.id, await this.sessionStart(req.params));
|
|
@@ -76,6 +83,41 @@ export class DaemonServer {
|
|
|
76
83
|
this.writeError(req.id, -32000, err instanceof Error ? err.message : String(err));
|
|
77
84
|
}
|
|
78
85
|
}
|
|
86
|
+
async gracefulShutdown() {
|
|
87
|
+
if (this.state !== "running")
|
|
88
|
+
return;
|
|
89
|
+
this.state = "shuttingDown";
|
|
90
|
+
// 1. Signal all in-flight agent loops to abort.
|
|
91
|
+
this.abort.abort();
|
|
92
|
+
// 2. Stop accepting new stdin.
|
|
93
|
+
stdin.pause();
|
|
94
|
+
// 3. Wait for in-flight agent loops to finish (with timeout).
|
|
95
|
+
if (this.inFlight.size > 0) {
|
|
96
|
+
const deadline = Date.now() + 10_000;
|
|
97
|
+
const pending = [...this.inFlight];
|
|
98
|
+
try {
|
|
99
|
+
await Promise.race([
|
|
100
|
+
Promise.allSettled(pending),
|
|
101
|
+
new Promise((r) => {
|
|
102
|
+
const check = setInterval(() => {
|
|
103
|
+
if (Date.now() > deadline) {
|
|
104
|
+
clearInterval(check);
|
|
105
|
+
r();
|
|
106
|
+
}
|
|
107
|
+
}, 100);
|
|
108
|
+
}),
|
|
109
|
+
]);
|
|
110
|
+
}
|
|
111
|
+
catch {
|
|
112
|
+
// Agent loops may reject after abort — expected.
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
// 4. Sessions are stateless JSONL files — no close needed.
|
|
116
|
+
// Clear the active map so GC can collect in-flight agent results.
|
|
117
|
+
this.active.clear();
|
|
118
|
+
this.state = "exited";
|
|
119
|
+
process.exit(0);
|
|
120
|
+
}
|
|
79
121
|
healthResult() {
|
|
80
122
|
return {
|
|
81
123
|
uptimeMs: Date.now() - this.started,
|
|
@@ -162,37 +204,47 @@ export class DaemonServer {
|
|
|
162
204
|
sessionId: params.sessionId,
|
|
163
205
|
});
|
|
164
206
|
const sanitized = this.opts.registry.sanitize({ descriptionLimit: 200 });
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
active.history.length = 0;
|
|
178
|
-
active.history.push(...result.messages);
|
|
179
|
-
for (const msg of result.messages.slice(savedCount)) {
|
|
180
|
-
await active.session.append({
|
|
181
|
-
type: "message",
|
|
182
|
-
ts: new Date().toISOString(),
|
|
183
|
-
message: msg,
|
|
207
|
+
const done = (async () => {
|
|
208
|
+
try {
|
|
209
|
+
const result = await runAgentLoop({
|
|
210
|
+
sessionId: params.sessionId,
|
|
211
|
+
model: this.opts.config.model,
|
|
212
|
+
messages: active.history,
|
|
213
|
+
tools: sanitized.definitions,
|
|
214
|
+
maxTurns: this.opts.config.maxTurns,
|
|
215
|
+
provider,
|
|
216
|
+
toolExecutor: executor,
|
|
217
|
+
events,
|
|
218
|
+
signal: this.abort.signal,
|
|
184
219
|
});
|
|
220
|
+
const savedCount = active.history.length;
|
|
221
|
+
active.history.length = 0;
|
|
222
|
+
active.history.push(...result.messages);
|
|
223
|
+
for (const msg of result.messages.slice(savedCount)) {
|
|
224
|
+
await active.session.append({
|
|
225
|
+
type: "message",
|
|
226
|
+
ts: new Date().toISOString(),
|
|
227
|
+
message: msg,
|
|
228
|
+
});
|
|
229
|
+
}
|
|
185
230
|
}
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
231
|
+
catch (err) {
|
|
232
|
+
if (this.abort.signal.aborted)
|
|
233
|
+
return;
|
|
234
|
+
this.writeNotification("event.stream", {
|
|
235
|
+
streamId,
|
|
236
|
+
event: {
|
|
237
|
+
type: "error",
|
|
238
|
+
message: err instanceof Error ? err.message : String(err),
|
|
239
|
+
},
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
})();
|
|
243
|
+
const tracked = done;
|
|
244
|
+
tracked.finally(() => {
|
|
245
|
+
this.inFlight.delete(tracked);
|
|
195
246
|
});
|
|
247
|
+
this.inFlight.add(tracked);
|
|
196
248
|
return { streamId };
|
|
197
249
|
}
|
|
198
250
|
writeResult(id, result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/daemon/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAgB7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/daemon/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
* Returns structured ApplyResult; does NOT throw on merge conflicts —
|
|
18
18
|
* caller inspects `conflicts`/`success` and decides.
|
|
19
19
|
*/
|
|
20
|
-
import type { ApplyOptions, ApplyResult, WorktreeHandle } from
|
|
20
|
+
import type { ApplyOptions, ApplyResult, WorktreeHandle } from "./types.js";
|
|
21
21
|
/**
|
|
22
22
|
* Apply a worktree's changes back to the parent working tree.
|
|
23
23
|
*
|
package/dist/fleet/apply-back.js
CHANGED
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
* Returns structured ApplyResult; does NOT throw on merge conflicts —
|
|
18
18
|
* caller inspects `conflicts`/`success` and decides.
|
|
19
19
|
*/
|
|
20
|
-
import { execFile } from
|
|
21
|
-
import { writeFile, unlink } from
|
|
22
|
-
import { join } from
|
|
23
|
-
import { tmpdir } from
|
|
24
|
-
import { promisify } from
|
|
25
|
-
import { getRepoRoot
|
|
20
|
+
import { execFile } from "node:child_process";
|
|
21
|
+
import { writeFile, unlink } from "node:fs/promises";
|
|
22
|
+
import { join } from "node:path";
|
|
23
|
+
import { tmpdir } from "node:os";
|
|
24
|
+
import { promisify } from "node:util";
|
|
25
|
+
import { getRepoRoot } from "./worktree.js";
|
|
26
26
|
const pexec = promisify(execFile);
|
|
27
27
|
const MAX_DIFF_BYTES = 50 * 1024 * 1024;
|
|
28
28
|
/**
|
|
@@ -32,9 +32,9 @@ const MAX_DIFF_BYTES = 50 * 1024 * 1024;
|
|
|
32
32
|
* changes are staged + committed transparently before the apply.
|
|
33
33
|
*/
|
|
34
34
|
export async function applyBack(worktree, options = {}) {
|
|
35
|
-
const strategy = options.strategy ??
|
|
36
|
-
const repoRoot = options.repoRoot ?? await getRepoRoot(worktree.repoRoot);
|
|
37
|
-
const message = options.message ?? `fleet: ${worktree.branch.split(
|
|
35
|
+
const strategy = options.strategy ?? "3way";
|
|
36
|
+
const repoRoot = options.repoRoot ?? (await getRepoRoot(worktree.repoRoot));
|
|
37
|
+
const message = options.message ?? `fleet: ${worktree.branch.split("/").pop() ?? "agent"}`;
|
|
38
38
|
try {
|
|
39
39
|
await commitDirty(worktree, message);
|
|
40
40
|
}
|
|
@@ -42,80 +42,101 @@ export async function applyBack(worktree, options = {}) {
|
|
|
42
42
|
return fail(strategy, `commit failed: ${errMsg(err)}`);
|
|
43
43
|
}
|
|
44
44
|
switch (strategy) {
|
|
45
|
-
case
|
|
46
|
-
|
|
47
|
-
case
|
|
45
|
+
case "3way":
|
|
46
|
+
return apply3way(worktree, repoRoot, options.paths);
|
|
47
|
+
case "merge":
|
|
48
|
+
return applyMerge(worktree, repoRoot);
|
|
49
|
+
case "cherry-pick":
|
|
50
|
+
return applyCherryPick(worktree, repoRoot);
|
|
48
51
|
}
|
|
49
52
|
}
|
|
50
53
|
/** Commit every dirty file in the worktree (stage+commit). */
|
|
51
54
|
async function commitDirty(worktree, message) {
|
|
52
|
-
await pexec(
|
|
53
|
-
const { stdout } = await pexec(
|
|
55
|
+
await pexec("git", ["add", "-A"], { cwd: worktree.path });
|
|
56
|
+
const { stdout } = await pexec("git", ["status", "--porcelain"], {
|
|
57
|
+
cwd: worktree.path,
|
|
58
|
+
});
|
|
54
59
|
if (!stdout.trim())
|
|
55
60
|
return;
|
|
56
|
-
await pexec(
|
|
61
|
+
await pexec("git", ["commit", "-m", message, "--allow-empty"], {
|
|
62
|
+
cwd: worktree.path,
|
|
63
|
+
});
|
|
57
64
|
}
|
|
58
65
|
/* -------------------------- 3-way apply -------------------------- */
|
|
59
66
|
async function apply3way(worktree, repoRoot, pathsFilter) {
|
|
60
|
-
|
|
61
|
-
|
|
67
|
+
// Use the fork-point SHA, not the live parent HEAD — if the parent branch
|
|
68
|
+
// has advanced since this worktree was created, diffing against live HEAD
|
|
69
|
+
// would include parent-side changes that the agent never saw.
|
|
70
|
+
const base = worktree.baseCommit;
|
|
71
|
+
let diff = "";
|
|
62
72
|
try {
|
|
63
|
-
const args = [
|
|
73
|
+
const args = ["diff", base, "HEAD"];
|
|
64
74
|
if (pathsFilter && pathsFilter.length > 0) {
|
|
65
|
-
args.push(
|
|
75
|
+
args.push("--", ...pathsFilter);
|
|
66
76
|
}
|
|
67
|
-
const { stdout } = await pexec(
|
|
77
|
+
const { stdout } = await pexec("git", args, {
|
|
68
78
|
cwd: worktree.path,
|
|
69
79
|
maxBuffer: MAX_DIFF_BYTES,
|
|
70
80
|
});
|
|
71
81
|
diff = stdout;
|
|
72
82
|
}
|
|
73
83
|
catch (err) {
|
|
74
|
-
return fail(
|
|
84
|
+
return fail("3way", `diff failed: ${errMsg(err)}`);
|
|
75
85
|
}
|
|
76
86
|
if (!diff.trim()) {
|
|
77
|
-
return { success: true, strategy:
|
|
87
|
+
return { success: true, strategy: "3way", appliedFiles: [], conflicts: [] };
|
|
78
88
|
}
|
|
79
89
|
const appliedFiles = extractDiffPaths(diff);
|
|
80
90
|
const patchPath = join(tmpdir(), `fleet-${Date.now()}-${Math.random().toString(36).slice(2)}.patch`);
|
|
81
|
-
await writeFile(patchPath, diff,
|
|
91
|
+
await writeFile(patchPath, diff, "utf8");
|
|
82
92
|
try {
|
|
83
|
-
await pexec(
|
|
84
|
-
return { success: true, strategy:
|
|
93
|
+
await pexec("git", ["apply", "--3way", patchPath], { cwd: repoRoot });
|
|
94
|
+
return { success: true, strategy: "3way", appliedFiles, conflicts: [] };
|
|
85
95
|
}
|
|
86
96
|
catch (err) {
|
|
87
97
|
const stderr = extractStderr(err);
|
|
88
98
|
const conflicts = extractConflicts(stderr);
|
|
89
99
|
return {
|
|
90
100
|
success: conflicts.length === 0 && !stderr,
|
|
91
|
-
strategy:
|
|
101
|
+
strategy: "3way",
|
|
92
102
|
appliedFiles,
|
|
93
103
|
conflicts,
|
|
94
|
-
error: conflicts.length > 0
|
|
104
|
+
error: conflicts.length > 0
|
|
105
|
+
? `${conflicts.length} conflict(s)`
|
|
106
|
+
: stderr.slice(0, 500),
|
|
95
107
|
};
|
|
96
108
|
}
|
|
97
109
|
finally {
|
|
98
110
|
try {
|
|
99
111
|
await unlink(patchPath);
|
|
100
112
|
}
|
|
101
|
-
catch {
|
|
113
|
+
catch {
|
|
114
|
+
/* best effort */
|
|
115
|
+
}
|
|
102
116
|
}
|
|
103
117
|
}
|
|
104
118
|
/* --------------------------- Merge -------------------------------- */
|
|
105
119
|
async function applyMerge(worktree, repoRoot) {
|
|
106
120
|
try {
|
|
107
|
-
await pexec(
|
|
121
|
+
await pexec("git", ["merge", "--no-ff", "--no-edit", worktree.branch], {
|
|
122
|
+
cwd: repoRoot,
|
|
123
|
+
});
|
|
108
124
|
// Diff the just-created merge commit vs its first parent.
|
|
109
|
-
const { stdout } = await pexec(
|
|
110
|
-
const appliedFiles = stdout
|
|
111
|
-
|
|
125
|
+
const { stdout } = await pexec("git", ["diff", "--name-only", "HEAD~1..HEAD"], { cwd: repoRoot });
|
|
126
|
+
const appliedFiles = stdout
|
|
127
|
+
.split("\n")
|
|
128
|
+
.map((s) => s.trim())
|
|
129
|
+
.filter(Boolean);
|
|
130
|
+
return { success: true, strategy: "merge", appliedFiles, conflicts: [] };
|
|
112
131
|
}
|
|
113
132
|
catch (err) {
|
|
133
|
+
// Abort before returning — conflicts leave MERGE_HEAD on disk, blocking all future git ops.
|
|
134
|
+
await pexec("git", ["merge", "--abort"], { cwd: repoRoot }).catch(() => { });
|
|
114
135
|
const stderr = extractStderr(err);
|
|
115
136
|
const conflicts = extractConflicts(stderr);
|
|
116
137
|
return {
|
|
117
138
|
success: false,
|
|
118
|
-
strategy:
|
|
139
|
+
strategy: "merge",
|
|
119
140
|
appliedFiles: [],
|
|
120
141
|
conflicts,
|
|
121
142
|
error: stderr.slice(0, 500) || errMsg(err),
|
|
@@ -125,23 +146,44 @@ async function applyMerge(worktree, repoRoot) {
|
|
|
125
146
|
/* ---------------------- Cherry-pick range ------------------------- */
|
|
126
147
|
async function applyCherryPick(worktree, repoRoot) {
|
|
127
148
|
try {
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const
|
|
149
|
+
// baseCommit is the fork-point SHA — more reliable than live parentHead when
|
|
150
|
+
// the parent branch has received commits since this worktree was created.
|
|
151
|
+
const base = worktree.baseCommit;
|
|
152
|
+
const { stdout: revList } = await pexec("git", ["rev-list", `${base}..HEAD`], { cwd: worktree.path });
|
|
153
|
+
const shas = revList
|
|
154
|
+
.split("\n")
|
|
155
|
+
.map((s) => s.trim())
|
|
156
|
+
.filter(Boolean)
|
|
157
|
+
.reverse();
|
|
131
158
|
if (shas.length === 0) {
|
|
132
|
-
return {
|
|
159
|
+
return {
|
|
160
|
+
success: true,
|
|
161
|
+
strategy: "cherry-pick",
|
|
162
|
+
appliedFiles: [],
|
|
163
|
+
conflicts: [],
|
|
164
|
+
};
|
|
133
165
|
}
|
|
134
|
-
await pexec(
|
|
135
|
-
const { stdout } = await pexec(
|
|
136
|
-
const appliedFiles = stdout
|
|
137
|
-
|
|
166
|
+
await pexec("git", ["cherry-pick", ...shas], { cwd: repoRoot });
|
|
167
|
+
const { stdout } = await pexec("git", ["diff", "--name-only", `HEAD~${shas.length}..HEAD`], { cwd: repoRoot });
|
|
168
|
+
const appliedFiles = stdout
|
|
169
|
+
.split("\n")
|
|
170
|
+
.map((s) => s.trim())
|
|
171
|
+
.filter(Boolean);
|
|
172
|
+
return {
|
|
173
|
+
success: true,
|
|
174
|
+
strategy: "cherry-pick",
|
|
175
|
+
appliedFiles,
|
|
176
|
+
conflicts: [],
|
|
177
|
+
};
|
|
138
178
|
}
|
|
139
179
|
catch (err) {
|
|
180
|
+
// Abort the in-progress cherry-pick so subsequent git commands work.
|
|
181
|
+
await pexec("git", ["cherry-pick", "--abort"], { cwd: repoRoot }).catch(() => { });
|
|
140
182
|
const stderr = extractStderr(err);
|
|
141
183
|
const conflicts = extractConflicts(stderr);
|
|
142
184
|
return {
|
|
143
185
|
success: false,
|
|
144
|
-
strategy:
|
|
186
|
+
strategy: "cherry-pick",
|
|
145
187
|
appliedFiles: [],
|
|
146
188
|
conflicts,
|
|
147
189
|
error: stderr.slice(0, 500) || errMsg(err),
|
|
@@ -152,7 +194,7 @@ async function applyCherryPick(worktree, repoRoot) {
|
|
|
152
194
|
function extractDiffPaths(diff) {
|
|
153
195
|
const seen = new Set();
|
|
154
196
|
for (const m of diff.matchAll(/^diff --git a\/(.+?) b\/(.+?)$/gm)) {
|
|
155
|
-
seen.add(m[2] ?? m[1] ??
|
|
197
|
+
seen.add(m[2] ?? m[1] ?? "");
|
|
156
198
|
}
|
|
157
199
|
return [...seen].filter(Boolean);
|
|
158
200
|
}
|
|
@@ -167,15 +209,15 @@ function extractConflicts(stderr) {
|
|
|
167
209
|
return [...conflicts];
|
|
168
210
|
}
|
|
169
211
|
function extractStderr(err) {
|
|
170
|
-
if (err && typeof err ===
|
|
212
|
+
if (err && typeof err === "object") {
|
|
171
213
|
const e = err;
|
|
172
|
-
if (typeof e.stderr ===
|
|
214
|
+
if (typeof e.stderr === "string")
|
|
173
215
|
return e.stderr;
|
|
174
216
|
if (Buffer.isBuffer(e.stderr))
|
|
175
|
-
return e.stderr.toString(
|
|
176
|
-
if (typeof e.stdout ===
|
|
217
|
+
return e.stderr.toString("utf8");
|
|
218
|
+
if (typeof e.stdout === "string")
|
|
177
219
|
return e.stdout;
|
|
178
|
-
if (typeof e.message ===
|
|
220
|
+
if (typeof e.message === "string")
|
|
179
221
|
return e.message;
|
|
180
222
|
}
|
|
181
223
|
return String(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-back.js","sourceRoot":"","sources":["../../src/fleet/apply-back.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"apply-back.js","sourceRoot":"","sources":["../../src/fleet/apply-back.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
* fleet triple <goal…> — tripleshot + judge
|
|
22
22
|
* fleet cleanup — remove every fleet/ worktree
|
|
23
23
|
*/
|
|
24
|
-
import type { ApplyStrategy, WorktreeHandle } from
|
|
25
|
-
import type { SlashRegistry } from
|
|
24
|
+
import type { ApplyStrategy, WorktreeHandle } from "./types.js";
|
|
25
|
+
import type { SlashRegistry } from "../cli/slash.js";
|
|
26
26
|
export interface FleetCommandOptions {
|
|
27
27
|
cwd?: string;
|
|
28
28
|
model?: string;
|