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 -->
82 lines
2.9 KiB
TypeScript
82 lines
2.9 KiB
TypeScript
/**
|
|
* FNXC:CodeOrganization 2026-08-03-07:45:
|
|
* Configured command output formatting + sandbox backend selection peeled from executor.ts.
|
|
*/
|
|
import type { RunCommandResult } from "@fusion/core";
|
|
import type { RunAuditor } from "../util/run-audit.js";
|
|
import { resolveSandboxBackend, type SandboxBackend } from "../sandbox/index.js";
|
|
|
|
const WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS = 4_000;
|
|
|
|
export function truncateWorkflowScriptOutput(output: string): string {
|
|
if (output.length <= WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS) return output;
|
|
return `... output truncated to last ${WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS} characters ...\n${output.slice(-WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS)}`;
|
|
}
|
|
|
|
export function configuredCommandErrorMessage(result: RunCommandResult): string {
|
|
if (result.spawnError) return result.spawnError.message;
|
|
const parts: string[] = [];
|
|
if (result.timedOut) parts.push("Timed out");
|
|
if (result.exitCode !== null) parts.push(`Exit code: ${result.exitCode}`);
|
|
if (result.signal) parts.push(`Signal: ${result.signal}`);
|
|
const stdout = result.stdout.trim();
|
|
const stderr = result.stderr.trim();
|
|
if (stdout) parts.push(`stdout: ${truncateWorkflowScriptOutput(stdout)}`);
|
|
if (stderr) parts.push(`stderr: ${truncateWorkflowScriptOutput(stderr)}`);
|
|
return parts.length ? parts.join("\n") : "Command failed";
|
|
}
|
|
|
|
export function getConfiguredCommandSandboxBackend(auditor?: RunAuditor): SandboxBackend {
|
|
return resolveSandboxBackend({ auditor });
|
|
}
|
|
|
|
/**
|
|
* FNXC:CodeOrganization 2026-08-03-16:00:
|
|
* Shared sandbox-backed command runner used by runImplementation and test hooks.
|
|
* Lives with configured-command peels so U4 free functions do not re-open executor.ts locals.
|
|
*/
|
|
export async function runConfiguredCommand(
|
|
command: string,
|
|
cwd: string,
|
|
timeoutMs: number,
|
|
extraEnv?: NodeJS.ProcessEnv,
|
|
auditor?: RunAuditor,
|
|
signal?: AbortSignal,
|
|
): Promise<RunCommandResult> {
|
|
const backend = getConfiguredCommandSandboxBackend(auditor);
|
|
const result = await backend.run(command, {
|
|
cwd,
|
|
timeoutMs,
|
|
maxBuffer: 10 * 1024 * 1024,
|
|
encoding: "utf-8",
|
|
...(extraEnv !== undefined && { env: extraEnv }),
|
|
...(signal !== undefined && { signal }),
|
|
});
|
|
|
|
return {
|
|
stdout: result.stdout,
|
|
stderr: result.stderr,
|
|
exitCode: result.exitCode,
|
|
signal: result.signal,
|
|
bufferExceeded: result.bufferExceeded,
|
|
timedOut: result.timedOut,
|
|
spawnError: result.spawnError,
|
|
};
|
|
}
|
|
|
|
/*
|
|
FNXC:CodeOrganization 2026-08-04-06:25:
|
|
Test-only wrapper re-exported from executor.ts so sandbox wiring tests import a stable
|
|
facade path without holding the helper body on TaskExecutor's module surface.
|
|
*/
|
|
export async function __runConfiguredCommandForTests(
|
|
command: string,
|
|
cwd: string,
|
|
timeoutMs: number,
|
|
extraEnv?: NodeJS.ProcessEnv,
|
|
auditor?: RunAuditor,
|
|
signal?: AbortSignal,
|
|
): Promise<RunCommandResult> {
|
|
return runConfiguredCommand(command, cwd, timeoutMs, extraEnv, auditor, signal);
|
|
}
|