@alivault/pico 0.10.0 → 0.10.2

package/.output/server/_ssr/{router-BfWi4RfZ.mjs → router-CphHgwo2.mjs}

@@ -1,14 +1,14 @@
 import { i as __toESM } from "../_runtime.mjs";
 import { $ as require_react, Q as require_jsx_runtime } from "../_libs/@base-ui/react+[...].mjs";
 import { a as createRouter, c as createRootRoute, n as Scripts, r as HeadContent, s as createFileRoute } from "../_libs/@tanstack/react-router+[...].mjs";
-import { F as CircleCheck, S as Info, _ as OctagonX, a as TriangleAlert } from "../_libs/lucide-react.mjs";
-import { A as TooltipProvider, B as extractMessageImages, F as buildItemsFromSync, G as mergeAssistantBlocksForStreaming, H as extractToolText, L as createCompactionSummaryItem, P as assistantBlocksFromMessage, S as Spinner, V as extractMessageText$1, n as APPLIED_THEME_STORAGE_KEY, t as APPLIED_THEME_CLASSES, v as Route$54, xt as toolCategoryFromTool } from "./routes-D6yf6dMU.mjs";
+import { I as CircleCheck, S as Info, _ as OctagonX, a as TriangleAlert } from "../_libs/lucide-react.mjs";
+import { B as createCompactionSummaryItem, G as extractToolText, I as appliedThemeClassColorMode, J as mergeAssistantBlocksForStreaming, L as assistantBlocksFromMessage, M as TooltipProvider, R as buildItemsFromSync, T as Spinner, U as extractMessageImages, W as extractMessageText$1, f as PICO_SHIKI_VARIABLE_DEFAULTS, kt as toolCategoryFromTool, n as APPLIED_THEME_STORAGE_KEY, t as APPLIED_THEME_CLASSES, u as PICO_CODE_SHIKI_THEME, x as Route$54 } from "./routes-CHNxptm_.mjs";
 import { t as QueryClient } from "../_libs/tanstack__query-core.mjs";
 import { t as setupRouterSsrQueryIntegration } from "../_libs/@tanstack/react-router-ssr-query+[...].mjs";
 import { n as HotkeysProvider } from "../_libs/tanstack__react-hotkeys.mjs";
 import { n as z, t as J } from "../_libs/next-themes.mjs";
 import { t as Toaster } from "../_libs/sonner.mjs";
-import { a as rust_exports, i as python_exports, n as go_exports, o as css_exports, r as c_exports, s as highlight, t as java_exports } from "../_libs/sugar-high.mjs";
+import { c as bundledLanguages, l as bundledLanguagesAlias, s as codeToHtml, u as createCssVariablesTheme } from "../_libs/@pierre/diffs+[...].mjs";
 import { t as createTwoFilesPatch } from "../_libs/diff.mjs";
 import { n as Debouncer } from "../_libs/tanstack__pacer.mjs";
 import { createHash, randomUUID } from "node:crypto";
@@ -20,13 +20,17 @@ import os, { homedir } from "node:os";
 import { performance } from "node:perf_hooks";
 import { isMainThread } from "node:worker_threads";
 import { execSync, spawn } from "node:child_process";
-//#region node_modules/.nitro/vite/services/ssr/assets/router-BfWi4RfZ.js
+//#region node_modules/.nitro/vite/services/ssr/assets/router-CphHgwo2.js
 var import_react = /* @__PURE__ */ __toESM(require_react());
 var import_jsx_runtime = require_jsx_runtime();
