mustflow 2.18.0 → 2.18.3

package/dist/cli/commands/run.js

@@ -1,388 +1,20 @@
-import { spawn, spawnSync } from 'node:child_process';
 import { performance } from 'node:perf_hooks';
-import { canRunMustflowBuiltinInProcess, isMustflowBinName } from '../../core/command-classification.js';
 import { createCommandEnv } from '../../core/command-env.js';
-import { BoundedOutputBuffer } from '../../core/bounded-output.js';
 import { printUsageError, renderCliError, renderHelp } from '../lib/cli-output.js';
 import { readCommandContract, readMustflowConfigIfExists } from '../../core/config-loading.js';
 import { resolveRunReceiptRetentionPolicy } from '../../core/retention-policy.js';
 import { t } from '../lib/i18n.js';
-import { getPackageVersion } from '../lib/package-info.js';
 import { resolveMustflowRoot } from '../lib/project-root.js';
 import { createRunPlan, createRunPreview, isMustflowBuiltinIntent, renderRunPreviewText, } from '../lib/run-plan.js';
-import { createRunReceipt, writeRunReceipt } from '../../core/run-receipt.js';
+import { writeRunReceipt, } from '../../core/run-receipt.js';
 import { recordRunPerformanceHistory } from '../../core/run-performance-history.js';
 import { RunProfiler } from '../../core/run-profile.js';
 import { finishRunWriteTracking, startRunWriteTracking } from '../../core/run-write-drift.js';
