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 -->
64 lines
2.4 KiB
TypeScript
64 lines
2.4 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-11:30:
|
|
* adoptColumnAgentForNode peeled from TaskExecutor (U4).
|
|
* Resolve column-agent model/persona for a graph node (best-effort R8 fallback).
|
|
*/
|
|
import type { AgentStore, TaskDetail, TaskStore, WorkflowColumnAgent, WorkflowIrNode } from "@fusion/core";
|
|
import { executorLog } from "../logger.js";
|
|
import type { EngineRunContext } from "../util/run-audit.js";
|
|
import { buildAgentPersona } from "./agent-binding-pure.js";
|
|
|
|
export type AdoptColumnAgentForNodeDeps = {
|
|
store: TaskStore;
|
|
getRunContextFor: (taskId: string) => EngineRunContext | undefined;
|
|
agentStore?: AgentStore | null;
|
|
};
|
|
|
|
export async function adoptColumnAgentForNode(
|
|
deps: AdoptColumnAgentForNodeDeps,
|
|
node: WorkflowIrNode,
|
|
live: TaskDetail,
|
|
columnAgentId: string,
|
|
mode: WorkflowColumnAgent["mode"] | undefined,
|
|
): Promise<{ modelProvider?: string; modelId?: string; persona?: string } | undefined> {
|
|
try {
|
|
const agent = await deps.agentStore?.getAgent(columnAgentId);
|
|
if (!agent) {
|
|
await deps.store.logEntry(
|
|
live.id,
|
|
`Workflow node '${node.id}': column agent '${columnAgentId}' not found — falling back to node/default resolution`,
|
|
undefined,
|
|
deps.getRunContextFor(live.id),
|
|
);
|
|
return undefined;
|
|
}
|
|
const rc = (agent.runtimeConfig ?? {}) as { executorProvider?: string; executorModelId?: string };
|
|
await deps.store.logEntry(
|
|
live.id,
|
|
`Workflow node '${node.id}': running as column agent '${columnAgentId}' (${mode})`,
|
|
undefined,
|
|
deps.getRunContextFor(live.id),
|
|
);
|
|
return {
|
|
modelProvider: rc.executorProvider,
|
|
modelId: rc.executorModelId,
|
|
persona: buildAgentPersona(agent),
|
|
};
|
|
} catch {
|
|
// Agent lookup is best-effort; fall back to node/default resolution (R8).
|
|
// A secondary logEntry failure (DB locked / mid-recovery) must NOT propagate
|
|
// out of this error handler and escalate the node to a hard failure.
|
|
try {
|
|
await deps.store.logEntry(
|
|
live.id,
|
|
`Workflow node '${node.id}': column agent '${columnAgentId}' lookup failed — falling back to node/default resolution`,
|
|
undefined,
|
|
deps.getRunContextFor(live.id),
|
|
);
|
|
} catch (logErr: unknown) {
|
|
executorLog.warn(`${live.id}: failed to log column-agent lookup failure: ${logErr instanceof Error ? logErr.message : String(logErr)}`);
|
|
}
|
|
return undefined;
|
|
}
|
|
}
|