zidane-ui 9.1.13 → 9.1.14

package/dist/chat/headless/sidebar/directory.js

@@ -4,23 +4,29 @@ import { isProjectMember } from "./rows.js";
 import { DEFAULT_SIDEBAR_VIEW } from "./view.js";
 import { createNotificationStore } from "./notifications.js";
 import { NO_SIDEBAR_CONTRIBUTIONS, filterQueryOf, filtersForSpace, mergeSidebarSpaces, resolveGrouping, resolveSort, spaceMembership, switcherSpaces } from "./query.js";
-import { DEFAULT_SPACE_ID, SessionQueryError, activeSpaceOf, normalizeSpaces, projectNameOf, resolveSessionSpace, sessionDirLabel, viewQuery } from "zidane/chat/pure";
+import { DEFAULT_SPACE_ID, SessionQueryError, activeSpaceOf, createRecentChanges, normalizeSpaces, projectNameOf, resolveSessionSpace, sessionDirLabel, viewQuery } from "zidane/chat/pure";
 //#region src/chat/headless/sidebar/directory.ts
 /**
 * The session directory: every host's sessions as the sidebar lists them,
 * kept current outside React.
 *
 * - Listing: one read per host (this machine plus each remote host) under
-*   the shown archive filter. Reads are versioned: only the newest refresh
-*   lands, and a host's own older answer never overwrites a newer one.
+*   the shown archive filter, at the start, on a reconnect, a host or filter
+*   change. Reads are versioned: only the newest refresh lands, and a host's
+*   own older answer never overwrites a newer one.
+* - Live rows: each change signal carries the session's row as its host
+*   lists it (`SessionRowChange`). The directory applies it at once in
+*   place, with no read. Create and update upsert, and delete removes. A
+*   change that arrives while a read of its host is in flight is applied on
+*   top of that read's answer.
 * - Run state: a refresh reconciles the rows' status with the stream store
 *   (a running row marks the session running, an idle one confirmed by the
 *   host clears a run this client missed the end of) unless a stream signal
 *   moved the run state while the refresh was in flight.
-* - Live: a debounced change signal re-reads the hosts it touched; a run end
-*   re-reads its host and leaves a notification on a session not open; a
-*   runtime switch drops every stream; a reconnect (runtime or the open
-*   session's server) re-reads the open transcript when no run streams it.
+* - Live: a run end leaves a notification on a session not open. A runtime
+*   switch drops every stream, unless the runtime comes back as the same
+*   process. After a reconnect (runtime or the open session's server), the
+*   windows on screen climb the reconnect ladder (`streams.resync`).
 * - Prewarm: the transcripts around the open session load in idle time.
 * - Spaces: the shown space (kept by the views store), the slide direction of
 *   the last switch, following the open session to its space, and reopening
@@ -56,7 +62,6 @@ const defaultIdle = {
 function createSessionDirectory(options) {
 	const { sessions, streams, views } = options;
 	const idle = options.idle ?? defaultIdle;
-	const debounceMs = options.changedDebounceMs ?? 300;
 	const pinnedSession = options.pinnedSession ?? null;
 	const notifications = createNotificationStore();
 	let contributionsStore = options.contributions ?? constant(NO_SIDEBAR_CONTRIBUTIONS);
@@ -117,6 +122,22 @@ function createSessionDirectory(options) {
 	let refreshVersion = 0;
 	const hostLists = /* @__PURE__ */ new Map();
 	const hostReads = /* @__PURE__ */ new Map();