+function sonnerThemeFromAppliedTheme(theme) {
+	if (theme === "system") return "system";
+	return appliedThemeClassColorMode(theme) ?? "system";
+}
 var Toaster$1 = ({ ...props }) => {
 	const { theme = "system" } = z();
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Toaster, {
-		theme,
+		theme: sonnerThemeFromAppliedTheme(theme),
 		className: "toaster group",
 		icons: {
 			success: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CircleCheck, { className: "size-4" }),
@@ -39,6 +43,18 @@ var Toaster$1 = ({ ...props }) => {
 			"--normal-bg": "var(--popover)",
 			"--normal-text": "var(--popover-foreground)",
 			"--normal-border": "var(--border)",
+			"--success-bg": "color-mix(in oklab, var(--success) 14%, var(--popover))",
+			"--success-border": "color-mix(in oklab, var(--success) 35%, var(--border))",
+			"--success-text": "var(--success)",
+			"--info-bg": "color-mix(in oklab, var(--primary) 14%, var(--popover))",
+			"--info-border": "color-mix(in oklab, var(--primary) 35%, var(--border))",
+			"--info-text": "var(--primary)",
+			"--warning-bg": "color-mix(in oklab, var(--warning) 14%, var(--popover))",
+			"--warning-border": "color-mix(in oklab, var(--warning) 35%, var(--border))",
+			"--warning-text": "var(--warning)",
+			"--error-bg": "color-mix(in oklab, var(--danger) 14%, var(--popover))",
+			"--error-border": "color-mix(in oklab, var(--danger) 35%, var(--border))",
+			"--error-text": "var(--danger)",
 			"--border-radius": "var(--radius)"
 		},
 		toastOptions: { classNames: { toast: "cn-toast" } },
@@ -71,7 +87,7 @@ function AppProviders({ children }) {
 		})
 	});
 }
-var styles_default = "/assets/styles-DgbW000h.css";
+var styles_default = "/assets/styles-hk0oLlcJ.css";
 var TANSTACK_DEVTOOLS_SETTINGS_KEY = "tanstack_devtools_settings";
 var TANSTACK_DEVTOOLS_DEFAULTS_STORAGE_KEY = "pico-tanstack-devtools-defaults-v1";
 var TANSTACK_DEVTOOLS_CONFIG = {
@@ -519,7 +535,7 @@ async function clearContextDraft(options) {
 	await disposeDraftIfUnused(draftEntry);
 }
 async function resolveRequestedEntry(options) {
-	const { url, context, getSessionEntryByKey, ensureSessionEntryById, getActiveEntry, isDraftEntry, getOrCreateDraftEntry, activateContextSession, notifyOnActivate = true, preferActiveDraft = false } = options;
+	const { url, context, getSessionEntryByKey, ensureSessionEntryById, getActiveEntry, isDraftEntry, getOrCreateDraftEntry, activateContextSession, notifyOnActivate = true, preferActiveDraft = false, preferActiveDraftOverRequestedSession = false } = options;
 	const activateRequestedEntry = async (entry) => {
 		await activateContextSession(context, entry, { notify: notifyOnActivate });
 		return entry;
@@ -529,39 +545,52 @@ async function resolveRequestedEntry(options) {
 		const requestedEntry = getSessionEntryByKey(requestedSessionKey);
 		if (requestedEntry) return await activateRequestedEntry(requestedEntry);
 	}
-	if (preferActiveDraft && context.draftKey) {
-		const draftEntry = getSessionEntryByKey(context.draftKey);
-		if (draftEntry && isDraftEntry(draftEntry)) return await activateRequestedEntry(draftEntry);
-	}
 	const requestedSessionId = url.searchParams.get("session");
 	if (requestedSessionId) {
+		if (preferActiveDraft && preferActiveDraftOverRequestedSession && context.draftKey && context.activeKey === context.draftKey) {
+			const activeDraftEntry = getSessionEntryByKey(context.draftKey);
+			if (activeDraftEntry && isDraftEntry(activeDraftEntry)) return await activateRequestedEntry(activeDraftEntry);
+		}
 		const requestedEntry = await ensureSessionEntryById(requestedSessionId);
 		if (requestedEntry) return await activateRequestedEntry(requestedEntry);
 	}
+	if (preferActiveDraft && context.draftKey) {
+		const draftEntry = getSessionEntryByKey(context.draftKey);
+		if (draftEntry && isDraftEntry(draftEntry)) return await activateRequestedEntry(draftEntry);
+	}
 	const activeEntry = getActiveEntry(context);
 	if (activeEntry) return await activateRequestedEntry(activeEntry);
 	return await getOrCreateDraftEntry(context);
 }
+var SPECIAL_SHIKI_LANGUAGES = new Set([
+	"ansi",
+	"plain",
+	"plaintext",
+	"text"
+]);
+var SUPPORTED_SHIKI_LANGUAGES = new Set([...Object.keys(bundledLanguages), ...Object.keys(bundledLanguagesAlias)]);
+var picoCodeTheme = createCssVariablesTheme({
+	name: PICO_CODE_SHIKI_THEME,
+	variablePrefix: "--sh-",
+	variableDefaults: { ...PICO_SHIKI_VARIABLE_DEFAULTS },
+	fontStyle: false
+});
 function normalizeHighlightLanguage(language) {
 	const normalized = typeof language === "string" ? language.trim().toLowerCase().replace(/^language-/, "") : "";
 	if (!normalized) return "";
 	switch (normalized) {
-		case "js":
 		case "mjs":
 		case "cjs": return "javascript";
-		case "ts": return "typescript";
-		case "py": return "python";
-		case "rs": return "rust";
+		case "cts":
+		case "mts": return "typescript";
 		case "golang": return "go";
 		case "htm":
 		case "xhtml": return "html";
-		case "yml": return "yaml";
+		case "svg": return "xml";
 		case "shell":
-		case "shellscript":
-		case "sh":
-		case "zsh": return "bash";
+		case "shellscript": return "bash";
 		case "plain":
-		case "text": return "plaintext";
+		case "txt": return "text";
 		case "h": return "c";
 		default: return normalized;
 	}
@@ -571,46 +600,34 @@ function countTextLines(text) {
 	for (let index = 0; index < text.length; index += 1) if (text.charCodeAt(index) === 10) lines += 1;
 	return lines;
 }
-function getSugarHighOptions(language) {
-	switch (language) {
-		case "javascript":
-		case "jsx":
-		case "typescript":
-		case "tsx":
-		case "json":
-		case "jsonc":
-		case "html":
-		case "xml":
-		case "svg":
-		case "mdx": return null;
-		case "css": return css_exports;
-		case "python": return python_exports;
-		case "rust": return rust_exports;
-		case "c": return c_exports;
-		case "go": return go_exports;
-		case "java": return java_exports;
-		default: return;
-	}
-}
-function buildHighlightPayload(options) {
+function isSupportedShikiLanguage(language) {
+	return SPECIAL_SHIKI_LANGUAGES.has(language) || SUPPORTED_SHIKI_LANGUAGES.has(language);
+}
+function shikiCodeInnerHtml(html) {
+	return /<pre\b[^>]*><code>([\s\S]*)<\/code><\/pre>/.exec(html)?.[1] ?? html;
+}
+async function buildHighlightPayload(options) {
 	const text = typeof options.code === "string" ? options.code : "";
 	const normalizedLanguage = normalizeHighlightLanguage(options.language);
 	if (!text || !normalizedLanguage) return {
 		skipped: true,
 		language: normalizedLanguage || void 0
 	};
-	if (normalizedLanguage === "plaintext" || text.length > 1e5 || countTextLines(text) > 1500) return {
+	if (normalizedLanguage === "text" || normalizedLanguage === "plaintext" || text.length > 1e5 || countTextLines(text) > 1500) return {
 		skipped: true,
 		language: normalizedLanguage
 	};
-	const sugarOptions = getSugarHighOptions(normalizedLanguage);
-	if (sugarOptions === void 0) return {
+	if (!isSupportedShikiLanguage(normalizedLanguage)) return {
 		unsupported: true,
 		language: normalizedLanguage
 	};
 	return {
 		language: normalizedLanguage,
-		html: highlight(text, sugarOptions ?? void 0)
+		html: shikiCodeInnerHtml(await codeToHtml(text, {
+			lang: normalizedLanguage,
+			theme: picoCodeTheme,
+			defaultColor: false
+		}))
 	};
 }
 function messageItemIndex(item) {
@@ -1113,40 +1130,85 @@ function countFullTurnUserAndAssistantMessages(messages) {
 	finishTurn(false);
 	return count;
 }
-async function readSessionListMetrics(sessionPath) {
-	try {
-		const content = await readFile(sessionPath, "utf8");
-		let lastTimestamp = 0;
-		let lastValue;
-		const messages = [];
-		for (const line of content.split("\n")) {
-			if (!line.trim()) continue;
-			let entry;
-			try {
-				entry = JSON.parse(line);
-			} catch {
-				continue;
-			}
-			if (!isRecord(entry) || entry.type !== "message") continue;
-			const message = isRecord(entry.message) ? entry.message : void 0;
-			if (!message) continue;
-			const messageWithTimestamp = {
-				...message,
-				timestamp: message.timestamp ?? entry.timestamp
-			};
-			if (messageWithTimestamp.role === "user") {
-				const normalized = normalizeModifiedTimestamp(messageWithTimestamp.timestamp);
-				const timestamp = modifiedTimestampValue(normalized);
-				if (timestamp && timestamp >= lastTimestamp) {
-					lastTimestamp = timestamp;
-					lastValue = normalized;
-				}
+function readSessionListMetricEntries(content) {
+	const entries = [];
+	for (const line of content.split("\n")) {
+		if (!line.trim()) continue;
+		let entry;
+		try {
+			entry = JSON.parse(line);
+		} catch {
+			continue;
+		}
+		if (!isRecord(entry) || entry.type === "session") continue;
+		entries.push(entry);
+	}
+	return entries;
+}
+function sessionListMetricEntryId(entry) {
+	return typeof entry.id === "string" && entry.id ? entry.id : "";
+}
+function sessionListMetricEntryParentId(entry) {
+	return typeof entry.parentId === "string" && entry.parentId ? entry.parentId : "";
+}
+function sessionListMetricBranchEntries(entries, leafId) {
+	if (leafId === void 0) return entries;
+	if (leafId === null) return [];
+	const byId = new Map(entries.flatMap((entry) => {
+		const id = sessionListMetricEntryId(entry);
+		return id ? [[id, entry]] : [];
+	}));
+	const leaf = byId.get(leafId);
+	if (!leaf) return entries;
+	const branch = [];
+	let current = leaf;
+	const visited = /* @__PURE__ */ new Set();
+	while (current) {
+		const id = sessionListMetricEntryId(current);
+		if (id) {
+			if (visited.has(id)) break;
+			visited.add(id);
+		}
+		branch.unshift(current);
+		const parentId = sessionListMetricEntryParentId(current);
+		current = parentId ? byId.get(parentId) : void 0;
+	}
+	return branch;
+}
+function collectSessionListMetricMessages(entries) {
+	let lastTimestamp = 0;
+	let lastValue;
+	const messages = [];
+	for (const entry of entries) {
+		if (entry.type !== "message") continue;
+		const message = isRecord(entry.message) ? entry.message : void 0;
+		if (!message) continue;
+		const messageWithTimestamp = {
+			...message,
+			timestamp: message.timestamp ?? entry.timestamp
+		};
+		if (messageWithTimestamp.role === "user") {
+			const normalized = normalizeModifiedTimestamp(messageWithTimestamp.timestamp);
+			const timestamp = modifiedTimestampValue(normalized);
+			if (timestamp && timestamp >= lastTimestamp) {
+				lastTimestamp = timestamp;
+				lastValue = normalized;
 			}
-			if (messageWithTimestamp.role === "user" || messageWithTimestamp.role === "assistant") messages.push(messageWithTimestamp);
 		}
+		if (messageWithTimestamp.role === "user" || messageWithTimestamp.role === "assistant") messages.push(messageWithTimestamp);
+	}
+	return {
+		lastUserMessageAt: lastValue,
+		messages
+	};
+}
+async function readSessionListMetrics(sessionPath, options) {
+	try {
+		const entries = readSessionListMetricEntries(await readFile(sessionPath, "utf8"));
+		const { lastUserMessageAt, messages } = collectSessionListMetricMessages(Object.prototype.hasOwnProperty.call(options ?? {}, "leafId") ? sessionListMetricBranchEntries(entries, options?.leafId) : entries);
 		const lastMessage = getSessionLastCompleteMessageInfo(messages);
 		return {
-			lastUserMessageAt: lastValue,
+			lastUserMessageAt,
 			lastMessageAt: lastMessage.timestamp,
 			lastMessagePreview: lastMessage.preview,
 			messageCount: countFullTurnUserAndAssistantMessages(messages)
@@ -3688,6 +3750,7 @@ var PicoRuntime = class {
 	encoder = new TextEncoder();
 	contexts = /* @__PURE__ */ new Map();
 	sessionEntries = /* @__PURE__ */ new Map();
+	sessionTreeLeafOverrides = /* @__PURE__ */ new Map();
 	servicesByCwd = /* @__PURE__ */ new Map();
 	pendingUiRequests = /* @__PURE__ */ new Map();
 	activeOAuthLogins = /* @__PURE__ */ new Map();
@@ -3866,6 +3929,7 @@ var PicoRuntime = class {
 			id,
 			clients: /* @__PURE__ */ new Set(),
 			activeRevision: 0,
+			selectionNonce: 0,
 			activeKey: void 0,
 			draftKey: void 0,
 			sessionScope: process.cwd(),
@@ -3878,6 +3942,31 @@ var PicoRuntime = class {
 	getSessionPath(entry) {
 		return entry.session.sessionFile ?? entry.key;
 	}
+	getSessionTreeLeafOverrideKey(entry) {
+		return entry.session.sessionFile || "";
+	}
+	rememberSessionTreeLeaf(entry, onlyExisting = false) {
+		const key = this.getSessionTreeLeafOverrideKey(entry);
+		if (!key) return;
+		if (onlyExisting && !this.sessionTreeLeafOverrides.has(key)) return;
+		const leafId = entry.session.sessionManager.getLeafId?.() ?? null;
+		if (this.sessionTreeLeafOverrides.get(key) === leafId) return;
+		this.sessionTreeLeafOverrides.set(key, leafId);
+		this.invalidateSessionIndexCache();
+	}
+	restoreSessionTreeLeafOverride(manager, sessionPath) {
+		if (!this.sessionTreeLeafOverrides.has(sessionPath)) return;
+		const leafId = this.sessionTreeLeafOverrides.get(sessionPath) ?? null;
+		if (leafId === null) {
+			manager.resetLeaf?.();
+			return;
+		}
+		if (!manager.getEntry?.(leafId)) {
+			this.sessionTreeLeafOverrides.delete(sessionPath);
+			return;
+		}
+		manager.branch?.(leafId);
+	}
 	getActiveEntry(context) {
 		return context.activeKey ? this.sessionEntries.get(context.activeKey) : void 0;
 	}
@@ -3988,16 +4077,19 @@ var PicoRuntime = class {
 		return mergeSessionListEntry(target, fallback);
 	}
 	async sessionFallbackInfo(entry) {
-		const firstMessage = this.getSessionFirstMessage(entry);
+		const sessionName = entry.session.sessionName;
+		const waitingForAutoName = Boolean(entry.sessionNaming.pendingGeneration && !cleanupSessionNameCandidate(sessionName));
+		const firstMessage = waitingForAutoName ? "" : this.getSessionFirstMessage(entry);
+		const listName = waitingForAutoName ? "New session" : sessionName;
 		const lastMessage = getSessionLastCompleteMessageInfo(entry.session.messages);
 		return {
 			path: entry.session.sessionFile,
 			id: entry.session.sessionId,
 			cwd: entry.cwd,
-			name: entry.session.sessionName,
+			name: listName,
 			firstMessage,
 			title: getSessionListTitle({
-				name: entry.session.sessionName,
+				name: listName,
 				firstMessage
 			}),
 			modified: await this.sessionEntryModified(entry),
@@ -4023,13 +4115,17 @@ var PicoRuntime = class {
 			const sessions = allSessions.filter((entry) => (entry.messageCount ?? 0) > 0);
 			const metricsStartedAt = performance.now();
 			const withMetrics = await Promise.all(sessions.map(async (entry) => {
-				const metrics = entry.path ? await readSessionListMetrics(entry.path) : void 0;
+				let metrics;
+				if (entry.path) {
+					const hasLeafOverride = this.sessionTreeLeafOverrides.has(entry.path);
+					metrics = await readSessionListMetrics(entry.path, hasLeafOverride ? { leafId: this.sessionTreeLeafOverrides.get(entry.path) ?? null } : void 0);
+				}
 				return {
 					...entry,
-					lastUserMessageAt: metrics?.lastUserMessageAt ?? entry.lastUserMessageAt,
-					lastMessageAt: metrics?.lastMessageAt ?? entry.lastMessageAt,
-					lastMessagePreview: metrics?.lastMessagePreview ?? entry.lastMessagePreview,
-					messageCount: metrics?.messageCount ?? entry.messageCount
+					lastUserMessageAt: metrics ? metrics.lastUserMessageAt : entry.lastUserMessageAt,
+					lastMessageAt: metrics ? metrics.lastMessageAt : entry.lastMessageAt,
+					lastMessagePreview: metrics ? metrics.lastMessagePreview : entry.lastMessagePreview,
+					messageCount: metrics ? metrics.messageCount : entry.messageCount
 				};
 			}));
 			this.logSessionLoadDebug("session_index:metrics", {
@@ -4370,6 +4466,16 @@ var PicoRuntime = class {
 		await this.bindSessionEntry(entry);
 		await Promise.all([this.broadcastEntryState(entry), this.broadcastSessionsAll()]);
 	}
+	scheduleTreeNavigationSessionListChange(entry, previousLeafId, result) {
+		if (result.cancelled || result.aborted) return;
+		const nextLeafId = entry.session.sessionManager.getLeafId?.() ?? null;
+		if (!result.summaryEntry && previousLeafId === nextLeafId) return;
+		this.rememberSessionTreeLeaf(entry);
+		this.touchSessionEntry(entry);
+		this.broadcastSessionsAll().catch((error) => {
+			console.error("[pico] failed to broadcast tree navigation sessions:", error);
+		});
+	}
 	syncGitWatchDirectories() {
 		const cwds = /* @__PURE__ */ new Set();
 		for (const context of this.contexts.values()) {
@@ -4649,7 +4755,8 @@ var PicoRuntime = class {
 			getOrCreateDraftEntry: async (activeContext) => await this.getOrCreateDraftEntry(activeContext),
 			activateContextSession: async (activeContext, entry, activateOptions) => await this.activateContextSession(activeContext, entry, activateOptions),
 			notifyOnActivate: options?.notifyOnActivate,
-			preferActiveDraft: options?.preferActiveDraft
+			preferActiveDraft: options?.preferActiveDraft,
+			preferActiveDraftOverRequestedSession: options?.preferActiveDraftOverRequestedSession
 		});
 	}
 	async resolveRequest(request, options) {
@@ -4668,7 +4775,8 @@ var PicoRuntime = class {
 		try {
 			const activeEntry = await this.resolveRequestedEntry(url, context, {
 				notifyOnActivate: options?.notifyOnActivate ?? false,
-				preferActiveDraft: options?.preferActiveDraft ?? true
+				preferActiveDraft: options?.preferActiveDraft ?? true,
+				preferActiveDraftOverRequestedSession: options?.preferActiveDraftOverRequestedSession ?? false
 			});
 			this.logSessionLoadDebug("request_resolve:done", {
 				pathname: url.pathname,
@@ -4793,6 +4901,7 @@ var PicoRuntime = class {
 			const sdk = await this.getSdk();
 			const openStartedAt = performance.now();
 			const sessionManager = sdk.SessionManager.open(sessionPath);
+			this.restoreSessionTreeLeafOverride(sessionManager, sessionPath);
 			this.logSessionLoadDebug("session_manager:open", {
 				sessionPath,
 				cwd: sessionManager.getCwd(),
@@ -4809,7 +4918,9 @@ var PicoRuntime = class {
 		if (currentManager.isPersisted?.()) {
 			const currentSessionFile = entry.session.sessionFile;
 			if (!currentSessionFile) throw new Error("Persisted session is missing a session file");
-			return (await this.getSdk()).SessionManager.open(currentSessionFile, currentManager.getSessionDir?.(), entry.cwd);
+			const sessionManager = (await this.getSdk()).SessionManager.open(currentSessionFile, currentManager.getSessionDir?.(), entry.cwd);
+			this.restoreSessionTreeLeafOverride(sessionManager, currentSessionFile);
+			return sessionManager;
 		}
 		return await this.createForkedInMemorySessionManager(currentManager, currentManager.getLeafId?.(), entry.session.sessionFile);
 	}
@@ -5192,14 +5303,12 @@ var PicoRuntime = class {
 					};
 				},
 				navigateTree: async (targetId, navigateOptions) => {
+					const previousLeafId = session.sessionManager.getLeafId?.() ?? null;
 					const result = await session.navigateTree(targetId, navigateOptions);
 					this.refreshRetainedConversationItems(entry);
 					if (result.editorText != null) entry.uiState.editorText = result.editorText;
 					await this.broadcastEntryState(entry);
-					if (result.summaryEntry) {
-						this.touchSessionEntry(entry);
-						await this.broadcastSessionsAll();
-					}
+					this.scheduleTreeNavigationSessionListChange(entry, previousLeafId, result);
 					return {
 						cancelled: Boolean(result.cancelled),
 						aborted: Boolean(result.aborted)
@@ -5326,6 +5435,7 @@ var PicoRuntime = class {
 			statusChanged = true;
 		}
 		if (statusChanged) this.broadcastSessionStatusAll(entry);
+		this.rememberSessionTreeLeaf(entry, true);
 		await this.broadcastEntryState(entry);
 		if (type === "agent_start" || type === "agent_end" || type === "message_end" || type === "compaction_end" || type === "queue_update") await this.broadcastSessionsAll();
 		if (type === "agent_end" || type === "compaction_end") await this.cleanupInactiveContexts();
@@ -5383,12 +5493,13 @@ var PicoRuntime = class {
 					const bootstrapStartedAt = performance.now();
 					try {
 						const stateStartedAt = performance.now();
-						this.sendStatePayloadToClient(context, client, this.currentStatePayload(activeEntry, context), { forceFull: true });
+						const bootstrapEntry = this.getActiveEntry(context) ?? activeEntry;
+						this.sendStatePayloadToClient(context, client, this.currentStatePayload(bootstrapEntry, context), { forceFull: true });
 						this.logSessionLoadDebug("events_response:bootstrap_state", {
 							contextId: context.id,
 							clientId: client.id,
 							durationMs: roundedDurationMs(stateStartedAt),
-							...this.sessionDebugDetails(activeEntry)
+							...this.sessionDebugDetails(bootstrapEntry)
 						});
 						if (client.closed || request.signal.aborted) return;
 						const sessionsStartedAt = performance.now();
@@ -5438,7 +5549,10 @@ var PicoRuntime = class {
 		}
 	}
 	async prompt(request, body) {
-		const { context, activeEntry } = await this.resolveRequest(request, { preferActiveDraft: true });
+		const { context, activeEntry } = await this.resolveRequest(request, {
+			preferActiveDraft: true,
+			preferActiveDraftOverRequestedSession: true
+		});
 		const message = typeof body.message === "string" ? body.message : "";
 		const images = normalizePromptImages(body.images);
 		if (!message.trim() && images.length === 0) throw new Error("message or image is required");
@@ -5620,11 +5734,16 @@ var PicoRuntime = class {
 		const url = new URL(request.url);
 		const requestedSessionId = url.searchParams.get("session")?.trim() || "";
 		const requestedSessionPath = url.searchParams.get("sessionPath")?.trim() || "";
+		const rawSelectionNonce = Number(url.searchParams.get("selectionNonce"));
+		const selectionNonce = Number.isSafeInteger(rawSelectionNonce) && rawSelectionNonce > 0 ? rawSelectionNonce : 0;
 		const context = this.ensureContext(url.searchParams.get("context") || "default");
 		context.sessionScope = normalizeSessionScope(url.searchParams.get("scope"), process.cwd());
+		if (selectionNonce > context.selectionNonce) context.selectionNonce = selectionNonce;
 		this.logSessionLoadDebug("select_session:start", {
 			requestedSessionId,
 			requestedSessionPath,
+			selectionNonce,
+			latestSelectionNonce: context.selectionNonce,
 			contextId: context.id
 		});
 		try {
@@ -5640,6 +5759,26 @@ var PicoRuntime = class {
 				...this.sessionDebugDetails(nextEntry)
 			});
 			if (!nextEntry) throw new Error(`Unknown session: ${requestedSessionId}`);
+			if (request.signal.aborted) {
+				this.logSessionLoadDebug("select_session:skip_aborted", {
+					requestedSessionId,
+					requestedSessionPath,
+					selectionNonce,
+					latestSelectionNonce: context.selectionNonce,
+					...this.sessionDebugDetails(nextEntry)
+				});
+				return { ok: true };
+			}
+			if (selectionNonce > 0 && selectionNonce < context.selectionNonce) {
+				this.logSessionLoadDebug("select_session:skip_stale", {
+					requestedSessionId,
+					requestedSessionPath,
+					selectionNonce,
+					latestSelectionNonce: context.selectionNonce,
+					...this.sessionDebugDetails(nextEntry)
+				});
+				return { ok: true };
+			}
 			const activateStartedAt = performance.now();
 			await this.activateContextSession(context, nextEntry);
 			this.logSessionLoadDebug("select_session:activate", {
@@ -5763,6 +5902,7 @@ var PicoRuntime = class {
 		const targetId = typeof body.targetId === "string" ? body.targetId.trim() : "";
 		if (!targetId) throw new Error("targetId is required");
 		if (this.getEntryStreamingState(activeEntry) || activeEntry.session.isStreaming) throw new Error("Abort the current response before navigating the tree.");
+		const previousLeafId = activeEntry.session.sessionManager.getLeafId?.() ?? null;
 		const result = await activeEntry.session.navigateTree(targetId, {
 			summarize: Boolean(body.summarize),
 			customInstructions: typeof body.customInstructions === "string" ? body.customInstructions : void 0,
@@ -5771,11 +5911,8 @@ var PicoRuntime = class {
 		});
 		this.refreshRetainedConversationItems(activeEntry);
 		if (result.editorText != null) activeEntry.uiState.editorText = result.editorText;
-		if (result.summaryEntry) {
-			this.touchSessionEntry(activeEntry);
-			await this.broadcastSessionsAll();
-		}
 		await this.broadcastEntryState(activeEntry);
+		this.scheduleTreeNavigationSessionListChange(activeEntry, previousLeafId, result);
 		return {
 			ok: true,
 			cancelled: Boolean(result.cancelled),
@@ -6366,7 +6503,7 @@ var PicoRuntime = class {
 	async highlightCode(code, language) {
 		const text = typeof code === "string" ? code : "";
 		try {
-			const highlightInput = buildHighlightPayload({
+			const highlightInput = await buildHighlightPayload({
 				code,
 				language
 			});