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 -->
44 lines
1.9 KiB
TypeScript
44 lines
1.9 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-10:15:
|
|
* resolveInstructionsForRole peeled from TaskExecutor (U4).
|
|
* Looks up agents by role and resolves their instruction text/path for prompt assembly.
|
|
*/
|
|
import type { AgentCapability, AgentStore, Settings } from "@fusion/core";
|
|
import { resolveAgentMemoryInclusionMode } from "@fusion/core";
|
|
import { executorLog } from "../logger.js";
|
|
import { resolveAgentInstructions } from "../agents/agent-instructions.js";
|
|
|
|
export type ResolveInstructionsForRoleDeps = {
|
|
rootDir: string;
|
|
agentStore?: AgentStore | null;
|
|
};
|
|
|
|
export async function resolveInstructionsForRole(
|
|
deps: ResolveInstructionsForRoleDeps,
|
|
role: string,
|
|
settings?: Settings,
|
|
): Promise<string> {
|
|
if (!deps.agentStore) return "";
|
|
try {
|
|
const agents = await deps.agentStore.listAgents({ role: role as AgentCapability });
|
|
for (const agent of agents) {
|
|
if (agent.instructionsText || agent.instructionsPath) {
|
|
try {
|
|
const ratingSummary = await deps.agentStore.getRatingSummary(agent.id);
|
|
const mode = resolveAgentMemoryInclusionMode({ agent, globalSettings: settings }).mode;
|
|
return await resolveAgentInstructions(agent, deps.rootDir, ratingSummary, mode);
|
|
} catch (err: unknown) {
|
|
const msg = err instanceof Error ? err.message : String(err);
|
|
executorLog.warn(`${agent.id}: failed to load rating summary for instruction resolution, falling back to default instructions: ${msg}`);
|
|
const mode = resolveAgentMemoryInclusionMode({ agent, globalSettings: settings }).mode;
|
|
return await resolveAgentInstructions(agent, deps.rootDir, undefined, mode);
|
|
}
|
|
}
|
|
}
|
|
} catch (err: unknown) {
|
|
const msg = err instanceof Error ? err.message : String(err);
|
|
executorLog.warn(`Failed to resolve instructions for role '${role}', continuing without custom instructions: ${msg}`);
|
|
}
|
|
return "";
|
|
}
|