@alivault/pico 0.9.0 → 0.10.1

package/.output/server/_ssr/{router-DIdiRf-y.mjs → router-DhVJ7gcL.mjs}

@@ -1,8 +1,8 @@
 import { i as __toESM } from "../_runtime.mjs";
-import { X as require_react, Y as require_jsx_runtime } from "../_libs/@base-ui/react+[...].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 { a as TriangleAlert, g as OctagonX, j as CircleCheck, y as Info } from "../_libs/lucide-react.mjs";
-import { B as extractMessageText$1, I as createCompactionSummaryItem, N as assistantBlocksFromMessage, P as buildItemsFromSync, V as extractToolText, W as mergeAssistantBlocksForStreaming, _ as Route$49, bt as toolCategoryFromTool, k as TooltipProvider, n as APPLIED_THEME_STORAGE_KEY, t as APPLIED_THEME_CLASSES, x as Spinner, z as extractMessageImages } from "./routes-bPw2DezY.mjs";
+import { I 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, St as toolCategoryFromTool, V as extractMessageText$1, n as APPLIED_THEME_STORAGE_KEY, t as APPLIED_THEME_CLASSES, v as Route$54 } from "./routes-DbGwM-bj.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";
@@ -20,7 +20,7 @@ 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-DIdiRf-y.js
+//#region node_modules/.nitro/vite/services/ssr/assets/router-DhVJ7gcL.js
 var import_react = /* @__PURE__ */ __toESM(require_react());
 var import_jsx_runtime = require_jsx_runtime();
 var Toaster$1 = ({ ...props }) => {
@@ -71,7 +71,7 @@ function AppProviders({ children }) {
 		})
 	});
 }
