## 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 -->
79 lines
3.6 KiB
TypeScript
79 lines
3.6 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-19:20:
|
|
* blockOuterDispatchWhenDependenciesUnmet peeled from TaskExecutor (U4).
|
|
*
|
|
* FNXC:DependencyGating 2026-06-20-07:30:
|
|
* Workflow-graph and workflow-authoritative executor dispatches can be invoked outside the classic scheduler loop, so they must re-apply the shared scheduling dependency gate before graph routing, column-agent seams, or review handoff can run.
|
|
* Requeue with blockedBy instead of executing so missing or soft-deleted dependency residue keeps the scheduler helper's non-blocking semantics while live todo/queued/in-progress/triage dependencies block every dispatch surface.
|
|
*/
|
|
import type { Task, TaskStore } from "@fusion/core";
|
|
import { getUnmetSchedulingDependencies } from "../scheduler.js";
|
|
import { executorLog } from "../logger.js";
|
|
import type { EngineRunContext } from "../util/run-audit.js";
|
|
import { resolveReboundColumnFor } from "./lifecycle-columns.js";
|
|
|
|
export type DependencyDispatchGateDeps = {
|
|
store: TaskStore;
|
|
getRunContextFor: (taskId: string) => EngineRunContext | undefined;
|
|
};
|
|
|
|
export async function blockOuterDispatchWhenDependenciesUnmet(
|
|
deps: DependencyDispatchGateDeps,
|
|
task: Task,
|
|
): Promise<boolean> {
|
|
if (!task.dependencies || task.dependencies.length === 0) return false;
|
|
|
|
const settings = await deps.store.getSettings();
|
|
const tasks = await deps.store.listTasks({ includeArchived: false, slim: true });
|
|
const liveTask = tasks.find((candidate) => candidate.id === task.id) ?? task;
|
|
const markerAcceptedByTaskId = new Map<string, boolean>();
|
|
if (settings.mergeRequestContractShadowEnabled === true) {
|
|
for (const depId of liveTask.dependencies) {
|
|
markerAcceptedByTaskId.set(depId, (await deps.store.getCompletionHandoffAcceptedMarker(depId)) !== null);
|
|
}
|
|
}
|
|
const unmetDeps = getUnmetSchedulingDependencies(
|
|
liveTask,
|
|
tasks,
|
|
settings.mergeRequestContractShadowEnabled === true ? { markerAcceptedByTaskId } : undefined,
|
|
);
|
|
if (unmetDeps.length === 0) return false;
|
|
|
|
const reboundColumn = await resolveReboundColumnFor(deps.store, liveTask.id);
|
|
if (liveTask.column !== reboundColumn) {
|
|
await deps.store.moveTask(liveTask.id, reboundColumn, {
|
|
preserveProgress: true,
|
|
preserveWorktree: true,
|
|
preserveResumeState: true,
|
|
moveSource: "engine",
|
|
recoveryRehome: true,
|
|
});
|
|
}
|
|
/*
|
|
FNXC:DependencyGating 2026-08-07-12:10:
|
|
Prefer the store's transitionQueuedEpisode so queued signature/blockedBy/audit are one atomic
|
|
write (FN-8806 / main). Falls back to updateTask+logEntry only when the store lacks the helper.
|
|
*/
|
|
const normalizedUnmetDeps = [...new Set(unmetDeps)].sort();
|
|
if (typeof deps.store.transitionQueuedEpisode === "function") {
|
|
await deps.store.transitionQueuedEpisode(liveTask.id, {
|
|
signature: `dependency:${normalizedUnmetDeps.join(",")}`,
|
|
blockedBy: unmetDeps[0] ?? null,
|
|
overlapBlockedBy: liveTask.overlapBlockedBy ?? null,
|
|
action: `queued — unmet dependencies: ${unmetDeps.join(", ")}`,
|
|
outcome: "Executor pre-dispatch dependency gate blocked workflow/authoritative execution.",
|
|
runContext: deps.getRunContextFor(liveTask.id),
|
|
});
|
|
} else {
|
|
await deps.store.updateTask(liveTask.id, { status: "queued", blockedBy: unmetDeps[0] }, deps.getRunContextFor(liveTask.id));
|
|
await deps.store.logEntry(
|
|
liveTask.id,
|
|
`queued — unmet dependencies: ${unmetDeps.join(", ")}`,
|
|
"Executor pre-dispatch dependency gate blocked workflow/authoritative execution.",
|
|
deps.getRunContextFor(liveTask.id),
|
|
);
|
|
}
|
|
executorLog.log(`${liveTask.id}: executor dispatch blocked by unmet dependencies: ${unmetDeps.join(", ")}`);
|
|
return true;
|
|
}
|