## 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 -->
62 lines
2.4 KiB
TypeScript
62 lines
2.4 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-11:45:
|
|
* runSpawnedChild peeled from TaskExecutor (U4).
|
|
*
|
|
* FNXC:AgentSpawning 2026-06-23-12:25:
|
|
* Server memory must return to baseline after spawned child execution. Dispose the child session and free spawn budget in finally.
|
|
*/
|
|
import type { AgentStore } from "@fusion/core";
|
|
import type { AgentSession } from "@earendil-works/pi-coding-agent";
|
|
import { promptWithFallback } from "../pi.js";
|
|
import { executorLog } from "../logger.js";
|
|
|
|
export type RunSpawnedChildDeps = {
|
|
agentStore?: AgentStore | null;
|
|
childSessions: Map<string, AgentSession>;
|
|
/** Mutable spawn counter owned by TaskExecutor. */
|
|
adjustSpawnedCount: (delta: number) => void;
|
|
};
|
|
|
|
export async function runSpawnedChild(
|
|
deps: RunSpawnedChildDeps,
|
|
agentId: string,
|
|
childSession: AgentSession,
|
|
taskPrompt: string,
|
|
): Promise<void> {
|
|
try {
|
|
await deps.agentStore?.updateAgentState(agentId, "running");
|
|
} catch (err: unknown) {
|
|
const msg = err instanceof Error ? err.message : String(err);
|
|
executorLog.warn(`Failed to update spawned child ${agentId} state to 'running': ${msg}`);
|
|
}
|
|
|
|
try {
|
|
await promptWithFallback(childSession, taskPrompt);
|
|
// Normal completion — mark as active (available)
|
|
try {
|
|
await deps.agentStore?.updateAgentState(agentId, "active");
|
|
} catch (markActiveErr) {
|
|
executorLog.warn(`Child agent ${agentId} updateAgentState(active) failed: ${markActiveErr instanceof Error ? markActiveErr.message : String(markActiveErr)}`);
|
|
}
|
|
} catch (err: unknown) {
|
|
// Error during execution — mark as error
|
|
try {
|
|
await deps.agentStore?.updateAgentState(agentId, "error");
|
|
} catch (markErrorErr) {
|
|
executorLog.warn(`Child agent ${agentId} updateAgentState(error) failed: ${markErrorErr instanceof Error ? markErrorErr.message : String(markErrorErr)}`);
|
|
}
|
|
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
executorLog.warn(`Child agent ${agentId} failed: ${errorMessage}`);
|
|
} finally {
|
|
if (deps.childSessions.get(agentId) === childSession) {
|
|
try {
|
|
await childSession.dispose();
|
|
} catch (disposeErr) {
|
|
executorLog.warn(`Child agent ${agentId} session dispose failed: ${disposeErr instanceof Error ? disposeErr.message : String(disposeErr)}`);
|
|
}
|
|
deps.childSessions.delete(agentId);
|
|
}
|
|
deps.adjustSpawnedCount(-1);
|
|
}
|
|
}
|