braeburn 1.6.0 → 2.0.0

package/dist/commands/update.d.ts

@@ -1,5 +1,5 @@
 import { type PromptMode } from "../update/engine.js";
-import type { LogoVisibility } from "../update/state.js";
+import { type LogoVisibility } from "../update/state.js";
 import type { Step } from "../steps/index.js";
 type RunUpdateCommandOptions = {
     steps: Step[];
@@ -7,5 +7,12 @@ type RunUpdateCommandOptions = {
     logoVisibility: LogoVisibility;
     version: string;
 };
-export declare function runUpdateCommand(options: RunUpdateCommandOptions): Promise<void>;
+export type UpdateCommandResult = {
+    failedStepCount: number;
+};
+type ExitCodeWritable = {
+    exitCode: string | number | null | undefined;
+};
+export declare function applyUpdateCommandResult(updateCommandResult: UpdateCommandResult, processWithExitCode: ExitCodeWritable): void;
+export declare function runUpdateCommand(options: RunUpdateCommandOptions): Promise<UpdateCommandResult>;
 export {};

package/dist/commands/update.js

@@ -4,10 +4,16 @@ import { captureYesNo } from "../ui/prompt.js";
 import { buildScreen, buildScreenWithAnimationFrame, createScreenRenderer } from "../ui/screen.js";
 import { hideCursorDuringExecution } from "../ui/terminal.js";
 import { runUpdateEngine } from "../update/engine.js";
+import { countFailedSteps } from "../update/state.js";
 import { cancelActiveShellCommand } from "../runner.js";
 function shouldCaptureRuntimeAbortKey(state) {
     return state?.currentPhase === "running" || state?.currentPhase === "installing";
 }
+export function applyUpdateCommandResult(updateCommandResult, processWithExitCode) {
+    if (updateCommandResult.failedStepCount > 0) {
+        processWithExitCode.exitCode = 1;
+    }
+}
 export async function runUpdateCommand(options) {
     const renderScreen = createScreenRenderer();
     const restoreCursor = hideCursorDuringExecution({ screenBuffer: "alternate" });
@@ -15,6 +21,7 @@ export async function runUpdateCommand(options) {
     let latestState = undefined;
     let runtimeAbortKeyCaptureEnabled = false;
     let animationFrameIndex = 0;
+    let updateCommandResult = { failedStepCount: 0 };
     const handleRuntimeKeypress = (typedCharacter, key) => {
         if (key?.ctrl && key?.name === "c") {
             process.stdout.write("\x1b[?25h\n");
@@ -82,6 +89,9 @@ export async function runUpdateCommand(options) {
             },
         });
         finalScreen = buildScreen(finalState);
+        updateCommandResult = {
+            failedStepCount: countFailedSteps(finalState.completedStepRecords),
+        };
     }
     finally {
         disableRuntimeAbortKeyCapture();
@@ -91,4 +101,5 @@ export async function runUpdateCommand(options) {
     if (finalScreen) {
         process.stdout.write(finalScreen);
     }
+    return updateCommandResult;
 }

package/dist/index.js

@@ -4,7 +4,7 @@ import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
 import { ALL_STEPS } from "./steps/catalog.js";
-import { runUpdateCommand } from "./commands/update.js";
+import { applyUpdateCommandResult, runUpdateCommand } from "./commands/update.js";
 import { runLogCommand, runLogListCommand } from "./commands/log.js";
 import { runConfigCommand, runConfigUpdateCommand } from "./commands/config.js";
 import { runSetupCommand } from "./commands/setup.js";
@@ -70,12 +70,13 @@ Examples:
         stepsToRun = stepsToRun.filter((step) => isStepEnabled(config, step.id));
     }
     const logoIsEnabled = options.logo !== false && isLogoEnabled(config);
-    await runUpdateCommand({
+    const updateCommandResult = await runUpdateCommand({
         steps: stepsToRun,
         promptMode: autoYes ? "auto-accept" : "interactive",
         logoVisibility: logoIsEnabled ? "visible" : "hidden",
         version: BRAEBURN_VERSION,
     });
+    applyUpdateCommandResult(updateCommandResult, process);
 });
 program
     .command("log")

package/dist/ui/screen.d.ts

@@ -1,5 +1,5 @@
 import { type TerminalDimensions } from "./outputLines.js";
-import type { AppState } from "./state.js";
+import { type AppState } from "./state.js";
 export type ScreenRenderer = (content: string) => void;
 export declare function createScreenRenderer(output?: NodeJS.WritableStream): ScreenRenderer;
 export declare function buildScreen(state: AppState, terminalDimensions?: TerminalDimensions): string;

package/dist/ui/screen.js

@@ -3,6 +3,7 @@ import { buildActiveStepLines } from "./currentStep.js";
 import { buildStepOutputLines } from "./outputLines.js";
 import { buildPromptLines } from "./prompt.js";
 import { buildFailedStepLogHintLines, buildVersionReportLines } from "./versionReport.js";
+import { countFailedSteps } from "./state.js";
 export function createScreenRenderer(output = process.stdout) {
     return (content) => {
         output.write("\x1b[H\x1b[2J");
@@ -12,18 +13,48 @@ export function createScreenRenderer(output = process.stdout) {
 export function buildScreen(state, terminalDimensions) {
     return buildScreenWithAnimationFrame(state, 0, terminalDimensions);
 }
-export function buildScreenWithAnimationFrame(state, activityFrameIndex, terminalDimensions) {
-    const lines = [];
-    const failedStepIds = state.completedStepRecords.flatMap((record, stepIndex) => {
-        if (record.phase !== "failed") {
+function buildFailedStepLogHints(state) {
+    return state.completedStepRecords.flatMap((completedStepRecord, stepIndex) => {
+        if (completedStepRecord.phase !== "failed") {
             return [];
         }
         const failedStep = state.steps[stepIndex];
         if (!failedStep) {
             return [];
         }
-        return [failedStep.id];
+        return [{
+                stepId: failedStep.id,
+                logStepId: completedStepRecord.logStepId ?? failedStep.id,
+            }];
     });
+}
+function findLatestFailedStepDisplay(state) {
+    for (let stepIndex = state.completedStepRecords.length - 1; stepIndex >= 0; stepIndex -= 1) {
+        const completedStepRecord = state.completedStepRecords[stepIndex];
+        if (completedStepRecord?.phase !== "failed") {
+            continue;
+        }
+        const failedStep = state.steps[stepIndex];
+        if (!failedStep) {
+            continue;
+        }
+        const failureOutputLines = completedStepRecord.failureOutputLines;
+        if (!failureOutputLines || failureOutputLines.length === 0) {
+            continue;
+        }
+        return {
+            step: failedStep,
+            stepNumber: stepIndex + 1,
+            failureOutputLines,
+        };
+    }
+    return undefined;
+}
+export function buildScreenWithAnimationFrame(state, activityFrameIndex, terminalDimensions) {
+    const lines = [];
+    const failedStepCount = countFailedSteps(state.completedStepRecords);
+    const failedStepLogHints = buildFailedStepLogHints(state);
+    const latestFailedStepDisplay = findLatestFailedStepDisplay(state);
     lines.push(...buildHeaderLines({
         steps: state.steps,
         version: state.version,
@@ -38,11 +69,26 @@ export function buildScreenWithAnimationFrame(state, activityFrameIndex, termina
     if (state.runCompletion === "finished") {
         if (state.versionReport) {
             lines.push("");
-            lines.push(...buildVersionReportLines(state.versionReport));
+            lines.push(...buildVersionReportLines({
+                versions: state.versionReport,
+                failedStepCount,
+            }));
+        }
+        if (failedStepLogHints.length > 0) {
+            lines.push("");
+            lines.push(...buildFailedStepLogHintLines(failedStepLogHints));
         }
-        if (failedStepIds.length > 0) {
+        if (latestFailedStepDisplay) {
+            lines.push("");
+            lines.push(...buildActiveStepLines({
+                step: latestFailedStepDisplay.step,
+                stepNumber: latestFailedStepDisplay.stepNumber,
+                totalSteps: state.steps.length,
+                phase: "failed",
+                activityFrameIndex,
+            }));
             lines.push("");
-            lines.push(...buildFailedStepLogHintLines(failedStepIds));
+            lines.push(...buildStepOutputLines(latestFailedStepDisplay.failureOutputLines, terminalDimensions));
         }
     }
     else {
@@ -56,7 +102,9 @@ export function buildScreenWithAnimationFrame(state, activityFrameIndex, termina
                 phase: state.currentPhase,
                 activityFrameIndex,
             }));
-            const isShowingOutput = (state.currentPhase === "running" || state.currentPhase === "installing") &&
+            const isShowingOutput = (state.currentPhase === "running" ||
+                state.currentPhase === "installing" ||
+                state.currentPhase === "failed") &&
                 state.currentOutputLines.length > 0;
             if (isShowingOutput) {
                 lines.push("");

package/dist/ui/state.d.ts

@@ -1 +1 @@
-export { type DisplayStep, type StepPhase, type CompletedStepRecord, type CurrentPrompt, type ResolvedVersion, type LogoVisibility, type RunCompletion, type UpdateState, type AppState, createInitialUpdateState, createInitialAppState, } from "../update/state.js";
+export { type DisplayStep, type StepPhase, type CompletedStepRecord, type CurrentPrompt, type ResolvedVersion, type LogoVisibility, type RunCompletion, type UpdateState, type AppState, createInitialUpdateState, createInitialAppState, countFailedSteps, } from "../update/state.js";

package/dist/ui/state.js

@@ -1 +1 @@
-export { createInitialUpdateState, createInitialAppState, } from "../update/state.js";
+export { createInitialUpdateState, createInitialAppState, countFailedSteps, } from "../update/state.js";

package/dist/ui/versionReport.d.ts

@@ -1,3 +1,11 @@
 import type { ResolvedVersion } from "./state.js";
-export declare function buildVersionReportLines(versions: ResolvedVersion[]): string[];
-export declare function buildFailedStepLogHintLines(failedStepIds: string[]): string[];
+export type VersionReportOptions = {
+    versions: ResolvedVersion[];
+    failedStepCount: number;
+};
+export type FailedStepLogHint = {
+    stepId: string;
+    logStepId: string;
+};
+export declare function buildVersionReportLines(options: VersionReportOptions): string[];
+export declare function buildFailedStepLogHintLines(failedStepLogHints: FailedStepLogHint[]): string[];

package/dist/ui/versionReport.js

@@ -1,12 +1,19 @@
 import chalk from "chalk";
-export function buildVersionReportLines(versions) {
+function buildCompletionSummaryLine(failedStepCount) {
+    if (failedStepCount === 0) {
+        return `  ${chalk.green.bold("✓")} ${chalk.bold("All done!")}`;
+    }
+    const failureLabel = failedStepCount === 1 ? "1 step failed" : `${failedStepCount} steps failed`;
+    return `  ${chalk.red.bold("✗")} ${chalk.bold(`Done (${failureLabel})`)}`;
+}
+export function buildVersionReportLines(options) {
     return [
         chalk.dim("  ─── Versions ─────────────────────────"),
-        ...versions.map(({ label, value }) => `  ${chalk.dim("·")} ${chalk.bold(label + ":")} ${chalk.dim(value)}`),
+        ...options.versions.map(({ label, value }) => `  ${chalk.dim("·")} ${chalk.bold(label + ":")} ${chalk.dim(value)}`),
         "",
-        `  ${chalk.green.bold("✓")} ${chalk.bold("All done!")}`,
+        buildCompletionSummaryLine(options.failedStepCount),
     ];
 }
-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.`)}`);
+export function buildFailedStepLogHintLines(failedStepLogHints) {
+    return failedStepLogHints.map(({ stepId, logStepId }) => `  ${chalk.red.bold("✗")} ${chalk.bold(`Step ${stepId} failed.`)} ${chalk.dim(`Please run braeburn log ${logStepId} to see what happened.`)}`);
 }

package/dist/update/engine.js

@@ -1,5 +1,5 @@
 import { createLogWriterForStep } from "../logger.js";
-import { runShellCommand, ShellCommandCanceledError } from "../runner.js";
+import { runShellCommand, ShellCommandCanceledError, } from "../runner.js";
 import { createDefaultStepRunContext } from "../steps/index.js";
 import { toDisplaySteps } from "./displayStep.js";
 import { createInitialUpdateState, } from "./state.js";
@@ -29,6 +29,24 @@ function reportState(state, onStateChanged) {
 function wasStepCanceledByUser(error) {
     return error instanceof ShellCommandCanceledError;
 }
+function createFailureOutputLines(currentOutputLines, error) {
+    if (currentOutputLines.length > 0) {
+        return [...currentOutputLines];
+    }
+    const errorMessage = error instanceof Error && error.message.length > 0
+        ? error.message
+        : "Command failed.";
+    return [{ text: errorMessage, source: "stderr" }];
+}
+function createFailedStepRecord(options) {
+    const errorMessage = options.error instanceof Error ? options.error.message : String(options.error);
+    return {
+        phase: "failed",
+        summaryNote: wasStepCanceledByUser(options.error) ? "canceled by user" : errorMessage,
+        logStepId: options.logStepId,
+        failureOutputLines: [...options.failureOutputLines],
+    };
+}
 export async function runUpdateEngine(options) {
     const dependencies = resolveDependencies(options.dependencies);
     const state = createInitialUpdateState(toDisplaySteps(options.steps), options.version, options.logoVisibility);
@@ -82,12 +100,15 @@ export async function runUpdateEngine(options) {
                 if (wasStepCanceledByUser(error)) {
                     promptMode = "interactive";
                 }
+                const failureOutputLines = createFailureOutputLines(state.currentOutputLines, error);
                 state.currentPhase = "failed";
+                state.currentOutputLines = failureOutputLines;
                 reportState(state, options.onStateChanged);
-                state.completedStepRecords.push({
-                    phase: "failed",
-                    summaryNote: wasStepCanceledByUser(error) ? "canceled by user" : "install failed",
-                });
+                state.completedStepRecords.push(createFailedStepRecord({
+                    error,
+                    failureOutputLines,
+                    logStepId: `${step.id}-install`,
+                }));
                 continue;
             }
         }
@@ -121,14 +142,15 @@ export async function runUpdateEngine(options) {
             if (wasStepCanceledByUser(error)) {
                 promptMode = "interactive";
             }
-            const errorMessage = error instanceof Error ? error.message : String(error);
+            const failureOutputLines = createFailureOutputLines(state.currentOutputLines, error);
             state.currentPhase = "failed";
-            state.currentOutputLines = [];
+            state.currentOutputLines = failureOutputLines;
             reportState(state, options.onStateChanged);
-            state.completedStepRecords.push({
-                phase: "failed",
-                summaryNote: wasStepCanceledByUser(error) ? "canceled by user" : errorMessage,
-            });
+            state.completedStepRecords.push(createFailedStepRecord({
+                error,
+                failureOutputLines,
+                logStepId: step.id,
+            }));
         }
     }
     state.runCompletion = "finished";

package/dist/update/state.d.ts

@@ -10,6 +10,8 @@ export type StepPhase = "pending" | "checking-availability" | "prompting-to-inst
 export type CompletedStepRecord = {
     phase: StepPhase;
     summaryNote?: string;
+    logStepId?: string;
+    failureOutputLines?: CommandOutputLine[];
 };
 export type CurrentPrompt = {
     question: string;
@@ -36,3 +38,4 @@ export type UpdateState = {
 export type AppState = UpdateState;
 export declare function createInitialUpdateState(steps: DisplayStep[], version: string, logoVisibility: LogoVisibility): UpdateState;
 export declare const createInitialAppState: typeof createInitialUpdateState;
+export declare function countFailedSteps(completedStepRecords: CompletedStepRecord[]): number;

package/dist/update/state.js

@@ -13,3 +13,6 @@ export function createInitialUpdateState(steps, version, logoVisibility) {
     };
 }
 export const createInitialAppState = createInitialUpdateState;
+export function countFailedSteps(completedStepRecords) {
+    return completedStepRecords.filter((completedStepRecord) => completedStepRecord.phase === "failed").length;
+}

package/package.json

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