gentle-pi 0.9.2 → 0.10.0

package/extensions/gentle-ai.ts

@@ -19,6 +19,8 @@ import { fileURLToPath } from "node:url";
 import type {
 	ExtensionAPI,
 	ExtensionContext,
+	Theme,
+	ThemeColor,
 	ToolCallEventResult,
 } from "@earendil-works/pi-coding-agent";
 import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
@@ -45,6 +47,7 @@ import {
 	type ChangedDiff,
 	type TriggerEvent,
 } from "../lib/review-triggers.ts";
+import { sanitizeTerminalText, stripAnsi } from "../lib/terminal-theme.ts";
 
 const PACKAGE_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
 const ASSETS_DIR = join(PACKAGE_ROOT, "assets");
@@ -713,17 +716,8 @@ function isThinkingLevel(value: unknown): value is ThinkingLevel {
 	);
 }
 
-const ANSI_ESCAPE_PATTERN =
-	/[\u001b\u009b][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
-const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g;
 const SAFE_MODEL_ID_PATTERN = /^[A-Za-z0-9._~:@/+%-]+$/;
 
-function sanitizeTerminalText(value: string): string {
-	return value
-		.replace(ANSI_ESCAPE_PATTERN, "")
-		.replace(CONTROL_CHAR_PATTERN, "");
-}
-
 function normalizeModelId(value: unknown): string | undefined {
 	if (typeof value !== "string") return undefined;
 	const model = value.trim();
@@ -1236,6 +1230,26 @@ type ModelPanelResult =
 
 const SET_ALL_AGENTS = "Set all agents";
 
+const PANEL_TONE = {
+	BORDER: "border",
+	MUTED: "muted",
+	TEXT: "text",
+	TITLE: "title",
+	ACCENT: "accent",
+	STATUS: "status",
+} as const;
+
+type PanelTone = (typeof PANEL_TONE)[keyof typeof PANEL_TONE];
+
+const PANEL_TONE_COLOR: Record<PanelTone, ThemeColor> = {
+	border: "border",
+	muted: "muted",
+	text: "text",
+	title: "accent",
+	accent: "accent",
+	status: "thinkingHigh",
+};
+
 class SddModelPanel implements OverlayComponent {
 	private cursor = 0;
 	private mode: "agents" | "models" | "effort" = "agents";
@@ -1247,17 +1261,20 @@ class SddModelPanel implements OverlayComponent {
 	private readonly rows: string[];
 	private readonly modelOptions: string[];
 	private readonly done: (result: ModelPanelResult) => void;
+	private readonly theme: Theme | undefined;
 
 	constructor(
 		initialConfig: AgentModelConfig,
 		modelOptions: string[],
 		agents: string[],
 		done: (result: ModelPanelResult) => void,
+		theme?: Theme,
 	) {
 		this.draft = cloneModelConfig(initialConfig);
 		this.rows = [SET_ALL_AGENTS, ...agents];
 		this.modelOptions = modelOptions;
 		this.done = done;
+		this.theme = theme;
 	}
 
 	invalidate(): void {}
@@ -1287,15 +1304,46 @@ class SddModelPanel implements OverlayComponent {
 
 	private renderCard(lines: string[], width: number): string[] {
 		const innerWidth = Math.max(1, width - 4);
-		const fit = (text = "") =>
-			truncateToWidth(sanitizeTerminalText(text), innerWidth, "…", true).padEnd(innerWidth);
+		const horizontal = "─".repeat(innerWidth + 2);
+		const border = (text: string) => this.renderText(text, "border");
 		return [
-			`╭${"─".repeat(innerWidth + 2)}╮`,
-			...lines.map((line) => `│ ${fit(line)} │`),
-			`╰${"─".repeat(innerWidth + 2)}╯`,
+			border(`╭${horizontal}╮`),
+			...lines.map(
+				(line) =>
+					`${border("│")} ${this.fitStyledLine(line, innerWidth)} ${border("│")}`,
+			),
+			border(`╰${horizontal}╯`),
 		];
 	}
 
+	private fitStyledLine(line: string, width: number): string {
+		const visible = stripAnsi(line);
+		if (visible.length > width) {
+			return truncateToWidth(visible, Math.max(1, width), "…", true);
+		}
+		return `${line}${" ".repeat(Math.max(0, width - visible.length))}`;
+	}
+
+	private renderLine(text = "", width: number, tone?: PanelTone): string {
+		const safe = truncateToWidth(
+			sanitizeTerminalText(text),
+			Math.max(1, width),
+			"…",
+			true,
+		);
+		return tone ? this.renderText(safe, tone) : safe;
+	}
+
+	private renderText(text: string, tone: PanelTone): string {
+		const safe = sanitizeTerminalText(text);
+		if (!this.theme) return safe;
+		return this.theme.fg(PANEL_TONE_COLOR[tone], safe);
+	}
+
+	private renderCursor(focused: boolean): string {
+		return focused ? this.renderText("▸", "accent") : " ";
+	}
+
 	private handleAgentInput(data: string): void {
 		const maxCursor = this.rows.length + 1;
 		if (matchesKey(data, "ctrl+c") || matchesKey(data, "escape")) {
@@ -1478,11 +1526,11 @@ class SddModelPanel implements OverlayComponent {
 
 	private renderAgentList(width: number): string[] {
 		const lines: string[] = [];
-		const line = (text = "") =>
-			truncateToWidth(text, Math.max(1, width), "…", true);
-		lines.push(line("Assign Models and Effort to Agents"));
+		const line = (text = "", tone?: PanelTone) =>
+			this.renderLine(text, width, tone);
+		lines.push(line("Assign Models and Effort to Agents", "title"));
 		lines.push("");
-		lines.push(line("Current assignments:"));
+		lines.push(line("Current assignments:", "muted"));
 		lines.push("");
 		const visibleRows = Math.min(AGENT_LIST_MAX_VISIBLE_ROWS, this.rows.length);
 		const listCursor = Math.min(this.cursor, this.rows.length - 1);
@@ -1494,7 +1542,7 @@ class SddModelPanel implements OverlayComponent {
 			),
 		);
 		const end = Math.min(this.rows.length, start + visibleRows);
-		if (start > 0) lines.push(line(`  ↑ ${start} more agent(s)`));
+		if (start > 0) lines.push(line(`  ↑ ${start} more agent(s)`, "muted"));
 		for (let i = start; i < end; i++) {
 			const row = this.rows[i] ?? SET_ALL_AGENTS;
 			const focused = i === this.cursor;
@@ -1502,21 +1550,28 @@ class SddModelPanel implements OverlayComponent {
 				row === SET_ALL_AGENTS
 					? this.renderSetAllLabel(row)
 					: this.renderAgentLabel(row);
-			lines.push(line(`${focused ? "▸" : " "} ${label}`));
+			lines.push(`${this.renderCursor(focused)} ${label}`);
 		}
 		if (end < this.rows.length)
-			lines.push(line(`  ↓ ${this.rows.length - end} more agent(s)`));
+			lines.push(line(`  ↓ ${this.rows.length - end} more agent(s)`, "muted"));
 		lines.push("");
 		lines.push(
-			line(`${this.cursor === this.rows.length ? "▸" : " "} Continue`),
+			`${this.renderCursor(this.cursor === this.rows.length)} ${this.renderText(
+				"Continue",
+				this.cursor === this.rows.length ? "accent" : "text",
+			)}`,
 		);
 		lines.push(
-			line(`${this.cursor === this.rows.length + 1 ? "▸" : " "} ← Back`),
+			`${this.renderCursor(this.cursor === this.rows.length + 1)} ${this.renderText(
+				"← Back",
+				this.cursor === this.rows.length + 1 ? "accent" : "text",
+			)}`,
 		);
 		lines.push("");
 		lines.push(
 			line(
 				"j/k scroll • enter model/save • e effort • i inherit • c custom • x export • r restore • ctrl+s save • esc back",
+				"muted",
 			),
 		);
 		return lines;
@@ -1525,11 +1580,15 @@ class SddModelPanel implements OverlayComponent {
 	private renderModelPicker(width: number): string[] {
 		const lines: string[] = [];
 		const options = this.filteredModelOptions();
-		const line = (text = "") =>
-			truncateToWidth(text, Math.max(1, width), "…", true);
-		lines.push(line(`Select model for ${sanitizeTerminalText(this.selectedRow)}`));
+		const line = (text = "", tone?: PanelTone) =>
+			this.renderLine(text, width, tone);
+		lines.push(
+			line(`Select model for ${sanitizeTerminalText(this.selectedRow)}`, "title"),
+		);
 		lines.push("");
-		lines.push(line(`◎ ${this.query || "search..."}`));
+		lines.push(
+			`${this.renderText("◎", "accent")} ${this.renderText(this.query || "search...", "muted")}`,
+		);
 		lines.push("");
 		const start = Math.max(
 			0,
@@ -1541,12 +1600,17 @@ class SddModelPanel implements OverlayComponent {
 		const end = Math.min(options.length, start + MODEL_LIST_MAX_VISIBLE_ROWS);
 		for (let i = start; i < end; i++) {
 			const focused = i === this.modelCursor;
-			lines.push(line(`${focused ? "▸" : " "} ${sanitizeTerminalText(options[i] ?? "")}`));
+			lines.push(
+				`${this.renderCursor(focused)} ${this.renderText(
+					options[i] ?? "",
+					focused ? "status" : "text",
+				)}`,
+			);
 		}
-		if (options.length === 0) lines.push(line("  No matching models"));
+		if (options.length === 0) lines.push(line("  No matching models", "muted"));
 		lines.push("");
 		lines.push(
-			line("j/k: navigate • type: search • enter: select • esc: back"),
+			line("j/k: navigate • type: search • enter: select • esc: back", "muted"),
 		);
 		return lines;
 	}
@@ -1580,16 +1644,23 @@ class SddModelPanel implements OverlayComponent {
 
 	private renderEffortPicker(width: number): string[] {
 		const lines: string[] = [];
-		const line = (text = "") =>
-			truncateToWidth(text, Math.max(1, width), "…", true);
-		lines.push(line(`Select effort for ${sanitizeTerminalText(this.selectedRow)}`));
+		const line = (text = "", tone?: PanelTone) =>
+			this.renderLine(text, width, tone);
+		lines.push(
+			line(`Select effort for ${sanitizeTerminalText(this.selectedRow)}`, "title"),
+		);
 		lines.push("");
 		for (let i = 0; i < THINKING_OPTIONS.length; i++) {
 			const focused = i === this.effortCursor;
-			lines.push(line(`${focused ? "▸" : " "} ${THINKING_OPTIONS[i]}`));
+			lines.push(
+				`${this.renderCursor(focused)} ${this.renderText(
+					THINKING_OPTIONS[i] ?? "",
+					focused ? "status" : "text",
+				)}`,
+			);
 		}
 		lines.push("");
-		lines.push(line("j/k: navigate • enter: select • esc: back"));
+		lines.push(line("j/k: navigate • enter: select • esc: back", "muted"));
 		return lines;
 	}
 
@@ -1608,16 +1679,34 @@ class SddModelPanel implements OverlayComponent {
 		const effortLabel = efforts.every((value) => value === firstEffort)
 			? firstEffort
 			: "mixed";
-		return `${sanitizeTerminalText(row).padEnd(20)} model=${sanitizeTerminalText(modelLabel)}, effort=${sanitizeTerminalText(effortLabel)}`;
+		return `${this.renderText(sanitizeTerminalText(row).padEnd(20), "text")} ${this.renderText("model=", "muted")}${this.renderText(modelLabel, "status")}${this.renderText(
+			", effort=",
+			"muted",
+		)}${this.renderText(effortLabel, "status")}`;
 	}
 
 	private renderAgentLabel(row: string): string {
 		const model = this.draft[row]?.model ?? "inherit";
 		const effort = this.draft[row]?.thinking ?? "inherit";
-		return `${sanitizeTerminalText(row).padEnd(20)} model=${sanitizeTerminalText(model)}, effort=${sanitizeTerminalText(effort)}`;
+		return `${this.renderText(sanitizeTerminalText(row).padEnd(20), "text")} ${this.renderText("model=", "muted")}${this.renderText(model, "status")}${this.renderText(
+			", effort=",
+			"muted",
+		)}${this.renderText(effort, "status")}`;
 	}
 }
 
+function renderSddModelPanelForTesting(
+	initialConfig: AgentModelConfig,
+	modelOptions: string[],
+	agents: string[],
+	width: number,
+	theme?: Theme,
+): string[] {
+	return new SddModelPanel(initialConfig, modelOptions, agents, () => {}, theme).render(
+		width,
+	);
+}
+
 async function showSddModelPanel(
 	ctx: ExtensionContext,
 	config: AgentModelConfig,
@@ -1625,8 +1714,8 @@ async function showSddModelPanel(
 	const modelOptions = await getPiModelOptions(ctx);
 	const agents = listDiscoverableAgents(ctx.cwd).map((agent) => agent.name);
 	return ctx.ui.custom<ModelPanelResult>(
-		(_tui, _theme, _keybindings, done) =>
-			new SddModelPanel(config, modelOptions, agents, done),
+		(_tui, theme, _keybindings, done) =>
+			new SddModelPanel(config, modelOptions, agents, done, theme),
 		{
 			overlay: true,
 			overlayOptions: {
@@ -1918,6 +2007,7 @@ export const __testing = {
 	buildGentlePrompt,
 	classifyReviewEvent,
 	parseNumstat,
+	renderSddModelPanel: renderSddModelPanelForTesting,
 };
 
 export default function gentleAi(pi: ExtensionAPI): void {

package/lib/terminal-theme.ts

@@ -0,0 +1,16 @@
+const NON_OSC_ANSI_ESCAPE_PATTERN =
+	/\x1B\[[0-?]*[ -/]*[@-~]|\x1B[@-Z\\-_]|\x9B[0-?]*[ -/]*[@-~]/g;
+const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g;
+const OSC_ESCAPE_PATTERN = /(?:\x1B\]|\x9D)[\s\S]*?(?:\x07|\x1B\\|\x9C|$)/g;
+
+export function stripAnsi(value: string): string {
+	return stripOsc(value).replace(NON_OSC_ANSI_ESCAPE_PATTERN, "");
+}
+
+function stripOsc(value: string): string {
+	return value.replace(OSC_ESCAPE_PATTERN, "");
+}
+
+export function sanitizeTerminalText(value: string): string {
+	return stripAnsi(value).replace(CONTROL_CHAR_PATTERN, "");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gentle-pi",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "Turn Pi into el Gentleman: a senior-architect development harness with SDD/OpenSpec, subagents, strict TDD evidence, review guardrails, and skill discovery.",
   "license": "MIT",
   "type": "module",
@@ -31,6 +31,7 @@
     "skills/",
     "scripts/",
     "tests/",
+    "themes/",
     "README.md"
   ],
   "scripts": {
@@ -44,6 +45,9 @@
     "extensions": [
       "./extensions"
     ],
+    "themes": [
+      "./themes"
+    ],
     "prompts": [
       "./prompts"
     ],

package/tests/gentle-ai.test.ts

@@ -3,7 +3,9 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import test from "node:test";
+import type { Theme } from "@earendil-works/pi-coding-agent";
 import { __testing } from "../extensions/gentle-ai.ts";
+import { stripAnsi } from "../lib/terminal-theme.ts";
 
 function writeMarkdown(path: string, content: string): void {
 	mkdirSync(dirname(path), { recursive: true });
@@ -83,3 +85,35 @@ test("discoverable model agents include installed Judgment Day agents", (t) => {
 		["jd-judge-a", "jd-judge-b", "jd-fix-agent"],
 	);
 });
+
+test("model panel render does not auto-apply the Gentle theme and sanitizes agent labels", () => {
+	const lines = __testing.renderSddModelPanel(
+		{},
+		["openai/gpt-5.5"],
+		["safe-agent\x1b[31m"],
+		72,
+	);
+	const rendered = lines.join("\n");
+	const plain = stripAnsi(rendered);
+
+	assert.doesNotMatch(rendered, /\x1b\[38;2;71;85;105m/);
+	assert.doesNotMatch(rendered, /\x1b\[38;2;125;211;252m/);
+	assert.match(plain, /Assign Models and Effort to Agents/);
+	assert.match(plain, /safe-agent\s+model=inherit, effort=inherit/);
+	assert.doesNotMatch(plain, /\[31m/);
+});
+
+test("model panel render uses the Pi-provided current theme when supplied", () => {
+	const currentTheme = {
+		fg(_color: string, text: string): string {
+			return `\x1b[35m${text}\x1b[39m`;
+		},
+	} as unknown as Theme;
+
+	const rendered = __testing
+		.renderSddModelPanel({}, ["openai/gpt-5.5"], ["safe-agent"], 72, currentTheme)
+		.join("\n");
+
+	assert.match(rendered, /\x1b\[35m/);
+	assert.match(stripAnsi(rendered), /Assign Models and Effort to Agents/);
+});

package/tests/gentle-theme.test.ts

@@ -0,0 +1,221 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import test from "node:test";
+import { fileURLToPath } from "node:url";
+
+const PACKAGE_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
+
+const REQUIRED_THEME_COLOR_KEYS = [
+	"accent",
+	"border",
+	"borderAccent",
+	"borderMuted",
+	"success",
+	"error",
+	"warning",
+	"muted",
+	"dim",
+	"text",
+	"thinkingText",
+	"selectedBg",
+	"userMessageBg",
+	"userMessageText",
+	"customMessageBg",
+	"customMessageText",
+	"customMessageLabel",
+	"toolPendingBg",
+	"toolSuccessBg",
+	"toolErrorBg",
+	"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",
+] as const;
+
+interface PackageJsonPiManifest {
+	theme?: string;
+	themes?: string[];
+}
+
+interface PackageJson {
+	files?: string[];
+	pi?: PackageJsonPiManifest;
+}
+
+interface GentleThemeJson {
+	name?: string;
+	vars?: Record<string, unknown>;
+	colors?: Record<string, unknown>;
+	export?: Record<string, unknown>;
+}
+
+function resolveThemeColor(theme: GentleThemeJson, colorKey: string): unknown {
+	const colorRef = theme.colors?.[colorKey];
+
+	if (typeof colorRef !== "string") {
+		return colorRef;
+	}
+
+	return theme.vars?.[colorRef] ?? colorRef;
+}
+
+function assertResolvedThemeColor(
+	theme: GentleThemeJson,
+	colorKey: string,
+	expected: string,
+): void {
+	assert.equal(resolveThemeColor(theme, colorKey), expected, colorKey);
+}
+
+function readJson<T>(path: string): T {
+	return JSON.parse(readFileSync(path, "utf8")) as T;
+}
+
+test("package manifest exposes bundled themes to Pi discovery", () => {
+	const packageJson = readJson<PackageJson>(join(PACKAGE_ROOT, "package.json"));
+
+	assert.ok(
+		packageJson.pi?.themes?.includes("./themes"),
+		"package.json must expose ./themes so Pi can list bundled themes in Settings",
+	);
+	assert.ok(
+		packageJson.files?.includes("themes/"),
+		"package files must include themes/ so the bundled theme ships in npm packages",
+	);
+	assert.equal(
+		packageJson.pi?.theme,
+		undefined,
+		"package manifest must not auto-apply the bundled theme",
+	);
+});
+
+test("bundled Pi theme is named exactly Gentle and defines all required colors", () => {
+	const theme = readJson<GentleThemeJson>(
+		join(PACKAGE_ROOT, "themes", "Gentle.json"),
+	);
+
+	assert.equal(theme.name, "Gentle");
+	const colors = theme.colors ?? {};
+	assert.deepEqual(
+		REQUIRED_THEME_COLOR_KEYS.filter((key) => !(key in colors)),
+		[],
+	);
+});
+
+test("bundled Pi theme maps roles to the subtle OpenCode gentleman theme", () => {
+	const theme = readJson<GentleThemeJson>(
+		join(PACKAGE_ROOT, "themes", "Gentle.json"),
+	);
+	const vars = theme.vars ?? {};
+	const colors = theme.colors ?? {};
+
+	assert.equal(vars.bg, "#06080f", "Pi background should match OpenCode panel background");
+	assert.equal(vars.bgPanel, "#06080f", "large panel surfaces should match OpenCode panels");
+	assert.equal(vars.bgElement, "#06080f", "message surfaces should match OpenCode elements");
+	assert.equal(vars.bgSubtle, "#0d0f14", "secondary surfaces should use OpenCode diff context background");
+	assert.equal(vars.text, "#F3F6F9", "text should match OpenCode foreground");
+	assert.equal(vars.muted, "#5C6170", "muted text should match OpenCode textMuted");
+	assert.equal(vars.border, "#313342", "border should match OpenCode border");
+	assert.equal(vars.borderSubtle, "#232A40", "subtle borders should match OpenCode borderSubtle");
+	assert.equal(vars.accent, "#E0C15A", "source accent should remain available");
+	assert.equal(vars.selection, "#232A40", "selection should use OpenCode borderSubtle");
+	assert.equal(vars.red, "#CB7C94", "error accent should use blur red");
+	assert.equal(vars.green, "#B7CC85", "success accent should use blur green");
+	assert.equal(vars.blue, "#7FB4CA", "primary roles should use OpenCode primary blue");
+	assert.equal(vars.secondary, "#A3B5D6", "secondary roles should match OpenCode secondary");
+	assert.equal(vars.heading, "#B5B2D0", "markdown headings should match OpenCode heading");
+	assert.equal(vars.warning, "#DEBA87", "warning should match OpenCode warning");
+	assert.equal(
+		vars.toolSuccessBg,
+		"#1a2e1a",
+		"success background should match OpenCode diff added background",
+	);
+	assert.equal(
+		vars.toolPendingBg,
+		"#0d0f14",
+		"pending background should match OpenCode diff context background",
+	);
+	assert.equal(
+		vars.toolErrorBg,
+		"#2e1a1a",
+		"error background should match OpenCode diff removed background",
+	);
+	assert.equal(
+		vars.infoBg,
+		"#0d0f14",
+		"info background should stay as subtle as OpenCode diff context background",
+	);
+
+	assert.equal(colors.accent, "blue");
+	assert.equal(colors.selectedBg, "selection");
+	assert.equal(colors.borderAccent, "blue");
+	assert.equal(colors.userMessageBg, "bgElement");
+	assert.equal(colors.customMessageBg, "bgSubtle");
+	assert.notEqual(resolveThemeColor(theme, "borderAccent"), "#E0C15A");
+	assert.equal(colors.thinkingText, "muted");
+	assert.equal(colors.bashMode, "blue");
+	assert.equal(colors.toolPendingBg, "toolPendingBg");
+	assert.equal(colors.toolSuccessBg, "toolSuccessBg");
+	assert.equal(colors.toolErrorBg, "toolErrorBg");
+	assert.equal(colors.mdHeading, "heading");
+	assert.equal(colors.mdLink, "blue");
+	assert.equal(colors.mdCode, "green");
+	assert.equal(colors.mdQuote, "warning");
+	assert.equal(colors.mdListBullet, "blue");
+	assert.equal(colors.toolTitle, "blue");
+	assert.equal(colors.thinkingHigh, "blue");
+	assert.equal(colors.thinkingXhigh, "secondary");
+	assert.equal(colors.toolOutput, "text");
+	assert.equal(theme.export?.pageBg, "bg");
+	assert.equal(theme.export?.cardBg, "bgElement");
+
+	assertResolvedThemeColor(theme, "accent", "#7FB4CA");
+	assertResolvedThemeColor(theme, "border", "#313342");
+	assertResolvedThemeColor(theme, "borderMuted", "#232A40");
+	assertResolvedThemeColor(theme, "borderAccent", "#7FB4CA");
+	assertResolvedThemeColor(theme, "selectedBg", "#232A40");
+	assertResolvedThemeColor(theme, "thinkingText", "#5C6170");
+	assertResolvedThemeColor(theme, "bashMode", "#7FB4CA");
+	assertResolvedThemeColor(theme, "toolSuccessBg", "#1a2e1a");
+	assertResolvedThemeColor(theme, "toolErrorBg", "#2e1a1a");
+	assertResolvedThemeColor(theme, "toolPendingBg", "#0d0f14");
+	assertResolvedThemeColor(theme, "mdHeading", "#B5B2D0");
+	assertResolvedThemeColor(theme, "mdLink", "#7FB4CA");
+	assertResolvedThemeColor(theme, "mdCode", "#B7CC85");
+	assertResolvedThemeColor(theme, "mdQuote", "#DEBA87");
+	assertResolvedThemeColor(theme, "syntaxComment", "#8394A3");
+	assertResolvedThemeColor(theme, "syntaxKeyword", "#C99AD6");
+	assertResolvedThemeColor(theme, "syntaxFunction", "#B99BF2");
+	assertResolvedThemeColor(theme, "syntaxString", "#DFBD76");
+	assertResolvedThemeColor(theme, "syntaxNumber", "#A4DAA7");
+	assertResolvedThemeColor(theme, "syntaxType", "#8FB8DD");
+	assertResolvedThemeColor(theme, "syntaxPunctuation", "#96A2B0");
+});

package/tests/runtime-harness.mjs

@@ -7,6 +7,7 @@ import { dirname, join } from "node:path";
 import { discoverAndLoadExtensions } from "@earendil-works/pi-coding-agent";
 import { matchesKey } from "@earendil-works/pi-tui";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { stripAnsi } from "../lib/terminal-theme.ts";
 
 const ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
 const EXTENSIONS = [
@@ -823,8 +824,9 @@ async function run() {
 		ctx.ui.custom = (factory) => {
 			const panel = factory(null, null, null, () => undefined);
 			const initialLines = panel.render(120);
+			const plainInitialLines = initialLines.map(stripAnsi);
 			assert.ok(
-				initialLines[0].startsWith("╭") && initialLines.at(-1).startsWith("╰"),
+				plainInitialLines[0].startsWith("╭") && plainInitialLines.at(-1).startsWith("╰"),
 				"model panel should render inside a bordered card",
 			);
 			assert.ok(
@@ -832,36 +834,43 @@ async function run() {
 				"long model agent list should fit within a 24-row terminal 85% overlay budget",
 			);
 			assert.ok(
-				initialLines.some((line) => /↓ \d+ more agent\(s\)/.test(line)),
+				plainInitialLines.some((line) => /↓ \d+ more agent\(s\)/.test(line)),
 				"long model agent list should render a down-scroll indicator",
 			);
 			assert.ok(
-				initialLines.some((line) => line.includes("Continue")),
+				plainInitialLines.some((line) => line.includes("Continue")),
 				"long model agent list should keep Continue visible",
 			);
 			assert.doesNotMatch(
 				initialLines.join("\n"),
-				/[\u001b\u0007]/,
-				"model panel must strip terminal control sequences from agent labels",
+				/\u001b\]|\u0007/,
+				"model panel must strip unsafe terminal control sequences from agent labels",
+			);
+			assert.doesNotMatch(
+				plainInitialLines.join("\n"),
+				/\]52|\[31m/,
+				"model panel must strip user-provided terminal escapes from labels",
 			);
 			for (let i = 0; i < 20; i++) panel.handleInput("j");
 			const scrolledLines = panel.render(120);
+			const plainScrolledLines = scrolledLines.map(stripAnsi);
 			assert.ok(
 				scrolledLines.length <= 20,
 				"scrolled model agent list should stay within the overlay height budget",
 			);
 			assert.ok(
-				scrolledLines.some((line) => /↑ \d+ more agent\(s\)/.test(line)),
+				plainScrolledLines.some((line) => /↑ \d+ more agent\(s\)/.test(line)),
 				"long model agent list should render an up-scroll indicator after navigation",
 			);
 			panel.handleInput("G");
 			const bottomLines = panel.render(120);
+			const plainBottomLines = bottomLines.map(stripAnsi);
 			assert.ok(
 				bottomLines.length <= 20,
 				"bottom model agent list should stay within the overlay height budget",
 			);
 			assert.ok(
-				bottomLines.some((line) => line.includes("▸ ← Back")),
+				plainBottomLines.some((line) => line.includes("▸ ← Back")),
 				"G should jump to the Back action",
 			);
 			return Promise.resolve({ type: "cancel" });

package/tests/terminal-theme.test.ts

@@ -0,0 +1,22 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { sanitizeTerminalText, stripAnsi } from "../lib/terminal-theme.ts";
+
+test("sanitizeTerminalText removes user-controlled ANSI and control characters", () => {
+	assert.equal(
+		sanitizeTerminalText("safe\x1b[31mred\x1b[0m\x1b]52;c;Zm9v\u0007text"),
+		"saferedtext",
+	);
+});
+
+test("sanitizeTerminalText removes unterminated OSC payloads", () => {
+	assert.equal(sanitizeTerminalText("safe\x1b]52;c;Zm9vtext"), "safe");
+	assert.equal(sanitizeTerminalText("safe\x9d52;c;Zm9vtext"), "safe");
+});
+
+test("stripAnsi removes OSC payloads and ANSI styling", () => {
+	assert.equal(
+		stripAnsi("safe \x1b]52;c;Zm9v\u0007\x1b[31mred\x1b[0m"),
+		"safe red",
+	);
+});

package/themes/Gentle.json

@@ -0,0 +1,100 @@
+{
+  "$schema": "https://raw.githubusercontent.com/earendil-works/pi-mono/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "Gentle",
+  "vars": {
+    "bg": "#06080f",
+    "bgPanel": "#06080f",
+    "bgElement": "#06080f",
+    "bgSubtle": "#0d0f14",
+    "surfaceLine": "#0d0f14",
+    "border": "#313342",
+    "borderSubtle": "#232A40",
+    "text": "#F3F6F9",
+    "muted": "#5C6170",
+    "dim": "#5C6170",
+    "disabled": "#5C6170",
+    "accent": "#E0C15A",
+    "blue": "#7FB4CA",
+    "secondary": "#A3B5D6",
+    "heading": "#B5B2D0",
+    "syntaxComment": "#8394A3",
+    "syntaxKeyword": "#C99AD6",
+    "syntaxFunction": "#B99BF2",
+    "syntaxString": "#DFBD76",
+    "syntaxNumber": "#A4DAA7",
+    "syntaxType": "#8FB8DD",
+    "syntaxPunctuation": "#96A2B0",
+    "green": "#B7CC85",
+    "warning": "#DEBA87",
+    "red": "#CB7C94",
+    "brightBlack": "#8394A3",
+    "brightGreen": "#D1E8A9",
+    "brightYellow": "#DEBA87",
+    "brightPurple": "#B99BF2",
+    "brightMagenta": "#C99AD6",
+    "brightBlue": "#8FB8DD",
+    "selection": "#232A40",
+    "toolSuccessBg": "#1a2e1a",
+    "toolPendingBg": "#0d0f14",
+    "toolErrorBg": "#2e1a1a",
+    "infoBg": "#0d0f14"
+  },
+  "colors": {
+    "accent": "blue",
+    "border": "border",
+    "borderAccent": "blue",
+    "borderMuted": "borderSubtle",
+    "success": "green",
+    "error": "red",
+    "warning": "warning",
+    "muted": "muted",
+    "dim": "dim",
+    "text": "text",
+    "thinkingText": "muted",
+    "selectedBg": "selection",
+    "userMessageBg": "bgElement",
+    "userMessageText": "text",
+    "customMessageBg": "bgSubtle",
+    "customMessageText": "text",
+    "customMessageLabel": "blue",
+    "toolPendingBg": "toolPendingBg",
+    "toolSuccessBg": "toolSuccessBg",
+    "toolErrorBg": "toolErrorBg",
+    "toolTitle": "blue",
+    "toolOutput": "text",
+    "mdHeading": "heading",
+    "mdLink": "blue",
+    "mdLinkUrl": "muted",
+    "mdCode": "green",
+    "mdCodeBlock": "text",
+    "mdCodeBlockBorder": "borderSubtle",
+    "mdQuote": "warning",
+    "mdQuoteBorder": "borderSubtle",
+    "mdHr": "muted",
+    "mdListBullet": "blue",
+    "toolDiffAdded": "green",
+    "toolDiffRemoved": "red",
+    "toolDiffContext": "muted",
+    "syntaxComment": "syntaxComment",
+    "syntaxKeyword": "syntaxKeyword",
+    "syntaxFunction": "syntaxFunction",
+    "syntaxVariable": "text",
+    "syntaxString": "syntaxString",
+    "syntaxNumber": "syntaxNumber",
+    "syntaxType": "syntaxType",
+    "syntaxOperator": "warning",
+    "syntaxPunctuation": "syntaxPunctuation",
+    "thinkingOff": "borderSubtle",
+    "thinkingMinimal": "dim",
+    "thinkingLow": "muted",
+    "thinkingMedium": "blue",
+    "thinkingHigh": "blue",
+    "thinkingXhigh": "secondary",
+    "bashMode": "blue"
+  },
+  "export": {
+    "pageBg": "bg",
+    "cardBg": "bgElement",
+    "infoBg": "infoBg"
+  }
+}