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 -->
39 lines
1.5 KiB
TypeScript
39 lines
1.5 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-13:35:
|
|
* Pure branch-conflict log formatters peeled from TaskExecutor (U4).
|
|
*/
|
|
import type { BranchConflictError } from "../execution/branch-conflicts.js";
|
|
|
|
export function formatBranchConflictLifecycleLog(_taskId: string, error: BranchConflictError): string {
|
|
const strandedSummary = error.strandedCommits.length > 0
|
|
? error.strandedCommits.map((commit) => `${commit.sha.slice(0, 12)} ${commit.subject}`).join("; ")
|
|
: "none";
|
|
const recommendation = "Resolve the local branch/worktree conflict with git tooling (inspect/reclaim or discard) before retrying.";
|
|
return [
|
|
`Branch conflict: ${error.branchName} is already checked out at ${error.conflictingWorktreePath}`,
|
|
`Existing tip: ${error.existingTipSha}`,
|
|
`Stranded commits since ${error.startPoint}: ${strandedSummary}`,
|
|
recommendation,
|
|
].join("\n");
|
|
}
|
|
|
|
export function formatBranchConflictAgentLog(_taskId: string, error: BranchConflictError): string {
|
|
const lines = [
|
|
`branch=${error.branchName}`,
|
|
`worktree=${error.conflictingWorktreePath}`,
|
|
`existingTipSha=${error.existingTipSha}`,
|
|
`startPoint=${error.startPoint}`,
|
|
];
|
|
if (error.strandedCommits.length > 0) {
|
|
lines.push(
|
|
...error.strandedCommits.map((commit) => `stranded=${commit.sha.slice(0, 12)} ${commit.subject}`),
|
|
);
|
|
} else {
|
|
lines.push("stranded=none");
|
|
}
|
|
lines.push(
|
|
`recommendation=Resolve the local branch/worktree conflict with git tooling (inspect/reclaim or discard) before retrying.`,
|
|
);
|
|
return lines.join("\n");
|
|
}
|