@cat-factory/orchestration 0.129.7 → 0.129.8

package/dist/modules/execution/RunDispatcher.d.ts

@@ -265,6 +265,25 @@ export declare class RunDispatcher {
      */
     pollAgentJob(workspaceId: string, executionId: string): Promise<AdvanceResult>;
     private pollAgentJobInner;
+    /**
+     * Handle a `running` poll: a successful poll proves the container is up, so surface live subtask
+     * progress (e.g. 3/8 todos) without advancing the step. Only persist + emit when something
+     * actually changed so an idle poll doesn't churn storage or the event stream. Folds the poll's
+     * delta via {@link applyRunningFold} — a cheap pre-check against the loaded snapshot, then the
+     * authoritative re-apply on fresh state under CAS (idempotent for the set-to-latest folds and
+     * correct for the drain-on-read follow-up append). Split from {@link pollAgentJobInner} to stay
+     * under the statement ceiling.
+     */
+    private handleRunningPoll;
+    /**
+     * A gate whose helper INVESTIGATES instead of fixing (post-release-health → on-call) declares a
+     * `resolveHelperCompletion` hook. When such a helper's job settles — done OR failed — call the
+     * hook INSTEAD of re-probing the precheck (re-probing an investigate-don't-fix helper would just
+     * regress again and burn the budget) and finish the gate step with the output it returns. Returns
+     * the resulting {@link AdvanceResult}, or `null` when this branch doesn't apply (the caller falls
+     * through to the re-probe / other completion paths).
+     */
+    private resolveInvestigateHelperCompletion;
     /**
      * Fold a running poll's container signals into `step.container`: a successful poll
      * proves the container is `up`, and the harness's live phase (clone / agent / push)
@@ -357,6 +376,34 @@ export declare class RunDispatcher {
      * Shared by the inline path and the async-job poll path.
      */
     private recordStepResult;
+    /**
+     * Park a step on the durable decision-wait: pause it for input, flip the run + block to
+     * `blocked`, persist under CAS, emit, and report `awaiting_decision` keyed by `decisionId`.
+     * Shared by the raised-decision and human-approval branches of {@link recordStepResult}.
+     */
+    private parkStepAwaitingInput;
+    /**
+     * Record any PR(s) the step opened onto the block (its own-service PR + any peer-service PRs),
+     * and best-effort write back to the task's linked tracker issue(s) when the own-service PR is
+     * NEWLY opened (a retry that re-reports the same PR must not re-comment). Split from
+     * {@link recordStepResult} to keep it under the statement ceiling; a no-op when no PR was opened.
+     */
+    private recordOpenedPullRequests;
+    /**
+     * Run any POST-COMPLETION resolver registered for this step kind (blueprint/spec ingestion,
+     * task-estimate persistence). It reshapes the agent's structured result into domain state and may
+     * replace `step.output`. A no-op when no post-completion resolver applies. See
+     * {@link buildStepResolverRegistry} and {@link StepCompletionResolver.phase}.
+     */
+    private applyPostCompletionResolver;
+    /**
+     * Run any DETERMINISTIC terminal-phase resolver for this step kind (e.g. the merger performs the
+     * real GitHub merge with backend-held credentials), mutating `step.output` when it reshapes it.
+     * Position-independent: it fires whenever the step finishes, not only when it's last. Returns
+     * whether the resolver OWNS the block's terminal status (the merger sets `done`/`pr_ready`), so
+     * the advance/finalize path leaves that status alone rather than clobbering it to `in_progress`.
+     */
+    private applyTerminalStepResolver;
     /**
      * File a tracking issue/ticket for a `tracker` step from the preceding `analysis`
      * output. Non-LLM and best-effort: when no provider is wired or none is configured

package/dist/modules/execution/RunDispatcher.d.ts.map

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

package/dist/modules/execution/RunDispatcher.js

@@ -527,42 +527,7 @@ export class RunDispatcher {
             agentKind: step.agentKind,
         });
         if (update.state === 'running') {
-            // A successful poll proves the container is up, so the cold-boot phase is over
-            // (defensive: a replay may have left the flag set). Surface live subtask progress
-            // (e.g. 3/8 todos done) without advancing the step. Only persist + emit when something
-            // actually changed so an idle poll doesn't churn storage or the event stream.
-            //
-            // Fold the poll's delta onto a target instance via {@link applyRunningFold}. The captured
-            // `update` is the source, so re-applying on a freshly-reloaded instance is idempotent for
-            // the set-to-latest folds AND correct for the APPEND fold: the harness follow-up buffer is
-            // drain-on-read (`runner.ts`), so those streamed items exist ONLY on this `update` — abort-
-            // and-redrive would lose them, whereas re-applying under `mutateInstance` (which reloads a
-            // clean base each attempt) preserves them.
-            const foldCtx = { jobId: step.jobId, update, workspaceId };
-            // Cheap pre-check against the loaded snapshot: skip the write entirely on an idle poll
-            // (the common case). The mutation is discarded — the authoritative write re-applies the
-            // same fold on fresh state under CAS below.
-            if (await this.applyRunningFold(instance, foldCtx)) {
-                try {
-                    const persisted = await this.runStateMachine.mutateInstance(workspaceId, executionId, async (fresh) => {
-                        await this.applyRunningFold(fresh, foldCtx);
-                    });
-                    // Progress-only fold (subtask ticks / streamed follow-ups): skip the per-run
-                    // LLM-metrics GROUP BY so a live container's poll cadence doesn't re-aggregate
-                    // the run on every tick. The rollup refreshes on the step-boundary/terminal emit.
-                    await this.runStateMachine.emitInstance(workspaceId, persisted, { rollUpMetrics: false });
-                }
-                catch (error) {
-                    // The run was cancelled/removed mid-poll (`NotFoundError`) or stayed hot-contended
-                    // past the retry budget (`ConflictError`) — re-drive on fresh state rather than
-                    // failing the run; the next entry no-ops on a gone/terminal run.
-                    if (error instanceof NotFoundError || error instanceof ConflictError) {
-                        throw new RunContendedError(executionId);
-                    }
-                    throw error;
-                }
-            }
-            return { kind: 'awaiting_job', jobId: step.jobId, stepIndex: instance.currentStep };
+            return this.handleRunningPoll(workspaceId, executionId, instance, update, step.jobId);
         }
         // A gate whose helper INVESTIGATES instead of fixing (post-release-health → on-call)
         // declares a `resolveHelperCompletion` hook on its definition. When such a helper's job
@@ -571,34 +536,9 @@ export class RunDispatcher {
         // budget) and finish the gate step with the output it returns. The gate raises its own
         // `release_regression` notification + enriches any open incident inside the hook (from the
         // signals stashed at escalation); the run then completes for a human to act out-of-band.
-        const completionGate = this.gateFor(step.agentKind);
-        if (completionGate?.resolveHelperCompletion &&
-            step.gate?.phase === 'working' &&
-            (update.state === 'done' || update.state === 'failed')) {
-            const block = await this.blockRepository.get(workspaceId, instance.blockId);
-            step.jobId = undefined;
-            step.subtasks = undefined;
-            if (!block)
-                return { kind: 'noop' };
-            const isFinalStep = instance.currentStep === instance.steps.length - 1;
-            const jobResult = update.state === 'done'
-                ? { state: 'done', result: update.result }
-                : { state: 'failed', error: update.error ?? null };
-            const resolution = await completionGate.resolveHelperCompletion({
-                workspaceId,
-                instance,
-                block,
-                step,
-                result: jobResult,
-            });
-            // Preserve the done-result's fields (usage metering etc.) while recording the gate's
-            // resolved output; a failed investigation has no result to carry.
-            const base = update.state === 'done' ? update.result : { output: '' };
-            return this.recordStepResult(workspaceId, instance, step, isFinalStep, {
-                ...base,
-                output: resolution.output,
-            });
-        }
+        const investigated = await this.resolveInvestigateHelperCompletion(workspaceId, instance, step, update);
+        if (investigated)
+            return investigated;
         // A polling gate step's in-flight job is its helper agent (ci-fixer /
         // conflict-resolver), NOT the step's own work: when it finishes (or fails) we
         // don't record a result or advance — we drop the handle, return the gate to
@@ -702,6 +642,81 @@ export class RunDispatcher {
         step.jobId = undefined;
         return this.recordStepResult(workspaceId, instance, step, isFinalStep, update.result);
     }
+    /**
+     * Handle a `running` poll: a successful poll proves the container is up, so surface live subtask
+     * progress (e.g. 3/8 todos) without advancing the step. Only persist + emit when something
+     * actually changed so an idle poll doesn't churn storage or the event stream. Folds the poll's
+     * delta via {@link applyRunningFold} — a cheap pre-check against the loaded snapshot, then the
+     * authoritative re-apply on fresh state under CAS (idempotent for the set-to-latest folds and
+     * correct for the drain-on-read follow-up append). Split from {@link pollAgentJobInner} to stay
+     * under the statement ceiling.
+     */
+    async handleRunningPoll(workspaceId, executionId, instance, update, jobId) {
+        const foldCtx = { jobId, update, workspaceId };
+        // Cheap pre-check against the loaded snapshot: skip the write entirely on an idle poll
+        // (the common case). The mutation is discarded — the authoritative write re-applies the
+        // same fold on fresh state under CAS below.
+        if (await this.applyRunningFold(instance, foldCtx)) {
+            try {
+                const persisted = await this.runStateMachine.mutateInstance(workspaceId, executionId, async (fresh) => {
+                    await this.applyRunningFold(fresh, foldCtx);
+                });
+                // Progress-only fold (subtask ticks / streamed follow-ups): skip the per-run
+                // LLM-metrics GROUP BY so a live container's poll cadence doesn't re-aggregate
+                // the run on every tick. The rollup refreshes on the step-boundary/terminal emit.
+                await this.runStateMachine.emitInstance(workspaceId, persisted, { rollUpMetrics: false });
+            }
+            catch (error) {
+                // The run was cancelled/removed mid-poll (`NotFoundError`) or stayed hot-contended
+                // past the retry budget (`ConflictError`) — re-drive on fresh state rather than
+                // failing the run; the next entry no-ops on a gone/terminal run.
+                if (error instanceof NotFoundError || error instanceof ConflictError) {
+                    throw new RunContendedError(executionId);
+                }
+                throw error;
+            }
+        }
+        return { kind: 'awaiting_job', jobId, stepIndex: instance.currentStep };
+    }
+    /**
+     * A gate whose helper INVESTIGATES instead of fixing (post-release-health → on-call) declares a
+     * `resolveHelperCompletion` hook. When such a helper's job settles — done OR failed — call the
+     * hook INSTEAD of re-probing the precheck (re-probing an investigate-don't-fix helper would just
+     * regress again and burn the budget) and finish the gate step with the output it returns. Returns
+     * the resulting {@link AdvanceResult}, or `null` when this branch doesn't apply (the caller falls
+     * through to the re-probe / other completion paths).
+     */
+    async resolveInvestigateHelperCompletion(workspaceId, instance, step, update) {
+        const completionGate = this.gateFor(step.agentKind);
+        if (completionGate?.resolveHelperCompletion &&
+            step.gate?.phase === 'working' &&
+            (update.state === 'done' || update.state === 'failed')) {
+            const block = await this.blockRepository.get(workspaceId, instance.blockId);
+            step.jobId = undefined;
+            step.subtasks = undefined;
+            if (!block)
+                return { kind: 'noop' };
+            const isFinalStep = instance.currentStep === instance.steps.length - 1;
+            const jobResult = update.state === 'done'
+                ? { state: 'done', result: update.result }
+                : { state: 'failed', error: update.error ?? null };
+            const resolution = await completionGate.resolveHelperCompletion({
+                workspaceId,
+                instance,
+                block,
+                step,
+                result: jobResult,
+            });
+            // Preserve the done-result's fields (usage metering etc.) while recording the gate's
+            // resolved output; a failed investigation has no result to carry.
+            const base = update.state === 'done' ? update.result : { output: '' };
+            return this.recordStepResult(workspaceId, instance, step, isFinalStep, {
+                ...base,
+                output: resolution.output,
+            });
+        }
+        return null;
+    }
     /**
      * Fold a running poll's container signals into `step.container`: a successful poll
      * proves the container is `up`, and the harness's live phase (clone / agent / push)
@@ -1049,12 +1064,7 @@ export class RunDispatcher {
                 options: [...result.decision.options],
                 chosen: null,
             };
-            this.stepGraph.pauseStepForInput(step);
-            instance.status = 'blocked';
-            await this.runStateMachine.updateBlockProgress(workspaceId, instance, 'blocked');
-            await this.runStateMachine.casPersist(workspaceId, instance);
-            await this.runStateMachine.emitInstance(workspaceId, instance);
-            return { kind: 'awaiting_decision', decisionId: step.decision.id };
+            return this.parkStepAwaitingInput(workspaceId, instance, step, step.decision.id);
         }
         // Completion-path interceptors short-circuit before the normal finish/advance for the
         // few kinds whose verdict drives run flow: a container-backed companion applies its
@@ -1095,30 +1105,7 @@ export class RunDispatcher {
         // (service-connections phase 3) additionally reports the PRs it opened in the
         // connected involved-service repos; record them beside the own-service PR (they may
         // even arrive when the own service was a no-op and only a peer changed).
-        if (result.pullRequest || result.peerPullRequests?.length) {
-            // Read the block before the update so we can tell whether this PR is newly
-            // opened (vs. the same PR re-reported by a re-run/retry of the coder step).
-            const priorBlock = this.issueWriteback
-                ? await this.blockRepository.get(workspaceId, instance.blockId)
-                : null;
-            await this.blockRepository.update(workspaceId, instance.blockId, {
-                ...(result.pullRequest ? { pullRequest: result.pullRequest } : {}),
-                ...(result.peerPullRequests?.length ? { peerPullRequests: result.peerPullRequests } : {}),
-            });
-            // Best-effort writeback: comment on the task's linked tracker issue(s) that a
-            // PR opened. Only for the OWN-service PR, and only when it is newly recorded — a
-            // retry that re-reports the same PR must not re-comment (the tracker comment is not
-            // idempotent). Gated inside the provider by the workspace setting + per-task
-            // override; fire-and-forget so a tracker outage never fails the run.
-            if (this.issueWriteback &&
-                priorBlock &&
-                result.pullRequest &&
-                priorBlock.pullRequest?.url !== result.pullRequest.url) {
-                await this.issueWriteback
-                    .onPullRequestOpened(workspaceId, priorBlock, result.pullRequest)
-                    .catch(() => { });
-            }
-        }
+        await this.recordOpenedPullRequests(workspaceId, instance, result);
         // Run any POST-COMPLETION resolver registered for this step kind (blueprint/spec
         // ingestion, task-estimate persistence). It reshapes the agent's structured result into
         // domain state and may replace `step.output` (the estimator's readable summary). Its
@@ -1126,19 +1113,7 @@ export class RunDispatcher {
         // reviewable-output rendering and the follow-up/approval gates read `step.output`, so it
         // sits exactly where the old inline ingestion branches did. See
         // {@link buildStepResolverRegistry} and {@link StepCompletionResolver.phase}.
-        const postCompletionResolver = this.stepResolverFor(step.agentKind);
-        if (postCompletionResolver?.phase === 'post-completion' &&
-            (postCompletionResolver.applies?.(result) ?? true)) {
-            const resolution = await postCompletionResolver.resolve({
-                workspaceId,
-                instance,
-                step,
-                result,
-                isFinalStep,
-            });
-            if (resolution?.output !== undefined)
-                step.output = resolution.output;
-        }
+        await this.applyPostCompletionResolver(workspaceId, instance, step, result, isFinalStep);
         // A producer that emits a STRUCTURED ARTIFACT (the spec doc, the blueprint tree, …)
         // returns its raw Pi transcript summary as `result.output` — useless for review.
         // Replace the step's reviewable output with a rendering of the artifact ITSELF, so
@@ -1173,12 +1148,7 @@ export class RunDispatcher {
                 status: 'pending',
                 proposal: step.output,
             };
-            this.stepGraph.pauseStepForInput(step);
-            instance.status = 'blocked';
-            await this.runStateMachine.updateBlockProgress(workspaceId, instance, 'blocked');
-            await this.runStateMachine.casPersist(workspaceId, instance);
-            await this.runStateMachine.emitInstance(workspaceId, instance);
-            return { kind: 'awaiting_decision', decisionId: step.approval.id };
+            return this.parkStepAwaitingInput(workspaceId, instance, step, step.approval.id);
         }
         // Persist the agent's reported confidence whenever a step reports it, for board
         // transparency. Position-independent: it must NOT be tied to the final step, since a
@@ -1194,23 +1164,7 @@ export class RunDispatcher {
         // — so inserting a later step (post-release-health) can't silently disable it. A
         // resolver that owns the block's terminal status (the merger sets `done`/`pr_ready`)
         // tells `finalizeBlock` to leave it alone.
-        const resolver = this.stepResolverFor(step.agentKind);
-        let resolverOwnsTerminalStatus = false;
-        if (resolver &&
-            (resolver.phase ?? 'terminal') === 'terminal' &&
-            (resolver.applies?.(result) ?? true)) {
-            const resolution = await resolver.resolve({
-                workspaceId,
-                instance,
-                step,
-                result,
-                isFinalStep,
-            });
-            if (resolution?.output !== undefined)
-                step.output = resolution.output;
-            if (resolution?.ownsTerminalStatus)
-                resolverOwnsTerminalStatus = true;
-        }
+        const resolverOwnsTerminalStatus = await this.applyTerminalStepResolver(workspaceId, instance, step, result, isFinalStep);
         // A registered custom kind's POST-ops run deterministic backend repo work from the
         // agent's structured result (coerce its JSON, render artifact files, commit them via
         // the checkout-free RepoFiles port — the blueprint/spec rendering that used to live in
@@ -1251,6 +1205,92 @@ export class RunDispatcher {
         await this.runStateMachine.emitInstance(workspaceId, instance);
         return { kind: 'continue' };
     }
+    /**
+     * Park a step on the durable decision-wait: pause it for input, flip the run + block to
+     * `blocked`, persist under CAS, emit, and report `awaiting_decision` keyed by `decisionId`.
+     * Shared by the raised-decision and human-approval branches of {@link recordStepResult}.
+     */
+    async parkStepAwaitingInput(workspaceId, instance, step, decisionId) {
+        this.stepGraph.pauseStepForInput(step);
+        instance.status = 'blocked';
+        await this.runStateMachine.updateBlockProgress(workspaceId, instance, 'blocked');
+        await this.runStateMachine.casPersist(workspaceId, instance);
+        await this.runStateMachine.emitInstance(workspaceId, instance);
+        return { kind: 'awaiting_decision', decisionId };
+    }
+    /**
+     * Record any PR(s) the step opened onto the block (its own-service PR + any peer-service PRs),
+     * and best-effort write back to the task's linked tracker issue(s) when the own-service PR is
+     * NEWLY opened (a retry that re-reports the same PR must not re-comment). Split from
+     * {@link recordStepResult} to keep it under the statement ceiling; a no-op when no PR was opened.
+     */
+    async recordOpenedPullRequests(workspaceId, instance, result) {
+        if (!(result.pullRequest || result.peerPullRequests?.length))
+            return;
+        // Read the block before the update so we can tell whether this PR is newly
+        // opened (vs. the same PR re-reported by a re-run/retry of the coder step).
+        const priorBlock = this.issueWriteback
+            ? await this.blockRepository.get(workspaceId, instance.blockId)
+            : null;
+        await this.blockRepository.update(workspaceId, instance.blockId, {
+            ...(result.pullRequest ? { pullRequest: result.pullRequest } : {}),
+            ...(result.peerPullRequests?.length ? { peerPullRequests: result.peerPullRequests } : {}),
+        });
+        // Best-effort writeback: comment on the task's linked tracker issue(s) that a
+        // PR opened. Only for the OWN-service PR, and only when it is newly recorded — a
+        // retry that re-reports the same PR must not re-comment (the tracker comment is not
+        // idempotent). Gated inside the provider by the workspace setting + per-task
+        // override; fire-and-forget so a tracker outage never fails the run.
+        if (this.issueWriteback &&
+            priorBlock &&
+            result.pullRequest &&
+            priorBlock.pullRequest?.url !== result.pullRequest.url) {
+            await this.issueWriteback
+                .onPullRequestOpened(workspaceId, priorBlock, result.pullRequest)
+                .catch(() => { });
+        }
+    }
+    /**
+     * Run any POST-COMPLETION resolver registered for this step kind (blueprint/spec ingestion,
+     * task-estimate persistence). It reshapes the agent's structured result into domain state and may
+     * replace `step.output`. A no-op when no post-completion resolver applies. See
+     * {@link buildStepResolverRegistry} and {@link StepCompletionResolver.phase}.
+     */
+    async applyPostCompletionResolver(workspaceId, instance, step, result, isFinalStep) {
+        const postCompletionResolver = this.stepResolverFor(step.agentKind);
+        if (postCompletionResolver?.phase !== 'post-completion' ||
+            !(postCompletionResolver.applies?.(result) ?? true)) {
+            return;
+        }
+        const resolution = await postCompletionResolver.resolve({
+            workspaceId,
+            instance,
+            step,
+            result,
+            isFinalStep,
+        });
+        if (resolution?.output !== undefined)
+            step.output = resolution.output;
+    }
+    /**
+     * Run any DETERMINISTIC terminal-phase resolver for this step kind (e.g. the merger performs the
+     * real GitHub merge with backend-held credentials), mutating `step.output` when it reshapes it.
+     * Position-independent: it fires whenever the step finishes, not only when it's last. Returns
+     * whether the resolver OWNS the block's terminal status (the merger sets `done`/`pr_ready`), so
+     * the advance/finalize path leaves that status alone rather than clobbering it to `in_progress`.
+     */
+    async applyTerminalStepResolver(workspaceId, instance, step, result, isFinalStep) {
+        const resolver = this.stepResolverFor(step.agentKind);
+        if (!resolver ||
+            (resolver.phase ?? 'terminal') !== 'terminal' ||
+            !(resolver.applies?.(result) ?? true)) {
+            return false;
+        }
+        const resolution = await resolver.resolve({ workspaceId, instance, step, result, isFinalStep });
+        if (resolution?.output !== undefined)
+            step.output = resolution.output;
+        return resolution?.ownsTerminalStatus ?? false;
+    }
     /**
      * File a tracking issue/ticket for a `tracker` step from the preceding `analysis`
      * output. Non-LLM and best-effort: when no provider is wired or none is configured