-var styles_default = "/assets/styles-DueiniTy.css";
+var styles_default = "/assets/styles-oRWMaOB0.css";
 var TANSTACK_DEVTOOLS_SETTINGS_KEY = "tanstack_devtools_settings";
 var TANSTACK_DEVTOOLS_DEFAULTS_STORAGE_KEY = "pico-tanstack-devtools-defaults-v1";
 var TANSTACK_DEVTOOLS_CONFIG = {
@@ -79,7 +79,7 @@ var TANSTACK_DEVTOOLS_CONFIG = {
 	openHotkey: ["Control", "`"],
 	triggerHidden: true
 };
-var Route$48 = createRootRoute({
+var Route$53 = createRootRoute({
 	head: () => ({
 		meta: [
 			{ charSet: "utf-8" },
@@ -142,25 +142,30 @@ function RootDocument({ children }) {
 		})]
 	});
 }
+function subscribeTanStackDevtoolsReady() {
+	return () => {};
+}
+function getTanStackDevtoolsReadySnapshot() {
+	try {
+		if (window.localStorage.getItem(TANSTACK_DEVTOOLS_DEFAULTS_STORAGE_KEY) !== "true") {
+			const rawSettings = window.localStorage.getItem(TANSTACK_DEVTOOLS_SETTINGS_KEY);
+			const parsedSettings = rawSettings ? JSON.parse(rawSettings) : void 0;
+			const existingSettings = parsedSettings && typeof parsedSettings === "object" && !Array.isArray(parsedSettings) ? parsedSettings : {};
+			window.localStorage.setItem(TANSTACK_DEVTOOLS_SETTINGS_KEY, JSON.stringify({
+				...existingSettings,
+				openHotkey: TANSTACK_DEVTOOLS_CONFIG.openHotkey,
+				triggerHidden: TANSTACK_DEVTOOLS_CONFIG.triggerHidden
+			}));
+			window.localStorage.setItem(TANSTACK_DEVTOOLS_DEFAULTS_STORAGE_KEY, "true");
+		}
+	} catch {}
+	return true;
+}
+function getTanStackDevtoolsServerSnapshot() {
+	return false;
+}
 function AppTanStackDevtools() {
-	const [isReady, setIsReady] = import_react.useState(false);
-	import_react.useEffect(() => {
-		try {
-			if (window.localStorage.getItem(TANSTACK_DEVTOOLS_DEFAULTS_STORAGE_KEY) !== "true") {
-				const rawSettings = window.localStorage.getItem(TANSTACK_DEVTOOLS_SETTINGS_KEY);
-				const parsedSettings = rawSettings ? JSON.parse(rawSettings) : void 0;
-				const existingSettings = parsedSettings && typeof parsedSettings === "object" && !Array.isArray(parsedSettings) ? parsedSettings : {};
-				window.localStorage.setItem(TANSTACK_DEVTOOLS_SETTINGS_KEY, JSON.stringify({
-					...existingSettings,
-					openHotkey: TANSTACK_DEVTOOLS_CONFIG.openHotkey,
-					triggerHidden: TANSTACK_DEVTOOLS_CONFIG.triggerHidden
-				}));
-				window.localStorage.setItem(TANSTACK_DEVTOOLS_DEFAULTS_STORAGE_KEY, "true");
-			}
-		} catch {}
-		setIsReady(true);
-	}, []);
-	if (!isReady) return null;
+	if (!import_react.useSyncExternalStore(subscribeTanStackDevtoolsReady, getTanStackDevtoolsReadySnapshot, getTanStackDevtoolsServerSnapshot)) return null;
 }
 var PI_CODING_AGENT_PACKAGES = ["@earendil-works/pi-coding-agent", "@mariozechner/pi-coding-agent"];
 function normalizeSdkDir(candidate) {
@@ -455,7 +460,7 @@ async function generateSessionNameWithLlm(entry, text, imageCount) {
 		headers: auth.headers,
 		reasoningEffort: "minimal"
 	});
-	const raw = Array.isArray(response?.content) ? response.content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join(" ") : "";
+	const raw = Array.isArray(response?.content) ? response.content.flatMap((block) => block?.type === "text" && typeof block.text === "string" ? [block.text] : []).join(" ") : "";
 	if (!raw.trim()) return { reason: `refinement model ${model.provider}/${model.id} returned no text` };
 	const cleaned = cleanupSessionNameCandidate(raw);
 	if (!cleaned) return { reason: `refinement model ${model.provider}/${model.id} returned no usable title` };
@@ -524,15 +529,15 @@ 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) {
 		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);
@@ -743,7 +748,14 @@ function updateToolBlock(state, callId, update) {
 	for (let itemIndex = state.items.length - 1; itemIndex >= 0; itemIndex -= 1) {
 		const item = state.items[itemIndex];
 		if (item?.kind !== "assistant") continue;
-		const blockIndex = item.blocks.findIndex((block) => block.type === "tool" && block.callId === callId);
+		let blockIndex = -1;
+		for (let index = item.blocks.length - 1; index >= 0; index -= 1) {
+			const block = item.blocks[index];
+			if (block?.type === "tool" && block.callId === callId) {
+				blockIndex = index;
+				break;
+			}
+		}
 		if (blockIndex < 0) continue;
 		const block = item.blocks[blockIndex];
 		if (block?.type !== "tool") return;
@@ -936,7 +948,8 @@ function applyRetainedConversationEvent(state, event) {
 			}];
 			return;
 		}
-		state.items = state.items.filter((entry) => !(entry.kind === "assistant" && entry.streaming && entry.blocks.length === 0)).map((entry) => {
+		state.items = state.items.flatMap((entry) => {
+			if (entry.kind === "assistant" && entry.streaming && entry.blocks.length === 0) return [];
 			if (entry.kind !== "assistant") return entry;
 			if (!entry.streaming && entry.done !== false) return entry;
 			return {
@@ -967,7 +980,7 @@ function extractSessionListMessageText(message) {
 	const content = message.content;
 	if (typeof content === "string") return content;
 	if (!Array.isArray(content)) return "";
-	return content.filter((part) => isRecord(part) && part.type === "text").map((part) => typeof part.text === "string" ? part.text : "").join("\n");
+	return content.flatMap((part) => isRecord(part) && part.type === "text" ? [typeof part.text === "string" ? part.text : ""] : []).join("\n");
 }
 function extractSessionListImagePreview(message) {
 	const content = message.content;
@@ -1100,40 +1113,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)
@@ -1209,12 +1267,12 @@ function extractMessageText(message) {
 	const content = message.content;
 	if (typeof content === "string") return content.trim();
 	if (!Array.isArray(content)) return "";
-	return content.filter((part) => part?.type === "text" && typeof part.text === "string").map((part) => part.text).join(" ").trim();
+	return content.flatMap((part) => part?.type === "text" && typeof part.text === "string" ? [part.text] : []).join(" ").trim();
 }
 function extractSessionContentText(content) {
 	if (typeof content === "string") return content.trim();
 	if (!Array.isArray(content)) return "";
-	const text = content.filter((part) => Boolean(part) && typeof part === "object" && part.type === "text" && typeof part.text === "string").map((part) => part.text).join(" ").trim();
+	const text = content.flatMap((part) => part && typeof part === "object" && part.type === "text" && typeof part.text === "string" ? [part.text] : []).join(" ").trim();
 	if (text) return text;
 	const imageCount = content.filter((part) => part && typeof part === "object" && (part.type === "image" || part.type === "input_image")).length;
 	if (imageCount > 0) return `${imageCount} image${imageCount === 1 ? "" : "s"}`;
@@ -1318,15 +1376,22 @@ function serializeSessionTreeNode(node) {
 	if (entry.type === "custom") serialized.entry.customType = typeof entry.customType === "string" ? entry.customType : "custom";
 	if (entry.type === "label") serialized.entry.label = typeof entry.label === "string" ? entry.label : void 0;
 	if (entry.type === "session_info") serialized.entry.name = typeof entry.name === "string" ? entry.name : "";
-	serialized.children = (Array.isArray(node.children) ? node.children : []).map((child) => serializeSessionTreeNode(child)).filter((child) => Boolean(child));
+	serialized.children = (Array.isArray(node.children) ? node.children : []).flatMap((child) => {
+		const treeNode = serializeSessionTreeNode(child);
+		return treeNode ? [treeNode] : [];
+	});
 	return serialized;
 }
 function extractForkableUserMessages(entry) {
 	const messages = entry.session.getUserMessagesForForking?.();
-	if (Array.isArray(messages) && messages.length > 0) return messages.map((message) => ({
-		entryId: typeof message.entryId === "string" ? message.entryId.trim() : "",
-		text: typeof message.text === "string" ? message.text.trim() : ""
-	})).filter((message) => Boolean(message.entryId && message.text));
+	if (Array.isArray(messages) && messages.length > 0) return messages.flatMap((message) => {
+		const entryId = typeof message.entryId === "string" ? message.entryId.trim() : "";
+		const text = typeof message.text === "string" ? message.text.trim() : "";
+		return entryId && text ? [{
+			entryId,
+			text
+		}] : [];
+	});
 	const stack = [...entry.session.sessionManager.getTree?.() ?? []];
 	const results = [];
 	while (stack.length > 0) {
@@ -1351,7 +1416,7 @@ async function createForkedInMemorySessionManager(options) {
 	if (!leafId) return nextManager;
 	const branchEntries = sourceManager.getBranch?.(leafId);
 	if (!Array.isArray(branchEntries) || branchEntries.length === 0) throw new Error(`Entry ${leafId} not found`);
-	const pathWithoutLabels = branchEntries.filter((branchEntry) => branchEntry?.type !== "label").map((branchEntry) => cloneSessionData(branchEntry));
+	const pathWithoutLabels = branchEntries.flatMap((branchEntry) => branchEntry?.type !== "label" ? [cloneSessionData(branchEntry)] : []);
 	const header = cloneSessionData(sourceManager.getHeader?.() ?? nextManager.fileEntries?.[0]);
 	if (!header) throw new Error("Failed to initialize forked in-memory session.");
 	nextManager.fileEntries = [header, ...pathWithoutLabels];
@@ -1471,6 +1536,9 @@ async function createPicoEditToolDefinition(sdk, cwd) {
 		}
 	};
 }
+function gitTextContains(text, query) {
+	return text.indexOf(query) >= 0;
+}
 var GIT_STATUS_CACHE_TTL_MS = 5e3;
 var GIT_CHANGES_CACHE_TTL_MS = 5e3;
 var GIT_COMMITS_DEFAULT_LIMIT = 50;
@@ -1655,7 +1723,10 @@ function parseCommandNullList(output) {
 	return output.split("\0").filter((entry) => typeof entry === "string" && entry.length > 0);
 }
 function parseCommandLines(output, { trim = false } = {}) {
-	return output.split(/\r?\n/).map((entry) => trim ? entry.trim() : entry).filter((entry) => Boolean(trim ? entry : entry.length));
+	return output.split(/\r?\n/).flatMap((entry) => {
+		const line = trim ? entry.trim() : entry;
+		return trim ? line ? [line] : [] : line.length ? [line] : [];
+	});
 }
 function isGitCommitGraphLine(line) {
 	const tabIndex = line.indexOf("	");
@@ -1711,7 +1782,10 @@ function enrichGitCommitGraphLinesWithStats(lines, statsByHash) {
 	});
 }
 function gitCommandErrorMessage(fallback, result) {
-	const details = [result.stderr, result.stdout].map((value) => value.trim()).filter(Boolean).join("\n");
+	const details = [result.stderr, result.stdout].flatMap((value) => {
+		const detail = value.trim();
+		return detail ? [detail] : [];
+	}).join("\n");
 	if (result.timedOut) return `${fallback}: command timed out`;
 	if (details) return `${fallback}: ${details}`;
 	return fallback;
@@ -1743,7 +1817,10 @@ function deriveHeuristicCommitMessage(files) {
 	}
 	if (addedCount > modifiedCount && addedCount >= deletedCount) return `Add ${files.length} files`;
 	if (deletedCount > modifiedCount && deletedCount >= addedCount) return `Remove ${files.length} files`;
-	const commonDirectory = files.map((file) => file.path.split("/").slice(0, -1).join("/")).filter(Boolean).reduce((common, directory) => {
+	const commonDirectory = files.flatMap((file) => {
+		const directory = file.path.split("/").slice(0, -1).join("/");
+		return directory ? [directory] : [];
+	}).reduce((common, directory) => {
 		if (common === void 0) return directory;
 		return common === directory ? common : "";
 	}, void 0);
@@ -1771,12 +1848,31 @@ function parseGitStatusEntries(output) {
 	}
 	return files;
 }
+function parseGitNameStatusEntries(output) {
+	const entries = parseCommandNullList(output);
+	const files = [];
+	for (let index = 0; index < entries.length; index += 1) {
+		const status = entries[index];
+		if (typeof status !== "string" || !status) continue;
+		const isRenamedOrCopied = status.startsWith("R") || status.startsWith("C");
+		const previousPath = isRenamedOrCopied ? entries[index + 1] : void 0;
+		const filePath = isRenamedOrCopied ? entries[index + 2] : entries[index + 1];
+		index += isRenamedOrCopied ? 2 : 1;
+		if (typeof filePath !== "string" || !filePath) continue;
+		files.push({
+			status: /^[RC]\d+/.test(status) ? status.slice(0, 1) : status,
+			path: filePath,
+			...typeof previousPath === "string" && previousPath ? { previousPath } : {}
+		});
+	}
+	return files;
+}
 function parseGitNumstatEntries(output) {
 	const entries = parseCommandNullList(output);
 	const diffs = /* @__PURE__ */ new Map();
 	for (let index = 0; index < entries.length; index += 1) {
 		const entry = entries[index];
-		if (typeof entry !== "string" || !entry.includes("	")) continue;
+		if (typeof entry !== "string" || !gitTextContains(entry, "	")) continue;
 		const [addedRaw = "", deletedRaw = "", ...pathParts] = entry.split("	");
 		let filePath = pathParts.join("	");
 		let previousPath;
@@ -1797,7 +1893,10 @@ function parseGitNumstatEntries(output) {
 	return diffs;
 }
 function parseGitRefRows(output) {
-	return parseCommandLines(output).map((line) => line.split("\0")).filter((fields) => fields.some((field) => typeof field === "string" && field.length > 0));
+	return parseCommandLines(output).flatMap((line) => {
+		const fields = line.split("\0");
+		return fields.some((field) => typeof field === "string" && field.length > 0) ? [fields] : [];
+	});
 }
 function parseGitBranchTrack(track, upstream) {
 	const trackValue = typeof track === "string" ? track.trim() : "";
@@ -1852,12 +1951,28 @@ function assertGitFilePath(path) {
 	if (normalizedPath.split(/[\\/]+/).some((part) => part === "..")) throw new Error("file path must stay inside the repository");
 	return normalizedPath.replaceAll("\\", "/");
 }
+function assertGitCommitHash(commit) {
+	const normalizedCommit = typeof commit === "string" ? commit.trim() : "";
+	if (!normalizedCommit) throw new Error("commit is required");
+	if (!/^[0-9a-f]{5,40}$/i.test(normalizedCommit)) throw new Error("commit must be a valid hash");
+	return normalizedCommit;
+}
+function assertGitTagName(tagName) {
+	const normalizedTagName = typeof tagName === "string" ? tagName.trim() : "";
+	if (!normalizedTagName) throw new Error("tag name is required");
+	if (normalizedTagName.startsWith("-") || /\s/.test(normalizedTagName)) throw new Error("Invalid tag name");
+	return normalizedTagName;
+}
+function normalizeGitResetMode(mode) {
+	if (mode === "soft" || mode === "mixed" || mode === "hard") return mode;
+	throw new Error("reset mode must be soft, mixed, or hard");
+}
 function parseGitRemoteBranches(output) {
 	const branches = [];
 	for (const fields of parseGitRefRows(output)) {
 		const [name = "", hash = "", subject = "", relativeDate = "", committerDate = ""] = fields;
 		const branchName = typeof name === "string" ? name.trim() : "";
-		if (!branchName || !branchName.includes("/") || /\/HEAD$/i.test(branchName)) continue;
+		if (!branchName || !gitTextContains(branchName, "/") || /\/HEAD$/i.test(branchName)) continue;
 		branches.push({
 			name: branchName,
 			hash: typeof hash === "string" && hash.trim() ? hash.trim() : void 0,
@@ -2086,11 +2201,12 @@ async function readDirectoryGitFileReview(cwd, path, previousPath) {
 	const normalizedPreviousPath = previousPath ? assertGitFilePath(previousPath) : void 0;
 	if (!normalizedCwd) return null;
 	if (!await isInsideWorkTree(normalizedCwd)) return null;
+	const [oldContent, newContent] = await Promise.all([readGitHeadFileContent(normalizedCwd, normalizedPreviousPath || normalizedPath), readWorktreeFileContent(normalizedCwd, normalizedPath)]);
 	return {
 		path: normalizedPath,
 		previousPath: normalizedPreviousPath,
-		oldContent: await readGitHeadFileContent(normalizedCwd, normalizedPreviousPath || normalizedPath),
-		newContent: await readWorktreeFileContent(normalizedCwd, normalizedPath)
+		oldContent,
+		newContent
 	};
 }
 async function readDirectoryGitFileDiff(cwd, path) {
@@ -2409,14 +2525,20 @@ async function readUnpushedCommitMessages(cwd) {
 	});
 	return result.code === 0 ? parseCommandLines(result.stdout, { trim: true }).filter(Boolean) : [];
 }
+async function runGitPushCommand(cwd, context) {
+	return await runCommand("git", context.force ? ["push", "--force-with-lease"] : ["push"], {
+		cwd,
+		timeoutMs: GIT_ACTION_TIMEOUT_MS
+	});
+}
 async function pushDirectoryGitChanges(cwd, { force = false } = {}) {
 	const normalizedCwd = normalizeGitCwd(cwd);
 	if (!normalizedCwd) throw new Error("cwd is required");
 	if (!await isInsideWorkTree(normalizedCwd)) throw new Error("No git repository detected");
 	const pushedCommitMessages = await readUnpushedCommitMessages(normalizedCwd);
-	const result = await runCommand("git", force ? ["push", "--force-with-lease"] : ["push"], {
-		cwd: normalizedCwd,
-		timeoutMs: GIT_ACTION_TIMEOUT_MS
+	const result = await runGitPushCommand(normalizedCwd, {
+		force,
+		pushedCommitMessages
 	});
 	if (result.code !== 0) throw new Error(gitCommandErrorMessage(force ? "Failed to force push changes" : "Failed to push changes", result));
 	invalidateDirectoryGitCaches(normalizedCwd);
@@ -2467,6 +2589,294 @@ async function checkoutDirectoryGitBranch(cwd, branch, options = {}) {
 		stderr: result.stderr
 	};
 }
+function gitCommitActionLabel(action) {
+	switch (action) {
+		case "checkout": return "checkout commit";
+		case "cherry-pick": return "cherry-pick commit";
+		case "revert": return "revert commit";
+		case "tag": return "tag commit";
+		case "reset": return "reset branch";
+		case "rebase": return "rebase branch";
+		case "drop": return "drop commit";
+		case "squash": return "squash commits";
+	}
+}
+function remoteBaseUrlFromGitUrl(remoteUrl) {
+	const trimmed = remoteUrl.trim();
+	if (!trimmed) return "";
+	const scpLikeMatch = trimmed.match(/^git@([^:]+):(.+)$/);
+	if (scpLikeMatch) {
+		const host = scpLikeMatch[1];
+		const path = scpLikeMatch[2]?.replace(/\.git$/i, "");
+		return host && path ? `https://${host}/${path}` : "";
+	}
+	try {
+		const url = new URL(trimmed);
+		if (url.protocol === "ssh:" && url.username === "git") return `https://${url.host}${url.pathname.replace(/\.git$/i, "")}`;
+		if (url.protocol === "http:" || url.protocol === "https:") {
+			url.username = "";
+			url.password = "";
+			url.pathname = url.pathname.replace(/\.git$/i, "");
+			url.search = "";
+			url.hash = "";
+			return url.toString().replace(/\/$/, "");
+		}
+	} catch {}
+	return "";
+}
+function commitUrlPathForHost(host, commit) {
+	return host.toLowerCase().includes("gitlab") ? `/-/commit/${commit}` : `/commit/${commit}`;
+}
+async function readPrimaryRemoteName(cwd) {
+	const branchResult = await runCommand("git", [
+		"symbolic-ref",
+		"--quiet",
+		"--short",
+		"HEAD"
+	], {
+		cwd,
+		timeoutMs: 1500
+	});
+	const branch = branchResult.code === 0 ? branchResult.stdout.trim() : "";
+	if (branch) {
+		const branchRemoteResult = await runCommand("git", [
+			"config",
+			"--get",
+			`branch.${branch}.remote`
+		], {
+			cwd,
+			timeoutMs: 1500
+		});
+		const branchRemote = branchRemoteResult.stdout.trim();
+		if (branchRemoteResult.code === 0 && branchRemote) return branchRemote;
+	}
+	const pushDefaultResult = await runCommand("git", [
+		"config",
+		"--get",
+		"remote.pushDefault"
+	], {
+		cwd,
+		timeoutMs: 1500
+	});
+	const pushDefault = pushDefaultResult.stdout.trim();
+	if (pushDefaultResult.code === 0 && pushDefault) return pushDefault;
+	return "origin";
+}
+async function readDirectoryGitCommitFiles(cwd, commit) {
+	const normalizedCwd = normalizeGitCwd(cwd);
+	const normalizedCommit = assertGitCommitHash(commit);
+	if (!normalizedCwd) return null;
+	if (!await isInsideWorkTree(normalizedCwd)) return null;
+	const [statusResult, numstatResult] = await Promise.all([runCommand("git", [
+		"show",
+		"--name-status",
+		"-z",
+		"--find-renames=50%",
+		"--format=",
+		normalizedCommit
+	], {
+		cwd: normalizedCwd,
+		timeoutMs: 1e4
+	}), runCommand("git", [
+		"show",
+		"--numstat",
+		"-z",
+		"--find-renames=50%",
+		"--format=",
+		normalizedCommit
+	], {
+		cwd: normalizedCwd,
+		timeoutMs: 1e4
+	})]);
+	if (statusResult.code !== 0) throw new Error(gitCommandErrorMessage("Failed to read commit files", statusResult));
+	if (numstatResult.code !== 0) throw new Error(gitCommandErrorMessage("Failed to read commit file stats", numstatResult));
+	const stats = parseGitNumstatEntries(numstatResult.stdout);
+	return parseGitNameStatusEntries(statusResult.stdout).map((file) => ({
+		...file,
+		...stats.get(file.path)
+	}));
+}
+async function readDirectoryGitCommitDiff(cwd, commit, mode = "commit", path, previousPath) {
+	const normalizedCwd = normalizeGitCwd(cwd);
+	const normalizedCommit = assertGitCommitHash(commit);
+	const normalizedPath = path ? assertGitFilePath(path) : void 0;
+	const normalizedPreviousPath = previousPath ? assertGitFilePath(previousPath) : void 0;
+	if (!normalizedCwd) return null;
+	if (!await isInsideWorkTree(normalizedCwd)) return null;
+	const pathArgs = normalizedPath ? ["--", ...uniqueGitActionPaths([normalizedPreviousPath, normalizedPath])] : [];
+	const result = await runCommand("git", mode === "head" ? [
+		"diff",
+		"--patch",
+		"--no-color",
+		"--no-ext-diff",
+		"--find-renames=50%",
+		`${normalizedCommit}..HEAD`,
+		...pathArgs
+	] : mode === "previous" ? [
+		"diff",
+		"--patch",
+		"--no-color",
+		"--no-ext-diff",
+		"--find-renames=50%",
+		`${normalizedCommit}^`,
+		normalizedCommit,
+		...pathArgs
+	] : [
+		"show",
+		"--patch",
+		"--no-color",
+		"--no-ext-diff",
+		"--find-renames=50%",
+		"--format=",
+		normalizedCommit,
+		...pathArgs
+	], {
+		cwd: normalizedCwd,
+		timeoutMs: 3e4
+	});
+	if (result.code !== 0) throw new Error(gitCommandErrorMessage("Failed to read commit diff", result));
+	const title = mode === "head" ? `${normalizedCommit.slice(0, 7)}..HEAD` : mode === "previous" ? `${normalizedCommit.slice(0, 7)}^..${normalizedCommit.slice(0, 7)}` : normalizedCommit.slice(0, 7);
+	return {
+		commit: normalizedCommit,
+		mode,
+		title: normalizedPath ? `${title}:${normalizedPath}` : title,
+		...normalizedPath ? { path: normalizedPath } : {},
+		...normalizedPreviousPath ? { previousPath: normalizedPreviousPath } : {},
+		patch: result.stdout.trim()
+	};
+}
+async function readDirectoryGitCommitRemoteUrl(cwd, commit) {
+	const normalizedCwd = normalizeGitCwd(cwd);
+	const normalizedCommit = assertGitCommitHash(commit);
+	if (!normalizedCwd) return null;
+	if (!await isInsideWorkTree(normalizedCwd)) return null;
+	const remoteResult = await runCommand("git", [
+		"remote",
+		"get-url",
+		await readPrimaryRemoteName(normalizedCwd)
+	], {
+		cwd: normalizedCwd,
+		timeoutMs: 1500
+	});
+	if (remoteResult.code !== 0 || !remoteResult.stdout.trim()) throw new Error("No remote URL found");
+	const baseUrl = remoteBaseUrlFromGitUrl(remoteResult.stdout);
+	if (!baseUrl) throw new Error("Remote URL cannot be opened in the browser");
+	return {
+		commit: normalizedCommit,
+		remoteUrl: `${baseUrl}${commitUrlPathForHost(new URL(baseUrl).host, normalizedCommit)}`
+	};
+}
+async function runDirectoryGitCommitAction(cwd, action, commit, options = {}) {
+	const normalizedCwd = normalizeGitCwd(cwd);
+	const normalizedCommit = assertGitCommitHash(commit);
+	if (!normalizedCwd) throw new Error("cwd is required");
+	if (!await isInsideWorkTree(normalizedCwd)) throw new Error("No git repository detected");
+	let result;
+	switch (action) {
+		case "checkout":
+			result = await runCommand("git", [
+				"switch",
+				"--detach",
+				normalizedCommit
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "cherry-pick":
+			result = await runCommand("git", ["cherry-pick", normalizedCommit], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "revert":
+			result = await runCommand("git", [
+				"revert",
+				"--no-edit",
+				normalizedCommit
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "tag":
+			result = await runCommand("git", [
+				"tag",
+				assertGitTagName(options.tagName || ""),
+				normalizedCommit
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "reset":
+			result = await runCommand("git", [
+				"reset",
+				`--${normalizeGitResetMode(options.resetMode)}`,
+				normalizedCommit
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "rebase":
+			result = await runCommand("git", ["rebase", normalizedCommit], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "drop":
+			result = await runCommand("git", [
+				"rebase",
+				"--onto",
+				`${normalizedCommit}^`,
+				normalizedCommit,
+				"HEAD"
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			break;
+		case "squash": {
+			const message = cleanupCommitMessageCandidate(options.message || "");
+			if (!message) throw new Error("commit message is required");
+			const resetResult = await runCommand("git", [
+				"reset",
+				"--soft",
+				normalizedCommit
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			if (resetResult.code !== 0) throw new Error(gitCommandErrorMessage("Failed to squash commits", resetResult));
+			if ((await runCommand("git", [
+				"diff",
+				"--cached",
+				"--quiet"
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: 5e3
+			})).code === 0) throw new Error("No commits after this commit to squash");
+			result = await runCommand("git", [
+				"commit",
+				"-m",
+				message
+			], {
+				cwd: normalizedCwd,
+				timeoutMs: GIT_ACTION_TIMEOUT_MS
+			});
+			result.stdout = [resetResult.stdout, result.stdout].filter(Boolean).join("\n");
+			result.stderr = [resetResult.stderr, result.stderr].filter(Boolean).join("\n");
+			break;
+		}
+	}
+	if (result.code !== 0) throw new Error(gitCommandErrorMessage(`Failed to ${gitCommitActionLabel(action)}`, result));
+	invalidateDirectoryGitCaches(normalizedCwd);
+	return {
+		stdout: result.stdout,
+		stderr: result.stderr
+	};
+}
 async function generateDirectoryGitCommitMessage(cwd, modelRegistry) {
 	const normalizedCwd = normalizeGitCwd(cwd);
 	if (!normalizedCwd) throw new Error("cwd is required");
@@ -2544,7 +2954,7 @@ async function generateDirectoryGitCommitMessage(cwd, modelRegistry) {
 			headers: auth.headers,
 			reasoningEffort: "low"
 		});
-		const message = cleanupCommitMessageCandidate(Array.isArray(response?.content) ? response.content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n") : "");
+		const message = cleanupCommitMessageCandidate(Array.isArray(response?.content) ? response.content.flatMap((block) => block?.type === "text" && typeof block.text === "string" ? [block.text] : []).join("\n") : "");
 		if (message) return {
 			message,
 			source: "ai"
@@ -2710,10 +3120,11 @@ var GitWatchManager = class {
 	}
 	async resolveDirectory(state) {
 		const generation = state.generation;
+		if (this.directories.get(state.cwd) !== state) return;
 		const repository = await resolveDirectoryGitRepository(state.cwd).catch(() => null);
+		if (!repository) return;
 		if (this.directories.get(state.cwd) !== state) return;
 		if (state.generation !== generation) return;
-		if (!repository) return;
 		const repoKey = repositoryWatchKey(repository);
 		state.repoKey = repoKey;
 		(this.repositories.get(repoKey) ?? this.createRepositoryWatch(repoKey, repository)).subscribers.add(state.cwd);
@@ -3067,6 +3478,7 @@ function getApiKeyProviderDisplayName(providerId) {
 	return API_KEY_LOGIN_PROVIDER_NAMES[providerId] ?? providerId;
 }
 var STATE_SYNC_SCALAR_FIELDS = [
+	"activationRevision",
 	"sessionKey",
 	"draft",
 	"streaming",
@@ -3144,7 +3556,10 @@ function sanitizeMessageContentPart(part) {
 function sanitizeSessionMessage(message) {
 	const role = typeof message?.role === "string" ? message.role : "";
 	const metadata = message?.metadata && typeof message.metadata === "object" ? message.metadata : void 0;
-	const sanitizedContent = Array.isArray(message?.content) ? message.content.map((part) => sanitizeMessageContentPart(part)).filter((part) => Boolean(part)) : typeof message?.content === "string" ? message.content : void 0;
+	const sanitizedContent = Array.isArray(message?.content) ? message.content.flatMap((part) => {
+		const sanitizedPart = sanitizeMessageContentPart(part);
+		return sanitizedPart ? [sanitizedPart] : [];
+	}) : typeof message?.content === "string" ? message.content : void 0;
 	return {
 		...role ? { role } : {},
 		...sanitizedContent !== void 0 ? { content: sanitizedContent } : {},
@@ -3216,10 +3631,11 @@ function createStateSyncPatch(previous, next) {
 	let changed = false;
 	const patch = {
 		type: "state_sync",
+		activationRevision: next.activationRevision,
 		sessionKey: next.sessionKey
 	};
 	for (const field of STATE_SYNC_SCALAR_FIELDS) {
-		if (field === "sessionKey") continue;
+		if (field === "activationRevision" || field === "sessionKey") continue;
 		const nextValue = next[field];
 		if (Object.is(previous.scalarValues[field], nextValue)) continue;
 		patch[field] = nextValue;
@@ -3254,17 +3670,17 @@ function createInitialUiState() {
 }
 function normalizePromptImages(rawImages) {
 	if (!Array.isArray(rawImages)) return [];
-	return rawImages.map((image) => {
-		if (!image || typeof image !== "object") return void 0;
+	return rawImages.flatMap((image) => {
+		if (!image || typeof image !== "object") return [];
 		const mimeType = typeof image.mimeType === "string" ? image.mimeType.trim() : "";
 		const data = typeof image.data === "string" ? image.data.trim() : "";
-		if (!mimeType || !/^image\//i.test(mimeType) || !data) return void 0;
-		return {
+		if (!mimeType || !/^image\//i.test(mimeType) || !data) return [];
+		return [{
 			type: "image",
 			mimeType,
 			data
-		};
-	}).filter((image) => Boolean(image)).slice(0, 8);
+		}];
+	}).slice(0, 8);
 }
 function serializeModel(model) {
 	if (!model) return void 0;
@@ -3317,6 +3733,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();
@@ -3471,7 +3888,10 @@ var PicoRuntime = class {
 		});
 	}
 	listAvailableModels(entry) {
-		return entry.services.modelRegistry.getAvailable().map((model) => serializeModel(model)).filter((model) => Boolean(model)).sort((left, right) => {
+		return entry.services.modelRegistry.getAvailable().flatMap((model) => {
+			const serializedModel = serializeModel(model);
+			return serializedModel ? [serializedModel] : [];
+		}).sort((left, right) => {
 			const providerCompare = (left.provider || "").localeCompare(right.provider || "");
 			if (providerCompare !== 0) return providerCompare;
 			return (left.name || left.id).localeCompare(right.name || right.id);
@@ -3491,6 +3911,8 @@ var PicoRuntime = class {
 		const next = {
 			id,
 			clients: /* @__PURE__ */ new Set(),
+			activeRevision: 0,
+			selectionNonce: 0,
 			activeKey: void 0,
 			draftKey: void 0,
 			sessionScope: process.cwd(),
@@ -3503,6 +3925,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;
 	}
@@ -3524,13 +3971,13 @@ var PicoRuntime = class {
 		return false;
 	}
 	async disposeUnreferencedSessionEntries() {
-		const candidates = [...this.sessionEntries.values()];
-		for (const entry of candidates) {
-			if (this.sessionEntries.get(entry.key) !== entry) continue;
-			if (this.isSessionEntryReferenced(entry)) continue;
-			if (this.isSessionBusyForDone(entry)) continue;
-			await this.disposeSessionEntry(entry);
-		}
+		const candidates = [...this.sessionEntries.values()].filter((entry) => {
+			if (this.sessionEntries.get(entry.key) !== entry) return false;
+			if (this.isSessionEntryReferenced(entry)) return false;
+			if (this.isSessionBusyForDone(entry)) return false;
+			return true;
+		});
+		await Promise.all(candidates.map((entry) => this.disposeSessionEntry(entry)));
 	}
 	async cleanupInactiveContexts() {
 		for (const context of this.contexts.values()) {
@@ -3579,11 +4026,12 @@ var PicoRuntime = class {
 		}
 		return lastValue;
 	}
-	currentStatePayload(entry) {
+	currentStatePayload(entry, context) {
 		const draft = this.isDraftEntry(entry);
 		const historyTotalCount = entry.session.messages.length;
 		return {
 			type: "state_sync",
+			activationRevision: context.activeRevision,
 			sessionKey: entry.key,
 			items: entry.retainedConversationItems,
 			pendingUserMessages: entry.pendingUserMessages.map((message) => clonePendingUserMessage(message)),
@@ -3647,13 +4095,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", {
@@ -3708,12 +4160,12 @@ var PicoRuntime = class {
 		});
 	}
 	async listEntriesForDirectory(allSessions, directoryPath) {
-		const sessions = allSessions.filter((entry) => entry.cwd === directoryPath).map((entry) => ({ ...entry }));
-		const byPath = new Map(sessions.filter((entry) => entry.path).map((entry) => [entry.path, entry]));
-		const byId = new Map(sessions.filter((entry) => entry.id).map((entry) => [entry.id, entry]));
-		for (const entry of this.sessionEntries.values()) {
-			if (entry.cwd !== directoryPath || !this.hasVisibleSessionContent(entry)) continue;
-			const fallback = await this.sessionFallbackInfo(entry);
+		const sessions = allSessions.flatMap((entry) => entry.cwd === directoryPath ? [{ ...entry }] : []);
+		const byPath = new Map(sessions.flatMap((entry) => entry.path ? [[entry.path, entry]] : []));
+		const byId = new Map(sessions.flatMap((entry) => entry.id ? [[entry.id, entry]] : []));
+		const fallbackEntries = [...this.sessionEntries.values()].filter((entry) => entry.cwd === directoryPath && this.hasVisibleSessionContent(entry));
+		const fallbacks = await Promise.all(fallbackEntries.map((entry) => this.sessionFallbackInfo(entry)));
+		for (const fallback of fallbacks) {
 			const existing = (fallback.path ? byPath.get(fallback.path) : void 0) || (fallback.id ? byId.get(fallback.id) : void 0);
 			if (existing) {
 				this.mergeSessionListEntry(existing, fallback);
@@ -3726,7 +4178,7 @@ var PicoRuntime = class {
 		return sessions.sort((left, right) => this.compareSessionListEntriesByLastUserMessage(left, right));
 	}
 	buildStreamingPaths() {
-		return new Set([...this.sessionEntries.values()].filter((entry) => this.getEntryStreamingState(entry)).map((entry) => this.getSessionPath(entry)));
+		return new Set([...this.sessionEntries.values()].flatMap((entry) => this.getEntryStreamingState(entry) ? [this.getSessionPath(entry)] : []));
 	}
 	async collectDirectoryEntries(allSessions, directories) {
 		const entriesByDirectory = /* @__PURE__ */ new Map();
@@ -3928,7 +4380,7 @@ var PicoRuntime = class {
 		if (!entry) return;
 		const startedAt = performance.now();
 		const payloadStartedAt = performance.now();
-		const payload = this.currentStatePayload(entry);
+		const payload = this.currentStatePayload(entry, context);
 		const payloadDurationMs = roundedDurationMs(payloadStartedAt);
 		let sentCount = 0;
 		for (const client of context.clients) if (this.sendStatePayloadToClient(context, client, payload, options)) sentCount += 1;
@@ -3986,6 +4438,24 @@ var PicoRuntime = class {
 		}
 		await Promise.all(connectedContexts.map((context) => this.sendSessionsToContext(context)));
 	}
+	async activateContextsSessionAndBroadcast(contexts, entry) {
+		await Promise.all(contexts.map((context) => this.activateContextSession(context, entry)));
+		await this.broadcastSessionsAll();
+	}
+	async bindSessionEntryAndBroadcast(entry) {
+		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()) {
@@ -4157,6 +4627,7 @@ var PicoRuntime = class {
 	async activateContextSession(context, entry, options) {
 		const previousActiveKey = context.activeKey;
 		const startedAt = performance.now();
+		context.activeRevision += 1;
 		await activateContextSession({
 			context,
 			entry,
@@ -4185,6 +4656,7 @@ var PicoRuntime = class {
 		this.syncGitWatchDirectories();
 		this.logSessionLoadDebug("context_session:activate", {
 			contextId: context.id,
+			activeRevision: context.activeRevision,
 			previousActiveKey,
 			notify: options?.notify !== false,
 			statusDurationMs,
@@ -4407,6 +4879,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(),
@@ -4423,7 +4896,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);
 	}
@@ -4609,25 +5084,26 @@ var PicoRuntime = class {
 	}
 	pendingMessagesFromClientUpdate(entry, pendingMessagesUpdate) {
 		const pendingMessages = entry.pendingUserMessages.map((message) => clonePendingUserMessage(message));
-		const normalizedUpdates = Array.isArray(pendingMessagesUpdate) ? pendingMessagesUpdate.map((message) => {
+		const normalizedUpdates = Array.isArray(pendingMessagesUpdate) ? pendingMessagesUpdate.flatMap((message) => {
+			const pendingId = typeof message?.pendingId === "string" ? message.pendingId : "";
+			if (!pendingId) return [];
 			const hasImages = hasOwnProperty(message, "images");
 			const hasText = hasOwnProperty(message, "text");
-			return {
-				pendingId: typeof message?.pendingId === "string" ? message.pendingId : "",
+			return [{
+				pendingId,
 				hasImages,
 				hasText,
 				images: hasImages ? normalizePromptImages(message?.images) : [],
 				streamingBehavior: normalizePendingStreamingBehavior(message?.streamingBehavior),
 				text: hasText && typeof message?.text === "string" ? message.text : ""
-			};
-		}).filter((message) => Boolean(message.pendingId)) : [];
-		if (normalizedUpdates.length !== pendingMessages.length) throw new Error("pendingMessages must include every pending prompt exactly once.");
+			}];
+		}) : [];
 		const pendingMessagesById = new Map(pendingMessages.map((message) => [message.pendingId, message]));
 		if (pendingMessagesById.size !== pendingMessages.length) throw new Error("Pending prompt order is out of date. Refresh and try again.");
 		const nextPendingMessages = [];
 		for (const update of normalizedUpdates) {
 			const existing = pendingMessagesById.get(update.pendingId);
-			if (!existing) throw new Error("pendingMessages must include every pending prompt exactly once.");
+			if (!existing) continue;
 			const text = update.hasText ? update.text : existing.text;
 			const images = update.hasImages ? update.images : existing.images;
 			if (!text.trim() && images.length === 0) throw new Error("Pending prompt text or image is required.");
@@ -4642,23 +5118,30 @@ var PicoRuntime = class {
 		if (pendingMessagesById.size > 0) throw new Error("pendingMessages must include every pending prompt exactly once.");
 		return sortPendingUserMessages(nextPendingMessages);
 	}
+	async replayPendingUserMessages(entry, pendingMessages, index = 0) {
+		const pendingMessage = pendingMessages[index];
+		if (!pendingMessage) return;
+		const text = pendingMessage.text;
+		const images = normalizePromptImages(pendingMessage.images);
+		if (text.trim() || images.length > 0) await entry.session.prompt(text, {
+			...images.length > 0 ? { images } : {},
+			streamingBehavior: pendingMessage.streamingBehavior
+		});
+		await this.replayPendingUserMessages(entry, pendingMessages, index + 1);
+	}
 	async replacePendingUserMessages(entry, pendingMessages) {
 		const nextPending = sortPendingUserMessages(pendingMessages);
 		const canReplayPending = Boolean(entry.session.isStreaming);
-		if (!canReplayPending && nextPending.length > 0) throw new Error("Pending prompts can only be changed while the session is streaming.");
+		if (!canReplayPending) {
+			entry.pendingUserMessages = nextPending;
+			await this.broadcastEntryState(entry);
+			return entry.pendingUserMessages;
+		}
 		entry.pendingQueueMutation = true;
 		try {
 			entry.session.clearQueue();
 			entry.pendingUserMessages = [];
-			if (canReplayPending) for (const pendingMessage of nextPending) {
-				const text = pendingMessage.text;
-				const images = normalizePromptImages(pendingMessage.images);
-				if (!text.trim() && images.length === 0) continue;
-				await entry.session.prompt(text, {
-					...images.length > 0 ? { images } : {},
-					streamingBehavior: pendingMessage.streamingBehavior
-				});
-			}
+			if (canReplayPending) await this.replayPendingUserMessages(entry, nextPending);
 			entry.pendingUserMessages = nextPending;
 			this.reconcilePendingUserMessages(entry);
 		} finally {
@@ -4779,11 +5262,9 @@ var PicoRuntime = class {
 						sessionId: void 0,
 						sessionFile: void 0
 					};
-					for (const context of viewers()) {
-						context.draftKey = result.entry.key;
-						await this.activateContextSession(context, result.entry);
-					}
-					await this.broadcastSessionsAll();
+					const activeViewers = viewers();
+					for (const context of activeViewers) context.draftKey = result.entry.key;
+					await this.activateContextsSessionAndBroadcast(activeViewers, result.entry);
 					return {
 						sessionId: void 0,
 						sessionFile: void 0
@@ -4793,22 +5274,19 @@ var PicoRuntime = class {
 					const branchedPath = session.sessionManager.createBranchedSession?.(branchEntryId);
 					if (!branchedPath) return { cancelled: true };
 					const nextEntry = await this.ensureSessionEntryByPath(branchedPath);
-					for (const context of viewers()) await this.activateContextSession(context, nextEntry);
-					await this.broadcastSessionsAll();
+					await this.activateContextsSessionAndBroadcast(viewers(), nextEntry);
 					return {
 						sessionId: nextEntry.session.sessionId,
 						sessionFile: nextEntry.session.sessionFile
 					};
 				},
 				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)
@@ -4825,8 +5303,7 @@ var PicoRuntime = class {
 						sessionId: entry.session.sessionId,
 						sessionFile: entry.session.sessionFile
 					};
-					for (const context of viewers()) await this.activateContextSession(context, nextEntry);
-					await this.broadcastSessionsAll();
+					await this.activateContextsSessionAndBroadcast(viewers(), nextEntry);
 					return {
 						sessionId: nextEntry.session.sessionId,
 						sessionFile: nextEntry.session.sessionFile
@@ -4834,9 +5311,7 @@ var PicoRuntime = class {
 				},
 				reload: async () => {
 					await session.reload?.();
-					await this.bindSessionEntry(entry);
-					await this.broadcastEntryState(entry);
-					await this.broadcastSessionsAll();
+					await this.bindSessionEntryAndBroadcast(entry);
 				}
 			},
 			shutdownHandler: () => {
@@ -4938,6 +5413,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();
@@ -4995,12 +5471,13 @@ var PicoRuntime = class {
 					const bootstrapStartedAt = performance.now();
 					try {
 						const stateStartedAt = performance.now();
-						this.sendStatePayloadToClient(context, client, this.currentStatePayload(activeEntry), { 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();
@@ -5162,7 +5639,6 @@ var PicoRuntime = class {
 		const pendingMessages = Array.isArray(body.pendingMessages) ? body.pendingMessages : Array.isArray(body.pendingIds) ? body.pendingIds.map((pendingId) => ({ pendingId })) : null;
 		if (!pendingMessages) throw new Error("pendingMessages must be an array");
 		const nextPendingMessages = this.pendingMessagesFromClientUpdate(activeEntry, pendingMessages);
-		if (!activeEntry.session.isStreaming && nextPendingMessages.length > 0) throw new Error("Pending prompts can only be changed while the session is streaming.");
 		await this.replacePendingUserMessages(activeEntry, nextPendingMessages);
 		return {
 			ok: true,
@@ -5181,7 +5657,9 @@ var PicoRuntime = class {
 		const pendingMessages = activeEntry.pendingUserMessages.map((message) => clonePendingUserMessage(message));
 		const pendingIndex = pendingMessages.findIndex((message) => message.pendingId === pendingId);
 		if (pendingIndex === -1) {
-			if (normalizeClientPendingId(pendingId)) {
+			const isKnownClientPendingId = Boolean(normalizeClientPendingId(pendingId));
+			const isKnownServerPendingId = pendingId.startsWith("pending:");
+			if (isKnownClientPendingId || isKnownServerPendingId) {
 				activeEntry.canceledPendingUserMessageIds.add(pendingId);
 				return {
 					ok: true,
@@ -5192,7 +5670,6 @@ var PicoRuntime = class {
 		}
 		activeEntry.canceledPendingUserMessageIds.delete(pendingId);
 		pendingMessages.splice(pendingIndex, 1);
-		if (!activeEntry.session.isStreaming && pendingMessages.length > 0) throw new Error("Pending prompts can only be changed while the session is streaming.");
 		await this.replacePendingUserMessages(activeEntry, pendingMessages);
 		return {
 			ok: true,
@@ -5232,11 +5709,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 {
@@ -5252,6 +5734,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", {
@@ -5332,7 +5834,10 @@ var PicoRuntime = class {
 		return {
 			leafId,
 			streamingEntryId,
-			tree: (manager.getTree() || []).map((node) => serializeSessionTreeNode(node)).filter((node) => Boolean(node)).map((node) => markStreamingNode(node))
+			tree: (manager.getTree() || []).flatMap((node) => {
+				const treeNode = serializeSessionTreeNode(node);
+				return treeNode ? [markStreamingNode(treeNode)] : [];
+			})
 		};
 	}
 	async getSessionTreeForRequest(request) {
@@ -5372,6 +5877,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,
@@ -5380,11 +5886,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),
@@ -5532,6 +6035,27 @@ var PicoRuntime = class {
 			name: nextName
 		};
 	}
+	async setSessionReadState(request, body) {
+		const { context } = await this.resolveRequest(request);
+		const sessionPath = typeof body.path === "string" ? body.path.trim() : "";
+		const unread = typeof body.unread === "boolean" ? body.unread : false;
+		if (!sessionPath) throw new Error("path is required");
+		if (unread) context.unreadFinished.add(sessionPath);
+		else context.unreadFinished.delete(sessionPath);
+		const loadedEntry = [...this.sessionEntries.values()].find((entry) => this.getSessionPath(entry) === sessionPath);
+		if (loadedEntry) this.sendSessionStatusToContext(context, loadedEntry);
+		else this.sendToContext(context, {
+			type: "session_status",
+			sessionPath,
+			unread
+		});
+		await this.sendSessionsToContext(context);
+		return {
+			ok: true,
+			path: sessionPath,
+			unread
+		};
+	}
 	async writeMovedSessionFile(sessionPath, nextCwd, targetSessionDirectory) {
 		const sourcePath = resolve(sessionPath);
 		const targetPath = resolve(await uniqueSessionMovePath(sourcePath, targetSessionDirectory));
@@ -5563,20 +6087,23 @@ var PicoRuntime = class {
 		const previousPath = resolve(sessionPath);
 		const previousEntry = loadedEntries[0];
 		const previousCwd = previousEntry?.cwd || "";
-		const affectedContexts = [...this.contexts.values()].map((context) => ({
-			context,
-			wasActive: loadedEntries.some((entry) => context.activeKey === entry.key),
-			wasDraft: loadedEntries.some((entry) => context.draftKey === entry.key)
-		})).filter((entry) => entry.wasActive || entry.wasDraft);
+		const affectedContexts = [...this.contexts.values()].flatMap((context) => {
+			const wasActive = loadedEntries.some((entry) => context.activeKey === entry.key);
+			const wasDraft = loadedEntries.some((entry) => context.draftKey === entry.key);
+			return wasActive || wasDraft ? [{
+				context,
+				wasActive,
+				wasDraft
+			}] : [];
+		});
 		const nextPath = await this.writeMovedSessionFile(previousPath, nextCwd, targetSessionDirectory);
-		for (const loadedEntry of loadedEntries) await this.disposeSessionEntry(loadedEntry);
+		await Promise.all(loadedEntries.map((loadedEntry) => this.disposeSessionEntry(loadedEntry)));
 		let nextEntry;
 		if (affectedContexts.some((entry) => entry.wasActive)) {
 			nextEntry = await this.ensureSessionEntryByPath(nextPath);
-			for (const affected of affectedContexts) {
-				if (affected.wasDraft) affected.context.draftKey = void 0;
-				if (affected.wasActive) await this.activateContextSession(affected.context, nextEntry, { refreshSessions: false });
-			}
+			const activeNextEntry = nextEntry;
+			for (const affected of affectedContexts) if (affected.wasDraft) affected.context.draftKey = void 0;
+			await Promise.all(affectedContexts.flatMap((affected) => affected.wasActive ? [this.activateContextSession(affected.context, activeNextEntry, { refreshSessions: false })] : []));
 		} else for (const affected of affectedContexts) if (affected.wasDraft) affected.context.draftKey = void 0;
 		for (const context of this.contexts.values()) if (context.unreadFinished.delete(previousPath)) context.unreadFinished.add(nextPath);
 		this.invalidateSessionIndexCache();
@@ -5621,21 +6148,20 @@ var PicoRuntime = class {
 		const allSessions = await this.listSessionIndexEntries();
 		const directorySessions = await this.listEntriesForDirectory(allSessions, directory);
 		const streamingPaths = this.buildStreamingPaths();
-		const activeKeys = new Set([...this.contexts.values()].map((ctx) => ctx.activeKey).filter(Boolean));
-		const activePaths = new Set([...this.sessionEntries.values()].filter((entry) => activeKeys.has(entry.key)).map((entry) => this.getSessionPath(entry)));
+		const activeKeys = new Set([...this.contexts.values()].flatMap((ctx) => ctx.activeKey ? [ctx.activeKey] : []));
+		const activePaths = new Set([...this.sessionEntries.values()].flatMap((entry) => activeKeys.has(entry.key) ? [this.getSessionPath(entry)] : []));
 		const includeActiveSession = body.includeActiveSession === true;
-		const matchingSessions = directorySessions.map((entry) => {
+		const matchingSessions = directorySessions.flatMap((entry) => {
 			const activityAt = normalizeModifiedTimestamp(entry.lastUserMessageAt) || normalizeModifiedTimestamp(entry.modified);
-			return {
+			const serializedEntry = {
 				...this.serializeSessionListEntry(entry, context, streamingPaths),
 				activityAt
 			};
-		}).filter((entry) => {
-			if (!entry.path) return false;
-			if (streamingPaths.has(entry.path)) return false;
-			if (!includeActiveSession && activePaths.has(entry.path)) return false;
-			const activityTime = modifiedTimestampValue(entry.activityAt);
-			return activityTime > 0 && activityTime < cutoffTime;
+			if (!serializedEntry.path) return [];
+			if (streamingPaths.has(serializedEntry.path)) return [];
+			if (!includeActiveSession && activePaths.has(serializedEntry.path)) return [];
+			const activityTime = modifiedTimestampValue(serializedEntry.activityAt);
+			return activityTime > 0 && activityTime < cutoffTime ? [serializedEntry] : [];
 		});
 		if (body.dryRun !== false) return {
 			ok: true,
@@ -5645,10 +6171,10 @@ var PicoRuntime = class {
 			deletedSessionIds: [],
 			matchingSessions
 		};
-		const deletedSessionIds = matchingSessions.map((session) => session.id).filter((id) => Boolean(id));
-		const matchingPaths = matchingSessions.map((session) => session.path).filter((path) => Boolean(path));
+		const deletedSessionIds = matchingSessions.flatMap((session) => session.id ? [session.id] : []);
+		const matchingPaths = matchingSessions.flatMap((session) => session.path ? [session.path] : []);
 		const matchingPathSet = new Set(matchingPaths);
-		await Promise.all([...this.sessionEntries.values()].filter((entry) => matchingPathSet.has(this.getSessionPath(entry))).map((entry) => this.disposeSessionEntry(entry)));
+		await Promise.all([...this.sessionEntries.values()].flatMap((entry) => matchingPathSet.has(this.getSessionPath(entry)) ? [this.disposeSessionEntry(entry)] : []));
 		for (const ctx of this.contexts.values()) for (const sessionPath of matchingPaths) ctx.unreadFinished.delete(sessionPath);
 		await Promise.all(matchingPaths.map((sessionPath) => this.trashOrDeleteSessionFile(sessionPath)));
 		this.invalidateSessionIndexCache();
@@ -5664,23 +6190,32 @@ var PicoRuntime = class {
 	}
 	async deleteSessions(request, body) {
 		const { context } = await this.resolveRequest(request);
-		const paths = Array.isArray(body.paths) ? body.paths.filter((path) => typeof path === "string").map((path) => path.trim()).filter(Boolean) : [];
+		const paths = Array.isArray(body.paths) ? body.paths.flatMap((path) => {
+			if (typeof path !== "string") return [];
+			const trimmedPath = path.trim();
+			return trimmedPath ? [trimmedPath] : [];
+		}) : [];
 		const sessionPaths = [...new Set(paths)];
 		if (sessionPaths.length === 0) throw new Error("paths are required");
 		const sessionPathSet = new Set(sessionPaths);
 		const loadedEntries = [...this.sessionEntries.values()].filter((entry) => sessionPathSet.has(this.getSessionPath(entry)));
-		let replacementEntry;
-		for (const loadedEntry of loadedEntries) {
+		const replacementRequests = loadedEntries.flatMap((loadedEntry) => {
 			const affectedContexts = [...this.contexts.values()].filter((ctx) => ctx.activeKey === loadedEntry.key);
-			if (affectedContexts.length > 0) {
-				const nextReplacementEntry = await this.createNewSessionEntry(loadedEntry.cwd, { draft: true });
-				replacementEntry = replacementEntry ?? nextReplacementEntry;
-				for (const affected of affectedContexts) {
-					affected.draftKey = nextReplacementEntry.key;
-					await this.activateContextSession(affected, nextReplacementEntry);
-				}
-			}
+			return affectedContexts.length > 0 ? [{
+				affectedContexts,
+				cwd: loadedEntry.cwd
+			}] : [];
+		});
+		const replacementResults = await Promise.all(replacementRequests.map(async (request) => ({
+			affectedContexts: request.affectedContexts,
+			entry: await this.createNewSessionEntry(request.cwd, { draft: true })
+		})));
+		let replacementEntry;
+		for (const result of replacementResults) {
+			replacementEntry = replacementEntry ?? result.entry;
+			for (const affected of result.affectedContexts) affected.draftKey = result.entry.key;
 		}
+		await Promise.all(replacementResults.flatMap((result) => result.affectedContexts.map((affected) => this.activateContextSession(affected, result.entry))));
 		for (const ctx of this.contexts.values()) for (const sessionPath of sessionPaths) ctx.unreadFinished.delete(sessionPath);
 		await Promise.all(loadedEntries.map((entry) => this.disposeSessionEntry(entry)));
 		await Promise.all(sessionPaths.map((sessionPath) => this.trashOrDeleteSessionFile(sessionPath)));
@@ -5742,15 +6277,15 @@ var PicoRuntime = class {
 			authType: "oauth",
 			...authStatus(provider.id)
 		})).sort((left, right) => left.name.localeCompare(right.name));
-		const apiKeyOptions = Array.from(providerIds).filter((providerId) => {
-			if (BUILT_IN_API_KEY_LOGIN_PROVIDERS.has(providerId)) return true;
-			return !oauthProviderIds.has(providerId);
-		}).map((providerId) => ({
-			id: providerId,
-			name: getApiKeyProviderDisplayName(providerId),
-			authType: "api_key",
-			...authStatus(providerId)
-		})).sort((left, right) => left.name.localeCompare(right.name));
+		const apiKeyOptions = Array.from(providerIds).flatMap((providerId) => {
+			if (!BUILT_IN_API_KEY_LOGIN_PROVIDERS.has(providerId) && oauthProviderIds.has(providerId)) return [];
+			return [{
+				id: providerId,
+				name: getApiKeyProviderDisplayName(providerId),
+				authType: "api_key",
+				...authStatus(providerId)
+			}];
+		}).sort((left, right) => left.name.localeCompare(right.name));
 		const nameByProvider = new Map([...oauthOptions, ...apiKeyOptions].map((option) => [option.id, option.name]));
 		const authTypeByProvider = new Map([...oauthOptions, ...apiKeyOptions].map((option) => [option.id, option.authType]));
 		return {
@@ -5997,14 +6532,14 @@ var PicoRuntime = class {
 			pending.resolve({ cancelled: true });
 		} catch {}
 		this.pendingUiRequests.clear();
-		for (const entry of this.sessionEntries.values()) await this.disposeSessionEntry(entry);
+		await Promise.all([...this.sessionEntries.values()].map((entry) => this.disposeSessionEntry(entry)));
 	}
 };
 function getPicoRuntime() {
 	globalThis.__picoRuntime ??= new PicoRuntime();
 	return globalThis.__picoRuntime;
 }
-var Route$47 = createFileRoute("/events")({ server: { handlers: { GET: ({ request }) => getPicoRuntime().createEventsResponse(request) } } });
+var Route$52 = createFileRoute("/events")({ server: { handlers: { GET: ({ request }) => getPicoRuntime().createEventsResponse(request) } } });
 function jsonResponse(data, init = 200) {
 	const responseInit = typeof init === "number" ? { status: init } : init;
 	const headers = new Headers(responseInit.headers);
@@ -6040,7 +6575,7 @@ function routeErrorResponse(error, fallbackMessage) {
 async function readRequestJson(request) {
 	return await request.json().catch(() => ({}));
 }
-var Route$46 = createFileRoute("/api/thinking")({ server: { handlers: { POST: async ({ request }) => {
+var Route$51 = createFileRoute("/api/thinking")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().setThinking(request, body));
@@ -6048,7 +6583,7 @@ var Route$46 = createFileRoute("/api/thinking")({ server: { handlers: { POST: as
 		return routeErrorResponse(error, "Failed to update thinking level");
 	}
 } } } });
-var Route$45 = createFileRoute("/api/slash-command")({ server: { handlers: { POST: async ({ request }) => {
+var Route$50 = createFileRoute("/api/slash-command")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().runSlashCommand(request, body));
@@ -6056,7 +6591,7 @@ var Route$45 = createFileRoute("/api/slash-command")({ server: { handlers: { POS
 		return routeErrorResponse(error, "Failed to run slash command");
 	}
 } } } });
-var Route$44 = createFileRoute("/api/provider-usage")({ server: { handlers: { GET: async ({ request }) => {
+var Route$49 = createFileRoute("/api/provider-usage")({ server: { handlers: { GET: async ({ request }) => {
 	const provider = new URL(request.url).searchParams.get("provider") || void 0;
 	try {
 		return jsonResponse({
@@ -6067,7 +6602,7 @@ var Route$44 = createFileRoute("/api/provider-usage")({ server: { handlers: { GE
 		return routeErrorResponse(error, "Failed to read provider usage");
 	}
 } } } });
-var Route$43 = createFileRoute("/api/prompt")({ server: { handlers: { POST: async ({ request }) => {
+var Route$48 = createFileRoute("/api/prompt")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().prompt(request, body));
@@ -6097,6 +6632,9 @@ var DIRECTORY_SEARCH_IGNORE_DIRECTORIES = new Set([
 function displayPath(value = "") {
 	return String(value).replace(/\\/g, "/");
 }
+function projectPathTextContains(text, query) {
+	return text.indexOf(query) >= 0;
+}
 function expandHomeDirectory(inputPath) {
 	if (inputPath === "~") return os.homedir();
 	if (inputPath.startsWith("~/")) return `${os.homedir()}${inputPath.slice(1)}`;
@@ -6165,13 +6703,12 @@ async function listPathCompletionEntries(prefix, baseCwd) {
 		return [];
 	}
 	const normalizedSearchPrefix = searchPrefix.toLowerCase();
-	const suggestions = [];
-	for (const entry of entries) {
-		if (!entry.name.toLowerCase().startsWith(normalizedSearchPrefix)) continue;
+	const matchingEntries = entries.filter((entry) => entry.name.toLowerCase().startsWith(normalizedSearchPrefix));
+	const suggestions = await Promise.all(matchingEntries.map(async (entry) => {
 		const isDirectory = await completionEntryIsDirectory(entry, join(searchDir, entry.name));
 		let completionPath;
 		if (displayPrefix.endsWith("/") || displayPrefix.endsWith("\\")) completionPath = `${displayPrefix}${entry.name}`;
-		else if (displayPrefix.includes("/") || displayPrefix.includes("\\")) if (displayPrefix === "~") completionPath = `~/${entry.name}`;
+		else if (projectPathTextContains(displayPrefix, "/") || projectPathTextContains(displayPrefix, "\\")) if (displayPrefix === "~") completionPath = `~/${entry.name}`;
 		else if (displayPrefix.startsWith("~/")) {
 			const parentDir = dirname(displayPrefix.slice(2));
 			completionPath = parentDir === "." ? `~/${entry.name}` : `~/${displayPath(parentDir)}/${entry.name}`;
@@ -6184,13 +6721,12 @@ async function listPathCompletionEntries(prefix, baseCwd) {
 		}
 		else if (displayPrefix.startsWith("~")) completionPath = `~/${entry.name}`;
 		else completionPath = entry.name;
-		const value = isDirectory ? `${displayPath(completionPath)}/` : displayPath(completionPath);
-		suggestions.push({
-			value,
+		return {
+			value: isDirectory ? `${displayPath(completionPath)}/` : displayPath(completionPath),
 			label: `${entry.name}${isDirectory ? "/" : ""}`,
 			isDirectory
-		});
-	}
+		};
+	}));
 	suggestions.sort((left, right) => {
 		if (left.isDirectory && !right.isDirectory) return -1;
 		if (!left.isDirectory && right.isDirectory) return 1;
@@ -6257,7 +6793,7 @@ async function runFdSearch(command, args) {
 				const displayedLine = displayPath(line);
 				const hasTrailingSeparator = displayedLine.endsWith("/");
 				const normalizedPath = hasTrailingSeparator ? displayedLine.slice(0, -1) : displayedLine;
-				if (normalizedPath === ".git" || normalizedPath.startsWith(".git/") || normalizedPath.includes("/.git/")) continue;
+				if (normalizedPath === ".git" || normalizedPath.startsWith(".git/") || projectPathTextContains(normalizedPath, "/.git/")) continue;
 				results.push({
 					path: displayedLine,
 					isDirectory: hasTrailingSeparator
@@ -6267,52 +6803,72 @@ async function runFdSearch(command, args) {
 		});
 	});
 }
+async function runFdSearchCandidates(args) {
+	return (await Promise.all(["fd", "fdfind"].map((command) => runFdSearch(command, args)))).find((result) => result !== void 0);
+}
 function escapePathQueryRegex(value = "") {
 	return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function buildFdPathQuery(query = "") {
 	const normalized = displayPath(query);
-	if (!normalized.includes("/")) return normalized;
+	if (!projectPathTextContains(normalized, "/")) return normalized;
 	const hasTrailingSeparator = normalized.endsWith("/");
 	const trimmed = normalized.replace(/^\/+|\/+$/g, "");
 	if (!trimmed) return normalized;
 	const separatorPattern = "[\\\\/]";
-	const segments = trimmed.split("/").filter(Boolean).map((segment) => escapePathQueryRegex(segment));
+	const segments = trimmed.split("/").flatMap((segment) => segment ? [escapePathQueryRegex(segment)] : []);
 	if (segments.length === 0) return normalized;
 	let pattern = segments.join(separatorPattern);
 	if (hasTrailingSeparator) pattern += separatorPattern;
 	return pattern;
 }
+async function readDirectoryEntries(directory) {
+	try {
+		return await readdir(directory, {
+			withFileTypes: true,
+			encoding: "utf8"
+		});
+	} catch {
+		return [];
+	}
+}
+async function walkDirectoryFallbackLayer({ baseDir, normalizedQuery, currentDirs, matches, maxResults }) {
+	if (currentDirs.length === 0 || matches.length >= maxResults) return;
+	const directoryEntries = await Promise.all(currentDirs.map(async (currentDir) => ({
+		currentDir,
+		entries: await readDirectoryEntries(currentDir)
+	})));
+	const nextDirs = [];
+	for (const { currentDir, entries } of directoryEntries) for (const entry of entries) {
+		if (matches.length >= maxResults) break;
+		if (WALK_IGNORE_DIRECTORIES.has(entry.name)) continue;
+		const fullPath = join(currentDir, entry.name);
+		const relativePath = displayPath(path.relative(baseDir, fullPath));
+		const isDirectory = entry.isDirectory();
+		const displayValue = isDirectory ? `${relativePath}/` : relativePath;
+		if (!normalizedQuery || projectPathTextContains(displayValue.toLowerCase(), normalizedQuery)) matches.push({
+			path: displayValue,
+			isDirectory
+		});
+		if (isDirectory) nextDirs.push(fullPath);
+	}
+	await walkDirectoryFallbackLayer({
+		baseDir,
+		normalizedQuery,
+		currentDirs: nextDirs,
+		matches,
+		maxResults
+	});
+}
 async function walkDirectoryWithFallback(baseDir, query = "", maxResults = 100) {
-	const queue = [baseDir];
 	const matches = [];
-	const normalizedQuery = displayPath(query).toLowerCase();
-	while (queue.length > 0 && matches.length < maxResults) {
-		const currentDir = queue.shift();
-		if (!currentDir) continue;
-		let entries;
-		try {
-			entries = await readdir(currentDir, {
-				withFileTypes: true,
-				encoding: "utf8"
-			});
-		} catch {
-			continue;
-		}
-		for (const entry of entries) {
-			if (matches.length >= maxResults) break;
-			if (WALK_IGNORE_DIRECTORIES.has(entry.name)) continue;
-			const fullPath = join(currentDir, entry.name);
-			const relativePath = displayPath(path.relative(baseDir, fullPath));
-			const isDirectory = entry.isDirectory();
-			const displayValue = isDirectory ? `${relativePath}/` : relativePath;
-			if (!normalizedQuery || displayValue.toLowerCase().includes(normalizedQuery)) matches.push({
-				path: displayValue,
-				isDirectory
-			});
-			if (isDirectory) queue.push(fullPath);
-		}
-	}
+	await walkDirectoryFallbackLayer({
+		baseDir,
+		normalizedQuery: displayPath(query).toLowerCase(),
+		currentDirs: [baseDir],
+		matches,
+		maxResults
+	});
 	return matches;
 }
 async function walkDirectory(baseDir, query = "", maxResults = 100) {
@@ -6345,10 +6901,8 @@ async function walkDirectory(baseDir, query = "", maxResults = 100) {
 		"node_modules"
 	];
 	if (query) args.push(buildFdPathQuery(query));
-	for (const command of ["fd", "fdfind"]) {
-		const results = await runFdSearch(command, args);
-		if (results !== void 0) return results;
-	}
+	const results = await runFdSearchCandidates(args);
+	if (results !== void 0) return results;
 	return await walkDirectoryWithFallback(baseDir, query, maxResults);
 }
 async function resolveScopedFileReferenceQuery(rawQuery, baseCwd) {
@@ -6394,7 +6948,11 @@ function resolveProjectFilePath(baseCwd, filePath) {
 	};
 }
 async function listProjectFileTreePaths(baseCwd) {
-	return (await walkDirectory(baseCwd, "", PROJECT_FILE_TREE_LIMIT)).filter((entry) => !entry.isDirectory).map((entry) => displayPath(entry.path).replace(/\/+$/g, "")).filter(Boolean).sort((left, right) => left.localeCompare(right));
+	return (await walkDirectory(baseCwd, "", PROJECT_FILE_TREE_LIMIT)).flatMap((entry) => {
+		if (entry.isDirectory) return [];
+		const path = displayPath(entry.path).replace(/\/+$/g, "");
+		return path ? [path] : [];
+	}).sort((left, right) => left.localeCompare(right));
 }
 async function readProjectFileContent(baseCwd, filePath) {
 	const resolved = resolveProjectFilePath(baseCwd, filePath);
@@ -6423,46 +6981,54 @@ function directorySearchScore({ absolutePath, query, root }) {
 	if (score === 0) return 0;
 	return score - depth * 5;
 }
+async function searchDirectoriesFallbackLayer({ root, normalizedQuery, currentDirectories, results, maxResults }) {
+	const eligibleDirectories = currentDirectories.filter((current) => current.depth < DIRECTORY_SEARCH_MAX_DEPTH);
+	if (eligibleDirectories.length === 0 || results.length >= maxResults) return;
+	const directoryEntries = await Promise.all(eligibleDirectories.map(async (current) => ({
+		current,
+		entries: await readDirectoryEntries(current.directory)
+	})));
+	const nextDirectories = [];
+	for (const { current, entries } of directoryEntries) for (const entry of entries) {
+		if (results.length >= maxResults) break;
+		if (!entry.isDirectory()) continue;
+		if (DIRECTORY_SEARCH_IGNORE_DIRECTORIES.has(entry.name)) continue;
+		if (!normalizedQuery.startsWith(".") && entry.name.startsWith(".")) continue;
+		const fullPath = join(current.directory, entry.name);
+		const relativePath = `${displayPath(path.relative(root, fullPath))}/`;
+		if (projectPathTextContains(relativePath.toLowerCase(), normalizedQuery)) results.push({
+			path: relativePath,
+			isDirectory: true
+		});
+		nextDirectories.push({
+			directory: fullPath,
+			depth: current.depth + 1
+		});
+	}
+	await searchDirectoriesFallbackLayer({
+		root,
+		normalizedQuery,
+		currentDirectories: nextDirectories,
+		results,
+		maxResults
+	});
+}
 async function searchDirectoriesWithFallback({ root, query, maxResults }) {
-	const normalizedQuery = query.trim().toLowerCase();
 	const results = [];
-	const queue = [{
-		directory: root,
-		depth: 0
-	}];
-	while (queue.length > 0 && results.length < maxResults) {
-		const current = queue.shift();
-		if (!current || current.depth >= DIRECTORY_SEARCH_MAX_DEPTH) continue;
-		let entries;
-		try {
-			entries = await readdir(current.directory, {
-				withFileTypes: true,
-				encoding: "utf8"
-			});
-		} catch {
-			continue;
-		}
-		for (const entry of entries) {
-			if (results.length >= maxResults) break;
-			if (!entry.isDirectory()) continue;
-			if (DIRECTORY_SEARCH_IGNORE_DIRECTORIES.has(entry.name)) continue;
-			if (!normalizedQuery.startsWith(".") && entry.name.startsWith(".")) continue;
-			const fullPath = join(current.directory, entry.name);
-			const relativePath = `${displayPath(path.relative(root, fullPath))}/`;
-			if (relativePath.toLowerCase().includes(normalizedQuery)) results.push({
-				path: relativePath,
-				isDirectory: true
-			});
-			queue.push({
-				directory: fullPath,
-				depth: current.depth + 1
-			});
-		}
-	}
+	await searchDirectoriesFallbackLayer({
+		root,
+		normalizedQuery: query.trim().toLowerCase(),
+		currentDirectories: [{
+			directory: root,
+			depth: 0
+		}],
+		results,
+		maxResults
+	});
 	return results;
 }
 async function searchDirectoriesInRoot({ root, query, maxResults }) {
-	const args = [
+	const results = await runFdSearchCandidates([
 		"--base-directory",
 		root,
 		"--max-depth",
@@ -6498,11 +7064,8 @@ async function searchDirectoriesInRoot({ root, query, maxResults }) {
 		"--exclude",
 		"node_modules",
 		buildFdPathQuery(query)
-	];
-	for (const command of ["fd", "fdfind"]) {
-		const results = await runFdSearch(command, args);
-		if (results !== void 0) return results.filter((entry) => entry.isDirectory);
-	}
+	]);
+	if (results !== void 0) return results.filter((entry) => entry.isDirectory);
 	return await searchDirectoriesWithFallback({
 		root,
 		query,
@@ -6521,37 +7084,40 @@ async function searchDirectoryEntries(query, baseCwd) {
 	if (baseCwd && !pathIsInside(baseCwd, homeDirectory)) roots.push(baseCwd);
 	const seen = /* @__PURE__ */ new Set();
 	const matches = [];
-	for (const root of roots) {
+	const rootEntries = await Promise.all(roots.map(async (root) => {
 		let rootStats;
 		try {
 			rootStats = await stat(root);
 		} catch {
-			continue;
+			return [];
 		}
-		if (!rootStats.isDirectory()) continue;
-		const entries = await searchDirectoriesInRoot({
+		if (!rootStats.isDirectory()) return [];
+		return (await searchDirectoriesInRoot({
 			root,
 			query: normalizedQuery,
 			maxResults: DIRECTORY_SEARCH_LIMIT * 4
+		})).map((entry) => ({
+			entry,
+			root
+		}));
+	}));
+	for (const { entry, root } of rootEntries.flat()) {
+		const relativePath = displayPath(entry.path).replace(/\/+$/g, "");
+		if (!relativePath) continue;
+		const absolutePath = resolve(root, relativePath);
+		if (seen.has(absolutePath)) continue;
+		seen.add(absolutePath);
+		const score = directorySearchScore({
+			absolutePath,
+			query: normalizedQuery,
+			root
+		});
+		if (score <= 0) continue;
+		matches.push({
+			absolutePath,
+			root,
+			score
 		});
-		for (const entry of entries) {
-			const relativePath = displayPath(entry.path).replace(/\/+$/g, "");
-			if (!relativePath) continue;
-			const absolutePath = resolve(root, relativePath);
-			if (seen.has(absolutePath)) continue;
-			seen.add(absolutePath);
-			const score = directorySearchScore({
-				absolutePath,
-				query: normalizedQuery,
-				root
-			});
-			if (score <= 0) continue;
-			matches.push({
-				absolutePath,
-				root,
-				score
-			});
-		}
 	}
 	return matches.sort((left, right) => {
 		if (right.score !== left.score) return right.score - left.score;
@@ -6571,10 +7137,13 @@ async function listFileReferenceEntries(query, baseCwd, { isQuotedPrefix = false
 	const scopedQuery = await resolveScopedFileReferenceQuery(normalizedQuery, baseCwd);
 	const searchBaseDir = scopedQuery?.searchBaseDir ?? baseCwd;
 	const searchQuery = scopedQuery?.query ?? normalizedQuery;
-	return (await walkDirectory(searchBaseDir, searchQuery, 100)).map((entry) => ({
-		...entry,
-		score: scoreFileReferenceEntry(entry.path, searchQuery, entry.isDirectory)
-	})).filter((entry) => entry.score > 0).sort((left, right) => right.score - left.score).slice(0, 20).map((entry) => {
+	return (await walkDirectory(searchBaseDir, searchQuery, 100)).flatMap((entry) => {
+		const score = scoreFileReferenceEntry(entry.path, searchQuery, entry.isDirectory);
+		return score > 0 ? [{
+			...entry,
+			score
+		}] : [];
+	}).sort((left, right) => right.score - left.score).slice(0, 20).map((entry) => {
 		const pathWithoutSlash = entry.isDirectory ? entry.path.slice(0, -1) : entry.path;
 		const displayValue = scopedQuery ? scopedDisplayPath(scopedQuery.displayBase, pathWithoutSlash) : pathWithoutSlash;
 		return {
@@ -6588,7 +7157,7 @@ async function listFileReferenceEntries(query, baseCwd, { isQuotedPrefix = false
 		};
 	});
 }
-var Route$42 = createFileRoute("/api/path-completions")({ server: { handlers: { POST: async ({ request }) => {
+var Route$47 = createFileRoute("/api/path-completions")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
@@ -6604,7 +7173,7 @@ var Route$42 = createFileRoute("/api/path-completions")({ server: { handlers: {
 		return routeErrorResponse(error, "Failed to list path completions");
 	}
 } } } });
-var Route$41 = createFileRoute("/api/model")({ server: { handlers: { POST: async ({ request }) => {
+var Route$46 = createFileRoute("/api/model")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().setModel(request, body));
@@ -6612,7 +7181,7 @@ var Route$41 = createFileRoute("/api/model")({ server: { handlers: { POST: async
 		return routeErrorResponse(error, "Failed to update model");
 	}
 } } } });
-var Route$40 = createFileRoute("/api/highlight")({ server: { handlers: { POST: async ({ request }) => {
+var Route$45 = createFileRoute("/api/highlight")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().highlightCode(body.code, body.language));
@@ -6620,7 +7189,7 @@ var Route$40 = createFileRoute("/api/highlight")({ server: { handlers: { POST: a
 		return routeErrorResponse(error, "Failed to highlight code");
 	}
 } } } });
-var Route$39 = createFileRoute("/api/git-status")({ server: { handlers: { GET: async ({ request }) => {
+var Route$44 = createFileRoute("/api/git-status")({ server: { handlers: { GET: async ({ request }) => {
 	const requestedCwd = new URL(request.url).searchParams.get("cwd") || "";
 	if (!requestedCwd.trim()) return errorResponse("cwd is required");
 	try {
@@ -6635,7 +7204,7 @@ var Route$39 = createFileRoute("/api/git-status")({ server: { handlers: { GET: a
 		return routeErrorResponse(error, "Failed to read git status");
 	}
 } } } });
-var Route$38 = createFileRoute("/api/git-stage")({ server: { handlers: { POST: async ({ request }) => {
+var Route$43 = createFileRoute("/api/git-stage")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6656,7 +7225,7 @@ var Route$38 = createFileRoute("/api/git-stage")({ server: { handlers: { POST: a
 		return routeErrorResponse(error, "Failed to stage changes");
 	}
 } } } });
-var Route$37 = createFileRoute("/api/git-review")({ server: { handlers: { GET: async ({ request }) => {
+var Route$42 = createFileRoute("/api/git-review")({ server: { handlers: { GET: async ({ request }) => {
 	const url = new URL(request.url);
 	const requestedCwd = url.searchParams.get("cwd") || "";
 	const requestedPath = url.searchParams.get("path") || "";
@@ -6679,7 +7248,7 @@ var Route$37 = createFileRoute("/api/git-review")({ server: { handlers: { GET: a
 		return routeErrorResponse(error, "Failed to read git review file");
 	}
 } } } });
-var Route$36 = createFileRoute("/api/git-push")({ server: { handlers: { POST: async ({ request }) => {
+var Route$41 = createFileRoute("/api/git-push")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6698,7 +7267,7 @@ var Route$36 = createFileRoute("/api/git-push")({ server: { handlers: { POST: as
 		return routeErrorResponse(error, "Failed to push changes");
 	}
 } } } });
-var Route$35 = createFileRoute("/api/git-pull")({ server: { handlers: { POST: async ({ request }) => {
+var Route$40 = createFileRoute("/api/git-pull")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6716,7 +7285,7 @@ var Route$35 = createFileRoute("/api/git-pull")({ server: { handlers: { POST: as
 		return routeErrorResponse(error, "Failed to pull changes");
 	}
 } } } });
-var Route$34 = createFileRoute("/api/git-discard")({ server: { handlers: { POST: async ({ request }) => {
+var Route$39 = createFileRoute("/api/git-discard")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6738,7 +7307,7 @@ var Route$34 = createFileRoute("/api/git-discard")({ server: { handlers: { POST:
 		return routeErrorResponse(error, "Failed to discard changes");
 	}
 } } } });
-var Route$33 = createFileRoute("/api/git-diff")({ server: { handlers: { GET: async ({ request }) => {
+var Route$38 = createFileRoute("/api/git-diff")({ server: { handlers: { GET: async ({ request }) => {
 	const url = new URL(request.url);
 	const requestedCwd = url.searchParams.get("cwd") || "";
 	const requestedPath = url.searchParams.get("path") || "";
@@ -6758,7 +7327,28 @@ var Route$33 = createFileRoute("/api/git-diff")({ server: { handlers: { GET: asy
 		return routeErrorResponse(error, "Failed to read git diff");
 	}
 } } } });
-var Route$32 = createFileRoute("/api/git-commit-message")({ server: { handlers: { POST: async ({ request }) => {
+var Route$37 = createFileRoute("/api/git-commit-remote-url")({ server: { handlers: { GET: async ({ request }) => {
+	try {
+		const url = new URL(request.url);
+		const requestedCwd = url.searchParams.get("cwd") || "";
+		const commit = url.searchParams.get("commit") || "";
+		if (!requestedCwd.trim()) throw new Error("cwd is required");
+		if (!commit.trim()) throw new Error("commit is required");
+		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
+		const cwd = await resolveDirectoryPath(requestedCwd, getPicoRuntime().getBaseCwd(activeEntry, context));
+		const result = await readDirectoryGitCommitRemoteUrl(cwd, commit);
+		if (!result?.remoteUrl) throw new Error("No remote URL found");
+		return jsonResponse({
+			ok: true,
+			cwd,
+			commit: result.commit,
+			remoteUrl: result.remoteUrl
+		});
+	} catch (error) {
+		return routeErrorResponse(error, "Failed to read commit remote URL");
+	}
+} } } });
+var Route$36 = createFileRoute("/api/git-commit-message")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6777,7 +7367,93 @@ var Route$32 = createFileRoute("/api/git-commit-message")({ server: { handlers:
 		return routeErrorResponse(error, "Failed to generate commit message");
 	}
 } } } });
-var Route$31 = createFileRoute("/api/git-commit")({ server: { handlers: { POST: async ({ request }) => {
+var Route$35 = createFileRoute("/api/git-commit-files")({ server: { handlers: { GET: async ({ request }) => {
+	try {
+		const url = new URL(request.url);
+		const requestedCwd = url.searchParams.get("cwd") || "";
+		const commit = url.searchParams.get("commit") || "";
+		if (!requestedCwd.trim()) throw new Error("cwd is required");
+		if (!commit.trim()) throw new Error("commit is required");
+		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
+		const cwd = await resolveDirectoryPath(requestedCwd, getPicoRuntime().getBaseCwd(activeEntry, context));
+		return jsonResponse({
+			ok: true,
+			cwd,
+			commit,
+			files: await readDirectoryGitCommitFiles(cwd, commit) || []
+		});
+	} catch (error) {
+		return routeErrorResponse(error, "Failed to read commit files");
+	}
+} } } });
+function normalizeGitCommitDiffMode(value) {
+	if (value === "head" || value === "previous") return value;
+	return "commit";
+}
+var Route$34 = createFileRoute("/api/git-commit-diff")({ server: { handlers: { GET: async ({ request }) => {
+	try {
+		const url = new URL(request.url);
+		const requestedCwd = url.searchParams.get("cwd") || "";
+		const commit = url.searchParams.get("commit") || "";
+		const mode = normalizeGitCommitDiffMode(url.searchParams.get("mode"));
+		const path = url.searchParams.get("path") || void 0;
+		const previousPath = url.searchParams.get("previousPath") || void 0;
+		if (!requestedCwd.trim()) throw new Error("cwd is required");
+		if (!commit.trim()) throw new Error("commit is required");
+		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
+		const cwd = await resolveDirectoryPath(requestedCwd, getPicoRuntime().getBaseCwd(activeEntry, context));
+		const result = await readDirectoryGitCommitDiff(cwd, commit, mode, path, previousPath);
+		return jsonResponse({
+			ok: true,
+			cwd,
+			commit: result?.commit || commit,
+			mode,
+			title: result?.title || commit,
+			...result?.path ? { path: result.path } : {},
+			...result?.previousPath ? { previousPath: result.previousPath } : {},
+			patch: result?.patch || "No git repository detected."
+		});
+	} catch (error) {
+		return routeErrorResponse(error, "Failed to read commit diff");
+	}
+} } } });
+var gitCommitActions = new Set([
+	"checkout",
+	"cherry-pick",
+	"revert",
+	"tag",
+	"reset",
+	"rebase",
+	"drop",
+	"squash"
+]);
+var Route$33 = createFileRoute("/api/git-commit-action")({ server: { handlers: { POST: async ({ request }) => {
+	try {
+		const body = await readRequestJson(request);
+		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
+		const action = typeof body.action === "string" ? body.action : "";
+		const commit = typeof body.commit === "string" ? body.commit : "";
+		if (!requestedCwd.trim()) throw new Error("cwd is required");
+		if (!gitCommitActions.has(action)) throw new Error("action is required");
+		if (!commit.trim()) throw new Error("commit is required");
+		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
+		const cwd = await resolveDirectoryPath(requestedCwd, getPicoRuntime().getBaseCwd(activeEntry, context));
+		const result = await runDirectoryGitCommitAction(cwd, action, commit, {
+			tagName: typeof body.tagName === "string" ? body.tagName : "",
+			resetMode: typeof body.resetMode === "string" ? body.resetMode : "",
+			message: typeof body.message === "string" ? body.message : ""
+		});
+		return jsonResponse({
+			ok: true,
+			cwd,
+			stdout: result.stdout,
+			stderr: result.stderr
+		});
+	} catch (error) {
+		return routeErrorResponse(error, "Failed to run commit action");
+	}
+} } } });
+var Route$32 = createFileRoute("/api/git-commit")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6802,7 +7478,7 @@ var Route$31 = createFileRoute("/api/git-commit")({ server: { handlers: { POST:
 		return routeErrorResponse(error, "Failed to commit changes");
 	}
 } } } });
-var Route$30 = createFileRoute("/api/git-checkout")({ server: { handlers: { POST: async ({ request }) => {
+var Route$31 = createFileRoute("/api/git-checkout")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const requestedCwd = typeof body.cwd === "string" ? body.cwd : "";
@@ -6852,7 +7528,7 @@ function getRuntimeRequestForGitChanges(request, url) {
 		method: request.method
 	});
 }
-var Route$29 = createFileRoute("/api/git-changes")({ server: { handlers: { GET: async ({ request }) => {
+var Route$30 = createFileRoute("/api/git-changes")({ server: { handlers: { GET: async ({ request }) => {
 	const url = new URL(request.url);
 	const requestedCwd = url.searchParams.get("cwd") || "";
 	const gitScope = getGitChangesScope(url);
@@ -6922,7 +7598,7 @@ var Route$29 = createFileRoute("/api/git-changes")({ server: { handlers: { GET:
 		return routeErrorResponse(error, "Failed to read git changes");
 	}
 } } } });
-var Route$28 = createFileRoute("/api/file-completions")({ server: { handlers: { POST: async ({ request }) => {
+var Route$29 = createFileRoute("/api/file-completions")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
@@ -6939,7 +7615,7 @@ var Route$28 = createFileRoute("/api/file-completions")({ server: { handlers: {
 		return routeErrorResponse(error, "Failed to list file completions");
 	}
 } } } });
-var Route$27 = createFileRoute("/api/directory-sessions-indexes")({ server: { handlers: { GET: async ({ request }) => {
+var Route$28 = createFileRoute("/api/directory-sessions-indexes")({ server: { handlers: { GET: async ({ request }) => {
 	const directories = new URL(request.url).searchParams.getAll("directory");
 	if (directories.length === 0) return errorResponse("at least one directory is required");
 	try {
@@ -6948,7 +7624,7 @@ var Route$27 = createFileRoute("/api/directory-sessions-indexes")({ server: { ha
 		return routeErrorResponse(error, "Failed to list directory session indexes");
 	}
 } } } });
-var Route$26 = createFileRoute("/api/directory-sessions-index")({ server: { handlers: { GET: async ({ request }) => {
+var Route$27 = createFileRoute("/api/directory-sessions-index")({ server: { handlers: { GET: async ({ request }) => {
 	const directory = new URL(request.url).searchParams.get("directory") || "";
 	if (!directory.trim()) return errorResponse("directory is required");
 	try {
@@ -6957,7 +7633,7 @@ var Route$26 = createFileRoute("/api/directory-sessions-index")({ server: { hand
 		return routeErrorResponse(error, "Failed to list directory session index");
 	}
 } } } });
-var Route$25 = createFileRoute("/api/directory-sessions")({ server: { handlers: { GET: async ({ request }) => {
+var Route$26 = createFileRoute("/api/directory-sessions")({ server: { handlers: { GET: async ({ request }) => {
 	const url = new URL(request.url);
 	const directory = url.searchParams.get("directory") || "";
 	const offset = Number.parseInt(url.searchParams.get("offset") || "0", 10);
@@ -6972,7 +7648,7 @@ var Route$25 = createFileRoute("/api/directory-sessions")({ server: { handlers:
 		return routeErrorResponse(error, "Failed to list directory sessions");
 	}
 } } } });
-var Route$24 = createFileRoute("/api/directory-search")({ server: { handlers: { POST: async ({ request }) => {
+var Route$25 = createFileRoute("/api/directory-search")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		const { context, activeEntry } = await getPicoRuntime().resolveRequest(request);
@@ -6988,14 +7664,14 @@ var Route$24 = createFileRoute("/api/directory-search")({ server: { handlers: {
 		return routeErrorResponse(error, "Failed to search directories");
 	}
 } } } });
-var Route$23 = createFileRoute("/api/abort")({ server: { handlers: { POST: async ({ request }) => {
+var Route$24 = createFileRoute("/api/abort")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		return jsonResponse(await getPicoRuntime().abort(request));
 	} catch (error) {
 		return routeErrorResponse(error, "Failed to abort session");
 	}
 } } } });
-var Route$22 = createFileRoute("/api/ui/$id")({ server: { handlers: { POST: async ({ request, params }) => {
+var Route$23 = createFileRoute("/api/ui/$id")({ server: { handlers: { POST: async ({ request, params }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().resolveUiRequest(params.id, body));
@@ -7003,7 +7679,7 @@ var Route$22 = createFileRoute("/api/ui/$id")({ server: { handlers: { POST: asyn
 		return routeErrorResponse(error, "Failed to resolve UI request");
 	}
 } } } });
-var Route$21 = createFileRoute("/api/settings/hide-thinking")({ server: { handlers: { POST: async ({ request }) => {
+var Route$22 = createFileRoute("/api/settings/hide-thinking")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().setHideThinking(body));
@@ -7011,7 +7687,7 @@ var Route$21 = createFileRoute("/api/settings/hide-thinking")({ server: { handle
 		return routeErrorResponse(error, "Failed to update hide-thinking setting");
 	}
 } } } });
-var Route$20 = createFileRoute("/api/sessions/delete")({ server: { handlers: { POST: async ({ request }) => {
+var Route$21 = createFileRoute("/api/sessions/delete")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().deleteSessions(request, body));
@@ -7019,7 +7695,7 @@ var Route$20 = createFileRoute("/api/sessions/delete")({ server: { handlers: { P
 		return routeErrorResponse(error, "Failed to delete sessions");
 	}
 } } } });
-var Route$19 = createFileRoute("/api/session/tree")({ server: { handlers: {
+var Route$20 = createFileRoute("/api/session/tree")({ server: { handlers: {
 	GET: async ({ request }) => {
 		try {
 			return jsonResponse(await getPicoRuntime().getSessionTreeForRequest(request));
@@ -7036,14 +7712,14 @@ var Route$19 = createFileRoute("/api/session/tree")({ server: { handlers: {
 		}
 	}
 } } });
-var Route$18 = createFileRoute("/api/session/select")({ server: { handlers: { POST: async ({ request }) => {
+var Route$19 = createFileRoute("/api/session/select")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		return jsonResponse(await getPicoRuntime().selectSession(request));
 	} catch (error) {
 		return routeErrorResponse(error, "Failed to select session");
 	}
 } } } });
-var Route$17 = createFileRoute("/api/session/rename")({ server: { handlers: { POST: async ({ request }) => {
+var Route$18 = createFileRoute("/api/session/rename")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
 		return jsonResponse(await getPicoRuntime().renameSession(body));
@@ -7051,6 +7727,14 @@ var Route$17 = createFileRoute("/api/session/rename")({ server: { handlers: { PO
 		return routeErrorResponse(error, "Failed to rename session");
 	}
 } } } });
+var Route$17 = createFileRoute("/api/session/read-state")({ server: { handlers: { POST: async ({ request }) => {
+	try {
+		const body = await readRequestJson(request);
+		return jsonResponse(await getPicoRuntime().setSessionReadState(request, body));
+	} catch (error) {
+		return routeErrorResponse(error, "Failed to update session read state");
+	}
+} } } });
 var Route$16 = createFileRoute("/api/session/new")({ server: { handlers: { POST: async ({ request }) => {
 	try {
 		const body = await readRequestJson(request);
@@ -7224,220 +7908,245 @@ var Route = createFileRoute("/api/session/tree/label")({ server: { handlers: { P
 		return routeErrorResponse(error, "Failed to update tree label");
 	}
 } } } });
-var EventsRoute = Route$47.update({
+var EventsRoute = Route$52.update({
 	id: "/events",
 	path: "/events",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var IndexRoute = Route$49.update({
+var IndexRoute = Route$54.update({
 	id: "/",
 	path: "/",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiThinkingRoute = Route$46.update({
+var ApiThinkingRoute = Route$51.update({
 	id: "/api/thinking",
 	path: "/api/thinking",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiSlashCommandRoute = Route$45.update({
+var ApiSlashCommandRoute = Route$50.update({
 	id: "/api/slash-command",
 	path: "/api/slash-command",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiProviderUsageRoute = Route$44.update({
+var ApiProviderUsageRoute = Route$49.update({
 	id: "/api/provider-usage",
 	path: "/api/provider-usage",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiPromptRoute = Route$43.update({
+var ApiPromptRoute = Route$48.update({
 	id: "/api/prompt",
 	path: "/api/prompt",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiPathCompletionsRoute = Route$42.update({
+var ApiPathCompletionsRoute = Route$47.update({
 	id: "/api/path-completions",
 	path: "/api/path-completions",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiModelRoute = Route$41.update({
+var ApiModelRoute = Route$46.update({
 	id: "/api/model",
 	path: "/api/model",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiHighlightRoute = Route$40.update({
+var ApiHighlightRoute = Route$45.update({
 	id: "/api/highlight",
 	path: "/api/highlight",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitStatusRoute = Route$39.update({
+var ApiGitStatusRoute = Route$44.update({
 	id: "/api/git-status",
 	path: "/api/git-status",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitStageRoute = Route$38.update({
+var ApiGitStageRoute = Route$43.update({
 	id: "/api/git-stage",
 	path: "/api/git-stage",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitReviewRoute = Route$37.update({
+var ApiGitReviewRoute = Route$42.update({
 	id: "/api/git-review",
 	path: "/api/git-review",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitPushRoute = Route$36.update({
+var ApiGitPushRoute = Route$41.update({
 	id: "/api/git-push",
 	path: "/api/git-push",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitPullRoute = Route$35.update({
+var ApiGitPullRoute = Route$40.update({
 	id: "/api/git-pull",
 	path: "/api/git-pull",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitDiscardRoute = Route$34.update({
+var ApiGitDiscardRoute = Route$39.update({
 	id: "/api/git-discard",
 	path: "/api/git-discard",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitDiffRoute = Route$33.update({
+var ApiGitDiffRoute = Route$38.update({
 	id: "/api/git-diff",
 	path: "/api/git-diff",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitCommitMessageRoute = Route$32.update({
+var ApiGitCommitRemoteUrlRoute = Route$37.update({
+	id: "/api/git-commit-remote-url",
+	path: "/api/git-commit-remote-url",
+	getParentRoute: () => Route$53
+});
+var ApiGitCommitMessageRoute = Route$36.update({
 	id: "/api/git-commit-message",
 	path: "/api/git-commit-message",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
+});
+var ApiGitCommitFilesRoute = Route$35.update({
+	id: "/api/git-commit-files",
+	path: "/api/git-commit-files",
+	getParentRoute: () => Route$53
+});
+var ApiGitCommitDiffRoute = Route$34.update({
+	id: "/api/git-commit-diff",
+	path: "/api/git-commit-diff",
+	getParentRoute: () => Route$53
 });
-var ApiGitCommitRoute = Route$31.update({
+var ApiGitCommitActionRoute = Route$33.update({
+	id: "/api/git-commit-action",
+	path: "/api/git-commit-action",
+	getParentRoute: () => Route$53
+});
+var ApiGitCommitRoute = Route$32.update({
 	id: "/api/git-commit",
 	path: "/api/git-commit",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitCheckoutRoute = Route$30.update({
+var ApiGitCheckoutRoute = Route$31.update({
 	id: "/api/git-checkout",
 	path: "/api/git-checkout",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiGitChangesRoute = Route$29.update({
+var ApiGitChangesRoute = Route$30.update({
 	id: "/api/git-changes",
 	path: "/api/git-changes",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiFileCompletionsRoute = Route$28.update({
+var ApiFileCompletionsRoute = Route$29.update({
 	id: "/api/file-completions",
 	path: "/api/file-completions",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiDirectorySessionsIndexesRoute = Route$27.update({
+var ApiDirectorySessionsIndexesRoute = Route$28.update({
 	id: "/api/directory-sessions-indexes",
 	path: "/api/directory-sessions-indexes",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiDirectorySessionsIndexRoute = Route$26.update({
+var ApiDirectorySessionsIndexRoute = Route$27.update({
 	id: "/api/directory-sessions-index",
 	path: "/api/directory-sessions-index",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiDirectorySessionsRoute = Route$25.update({
+var ApiDirectorySessionsRoute = Route$26.update({
 	id: "/api/directory-sessions",
 	path: "/api/directory-sessions",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiDirectorySearchRoute = Route$24.update({
+var ApiDirectorySearchRoute = Route$25.update({
 	id: "/api/directory-search",
 	path: "/api/directory-search",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiAbortRoute = Route$23.update({
+var ApiAbortRoute = Route$24.update({
 	id: "/api/abort",
 	path: "/api/abort",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiUiIdRoute = Route$22.update({
+var ApiUiIdRoute = Route$23.update({
 	id: "/api/ui/$id",
 	path: "/api/ui/$id",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiSettingsHideThinkingRoute = Route$21.update({
+var ApiSettingsHideThinkingRoute = Route$22.update({
 	id: "/api/settings/hide-thinking",
 	path: "/api/settings/hide-thinking",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiSessionsDeleteRoute = Route$20.update({
+var ApiSessionsDeleteRoute = Route$21.update({
 	id: "/api/sessions/delete",
 	path: "/api/sessions/delete",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiSessionTreeRoute = Route$19.update({
+var ApiSessionTreeRoute = Route$20.update({
 	id: "/api/session/tree",
 	path: "/api/session/tree",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiSessionSelectRoute = Route$18.update({
+var ApiSessionSelectRoute = Route$19.update({
 	id: "/api/session/select",
 	path: "/api/session/select",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
-var ApiSessionRenameRoute = Route$17.update({
+var ApiSessionRenameRoute = Route$18.update({
 	id: "/api/session/rename",
 	path: "/api/session/rename",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
+});
+var ApiSessionReadStateRoute = Route$17.update({
+	id: "/api/session/read-state",
+	path: "/api/session/read-state",
+	getParentRoute: () => Route$53
 });
 var ApiSessionNewRoute = Route$16.update({
 	id: "/api/session/new",
 	path: "/api/session/new",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiSessionMoveRoute = Route$15.update({
 	id: "/api/session/move",
 	path: "/api/session/move",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiSessionHistoryRoute = Route$14.update({
 	id: "/api/session/history",
 	path: "/api/session/history",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiSessionForkRoute = Route$13.update({
 	id: "/api/session/fork",
 	path: "/api/session/fork",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiSessionDeleteRoute = Route$12.update({
 	id: "/api/session/delete",
 	path: "/api/session/delete",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiSessionCloneRoute = Route$11.update({
 	id: "/api/session/clone",
 	path: "/api/session/clone",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiPendingMessagesReorderRoute = Route$10.update({
 	id: "/api/pending-messages/reorder",
 	path: "/api/pending-messages/reorder",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiPendingMessageRemoveRoute = Route$9.update({
 	id: "/api/pending-message/remove",
 	path: "/api/pending-message/remove",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiFilesTreeRoute = Route$8.update({
 	id: "/api/files/tree",
 	path: "/api/files/tree",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiFilesReadRoute = Route$7.update({
 	id: "/api/files/read",
 	path: "/api/files/read",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiDirectoryResolveRoute = Route$6.update({
 	id: "/api/directory/resolve",
 	path: "/api/directory/resolve",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiDirectorySessionsCleanupRoute = Route$5.update({
 	id: "/cleanup",
@@ -7447,22 +8156,22 @@ var ApiDirectorySessionsCleanupRoute = Route$5.update({
 var ApiAuthProvidersRoute = Route$4.update({
 	id: "/api/auth/providers",
 	path: "/api/auth/providers",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiAuthOauthRoute = Route$3.update({
 	id: "/api/auth/oauth",
 	path: "/api/auth/oauth",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiAuthLogoutRoute = Route$2.update({
 	id: "/api/auth/logout",
 	path: "/api/auth/logout",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiAuthApiKeyRoute = Route$1.update({
 	id: "/api/auth/api-key",
 	path: "/api/auth/api-key",
-	getParentRoute: () => Route$48
+	getParentRoute: () => Route$53
 });
 var ApiSessionTreeLabelRoute = Route.update({
 	id: "/label",
@@ -7484,7 +8193,11 @@ var rootRouteChildren = {
 	ApiGitChangesRoute,
 	ApiGitCheckoutRoute,
 	ApiGitCommitRoute,
+	ApiGitCommitActionRoute,
+	ApiGitCommitDiffRoute,
+	ApiGitCommitFilesRoute,
 	ApiGitCommitMessageRoute,
+	ApiGitCommitRemoteUrlRoute,
 	ApiGitDiffRoute,
 	ApiGitDiscardRoute,
 	ApiGitPullRoute,
@@ -7514,6 +8227,7 @@ var rootRouteChildren = {
 	ApiSessionHistoryRoute,
 	ApiSessionMoveRoute,
 	ApiSessionNewRoute,
+	ApiSessionReadStateRoute,
 	ApiSessionRenameRoute,
 	ApiSessionSelectRoute,
 	ApiSessionTreeRoute: ApiSessionTreeRoute._addFileChildren(ApiSessionTreeRouteChildren),
@@ -7521,7 +8235,7 @@ var rootRouteChildren = {
 	ApiSettingsHideThinkingRoute,
 	ApiUiIdRoute
 };
-var routeTree = Route$48._addFileChildren(rootRouteChildren)._addFileTypes();
+var routeTree = Route$53._addFileChildren(rootRouteChildren)._addFileTypes();
 function getRouter() {
 	const queryClient = new QueryClient({ defaultOptions: { queries: {
 		retry: 1,