-function emitOutput(reporter, output, stream) {
-    if (!output) {
-        return;
-    }
-    const text = (typeof output === 'object' && 'tail' in output ? output.tail : output.toString()).trimEnd();
-    if (text.length === 0) {
-        return;
-    }
-    reporter[stream](text);
-}
-function signalProcessTree(pid, signal) {
-    if (!pid || pid <= 0) {
-        return;
-    }
-    if (process.platform === 'win32') {
-        spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], {
-            stdio: 'ignore',
-            windowsHide: true,
-        });
-        if (signal === 'SIGKILL') {
-            try {
-                process.kill(pid, signal);
-            }
-            catch {
-                // taskkill may already have terminated the direct child.
-            }
-        }
-        return;
-    }
-    try {
-        process.kill(-pid, signal);
-    }
-    catch {
-        try {
-            process.kill(pid, signal);
-        }
-        catch {
-            // The child may already be gone after Node's spawn timeout handling.
-        }
-    }
-}
-function signalProcessTreeNonBlocking(pid, signal) {
-    if (!pid || pid <= 0) {
-        return;
-    }
-    if (process.platform === 'win32') {
-        const killer = spawn('taskkill', ['/PID', String(pid), '/T', '/F'], {
-            stdio: 'ignore',
-            windowsHide: true,
-            detached: true,
-        });
-        killer.unref();
-        if (signal === 'SIGKILL') {
-            try {
-                process.kill(pid, signal);
-            }
-            catch {
-                // taskkill may already have terminated the direct child.
-            }
-        }
-        return;
-    }
-    try {
-        process.kill(-pid, signal);
-    }
-    catch {
-        try {
-            process.kill(pid, signal);
-        }
-        catch {
-            // The child may already be gone after the timeout fired.
-        }
-    }
-}
-function terminateProcessTree(pid) {
-    signalProcessTree(pid, 'SIGTERM');
-}
-function forceTerminateProcessTree(pid) {
-    signalProcessTree(pid, 'SIGKILL');
-}
-function terminateProcessTreeNonBlocking(pid) {
-    signalProcessTreeNonBlocking(pid, 'SIGTERM');
-}
-function forceTerminateProcessTreeNonBlocking(pid) {
-    signalProcessTreeNonBlocking(pid, 'SIGKILL');
-}
-function getKillMethod() {
-    return process.platform === 'win32' ? 'taskkill_process_tree' : 'process_group_sigterm';
-}
-function createBufferedReporter() {
-    const stdout = [];
-    const stderr = [];
-    return {
-        reporter: {
-            stdout(message) {
-                stdout.push(`${message}\n`);
-            },
-            stderr(message) {
-                stderr.push(`${message}\n`);
-            },
-        },
-        stdout() {
-            return stdout.join('');
-        },
-        stderr() {
-            return stderr.join('');
-        },
-    };
-}
-/**
- * mf:anchor cli.run.builtin-inprocess
- * purpose: Dispatch selected mustflow built-in commands without spawning a nested CLI process.
- * search: builtin intent, in-process command, nested mf run, run receipt
- * invariant: Only commands classified by command-classification can use this path.
- * risk: config, state
- */
-async function runKnownBuiltinCommand(args, reporter, lang) {
-    const [command, ...commandArgs] = args;
-    if ((command === '--version' || command === '-v' || command === 'version') && commandArgs.length === 0) {
-        reporter.stdout(getPackageVersion());
-        return 0;
-    }
-    if (!canRunMustflowBuiltinInProcess(command)) {
-        return undefined;
-    }
-    if (command === 'check') {
-        return (await import('./check.js')).runCheck(commandArgs, reporter, lang);
-    }
-    if (command === 'classify') {
-        return (await import('./classify.js')).runClassify(commandArgs, reporter, lang);
-    }
-    if (command === 'context') {
-        return (await import('./context.js')).runContext(commandArgs, reporter, lang);
-    }
-    if (command === 'doctor') {
-        return (await import('./doctor.js')).runDoctor(commandArgs, reporter, lang);
-    }
-    if (command === 'help') {
-        return (await import('./help.js')).runHelp(commandArgs, reporter, lang);
-    }
-    if (command === 'impact') {
-        return (await import('./impact.js')).runImpact(commandArgs, reporter, lang);
-    }
-    if (command === 'line-endings') {
-        return (await import('./line-endings.js')).runLineEndings(commandArgs, reporter, lang);
-    }
-    if (command === 'map') {
-        return (await import('./map.js')).runMap(commandArgs, reporter, lang);
-    }
-    if (command === 'status') {
-        return (await import('./status.js')).runStatus(commandArgs, reporter, lang);
-    }
-    if (command === 'update') {
-        return (await import('./update.js')).runUpdate(commandArgs, reporter, lang);
-    }
-    if (command === 'version-sources') {
-        return (await import('./version-sources.js')).runVersionSources(commandArgs, reporter, lang);
-    }
-    return undefined;
-}
-async function withWorkingDirectory(cwd, callback) {
-    const previousCwd = process.cwd();
-    process.chdir(cwd);
-    try {
-        return await callback();
-    }
-    finally {
-        process.chdir(previousCwd);
-    }
-}
-async function runBuiltinArgvInProcess(commandArgv, cwd, lang) {
-    const [command = '', ...builtinArgs] = commandArgv;
-    if (!isMustflowBinName(command)) {
-        return undefined;
-    }
-    const output = createBufferedReporter();
-    try {
-        const status = await withWorkingDirectory(cwd, () => runKnownBuiltinCommand(builtinArgs, output.reporter, lang));
-        if (status === undefined) {
-            return undefined;
-        }
-        return {
-            status,
-            signal: null,
-            stdout: output.stdout(),
-            stderr: output.stderr(),
-        };
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        return {
-            status: 1,
-            signal: null,
-            stdout: output.stdout(),
-            stderr: `${output.stderr()}${message}\n`,
-        };
-    }
-}
-function runArgvCommand(command, cwd, maxOutputBytes, env, timeoutSeconds) {
-    return spawnSync(command?.executable ?? '', command?.args ?? [], {
-        cwd,
-        encoding: 'utf8',
-        input: '',
-        maxBuffer: maxOutputBytes,
-        env,
-        shell: command?.shell ?? false,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        timeout: timeoutSeconds * 1000,
-        windowsHide: true,
-    });
-}
-function writeStreamChunk(reporter, stream, chunk) {
-    if (stream === 'stdout') {
-        if (reporter.writeStdout) {
-            reporter.writeStdout(chunk);
-            return;
-        }
-        reporter.stdout(chunk.toString());
-        return;
-    }
-    if (reporter.writeStderr) {
-        reporter.writeStderr(chunk);
-        return;
-    }
-    reporter.stderr(chunk.toString());
-}
-function runArgvCommandStreaming(command, cwd, env, timeoutSeconds, stdoutTailBytes, stderrTailBytes, reporter) {
-    return new Promise((resolve) => {
-        const stdout = new BoundedOutputBuffer(stdoutTailBytes);
-        const stderr = new BoundedOutputBuffer(stderrTailBytes);
-        let settled = false;
-        let timedOut = false;
-        let childError;
-        let childPid;
-        let timeout;
-        const child = spawn(command?.executable ?? '', command?.args ?? [], {
-            cwd,
-            env,
-            shell: command?.shell ?? false,
-            stdio: ['ignore', 'pipe', 'pipe'],
-            windowsHide: true,
-            detached: process.platform !== 'win32',
-        });
-        childPid = child.pid;
-        const finish = (status, signal) => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            if (timeout) {
-                clearTimeout(timeout);
-            }
-            resolve({
-                status: timedOut ? null : status,
-                signal: timedOut ? null : signal,
-                error: timedOut ? Object.assign(new Error('Command timed out'), { code: 'ETIMEDOUT' }) : childError,
-                stdout: stdout.toSnapshot(),
-                stderr: stderr.toSnapshot(),
-                pid: childPid,
-            });
-        };
-        child.stdout?.on('data', (chunk) => {
-            stdout.append(chunk);
-            writeStreamChunk(reporter, 'stdout', chunk);
-        });
-        child.stderr?.on('data', (chunk) => {
-            stderr.append(chunk);
-            writeStreamChunk(reporter, 'stderr', chunk);
-        });
-        child.once('error', (error) => {
-            childError = error;
-        });
-        child.once('close', (status, signal) => {
-            finish(status, signal);
-        });
-        timeout = setTimeout(() => {
-            timedOut = true;
-            child.stdout?.destroy();
-            child.stderr?.destroy();
-            child.unref();
-            terminateProcessTreeNonBlocking(childPid);
-            forceTerminateProcessTreeNonBlocking(childPid);
-            finish(null, null);
-        }, timeoutSeconds * 1000);
-    });
-}
-function runShellCommand(command, cwd, maxOutputBytes, env, timeoutSeconds) {
-    return spawnSync(command ?? '', {
-        cwd,
-        encoding: 'utf8',
-        input: '',
-        maxBuffer: maxOutputBytes,
-        env,
-        shell: true,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        timeout: timeoutSeconds * 1000,
-        windowsHide: true,
-    });
-}
-function runShellCommandStreaming(command, cwd, env, timeoutSeconds, stdoutTailBytes, stderrTailBytes, reporter) {
-    return new Promise((resolve) => {
-        const stdout = new BoundedOutputBuffer(stdoutTailBytes);
-        const stderr = new BoundedOutputBuffer(stderrTailBytes);
-        let settled = false;
-        let timedOut = false;
-        let childError;
-        let childPid;
-        let timeout;
-        const child = spawn(command ?? '', {
-            cwd,
-            env,
-            shell: true,
-            stdio: ['ignore', 'pipe', 'pipe'],
-            windowsHide: true,
-            detached: process.platform !== 'win32',
-        });
-        childPid = child.pid;
-        const finish = (status, signal) => {
-            if (settled) {
-                return;
-            }
-            settled = true;
-            if (timeout) {
-                clearTimeout(timeout);
-            }
-            resolve({
-                status: timedOut ? null : status,
-                signal: timedOut ? null : signal,
-                error: timedOut ? Object.assign(new Error('Command timed out'), { code: 'ETIMEDOUT' }) : childError,
-                stdout: stdout.toSnapshot(),
-                stderr: stderr.toSnapshot(),
-                pid: childPid,
-            });
-        };
-        child.stdout?.on('data', (chunk) => {
-            stdout.append(chunk);
-            writeStreamChunk(reporter, 'stdout', chunk);
-        });
-        child.stderr?.on('data', (chunk) => {
-            stderr.append(chunk);
-            writeStreamChunk(reporter, 'stderr', chunk);
-        });
-        child.once('error', (error) => {
-            childError = error;
-        });
-        child.once('close', (status, signal) => {
-            finish(status, signal);
-        });
-        timeout = setTimeout(() => {
-            timedOut = true;
-            child.stdout?.destroy();
-            child.stderr?.destroy();
-            child.unref();
-            terminateProcessTreeNonBlocking(childPid);
-            forceTerminateProcessTreeNonBlocking(childPid);
-            finish(null, null);
-        }, timeoutSeconds * 1000);
-    });
-}
-function getRunStatus(error, exitCode, successExitCodes) {
-    const errorWithCode = error;
-    if (errorWithCode?.code === 'ETIMEDOUT') {
-        return 'timed_out';
-    }
-    if (error) {
-        return 'start_failed';
-    }
-    return exitCode !== null && successExitCodes.includes(exitCode) ? 'passed' : 'failed';
-}
+import { runBuiltinArgvInProcess } from './run/builtin-dispatch.js';
+import { getRunStatus, runArgvCommandStreaming, runShellCommandStreaming } from './run/executor.js';
+import { emitOutput } from './run/output.js';
+import { createPendingTimeoutTermination, getKillMethod, terminateProcessTree } from './run/process-tree.js';
+import { assembleRunReceipt } from './run/receipt.js';
 function getRunPlanDetail(plan, lang, fallbackKey) {
     return plan.detail ?? t(lang, fallbackKey);
 }