+	/** Per host, the changes received while its list is read. A read's answer takes the ones after the read started (`createRecentChanges`). */
+	const recentChanges = /* @__PURE__ */ new Map();
+	const recentFor = (host) => {
+		let recent = recentChanges.get(host);
+		if (!recent) recentChanges.set(host, recent = createRecentChanges());
+		return recent;
+	};
+	/** The row as the shown archive filter lists it, `null` when it does not. */
+	const listed = (row) => row && (archive === "active" ? !row.archived : archive === "archived" ? Boolean(row.archived) : true) ? row : null;
+	/** `rows` with `id`'s row replaced, added (`row`) or removed (`null`), newest first as a host lists them. */
+	const withRow = (rows, id, row) => {
+		const at = rows.findIndex((s) => s.id === id);
+		if (at === -1 && !row) return rows;
+		const next = at === -1 ? [...rows, row] : row ? rows.map((s, i) => i === at ? row : s) : rows.filter((_, i) => i !== at);
+		return row ? next.map((s, i) => [s, i]).sort((a, b) => b[0].updatedAt - a[0].updatedAt || a[1] - b[1]).map(([s]) => s) : next;
+	};
 	const refreshHosts = async (only) => {
 		const version = ++refreshVersion;
 		const unchanged = streams.captureRunState();
@@ -126,11 +147,17 @@ function createSessionDirectory(options) {
 			await Promise.all(hosts.filter((host) => !only || only.has(host) || !hostLists.has(host)).map(async (host) => {
 				const read = (hostReads.get(host) ?? 0) + 1;
 				hostReads.set(host, read);
-				const rows = host ? await sessions.query({
-					archive: filter,
-					hostId: host
-				}).catch(() => []) : await sessions.query({ archive: filter });
-				if (hostReads.get(host) === read) hostLists.set(host, rows);
+				const recent = recentFor(host);
+				const reading = recent.begin();
+				try {
+					const rows = host ? await sessions.query({
+						archive: filter,
+						hostId: host
+					}).catch(() => []) : await sessions.query({ archive: filter });
+					if (hostReads.get(host) === read) hostLists.set(host, recent.end(reading, rows, (list, row, id) => withRow(list, id, listed(row))));
+				} finally {
+					recent.drop(reading);
+				}
 			}));
 			if (version !== refreshVersion) return;
 			for (const host of hostLists.keys()) if (!hosts.includes(host)) hostLists.delete(host);
@@ -157,13 +184,52 @@ function createSessionDirectory(options) {
 		}
 	};
 	const refresh = () => refreshHosts();
-	const reconvergeActiveTranscript = () => {
+	/** Applies a change signal. The row lands in its host's list at once. */
+	const applyChange = (change) => {
+		const row = change.op === "delete" ? null : change.row ?? void 0;
+		if (row === void 0) return;
+		const id = change.sessionId;
+		const host = row?.hostId ?? options.serverOf(id) ?? [...hostLists].find(([, rows]) => rows.some((s) => s.id === id))?.[0] ?? "";
+		recentFor(host).note(id, row);
+		const rows = hostLists.get(host);
+		if (!rows) return;
+		const shown = listed(row);
+		const next = withRow(rows, id, shown);
+		if (next === rows) return;
+		hostLists.set(host, next);
+		if (shown) {
+			options.onListed?.([shown]);
+			if (shown.status === "running") streams.markRunning(shown.id);
+		}
+		const hosts = ["", ...options.servers.get().map((h) => h.id)];
+		patch({ allSessions: hosts.flatMap((h) => hostLists.get(h) ?? []) });
+	};
+	const comebacks = /* @__PURE__ */ new Map();
+	const caughtUp = /* @__PURE__ */ new Map();
+	const comebacksOf = (sessionId) => comebacks.get(options.serverOf(sessionId) ?? "") ?? 0;
+	const comeBack = (host) => comebacks.set(host, (comebacks.get(host) ?? 0) + 1);
+	const catchUp = (sessionId) => {
+		const seen = comebacksOf(sessionId);
+		if (seen === 0 || caughtUp.get(sessionId) === seen) return;
+		caughtUp.set(sessionId, seen);
+		if (streams.hasEvents(sessionId)) streams.resync(sessionId);
+	};
+	/** When the open session's connection comes back, its window climbs the reconnect ladder's last steps (`streams.resync`). */
+	const resyncActiveTranscript = () => {
 		const active = state.get().activeSessionId;
-		if (!active || streams.peekRunning(active) || state.get().allSessions.some((s) => s.id === active && s.status === "running")) return;
-		const runSeqAtKickoff = streams.peekRunSeq(active);
-		options.loadEvents(active).then((events) => {
-			if (state.get().activeSessionId === active && !streams.peekRunning(active) && streams.peekRunSeq(active) === runSeqAtKickoff) streams.setEventsPage(active, events);
-		}).catch(() => void 0);
+		if (!active) return;
+		caughtUp.set(active, comebacksOf(active));
+		streams.resync(active);
+	};
+	/** When this machine's runtime comes back, every window on screen (the open session, a side chat) climbs the ladder. */
+	const resyncVisibleTranscripts = () => {
+		resyncActiveTranscript();
+		const active = state.get().activeSessionId;
+		for (const id of options.pinned?.() ?? []) {
+			if (id === active || options.serverOf(id) !== null || !streams.hasEvents(id)) continue;
+			caughtUp.set(id, comebacksOf(id));
+			streams.resync(id);
+		}
 	};
 	const setActive = (next) => {
 		const current = state.get().activeSessionId;
@@ -349,11 +415,19 @@ function createSessionDirectory(options) {
 					id,
 					status
 				};
-				if (id !== null && last.id === id && last.status !== void 0 && last.status !== "connected" && status === "connected") reconvergeActiveTranscript();
+				if (id !== null && last.id === id && last.status !== void 0 && last.status !== "connected" && status === "connected") resyncActiveTranscript();
+				if (active) catchUp(active);
 			};
+			let statuses = new Map(options.servers.get().map((host) => [host.id, host.status]));
 			followActiveServer();
 			offs.push(state.subscribe(followActiveServer));
 			offs.push(options.servers.subscribe(() => {
+				const next = new Map(options.servers.get().map((host) => [host.id, host.status]));
+				for (const [host, status] of next) {
+					const was = statuses.get(host);
+					if (was !== void 0 && was !== "connected" && status === "connected") comeBack(host);
+				}
+				statuses = next;
 				followActiveServer();
 				const key = options.servers.get().map((host) => `${host.id}:${host.status}`).join("|");
 				if (key === serversKey) return;
@@ -361,24 +435,65 @@ function createSessionDirectory(options) {
 				refresh();
 			}));
 			let runtime = null;
+			/** The process the windows' streams come from, when the transport names it. */
+			let runtimeEpoch;
+			/** Set when the runtime went down while being resumed. The windows wait for the comeback to know whether to go. */
+			let dropPending = false;
+			/** The last down notice said an attempt to reconnect was in flight. */
+			let attempting = false;
+			/** The runtime's connection went down since it was last up, so its next `connected` is a comeback. */
+			let runtimeDropped = false;
 			const onRuntime = options.signals?.onRuntime;
 			if (onRuntime) {
-				offs.push(onRuntime((connected) => {
+				offs.push(onRuntime((connected, origin) => {
 					const previous = runtime;
 					runtime = connected;
-					if (previous === null || previous === connected) return;
-					streams.dropAll();
-					refresh();
+					const drop = () => {
+						dropPending = false;
+						streams.dropAll();
+						refresh();
+					};
+					const wasAttempting = attempting;
+					attempting = !connected && origin?.connecting === true;
+					if (previous === null) {
+						if (connected) runtimeEpoch = origin?.epoch;
+						return;
+					}
+					if (!connected) {
+						if (previous) {
+							if (origin?.resuming && runtimeEpoch !== void 0) dropPending = true;
+							else drop();
+							return;
+						}
+						if (dropPending && (!origin?.resuming || wasAttempting && !attempting)) drop();
+						return;
+					}
+					if (previous) return;
+					const same = dropPending && origin?.epoch !== void 0 && origin.epoch === runtimeEpoch;
+					runtimeEpoch = origin?.epoch;
+					if (same) dropPending = false;
+					else drop();
 				}));
 				offs.push(onRuntime((connected) => {
-					if (!connected) return;
+					if (!connected) {
+						runtimeDropped = true;
+						return;
+					}
+					if (runtimeDropped) comeBack("");
+					runtimeDropped = false;
 					refresh();
-					reconvergeActiveTranscript();
+					resyncVisibleTranscripts();
 				}));
+				let seeding = true;
+				offs.push(() => seeding = false);
+				options.signals?.currentRuntime?.().then((now) => {
+					if (!seeding || !now || runtime !== null) return;
+					runtime = now.connected;
+					if (now.connected) runtimeEpoch = now.origin?.epoch;
+				}, () => void 0);
 			}
 			const onRunEnd = options.signals?.onRunEnd;
 			if (onRunEnd) offs.push(onRunEnd((sessionId, ok) => {
-				refreshHosts(/* @__PURE__ */ new Set([options.serverOf(sessionId) ?? ""]));
 				if (sessionId === state.get().activeSessionId) return;
 				notifications.set(sessionId, ok ? "completed" : "error");
 			}));
@@ -391,30 +506,7 @@ function createSessionDirectory(options) {
 				}
 				refresh();
 			}));
-			if (sessions.onChanged) {
-				let timer = null;
-				let activeTouched = false;
-				let touched = /* @__PURE__ */ new Set();
-				const off = sessions.onChanged((sessionId) => {
-					activeTouched ||= sessionId === state.get().activeSessionId;
-					touched.add(options.serverOf(sessionId) ?? "");
-					if (timer !== null) clearTimeout(timer);
-					timer = setTimeout(() => {
-						timer = null;
-						const hosts = touched;
-						touched = /* @__PURE__ */ new Set();
-						refreshHosts(hosts);
-						if (activeTouched) {
-							activeTouched = false;
-							reconvergeActiveTranscript();
-						}
-					}, debounceMs);
-				});
-				offs.push(() => {
-					off();
-					if (timer !== null) clearTimeout(timer);
-				});
-			}
+			if (sessions.onChanged) offs.push(sessions.onChanged(applyChange));
 			refresh();
 			return () => {
 				for (const off of offs.splice(0).reverse()) off();
@@ -443,7 +535,6 @@ function createSessionDirectory(options) {
 		},
 		async rename(sessionId, title) {
 			await sessions.rename?.(sessionId, title);
-			await refresh();
 		},
 		async setFavorite(sessionId, favorite) {
 			const flip = (value) => {
@@ -460,33 +551,23 @@ function createSessionDirectory(options) {
 				flip(!favorite);
 				throw err;
 			}
-			await refresh();
 		},
 		async setArchived(sessionId, archived) {
 			await sessions.setArchived?.(sessionId, archived);
-			await refresh();
 		},
 		async archiveMany(sessionIds) {
-			try {
-				for (const id of sessionIds) await sessions.setArchived?.(id, true);
-			} finally {
-				await refresh();
-			}
+			for (const id of sessionIds) await sessions.setArchived?.(id, true);
 		},
 		drop,
 		async removeMany(sessionIds) {
 			let kept = 0;
 			let reason;
-			try {
-				for (const id of sessionIds) {
-					const result = await drop(id);
-					if (result.kept) {
-						kept += 1;
-						reason ??= result.reason;
-					}
+			for (const id of sessionIds) {
+				const result = await drop(id);
+				if (result.kept) {
+					kept += 1;
+					reason ??= result.reason;
 				}
-			} finally {
-				await refresh();
 			}
 			return reason ? {
 				kept,
@@ -504,7 +585,6 @@ function createSessionDirectory(options) {
 		async setSessionSpace(sessionId, spaceId) {
 			await sessions.setSpace?.(sessionId, spaceId);
 			views.forgetSession(sessionId, spaceId);
-			await refresh();
 		},
 		setSpaceHidden(spaceId, hidden) {
 			if (spaceId === DEFAULT_SPACE_ID) return;
@@ -604,7 +684,6 @@ function createSessionDirectory(options) {
 				await sessions.setSpace?.(member.id, spaceId);
 				views.forgetSession(member.id, spaceId);
 			}
-			await refresh();
 			return members.length;
 		}
 	};

package/dist/chat/headless/sidebar/index.d.ts

@@ -1,8 +1,8 @@
 import { SessionNotification, SessionNotificationStore, createNotificationStore } from "./notifications.js";
 import { SessionActivityFilter, SessionArchiveFilter, SidebarExtensionView, SidebarGroupBy, SidebarListSession, SidebarOrigin, SidebarSortBy, SidebarView, VIEW_CHOICE } from "./types.js";
-import { DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SidebarLastSessions, SidebarViewMap, SidebarViewRecord, SidebarViews, SidebarViewsHost, SidebarViewsOptions, SidebarViewsStorage, SpaceSwitcherPrefs, createSidebarViews, parseSidebarView, parseSwitcherPrefs, readSidebarViews } from "./view.js";
+import { DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SIDEBAR_VIEW_VERSION, SidebarLastSessions, SidebarViewMap, SidebarViewRecord, SidebarViews, SidebarViewsHost, SidebarViewsOptions, SidebarViewsStorage, SpaceSwitcherPrefs, createSidebarViews, parseSidebarView, parseSwitcherPrefs, readSidebarViews } from "./view.js";
 import { AGENT_GROUPING, MAX_ROW_CHIPS, NO_SIDEBAR_CONTRIBUTIONS, SidebarContributionStores, SidebarContributions, SidebarGrouping, SidebarItemEntry, SidebarQueryLayer, SidebarRowChip, SidebarRowDecoration, SidebarSpace, claimChildSessions, clearedViewFilters, createDecorator, extensionSpaceOf, filterQueryOf, filtersForSpace, itemsForSpace, mergeSidebarSpaces, nextSavedViewName, resolveGrouping, resolveSort, sidebarContributionsOf, spaceMembership, switcherSpaces, viewFilterOf, viewFiltersOn } from "./query.js";
-import { DirectoryServer, DirectorySettings, ProjectInSpace, SessionDirectory, SessionDirectoryOptions, SessionDirectorySource, SessionDirectoryState, SessionDirectoryStreams, SessionRef, SessionRemoval, availableProjectsOf, createSessionDirectory, filterDirectorySessions, projectKeyOf, sessionRefsOf } from "./directory.js";
+import { DirectoryServer, DirectorySettings, ProjectInSpace, RuntimeNow, RuntimeOrigin, SessionDirectory, SessionDirectoryOptions, SessionDirectorySource, SessionDirectoryState, SessionDirectoryStreams, SessionRef, SessionRemoval, SessionRowChange, availableProjectsOf, createSessionDirectory, filterDirectorySessions, projectKeyOf, sessionRefsOf } from "./directory.js";
 import { SessionBadgesEntry, SessionBadgesSource, SessionBadgesStore, createSessionBadges } from "./badges.js";
 import { SessionWindowMode, SidebarEnvironmentHost, SidebarHost } from "./host.js";
 import { DEFAULT_SIDEBAR_LABELS, SidebarLabels } from "./labels.js";
@@ -16,4 +16,4 @@ import { CompactionProgress, CompactionProgressStore, CompactionSignal, createCo
 import { SESSION_HISTORY_LIMIT, SessionHistory, SessionHistoryDirection, SessionHistoryOptions, SessionHistoryPage, SessionHistoryState, SessionHistoryStore, createSessionHistory, parseSessionHistory } from "./history.js";
 import { DotStateInput, SidebarDotState, deriveDotState } from "./dot-state.js";
 import { deleteSessionPrompt, environmentKindLabel, environmentSummaryText, runsInRemoteSandbox } from "./environment.js";
-export { AGENT_GROUPING, BuildQuerySidebarRowsOptions, BuildSidebarRowsOptions, CHATS_BUCKET, COMMON_EMOJI, CompactionProgress, CompactionProgressStore, CompactionSignal, DEFAULT_SIDEBAR_LABELS, DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, DirectoryServer, DirectorySettings, DotStateInput, MAIN_SESSION_ICON_KEY, MAX_ROW_CHIPS, NO_SIDEBAR_CONTRIBUTIONS, PINNED_PROJECTS_KEY, PROJECT_ICONS_KEY, PinsBySpace, ProjectIcon, ProjectIconMap, ProjectInSpace, RunEstimatesRow, RunEstimatesSignal, RunEstimatesStore, SESSION_HISTORY_LIMIT, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SessionActivity, SessionActivityFilter, SessionActivitySignal, SessionActivityStore, SessionArchiveFilter, SessionBadgesEntry, SessionBadgesSource, SessionBadgesStore, SessionDirectory, SessionDirectoryOptions, SessionDirectorySource, SessionDirectoryState, SessionDirectoryStreams, SessionHistory, SessionHistoryDirection, SessionHistoryOptions, SessionHistoryPage, SessionHistoryState, SessionHistoryStore, SessionNotification, SessionNotificationStore, SessionRef, SessionRemoval, SessionWindowMode, SidebarContributionStores, SidebarContributions, SidebarDotState, SidebarEnvironmentHost, SidebarExtensionView, SidebarGroupBy, SidebarGrouping, SidebarHost, SidebarItemEntry, SidebarLabels, SidebarLastSessions, SidebarListRow, SidebarListSession, SidebarNode, SidebarOrigin, SidebarQueryLayer, SidebarRowChip, SidebarRowDecoration, SidebarSortBy, SidebarSpace, SidebarView, SidebarViewMap, SidebarViewRecord, SidebarViews, SidebarViewsHost, SidebarViewsOptions, SidebarViewsStorage, SpaceSwitcherPrefs, VIEW_CHOICE, activityLabel, availableProjectsOf, buildHostSidebarRows, buildQuerySidebarRows, buildSidebarRows, claimChildSessions, clearedViewFilters, createCompactionProgress, createDecorator, createNotificationStore, createRunEstimates, createSessionActivity, createSessionBadges, createSessionDirectory, createSessionHistory, createSidebarViews, deleteSessionPrompt, deriveDotState, environmentKindLabel, environmentSummaryText, extensionSpaceOf, filterDirectorySessions, filterQueryOf, filtersForSpace, firstGrapheme, groupsByFolder, isProjectIcon, isProjectMember, itemRows, itemsForSpace, mergeSidebarSpaces, nestSidebarRows, nextSavedViewName, parsePinnedProjects, parseProjectIcons, parseSessionHistory, parseSidebarView, parseSwitcherPrefs, partitionMainSession, pickRunEstimate, pinSession, pinnedSessions, projectKeyOf, projectPathOf, readSidebarViews, reduceActivity, reduceCompaction, repoGroups, resolveGrouping, resolveSort, runsInRemoteSandbox, sessionRefsOf, sidebarContributionsOf, spaceMembership, switcherSpaces, viewFilterOf, viewFiltersOn, withPinnedProject };
+export { AGENT_GROUPING, BuildQuerySidebarRowsOptions, BuildSidebarRowsOptions, CHATS_BUCKET, COMMON_EMOJI, CompactionProgress, CompactionProgressStore, CompactionSignal, DEFAULT_SIDEBAR_LABELS, DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, DirectoryServer, DirectorySettings, DotStateInput, MAIN_SESSION_ICON_KEY, MAX_ROW_CHIPS, NO_SIDEBAR_CONTRIBUTIONS, PINNED_PROJECTS_KEY, PROJECT_ICONS_KEY, PinsBySpace, ProjectIcon, ProjectIconMap, ProjectInSpace, RunEstimatesRow, RunEstimatesSignal, RunEstimatesStore, RuntimeNow, RuntimeOrigin, SESSION_HISTORY_LIMIT, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SIDEBAR_VIEW_VERSION, SessionActivity, SessionActivityFilter, SessionActivitySignal, SessionActivityStore, SessionArchiveFilter, SessionBadgesEntry, SessionBadgesSource, SessionBadgesStore, SessionDirectory, SessionDirectoryOptions, SessionDirectorySource, SessionDirectoryState, SessionDirectoryStreams, SessionHistory, SessionHistoryDirection, SessionHistoryOptions, SessionHistoryPage, SessionHistoryState, SessionHistoryStore, SessionNotification, SessionNotificationStore, SessionRef, SessionRemoval, SessionRowChange, SessionWindowMode, SidebarContributionStores, SidebarContributions, SidebarDotState, SidebarEnvironmentHost, SidebarExtensionView, SidebarGroupBy, SidebarGrouping, SidebarHost, SidebarItemEntry, SidebarLabels, SidebarLastSessions, SidebarListRow, SidebarListSession, SidebarNode, SidebarOrigin, SidebarQueryLayer, SidebarRowChip, SidebarRowDecoration, SidebarSortBy, SidebarSpace, SidebarView, SidebarViewMap, SidebarViewRecord, SidebarViews, SidebarViewsHost, SidebarViewsOptions, SidebarViewsStorage, SpaceSwitcherPrefs, VIEW_CHOICE, activityLabel, availableProjectsOf, buildHostSidebarRows, buildQuerySidebarRows, buildSidebarRows, claimChildSessions, clearedViewFilters, createCompactionProgress, createDecorator, createNotificationStore, createRunEstimates, createSessionActivity, createSessionBadges, createSessionDirectory, createSessionHistory, createSidebarViews, deleteSessionPrompt, deriveDotState, environmentKindLabel, environmentSummaryText, extensionSpaceOf, filterDirectorySessions, filterQueryOf, filtersForSpace, firstGrapheme, groupsByFolder, isProjectIcon, isProjectMember, itemRows, itemsForSpace, mergeSidebarSpaces, nestSidebarRows, nextSavedViewName, parsePinnedProjects, parseProjectIcons, parseSessionHistory, parseSidebarView, parseSwitcherPrefs, partitionMainSession, pickRunEstimate, pinSession, pinnedSessions, projectKeyOf, projectPathOf, readSidebarViews, reduceActivity, reduceCompaction, repoGroups, resolveGrouping, resolveSort, runsInRemoteSandbox, sessionRefsOf, sidebarContributionsOf, spaceMembership, switcherSpaces, viewFilterOf, viewFiltersOn, withPinnedProject };

package/dist/chat/headless/sidebar/index.js

@@ -1,18 +1,18 @@
 import { createRunEstimates, pickRunEstimate } from "./estimates.js";
+import { pinSession, pinnedSessions } from "./pinned-sessions.js";
 import { COMMON_EMOJI, MAIN_SESSION_ICON_KEY, PROJECT_ICONS_KEY, firstGrapheme, isProjectIcon, parseProjectIcons } from "./project-icons.js";
 import { DEFAULT_SIDEBAR_LABELS } from "./labels.js";
-import { pinSession, pinnedSessions } from "./pinned-sessions.js";
 import { VIEW_CHOICE } from "./types.js";
 import { CHATS_BUCKET, buildHostSidebarRows, buildQuerySidebarRows, buildSidebarRows, groupsByFolder, isProjectMember, itemRows, nestSidebarRows, partitionMainSession, projectPathOf, repoGroups } from "./rows.js";
 import { PINNED_PROJECTS_KEY, parsePinnedProjects, withPinnedProject } from "./pinned-projects.js";
 import { activityLabel, createSessionActivity, reduceActivity } from "./activity.js";
 import { createCompactionProgress, reduceCompaction } from "./compaction.js";
 import { createSessionBadges } from "./badges.js";
-import { DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, createSidebarViews, parseSidebarView, parseSwitcherPrefs, readSidebarViews } from "./view.js";
+import { DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SIDEBAR_VIEW_VERSION, createSidebarViews, parseSidebarView, parseSwitcherPrefs, readSidebarViews } from "./view.js";
 import { SESSION_HISTORY_LIMIT, createSessionHistory, parseSessionHistory } from "./history.js";
 import { createNotificationStore } from "./notifications.js";
 import { AGENT_GROUPING, MAX_ROW_CHIPS, NO_SIDEBAR_CONTRIBUTIONS, claimChildSessions, clearedViewFilters, createDecorator, extensionSpaceOf, filterQueryOf, filtersForSpace, itemsForSpace, mergeSidebarSpaces, nextSavedViewName, resolveGrouping, resolveSort, sidebarContributionsOf, spaceMembership, switcherSpaces, viewFilterOf, viewFiltersOn } from "./query.js";
 import { availableProjectsOf, createSessionDirectory, filterDirectorySessions, projectKeyOf, sessionRefsOf } from "./directory.js";
 import { deriveDotState } from "./dot-state.js";
 import { deleteSessionPrompt, environmentKindLabel, environmentSummaryText, runsInRemoteSandbox } from "./environment.js";
-export { AGENT_GROUPING, CHATS_BUCKET, COMMON_EMOJI, DEFAULT_SIDEBAR_LABELS, DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, MAIN_SESSION_ICON_KEY, MAX_ROW_CHIPS, NO_SIDEBAR_CONTRIBUTIONS, PINNED_PROJECTS_KEY, PROJECT_ICONS_KEY, SESSION_HISTORY_LIMIT, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, VIEW_CHOICE, activityLabel, availableProjectsOf, buildHostSidebarRows, buildQuerySidebarRows, buildSidebarRows, claimChildSessions, clearedViewFilters, createCompactionProgress, createDecorator, createNotificationStore, createRunEstimates, createSessionActivity, createSessionBadges, createSessionDirectory, createSessionHistory, createSidebarViews, deleteSessionPrompt, deriveDotState, environmentKindLabel, environmentSummaryText, extensionSpaceOf, filterDirectorySessions, filterQueryOf, filtersForSpace, firstGrapheme, groupsByFolder, isProjectIcon, isProjectMember, itemRows, itemsForSpace, mergeSidebarSpaces, nestSidebarRows, nextSavedViewName, parsePinnedProjects, parseProjectIcons, parseSessionHistory, parseSidebarView, parseSwitcherPrefs, partitionMainSession, pickRunEstimate, pinSession, pinnedSessions, projectKeyOf, projectPathOf, readSidebarViews, reduceActivity, reduceCompaction, repoGroups, resolveGrouping, resolveSort, runsInRemoteSandbox, sessionRefsOf, sidebarContributionsOf, spaceMembership, switcherSpaces, viewFilterOf, viewFiltersOn, withPinnedProject };
+export { AGENT_GROUPING, CHATS_BUCKET, COMMON_EMOJI, DEFAULT_SIDEBAR_LABELS, DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, MAIN_SESSION_ICON_KEY, MAX_ROW_CHIPS, NO_SIDEBAR_CONTRIBUTIONS, PINNED_PROJECTS_KEY, PROJECT_ICONS_KEY, SESSION_HISTORY_LIMIT, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SIDEBAR_VIEW_VERSION, VIEW_CHOICE, activityLabel, availableProjectsOf, buildHostSidebarRows, buildQuerySidebarRows, buildSidebarRows, claimChildSessions, clearedViewFilters, createCompactionProgress, createDecorator, createNotificationStore, createRunEstimates, createSessionActivity, createSessionBadges, createSessionDirectory, createSessionHistory, createSidebarViews, deleteSessionPrompt, deriveDotState, environmentKindLabel, environmentSummaryText, extensionSpaceOf, filterDirectorySessions, filterQueryOf, filtersForSpace, firstGrapheme, groupsByFolder, isProjectIcon, isProjectMember, itemRows, itemsForSpace, mergeSidebarSpaces, nestSidebarRows, nextSavedViewName, parsePinnedProjects, parseProjectIcons, parseSessionHistory, parseSidebarView, parseSwitcherPrefs, partitionMainSession, pickRunEstimate, pinSession, pinnedSessions, projectKeyOf, projectPathOf, readSidebarViews, reduceActivity, reduceCompaction, repoGroups, resolveGrouping, resolveSort, runsInRemoteSandbox, sessionRefsOf, sidebarContributionsOf, spaceMembership, switcherSpaces, viewFilterOf, viewFiltersOn, withPinnedProject };

package/dist/chat/headless/sidebar/labels.d.ts

@@ -1,6 +1,6 @@
 import { SecretTimeLeft } from "../secrets.js";
-import { u as AuthFailure } from "../../../dist/timeout-B5pO5I5a.js";
-import { KC as SecretTtl } from "../../../dist/index-Bq87OcGy.js";
+import { u as AuthFailure } from "../../../dist/timeout-Cz9dRF8Q.js";
+import { tw as SecretTtl } from "../../../dist/index-C6rzc-tt.js";
 import "../../../dist/index.js";
 import "../index.js";
 //#region src/chat/headless/sidebar/labels.d.ts
@@ -209,7 +209,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   authSignedInRetrying: string;
   authFixed: string;
   authTryAgain: string;
-  authFailed: (message: string) => string;
+  authSignInFailed: string;
   sessionEventLabel: (title: string, verb: string, needsAttention: boolean) => string;
   clickToAnswer: string;
   openSession: string;
@@ -252,7 +252,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   zoomOutDiagram: string;
   fitDiagram: string;
   copyDiagramSource: string;
-  diagramError: (message: string, at: string) => string;
+  diagramNotDrawn: (at: string) => string;
   diagramErrorAt: (line: number, column: number) => string;
   stopCommand: string;
   shellCancelled: string;
@@ -273,7 +273,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   blockRunStopped: string;
   blockRunTimedOut: string;
   blockRunTruncated: string;
-  blockRunFailed: (reason: string) => string;
+  blockRunError: string;
   blockRunNeedsTerminal: string;
   working: string;
   foldSteps: (count: number) => string;
@@ -303,6 +303,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   composerPlaceholderSteer: string;
   composerPlaceholderQueue: string;
   sendMessage: string;
+  composerSendFailed: string;
   sendHint: string;
   stopRun: string;
   stopHint: string;
@@ -347,7 +348,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   modelsJumpToProvider: string;
   modelsJumpHint: (provider: string, digit: number | null) => string;
   modelsLoading: string;
-  modelsLoadFailed: (error: string) => string;
+  modelsLoadError: string;
   modelsNoProviders: string;
   modelsNoMatch: (query: string) => string;
   modelsTypeAnId: string;
@@ -404,6 +405,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   inboxRecent: string;
   inboxPreviousSession: string;
   unsupportedInteraction: (tool: string) => string;
+  answerSendFailed: string;
   planRejectNote: string;
   planReviseNote: string;
   planRejectPlaceholder: string;
@@ -468,6 +470,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   filterSorts: {
     recency: string;
     createdTime: string;
+    lastUserMessage: string;
     alphabetical: string;
   };
   filterAllProjects: string;
@@ -555,6 +558,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   interactionAnsweredBy: (who: string) => string;
   badgePathUnavailable: string;
   badgeNoComposer: string;
+  badgeActionFailed: string;
   badgeCopied: string;
   badgeOpenIn: (app: string) => string;
   badgeOpenInBrowserPane: string;
@@ -590,6 +594,9 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   previous: string;
   next: string;
   loading: string;
+  noticeDetails: string;
+  noticeStack: string;
+  noticeDismiss: string;
   filePath: (path: string) => string;
   rename: string;
   current: string;
@@ -607,6 +614,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   modalBack: string;
   screenBack: (screen: string) => string;
   screenBackKey: string;
+  screenNavBack: (screen: string) => string;
   paletteLabel: string;
   paletteFilter: string;
   paletteBack: string;
@@ -670,6 +678,7 @@ declare const DEFAULT_SIDEBAR_LABELS: {
   openInNewTab: string;
   terminal: string;
   terminalLoadFailed: (message: string) => string;
+  terminalStartFailed: string;
   terminalExited: (code: number) => string;
 };
 /** The sidebar's strings, as {@link DEFAULT_SIDEBAR_LABELS} has them. */

package/dist/chat/headless/sidebar/types.d.ts

@@ -15,6 +15,8 @@ interface SidebarListSession {
   createdAt: number;
   /** Epoch ms of the last activity. */
   updatedAt: number;
+  /** Epoch ms of the user's last typed message, for the "Last user message" sort. If absent, the session sorts by `createdAt`. */
+  lastUserMessageAt?: number;
   /** The folder its tools run in. */
   cwd: string;
   /** The repository or project folder it belongs to, when known. */
@@ -72,7 +74,7 @@ interface SidebarExtensionView {
 /** The Origin filter: the sessions a reminder started (`scheduleId` set), or the others. */
 type SidebarOrigin = 'scheduled' | 'unscheduled';
 /** How the sidebar orders sessions inside a group. */
-type SidebarSortBy = 'recency' | 'createdTime' | 'alphabetical';
+type SidebarSortBy = 'recency' | 'createdTime' | 'lastUserMessage' | 'alphabetical';
 /** The filter axes, kept per space. */
 interface SidebarView {
   /** Active, archived or every session. */

package/dist/chat/headless/sidebar/view.d.ts

@@ -3,13 +3,19 @@ import { SidebarView } from "./types.js";
 //#region src/chat/headless/sidebar/view.d.ts
 /** A view nobody changed yet. */
 declare const DEFAULT_SIDEBAR_VIEW: SidebarView;
+/** The format a view record carries (`v`). Format 1 had none, and its `sortBy: 'recency'` reads as the default. */
+declare const SIDEBAR_VIEW_VERSION = 2;
 /** Where the views persist: one map of space id → view. */
-declare const SIDEBAR_VIEW_KEY = "zg-sidebar-view:v1";
+declare const SIDEBAR_VIEW_KEY = "zg-sidebar-view:v2";
 /** Where the shown space persists. */
 declare const SIDEBAR_SPACE_KEY = "zg-sidebar-space";
-/** A space's record as stored: its view, plus the conversation last open in it (`session`, when one was). */
+/**
+ * A space's record as stored: its view, the conversation last open in it (`session`, when one was),
+ * and its format (`v`, {@link SIDEBAR_VIEW_VERSION} on every record written).
+ */
 type SidebarViewRecord = SidebarView & {
   session?: string;
+  v?: number;
 };
 /** The views the host keeps for this user, next to the device's Storage. */
 interface SidebarViewsHost {
@@ -23,7 +29,8 @@ interface SidebarViewsHost {
   setSpace(spaceId: string): Promise<unknown>;
 }
 /**
- * A stored view, every axis checked; what is missing or unknown takes the default.
+ * A stored view, every axis checked. What is missing or unknown takes the default. A record
+ * without the format mark (format 1) reads `sortBy: 'recency'` as unset, because it was format 1's default.
  *
  * @param raw - The stored value.
  */
@@ -55,7 +62,8 @@ type SidebarLastSessions = Record<string, string>;
 /** The Storage the views persist in (`localStorage` in a browser). */
 type SidebarViewsStorage = Pick<Storage, 'getItem' | 'setItem' | 'removeItem'>;
 /**
- * The views the Storage holds: the per-space map, else the legacy per-axis keys as the default space's view.
+ * The views the Storage holds: the per-space map (format 1's when the current key holds none),
+ * else the legacy per-axis keys as the default space's view.
  *
  * @param storage - Where the views persist; absent reads nothing.
  */
@@ -103,4 +111,4 @@ interface SidebarViewsOptions {
  */
 declare function createSidebarViews(options?: SidebarViewsOptions): SidebarViews;
 //#endregion
-export { DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SidebarLastSessions, SidebarViewMap, SidebarViewRecord, SidebarViews, SidebarViewsHost, SidebarViewsOptions, SidebarViewsStorage, SpaceSwitcherPrefs, createSidebarViews, parseSidebarView, parseSwitcherPrefs, readSidebarViews };
+export { DEFAULT_SIDEBAR_VIEW, DEFAULT_SWITCHER_PREFS, SIDEBAR_SPACE_KEY, SIDEBAR_SWITCHER_KEY, SIDEBAR_VIEW_KEY, SIDEBAR_VIEW_VERSION, SidebarLastSessions, SidebarViewMap, SidebarViewRecord, SidebarViews, SidebarViewsHost, SidebarViewsOptions, SidebarViewsStorage, SpaceSwitcherPrefs, createSidebarViews, parseSidebarView, parseSwitcherPrefs, readSidebarViews };