braeburn 1.4.1 → 1.4.2

package/dist/runner.js

@@ -1,4 +1,45 @@
 import { execa } from "execa";
+const FAILURE_OUTPUT_TAIL_LINE_LIMIT = 20;
+function splitNonEmptyLines(text) {
+    if (!text) {
+        return [];
+    }
+    return text.split(/\r?\n|\r/).filter(Boolean);
+}
+function buildFailureSummaryLines(shellCommand, error) {
+    const defaultMessage = error instanceof Error ? error.message : String(error);
+    if (typeof error !== "object" || error === null) {
+        return [
+            `[braeburn] Command failed: ${shellCommand}`,
+            `[braeburn] Error: ${defaultMessage}`,
+        ];
+    }
+    const errorDetails = error;
+    const summaryLines = [`[braeburn] Command failed: ${shellCommand}`];
+    if (typeof errorDetails.exitCode === "number") {
+        summaryLines.push(`[braeburn] Exit code: ${errorDetails.exitCode}`);
+    }
+    if (typeof errorDetails.signal === "string") {
+        summaryLines.push(`[braeburn] Signal: ${errorDetails.signal}`);
+    }
+    if (typeof errorDetails.shortMessage === "string" && errorDetails.shortMessage.length > 0) {
+        summaryLines.push(`[braeburn] ${errorDetails.shortMessage}`);
+    }
+    else {
+        summaryLines.push(`[braeburn] Error: ${defaultMessage}`);
+    }
+    const stderrTailLines = splitNonEmptyLines(errorDetails.stderr).slice(-FAILURE_OUTPUT_TAIL_LINE_LIMIT);
+    if (stderrTailLines.length > 0) {
+        summaryLines.push(`[braeburn] stderr tail (${stderrTailLines.length}):`);
+        summaryLines.push(...stderrTailLines.map((line) => `  ${line}`));
+    }
+    const stdoutTailLines = splitNonEmptyLines(errorDetails.stdout).slice(-FAILURE_OUTPUT_TAIL_LINE_LIMIT);
+    if (stdoutTailLines.length > 0) {
+        summaryLines.push(`[braeburn] stdout tail (${stdoutTailLines.length}):`);
+        summaryLines.push(...stdoutTailLines.map((line) => `  ${line}`));
+    }
+    return summaryLines;
+}
 export async function runShellCommand(options) {
     const subprocess = execa("bash", ["-c", options.shellCommand], {
         all: true,
@@ -18,7 +59,16 @@ export async function runShellCommand(options) {
             options.logWriter(line);
         }
     });
-    await subprocess;
+    try {
+        await subprocess;
+    }
+    catch (error) {
+        const failureSummaryLines = buildFailureSummaryLines(options.shellCommand, error);
+        for (const line of failureSummaryLines) {
+            await options.logWriter(line);
+        }
+        throw error;
+    }
 }
 export async function doesShellCommandSucceed(options) {
     const result = await execa("bash", ["-c", options.shellCommand], {

package/dist/steps/nvm.js

@@ -2,19 +2,27 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { checkPathExists } from "./runtime.js";
 const NVM_DIRECTORY = join(homedir(), ".nvm");
+const NVM_SCRIPT_PATH = join(NVM_DIRECTORY, "nvm.sh");
 // nvm is a shell function sourced from nvm.sh — it cannot be invoked as a
 // standalone binary, so we source it explicitly inside each bash invocation.
-const NVM_SOURCE_PREFIX = `export NVM_DIR="${NVM_DIRECTORY}" && source "$NVM_DIR/nvm.sh"`;
+const NVM_SOURCE_PREFIX = `export NVM_DIR="${NVM_DIRECTORY}" && source "$NVM_DIR/nvm.sh" --no-use`;
+const NVM_INSTALL_COMMAND = `${NVM_SOURCE_PREFIX} && ` +
+    `CURRENT_NODE_VERSION="$(nvm current)" && ` +
+    `if [ "$CURRENT_NODE_VERSION" = "none" ] || [ "$CURRENT_NODE_VERSION" = "system" ]; then ` +
+    `nvm install node; ` +
+    `else ` +
+    `nvm install node --reinstall-packages-from="$CURRENT_NODE_VERSION"; ` +
+    `fi`;
 const nvmStep = {
     id: "nvm",
     name: "Node.js (nvm)",
     stage: "runtime",
     description: "Install the latest Node.js via nvm, migrating packages from the current version",
     async checkIsAvailable() {
-        return checkPathExists(NVM_DIRECTORY);
+        return checkPathExists(NVM_SCRIPT_PATH);
     },
     async run(context) {
-        await context.runStep(`${NVM_SOURCE_PREFIX} && nvm install node --reinstall-packages-from=node`);
+        await context.runStep(NVM_INSTALL_COMMAND);
     },
 };
 export default nvmStep;

package/dist/ui/screen.js

@@ -2,7 +2,7 @@ import { buildHeaderLines } from "./header.js";
 import { buildActiveStepLines } from "./currentStep.js";
 import { buildOutputBoxLines } from "./outputBox.js";
 import { buildPromptLines } from "./prompt.js";
-import { buildVersionReportLines } from "./versionReport.js";
+import { buildFailedStepLogHintLines, buildVersionReportLines } from "./versionReport.js";
 export function createScreenRenderer(output = process.stdout) {
     return (content) => {
         output.write("\x1b[H\x1b[2J");
@@ -11,6 +11,16 @@ export function createScreenRenderer(output = process.stdout) {
 }
 export function buildScreen(state, terminalDimensions) {
     const lines = [];
+    const failedStepIds = state.completedStepRecords.flatMap((record, stepIndex) => {
+        if (record.phase !== "failed") {
+            return [];
+        }
+        const failedStep = state.steps[stepIndex];
+        if (!failedStep) {
+            return [];
+        }
+        return [failedStep.id];
+    });
     lines.push(...buildHeaderLines({
         steps: state.steps,
         version: state.version,
@@ -26,6 +36,10 @@ export function buildScreen(state, terminalDimensions) {
             lines.push("");
             lines.push(...buildVersionReportLines(state.versionReport));
         }
+        if (failedStepIds.length > 0) {
+            lines.push("");
+            lines.push(...buildFailedStepLogHintLines(failedStepIds));
+        }
     }
     else {
         const currentStep = state.steps[state.currentStepIndex];

package/dist/ui/versionReport.d.ts

@@ -1,2 +1,3 @@
 import type { ResolvedVersion } from "./state.js";
 export declare function buildVersionReportLines(versions: ResolvedVersion[]): string[];
+export declare function buildFailedStepLogHintLines(failedStepIds: string[]): string[];

package/dist/ui/versionReport.js

@@ -7,3 +7,6 @@ export function buildVersionReportLines(versions) {
         `  ${chalk.green.bold("✓")} ${chalk.bold("All done!")}`,
     ];
 }
+export function buildFailedStepLogHintLines(failedStepIds) {
+    return failedStepIds.map((stepId) => `  ${chalk.red.bold("✗")} ${chalk.bold(`Step ${stepId} failed.`)} ${chalk.dim(`Please run braeburn log --${stepId} to see what happened.`)}`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braeburn",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "macOS system updater CLI",
   "type": "module",
   "bin": {