@telora/daemon 0.22.132 → 0.22.136

package/dist/spawn/lead-launch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-launch.d.ts","sourceRoot":"","sources":["../../src/spawn/lead-launch.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAqB,KAAK,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAOxF,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,6FAA6F;IAC7F,KAAK,EAAE,MAAM,8BAA8B,CAAC;CAC7C;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,qBAAqB,EAC3B,SAAS,GAAE,iBAAsB,GAChC,OAAO,CAAC,8BAA8B,GAAG,IAAI,CAAC,CAsBhD"}

package/dist/spawn/lead-launch.js

@@ -0,0 +1,34 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/spawn/lead-launch.test.ts
+// PINNED-BY-END
+import { recordLeadProcess } from './lead-process-ownership.js';
+import { endSupersededLeadProcesses } from './untracked-lead-sweep.js';
+import { processGroupEnded } from './process-group-kill.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'lead-launch' });
+/**
+ * End the focus's untracked previous leads, then spawn and record the new lead.
+ * Returns the lead, or null when the spawn was refused because a previous lead
+ * could not be ended (the caller fails the session and releases the team).
+ */
+export async function launchLeadProcess(args, ownership = {}) {
+    const { focusId, focusName, teamState, sessionId } = args;
+    const superseded = await endSupersededLeadProcesses(focusId, focusName, ownership);
+    const unended = superseded.filter((r) => !processGroupEnded(r));
+    if (unended.length > 0) {
+        log.error(`Refusing spawn for "${focusName}": previous lead process group(s) ` +
+            `${unended.map((r) => `${r.pgid} (${r.outcome}${r.detail ? `: ${r.detail}` : ''})`).join(', ')} could not be ended -- ` +
+            'a new lead must not supersede a live one; their ownership records are kept for the untracked-process sweep', { focusId });
+        return null;
+    }
+    const proc = args.spawn();
+    teamState.leadPid = proc.pid ?? null;
+    teamState.leadStdin = proc.stdin;
+    teamState.phase = 'executing';
+    // Record the detached lead (pid, start identity, focus, session) on the team
+    // state and in the pidfile: a hard daemon kill group-reaps it from there, and
+    // the running daemon's ownership passes read it.
+    recordLeadProcess(proc, teamState, sessionId, ownership);
+    return proc;
+}
+//# sourceMappingURL=lead-launch.js.map

package/dist/spawn/lead-launch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-launch.js","sourceRoot":"","sources":["../../src/spawn/lead-launch.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,2DAA2D;AAC3D,gBAAgB;AAqBhB,OAAO,EAAE,iBAAiB,EAA0B,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;AAWpD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAA2B,EAC3B,YAA+B,EAAE;IAEjC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,0BAA0B,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,GAAG,CAAC,KAAK,CACP,uBAAuB,SAAS,oCAAoC;YACpE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB;YACvH,4GAA4G,EAC5G,EAAE,OAAO,EAAE,CACZ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC1B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC;IACrC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;IACjC,SAAS,CAAC,KAAK,GAAG,WAAW,CAAC;IAC9B,6EAA6E;IAC7E,8EAA8E;IAC9E,iDAAiD;IACjD,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/spawn/lead-process-ownership.d.ts

