@zaly/tui 0.0.12 → 0.1.0

package/dist/{types-D2EYlzmK.d.mts → types-C9ceMsbJ.d.mts}

@@ -1,12 +1,20 @@
+import { Simplify } from "@zaly/shared";
 import { BundledLanguage, BundledTheme } from "shiki/types";
 //#region src/shiki/types.d.ts
 type ShikiTheme = BundledTheme;
 type ShikiLanguage = BundledLanguage;
+type ShikiSelection = "auto" | ShikiTheme;
+type GeneratedShikiTheme = {
+  name: string;
+  appearance: "dark" | "light";
+  styles: AnsiStyle[];
+};
+type ShikiThemeInput = ShikiTheme | GeneratedShikiTheme;
 type ShikiRequest = {
   key?: string;
   code: string;
   lang: string;
-  theme?: ShikiTheme;
+  theme?: ShikiThemeInput;
   signal?: AbortSignal;
 };
 type ShikiWorkerRequest = Omit<ShikiRequest, "lang" | "key"> & {
@@ -29,68 +37,16 @@ type ShikiWorkerMessage = {
   type: "result";
 });
 type ShikiOpts = {
-  theme?: ShikiTheme;
+  theme?: ShikiThemeInput;
   signal?: AbortSignal;
 };
 //#endregion
-//#region src/style/types.d.ts
-type RGB = [r: number, g: number, b: number];
-/** Alpha percentage for `/<alpha>` suffix on Color values. Any integer
- *  0..100 is accepted at runtime; the template literal uses `${number}`
- *  so odd values like `/98` typecheck without a cast. */
-type ColorLightness = `${number}`;
-/** Standard ANSI color names. */
-type AnsiColorName = "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "gray" | "grey";
-/** Bright ANSI variants — `brightRed`, `brightBlue`, etc. */
-type BrightAnsiColorName = `bright${Capitalize<AnsiColorName>}`;
-type AnsiColor = AnsiColorName | BrightAnsiColorName | HexColor | "inherit";
-/** Hex color string. Matches `#rgb` / `#rgba` / `#rrggbb` / `#rrggbbaa`
- *  (any case; runtime validates). Alpha is native to the hex form, so
- *  there is no separate `/<alpha>` suffix for hex. */
-type HexColor = `#${string}`;
-type ThemeKey = Exclude<keyof Theme, "shiki" | "$schema" | "id">;
-/**
- * A color value. Accepted forms:
- *  - `#rgb` / `#rrggbb` hex
- *  - ANSI color names (`red`, `cyan`, `gray`, …)
- *  - Bright ANSI variants (`brightRed`, `brightBlue`, …)
- *  - Theme slot keys from `keyof Theme` (`primary`, `muted`, …)
- *  - `'inherit'` — use the parent's color (renders as no escape).
- *  - Variant suffix `-<step>` on hex or theme slots — e.g. `primary-300`,
- *    `#82aaff-900`. The base color gets resolved through the theme
- *    (extracting the channel when needed), then `variant(base, step)`
- *    shifts it along the OKLCH tonal scale.
- */
-type Color<Ansi extends boolean = true> = HexColor | (Ansi extends true ? AnsiColorName : never) | (Ansi extends true ? BrightAnsiColorName : never) | ThemeKey | "inherit" | `${HexColor | ThemeKey}-${ColorLightness}` | `${HexColor | ThemeKey}+${ColorLightness}`;
-interface AnsiStyle {
-  fg?: AnsiColor;
-  bg?: AnsiColor;
-  bold?: boolean;
-  dim?: boolean;
-  italic?: boolean;
-  underline?: boolean;
-  inverse?: boolean;
-  strikethrough?: boolean;
-}
-/** Base style shared by every node type. Box/Text/etc. extend this.
- *  Pure styling — no layout or lifecycle fields. Widget state interfaces
- *  extend `StyleState` to pick up the `visible` base-state bits alongside
- *  these style fields. */
-type Style<Ansi extends boolean = true> = Omit<AnsiStyle, "fg" | "bg"> & {
+//#region src/themes/types.d.ts
+type ThemeStyle<Ansi extends boolean = true> = Simplify<Omit<AnsiStyle, "fg" | "bg"> & {
   fg?: Color<Ansi>;
   bg?: Color<Ansi>;
-  style?: AnyStyle<Ansi>;
-};
-type AnyStyle<Ansi extends boolean = false> = Style<Ansi> | Color<Ansi>;
-//#endregion
-//#region src/themes/types.d.ts
-/**
- * A theme slot value. Color shortcuts expand to `{ fg: <color> }` at resolve
- * time; Style objects are used as-is and may carry attrs (`bold`, `underline`,
- * etc.) and a `bg`. Use Color for simple fg-only slots; escalate to Style when
- * the part needs more than just a foreground color.
- */
-type ThemeValue = Color | Style;
+}>;
+type ThemeValue<Ansi extends boolean = true> = ThemeStyle<Ansi> | Color<Ansi>;
 /**
  * A theme is a flat record mapping semantic slots to `ThemeValue`s. Callers
  * reference slots by key (`fg: "primary"` for colors, `borderStyle: "border"`
@@ -107,103 +63,155 @@ type ThemeValue = Color | Style;
  * **Surface tiers**: `ui` → `subtle` → `overlay` (bottom → top).
  * `highlight` is orthogonal — a tinted accent surface, not a tier.
  */
