@msn-control/liftoff 0.10.3 → 0.11.1

package/dist/process-runner.js

@@ -1,4 +1,6 @@
 import spawn from 'cross-spawn';
+import { spawn as spawnProcess } from 'node:child_process';
+import path from 'node:path';
 import { StringDecoder } from 'node:string_decoder';
 function displayArgument(value) {
     if (/^[A-Za-z0-9_./:@=+,-]+$/.test(value)) {
@@ -33,33 +35,106 @@ function createStreamRedactor(sensitiveValues) {
             const emit = redactSensitiveText(pending, values);
             pending = '';
             return emit;
+        },
+        discard() {
+            pending = '';
         }
     };
 }
+function terminateProcessTree(child, ownsProcessGroup) {
+    if (child.pid === undefined)
+        return Promise.resolve(true);
+    if (process.platform !== 'win32') {
+        try {
+            if (ownsProcessGroup)
+                process.kill(-child.pid, 'SIGKILL');
+            else
+                child.kill('SIGKILL');
+            return Promise.resolve(true);
+        }
+        catch (error) {
+            if (error.code === 'ESRCH')
+                return Promise.resolve(true);
+            try {
+                child.kill('SIGKILL');
+            }
+            catch { /* The caller reports termination failure. */ }
+            return Promise.resolve(false);
+        }
+    }
+    // An exited Windows root PID may have been reused; never target its replacement.
+    if (child.exitCode !== null || child.signalCode !== null)
+        return Promise.resolve(false);
+    return new Promise((resolve) => {
+        const killer = spawnProcess(path.join(process.env.SystemRoot ?? 'C:\\Windows', 'System32', 'taskkill.exe'), ['/PID', String(child.pid), '/T', '/F'], { shell: false, windowsHide: true, stdio: 'ignore' });
+        let settled = false;
+        const finish = (success) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            if (!success) {
+                try {
+                    child.kill('SIGKILL');
+                }
+                catch { /* The caller reports termination failure. */ }
+            }
+            resolve(success);
+        };
+        const timer = setTimeout(() => {
+            try {
+                killer.kill('SIGKILL');
+            }
+            catch { /* Settlement must remain bounded. */ }
+            finish(false);
+        }, 500);
+        killer.once('error', () => finish(false));
+        killer.once('close', (status) => finish(status === 0));
+    });
+}
 export class NodeCommandRunner {
     async run(command, options = {}) {
+        if (options.maxOutputBytes !== undefined &&
+            (!Number.isSafeInteger(options.maxOutputBytes) || options.maxOutputBytes <= 0)) {
+            throw new RangeError('maxOutputBytes must be a positive safe integer.');
+        }
         const displayCommand = formatCommand(command, options.redactArgIndices);
+        if (options.signal?.aborted) {
+            return {
+                command, displayCommand, status: null, signal: null, stdout: '', stderr: '', timedOut: false,
+                aborted: true, errorCode: 'ABORT_ERR', errorMessage: 'Command was cancelled before it started.',
+                ...(options.maxOutputBytes === undefined ? {} : { outputLimitExceeded: false })
+            };
+        }
         return new Promise((resolve) => {
             let settled = false;
+            let stopping = false;
             let timedOut = false;
+            let outputLimitExceeded = false;
+            let aborted = false;
+            let discardOutput = false;
+            let outputBytes = 0;
             let stdout = '';
             let stderr = '';
             let errorCode;
             let errorMessage;
+            let timer;
             const stdoutDecoder = new StringDecoder('utf8');
             const stderrDecoder = new StringDecoder('utf8');
             const stdoutRedactor = createStreamRedactor(options.redactValues ?? []);
             const stderrRedactor = createStreamRedactor(options.redactValues ?? []);
+            const bounded = Boolean(options.timeoutMs && options.timeoutMs > 0) ||
+                options.maxOutputBytes !== undefined || options.signal !== undefined;
+            // A dedicated POSIX group contains inherited-pipe descendants without detaching their lifetime.
+            const ownsProcessGroup = bounded && process.platform !== 'win32';
             const child = spawn(command.executable, command.args, {
                 cwd: options.cwd,
                 env: options.env ? { ...process.env, ...options.env } : process.env,
                 shell: false,
+                detached: ownsProcessGroup,
                 stdio: [options.stdin === undefined ? 'ignore' : 'pipe', 'pipe', 'pipe'],
                 windowsHide: true
             });
-            if (options.stdin !== undefined) {
-                child.stdin?.end(options.stdin);
-            }
             const finish = (status, signal) => {
                 if (settled) {
                     return;
@@ -68,8 +143,9 @@ export class NodeCommandRunner {
                 if (timer) {
                     clearTimeout(timer);
                 }
-                const stdoutEnd = stdoutDecoder.end();
-                const stderrEnd = stderrDecoder.end();
+                options.signal?.removeEventListener('abort', cancel);
+                const stdoutEnd = discardOutput ? '' : stdoutDecoder.end();
+                const stderrEnd = discardOutput ? '' : stderrDecoder.end();
                 stdout += stdoutEnd;
                 stderr += stderrEnd;
                 if (options.stream && (options.redactValues?.length ?? 0) > 0) {
@@ -90,11 +166,71 @@ export class NodeCommandRunner {
                     stdout: redactSensitiveText(stdout, options.redactValues),
                     stderr: redactSensitiveText(stderr, options.redactValues),
                     timedOut,
+                    ...(options.maxOutputBytes === undefined ? {} : { outputLimitExceeded }),
+                    ...(options.signal === undefined ? {} : { aborted }),
                     ...(errorCode ? { errorCode } : {}),
                     ...(errorMessage ? { errorMessage: redactSensitiveText(errorMessage, options.redactValues) } : {})
                 });
             };
+            const stop = () => {
+                if (settled || stopping)
+                    return;
+                stopping = true;
+                if (timer)
+                    clearTimeout(timer);
+                options.signal?.removeEventListener('abort', cancel);
+                discardOutput = outputLimitExceeded || (options.redactValues?.some((value) => value.length > 0) ?? false);
+                if (discardOutput) {
+                    stdout = '';
+                    stderr = '';
+                    stdoutRedactor.discard();
+                    stderrRedactor.discard();
+                }
+                const completeStop = (terminated) => {
+                    for (const stream of [child.stdin, child.stdout, child.stderr]) {
+                        try {
+                            stream?.destroy();
+                        }
+                        catch {
+                            terminated = false;
+                        }
+                    }
+                    if (!terminated) {
+                        errorCode = 'PROCESS_TREE_TERMINATION_FAILED';
+                        errorMessage = 'The complete command process tree could not be terminated.';
+                    }
+                    finish(null, 'SIGKILL');
+                };
+                try {
+                    void terminateProcessTree(child, ownsProcessGroup).then(completeStop, () => completeStop(false));
+                }
+                catch {
+                    completeStop(false);
+                }
+            };
+            const cancel = () => {
+                if (settled || stopping)
+                    return;
+                aborted = true;
+                errorCode = 'ABORT_ERR';
+                errorMessage = 'Command was cancelled.';
+                stop();
+            };
+            const acceptChunk = (chunk) => {
+                if (settled || stopping)
+                    return false;
+                outputBytes += Buffer.byteLength(chunk);
+                if (options.maxOutputBytes === undefined || outputBytes <= options.maxOutputBytes)
+                    return true;
+                outputLimitExceeded = true;
+                errorCode = 'MAX_OUTPUT_BYTES_EXCEEDED';
+                errorMessage = 'Child output exceeded the configured byte limit.';
+                stop();
+                return false;
+            };
             child.stdout?.on('data', (chunk) => {
+                if (!acceptChunk(chunk))
+                    return;
                 const decoded = typeof chunk === 'string' ? chunk : stdoutDecoder.write(chunk);
                 stdout += decoded;
                 if (options.stream) {
@@ -110,6 +246,8 @@ export class NodeCommandRunner {
                 }
             });
             child.stderr?.on('data', (chunk) => {
+                if (!acceptChunk(chunk))
+                    return;
                 const decoded = typeof chunk === 'string' ? chunk : stderrDecoder.write(chunk);
                 stderr += decoded;
                 if (options.stream) {
@@ -125,16 +263,34 @@ export class NodeCommandRunner {
                 }
             });
             child.on('error', (error) => {
+                if (settled || stopping)
+                    return;
                 errorCode = error.code;
                 errorMessage = error.message;
             });
-            child.on('close', finish);
-            const timer = options.timeoutMs && options.timeoutMs > 0
+            child.stdin?.on('error', (error) => {
+                if (settled || stopping)
+                    return;
+                errorCode = error.code;
+                errorMessage = error.message;
+            });
+            child.on('close', (status, signal) => {
+                if (!stopping)
+                    finish(status, signal);
+            });
+            timer = options.timeoutMs && options.timeoutMs > 0
                 ? setTimeout(() => {
+                    if (settled || stopping)
+                        return;
                     timedOut = true;
-                    child.kill('SIGTERM');
+                    stop();
                 }, options.timeoutMs)
                 : undefined;
+            options.signal?.addEventListener('abort', cancel, { once: true });
+            if (options.signal?.aborted)
+                cancel();
+            if (!stopping && options.stdin !== undefined)
+                child.stdin?.end(options.stdin);
         });
     }
 }

package/dist/process-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-runner.js","sourceRoot":"","sources":["../src/process-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process-runner.js","sourceRoot":"","sources":["../src/process-runner.ts"],"names":[],"mappings":"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"}

package/dist/project-dependencies.d.ts

@@ -1,7 +1,6 @@
-import { type CommandRunner } from './process-runner.js';
-import type { ExternalCommand, ProjectPlan } from './types.js';
+import type { CommandRunner } from './process-runner.js';
+import type { ExternalCommand, ProjectPlan } from './domain/project/contracts.js';
 import type { RequirementProbeResult } from './workstation.js';
-export { verifyPowerAppsPackageMetadata } from './power-apps-validation.js';
 export interface DependencyCommandPlan {
     id: string;
     label: string;
@@ -18,7 +17,9 @@ export interface DependencySetupResult {
     failed?: DependencyCommandPlan;
     detail?: string;
     restoredMutations: string[];
+    preservedMutations: string[];
     resumeCommand?: string;
+    resumeShell?: string;
 }
 export interface DependencySetupExecutionOptions {
     stdout: NodeJS.WritableStream;
@@ -26,6 +27,7 @@ export interface DependencySetupExecutionOptions {
     onCommand?: (command: DependencyCommandPlan) => void;
 }
 export declare function buildDependencySetupPlan(plan: ProjectPlan, projectRoot: string, _probes: RequirementProbeResult[], platform?: NodeJS.Platform): DependencySetupPlan;
+export declare function dependencyResumeShell(platform?: NodeJS.Platform): string;
 export declare function dependencyResumeCommand(command: DependencyCommandPlan, platform?: NodeJS.Platform): string;
 export declare function runDependencySetup(setup: DependencySetupPlan, projectRoot: string, runner: CommandRunner, options: DependencySetupExecutionOptions): Promise<DependencySetupResult>;
 export declare function verifyDependencyLockPair(packagePath: string, lockPath: string): Promise<boolean>;

package/dist/project-dependencies.js

@@ -1,25 +1,15 @@
 import { createHash } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
-import { formatCommand } from './process-runner.js';
-import { readProjectFile, writeProjectFile } from './file-system.js';
-export { verifyPowerAppsPackageMetadata } from './power-apps-validation.js';
+import { captureProjectFileSnapshot } from './adapters/filesystem/project-transaction.js';
+import { withProjectMutationLock } from './adapters/filesystem/project-lock.js';
+import { commandShellForPlatform, formatShellDirectoryCommand } from './adapters/process/shell-command.js';
 function npmExecutable(platform) {
     return platform === 'win32' ? 'npm.cmd' : 'npm';
 }
 export function buildDependencySetupPlan(plan, projectRoot, _probes, platform = process.platform) {
     const commands = [];
     const protectedPaths = [];
-    if (plan.workload === 'power-apps-code-app') {
-        commands.push({
-            id: 'power-apps-root',
-            label: 'Install Power Apps code app dependencies',
-            command: { executable: npmExecutable(platform), args: ['ci'] },
-            cwd: projectRoot
-        });
-        protectedPaths.push(['package.json'], ['package-lock.json']);
-        return { commands, protectedPaths };
-    }
     if (plan.apiStack.id === 'python-fastapi') {
         commands.push({
             id: 'python-backend',
@@ -81,70 +71,91 @@ function contentHash(content) {
 async function captureProtectedFiles(projectRoot, protectedPaths) {
     const snapshots = [];
     for (const pathParts of protectedPaths) {
-        const content = await readProjectFile(projectRoot, pathParts);
+        const { content, mode } = await captureProjectFileSnapshot(projectRoot, pathParts);
         if (!content) {
             throw new Error(`Dependency setup cannot protect missing file ${pathParts.join('/')}.`);
         }
-        snapshots.push({ pathParts, content, hash: contentHash(content) });
+        snapshots.push({ pathParts, hash: contentHash(content), mode });
     }
     return snapshots;
 }
-async function restoreMutations(projectRoot, snapshots) {
-    const restored = [];
+async function changedProtectedPaths(projectRoot, snapshots) {
+    const changed = [];
     for (const snapshot of snapshots) {
-        const current = await readProjectFile(projectRoot, snapshot.pathParts);
-        if (!current || contentHash(current) !== snapshot.hash) {
-            await writeProjectFile(projectRoot, snapshot.pathParts, snapshot.content.toString('utf8'));
-            restored.push(snapshot.pathParts.join('/'));
+        const current = await captureProjectFileSnapshot(projectRoot, snapshot.pathParts);
+        if (current.content === undefined ||
+            contentHash(current.content) !== snapshot.hash ||
+            current.mode !== snapshot.mode) {
+            changed.push(snapshot.pathParts.join('/'));
         }
     }
-    return restored;
+    return changed;
+}
+export function dependencyResumeShell(platform = process.platform) {
+    return commandShellForPlatform(platform) === 'powershell' ? 'PowerShell' : 'POSIX shell';
 }
 export function dependencyResumeCommand(command, platform = process.platform) {
-    const changeDirectory = platform === 'win32'
-        ? `cd /d ${JSON.stringify(command.cwd)}`
-        : `cd ${JSON.stringify(command.cwd)}`;
-    return `${changeDirectory} && ${formatCommand(command.command)}`;
+    return formatShellDirectoryCommand(command.command, command.cwd, commandShellForPlatform(platform));
 }
 export async function runDependencySetup(setup, projectRoot, runner, options) {
-    const snapshots = await captureProtectedFiles(projectRoot, setup.protectedPaths);
-    const completed = [];
-    for (const command of setup.commands) {
-        options.onCommand?.(command);
-        const result = await runner.run(command.command, {
-            cwd: command.cwd,
-            timeoutMs: 15 * 60_000,
-            stream: true,
-            stdout: options.stdout,
-            stderr: options.stderr
-        });
-        if (result.status !== 0 || result.timedOut) {
-            const restoredMutations = await restoreMutations(projectRoot, snapshots);
-            return {
-                success: false,
-                completed,
-                failed: command,
-                detail: result.timedOut
-                    ? 'dependency command timed out'
-                    : result.stderr.trim().split(/\r?\n/)[0] || `exit status ${result.status}`,
-                restoredMutations,
-                resumeCommand: dependencyResumeCommand(command)
-            };
+    return withProjectMutationLock(projectRoot, async (lease) => {
+        const snapshots = await captureProtectedFiles(projectRoot, setup.protectedPaths);
+        const completed = [];
+        for (const command of setup.commands) {
+            await lease.assertHeld();
+            const before = await changedProtectedPaths(projectRoot, snapshots);
+            if (before.length) {
+                return {
+                    success: false,
+                    completed,
+                    failed: command,
+                    detail: `Dependency metadata changed before execution and was preserved for review: ${before.join(', ')}`,
+                    restoredMutations: [],
+                    preservedMutations: before,
+                    resumeCommand: dependencyResumeCommand(command),
+                    resumeShell: dependencyResumeShell()
+                };
+            }
+            options.onCommand?.(command);
+            const result = await runner.run(command.command, {
+                cwd: command.cwd,
+                timeoutMs: 15 * 60_000,
+                stream: true,
+                stdout: options.stdout,
+                stderr: options.stderr
+            });
+            await lease.assertHeld();
+            const preservedMutations = await changedProtectedPaths(projectRoot, snapshots);
+            if (result.status !== 0 || result.timedOut || result.errorCode) {
+                return {
+                    success: false,
+                    completed,
+                    failed: command,
+                    detail: result.timedOut
+                        ? 'dependency command timed out'
+                        : result.errorMessage || result.stderr.trim().split(/\r?\n/)[0] || `exit status ${result.status}`,
+                    restoredMutations: [],
+                    preservedMutations,
+                    resumeCommand: dependencyResumeCommand(command),
+                    resumeShell: dependencyResumeShell()
+                };
+            }
+            if (preservedMutations.length > 0) {
+                return {
+                    success: false,
+                    completed,
+                    failed: command,
+                    detail: `Dependency metadata changed during setup and was preserved for review: ${preservedMutations.join(', ')}`,
+                    restoredMutations: [],
+                    preservedMutations,
+                    resumeCommand: dependencyResumeCommand(command),
+                    resumeShell: dependencyResumeShell()
+                };
+            }
+            completed.push(command);
         }
-        completed.push(command);
-        const restoredMutations = await restoreMutations(projectRoot, snapshots);
-        if (restoredMutations.length > 0) {
-            return {
-                success: false,
-                completed,
-                failed: command,
-                detail: `dependency command modified protected files: ${restoredMutations.join(', ')}`,
-                restoredMutations,
-                resumeCommand: dependencyResumeCommand(command)
-            };
-        }
-    }
-    return { success: true, completed, restoredMutations: [] };
+        return { success: true, completed, restoredMutations: [], preservedMutations: [] };
+    });
 }
 export async function verifyDependencyLockPair(packagePath, lockPath) {
     const [packageJson, lockJson] = await Promise.all([

package/dist/project-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-dependencies.js","sourceRoot":"","sources":["../src/project-dependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-dependencies.js","sourceRoot":"","sources":["../src/project-dependencies.ts"],"names":[],"mappings":"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"}