@prestyj/cli 5.3.0 → 5.4.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/dist/app-sidecar.js +696 -59
- package/dist/app-sidecar.js.map +1 -1
- package/dist/cli.js +2 -2
- package/dist/cli.js.map +1 -1
- package/dist/core/agent-session-compaction.test.js +138 -0
- package/dist/core/agent-session-compaction.test.js.map +1 -1
- package/dist/core/agent-session.d.ts +71 -3
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +280 -47
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/autopilot-cycle.d.ts +69 -17
- package/dist/core/autopilot-cycle.d.ts.map +1 -1
- package/dist/core/autopilot-cycle.js +82 -13
- package/dist/core/autopilot-cycle.js.map +1 -1
- package/dist/core/autopilot-cycle.test.js +206 -10
- package/dist/core/autopilot-cycle.test.js.map +1 -1
- package/dist/core/autopilot-gate.d.ts +48 -22
- package/dist/core/autopilot-gate.d.ts.map +1 -1
- package/dist/core/autopilot-gate.js +110 -1
- package/dist/core/autopilot-gate.js.map +1 -1
- package/dist/core/autopilot-gate.test.js +139 -3
- package/dist/core/autopilot-gate.test.js.map +1 -1
- package/dist/core/autopilot-verdict.d.ts +6 -0
- package/dist/core/autopilot-verdict.d.ts.map +1 -1
- package/dist/core/autopilot-verdict.js +75 -1
- package/dist/core/autopilot-verdict.js.map +1 -1
- package/dist/core/autopilot-verdict.test.js +63 -0
- package/dist/core/autopilot-verdict.test.js.map +1 -1
- package/dist/core/bash-spawn-benchmark.d.ts +2 -0
- package/dist/core/bash-spawn-benchmark.d.ts.map +1 -0
- package/dist/core/bash-spawn-benchmark.js +139 -0
- package/dist/core/bash-spawn-benchmark.js.map +1 -0
- package/dist/core/compaction/compactor.test.js +1 -1
- package/dist/core/compaction/compactor.test.js.map +1 -1
- package/dist/core/fast-apply-benchmark.d.ts +1 -1
- package/dist/core/fast-apply-benchmark.js +2 -2
- package/dist/core/fast-apply-benchmark.js.map +1 -1
- package/dist/core/hashline-edit-benchmark.d.ts +33 -1
- package/dist/core/hashline-edit-benchmark.d.ts.map +1 -1
- package/dist/core/hashline-edit-benchmark.js +193 -21
- package/dist/core/hashline-edit-benchmark.js.map +1 -1
- package/dist/core/hashline-edit-benchmark.test.js +51 -2
- package/dist/core/hashline-edit-benchmark.test.js.map +1 -1
- package/dist/core/mcp/deferred-catalog.d.ts +28 -0
- package/dist/core/mcp/deferred-catalog.d.ts.map +1 -0
- package/dist/core/mcp/deferred-catalog.js +72 -0
- package/dist/core/mcp/deferred-catalog.js.map +1 -0
- package/dist/core/mcp/resolve-stdio.d.ts +19 -3
- package/dist/core/mcp/resolve-stdio.d.ts.map +1 -1
- package/dist/core/mcp/resolve-stdio.js +136 -5
- package/dist/core/mcp/resolve-stdio.js.map +1 -1
- package/dist/core/mcp/resolve-stdio.test.js +82 -1
- package/dist/core/mcp/resolve-stdio.test.js.map +1 -1
- package/dist/core/nolan-context.d.ts +26 -2
- package/dist/core/nolan-context.d.ts.map +1 -1
- package/dist/core/nolan-context.js +46 -4
- package/dist/core/nolan-context.js.map +1 -1
- package/dist/core/nolan-context.test.js +53 -12
- package/dist/core/nolan-context.test.js.map +1 -1
- package/dist/core/nolan-prompt.d.ts +2 -15
- package/dist/core/nolan-prompt.d.ts.map +1 -1
- package/dist/core/nolan-prompt.js +96 -15
- package/dist/core/nolan-prompt.js.map +1 -1
- package/dist/core/nolan-prompt.test.js +102 -7
- package/dist/core/nolan-prompt.test.js.map +1 -1
- package/dist/core/persistent-shell.d.ts +27 -0
- package/dist/core/persistent-shell.d.ts.map +1 -0
- package/dist/core/persistent-shell.js +150 -0
- package/dist/core/persistent-shell.js.map +1 -0
- package/dist/core/persistent-shell.test.d.ts +2 -0
- package/dist/core/persistent-shell.test.d.ts.map +1 -0
- package/dist/core/persistent-shell.test.js +84 -0
- package/dist/core/persistent-shell.test.js.map +1 -0
- package/dist/core/process-manager-dev-server-repro.test.js +34 -6
- package/dist/core/process-manager-dev-server-repro.test.js.map +1 -1
- package/dist/core/progress/engine.d.ts +23 -0
- package/dist/core/progress/engine.d.ts.map +1 -0
- package/dist/core/progress/engine.js +131 -0
- package/dist/core/progress/engine.js.map +1 -0
- package/dist/core/progress/engine.test.d.ts +2 -0
- package/dist/core/progress/engine.test.d.ts.map +1 -0
- package/dist/core/progress/engine.test.js +136 -0
- package/dist/core/progress/engine.test.js.map +1 -0
- package/dist/core/progress/git-xp.d.ts +16 -0
- package/dist/core/progress/git-xp.d.ts.map +1 -0
- package/dist/core/progress/git-xp.js +106 -0
- package/dist/core/progress/git-xp.js.map +1 -0
- package/dist/core/progress/git-xp.test.d.ts +2 -0
- package/dist/core/progress/git-xp.test.d.ts.map +1 -0
- package/dist/core/progress/git-xp.test.js +88 -0
- package/dist/core/progress/git-xp.test.js.map +1 -0
- package/dist/core/progress/ranks.d.ts +21 -0
- package/dist/core/progress/ranks.d.ts.map +1 -0
- package/dist/core/progress/ranks.js +141 -0
- package/dist/core/progress/ranks.js.map +1 -0
- package/dist/core/progress/ranks.test.d.ts +2 -0
- package/dist/core/progress/ranks.test.d.ts.map +1 -0
- package/dist/core/progress/ranks.test.js +59 -0
- package/dist/core/progress/ranks.test.js.map +1 -0
- package/dist/core/progress/rebuild.d.ts +9 -0
- package/dist/core/progress/rebuild.d.ts.map +1 -0
- package/dist/core/progress/rebuild.js +119 -0
- package/dist/core/progress/rebuild.js.map +1 -0
- package/dist/core/progress/rebuild.test.d.ts +2 -0
- package/dist/core/progress/rebuild.test.d.ts.map +1 -0
- package/dist/core/progress/rebuild.test.js +88 -0
- package/dist/core/progress/rebuild.test.js.map +1 -0
- package/dist/core/progress/store.d.ts +35 -0
- package/dist/core/progress/store.d.ts.map +1 -0
- package/dist/core/progress/store.js +200 -0
- package/dist/core/progress/store.js.map +1 -0
- package/dist/core/progress/store.test.d.ts +2 -0
- package/dist/core/progress/store.test.d.ts.map +1 -0
- package/dist/core/progress/store.test.js +108 -0
- package/dist/core/progress/store.test.js.map +1 -0
- package/dist/core/progress/types.d.ts +108 -0
- package/dist/core/progress/types.d.ts.map +1 -0
- package/dist/core/progress/types.js +3 -0
- package/dist/core/progress/types.js.map +1 -0
- package/dist/core/project-discovery.d.ts.map +1 -1
- package/dist/core/project-discovery.js +40 -9
- package/dist/core/project-discovery.js.map +1 -1
- package/dist/core/project-discovery.test.d.ts +2 -0
- package/dist/core/project-discovery.test.d.ts.map +1 -0
- package/dist/core/project-discovery.test.js +104 -0
- package/dist/core/project-discovery.test.js.map +1 -0
- package/dist/core/session-history.d.ts +51 -0
- package/dist/core/session-history.d.ts.map +1 -0
- package/dist/core/session-history.js +156 -0
- package/dist/core/session-history.js.map +1 -0
- package/dist/core/session-history.test.d.ts +2 -0
- package/dist/core/session-history.test.d.ts.map +1 -0
- package/dist/core/session-history.test.js +101 -0
- package/dist/core/session-history.test.js.map +1 -0
- package/dist/core/session-manager.d.ts +34 -0
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +67 -0
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/session-manager.test.js +140 -1
- package/dist/core/session-manager.test.js.map +1 -1
- package/dist/core/settings-manager.d.ts +1 -0
- package/dist/core/settings-manager.d.ts.map +1 -1
- package/dist/core/settings-manager.js +4 -0
- package/dist/core/settings-manager.js.map +1 -1
- package/dist/system-prompt.d.ts.map +1 -1
- package/dist/system-prompt.js +12 -8
- package/dist/system-prompt.js.map +1 -1
- package/dist/system-prompt.test.js +15 -20
- package/dist/system-prompt.test.js.map +1 -1
- package/dist/tools/bash.d.ts +1 -0
- package/dist/tools/bash.d.ts.map +1 -1
- package/dist/tools/bash.js +27 -2
- package/dist/tools/bash.js.map +1 -1
- package/dist/tools/edit.d.ts +9 -2
- package/dist/tools/edit.d.ts.map +1 -1
- package/dist/tools/edit.js +91 -10
- package/dist/tools/edit.js.map +1 -1
- package/dist/tools/edit.test.js +97 -0
- package/dist/tools/edit.test.js.map +1 -1
- package/dist/tools/plan-mode.test.js +25 -0
- package/dist/tools/plan-mode.test.js.map +1 -1
- package/dist/tools/prompt-hints.d.ts.map +1 -1
- package/dist/tools/prompt-hints.js +3 -0
- package/dist/tools/prompt-hints.js.map +1 -1
- package/dist/tools/subagent.d.ts +2 -0
- package/dist/tools/subagent.d.ts.map +1 -1
- package/dist/tools/subagent.js +213 -194
- package/dist/tools/subagent.js.map +1 -1
- package/dist/tools/subagent.test.d.ts +2 -0
- package/dist/tools/subagent.test.d.ts.map +1 -0
- package/dist/tools/subagent.test.js +73 -0
- package/dist/tools/subagent.test.js.map +1 -0
- package/dist/tools/tool-search.d.ts +15 -0
- package/dist/tools/tool-search.d.ts.map +1 -0
- package/dist/tools/tool-search.js +35 -0
- package/dist/tools/tool-search.js.map +1 -0
- package/dist/ui/components/Footer.js +3 -3
- package/dist/ui/components/Footer.js.map +1 -1
- package/dist/ui/hooks/useAgentLoop.d.ts.map +1 -1
- package/dist/ui/hooks/useAgentLoop.js +22 -9
- package/dist/ui/hooks/useAgentLoop.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,18 +1,30 @@
|
|
|
1
1
|
import { describe, it, expect, vi } from "vitest";
|
|
2
|
-
import { driveAutopilotCycle,
|
|
2
|
+
import { driveAutopilotCycle, buildPlanRevisionPrompt, frameAutopilotInjection, AUTOPILOT_INJECTION_PREAMBLE, AUTOPILOT_PLAN_DRAFTING_REASON, } from "./autopilot-cycle.js";
|
|
3
3
|
/** Build a full deps object with sane defaults; tests override what they probe.
|
|
4
|
-
* `verdicts`
|
|
5
|
-
|
|
4
|
+
* `verdicts` feeds the WORK review queue; `planVerdicts` feeds the PLAN review
|
|
5
|
+
* queue. Running out returns null (review failure). */
|
|
6
|
+
function makeDeps(verdicts, overrides = {}, planVerdicts = []) {
|
|
6
7
|
const emitted = [];
|
|
7
8
|
const injected = [];
|
|
8
9
|
const ran = [];
|
|
9
10
|
const queue = [...verdicts];
|
|
11
|
+
const planQueue = [...planVerdicts];
|
|
12
|
+
const counters = { implemented: 0, accepted: 0 };
|
|
10
13
|
const deps = {
|
|
11
14
|
maxRounds: 3,
|
|
12
15
|
isCancelled: () => false,
|
|
13
16
|
isPlanMode: () => false,
|
|
17
|
+
planPending: () => false,
|
|
14
18
|
resetReviewer: vi.fn(async () => { }),
|
|
15
19
|
review: vi.fn(async () => queue.shift() ?? null),
|
|
20
|
+
reviewPlan: vi.fn(async () => planQueue.shift() ?? null),
|
|
21
|
+
acceptPlan: async () => {
|
|
22
|
+
counters.accepted++;
|
|
23
|
+
return true;
|
|
24
|
+
},
|
|
25
|
+
runImplement: async () => {
|
|
26
|
+
counters.implemented++;
|
|
27
|
+
},
|
|
16
28
|
runPrompt: async (body) => {
|
|
17
29
|
ran.push(body);
|
|
18
30
|
},
|
|
@@ -26,9 +38,26 @@ function makeDeps(verdicts, overrides = {}) {
|
|
|
26
38
|
};
|
|
27
39
|
// Overrides may swap the vi.fn defaults for plain functions; every test that
|
|
28
40
|
// asserts on mock calls passes a vi.fn itself, so the cast is safe.
|
|
29
|
-
return Object.assign(deps, { emitted, injected, ran });
|
|
41
|
+
return Object.assign(deps, { emitted, injected, ran, counters });
|
|
42
|
+
}
|
|
43
|
+
/** planPending() driven by a mutable flag the plan deps flip, mirroring the
|
|
44
|
+
* sidecar (acceptPlan / injection clear pending; exit_plan re-sets it). */
|
|
45
|
+
function pendingFlag(initial = true) {
|
|
46
|
+
let value = initial;
|
|
47
|
+
return { get: () => value, set: (v) => (value = v) };
|
|
30
48
|
}
|
|
31
|
-
describe("
|
|
49
|
+
describe("frameAutopilotInjection", () => {
|
|
50
|
+
it("prepends the autopilot preamble and preserves the body verbatim", () => {
|
|
51
|
+
const framed = frameAutopilotInjection("Add a test for the login flow.");
|
|
52
|
+
expect(framed.startsWith(AUTOPILOT_INJECTION_PREAMBLE)).toBe(true);
|
|
53
|
+
expect(framed.endsWith("Add a test for the login flow.")).toBe(true);
|
|
54
|
+
expect(framed).toContain("no human is watching");
|
|
55
|
+
});
|
|
56
|
+
it("is deterministic so the run and the digest match-string stay in sync", () => {
|
|
57
|
+
expect(frameAutopilotInjection("do x")).toBe(frameAutopilotInjection("do x"));
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
describe("driveAutopilotCycle — work branch (unchanged behavior)", () => {
|
|
32
61
|
it("ALL_CLEAR → autopilot_done, no injected run", async () => {
|
|
33
62
|
const deps = makeDeps([{ kind: "all_clear" }]);
|
|
34
63
|
await driveAutopilotCycle(deps);
|
|
@@ -116,15 +145,15 @@ describe("driveAutopilotCycle", () => {
|
|
|
116
145
|
expect(deps.review).toHaveBeenCalledTimes(1);
|
|
117
146
|
expect(deps.emitted).toEqual([]);
|
|
118
147
|
});
|
|
119
|
-
it("plan mode
|
|
148
|
+
it("still INSIDE plan mode with no submitted plan → drafting hold, no review", async () => {
|
|
120
149
|
const deps = makeDeps([{ kind: "all_clear" }], { isPlanMode: () => true });
|
|
121
150
|
await driveAutopilotCycle(deps);
|
|
122
151
|
expect(deps.review).not.toHaveBeenCalled();
|
|
123
152
|
expect(deps.emitted).toEqual([
|
|
124
|
-
{ type: "autopilot_human", data: { reason:
|
|
153
|
+
{ type: "autopilot_human", data: { reason: AUTOPILOT_PLAN_DRAFTING_REASON } },
|
|
125
154
|
]);
|
|
126
155
|
});
|
|
127
|
-
it("injected run entering plan mode
|
|
156
|
+
it("injected run entering plan mode WITHOUT submitting halts before the next review", async () => {
|
|
128
157
|
let planMode = false;
|
|
129
158
|
const ran = [];
|
|
130
159
|
const deps = makeDeps([
|
|
@@ -134,7 +163,7 @@ describe("driveAutopilotCycle", () => {
|
|
|
134
163
|
], {
|
|
135
164
|
runPrompt: async (body) => {
|
|
136
165
|
ran.push(body);
|
|
137
|
-
planMode = true; // EZ Coder called enter_plan
|
|
166
|
+
planMode = true; // EZ Coder called enter_plan (no exit_plan) mid-run
|
|
138
167
|
},
|
|
139
168
|
isPlanMode: () => planMode,
|
|
140
169
|
});
|
|
@@ -142,7 +171,7 @@ describe("driveAutopilotCycle", () => {
|
|
|
142
171
|
expect(ran).toEqual(["restructure the module"]);
|
|
143
172
|
expect(deps.review).toHaveBeenCalledTimes(1);
|
|
144
173
|
expect(deps.emitted).toEqual([
|
|
145
|
-
{ type: "autopilot_human", data: { reason:
|
|
174
|
+
{ type: "autopilot_human", data: { reason: AUTOPILOT_PLAN_DRAFTING_REASON } },
|
|
146
175
|
]);
|
|
147
176
|
});
|
|
148
177
|
it("multi-round: prompt → prompt → all_clear runs both fixes then finishes", async () => {
|
|
@@ -176,4 +205,171 @@ describe("driveAutopilotCycle", () => {
|
|
|
176
205
|
expect(order).toEqual(["reset", "review", "run", "review"]);
|
|
177
206
|
});
|
|
178
207
|
});
|
|
208
|
+
describe("driveAutopilotCycle — plan branch", () => {
|
|
209
|
+
it("plan approve → acceptPlan → runImplement → work review of the implementation", async () => {
|
|
210
|
+
const pending = pendingFlag();
|
|
211
|
+
const order = [];
|
|
212
|
+
const deps = makeDeps([{ kind: "all_clear" }], {
|
|
213
|
+
planPending: pending.get,
|
|
214
|
+
acceptPlan: async () => {
|
|
215
|
+
order.push("accept");
|
|
216
|
+
pending.set(false);
|
|
217
|
+
return true;
|
|
218
|
+
},
|
|
219
|
+
runImplement: async () => {
|
|
220
|
+
order.push("implement");
|
|
221
|
+
},
|
|
222
|
+
}, [{ kind: "all_clear" }]);
|
|
223
|
+
await driveAutopilotCycle(deps);
|
|
224
|
+
expect(order).toEqual(["accept", "implement"]);
|
|
225
|
+
expect(deps.reviewPlan).toHaveBeenCalledTimes(1);
|
|
226
|
+
expect(deps.review).toHaveBeenCalledTimes(1); // post-implement work review
|
|
227
|
+
expect(deps.emitted).toEqual([{ type: "autopilot_done", data: {} }]);
|
|
228
|
+
});
|
|
229
|
+
it("IGNORE on a plan maps to approve (no user blocker for plans)", async () => {
|
|
230
|
+
const pending = pendingFlag();
|
|
231
|
+
const deps = makeDeps([{ kind: "all_clear" }], {
|
|
232
|
+
planPending: pending.get,
|
|
233
|
+
acceptPlan: async () => {
|
|
234
|
+
pending.set(false);
|
|
235
|
+
return true;
|
|
236
|
+
},
|
|
237
|
+
}, [{ kind: "ignore" }]);
|
|
238
|
+
await driveAutopilotCycle(deps);
|
|
239
|
+
expect(deps.counters.implemented).toBe(1);
|
|
240
|
+
expect(deps.emitted).toEqual([{ type: "autopilot_done", data: {} }]);
|
|
241
|
+
});
|
|
242
|
+
it("plan revision → resubmit → approve", async () => {
|
|
243
|
+
const pending = pendingFlag();
|
|
244
|
+
const revisionBody = buildPlanRevisionPrompt("steps 3 and 4 are in the wrong order");
|
|
245
|
+
const deps = makeDeps([{ kind: "all_clear" }], {
|
|
246
|
+
maxRounds: 5,
|
|
247
|
+
planPending: pending.get,
|
|
248
|
+
acceptPlan: async () => {
|
|
249
|
+
pending.set(false);
|
|
250
|
+
return true;
|
|
251
|
+
},
|
|
252
|
+
runPrompt: async (body) => {
|
|
253
|
+
expect(body).toBe(revisionBody);
|
|
254
|
+
// Sidecar: injecting a revision clears pending; the run resubmits
|
|
255
|
+
// via exit_plan, which re-sets it.
|
|
256
|
+
pending.set(true);
|
|
257
|
+
},
|
|
258
|
+
}, [{ kind: "prompt", body: "steps 3 and 4 are in the wrong order" }, { kind: "all_clear" }]);
|
|
259
|
+
// The sidecar clears pending on injection BEFORE runPrompt; emulate by
|
|
260
|
+
// wrapping onInjected.
|
|
261
|
+
deps.onInjected = (body, round) => {
|
|
262
|
+
pending.set(false);
|
|
263
|
+
deps.injected.push({ body, round });
|
|
264
|
+
};
|
|
265
|
+
await driveAutopilotCycle(deps);
|
|
266
|
+
expect(deps.injected).toEqual([{ body: revisionBody, round: 1 }]);
|
|
267
|
+
expect(deps.reviewPlan).toHaveBeenCalledTimes(2);
|
|
268
|
+
expect(deps.counters.implemented).toBe(1);
|
|
269
|
+
expect(deps.emitted).toEqual([{ type: "autopilot_done", data: {} }]);
|
|
270
|
+
});
|
|
271
|
+
it("plan revision WITHOUT resubmit falls through to a normal work review", async () => {
|
|
272
|
+
const pending = pendingFlag();
|
|
273
|
+
const deps = makeDeps([{ kind: "all_clear" }], {
|
|
274
|
+
planPending: pending.get,
|
|
275
|
+
onInjected: () => pending.set(false), // sidecar clears pending on injection
|
|
276
|
+
runPrompt: async () => {
|
|
277
|
+
// Run never calls exit_plan again — pending stays false.
|
|
278
|
+
},
|
|
279
|
+
}, [{ kind: "prompt", body: "drop step 5" }]);
|
|
280
|
+
await driveAutopilotCycle(deps);
|
|
281
|
+
expect(deps.reviewPlan).toHaveBeenCalledTimes(1);
|
|
282
|
+
expect(deps.review).toHaveBeenCalledTimes(1);
|
|
283
|
+
expect(deps.counters.accepted).toBe(0);
|
|
284
|
+
expect(deps.emitted).toEqual([{ type: "autopilot_done", data: {} }]);
|
|
285
|
+
});
|
|
286
|
+
it("HUMAN on a plan → autopilot_human, no accept, no implement", async () => {
|
|
287
|
+
const deps = makeDeps([], { planPending: () => true }, [
|
|
288
|
+
{ kind: "human", reason: "destructive migration needs a user call" },
|
|
289
|
+
]);
|
|
290
|
+
await driveAutopilotCycle(deps);
|
|
291
|
+
expect(deps.counters.accepted).toBe(0);
|
|
292
|
+
expect(deps.counters.implemented).toBe(0);
|
|
293
|
+
expect(deps.emitted).toEqual([
|
|
294
|
+
{ type: "autopilot_human", data: { reason: "destructive migration needs a user call" } },
|
|
295
|
+
]);
|
|
296
|
+
});
|
|
297
|
+
it("acceptPlan returning false (stale generation — user acted) exits silently", async () => {
|
|
298
|
+
const deps = makeDeps([], {
|
|
299
|
+
planPending: () => true,
|
|
300
|
+
acceptPlan: async () => false,
|
|
301
|
+
}, [{ kind: "all_clear" }]);
|
|
302
|
+
await driveAutopilotCycle(deps);
|
|
303
|
+
expect(deps.counters.implemented).toBe(0);
|
|
304
|
+
expect(deps.emitted).toEqual([]);
|
|
305
|
+
});
|
|
306
|
+
it("plan review failure (null) → silent stop", async () => {
|
|
307
|
+
const deps = makeDeps([], { planPending: () => true }, [null]);
|
|
308
|
+
await driveAutopilotCycle(deps);
|
|
309
|
+
expect(deps.counters.accepted).toBe(0);
|
|
310
|
+
expect(deps.emitted).toEqual([]);
|
|
311
|
+
});
|
|
312
|
+
it("cancel landing during the plan review discards the verdict", async () => {
|
|
313
|
+
let cancelled = false;
|
|
314
|
+
const deps = makeDeps([], {
|
|
315
|
+
planPending: () => true,
|
|
316
|
+
isCancelled: () => cancelled,
|
|
317
|
+
reviewPlan: vi.fn(async () => {
|
|
318
|
+
cancelled = true; // user Accept/cancel fired while Nolan reviewed the plan
|
|
319
|
+
return { kind: "all_clear" };
|
|
320
|
+
}),
|
|
321
|
+
});
|
|
322
|
+
await driveAutopilotCycle(deps);
|
|
323
|
+
expect(deps.counters.accepted).toBe(0);
|
|
324
|
+
expect(deps.emitted).toEqual([]);
|
|
325
|
+
});
|
|
326
|
+
it("cancel landing during the implement run stops before the next review", async () => {
|
|
327
|
+
const pending = pendingFlag();
|
|
328
|
+
let cancelled = false;
|
|
329
|
+
const deps = makeDeps([{ kind: "all_clear" }], {
|
|
330
|
+
planPending: pending.get,
|
|
331
|
+
isCancelled: () => cancelled,
|
|
332
|
+
acceptPlan: async () => {
|
|
333
|
+
pending.set(false);
|
|
334
|
+
return true;
|
|
335
|
+
},
|
|
336
|
+
runImplement: async () => {
|
|
337
|
+
cancelled = true; // /cancel fires mid-implementation
|
|
338
|
+
},
|
|
339
|
+
}, [{ kind: "all_clear" }]);
|
|
340
|
+
await driveAutopilotCycle(deps);
|
|
341
|
+
expect(deps.review).not.toHaveBeenCalled();
|
|
342
|
+
expect(deps.emitted).toEqual([]);
|
|
343
|
+
});
|
|
344
|
+
it("repeated plan rejections hit the round cap safely", async () => {
|
|
345
|
+
const pending = pendingFlag();
|
|
346
|
+
const deps = makeDeps([], {
|
|
347
|
+
maxRounds: 2,
|
|
348
|
+
planPending: pending.get,
|
|
349
|
+
onInjected: () => pending.set(false),
|
|
350
|
+
runPrompt: async () => pending.set(true), // every revision resubmits
|
|
351
|
+
}, [
|
|
352
|
+
{ kind: "prompt", body: "reject 1" },
|
|
353
|
+
{ kind: "prompt", body: "reject 2" },
|
|
354
|
+
// Would be round 3 — must never be reached.
|
|
355
|
+
{ kind: "prompt", body: "reject 3" },
|
|
356
|
+
]);
|
|
357
|
+
await driveAutopilotCycle(deps);
|
|
358
|
+
expect(deps.reviewPlan).toHaveBeenCalledTimes(2);
|
|
359
|
+
expect(deps.emitted).toEqual([{ type: "autopilot_capped", data: { rounds: 2 } }]);
|
|
360
|
+
});
|
|
361
|
+
it("plan branch wins over the drafting hold when both flags are up", async () => {
|
|
362
|
+
// exit_plan fired (pending) but isPlanMode is somehow still true — the
|
|
363
|
+
// submitted plan takes precedence; the drafting hold is only for
|
|
364
|
+
// enter-without-exit.
|
|
365
|
+
const deps = makeDeps([], { planPending: () => true, isPlanMode: () => true }, [
|
|
366
|
+
{ kind: "human", reason: "needs a user call" },
|
|
367
|
+
]);
|
|
368
|
+
await driveAutopilotCycle(deps);
|
|
369
|
+
expect(deps.reviewPlan).toHaveBeenCalledTimes(1);
|
|
370
|
+
expect(deps.emitted).toEqual([
|
|
371
|
+
{ type: "autopilot_human", data: { reason: "needs a user call" } },
|
|
372
|
+
]);
|
|
373
|
+
});
|
|
374
|
+
});
|
|
179
375
|
//# sourceMappingURL=autopilot-cycle.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autopilot-cycle.test.js","sourceRoot":"","sources":["../../src/core/autopilot-cycle.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"autopilot-cycle.test.js","sourceRoot":"","sources":["../../src/core/autopilot-cycle.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Autopilot gate — pure decision logic for whether Nolan's auto-review cycle may
|
|
3
|
-
* start after a finished EZ Coder turn.
|
|
4
|
-
*
|
|
5
|
-
* Autopilot must NOT review every turn. The concrete leak cases this gate
|
|
6
|
-
* closes (each has a matching unit test in autopilot-gate.test.ts):
|
|
7
|
-
*
|
|
8
|
-
* - Workflow slash commands (`/compare`, `/bullet-proof`, `/expand`, custom
|
|
9
|
-
* `.ezcoder/commands/*.md`) end with reports or A/B/C choices that are reserved
|
|
10
|
-
* for the USER. Nolan reviewing them reads "findings" as "something real is
|
|
11
|
-
* wrong" and injects fix prompts the user never approved.
|
|
12
|
-
* - Registry commands (`/help`, `/session`, unknown `/foo`) and failed runs
|
|
13
|
-
* add no assistant work at all — a review would judge the PREVIOUS turn
|
|
14
|
-
* again (Nolan's cycle memory is wiped per turn) and can flip a settled
|
|
15
|
-
* ALL_CLEAR into a fresh PROMPT.
|
|
16
|
-
* - A turn that ended in plan mode has a pending Accept/Reject modal; Nolan must
|
|
17
|
-
* never inject a prompt into a read-only plan-mode session.
|
|
18
|
-
*
|
|
19
|
-
* Kept pure + dependency-light so it's unit-testable without booting the
|
|
20
|
-
* sidecar (which runs `main()` at import time).
|
|
21
|
-
*/
|
|
22
1
|
/** A workflow (prompt-template) command: built-in PROMPT_COMMANDS or a custom
|
|
23
2
|
* `.ezcoder/commands/*.md` entry. `prompt` is the full template body the command
|
|
24
3
|
* expands to when run. */
|
|
@@ -55,7 +34,20 @@ export declare function matchExpandedCommand(text: string, commands: readonly Wo
|
|
|
55
34
|
export declare function countAssistantMessages(messages: ReadonlyArray<{
|
|
56
35
|
role: string;
|
|
57
36
|
}>): number;
|
|
58
|
-
|
|
37
|
+
/** Extract every tool call made by assistant messages from `startIndex`
|
|
38
|
+
* onward — i.e. the tool calls added during one turn, given the message
|
|
39
|
+
* array length captured before that turn ran. Used to feed
|
|
40
|
+
* isMechanicalOnlyTurn without the gate module depending on gg-ai's full
|
|
41
|
+
* Message type (kept structurally typed so it's easy to unit test). */
|
|
42
|
+
export declare function extractTurnToolCalls(messages: ReadonlyArray<{
|
|
43
|
+
role: string;
|
|
44
|
+
content: string | ReadonlyArray<{
|
|
45
|
+
type: string;
|
|
46
|
+
name?: string;
|
|
47
|
+
args?: Record<string, unknown>;
|
|
48
|
+
}>;
|
|
49
|
+
}>, startIndex: number): TurnToolCall[];
|
|
50
|
+
export type AutopilotSkipReason = "disabled" | "cancelled" | "plan-mode" | "workflow-command" | "mechanical-only" | "no-assistant-output";
|
|
59
51
|
export interface AutopilotGateInput {
|
|
60
52
|
/** The window's autopilot toggle. */
|
|
61
53
|
enabled: boolean;
|
|
@@ -63,13 +55,22 @@ export interface AutopilotGateInput {
|
|
|
63
55
|
cancelled: boolean;
|
|
64
56
|
/** True when the session ended the turn in plan mode (plan modal pending). */
|
|
65
57
|
planMode: boolean;
|
|
58
|
+
/** True when the turn SUBMITTED a plan (exit_plan fired — the sidecar's
|
|
59
|
+
* pendingPlanPath is set). Nolan reviews the plan itself instead of the
|
|
60
|
+
* work. Optional so existing callers/tests default to false. */
|
|
61
|
+
planPending?: boolean;
|
|
66
62
|
/** True when the turn was a workflow slash command (see isWorkflowCommandText). */
|
|
67
63
|
workflowCommand: boolean;
|
|
68
64
|
/** Assistant messages ADDED by this turn (after minus before). */
|
|
69
65
|
assistantMessagesAdded: number;
|
|
66
|
+
/** True when every tool call this turn was mechanical bash usage (see
|
|
67
|
+
* isMechanicalOnlyTurn) — nothing for Nolan to review. Optional so existing
|
|
68
|
+
* callers/tests that don't set it default to false (reviewable). */
|
|
69
|
+
mechanicalOnly?: boolean;
|
|
70
70
|
}
|
|
71
71
|
export type AutopilotGateDecision = {
|
|
72
72
|
start: true;
|
|
73
|
+
kind: "work" | "plan";
|
|
73
74
|
} | {
|
|
74
75
|
start: false;
|
|
75
76
|
reason: AutopilotSkipReason;
|
|
@@ -78,6 +79,31 @@ export type AutopilotGateDecision = {
|
|
|
78
79
|
* Decide whether the autopilot cycle may start for a just-finished turn.
|
|
79
80
|
* Checks are ordered cheapest/most-fundamental first; the reason is logged by
|
|
80
81
|
* the sidecar so skips are debuggable from ezcoder-app-sidecar.log.
|
|
82
|
+
*
|
|
83
|
+
* `planPending` beats the workflow/mechanical/no-output checks: a plan
|
|
84
|
+
* submission via exit_plan flips plan mode OFF and often has only mechanical
|
|
85
|
+
* tool calls, but it IS reviewable work — Nolan reviews the plan itself
|
|
86
|
+
* (kind: "plan") instead of skipping. `planMode` still wins over it: a turn
|
|
87
|
+
* that ended INSIDE plan mode (enter without exit) has no submitted plan and
|
|
88
|
+
* Nolan must never prompt into a read-only session.
|
|
81
89
|
*/
|
|
82
90
|
export declare function shouldStartAutopilotCycle(input: AutopilotGateInput): AutopilotGateDecision;
|
|
91
|
+
/** A tool call made during a turn, as recorded on an assistant message's
|
|
92
|
+
* content parts. Mirrors gg-ai's `ToolCall` shape minus the fields the gate
|
|
93
|
+
* doesn't need (id). */
|
|
94
|
+
export interface TurnToolCall {
|
|
95
|
+
name: string;
|
|
96
|
+
args?: Record<string, unknown>;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* True when the turn has nothing for Nolan to review: either it made NO tool
|
|
100
|
+
* calls at all (a plain-text answer — "a plain question that got answered
|
|
101
|
+
* with no code touched" is IGNORE per the autopilot contract), or EVERY tool
|
|
102
|
+
* call was mechanical (a dedicated read-only tool, or bash usage that starts
|
|
103
|
+
* a background process / is read-only / is a plain git commit-push chain).
|
|
104
|
+
* ANY non-mechanical call (edit, write, subagent, generate_image, or bash
|
|
105
|
+
* outside these safe shapes) makes the whole turn reviewable — conservative
|
|
106
|
+
* default: keep reviewing whenever it's unclear.
|
|
107
|
+
*/
|
|
108
|
+
export declare function isMechanicalOnlyTurn(toolCalls: readonly TurnToolCall[]): boolean;
|
|
83
109
|
//# sourceMappingURL=autopilot-gate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autopilot-gate.d.ts","sourceRoot":"","sources":["../../src/core/autopilot-gate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"autopilot-gate.d.ts","sourceRoot":"","sources":["../../src/core/autopilot-gate.ts"],"names":[],"mappings":"AAiCA;;2BAE2B;AAC3B,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;8EAE8E;AAC9E,eAAO,MAAM,wBAAwB,iCAAiC,CAAC;AAWvE;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,SAAS,mBAAmB,EAAE,GACvC,OAAO,CAMT;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,SAAS,mBAAmB,EAAE,GACvC;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAW9D;AAED;0DAC0D;AAC1D,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,aAAa,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,CAIxF;AAED;;;;wEAIwE;AACxE,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,aAAa,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EACH,MAAM,GACN,aAAa,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;CACpF,CAAC,EACF,UAAU,EAAE,MAAM,GACjB,YAAY,EAAE,CAWhB;AAED,MAAM,MAAM,mBAAmB,GAC3B,UAAU,GACV,WAAW,GACX,WAAW,GACX,kBAAkB,GAClB,iBAAiB,GACjB,qBAAqB,CAAC;AAE1B,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,8EAA8E;IAC9E,QAAQ,EAAE,OAAO,CAAC;IAClB;;qEAEiE;IACjE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mFAAmF;IACnF,eAAe,EAAE,OAAO,CAAC;IACzB,kEAAkE;IAClE,sBAAsB,EAAE,MAAM,CAAC;IAC/B;;yEAEqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,MAAM,qBAAqB,GAC7B;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACtC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,kBAAkB,GAAG,qBAAqB,CAS1F;AAED;;yBAEyB;AACzB,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAsDD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAOhF"}
|
|
@@ -15,10 +15,21 @@
|
|
|
15
15
|
* ALL_CLEAR into a fresh PROMPT.
|
|
16
16
|
* - A turn that ended in plan mode has a pending Accept/Reject modal; Nolan must
|
|
17
17
|
* never inject a prompt into a read-only plan-mode session.
|
|
18
|
+
* - A turn whose ONLY tool calls were mechanical usage — a bash command that
|
|
19
|
+
* starts a background process (dev server, watcher), is read-only, or is a
|
|
20
|
+
* plain `git add`/`commit`/`push` workflow; a dedicated read-only tool
|
|
21
|
+
* (read/grep/find/ls/web_fetch/web_search/source_path/code_search/
|
|
22
|
+
* task_output/screenshot/skill); or NO tool calls at all (a plain-text
|
|
23
|
+
* answer with nothing built) — was always going to come back as Nolan's
|
|
24
|
+
* IGNORE verdict (see the autopilot system prompt's "mechanical operation"
|
|
25
|
+
* / "plain question answered with no code touched" rules). Pre-filtering
|
|
26
|
+
* these skips the review API call entirely instead of paying for one whose
|
|
27
|
+
* answer is already known.
|
|
18
28
|
*
|
|
19
29
|
* Kept pure + dependency-light so it's unit-testable without booting the
|
|
20
30
|
* sidecar (which runs `main()` at import time).
|
|
21
31
|
*/
|
|
32
|
+
import { isReadOnlyCommand } from "../tools/read-only-bash.js";
|
|
22
33
|
/** The exact separator AgentSession.prompt() inserts between a command's
|
|
23
34
|
* template and the user's extra args (see agent-session.ts prompt expansion).
|
|
24
35
|
* Must stay byte-identical or expanded-command detection silently breaks. */
|
|
@@ -75,10 +86,35 @@ export function countAssistantMessages(messages) {
|
|
|
75
86
|
count++;
|
|
76
87
|
return count;
|
|
77
88
|
}
|
|
89
|
+
/** Extract every tool call made by assistant messages from `startIndex`
|
|
90
|
+
* onward — i.e. the tool calls added during one turn, given the message
|
|
91
|
+
* array length captured before that turn ran. Used to feed
|
|
92
|
+
* isMechanicalOnlyTurn without the gate module depending on gg-ai's full
|
|
93
|
+
* Message type (kept structurally typed so it's easy to unit test). */
|
|
94
|
+
export function extractTurnToolCalls(messages, startIndex) {
|
|
95
|
+
const calls = [];
|
|
96
|
+
for (const m of messages.slice(startIndex)) {
|
|
97
|
+
if (m.role !== "assistant" || typeof m.content === "string")
|
|
98
|
+
continue;
|
|
99
|
+
for (const part of m.content) {
|
|
100
|
+
if (part.type === "tool_call" && typeof part.name === "string") {
|
|
101
|
+
calls.push({ name: part.name, args: part.args });
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
return calls;
|
|
106
|
+
}
|
|
78
107
|
/**
|
|
79
108
|
* Decide whether the autopilot cycle may start for a just-finished turn.
|
|
80
109
|
* Checks are ordered cheapest/most-fundamental first; the reason is logged by
|
|
81
110
|
* the sidecar so skips are debuggable from ezcoder-app-sidecar.log.
|
|
111
|
+
*
|
|
112
|
+
* `planPending` beats the workflow/mechanical/no-output checks: a plan
|
|
113
|
+
* submission via exit_plan flips plan mode OFF and often has only mechanical
|
|
114
|
+
* tool calls, but it IS reviewable work — Nolan reviews the plan itself
|
|
115
|
+
* (kind: "plan") instead of skipping. `planMode` still wins over it: a turn
|
|
116
|
+
* that ended INSIDE plan mode (enter without exit) has no submitted plan and
|
|
117
|
+
* Nolan must never prompt into a read-only session.
|
|
82
118
|
*/
|
|
83
119
|
export function shouldStartAutopilotCycle(input) {
|
|
84
120
|
if (!input.enabled)
|
|
@@ -87,10 +123,83 @@ export function shouldStartAutopilotCycle(input) {
|
|
|
87
123
|
return { start: false, reason: "cancelled" };
|
|
88
124
|
if (input.planMode)
|
|
89
125
|
return { start: false, reason: "plan-mode" };
|
|
126
|
+
if (input.planPending)
|
|
127
|
+
return { start: true, kind: "plan" };
|
|
90
128
|
if (input.workflowCommand)
|
|
91
129
|
return { start: false, reason: "workflow-command" };
|
|
130
|
+
if (input.mechanicalOnly)
|
|
131
|
+
return { start: false, reason: "mechanical-only" };
|
|
92
132
|
if (input.assistantMessagesAdded <= 0)
|
|
93
133
|
return { start: false, reason: "no-assistant-output" };
|
|
94
|
-
return { start: true };
|
|
134
|
+
return { start: true, kind: "work" };
|
|
135
|
+
}
|
|
136
|
+
/** Dedicated tools that can never touch the repo/filesystem in a way worth
|
|
137
|
+
* reviewing: pure lookups (read/grep/find/ls/source_path/code_search),
|
|
138
|
+
* network research (web_fetch/web_search), reading a background process's
|
|
139
|
+
* output (task_output), a UI screenshot, or loading a skill definition. Any
|
|
140
|
+
* call to one of these is mechanical regardless of its arguments — unlike
|
|
141
|
+
* bash, which needs isMechanicalBashCall to tell a read-only invocation from
|
|
142
|
+
* a mutating one. Deliberately excludes generate_image (produces a real
|
|
143
|
+
* artifact), subagent (can do anything internally), tasks/task_send/
|
|
144
|
+
* task_stop (mutate task/process state), and enter_plan/exit_plan (mode
|
|
145
|
+
* transitions already handled by the separate plan-mode gate check). */
|
|
146
|
+
const READ_ONLY_TOOL_NAMES = new Set([
|
|
147
|
+
"read",
|
|
148
|
+
"grep",
|
|
149
|
+
"find",
|
|
150
|
+
"ls",
|
|
151
|
+
"web_fetch",
|
|
152
|
+
"web_search",
|
|
153
|
+
"source_path",
|
|
154
|
+
"code_search",
|
|
155
|
+
"task_output",
|
|
156
|
+
"screenshot",
|
|
157
|
+
"skill",
|
|
158
|
+
]);
|
|
159
|
+
/** Leading git subcommands that are a plain add/commit/push workflow —
|
|
160
|
+
* mechanical for review purposes even though they mutate the repo (distinct
|
|
161
|
+
* from plan-mode's stricter read-only bar in read-only-bash.ts). */
|
|
162
|
+
const GIT_COMMIT_WORKFLOW = /^git\s+(add|commit|push)\b/i;
|
|
163
|
+
/**
|
|
164
|
+
* True when a bash call is mechanical: starting a background process (a dev
|
|
165
|
+
* server or watcher — nothing to review until it's stopped and its actual
|
|
166
|
+
* code changes land in a later turn), a read-only command (reuses the same
|
|
167
|
+
* conservative classifier plan mode trusts), or a plain git add/commit/push
|
|
168
|
+
* chain. Conservative by construction: anything it can't prove mechanical
|
|
169
|
+
* (including a chain mixing git with other commands) returns false, so the
|
|
170
|
+
* turn still gets reviewed — false negatives are safe here, false positives
|
|
171
|
+
* are not.
|
|
172
|
+
*/
|
|
173
|
+
function isMechanicalBashCall(args) {
|
|
174
|
+
if (!args)
|
|
175
|
+
return false;
|
|
176
|
+
if (args.run_in_background === true)
|
|
177
|
+
return true;
|
|
178
|
+
const command = typeof args.command === "string" ? args.command : "";
|
|
179
|
+
if (!command.trim())
|
|
180
|
+
return false;
|
|
181
|
+
if (isReadOnlyCommand(command))
|
|
182
|
+
return true;
|
|
183
|
+
const segments = command
|
|
184
|
+
.split(/&&|;|\|/)
|
|
185
|
+
.map((s) => s.trim())
|
|
186
|
+
.filter((s) => s.length > 0);
|
|
187
|
+
return segments.length > 0 && segments.every((s) => GIT_COMMIT_WORKFLOW.test(s));
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* True when the turn has nothing for Nolan to review: either it made NO tool
|
|
191
|
+
* calls at all (a plain-text answer — "a plain question that got answered
|
|
192
|
+
* with no code touched" is IGNORE per the autopilot contract), or EVERY tool
|
|
193
|
+
* call was mechanical (a dedicated read-only tool, or bash usage that starts
|
|
194
|
+
* a background process / is read-only / is a plain git commit-push chain).
|
|
195
|
+
* ANY non-mechanical call (edit, write, subagent, generate_image, or bash
|
|
196
|
+
* outside these safe shapes) makes the whole turn reviewable — conservative
|
|
197
|
+
* default: keep reviewing whenever it's unclear.
|
|
198
|
+
*/
|
|
199
|
+
export function isMechanicalOnlyTurn(toolCalls) {
|
|
200
|
+
if (toolCalls.length === 0)
|
|
201
|
+
return true;
|
|
202
|
+
return toolCalls.every((call) => READ_ONLY_TOOL_NAMES.has(call.name) ||
|
|
203
|
+
(call.name === "bash" && isMechanicalBashCall(call.args)));
|
|
95
204
|
}
|
|
96
205
|
//# sourceMappingURL=autopilot-gate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autopilot-gate.js","sourceRoot":"","sources":["../../src/core/autopilot-gate.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"autopilot-gate.js","sourceRoot":"","sources":["../../src/core/autopilot-gate.ts"],"names":[],"mappings":"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"}
|