@deepseek-harness-tui/dsh-tui 0.9.2 → 0.9.3

package/lib/types/ink/root.js

@@ -26,6 +26,8 @@ export const renderSync = (node, options) => {
             instance.unmount();
         },
         waitUntilExit: instance.waitUntilExit,
+        detachForShutdown: () => instance.detachForShutdown(),
+        detachStdinForHandoff: () => instance.detachStdinForHandoff(),
         cleanup: () => instances.delete(inkOptions.stdout),
     };
 };

package/lib/types/ink/terminal-querier.d.ts

@@ -112,6 +112,14 @@ export declare class TerminalQuerier {
      * before it — concurrent batches from independent callers stay isolated.
      */
     private queue;
+    /**
+     * Set by dispose(). Post-dispose send()/flush() must not touch the
+     * terminal: they would re-enable raw mode (holdRawMode) and emit query
+     * bytes after the exit funnel's cleanup has already restored cooked
+     * mode — the replies then leak into the shell (#507). Resolving as
+     * "no answer" keeps callers' .then() chains inert instead of pending.
+     */
+    private disposed;
     constructor(stdout: NodeJS.WriteStream, setRawMode?: ((enabled: boolean) => void) | undefined);
     private holdRawMode;
     /**

package/lib/types/ink/terminal-querier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-querier.d.ts","sourceRoot":"","sources":["../../../src/ink/terminal-querier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAI3D;;4CAE4C;AAC5C,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,IAAI;IACzE,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAA;IACf,6DAA6D;IAC7D,KAAK,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,CAAC,IAAI,CAAC,CAAA;CACvC,CAAA;AAED,KAAK,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAA;AACnE,KAAK,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAC7D,KAAK,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAC7D,KAAK,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC,CAAA;AACzE,KAAK,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAAA;AAC9E,KAAK,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAC7D,KAAK,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA;AAIzE;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,CAKlE;AAED;;;;;GAKG;AACH,wBAAgB,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAKhD;AAED;;;GAGG;AACH,wBAAgB,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAKhD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,aAAa,CAAC,aAAa,CAAC,CAK5D;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAKjE;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAKjE;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAK5D;AAgBD;;;GAGG;AACH,qBAAa,eAAe;IASxB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU,CAAC;IATrB;;;;OAIG;IACH,OAAO,CAAC,KAAK,CAAgB;gBAGnB,MAAM,EAAE,MAAM,CAAC,WAAW,EAC1B,UAAU,CAAC,GAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,aAAA;IAGjD,OAAO,CAAC,WAAW;IAKnB;;;;;;;;;;;;OAYG;IACH,IAAI,CAAC,CAAC,SAAS,gBAAgB,EAC7B,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GACtB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAYzB;;;;;;;;OAQG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWtB,8EAA8E;IAC9E,OAAO,IAAI,IAAI;IAQf;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI;CAqBtC"}
+{"version":3,"file":"terminal-querier.d.ts","sourceRoot":"","sources":["../../../src/ink/terminal-querier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAI3D;;4CAE4C;AAC5C,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,IAAI;IACzE,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAA;IACf,6DAA6D;IAC7D,KAAK,EAAE,CAAC,CAAC,EAAE,gBAAgB,KAAK,CAAC,IAAI,CAAC,CAAA;CACvC,CAAA;AAED,KAAK,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAA;AACnE,KAAK,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAC7D,KAAK,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAC7D,KAAK,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,CAAC,CAAA;AACzE,KAAK,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAAA;AAC9E,KAAK,WAAW,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CAAA;AAC7D,KAAK,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA;AAIzE;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,CAKlE;AAED;;;;;GAKG;AACH,wBAAgB,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAKhD;AAED;;;GAGG;AACH,wBAAgB,GAAG,IAAI,aAAa,CAAC,WAAW,CAAC,CAKhD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,aAAa,CAAC,aAAa,CAAC,CAK5D;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAKjE;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAKjE;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAK5D;AAgBD;;;GAGG;AACH,qBAAa,eAAe;IAkBxB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU,CAAC;IAlBrB;;;;OAIG;IACH,OAAO,CAAC,KAAK,CAAgB;IAE7B;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAQ;gBAGd,MAAM,EAAE,MAAM,CAAC,WAAW,EAC1B,UAAU,CAAC,GAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,aAAA;IAGjD,OAAO,CAAC,WAAW;IAKnB;;;;;;;;;;;;OAYG;IACH,IAAI,CAAC,CAAC,SAAS,gBAAgB,EAC7B,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GACtB,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAazB;;;;;;;;OAQG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAYtB,8EAA8E;IAC9E,OAAO,IAAI,IAAI;IASf;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,CAAC,CAAC,EAAE,gBAAgB,GAAG,IAAI;CAqBtC"}

package/lib/types/ink/terminal-querier.js

@@ -122,6 +122,14 @@ export class TerminalQuerier {
      * before it — concurrent batches from independent callers stay isolated.
      */
     queue = [];
+    /**
+     * Set by dispose(). Post-dispose send()/flush() must not touch the
+     * terminal: they would re-enable raw mode (holdRawMode) and emit query
+     * bytes after the exit funnel's cleanup has already restored cooked
+     * mode — the replies then leak into the shell (#507). Resolving as
+     * "no answer" keeps callers' .then() chains inert instead of pending.
+     */
+    disposed = false;
     constructor(stdout, setRawMode) {
         this.stdout = stdout;
         this.setRawMode = setRawMode;
@@ -144,6 +152,8 @@ export class TerminalQuerier {
      *   answer before the next flush() sentinel.
      */
     send(query) {
+        if (this.disposed)
+            return Promise.resolve(undefined);
         return new Promise(resolve => {
             this.queue.push({
                 kind: 'query',
@@ -164,6 +174,8 @@ export class TerminalQuerier {
      * Safe to call with no pending queries — still waits for a round-trip.
      */
     flush() {
+        if (this.disposed)
+            return Promise.resolve();
         return new Promise(resolve => {
             this.queue.push({
                 kind: 'sentinel',
@@ -175,6 +187,7 @@ export class TerminalQuerier {
     }
     /** Resolve and release all pending queries when their owning app unmounts. */
     dispose() {
+        this.disposed = true;
         for (const pending of this.queue.splice(0)) {
             if (pending.kind === 'query')
                 pending.resolve(undefined);

package/lib/types/ink/terminal.d.ts

@@ -53,6 +53,31 @@ export declare function setXtversionName(name: string): void;
  * @returns true when the terminal is xterm.js-based.
  */
 export declare function isXtermJs(): boolean;
+/**
+ * True when the terminal can be safely probed with DECRQM
+ * (`CSI ? <mode> $ p`).
+ *
+ * DECRQM carries a `$` intermediate byte before its final `p`. A conforming
+ * parser consumes the whole sequence and either answers with DECRPM or stays
+ * silent, so callers have historically treated an unanswered probe as
+ * "unsupported" and sent it unconditionally. macOS Terminal.app breaks that
+ * assumption: it does not implement DECRQM *and* its CSI parser gives up at
+ * the `$`, printing the trailing `p` to the screen as literal text. Every
+ * probe therefore leaks a visible `p` at the cursor.
+ *
+ * Terminal.app reports `TERM=xterm-256color`, so TERM sniffing cannot tell it
+ * apart from a real xterm — `TERM_PROGRAM=Apple_Terminal` is the only marker.
+ * It is not forwarded over SSH, which matches the scope of the bug: the leak
+ * only happens when the sequence reaches Terminal.app's own parser, and a
+ * remote session is parsed by whatever terminal is actually attached.
+ *
+ * Kept as an exclusion rather than an allowlist so unknown terminals keep the
+ * (correct, spec-conforming) probe and only the known-broken one opts out.
+ * Same failure mode as the extended-keys allowlist below: assuming terminals
+ * silently ignore unknown CSI is not safe in practice.
+ * @returns true when it is safe to send a DECRQM probe.
+ */
+export declare function supportsDecrqmProbe(): boolean;
 /**
  * True if this terminal correctly handles extended key reporting
  * (Kitty keyboard protocol + xterm modifyOtherKeys).
@@ -122,6 +147,23 @@ export type Terminal = {
     stdout: Writable;
     stderr: Writable;
 };
+/**
+ * Write a frame diff to the terminal as a single buffered write. Wraps
+ * the output in BSU/ESU synchronized-update markers unless skipSyncMarkers
+ * is set. No-op when the diff contains no patches.
+ * @param terminal - the terminal to write to.
+ * @param diff - the frame diff patches to render.
+ * @param skipSyncMarkers - when true, omit the BSU/ESU wrapping.
+ */
+/**
+ * Serialize a frame diff into a single ANSI string (BSU/ESU-wrapped unless
+ * skipSyncMarkers is set). Empty string when the diff has no patches.
+ * Extracted from writeDiffToTerminal so shutdown paths can write the last
+ * frame synchronously (issue #522: an async frame write racing the
+ * synchronous EXIT_ALT_SCREEN lands on the MAIN screen after the alt
+ * screen is gone, leaving misplaced residue).
+ */
+export declare function serializeDiff(terminal: Terminal, diff: Diff, skipSyncMarkers?: boolean): string;
 /**
  * Write a frame diff to the terminal as a single buffered write. Wraps
  * the output in BSU/ESU synchronized-update markers unless skipSyncMarkers

package/lib/types/ink/terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../src/ink/terminal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAKtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAYtC;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,eAAe,CAAA;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;GASG;AACH,wBAAgB,4BAA4B,IAAI,OAAO,CAuCtD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,OAAO,CAwDvD;AAcD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnD;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAGnC;AAyBD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAG9C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,WAAW,GAAE,MAAM,GAAG,SAAoC,EAC1D,kBAAkB,GAAE,MAAM,GAAG,SAA4C,GACxE,OAAO,CAOT;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAEpD;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,SAAkC,CAAA;AAEpE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAuBD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,eAAe,UAAQ,GACtB,IAAI,CAwFN"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../src/ink/terminal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAKtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAYtC;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,eAAe,CAAA;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;GASG;AACH,wBAAgB,4BAA4B,IAAI,OAAO,CAuCtD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,OAAO,CAwDvD;AAcD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnD;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,IAAI,OAAO,CAGnC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAyBD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAG9C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,WAAW,GAAE,MAAM,GAAG,SAAoC,EAC1D,kBAAkB,GAAE,MAAM,GAAG,SAA4C,GACxE,OAAO,CAOT;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAEpD;AAED;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,SAAkC,CAAA;AAEpE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAuBD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,QAAQ,CAAA;IAChB,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED;;;;;;;GAOG;AACH;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,eAAe,UAAQ,GACtB,MAAM,CAwFR;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,eAAe,UAAQ,GACtB,IAAI,CAMN"}

package/lib/types/ink/terminal.js

@@ -153,6 +153,33 @@ export function isXtermJs() {
         return true;
     return xtversionName?.startsWith('xterm.js') ?? false;
 }
+/**
+ * True when the terminal can be safely probed with DECRQM
+ * (`CSI ? <mode> $ p`).
+ *
+ * DECRQM carries a `$` intermediate byte before its final `p`. A conforming
+ * parser consumes the whole sequence and either answers with DECRPM or stays
+ * silent, so callers have historically treated an unanswered probe as
+ * "unsupported" and sent it unconditionally. macOS Terminal.app breaks that
+ * assumption: it does not implement DECRQM *and* its CSI parser gives up at
+ * the `$`, printing the trailing `p` to the screen as literal text. Every
+ * probe therefore leaks a visible `p` at the cursor.
+ *
+ * Terminal.app reports `TERM=xterm-256color`, so TERM sniffing cannot tell it
+ * apart from a real xterm — `TERM_PROGRAM=Apple_Terminal` is the only marker.
+ * It is not forwarded over SSH, which matches the scope of the bug: the leak
+ * only happens when the sequence reaches Terminal.app's own parser, and a
+ * remote session is parsed by whatever terminal is actually attached.
+ *
+ * Kept as an exclusion rather than an allowlist so unknown terminals keep the
+ * (correct, spec-conforming) probe and only the known-broken one opts out.
+ * Same failure mode as the extended-keys allowlist below: assuming terminals
+ * silently ignore unknown CSI is not safe in practice.
+ * @returns true when it is safe to send a DECRQM probe.
+ */
+export function supportsDecrqmProbe() {
+    return process.env.TERM_PROGRAM !== 'Apple_Terminal';
+}
 // Terminals known to correctly implement the Kitty keyboard protocol
 // (CSI >1u) and/or xterm modifyOtherKeys (CSI >4;2m) for ctrl+shift+<letter>
 // disambiguation. We previously enabled unconditionally (#23350), assuming
@@ -280,10 +307,18 @@ function dumpFrame(buffer) {
  * @param diff - the frame diff patches to render.
  * @param skipSyncMarkers - when true, omit the BSU/ESU wrapping.
  */
-export function writeDiffToTerminal(terminal, diff, skipSyncMarkers = false) {
+/**
+ * Serialize a frame diff into a single ANSI string (BSU/ESU-wrapped unless
+ * skipSyncMarkers is set). Empty string when the diff has no patches.
+ * Extracted from writeDiffToTerminal so shutdown paths can write the last
+ * frame synchronously (issue #522: an async frame write racing the
+ * synchronous EXIT_ALT_SCREEN lands on the MAIN screen after the alt
+ * screen is gone, leaving misplaced residue).
+ */
+export function serializeDiff(terminal, diff, skipSyncMarkers = false) {
     // No output if there are no patches
     if (diff.length === 0) {
-        return;
+        return '';
     }
     // BSU/ESU wrapping is opt-out to keep main-screen behavior unchanged.
     // Callers pass skipSyncMarkers=true when the terminal doesn't support
@@ -364,5 +399,20 @@ export function writeDiffToTerminal(terminal, diff, skipSyncMarkers = false) {
     if (useSync)
         buffer += ESU;
     dumpFrame(buffer);
+    return buffer;
+}
+/**
+ * Write a frame diff to the terminal as a single buffered write. Wraps
+ * the output in BSU/ESU synchronized-update markers unless skipSyncMarkers
+ * is set. No-op when the diff contains no patches.
+ * @param terminal - the terminal to write to.
+ * @param diff - the frame diff patches to render.
+ * @param skipSyncMarkers - when true, omit the BSU/ESU wrapping.
+ */
+export function writeDiffToTerminal(terminal, diff, skipSyncMarkers = false) {
+    const buffer = serializeDiff(terminal, diff, skipSyncMarkers);
+    if (buffer === '') {
+        return;
+    }
     terminal.stdout.write(buffer);
 }

package/lib/types/plugin-spec/registry.d.ts

@@ -1,7 +1,7 @@
 /** Load and verify the pinned dsh-TUI admission profile. */
 import type { ContractRegistry, PermissionRegistry, RegistryEntry } from './types.js';
 export declare const DSH_STD_REVISION = "614dfa1ac168db79fcf4577cf0ebb34e2e3b944b";
-export declare const ECOSYSTEM_SPEC_REVISION = "2d0236f7d4579814d9d177a58d03ebd168025960";
+export declare const ECOSYSTEM_SPEC_REVISION = "04d6798152db1df8523d97f51541adf42d3e41d9";
 export interface SpecData {
     dir: string;
     registry: ContractRegistry;

package/lib/types/plugin-spec/registry.js

@@ -5,7 +5,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createAdmissionCatalog } from './tui-extension.js';
 export const DSH_STD_REVISION = '614dfa1ac168db79fcf4577cf0ebb34e2e3b944b';
-export const ECOSYSTEM_SPEC_REVISION = '2d0236f7d4579814d9d177a58d03ebd168025960';
+export const ECOSYSTEM_SPEC_REVISION = '04d6798152db1df8523d97f51541adf42d3e41d9';
 const REGISTRY_FILE = join('registry', 'registry-0.15.json');
 const EXPECTED_PROFILE_VERSION = 'tui-admission/0.15';
 const EXPECTED_STD_REPOSITORY = 'https://github.com/Yan-Zero/dsh-std';

package/lib/types/screens/Chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAwBzB,OAAO,EAAqB,KAAK,OAAO,EAAsE,MAAM,2BAA2B,CAAA;AAC/I,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAuK3D,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,GACnC,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,oEAAoE;IACpE,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,4BA8vGA"}
+{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/screens/Chat.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAwBzB,OAAO,EAAqB,KAAK,OAAO,EAAsE,MAAM,2BAA2B,CAAA;AAC/I,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAGlE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAwJ3D,wBAAgB,IAAI,CAAC,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAkB,EAClB,cAAc,EAAE,kBAAkB,GACnC,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,aAAa,CAAA;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,oEAAoE;IACpE,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,eAAe,CAAA;IACpC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,4BAq0GA"}

package/lib/types/screens/Chat.js

@@ -39,6 +39,7 @@ import { OverlayAbove } from '../components/OverlayAbove.js';
 import { PromptInput } from '../components/PromptInput.js';
 import { GoalTodoPanel } from '../components/GoalTodoPanel.js';
 import { AutoRecapRow } from '../components/AutoRecapRow.js';
+import { BalanceReportRow } from '../components/BalanceReportRow.js';
 import { LoadedContextPanel } from '../components/LoadedContextPanel.js';
 import { StatusLine } from './StatusLine.js';
 import { WorkingSpinner, useThinkingStatus } from '../components/WorkingSpinner.js';
@@ -108,22 +109,6 @@ const NO_ROWS = [];
 function capitalize(text) {
     return text.length === 0 ? text : text[0].toUpperCase() + text.slice(1);
 }
-/**
- * CC's built-in skill commands, driven through the DSH skill system: each
- * submits an activation prompt the model resolves via its skill catalog/load
- * tools (the corresponding SKILL.md ships under ~/.dsh/skills with dsh-tui).
- */
-// i18n keys, not resolved strings: module scope evaluates before apply()'s
-// setLang, so t() must run at the call site to follow the active language.
-const SKILL_PROMPTS = {
-    audit: 'skill-audit-prompt',
-    bug: 'skill-bug-prompt',
-    practice: 'skill-practice-prompt',
-    review: 'skill-review-prompt',
-    pr_comments: 'skill-pr-comments-prompt',
-    'release-notes': 'skill-release-notes-prompt',
-    'vuln-check': 'skill-vuln-check-prompt',
-};
 /** Terminal-title spinner frames (CC's TITLE_ANIMATION_FRAMES). */
 const TITLE_ANIMATION_FRAMES = ['⠂', '⠐'];
 /** Searchable transcript text for one row (`/` incsearch, CC semantics:
@@ -349,6 +334,25 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
         recapAbortRef.current = null;
         setRecap(null);
     };
+    /** /balance report (`BalanceReportRow`): pure UI state like /recap — the
+     *  result never enters the transcript or session log. Clicking the row
+     *  re-queries (refreshing keeps the stale summary visible); a session
+     *  switch retires the report. */
+    const [balance, setBalance] = React.useState(null);
+    const balanceSeqRef = React.useRef(0);
+    const runBalance = React.useCallback(() => {
+        const seq = ++balanceSeqRef.current;
+        setBalance(prev => ({ result: prev?.result ?? null, refreshing: true }));
+        void channel.balanceInfo().then(result => {
+            if (balanceSeqRef.current !== seq)
+                return;
+            setBalance({ result, refreshing: false });
+        });
+    }, [channel]);
+    const balanceSessionId = channel.agentId;
+    React.useEffect(() => {
+        setBalance(null);
+    }, [balanceSessionId]);
     // Auto-recap (`dsh-tui.recapOnOpen`): every time the session switches
     // (mount = open/resume, rewind/fork included), summarize its tail into
     // the dim AutoRecapRow. Failures stay silent in auto mode — `/recap`
@@ -1337,6 +1341,15 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                 channel.pushLocal('/cost', lines);
                 return true;
             }
+            case 'balance': {
+                // DeepSeek official account balance (free read-only endpoint): the
+                // channel resolves DEEPSEEK_API_KEY through the credentials seam and
+                // queries api.deepseek.com/user/balance. The result renders as the
+                // interactive BalanceReportRow (hover for details, click to refresh).
+                setHelpOpen(false);
+                runBalance();
+                return true;
+            }
             case 'settings': {
                 // Plugin settings screen (issue #165): opens immediately; the screen
                 // reads sections + namespaces from the channel itself.
@@ -1718,21 +1731,6 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                 setHelpOpen(false);
                 channel.pushLocal('/connect', [t('connect-none')]);
                 return true;
-            case 'audit':
-            case 'bug':
-            case 'practice':
-            case 'review':
-            case 'pr_comments':
-            case 'release-notes':
-            case 'vuln-check': {
-                // CC's skill commands: drive the DSH skill system by sending the
-                // activation prompt to the model (it loads the skill via its skill
-                // catalog/load tools when the SKILL.md ships in ~/.dsh/skills).
-                const key = SKILL_PROMPTS[name];
-                if (key)
-                    channel.submit(t(key));
-                return true;
-            }
             default: {
                 // Plugin-registered command (DSH command registry): dispatch through
                 // the channel, whose execution logs command/run + command/done (the
@@ -2737,7 +2735,23 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
             // double-press exit when the input is empty; ctrl+d keeps the
             // time-based double-press exit regardless.
             if (channel.working) {
-                channel.cancel();
+                // First press while working only interrupts. If that abort is still
+                // converging (cancelPending) the next press is the user insisting on
+                // leaving: go straight to the exit funnel. Without this, a stuck turn
+                // (long tool call that never settles, silent stream) swallows every
+                // Ctrl+C forever — raw mode keeps the launcher's SIGINT escape
+                // unreachable until the TUI exits.
+                if (channel.cancelPending) {
+                    onExit();
+                }
+                else {
+                    channel.cancel();
+                    // Interrupt replaces any previously armed exit: the next press
+                    // must re-confirm instead of exiting out from under the turn.
+                    exitPendingRef.current = false;
+                    if (exitTimerRef.current)
+                        clearTimeout(exitTimerRef.current);
+                }
             }
             else if (input === 'c' && promptControllerRef.current?.hasText()) {
                 promptControllerRef.current.clear();
@@ -2791,6 +2805,29 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
     // Working-activity line (spinner slot): context-pressure prefix shares the
     // StatusLine thresholds (amber ≥ 80, red ≥ 95).
     const activityWarnPct = contextPressurePct(channel.lastUsage, channel.contextWindow);
+    // ── Interrupt lane ─────────────────────────────────────────────────────
+    // The approval and ask_user_question panels park the agent until the user
+    // answers, but they render inside the conversation layout — every screen
+    // early-return below (plugin scene, browser, settings, subagent, trace)
+    // used to win over them, leaving the session stuck with no visible cause.
+    // While one is pending and a screen is up, the panel takes the whole
+    // terminal INSTEAD of the screen. The screen's open flag survives, so the
+    // decision lands back on the screen (remounted fresh — the same lifecycle
+    // as closing and reopening it); keyboard exclusivity holds because the
+    // covered screen is unmounted, exactly like the chat-state prompt slot.
+    // The panel elements are shared with the prompt-slot chain below so the
+    // two mount sites cannot drift.
+    const approvalPanelNode = approvalSnapshot !== null ? (_jsx(ApprovalPanel, { approval: approvalSnapshot, onDecide: outcome => approvals.decide(outcome) }, approvalSnapshot.key)) : null;
+    const questionPanelNode = questionSnapshot !== null ? (_jsx(AskUserQuestionPanel, { question: questionSnapshot.question, position: questionSnapshot.position, total: questionSnapshot.total, answered: questionSnapshot.answered, initialDraft: questionSnapshot.draft, onAnswer: selection => questionStore.answerCurrent(selection), onCancel: () => questionStore.cancelCurrent(), onBack: questionSnapshot.canGoBack
+            ? draft => questionStore.backCurrent(draft)
+            : undefined }, questionSnapshot.key)) : null;
+    const interruptPanel = approvalPanelNode ?? questionPanelNode;
+    const screenOpen = channel.pluginScene !== undefined || browserOpen || settingsOpen
+        || subagentDetailId !== null || subagentDashboardOpen || sceneOpen;
+    if (interruptPanel !== null && screenOpen) {
+        const node = (_jsx(Box, { flexDirection: "column", width: "100%", paddingX: 1, children: interruptPanel }));
+        return fullscreen ? node : _jsx(AlternateScreen, { children: node });
+    }
     // A plugin scene (dsh-tui-scenes) takes the whole terminal the same way
     // the trajectory scene does, and sits at the TOP of this return chain:
     // an open() landing while the session browser or the trajectory scene is
@@ -2925,7 +2962,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 // transcript mount batches (and the first wheel events) for the
                                 // frame budget right when the user wants to read history. Fresh
                                 // sessions keep the full intro; restored ones settle instantly.
-                                skipIntro: channel.rows.length > 30 }, logoNonce), loadedContextVisible && (_jsx(LoadedContextPanel, { context: channel.loadedContext, open: loadedContextOpen, onToggle: toggleLoadedContext })), _jsx(MessageList, { rows: channel.rows, failureHintRowId: failureHintRowId, failureHint: t('traj-hint-failure', { key: `${modLabel}t` }), expanded: expanded, expandedRows: expandedRows, selectedId: selectionActive ? selectedId : null, onToggleRow: toggleRowExpanded, streamFoldedRows: streamFoldedRows, onToggleStreamFold: toggleStreamFolded, model: channel.model, diffLayout: channel.diffLayout, thinkingFold: channel.thinkingFold, toolBackground: channel.toolBackground, activityFrames: channel.activityFrames, showAll: showAllMessages, thinkingVisible: thinkingVisible, historyPaintEnabled: !fullscreen, onToggleAll: () => { setShowAllMessages(previous => !previous); }, onLoadOlder: () => channel.loadOlder(), registerRowRef: registerRowRef, scrollHandle: handle, forceMountRowId: forceMountRowId, newSinceRowId: isSticky ? null : lastSeenRowIdRef.current, onUnseenCount: setUnseenCount, onTimeline: setTimeline, onOpenSubagent: (agentId) => setSubagentDetailId(agentId), onOpenFile: openFileActions })] }), (() => {
+                                skipIntro: channel.rows.length > 30 }, logoNonce), loadedContextVisible && (_jsx(LoadedContextPanel, { context: channel.loadedContext, open: loadedContextOpen, onToggle: toggleLoadedContext })), _jsx(MessageList, { rows: channel.rows, failureHintRowId: failureHintRowId, failureHint: t('traj-hint-failure', { key: `${modLabel}t` }), expanded: expanded, expandedRows: expandedRows, selectedId: selectionActive ? selectedId : null, onToggleRow: toggleRowExpanded, streamFoldedRows: streamFoldedRows, onToggleStreamFold: toggleStreamFolded, model: channel.model, diffLayout: channel.diffLayout, thinkingFold: channel.thinkingFold, toolBackground: channel.toolBackground, foldTerminalCommand: channel.foldTerminalCommand, activityFrames: channel.activityFrames, showAll: showAllMessages, thinkingVisible: thinkingVisible, historyPaintEnabled: !fullscreen, onToggleAll: () => { setShowAllMessages(previous => !previous); }, onLoadOlder: () => channel.loadOlder(), registerRowRef: registerRowRef, scrollHandle: handle, forceMountRowId: forceMountRowId, newSinceRowId: isSticky ? null : lastSeenRowIdRef.current, onUnseenCount: setUnseenCount, onTimeline: setTimeline, onOpenSubagent: (agentId) => setSubagentDetailId(agentId), onOpenFile: openFileActions })] }), (() => {
                         // Gutter mode (settings `dsh-tui.scrollGutter`): the timeline
                         // rail (default), the proportional scrollbar, or nothing. The
                         // slot keeps its 2 columns in both rendered modes (Qwen's
@@ -2948,7 +2985,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 // the animated chars/4 estimate, matching the classic
                                 // spinner's counter (the suffix used raw chars before,
                                 // inflating the reading next to a real upload number).
-                                suffix: `${lastUploadTokens > 0 ? ` · ↑ ${formatTokens(lastUploadTokens)}` : ''} · ↓ ${formatTokens(Math.round(channel.responseChars / 4))} tokens` }) })) : (_jsx(WorkingSpinner, { mode: channel.spinnerMode, hasActiveTools: channel.activeToolCount > 0, responseLengthRef: responseLengthRef, uploadTokensRef: uploadTokensRef, loadingStartTimeRef: loadingStartTimeRef, totalPausedMsRef: totalPausedMsRef, pauseStartTimeRef: pauseStartTimeRef, thinkingStatus: thinkingStatus }))), _jsx(GoalTodoPanel, { channel: channel, collapsed: todoCollapsed, onToggle: () => setTodoCollapsed(previous => !previous) }), recap !== null && recap.auto && !recap.expanded && (_jsx(AutoRecapRow, { summary: recap.summary, streaming: !recap.done, onExpand: () => setRecap(prev => (prev ? { ...prev, expanded: true } : prev)), onDismiss: () => closeRecap() })), statusEntries.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate", children: statusEntries.map(entry => entry.text).join(' · ') })), approvalSnapshot !== null ? (_jsx(ApprovalPanel, { approval: approvalSnapshot, onDecide: outcome => approvals.decide(outcome) }, approvalSnapshot.key)) : dialogSnapshot !== null ? (_jsx(ExtensionDialog, { dialog: dialogSnapshot, onDecide: value => dialogs.decide(dialogSnapshot.key, value), onCancel: () => dialogs.cancel(dialogSnapshot.key) }, dialogSnapshot.key)) : overlay.kind === 'tips' ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(TipsPanel, { onClose: () => dispatchOverlay({ type: 'close-if', kind: 'tips' }) }) })) : recap !== null && (!recap.auto || recap.expanded) ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(RecapPanel, { summary: recap.summary, title: recap.title, error: recap.error, streaming: !recap.done, titleApplied: recap.titleApplied, onClose: () => {
+                                suffix: `${lastUploadTokens > 0 ? ` · ↑ ${formatTokens(lastUploadTokens)}` : ''} · ↓ ${formatTokens(Math.round(channel.responseChars / 4))} tokens` }) })) : (_jsx(WorkingSpinner, { mode: channel.spinnerMode, hasActiveTools: channel.activeToolCount > 0, responseLengthRef: responseLengthRef, uploadTokensRef: uploadTokensRef, loadingStartTimeRef: loadingStartTimeRef, totalPausedMsRef: totalPausedMsRef, pauseStartTimeRef: pauseStartTimeRef, thinkingStatus: thinkingStatus }))), _jsx(GoalTodoPanel, { channel: channel, collapsed: todoCollapsed, onToggle: () => setTodoCollapsed(previous => !previous) }), recap !== null && recap.auto && !recap.expanded && (_jsx(AutoRecapRow, { summary: recap.summary, streaming: !recap.done, onExpand: () => setRecap(prev => (prev ? { ...prev, expanded: true } : prev)), onDismiss: () => closeRecap() })), balance !== null && (_jsx(BalanceReportRow, { result: balance.result, refreshing: balance.refreshing, tokens: channel.tokens, model: channel.model, onRefresh: runBalance, onDismiss: () => setBalance(null) })), statusEntries.length > 0 && (_jsx(Text, { dimColor: true, wrap: "truncate", children: statusEntries.map(entry => entry.text).join(' · ') })), approvalPanelNode !== null ? (approvalPanelNode) : dialogSnapshot !== null ? (_jsx(ExtensionDialog, { dialog: dialogSnapshot, onDecide: value => dialogs.decide(dialogSnapshot.key, value), onCancel: () => dialogs.cancel(dialogSnapshot.key) }, dialogSnapshot.key)) : overlay.kind === 'tips' ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(TipsPanel, { onClose: () => dispatchOverlay({ type: 'close-if', kind: 'tips' }) }) })) : recap !== null && (!recap.auto || recap.expanded) ? (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(RecapPanel, { summary: recap.summary, title: recap.title, error: recap.error, streaming: !recap.done, titleApplied: recap.titleApplied, onClose: () => {
                                 // An expanded auto recap collapses back to its dim row;
                                 // a manual /recap closes outright.
                                 if (recap.auto) {
@@ -2971,9 +3008,7 @@ export function Chat({ channel, questionStore, approvalStore, extensionDialogs,
                                 void setClipboard(btw.answer ?? '').then(raw => { if (raw)
                                     writeRaw?.(raw); });
                                 channel.notify(t('copied-chars', { n: (btw.answer ?? '').length }), { timeoutMs: 1500 });
-                            } }) })) : questionSnapshot !== null ? (_jsx(AskUserQuestionPanel, { question: questionSnapshot.question, position: questionSnapshot.position, total: questionSnapshot.total, answered: questionSnapshot.answered, initialDraft: questionSnapshot.draft, onAnswer: selection => questionStore.answerCurrent(selection), onCancel: () => questionStore.cancelCurrent(), onBack: questionSnapshot.canGoBack
-                            ? draft => questionStore.backCurrent(draft)
-                            : undefined }, questionSnapshot.key)) : (_jsx(PromptInput, { channel: channel, helpOpen: helpOpen, onToggleHelp: () => { setHelpOpen(previous => !previous); }, onRunCommand: runCommand, selectionActive: promptSelectionActive, fillText: historyFill, onFillConsumed: () => { setHistoryFill(null); }, onRewindRequest: openRewind, controllerRef: promptControllerRef })), _jsx(StatusLine, { channel: channel, selectionActive: selectionActive, helpOpen: helpOpen, wake: wakeBand === undefined
+                            } }) })) : questionPanelNode !== null ? (questionPanelNode) : (_jsx(PromptInput, { channel: channel, helpOpen: helpOpen, onToggleHelp: () => { setHelpOpen(previous => !previous); }, onRunCommand: runCommand, selectionActive: promptSelectionActive, fillText: historyFill, onFillConsumed: () => { setHistoryFill(null); }, onRewindRequest: openRewind, controllerRef: promptControllerRef })), _jsx(StatusLine, { channel: channel, selectionActive: selectionActive, helpOpen: helpOpen, wake: wakeBand === undefined
                             ? undefined
                             : {
                                 band: wakeBand,

package/lib/types/screens/SessionBrowser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionBrowser.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionBrowser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAsBzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAoDxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,WAAW,EACX,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,4EAA4E;IAC5E,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAkhBlB"}
+{"version":3,"file":"SessionBrowser.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionBrowser.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAwBzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAoDxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,WAAW,EACX,OAAO,GACR,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,4EAA4E;IAC5E,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAC9C,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,GAAG,KAAK,CAAC,SAAS,CAiiBlB"}

package/lib/types/screens/SessionBrowser.js

@@ -10,22 +10,23 @@ import { useTerminalFocus } from '../ink/hooks/use-terminal-focus.js';
 import { isMod, isPlainReturn, modLabel } from '../utils/modifiers.js';
 import { formatProject, spreadRow, tailWidth, truncateWidth } from '../sessions/format.js';
 import { stringWidth } from '../ink/stringWidth.js';
+import { TICK, MULTIPLICATION_X } from '../cc/figures.js';
 import { anchorTop, buildView, DEFAULT_FILTERS, moveSelection, seekSelectable, sessionAt, windowEnd, } from '../sessions/view.js';
 import { t } from '../i18n.js';
 /**
- * Rows the layout cannot do without: the header, the search box, the hints.
- * Everything else — the rules, the list itself — yields before these do.
+ * Rows the layout cannot do without: the header, the bordered search card
+ * (three rows: top border, input, bottom border), the notice slot, and the
+ * hints. Everything else — the rule, the list itself — yields before these do.
  */
-const MANDATORY_LINES = 3;
+const MANDATORY_LINES = 6;
 /**
- * The three horizontal rules, in the order they earn their row.
+ * The one remaining horizontal rule, above the hints.
  *
- * 0 frames the header, 2 lifts the hints off the content, 1 separates the
- * search box — and that last one is the least load-bearing, so on a terminal
- * too short for all three it is the one that goes. Rules are decoration; a
- * row of content, or the hint line telling the user which keys exist, is not.
+ * The search card's own border separates it from the header and the list, so
+ * the two rules that used to flank it are gone; what remains lifts the hints
+ * off the content — decoration, and the first thing a short terminal drops.
  */
-const RULE_PRIORITY = [0, 2, 1];
+const RULE_PRIORITY = [2];
 /** Terminal width below which the preview replaces the list instead of joining it. */
 const SPLIT_MIN_COLUMNS = 100;
 /** A thrown value's message, for a notification that has to say something. */
@@ -217,6 +218,16 @@ export function SessionBrowser({ channel, home, sameProject, onClose, }) {
         if (landed !== undefined)
             setFocusId(landed.id);
     };
+    /**
+     * Mouse wheel over the list walks the cursor (the window is cursor-follow,
+     * so rolling IS scrolling; the preview pane rides along). Confirm/rename
+     * seats keep the keyboard as sole owner.
+     */
+    const handleWheel = (event) => {
+        if (mode !== 'list')
+            return;
+        step(event.deltaY >= 0 ? 1 : -1);
+    };
     // Preview follows the cursor. Keyed on the id so arrowing past a row does
     // not refetch the one it came from, and guarded on unmount so a slow read
     // landing after the cursor moved cannot overwrite a newer preview.
@@ -247,14 +258,16 @@ export function SessionBrowser({ channel, home, sameProject, onClose, }) {
     const previewWidth = splitPreview ? Math.min(56, Math.floor(columns * 0.42)) : columns;
     const listWidth = Math.max(20, columns - (splitPreview ? previewWidth : 0));
     // Height is distributed, never assumed. Mandatory rows first, then a row
-    // for each region the current state actually needs, then the rules while
+    // for each region the current state actually needs, then the rule while
     // rows remain, and the list gets what is left — which may be nothing.
     //
     // The arithmetic below is the whole vertical layout: the regions sum to
     // exactly `rows` at every height down to MANDATORY_LINES. Anything that
     // assumed a fixed chrome would overflow on a short terminal, and the row
     // that falls off the bottom is always the last one — the hints.
-    const extraLines = (mode === 'list' ? 0 : 1) + (notice === undefined ? 0 : 1);
+    // The notice slot is mandatory (permanent): a delete/rename report must
+    // never shift the list by arriving.
+    const extraLines = mode === 'list' ? 0 : 1;
     const ruleBudget = Math.max(0, Math.min(RULE_PRIORITY.length, rows - MANDATORY_LINES - extraLines));
     const rules = new Set(RULE_PRIORITY.slice(0, ruleBudget));
     const listHeight = Math.max(0, rows - MANDATORY_LINES - extraLines - rules.size);
@@ -469,12 +482,14 @@ export function SessionBrowser({ channel, home, sameProject, onClose, }) {
                 t('session-hint-list-mid', { mod: modLabel }),
                 t('session-hint-list-short'),
             ], inputBudget);
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsxs(Box, { flexShrink: 0, children: [_jsx(Text, { color: "remember", bold: true, children: header.left }), _jsx(Text, { dimColor: true, children: `${' '.repeat(header.gap)}${header.right}` })] }), rules.has(0) && (_jsx(Box, { flexShrink: 0, children: _jsx(Divider, { width: columns }) })), _jsx(Box, { flexShrink: 0, children: _jsx(SearchBox, { query: tailWidth(filters.query, inputBudget), isFocused: mode === 'list', isTerminalFocused: isTerminalFocused, placeholder: truncateWidth(t('session-search-placeholder', { scope }), inputBudget), borderless: true }) }), rules.has(1) && (_jsx(Box, { flexShrink: 0, children: _jsx(Divider, { width: columns }) })), _jsxs(Box, { flexGrow: 1, flexShrink: 1, children: [!soloPreview && (_jsxs(Box, { flexDirection: "column", width: listWidth, height: listHeight, flexShrink: 0, children: [!loaded && (_jsx(Text, { dimColor: true, italic: true, children: ` ${truncateWidth(t('session-loading'), listWidth - 2)}` })), loaded && view.rows.length === 0 && (_jsx(Text, { dimColor: true, italic: true, children: ` ${truncateWidth(t('resume-none-in-cwd'), listWidth - 2)}` })), visible.map((row, index) => row.kind === 'project' ? (_jsxs(Box, { flexShrink: 0, children: [_jsx(Text, { color: "planMode", children: truncateWidth(` ${formatProject(row.project, home)}`, listWidth - 6) }), _jsx(Text, { dimColor: true, children: `  ${row.count}` })] }, `project:${row.project}:${index}`)) : (_jsx(SessionListRow, { session: row.session, width: listWidth, depth: row.depth, focused: windowTop + index === focus, now: now, 
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsxs(Box, { flexShrink: 0, children: [_jsx(Text, { color: "remember", bold: true, children: header.left }), _jsx(Text, { dimColor: true, children: `${' '.repeat(header.gap)}${header.right}` })] }), _jsx(Box, { flexShrink: 0, children: _jsx(SearchBox, { query: tailWidth(filters.query, inputBudget), isFocused: mode === 'list', isTerminalFocused: isTerminalFocused, placeholder: truncateWidth(t('session-search-placeholder', { scope }), inputBudget) }) }), _jsxs("ink-box", { style: { flexDirection: 'row', flexGrow: 1, flexShrink: 1, overflow: 'hidden' }, onWheel: handleWheel, children: [!soloPreview && (_jsxs(Box, { flexDirection: "column", width: listWidth, height: listHeight, flexShrink: 0, children: [!loaded && (_jsx(Text, { dimColor: true, italic: true, children: ` ${truncateWidth(t('session-loading'), listWidth - 2)}` })), loaded && view.rows.length === 0 && (_jsx(Text, { dimColor: true, italic: true, children: ` ${truncateWidth(t('resume-none-in-cwd'), listWidth - 2)}` })), visible.map((row, index) => row.kind === 'project' ? (_jsxs(Box, { flexShrink: 0, children: [_jsx(Text, { color: "planMode", children: truncateWidth(` ${formatProject(row.project, home)}`, listWidth - 6) }), _jsx(Text, { dimColor: true, children: `  ${row.count}` })] }, `project:${row.project}:${index}`)) : (_jsx(SessionListRow, { session: row.session, width: listWidth, depth: row.depth, focused: windowTop + index === focus, now: now, 
                                 // 点击行 = 聚焦 + 恢复该会话（与 Enter 同路径）
                                 onClick: () => {
                                     setFocusId(row.session.id);
                                     resumeSession(row.session);
-                                } }, row.session.id)))] })), (splitPreview || soloPreview) && focused !== undefined && (_jsx(SessionPreview, { session: focused, entries: preview, loading: previewLoading, width: previewWidth, height: listHeight, home: home, now: now }))] }), notice !== undefined && (_jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: notice.tone === 'error' ? 'error' : 'success', children: ` ${truncateWidth(notice.text, Math.max(0, columns - 2))}` }) })), mode === 'confirm-delete' && focused !== undefined && (_jsx(Box, { flexShrink: 0, onClick: () => {
+                                } }, row.session.id)))] })), (splitPreview || soloPreview) && focused !== undefined && (_jsx(SessionPreview, { session: focused, entries: preview, loading: previewLoading, width: previewWidth, height: listHeight, home: home, now: now }))] }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { color: notice?.tone === 'error' ? 'error' : 'success', children: notice === undefined
+                        ? ' '
+                        : ` ${notice.tone === 'error' ? MULTIPLICATION_X : TICK} ${truncateWidth(notice.text, Math.max(0, columns - 4))}` }) }), mode === 'confirm-delete' && focused !== undefined && (_jsx(Box, { flexShrink: 0, onClick: () => {
                     // 点击确认行 = 确认删除（与 Enter 同路径）；确认屏本身就是
                     // 显式确认层，取消保留键盘 Esc，防误点
                     setMode('list');

package/lib/types/screens/SessionTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionTree.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionTree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AAqIxD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAgB,EAChB,OAAO,EACP,aAAa,GACd,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,yEAAyE;IACzE,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CACtC,GAAG,KAAK,CAAC,SAAS,CAselB"}
+{"version":3,"file":"SessionTree.d.ts","sourceRoot":"","sources":["../../../src/screens/SessionTree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AA8IxD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,gBAAgB,EAChB,OAAO,EACP,aAAa,GACd,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,yEAAyE;IACzE,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CACtC,GAAG,KAAK,CAAC,SAAS,CAyflB"}