pi-zentui 0.1.9 → 0.1.11

package/README.md

@@ -25,9 +25,9 @@ Zentui brings two popular aesthetics to Pi:
 
 ### Editor (Opencode-inspired)
 
-- Bordered input box with theme accent rail and thinking-level border color
+- Bordered input box with configurable accent rail and border colors
 - Model name and provider displayed inside the editor frame
-- Thinking level indicator when enabled
+- Configurable model, provider, and thinking-level indicator colors
 - Prompt-box-style user messages matching the ZentUI input chrome
 
 ### Git Status Icons
@@ -49,65 +49,65 @@ Zentui brings two popular aesthetics to Pi:
 
 Detects Starship Nerd Font runtime/language modules, uses the Starship Nerd Font symbols, and keeps Starship-style defaults such as `bold green` for Node.js. By default Zentui maps those styles through your active Pi theme; switch the Starship/footer color source to `terminal` in `/zentui` if you want your terminal colorscheme to supply the exact ANSI colors.
 
-| Runtime/language | Detection examples                                           |
-| ---------------- | ------------------------------------------------------------ |
-| Buf              | `buf.yaml`, `buf.gen.yaml`, `buf.work.yaml`                  |
-| Bun              | `bun.lock`, `bun.lockb`                                      |
-| C                | `.c`, `.h` files                                             |
-| C++              | `.cpp`, `.cc`, `.cxx`, `.hpp` files                          |
-| CMake            | `CMakeLists.txt`, `CMakeCache.txt`                           |
-| COBOL            | `.cbl`, `.cob` files                                         |
-| Conda            | `CONDA_DEFAULT_ENV` environment                              |
-| Crystal          | `.cr` files, `shard.yml`                                     |
-| Dart             | `.dart` files, `pubspec.yaml`, `.dart_tool/`                 |
-| Deno             | `deno.json`, `deno.jsonc`, `deno.lock`                       |
-| .NET             | `.csproj`, `.fsproj`, `global.json`, `Directory.Build.*`     |
-| Elixir           | `mix.exs`                                                    |
-| Elm              | `.elm` files, `elm.json`, `elm-stuff/`                       |
-| Erlang           | `rebar.config`, `erlang.mk`                                  |
-| Fennel           | `.fnl` files                                                 |
-| Fortran          | `.f`, `.f90`, `.f95`, `.f03`, `.f08`, `.f18`, `fpm.toml`     |
-| Gleam            | `.gleam` files, `gleam.toml`                                 |
-| Go               | `go.mod`                                                     |
-| Gradle           | `build.gradle`, `build.gradle.kts`, `gradle/`                |
-| Guix shell       | `GUIX_ENVIRONMENT` environment                               |
-| Haskell          | `.hs`, `.cabal`, `stack.yaml`, `cabal.project`               |
-| Haxe             | `.hx`, `.hxml`, `haxelib.json`, `.haxerc`                    |
-| Helm             | `helmfile.yaml`, `Chart.yaml`                                |
-| Java             | `.java-version`                                              |
-| Julia            | `.jl` files, `Project.toml`, `Manifest.toml`                 |
-| Kotlin           | `.kt`, `.kts` files                                          |
-| Lua              | `.lua` files, `stylua.toml`, `.luarc.json`, `lua/` dir       |
-| Maven            | `pom.xml`                                                    |
-| Meson            | `MESON_DEVENV=1` and `MESON_PROJECT_NAME` environment        |
-| Mojo             | `.mojo` files                                                |
-| Nim              | `.nim`, `.nims`, `.nimble`, `nim.cfg`                        |
-| Nix shell        | `IN_NIX_SHELL=pure` or `IN_NIX_SHELL=impure` environment     |
-| Node.js          | `package.json`, `.nvmrc`, `.node-version`                    |
-| OCaml            | `.opam`, `.ml`, `.mli`, `dune`, `_opam/`, `esy.lock/`        |
-| Odin             | `.odin` files                                                |
-| OPA/Rego         | `.rego` files                                                |
-| Perl             | `.pl`, `.pm`, `Makefile.PL`, `cpanfile`, `META.*`            |
-| PHP              | `composer.json`                                              |
+| Runtime/language | Detection examples                                            |
+| ---------------- | ------------------------------------------------------------- |
+| Buf              | `buf.yaml`, `buf.gen.yaml`, `buf.work.yaml`                   |
+| Bun              | `bun.lock`, `bun.lockb`                                       |
+| C                | `.c`, `.h` files                                              |
+| C++              | `.cpp`, `.cc`, `.cxx`, `.hpp` files                           |
+| CMake            | `CMakeLists.txt`, `CMakeCache.txt`                            |
+| COBOL            | `.cbl`, `.cob` files                                          |
+| Conda            | `CONDA_DEFAULT_ENV` environment                               |
+| Crystal          | `.cr` files, `shard.yml`                                      |
+| Dart             | `.dart` files, `pubspec.yaml`, `.dart_tool/`                  |
+| Deno             | `deno.json`, `deno.jsonc`, `deno.lock`                        |
+| .NET             | `.csproj`, `.fsproj`, `global.json`, `Directory.Build.*`      |
+| Elixir           | `mix.exs`                                                     |
+| Elm              | `.elm` files, `elm.json`, `elm-stuff/`                        |
+| Erlang           | `rebar.config`, `erlang.mk`                                   |
+| Fennel           | `.fnl` files                                                  |
+| Fortran          | `.f`, `.f90`, `.f95`, `.f03`, `.f08`, `.f18`, `fpm.toml`      |
+| Gleam            | `.gleam` files, `gleam.toml`                                  |
+| Go               | `go.mod`                                                      |
+| Gradle           | `build.gradle`, `build.gradle.kts`, `gradle/`                 |
+| Guix shell       | `GUIX_ENVIRONMENT` environment                                |
+| Haskell          | `.hs`, `.cabal`, `stack.yaml`, `cabal.project`                |
+| Haxe             | `.hx`, `.hxml`, `haxelib.json`, `.haxerc`                     |
+| Helm             | `helmfile.yaml`, `Chart.yaml`                                 |
+| Java             | `.java-version`                                               |
+| Julia            | `.jl` files, `Project.toml`, `Manifest.toml`                  |
+| Kotlin           | `.kt`, `.kts` files                                           |
+| Lua              | `.lua` files, `stylua.toml`, `.luarc.json`, `lua/` dir        |
+| Maven            | `pom.xml`                                                     |
+| Meson            | `MESON_DEVENV=1` and `MESON_PROJECT_NAME` environment         |
+| Mojo             | `.mojo` files                                                 |
+| Nim              | `.nim`, `.nims`, `.nimble`, `nim.cfg`                         |
+| Nix shell        | `IN_NIX_SHELL=pure` or `IN_NIX_SHELL=impure` environment      |
+| Node.js          | `package.json`, `.nvmrc`, `.node-version`                     |
+| OCaml            | `.opam`, `.ml`, `.mli`, `dune`, `_opam/`, `esy.lock/`         |
+| Odin             | `.odin` files                                                 |
+| OPA/Rego         | `.rego` files                                                 |
+| Perl             | `.pl`, `.pm`, `Makefile.PL`, `cpanfile`, `META.*`             |
+| PHP              | `composer.json`                                               |
 | Pixi             | `pixi.toml`, `pixi.lock`, `PIXI_ENVIRONMENT_NAME` environment |
-| Pulumi           | `Pulumi.yaml`, `Pulumi.yml`                                  |
-| PureScript       | `.purs` files, `spago.dhall`, `spago.yaml`, `spago.lock`     |
-| Python           | `pyproject.toml`, `requirements.txt`, `setup.py`, `Pipfile`  |
-| R                | `.R`, `.Rmd`, `.Rproj`, `DESCRIPTION`, `.Rproj.user/`        |
-| Raku             | `.raku`, `.rakumod`, `.p6`, `.pm6`, `META6.json`             |
-| Red              | `.red`, `.reds` files                                        |
-| Ruby             | `Gemfile`, `.ruby-version`                                   |
+| Pulumi           | `Pulumi.yaml`, `Pulumi.yml`                                   |
+| PureScript       | `.purs` files, `spago.dhall`, `spago.yaml`, `spago.lock`      |
+| Python           | `pyproject.toml`, `requirements.txt`, `setup.py`, `Pipfile`   |
+| R                | `.R`, `.Rmd`, `.Rproj`, `DESCRIPTION`, `.Rproj.user/`         |
+| Raku             | `.raku`, `.rakumod`, `.p6`, `.pm6`, `META6.json`              |
+| Red              | `.red`, `.reds` files                                         |
+| Ruby             | `Gemfile`, `.ruby-version`                                    |
 | Rust             | `Cargo.toml`                                                  |
-| Scala            | `.scala`, `.sbt`, `build.sbt`, `.metals/`                    |
-| Solidity         | `.sol` files                                                 |
-| Spack            | `SPACK_ENV` environment                                      |
-| Swift            | `.swift` files, `Package.swift`                              |
-| Terraform        | `.tf`, `.tfplan`, `.tfstate`, `.terraform/`                  |
-| Typst            | `.typ` files, `template.typ`                                 |
-| Vagrant          | `Vagrantfile`                                                |
-| V                | `.v` files, `v.mod`, `vpkg.json`                             |
-| Xmake            | `xmake.lua`                                                  |
-| Zig              | `.zig` files, `build.zig`                                    |
+| Scala            | `.scala`, `.sbt`, `build.sbt`, `.metals/`                     |
+| Solidity         | `.sol` files                                                  |
+| Spack            | `SPACK_ENV` environment                                       |
+| Swift            | `.swift` files, `Package.swift`                               |
+| Terraform        | `.tf`, `.tfplan`, `.tfstate`, `.terraform/`                   |
+| Typst            | `.typ` files, `template.typ`                                  |
+| Vagrant          | `Vagrantfile`                                                 |
+| V                | `.v` files, `v.mod`, `vpkg.json`                              |
+| Xmake            | `xmake.lua`                                                   |
+| Zig              | `.zig` files, `build.zig`                                     |
 
 ## Install
 
@@ -121,71 +121,66 @@ pi install git:github.com/lmilojevicc/pi-zentui
 
 ## Config
 
-On first run, Zentui creates a config file at:
+User config lives at `~/.pi/agent/zentui.json`. The file is optional: missing or invalid known values fall back to Zentui defaults, unknown keys are ignored at runtime, and `/zentui` currently patches only color-source settings.
 
-```
-~/.pi/agent/zentui.json
-```
-
-### Default config
+Default config values — copy this and change any value you want:
 
 ```json
 {
-  "projectRefreshIntervalMs": 30000,
-  "icons": {
-    "cwd": "󰝰",
-    "git": "",
-    "ahead": "↑",
-    "behind": "↓",
-    "diverged": "⇕",
-    "conflicted": "=",
-    "untracked": "?",
-    "stashed": "$",
-    "modified": "!",
-    "staged": "+",
-    "renamed": "»",
-    "deleted": "✘",
-    "typechanged": "T"
-  },
-  "colors": {
-    "cwd": "bold cyan",
-    "gitBranch": "bold purple",
-    "gitStatus": "bold red",
-    "contextNormal": "dimmed",
-    "contextWarning": "bold yellow",
-    "contextError": "bold red",
-    "tokens": "dimmed",
-    "cost": "bold green",
-    "separator": "dimmed",
-    "runtimePrefix": ""
-  },
-  "colorSources": {
-    "starship": "theme",
-    "editor": "theme",
-    "userMessages": "theme"
-  }
+	"projectRefreshIntervalMs": 30000,
+	"icons": {
+		"cwd": "󰝰",
+		"git": "",
+		"ahead": "↑",
+		"behind": "↓",
+		"diverged": "⇕",
+		"conflicted": "=",
+		"untracked": "?",
+		"stashed": "$",
+		"modified": "!",
+		"staged": "+",
+		"renamed": "»",
+		"deleted": "✘",
+		"typechanged": "T"
+	},
+	"colors": {
+		"cwd": "bold cyan",
+		"gitBranch": "bold purple",
+		"gitStatus": "bold red",
+		"contextNormal": "bright-black",
+		"contextWarning": "bold yellow",
+		"contextError": "bold red",
+		"tokens": "bright-black",
+		"cost": "bold green",
+		"separator": "bright-black",
+		"runtimePrefix": "",
+		"editorAccent": "accent",
+		"editorBorder": "borderMuted",
+		"editorModel": "accent",
+		"editorProvider": "text",
+		"editorThinking": "muted",
+		"editorThinkingMinimal": "thinkingMinimal",
+		"editorThinkingLow": "thinkingLow",
+		"editorThinkingMedium": "thinkingMedium",
+		"editorThinkingHigh": "thinkingHigh",
+		"editorThinkingXhigh": "thinkingXhigh"
+	},
+	"colorSources": {
+		"starship": "theme",
+		"editor": "theme",
+		"userMessages": "theme"
+	}
 }
 ```
 
-`projectRefreshIntervalMs` controls how often Zentui refreshes project status (git/runtime) while Pi is idle. Set it to `0` to disable polling; invalid values or values below 5000 ms fall back to `30000`.
-
-### Color values
-
-Use `/zentui` inside Pi to switch color sources between Pi theme colors and terminal colors:
-
-- `starship` — footer/runtime/git/context/cost colors
-- `editor + previous messages` — input editor and previous user-message rails/borders
-
-Both settings default to `theme`. The config still stores editor and previous user-message sources separately as `editor` and `userMessages`, but `/zentui` changes them together so the prompt chrome stays consistent.
-
-Color values can use terminal-palette style strings, hex colors, or Pi theme color tokens:
-
-- Named terminal colors: `bold purple`, `yellow`, `bright-cyan`
-- 256-color / hex: `bold 149`, `fg:202`, `#89b4fa`
-- Backgrounds and modifiers: `bg:blue fg:bright-green`, `underline bg:#bf5700`
-- Pi theme tokens: `accent`, `borderMuted`, `syntaxKeyword`
-
-Use the `colors` config key for these values.
+- Style values can be Starship/terminal strings (`bold purple`, `fg:202`, `#89b4fa`, `bg:blue fg:bright-green`) or Pi theme tokens (`accent`, `borderMuted`, `thinkingHigh`).
+- `projectRefreshIntervalMs`: project status polling interval; `0` disables polling.
+- `icons`: every shown icon key is configurable; omit any key to use the Zentui default.
+- `colorSources`: `theme` maps styles through Pi theme tokens; `terminal` emits terminal colors. `/zentui` switches these sources; manual JSON controls specific style values.
+- The shown `editor*` values match the default `theme` source. Omit those keys to keep Zentui's source-aware defaults when switching between `theme` and `terminal`.
+- `editorAccent` styles the active editor rail and previous user-message rail.
+- `editorBorder` styles the active editor and previous user-message top/bottom border color only; the border glyph stays `─`.
+- `editorModel`, `editorProvider`, and `editorThinking*` style the editor metadata. `editorThinking` applies to every non-`off` thinking level unless a level-specific key is set.
 
 ## Requirements
 

package/extensions/zentui/config.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { isSupportedColorSpec } from "./style";
 
 export type ColorSpec = string;
 export type ColorSource = "theme" | "terminal";
@@ -42,6 +43,16 @@ export type PolishedTuiConfig = {
 		cost: ColorSpec;
 		separator: ColorSpec;
 		runtimePrefix: ColorSpec;
+		editorAccent?: ColorSpec;
+		editorBorder?: ColorSpec;
+		editorModel?: ColorSpec;
+		editorProvider?: ColorSpec;
+		editorThinking?: ColorSpec;
+		editorThinkingMinimal?: ColorSpec;
+		editorThinkingLow?: ColorSpec;
+		editorThinkingMedium?: ColorSpec;
+		editorThinkingHigh?: ColorSpec;
+		editorThinkingXhigh?: ColorSpec;
 	};
 	colorSources: ColorSourcesConfig;
 };
@@ -69,12 +80,12 @@ export const defaultConfig: PolishedTuiConfig = {
 		cwd: "bold cyan",
 		gitBranch: "bold purple",
 		gitStatus: "bold red",
-		contextNormal: "dimmed",
+		contextNormal: "bright-black",
 		contextWarning: "bold yellow",
 		contextError: "bold red",
-		tokens: "dimmed",
+		tokens: "bright-black",
 		cost: "bold green",
-		separator: "dimmed",
+		separator: "bright-black",
 		runtimePrefix: "",
 	},
 	colorSources: {
@@ -84,6 +95,22 @@ export const defaultConfig: PolishedTuiConfig = {
 	},
 };
 
+const iconKeys = [
+	"cwd",
+	"git",
+	"ahead",
+	"behind",
+	"diverged",
+	"conflicted",
+	"untracked",
+	"stashed",
+	"modified",
+	"staged",
+	"renamed",
+	"deleted",
+	"typechanged",
+] as const satisfies readonly (keyof PolishedTuiConfig["icons"])[];
+
 type ConfigRecord = Record<string, unknown>;
 
 function isRecord(value: unknown): value is ConfigRecord {
@@ -107,6 +134,11 @@ function stringValue(record: Record<string, unknown>, key: string): string | und
 	return typeof value === "string" ? value : undefined;
 }
 
+function colorValue(record: Record<string, unknown>, key: string): string | undefined {
+	const value = stringValue(record, key);
+	return value !== undefined && isSupportedColorSpec(value) ? value : undefined;
+}
+
 function colorSourceValue(
 	record: Record<string, unknown>,
 	key: keyof ColorSourcesConfig,
@@ -125,18 +157,37 @@ function definedColors(
 	) as Partial<PolishedTuiConfig["colors"]>;
 }
 
+function normalizeIcons(record: Record<string, unknown>): Partial<PolishedTuiConfig["icons"]> {
+	return Object.fromEntries(
+		iconKeys.flatMap((key) => {
+			const value = stringValue(record, key);
+			return value === undefined ? [] : [[key, value]];
+		}),
+	) as Partial<PolishedTuiConfig["icons"]>;
+}
+
 function normalizeColors(record: Record<string, unknown>): Partial<PolishedTuiConfig["colors"]> {
 	return definedColors({
-		cwd: stringValue(record, "cwd") ?? stringValue(record, "cwdText"),
-		gitBranch: stringValue(record, "gitBranch") ?? stringValue(record, "git"),
-		gitStatus: stringValue(record, "gitStatus"),
-		contextNormal: stringValue(record, "contextNormal"),
-		contextWarning: stringValue(record, "contextWarning"),
-		contextError: stringValue(record, "contextError"),
-		tokens: stringValue(record, "tokens"),
-		cost: stringValue(record, "cost"),
-		separator: stringValue(record, "separator"),
-		runtimePrefix: stringValue(record, "runtimePrefix"),
+		cwd: colorValue(record, "cwd") ?? colorValue(record, "cwdText"),
+		gitBranch: colorValue(record, "gitBranch") ?? colorValue(record, "git"),
+		gitStatus: colorValue(record, "gitStatus"),
+		contextNormal: colorValue(record, "contextNormal"),
+		contextWarning: colorValue(record, "contextWarning"),
+		contextError: colorValue(record, "contextError"),
+		tokens: colorValue(record, "tokens"),
+		cost: colorValue(record, "cost"),
+		separator: colorValue(record, "separator"),
+		runtimePrefix: colorValue(record, "runtimePrefix"),
+		editorAccent: colorValue(record, "editorAccent"),
+		editorBorder: colorValue(record, "editorBorder"),
+		editorModel: colorValue(record, "editorModel"),
+		editorProvider: colorValue(record, "editorProvider"),
+		editorThinking: colorValue(record, "editorThinking"),
+		editorThinkingMinimal: colorValue(record, "editorThinkingMinimal"),
+		editorThinkingLow: colorValue(record, "editorThinkingLow"),
+		editorThinkingMedium: colorValue(record, "editorThinkingMedium"),
+		editorThinkingHigh: colorValue(record, "editorThinkingHigh"),
+		editorThinkingXhigh: colorValue(record, "editorThinkingXhigh"),
 	});
 }
 
@@ -172,18 +223,17 @@ function readConfigRecord(path = configPath): ConfigRecord {
 }
 
 export function ensureConfigExists(): void {
-	try {
-		if (!existsSync(configPath)) {
-			writeFileSync(configPath, `${JSON.stringify(defaultConfig, null, 2)}\n`, "utf8");
-		}
-	} catch {
-		// Ignore config bootstrap failures; extension will fall back to defaults.
-	}
+	// Intentionally left as a no-op. Zentui config is user-owned and
+	// compatibility-sensitive: runtime defaults come from `mergeConfig({})`, and
+	// the extension should not persist opinionated defaults unless the user
+	// explicitly changes a setting.
 }
 
 export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 	const config = isRecord(parsed) ? parsed : {};
-	const icons = isRecord(config.icons) ? (config.icons as Partial<PolishedTuiConfig["icons"]>) : {};
+	const icons = isRecord(config.icons)
+		? normalizeIcons(config.icons as Record<string, unknown>)
+		: {};
 	const colors = isRecord(config.colors)
 		? normalizeColors(config.colors as Record<string, unknown>)
 		: {};
@@ -200,16 +250,16 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 			...defaultConfig.colors,
 			...colors,
 		},
-		colorSources,
+		colorSources: { ...colorSources },
 	};
 }
 
 export function loadConfig(): PolishedTuiConfig {
 	try {
-		if (!existsSync(configPath)) return defaultConfig;
+		if (!existsSync(configPath)) return mergeConfig({});
 		return mergeConfig(JSON.parse(readFileSync(configPath, "utf8")));
 	} catch {
-		return defaultConfig;
+		return mergeConfig({});
 	}
 }
 
@@ -219,10 +269,9 @@ export function saveColorSourcesPatch(
 ): PolishedTuiConfig {
 	const record = readConfigRecord(path);
 	const existing = isRecord(record.colorSources)
-		? validColorSourceEntries(record.colorSources as Record<string, unknown>)
+		? { ...(record.colorSources as Record<string, unknown>) }
 		: {};
 	record.colorSources = {
-		...defaultConfig.colorSources,
 		...existing,
 		...validColorSourceEntries(patch),
 	};

package/extensions/zentui/footer.ts

@@ -53,7 +53,7 @@ export function installFooter(
 					renderStyleForSource(theme, colorSource, config.colors.gitBranch, text);
 				const gitStatusColor = (text: string) =>
 					renderStyleForSource(theme, colorSource, config.colors.gitStatus, text);
-				const gitIcon = gitColor(config.icons.git);
+				const gitIcon = config.icons.git ? gitColor(config.icons.git) : "";
 				const allStatus = [
 					state.conflicted > 0 ? config.icons.conflicted : "",
 					state.stashed ? config.icons.stashed : "",
@@ -75,7 +75,9 @@ export function installFooter(
 				const statusBlock =
 					allStatus || aheadBehind ? gitStatusColor(`[${allStatus}${aheadBehind}]`) : "";
 				const branchLabel = branch
-					? `on ${gitIcon} ${gitColor(branch)}${statusBlock ? ` ${statusBlock}` : ""}`
+					? [...["on", gitIcon, gitColor(branch)].filter(Boolean), statusBlock]
+							.filter(Boolean)
+							.join(" ")
 					: "";
 				const runtimeLabel = formatRuntimeSegment(
 					theme,

package/extensions/zentui/index.ts

@@ -19,7 +19,6 @@ import { readRuntimeInfo } from "./runtime";
 import { installSelectorBorderStyle } from "./selector-border";
 import { registerZentuiSettingsCommand } from "./settings-command";
 import { type FooterState, createInitialState, syncState } from "./state";
-import { renderAccentLine } from "./style";
 import { PolishedEditor } from "./ui";
 import { installUserMessageStyle } from "./user-message";
 
@@ -81,15 +80,10 @@ export default function (pi: ExtensionAPI) {
 					keybindings,
 					ctx.ui.theme,
 					getCurrentConfig,
-					() =>
-						[
-							renderAccentLine(
-								ctx.ui.theme,
-								getCurrentConfig().colorSources.editor,
-								state.modelLabel,
-							),
-							ctx.ui.theme.fg("text", state.providerLabel),
-						].join(ctx.ui.theme.fg("borderMuted", "  ")),
+					() => ({
+						modelLabel: state.modelLabel,
+						providerLabel: state.providerLabel,
+					}),
 					getThinkingLevel,
 				),
 		);

package/extensions/zentui/settings-command.ts

@@ -7,7 +7,7 @@ import {
 	truncateToWidth,
 } from "@earendil-works/pi-tui";
 import type { ColorSource, ColorSourcesConfig, PolishedTuiConfig } from "./config";
-import { EDITOR_BORDER_STYLE, renderChromeBorder } from "./style";
+import { EDITOR_BORDER_STYLE, renderChromeBorder, safeThemeFg } from "./style";
 
 const colorSourceValues: ColorSource[] = ["theme", "terminal"];
 
@@ -97,8 +97,8 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 							EDITOR_BORDER_STYLE,
 							"─".repeat(Math.max(0, width)),
 						);
-						const header = theme.fg("accent", theme.bold("Zentui settings"));
-						const hint = theme.fg("dim", "Enter/Space cycles values · Esc closes");
+						const header = safeThemeFg(theme, "accent", theme.bold("Zentui settings"));
+						const hint = safeThemeFg(theme, "muted", "Enter/Space cycles values · Esc closes");
 						return [
 							truncateToWidth(border, width, ""),
 							truncateToWidth(header, width, ""),

package/extensions/zentui/style.ts

@@ -1,3 +1,4 @@
+import type { ThemeColor } from "@earendil-works/pi-coding-agent";
 import type { ColorSource, ColorSpec } from "./config";
 
 type ThemeLike = {
@@ -12,6 +13,21 @@ export type { ThemeLike };
 export const EDITOR_ACCENT_STYLE = "blue";
 export const EDITOR_BORDER_STYLE = "bright-black";
 
+export type SourceStyleFallback = {
+	theme: ColorSpec;
+	terminal: ColorSpec;
+};
+
+export const EDITOR_ACCENT_FALLBACK: SourceStyleFallback = {
+	theme: "accent",
+	terminal: EDITOR_ACCENT_STYLE,
+};
+
+export const EDITOR_BORDER_FALLBACK: SourceStyleFallback = {
+	theme: "borderMuted",
+	terminal: EDITOR_BORDER_STYLE,
+};
+
 function isHexColor(value: string): boolean {
 	return /^#(?:[0-9a-fA-F]{6})$/.test(value);
 }
@@ -72,6 +88,54 @@ const themeColorNameMap = new Map([
 
 const themeStyleModifiers = new Set(["bold", "italic", "underline"]);
 
+const themeColorTokens = new Set<ThemeColor>([
+	"accent",
+	"border",
+	"borderAccent",
+	"borderMuted",
+	"success",
+	"error",
+	"warning",
+	"muted",
+	"dim",
+	"text",
+	"thinkingText",
+	"userMessageText",
+	"customMessageText",
+	"customMessageLabel",
+	"toolTitle",
+	"toolOutput",
+	"mdHeading",
+	"mdLink",
+	"mdLinkUrl",
+	"mdCode",
+	"mdCodeBlock",
+	"mdCodeBlockBorder",
+	"mdQuote",
+	"mdQuoteBorder",
+	"mdHr",
+	"mdListBullet",
+	"toolDiffAdded",
+	"toolDiffRemoved",
+	"toolDiffContext",
+	"syntaxComment",
+	"syntaxKeyword",
+	"syntaxFunction",
+	"syntaxVariable",
+	"syntaxString",
+	"syntaxNumber",
+	"syntaxType",
+	"syntaxOperator",
+	"syntaxPunctuation",
+	"thinkingOff",
+	"thinkingMinimal",
+	"thinkingLow",
+	"thinkingMedium",
+	"thinkingHigh",
+	"thinkingXhigh",
+	"bashMode",
+]);
+
 function terminalColorToAnsi(color: string, isBackground = false): string | undefined {
 	const normalized = color.toLowerCase();
 	const colorCode = terminalColorCodes.get(normalized);
@@ -92,6 +156,26 @@ function isExplicitTerminalColorToken(token: string): boolean {
 	return /^(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/.test(normalized);
 }
 
+function isSupportedStyleToken(token: string): boolean {
+	const normalized = token.toLowerCase();
+	if (terminalStyleModifiers.has(normalized)) return true;
+	if (terminalColorToAnsi(normalized) !== undefined) return true;
+
+	const isForeground = normalized.startsWith("fg:");
+	const isBackground = normalized.startsWith("bg:");
+	if (isForeground || isBackground) {
+		return terminalColorToAnsi(normalized.slice(3), isBackground) !== undefined;
+	}
+
+	return themeColorTokens.has(token as ThemeColor);
+}
+
+export function isSupportedColorSpec(style: ColorSpec): boolean {
+	const trimmed = style.trim();
+	if (trimmed === "") return true;
+	return trimmed.split(/\s+/).every(isSupportedStyleToken);
+}
+
 function applyThemeModifiers(theme: ThemeLike, styleTokens: string[], text: string): string {
 	let rendered = text;
 	for (const token of styleTokens) {
@@ -103,7 +187,7 @@ function applyThemeModifiers(theme: ThemeLike, styleTokens: string[], text: stri
 	return rendered;
 }
 
-function themeFg(theme: ThemeLike, color: string, text: string): string {
+export function safeThemeFg(theme: ThemeLike, color: string, text: string): string {
 	try {
 		return theme.fg(color, text);
 	} catch {
@@ -137,7 +221,7 @@ export function colorize(theme: ThemeLike, color: ColorSpec, text: string): stri
 	if (isHexColor(color)) {
 		return `${hexToAnsi(color)}${text}\x1b[39m`;
 	}
-	return themeFg(theme, color, text);
+	return safeThemeFg(theme, color, text);
 }
 
 /**
@@ -184,7 +268,7 @@ export function renderThemeStyle(theme: ThemeLike, style: ColorSpec, text: strin
 	if (tokens.some(isExplicitTerminalColorToken)) return renderTerminalStyle(style, text);
 
 	const color = mapThemeColor(tokens) ?? "text";
-	return themeFg(theme, color, applyThemeModifiers(theme, tokens, text));
+	return safeThemeFg(theme, color, applyThemeModifiers(theme, tokens, text));
 }
 
 export function renderStyleForSource(
@@ -198,6 +282,17 @@ export function renderStyleForSource(
 		: renderThemeStyle(theme, style, text);
 }
 
+export function renderStyleForSourceOrFallback(
+	theme: ThemeLike,
+	source: ColorSource,
+	style: ColorSpec | undefined,
+	fallback: ColorSpec | SourceStyleFallback,
+	text: string,
+): string {
+	const fallbackStyle = typeof fallback === "string" ? fallback : fallback[source];
+	return renderStyleForSource(theme, source, style ?? fallbackStyle, text);
+}
+
 export function renderEditorAccent(text: string): string {
 	return renderTerminalStyle(EDITOR_ACCENT_STYLE, text);
 }
@@ -207,7 +302,7 @@ export function renderEditorBorder(text: string): string {
 }
 
 export function renderAccentLine(theme: ThemeLike, source: ColorSource, text: string): string {
-	return source === "terminal" ? renderEditorAccent(text) : themeFg(theme, "accent", text);
+	return renderStyleForSourceOrFallback(theme, source, undefined, EDITOR_ACCENT_FALLBACK, text);
 }
 
 export function renderChromeBorder(
@@ -216,6 +311,11 @@ export function renderChromeBorder(
 	terminalFallbackStyle: ColorSpec,
 	text: string,
 ): string {
-	if (source === "terminal") return renderTerminalStyle(terminalFallbackStyle, text);
-	return themeFg(theme, "borderMuted", text);
+	return renderStyleForSourceOrFallback(
+		theme,
+		source,
+		undefined,
+		{ theme: "borderMuted", terminal: terminalFallbackStyle },
+		text,
+	);
 }

package/extensions/zentui/ui.ts

@@ -7,20 +7,30 @@ import {
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import type { PolishedTuiConfig } from "./config";
-import { EDITOR_BORDER_STYLE, renderAccentLine, renderChromeBorder } from "./style";
+import {
+	EDITOR_ACCENT_FALLBACK,
+	EDITOR_BORDER_FALLBACK,
+	renderStyleForSourceOrFallback,
+	safeThemeFg,
+} from "./style";
 
 type AutocompleteEditorInternals = {
 	autocompleteList?: Pick<Component, "render">;
 	isShowingAutocomplete?: () => boolean;
 };
 
+type EditorMeta = {
+	modelLabel: string;
+	providerLabel: string;
+};
+
 function clampRenderedLines(lines: string[], width: number): string[] {
 	const maxWidth = Math.max(0, width);
 	return lines.map((line) => truncateToWidth(line, maxWidth, ""));
 }
 
 export class PolishedEditor extends CustomEditor {
-	private readonly getModelMeta: () => string;
+	private readonly getModelMeta: () => EditorMeta;
 	private readonly getThinkingLevel: () => string | undefined;
 	private readonly getConfig: () => PolishedTuiConfig;
 	private readonly uiTheme: Theme;
@@ -32,11 +42,11 @@ export class PolishedEditor extends CustomEditor {
 		keybindings: KeybindingsManager,
 		uiTheme: Theme,
 		getConfig: () => PolishedTuiConfig,
-		getModelMeta: () => string,
+		getModelMeta: () => EditorMeta,
 		getThinkingLevel: () => string | undefined,
 	) {
 		super(tui, theme, keybindings, { paddingX: 0 });
-		this.borderColor = (text: string) => uiTheme.fg("border", text);
+		this.borderColor = (text: string) => safeThemeFg(uiTheme, "border", text);
 		this.uiTheme = uiTheme;
 		this.getConfig = getConfig;
 		this.getModelMeta = getModelMeta;
@@ -49,6 +59,23 @@ export class PolishedEditor extends CustomEditor {
 		return `${truncated}${pad}`;
 	}
 
+	private editorThinkingStyle(config: PolishedTuiConfig, level: string): string | undefined {
+		switch (level.toLowerCase()) {
+			case "minimal":
+				return config.colors.editorThinkingMinimal ?? config.colors.editorThinking;
+			case "low":
+				return config.colors.editorThinkingLow ?? config.colors.editorThinking;
+			case "medium":
+				return config.colors.editorThinkingMedium ?? config.colors.editorThinking;
+			case "high":
+				return config.colors.editorThinkingHigh ?? config.colors.editorThinking;
+			case "xhigh":
+				return config.colors.editorThinkingXhigh ?? config.colors.editorThinking;
+			default:
+				return config.colors.editorThinking;
+		}
+	}
+
 	render(width: number): string[] {
 		if (width <= 2) {
 			return clampRenderedLines(super.render(width), width);
@@ -84,26 +111,61 @@ export class PolishedEditor extends CustomEditor {
 			return clampRenderedLines(rendered, width);
 		}
 
+		const config = this.getConfig();
+		const colorSource = config.colorSources.editor;
 		const editorLines = editorFrame.slice(1, -1);
-		const metaParts = [this.getModelMeta()];
+		const { modelLabel, providerLabel } = this.getModelMeta();
+		const model = renderStyleForSourceOrFallback(
+			this.uiTheme,
+			colorSource,
+			config.colors.editorModel,
+			EDITOR_ACCENT_FALLBACK,
+			modelLabel,
+		);
+		const provider = renderStyleForSourceOrFallback(
+			this.uiTheme,
+			colorSource,
+			config.colors.editorProvider,
+			"text",
+			providerLabel,
+		);
+		const modelMeta = [model, provider]
+			.filter(Boolean)
+			.join(safeThemeFg(this.uiTheme, "borderMuted", "  "));
+		const metaParts = [modelMeta];
 		const thinkingLevel = this.getThinkingLevel();
 		if (thinkingLevel && thinkingLevel !== "off") {
-			metaParts.push(this.uiTheme.fg("muted", thinkingLevel));
+			metaParts.push(
+				renderStyleForSourceOrFallback(
+					this.uiTheme,
+					colorSource,
+					this.editorThinkingStyle(config, thinkingLevel),
+					"muted",
+					thinkingLevel,
+				),
+			);
 		}
-		const meta = metaParts.filter(Boolean).join(this.uiTheme.fg("border", "  "));
+		const meta = metaParts.filter(Boolean).join(safeThemeFg(this.uiTheme, "border", "  "));
 
-		const colorSource = this.getConfig().colorSources.editor;
-		const rail = `${renderAccentLine(this.uiTheme, colorSource, "│")}${this.reset} `;
-		const top = renderChromeBorder(
+		const rail = `${renderStyleForSourceOrFallback(
+			this.uiTheme,
+			colorSource,
+			config.colors.editorAccent,
+			EDITOR_ACCENT_FALLBACK,
+			"│",
+		)}${this.reset} `;
+		const top = renderStyleForSourceOrFallback(
 			this.uiTheme,
 			colorSource,
-			EDITOR_BORDER_STYLE,
+			config.colors.editorBorder,
+			EDITOR_BORDER_FALLBACK,
 			"─".repeat(width),
 		);
-		const bottom = renderChromeBorder(
+		const bottom = renderStyleForSourceOrFallback(
 			this.uiTheme,
 			colorSource,
-			EDITOR_BORDER_STYLE,
+			config.colors.editorBorder,
+			EDITOR_BORDER_FALLBACK,
 			"─".repeat(width),
 		);
 		const lines = ["", ...editorLines, "", meta];

package/extensions/zentui/user-message.ts

@@ -6,7 +6,11 @@ import {
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import type { PolishedTuiConfig } from "./config";
-import { EDITOR_BORDER_STYLE, renderAccentLine, renderChromeBorder } from "./style";
+import {
+	EDITOR_ACCENT_FALLBACK,
+	EDITOR_BORDER_FALLBACK,
+	renderStyleForSourceOrFallback,
+} from "./style";
 
 const OSC133_ZONE_START = "\x1b]133;A\x07";
 const OSC133_ZONE_END = "\x1b]133;B\x07";
@@ -52,7 +56,12 @@ function findMarkdownText(value: unknown): string | undefined {
 }
 
 function themeFg(theme: Theme | undefined, color: ThemeColor, text: string): string {
-	return theme ? theme.fg(color, text) : text;
+	if (!theme) return text;
+	try {
+		return theme.fg(color, text);
+	} catch {
+		return text;
+	}
 }
 
 function makeMarkdownTheme(theme: Theme | undefined): MarkdownTheme {
@@ -87,7 +96,17 @@ function renderPromptBoxLine(
 	config: PolishedTuiConfig,
 ): string {
 	if (width <= 0) return "";
-	const rail = `${theme ? renderAccentLine(theme, config.colorSources.userMessages, "│") : "│"} `;
+	const rail = `${
+		theme
+			? renderStyleForSourceOrFallback(
+					theme,
+					config.colorSources.userMessages,
+					config.colors.editorAccent,
+					EDITOR_ACCENT_FALLBACK,
+					"│",
+				)
+			: "│"
+	} `;
 	const contentWidth = Math.max(0, width - visibleWidth(rail));
 	return truncateToWidth(`${rail}${fillLine(line, contentWidth)}`, width, "");
 }
@@ -103,7 +122,17 @@ function renderZentuiUserMessage(
 	if (width <= 0) return [""];
 
 	const railWidth = visibleWidth(
-		`${theme ? renderAccentLine(theme, config.colorSources.userMessages, "│") : "│"} `,
+		`${
+			theme
+				? renderStyleForSourceOrFallback(
+						theme,
+						config.colorSources.userMessages,
+						config.colors.editorAccent,
+						EDITOR_ACCENT_FALLBACK,
+						"│",
+					)
+				: "│"
+		} `,
 	);
 	const contentWidth = Math.max(1, width - railWidth);
 	const renderer = new Markdown(text, 0, 0, makeMarkdownTheme(theme), {
@@ -112,10 +141,11 @@ function renderZentuiUserMessage(
 	const body = renderer.render(contentWidth);
 	const contentLines = body.length > 0 ? body : [""];
 	const border = theme
-		? renderChromeBorder(
+		? renderStyleForSourceOrFallback(
 				theme,
 				config.colorSources.userMessages,
-				EDITOR_BORDER_STYLE,
+				config.colors.editorBorder,
+				EDITOR_BORDER_FALLBACK,
 				"─".repeat(width),
 			)
 		: "─".repeat(width);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-zentui",
-	"version": "0.1.9",
+	"version": "0.1.11",
 	"description": "A Starship-inspired statusline and Opencode-style TUI for Pi.",
 	"type": "module",
 	"license": "MIT",