pi-ui-extend 0.1.21 → 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

@@ -85,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

@@ -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;
@@ -914,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);
     }

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/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

@@ -1,43 +1,20 @@
 import { applyOutputFilters } from "../../config.js";
 import { renderMarkdownTextLines } from "../../markdown-format.js";
-import { stringDisplayWidth } from "../../terminal-width.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) {
     const { left: userContentLeft, contentWidth: userContentWidth } = horizontalPaddingLayout(width);
-    const userLine = (text, entryId, syntaxHighlight, segments) => {
-        const textWidth = stringDisplayWidth(text);
-        const padding = Math.max(0, width - textWidth);
-        const paddedText = " ".repeat(padding) + text;
-        const offset = padding;
-        return {
-            text: paddedText,
-            colorOverride: options.colors.userForeground,
-            backgroundOverride: options.colors.userMessageBackground,
-            ...(segments && segments.length > 0
-                ? {
-                    segments: segments.map((segment) => ({
-                        ...segment,
-                        start: segment.start + offset,
-                        end: segment.end + offset,
-                        foreground: options.colors.userForeground,
-                    })),
-                }
-                : {}),
-            ...(syntaxHighlight === undefined
-                ? {}
-                : {
-                    syntaxHighlight: {
-                        ...syntaxHighlight,
-                        start: syntaxHighlight.start + offset,
-                    },
-                }),
-            ...(entryId === undefined ? {} : { target: { kind: "user-message", id: entryId } }),
-        };
-    };
+    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 } }),
+    });
     const queuedLine = (text, entryId, segments) => ({
         text,
         colorOverride: options.colors.userForeground,
@@ -45,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":
@@ -65,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",
     }));
 }