@@ -0,0 +1,91 @@
+/**
+ * Which agent processes this daemon owns, and ending the ones no team does.
+ *
+ * Every team lead the daemon spawns is recorded -- pid, process group (== pid,
+ * the lead is spawned detached), start identity, focus and session -- both on
+ * its FocusTeamState and in the persisted worker pidfile (shell/worker-pidfile).
+ * The running daemon reads that record, not only the boot reap and
+ * `stop --force`, so it can:
+ *
+ *   - end a team's whole process group at cleanup (`ensureTeamProcessGroupGone`),
+ *   - verify a recorded pid still names the process it spawned, and
+ *   - (spawn/untracked-lead-sweep.ts) end a focus's previous lead before a new
+ *     spawn supersedes it, and any live lead it spawned that no team tracks.
+ *
+ * A recorded pid is signalled only when its identity is verified: the live
+ * process's start identity equals the one recorded at spawn. A pid that was
+ * reused by an unrelated process, or an entry with no recorded identity, is
+ * never signalled. A lead that has already exited is safe to group-signal: the
+ * kernel does not reuse a pid while a process group of that id still has
+ * members, so a live group with that id is the lead's own stragglers.
+ */
+import type { ChildProcess } from 'node:child_process';
+import type { FocusTeamState } from '../types/index.js';
+import { type WorkerPidEntry } from '../shell/worker-pidfile.js';
+import { type ProcessGroupKillOptions, type ProcessGroupKillResult } from './process-group-kill.js';
+/** Seams shared by the ownership passes; defaults touch the real OS and state. */
+export interface LeadOwnershipDeps {
+    readEntries?: () => WorkerPidEntry[];
+    /** Persist one ownership record. Defaults to the worker pidfile. */
+    recordEntry?: (entry: WorkerPidEntry) => void;
+    removeEntry?: (pid: number) => void;
+    /** Pids a live team or one-shot worker currently owns. */
+    trackedPids?: () => Set<number>;
+    readStartIdentity?: (pid: number) => string | null;
+    /** True while any non-zombie member of the group is alive. */
+    isGroupAlive?: (pgid: number) => boolean;
+    terminate?: (pgid: number, opts: ProcessGroupKillOptions) => Promise<ProcessGroupKillResult>;
+    now?: () => number;
+    /** SIGTERM-to-SIGKILL grace for the team-cleanup kill. Defaults to PROCESS_GROUP_GRACE_MS. */
+    graceMs?: number;
+}
+export interface ResolvedLeadOwnershipDeps {
+    readEntries: () => WorkerPidEntry[];
+    removeEntry: (pid: number) => void;
+    trackedPids: () => Set<number>;
+    readStartIdentity: (pid: number) => string | null;
+    isGroupAlive: (pgid: number) => boolean;
+    terminate: (pgid: number, opts: ProcessGroupKillOptions) => Promise<ProcessGroupKillResult>;
+    now: () => number;
+}
+/** Every pid a live team (lead) or registered one-shot worker owns right now. */
+export declare function currentlyTrackedPids(): Set<number>;
+export declare function resolveLeadOwnershipDeps(deps: LeadOwnershipDeps): ResolvedLeadOwnershipDeps;
+/**
+ * Record a freshly spawned lead: its start identity on the team state, and its
+ * ownership record in the pidfile. The record is NOT dropped when the lead
+ * closes -- the lead's children can outlive it -- only once its whole process
+ * group is confirmed gone (`ensureTeamProcessGroupGone`, or the untracked-process
+ * sweep, which prunes a record whose group is already gone).
+ */
+export declare function recordLeadProcess(proc: ChildProcess, teamState: FocusTeamState, sessionId: string, deps?: Pick<LeadOwnershipDeps, 'recordEntry' | 'readStartIdentity'>): void;
+/**
+ * True when the team's lead pid now names a DIFFERENT live process (pid reuse):
+ * a start identity was recorded at spawn and the live one differs. A gone lead
+ * (null live identity) or an unrecorded identity is not a mismatch.
+ */
+export declare function leadPidReused(team: Pick<FocusTeamState, 'leadPid' | 'leadStartIdentity'>, readStartIdentity?: (pid: number) => string | null): boolean;
+/** Whether a team's process tree is confirmed gone, and why (or why not). */
+export interface TeamProcessTreeVerdict {
+    /** True only when no process of this team's group is observed alive. */
+    gone: boolean;
+    detail: string;
+    /** The termination result, when the group was signalled. */
+    result: ProcessGroupKillResult | null;
+}
+/**
+ * The team-cleanup guarantee: after a team's lead has closed, end anything left
+ * in its process group (subagents, MCP children, or a lead that closed its
+ * stdio but did not exit) within the grace, SIGKILL stragglers, and CONFIRM the
+ * group is gone.
+ *
+ * Signals only a group whose lead was really spawned (a start identity was
+ * recorded), whose pid no other live team now owns, and which was not reused.
+ * Absence is confirmed only by observation: a group that survived SIGKILL, could
+ * not be signalled, or could not be verified is reported `gone: false` and its
+ * ownership record is KEPT -- so the untracked-process sweep keeps acting on it --
+ * with the failure logged. Only a confirmed-gone tree discharges the record.
+ * Never throws.
+ */
+export declare function ensureTeamProcessGroupGone(teamState: FocusTeamState, context: string, deps?: LeadOwnershipDeps): Promise<TeamProcessTreeVerdict>;
+//# sourceMappingURL=lead-process-ownership.d.ts.map

