gsd-pi 2.79.0-dev.ece5fd8ba → 2.80.0-dev.4ea7d80e7

package/packages/pi-coding-agent/src/modes/interactive/controllers/chat-controller.ts

@@ -1,9 +1,14 @@
+// GSD-2 Interactive Chat Controller
 import { Loader, Markdown, Spacer, Text } from "@gsd/pi-tui";
 
 import type { InteractiveModeEvent, InteractiveModeStateHost } from "../interactive-mode-state.js";
 import { theme } from "../theme/theme.js";
 import { AssistantMessageComponent } from "../components/assistant-message.js";
-import { ToolExecutionComponent } from "../components/tool-execution.js";
+import {
+	ToolExecutionComponent,
+	ToolPhaseSummaryComponent,
+	type ToolExecutionPhase,
+} from "../components/tool-execution.js";
 import { DynamicBorder } from "../components/dynamic-border.js";
 import { appKey } from "../components/keybinding-hints.js";
 
@@ -100,6 +105,71 @@ let pinnedBorder: DynamicBorder | undefined;
 // Reference to the pinned markdown component below the border
 let pinnedTextComponent: Markdown | undefined;
 
+function mergeToolPhases(phases: ToolExecutionPhase[]): ToolExecutionPhase[] {
+	const merged: ToolExecutionPhase[] = [];
+	for (const phase of phases) {
+		const previous = merged[merged.length - 1];
+		if (previous?.label === phase.label) {
+			previous.count += phase.count;
+			previous.durationMs += phase.durationMs;
+		} else {
+			merged.push({ ...phase });
+		}
+	}
+	return merged;
+}
+
+function replaceCompactToolRowsWithPhaseSummary(
+	host: InteractiveModeStateHost & { ui: { requestRender: () => void } },
+): void {
+	let changed = false;
+	const nextRenderedSegments: RenderedSegment[] = [];
+	let rollupRun: Array<{ seg: Extract<RenderedSegment, { kind: "tool" }>; phase: ToolExecutionPhase }> = [];
+
+	const flushRollupRun = () => {
+		if (rollupRun.length < 2) {
+			nextRenderedSegments.push(...rollupRun.map((item) => item.seg));
+			rollupRun = [];
+			return;
+		}
+
+		const firstIndex = Math.max(0, host.chatContainer.children.indexOf(rollupRun[0].seg.component));
+		const summary = new ToolPhaseSummaryComponent(mergeToolPhases(rollupRun.map((item) => item.phase)));
+
+		for (const { seg } of rollupRun) {
+			host.chatContainer.removeChild(seg.component);
+		}
+
+		host.chatContainer.addChild(summary);
+		const summaryIndex = host.chatContainer.children.indexOf(summary);
+		if (summaryIndex !== -1 && summaryIndex !== firstIndex) {
+			host.chatContainer.children.splice(summaryIndex, 1);
+			host.chatContainer.children.splice(firstIndex, 0, summary);
+			(host.chatContainer as unknown as { _prevRender: string[] | null })._prevRender = null;
+		}
+
+		changed = true;
+		rollupRun = [];
+	};
+
+	for (const seg of renderedSegments) {
+		const phase = seg.kind === "tool" ? seg.component.getRollupPhase() : null;
+		if (seg.kind === "tool" && phase) {
+			rollupRun.push({ seg, phase });
+			continue;
+		}
+
+		flushRollupRun();
+		nextRenderedSegments.push(seg);
+	}
+	flushRollupRun();
+
+	if (changed) {
+		renderedSegments = nextRenderedSegments;
+		host.ui.requestRender();
+	}
+}
+
 export async function handleAgentEvent(host: InteractiveModeStateHost & {
 	init: () => Promise<void>;
 	getMarkdownThemeWithSettings: () => any;
@@ -177,6 +247,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					return;
 			}
 		case "agent_start":
+			host.clearBlockingError();
 			if (host.retryEscapeHandler) {
 				host.defaultEditor.onEscape = host.retryEscapeHandler;
 				host.retryEscapeHandler = undefined;
@@ -772,6 +843,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					host.streamingComponent.setShowMetadata(true);
 					host.streamingComponent.updateContent(host.streamingMessage);
 				}
+				replaceCompactToolRowsWithPhaseSummary(host);
 
 				if (host.streamingMessage.stopReason === "aborted" || host.streamingMessage.stopReason === "error") {
 					if (!errorMessage) {
@@ -822,6 +894,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				component.setExpanded(host.toolOutputExpanded);
 				host.chatContainer.addChild(component);
 				host.pendingTools.set(event.toolCallId, component);
+				renderedSegments.push({ kind: "tool", contentIndex: Number.MAX_SAFE_INTEGER, component });
 				host.ui.requestRender();
 			}
 			break;
@@ -855,6 +928,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				host.streamingComponent.setShowMetadata(true);
 				host.streamingComponent.updateContent(host.streamingMessage);
 			}
+			replaceCompactToolRowsWithPhaseSummary(host);
 			host.streamingComponent = undefined;
 			host.streamingMessage = undefined;
 			renderedSegments = [];

package/packages/pi-coding-agent/src/modes/interactive/controllers/input-controller.test.ts

@@ -49,6 +49,7 @@ function createMockHost() {
 		isInitialized: true,
 		loadingAnimation: undefined,
 		pendingWorkingMessage: undefined,
+		clearBlockingError: () => {},
 		defaultWorkingMessage: "Working...",
 		streamingComponent: undefined,
 		streamingMessage: undefined,

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode-state.ts

@@ -20,6 +20,7 @@ export interface InteractiveModeStateHost {
 	isInitialized: boolean;
 	loadingAnimation?: any;
 	pendingWorkingMessage?: string;
+	clearBlockingError(): void;
 	defaultWorkingMessage: string;
 	streamingComponent?: any;
 	streamingMessage?: any;
@@ -37,4 +38,3 @@ export interface InteractiveModeStateHost {
 }
 
 export type InteractiveModeEvent = AgentSessionEvent;
-

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts

@@ -64,6 +64,7 @@ import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/cha
 import { readClipboardImage } from "../../utils/clipboard-image.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
+import { AdaptiveLayoutComponent } from "./components/adaptive-layout.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
@@ -170,6 +171,47 @@ type CompactionQueuedMessage = {
 	mode: "steer" | "followUp";
 };
 
+export type ExtensionNotifyType = "info" | "warning" | "error" | "success" | undefined;
+
+export function shouldRenderExtensionNotifyInChat(type: ExtensionNotifyType): boolean {
+	return type !== "warning";
+}
+
+export interface ExtensionNotifyRenderResult {
+	rendered: boolean;
+	statusSpacer?: Spacer;
+	statusText?: Text;
+}
+
+export function renderExtensionNotifyInChat(
+	chatContainer: Container,
+	message: string,
+	type?: ExtensionNotifyType,
+): ExtensionNotifyRenderResult {
+	if (!shouldRenderExtensionNotifyInChat(type)) {
+		return { rendered: false };
+	}
+
+	const spacer = new Spacer(1);
+	chatContainer.addChild(spacer);
+
+	if (type === "error") {
+		chatContainer.addChild(new Text(theme.fg("error", `Error: ${message}`), 1, 0));
+		return { rendered: true };
+	}
+	if (type === "success") {
+		chatContainer.addChild(new DynamicBorder((text) => theme.fg("success", text)));
+		chatContainer.addChild(new Text(theme.fg("success", message), 1, 0));
+		chatContainer.addChild(new DynamicBorder((text) => theme.fg("success", text)));
+		chatContainer.addChild(new Spacer(1));
+		return { rendered: true };
+	}
+
+	const statusText = new Text(theme.fg("dim", message), 1, 0);
+	chatContainer.addChild(statusText);
+	return { rendered: true, statusSpacer: spacer, statusText };
+}
+
 /**
  * Options for InteractiveMode initialization.
  */
@@ -205,6 +247,7 @@ export class InteractiveMode {
 	private ui: TUI;
 	private chatContainer: Container;
 	private pendingMessagesContainer: Container;
+	private adaptiveLayout: AdaptiveLayoutComponent;
 	private statusContainer: Container;
 	private pinnedMessageContainer: Container;
 	private defaultEditor: CustomEditor;
@@ -220,6 +263,7 @@ export class InteractiveMode {
 	private loadingAnimation: Loader | undefined = undefined;
 	private pendingWorkingMessage: string | undefined = undefined;
 	private readonly defaultWorkingMessage = "Working...";
+	private lastBlockingError: string | undefined = undefined;
 
 	private lastSigintTime = 0;
 	private lastEscapeTime = 0;
@@ -326,6 +370,14 @@ export class InteractiveMode {
 		this.headerContainer = new Container();
 		this.chatContainer = new Container();
 		this.pendingMessagesContainer = new Container();
+		this.adaptiveLayout = new AdaptiveLayoutComponent(() => ({
+			override: this.settingsManager.getAdaptiveMode(),
+			activeToolCount: this.pendingTools.size,
+			gsdPhase: this.pendingWorkingMessage,
+			lastError: this.lastBlockingError,
+			sessionName: this.sessionManager.getSessionName(),
+			cwd: process.cwd(),
+		}));
 		this.statusContainer = new Container();
 		this.pinnedMessageContainer = new Container();
 		this.widgetContainerAbove = new Container();
@@ -530,6 +582,7 @@ export class InteractiveMode {
 			}
 		}
 
+		this.ui.addChild(this.adaptiveLayout);
 		this.ui.addChild(this.chatContainer);
 		this.ui.addChild(this.pendingMessagesContainer);
 		this.ui.addChild(this.statusContainer);
@@ -1180,6 +1233,7 @@ export class InteractiveMode {
 						this.streamingComponent = undefined;
 						this.streamingMessage = undefined;
 						this.pendingTools.clear();
+						this.clearBlockingError();
 
 						// Render any messages added via setup, or show empty session
 						this.renderInitialMessages();
@@ -1833,16 +1887,16 @@ export class InteractiveMode {
 	/**
 	 * Show a notification for extensions.
 	 */
-	private showExtensionNotify(message: string, type?: "info" | "warning" | "error" | "success"): void {
-		if (type === "error") {
-			this.showError(message);
-		} else if (type === "warning") {
-			this.showWarning(message);
-		} else if (type === "success") {
-			this.showSuccess(message);
-		} else {
-			this.showStatus(message, { append: true });
+	private showExtensionNotify(message: string, type?: ExtensionNotifyType): void {
+		const result = renderExtensionNotifyInChat(this.chatContainer, message, type);
+		if (!result.rendered) {
+			return;
+		}
+		if (result.statusSpacer && result.statusText) {
+			this.lastStatusSpacer = result.statusSpacer;
+			this.lastStatusText = result.statusText;
 		}
+		this.ui.requestRender();
 	}
 
 	/** Show a custom component with keyboard focus. Overlay mode renders on top of existing content. */
@@ -2839,11 +2893,16 @@ export class InteractiveMode {
 	}
 
 	showError(errorMessage: string): void {
+		this.lastBlockingError = errorMessage;
 		this.chatContainer.addChild(new Spacer(1));
 		this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
 		this.ui.requestRender();
 	}
 
+	clearBlockingError(): void {
+		this.lastBlockingError = undefined;
+	}
+
 	showWarning(warningMessage: string): void {
 		this.chatContainer.addChild(new Spacer(1));
 		this.chatContainer.addChild(new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
@@ -3154,6 +3213,7 @@ export class InteractiveMode {
 					quietStartup: this.settingsManager.getQuietStartup(),
 					clearOnShrink: this.settingsManager.getClearOnShrink(),
 					timestampFormat: this.settingsManager.getTimestampFormat(),
+					adaptiveMode: this.settingsManager.getAdaptiveMode(),
 				},
 				{
 					onAutoCompactChange: (enabled) => {
@@ -3260,6 +3320,10 @@ export class InteractiveMode {
 					onTimestampFormatChange: (format) => {
 						this.settingsManager.setTimestampFormat(format);
 					},
+					onAdaptiveModeChange: (mode) => {
+						this.settingsManager.setAdaptiveMode(mode);
+						this.ui.requestRender();
+					},
 					onCancel: () => {
 						done();
 						this.ui.requestRender();
@@ -3648,6 +3712,7 @@ export class InteractiveMode {
 		this.streamingComponent = undefined;
 		this.streamingMessage = undefined;
 		this.pendingTools.clear();
+		this.clearBlockingError();
 
 		// Switch session via AgentSession (emits extension session events)
 		await this.session.switchSession(sessionPath);
@@ -3969,6 +4034,7 @@ export class InteractiveMode {
 		this.streamingMessage = undefined;
 		this.pendingTools.clear();
 		this.pendingImages.length = 0;
+		this.clearBlockingError();
 
 		// Reset contextual tips for the new session
 		this.contextualTips.reset();

package/packages/pi-coding-agent/src/modes/interactive/slash-command-handlers.test.ts

@@ -0,0 +1,95 @@
+// GSD2 - Slash command tests for interactive TUI settings commands
+
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { Container } from "@gsd/pi-tui";
+import { SettingsManager } from "../../core/settings-manager.js";
+import { dispatchSlashCommand, type SlashCommandContext } from "./slash-command-handlers.js";
+
+function makeContext(settingsManager = SettingsManager.inMemory()): SlashCommandContext {
+	const statuses: string[] = [];
+	const warnings: string[] = [];
+	const renders: string[] = [];
+	return {
+		session: {} as never,
+		ui: {} as never,
+		keybindings: {} as never,
+		chatContainer: new Container(),
+		statusContainer: new Container(),
+		editorContainer: new Container(),
+		headerContainer: new Container(),
+		pendingMessagesContainer: new Container(),
+		editor: {} as never,
+		defaultEditor: {} as never,
+		sessionManager: {} as never,
+		settingsManager,
+		invalidateFooter() {},
+		showStatus(message: string) {
+			statuses.push(message);
+		},
+		showError(message: string) {
+			throw new Error(message);
+		},
+		showWarning(message: string) {
+			warnings.push(message);
+		},
+		showSelector() {},
+		updateEditorBorderColor() {},
+		getMarkdownThemeWithSettings: () => ({} as never),
+		requestRender() {
+			renders.push("render");
+		},
+		updateTerminalTitle() {},
+		showSettingsSelector() {},
+		showModelsSelector: async () => {},
+		handleModelCommand: async () => {},
+		showUserMessageSelector() {},
+		showTreeSelector() {},
+		showProviderManager() {},
+		showOAuthSelector: async () => {},
+		showSessionSelector() {},
+		handleClearCommand: async () => {},
+		handleReloadCommand: async () => {},
+		handleDebugCommand() {},
+		shutdown: async () => {},
+		executeCompaction: async () => undefined,
+		handleBashCommand: async () => {},
+		_testStatuses: statuses,
+		_testWarnings: warnings,
+		_testRenders: renders,
+	} as SlashCommandContext & {
+		_testStatuses: string[];
+		_testWarnings: string[];
+		_testRenders: string[];
+	};
+}
+
+describe("dispatchSlashCommand /tui", () => {
+	it("persists /tui mode validation to terminal adaptive mode", async () => {
+		const settingsManager = SettingsManager.inMemory();
+		const ctx = makeContext(settingsManager) as SlashCommandContext & {
+			_testStatuses: string[];
+			_testRenders: string[];
+		};
+
+		const handled = await dispatchSlashCommand("/tui mode validation", ctx);
+
+		assert.equal(handled, true);
+		assert.equal(settingsManager.getAdaptiveMode(), "validation");
+		assert.deepEqual(ctx._testStatuses, ["TUI mode: validation"]);
+		assert.equal(ctx._testRenders.length, 1);
+	});
+
+	it("rejects unknown TUI modes without changing settings", async () => {
+		const settingsManager = SettingsManager.inMemory({ terminal: { adaptiveMode: "workflow" } });
+		const ctx = makeContext(settingsManager) as SlashCommandContext & {
+			_testWarnings: string[];
+		};
+
+		const handled = await dispatchSlashCommand("/tui mode poster", ctx);
+
+		assert.equal(handled, true);
+		assert.equal(settingsManager.getAdaptiveMode(), "workflow");
+		assert.match(ctx._testWarnings[0], /Usage: \/tui mode/);
+	});
+});

package/packages/pi-coding-agent/src/modes/interactive/slash-command-handlers.ts

@@ -31,7 +31,7 @@ import {
 import type { AgentSession } from "../../core/agent-session.js";
 import type { AppAction, KeybindingsManager } from "../../core/keybindings.js";
 import type { SessionManager } from "../../core/session-manager.js";
-import type { SettingsManager } from "../../core/settings-manager.js";
+import type { AdaptiveTuiMode, SettingsManager } from "../../core/settings-manager.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { getChangelogPath, parseChangelog } from "../../utils/changelog.js";
 import { ArminComponent } from "./components/armin.js";
@@ -235,6 +235,10 @@ export async function dispatchSlashCommand(
 		await ctx.handleBashCommand(command, { loginShell: true });
 		return true;
 	}
+	if (text === "/tui" || text.startsWith("/tui ")) {
+		handleTuiCommand(text, ctx);
+		return true;
+	}
 
 	return false;
 }
@@ -665,6 +669,25 @@ function handleEditModeCommand(arg: string | undefined, ctx: SlashCommandContext
 	ctx.showStatus(`Edit mode: ${next}${next === "hashline" ? " (LINE#ID anchored edits)" : " (text-match edits)"}`);
 }
 
+function handleTuiCommand(text: string, ctx: SlashCommandContext): void {
+	const parts = text.trim().split(/\s+/);
+	const mode = parts[1] === "mode" ? parts[2] : parts[1];
+	const valid: AdaptiveTuiMode[] = ["auto", "chat", "workflow", "validation", "debug", "compact"];
+
+	if (!mode) {
+		ctx.showStatus(`TUI mode: ${ctx.settingsManager.getAdaptiveMode()}`);
+		return;
+	}
+	if (!valid.includes(mode as AdaptiveTuiMode)) {
+		ctx.showWarning(`Usage: /tui mode ${valid.join("|")}`);
+		return;
+	}
+
+	ctx.settingsManager.setAdaptiveMode(mode as AdaptiveTuiMode);
+	ctx.showStatus(`TUI mode: ${mode}`);
+	ctx.requestRender();
+}
+
 function handleArminSaysHi(ctx: SlashCommandContext): void {
 	ctx.chatContainer.addChild(new Spacer(1));
 	ctx.chatContainer.addChild(new ArminComponent(ctx.ui));

package/packages/pi-coding-agent/src/modes/interactive/theme/theme-schema.ts

@@ -70,6 +70,19 @@ export const ThemeJsonSchema = Type.Object({
     thinkingXhigh: ColorValueSchema,
     // Bash Mode (1 color)
     bashMode: ColorValueSchema,
+    // Adaptive TUI semantic tokens (optional; defaults are derived from core colors)
+    surfaceBorder: Type.Optional(ColorValueSchema),
+    surfaceMuted: Type.Optional(ColorValueSchema),
+    surfaceTitle: Type.Optional(ColorValueSchema),
+    surfaceAccent: Type.Optional(ColorValueSchema),
+    toolRunning: Type.Optional(ColorValueSchema),
+    toolSuccess: Type.Optional(ColorValueSchema),
+    toolError: Type.Optional(ColorValueSchema),
+    toolMuted: Type.Optional(ColorValueSchema),
+    modeWorkflow: Type.Optional(ColorValueSchema),
+    modeValidation: Type.Optional(ColorValueSchema),
+    modeDebug: Type.Optional(ColorValueSchema),
+    modeCompact: Type.Optional(ColorValueSchema),
   }),
   export: Type.Optional(
     Type.Object({

package/packages/pi-coding-agent/src/modes/interactive/theme/theme.ts

@@ -69,7 +69,19 @@ export type ThemeColor =
 	| "thinkingMedium"
 	| "thinkingHigh"
 	| "thinkingXhigh"
-	| "bashMode";
+	| "bashMode"
+	| "surfaceBorder"
+	| "surfaceMuted"
+	| "surfaceTitle"
+	| "surfaceAccent"
+	| "toolRunning"
+	| "toolSuccess"
+	| "toolError"
+	| "toolMuted"
+	| "modeWorkflow"
+	| "modeValidation"
+	| "modeDebug"
+	| "modeCompact";
 
 export type ThemeBg =
 	| "selectedBg"
@@ -374,6 +386,24 @@ function getBuiltinThemes(): Record<string, ThemeJson> {
 	return builtinThemes;
 }
 
+function withSemanticColorDefaults(colors: ThemeJson["colors"]): ThemeJson["colors"] {
+	return {
+		...colors,
+		surfaceBorder: colors.surfaceBorder ?? colors.border,
+		surfaceMuted: colors.surfaceMuted ?? colors.borderMuted,
+		surfaceTitle: colors.surfaceTitle ?? colors.toolTitle,
+		surfaceAccent: colors.surfaceAccent ?? colors.borderAccent,
+		toolRunning: colors.toolRunning ?? colors.warning,
+		toolSuccess: colors.toolSuccess ?? colors.success,
+		toolError: colors.toolError ?? colors.error,
+		toolMuted: colors.toolMuted ?? colors.muted,
+		modeWorkflow: colors.modeWorkflow ?? colors.accent,
+		modeValidation: colors.modeValidation ?? colors.warning,
+		modeDebug: colors.modeDebug ?? colors.error,
+		modeCompact: colors.modeCompact ?? colors.muted,
+	};
+}
+
 export function getAvailableThemes(): string[] {
 	const themes = new Set<string>(Object.keys(getBuiltinThemes()));
 	const customThemesDir = getCustomThemesDir();
@@ -493,7 +523,7 @@ function loadThemeJson(name: string): ThemeJson {
 
 function createTheme(themeJson: ThemeJson, mode?: ColorMode, sourcePath?: string): Theme {
 	const colorMode = mode ?? detectColorMode();
-	const resolvedColors = resolveThemeColors(themeJson.colors, themeJson.vars);
+	const resolvedColors = resolveThemeColors(withSemanticColorDefaults(themeJson.colors), themeJson.vars);
 	const fgColors: Record<ThemeColor, string | number> = {} as Record<ThemeColor, string | number>;
 	const bgColors: Record<ThemeBg, string | number> = {} as Record<ThemeBg, string | number>;
 	const bgColorKeys: Set<string> = new Set([

package/packages/pi-coding-agent/src/modes/interactive/theme/themes.ts

@@ -1,3 +1,4 @@
+// GSD2 TUI - Built-in terminal theme definitions.
 /**
  * Built-in theme definitions.
  *
@@ -18,27 +19,30 @@ import type { ThemeJson } from "./theme-schema.js";
 const dark: ThemeJson = {
 	name: "dark",
 	vars: {
-		cyan: "#22d3ee",
-		blue: "#60a5fa",
-		green: "#34d399",
-		red: "#fb7185",
-		yellow: "#facc15",
-		gray: "#a1a1aa",
-		dimGray: "#8b93a7",
-		darkGray: "#4b5563",
-		accent: "#2dd4bf",
-		selectedBg: "#1f2a44",
-		userMsgBg: "#1e2535",
-		toolPendingBg: "#1f2330",
-		toolSuccessBg: "#1f3128",
-		toolErrorBg: "#3a202a",
-		customMsgBg: "#2a2140",
+		cyan: "#5cc8c8",
+		blue: "#79b8ff",
+		green: "#7ad38b",
+		red: "#f27b7b",
+		yellow: "#d6b85f",
+		gray: "#87949b",
+		dimGray: "#657178",
+		darkGray: "#303a40",
+		line: "#52616a",
+		lineSoft: "#303a40",
+		textSoft: "#cbd6dc",
+		accent: "#5cc8c8",
+		selectedBg: "#1d282a",
+		userMsgBg: "#202a2f",
+		toolPendingBg: "#252721",
+		toolSuccessBg: "#1c251f",
+		toolErrorBg: "#251e20",
+		customMsgBg: "#202a2f",
 	},
 	colors: {
 		accent: "accent",
-		border: "blue",
-		borderAccent: "cyan",
-		borderMuted: "darkGray",
+		border: "line",
+		borderAccent: "accent",
+		borderMuted: "lineSoft",
 		success: "green",
 		error: "red",
 		warning: "yellow",
@@ -49,16 +53,21 @@ const dark: ThemeJson = {
 
 		selectedBg: "selectedBg",
 		userMessageBg: "userMsgBg",
-		userMessageText: "gray",
-		assistantMessageText: "",
+		userMessageText: "textSoft",
+		assistantMessageText: "textSoft",
 		customMessageBg: "customMsgBg",
-		customMessageText: "",
-		customMessageLabel: "#c084fc",
+		customMessageText: "textSoft",
+		customMessageLabel: "blue",
 		toolPendingBg: "toolPendingBg",
 		toolSuccessBg: "toolSuccessBg",
 		toolErrorBg: "toolErrorBg",
-		toolTitle: "#8a8a8a",
-		toolOutput: "#6e6e6e",
+		toolTitle: "gray",
+		toolOutput: "textSoft",
+		surfaceTitle: "accent",
+		surfaceAccent: "accent",
+		toolRunning: "yellow",
+		toolSuccess: "green",
+		toolError: "red",
 
 		mdHeading: "#fbbf24",
 		mdLink: "#93c5fd",
@@ -95,9 +104,9 @@ const dark: ThemeJson = {
 		bashMode: "green",
 	},
 	export: {
-		pageBg: "#101522",
-		cardBg: "#171f33",
-		infoBg: "#3b321d",
+		pageBg: "#111416",
+		cardBg: "#1e2529",
+		infoBg: "#252721",
 	},
 };