## 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 -->
74 lines
2.8 KiB
TypeScript
74 lines
2.8 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-18:15:
|
|
* handleImplicitTaskDoneRefusal peeled from TaskExecutor (U4).
|
|
* Requeues or fails after an implicit fn_task_done bulk-completion refusal.
|
|
*/
|
|
import type { Task, TaskStore } from "@fusion/core";
|
|
import { executorLog } from "../logger.js";
|
|
import type { EngineRunContext } from "../util/run-audit.js";
|
|
import { evaluateTaskDoneRefusal } from "./task-done-refusal.js";
|
|
import { skipBypassTaintUpdateForRefusal } from "./completion-predicates.js";
|
|
import { resolveReboundColumnFor } from "./lifecycle-columns.js";
|
|
|
|
/** Maximum todo requeues after exhausting in-session fn_task_done retries. */
|
|
export const MAX_TASK_DONE_REQUEUE_RETRIES = 3;
|
|
|
|
export type TaskDoneRefusalHandlerDeps = {
|
|
store: TaskStore;
|
|
getRunContextFor: (taskId: string) => EngineRunContext | undefined;
|
|
markGraphExecuteSelfRequeued: (taskId: string) => void;
|
|
persistTokenUsage: (taskId: string) => Promise<void>;
|
|
deleteActiveSession: (taskId: string) => void;
|
|
clearTokenUsageBaseline: (taskId: string) => void;
|
|
};
|
|
|
|
export async function handleImplicitTaskDoneRefusal(
|
|
deps: TaskDoneRefusalHandlerDeps,
|
|
task: Task,
|
|
refusal: Extract<ReturnType<typeof evaluateTaskDoneRefusal>, { ok: false }>,
|
|
): Promise<void> {
|
|
await deps.store.logEntry(task.id, refusal.message, undefined, deps.getRunContextFor(task.id));
|
|
executorLog.error(`${task.id}: fn_task_done refused (${refusal.refusalClass}) — ${refusal.reason} (implicit completion)`);
|
|
|
|
const taintUpdate = skipBypassTaintUpdateForRefusal(refusal);
|
|
const priorRequeues = task.taskDoneRetryCount ?? 0;
|
|
const nextRequeueCount = priorRequeues + 1;
|
|
if (priorRequeues < MAX_TASK_DONE_REQUEUE_RETRIES) {
|
|
await deps.store.updateTask(task.id, {
|
|
status: "queued",
|
|
error: null,
|
|
taskDoneRetryCount: nextRequeueCount,
|
|
...taintUpdate,
|
|
paused: false,
|
|
pausedByAgentId: null,
|
|
worktree: null,
|
|
branch: null,
|
|
sessionFile: null,
|
|
});
|
|
await deps.store.logEntry(
|
|
task.id,
|
|
`${refusal.message} — requeued to todo immediately (${nextRequeueCount}/${MAX_TASK_DONE_REQUEUE_RETRIES})`,
|
|
undefined,
|
|
deps.getRunContextFor(task.id),
|
|
);
|
|
deps.markGraphExecuteSelfRequeued(task.id);
|
|
await deps.store.moveTask(task.id, await resolveReboundColumnFor(deps.store, task.id), { preserveProgress: true });
|
|
} else {
|
|
await deps.store.updateTask(task.id, {
|
|
status: "failed",
|
|
error: refusal.message,
|
|
...taintUpdate,
|
|
paused: false,
|
|
pausedByAgentId: null,
|
|
worktree: null,
|
|
branch: null,
|
|
sessionFile: null,
|
|
});
|
|
await deps.store.logEntry(task.id, `${refusal.message} — execution failed because implicit fn_task_done was refused`, undefined, deps.getRunContextFor(task.id));
|
|
await deps.persistTokenUsage(task.id);
|
|
}
|
|
|
|
deps.deleteActiveSession(task.id);
|
|
deps.clearTokenUsageBaseline(task.id);
|
|
}
|