package/dist/spawn/lead-process-ownership.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-process-ownership.d.ts","sourceRoot":"","sources":["../../src/spawn/lead-process-ownership.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAML,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC5B,MAAM,yBAAyB,CAAC;AAKjC,kFAAkF;AAClF,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,MAAM,cAAc,EAAE,CAAC;IACrC,oEAAoE;IACpE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,0DAA0D;IAC1D,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACnD,8DAA8D;IAC9D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC7F,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,8FAA8F;IAC9F,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,WAAW,EAAE,MAAM,cAAc,EAAE,CAAC;IACpC,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,WAAW,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAClD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,KAAK,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC5F,GAAG,EAAE,MAAM,MAAM,CAAC;CACnB;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,CAAC,CAOlD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,GAAG,yBAAyB,CAU3F;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,mBAAmB,CAAM,GACtE,IAAI,CAUN;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,mBAAmB,CAAC,EAC3D,iBAAiB,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAA+B,GAC3E,OAAO,CAIT;AAED,6EAA6E;AAC7E,MAAM,WAAW,sBAAsB;IACrC,wEAAwE;IACxE,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAAC;CACvC;AA4BD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,iBAAsB,GAC3B,OAAO,CAAC,sBAAsB,CAAC,CAcjC"}

package/dist/spawn/lead-process-ownership.js