-type Theme = {
+type Theme<Ansi extends boolean = true, T = ThemeValue<Ansi>> = {
   id: string;
+  /** Dark/light appearance, inferred from bg when omitted in a theme file. */
+  appearance: "dark" | "light";
   name?: string;
-  /** Optional name of a matching Shiki syntax-highlighting theme. Code
-   *  blocks and fenced markdown snippets look this up so highlighting
-   *  aligns with the TUI palette. Leave unset for themes without a
-   *  Shiki counterpart. */
-  shiki?: ShikiTheme;
-  fg: Color;
-  bg: Color;
+  /** Matching bundled Shiki theme. Unset or "auto" generates highlighting
+   *  from the syntax slots. */
+  shiki?: ShikiSelection;
+  fg: Color<Ansi, Ansi>;
+  bg: Color<Ansi, Ansi>;
   /** Brand / primary accent. */
-  primary: Color;
+  primary: Color<Ansi>;
   /** Secondary accent — distinct hue from `primary`. */
-  accent: Color;
+  accent: Color<Ansi>;
   /** Secondary text — first tier of the quietness ladder
    *  (`muted` → `quiet` → `comment`). Slightly faded but readable;
    *  good for timestamps, captions, less-prominent labels. */
-  muted: ThemeValue;
+  muted: T;
   /** De-emphasized but still readable. Reasoning / thinking text,
    *  secondary annotations, hints. */
-  quiet: ThemeValue;
+  quiet: T;
   /** Editor-comment tier — soft, often tinted. Used for code
    *  annotations, line-number labels, italic quotes. */
-  comment: ThemeValue;
+  comment: T;
   /** Section / panel titles. Typically `bold` + a fg color. */
-  title: ThemeValue;
+  title: T;
   /** Structural separators — borders, dividers, gutter lines. */
-  delim: ThemeValue;
+  delim: T;
   /** Default UI surface. Bottom of the stack. */
-  ui: ThemeValue;
+  ui: T;
   /** Popup / modal surface. One tier above `ui`. */
-  overlay: ThemeValue;
+  overlay: T;
   /** Tinted region for emphasized content within the stream — user
    *  bubble bg, focused row, callout. Distinct from `code`, which is
    *  reserved for code-block bg. */
-  highlight: ThemeValue;
+  highlight: T;
   /** Separators between messages or sections. */
-  divider: ThemeValue;
+  divider: T;
   /** Highlighted text in inputs, lists, autocomplete. */
-  selection: ThemeValue;
+  selection: T;
   /** Line-number column, diff markers. */
-  gutter: ThemeValue;
+  gutter: T;
   /** Main input-prompt styling. */
-  prompt: ThemeValue;
+  prompt: T;
   /** Structural border around panels, boxes, tables. */
-  border: ThemeValue;
+  border: T;
   /** Title text inside a bordered region (slightly stronger than
    *  `border`). */
-  borderTitle: ThemeValue;
+  borderTitle: T;
   /** Code-block surface (bg + optional fg). Default for `mdCodeBlock`. */
-  code: ThemeValue;
+  code: T;
   /** Title above a code block (e.g. file path). */
-  codeTitle: ThemeValue;
-  success: Color;
-  info: Color;
-  warn: Color;
-  error: Color;
-  syntaxBoolean: ThemeValue;
-  syntaxBracket: ThemeValue;
-  syntaxConstant: ThemeValue;
-  syntaxDelimiter: ThemeValue;
-  syntaxField: ThemeValue;
-  syntaxFunction: ThemeValue;
-  syntaxNumber: ThemeValue;
-  syntaxSpecial: ThemeValue;
-  syntaxString: ThemeValue;
-  mdBold: ThemeValue;
-  mdCode: ThemeValue;
-  mdCodeBlock: ThemeValue;
-  mdCodeBlockTitle: ThemeValue;
-  mdHeading1: ThemeValue;
-  mdHeading2: ThemeValue;
-  mdHeading3: ThemeValue;
-  mdHeading4: ThemeValue;
-  mdHeading5: ThemeValue;
-  mdHeading6: ThemeValue;
-  mdHeading: ThemeValue;
-  mdHr: ThemeValue;
-  mdItalic: ThemeValue;
-  mdLink: ThemeValue;
-  mdListBullet: ThemeValue;
-  mdListChecked: ThemeValue;
-  mdListUnchecked: ThemeValue;
-  mdQuote: ThemeValue;
-  mdStrikethrough: ThemeValue;
-  mdTable: ThemeValue;
-  mdTableHeader: ThemeValue;
-  optionName: ThemeValue;
-  optionDesc: ThemeValue;
+  codeTitle: T;
+  success: Color<Ansi>;
+  info: Color<Ansi>;
+  warn: Color<Ansi>;
+  error: Color<Ansi>;
+  syntaxBoolean: T;
+  syntaxBracket: T;
+  syntaxConstant: T;
+  syntaxDelimiter: T;
+  syntaxField: T;
+  syntaxFunction: T;
+  syntaxNumber: T;
+  syntaxSpecial: T;
+  syntaxString: T;
+  mdBold: T;
+  mdCode: T;
+  mdCodeBlock: T;
+  mdCodeBlockTitle: T;
+  mdHeading1: T;
+  mdHeading2: T;
+  mdHeading3: T;
+  mdHeading4: T;
+  mdHeading5: T;
+  mdHeading6: T;
+  mdHeading: T;
+  mdHr: T;
+  mdItalic: T;
+  mdLink: T;
+  mdListBullet: T;
+  mdListChecked: T;
+  mdListUnchecked: T;
+  mdMath: T;
+  mdQuote: T;
+  mdStrikethrough: T;
+  mdTable: T;
+  mdTableHeader: T;
+  optionName: T;
+  optionDesc: T;
   /** Currently-highlighted entry. */
-  optionActive: ThemeValue;
-  diffAdd: ThemeValue;
-  diffContext: ThemeValue;
-  diffDel: ThemeValue;
-  diffLine: ThemeValue;
-  diffTitle: ThemeValue;
+  optionActive: T;
+  diffAdd: T;
+  diffDel: T;
+  diffContext: T;
+  diffAddNum: T;
+  diffDelNum: T;
+  diffContextNum: T;
 };
 //#endregion
-export { ShikiRequest as _, AnsiStyle as a, ShikiWorkerMessage as b, Color as c, RGB as d, Style as f, ShikiOpts as g, ShikiLanguage as h, AnsiColorName as i, ColorLightness as l, ShikiJob as m, ThemeValue as n, AnyStyle as o, ThemeKey as p, AnsiColor as r, BrightAnsiColorName as s, Theme as t, HexColor as u, ShikiResult as v, ShikiWorkerRequest as x, ShikiTheme as y };
-//# sourceMappingURL=types-D2EYlzmK.d.mts.map
+//#region src/style/types.d.ts
+type RGB = [r: number, g: number, b: number];
+/** Alpha percentage for `/<alpha>` suffix on Color values. Any integer
+ *  0..100 is accepted at runtime; the template literal uses `${number}`
+ *  so odd values like `/98` typecheck without a cast. */
+type ColorLightness = `${number}`;
+/** Standard ANSI color names. */
+type AnsiColorName = "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "gray" | "grey";
+/** Bright ANSI variants — `brightRed`, `brightBlue`, etc. */
+type BrightAnsiColorName = `bright${Capitalize<AnsiColorName>}`;
+type AnsiColor = AnsiColorName | BrightAnsiColorName | HexColor | "inherit";
+/** Hex color string. Matches `#rgb` / `#rgba` / `#rrggbb` / `#rrggbbaa`
+ *  (any case; runtime validates). Alpha is native to the hex form, so
+ *  there is no separate `/<alpha>` suffix for hex. */
+type HexColor = `#${string}`;
+type ThemeKey = Exclude<keyof Theme<false, unknown>, "shiki" | "$schema" | "id" | "name" | "appearance">;
+/**
+ * A color value. Accepted forms:
+ *  - `#rgb` / `#rrggbb` hex
+ *  - ANSI color names (`red`, `cyan`, `gray`, …)
+ *  - Bright ANSI variants (`brightRed`, `brightBlue`, …)
+ *  - Theme slot keys from `keyof Theme` (`primary`, `muted`, …)
+ *  - `'inherit'` — use the parent's color (renders as no escape).
+ *  - Variant suffix `-<step>` on hex or theme slots — e.g. `primary-300`,
+ *    `#82aaff-900`. The base color gets resolved through the theme
+ *    (extracting the channel when needed), then `variant(base, step)`
+ *    shifts it along the OKLCH tonal scale.
+ */
+type Color<Ansi extends boolean = true, I = true> = HexColor | (Ansi extends true ? AnsiColorName : never) | (Ansi extends true ? BrightAnsiColorName : never) | ThemeKey | (I extends true ? "inherit" : never) | `${HexColor | ThemeKey}-${ColorLightness}` | `${HexColor | ThemeKey}+${ColorLightness}`;
+interface AnsiStyle {
+  fg?: AnsiColor;
+  bg?: AnsiColor;
+  bold?: boolean;
+  dim?: boolean;
+  italic?: boolean;
+  underline?: boolean;
+  inverse?: boolean;
+  strikethrough?: boolean;
+}
+/** Base style shared by every node type. Box/Text/etc. extend this.
+ *  Pure styling — no layout or lifecycle fields. Widget state interfaces
+ *  extend `StyleState` to pick up the `visible` base-state bits alongside
+ *  these style fields. */
+type Style<Ansi extends boolean = true> = Simplify<Omit<AnsiStyle, "fg" | "bg"> & {
+  fg?: Color<Ansi>;
+  bg?: Color<Ansi>;
+  style?: AnyStyle<Ansi>;
+}>;
+type AnyStyle<Ansi extends boolean = false> = Style<Ansi> | Color<Ansi>;
+//#endregion
+export { ShikiThemeInput as C, ShikiTheme as S, ShikiWorkerRequest as T, ShikiLanguage as _, BrightAnsiColorName as a, ShikiResult as b, HexColor as c, ThemeKey as d, Theme as f, ShikiJob as g, GeneratedShikiTheme as h, AnyStyle as i, RGB as l, ThemeValue as m, AnsiColorName as n, Color as o, ThemeStyle as p, AnsiStyle as r, ColorLightness as s, AnsiColor as t, Style as u, ShikiOpts as v, ShikiWorkerMessage as w, ShikiSelection as x, ShikiRequest as y };
+//# sourceMappingURL=types-C9ceMsbJ.d.mts.map

package/dist/types-C9ceMsbJ.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types-C9ceMsbJ.d.mts","names":[],"sources":["../src/shiki/types.ts","../src/themes/types.ts","../src/style/types.ts"],"mappings":";;;KAGY,aAAa;KACb,gBAAgB;KAChB,0BAA0B;KAC1B;EACV;EACA;EACA,QAAQ;;KAEE,kBAAkB,aAAa;KAE/B;EACV;EACA;EACA;EACA,QAAQ;EACR,SAAS;;KAGC,qBAAqB,KAAK;EACpC;EACA,MAAM;EACN;;KAGU,WAAW,qBACrB,kBAAkB,QAAQ,cAAc;EACtC;;KAGQ;EACV;EACA;EACA;EACA;;KAGU;EAAuB;KAAmB;EAAgB;;KAE1D;EACV,QAAQ;EACR,SAAS;;;;KCvCC,WAAW,+BAA+B,SACpD,KAAK;EACH,KAAK,MAAM;EACX,KAAK,MAAM;;KAGH,WAAW,+BAA+B,WAAW,QAAQ,MAAM;;;;;;;;;;;;;;;;;KAkBnE,MAAM,6BAA6B,IAAI,WAAW;EAC5D;;EAEA;EACA;;;EAGA,QAAQ;EAIR,IAAI,MAAM,MAAM;EAChB,IAAI,MAAM,MAAM;;EAEhB,SAAS,MAAM;;EAEf,QAAQ,MAAM;;;;EAOd,OAAO;;;EAGP,OAAO;;;EAGP,SAAS;;EAET,OAAO;;EAEP,OAAO;;EAKP,IAAI;;EAEJ,SAAS;;;;EAIT,WAAW;;EAKX,SAAS;;EAET,WAAW;;EAEX,QAAQ;;EAER,QAAQ;;EAER,QAAQ;;;EAGR,aAAa;;EAKb,MAAM;;EAEN,WAAW;EAIX,SAAS,MAAM;EACf,MAAM,MAAM;EACZ,MAAM,MAAM;EACZ,OAAO,MAAM;EAGb,eAAe;EACf,eAAe;EACf,gBAAgB;EAChB,iBAAiB;EACjB,aAAa;EACb,gBAAgB;EAChB,cAAc;EACd,eAAe;EACf,cAAc;EAId,QAAQ;EACR,QAAQ;EACR,aAAa;EACb,kBAAkB;EAClB,YAAY;EACZ,YAAY;EACZ,YAAY;EACZ,YAAY;EACZ,YAAY;EACZ,YAAY;EACZ,WAAW;EACX,MAAM;EACN,UAAU;EACV,QAAQ;EACR,cAAc;EACd,eAAe;EACf,iBAAiB;EACjB,QAAQ;EACR,SAAS;EACT,iBAAiB;EACjB,SAAS;EACT,eAAe;EAIf,YAAY;EACZ,YAAY;;EAEZ,cAAc;EAGd,SAAS;EACT,SAAS;EACT,aAAa;EACb,YAAY;EACZ,YAAY;EACZ,gBAAgB;;;;KCtJN,OAAO,WAAW,WAAW;;;;KAK7B;;KAGA;;KAaA,+BAA+B,WAAW;KAE1C,YAAY,gBAAgB,sBAAsB;;;;KAKlD;KACA,WAAW,cACf;;;;;;;;;;;;;KAgBI,MAAM,6BAA6B,YAC3C,YACC,oBAAoB,0BACpB,oBAAoB,+BACrB,YACC,yCACE,WAAW,YAAY,sBACvB,WAAW,YAAY;UAEb;EACf,KAAK;EACL,KAAK;EACL;EACA;EACA;EACA;EACA;EACA;;;;;;KAOU,MAAM,+BAA+B,SAC/C,KAAK;EACH,KAAK,MAAM;EACX,KAAK,MAAM;EACX,QAAQ,SAAS;;KAIT,SAAS,gCAAgC,MAAM,QAAQ,MAAM"}

package/dist/{widget-DPqBbB57.d.mts → widget-DlF32PRp.d.mts}

@@ -1,4 +1,4 @@
-import { p as Node } from "./queries-BDX8mcl5.mjs";
+import { h as Node } from "./queries-C75-wG1B.mjs";
 //#region src/widgets/widget.d.ts
 type Props = Record<string, unknown>;
 /**
@@ -46,4 +46,4 @@ type Widget<A extends unknown[] = never[], N extends Node = Node> = (...args: A)
 declare function widget<T extends Widget>(fn: T): T;
 //#endregion
 export { Widget as n, widget as r, Props as t };
-//# sourceMappingURL=widget-DPqBbB57.d.mts.map
+//# sourceMappingURL=widget-DlF32PRp.d.mts.map

package/dist/{widget-DPqBbB57.d.mts.map → widget-DlF32PRp.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"widget-DPqBbB57.d.mts","names":[],"sources":["../src/widgets/widget.ts"],"mappings":";;KAIY,QAAQ;;;;;;;;;;;KAYR,OAAO,+BAA+B,UAAU,OAAO,YAAY,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkC3E,OAAO,UAAU,QAAQ,IAAI,IAAI"}
+{"version":3,"file":"widget-DlF32PRp.d.mts","names":[],"sources":["../src/widgets/widget.ts"],"mappings":";;KAIY,QAAQ;;;;;;;;;;;KAYR,OAAO,+BAA+B,UAAU,OAAO,YAAY,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkC3E,OAAO,UAAU,QAAQ,IAAI,IAAI"}

package/dist/widgets/autocomplete.d.mts

@@ -1,2 +1,2 @@
-import { a as AutocompleteState, i as AutocompleteOptions, n as Autocomplete, o as CompletionSource, r as AutocompleteEvents, s as autocomplete, t as AcceptFn } from "../autocomplete-StW1QJZJ.mjs";
+import { a as AutocompleteState, i as AutocompleteOptions, n as Autocomplete, o as CompletionSource, r as AutocompleteEvents, s as autocomplete, t as AcceptFn } from "../autocomplete-CD30kSe_.mjs";
 export { AcceptFn, Autocomplete, AutocompleteEvents, AutocompleteOptions, AutocompleteState, CompletionSource, autocomplete };

package/dist/widgets/autocomplete.mjs

@@ -1,7 +1,7 @@
 import { S as unwrap, f as effect, h as memo, y as signal } from "../reactive-f7NpAi69.mjs";
 import { t as Node } from "../node-BZ7f6HzU.mjs";
-import { t as picker } from "../picker-Dh5IUrTk.mjs";
-import { t as Input } from "../input-BGTTujDN.mjs";
+import { t as picker } from "../picker-f6xjgACX.mjs";
+import { t as Input } from "../input-ET2YEMcl.mjs";
 //#region src/widgets/autocomplete.ts
 /**
 * Autocomplete popup bound to an `Input`. Watches the input's value and

package/dist/widgets/box.d.mts

@@ -1,2 +1,2 @@
-import { B as Padding, R as Box, V as box, z as BoxStyle } from "../queries-BDX8mcl5.mjs";
+import { B as Box, H as Padding, U as box, V as BoxStyle } from "../queries-C75-wG1B.mjs";
 export { Box, BoxStyle, Padding, box };

package/dist/widgets/box.mjs

@@ -1 +1 @@
-export { t as Box, n as box } from "../box-BkP4MF82.mjs";
+export { t as Box, n as box } from "../box-C_N_7ChP.mjs";

package/dist/widgets/code.d.mts

@@ -1,5 +1,6 @@
-import { R as Box, X as State, nt as Reactive } from "../queries-BDX8mcl5.mjs";
-import { o as AnyStyle } from "../types-D2EYlzmK.mjs";
+import { i as AnyStyle } from "../types-C9ceMsbJ.mjs";
+import { B as Box, Q as State, it as Reactive } from "../queries-C75-wG1B.mjs";
+import { t as WrapMode } from "../text-CmxbA8lk.mjs";
 //#region src/widgets/code.d.ts
 export interface CodeState {
   /** Source to render. Plain string or reactive accessor — pass a
@@ -23,6 +24,7 @@ export interface CodeState {
   offset?: Reactive<number | undefined>;
   limit?: Reactive<number | undefined>;
   more?: (more: number, msg: string) => string;
+  wrap?: WrapMode;
 }
 /**
  * Standalone code block: shiki-highlighted body inside a `code`-styled

package/dist/widgets/code.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"code.d.mts","names":["_$__box_ts0.Box"],"sources":["../../src/widgets/code.ts"],"mappings":";;;iBAciB;;;EAGf,MAAM;;;EAGN,OAAO;;;;EAIP;;;EAGA,QAAQ;;EAER;EACA,QAAQ;EACR;EACA,eAAe;EACf,SAAS;EACT,QAAQ;EACR,QAAQ,cAAc;;;;;;;;;;;;;;;;;;;;qBAqBX,OAAI,OAAkB,MAAM,eAANA"}
+{"version":3,"file":"code.d.mts","names":["_$__box_ts0.Box"],"sources":["../../src/widgets/code.ts"],"mappings":";;;;iBAgBiB;;;EAGf,MAAM;;;EAGN,OAAO;;;;EAIP;;;EAGA,QAAQ;;EAER;EACA,QAAQ;EACR;EACA,eAAe;EACf,SAAS;EACT,QAAQ;EACR,QAAQ,cAAc;EACtB,OAAO;;;;;;;;;;;;;;;;;;;;qBAqBI,OAAI,OAAkB,MAAM,eAANA"}

package/dist/widgets/code.mjs

@@ -1,9 +1,10 @@
 import { S as unwrap, h as memo, r as createAsync, w as useContext } from "../reactive-f7NpAi69.mjs";
-import { n as box } from "../box-BkP4MF82.mjs";
-import { a as formatLines } from "../text-CkQ7Irmt.mjs";
-import { n as text } from "../text-XvPfweeg.mjs";
-import { t as RenderContext } from "../render-DEIUNLkh.mjs";
-import { t as codeToAnsi } from "../shiki--ASSYv4_.mjs";
+import { n as box } from "../box-C_N_7ChP.mjs";
+import { a as formatLines } from "../text-BoJdKXLU.mjs";
+import { n as text } from "../text-DPrhma4x.mjs";
+import { t as RenderContext } from "../render-B7LfNM5K.mjs";
+import { t as codeToAnsi } from "../shiki-CJauRusM.mjs";
+import { t as shikiTheme } from "../theme-C8LkcoaK.mjs";
 import { t as widget } from "../widget-BkMwhY2p.mjs";
 import { t as show } from "../show-DR2x1YFc.mjs";
 import { extname } from "pathe";
@@ -36,7 +37,7 @@ const code = widget((props) => {
 	const body = createAsync(async () => {
 		const source = plain();
 		if (!lang || !syntax) return source;
-		return await codeToAnsi(source, lang, { theme: context?.style().theme.shiki });
+		return await codeToAnsi(source, lang, { theme: context ? shikiTheme(context.style().theme) : void 0 });
 	}, { initialValue: plain() });
 	const formatted = memo(() => formatLines(body().split("\n"), {
 		limit: unwrap(props.limit),
@@ -51,7 +52,7 @@ const code = widget((props) => {
 		padding: props.style === false ? void 0 : [0, 1],
 		style: props.style === false ? void 0 : props.style ?? "code",
 		width: "fit"
-	}, show({ when: title }, () => text((ctx) => ctx.style.codeTitle(title() ?? ""), { wrap: "none" })), text(formatted, { wrap: "none" }));
+	}, show({ when: title }, () => text((ctx) => ctx.style.codeTitle(title() ?? ""), { wrap: "none" })), text(formatted, { wrap: props.wrap ?? "none" }));
 });
 //#endregion
 export { code };

package/dist/widgets/code.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"code.mjs","names":[],"sources":["../../src/widgets/code.ts"],"sourcesContent":["import type { Reactive } from \"../core/reactive.ts\"\nimport type { State } from \"../core/state.ts\"\nimport type { AnyStyle } from \"../style/types.ts\"\n\nimport { extname } from \"pathe\"\nimport { createAsync, memo, unwrap, useContext } from \"../core/reactive.ts\"\nimport { RenderContext } from \"../core/render.ts\"\nimport { formatLines } from \"../layout/text.ts\"\nimport { codeToAnsi } from \"../shiki/shiki.ts\"\nimport { box } from \"./box.ts\"\nimport { show } from \"./show.ts\"\nimport { text } from \"./text.ts\"\nimport { widget } from \"./widget.ts\"\n\nexport interface CodeState {\n  /** Source to render. Plain string or reactive accessor — pass a\n   *  signal for streaming bash output / tool results. */\n  code: Reactive<string>\n  /** Optional file path. Drives the default `lang` (extension) and\n   *  `title` (path) when those aren't set explicitly. */\n  path?: Reactive<string>\n  /** Language for syntax highlighting (any shiki-bundled name or\n   *  alias). Defaults to `extname(path).slice(1)` when `path` is set.\n   *  Unknown langs fall through to plain rendering. */\n  lang?: string\n  /** Title line shown above the block. May contain ANSI. Defaults to\n   *  `path` when set. */\n  title?: Reactive<string>\n  /** Disable syntax highlighting even if `lang` is set. Default: `true`. */\n  syntax?: boolean\n  style?: AnyStyle | false\n  numbered?: boolean\n  numberOffset?: Reactive<number | undefined>\n  offset?: Reactive<number | undefined>\n  limit?: Reactive<number | undefined>\n  more?: (more: number, msg: string) => string\n}\n\n/**\n * Standalone code block: shiki-highlighted body inside a `code`-styled\n * shrink-to-content backdrop, optionally titled.\n *\n * Composition over custom layout — the backdrop is `box({ bg: \"code\",\n * width: \"fit\" })`, the body is plain `text(...)`. Ambient theme/style\n * arrive via `useContext(RenderContext)`; the async closure reads\n * `style()?.theme` so it stays correct across theme swaps.\n *\n * Async highlighting flows through `createAsync`: signal reads inside\n * the async closure auto-track, so `props.code` (or any other reactive\n * source) drives a re-fire. The accessor returns `initialValue` (the\n * plain source) until shiki resolves, then swaps to the highlighted\n * version. When called inside a Stream surface's `append`, the surface\n * installs a `SuspenseContext` boundary; Stream awaits it before\n * painting, so rows committed to scrollback always reflect the\n * resolved highlight rather than the initial plain source.\n */\nexport const code = widget((props: State<CodeState>) => {\n  const path = unwrap(props.path)\n  const lang = props.lang ?? (path !== undefined ? extname(path).slice(1).toLowerCase() : undefined)\n  const syntax = props.syntax ?? true\n\n  // Theme is sourced from a render-time hook since the async closure\n  // runs outside the render phase.\n\n  const context = useContext(RenderContext)\n\n  const title = memo(() => unwrap(props.title) ?? path)\n\n  const plain = () => unwrap(props.code).replace(/\\n+$/, \"\")\n\n  const body = createAsync(\n    async () => {\n      const source = plain()\n      if (!lang || !syntax) return source\n      return await codeToAnsi(source, lang, { theme: context?.style().theme.shiki })\n    },\n    { initialValue: plain() }\n  )\n\n  const formatted = memo(() =>\n    formatLines(body().split(\"\\n\"), {\n      limit: unwrap(props.limit),\n      more: props.more,\n      numberOffset: unwrap(props.numberOffset),\n      numbered: props.numbered,\n      offset: unwrap(props.offset),\n      style: context?.style().gutter,\n    }).join(\"\\n\")\n  )\n\n  return box(\n    {\n      flexDirection: \"column\",\n      padding: props.style === false ? undefined : [0, 1],\n      style: props.style === false ? undefined : (props.style ?? \"code\"),\n      width: \"fit\",\n    },\n    show({ when: title }, () =>\n      text((ctx) => ctx.style.codeTitle(title() ?? \"\"), { wrap: \"none\" })\n    ),\n    text(formatted, { wrap: \"none\" })\n  )\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwDA,MAAa,OAAO,QAAQ,UAA4B;CACtD,MAAM,OAAO,OAAO,MAAM,IAAI;CAC9B,MAAM,OAAO,MAAM,SAAS,SAAS,KAAA,IAAY,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,KAAA;CACxF,MAAM,SAAS,MAAM,UAAU;CAK/B,MAAM,UAAU,WAAW,aAAa;CAExC,MAAM,QAAQ,WAAW,OAAO,MAAM,KAAK,KAAK,IAAI;CAEpD,MAAM,cAAc,OAAO,MAAM,IAAI,CAAC,CAAC,QAAQ,QAAQ,EAAE;CAEzD,MAAM,OAAO,YACX,YAAY;EACV,MAAM,SAAS,MAAM;EACrB,IAAI,CAAC,QAAQ,CAAC,QAAQ,OAAO;EAC7B,OAAO,MAAM,WAAW,QAAQ,MAAM,EAAE,OAAO,SAAS,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC;CAC/E,GACA,EAAE,cAAc,MAAM,EAAE,CAC1B;CAEA,MAAM,YAAY,WAChB,YAAY,KAAK,CAAC,CAAC,MAAM,IAAI,GAAG;EAC9B,OAAO,OAAO,MAAM,KAAK;EACzB,MAAM,MAAM;EACZ,cAAc,OAAO,MAAM,YAAY;EACvC,UAAU,MAAM;EAChB,QAAQ,OAAO,MAAM,MAAM;EAC3B,OAAO,SAAS,MAAM,CAAC,CAAC;CAC1B,CAAC,CAAC,CAAC,KAAK,IAAI,CACd;CAEA,OAAO,IACL;EACE,eAAe;EACf,SAAS,MAAM,UAAU,QAAQ,KAAA,IAAY,CAAC,GAAG,CAAC;EAClD,OAAO,MAAM,UAAU,QAAQ,KAAA,IAAa,MAAM,SAAS;EAC3D,OAAO;CACT,GACA,KAAK,EAAE,MAAM,MAAM,SACjB,MAAM,QAAQ,IAAI,MAAM,UAAU,MAAM,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CACpE,GACA,KAAK,WAAW,EAAE,MAAM,OAAO,CAAC,CAClC;AACF,CAAC"}
+{"version":3,"file":"code.mjs","names":[],"sources":["../../src/widgets/code.ts"],"sourcesContent":["import type { Reactive } from \"../core/reactive.ts\"\nimport type { State } from \"../core/state.ts\"\nimport type { WrapMode } from \"../layout/text.ts\"\nimport type { AnyStyle } from \"../style/types.ts\"\n\nimport { extname } from \"pathe\"\nimport { createAsync, memo, unwrap, useContext } from \"../core/reactive.ts\"\nimport { RenderContext } from \"../core/render.ts\"\nimport { formatLines } from \"../layout/text.ts\"\nimport { codeToAnsi } from \"../shiki/shiki.ts\"\nimport { shikiTheme } from \"../shiki/theme.ts\"\nimport { box } from \"./box.ts\"\nimport { show } from \"./show.ts\"\nimport { text } from \"./text.ts\"\nimport { widget } from \"./widget.ts\"\n\nexport interface CodeState {\n  /** Source to render. Plain string or reactive accessor — pass a\n   *  signal for streaming bash output / tool results. */\n  code: Reactive<string>\n  /** Optional file path. Drives the default `lang` (extension) and\n   *  `title` (path) when those aren't set explicitly. */\n  path?: Reactive<string>\n  /** Language for syntax highlighting (any shiki-bundled name or\n   *  alias). Defaults to `extname(path).slice(1)` when `path` is set.\n   *  Unknown langs fall through to plain rendering. */\n  lang?: string\n  /** Title line shown above the block. May contain ANSI. Defaults to\n   *  `path` when set. */\n  title?: Reactive<string>\n  /** Disable syntax highlighting even if `lang` is set. Default: `true`. */\n  syntax?: boolean\n  style?: AnyStyle | false\n  numbered?: boolean\n  numberOffset?: Reactive<number | undefined>\n  offset?: Reactive<number | undefined>\n  limit?: Reactive<number | undefined>\n  more?: (more: number, msg: string) => string\n  wrap?: WrapMode\n}\n\n/**\n * Standalone code block: shiki-highlighted body inside a `code`-styled\n * shrink-to-content backdrop, optionally titled.\n *\n * Composition over custom layout — the backdrop is `box({ bg: \"code\",\n * width: \"fit\" })`, the body is plain `text(...)`. Ambient theme/style\n * arrive via `useContext(RenderContext)`; the async closure reads\n * `style()?.theme` so it stays correct across theme swaps.\n *\n * Async highlighting flows through `createAsync`: signal reads inside\n * the async closure auto-track, so `props.code` (or any other reactive\n * source) drives a re-fire. The accessor returns `initialValue` (the\n * plain source) until shiki resolves, then swaps to the highlighted\n * version. When called inside a Stream surface's `append`, the surface\n * installs a `SuspenseContext` boundary; Stream awaits it before\n * painting, so rows committed to scrollback always reflect the\n * resolved highlight rather than the initial plain source.\n */\nexport const code = widget((props: State<CodeState>) => {\n  const path = unwrap(props.path)\n  const lang = props.lang ?? (path !== undefined ? extname(path).slice(1).toLowerCase() : undefined)\n  const syntax = props.syntax ?? true\n\n  // Theme is sourced from a render-time hook since the async closure\n  // runs outside the render phase.\n\n  const context = useContext(RenderContext)\n\n  const title = memo(() => unwrap(props.title) ?? path)\n\n  const plain = () => unwrap(props.code).replace(/\\n+$/, \"\")\n\n  const body = createAsync(\n    async () => {\n      const source = plain()\n      if (!lang || !syntax) return source\n      return await codeToAnsi(source, lang, {\n        theme: context ? shikiTheme(context.style().theme) : undefined,\n      })\n    },\n    { initialValue: plain() }\n  )\n\n  const formatted = memo(() =>\n    formatLines(body().split(\"\\n\"), {\n      limit: unwrap(props.limit),\n      more: props.more,\n      numberOffset: unwrap(props.numberOffset),\n      numbered: props.numbered,\n      offset: unwrap(props.offset),\n      style: context?.style().gutter,\n    }).join(\"\\n\")\n  )\n\n  return box(\n    {\n      flexDirection: \"column\",\n      padding: props.style === false ? undefined : [0, 1],\n      style: props.style === false ? undefined : (props.style ?? \"code\"),\n      width: \"fit\",\n    },\n    show({ when: title }, () =>\n      text((ctx) => ctx.style.codeTitle(title() ?? \"\"), { wrap: \"none\" })\n    ),\n    text(formatted, { wrap: props.wrap ?? \"none\" })\n  )\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DA,MAAa,OAAO,QAAQ,UAA4B;CACtD,MAAM,OAAO,OAAO,MAAM,IAAI;CAC9B,MAAM,OAAO,MAAM,SAAS,SAAS,KAAA,IAAY,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,IAAI,KAAA;CACxF,MAAM,SAAS,MAAM,UAAU;CAK/B,MAAM,UAAU,WAAW,aAAa;CAExC,MAAM,QAAQ,WAAW,OAAO,MAAM,KAAK,KAAK,IAAI;CAEpD,MAAM,cAAc,OAAO,MAAM,IAAI,CAAC,CAAC,QAAQ,QAAQ,EAAE;CAEzD,MAAM,OAAO,YACX,YAAY;EACV,MAAM,SAAS,MAAM;EACrB,IAAI,CAAC,QAAQ,CAAC,QAAQ,OAAO;EAC7B,OAAO,MAAM,WAAW,QAAQ,MAAM,EACpC,OAAO,UAAU,WAAW,QAAQ,MAAM,CAAC,CAAC,KAAK,IAAI,KAAA,EACvD,CAAC;CACH,GACA,EAAE,cAAc,MAAM,EAAE,CAC1B;CAEA,MAAM,YAAY,WAChB,YAAY,KAAK,CAAC,CAAC,MAAM,IAAI,GAAG;EAC9B,OAAO,OAAO,MAAM,KAAK;EACzB,MAAM,MAAM;EACZ,cAAc,OAAO,MAAM,YAAY;EACvC,UAAU,MAAM;EAChB,QAAQ,OAAO,MAAM,MAAM;EAC3B,OAAO,SAAS,MAAM,CAAC,CAAC;CAC1B,CAAC,CAAC,CAAC,KAAK,IAAI,CACd;CAEA,OAAO,IACL;EACE,eAAe;EACf,SAAS,MAAM,UAAU,QAAQ,KAAA,IAAY,CAAC,GAAG,CAAC;EAClD,OAAO,MAAM,UAAU,QAAQ,KAAA,IAAa,MAAM,SAAS;EAC3D,OAAO;CACT,GACA,KAAK,EAAE,MAAM,MAAM,SACjB,MAAM,QAAQ,IAAI,MAAM,UAAU,MAAM,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CACpE,GACA,KAAK,WAAW,EAAE,MAAM,MAAM,QAAQ,OAAO,CAAC,CAChD;AACF,CAAC"}

package/dist/widgets/completions/actions.d.mts

@@ -1,2 +1,2 @@
-import { n as ActionsSourceOptions, r as actionsSource, t as ActionCompletionItem } from "../../actions-Dc4D4uSf.mjs";
+import { n as ActionsSourceOptions, r as actionsSource, t as ActionCompletionItem } from "../../actions--ODlgCQ5.mjs";
 export { ActionCompletionItem, ActionsSourceOptions, actionsSource };

package/dist/widgets/completions/files.d.mts

@@ -1,2 +1,2 @@
-import { n as filesSource, t as FilesSourceOptions } from "../../files-7DUYSeNc.mjs";
+import { n as filesSource, t as FilesSourceOptions } from "../../files-B_5HDBPp.mjs";
 export { FilesSourceOptions, filesSource };

package/dist/widgets/completions/github.d.mts

@@ -1,2 +1,2 @@
-import { a as githubSource, i as GithubState, n as GithubItem, r as GithubSourceOptions, t as GithubFetcher } from "../../github-C1KfXk98.mjs";
+import { a as githubSource, i as GithubState, n as GithubItem, r as GithubSourceOptions, t as GithubFetcher } from "../../github-CyRwUQ3y.mjs";
 export { GithubFetcher, GithubItem, GithubSourceOptions, GithubState, githubSource };

package/dist/widgets/completions/index.d.mts

@@ -1,4 +1,4 @@
-import { n as ActionsSourceOptions, r as actionsSource, t as ActionCompletionItem } from "../../actions-Dc4D4uSf.mjs";
-import { n as filesSource, t as FilesSourceOptions } from "../../files-7DUYSeNc.mjs";
-import { a as githubSource, i as GithubState, n as GithubItem, r as GithubSourceOptions, t as GithubFetcher } from "../../github-C1KfXk98.mjs";
+import { n as ActionsSourceOptions, r as actionsSource, t as ActionCompletionItem } from "../../actions--ODlgCQ5.mjs";
+import { n as filesSource, t as FilesSourceOptions } from "../../files-B_5HDBPp.mjs";
+import { a as githubSource, i as GithubState, n as GithubItem, r as GithubSourceOptions, t as GithubFetcher } from "../../github-CyRwUQ3y.mjs";
 export { ActionCompletionItem, ActionsSourceOptions, FilesSourceOptions, GithubFetcher, GithubItem, GithubSourceOptions, GithubState, actionsSource, filesSource, githubSource };

package/dist/widgets/diff.d.mts

@@ -1,5 +1,5 @@
-import { J as Layout, P as RenderCtx, X as State, nt as Reactive, p as Node } from "../queries-BDX8mcl5.mjs";
-import { t as WrapMode } from "../text-CCYs9RB2.mjs";
+import { I as RenderCtx, Q as State, X as Layout, h as Node, it as Reactive } from "../queries-C75-wG1B.mjs";
+import { t as WrapMode } from "../text-CmxbA8lk.mjs";
 //#region src/widgets/diff.d.ts
 export interface DiffState {
   /** Pre-state file content. Plain string or reactive accessor —

package/dist/widgets/diff.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"diff.d.mts","names":[],"sources":["../../src/widgets/diff.ts"],"mappings":";;;iBAeiB;;;EAGf,UAAU;;;EAGV,UAAU;;;;EAIV,OAAO;;;EAGP;;EAEA;EACA,OAAO;;;;;;;;;;;;;qBAuBI,aAAa,KAAK;;EAI7B,YAAY,OAAO;MA+Bf;IAAW;IAAkB;;YAOjB,QAAQ,KAAK,YAAY;EAmBhC,UAAU;;;;;;;;;;;;;wBA4BL,KAAK,OAAO,MAAM,aAAa"}
+{"version":3,"file":"diff.d.mts","names":[],"sources":["../../src/widgets/diff.ts"],"mappings":";;;iBAgBiB;;;EAGf,UAAU;;;EAGV,UAAU;;;;EAIV,OAAO;;;EAGP;;EAEA;EACA,OAAO;;;;;;;;;;;;;qBA2BI,aAAa,KAAK;;EAI7B,YAAY,OAAO;MA+Bf;IAAW;IAAkB;;YAOjB,QAAQ,KAAK,YAAY;EAqBhC,UAAU;;;;;;;;;;;;;wBA+BL,KAAK,OAAO,MAAM,aAAa"}

package/dist/widgets/diff.mjs

@@ -1,11 +1,13 @@
 import { S as unwrap, h as memo, r as createAsync, w as useContext } from "../reactive-f7NpAi69.mjs";
 import { t as Node } from "../node-BZ7f6HzU.mjs";
-import { r as countLines, t as calcLayout } from "../text-CkQ7Irmt.mjs";
-import { t as RenderContext } from "../render-DEIUNLkh.mjs";
-import { t as codeToAnsi } from "../shiki--ASSYv4_.mjs";
+import { t as calcLayout } from "../text-BoJdKXLU.mjs";
+import { t as RenderContext } from "../render-B7LfNM5K.mjs";
+import { t as codeToAnsi } from "../shiki-CJauRusM.mjs";
+import { t as shikiTheme } from "../theme-C8LkcoaK.mjs";
 import { splitAnsi, stringWidth, wrapAnsi } from "@zaly/shared/ansi";
 import { basename, extname } from "pathe";
 //#region src/widgets/diff.ts
+const NO_NEWLINE = String.raw``;
 /**
 * Show a unified diff between two file contents with syntax-highlighted
 * rows. Added rows carry a green backdrop and `+` prefix; removed rows
@@ -34,7 +36,7 @@ var Diff = class extends Node {
 			const lang = this.#lang();
 			const input = this.input;
 			if (!lang) return input;
-			const theme = context?.style().theme.shiki;
+			const theme = context ? shikiTheme(context.style().theme) : void 0;
 			const [original, modified] = await Promise.all([codeToAnsi(input.original, lang, { theme }), codeToAnsi(input.modified, lang, { theme })]);
 			return {
 				modified,
@@ -56,16 +58,18 @@ var Diff = class extends Node {
 		const input = this.input;
 		const layout = this.layout();
 		const width = Math.min(ctx.width, layout.width);
+		const original = splitLines(input.original);
+		const modified = splitLines(input.modified);
 		const opts = {
 			context: this.state.context ?? 3,
 			ctx: {
 				...ctx,
 				width
 			},
-			modified: input.modified.split("\n"),
-			modifiedHi: highlighted.modified.split("\n"),
-			original: input.original.split("\n"),
-			originalHi: highlighted.original.split("\n")
+			modified,
+			modifiedHi: splitAnsi(highlighted.modified).slice(0, modified.length),
+			original,
+			originalHi: splitAnsi(highlighted.original).slice(0, original.length)
 		};
 		this.state.wrap ??= "word";
 		return await buildDiffRows(opts);
@@ -74,10 +78,12 @@ var Diff = class extends Node {
 		const input = this.input;
 		const original = calcLayout(input.original, { wrap: this.state.wrap });
 		const modified = calcLayout(input.modified, { wrap: this.state.wrap });
-		const padding = Math.max(1, countLines(unwrap(this.state.original)), countLines(unwrap(this.state.modified))).toString().length * 2 + 4 + 4;
+		const numWidth = Math.max(1, splitLines(input.original).length, splitLines(input.modified).length).toString().length;
+		const markerWidth = [input.original, input.modified].some((s) => s !== "" && !s.endsWith("\n")) ? stringWidth(NO_NEWLINE) : 0;
+		const padding = numWidth * 2 + 4 + 4;
 		return {
 			minWidth: Math.max(original.minWidth, modified.minWidth) + padding,
-			width: Math.max(original.width, modified.width) + padding
+			width: Math.max(original.width, modified.width, markerWidth) + padding
 		};
 	}
 };
@@ -95,10 +101,20 @@ var Diff = class extends Node {
 function diff(state) {
 	return new Diff(state);
 }
+function splitLines(text) {
+	if (text === "") return [];
+	const terminated = text.endsWith("\n");
+	const lines = text.split("\n");
+	if (terminated) lines.pop();
+	return lines.map((line, i) => ({
+		terminated: i < lines.length - 1 || terminated,
+		text: line
+	}));
+}
 async function buildDiffRows(opts) {
 	const context = opts.context;
 	const { diffArrays } = await import("diff");
-	const segments = diffArrays(opts.original, opts.modified);
+	const segments = diffArrays(opts.original, opts.modified, { comparator: (a, b) => a.text === b.text && a.terminated === b.terminated });
 	const { original: origLines, modified: modLines, originalHi: origHi, modifiedHi: modHi, ctx } = opts;
 	const ann = [];
 	let oI = 0;
@@ -136,16 +152,19 @@ async function buildDiffRows(opts) {
 			content: modHi[a.modIdx] ?? origHi[a.origIdx] ?? "",
 			newNum: a.modIdx + 1,
 			origNum: a.origIdx + 1,
+			terminated: modLines[a.modIdx].terminated,
 			type: "context"
 		});
 		else if (a.kind === "remove") rows.push({
 			content: origHi[a.origIdx] ?? "",
 			origNum: a.origIdx + 1,
+			terminated: origLines[a.origIdx].terminated,
 			type: "remove"
 		});
 		else rows.push({
 			content: modHi[a.modIdx] ?? "",
 			newNum: a.modIdx + 1,
+			terminated: modLines[a.modIdx].terminated,
 			type: "add"
 		});
 	}
@@ -166,7 +185,7 @@ function renderRows(ctx, rows, origTotal, modTotal) {
 	for (const r of rows) {
 		const origStr = r.type === "add" ? "" : String(r.origNum);
 		const newStr = r.type === "remove" ? "" : String(r.newNum);
-		const gutterStyle = s.bg(`${styles[r.type]}+10`);
+		const gutterStyle = s[`${styles[r.type]}Num`] ?? ((x) => x);
 		const gutter = gutterStyle(` ${pad(origStr, numWidth)}  ${pad(newStr, numWidth)} `);
 		const prefix = r.type === "add" ? " + " : r.type === "remove" ? " - " : "   ";
 		const innerWidth = Math.max(0, contentWidth - stringWidth(prefix) - 1);
@@ -179,6 +198,10 @@ function renderRows(ctx, rows, origTotal, modTotal) {
 			const styledBody = rowStyle?.(bodyLine) ?? bodyLine;
 			out.push((i === 0 ? gutter : gutterStyle(blankGutter)) + styledBody);
 		}
+		if (!r.terminated) {
+			const marker = wrapAnsi(NO_NEWLINE, Math.max(1, contentWidth), { mode: "word" });
+			for (const line of splitAnsi(marker)) out.push(" ".repeat(gutterWidth) + s.dim(line));
+		}
 	}
 	return out;
 }