## Summary
Wave 18 continues the package code-organization program after wave 17
domain folders (U4 Slice A from
`docs/plans/2026-07-14-001-refactor-package-code-organization-plan.md`).
### What changed
Peel **pure, behavior-preserving** helpers out of
`packages/engine/src/executor.ts` into domain modules under
`packages/engine/src/executor/`, with **stable re-exports** from
`executor.ts` so deep imports and `vi.mock("../executor.js")` keep
working.
| New module | Symbols |
|------------|---------|
| `executor/task-done-refusal.ts` | `evaluateTaskDoneRefusal`,
`determineRevisionResetStart`, skip-bypass refusal helper |
| `executor/workflow-feedback-paths.ts` |
`extractReferencedPathsFromWorkflowFeedback`,
`isAlwaysAllowedScopeLeakPath`, `workflowPathMatchesDeclaredScope` |
| `executor/workflow-step-verdict.ts` |
`FUSION_WORKFLOW_STEP_CONVENTIONS_PREAMBLE`, `parseWorkflowStepVerdict`
/ `parseWorkflowStepOutput`, step outcome types |
| `executor/await-input-parse.ts` | `parseAwaitInputSentinel`,
`parseAwaitInputQuestionToolCall` |
| `executor/no-commit-eligibility.ts` | `getNoCommitEligibilityReason`
(+ prompt heuristics) |
`executor.ts` live LOC ~**22817 → ~22427** (first pure-peel batch; more
peels needed to approach the 2k cap).
### Shims
- `old path` `executor.ts` public exports → `new path` `executor/*.ts` →
delete-when consumer deep-imports are re-pointed (not this PR)
### Test plan
- [x] `@fusion/engine` typecheck
- [x] Oracle: task-done refusal, skip-bypass, workflow malformed
verdict, scope-leak allowlist, executor-step-session, executor-prompt
- [x] `vitest --project=engine-core` (merge-gate curated suite)
- [ ] CI merge gate
**Stack:** wave17 (merged) → **this PR**
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Improved recognition of workflow outcomes from structured and
conversational responses.
* Added support for extracting questions from await-input responses and
tool calls.
* Improved workflow feedback handling for referenced files and declared
scope patterns.
* Added clearer guidance for task execution, approvals, verification,
and available tools.
* **Bug Fixes**
* Prevented completion when required review approvals are missing or
revisions remain pending.
* Improved handling of workflows that legitimately require no code
changes.
* Added clearer refusal messages and more reliable revision restarts.
* Sanitized repository paths in Git remediation instructions.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
113 lines
4.6 KiB
TypeScript
113 lines
4.6 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-10:35:
|
|
* resumeOrphaned peeled from TaskExecutor (U4).
|
|
* Startup recovery for orphaned WIP tasks after crash/restart.
|
|
*
|
|
* FNXC:WorkflowResolvedColumns 2026-07-30-21:40 (a MISSED PAIR, the class #2879 ratcheted):
|
|
* `listWipLaneTasks()` already resolves the wip lane by role. This filter must not re-assert
|
|
* the literal `in-progress` on the rows that read returned, or on a renamed board the read
|
|
* finds orphans and the filter drops every one — recovery silently does nothing after restart.
|
|
*/
|
|
import type { Task, TaskStore } from "@fusion/core";
|
|
import { resolveProjectColumnsForRoles } from "@fusion/core";
|
|
import { setImmediate as setImmediateCb } from "node:timers";
|
|
import { executorLog } from "../logger.js";
|
|
import { getResumeOrphanDelayMs } from "./resume-orphan-delay.js";
|
|
import { isNoProgressNoTaskDoneFailure, isTaskWorkComplete } from "./task-predicates.js";
|
|
|
|
const yieldEventLoop = (): Promise<void> => new Promise((resolve) => setImmediateCb(resolve));
|
|
|
|
export type ResumeOrphanedDeps = {
|
|
store: TaskStore;
|
|
executing: Set<string>;
|
|
recoveringCompleted: Set<string>;
|
|
processWideGraphRouting: Set<string>;
|
|
listWipLaneTasks: () => Promise<Task[]>;
|
|
clearResumeFailureState: (task: Task) => Promise<void>;
|
|
recoverApprovedStepsOnResume: (taskId: string) => Promise<void>;
|
|
recoverCompletedTask: (task: Task) => Promise<boolean>;
|
|
execute: (task: Task) => Promise<void>;
|
|
};
|
|
|
|
export async function resumeOrphaned(deps: ResumeOrphanedDeps): Promise<void> {
|
|
const settings = await deps.store.getSettings();
|
|
if (settings.globalPause || settings.enginePaused) {
|
|
executorLog.log(
|
|
`resumeOrphaned skipped — ${
|
|
settings.globalPause ? "global pause" : "engine pause"
|
|
} is active`,
|
|
);
|
|
return;
|
|
}
|
|
|
|
const wipColumns = await resolveProjectColumnsForRoles(deps.store, ["countsTowardWip"]);
|
|
const tasks = await deps.listWipLaneTasks();
|
|
const inProgress = tasks.filter(
|
|
(t) => wipColumns.has(t.column) && !t.deletedAt && !deps.executing.has(t.id) && !t.paused,
|
|
);
|
|
|
|
if (inProgress.length === 0) return;
|
|
|
|
executorLog.log(`Found ${inProgress.length} orphaned in-progress task(s)`);
|
|
const resumeDelayMs = getResumeOrphanDelayMs();
|
|
if (resumeDelayMs > 0) {
|
|
executorLog.log(
|
|
`Deferring orphan task resumption for ${resumeDelayMs}ms to keep dashboard responsive during cold start`,
|
|
);
|
|
}
|
|
// When the delay is zero (default in tests and when explicitly disabled),
|
|
// skip the setTimeout indirection so the spawn happens on the current
|
|
// microtask — matching the legacy behavior callers may rely on.
|
|
const scheduleResume = resumeDelayMs > 0
|
|
? (fn: () => void) => { setTimeout(fn, resumeDelayMs); }
|
|
: (fn: () => void) => { fn(); };
|
|
let yieldNext = false;
|
|
for (const task of inProgress) {
|
|
if (yieldNext) await yieldEventLoop();
|
|
yieldNext = true;
|
|
// Fast-path: if the task already completed its work (all steps done),
|
|
// move it directly to in-review instead of re-executing from scratch.
|
|
if (isTaskWorkComplete(task) && !task.mergeDetails) {
|
|
if (deps.recoveringCompleted.has(task.id)) {
|
|
executorLog.debug(`${task.id} completed-task recovery already running - skipping duplicate startup recovery`);
|
|
continue;
|
|
}
|
|
if (deps.processWideGraphRouting.has(task.id)) {
|
|
executorLog.debug(`${task.id} owned by the workflow graph interpreter — skipping completed-task fast-path`);
|
|
continue;
|
|
}
|
|
executorLog.log(`${task.id} is already complete — fast-pathing to in-review`);
|
|
deps.recoveringCompleted.add(task.id);
|
|
scheduleResume(() => {
|
|
void deps.recoverCompletedTask(task)
|
|
.catch((err) =>
|
|
executorLog.error(`Failed to recover completed orphan ${task.id}:`, err),
|
|
)
|
|
.finally(() => {
|
|
deps.recoveringCompleted.delete(task.id);
|
|
});
|
|
});
|
|
continue;
|
|
}
|
|
|
|
if (isNoProgressNoTaskDoneFailure(task)) {
|
|
executorLog.log(`${task.id} failed without fn_task_done and has no step progress — leaving for self-healing requeue`);
|
|
continue;
|
|
}
|
|
|
|
executorLog.log(`Resuming ${task.id}: ${task.title || task.description.slice(0, 60)}`);
|
|
try {
|
|
await deps.clearResumeFailureState(task);
|
|
await deps.store.logEntry(task.id, "Resumed after engine restart");
|
|
await deps.recoverApprovedStepsOnResume(task.id);
|
|
} catch (err) {
|
|
executorLog.error(`Failed to write resume log for ${task.id}:`, err);
|
|
}
|
|
scheduleResume(() => {
|
|
deps.execute(task).catch((err) =>
|
|
executorLog.error(`Failed to resume ${task.id}:`, err),
|
|
);
|
|
});
|
|
}
|
|
}
|