@@ -0,0 +1,120 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/completion/team-teardown-kills-process-group.test.ts,
+//   packages/daemon/src/focus/session-process-reap.test.ts, packages/daemon/src/spawn/lead-launch.test.ts,
+//   packages/daemon/src/spawn/lead-process-ownership.test.ts,
+//   packages/daemon/src/spawn/spawn-team-process-ownership.test.ts,
+//   packages/daemon/src/spawn/untracked-lead-sweep.test.ts
+// PINNED-BY-END
+import { getActiveTeams } from '../focus/focus-team-state.js';
+import { listTrackedWorkers } from './worker-registry.js';
+import { readWorkerPidfile, recordWorkerProcess, removeWorkerPid, } from '../shell/worker-pidfile.js';
+import { PROCESS_GROUP_GRACE_MS, isProcessGroupAlive, processGroupEnded, readProcessStartIdentity, terminateProcessGroup, } from './process-group-kill.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'lead-process-ownership' });
+/** Every pid a live team (lead) or registered one-shot worker owns right now. */
+export function currentlyTrackedPids() {
+    const pids = new Set();
+    for (const team of getActiveTeams().values()) {
+        if (typeof team.leadPid === 'number')
+            pids.add(team.leadPid);
+    }
+    for (const worker of listTrackedWorkers())
+        pids.add(worker.pid);
+    return pids;
+}
+export function resolveLeadOwnershipDeps(deps) {
+    return {
+        readEntries: deps.readEntries ?? (() => readWorkerPidfile()),
+        removeEntry: deps.removeEntry ?? ((pid) => removeWorkerPid(pid)),
+        trackedPids: deps.trackedPids ?? currentlyTrackedPids,
+        readStartIdentity: deps.readStartIdentity ?? readProcessStartIdentity,
+        isGroupAlive: deps.isGroupAlive ?? isProcessGroupAlive,
+        terminate: deps.terminate ?? ((pgid, opts) => terminateProcessGroup(pgid, opts)),
+        now: deps.now ?? Date.now,
+    };
+}
+/**
+ * Record a freshly spawned lead: its start identity on the team state, and its
+ * ownership record in the pidfile. The record is NOT dropped when the lead
+ * closes -- the lead's children can outlive it -- only once its whole process
+ * group is confirmed gone (`ensureTeamProcessGroupGone`, or the untracked-process
+ * sweep, which prunes a record whose group is already gone).
+ */
+export function recordLeadProcess(proc, teamState, sessionId, deps = {}) {
+    if (typeof proc.pid !== 'number')
+        return;
+    const leadPid = proc.pid;
+    const startIdentity = (deps.readStartIdentity ?? readProcessStartIdentity)(leadPid);
+    teamState.leadStartIdentity = startIdentity;
+    const entry = {
+        pid: leadPid, label: teamState.focusName, focusId: teamState.focusId, sessionId, recordedAt: Date.now(),
+    };
+    if (startIdentity !== null)
+        entry.startIdentity = startIdentity;
+    (deps.recordEntry ?? ((e) => recordWorkerProcess(e)))(entry);
+}
+/**
+ * True when the team's lead pid now names a DIFFERENT live process (pid reuse):
+ * a start identity was recorded at spawn and the live one differs. A gone lead
+ * (null live identity) or an unrecorded identity is not a mismatch.
+ */
+export function leadPidReused(team, readStartIdentity = readProcessStartIdentity) {
+    if (team.leadPid == null || team.leadStartIdentity == null)
+        return false;
+    const live = readStartIdentity(team.leadPid);
+    return live !== null && live !== team.leadStartIdentity;
+}
+async function resolveTeamProcessTree(teamState, context, d, graceMs) {
+    const pid = teamState.leadPid;
+    const verdict = (gone, detail, result = null) => ({ gone, detail, result });
+    if (pid == null)
+        return verdict(true, 'no lead process was spawned');
+    if (!Number.isInteger(pid) || pid <= 1)
+        return verdict(false, `lead pid ${pid} is not a signallable process group`);
+    // The kernel does not reuse an id a process group still holds, so a pid now
+    // owned by another team's lead, or reused by an unrelated process, means
+    // nothing of THIS team's group remains.
+    const ownedByAnotherTeam = [...getActiveTeams().values()].some((t) => t !== teamState && t.leadPid === pid);
+    if (ownedByAnotherTeam || leadPidReused(teamState, d.readStartIdentity)) {
+        return verdict(true, `pid ${pid} now belongs to another process, so no process of this team's group remains`);
+    }
+    if (teamState.leadStartIdentity == null) {
+        if (!d.isGroupAlive(pid))
+            return verdict(true, `process group ${pid} is already gone`);
+        return verdict(false, `no spawn identity was recorded for pid ${pid}, so its live process group cannot be verified as this team's and was not signalled`);
+    }
+    const result = await d.terminate(pid, { label: teamState.focusName, context, graceMs });
+    if (processGroupEnded(result))
+        return verdict(true, `process group ${pid} ${result.outcome}`, result);
+    return verdict(false, `process group ${pid} ${result.outcome}${result.detail ? ` (${result.detail})` : ''}`, result);
+}
+/**
+ * The team-cleanup guarantee: after a team's lead has closed, end anything left
+ * in its process group (subagents, MCP children, or a lead that closed its
+ * stdio but did not exit) within the grace, SIGKILL stragglers, and CONFIRM the
+ * group is gone.
+ *
+ * Signals only a group whose lead was really spawned (a start identity was
+ * recorded), whose pid no other live team now owns, and which was not reused.
+ * Absence is confirmed only by observation: a group that survived SIGKILL, could
+ * not be signalled, or could not be verified is reported `gone: false` and its
+ * ownership record is KEPT -- so the untracked-process sweep keeps acting on it --
+ * with the failure logged. Only a confirmed-gone tree discharges the record.
+ * Never throws.
+ */
+export async function ensureTeamProcessGroupGone(teamState, context, deps = {}) {
+    const d = resolveLeadOwnershipDeps(deps);
+    const verdict = await resolveTeamProcessTree(teamState, context, d, deps.graceMs ?? PROCESS_GROUP_GRACE_MS);
+    const pid = teamState.leadPid;
+    if (verdict.gone) {
+        if (pid != null)
+            d.removeEntry(pid);
+        log.debug(`[process-kill] ${context}: "${teamState.focusName}" process tree confirmed gone -- ${verdict.detail}`);
+    }
+    else {
+        log.error(`[process-kill] ${context}: "${teamState.focusName}" process tree NOT confirmed gone -- ${verdict.detail}; ` +
+            'its ownership record is kept for the untracked-process sweep');
+    }
+    return verdict;
+}
+//# sourceMappingURL=lead-process-ownership.js.map

package/dist/spawn/lead-process-ownership.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lead-process-ownership.js","sourceRoot":"","sources":["../../src/spawn/lead-process-ownership.ts"],"names":[],"mappings":"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"}

package/dist/spawn/lifecycle.d.ts

@@ -1,6 +1,16 @@
+/**
+ * Agent lifecycle management — terminate, query, and resolution spawning.
+ *
+ * Extracted from the former spawner.ts monolith (now ./state.ts) — manages the lifecycle of running agent processes
+ * including termination, status queries, and merge conflict resolution agents.
+ */
+import { type ChildProcess, type SpawnOptions } from 'node:child_process';
 import type { DaemonConfig } from '../types/index.js';
 import { type TokenUsage } from '@telora/daemon-core';