@@ -540,8 +172,6 @@ export async function runRun(args, reporter, lang = 'en', options = {}) {
     }
     const runReceiptPolicy = profiler.measure('retention_policy', () => resolveRunReceiptRetentionPolicy(readMustflowConfigIfExists(projectRoot)));
     const env = profiler.measure('environment', () => createCommandEnv(projectRoot, { policy: plan.envPolicy, allowlist: plan.envAllowlist }));
-    const lifecycleValue = plan.lifecycle ?? 'oneshot';
-    const runPolicyValue = plan.runPolicy ?? 'agent_allowed';
     const writeTracker = profiler.measure('write_drift_before', () => startRunWriteTracking(projectRoot, contract, intentName));
     const stdoutTailBytes = Math.min(runReceiptPolicy.stdoutTailBytes, plan.maxOutputBytes);
     const stderrTailBytes = Math.min(runReceiptPolicy.stderrTailBytes, plan.maxOutputBytes);
@@ -556,17 +186,11 @@ export async function runRun(args, reporter, lang = 'en', options = {}) {
             }
         }
         if (plan.commandArgv) {
-            if (!json) {
-                streamedOutput = true;
-                return runArgvCommandStreaming(plan.argvCommand, plan.cwd, env, plan.timeoutSeconds, stdoutTailBytes, stderrTailBytes, reporter);
-            }
-            return runArgvCommand(plan.argvCommand, plan.cwd, plan.maxOutputBytes, env, plan.timeoutSeconds);
-        }
-        if (!json) {
-            streamedOutput = true;
-            return runShellCommandStreaming(plan.shellCommand, plan.cwd, env, plan.timeoutSeconds, stdoutTailBytes, stderrTailBytes, reporter);
+            streamedOutput = !json;
+            return runArgvCommandStreaming(plan.argvCommand, plan.cwd, env, plan.timeoutSeconds, plan.maxOutputBytes, stdoutTailBytes, stderrTailBytes, reporter, !json, json);
         }
