pi-umbra 0.3.0 → 0.4.0

package/README.md

@@ -2,7 +2,7 @@
 
 Every pi-umbra package in one install: seven dark themes, tool calls drawn as cards, a
 status footer, an input bar with the session name, a working line that names the running
-tool, parallel read-only branches with a live panel, and the `/umb-*` commands.
+tool, parallel pi branches (read-only, or editing in their own git worktree) with a live agent tree, and the `/umb-*` commands.
 
 ![A one-minute tour: tool cards and diffs, the working line, a question from the model, parallel branches, the card settings and the seven themes](https://raw.githubusercontent.com/grknbyk/pi-umbra/main/assets/demo.webp)
 
@@ -10,7 +10,7 @@ tool, parallel read-only branches with a live panel, and the `/umb-*` commands.
 pi install npm:pi-umbra
 ```
 
-The ten packages ship bundled inside this one tarball. Three of them patch pi's bundle, so
+The nine packages ship bundled inside this one tarball. Three of them patch pi's bundle, so
 run the three scripts once now and again after every pi update, then restart pi:
 
 ```sh
@@ -26,11 +26,10 @@ node ~/.pi/agent/npm/node_modules/pi-umbra/node_modules/pi-umbra-subagents/patch
 | [pi-umbra-ask](https://www.npmjs.com/package/pi-umbra-ask) | a tool the model calls to ask you a question and wait |
 | [pi-umbra-shimmer](https://www.npmjs.com/package/pi-umbra-shimmer) | a wave of colour through the working line, `/umb-shimmer` |
 | [pi-umbra-skill-matcher](https://www.npmjs.com/package/pi-umbra-skill-matcher) | `/name` runs `skill:name`, completion mid-sentence |
-| [pi-umbra-rename](https://www.npmjs.com/package/pi-umbra-rename) | `/umb-rename`, session name and terminal title |
 | [pi-umbra-copy-chat](https://www.npmjs.com/package/pi-umbra-copy-chat) | `/umb-copy-chat`, the session on the clipboard |
 | [pi-umbra-preview](https://www.npmjs.com/package/pi-umbra-preview) | `/umb-preview`, render a document in the browser |
 | [pi-umbra-help](https://www.npmjs.com/package/pi-umbra-help) | `/umb-help` and `/umb-doctor` |
-| [pi-umbra-subagents](https://www.npmjs.com/package/pi-umbra-subagents) | parallel read-only pi branches with a live panel, `/umb-fan`, `/umb-loop` |
+| [pi-umbra-subagents](https://www.npmjs.com/package/pi-umbra-subagents) | parallel pi branches, read-only or in their own git worktree, with a live agent tree, `/umb-fan`, `/umb-loop` |
 
 Full documentation: [github.com/grknbyk/pi-umbra](https://github.com/grknbyk/pi-umbra).
 

package/node_modules/@shikijs/cli/dist/cli.d.mts

@@ -1,10 +1,17 @@
+import { Readable } from "node:stream";
 //#region src/cli.d.ts
-declare function isUrl(path: string): boolean;
-declare function getExtFromUrl(url: string): string;
-declare function readSource(path: string): Promise<{
+export declare function isUrl(path: string): boolean;
+export declare function getExtFromUrl(url: string): string;
+/**
+ * Unknown languages fall back to plaintext so the CLI can be used as a `cat` replacement.
+ * Known-language grammar load/parse errors are not swallowed.
+ */
+export declare function resolveLanguage(lang: string): string;
+export declare function readSource(path: string): Promise<{
   content: string;
   ext: string;
 }>;
-declare function run(argv?: string[], log?: (...data: any[]) => void): Promise<void>;
-//#endregion
-export { getExtFromUrl, isUrl, readSource, run };
+export declare function run(argv?: string[], log?: (...data: any[]) => void, stdin?: Readable & {
+  isTTY?: boolean;
+}): Promise<void>;
+//#endregion

package/node_modules/@shikijs/cli/dist/cli.mjs

@@ -1,10 +1,11 @@
-import { t as codeToANSI } from "./code-to-ansi-BNrZay-4.mjs";
+import { t as codeToANSI } from "./code-to-ansi-Dmm_CuZ9.mjs";
+import { bundledLanguages, isSpecialLang } from "shiki";
 import fs from "node:fs/promises";
 import { parse } from "node:path";
 import process from "node:process";
 import cac from "cac";
 //#region package.json
-var version = "4.4.3";
+var version = "4.5.0";
 //#endregion
 //#region src/cli.ts
 function isUrl(path) {
@@ -18,6 +19,26 @@ function getExtFromUrl(url) {
 		return "";
 	}
 }
+/**
+* Unknown languages fall back to plaintext so the CLI can be used as a `cat` replacement.
+* Known-language grammar load/parse errors are not swallowed.
+*/
+function resolveLanguage(lang) {
+	const normalized = lang.toLowerCase();
+	if (normalized in bundledLanguages || isSpecialLang(normalized)) return normalized;
+	return "text";
+}
+async function render(content, lang, theme, format) {
+	const resolved = resolveLanguage(lang);
+	if (format === "html") {
+		const { codeToHtml } = await import("shiki");
+		return await codeToHtml(content, {
+			lang: resolved,
+			theme
+		});
+	}
+	return await codeToANSI(content, resolved, theme);
+}
 async function readSource(path) {
 	if (isUrl(path)) {
 		const response = await fetch(path);
@@ -31,7 +52,7 @@ async function readSource(path) {
 		ext: parse(path).ext.slice(1).toLowerCase()
 	};
 }
-async function run(argv = process.argv, log = console.log) {
+async function run(argv = process.argv, log = console.log, stdin = process.stdin) {
 	const cli = cac("shiki");
 	cli.option("--theme <theme>", "Color theme to use", { default: "vitesse-dark" }).option("--lang <lang>", "Programming language").option("--format <format>", "Output format (ansi, html)", { default: "ansi" }).option("--list-themes", "List all available themes").option("--list-langs", "List all available languages").help().version(version);
 	const { options, args } = cli.parse(argv);
@@ -41,27 +62,18 @@ async function run(argv = process.argv, log = console.log) {
 		return;
 	}
 	if (options.listLangs) {
-		const { bundledLanguages } = await import("shiki");
 		for (const lang of Object.keys(bundledLanguages)) log(lang);
 		return;
 	}
 	const files = args;
 	if (files.length === 0) {
-		if (!process.stdin.isTTY) {
-			const content = await new Promise((resolve, reject) => {
+		if (!stdin.isTTY) {
+			log(await render(await new Promise((resolve, reject) => {
 				let data = "";
-				process.stdin.on("data", (chunk) => data += chunk);
-				process.stdin.on("end", () => resolve(data));
-				process.stdin.on("error", reject);
-			});
-			const lang = options.lang || "text";
-			if (options.format === "html") {
-				const { codeToHtml } = await import("shiki");
-				log(await codeToHtml(content, {
-					lang,
-					theme: options.theme
-				}));
-			} else log(await codeToANSI(content, lang, options.theme));
+				stdin.on("data", (chunk) => data += chunk);
+				stdin.on("end", () => resolve(data));
+				stdin.on("error", reject);
+			}), options.lang || "text", options.theme, options.format));
 			return;
 		}
 		cli.outputHelp();
@@ -69,17 +81,10 @@ async function run(argv = process.argv, log = console.log) {
 	}
 	const codes = await Promise.all(files.map(async (path) => {
 		const { content, ext } = await readSource(path);
-		const lang = (options.lang || ext).toLowerCase();
-		if (options.format === "html") {
-			const { codeToHtml } = await import("shiki");
-			return await codeToHtml(content, {
-				lang,
-				theme: options.theme
-			});
-		} else return await codeToANSI(content, lang, options.theme);
+		return await render(content, options.lang || ext || "text", options.theme, options.format);
 	}));
 	for (const code of codes) log(code);
 }
 run();
 //#endregion
-export { getExtFromUrl, isUrl, readSource, run };
+export { getExtFromUrl, isUrl, readSource, resolveLanguage, run };

package/node_modules/@shikijs/cli/dist/{code-to-ansi-BNrZay-4.mjs → code-to-ansi-Dmm_CuZ9.mjs}

@@ -1,5 +1,5 @@
 import { FontStyle } from "@shikijs/vscode-textmate";
-import c from "ansis";
+import { Ansis } from "ansis";
 import { codeToTokensBase, getSingletonHighlighter } from "shiki";
 //#region src/colors.ts
 const RE_HASH = /#/;
@@ -36,7 +36,15 @@ function hexApplyAlpha(hex, type = "dark") {
 }
 //#endregion
 //#region src/code-to-ansi.ts
-async function codeToANSI(code, lang, theme) {
+/**
+* Converts code to a string containing ANSI escape codes.
+*
+* The color level is explicit and does not depend on the current environment,
+* as the result is not necessarily printed to the terminal that runs this
+* code. Pass {@link CodeToANSIOptions.colorLevel} to target a different level.
+*/
+async function codeToANSI(code, lang, theme, options = {}) {
+	const ansi = new Ansis(options.colorLevel ?? 3);
 	let output = "";
 	const lines = await codeToTokensBase(code, {
 		lang,
@@ -47,12 +55,12 @@ async function codeToANSI(code, lang, theme) {
 		for (const token of line) {
 			let text = token.content;
 			const color = token.color || themeReg.fg;
-			if (color) text = c.hex(hexApplyAlpha(color, themeReg.type))(text);
+			if (color) text = ansi.hex(hexApplyAlpha(color, themeReg.type))(text);
 			if (token.fontStyle) {
-				if (token.fontStyle & FontStyle.Bold) text = c.bold(text);
-				if (token.fontStyle & FontStyle.Italic) text = c.italic(text);
-				if (token.fontStyle & FontStyle.Underline) text = c.underline(text);
-				if (token.fontStyle & FontStyle.Strikethrough) text = c.strikethrough(text);
+				if (token.fontStyle & FontStyle.Bold) text = ansi.bold(text);
+				if (token.fontStyle & FontStyle.Italic) text = ansi.italic(text);
+				if (token.fontStyle & FontStyle.Underline) text = ansi.underline(text);
+				if (token.fontStyle & FontStyle.Strikethrough) text = ansi.strikethrough(text);
 			}
 			output += text;
 		}

package/node_modules/@shikijs/cli/dist/index.d.mts

@@ -1,5 +1,26 @@
 import { BundledLanguage, BundledTheme } from "shiki";
 //#region src/code-to-ansi.d.ts
-declare function codeToANSI(code: string, lang: BundledLanguage, theme: BundledTheme): Promise<string>;
-//#endregion
-export { codeToANSI };
+/**
+ * The ANSI color level of the emitted escape codes, matching the levels
+ * understood by `ansis`: `0` no color, `1` basic (16 colors), `2` 256 colors,
+ * `3` truecolor (24-bit).
+ */
+export type ANSIColorLevel = 0 | 1 | 2 | 3;
+export interface CodeToANSIOptions {
+  /**
+   * The color level to emit.
+   *
+   * Defaults to `3` (truecolor), so the result does not depend on the
+   * environment this code happens to run in.
+   */
+  colorLevel?: ANSIColorLevel;
+}
+/**
+ * Converts code to a string containing ANSI escape codes.
+ *
+ * The color level is explicit and does not depend on the current environment,
+ * as the result is not necessarily printed to the terminal that runs this
+ * code. Pass {@link CodeToANSIOptions.colorLevel} to target a different level.
+ */
+export declare function codeToANSI(code: string, lang: BundledLanguage, theme: BundledTheme, options?: CodeToANSIOptions): Promise<string>;
+//#endregion

package/node_modules/@shikijs/cli/dist/index.mjs

@@ -1,2 +1,2 @@
-import { t as codeToANSI } from "./code-to-ansi-BNrZay-4.mjs";
+import { t as codeToANSI } from "./code-to-ansi-Dmm_CuZ9.mjs";
 export { codeToANSI };

package/node_modules/@shikijs/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/cli",
   "type": "module",
-  "version": "4.4.3",
+  "version": "4.5.0",
   "description": "Shiki in the command line",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -40,9 +40,9 @@
   },
   "dependencies": {
     "@shikijs/vscode-textmate": "^10.0.2",
-    "ansis": "^4.3.1",
+    "ansis": "^4.4.0",
     "cac": "^7.0.0",
-    "shiki": "4.4.3"
+    "shiki": "4.5.0"
   },
   "scripts": {
     "build": "tsdown",

package/node_modules/@shikijs/core/dist/index.d.mts

@@ -24,8 +24,8 @@ export * from "@shikijs/types";
  *
  * @param options
  */
-declare function createBundledHighlighter<BundledLangs extends string, BundledThemes extends string>(options: CreateBundledHighlighterOptions<BundledLangs, BundledThemes>): CreateHighlighterFactory<BundledLangs, BundledThemes>;
-interface ShorthandsBundle<L extends string, T extends string> {
+export declare function createBundledHighlighter<BundledLangs extends string, BundledThemes extends string>(options: CreateBundledHighlighterOptions<BundledLangs, BundledThemes>): CreateHighlighterFactory<BundledLangs, BundledThemes>;
+export interface ShorthandsBundle<L extends string, T extends string> {
   /**
    * Shorthand for `codeToHtml` with auto-loaded theme and language.
    * A singleton highlighter it maintained internally.
@@ -71,14 +71,14 @@ interface ShorthandsBundle<L extends string, T extends string> {
    */
   getLastGrammarState: ((element: ThemedToken[][] | Root) => GrammarState) | ((code: string, options: CodeToTokensBaseOptions<L, T>) => Promise<GrammarState>);
 }
-declare function makeSingletonHighlighter<L extends string, T extends string>(createHighlighter: CreateHighlighterFactory<L, T>): (options?: Partial<BundledHighlighterOptions<L, T>>) => Promise<HighlighterGeneric<L, T>>;
-interface CreateSingletonShorthandsOptions<L extends string, T extends string> {
+export declare function makeSingletonHighlighter<L extends string, T extends string>(createHighlighter: CreateHighlighterFactory<L, T>): (options?: Partial<BundledHighlighterOptions<L, T>>) => Promise<HighlighterGeneric<L, T>>;
+export interface CreateSingletonShorthandsOptions<L extends string, T extends string> {
   /**
    * A custom function to guess embedded languages to be loaded.
    */
   guessEmbeddedLanguages?: (code: string, lang: string | undefined, highlighter: HighlighterGeneric<L, T>) => Awaitable<string[] | undefined>;
 }
-declare function createSingletonShorthands<L extends string, T extends string>(createHighlighter: CreateHighlighterFactory<L, T>, config?: CreateSingletonShorthandsOptions<L, T>): ShorthandsBundle<L, T>;
+export declare function createSingletonShorthands<L extends string, T extends string>(createHighlighter: CreateHighlighterFactory<L, T>, config?: CreateSingletonShorthandsOptions<L, T>): ShorthandsBundle<L, T>;
 //#endregion
 //#region src/constructors/highlighter.d.ts
 /**
@@ -87,7 +87,7 @@ declare function createSingletonShorthands<L extends string, T extends string>(c
  *
  * @see http://shiki.style/guide/bundles#fine-grained-bundle
  */
-declare function createHighlighterCore(options: HighlighterCoreOptions<false>): Promise<HighlighterCore>;
+export declare function createHighlighterCore(options: HighlighterCoreOptions<false>): Promise<HighlighterCore>;
 /**
  * Create a Shiki core highlighter instance, with no languages or themes bundled.
  * Wasm and each language and theme must be loaded manually.
@@ -96,20 +96,20 @@ declare function createHighlighterCore(options: HighlighterCoreOptions<false>):
  *
  * @see http://shiki.style/guide/bundles#fine-grained-bundle
  */
-declare function createHighlighterCoreSync(options: HighlighterCoreOptions<true>): HighlighterCore;
-declare function makeSingletonHighlighterCore(createHighlighter: typeof createHighlighterCore): (options: HighlighterCoreOptions) => Promise<HighlighterCore>;
-declare const getSingletonHighlighterCore: (options: HighlighterCoreOptions) => Promise<HighlighterCore>;
+export declare function createHighlighterCoreSync(options: HighlighterCoreOptions<true>): HighlighterCore;
+export declare function makeSingletonHighlighterCore(createHighlighter: typeof createHighlighterCore): (options: HighlighterCoreOptions) => Promise<HighlighterCore>;
+export declare const getSingletonHighlighterCore: (options: HighlighterCoreOptions) => Promise<HighlighterCore>;
 //#endregion
 //#region src/highlight/code-to-hast.d.ts
-declare function codeToHast(primitive: ShikiPrimitive, code: string, options: CodeToHastOptions, transformerContext?: ShikiTransformerContextCommon): Root;
-declare function tokensToHast(tokens: ThemedToken[][], options: CodeToHastRenderOptions, transformerContext: ShikiTransformerContextSource, grammarState?: GrammarState | undefined): Root;
+export declare function codeToHast(primitive: ShikiPrimitive, code: string, options: CodeToHastOptions, transformerContext?: ShikiTransformerContextCommon): Root;
+export declare function tokensToHast(tokens: ThemedToken[][], options: CodeToHastRenderOptions, transformerContext: ShikiTransformerContextSource, grammarState?: GrammarState | undefined): Root;
 //#endregion
 //#region src/highlight/code-to-html.d.ts
-declare const hastToHtml: typeof toHtml;
+export declare const hastToHtml: typeof toHtml;
 /**
  * Get highlighted code in HTML.
  */
-declare function codeToHtml(primitive: ShikiPrimitive, code: string, options: CodeToHastOptions): string;
+export declare function codeToHtml(primitive: ShikiPrimitive, code: string, options: CodeToHastOptions): string;
 //#endregion
 //#region src/highlight/code-to-tokens.d.ts
 /**
@@ -117,20 +117,20 @@ declare function codeToHtml(primitive: ShikiPrimitive, code: string, options: Co
  *
  * It will use `codeToTokensWithThemes` or `codeToTokensBase` based on the options.
  */
-declare function codeToTokens(primitive: ShikiPrimitive, code: string, options: CodeToTokensOptions): TokensResult;
+export declare function codeToTokens(primitive: ShikiPrimitive, code: string, options: CodeToTokensOptions): TokensResult;
 //#endregion
 //#region src/highlight/code-to-tokens-ansi.d.ts
-declare function tokenizeAnsiWithTheme(theme: ThemeRegistrationResolved, fileContents: string, options?: TokenizeWithThemeOptions): ThemedToken[][];
+export declare function tokenizeAnsiWithTheme(theme: ThemeRegistrationResolved, fileContents: string, options?: TokenizeWithThemeOptions): ThemedToken[][];
 //#endregion
 //#region src/highlight/code-to-tokens-base.d.ts
 /**
  * Code to tokens, with a simple theme.
  * This wraps the tokenizer's implementation to add ANSI support.
  */
-declare function codeToTokensBase(primitive: ShikiPrimitive, code: string, options?: CodeToTokensBaseOptions): ThemedToken[][];
+export declare function codeToTokensBase(primitive: ShikiPrimitive, code: string, options?: CodeToTokensBaseOptions): ThemedToken[][];
 //#endregion
 //#region src/theme-css-variables.d.ts
-interface CssVariablesThemeOptions {
+export interface CssVariablesThemeOptions {
   /**
    * Theme name. Need to unique if multiple css variables themes are created
    *
@@ -161,13 +161,13 @@ interface CssVariablesThemeOptions {
  *
  * @see https://shiki.style/guide/theme-colors#css-variables-theme
  */
-declare function createCssVariablesTheme(options?: CssVariablesThemeOptions): ThemeRegistration;
+export declare function createCssVariablesTheme(options?: CssVariablesThemeOptions): ThemeRegistration;
 //#endregion
 //#region src/transformer-decorations.d.ts
 /**
  * A built-in transformer to add decorations to the highlighted code.
  */
-declare function transformerDecorations(): ShikiTransformer;
+export declare function transformerDecorations(): ShikiTransformer;
 //#endregion
 //#region src/utils/hast.d.ts
 /**
@@ -175,7 +175,7 @@ declare function transformerDecorations(): ShikiTransformer;
  *
  * If the `property.class` is a string, it will be splitted by space and converted to an array.
  */
-declare function addClassToHast(node: Element, className: string | string[]): Element;
+export declare function addClassToHast(node: Element, className: string | string[]): Element;
 //#endregion
 //#region src/utils/strings.d.ts
 /**
@@ -183,7 +183,7 @@ declare function addClassToHast(node: Element, className: string | string[]): El
  *
  * Overflow/underflow are unchecked.
  */
-declare function createPositionConverter(code: string): {
+export declare function createPositionConverter(code: string): {
   lines: string[];
   indexToPos: (index: number) => Position;
   posToIndex: (line: number, character: number) => number;
@@ -207,7 +207,7 @@ declare function createPositionConverter(code: string): {
  * guessEmbeddedLanguages('```python\nprint("hi")\n```')
  * ```
  */
-declare function guessEmbeddedLanguages(code: string, _lang: string | undefined, highlighter?: HighlighterGeneric<any, any>): string[];
+export declare function guessEmbeddedLanguages(code: string, _lang: string | undefined, highlighter?: HighlighterGeneric<any, any>): string[];
 //#endregion
 //#region src/utils/tokens.d.ts
 /**
@@ -215,13 +215,13 @@ declare function guessEmbeddedLanguages(code: string, _lang: string | undefined,
  *
  * The offsets are relative to the token, and should be sorted.
  */
-declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
+export declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
 /**
  * Split 2D tokens array by given breakpoints.
  */
-declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
-declare function flatTokenVariants(merged: ThemedTokenWithVariants, variantsOrder: string[], cssVariablePrefix: string, defaultColor: CodeOptionsMultipleThemes['defaultColor'], colorsRendering?: CodeOptionsMultipleThemes['colorsRendering']): ThemedToken;
-declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
-declare function stringifyTokenStyle(token: string | Record<string, string>): string;
+export declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
+export declare function flatTokenVariants(merged: ThemedTokenWithVariants, variantsOrder: string[], cssVariablePrefix: string, defaultColor: CodeOptionsMultipleThemes['defaultColor'], colorsRendering?: CodeOptionsMultipleThemes['colorsRendering']): ThemedToken;
+export declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
+export declare function stringifyTokenStyle(token: string | Record<string, string>): string;
 //#endregion
-export { CreateSingletonShorthandsOptions, CssVariablesThemeOptions, ShikiError, ShorthandsBundle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createBundledHighlighter, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createPositionConverter, createShikiInternal, createShikiInternalSync, createShikiPrimitive, createShikiPrimitiveAsync, createSingletonShorthands, flatTokenVariants, getLastGrammarState, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, hastToHtml, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations };
+export { ShikiError, applyColorReplacements, codeToTokensWithThemes, createShikiInternal, createShikiInternalSync, createShikiPrimitive, createShikiPrimitiveAsync, getLastGrammarState, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, toArray, tokenizeWithTheme };

package/node_modules/@shikijs/core/dist/index.mjs

@@ -177,16 +177,17 @@ function flatTokenVariants(merged, variantsOrder, cssVariablePrefix, defaultColo
 	styles.forEach((cur, idx) => {
 		for (const key of styleKeys) {
 			const value = cur[key] || "inherit";
-			if (idx === 0 && defaultColor && COLOR_KEYS.includes(key)) if (defaultColor === "light-dark()" && styles.length > 1) {
-				const lightIndex = variantsOrder.findIndex((t) => t === "light");
-				const darkIndex = variantsOrder.findIndex((t) => t === "dark");
-				if (lightIndex === -1 || darkIndex === -1) throw new ShikiError$1("When using `defaultColor: \"light-dark()\"`, you must provide both `light` and `dark` themes");
-				const lightValue = styles[lightIndex][key] || "inherit";
-				const darkValue = styles[darkIndex][key] || "inherit";
-				mergedStyles[key] = `light-dark(${lightValue}, ${darkValue})`;
-				if (colorsRendering === "css-vars") mergedStyles[varKey(idx, key)] = value;
-			} else mergedStyles[key] = value;
-			else if (colorsRendering === "css-vars") mergedStyles[varKey(idx, key)] = value;
+			if (idx === 0 && defaultColor && COLOR_KEYS.includes(key)) {
+				if (defaultColor === "light-dark()" && styles.length > 1) {
+					const lightIndex = variantsOrder.findIndex((t) => t === "light");
+					const darkIndex = variantsOrder.findIndex((t) => t === "dark");
+					if (lightIndex === -1 || darkIndex === -1) throw new ShikiError$1("When using `defaultColor: \"light-dark()\"`, you must provide both `light` and `dark` themes");
+					const lightValue = styles[lightIndex][key] || "inherit";
+					const darkValue = styles[darkIndex][key] || "inherit";
+					mergedStyles[key] = `light-dark(${lightValue}, ${darkValue})`;
+					if (colorsRendering === "css-vars") mergedStyles[varKey(idx, key)] = value;
+				} else mergedStyles[key] = value;
+			} else if (colorsRendering === "css-vars") mergedStyles[varKey(idx, key)] = value;
 		}
 	});
 	token.htmlStyle = mergedStyles;
@@ -829,8 +830,10 @@ function tokensToHast(tokens, options, transformerContext, grammarState = getLas
 	};
 	const { structure = "classic", tabindex = "0" } = options;
 	const properties = { class: `shiki ${options.themeName || ""}` };
-	if (options.rootStyle !== false) if (options.rootStyle != null) properties.style = options.rootStyle;
-	else properties.style = `background-color:${options.bg};color:${options.fg}`;
+	if (options.rootStyle !== false) {
+		if (options.rootStyle != null) properties.style = options.rootStyle;
+		else properties.style = `background-color:${options.bg};color:${options.fg}`;
+	}
 	if (tabindex !== false && tabindex != null) properties.tabindex = tabindex.toString();
 	for (const [key, value] of Object.entries(options.meta || {})) if (!key.startsWith("_")) properties[key] = value;
 	let preNode = {

package/node_modules/@shikijs/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "4.4.3",
+  "version": "4.5.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -46,11 +46,11 @@
     "node": ">=20"
   },
   "dependencies": {
+    "@shikijs/primitive": "4.5.0",
+    "@shikijs/types": "4.5.0",
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.5",
-    "hast-util-to-html": "^9.0.5",
-    "@shikijs/primitive": "4.4.3",
-    "@shikijs/types": "4.4.3"
+    "hast-util-to-html": "^9.0.5"
   },
   "scripts": {
     "build": "tsdown",

package/node_modules/@shikijs/engine-javascript/dist/{engine-compile-Bdn9ihA2.d.mts → engine-compile-CtqiSkRk.d.mts}

@@ -24,6 +24,11 @@ declare class JavaScriptScanner implements PatternScanner {
   patterns: (string | RegExp)[];
   options: JavaScriptRegexScannerOptions;
   regexps: (RegExp | null)[];
+  /**
+   * Last search of each regexp on the current string, reused the way `vscode-oniguruma` does.
+   * `null` for regexps whose searches can't be reused.
+   */
+  private lastSearches;
   constructor(patterns: (string | RegExp)[], options?: JavaScriptRegexScannerOptions);
   findNextMatchSync(string: string | RegexEngineString, startPosition: number, _options: number): IOnigMatch | null;
 }

package/node_modules/@shikijs/engine-javascript/dist/engine-compile.d.mts

@@ -1,2 +1,2 @@
-import { n as createJavaScriptRegexEngine, r as defaultJavaScriptRegexConstructor, t as JavaScriptRegexEngineOptions } from "./engine-compile-Bdn9ihA2.mjs";
+import { n as createJavaScriptRegexEngine, r as defaultJavaScriptRegexConstructor, t as JavaScriptRegexEngineOptions } from "./engine-compile-CtqiSkRk.mjs";
 export { JavaScriptRegexEngineOptions, createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor };

package/node_modules/@shikijs/engine-javascript/dist/engine-compile.mjs

@@ -1,4 +1,4 @@
-import { t as JavaScriptScanner } from "./scanner-DX8LRFGE.mjs";
+import { n as JavaScriptScanner, t as createJavaScriptEngineString } from "./string-TLTPtCPs.mjs";
 import { toRegExp } from "oniguruma-to-es";
 //#region src/engine-compile.ts
 /**
@@ -38,9 +38,7 @@ function createJavaScriptRegexEngine(options = {}) {
 		createScanner(patterns) {
 			return new JavaScriptScanner(patterns, _options);
 		},
-		createString(s) {
-			return { content: s };
-		}
+		createString: createJavaScriptEngineString
 	};
 }
 //#endregion

package/node_modules/@shikijs/engine-javascript/dist/engine-raw.d.mts

@@ -7,6 +7,5 @@ import { RegexEngine } from "@shikijs/types";
  *
  * Zero dependencies.
  */
-declare function createJavaScriptRawEngine(): RegexEngine;
-//#endregion
-export { createJavaScriptRawEngine };
+export declare function createJavaScriptRawEngine(): RegexEngine;
+//#endregion

package/node_modules/@shikijs/engine-javascript/dist/engine-raw.mjs

@@ -1,4 +1,4 @@
-import { t as JavaScriptScanner } from "./scanner-DX8LRFGE.mjs";
+import { n as JavaScriptScanner, t as createJavaScriptEngineString } from "./string-TLTPtCPs.mjs";
 //#region src/engine-raw.ts
 /**
 * Raw JavaScript regex engine that only supports precompiled grammars.
@@ -18,9 +18,7 @@ function createJavaScriptRawEngine() {
 		createScanner(patterns) {
 			return new JavaScriptScanner(patterns, options);
 		},
-		createString(s) {
-			return { content: s };
-		}
+		createString: createJavaScriptEngineString
 	};
 }
 //#endregion

package/node_modules/@shikijs/engine-javascript/dist/index.d.mts

@@ -1,3 +1,3 @@
-import { a as JavaScriptScanner, i as JavaScriptRegexScannerOptions, n as createJavaScriptRegexEngine, r as defaultJavaScriptRegexConstructor, t as JavaScriptRegexEngineOptions } from "./engine-compile-Bdn9ihA2.mjs";
+import { a as JavaScriptScanner, i as JavaScriptRegexScannerOptions, n as createJavaScriptRegexEngine, r as defaultJavaScriptRegexConstructor, t as JavaScriptRegexEngineOptions } from "./engine-compile-CtqiSkRk.mjs";
 import { createJavaScriptRawEngine } from "./engine-raw.mjs";
 export { JavaScriptRegexEngineOptions, JavaScriptRegexScannerOptions, JavaScriptScanner, createJavaScriptRawEngine, createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor };

package/node_modules/@shikijs/engine-javascript/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as JavaScriptScanner } from "./scanner-DX8LRFGE.mjs";
+import { n as JavaScriptScanner } from "./string-TLTPtCPs.mjs";
 import { createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor } from "./engine-compile.mjs";
 import { createJavaScriptRawEngine } from "./engine-raw.mjs";
 export { JavaScriptScanner, createJavaScriptRawEngine, createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor };