pi-ui-extend 0.1.20 → 0.1.24

package/README.md

@@ -87,7 +87,6 @@ Useful flags:
 - `--cwd <path>`: workspace used for Pi tools, settings, resources, and sessions.
 - `--no-session`: run with an in-memory SDK session.
 - `--model <provider/model[:thinking]>`: request a specific model, for example `anthropic/claude-sonnet-4-20250514:medium`.
-- `--reload-on-build`: restart the running Pix process after a successful watcher build.
 
 ## Updating Pix
 
@@ -143,20 +142,12 @@ Run Pix against a workspace:
 pix --cwd /path/to/workspace
 ```
 
-During UI development, run the watcher in another terminal:
+During UI development, run the watcher in another terminal, then restart Pix after rebuilds when needed:
 
 ```bash
 npm run watch:pix
 ```
 
-Each running instance can reload after successful builds:
-
-```bash
-PIX_RELOAD_ON_BUILD=1 pix --cwd /path/to/workspace
-# or
-pix --reload-on-build --cwd /path/to/workspace
-```
-
 For a one-shot dev launch that rebuilds and refreshes the global link first:
 
 ```bash

package/bin/pix.mjs

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
-import { spawn } from "node:child_process";
-import { existsSync, readdirSync, statSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { delimiter, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -11,10 +10,7 @@ const packageRoot = dirname(dirname(launcherPath));
 const mainPath = fileURLToPath(new URL("../dist/main.js", import.meta.url));
 const updatePath = fileURLToPath(new URL("../dist/app/cli/update.js", import.meta.url));
 const installPath = fileURLToPath(new URL("../dist/app/cli/install.js", import.meta.url));
-const distPath = dirname(mainPath);
-const rawArgs = process.argv.slice(2);
-const childArgs = [];
-let reloadOnBuild = truthyEnv(process.env.PIX_RELOAD_ON_BUILD);
+const cliArgs = process.argv.slice(2);
 
 if (!isCurrentNodeSupported()) {
 	console.error(`[pix] Node ${minimumNodeVersionLabel}+ is required; current Node is ${process.versions.node}.`);
@@ -22,63 +18,31 @@ if (!isCurrentNodeSupported()) {
 	process.exit(1);
 }
 
-for (const arg of rawArgs) {
-	if (arg === "--reload-on-build") {
-		reloadOnBuild = true;
-		continue;
-	}
-	if (arg === "--no-reload-on-build") {
-		reloadOnBuild = false;
-		continue;
-	}
-	childArgs.push(arg);
-}
+applyPixRuntimeEnv();
 
-if (childArgs[0] === "update") {
+if (cliArgs[0] === "update") {
 	if (!existsSync(updatePath)) {
 		console.error("pix update is not built yet. Run `npm run build:pix` or update from a published package.");
 		process.exit(1);
 	}
 	const { runPixUpdateCli } = await import(new URL("../dist/app/cli/update.js", import.meta.url));
-	process.exit(await runPixUpdateCli(childArgs.slice(1)));
+	process.exit(await runPixUpdateCli(cliArgs.slice(1)));
 }
 
-if (childArgs[0] === "install" || childArgs[0] === "setup") {
+if (cliArgs[0] === "install" || cliArgs[0] === "setup") {
 	if (!existsSync(installPath)) {
 		console.error("pix install is not built yet. Run `npm run build:pix` or update from a published package.");
 		process.exit(1);
 	}
 	const { runPixInstallCli } = await import(new URL("../dist/app/cli/install.js", import.meta.url));
-	process.exit(await runPixInstallCli(childArgs.slice(1), { env: pixChildEnv() }));
+	process.exit(await runPixInstallCli(cliArgs.slice(1), { env: process.env }));
 }
 
 if (!existsSync(mainPath)) {
 	console.error("pix is not built yet. Run `npm run build:pix` or `npm run watch:pix`.");
 	process.exit(1);
 }
-
-let child = undefined;
-let reloadTimer = undefined;
-let distPollTimer = undefined;
-let distSnapshot = snapshotDist();
-let restarting = false;
-let shuttingDown = false;
-
-startChild();
-if (reloadOnBuild) startDistPolling();
-
-for (const signal of ["SIGINT", "SIGTERM"]) {
-	process.on(signal, () => {
-		shuttingDown = true;
-		stopDistPolling();
-		child?.kill(signal);
-	});
-}
-
-function truthyEnv(value) {
-	if (!value) return false;
-	return !["0", "false", "no", "off"].includes(value.toLowerCase());
-}
+await import(new URL("../dist/main.js", import.meta.url));
 
 function isCurrentNodeSupported() {
 	const parts = process.versions.node.split(".").map((part) => Number.parseInt(part, 10));
@@ -91,117 +55,10 @@ function isCurrentNodeSupported() {
 	return true;
 }
 
-function startChild() {
-	child = spawn(process.execPath, [mainPath, ...childArgs], {
-		stdio: "inherit",
-		env: pixChildEnv(),
-	});
-
-	child.on("error", (error) => {
-		console.error(error.message);
-		process.exitCode = 1;
-	});
-
-	child.on("exit", (code, signal) => {
-		child = undefined;
-		if (restarting) return;
-
-		shuttingDown = true;
-		stopDistPolling();
-		if (signal) {
-			process.exitCode = signal === "SIGINT" ? 130 : signal === "SIGTERM" ? 143 : 1;
-			return;
-		}
-		process.exitCode = code ?? 1;
-	});
-}
-
-function pixChildEnv() {
-	const env = { ...process.env };
+function applyPixRuntimeEnv() {
 	const bundledBinPath = join(packageRoot, "node_modules", ".bin");
 	if (existsSync(bundledBinPath)) {
-		env.PATH = [bundledBinPath, env.PATH ?? ""].filter(Boolean).join(delimiter);
-		env.PIX_BUNDLED_PI_BIN = bundledBinPath;
+		process.env.PATH = [bundledBinPath, process.env.PATH ?? ""].filter(Boolean).join(delimiter);
+		process.env.PIX_BUNDLED_PI_BIN = bundledBinPath;
 	}
-	return env;
-}
-
-function startDistPolling() {
-	const pollInterval = Number(process.env.PIX_RELOAD_POLL_MS ?? 1000);
-	distPollTimer = setInterval(() => {
-		const nextSnapshot = snapshotDist();
-		if (nextSnapshot === distSnapshot) return;
-
-		distSnapshot = nextSnapshot;
-		queueReload();
-	}, Number.isFinite(pollInterval) && pollInterval > 0 ? pollInterval : 1000);
-}
-
-function stopDistPolling() {
-	if (reloadTimer) clearTimeout(reloadTimer);
-	if (distPollTimer) clearInterval(distPollTimer);
-	reloadTimer = undefined;
-	distPollTimer = undefined;
-}
-
-function queueReload() {
-	if (shuttingDown) return;
-	if (reloadTimer) clearTimeout(reloadTimer);
-	reloadTimer = setTimeout(() => {
-		reloadTimer = undefined;
-		restartChild();
-	}, 250);
-}
-
-function restartChild() {
-	if (shuttingDown) return;
-	if (!child) {
-		startChild();
-		return;
-	}
-
-	restarting = true;
-	const currentChild = child;
-	currentChild.once("exit", () => {
-		restarting = false;
-		if (!shuttingDown) startChild();
-	});
-	console.error("[pix] dist changed; restarting renderer");
-	currentChild.kill("SIGTERM");
-}
-
-function snapshotDist() {
-	let newestMtime = 0;
-	let runtimeFileCount = 0;
-	const pendingDirs = [distPath];
-
-	while (pendingDirs.length > 0) {
-		const currentDir = pendingDirs.pop();
-		if (!currentDir) continue;
-
-		let entries;
-		try {
-			entries = readdirSync(currentDir, { withFileTypes: true });
-		} catch {
-			continue;
-		}
-
-		for (const entry of entries) {
-			const entryPath = join(currentDir, entry.name);
-			if (entry.isDirectory()) {
-				pendingDirs.push(entryPath);
-				continue;
-			}
-			if (!entry.isFile() || !entry.name.endsWith(".js")) continue;
-
-			runtimeFileCount += 1;
-			try {
-				newestMtime = Math.max(newestMtime, statSync(entryPath).mtimeMs);
-			} catch {
-				// If tsc is replacing a file while we scan, the next poll will see the final state.
-			}
-		}
-	}
-
-	return `${runtimeFileCount}:${newestMtime}`;
 }

package/dist/app/app.d.ts

@@ -60,6 +60,9 @@ export declare class PiUiExtendApp {
     private resumeLoading;
     constructor(options: AppOptions);
     private createRuntime;
+    private loadStartupConfig;
+    private applyPixConfig;
+    private updateOutputFilters;
     start(): Promise<void>;
     private checkPixUpdateOnStartup;
     private bindCurrentSession;
@@ -82,6 +85,7 @@ export declare class PiUiExtendApp {
     private openSearchResultInNewTab;
     private scrollToUserMessageJumpTarget;
     private findUserEntryBySessionEntryId;
+    private findUserEntryByJumpText;
     private loadSessionHistoryAsync;
     private handleSessionEvent;
     private findEntry;

package/dist/app/app.js

@@ -1,6 +1,6 @@
 import { THEMES } from "../theme.js";
 import { InputEditor } from "../input-editor.js";
-import { compileOutputFilterPatterns, loadPixConfig, resolveToolRule, } from "../config.js";
+import { compileOutputFilterPatterns, defaultPixConfig, loadPixConfig, resolveToolRule, } from "../config.js";
 import { AppCommandController } from "./commands/command-controller.js";
 import { ConversationViewport } from "./rendering/conversation-viewport.js";
 import { EditorLayoutRenderer } from "./rendering/editor-layout-renderer.js";
@@ -46,6 +46,9 @@ import { AppVoiceController } from "./input/voice-controller.js";
 import { createIsolatedExtensionEventBus } from "./extensions/extension-event-bus.js";
 import { setAppIconTheme } from "./icons.js";
 const TERMINAL_BELL_ATTENTION_EVENT = "pix:terminal-bell:attention";
+function normalizeJumpTargetText(text) {
+    return text.replace(/\s+/gu, " ").trim();
+}
 const SUBAGENTS_LIVE_STATE_EVENT = "pi-tools-suite:async-subagents:live-state";
 const TODO_STATE_EVENT = "pi-tools-suite:todo:state";
 const COALESCED_RENDER_DELAY_MS = 16;
@@ -68,7 +71,7 @@ export class PiUiExtendApp {
     extensionUiController;
     extensionActions;
     pixConfig;
-    outputFilters;
+    outputFilters = [];
     commandController;
     inputActions;
     inputController;
@@ -127,7 +130,7 @@ export class PiUiExtendApp {
     constructor(options) {
         this.options = options;
         this.theme = THEMES[options.themeName];
-        this.pixConfig = loadPixConfig(this.options.cwd);
+        this.pixConfig = defaultPixConfig();
         setAppIconTheme(this.pixConfig.iconTheme.name);
         const app = this;
         this.blinkController = new AppBlinkController({
@@ -160,7 +163,7 @@ export class PiUiExtendApp {
         });
         this.tabsController = new AppTabsController({
             options: this.options,
-            maxProjectSessions: this.pixConfig.maxProjectSessions,
+            maxProjectSessions: () => this.pixConfig.maxProjectSessions,
             blinkController: this.blinkController,
             runtime: () => this.runtime,
             createRuntimeForNewSession: () => this.createRuntime(newTabRuntimeOptions(this.options)),
@@ -398,18 +401,16 @@ export class PiUiExtendApp {
             get subagentsWidgetState() { return app.subagentsWidgetController.widgetState; },
             get voicePartialText() { return app.voicePartialText; },
             get autocompleteSuggestion() { return app.autocompleteController.suggestionText(); },
-            get queuedMessageWidgetEntries() { return app.queuedMessages.deferredQueuedEntries(); },
+            get queuedMessageWidgetEntries() { return app.queuedMessages.queuedEntries(); },
             renderExtensionInputComponent: (width) => this.extensionUiController.renderActiveCustomUi(width),
             extensionInputUsesEditor: () => this.extensionUiController.activeCustomUiUsesEditor(),
             widgetTuiHandle: () => this.extensionUiController.widgetTuiHandle(),
             createExtensionTheme: () => this.extensionUiController.createExtensionTheme(),
             suppressExtensionWidget: (key) => this.extensionUiController.suppressWidget(key),
         });
-        this.outputFilters = compileOutputFilterPatterns(this.pixConfig.outputFilters.patterns);
+        this.updateOutputFilters();
         this.conversationViewport = new ConversationViewport({
             get entries() { return app.entries; },
-            get session() { return app.runtime?.session; },
-            get deferredUserMessages() { return app.queuedMessages.deferredUserMessages; },
             get entryRenderVersions() { return app.sessionEvents.entryRenderVersions; },
             get superCompactTools() { return app.superCompactTools; },
             get allThinkingExpanded() { return app.allThinkingExpanded; },
@@ -700,6 +701,7 @@ export class PiUiExtendApp {
             inputEditor: () => this.inputEditor,
             enableTerminal: () => this.terminalController.enableTerminal(),
             disposeRuntimeForQuit: (runtime) => this.terminalController.disposeRuntimeForQuit(runtime),
+            loadStartupConfig: () => this.loadStartupConfig(),
             loadRequestHistory: () => this.requestHistory.load(),
             startSubagentsPolling: () => this.subagentsWidgetController.startPolling(),
             closeSdkMenuForBind: () => this.popupMenus.closeSdkMenu(undefined, { render: false, restoreStatus: false }),
@@ -750,8 +752,35 @@ export class PiUiExtendApp {
     createRuntime(options) {
         return createPixRuntime(options, {
             eventBus: this.createExtensionEventBus(),
+            config: this.pixConfig,
         });
     }
+    async loadStartupConfig() {
+        await yieldToEventLoop();
+        this.applyPixConfig(loadPixConfig(this.options.cwd));
+    }
+    applyPixConfig(config) {
+        replaceRecord(this.pixConfig.toolRenderer, config.toolRenderer);
+        replaceRecord(this.pixConfig.outputFilters, config.outputFilters);
+        replaceRecord(this.pixConfig.promptEnhancer, config.promptEnhancer);
+        replaceRecord(this.pixConfig.autocomplete, config.autocomplete);
+        replaceRecord(this.pixConfig.modelColors, config.modelColors);
+        replaceRecord(this.pixConfig.iconTheme, config.iconTheme);
+        replaceRecord(this.pixConfig.dictation, config.dictation);
+        if (config.defaultModel === undefined)
+            delete this.pixConfig.defaultModel;
+        else
+            this.pixConfig.defaultModel = { ...config.defaultModel };
+        this.pixConfig.ignoreContextFiles = config.ignoreContextFiles;
+        this.pixConfig.maxProjectSessions = config.maxProjectSessions;
+        this.updateOutputFilters();
+        this.voiceController.updateDictationConfig(this.pixConfig.dictation);
+        setAppIconTheme(this.pixConfig.iconTheme.name);
+        this.conversationViewport.clear();
+    }
+    updateOutputFilters() {
+        this.outputFilters.splice(0, this.outputFilters.length, ...compileOutputFilterPatterns(this.pixConfig.outputFilters.patterns));
+    }
     async start() {
         await this.sessionLifecycle.start();
         this.modelUsageController.startPolling();
@@ -888,20 +917,42 @@ export class PiUiExtendApp {
     async scrollToUserMessageJumpTarget(target) {
         if (target.entryId && this.scrollController.scrollToConversationEntry(target.entryId))
             return true;
-        if (!target.sessionEntryId)
-            return false;
-        let entry = this.findUserEntryBySessionEntryId(target.sessionEntryId);
-        while (!entry && this.sessionEvents.hasOlderSessionHistory() && !this.sessionEvents.isLoadingOlderSessionHistory()) {
-            const loaded = await this.sessionEvents.loadOlderSessionHistory({ render: false });
-            if (!loaded)
-                break;
-            entry = this.findUserEntryBySessionEntryId(target.sessionEntryId);
+        this.workspaceActions.syncUserSessionEntryMetadata();
+        if (target.sessionEntryId) {
+            let entry = this.findUserEntryBySessionEntryId(target.sessionEntryId);
+            while (!entry && this.sessionEvents.hasOlderSessionHistory() && !this.sessionEvents.isLoadingOlderSessionHistory()) {
+                const loaded = await this.sessionEvents.loadOlderSessionHistory({ render: false });
+                if (!loaded)
+                    break;
+                entry = this.findUserEntryBySessionEntryId(target.sessionEntryId);
+            }
+            if (entry && this.scrollController.scrollToConversationEntry(entry.id))
+                return true;
         }
-        return entry ? this.scrollController.scrollToConversationEntry(entry.id) : false;
+        const fallbackEntry = this.findUserEntryByJumpText(target);
+        return fallbackEntry ? this.scrollController.scrollToConversationEntry(fallbackEntry.id) : false;
     }
     findUserEntryBySessionEntryId(sessionEntryId) {
         return this.entries.find((entry) => entry.kind === "user" && entry.sessionEntryId === sessionEntryId);
     }
+    findUserEntryByJumpText(target) {
+        if (!target.text)
+            return undefined;
+        const userEntries = this.entries.filter((entry) => entry.kind === "user");
+        if (target.userIndex !== undefined && target.userCount !== undefined) {
+            const visibleIndex = target.userIndex - (target.userCount - userEntries.length);
+            const entry = userEntries[visibleIndex];
+            if (entry && normalizeJumpTargetText(entry.text) === normalizeJumpTargetText(target.text))
+                return entry;
+        }
+        const normalizedTargetText = normalizeJumpTargetText(target.text);
+        for (let index = userEntries.length - 1; index >= 0; index -= 1) {
+            const entry = userEntries[index];
+            if (entry && normalizeJumpTargetText(entry.text) === normalizedTargetText)
+                return entry;
+        }
+        return undefined;
+    }
     async loadSessionHistoryAsync(options) {
         return this.sessionEvents.loadSessionHistoryAsync(options);
     }
@@ -1053,3 +1104,37 @@ function newTabRuntimeOptions(options) {
         ...(options.modelRef === undefined ? {} : { modelRef: options.modelRef }),
     };
 }
+async function yieldToEventLoop() {
+    await new Promise((resolve) => { setTimeout(resolve, 0); });
+}
+function replaceRecord(target, source) {
+    for (const key of Object.keys(target)) {
+        if (!(key in source))
+            delete target[key];
+    }
+    for (const [key, value] of Object.entries(source)) {
+        const existing = target[key];
+        if (isMutableRecord(existing) && isMutableRecord(value)) {
+            replaceRecord(existing, value);
+        }
+        else {
+            target[key] = cloneConfigValue(value);
+        }
+    }
+}
+function cloneConfigValue(value) {
+    if (Array.isArray(value))
+        return value.map(cloneConfigValue);
+    if (isMutableRecord(value))
+        return cloneConfigRecord(value);
+    return value;
+}
+function cloneConfigRecord(value) {
+    const cloned = {};
+    for (const [key, nested] of Object.entries(value))
+        cloned[key] = cloneConfigValue(nested);
+    return cloned;
+}
+function isMutableRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/dist/app/cli/startup-info.d.ts

@@ -1,3 +1,2 @@
 import type { AgentSessionRuntime } from "@earendil-works/pi-coding-agent";
 export declare function createStartupInfoMessage(runtime: AgentSessionRuntime): string;
-export declare function isEmptyStartupSession(runtime: AgentSessionRuntime): boolean;

package/dist/app/cli/startup-info.js

@@ -12,9 +12,6 @@ export function createStartupInfoMessage(runtime) {
         ...sections.flatMap(formatSection),
     ].join("\n").trimEnd();
 }
-export function isEmptyStartupSession(runtime) {
-    return Array.isArray(runtime.session.messages) && runtime.session.messages.length === 0;
-}
 function startupSections(runtime) {
     const loader = runtime.session.resourceLoader;
     const context = loader.getAgentsFiles();

package/dist/app/commands/command-session-actions.js

@@ -9,6 +9,7 @@ import { runProcess } from "../process.js";
 import { copyTextToClipboard } from "../screen/clipboard.js";
 import { formatAccountUsageReport, queryAccountUsageReport } from "../model/model-usage-status.js";
 import { checkPixUpdate, formatPixUpdateCheck, parsePixUpdateArgs, pixUpdateUsage } from "../cli/update.js";
+import { createStartupInfoMessage } from "../cli/startup-info.js";
 export class SessionCommandActions {
     host;
     constructor(host) {
@@ -114,6 +115,8 @@ export class SessionCommandActions {
             return;
         const stats = runtime.session.getSessionStats();
         const lines = [
+            createStartupInfoMessage(runtime),
+            "",
             "Session info",
             ...(runtime.session.sessionName ? [`name: ${runtime.session.sessionName}`] : []),
             `file: ${stats.sessionFile ?? "in-memory"}`,

package/dist/app/extensions/extension-ui-controller.js

@@ -1,4 +1,4 @@
-import { ANSI_RESET, colorize, THEMES } from "../../theme.js";
+import { ANSI_RESET, ansiStylePrefix, colorize, THEMES } from "../../theme.js";
 import { isToastKind } from "../../ui.js";
 import { ellipsizeDisplay, sanitizeText } from "../rendering/render-text.js";
 const CUSTOM_UI_WIDGET_KEY = "pix-custom-ui";
@@ -20,7 +20,7 @@ export class ExtensionUiController {
         const colors = this.host.theme.colors;
         const foreground = (color) => extensionForegroundColor(colors, String(color));
         const background = (color) => extensionBackgroundColor(colors, String(color));
-        const prefix = (options) => (colorize("", options).replace(new RegExp(`${escapeRegExp(ANSI_RESET)}$`), ""));
+        const prefix = (options) => ansiStylePrefix(options);
         return {
             fg: (color, text) => colorize(text, { foreground: foreground(color) }),
             bg: (color, text) => colorize(text, { background: background(color) }),

package/dist/app/input/voice-controller.d.ts

@@ -54,8 +54,8 @@ type VoiceControllerTestDeps = {
 export declare function setVoiceControllerTestDeps(overrides?: Partial<VoiceControllerTestDeps>): void;
 export declare class AppVoiceController {
     private readonly host;
-    private readonly modelDefinitions;
-    private readonly languages;
+    private modelDefinitions;
+    private languages;
     private language;
     private state;
     private readonly modelCache;
@@ -69,6 +69,7 @@ export declare class AppVoiceController {
     private partialTranscriptTimer;
     private startGeneration;
     constructor(host: AppVoiceControllerHost, dictationConfig: DictationConfig);
+    updateDictationConfig(dictationConfig: DictationConfig): void;
     statusWidgetText(): string;
     showLanguageSwitcher(): boolean;
     statusWidgetActive(): boolean;

package/dist/app/input/voice-controller.js

@@ -51,6 +51,15 @@ export class AppVoiceController {
         this.languages = Object.keys(this.modelDefinitions);
         this.language = this.initialLanguage(dictationConfig.language);
     }
+    updateDictationConfig(dictationConfig) {
+        this.modelDefinitions = dictationConfig.languages;
+        this.languages = Object.keys(this.modelDefinitions);
+        this.language = this.initialLanguage(dictationConfig.language ?? this.language);
+        for (const language of this.modelCache.keys()) {
+            if (!this.modelDefinitions[language])
+                this.modelCache.delete(language);
+        }
+    }
     statusWidgetText() {
         const languageLabel = this.showLanguageSwitcher() ? ` ${this.language.toUpperCase()}` : "";
         switch (this.state) {

package/dist/app/popup/popup-menu-controller.js

@@ -810,7 +810,13 @@ export function buildUserMessageJumpItems(entries) {
         const preview = sanitizeText(entry.text).replace(/\s+/g, " ").trim();
         const label = `${index + 1}. ${preview || "(empty message)"}`;
         return {
-            value: { ...(entry.entryId === undefined ? {} : { entryId: entry.entryId }), ...(entry.sessionEntryId === undefined ? {} : { sessionEntryId: entry.sessionEntryId }) },
+            value: {
+                ...(entry.entryId === undefined ? {} : { entryId: entry.entryId }),
+                ...(entry.sessionEntryId === undefined ? {} : { sessionEntryId: entry.sessionEntryId }),
+                text: entry.text,
+                userIndex: index,
+                userCount: userEntries.length,
+            },
             label,
             ...(entry.entryId ? {} : { description: "load older history and jump" }),
             aliases: [entry.sessionEntryId ?? "", entry.entryId ?? ""],

package/dist/app/rendering/conversation-entry-renderer.js

@@ -2,7 +2,7 @@ import { applyOutputFilters } from "../../config.js";
 import { renderMarkdownTextLines } from "../../markdown-format.js";
 import { attachImageClickTargets } from "../screen/image-click-targets.js";
 import { APP_ICONS } from "../icons.js";
-import { horizontalPaddingLayout, padHorizontalText, wrapText } from "./render-text.js";
+import { horizontalPaddingLayout, padHorizontalText, wrapTextLines } from "./render-text.js";
 import { renderConversationShellEntry } from "./conversation-shell-renderer.js";
 import { renderConversationToolEntry, renderThinkingEntry } from "./conversation-tool-renderer.js";
 export function renderConversationEntry(entry, width, options) {
@@ -10,6 +10,7 @@ export function renderConversationEntry(entry, width, options) {
     const userLine = (text, entryId, syntaxHighlight, segments) => ({
         text: padHorizontalText(text, width),
         colorOverride: options.colors.userForeground,
+        backgroundOverride: options.colors.userMessageBackground,
         ...(segments && segments.length > 0 ? { segments: segments.map((segment) => ({ ...segment, start: segment.start + userContentLeft, end: segment.end + userContentLeft })) } : {}),
         ...(syntaxHighlight === undefined ? {} : { syntaxHighlight }),
         ...(entryId === undefined ? {} : { target: { kind: "user-message", id: entryId } }),
@@ -21,17 +22,25 @@ export function renderConversationEntry(entry, width, options) {
         target: { kind: "queue-message", id: entryId },
     });
     const userMessageLines = (userEntry) => {
-        const lines = renderMarkdownTextLines(userEntry.text, userContentWidth, userContentLeft).map((line) => userLine(line.text, userEntry.id, line.syntaxHighlight, line.segments));
+        const lines = renderMarkdownTextLines(userEntry.text, userContentWidth, userContentLeft).map((line) => ({
+            ...userLine(line.text, userEntry.id, line.syntaxHighlight, line.segments),
+            ...(line.copyText === undefined ? {} : { copyText: line.copyText }),
+            ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}),
+        }));
         return attachImageClickTargets(lines, userEntry.id, userEntry.images, { foreground: options.colors.info, underline: true });
     };
     const queuedMessageLines = (queuedEntry) => {
         const icon = queuedEntry.queueSource === "deferred" ? APP_ICONS.pause : APP_ICONS.timerSand;
-        const contentLines = wrapText(`${icon} ${queuedEntry.text}`, width);
-        return contentLines.map((text, index) => queuedLine(text, queuedEntry.id, index === 0 ? [{ start: 0, end: icon.length, foreground: options.colors.info }] : undefined));
+        const contentLines = wrapTextLines(`${icon} ${queuedEntry.text}`, width);
+        return contentLines.map((line, index) => ({
+            ...queuedLine(line.text, queuedEntry.id, index === 0 ? [{ start: 0, end: icon.length, foreground: options.colors.info }] : undefined),
+            copyText: line.copyText,
+            ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}),
+        }));
     };
     switch (entry.kind) {
         case "system":
-            return wrapText(`system: ${entry.text}`, width).map((text) => ({ text, variant: "muted" }));
+            return wrapTextLines(`system: ${entry.text}`, width).map((line) => ({ text: line.text, copyText: line.copyText, ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}), variant: "muted" }));
         case "user":
             return userMessageLines(entry);
         case "queued":
@@ -41,21 +50,23 @@ export function renderConversationEntry(entry, width, options) {
         case "custom":
             return renderCustomEntry(entry, width);
         case "session-aborted":
-            return wrapText(entry.text, width).map((text) => ({ text, variant: "error" }));
+            return wrapTextLines(entry.text, width).map((line) => ({ text: line.text, copyText: line.copyText, ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}), variant: "error" }));
         case "shell":
             return renderConversationShellEntry(entry, width, options);
         case "thinking":
             return renderThinkingEntry(entry, width, options);
         case "error":
-            return wrapText(`error: ${entry.text}`, width).map((text) => ({ text, variant: "error" }));
+            return wrapTextLines(`error: ${entry.text}`, width).map((line) => ({ text: line.text, copyText: line.copyText, ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}), variant: "error" }));
         case "tool":
             return renderConversationToolEntry(entry, width, options);
     }
 }
 function renderCustomEntry(entry, width) {
     const label = `[${entry.customType}]`;
-    return wrapText(`${label}\n${entry.text}`, width).map((text, index) => ({
-        text,
+    return wrapTextLines(`${label}\n${entry.text}`, width).map((line, index) => ({
+        text: line.text,
+        copyText: line.copyText,
+        ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}),
         variant: index === 0 ? "accent" : "normal",
     }));
 }
@@ -69,10 +80,18 @@ function renderAssistantLines(text, width, options) {
         return [];
     const lines = [];
     for (const line of contentLines) {
+        const headingSegment = line.heading
+            ? { start: contentLeft, end: contentLeft + line.text.length, foreground: options.colors.assistantForeground, bold: true }
+            : undefined;
+        const existingSegments = line.segments?.map((segment) => ({ ...segment, start: segment.start + contentLeft, end: segment.end + contentLeft })) ?? [];
+        const allSegments = headingSegment ? [headingSegment, ...existingSegments] : existingSegments;
         lines.push({
             text: padHorizontalText(line.text, width),
+            ...(line.copyText === undefined ? {} : { copyText: line.copyText }),
+            ...(line.continuesOnNextLine ? { continuesOnNextLine: true } : {}),
             colorOverride: options.colors.assistantForeground,
-            ...(line.segments && line.segments.length > 0 ? { segments: line.segments.map((segment) => ({ ...segment, start: segment.start + contentLeft, end: segment.end + contentLeft })) } : {}),
+            backgroundOverride: options.colors.assistantMessageBackground,
+            ...(allSegments.length > 0 ? { segments: allSegments } : {}),
             ...(line.syntaxHighlight ? { syntaxHighlight: line.syntaxHighlight } : {}),
         });
     }

package/dist/app/rendering/conversation-tool-renderer.js

@@ -63,7 +63,7 @@ export function renderThinkingEntry(entry, width, options) {
         expandedText: compactExpandedText || "(empty)",
         bodyWrap: "word",
         syntaxHighlight: compactExpandedText ? markdownSyntaxHighlightsForText(compactExpandedText) : undefined,
-    }, rule, width, options.colors, { superCompact: Boolean(options.superCompactTools && !forceExpanded) });
+    }, rule, width, options.colors, { superCompact: Boolean(options.superCompactTools && !forceExpanded), backgroundOverride: options.colors.thinkingMessageBackground, skipHeaderBackground: true });
 }
 function trimTrailingBlankLines(text) {
     return text.replace(/(?:\r?\n[ \t]*)+$/u, "");