-        return runShellCommand(plan.shellCommand, plan.cwd, plan.maxOutputBytes, env, plan.timeoutSeconds);
+        streamedOutput = !json;
+        return runShellCommandStreaming(plan.shellCommand, plan.cwd, env, plan.timeoutSeconds, plan.maxOutputBytes, stdoutTailBytes, stderrTailBytes, reporter, !json, json);
     });
     const childDurationMs = performance.now() - childStartedAtMs;
     const finishedAt = new Date();
@@ -574,44 +198,28 @@ export async function runRun(args, reporter, lang = 'en', options = {}) {
     const exitCode = typeof result.status === 'number' ? result.status : null;
     const runStatus = getRunStatus(result.error, exitCode, plan.successExitCodes);
     let killMethod = null;
+    let termination = null;
     if (runStatus === 'timed_out') {
-        killMethod = getKillMethod();
-        terminateProcessTree(result.pid);
+        termination = result.termination ?? createPendingTimeoutTermination(getKillMethod());
+        killMethod = termination.method;
+        if (!result.termination && result.pid) {
+            terminateProcessTree(result.pid);
+        }
     }
-    const receipt = profiler.measure('receipt_create', () => createRunReceipt({
-        intent: intentName,
-        status: runStatus,
-        timedOut: runStatus === 'timed_out',
+    const receipt = profiler.measure('receipt_create', () => assembleRunReceipt({
+        intentName,
+        runStatus,
         startedAt,
         finishedAt,
         projectRoot,
-        cwd: plan.cwd,
-        lifecycle: lifecycleValue,
-        runPolicy: runPolicyValue,
-        mode: plan.mode,
-        argv: plan.commandArgv,
-        cmd: plan.shellCommand,
-        envPolicy: plan.envPolicy,
-        envAllowlist: plan.envAllowlist,
-        timeoutSeconds: plan.timeoutSeconds,
-        maxOutputBytes: plan.maxOutputBytes,
-        successExitCodes: plan.successExitCodes,
+        plan,
+        result,
         exitCode,
-        signal: result.signal,
-        error: result.error?.message ?? null,
         killMethod,
-        stdout: result.stdout,
-        stderr: result.stderr,
+        termination,
         writeDrift,
         executorOverheadMs: Math.max(0, Math.round((performance.now() - executorStartedAtMs - childDurationMs) * 1000) / 1000),
         phaseTimings: profiler.getReceiptPhases(),
-        selectionSummary: {
-            strategy: plan.testTargets.length > 0 ? 'project_test_selection' : 'direct_intent',
-            changed_file_count: 0,
-            changed_surface_counts: {},
-            selected_target_count: Math.max(1, plan.testTargets.length),
-            fallback_used: false,
-        },
         stdoutTailBytes: runReceiptPolicy.stdoutTailBytes,
         stderrTailBytes: runReceiptPolicy.stderrTailBytes,
     }));