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 -->
83 lines
2.7 KiB
TypeScript
83 lines
2.7 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-11:55:
|
|
* runProjectedGraphTaskStep peeled from TaskExecutor (U4).
|
|
*
|
|
* Project a graph-owned step only after it has a real worktree. A fresh task has no
|
|
* worktree until the authoritative implementation pass acquires one. Projecting before
|
|
* that pass produces a false "step started" event and captures the baseline from the
|
|
* project root. In that fresh path, let the implementation pass own the first projection
|
|
* and reuse the base SHA it captures during worktree acquisition. Resumed and
|
|
* isolated-step runs already have a worktree, so they keep the normal per-step
|
|
* projection and pre-work baseline behavior.
|
|
*
|
|
* FNXC:BaselineCwdGating 2026-07-21-19:21:
|
|
* FN-8464 requires graph step projection to defer until the candidate is a real directory.
|
|
* A stale/non-directory path must follow fresh-worktree ordering so runTaskStep never spawns
|
|
* baseline git with an unusable cwd.
|
|
*/
|
|
import type { Task, TaskDetail, TaskStore, ThinkingLevel } from "@fusion/core";
|
|
import type { ImplementationExit } from "./implementation-exit.js";
|
|
import { runTaskStep, isUsableWorktreeDirectory, type RunTaskStepResult } from "../execution/step-runner.js";
|
|
|
|
export type ForeachActiveContextLite = {
|
|
instanceId?: string;
|
|
worktreePath?: string | null;
|
|
deferDoneToReview?: boolean;
|
|
};
|
|
|
|
export type RunProjectedGraphTaskStepDeps = {
|
|
store: TaskStore;
|
|
runGraphTaskStep: (
|
|
task: Task,
|
|
stepIndex: number,
|
|
instanceId?: string,
|
|
governingNodeId?: string,
|
|
thinkingLevel?: ThinkingLevel,
|
|
skillName?: string,
|
|
) => Promise<{ success: boolean; error?: string; exit?: ImplementationExit }>;
|
|
};
|
|
|
|
export async function runProjectedGraphTaskStep(
|
|
deps: RunProjectedGraphTaskStepDeps,
|
|
task: Task,
|
|
live: TaskDetail,
|
|
stepIndex: number,
|
|
active: ForeachActiveContextLite,
|
|
governingNodeId?: string,
|
|
thinkingLevel?: ThinkingLevel,
|
|
skillName?: string,
|
|
): Promise<RunTaskStepResult> {
|
|
const worktreePath = active.worktreePath || live.worktree;
|
|
const runStep = (idx: number) =>
|
|
deps.runGraphTaskStep(
|
|
task,
|
|
idx,
|
|
active.instanceId,
|
|
governingNodeId,
|
|
thinkingLevel,
|
|
skillName,
|
|
);
|
|
|
|
if (!worktreePath || !isUsableWorktreeDirectory(worktreePath)) {
|
|
const result = await runStep(stepIndex);
|
|
const refreshed = await deps.store.getTask(task.id).catch(() => live);
|
|
return {
|
|
outcome: result.success ? "success" : "failure",
|
|
baselineSha: refreshed.baseCommitSha,
|
|
checkpointId: undefined,
|
|
exit: result.exit,
|
|
};
|
|
}
|
|
|
|
return runTaskStep(
|
|
{
|
|
store: deps.store,
|
|
worktreePath,
|
|
runStep,
|
|
},
|
|
{ id: task.id, steps: live.steps },
|
|
stepIndex,
|
|
{ markDoneOnSuccess: active.deferDoneToReview !== true, projectionSource: "graph" },
|
|
);
|
|
}
|