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 -->
65 lines
2.7 KiB
TypeScript
65 lines
2.7 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-12:10:
|
|
* runRawCliCommand peeled from TaskExecutor (U4).
|
|
* Execute an approved CLI command in a task worktree for a workflow node.
|
|
*/
|
|
import type { TaskDetail, TaskStore, RunCommandResult } from "@fusion/core";
|
|
import { executorLog } from "../logger.js";
|
|
import { createRunAuditor, generateSyntheticRunId, type EngineRunContext, type RunAuditor } from "../util/run-audit.js";
|
|
import { configuredCommandErrorMessage } from "./configured-command.js";
|
|
import { createConfiguredCommandAbortError } from "./task-predicates.js";
|
|
|
|
export type RunRawCliCommandDeps = {
|
|
store: TaskStore;
|
|
getRunContextFor: (taskId: string) => EngineRunContext | undefined;
|
|
registerConfiguredCommandController: (taskId: string, controller: AbortController) => void;
|
|
unregisterConfiguredCommandController: (taskId: string, controller: AbortController) => void;
|
|
runConfiguredCommand: (
|
|
command: string,
|
|
cwd: string,
|
|
timeoutMs: number,
|
|
extraEnv?: NodeJS.ProcessEnv,
|
|
auditor?: RunAuditor,
|
|
signal?: AbortSignal,
|
|
) => Promise<RunCommandResult>;
|
|
};
|
|
|
|
export async function runRawCliCommand(
|
|
deps: RunRawCliCommandDeps,
|
|
task: TaskDetail,
|
|
label: string,
|
|
command: string,
|
|
worktreePath: string,
|
|
extraEnv?: NodeJS.ProcessEnv,
|
|
): Promise<{ success: boolean; output?: string; error?: string }> {
|
|
executorLog.log(`${task.id}: workflow node '${label}' executing approved CLI command: ${command}`);
|
|
await deps.store.logEntry(task.id, `Workflow node '${label}' executing CLI command: ${command}`, undefined, deps.getRunContextFor(task.id));
|
|
const abort = new AbortController();
|
|
deps.registerConfiguredCommandController(task.id, abort);
|
|
try {
|
|
const result = await deps.runConfiguredCommand(
|
|
command,
|
|
worktreePath,
|
|
120_000,
|
|
extraEnv,
|
|
createRunAuditor(deps.store, {
|
|
runId: deps.getRunContextFor(task.id)?.runId ?? generateSyntheticRunId("exec-cli", task.id),
|
|
agentId: deps.getRunContextFor(task.id)?.agentId ?? (task.assignedAgentId ?? "executor"),
|
|
taskId: task.id,
|
|
phase: "execute",
|
|
}),
|
|
abort.signal,
|
|
);
|
|
if (abort.signal.aborted) throw createConfiguredCommandAbortError(task.id, command);
|
|
if (result.spawnError || result.timedOut || result.exitCode !== 0) {
|
|
return { success: false, error: configuredCommandErrorMessage(result) };
|
|
}
|
|
return { success: true, output: `CLI command completed successfully` };
|
|
} catch (err: unknown) {
|
|
if (err instanceof Error && err.name === "AbortError") throw err;
|
|
return { success: false, error: err instanceof Error ? err.message : String(err) };
|
|
} finally {
|
|
deps.unregisterConfiguredCommandController(task.id, abort);
|
|
}
|
|
}
|