1cf86baa1c
## 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 -->
55 lines
2.1 KiB
TypeScript
55 lines
2.1 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-11:45:
|
|
* prepareGraphNodeExecution peeled from TaskExecutor (U4).
|
|
*
|
|
* FNXC:WorktreeBaseRefresh 2026-08-01-16:32:
|
|
* An existing code-node checkout must remain attached so it takes the guarded reuse/refresh path.
|
|
* Only a missing recorded path is cleared to permit fresh creation.
|
|
*
|
|
* FNXC:WorkflowExecution 2026-06-29-15:28 / 09:50:
|
|
* Graph declares worktree requirement; this adapter fulfills it. Stale paths are reacquired before write-capable nodes.
|
|
*
|
|
* FNXC:WorktreeBaseRefresh 2026-08-01-16:04:
|
|
* Code nodes reacquire with refresh enabled; planning/review keep C0 checkout.
|
|
*/
|
|
import { existsSync } from "node:fs";
|
|
import type { Settings, TaskDetail, TaskStore, WorkflowIrNode } from "@fusion/core";
|
|
import type { WorkflowNodePreparationRequirement } from "../workflows/workflow-graph-executor.js";
|
|
import type { EngineRunContext } from "../util/run-audit.js";
|
|
|
|
export type PrepareGraphNodeExecutionDeps = {
|
|
store: TaskStore;
|
|
getRunContextFor: (taskId: string) => EngineRunContext | undefined;
|
|
ensureGraphCustomNodeWorktree: (
|
|
task: TaskDetail,
|
|
settings: Settings,
|
|
nodeId: string,
|
|
refreshStaleBase?: boolean,
|
|
) => Promise<TaskDetail>;
|
|
};
|
|
|
|
export async function prepareGraphNodeExecution(
|
|
deps: PrepareGraphNodeExecutionDeps,
|
|
node: WorkflowIrNode,
|
|
nodeTask: TaskDetail,
|
|
settings: Settings,
|
|
requirement: WorkflowNodePreparationRequirement,
|
|
): Promise<void> {
|
|
if (!requirement.requiresWorktree) return;
|
|
const live = await deps.store.getTask(nodeTask.id);
|
|
const executionCodeNode = node.kind === "code";
|
|
if (live.worktree && existsSync(live.worktree) && !executionCodeNode) return;
|
|
const taskForAcquisition = live.worktree && !existsSync(live.worktree)
|
|
? ({ ...live, worktree: undefined, sessionFile: undefined } as TaskDetail)
|
|
: live;
|
|
if (live.worktree) {
|
|
await deps.store.logEntry(
|
|
live.id,
|
|
`Workflow node '${node.id}' assigned worktree is missing — reacquiring before node execution`,
|
|
live.worktree,
|
|
deps.getRunContextFor(live.id),
|
|
);
|
|
}
|
|
await deps.ensureGraphCustomNodeWorktree(taskForAcquisition, settings, node.id, executionCodeNode);
|
|
}
|