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 -->
65 lines
2.1 KiB
TypeScript
65 lines
2.1 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-14:50:
|
|
* normalizeReclaimableWorktreePath peeled from TaskExecutor (U4 Slice B).
|
|
*/
|
|
import type { Settings } from "@fusion/core";
|
|
import { relocateReclaimableWorktreeIntoRoot } from "../worktree/worktree-pool.js";
|
|
import { NonRetryableWorktreeError } from "./worktree-registry-helpers.js";
|
|
|
|
export type ReclaimPathDeps = {
|
|
rootDir: string;
|
|
store: {
|
|
logEntry: (taskId: string, action: string, outcome?: string) => Promise<unknown>;
|
|
};
|
|
hasActiveWorktreeBinding: (taskId: string, path: string) => boolean;
|
|
isLiveCleanupRefusal: (worktreePath: string, taskId: string) => Promise<boolean>;
|
|
};
|
|
|
|
export async function normalizeReclaimableWorktreePath(
|
|
deps: ReclaimPathDeps,
|
|
sourcePath: string,
|
|
targetPath: string,
|
|
taskId: string,
|
|
settings: Partial<Settings>,
|
|
): Promise<string> {
|
|
const isRelocationActive = async (path: string) =>
|
|
deps.hasActiveWorktreeBinding(taskId, path)
|
|
|| await deps.isLiveCleanupRefusal(path, taskId);
|
|
try {
|
|
const placement = await relocateReclaimableWorktreeIntoRoot({
|
|
rootDir: deps.rootDir,
|
|
sourcePath,
|
|
targetPath,
|
|
taskId,
|
|
settings,
|
|
isPathActive: isRelocationActive,
|
|
});
|
|
if (placement.kind === "deferred-live") {
|
|
await deps.store.logEntry(
|
|
taskId,
|
|
`[recovery] deferred relocation of active preserved worktree ${sourcePath}`,
|
|
sourcePath,
|
|
);
|
|
return placement.path;
|
|
}
|
|
if (placement.relocated) {
|
|
await deps.store.logEntry(
|
|
taskId,
|
|
`[recovery] relocated preserved worktree from ${sourcePath} to ${placement.path}`,
|
|
placement.path,
|
|
);
|
|
}
|
|
return placement.path;
|
|
} catch (error) {
|
|
const detail = error instanceof Error ? error.message : String(error);
|
|
await deps.store.logEntry(
|
|
taskId,
|
|
`[recovery] failed to relocate preserved worktree from ${sourcePath} to ${targetPath}: ${detail}`,
|
|
sourcePath,
|
|
);
|
|
throw new NonRetryableWorktreeError(
|
|
`Could not relocate preserved ${taskId} worktree into the configured worktrees directory: ${detail}`,
|
|
);
|
|
}
|
|
}
|