@@ -100,6 +87,8 @@ function renderAssistantLines(text, width, options) {
         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,
             backgroundOverride: options.colors.assistantMessageBackground,
             ...(allSegments.length > 0 ? { segments: allSegments } : {}),

package/dist/app/rendering/render-text.d.ts

@@ -1,5 +1,10 @@
 import type { Theme } from "../../theme.js";
 import type { ToolStatusEntry } from "../types.js";
+export type WrappedTextLine = {
+    text: string;
+    copyText: string;
+    continuesOnNextLine?: boolean;
+};
 export declare function sanitizeText(text: string): string;
 export declare function alertIconPrefixLength(text: string): number | undefined;
 export declare function normalizePastedTextForDuplicateKey(text: string): string;
@@ -12,6 +17,7 @@ export declare function toolStatusIcon(entry: ToolStatusEntry): string;
 export declare function toolStatusIconColor(entry: ToolStatusEntry, colors: Theme["colors"]): string;
 export declare function wrapLine(text: string, width: number): string[];
 export declare function wrapText(text: string, width: number): string[];
+export declare function wrapTextLines(text: string, width: number): WrappedTextLine[];
 export declare function padOrTrimPlain(text: string, width: number): string;
 export declare function horizontalPaddingLayout(width: number): {
     left: number;

package/dist/app/rendering/render-text.js

@@ -93,6 +93,15 @@ export function wrapText(text, width) {
     const lines = sanitizeText(text).split("\n");
     return lines.flatMap((line) => wrapLine(line, width));
 }
+export function wrapTextLines(text, width) {
+    return sanitizeText(text)
+        .split("\n")
+        .flatMap((line) => wrapDisplayLine(line, width).map((wrapped, index, wrappedLines) => ({
+        text: wrapped,
+        copyText: wrapped,
+        ...(index < wrappedLines.length - 1 ? { continuesOnNextLine: true } : {}),
+    })));
+}
 export function padOrTrimPlain(text, width) {
     return padOrTrimDisplay(text, width);
 }

package/dist/app/rendering/tab-line-renderer.js

@@ -3,7 +3,6 @@ import { APP_ICONS } from "../icons.js";
 import { ellipsizeDisplay } from "./render-text.js";
 const TAB_SEPARATOR = " │ ";
 const EMPTY_NEW_TAB_PREFIX = "│ ";
-const DEFAULT_SESSION_TITLE_PATTERN = /^session [0-9a-f]{8}$/iu;
 export const TAB_PANEL_ROWS = 2;
 export function tabPanelRows(tabLineVisible, terminalRows, tabCount = TAB_PANEL_ROWS) {
     if (!tabLineVisible)
@@ -158,10 +157,7 @@ export class TabLineRenderer {
         return this.buttonLayoutFromText(`${prefix}${ellipsizeDisplay(title, titleWidth)}${suffix}`, 0, statusText.length);
     }
     displayTitle(tab) {
-        const title = tab.title.trim();
-        if (!DEFAULT_SESSION_TITLE_PATTERN.test(title))
-            return tab.title;
-        return tab.titlePlaceholder === "loading" ? "Loading…" : "New";
+        return tab.title;
     }
     buttonLayoutFromText(text, statusStart, statusLength) {
         const closeStart = Math.max(0, text.lastIndexOf(APP_ICONS.close));

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

@@ -117,7 +117,13 @@ function renderToolBodyLines(text, width, target, color, style, colors, syntaxHi
             ? wrapAnsiStyledDisplayLine(ansiLine, bodyWidth)
             : wrapBodyLine(displayLine, bodyWidth).map((wrapped) => ({ text: wrapped, segments: [] }));
         for (const [wrapIndex, wrapped] of wrappedLines.entries()) {
-            const line = { text: `  ${wrapped.text}`, target, colorOverride: color };
+            const line = {
+                text: `  ${wrapped.text}`,
+                copyText: `  ${wrapped.text}`,
+                ...(wrapIndex < wrappedLines.length - 1 ? { continuesOnNextLine: true } : {}),
+                target,
+                colorOverride: color,
+            };
             if (diffStyle) {
                 const segment = { start: 2, end: line.text.length, foreground: diffStyle.foreground };
                 if (diffStyle.bold != null)

package/dist/app/screen/mouse-controller.js

@@ -799,17 +799,19 @@ export class AppMouseController {
         const width = this.conversationArea()?.viewportColumns ?? this.host.terminalColumns();
         const count = range.end.line - range.start.line + 1;
         const renderedLines = this.host.conversationViewport().slice(width, range.start.line, count);
-        const lines = [];
+        let copiedText = "";
         for (let index = 0; index < count; index += 1) {
             const rendered = renderedLines[index];
-            const text = rendered?.text ?? "";
+            const lineText = rendered?.text ?? "";
             const line = range.start.line + index;
             const startColumn = line === range.start.line ? range.start.x : 1;
-            const endColumn = line === range.end.line ? range.end.x : text.length + 1;
-            const lineText = sliceByDisplayColumns(text, startColumn, endColumn);
-            lines.push(lineText.trimEnd());
+            const endColumn = line === range.end.line ? range.end.x : lineText.length + 1;
+            const selectedLine = selectedConversationLineText(rendered, lineText, startColumn, endColumn);
+            copiedText += selectedLine;
+            if (!(rendered?.continuesOnNextLine))
+                copiedText += "\n";
         }
-        return lines.join("\n").replace(/\s+$/u, "");
+        return copiedText.replace(/\s+$/u, "");
     }
     conversationPointFromMouse(event, clampToViewport) {
         const area = this.conversationArea();
@@ -930,6 +932,12 @@ export class AppMouseController {
         selection.moved = true;
     }
 }
+function selectedConversationLineText(rendered, text, startColumn, endColumn) {
+    const selectsWholeLine = startColumn <= 1 && endColumn >= text.length + 1;
+    if (selectsWholeLine && rendered?.copyText !== undefined)
+        return rendered.copyText;
+    return sliceByDisplayColumns(text, startColumn, endColumn).trimEnd();
+}
 function orderedConversationSelection(anchor, current) {
     if (anchor.line < current.line)
         return { start: anchor, end: current };

package/dist/app/session/session-event-controller.js

@@ -133,6 +133,8 @@ export class AppSessionEventController {
             case "tool_execution_end":
                 this.host.setSessionActivity(this.host.runtime()?.session.isStreaming ? "running" : "idle");
                 this.recordToolWorkspaceMutation(event.toolCallId, event.toolName, event.result.details, event.isError);
+                if (this.currentUserEntryId)
+                    this.host.scheduleUserSessionEntryMetadataSync();
                 this.host.observeSubagentsToolResult(event.toolName, isRecord(event.result) ? event.result.details : undefined);
                 this.host.observeTodoToolResult(event.toolName, isRecord(event.result) ? event.result.details : undefined, event.isError);
                 this.upsertToolEntry(event.toolCallId, {
@@ -274,7 +276,6 @@ export class AppSessionEventController {
             this.finishCurrentThinkingEntry();
             this.flushAssistantTextBuffer(true);
             this.clearCurrentAssistantState();
-            this.currentUserEntryId = undefined;
         }
     }
     prepareToolWorkspaceMutation(toolCallId, toolName, args) {
@@ -362,7 +363,7 @@ export class AppSessionEventController {
         }
         if (!this.assistantTextBuffer)
             return visibleText;
-        if (shouldHoldAssistantStreamTail(this.assistantTextBuffer)) {
+        if (shouldHoldAssistantStreamTail(this.assistantTextBuffer, this.hasVisibleAssistantText(visibleText))) {
             if (final)
                 this.assistantTextBuffer = "";
             return visibleText;
@@ -439,9 +440,9 @@ function shouldDropAssistantStreamLine(line, hasVisibleText) {
         return true;
     return isHiddenMarkdownMetadataLine(line);
 }
-function shouldHoldAssistantStreamTail(text) {
+function shouldHoldAssistantStreamTail(text, hasVisibleText) {
     if (text.trim().length === 0)
-        return true;
+        return !hasVisibleText;
     return isPotentialDcpMetadataLine(text);
 }
 function isHiddenMarkdownMetadataLine(line) {

package/dist/app/session/session-lifecycle-controller.js

@@ -1,7 +1,6 @@
 import { createId } from "../id.js";
 import { stringifyUnknown } from "../rendering/message-content.js";
 import { collectStartupAvailabilityIssues } from "../cli/startup-checks.js";
-import { createStartupInfoMessage, isEmptyStartupSession } from "../cli/startup-info.js";
 export class AppSessionLifecycleController {
     host;
     unsubscribe;
@@ -37,9 +36,6 @@ export class AppSessionLifecycleController {
                 await this.bindCurrentSession({ awaitExtensions: false });
             });
             await this.bindCurrentSession({ awaitExtensions: false });
-            if (isEmptyStartupSession(runtime)) {
-                this.host.addEntry({ id: createId("system"), kind: "system", text: createStartupInfoMessage(runtime) });
-            }
             if (runtime.modelFallbackMessage) {
                 this.host.addEntry({ id: createId("system"), kind: "system", text: runtime.modelFallbackMessage });
             }