@telora/daemon 0.22.144 → 0.22.160
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/build-info.json +8 -3
- package/dist/audit/audit-phase.d.ts +34 -1
- package/dist/audit/audit-phase.d.ts.map +1 -1
- package/dist/audit/audit-phase.js +77 -9
- package/dist/audit/audit-phase.js.map +1 -1
- package/dist/backends/codex/codex-mcp-proxy.d.ts +4 -6
- package/dist/backends/codex/codex-mcp-proxy.d.ts.map +1 -1
- package/dist/backends/codex/codex-mcp-proxy.js.map +1 -1
- package/dist/backends/codex/mcp-preflight.d.ts +2 -2
- package/dist/backends/codex/mcp-preflight.d.ts.map +1 -1
- package/dist/backends/codex/mcp-preflight.js.map +1 -1
- package/dist/completion/completion-phase-registry.d.ts +1 -0
- package/dist/completion/completion-phase-registry.d.ts.map +1 -1
- package/dist/completion/completion-phase-registry.js +7 -5
- package/dist/completion/completion-phase-registry.js.map +1 -1
- package/dist/completion/escalation-provenance.d.ts.map +1 -1
- package/dist/completion/escalation-provenance.js +5 -2
- package/dist/completion/escalation-provenance.js.map +1 -1
- package/dist/completion/exit-classification.d.ts +1 -1
- package/dist/completion/exit-classification.d.ts.map +1 -1
- package/dist/completion/exit-classification.js +7 -1
- package/dist/completion/exit-classification.js.map +1 -1
- package/dist/completion/review-cycle-cap.d.ts +81 -35
- package/dist/completion/review-cycle-cap.d.ts.map +1 -1
- package/dist/completion/review-cycle-cap.js +60 -132
- package/dist/completion/review-cycle-cap.js.map +1 -1
- package/dist/completion/review-exit-deps.d.ts +3 -1
- package/dist/completion/review-exit-deps.d.ts.map +1 -1
- package/dist/completion/review-exit-deps.js +3 -1
- package/dist/completion/review-exit-deps.js.map +1 -1
- package/dist/completion/review-exit-phase.d.ts.map +1 -1
- package/dist/completion/review-exit-phase.js +5 -4
- package/dist/completion/review-exit-phase.js.map +1 -1
- package/dist/completion/state-cascade.d.ts.map +1 -1
- package/dist/completion/state-cascade.js +3 -7
- package/dist/completion/state-cascade.js.map +1 -1
- package/dist/delivery/delivery-review-coverage.d.ts +16 -0
- package/dist/delivery/delivery-review-coverage.d.ts.map +1 -1
- package/dist/delivery/delivery-review-coverage.js +16 -0
- package/dist/delivery/delivery-review-coverage.js.map +1 -1
- package/dist/focus/focus-engine.d.ts +16 -0
- package/dist/focus/focus-engine.d.ts.map +1 -1
- package/dist/focus/focus-engine.js +37 -17
- package/dist/focus/focus-engine.js.map +1 -1
- package/dist/focus/focus-executor.d.ts.map +1 -1
- package/dist/focus/focus-executor.js +7 -0
- package/dist/focus/focus-executor.js.map +1 -1
- package/dist/focus/focus-spawn-decision.d.ts +5 -3
- package/dist/focus/focus-spawn-decision.d.ts.map +1 -1
- package/dist/focus/focus-spawn-decision.js.map +1 -1
- package/dist/focus/listener-spawn.d.ts.map +1 -1
- package/dist/focus/listener-spawn.js +4 -3
- package/dist/focus/listener-spawn.js.map +1 -1
- package/dist/focus/listener.d.ts +15 -0
- package/dist/focus/listener.d.ts.map +1 -1
- package/dist/focus/listener.js +58 -9
- package/dist/focus/listener.js.map +1 -1
- package/dist/focus/review-cycle-cap-hold.d.ts +15 -94
- package/dist/focus/review-cycle-cap-hold.d.ts.map +1 -1
- package/dist/focus/review-cycle-cap-hold.js +54 -112
- package/dist/focus/review-cycle-cap-hold.js.map +1 -1
- package/dist/focus/session-health.d.ts +22 -1
- package/dist/focus/session-health.d.ts.map +1 -1
- package/dist/focus/session-health.js +28 -3
- package/dist/focus/session-health.js.map +1 -1
- package/dist/focus/session-process-reap.d.ts +3 -1
- package/dist/focus/session-process-reap.d.ts.map +1 -1
- package/dist/focus/session-process-reap.js +20 -0
- package/dist/focus/session-process-reap.js.map +1 -1
- package/dist/focus-stage-lifecycle/index.d.ts.map +1 -1
- package/dist/focus-stage-lifecycle/index.js +1 -0
- package/dist/focus-stage-lifecycle/index.js.map +1 -1
- package/dist/focus-stage-lifecycle/wedge-watchdog.d.ts +10 -0
- package/dist/focus-stage-lifecycle/wedge-watchdog.d.ts.map +1 -1
- package/dist/focus-stage-lifecycle/wedge-watchdog.js +27 -3
- package/dist/focus-stage-lifecycle/wedge-watchdog.js.map +1 -1
- package/dist/git/focus-integration-sync.d.ts +42 -3
- package/dist/git/focus-integration-sync.d.ts.map +1 -1
- package/dist/git/focus-integration-sync.js +38 -2
- package/dist/git/focus-integration-sync.js.map +1 -1
- package/dist/merge/abandoned-merge-recovery.d.ts.map +1 -1
- package/dist/merge/abandoned-merge-recovery.js +10 -0
- package/dist/merge/abandoned-merge-recovery.js.map +1 -1
- package/dist/merge/merge-back-loop.d.ts +1 -0
- package/dist/merge/merge-back-loop.d.ts.map +1 -1
- package/dist/merge/merge-back-loop.js +3 -3
- package/dist/merge/merge-back-loop.js.map +1 -1
- package/dist/prompt/team-prompt-base.d.ts +2 -1
- package/dist/prompt/team-prompt-base.d.ts.map +1 -1
- package/dist/prompt/team-prompt-base.js +5 -19
- package/dist/prompt/team-prompt-base.js.map +1 -1
- package/dist/prompt-sections/integration-reconcile-section.d.ts +45 -0
- package/dist/prompt-sections/integration-reconcile-section.d.ts.map +1 -0
- package/dist/prompt-sections/integration-reconcile-section.js +69 -0
- package/dist/prompt-sections/integration-reconcile-section.js.map +1 -0
- package/dist/prompt-sections/persona-sections.d.ts +0 -20
- package/dist/prompt-sections/persona-sections.d.ts.map +1 -1
- package/dist/prompt-sections/persona-sections.js +4 -49
- package/dist/prompt-sections/persona-sections.js.map +1 -1
- package/dist/prompt-sections/testing-standard.d.ts +51 -0
- package/dist/prompt-sections/testing-standard.d.ts.map +1 -0
- package/dist/prompt-sections/testing-standard.js +132 -0
- package/dist/prompt-sections/testing-standard.js.map +1 -0
- package/dist/queries/agent-resolvable-promotion.d.ts.map +1 -1
- package/dist/queries/agent-resolvable-promotion.js +7 -5
- package/dist/queries/agent-resolvable-promotion.js.map +1 -1
- package/dist/queries/ended-arm.d.ts +47 -0
- package/dist/queries/ended-arm.d.ts.map +1 -0
- package/dist/queries/ended-arm.js +35 -0
- package/dist/queries/ended-arm.js.map +1 -0
- package/dist/queries/escalation-consumption.d.ts.map +1 -1
- package/dist/queries/escalation-consumption.js +0 -1
- package/dist/queries/escalation-consumption.js.map +1 -1
- package/dist/queries/focus-discovery.d.ts +14 -0
- package/dist/queries/focus-discovery.d.ts.map +1 -1
- package/dist/queries/focus-discovery.js +1 -0
- package/dist/queries/focus-discovery.js.map +1 -1
- package/dist/queries/focus-integration-conflict.d.ts +78 -0
- package/dist/queries/focus-integration-conflict.d.ts.map +1 -0
- package/dist/queries/focus-integration-conflict.js +136 -0
- package/dist/queries/focus-integration-conflict.js.map +1 -0
- package/dist/queries/focuses.d.ts +6 -3
- package/dist/queries/focuses.d.ts.map +1 -1
- package/dist/queries/focuses.js +13 -5
- package/dist/queries/focuses.js.map +1 -1
- package/dist/queries/incident-correlation.d.ts +1 -2
- package/dist/queries/incident-correlation.d.ts.map +1 -1
- package/dist/queries/incident-correlation.js +1 -3
- package/dist/queries/incident-correlation.js.map +1 -1
- package/dist/queries/local-models.js +1 -1
- package/dist/queries/local-models.js.map +1 -1
- package/dist/queries/schemas-local-model.d.ts +47 -0
- package/dist/queries/schemas-local-model.d.ts.map +1 -0
- package/dist/queries/schemas-local-model.js +57 -0
- package/dist/queries/schemas-local-model.js.map +1 -0
- package/dist/queries/schemas.d.ts +10 -32
- package/dist/queries/schemas.d.ts.map +1 -1
- package/dist/queries/schemas.js +10 -41
- package/dist/queries/schemas.js.map +1 -1
- package/dist/queries/sessions.d.ts +120 -12
- package/dist/queries/sessions.d.ts.map +1 -1
- package/dist/queries/sessions.js +104 -11
- package/dist/queries/sessions.js.map +1 -1
- package/dist/queries/shared.d.ts +1 -0
- package/dist/queries/shared.d.ts.map +1 -1
- package/dist/queries/shared.js +1 -1
- package/dist/queries/shared.js.map +1 -1
- package/dist/queries/system-session.d.ts.map +1 -1
- package/dist/queries/system-session.js +3 -1
- package/dist/queries/system-session.js.map +1 -1
- package/dist/resolvers/assembly-engine.d.ts +71 -1
- package/dist/resolvers/assembly-engine.d.ts.map +1 -1
- package/dist/resolvers/assembly-engine.js +82 -43
- package/dist/resolvers/assembly-engine.js.map +1 -1
- package/dist/resolvers/branch-work-arming.d.ts +133 -0
- package/dist/resolvers/branch-work-arming.d.ts.map +1 -0
- package/dist/resolvers/branch-work-arming.js +67 -0
- package/dist/resolvers/branch-work-arming.js.map +1 -0
- package/dist/resolvers/focus-review-coverage.d.ts.map +1 -1
- package/dist/resolvers/focus-review-coverage.js +31 -2
- package/dist/resolvers/focus-review-coverage.js.map +1 -1
- package/dist/resolvers/wiki-topic.d.ts +6 -5
- package/dist/resolvers/wiki-topic.d.ts.map +1 -1
- package/dist/resolvers/wiki-topic.js +43 -27
- package/dist/resolvers/wiki-topic.js.map +1 -1
- package/dist/session/session-lineage.d.ts.map +1 -1
- package/dist/session/session-lineage.js +1 -0
- package/dist/session/session-lineage.js.map +1 -1
- package/dist/shell/crash-recovery.d.ts +4 -2
- package/dist/shell/crash-recovery.d.ts.map +1 -1
- package/dist/shell/crash-recovery.js +15 -14
- package/dist/shell/crash-recovery.js.map +1 -1
- package/dist/shell/daemon-instance.d.ts +176 -0
- package/dist/shell/daemon-instance.d.ts.map +1 -0
- package/dist/shell/daemon-instance.js +281 -0
- package/dist/shell/daemon-instance.js.map +1 -0
- package/dist/shell/graceful-shutdown.d.ts +12 -1
- package/dist/shell/graceful-shutdown.d.ts.map +1 -1
- package/dist/shell/graceful-shutdown.js +7 -4
- package/dist/shell/graceful-shutdown.js.map +1 -1
- package/dist/shell/shutdown-ownership.d.ts +34 -0
- package/dist/shell/shutdown-ownership.d.ts.map +1 -0
- package/dist/shell/shutdown-ownership.js +51 -0
- package/dist/shell/shutdown-ownership.js.map +1 -0
- package/dist/shell/unified-shell.d.ts.map +1 -1
- package/dist/shell/unified-shell.js +12 -5
- package/dist/shell/unified-shell.js.map +1 -1
- package/dist/shell/worker-pidfile.d.ts +127 -11
- package/dist/shell/worker-pidfile.d.ts.map +1 -1
- package/dist/shell/worker-pidfile.js +349 -58
- package/dist/shell/worker-pidfile.js.map +1 -1
- package/dist/spawn/lead-launch.d.ts +17 -1
- package/dist/spawn/lead-launch.d.ts.map +1 -1
- package/dist/spawn/lead-launch.js +56 -7
- package/dist/spawn/lead-launch.js.map +1 -1
- package/dist/spawn/lead-process-ownership.d.ts +5 -4
- package/dist/spawn/lead-process-ownership.d.ts.map +1 -1
- package/dist/spawn/lead-process-ownership.js +7 -4
- package/dist/spawn/lead-process-ownership.js.map +1 -1
- package/dist/spawn/lifecycle.d.ts +0 -12
- package/dist/spawn/lifecycle.d.ts.map +1 -1
- package/dist/spawn/lifecycle.js +76 -19
- package/dist/spawn/lifecycle.js.map +1 -1
- package/dist/spawn/liveness.d.ts.map +1 -1
- package/dist/spawn/liveness.js +3 -1
- package/dist/spawn/liveness.js.map +1 -1
- package/dist/spawn/one-shot-process-ownership.d.ts +46 -2
- package/dist/spawn/one-shot-process-ownership.d.ts.map +1 -1
- package/dist/spawn/one-shot-process-ownership.js +78 -3
- package/dist/spawn/one-shot-process-ownership.js.map +1 -1
- package/dist/spawn/process-group-kill.d.ts.map +1 -1
- package/dist/spawn/process-group-kill.js +3 -1
- package/dist/spawn/process-group-kill.js.map +1 -1
- package/dist/spawn/process-spawn.d.ts +5 -15
- package/dist/spawn/process-spawn.d.ts.map +1 -1
- package/dist/spawn/process-spawn.js +2 -1
- package/dist/spawn/process-spawn.js.map +1 -1
- package/dist/spawn/prompt-assembly.d.ts +27 -2
- package/dist/spawn/prompt-assembly.d.ts.map +1 -1
- package/dist/spawn/prompt-assembly.js +65 -43
- package/dist/spawn/prompt-assembly.js.map +1 -1
- package/dist/spawn/worktree-session.d.ts +46 -2
- package/dist/spawn/worktree-session.d.ts.map +1 -1
- package/dist/spawn/worktree-session.js +57 -4
- package/dist/spawn/worktree-session.js.map +1 -1
- package/dist/testing/fixtures/conflicting-repo.d.ts +30 -0
- package/dist/testing/fixtures/conflicting-repo.d.ts.map +1 -0
- package/dist/testing/fixtures/conflicting-repo.js +89 -0
- package/dist/testing/fixtures/conflicting-repo.js.map +1 -0
- package/dist/testing/fixtures/index.d.ts.map +1 -1
- package/dist/testing/fixtures/index.js +2 -1
- package/dist/testing/fixtures/index.js.map +1 -1
- package/dist/testing/fixtures/pending-spawn-world.js +2 -2
- package/dist/testing/fixtures/pending-spawn-world.js.map +1 -1
- package/dist/types/exit-category.d.ts +59 -0
- package/dist/types/exit-category.d.ts.map +1 -0
- package/dist/types/exit-category.js +133 -0
- package/dist/types/exit-category.js.map +1 -0
- package/dist/types/index.js +1 -1
- package/dist/types/session.d.ts +5 -1
- package/dist/types/session.d.ts.map +1 -1
- package/dist/types/session.js +1 -1
- package/dist/types/session.js.map +1 -1
- package/dist/verify/stall-detector-config.d.ts +5 -1
- package/dist/verify/stall-detector-config.d.ts.map +1 -1
- package/dist/verify/stall-detector-config.js +5 -1
- package/dist/verify/stall-detector-config.js.map +1 -1
- package/dist/worktree/state.d.ts +75 -1
- package/dist/worktree/state.d.ts.map +1 -1
- package/dist/worktree/state.js +89 -17
- package/dist/worktree/state.js.map +1 -1
- package/package.json +3 -3
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
// Pinned by: packages/daemon/src/spawn/one-shot-process-ownership.test.ts
|
|
3
3
|
// PINNED-BY-END
|
|
4
4
|
import { trackChildProcess } from './worker-registry.js';
|
|
5
|
-
import { recordWorkerProcess, removeWorkerPid } from '../shell/worker-pidfile.js';
|
|
5
|
+
import { recordWorkerProcess, removeWorkerPid, reserveLeadRecord, releaseLeadReservation, } from '../shell/worker-pidfile.js';
|
|
6
|
+
import { daemonInstanceId } from '../shell/daemon-instance.js';
|
|
6
7
|
import { processGroupEnded, readProcessStartIdentity, terminateProcessGroup, } from './process-group-kill.js';
|
|
7
8
|
import { updateSession } from '../queries/sessions.js';
|
|
8
9
|
import { createLogger } from '../shell/log.js';
|
|
@@ -10,11 +11,40 @@ const log = createLogger({ module: 'one-shot-process-ownership' });
|
|
|
10
11
|
/** Grace a closed one-shot's leftover group members get on SIGTERM before SIGKILL. */
|
|
11
12
|
export const ONE_SHOT_TREE_GRACE_MS = 2_000;
|
|
12
13
|
/** Record and track a spawned one-shot agent session process; see the module comment. */
|
|
14
|
+
/**
|
|
15
|
+
* Reserve a one-shot's ownership record BEFORE it is spawned.
|
|
16
|
+
*
|
|
17
|
+
* Same window, same rule as the team-lead launch (spawn/lead-launch.ts): the
|
|
18
|
+
* record used to be written only after `spawn()` returned, so a hard kill (or a
|
|
19
|
+
* failed write) in between left a live detached one-shot with no record anywhere
|
|
20
|
+
* -- and its session row, which the audit/merge one-shots open for themselves,
|
|
21
|
+
* then read as a row whose process was never spawned.
|
|
22
|
+
*
|
|
23
|
+
* Returns false when the reservation did not land. The caller must then NOT spawn:
|
|
24
|
+
* a one-shot this host cannot name is one no later pass can prove stopped.
|
|
25
|
+
*/
|
|
26
|
+
export function reserveOneShotRecord(owner, deps = {}) {
|
|
27
|
+
const reserve = deps.reserve ?? ((r) => reserveLeadRecord(r));
|
|
28
|
+
return reserve({
|
|
29
|
+
label: owner.label,
|
|
30
|
+
sessionId: owner.sessionId,
|
|
31
|
+
reservedBy: daemonInstanceId(),
|
|
32
|
+
...(owner.focusId ? { focusId: owner.focusId } : {}),
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Record a spawned one-shot, resolving any reservation made for its session.
|
|
37
|
+
*
|
|
38
|
+
* Returns whether the record landed. A false means this host cannot name the
|
|
39
|
+
* process -- the caller ends it rather than leaving it running (the reservation,
|
|
40
|
+
* if any, still stands, so the session reads as unprovable rather than as a
|
|
41
|
+
* session whose process never existed).
|
|
42
|
+
*/
|
|
13
43
|
export function ownOneShotProcess(proc, owner, deps = {}) {
|
|
14
44
|
trackChildProcess(proc, owner.label);
|
|
15
45
|
const pid = proc.pid;
|
|
16
46
|
if (typeof pid !== 'number' || pid <= 1)
|
|
17
|
-
return;
|
|
47
|
+
return false;
|
|
18
48
|
const startIdentity = (deps.readStartIdentity ?? readProcessStartIdentity)(pid);
|
|
19
49
|
const entry = {
|
|
20
50
|
pid,
|
|
@@ -24,7 +54,12 @@ export function ownOneShotProcess(proc, owner, deps = {}) {
|
|
|
24
54
|
...(owner.sessionId ? { sessionId: owner.sessionId } : {}),
|
|
25
55
|
...(startIdentity ? { startIdentity } : {}),
|
|
26
56
|
};
|
|
27
|
-
(deps.recordEntry ?? ((e) => recordWorkerProcess(e)))(entry);
|
|
57
|
+
const recorded = (deps.recordEntry ?? ((e) => recordWorkerProcess(e)))(entry);
|
|
58
|
+
if (!recorded) {
|
|
59
|
+
log.error(`Could not record one-shot ${owner.label} (pid ${pid}); the caller must end it rather than ` +
|
|
60
|
+
'leave a process this host cannot name');
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
28
63
|
if (owner.sessionId) {
|
|
29
64
|
const stamp = deps.stampSessionPid ?? (async (sessionId, p) => { await updateSession(sessionId, { pid: p }); });
|
|
30
65
|
stamp(owner.sessionId, pid).catch((err) => {
|
|
@@ -40,5 +75,45 @@ export function ownOneShotProcess(proc, owner, deps = {}) {
|
|
|
40
75
|
deps.onReleased?.(result);
|
|
41
76
|
});
|
|
42
77
|
});
|
|
78
|
+
return true;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Resolve the reservation into the real record, or END the process.
|
|
82
|
+
*
|
|
83
|
+
* The two outcomes the caller always wants together: a one-shot whose record
|
|
84
|
+
* does not land is one this host cannot name, and leaving it running is the
|
|
85
|
+
* orphan the record exists to prevent. Returns false once the process is ended.
|
|
86
|
+
*/
|
|
87
|
+
export async function ownSpawnedOneShotOrEnd(proc, owner, deps = {}) {
|
|
88
|
+
if (ownOneShotProcess(proc, owner, deps))
|
|
89
|
+
return true;
|
|
90
|
+
// The record did not land. SIGKILLing the group and walking away left three
|
|
91
|
+
// things behind: an unconfirmed process, the session's pending reservation
|
|
92
|
+
// (made by THIS still-live daemon, so nothing would ever retract it), and an
|
|
93
|
+
// open agent_sessions row. Each of those is a liveness claim nobody can
|
|
94
|
+
// discharge, so the failure path closes all three -- and the reservation is
|
|
95
|
+
// dropped only once the group is CONFIRMED gone.
|
|
96
|
+
const pgid = proc.pid;
|
|
97
|
+
let ended = true;
|
|
98
|
+
if (typeof pgid === 'number' && pgid > 1) {
|
|
99
|
+
const terminate = deps.terminate ?? ((id, opts) => terminateProcessGroup(id, opts));
|
|
100
|
+
const result = await terminate(pgid, {
|
|
101
|
+
label: owner.label,
|
|
102
|
+
context: 'one-shot ownership record failed',
|
|
103
|
+
graceMs: deps.graceMs ?? ONE_SHOT_TREE_GRACE_MS,
|
|
104
|
+
});
|
|
105
|
+
ended = processGroupEnded(result);
|
|
106
|
+
if (!ended) {
|
|
107
|
+
log.error(`Unrecordable one-shot ${owner.label} (pid ${pgid}) could not be ended (${result.outcome}); ` +
|
|
108
|
+
'its reservation is kept so no reader reads its session as processless');
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
if (ended && owner.sessionId)
|
|
112
|
+
releaseOneShotReservation(owner.sessionId, deps);
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
/** Drop a one-shot reservation whose spawn never produced a process. */
|
|
116
|
+
export function releaseOneShotReservation(sessionId, deps = {}) {
|
|
117
|
+
(deps.release ?? ((id) => { releaseLeadReservation(id); }))(sessionId);
|
|
43
118
|
}
|
|
44
119
|
//# sourceMappingURL=one-shot-process-ownership.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-shot-process-ownership.js","sourceRoot":"","sources":["../../src/spawn/one-shot-process-ownership.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,0EAA0E;AAC1E,gBAAgB;AAyBhB,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"one-shot-process-ownership.js","sourceRoot":"","sources":["../../src/spawn/one-shot-process-ownership.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-group-kill.d.ts","sourceRoot":"","sources":["../../src/spawn/process-group-kill.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process-group-kill.d.ts","sourceRoot":"","sources":["../../src/spawn/process-group-kill.ts"],"names":[],"mappings":"AAyCA,sEAAsE;AACtE,eAAO,MAAM,sBAAsB,OAAQ,CAAC;AAE5C,+DAA+D;AAC/D,eAAO,MAAM,6BAA6B,OAAQ,CAAC;AAInD,MAAM,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;AAEnE,0DAA0D;AAC1D,MAAM,WAAW,oBAAoB;IACnC,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8DAA8D;IAC9D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,iDAAiD;IACjD,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,uBAAuB;IACtC,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IACtC,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,cAAc,CAAC;AAEzG,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,uBAAuB,CAAC;IACjC,gEAAgE;IAChE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,GAAG,OAAO,CAE1F;AAyBD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKnE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAsBzD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,GAAE,MAAoB,GAAG,MAAM,GAAG,IAAI,CAalH;AAyCD,6EAA6E;AAC7E,MAAM,WAAW,8BAA8B;IAC7C,wEAAwE;IACxE,SAAS,EAAE,OAAO,CAAC;IACnB,0EAA0E;IAC1E,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACzC;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,IAAI,GAAE,oBAAyB,GAC9B,8BAA8B,CAiChC;AAED,+EAA+E;AAC/E,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,IAAI,GAAE,oBAAyB,GAC9B,OAAO,CAAC,sBAAsB,CAAC,CAEjC"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
// Pinned by: packages/daemon/src/completion/team-teardown-kills-process-group.test.ts,
|
|
3
3
|
// packages/daemon/src/focus/session-health-passes.test.ts,
|
|
4
4
|
// packages/daemon/src/focus/session-health-poll-sweep.test.ts,
|
|
5
|
+
// packages/daemon/src/shell/shutdown-ownership-wiring.test.ts,
|
|
5
6
|
// packages/daemon/src/spawn/lead-launch.test.ts, packages/daemon/src/spawn/lead-process-ownership.test.ts,
|
|
6
7
|
// packages/daemon/src/spawn/one-shot-process-ownership.test.ts,
|
|
7
8
|
// packages/daemon/src/spawn/process-group-kill.test.ts,
|
|
8
9
|
// packages/daemon/src/spawn/spawn-team-process-ownership.test.ts,
|
|
9
|
-
// packages/daemon/src/spawn/untracked-lead-sweep.test.ts
|
|
10
|
+
// packages/daemon/src/spawn/untracked-lead-sweep.test.ts,
|
|
11
|
+
// packages/daemon/src/worktree/worktree-state.test.ts
|
|
10
12
|
// PINNED-BY-END
|
|
11
13
|
/**
|
|
12
14
|
* The ONE kill path for a daemon-spawned agent process tree.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-group-kill.js","sourceRoot":"","sources":["../../src/spawn/process-group-kill.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,uFAAuF;AACvF,6DAA6D;AAC7D,iEAAiE;AACjE,6GAA6G;AAC7G,kEAAkE;AAClE,0DAA0D;AAC1D,oEAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"process-group-kill.js","sourceRoot":"","sources":["../../src/spawn/process-group-kill.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,uFAAuF;AACvF,6DAA6D;AAC7D,iEAAiE;AACjE,iEAAiE;AACjE,6GAA6G;AAC7G,kEAAkE;AAClE,0DAA0D;AAC1D,oEAAoE;AACpE,4DAA4D;AAC5D,wDAAwD;AACxD,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;AAE3D,sEAAsE;AACtE,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAE5C,+DAA+D;AAC/D,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAEnD,MAAM,eAAe,GAAG,GAAG,CAAC;AA6C5B,sFAAsF;AACtF,MAAM,UAAU,iBAAiB,CAAC,MAA+C;IAC/E,OAAO,MAAM,CAAC,OAAO,KAAK,cAAc,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;AACzG,CAAC;AAED,MAAM,WAAW,GAAW,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,MAAM,YAAY,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1F,SAAS,SAAS,CAAC,GAAY;IAC7B,MAAM,IAAI,GAAI,GAA6B,EAAE,IAAI,CAAC;IAClD,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAE,GAAa,EAAE,OAAO,IAAI,GAAG,CAAC,CAAC;AAClF,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,GAAoB;IAC1C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,GAAW;IAClD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACpF,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACnC,oEAAoE;IACpE,OAAO,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,mEAAmE;QACnE,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,SAAS;QACnC,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACrC,2DAA2D;QAC3D,IAAI,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,MAAsB,EAAE,OAAe,WAAW;IACjG,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,QAAQ,EAAE,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAC/B,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,IAAY,EACZ,QAAgB,EAChB,MAAc,EACd,YAAuC,EACvC,KAAoC;IAEpC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,IAAI,MAAM,IAAI,QAAQ;YAAE,OAAO,KAAK,CAAC;QACrC,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,IAAI,MAAM,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,MAA8B,EAAE,IAA6B,EAAE,OAAe;IAChG,MAAM,GAAG,GAAG,iBAAiB,MAAM,CAAC,IAAI,QAAQ,IAAI,CAAC,KAAK,GAAG,CAAC;IAC9D,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,cAAc;YACjB,GAAG,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,OAAO,KAAK,GAAG,eAAe,CAAC,CAAC;YACjE,OAAO;QACT,KAAK,QAAQ;YACX,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,OAAO,KAAK,GAAG,cAAc,IAAI,CAAC,aAAa,IAAI,SAAS,EAAE,CAAC,CAAC;YAChG,OAAO;QACT,KAAK,QAAQ;YACX,GAAG,CAAC,IAAI,CACN,kBAAkB,IAAI,CAAC,OAAO,YAAY,GAAG,2BAA2B;gBACxE,GAAG,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,4BAA4B,CACjI,CAAC;YACF,OAAO;QACT,KAAK,UAAU;YACb,GAAG,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,OAAO,KAAK,GAAG,wDAAwD,CAAC,CAAC;YAC1G,OAAO;QACT,KAAK,cAAc;YACjB,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,OAAO,sBAAsB,GAAG,KAAK,MAAM,CAAC,MAAM,IAAI,gBAAgB,EAAE,CAAC,CAAC;IAC9G,CAAC;AACH,CAAC;AAUD;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,IAAY,EACZ,IAA6B,EAC7B,OAA6B,EAAE;IAE/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC;IACtC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC;IAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC;IACzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,sBAAsB,CAAC;IACvD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,6BAA6B,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,eAAe,CAAC;IAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC;IAEtD,MAAM,MAAM,GAAG,CAAC,OAAgC,EAAE,MAAe,EAA0B,EAAE;QAC3F,MAAM,MAAM,GAA2B,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC5G,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,OAAgC,EAAE,MAAe,EAAkC,EAAE,CACzG,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IAE3E,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;QAAE,OAAO,YAAY,CAAC,cAAc,EAAE,eAAe,IAAI,EAAE,CAAC,CAAC;IACrG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;QAAE,OAAO,YAAY,CAAC,cAAc,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC/D,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,YAAY,CAAC,cAAc,CAAC,CAAC;IAC9D,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,YAAY,CAAC,cAAc,EAAE,GAAG,aAAa,aAAa,QAAQ,GAAG,CAAC,CAAC;IAErG,MAAM,MAAM,GAAG,KAAK,IAAqC,EAAE;QACzD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC;gBAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChG,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YAC1D,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,OAAO;gBAAE,OAAO,MAAM,CAAC,cAAc,EAAE,oBAAoB,OAAO,GAAG,CAAC,CAAC;QAC7G,CAAC;QACD,IAAI,MAAM,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClG,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;AAC/C,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,qBAAqB,CACnC,IAAY,EACZ,IAA6B,EAC7B,OAA6B,EAAE;IAE/B,OAAO,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC;AAC/D,CAAC"}
|
|
@@ -18,6 +18,8 @@ import { spawn, type ChildProcessWithoutNullStreams, type SpawnOptionsWithoutStd
|
|
|
18
18
|
import { type ResourceGovernor } from '@telora/daemon-core';
|
|
19
19
|
import type { CompactRecipe, DaemonConfig, FocusTeamState } from '../types/index.js';
|
|
20
20
|
import { createSession, updateSession } from '../queries/sessions.js';
|
|
21
|
+
import type { SessionCloseUpdate } from '../queries/sessions.js';
|
|
22
|
+
import type { ExitCategory } from '../types/index.js';
|
|
21
23
|
import { fetchBackendEnvExtras } from './spawn-environment.js';
|
|
22
24
|
import type { LeadOwnershipDeps } from './lead-process-ownership.js';
|
|
23
25
|
import { getPendingSpawnDirective } from '../directive/directive-executor.js';
|
|
@@ -34,22 +36,14 @@ import type { SpawnFocusTeamParams } from './spawn-decision.js';
|
|
|
34
36
|
* apply-side -- updateSession + governor.releaseSlot + activeTeams.delete -- stays
|
|
35
37
|
* in spawnTeamProcess, exercised by spawn-path-unified.test.ts).
|
|
36
38
|
*/
|
|
37
|
-
export declare function governorDeniedSessionUpdate():
|
|
38
|
-
status: string;
|
|
39
|
-
exit_reason: string;
|
|
40
|
-
exit_category: string;
|
|
41
|
-
};
|
|
39
|
+
export declare function governorDeniedSessionUpdate(): SessionCloseUpdate;
|
|
42
40
|
/**
|
|
43
41
|
* The terminal session-update payload written when a required OS sandbox cannot
|
|
44
42
|
* initialize and the spawn is refused (fail-closed). Pure -- the caller adds
|
|
45
43
|
* `ended_at` and calls updateSession. Exported so the sandbox-unavailable
|
|
46
44
|
* exit_category contract is unit-pinned.
|
|
47
45
|
*/
|
|
48
|
-
export declare function sandboxUnavailableSessionUpdate(message: string):
|
|
49
|
-
status: string;
|
|
50
|
-
exit_reason: string;
|
|
51
|
-
exit_category: string;
|
|
52
|
-
};
|
|
46
|
+
export declare function sandboxUnavailableSessionUpdate(message: string): SessionCloseUpdate;
|
|
53
47
|
/**
|
|
54
48
|
* Inputs to spawnTeamProcess -- the final phase that takes a fully-resolved
|
|
55
49
|
* spawn (env constituents, args, message, session, backend) and actually
|
|
@@ -122,11 +116,7 @@ export interface BackendSpawnGateResult {
|
|
|
122
116
|
* by the per-spawn environment after the host-level probe runs.
|
|
123
117
|
*/
|
|
124
118
|
export declare function gateLocalModelBackendSpawn(backend: AgentBackend, config: DaemonConfig, isLocalModelPass: boolean, host?: string): Promise<BackendSpawnGateResult>;
|
|
125
|
-
export declare function backendUnavailableSessionUpdate(reason: string, category?:
|
|
126
|
-
status: string;
|
|
127
|
-
exit_reason: string;
|
|
128
|
-
exit_category: string;
|
|
129
|
-
};
|
|
119
|
+
export declare function backendUnavailableSessionUpdate(reason: string, category?: ExitCategory): SessionCloseUpdate;
|
|
130
120
|
/** Attach the error listener in the same synchronous stack frame as spawn(). */
|
|
131
121
|
export declare function spawnCrashIsolated(command: string, args: readonly string[], options: SpawnOptionsWithoutStdio, onError: (error: Error) => void, spawnFn?: typeof spawn): ChildProcessWithoutNullStreams;
|
|
132
122
|
/** Ensure a terminal spawn failure is persisted after any in-flight running transition. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-spawn.d.ts","sourceRoot":"","sources":["../../src/spawn/process-spawn.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,KAAK,EAAE,KAAK,8BAA8B,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE/G,OAAO,EAA4B,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACZ,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAgC,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAI7F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAGjF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EACL,mBAAmB,EAIpB,MAAM,cAAc,CAAC;AAOtB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAMhE;;;;;;GAMG;AACH,wBAAgB,2BAA2B,IAAI
|
|
1
|
+
{"version":3,"file":"process-spawn.d.ts","sourceRoot":"","sources":["../../src/spawn/process-spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ import { spawn } from 'node:child_process';
|
|
|
22
22
|
import { hostname } from 'node:os';
|
|
23
23
|
import { loadEnvConfig, withRetry } from '@telora/daemon-core';
|
|
24
24
|
import { updateSession } from '../queries/sessions.js';
|
|
25
|
+
import { isExitCategory } from '../types/index.js';
|
|
25
26
|
import { buildLeveredSpawnEnvironment, fetchBackendEnvExtras } from './spawn-environment.js';
|
|
26
27
|
import { wrapSpawnCommand, SandboxUnavailableError } from './spawn-sandbox.js';
|
|
27
28
|
import { ensureTeamProcessGroupGone } from './lead-process-ownership.js';
|
|
@@ -262,7 +263,7 @@ export async function spawnTeamProcess(spec) {
|
|
|
262
263
|
: await preflightLocalModelMcp(config, isLocalModelPass);
|
|
263
264
|
if (!spawnGate.allowed) {
|
|
264
265
|
const reason = spawnGate.reason ?? `${backend.displayName} unavailable`;
|
|
265
|
-
const category = spawnGate.category
|
|
266
|
+
const category = isExitCategory(spawnGate.category) ? spawnGate.category : 'backend_unavailable';
|
|
266
267
|
log.error(`Refusing spawn for "${focusName}" (${category}): ${reason}`);
|
|
267
268
|
await updateSession(session.id, {
|
|
268
269
|
...backendUnavailableSessionUpdate(reason, category),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-spawn.js","sourceRoot":"","sources":["../../src/spawn/process-spawn.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"process-spawn.js","sourceRoot":"","sources":["../../src/spawn/process-spawn.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,35 @@ import type { DaemonConfig, AgentRole, FocusTeamState, PipelineConfig } from '..
|
|
|
14
14
|
import { getFocusDeliveries, getFocusIssues } from '../queries/focuses.js';
|
|
15
15
|
import type { AgentResolvableItem } from '../queries/escalation-consumption.js';
|
|
16
16
|
import { type FocusTeamPromptContext } from '../prompt/team-prompt-base.js';
|
|
17
|
+
import type { IntegrationConflict } from '../git/focus-integration-sync.js';
|
|
17
18
|
import { resolveLineageSpec } from '../session/session-lineage.js';
|
|
18
19
|
import { type AssemblyManifestEntry } from '../resolvers/assembly-engine.js';
|
|
19
20
|
import type { SpawnContext } from './shared.js';
|
|
20
21
|
import { type CommitGateSeams } from '../verify/commit-gate-configured.js';
|
|
22
|
+
/**
|
|
23
|
+
* The spawn's integration-sync outcome, threaded into EVERY message shape.
|
|
24
|
+
*
|
|
25
|
+
* Declared once and intersected into both prompt entry points rather than spelled
|
|
26
|
+
* out in each argument literal -- the two shapes cannot then drift, and a message
|
|
27
|
+
* shape added later inherits the field rather than silently dropping the task.
|
|
28
|
+
*/
|
|
29
|
+
export interface IntegrationReconcileInput {
|
|
30
|
+
/**
|
|
31
|
+
* What the coding spawn's sync with integration conflicted on, or null/absent
|
|
32
|
+
* when the sync succeeded, was held, or never ran (a review spawn). Absent =>
|
|
33
|
+
* the message composed is byte-for-byte the one composed before this existed.
|
|
34
|
+
*/
|
|
35
|
+
integrationConflict?: IntegrationConflict | null;
|
|
36
|
+
/** The focus branch the team is on, named in the reconcile task. */
|
|
37
|
+
focusBranchName?: string;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* The reconcile-first block, as a prefix to prepend (with its blank-line
|
|
41
|
+
* separator) -- '' when there is no conflict. Putting it FIRST is the point: the
|
|
42
|
+
* task is the entry condition of the coding stage, so it precedes the role
|
|
43
|
+
* framework, the directive body and the resume delta alike.
|
|
44
|
+
*/
|
|
45
|
+
export declare function integrationReconcileLead(input: IntegrationReconcileInput): string;
|
|
21
46
|
/**
|
|
22
47
|
* Phase C input: assemble the FocusTeamPromptContext threaded into both the
|
|
23
48
|
* directive and legacy prompt builders. Pure factory -- byte-identical to the
|
|
@@ -76,7 +101,7 @@ export declare function buildSpawnPrompt(args: {
|
|
|
76
101
|
* Claude --resume session id. Only emitted on review passes; ignored otherwise.
|
|
77
102
|
*/
|
|
78
103
|
agentSessionId?: string;
|
|
79
|
-
}): string;
|
|
104
|
+
} & IntegrationReconcileInput): string;
|
|
80
105
|
/**
|
|
81
106
|
* Phase: choose the stdin message. A fresh spawn sends the full composed prompt;
|
|
82
107
|
* a resume sends an incremental delta (git diff + prior findings to verify) since
|
|
@@ -144,7 +169,7 @@ export declare function buildSpawnMessage(args: {
|
|
|
144
169
|
* it; the production spawn path always passes session.id.
|
|
145
170
|
*/
|
|
146
171
|
agentSessionId?: string;
|
|
147
|
-
} & ResumeGateVerdictSeam): Promise<string>;
|
|
172
|
+
} & ResumeGateVerdictSeam & IntegrationReconcileInput): Promise<string>;
|
|
148
173
|
/** The gate reads the resume delta's own-gate verdict fallback takes. */
|
|
149
174
|
type ResumeGateReads = Pick<CommitGateSeams, 'resolveCommitGate' | 'readCommitVerdict' | 'readDeliveryGateOutcome'>;
|
|
150
175
|
/** The resume-delta gate-verdict seam of buildSpawnMessage. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-assembly.d.ts","sourceRoot":"","sources":["../../src/spawn/prompt-assembly.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prompt-assembly.d.ts","sourceRoot":"","sources":["../../src/spawn/prompt-assembly.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,cAAc,EACd,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAKL,KAAK,sBAAsB,EAC5B,MAAM,+BAA+B,CAAC;AAOvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAA2D,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACtI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAM5F;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACjD,oEAAoE;IACpE,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,yBAAyB,GAAG,MAAM,CAGjF;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IACnD,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACnD,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACtC,yBAAyB,EAAE,YAAY,CAAC,2BAA2B,CAAC,CAAC;IACrE,QAAQ,EAAE,OAAO,CAAC;IAClB,gGAAgG;IAChG,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;CAC7C,GAAG,sBAAsB,CAuBzB;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,sBAAsB,CAAC;IACtC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,yBAAyB,GAAG,MAAM,CAkDrC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;;;;OAQG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,sBAAsB,CAAC;IACtC,SAAS,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;IACjD,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IACnD,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IAC1D;;;;;;;OAOG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAC9C;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,qBAAqB,GAAG,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiEtE;AAED,yEAAyE;AACzE,KAAK,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,mBAAmB,GAAG,mBAAmB,GAAG,yBAAyB,CAAC,CAAC;AAEpH,+DAA+D;AAC/D,UAAU,qBAAqB;IAC7B;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAwFD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,CAAC;IACnD,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,GAAG;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,cAAc,EAAE,OAAO,CAAA;CAAE,CAQvD;AAED,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,EAC1D,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC,GACjD,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAWhD;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;CAC5D,GAAG,MAAM,CA+BT"}
|
|
@@ -2,18 +2,32 @@
|
|
|
2
2
|
// Pinned by: packages/daemon/src/integration/review-rework-resume-verdict.test.ts,
|
|
3
3
|
// packages/daemon/src/integration/verification-rework-resume-verdict.test.ts,
|
|
4
4
|
// packages/daemon/src/nexus/nexus-return-path-e2e.test.ts,
|
|
5
|
+
// packages/daemon/src/prompt-sections/testing-standard.test.ts,
|
|
6
|
+
// packages/daemon/src/spawn/integration-reconcile-spawn.test.ts,
|
|
5
7
|
// packages/daemon/src/spawn/prompt-assembly-resume-verdict.test.ts
|
|
6
8
|
// PINNED-BY-END
|
|
7
9
|
import { getActiveFocuses } from '../queries/focus-discovery.js';
|
|
8
10
|
import { consumeForceFullPassReview } from '../completion/review-exit-phase.js';
|
|
9
|
-
import { buildRoleFrameworkPrompt, buildRemediationFramingSection, buildReviewOutcomeStampingSection,
|
|
11
|
+
import { buildRoleFrameworkPrompt, buildRemediationFramingSection, buildReviewOutcomeStampingSection, buildResumeDeltaMessage, } from '../prompt/team-prompt-base.js';
|
|
12
|
+
import { buildCodingTestingStandardSection, buildReviewSensorAuditSection, } from '../prompt-sections/testing-standard.js';
|
|
10
13
|
import { buildFocusTeamPrompt } from '../prompt/focus-prompt-builder.js';
|
|
14
|
+
import { buildIntegrationReconcileSection } from '../prompt-sections/integration-reconcile-section.js';
|
|
11
15
|
import { resolveAssemblyRecipeWithManifest } from '../resolvers/assembly-engine.js';
|
|
12
16
|
import { createLogger } from '../shell/log.js';
|
|
13
17
|
import { judgedShaOfRun, latestJudgedDelivery } from '../verify/gate-verdict-source.js';
|
|
14
18
|
import { commitGateSeams } from '../verify/commit-gate-configured.js';
|
|
15
19
|
import { ownGateVerdictFor } from '../completion/review-exit-verdict-gate.js';
|
|
16
20
|
const log = createLogger({ module: 'focus-executor' });
|
|
21
|
+
/**
|
|
22
|
+
* The reconcile-first block, as a prefix to prepend (with its blank-line
|
|
23
|
+
* separator) -- '' when there is no conflict. Putting it FIRST is the point: the
|
|
24
|
+
* task is the entry condition of the coding stage, so it precedes the role
|
|
25
|
+
* framework, the directive body and the resume delta alike.
|
|
26
|
+
*/
|
|
27
|
+
export function integrationReconcileLead(input) {
|
|
28
|
+
const lines = buildIntegrationReconcileSection(input.integrationConflict ?? null, input.focusBranchName ?? '');
|
|
29
|
+
return lines.length > 0 ? lines.join('\n') + '\n\n' : '';
|
|
30
|
+
}
|
|
17
31
|
/**
|
|
18
32
|
* Phase C input: assemble the FocusTeamPromptContext threaded into both the
|
|
19
33
|
* directive and legacy prompt builders. Pure factory -- byte-identical to the
|
|
@@ -66,15 +80,21 @@ export function buildSpawnPrompt(args) {
|
|
|
66
80
|
if (answeredEscalationsSection.trim()) {
|
|
67
81
|
prompt += '\n\n' + answeredEscalationsSection;
|
|
68
82
|
}
|
|
69
|
-
//
|
|
70
|
-
// (
|
|
71
|
-
//
|
|
72
|
-
//
|
|
73
|
-
//
|
|
83
|
+
// The testing standard reaches BOTH passes from one source text
|
|
84
|
+
// (prompt-sections/testing-standard.ts), shipped inside the daemon package so
|
|
85
|
+
// it arrives in every product -- including one whose wiki is empty. The review
|
|
86
|
+
// pass gets it as the sensor-audit charge (the independent frame interrogates
|
|
87
|
+
// the tests, not just the code); the coding pass gets it as the standard it
|
|
88
|
+
// will be judged against, before it writes a test rather than one review
|
|
89
|
+
// bounce at a time. The review-only outcome-stamping obligation is the
|
|
90
|
+
// terminal step, so it is appended after the charge.
|
|
74
91
|
if (isReviewPass) {
|
|
75
92
|
prompt += '\n\n' + buildReviewSensorAuditSection().join('\n');
|
|
76
93
|
prompt += '\n\n' + buildReviewOutcomeStampingSection(agentSessionId).join('\n');
|
|
77
94
|
}
|
|
95
|
+
else {
|
|
96
|
+
prompt += '\n\n' + buildCodingTestingStandardSection().join('\n');
|
|
97
|
+
}
|
|
78
98
|
// Append PRD milestone context (push-down) so a PRD-armed focus team inherits
|
|
79
99
|
// the milestone's goal/expansion/vision + frontier position. Appended to the
|
|
80
100
|
// final prompt so it reaches BOTH the directive and legacy prompt paths; empty
|
|
@@ -82,7 +102,11 @@ export function buildSpawnPrompt(args) {
|
|
|
82
102
|
if (prdMilestoneContext.trim()) {
|
|
83
103
|
prompt += '\n\n' + prdMilestoneContext;
|
|
84
104
|
}
|
|
85
|
-
|
|
105
|
+
// Reconciling a branch that cannot reach integration is the coding stage's
|
|
106
|
+
// ENTRY CONDITION, so it is prepended -- read before the role framework, the
|
|
107
|
+
// directive body and everything appended above. Empty (and the prompt
|
|
108
|
+
// unchanged) whenever the sync succeeded, was held, or never ran.
|
|
109
|
+
return integrationReconcileLead(args) + prompt;
|
|
86
110
|
}
|
|
87
111
|
/**
|
|
88
112
|
* Phase: choose the stdin message. A fresh spawn sends the full composed prompt;
|
|
@@ -105,6 +129,9 @@ export function buildSpawnPrompt(args) {
|
|
|
105
129
|
export async function buildSpawnMessage(args) {
|
|
106
130
|
const { prompt, resumeId, readOnlyFocus, role, promptContext, spawnSpec, config, focusId, focusName, deliveries, issues, worktreePath, priorFindings, answeredEscalationsSection = '', gitDiffManifestSink, agentSessionId, resumeGate = commitGateSeams } = args;
|
|
107
131
|
const answersSuffix = answeredEscalationsSection.trim() ? `\n\n${answeredEscalationsSection}` : '';
|
|
132
|
+
// The fresh-prompt shape already carries the reconcile task (buildSpawnPrompt
|
|
133
|
+
// prepended it); the two shapes built HERE must carry it themselves.
|
|
134
|
+
const reconcileLead = integrationReconcileLead(args);
|
|
108
135
|
// Scoping directive takes priority over the fresh/resume split, but ONLY for
|
|
109
136
|
// executable (non-discovery) focuses. It is returned even when resumeId is
|
|
110
137
|
// null because the caller forces this spawn fresh for exactly this case.
|
|
@@ -123,7 +150,7 @@ export async function buildSpawnMessage(args) {
|
|
|
123
150
|
focusName,
|
|
124
151
|
deliveries: unscopedDeliveries,
|
|
125
152
|
});
|
|
126
|
-
const messageToSend = `${roleFramework}\n\n${scopingDirective}${answersSuffix}`;
|
|
153
|
+
const messageToSend = `${reconcileLead}${roleFramework}\n\n${scopingDirective}${answersSuffix}`;
|
|
127
154
|
log.info(`[focus-executor] Spawning fresh scoping session for "${focusName}" ` +
|
|
128
155
|
`-- role framework + explicit scoping directive for ${unscopedDeliveries.length} queued ` +
|
|
129
156
|
`zero-issue deliver${unscopedDeliveries.length === 1 ? 'y' : 'ies'} ` +
|
|
@@ -133,40 +160,7 @@ export async function buildSpawnMessage(args) {
|
|
|
133
160
|
}
|
|
134
161
|
if (!resumeId)
|
|
135
162
|
return prompt;
|
|
136
|
-
|
|
137
|
-
// last spawn": a resumed reviewer sees reviewed_through_sha..tip when a
|
|
138
|
-
// completed cycle set the watermark, and the FULL branch diff (with an
|
|
139
|
-
// explicit full-pass demand) when none exists (first review, or the prior
|
|
140
|
-
// cycle aborted). Non-review resumes keep the integration-base diff.
|
|
141
|
-
let reviewCoverage;
|
|
142
|
-
let diffBaseOverride;
|
|
143
|
-
if (spawnSpec.lineage === 'review') {
|
|
144
|
-
try {
|
|
145
|
-
// A prior review under-covered (the branch drifted mid-review), so the
|
|
146
|
-
// review-exit handler armed a full pass: the incremental watermark cannot
|
|
147
|
-
// be trusted this cycle. consumeForceFullPassReview clears the one-shot arm.
|
|
148
|
-
if (consumeForceFullPassReview(focusId)) {
|
|
149
|
-
reviewCoverage = { mode: 'full-pass' };
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
const focuses = await getActiveFocuses(config.organizationId, config.productId);
|
|
153
|
-
const watermark = focuses.find(f => f.focus_id === focusId)?.reviewed_through_sha ?? null;
|
|
154
|
-
if (watermark) {
|
|
155
|
-
diffBaseOverride = watermark;
|
|
156
|
-
reviewCoverage = { mode: 'incremental', baseSha: watermark };
|
|
157
|
-
}
|
|
158
|
-
else {
|
|
159
|
-
reviewCoverage = { mode: 'full-pass' };
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
catch (err) {
|
|
164
|
-
// On a resolve failure, default to a full pass -- the safe direction
|
|
165
|
-
// (re-cover everything rather than silently skip an unreviewed range).
|
|
166
|
-
log.debug(`Review coverage watermark resolve failed (non-fatal):`, err.message);
|
|
167
|
-
reviewCoverage = { mode: 'full-pass' };
|
|
168
|
-
}
|
|
169
|
-
}
|
|
163
|
+
const { reviewCoverage, diffBaseOverride } = await resolveReviewResumeCoverage(spawnSpec.lineage, focusId, config);
|
|
170
164
|
const diffCtx = {
|
|
171
165
|
focusId,
|
|
172
166
|
deliveryIds: deliveries.map(d => d.id),
|
|
@@ -177,7 +171,7 @@ export async function buildSpawnMessage(args) {
|
|
|
177
171
|
...(diffBaseOverride ? { diffBaseOverride } : {}),
|
|
178
172
|
};
|
|
179
173
|
const gitDiff = await assembleResumeGitDiff(diffCtx, gitDiffManifestSink);
|
|
180
|
-
const messageToSend = buildResumeDeltaMessage({
|
|
174
|
+
const messageToSend = reconcileLead + buildResumeDeltaMessage({
|
|
181
175
|
lineage: spawnSpec.lineage,
|
|
182
176
|
focusName,
|
|
183
177
|
gitDiff,
|
|
@@ -191,6 +185,34 @@ export async function buildSpawnMessage(args) {
|
|
|
191
185
|
`${priorFindings.length} prior finding(s))`);
|
|
192
186
|
return messageToSend;
|
|
193
187
|
}
|
|
188
|
+
/**
|
|
189
|
+
* The review resume delta is computed from the coverage WATERMARK, not "since
|
|
190
|
+
* last spawn": a resumed reviewer sees reviewed_through_sha..tip when a completed
|
|
191
|
+
* cycle set the watermark, and the FULL branch diff (with an explicit full-pass
|
|
192
|
+
* demand) when none exists (first review, or the prior cycle aborted). A prior
|
|
193
|
+
* review that under-covered (the branch drifted mid-review) armed a one-shot full
|
|
194
|
+
* pass, which consumeForceFullPassReview takes here. A resolve failure defaults to
|
|
195
|
+
* a full pass -- the safe direction, re-covering rather than silently skipping an
|
|
196
|
+
* unreviewed range. A non-review resume keeps the integration-base diff (neither
|
|
197
|
+
* field set).
|
|
198
|
+
*/
|
|
199
|
+
async function resolveReviewResumeCoverage(lineage, focusId, config) {
|
|
200
|
+
if (lineage !== 'review')
|
|
201
|
+
return {};
|
|
202
|
+
try {
|
|
203
|
+
if (consumeForceFullPassReview(focusId))
|
|
204
|
+
return { reviewCoverage: { mode: 'full-pass' } };
|
|
205
|
+
const focuses = await getActiveFocuses(config.organizationId, config.productId);
|
|
206
|
+
const watermark = focuses.find(f => f.focus_id === focusId)?.reviewed_through_sha ?? null;
|
|
207
|
+
if (!watermark)
|
|
208
|
+
return { reviewCoverage: { mode: 'full-pass' } };
|
|
209
|
+
return { diffBaseOverride: watermark, reviewCoverage: { mode: 'incremental', baseSha: watermark } };
|
|
210
|
+
}
|
|
211
|
+
catch (err) {
|
|
212
|
+
log.debug(`Review coverage watermark resolve failed (non-fatal):`, err.message);
|
|
213
|
+
return { reviewCoverage: { mode: 'full-pass' } };
|
|
214
|
+
}
|
|
215
|
+
}
|
|
194
216
|
/**
|
|
195
217
|
* The resume delta's git.diff_against_base content, with its manifest pushed to
|
|
196
218
|
* the sink. Best-effort: a failed assembly yields '' and the delta tells the
|