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 -->
57 lines
2.0 KiB
TypeScript
57 lines
2.0 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-13:55:
|
|
* isRemediationGraphNode / isPreMergeRemediationGraphNode peeled from TaskExecutor (U4).
|
|
*
|
|
* FNXC:WorkflowRemediation 2026-07-01-23:40:
|
|
* Remediation nodes are fire-and-forget schedulers; terminal failure must not stamp failed while a fix session lives.
|
|
*
|
|
* FNXC:WorkflowRemediation 2026-07-03-23:10:
|
|
* Pre-merge remediation only for optional-step recovery; plan-replan stays on replan/triage.
|
|
*/
|
|
import type { TaskStore } from "@fusion/core";
|
|
import { resolveWorkflowIrForTask } from "@fusion/core";
|
|
|
|
export type RemediationGraphNodeDeps = {
|
|
store: TaskStore;
|
|
};
|
|
|
|
export async function isRemediationGraphNode(
|
|
deps: RemediationGraphNodeDeps,
|
|
taskId: string,
|
|
failedNode: string | undefined,
|
|
): Promise<boolean> {
|
|
if (!failedNode) return false;
|
|
try {
|
|
const ir = await resolveWorkflowIrForTask(deps.store, taskId);
|
|
const node = ir?.nodes?.find((n) => n.id === failedNode);
|
|
const action = node?.config?.workflowAction;
|
|
if (action === "pre-merge-remediation" || action === "plan-replan") return true;
|
|
if (node) return false;
|
|
} catch {
|
|
// Best-effort IR resolution; fall through to the built-in id fallback.
|
|
}
|
|
return (
|
|
failedNode === "code-review-remediation"
|
|
|| failedNode === "browser-verification-remediation"
|
|
|| failedNode === "plan-replan"
|
|
);
|
|
}
|
|
|
|
export async function isPreMergeRemediationGraphNode(
|
|
deps: RemediationGraphNodeDeps,
|
|
taskId: string,
|
|
failedNode: string | undefined,
|
|
): Promise<boolean> {
|
|
if (!failedNode) return false;
|
|
try {
|
|
const ir = await resolveWorkflowIrForTask(deps.store, taskId);
|
|
const node = ir?.nodes?.find((n) => n.id === failedNode);
|
|
const action = node?.config?.workflowAction;
|
|
if (action === "pre-merge-remediation") return true;
|
|
if (node) return false;
|
|
} catch {
|
|
// Best-effort IR resolution; fall through to the built-in id fallback.
|
|
}
|
|
return failedNode === "code-review-remediation" || failedNode === "browser-verification-remediation";
|
|
}
|