@flowscripter/dynamic-cli-framework 5.1.2 → 5.1.4

package/dist/src/service/plugin/SpawnInterfaceAdapter.d.ts

@@ -6,8 +6,10 @@ export interface SpawnInterfaceAdapterOptions {
 }
 /**
  * Adapts a {@link SpawnService} to dynamic-plugin-framework's {@link SpawnInterface}, wrapping
- * spawned process output in a quoted, marked block via {@link PrinterService} that is cleared
- * again once the process exits (subject to {@link SpawnInterfaceAdapterOptions.markMinimumDisplayTimeMs}).
+ * spawned process output in a quoted, marked block via {@link PrinterService}. On success the
+ * block is cleared once the process exits (subject to
+ * {@link SpawnInterfaceAdapterOptions.markMinimumDisplayTimeMs}); on failure the block is left
+ * on screen so the diagnostic output from the failing command remains visible.
  */
 export default class SpawnInterfaceAdapter implements SpawnInterface {
     #private;

package/dist/src/service/plugin/SpawnInterfaceAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpawnInterfaceAdapter.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/SpawnInterfaceAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1F,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAOhE,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE,4BAAiC;IAQ/B,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GACvB,OAAO,CAAC,WAAW,CAAC;CA+BxB"}
+{"version":3,"file":"SpawnInterfaceAdapter.d.ts","sourceRoot":"","sources":["../../../../src/service/plugin/SpawnInterfaceAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1F,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,cAAc;;gBAOhE,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,EAC9B,OAAO,GAAE,4BAAiC;IAQ/B,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GACvB,OAAO,CAAC,WAAW,CAAC;CAsCxB"}

package/dist/src/service/plugin/SpawnInterfaceAdapter.js

@@ -1,7 +1,9 @@
 /**
  * Adapts a {@link SpawnService} to dynamic-plugin-framework's {@link SpawnInterface}, wrapping
- * spawned process output in a quoted, marked block via {@link PrinterService} that is cleared
- * again once the process exits (subject to {@link SpawnInterfaceAdapterOptions.markMinimumDisplayTimeMs}).
+ * spawned process output in a quoted, marked block via {@link PrinterService}. On success the
+ * block is cleared once the process exits (subject to
+ * {@link SpawnInterfaceAdapterOptions.markMinimumDisplayTimeMs}); on failure the block is left
+ * on screen so the diagnostic output from the failing command remains visible.
  */
 export default class SpawnInterfaceAdapter {
     #spawnService;
@@ -32,7 +34,15 @@ export default class SpawnInterfaceAdapter {
         await writeQueue;
         this.#printerService.endQuote();
         this.#printerService.endMark();
-        await this.#printerService.clearMarked(this.#markMinimumDisplayTimeMs);
+        if (result.ok) {
+            await this.#printerService.clearMarked(this.#markMinimumDisplayTimeMs);
+        }
+        else {
+            // Leave the marked/quoted output on screen so the failing command's diagnostic output is
+            // visible, but still reset the mark/quote bookkeeping so a subsequent spawn() can start a
+            // fresh mark region.
+            this.#printerService.discardMark();
+        }
         if (result.ok) {
             return { ok: true, exitCode: result.exitCode };
         }

package/dist/src/service/printer/DefaultPrinterService.d.ts

@@ -22,6 +22,7 @@ export default class DefaultPrinterService implements PrinterService {
     emphasised(message: string): string;
     selected(message: string): string;
     italic(message: string): string;
+    dim(message: string): string;
     yellow(message: string): string;
     orange(message: string): string;
     red(message: string): string;
@@ -53,6 +54,12 @@ export default class DefaultPrinterService implements PrinterService {
     endQuote(): void;
     startMark(): void;
     endMark(): void;
+    /**
+     * Stop tracking rows for the current mark region without erasing them - e.g. when the marked
+     * output should be left on screen (such as a spawned command's output on failure), but the
+     * mark/quote bookkeeping still needs to be reset so a later startMark() doesn't throw.
+     */
+    discardMark(): void;
     clearMarked(minimumDisplayTimeMs?: number): Promise<void>;
     setLevel(level: Level): Promise<void>;
     getLevel(): Level;

package/dist/src/service/printer/DefaultPrinterService.d.ts.map

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

package/dist/src/service/printer/DefaultPrinterService.js

@@ -118,6 +118,9 @@ export default class DefaultPrinterService {
     italic(message) {
         return this.#styler.italicText(message);
     }
+    dim(message) {
+        return this.#styler.dimText(message);
+    }
     yellow(message) {
         return this.#styler.colorText(message, this.#theme[Color.YELLOW]);
     }
@@ -241,6 +244,18 @@ export default class DefaultPrinterService {
         }
         this.#markEndedAt = Date.now();
     }
+    /**
+     * Stop tracking rows for the current mark region without erasing them - e.g. when the marked
+     * output should be left on screen (such as a spawned command's output on failure), but the
+     * mark/quote bookkeeping still needs to be reset so a later startMark() doesn't throw.
+     */
+    discardMark() {
+        if (this.#markedLineCount === undefined) {
+            throw new Error("discardMark() called without a preceding startMark()");
+        }
+        this.#markedLineCount = undefined;
+        this.#markEndedAt = undefined;
+    }
     async clearMarked(minimumDisplayTimeMs = 0) {
         if (this.#markedLineCount === undefined || this.#markEndedAt === undefined) {
             throw new Error("clearMarked() called without a preceding endMark()");

package/dist/src/service/printer/terminal/Quote.js

@@ -44,7 +44,7 @@ export default class Quote {
         }
         const endsWithNewline = message.endsWith("\n");
         const raw = endsWithNewline ? message.slice(0, -1) : message;
-        const lines = raw.split("\n").map((line) => this.#prefixLine() + line);
+        const lines = raw.split("\n").map((line) => this.#prefixLine() + this.#styler.dimText(line));
         return lines.join("\n") + (endsWithNewline ? "\n" : "");
     }
 }

package/dist/src/service/spawn/DefaultSpawnService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultSpawnService.d.ts","sourceRoot":"","sources":["../../../../src/service/spawn/DefaultSpawnService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,yCAAyC,CAAC;AAOjD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAa3E;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,YAAY;;IAIvD,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,GAAG,IAAI;IAkDjF,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,WAAW,CAAC;CA8ExB"}
+{"version":3,"file":"DefaultSpawnService.d.ts","sourceRoot":"","sources":["../../../../src/service/spawn/DefaultSpawnService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EACf,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,yCAAyC,CAAC;AAOjD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAa3E;AAED,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,YAAY;;IAIvD,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,GAAG,IAAI;IAkDjF,KAAK,CAChB,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,EAC9B,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,WAAW,CAAC;CAuFxB"}

package/dist/src/service/spawn/DefaultSpawnService.js

@@ -99,14 +99,21 @@ export default class DefaultSpawnService {
             }
             await this.#terminate(proc, command);
         });
+        // These are intentionally not awaited here - they only complete once the child's stdout/
+        // stderr streams reach EOF, which can happen slightly after proc.exited resolves. They are
+        // awaited below, before returning, so that every onOutput callback (and thus every write it
+        // triggers) is guaranteed to have completed before the caller acts on the result.
+        let pipeStdout = Promise.resolve();
+        let pipeStderr = Promise.resolve();
         if (mode === "wrapped" && options.onOutput) {
             const onOutput = options.onOutput;
-            void this.#pipeLines(proc.stdout, "stdout", onOutput);
-            void this.#pipeLines(proc.stderr, "stderr", onOutput);
+            pipeStdout = this.#pipeLines(proc.stdout, "stdout", onOutput);
+            pipeStderr = this.#pipeLines(proc.stderr, "stderr", onOutput);
         }
         try {
             if (options.timeoutMs === undefined) {
                 const exitCode = await proc.exited;
+                await Promise.all([pipeStdout, pipeStderr]);
                 settled = true;
                 return exitCode === 0 ? { ok: true, exitCode } : { ok: false, exitCode };
             }
@@ -121,10 +128,12 @@ export default class DefaultSpawnService {
             if (timedOut) {
                 logger.debug(() => `Command '${command.join(" ")}' timed out after ${options.timeoutMs}ms`);
                 await this.#terminate(proc, command);
+                await Promise.all([pipeStdout, pipeStderr]);
                 settled = true;
                 return { ok: false, timedOut: true };
             }
             const exitCode = await proc.exited;
+            await Promise.all([pipeStdout, pipeStderr]);
             settled = true;
             return exitCode === 0 ? { ok: true, exitCode } : { ok: false, exitCode };
         }

package/dist/src/terminal/Ansi.d.ts

@@ -5,6 +5,8 @@ export declare const HIDE_CURSOR: string;
 export declare const SHOW_CURSOR: string;
 export declare const ITALIC_START: string;
 export declare const ITALIC_END: string;
+export declare const DIM_START: string;
+export declare const DIM_END: string;
 export declare const FOREGROUND_COLOR_END: string;
 export declare const BACKGROUND_COLOR_END: string;
 export declare const HYPERLINK_END = "\u001B]8;;\u0007";

package/dist/src/terminal/Ansi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Ansi.d.ts","sourceRoot":"","sources":["../../../src/terminal/Ansi.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,QAAa,CAAC;AACrC,eAAO,MAAM,WAAW,QAAY,CAAC;AACrC,eAAO,MAAM,SAAS,QAAa,CAAC;AACpC,eAAO,MAAM,WAAW,QAAe,CAAC;AACxC,eAAO,MAAM,WAAW,QAAe,CAAC;AACxC,eAAO,MAAM,YAAY,QAAa,CAAC;AACvC,eAAO,MAAM,UAAU,QAAc,CAAC;AACtC,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAChD,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAChD,eAAO,MAAM,aAAa,qBAA8B,CAAC;AAEzD,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAElD"}
+{"version":3,"file":"Ansi.d.ts","sourceRoot":"","sources":["../../../src/terminal/Ansi.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,UAAU,QAAa,CAAC;AACrC,eAAO,MAAM,WAAW,QAAY,CAAC;AACrC,eAAO,MAAM,SAAS,QAAa,CAAC;AACpC,eAAO,MAAM,WAAW,QAAe,CAAC;AACxC,eAAO,MAAM,WAAW,QAAe,CAAC;AACxC,eAAO,MAAM,YAAY,QAAa,CAAC;AACvC,eAAO,MAAM,UAAU,QAAc,CAAC;AACtC,eAAO,MAAM,SAAS,QAAa,CAAC;AACpC,eAAO,MAAM,OAAO,QAAc,CAAC;AACnC,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAChD,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAChD,eAAO,MAAM,aAAa,qBAA8B,CAAC;AAEzD,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAElD"}

package/dist/src/terminal/Ansi.js

@@ -9,6 +9,8 @@ export const HIDE_CURSOR = CSI + "?25l";
 export const SHOW_CURSOR = CSI + "?25h";
 export const ITALIC_START = CSI + "3m";
 export const ITALIC_END = CSI + "23m";
+export const DIM_START = CSI + "2m";
+export const DIM_END = CSI + "22m";
 export const FOREGROUND_COLOR_END = CSI + "39m";
 export const BACKGROUND_COLOR_END = CSI + "49m";
 export const HYPERLINK_END = `${OSC}8${SEP}${SEP}${BEL}`;

package/dist/src/terminal/Styler.d.ts

@@ -4,6 +4,7 @@ export default interface Styler {
     colorText(text: string, colorValue: number): string;
     backgroundColorText(text: string, colorValue: number): string;
     italicText(text: string): string;
+    dimText(text: string): string;
     hyperlink(text: string, url: string): string;
 }
 //# sourceMappingURL=Styler.d.ts.map

package/dist/src/terminal/Styler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Styler.d.ts","sourceRoot":"","sources":["../../../src/terminal/Styler.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,WAAW,MAAM;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IACpD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9C"}
+{"version":3,"file":"Styler.d.ts","sourceRoot":"","sources":["../../../src/terminal/Styler.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,WAAW,MAAM;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IACpD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACjC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9C"}

package/dist/src/terminal/TtyStyler.d.ts

@@ -15,6 +15,7 @@ export default class TtyStyler implements Styler {
     colorText(text: string, colorValue: number): string;
     backgroundColorText(text: string, colorValue: number): string;
     italicText(text: string): string;
+    dimText(text: string): string;
     hyperlink(text: string, url: string): string;
 }
 //# sourceMappingURL=TtyStyler.d.ts.map

package/dist/src/terminal/TtyStyler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TtyStyler.d.ts","sourceRoot":"","sources":["../../../src/terminal/TtyStyler.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,MAAM,CAAC,OAAO,OAAO,SAAU,YAAW,MAAM;IAC9C,YAAY,EAAE,OAAO,CAAQ;IAC7B,iBAAiB,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B;;;;;;;OAOG;gBACS,UAAU,GAAE,MAAU,EAAE,iBAAiB,GAAE,OAAc;IAKrE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAgBnD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAyB7D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAOhC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;CAM7C"}
+{"version":3,"file":"TtyStyler.d.ts","sourceRoot":"","sources":["../../../src/terminal/TtyStyler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,MAAM,CAAC,OAAO,OAAO,SAAU,YAAW,MAAM;IAC9C,YAAY,EAAE,OAAO,CAAQ;IAC7B,iBAAiB,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B;;;;;;;OAOG;gBACS,UAAU,GAAE,MAAU,EAAE,iBAAiB,GAAE,OAAc;IAKrE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAgBnD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAyB7D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAOhC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAO7B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;CAM7C"}

package/dist/src/terminal/TtyStyler.js

@@ -1,4 +1,4 @@
-import { BACKGROUND_COLOR_END, FOREGROUND_COLOR_END, HYPERLINK_END, hyperlinkStart, ITALIC_END, ITALIC_START, } from "./Ansi.js";
+import { BACKGROUND_COLOR_END, DIM_END, DIM_START, FOREGROUND_COLOR_END, HYPERLINK_END, hyperlinkStart, ITALIC_END, ITALIC_START, } from "./Ansi.js";
 export default class TtyStyler {
     colorEnabled = true;
     hyperlinksEnabled;
@@ -50,6 +50,12 @@ export default class TtyStyler {
         }
         return ITALIC_START + text + ITALIC_END;
     }
+    dimText(text) {
+        if (!this.colorEnabled || this.colorLevel === 0) {
+            return text;
+        }
+        return DIM_START + text + DIM_END;
+    }
     hyperlink(text, url) {
         if (!this.hyperlinksEnabled) {
             return `${text}: ${url}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/dynamic-cli-framework",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "description": "A framework for developing CLI applications which supports dynamic discovery and installation of new commands",
   "keywords": [
     "bun",
@@ -48,7 +48,7 @@
     "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
-    "@flowscripter/dynamic-cli-framework-api": "^2.0.0",
+    "@flowscripter/dynamic-cli-framework-api": "^2.2.0",
     "@flowscripter/dynamic-plugin-framework": "2.1.1",
     "emphasize": "^7.0.0",
     "fastest-levenshtein": "^1.0.16",

package/src/service/plugin/SpawnInterfaceAdapter.ts

@@ -8,8 +8,10 @@ export interface SpawnInterfaceAdapterOptions {
 
 /**
  * Adapts a {@link SpawnService} to dynamic-plugin-framework's {@link SpawnInterface}, wrapping
- * spawned process output in a quoted, marked block via {@link PrinterService} that is cleared
- * again once the process exits (subject to {@link SpawnInterfaceAdapterOptions.markMinimumDisplayTimeMs}).
+ * spawned process output in a quoted, marked block via {@link PrinterService}. On success the
+ * block is cleared once the process exits (subject to
+ * {@link SpawnInterfaceAdapterOptions.markMinimumDisplayTimeMs}); on failure the block is left
+ * on screen so the diagnostic output from the failing command remains visible.
  */
 export default class SpawnInterfaceAdapter implements SpawnInterface {
   readonly #spawnService: SpawnService;
@@ -53,7 +55,14 @@ export default class SpawnInterfaceAdapter implements SpawnInterface {
 
     this.#printerService.endQuote();
     this.#printerService.endMark();
-    await this.#printerService.clearMarked(this.#markMinimumDisplayTimeMs);
+    if (result.ok) {
+      await this.#printerService.clearMarked(this.#markMinimumDisplayTimeMs);
+    } else {
+      // Leave the marked/quoted output on screen so the failing command's diagnostic output is
+      // visible, but still reset the mark/quote bookkeeping so a subsequent spawn() can start a
+      // fresh mark region.
+      this.#printerService.discardMark();
+    }
 
     if (result.ok) {
       return { ok: true, exitCode: result.exitCode };

package/src/service/printer/DefaultPrinterService.ts

@@ -152,6 +152,10 @@ export default class DefaultPrinterService implements PrinterService {
     return this.#styler.italicText(message);
   }
 
+  public dim(message: string): string {
+    return this.#styler.dimText(message);
+  }
+
   public yellow(message: string): string {
     return this.#styler.colorText(message, this.#theme[Color.YELLOW]!);
   }
@@ -312,6 +316,19 @@ export default class DefaultPrinterService implements PrinterService {
     this.#markEndedAt = Date.now();
   }
 
+  /**
+   * Stop tracking rows for the current mark region without erasing them - e.g. when the marked
+   * output should be left on screen (such as a spawned command's output on failure), but the
+   * mark/quote bookkeeping still needs to be reset so a later startMark() doesn't throw.
+   */
+  public discardMark(): void {
+    if (this.#markedLineCount === undefined) {
+      throw new Error("discardMark() called without a preceding startMark()");
+    }
+    this.#markedLineCount = undefined;
+    this.#markEndedAt = undefined;
+  }
+
   public async clearMarked(minimumDisplayTimeMs = 0): Promise<void> {
     if (this.#markedLineCount === undefined || this.#markEndedAt === undefined) {
       throw new Error("clearMarked() called without a preceding endMark()");

package/src/service/printer/terminal/Quote.ts

@@ -60,7 +60,7 @@ export default class Quote {
     }
     const endsWithNewline = message.endsWith("\n");
     const raw = endsWithNewline ? message.slice(0, -1) : message;
-    const lines = raw.split("\n").map((line) => this.#prefixLine() + line);
+    const lines = raw.split("\n").map((line) => this.#prefixLine() + this.#styler.dimText(line));
     return lines.join("\n") + (endsWithNewline ? "\n" : "");
   }
 }

package/src/service/spawn/DefaultSpawnService.ts

@@ -129,15 +129,22 @@ export default class DefaultSpawnService implements SpawnService {
       await this.#terminate(proc, command);
     });
 
+    // These are intentionally not awaited here - they only complete once the child's stdout/
+    // stderr streams reach EOF, which can happen slightly after proc.exited resolves. They are
+    // awaited below, before returning, so that every onOutput callback (and thus every write it
+    // triggers) is guaranteed to have completed before the caller acts on the result.
+    let pipeStdout: Promise<void> = Promise.resolve();
+    let pipeStderr: Promise<void> = Promise.resolve();
     if (mode === "wrapped" && options.onOutput) {
       const onOutput = options.onOutput;
-      void this.#pipeLines(proc.stdout, "stdout", onOutput);
-      void this.#pipeLines(proc.stderr, "stderr", onOutput);
+      pipeStdout = this.#pipeLines(proc.stdout, "stdout", onOutput);
+      pipeStderr = this.#pipeLines(proc.stderr, "stderr", onOutput);
     }
 
     try {
       if (options.timeoutMs === undefined) {
         const exitCode = await proc.exited;
+        await Promise.all([pipeStdout, pipeStderr]);
         settled = true;
         return exitCode === 0 ? { ok: true, exitCode } : { ok: false, exitCode };
       }
@@ -154,11 +161,13 @@ export default class DefaultSpawnService implements SpawnService {
       if (timedOut) {
         logger.debug(() => `Command '${command.join(" ")}' timed out after ${options.timeoutMs}ms`);
         await this.#terminate(proc, command);
+        await Promise.all([pipeStdout, pipeStderr]);
         settled = true;
         return { ok: false, timedOut: true };
       }
 
       const exitCode = await proc.exited;
+      await Promise.all([pipeStdout, pipeStderr]);
       settled = true;
       return exitCode === 0 ? { ok: true, exitCode } : { ok: false, exitCode };
     } finally {

package/src/terminal/Ansi.ts

@@ -10,6 +10,8 @@ export const HIDE_CURSOR = CSI + "?25l";
 export const SHOW_CURSOR = CSI + "?25h";
 export const ITALIC_START = CSI + "3m";
 export const ITALIC_END = CSI + "23m";
+export const DIM_START = CSI + "2m";
+export const DIM_END = CSI + "22m";
 export const FOREGROUND_COLOR_END = CSI + "39m";
 export const BACKGROUND_COLOR_END = CSI + "49m";
 export const HYPERLINK_END = `${OSC}8${SEP}${SEP}${BEL}`;

package/src/terminal/Styler.ts

@@ -4,5 +4,6 @@ export default interface Styler {
   colorText(text: string, colorValue: number): string;
   backgroundColorText(text: string, colorValue: number): string;
   italicText(text: string): string;
+  dimText(text: string): string;
   hyperlink(text: string, url: string): string;
 }

package/src/terminal/TtyStyler.ts

@@ -1,5 +1,7 @@
 import {
   BACKGROUND_COLOR_END,
+  DIM_END,
+  DIM_START,
   FOREGROUND_COLOR_END,
   HYPERLINK_END,
   hyperlinkStart,
@@ -75,6 +77,13 @@ export default class TtyStyler implements Styler {
     return ITALIC_START + text + ITALIC_END;
   }
 
+  dimText(text: string): string {
+    if (!this.colorEnabled || this.colorLevel === 0) {
+      return text;
+    }
+    return DIM_START + text + DIM_END;
+  }
+
   hyperlink(text: string, url: string): string {
     if (!this.hyperlinksEnabled) {
       return `${text}: ${url}`;