+import { type OneShotOwnershipDeps } from './one-shot-process-ownership.js';
 import { type TelemetryMetricRow } from '../otlp/telemetry-writer.js';
+import { openSystemSession, closeSystemSession } from '../queries/system-session.js';
+import { type Logger } from '../shell/log.js';
 /** A worker the reap path tracks: a focus team lead and its identity. */
 export interface ReapableWorker {
     /** PID of the team lead `claude --print` process. */
@@ -54,13 +64,33 @@ export declare function buildResolutionAgentPrompt(p: {
     integrationBranch: string;
     conflictFiles: string[];
     focusDescription: string;
+    /** A previous run's preserved partial resolution (refs/telora/resolver-partial/...), or null. */
+    priorPartialRef?: string | null;
 }): string;
+/**
+ * The process, timer, log, session and ownership effects of {@link spawnResolutionAgent}.
+ * An optional seam so a test observes the real spawn/timeout log lines, the kill
+ * timer's budget and the ownership record without mock.module; production uses
+ * the defaults (the real session writes and ownership record).
+ */
+export interface ResolutionAgentEffects {
+    spawn: (command: string, args: string[], options: SpawnOptions) => ChildProcess;
+    setTimeout: (fn: () => void, ms: number) => ReturnType<typeof setTimeout>;
+    /** Signals the resolver's process GROUP (it is spawned detached) by its leader pid. */
+    kill: (pid: number, signal: NodeJS.Signals) => void;
+    log: Pick<Logger, 'info' | 'warn' | 'error'>;
+    openSession?: typeof openSystemSession;
+    closeSession?: typeof closeSystemSession;
+    ownership?: OneShotOwnershipDeps;
+}
 /**
  * Spawn a short-lived, single-purpose Claude Code agent for merge conflict resolution.
  *
  * Used when no active team exists for a focus but merge conflicts need resolution.
  * The agent receives a focused prompt with conflict details, resolves in the existing
- * worktree, and exits. No session DB record, no streaming, no team mode.
+ * worktree, and exits. It runs under a role-less 'merge' agent_sessions row whose
+ * process ownership is recorded (spawn/one-shot-process-ownership.ts). No
+ * streaming, no team mode.
  */
 export declare function spawnResolutionAgent(params: {
     config: DaemonConfig;
@@ -77,7 +107,15 @@ export declare function spawnResolutionAgent(params: {
      * row is still created, just unscoped).
      */
     focusId?: string | null;
-}): Promise<{
+    /**
+     * Scales the conflict-sized budget (an escalated retry). Absent => 1. The
+     * budget itself is computed from the conflict set or the product's configured
+     * `resolutionAgentTimeoutMs` (spawn/resolution-budget.ts).
+     */
+    budgetMultiplier?: number;
+    /** A previous run's preserved partial resolution, named in the prompt. */
+    priorPartialRef?: string | null;
+}, effects?: Partial<ResolutionAgentEffects>): Promise<{
     success: boolean;
     error?: string;
 }>;
@@ -97,6 +135,8 @@ export interface AuditSpawnOptions {
      * cross-cycle memory of the gap's trajectory. Omitted/null -> fresh session.
      */
     resumeSessionId?: string | null;
+    /** The role-less 'audit' agent_sessions row this assessor runs under (its process ownership is recorded against it). */
+    agentSessionId?: string | null;
 }
 /** Result of an audit-assessor spawn. */
 export interface AuditSpawnResult {
@@ -150,5 +190,5 @@ export declare function buildAuditMetricRow(params: {
  * reality_tree_* MCP tools so it can mutate the graph but not touch workflow
  * state.
  */
-export declare function spawnAuditAgent(opts: AuditSpawnOptions): Promise<AuditSpawnResult>;
+export declare function spawnAuditAgent(opts: AuditSpawnOptions, ownership?: OneShotOwnershipDeps): Promise<AuditSpawnResult>;
 //# sourceMappingURL=lifecycle.d.ts.map

package/dist/spawn/lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/spawn/lifecycle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/spawn/lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/spawn/lifecycle.js

@@ -3,7 +3,9 @@
 //   packages/daemon/src/spawn/audit-spawn-reaches-spawn.test.ts,
 //   packages/daemon/src/spawn/audit-spawn-stream-json.test.ts,
 //   packages/daemon/src/spawn/audit-telemetry-capture.test.ts,
-//   packages/daemon/src/spawn/reap-worker-fleet.test.ts
+//   packages/daemon/src/spawn/one-shot-process-ownership.test.ts,
+//   packages/daemon/src/spawn/reap-worker-fleet.test.ts,
+//   packages/daemon/src/spawn/resolution-agent-budget.test.ts
 // PINNED-BY-END
 /**
  * Agent lifecycle management — terminate, query, and resolution spawning.
@@ -12,11 +14,14 @@
  * including termination, status queries, and merge conflict resolution agents.
  */
 import { spawn } from 'node:child_process';
-import { runGitSync } from '../git/index.js';
+import { readResolutionCompletion } from '../git/index.js';
+import { computeResolutionAgentBudget, formatResolutionBudget, statConflictFiles } from './resolution-budget.js';
 import { stripClaudeCodeEnvVars, StreamJsonParser, } from '@telora/daemon-core';
 import { getActiveTeams } from '../focus/focus-team-state.js';
 import { isProcessAlive } from './liveness.js';
-import { trackChildProcess, listTrackedWorkers } from './worker-registry.js';
+import { listTrackedWorkers } from './worker-registry.js';
+import { ownOneShotProcess } from './one-shot-process-ownership.js';
+import { signalProcessGroup } from './process-group-kill.js';
 import { buildLeveredSpawnEnvironment } from './spawn-environment.js';
 import { bufferMetric } from '../otlp/telemetry-writer.js';
 import { estimateLoopCostUsd } from '../loops/index.js';
@@ -138,8 +143,6 @@ function defaultListWorkers() {
     return [...byPid.values()];
 }
 // ── Merge Conflict Resolution Agent ──────────────────────────────────
-/** Timeout for the resolution agent (10 minutes). */
-const RESOLUTION_AGENT_TIMEOUT_MS = 10 * 60 * 1000;
 /**
  * The resolution agent's prompt. Its steps come from the shared merge-resolution
  * wording (the same the team-lead message and the prompt section send). Pure --
@@ -156,6 +159,17 @@ export function buildResolutionAgentPrompt(p) {
         `**Conflicted files:**`,
         ...p.conflictFiles.map(f => `- ${f}`),
         ``,
+        ...(p.priorPartialRef
+            ? [
+                `**Earlier partial resolution:** a previous resolver ran out of time on this conflict. Its partial work is`,
+                `preserved at \`${p.priorPartialRef}\` (a commit whose tree holds its staged and unstaged edits). Inspect it`,
+                `per file with \`git show ${p.priorPartialRef}:<path>\` and reuse what is correct. It may still contain`,
+                `conflict markers, so check each file rather than copying the whole tree. Recover per file only: compare with`,
+                `\`git diff ${p.priorPartialRef} -- <path>\` and take what is right into the working copy, then \`git add <path>\`.`,
+                `Do NOT \`git checkout\`, \`git reset\` or \`git restore\` the ref (or its whole tree) over the in-progress merge.`,
+                ``,
+            ]
+            : []),
         `**Focus context:** ${p.focusDescription}`,
         ``,
         `**Instructions:**`,
@@ -163,16 +177,32 @@ export function buildResolutionAgentPrompt(p) {
         `Follow the coding standards in CLAUDE.md.`,
     ].join('\n');
 }
+const DEFAULT_RESOLUTION_AGENT_EFFECTS = {
+    spawn: (command, args, options) => spawn(command, args, options),
+    setTimeout: (fn, ms) => setTimeout(fn, ms),
+    kill: (pid, signal) => { signalProcessGroup(pid, signal); },
+    log,
+    openSession: openSystemSession,
+    closeSession: closeSystemSession,
+};
 /**
  * Spawn a short-lived, single-purpose Claude Code agent for merge conflict resolution.
  *
  * Used when no active team exists for a focus but merge conflicts need resolution.
  * The agent receives a focused prompt with conflict details, resolves in the existing
- * worktree, and exits. No session DB record, no streaming, no team mode.
+ * worktree, and exits. It runs under a role-less 'merge' agent_sessions row whose
+ * process ownership is recorded (spawn/one-shot-process-ownership.ts). No
+ * streaming, no team mode.
  */
-export async function spawnResolutionAgent(params) {
-    const { config, worktreePath, branchName, integrationBranch, conflictFiles, focusDescription, model, focusId } = params;
-    const prompt = buildResolutionAgentPrompt({ worktreePath, branchName, integrationBranch, conflictFiles, focusDescription });
+export async function spawnResolutionAgent(params, effects = {}) {
+    const fx = { ...DEFAULT_RESOLUTION_AGENT_EFFECTS, ...effects };
+    const { config, worktreePath, branchName, integrationBranch, conflictFiles, focusDescription, model, focusId, priorPartialRef } = params;
+    const budget = computeResolutionAgentBudget({
+        files: statConflictFiles(worktreePath, conflictFiles),
+        configuredMs: config.resolutionAgentTimeoutMs ?? null,
+        ...(params.budgetMultiplier !== undefined ? { multiplier: params.budgetMultiplier } : {}),
+    });
+    const prompt = buildResolutionAgentPrompt({ worktreePath, branchName, integrationBranch, conflictFiles, focusDescription, priorPartialRef: priorPartialRef ?? null });
     const args = [
         '--print',
         '--dangerously-skip-permissions',
@@ -182,64 +212,67 @@ export async function spawnResolutionAgent(params) {
     ];
     // Build a clean environment (strip Claude Code session vars)
     const spawnEnv = stripClaudeCodeEnvVars(process.env);
-    log.info(`Spawning resolution agent for branch ${branchName} (${conflictFiles.length} conflicts, model: ${model ?? 'default'})`);
+    fx.log.info(`Spawning resolution agent for branch ${branchName} (${conflictFiles.length} conflicts, model: ${model ?? 'default'}, ${formatResolutionBudget(budget)})`);
     // Open a role-less 'merge' agent_sessions row so this --print one-shot's
     // run-time reaches OEE Availability (merge is production work: landing
     // delivered code). Best-effort -- a null id just means no row for this run.
-    const mergeSessionId = await openSystemSession({
+    const closeSession = fx.closeSession ?? closeSystemSession;
+    const mergeSessionId = await (fx.openSession ?? openSystemSession)({
         organizationId: config.organizationId,
         focusId: focusId ?? null,
         branchName,
         sessionType: 'merge',
     });
     return new Promise((resolve) => {
-        const proc = spawn(config.claudeCodePath, args, {
+        const proc = fx.spawn(config.claudeCodePath, args, {
             cwd: worktreePath,
             env: spawnEnv,
-            stdio: ['pipe', 'pipe', 'pipe'],
+            stdio: ['pipe', 'pipe', 'pipe'], detached: true, // own group: exit/timeout cleanup ends its MCP children too
         });
-        // Register so a graceful stop reaps this one-shot if it is still resolving.
-        trackChildProcess(proc, `merge-resolution:${branchName}`);
+        // Track + record ownership so a graceful stop or the untracked sweep can end its whole tree.
+        ownOneShotProcess(proc, { label: `merge-resolution:${branchName}`, focusId: focusId ?? null, sessionId: mergeSessionId }, fx.ownership);
         // Close stdin immediately -- prompt is passed as CLI arg
         proc.stdin?.end();
         // Timeout with escalating shutdown
-        const timeout = setTimeout(() => {
-            log.warn(`Resolution agent timed out after ${RESOLUTION_AGENT_TIMEOUT_MS / 1000}s, killing`);
-            try {
-                process.kill(proc.pid, 'SIGTERM');
-            }
-            catch { /* ignore */ }
-            setTimeout(() => {
+        const timeout = fx.setTimeout(() => {
+            fx.log.warn(`Resolution agent for branch ${branchName} timed out, killing (${formatResolutionBudget(budget)})`);
+            if (proc.pid) {
                 try {
-                    process.kill(proc.pid, 'SIGKILL');
+                    fx.kill(proc.pid, 'SIGTERM');
                 }
                 catch { /* ignore */ }
+            }
+            fx.setTimeout(() => {
+                if (proc.pid) {
+                    try {
+                        fx.kill(proc.pid, 'SIGKILL');
+                    }
+                    catch { /* ignore */ }
+                }
             }, 10000);
-        }, RESOLUTION_AGENT_TIMEOUT_MS);
+        }, budget.budgetMs);
         proc.on('close', (code) => {
             clearTimeout(timeout);
-            // Verify resolution by checking for remaining unmerged files
-            const unmergedResult = runGitSync(['diff', '--name-only', '--diff-filter=U'], worktreePath);
-            const unmergedFiles = unmergedResult.success
-                ? unmergedResult.output.split('\n').filter(Boolean)
-                : [];
-            const success = unmergedFiles.length === 0;
-            const msg = success ? undefined : `Conflicts remain in: ${unmergedFiles.join(', ')}`;
+            // Verify resolution: a finished merge (no unmerged paths, no MERGE_HEAD,
+            // nothing uncommitted), not merely "no unmerged files".
+            const completion = readResolutionCompletion(worktreePath);
+            const success = completion.finished;
+            const msg = success ? undefined : completion.reason;
             if (success) {
-                log.info(`Resolution agent succeeded for branch ${branchName} (exit code: ${code})`);
+                fx.log.info(`Resolution agent succeeded for branch ${branchName} (exit code: ${code})`);
             }
             else {
-                log.warn(`Resolution agent failed for branch ${branchName}: ${msg}`);
+                fx.log.warn(`Resolution agent failed for branch ${branchName}: ${msg}`);
             }
             // Close the 'merge' session (stamps ended_at) before resolving, on either
             // outcome. closeSystemSession never throws; .finally guarantees resolve.
-            void closeSystemSession(mergeSessionId, { success, exitReason: msg })
+            void closeSession(mergeSessionId, { success, exitReason: msg })
                 .finally(() => resolve(success ? { success: true } : { success: false, error: msg }));
         });
         proc.on('error', (err) => {
             clearTimeout(timeout);
-            log.error(`Resolution agent spawn error: ${err.message}`);
-            void closeSystemSession(mergeSessionId, { success: false, exitReason: err.message })
+            fx.log.error(`Resolution agent spawn error: ${err.message}`);
+            void closeSession(mergeSessionId, { success: false, exitReason: err.message })
                 .finally(() => resolve({ success: false, error: `Spawn error: ${err.message}` }));
         });
     });
@@ -309,7 +342,7 @@ export function buildAuditMetricRow(params) {
  * reality_tree_* MCP tools so it can mutate the graph but not touch workflow
  * state.
  */
-export async function spawnAuditAgent(opts) {
+export async function spawnAuditAgent(opts, ownership = {}) {
     const { config, prompt, worktreePath, focusId, cycleNumber, model, timeoutMs, allowedTools, resumeSessionId } = opts;
     const args = [];
     // --resume must precede the output-format flags.
@@ -344,15 +377,15 @@ export async function spawnAuditAgent(opts) {
             child = spawn(config.claudeCodePath, args, {
                 cwd: worktreePath ?? config.repoPath,
                 env: stripClaudeCodeEnvVars(spawnEnv, { preserve: ['CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS'] }),
-                stdio: ['pipe', 'pipe', 'pipe'],
+                stdio: ['pipe', 'pipe', 'pipe'], detached: true, // own group: exit/timeout cleanup ends its MCP children too
             });
         }
         catch (err) {
             resolve({ exitCode: null, stdout: '', stderr: '', errorMessage: `spawn failed: ${err.message}` });
             return;
         }
-        // Register so a graceful stop reaps this one-shot if the audit is still running.
-        trackChildProcess(child, `audit:${focusId} cycle ${cycleNumber}`);
+        // Track + record ownership so a graceful stop or the untracked sweep can end its whole tree.
+        ownOneShotProcess(child, { label: `audit:${focusId} cycle ${cycleNumber}`, focusId, sessionId: opts.agentSessionId ?? null }, ownership);
         child.stdin?.end();
         // Raw stdout is retained as a fallback (e.g. a non-JSON stub). In normal
         // operation stdout is NDJSON stream-json; the parser reconstructs the
@@ -402,10 +435,8 @@ export async function spawnAuditAgent(opts) {
         child.stdout?.on('data', (chunk) => { rawStdout += chunk.toString('utf8'); });
         child.stderr?.on('data', (chunk) => { stderr += chunk.toString('utf8'); });
         const timer = setTimeout(() => {
-            try {
-                child.kill('SIGKILL');
-            }
-            catch { /* ignore */ }
+            if (child.pid)
+                signalProcessGroup(child.pid, 'SIGKILL');
         }, timeoutMs);
         // Prefer the reconstructed assistant text (so parseAuditSummary finds the
         // fenced block); fall back to raw stdout when no stream-json was parsed.