@zaly/tui 0.0.12 → 0.1.1

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-B0yyZ-Ww.mjs";
+import { n as filesSource, t as FilesSourceOptions } from "../../files-CdiDnwA_.mjs";
+import { a as githubSource, i as GithubState, n as GithubItem, r as GithubSourceOptions, t as GithubFetcher } from "../../github-DC0XemKa.mjs";
 export { ActionCompletionItem, ActionsSourceOptions, FilesSourceOptions, GithubFetcher, GithubItem, GithubSourceOptions, GithubState, actionsSource, filesSource, githubSource };

package/dist/widgets/completions/index.mjs

@@ -1,4 +1,4 @@
-import { t as actionsSource } from "../../actions-DEIKF2ts.mjs";
-import { t as filesSource } from "../../files-BvThQpOf.mjs";
-import { t as githubSource } from "../../github-Cy2hfWJ7.mjs";
+import { t as actionsSource } from "../../actions-AY6avfEV.mjs";
+import { t as filesSource } from "../../files-C3ZnFpvq.mjs";
+import { t as githubSource } from "../../github-CLveT9mq.mjs";
 export { actionsSource, filesSource, githubSource };

package/dist/widgets/diff.d.mts

@@ -1,6 +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";
-//#region src/widgets/diff.d.ts
+import { I as RenderCtx, Q as State, X as Layout, h as Node, it as Reactive } from "../queries-Dmd3IjSd.mjs";
+import { t as WrapMode } from "../text-DdkJXgoC.mjs";
 export interface DiffState {
   /** Pre-state file content. Plain string or reactive accessor —
    *  pass a signal to live-update the diff as either side changes. */
@@ -52,5 +51,4 @@ export declare class Diff extends Node<DiffState> {
  * ```
  */
 export declare function diff(state: State<DiffState>): Diff;
-//#endregion
 //# sourceMappingURL=diff.d.mts.map

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 { S as unwrap, h as memo, r as createAsync, w as useContext } from "../reactive-DkP75TPk.mjs";
+import { t as Node } from "../node-CXNobGaP.mjs";
+import { t as calcLayout } from "../text-4arC3odI.mjs";
+import { t as RenderContext } from "../render-Bp2N2i6J.mjs";
+import { t as codeToAnsi } from "../shiki-BAf9PdIc.mjs";
+import { t as shikiTheme } from "../theme-B8hb1lPU.mjs";
 import { splitAnsi, stringWidth, wrapAnsi } from "@zaly/shared/ansi";
 import { basename, extname } from "pathe";
-//#region src/widgets/diff.ts
+// 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;
 }
@@ -193,7 +216,6 @@ function langFromPath(path) {
 	if (ext) return ext;
 	return basename(path).toLowerCase() || void 0;
 }
-//#endregion
 export { Diff, diff };
 
 //# sourceMappingURL=diff.mjs.map

package/dist/widgets/diff.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"diff.mjs","names":[],"sources":["../../src/widgets/diff.ts"],"sourcesContent":["import type { RenderCtx } from \"../core/ctx.ts\"\nimport type { Accessor, Reactive } from \"../core/reactive.ts\"\nimport type { Layout, State } from \"../core/state.ts\"\nimport type { WrapMode } from \"../layout/text.ts\"\n\nimport { splitAnsi, stringWidth, wrapAnsi } from \"@zaly/shared/ansi\"\nimport { basename, extname } from \"pathe\"\n// oxlint-disable no-nested-ternary\n// oxlint-disable typescript/no-unnecessary-condition\nimport { Node } from \"../core/node.ts\"\nimport { createAsync, memo, unwrap, useContext } from \"../core/reactive.ts\"\nimport { RenderContext } from \"../core/render.ts\"\nimport { calcLayout, countLines } from \"../layout/text.ts\"\nimport { codeToAnsi } from \"../shiki/shiki.ts\"\n\nexport interface DiffState {\n  /** Pre-state file content. Plain string or reactive accessor —\n   *  pass a signal to live-update the diff as either side changes. */\n  original: Reactive<string>\n  /** Post-state file content. The widget runs `diffLines` between\n   *  `original` and `modified` and renders the resulting hunks. */\n  modified: Reactive<string>\n  /** Optional file path. Drives the default `lang` (extension or\n   *  basename — shiki recognises both `.ts` and `Dockerfile`-style\n   *  names) and `title` when those aren't set explicitly. */\n  path?: Reactive<string>\n  /** Language for syntax highlighting (any shiki-bundled name or\n   *  alias). Defaults from `path` when set. */\n  lang?: string\n  /** Lines of surrounding context per hunk. Default: 3. */\n  context?: number\n  wrap?: WrapMode\n}\n\ntype DiffOpts = {\n  original: string[]\n  originalHi: string[]\n  modified: string[]\n  modifiedHi: string[]\n  context: number\n  ctx: RenderCtx\n}\n\n/**\n * Show a unified diff between two file contents with syntax-highlighted\n * rows. Added rows carry a green backdrop and `+` prefix; removed rows\n * carry a red backdrop and `-` prefix; context rows show both line\n * numbers with a neutral gutter.\n *\n * Both sides are highlighted as complete files (via shiki) before the\n * diff is assembled, so context around an edit tokenizes the way it\n * would in the actual file — multi-line strings, block comments, etc.\n * don't get truncated by the hunk window.\n */\nexport class Diff extends Node<DiffState> {\n  #lang: Accessor<string | undefined>\n  #highlighted: Accessor<{ original: string; modified: string }>\n\n  constructor(state: DiffState) {\n    super({ wrap: \"word\", ...state })\n\n    this.#lang = memo(() => {\n      const path = unwrap(this.state.path)\n      return this.state.lang ?? (path !== undefined ? langFromPath(path) : undefined)\n    })\n\n    const context = useContext(RenderContext)\n    this.#highlighted = createAsync(\n      async () => {\n        const lang = this.#lang()\n        const input = this.input\n        if (!lang) return input\n        const theme = context?.style().theme.shiki\n        const [original, modified] = await Promise.all([\n          codeToAnsi(input.original, lang, { theme }),\n          codeToAnsi(input.modified, lang, { theme }),\n        ])\n        return { modified, original }\n      },\n      {\n        initialValue: this.input,\n      }\n    )\n  }\n\n  #norm(s: string): string {\n    return s.replaceAll(\"\\r\\n\", \"\\n\").replaceAll(\"\\r\", \"\")\n  }\n\n  get input(): { original: string; modified: string } {\n    return {\n      modified: this.#norm(unwrap(this.state.modified)),\n      original: this.#norm(unwrap(this.state.original)),\n    }\n  }\n\n  protected async _render(ctx: RenderCtx): Promise<string[]> {\n    const highlighted = this.#highlighted()\n    const input = this.input\n    const layout = this.layout()\n    const width = Math.min(ctx.width, layout.width)\n\n    const opts: DiffOpts = {\n      context: this.state.context ?? 3,\n      ctx: { ...ctx, width },\n      modified: input.modified.split(\"\\n\"),\n      modifiedHi: highlighted.modified.split(\"\\n\"),\n      original: input.original.split(\"\\n\"),\n      originalHi: highlighted.original.split(\"\\n\"),\n    }\n\n    this.state.wrap ??= \"word\"\n    return await buildDiffRows(opts)\n  }\n\n  override layout(): Layout {\n    const input = this.input\n    const original = calcLayout(input.original, { wrap: this.state.wrap })\n    const modified = calcLayout(input.modified, { wrap: this.state.wrap })\n    const numWidth = Math.max(\n      1,\n      countLines(unwrap(this.state.original)),\n      countLines(unwrap(this.state.modified))\n    ).toString().length\n    const padding = numWidth * 2 + 4 + 4\n    return {\n      minWidth: Math.max(original.minWidth, modified.minWidth) + padding,\n      width: Math.max(original.width, modified.width) + padding,\n    }\n  }\n}\n\n/**\n * Factory for `Diff`.\n *\n * ```ts\n * diff({\n *   original: \"function foo() {}\\n\",\n *   modified: \"function foo(x) {}\\n\",\n *   path: \"foo.ts\",\n * })\n * ```\n */\nexport function diff(state: State<DiffState>): Diff {\n  return new Diff(state)\n}\n\n// ---------- internals ----------\n\ntype DiffRow =\n  | { type: \"context\"; origNum: number; newNum: number; content: string }\n  | { type: \"remove\"; origNum: number; content: string }\n  | { type: \"add\"; newNum: number; content: string }\n\nasync function buildDiffRows(opts: DiffOpts): Promise<string[]> {\n  const context = opts.context\n  // Async-import keeps cold start snappy — only the diff widget pulls\n  // in the library, and it lands at first render rather than at module\n  // load.\n  const { diffArrays } = await import(\"diff\")\n  const segments = diffArrays(opts.original, opts.modified)\n  const {\n    original: origLines,\n    modified: modLines,\n    originalHi: origHi,\n    modifiedHi: modHi,\n    ctx,\n  } = opts\n\n  // Annotate each line in the diff with its kind + (orig, mod) indices.\n  // The flattened list is the row-order the diff would print without\n  // any hunking; we compute hunks (with surrounding context) on top.\n  interface Annotated {\n    kind: \"equal\" | \"remove\" | \"add\"\n    origIdx?: number\n    modIdx?: number\n  }\n  const ann: Annotated[] = []\n  let oI = 0\n  let mI = 0\n  for (const seg of segments) {\n    if (seg.added) {\n      for (const _ of seg.value) ann.push({ kind: \"add\", modIdx: mI++ })\n    } else if (seg.removed) {\n      for (const _ of seg.value) ann.push({ kind: \"remove\", origIdx: oI++ })\n    } else {\n      for (const _ of seg.value) ann.push({ kind: \"equal\", modIdx: mI++, origIdx: oI++ })\n    }\n  }\n\n  // Find hunks: ranges around each non-equal line, expanded by `context`,\n  // merged when adjacent ranges touch.\n  const ranges: { start: number; end: number }[] = []\n  for (let i = 0; i < ann.length; i++) {\n    if (ann[i].kind === \"equal\") continue\n    const start = Math.max(0, i - context)\n    const end = Math.min(ann.length - 1, i + context)\n    const last = ranges.at(-1)\n    if (last && start <= last.end + 1) last.end = Math.max(last.end, end)\n    else ranges.push({ end, start })\n  }\n  if (ranges.length === 0) return [] // nothing changed\n\n  // Emit rows for each hunk. (Between hunks we just skip the equal\n  // lines — a `…` divider is a future polish.)\n  const rows: DiffRow[] = []\n  for (const r of ranges) {\n    for (let i = r.start; i <= r.end; i++) {\n      const a = ann[i]\n      if (a.kind === \"equal\") {\n        rows.push({\n          content: modHi[a.modIdx!] ?? origHi[a.origIdx!] ?? \"\",\n          newNum: a.modIdx! + 1,\n          origNum: a.origIdx! + 1,\n          type: \"context\",\n        })\n      } else if (a.kind === \"remove\") {\n        rows.push({\n          content: origHi[a.origIdx!] ?? \"\",\n          origNum: a.origIdx! + 1,\n          type: \"remove\",\n        })\n      } else {\n        rows.push({\n          content: modHi[a.modIdx!] ?? \"\",\n          newNum: a.modIdx! + 1,\n          type: \"add\",\n        })\n      }\n    }\n  }\n\n  return renderRows(ctx, rows, origLines.length, modLines.length)\n}\n\nfunction renderRows(\n  ctx: RenderCtx,\n  rows: DiffRow[],\n  origTotal: number,\n  modTotal: number\n): string[] {\n  const numWidth = Math.max(String(origTotal).length, String(modTotal).length, 1)\n  const s = ctx.style\n\n  // Two-column gutter: original line number | new line number | space.\n  // - Context rows show both numbers.\n  // - Remove rows show only the original number; new column blank.\n  // - Add rows show only the new number; original column blank.\n  // Wrapped continuation lines reuse the row style but emit a blank\n  // gutter so the line number isn't repeated per visual row.\n  const gutterWidth = numWidth * 2 + 4 // \"<orig> <new> \"\n  const contentWidth = Math.max(0, ctx.width - gutterWidth)\n  const blankGutter = \" \".repeat(gutterWidth - 2) + s.dim(\"↪ \")\n\n  const styles = {\n    add: \"diffAdd\",\n    context: \"diffContext\",\n    remove: \"diffDel\",\n  } as const\n\n  const out: string[] = []\n  for (const r of rows) {\n    const origStr = r.type === \"add\" ? \"\" : String(r.origNum)\n    const newStr = r.type === \"remove\" ? \"\" : String(r.newNum)\n    const gutterStyle = s.bg(`${styles[r.type]}+10`)\n    const gutter = gutterStyle(` ${pad(origStr, numWidth)}  ${pad(newStr, numWidth)} `)\n\n    const prefix = r.type === \"add\" ? \" + \" : r.type === \"remove\" ? \" - \" : \"   \"\n    const innerWidth = Math.max(0, contentWidth - stringWidth(prefix) - 1)\n\n    // Hard-wrap the content. Char-wrap (vs. word-wrap) keeps code\n    // diffs honest — splitting by word boundaries would shift columns\n    // mid-line and make alignment confusing.\n    const wrapped =\n      innerWidth > 0 && stringWidth(r.content) > innerWidth\n        ? splitAnsi(wrapAnsi(r.content, innerWidth, { mode: \"word\" }))\n        : [r.content]\n\n    const rowStyle = s.bg(styles[r.type])\n    for (let i = 0; i < wrapped.length; i++) {\n      const wline = wrapped[i]\n      const pw = Math.max(0, innerWidth - stringWidth(wline) + 1)\n      const bodyLine = (i === 0 ? prefix : \"   \") + wline + \" \".repeat(pw)\n      const styledBody = rowStyle?.(bodyLine) ?? bodyLine\n      out.push((i === 0 ? gutter : gutterStyle(blankGutter)) + styledBody)\n    }\n  }\n  return out\n}\n\nfunction pad(s: string, width: number): string {\n  return s.length >= width ? s : \" \".repeat(width - s.length) + s\n}\n\n/** Resolve a file path to a shiki language identifier. Falls back from\n *  extension to basename — shiki natively recognises `dockerfile`,\n *  `makefile`, `cmakelists.txt`, etc. */\nfunction langFromPath(path: string): string | undefined {\n  const ext = extname(path).slice(1).toLowerCase()\n  if (ext) return ext\n  const base = basename(path).toLowerCase()\n  return base || undefined\n}\n"],"mappings":"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"}
+{"version":3,"file":"diff.mjs","names":[],"sources":["../../src/widgets/diff.ts"],"sourcesContent":["import type { RenderCtx } from \"../core/ctx.ts\"\nimport type { Accessor, Reactive } from \"../core/reactive.ts\"\nimport type { Layout, State } from \"../core/state.ts\"\nimport type { WrapMode } from \"../layout/text.ts\"\n\nimport { splitAnsi, stringWidth, wrapAnsi } from \"@zaly/shared/ansi\"\nimport { basename, extname } from \"pathe\"\n// oxlint-disable no-nested-ternary\n// oxlint-disable typescript/no-unnecessary-condition\nimport { Node } from \"../core/node.ts\"\nimport { createAsync, memo, unwrap, useContext } from \"../core/reactive.ts\"\nimport { RenderContext } from \"../core/render.ts\"\nimport { calcLayout } from \"../layout/text.ts\"\nimport { codeToAnsi } from \"../shiki/shiki.ts\"\nimport { shikiTheme } from \"../shiki/theme.ts\"\n\nexport interface DiffState {\n  /** Pre-state file content. Plain string or reactive accessor —\n   *  pass a signal to live-update the diff as either side changes. */\n  original: Reactive<string>\n  /** Post-state file content. The widget runs `diffLines` between\n   *  `original` and `modified` and renders the resulting hunks. */\n  modified: Reactive<string>\n  /** Optional file path. Drives the default `lang` (extension or\n   *  basename — shiki recognises both `.ts` and `Dockerfile`-style\n   *  names) and `title` when those aren't set explicitly. */\n  path?: Reactive<string>\n  /** Language for syntax highlighting (any shiki-bundled name or\n   *  alias). Defaults from `path` when set. */\n  lang?: string\n  /** Lines of surrounding context per hunk. Default: 3. */\n  context?: number\n  wrap?: WrapMode\n}\n\nconst NO_NEWLINE = String.raw`\`\n\ntype DiffLine = { text: string; terminated: boolean }\n\ntype DiffOpts = {\n  original: DiffLine[]\n  originalHi: string[]\n  modified: DiffLine[]\n  modifiedHi: string[]\n  context: number\n  ctx: RenderCtx\n}\n\n/**\n * Show a unified diff between two file contents with syntax-highlighted\n * rows. Added rows carry a green backdrop and `+` prefix; removed rows\n * carry a red backdrop and `-` prefix; context rows show both line\n * numbers with a neutral gutter.\n *\n * Both sides are highlighted as complete files (via shiki) before the\n * diff is assembled, so context around an edit tokenizes the way it\n * would in the actual file — multi-line strings, block comments, etc.\n * don't get truncated by the hunk window.\n */\nexport class Diff extends Node<DiffState> {\n  #lang: Accessor<string | undefined>\n  #highlighted: Accessor<{ original: string; modified: string }>\n\n  constructor(state: DiffState) {\n    super({ wrap: \"word\", ...state })\n\n    this.#lang = memo(() => {\n      const path = unwrap(this.state.path)\n      return this.state.lang ?? (path !== undefined ? langFromPath(path) : undefined)\n    })\n\n    const context = useContext(RenderContext)\n    this.#highlighted = createAsync(\n      async () => {\n        const lang = this.#lang()\n        const input = this.input\n        if (!lang) return input\n        const theme = context ? shikiTheme(context.style().theme) : undefined\n        const [original, modified] = await Promise.all([\n          codeToAnsi(input.original, lang, { theme }),\n          codeToAnsi(input.modified, lang, { theme }),\n        ])\n        return { modified, original }\n      },\n      {\n        initialValue: this.input,\n      }\n    )\n  }\n\n  #norm(s: string): string {\n    return s.replaceAll(\"\\r\\n\", \"\\n\").replaceAll(\"\\r\", \"\")\n  }\n\n  get input(): { original: string; modified: string } {\n    return {\n      modified: this.#norm(unwrap(this.state.modified)),\n      original: this.#norm(unwrap(this.state.original)),\n    }\n  }\n\n  protected async _render(ctx: RenderCtx): Promise<string[]> {\n    const highlighted = this.#highlighted()\n    const input = this.input\n    const layout = this.layout()\n    const width = Math.min(ctx.width, layout.width)\n\n    const original = splitLines(input.original)\n    const modified = splitLines(input.modified)\n    const opts: DiffOpts = {\n      context: this.state.context ?? 3,\n      ctx: { ...ctx, width },\n      modified,\n      modifiedHi: splitAnsi(highlighted.modified).slice(0, modified.length),\n      original,\n      originalHi: splitAnsi(highlighted.original).slice(0, original.length),\n    }\n\n    this.state.wrap ??= \"word\"\n    return await buildDiffRows(opts)\n  }\n\n  override layout(): Layout {\n    const input = this.input\n    const original = calcLayout(input.original, { wrap: this.state.wrap })\n    const modified = calcLayout(input.modified, { wrap: this.state.wrap })\n    const numWidth = Math.max(\n      1,\n      splitLines(input.original).length,\n      splitLines(input.modified).length\n    ).toString().length\n    const markerWidth = [input.original, input.modified].some((s) => s !== \"\" && !s.endsWith(\"\\n\"))\n      ? stringWidth(NO_NEWLINE)\n      : 0\n    const padding = numWidth * 2 + 4 + 4\n    return {\n      minWidth: Math.max(original.minWidth, modified.minWidth) + padding,\n      width: Math.max(original.width, modified.width, markerWidth) + padding,\n    }\n  }\n}\n\n/**\n * Factory for `Diff`.\n *\n * ```ts\n * diff({\n *   original: \"function foo() {}\\n\",\n *   modified: \"function foo(x) {}\\n\",\n *   path: \"foo.ts\",\n * })\n * ```\n */\nexport function diff(state: State<DiffState>): Diff {\n  return new Diff(state)\n}\n\n// ---------- internals ----------\n\nfunction splitLines(text: string): DiffLine[] {\n  if (text === \"\") return []\n  const terminated = text.endsWith(\"\\n\")\n  const lines = text.split(\"\\n\")\n  if (terminated) lines.pop()\n  return lines.map((line, i) => ({ terminated: i < lines.length - 1 || terminated, text: line }))\n}\n\ntype DiffRow = { terminated: boolean } & (\n  | { type: \"context\"; origNum: number; newNum: number; content: string }\n  | { type: \"remove\"; origNum: number; content: string }\n  | { type: \"add\"; newNum: number; content: string }\n)\n\nasync function buildDiffRows(opts: DiffOpts): Promise<string[]> {\n  const context = opts.context\n  // Async-import keeps cold start snappy — only the diff widget pulls\n  // in the library, and it lands at first render rather than at module\n  // load.\n  const { diffArrays } = await import(\"diff\")\n  const segments = diffArrays(opts.original, opts.modified, {\n    comparator: (a, b) => a.text === b.text && a.terminated === b.terminated,\n  })\n  const {\n    original: origLines,\n    modified: modLines,\n    originalHi: origHi,\n    modifiedHi: modHi,\n    ctx,\n  } = opts\n\n  // Annotate each line in the diff with its kind + (orig, mod) indices.\n  // The flattened list is the row-order the diff would print without\n  // any hunking; we compute hunks (with surrounding context) on top.\n  interface Annotated {\n    kind: \"equal\" | \"remove\" | \"add\"\n    origIdx?: number\n    modIdx?: number\n  }\n  const ann: Annotated[] = []\n  let oI = 0\n  let mI = 0\n  for (const seg of segments) {\n    if (seg.added) {\n      for (const _ of seg.value) ann.push({ kind: \"add\", modIdx: mI++ })\n    } else if (seg.removed) {\n      for (const _ of seg.value) ann.push({ kind: \"remove\", origIdx: oI++ })\n    } else {\n      for (const _ of seg.value) ann.push({ kind: \"equal\", modIdx: mI++, origIdx: oI++ })\n    }\n  }\n\n  // Find hunks: ranges around each non-equal line, expanded by `context`,\n  // merged when adjacent ranges touch.\n  const ranges: { start: number; end: number }[] = []\n  for (let i = 0; i < ann.length; i++) {\n    if (ann[i].kind === \"equal\") continue\n    const start = Math.max(0, i - context)\n    const end = Math.min(ann.length - 1, i + context)\n    const last = ranges.at(-1)\n    if (last && start <= last.end + 1) last.end = Math.max(last.end, end)\n    else ranges.push({ end, start })\n  }\n  if (ranges.length === 0) return [] // nothing changed\n\n  // Emit rows for each hunk. (Between hunks we just skip the equal\n  // lines — a `…` divider is a future polish.)\n  const rows: DiffRow[] = []\n  for (const r of ranges) {\n    for (let i = r.start; i <= r.end; i++) {\n      const a = ann[i]\n      if (a.kind === \"equal\") {\n        rows.push({\n          content: modHi[a.modIdx!] ?? origHi[a.origIdx!] ?? \"\",\n          newNum: a.modIdx! + 1,\n          origNum: a.origIdx! + 1,\n          terminated: modLines[a.modIdx!].terminated,\n          type: \"context\",\n        })\n      } else if (a.kind === \"remove\") {\n        rows.push({\n          content: origHi[a.origIdx!] ?? \"\",\n          origNum: a.origIdx! + 1,\n          terminated: origLines[a.origIdx!].terminated,\n          type: \"remove\",\n        })\n      } else {\n        rows.push({\n          content: modHi[a.modIdx!] ?? \"\",\n          newNum: a.modIdx! + 1,\n          terminated: modLines[a.modIdx!].terminated,\n          type: \"add\",\n        })\n      }\n    }\n  }\n\n  return renderRows(ctx, rows, origLines.length, modLines.length)\n}\n\nfunction renderRows(\n  ctx: RenderCtx,\n  rows: DiffRow[],\n  origTotal: number,\n  modTotal: number\n): string[] {\n  const numWidth = Math.max(String(origTotal).length, String(modTotal).length, 1)\n  const s = ctx.style\n\n  // Two-column gutter: original line number | new line number | space.\n  // - Context rows show both numbers.\n  // - Remove rows show only the original number; new column blank.\n  // - Add rows show only the new number; original column blank.\n  // Wrapped continuation lines reuse the row style but emit a blank\n  // gutter so the line number isn't repeated per visual row.\n  const gutterWidth = numWidth * 2 + 4 // \"<orig> <new> \"\n  const contentWidth = Math.max(0, ctx.width - gutterWidth)\n  const blankGutter = \" \".repeat(gutterWidth - 2) + s.dim(\"↪ \")\n\n  const styles = {\n    add: \"diffAdd\",\n    context: \"diffContext\",\n    remove: \"diffDel\",\n  } as const\n\n  const out: string[] = []\n  for (const r of rows) {\n    const origStr = r.type === \"add\" ? \"\" : String(r.origNum)\n    const newStr = r.type === \"remove\" ? \"\" : String(r.newNum)\n\n    const gutterStyle = s[`${styles[r.type]}Num`] ?? ((x: string) => x)\n    const gutter = gutterStyle(` ${pad(origStr, numWidth)}  ${pad(newStr, numWidth)} `)\n\n    const prefix = r.type === \"add\" ? \" + \" : r.type === \"remove\" ? \" - \" : \"   \"\n    const innerWidth = Math.max(0, contentWidth - stringWidth(prefix) - 1)\n\n    // Hard-wrap the content. Char-wrap (vs. word-wrap) keeps code\n    // diffs honest — splitting by word boundaries would shift columns\n    // mid-line and make alignment confusing.\n    const wrapped =\n      innerWidth > 0 && stringWidth(r.content) > innerWidth\n        ? splitAnsi(wrapAnsi(r.content, innerWidth, { mode: \"word\" }))\n        : [r.content]\n\n    const rowStyle = s.bg(styles[r.type])\n    for (let i = 0; i < wrapped.length; i++) {\n      const wline = wrapped[i]\n      const pw = Math.max(0, innerWidth - stringWidth(wline) + 1)\n      const bodyLine = (i === 0 ? prefix : \"   \") + wline + \" \".repeat(pw)\n      const styledBody = rowStyle?.(bodyLine) ?? bodyLine\n      out.push((i === 0 ? gutter : gutterStyle(blankGutter)) + styledBody)\n    }\n    if (!r.terminated) {\n      const marker = wrapAnsi(NO_NEWLINE, Math.max(1, contentWidth), { mode: \"word\" })\n      for (const line of splitAnsi(marker)) out.push(\" \".repeat(gutterWidth) + s.dim(line))\n    }\n  }\n  return out\n}\n\nfunction pad(s: string, width: number): string {\n  return s.length >= width ? s : \" \".repeat(width - s.length) + s\n}\n\n/** Resolve a file path to a shiki language identifier. Falls back from\n *  extension to basename — shiki natively recognises `dockerfile`,\n *  `makefile`, `cmakelists.txt`, etc. */\nfunction langFromPath(path: string): string | undefined {\n  const ext = extname(path).slice(1).toLowerCase()\n  if (ext) return ext\n  const base = basename(path).toLowerCase()\n  return base || undefined\n}\n"],"mappings":"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"}

package/dist/widgets/divider.d.mts

@@ -1,10 +1,8 @@
-import { H as Text } from "../queries-BDX8mcl5.mjs";
-import { f as Style } from "../types-D2EYlzmK.mjs";
-//#region src/widgets/divider.d.ts
+import { u as Style } from "../types-ByMHEdCF.mjs";
+import { W as Text } from "../queries-Dmd3IjSd.mjs";
 export type DividerState = Style<false> & {
   char?: string;
   length?: number;
 };
 export declare function divider(state?: DividerState): Text;
-//#endregion
 //# sourceMappingURL=divider.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"divider.d.mts","names":[],"sources":["../../src/widgets/divider.ts"],"mappings":";;;YAKY,eAAe;EACzB;EACA;;wBAGc,QAAQ,QAAO,eAAsC"}
+{"version":3,"file":"divider.d.mts","names":[],"sources":["../../src/widgets/divider.ts"],"mappings":";;YAKY,eAAe;EACzB;EACA;;wBAGc,QAAQ,QAAO,eAAsC"}

package/dist/widgets/divider.mjs

@@ -1 +1 @@
-export { t as divider } from "../divider-TSx9NhI_.mjs";
+export { t as divider } from "../divider-qEj5prKE.mjs";

package/dist/widgets/image.d.mts

@@ -1,2 +1,2 @@
-import { n as ImageState, r as image, t as Image } from "../image-VaT7AN-S.mjs";
+import { n as ImageState, r as image, t as Image } from "../image-DdRDv7q6.mjs";
 export { Image, ImageState, image };

package/dist/widgets/image.mjs

@@ -1,10 +1,10 @@
-import { S as unwrap, w as useContext } from "../reactive-f7NpAi69.mjs";
-import { t as Node } from "../node-BZ7f6HzU.mjs";
-import { t as RenderContext } from "../render-DEIUNLkh.mjs";
-import { s as loadKittyGraphics } from "../kitty-JbCJC0iQ.mjs";
+import { S as unwrap, w as useContext } from "../reactive-DkP75TPk.mjs";
+import { t as Node } from "../node-CXNobGaP.mjs";
+import { t as RenderContext } from "../render-Bp2N2i6J.mjs";
+import { s as loadKittyGraphics } from "../kitty-BH_eK6lz.mjs";
 import { fileDetect } from "@zaly/shared/detect";
 import { imageInfo } from "@zaly/shared/image";
-//#region src/widgets/image.ts
+// src/widgets/image.ts
 var Image = class extends Node {
 	#delete;
 	#enabled;
@@ -31,7 +31,7 @@ var Image = class extends Node {
 		const detected = await fileDetect(this.state.src);
 		if (detected?.type !== "image") return this.fallback;
 		const img = await imageInfo(detected);
-		const { cols, rows } = dims(this.state, img, Math.min(ctx.width, 80));
+		const { cols, rows } = dims(this.state, img, ctx.width);
 		const t = await kitty.transmitOnce(img);
 		if (!t) return this.fallback;
 		const p = kitty.placement(t.imageId, {
@@ -61,9 +61,9 @@ function image(first, style) {
 function dims(state, meta, available) {
 	const cellAspect = state.cellAspect ?? 2;
 	const aspect = meta.height / meta.width;
-	let cols = state.width;
+	let cols = state.width === void 0 ? void 0 : Math.max(1, Math.min(state.width, available));
 	let rows = state.height;
-	if (cols === void 0 && rows === void 0) cols = Math.max(1, available);
+	if (cols === void 0 && rows === void 0) cols = Math.max(1, Math.min(available, 80));
 	if (cols !== void 0 && rows === void 0) rows = Math.max(1, Math.round(cols * aspect / cellAspect));
 	else if (rows !== void 0 && cols === void 0) cols = Math.max(1, Math.round(rows * cellAspect / aspect));
 	return {
@@ -71,7 +71,6 @@ function dims(state, meta, available) {
 		rows: rows ?? 1
 	};
 }
-//#endregion
 export { Image, image };
 
 //# sourceMappingURL=image.mjs.map

package/dist/widgets/image.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"image.mjs","names":[],"sources":["../../src/widgets/image.ts"],"sourcesContent":["import type { RenderCtx } from \"../core/ctx.ts\"\nimport type { Accessor } from \"../core/reactive.ts\"\nimport type { Layout } from \"../core/state.ts\"\n\nimport { fileDetect } from \"@zaly/shared/detect\"\nimport { imageInfo } from \"@zaly/shared/image\"\nimport { Node } from \"../core/node.ts\"\nimport { unwrap, useContext } from \"../core/reactive.ts\"\nimport { RenderContext } from \"../core/render.ts\"\nimport { loadKittyGraphics } from \"../image/kitty.ts\"\n\nexport interface ImageState {\n  /**\n   * Path to an image file. PNG passes through with zero decoding; other\n   * formats (JPEG/WebP/GIF/AVIF/SVG) are read via image-meta for\n   * dimensions and — for KGP terminals — converted once to a cached\n   * temp PNG via sharp. iTerm2 accepts all formats natively.\n   */\n  src: string\n  /** Display width in terminal cells. Defaults to `ctx.width`. */\n  width?: number\n  /**\n   * Display height in terminal cells. When omitted, computed from the\n   * source aspect ratio + `cellAspect`.\n   */\n  height?: number\n  /** Fallback text shown on terminals without an image protocol. */\n  alt?: string\n  /**\n   * Character cell aspect ratio (cellHeight / cellWidth). Most terminals\n   * land around 2.0. Tweak if aspect-preserved images look stretched.\n   */\n  cellAspect?: number\n}\n\nexport class Image extends Node<ImageState> {\n  #delete?: () => void\n  #enabled?: Accessor<boolean>\n\n  constructor(state: ImageState) {\n    super(state)\n    this.on(\"unmount\", () => this.#delete?.())\n    const context = useContext(RenderContext)\n    this.#enabled = context?.images\n  }\n\n  get fallback(): string[] {\n    return [this.state.alt ?? `[Image: ${this.state.src}]`]\n  }\n\n  override layout(): Layout {\n    return { minWidth: 50, width: 100 }\n  }\n\n  protected async _render(ctx: RenderCtx): Promise<string[]> {\n    if (unwrap(this.#enabled) === false) return this.fallback\n\n    const queries = this.ctx?.input.queries\n    const kitty = queries ? await loadKittyGraphics(queries) : undefined\n    if (!kitty?.supported) return this.fallback\n\n    const detected = await fileDetect(this.state.src)\n    if (detected?.type !== \"image\") return this.fallback\n    const img = await imageInfo(detected)\n\n    const { cols, rows } = dims(this.state, img, Math.min(ctx.width, 80))\n\n    const t = await kitty.transmitOnce(img)\n    if (!t) return this.fallback\n    const p = kitty.placement(t.imageId, { cols, rows })\n    if (!p) return this.fallback\n    this.#delete = () =>\n      p.placementId ? kitty.deletePlacement(t.imageId, p.placementId) : undefined\n    // Route the transmit bytes through the side-channel queue (mount\n    // ctx → terminal). Cached rows then hold pure placement ANSI,\n    // which is safe to reuse across repaints. If we're rendering\n    // before mount (rare — tests, headless previews), fall back to\n    // inlining the transmit into the lead so the picture still\n    // shows correctly the first time.\n    if (t.transmit) {\n      ctx.transmit(t.transmit)\n      if (p.inline) ctx.transmit(p.seq)\n    }\n\n    if (p.inline) return p.data\n\n    const ret = [...p.data]\n    if (!ret.length) return this.fallback\n    ret[0] = p.seq + ret[0]\n    return ret\n  }\n}\n\nexport function image(src: string, style?: Omit<ImageState, \"src\">): Image\nexport function image(state: ImageState): Image\nexport function image(first: string | ImageState, style?: Omit<ImageState, \"src\">): Image {\n  if (typeof first === \"string\") return new Image({ src: first, ...style })\n  return new Image(first)\n}\n\nfunction dims(\n  state: ImageState,\n  meta: { width: number; height: number },\n  available: number\n): { cols: number; rows: number } {\n  const cellAspect = state.cellAspect ?? 2\n  const aspect = meta.height / meta.width\n  let cols = state.width\n  let rows = state.height\n  if (cols === undefined && rows === undefined) cols = Math.max(1, available)\n  if (cols !== undefined && rows === undefined) {\n    rows = Math.max(1, Math.round((cols * aspect) / cellAspect))\n  } else if (rows !== undefined && cols === undefined) {\n    cols = Math.max(1, Math.round((rows * cellAspect) / aspect))\n  }\n  return { cols: cols ?? available, rows: rows ?? 1 }\n}\n"],"mappings":";;;;;;;AAmCA,IAAa,QAAb,cAA2B,KAAiB;CAC1C;CACA;CAEA,YAAY,OAAmB;EAC7B,MAAM,KAAK;EACX,KAAK,GAAG,iBAAiB,KAAK,UAAU,CAAC;EACzC,MAAM,UAAU,WAAW,aAAa;EACxC,KAAK,WAAW,SAAS;CAC3B;CAEA,IAAI,WAAqB;EACvB,OAAO,CAAC,KAAK,MAAM,OAAO,WAAW,KAAK,MAAM,IAAI,EAAE;CACxD;CAEA,SAA0B;EACxB,OAAO;GAAE,UAAU;GAAI,OAAO;EAAI;CACpC;CAEA,MAAgB,QAAQ,KAAmC;EACzD,IAAI,OAAO,KAAK,QAAQ,MAAM,OAAO,OAAO,KAAK;EAEjD,MAAM,UAAU,KAAK,KAAK,MAAM;EAChC,MAAM,QAAQ,UAAU,MAAM,kBAAkB,OAAO,IAAI,KAAA;EAC3D,IAAI,CAAC,OAAO,WAAW,OAAO,KAAK;EAEnC,MAAM,WAAW,MAAM,WAAW,KAAK,MAAM,GAAG;EAChD,IAAI,UAAU,SAAS,SAAS,OAAO,KAAK;EAC5C,MAAM,MAAM,MAAM,UAAU,QAAQ;EAEpC,MAAM,EAAE,MAAM,SAAS,KAAK,KAAK,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,EAAE,CAAC;EAEpE,MAAM,IAAI,MAAM,MAAM,aAAa,GAAG;EACtC,IAAI,CAAC,GAAG,OAAO,KAAK;EACpB,MAAM,IAAI,MAAM,UAAU,EAAE,SAAS;GAAE;GAAM;EAAK,CAAC;EACnD,IAAI,CAAC,GAAG,OAAO,KAAK;EACpB,KAAK,gBACH,EAAE,cAAc,MAAM,gBAAgB,EAAE,SAAS,EAAE,WAAW,IAAI,KAAA;EAOpE,IAAI,EAAE,UAAU;GACd,IAAI,SAAS,EAAE,QAAQ;GACvB,IAAI,EAAE,QAAQ,IAAI,SAAS,EAAE,GAAG;EAClC;EAEA,IAAI,EAAE,QAAQ,OAAO,EAAE;EAEvB,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI;EACtB,IAAI,CAAC,IAAI,QAAQ,OAAO,KAAK;EAC7B,IAAI,KAAK,EAAE,MAAM,IAAI;EACrB,OAAO;CACT;AACF;AAIA,SAAgB,MAAM,OAA4B,OAAwC;CACxF,IAAI,OAAO,UAAU,UAAU,OAAO,IAAI,MAAM;EAAE,KAAK;EAAO,GAAG;CAAM,CAAC;CACxE,OAAO,IAAI,MAAM,KAAK;AACxB;AAEA,SAAS,KACP,OACA,MACA,WACgC;CAChC,MAAM,aAAa,MAAM,cAAc;CACvC,MAAM,SAAS,KAAK,SAAS,KAAK;CAClC,IAAI,OAAO,MAAM;CACjB,IAAI,OAAO,MAAM;CACjB,IAAI,SAAS,KAAA,KAAa,SAAS,KAAA,GAAW,OAAO,KAAK,IAAI,GAAG,SAAS;CAC1E,IAAI,SAAS,KAAA,KAAa,SAAS,KAAA,GACjC,OAAO,KAAK,IAAI,GAAG,KAAK,MAAO,OAAO,SAAU,UAAU,CAAC;MACtD,IAAI,SAAS,KAAA,KAAa,SAAS,KAAA,GACxC,OAAO,KAAK,IAAI,GAAG,KAAK,MAAO,OAAO,aAAc,MAAM,CAAC;CAE7D,OAAO;EAAE,MAAM,QAAQ;EAAW,MAAM,QAAQ;CAAE;AACpD"}
+{"version":3,"file":"image.mjs","names":[],"sources":["../../src/widgets/image.ts"],"sourcesContent":["import type { RenderCtx } from \"../core/ctx.ts\"\nimport type { Accessor } from \"../core/reactive.ts\"\nimport type { Layout } from \"../core/state.ts\"\n\nimport { fileDetect } from \"@zaly/shared/detect\"\nimport { imageInfo } from \"@zaly/shared/image\"\nimport { Node } from \"../core/node.ts\"\nimport { unwrap, useContext } from \"../core/reactive.ts\"\nimport { RenderContext } from \"../core/render.ts\"\nimport { loadKittyGraphics } from \"../image/kitty.ts\"\n\nexport interface ImageState {\n  /**\n   * Path to an image file. PNG passes through with zero decoding; other\n   * formats (JPEG/WebP/GIF/AVIF/SVG) are read via image-meta for\n   * dimensions and — for KGP terminals — converted once to a cached\n   * temp PNG via sharp. iTerm2 accepts all formats natively.\n   */\n  src: string\n  /** Display width in terminal cells. Defaults to `ctx.width`. */\n  width?: number\n  /**\n   * Display height in terminal cells. When omitted, computed from the\n   * source aspect ratio + `cellAspect`.\n   */\n  height?: number\n  /** Fallback text shown on terminals without an image protocol. */\n  alt?: string\n  /**\n   * Character cell aspect ratio (cellHeight / cellWidth). Most terminals\n   * land around 2.0. Tweak if aspect-preserved images look stretched.\n   */\n  cellAspect?: number\n}\n\nexport class Image extends Node<ImageState> {\n  #delete?: () => void\n  #enabled?: Accessor<boolean>\n\n  constructor(state: ImageState) {\n    super(state)\n    this.on(\"unmount\", () => this.#delete?.())\n    const context = useContext(RenderContext)\n    this.#enabled = context?.images\n  }\n\n  get fallback(): string[] {\n    return [this.state.alt ?? `[Image: ${this.state.src}]`]\n  }\n\n  override layout(): Layout {\n    return { minWidth: 50, width: 100 }\n  }\n\n  protected async _render(ctx: RenderCtx): Promise<string[]> {\n    if (unwrap(this.#enabled) === false) return this.fallback\n\n    const queries = this.ctx?.input.queries\n    const kitty = queries ? await loadKittyGraphics(queries) : undefined\n    if (!kitty?.supported) return this.fallback\n\n    const detected = await fileDetect(this.state.src)\n    if (detected?.type !== \"image\") return this.fallback\n    const img = await imageInfo(detected)\n\n    const { cols, rows } = dims(this.state, img, ctx.width)\n\n    const t = await kitty.transmitOnce(img)\n    if (!t) return this.fallback\n    const p = kitty.placement(t.imageId, { cols, rows })\n    if (!p) return this.fallback\n    this.#delete = () =>\n      p.placementId ? kitty.deletePlacement(t.imageId, p.placementId) : undefined\n    // Route the transmit bytes through the side-channel queue (mount\n    // ctx → terminal). Cached rows then hold pure placement ANSI,\n    // which is safe to reuse across repaints. If we're rendering\n    // before mount (rare — tests, headless previews), fall back to\n    // inlining the transmit into the lead so the picture still\n    // shows correctly the first time.\n    if (t.transmit) {\n      ctx.transmit(t.transmit)\n      if (p.inline) ctx.transmit(p.seq)\n    }\n\n    if (p.inline) return p.data\n\n    const ret = [...p.data]\n    if (!ret.length) return this.fallback\n    ret[0] = p.seq + ret[0]\n    return ret\n  }\n}\n\nexport function image(src: string, style?: Omit<ImageState, \"src\">): Image\nexport function image(state: ImageState): Image\nexport function image(first: string | ImageState, style?: Omit<ImageState, \"src\">): Image {\n  if (typeof first === \"string\") return new Image({ src: first, ...style })\n  return new Image(first)\n}\n\nfunction dims(\n  state: ImageState,\n  meta: { width: number; height: number },\n  available: number\n): { cols: number; rows: number } {\n  const cellAspect = state.cellAspect ?? 2\n  const aspect = meta.height / meta.width\n  let cols = state.width === undefined ? undefined : Math.max(1, Math.min(state.width, available))\n  let rows = state.height\n  if (cols === undefined && rows === undefined) cols = Math.max(1, Math.min(available, 80))\n  if (cols !== undefined && rows === undefined) {\n    rows = Math.max(1, Math.round((cols * aspect) / cellAspect))\n  } else if (rows !== undefined && cols === undefined) {\n    cols = Math.max(1, Math.round((rows * cellAspect) / aspect))\n  }\n  return { cols: cols ?? available, rows: rows ?? 1 }\n}\n"],"mappings":";;;;;;;AAmCA,IAAa,QAAb,cAA2B,KAAiB;CAC1C;CACA;CAEA,YAAY,OAAmB;EAC7B,MAAM,KAAK;EACX,KAAK,GAAG,iBAAiB,KAAK,UAAU,CAAC;EACzC,MAAM,UAAU,WAAW,aAAa;EACxC,KAAK,WAAW,SAAS;CAC3B;CAEA,IAAI,WAAqB;EACvB,OAAO,CAAC,KAAK,MAAM,OAAO,WAAW,KAAK,MAAM,IAAI,EAAE;CACxD;CAEA,SAA0B;EACxB,OAAO;GAAE,UAAU;GAAI,OAAO;EAAI;CACpC;CAEA,MAAgB,QAAQ,KAAmC;EACzD,IAAI,OAAO,KAAK,QAAQ,MAAM,OAAO,OAAO,KAAK;EAEjD,MAAM,UAAU,KAAK,KAAK,MAAM;EAChC,MAAM,QAAQ,UAAU,MAAM,kBAAkB,OAAO,IAAI,KAAA;EAC3D,IAAI,CAAC,OAAO,WAAW,OAAO,KAAK;EAEnC,MAAM,WAAW,MAAM,WAAW,KAAK,MAAM,GAAG;EAChD,IAAI,UAAU,SAAS,SAAS,OAAO,KAAK;EAC5C,MAAM,MAAM,MAAM,UAAU,QAAQ;EAEpC,MAAM,EAAE,MAAM,SAAS,KAAK,KAAK,OAAO,KAAK,IAAI,KAAK;EAEtD,MAAM,IAAI,MAAM,MAAM,aAAa,GAAG;EACtC,IAAI,CAAC,GAAG,OAAO,KAAK;EACpB,MAAM,IAAI,MAAM,UAAU,EAAE,SAAS;GAAE;GAAM;EAAK,CAAC;EACnD,IAAI,CAAC,GAAG,OAAO,KAAK;EACpB,KAAK,gBACH,EAAE,cAAc,MAAM,gBAAgB,EAAE,SAAS,EAAE,WAAW,IAAI,KAAA;EAOpE,IAAI,EAAE,UAAU;GACd,IAAI,SAAS,EAAE,QAAQ;GACvB,IAAI,EAAE,QAAQ,IAAI,SAAS,EAAE,GAAG;EAClC;EAEA,IAAI,EAAE,QAAQ,OAAO,EAAE;EAEvB,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI;EACtB,IAAI,CAAC,IAAI,QAAQ,OAAO,KAAK;EAC7B,IAAI,KAAK,EAAE,MAAM,IAAI;EACrB,OAAO;CACT;AACF;AAIA,SAAgB,MAAM,OAA4B,OAAwC;CACxF,IAAI,OAAO,UAAU,UAAU,OAAO,IAAI,MAAM;EAAE,KAAK;EAAO,GAAG;CAAM,CAAC;CACxE,OAAO,IAAI,MAAM,KAAK;AACxB;AAEA,SAAS,KACP,OACA,MACA,WACgC;CAChC,MAAM,aAAa,MAAM,cAAc;CACvC,MAAM,SAAS,KAAK,SAAS,KAAK;CAClC,IAAI,OAAO,MAAM,UAAU,KAAA,IAAY,KAAA,IAAY,KAAK,IAAI,GAAG,KAAK,IAAI,MAAM,OAAO,SAAS,CAAC;CAC/F,IAAI,OAAO,MAAM;CACjB,IAAI,SAAS,KAAA,KAAa,SAAS,KAAA,GAAW,OAAO,KAAK,IAAI,GAAG,KAAK,IAAI,WAAW,EAAE,CAAC;CACxF,IAAI,SAAS,KAAA,KAAa,SAAS,KAAA,GACjC,OAAO,KAAK,IAAI,GAAG,KAAK,MAAO,OAAO,SAAU,UAAU,CAAC;MACtD,IAAI,SAAS,KAAA,KAAa,SAAS,KAAA,GACxC,OAAO,KAAK,IAAI,GAAG,KAAK,MAAO,OAAO,aAAc,MAAM,CAAC;CAE7D,OAAO;EAAE,MAAM,QAAQ;EAAW,MAAM,QAAQ;CAAE;AACpD"}

package/dist/widgets/input.d.mts

@@ -1,2 +1,2 @@
-import { a as InputValue, i as InputState, n as InputAttachment, o as input, r as InputEvents, t as Input } from "../input-BAYux7qo.mjs";
+import { a as InputValue, i as InputState, n as InputAttachment, o as input, r as InputEvents, t as Input } from "../input-C3kfYoEJ.mjs";
 export { Input, InputAttachment, InputEvents, InputState, InputValue, input };

package/dist/widgets/input.mjs

@@ -1 +1 @@
-export { t as Input, n as input } from "../input-BGTTujDN.mjs";
+export { t as Input, n as input } from "../input-BkE4EpBw.mjs";

package/dist/widgets/log.d.mts

@@ -1,2 +1,2 @@
-import { A as LogState, M as log, j as LogStyle } from "../queries-BDX8mcl5.mjs";
+import { M as LogState, N as LogStyle, P as log } from "../queries-Dmd3IjSd.mjs";
 export { LogState, LogStyle, log };

package/dist/widgets/log.mjs

@@ -1 +1 @@
-export { t as log } from "../log-ByKlM4iI.mjs";
+export { t as log } from "../log-96b1_J6G.mjs";

package/dist/widgets/markdown.d.mts

@@ -1,9 +1,8 @@
-import { J as Layout, P as RenderCtx, U as TextContent, X as State, p as Node } from "../queries-BDX8mcl5.mjs";
-import { o as AnyStyle } from "../types-D2EYlzmK.mjs";
-import { t as WrapMode } from "../text-CCYs9RB2.mjs";
-import { n as MdOptions } from "../types-D3jk1rtk.mjs";
-import { t as Image } from "../image-VaT7AN-S.mjs";
-//#region src/widgets/markdown.d.ts
+import { i as AnyStyle } from "../types-ByMHEdCF.mjs";
+import { G as TextContent, I as RenderCtx, Q as State, X as Layout, h as Node } from "../queries-Dmd3IjSd.mjs";
+import { t as WrapMode } from "../text-DdkJXgoC.mjs";
+import { n as MdOptions } from "../types-CUVUJPz6.mjs";
+import { t as Image } from "../image-DdRDv7q6.mjs";
 export interface MarkdownState {
   /** Markdown source. Accepts a plain string or a reactive accessor —
    *  pass `signal()` / `memo()` for streaming content that re-parses on
@@ -40,5 +39,4 @@ export declare class Markdown extends Node<MarkdownState> {
  */
 export declare function markdown(content: TextContent, style?: Omit<State<MarkdownState>, "content">): Markdown;
 export declare function markdown(state: State<MarkdownState>): Markdown;
-//#endregion
 //# sourceMappingURL=markdown.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.mts","names":["_$___core_state_ts0.Layout"],"sources":["../../src/widgets/markdown.ts"],"mappings":";;;;;;iBAoBiB;;;;EAIf,SAAS;;EAET,UAAU;;;;;;;EAOV;EACA,OAAO;EACP,QAAQ;;qBAcG,iBAAiB,KAAK;;WAKxB,QAAM,YAAA;EASf,YAAY,OAAO,MAAM;YAwDT,QAAQ,KAAK,YAAY;EA0C1B,OAAO,KAAK,YAAS,QAATA;;;;;;;;;;;;wBAeb,SACd,SAAS,aACT,QAAQ,KAAK,MAAM,6BAClB;wBACa,SAAS,OAAO,MAAM,iBAAiB"}
+{"version":3,"file":"markdown.d.mts","names":["_$___core_state_ts0.Layout"],"sources":["../../src/widgets/markdown.ts"],"mappings":";;;;;iBAqBiB;;;;EAIf,SAAS;;EAET,UAAU;;;;;;;EAOV;EACA,OAAO;EACP,QAAQ;;qBAcG,iBAAiB,KAAK;;WAKxB,QAAM,YAAA;EASf,YAAY,OAAO,MAAM;YAwDT,QAAQ,KAAK,YAAY;EA0C1B,OAAO,KAAK,YAAS,QAATA;;;;;;;;;;;;wBAeb,SACd,SAAS,aACT,QAAQ,KAAK,MAAM,6BAClB;wBACa,SAAS,OAAO,MAAM,iBAAiB"}

package/dist/widgets/markdown.mjs

@@ -1 +1 @@
-export { t as Markdown, n as markdown } from "../markdown-CwRmWuU6.mjs";
+export { t as Markdown, n as markdown } from "../markdown-CgRZBhIX.mjs";

package/dist/widgets/overlay.d.mts

@@ -1,2 +1,2 @@
-import { F as Overlay, I as OverlayState, L as overlay } from "../queries-BDX8mcl5.mjs";
+import { L as Overlay, R as OverlayState, z as overlay } from "../queries-Dmd3IjSd.mjs";
 export { Overlay, OverlayState, overlay };

package/dist/widgets/overlay.mjs

@@ -1 +1 @@
-export { t as overlay } from "../overlay-BnvOKtGT.mjs";
+export { t as overlay } from "../overlay-CevDWgSF.mjs";

package/dist/widgets/picker.d.mts

@@ -1,2 +1,2 @@
-import { a as picker, i as PickerTreeProps, n as PickerItem, r as PickerSelectProps, t as PickerActions } from "../picker-DQs_IW77.mjs";
+import { a as picker, i as PickerTreeProps, n as PickerItem, r as PickerSelectProps, t as PickerActions } from "../picker-DsB6--GN.mjs";
 export { PickerActions, PickerItem, PickerSelectProps, PickerTreeProps, picker };

package/dist/widgets/picker.mjs

@@ -1 +1 @@
-export { t as picker } from "../picker-Dh5IUrTk.mjs";
+export { t as picker } from "../picker-D9WrE3zF.mjs";

package/dist/widgets/progress.d.mts

@@ -1,6 +1,5 @@
-import { Nt as Size, P as RenderCtx, X as State, nt as Reactive, p as Node } from "../queries-BDX8mcl5.mjs";
-import { c as Color } from "../types-D2EYlzmK.mjs";
-//#region src/widgets/progress.d.ts
+import { o as Color } from "../types-ByMHEdCF.mjs";
+import { Ft as Size, I as RenderCtx, Q as State, h as Node, it as Reactive } from "../queries-Dmd3IjSd.mjs";
 export interface ProgressState {
   /** Current value. Clamped to `[0, total]`. Accepts a signal accessor
    *  so callers can drive the bar from reactive state without manual
@@ -43,5 +42,4 @@ export declare class Progress extends Node<ProgressState> {
  * ```
  */
 export declare function progress(state: State<ProgressState>): Progress;
-//#endregion
 //# sourceMappingURL=progress.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"progress.d.mts","names":[],"sources":["../../src/widgets/progress.ts"],"mappings":";;;iBAWiB;;;;EAIf,OAAO;;EAEP,QAAQ;;;;;EAKR,QAAQ;;;;;;EAMR,mBAAmB,KAAK,WAAW;;EAEnC,QAAQ;;EAER,aAAa;;EAEb;;EAEA;;qBAGW,iBAAiB,KAAK;YACvB,QAAQ,KAAK;;;;;;;;;;;;;wBAwCT,SAAS,OAAO,MAAM,iBAAiB"}
+{"version":3,"file":"progress.d.mts","names":[],"sources":["../../src/widgets/progress.ts"],"mappings":";;iBAWiB;;;;EAIf,OAAO;;EAEP,QAAQ;;;;;EAKR,QAAQ;;;;;;EAMR,mBAAmB,KAAK,WAAW;;EAEnC,QAAQ;;EAER,aAAa;;EAEb;;EAEA;;qBAGW,iBAAiB,KAAK;YACvB,QAAQ,KAAK;;;;;;;;;;;;;wBAwCT,SAAS,OAAO,MAAM,iBAAiB"}

package/dist/widgets/progress.mjs

@@ -1,8 +1,8 @@
-import { S as unwrap } from "../reactive-f7NpAi69.mjs";
-import { t as Node } from "../node-BZ7f6HzU.mjs";
-import { n as resolveSize } from "../size-D8JogYLy.mjs";
+import { S as unwrap } from "../reactive-DkP75TPk.mjs";
+import { t as Node } from "../node-CXNobGaP.mjs";
+import { n as resolveSize } from "../size-BHRJuRk9.mjs";
 import { stringWidth } from "@zaly/shared/ansi";
-//#region src/widgets/progress.ts
+// src/widgets/progress.ts
 var Progress = class extends Node {
 	_render(ctx) {
 		const total = unwrap(this.state.total ?? 1);
@@ -42,7 +42,6 @@ function resolveLabel(label, ctx, fraction) {
 	if (label === "auto") return `${Math.round(fraction * 100)}%`;
 	return label;
 }
-//#endregion
 export { Progress, progress };
 
 //# sourceMappingURL=progress.mjs.map

package/dist/widgets/select.d.mts

@@ -1,2 +1,2 @@
-import { a as SelectEvents, i as Select, n as OptionRender, o as SelectState, r as OptionRenderCtx, s as select, t as Option } from "../select-J2KtwxyK.mjs";
+import { a as SelectEvents, i as Select, n as OptionRender, o as SelectState, r as OptionRenderCtx, s as select, t as Option } from "../select-BZCFXdjp.mjs";
 export { Option, OptionRender, OptionRenderCtx, Select, SelectEvents, SelectState, select };

package/dist/widgets/select.mjs

@@ -1 +1 @@
-export { t as Select, n as select } from "../select-m7NE6Rwa.mjs";
+export { t as Select, n as select } from "../select-CUmAFKJh.mjs";

package/dist/widgets/show.d.mts

@@ -1,5 +1,4 @@
-import { P as RenderCtx, nt as Reactive, p as Node } from "../queries-BDX8mcl5.mjs";
-//#region src/widgets/show.d.ts
+import { I as RenderCtx, h as Node, it as Reactive } from "../queries-Dmd3IjSd.mjs";
 export type ShowGate = {
   when: Reactive<unknown>;
 };
@@ -50,6 +49,5 @@ declare class Show extends Node {
  * ```
  */
 export declare function show(...spec: ShowSpec): Show;
-//#endregion
 export type { Show };
 //# sourceMappingURL=show.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"show.d.mts","names":[],"sources":["../../src/widgets/show.ts"],"mappings":";;YAMY;EAAa,MAAM;;YACnB;EAAe,MAAM;EAAmB,KAAK;;YAC7C,qBAAqB,OAAO;YAC5B,YAAY,WAAW,qBAAqB,WAAW,eAAe;;;;;;;;;cAkB5E,aAAa;;EAIjB,YAAY,MAAM;EAqBT,2BAA2B;;;;YAepB,QAAQ,KAAK,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;wBA8B3B,QAAQ,MAAM,WAAW"}
+{"version":3,"file":"show.d.mts","names":[],"sources":["../../src/widgets/show.ts"],"mappings":";YAMY;EAAa,MAAM;;YACnB;EAAe,MAAM;EAAmB,KAAK;;YAC7C,qBAAqB,OAAO;YAC5B,YAAY,WAAW,qBAAqB,WAAW,eAAe;;;;;;;;;cAkB5E,aAAa;;EAIjB,YAAY,MAAM;EAqBT,2BAA2B;;;;YAepB,QAAQ,KAAK,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;wBA8B3B,QAAQ,MAAM,WAAW"}

package/dist/widgets/show.mjs

@@ -1 +1 @@
-export { t as show } from "../show-DR2x1YFc.mjs";
+export { t as show } from "../show-D5XNXgZf.mjs";

package/dist/widgets/spinner.d.mts

@@ -1,6 +1,5 @@
-import { P as RenderCtx, X as State, nt as Reactive, p as Node } from "../queries-BDX8mcl5.mjs";
-import { o as AnyStyle } from "../types-D2EYlzmK.mjs";
-//#region src/widgets/spinner.d.ts
+import { i as AnyStyle } from "../types-ByMHEdCF.mjs";
+import { I as RenderCtx, Q as State, h as Node, it as Reactive } from "../queries-Dmd3IjSd.mjs";
 /**
  * Frame sets from the common terminal-spinner vocabulary. Pick one to taste.
  * @internal
@@ -60,5 +59,4 @@ export declare class Spinner extends Node<SpinnerState> {
  * gives you the braille `dots` set at 80ms in the theme's `primary` color.
  */
 export declare function spinner(state?: State<SpinnerState>): Spinner;
-//#endregion
 //# sourceMappingURL=spinner.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"spinner.d.mts","names":[],"sources":["../../src/widgets/spinner.ts"],"mappings":";;;;;;;qBAaa;WACX;WACA;WACA;WACA;WACA;;YAGU,4BAA4B;iBAEvB;;EAEf,SAAS;;EAET,QAAQ,SAAS;;;;;EAKjB,UAAU;EACV;;;;;;;;;;;;;;;;;;;;;qBA4DW,gBAAgB,KAAK;;EAChC,YAAY,OAAO;;SAYZ,KAAK;;EAKZ;;EAMA;YAcU,QAAQ,KAAK;;;;;;wBAoBT,QAAQ,QAAO,MAAM,gBAAqB"}
+{"version":3,"file":"spinner.d.mts","names":[],"sources":["../../src/widgets/spinner.ts"],"mappings":";;;;;;qBAaa;WACX;WACA;WACA;WACA;WACA;;YAGU,4BAA4B;iBAEvB;;EAEf,SAAS;;EAET,QAAQ,SAAS;;;;;EAKjB,UAAU;EACV;;;;;;;;;;;;;;;;;;;;;qBA4DW,gBAAgB,KAAK;;EAChC,YAAY,OAAO;;SAYZ,KAAK;;EAKZ;;EAMA;YAcU,QAAQ,KAAK;;;;;;wBAoBT,QAAQ,QAAO,MAAM,gBAAqB"}

package/dist/widgets/spinner.mjs

@@ -1,7 +1,7 @@
-import { S as unwrap, f as effect, x as untrack } from "../reactive-f7NpAi69.mjs";
-import { t as Node } from "../node-BZ7f6HzU.mjs";
+import { S as unwrap, f as effect, x as untrack } from "../reactive-DkP75TPk.mjs";
+import { t as Node } from "../node-CXNobGaP.mjs";
 import { stringWidth } from "@zaly/shared/ansi";
-//#region src/widgets/spinner.ts
+// src/widgets/spinner.ts
 /**
 * Frame sets from the common terminal-spinner vocabulary. Pick one to taste.
 * @internal
@@ -141,7 +141,6 @@ var Spinner = class Spinner extends Node {
 function spinner(state = {}) {
 	return new Spinner(state);
 }
-//#endregion
 export { Spinner, spinner, spinnerFrames };
 
 //# sourceMappingURL=spinner.mjs.map

package/dist/widgets/text.d.mts

@@ -1,2 +1,2 @@
-import { G as text, H as Text, K as textContent, U as TextContent, W as TextStyle } from "../queries-BDX8mcl5.mjs";
+import { G as TextContent, J as textContent, K as TextStyle, W as Text, q as text } from "../queries-Dmd3IjSd.mjs";
 export { Text, TextContent, TextStyle, text, textContent };

package/dist/widgets/text.mjs

@@ -1 +1 @@
-export { t as Text, n as text, r as textContent } from "../text-XvPfweeg.mjs";
+export { t as Text, n as text, r as textContent } from "../text-BArwVVkg.mjs";

package/dist/widgets/tree.d.mts

@@ -1,2 +1,2 @@
-import { i as tree, n as TreeNode, r as TreeProps, t as TreeItem } from "../tree-DJl5W_B7.mjs";
+import { i as tree, n as TreeNode, r as TreeProps, t as TreeItem } from "../tree-Berzv8Rz.mjs";
 export { TreeItem, TreeNode, TreeProps, tree };

package/dist/widgets/tree.mjs

@@ -1 +1 @@
-export { t as tree } from "../tree-Bo1afYhe.mjs";
+export { t as tree } from "../tree-D6NvMQx8.mjs";

package/dist/widgets/widget.d.mts

@@ -1,2 +1,2 @@
-import { n as Widget, r as widget, t as Props } from "../widget-DPqBbB57.mjs";
+import { n as Widget, r as widget, t as Props } from "../widget-sPJaKVU2.mjs";
 export { Props, Widget, widget };

package/dist/widgets/widget.mjs

@@ -1 +1 @@
-export { t as widget } from "../widget-BkMwhY2p.mjs";
+export { t as widget } from "../widget-sFveyrZE.mjs";

package/dist/{worker-T6SdPzUH.mjs → worker-CtEowucz.mjs}

@@ -1,4 +1,4 @@
-//#region src/shiki/worker.ts
+// src/shiki/worker.ts
 const workerHost = {
 	onMessage: (handler) => {
 		if (typeof globalThis.addEventListener === "function") {
@@ -46,7 +46,6 @@ async function createWorker() {
 		terminate: () => void worker.terminate()
 	};
 }
-//#endregion
 export { workerHost as n, createWorker as t };
 
-//# sourceMappingURL=worker-T6SdPzUH.mjs.map
+//# sourceMappingURL=worker-CtEowucz.mjs.map