@agent-native/core 0.188.0 → 0.189.0

package/corpus/templates/design/app/components/layout/Layout.tsx

@@ -129,15 +129,29 @@ export function Layout({ children }: LayoutProps) {
     if (!designId) return null;
     return { type: "design" as const, id: designId };
   }, [location.pathname]);
+  const flushDesignEditorSaves = useCallback(async () => {
+    const flushes: Promise<void>[] = [];
+    window.dispatchEvent(
+      new CustomEvent("agent-native:design-flush-pending-saves", {
+        detail: flushes,
+      }),
+    );
+    await Promise.all(flushes);
+  }, []);
   const designChatHistory = useMemo<
     AssistantChatHistoryConfig | undefined
   >(() => {
     if (!designScope) return undefined;
     const designId = designScope.id;
     return {
+      beforeStart: flushDesignEditorSaves,
       list: {
         action: "list-design-versions",
-        args: { designId, limit: 100 },
+        args: (threadId) => ({
+          designId,
+          limit: 100,
+          ...(threadId ? { threadId } : {}),
+        }),
         getVersions: (result: unknown) => {
           const versions =
             result && typeof result === "object"
@@ -154,9 +168,10 @@ export function Layout({ children }: LayoutProps) {
           designId,
           versionId: version.id,
         }),
+        beforeRestore: flushDesignEditorSaves,
       },
     };
-  }, [designScope]);
+  }, [designScope, flushDesignEditorSaves]);
   const chatHomeHandoffActive = useAgentChatHomeHandoff({
     storageKey: DESIGN_CHAT_STORAGE_KEY,
     activePath: location.pathname,

package/corpus/templates/design/app/pages/design-editor/editor-state.ts

@@ -741,9 +741,9 @@ export function flushFileContentSavesOnBackground(
   pendingByFileId: FileContentSaveRequestsById,
   latestUnacknowledgedByFileId: FileContentSaveRequestsById,
   timerIds: readonly number[],
-  save: (pending: FileContentSaveRequest) => void,
+  save: (pending: FileContentSaveRequest) => unknown | Promise<unknown>,
   clearTimer: (timerId: number) => void,
-): void {
+): Promise<void> {
   const newestByFileId = new Map<string, FileContentSaveRequest>();
   for (const pending of Object.values(latestUnacknowledgedByFileId)) {
     newestByFileId.set(pending.id, pending);
@@ -754,8 +754,15 @@ export function flushFileContentSavesOnBackground(
       newestByFileId.set(pending.id, pending);
     }
   }
-  for (const pending of newestByFileId.values()) save(pending);
+  const saves = [...newestByFileId.values()].map((pending) => {
+    try {
+      return Promise.resolve(save(pending));
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  });
   for (const timerId of timerIds) clearTimer(timerId);
+  return Promise.all(saves).then(() => undefined);
 }
 
 /**

package/corpus/templates/design/changelog/2026-09-25-chat-messages-can-be-reverted-to-their-autosaved-version-inc.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-09-25
+---
+
+Chat messages can be reverted to their autosaved version, including a shortcut to restore the start of a chat.

package/corpus/templates/design/server/lib/design-versions.ts

@@ -18,7 +18,7 @@ import {
 import { captureError } from "@agent-native/core/server";
 import { getRequestUserEmail } from "@agent-native/core/server/request-context";
 import { accessFilter, assertAccess } from "@agent-native/core/sharing";
-import { and, asc, desc, eq, isNull, sql } from "drizzle-orm";
+import { and, asc, desc, eq, isNull, like, sql } from "drizzle-orm";
 import { nanoid } from "nanoid";
 
 import {
@@ -49,6 +49,7 @@ export interface DesignVersionChatContext {
   runId?: string;
   turnId?: string;
   actionName?: string;
+  phase?: "start" | "end";
   surface?: "editor";
   /** Which editor-surface caller wrote this checkpoint. Only set alongside
    * `surface: "editor"` — see Throttle 1 below for why it matters. */
@@ -172,6 +173,15 @@ function stableStringify(value: unknown): string {
     .join(",")}}`;
 }
 
+function designVersionIdForIdempotencyKey(
+  designId: string,
+  idempotencyKey: string,
+) {
+  return `design-version-${createHash("sha256")
+    .update(stableStringify({ designId, idempotencyKey }))
+    .digest("hex")}`;
+}
+
 function nextRevisionTimestamp(previous: string | null | undefined): string {
   const previousMs = previous ? Date.parse(previous) : Number.NaN;
   return new Date(
@@ -204,6 +214,9 @@ function parseChatContext(
       context[key] = candidate;
     }
   }
+  if (value.phase === "start" || value.phase === "end") {
+    context.phase = value.phase;
+  }
   if (value.surface === "editor") context.surface = "editor";
   if (value.caller === "frontend" || value.caller === "webmcp") {
     context.caller = value.caller;
@@ -414,7 +427,7 @@ function chatContextKey(
   if (!context || context.surface === "editor") return null;
   const scope = context.threadId ?? "";
   const turn = context.turnId ?? context.runId ?? "";
-  return turn ? `${scope}:${turn}` : null;
+  return turn ? `${scope}:${turn}:${context.phase ?? ""}` : null;
 }
 
 function actionChatContext(
@@ -621,6 +634,7 @@ async function captureDesignVersion(
     chatContext?: DesignVersionChatContext;
     deletionGeometry?: ComponentDeletionGeometry;
     preferStoredFileContent?: boolean;
+    idempotencyKey?: string;
   },
   access: DesignAccess,
   database?: DesignDatabase,
@@ -735,16 +749,18 @@ async function captureDesignVersion(
       };
     }
   }
-  const id = `design-version-${createHash("sha256")
-    .update(
-      stableStringify({
-        designId,
-        previousVersionId: latest?.id ?? "initial",
-        chatContextKey: chatContextKey(options.chatContext),
-        stateHash,
-      }),
-    )
-    .digest("hex")}`;
+  const id = options.idempotencyKey
+    ? designVersionIdForIdempotencyKey(designId, options.idempotencyKey)
+    : `design-version-${createHash("sha256")
+        .update(
+          stableStringify({
+            designId,
+            previousVersionId: latest?.id ?? "initial",
+            chatContextKey: chatContextKey(options.chatContext),
+            stateHash,
+          }),
+        )
+        .digest("hex")}`;
   const snapshot = JSON.stringify({
     schemaVersion: 1,
     snapshotKind: "design-history",
@@ -877,6 +893,41 @@ export async function createDesignVersionSnapshot(
   });
 }
 
+export async function createDesignChatBeginningSnapshot(
+  designId: string,
+  run: { threadId: string; runId: string },
+) {
+  return withDesignVersionLock(designId, async () => {
+    const access = await assertAccess("design", designId, "editor");
+    const rows = await getDb()
+      .select({ id: schema.designVersions.id })
+      .from(schema.designVersions)
+      .where(
+        and(
+          eq(schema.designVersions.designId, designId),
+          eq(
+            schema.designVersions.id,
+            designVersionIdForIdempotencyKey(
+              designId,
+              `chat-start:${run.threadId}`,
+            ),
+          ),
+        ),
+      )
+      .limit(1);
+    if (rows.length) return null;
+    return captureDesignVersion(
+      designId,
+      {
+        label: "Before chat",
+        chatContext: { ...run, phase: "start" },
+        idempotencyKey: `chat-start:${run.threadId}`,
+      },
+      access,
+    );
+  });
+}
+
 function checkpointSkipReason(
   error: unknown,
 ): DesignVersionCheckpointSkipReason {
@@ -1140,6 +1191,7 @@ export async function snapshotDesignBeforeAgentEditInVersionLock(
 export async function listDesignVersions(
   designId: string,
   limit: number,
+  threadId?: string,
 ): Promise<{
   designId: string;
   count: number;
@@ -1147,7 +1199,8 @@ export async function listDesignVersions(
   versions: DesignVersionListEntry[];
 }> {
   await assertAccess("design", designId, "viewer");
-  const rows = await getDb()
+  const db = getDb();
+  const rows = await db
     .select({
       id: schema.designVersions.id,
       label: schema.designVersions.label,
@@ -1163,11 +1216,46 @@ export async function listDesignVersions(
       desc(schema.designVersions.id),
     )
     .limit(limit);
+  const beginningRows = await db
+    .select({
+      id: schema.designVersions.id,
+      label: schema.designVersions.label,
+      createdAt: schema.designVersions.createdAt,
+      chatContext: schema.designVersions.chatContext,
+      fileCount: schema.designVersions.fileCount,
+    })
+    .from(schema.designVersions)
+    .where(
+      threadId
+        ? and(
+            eq(schema.designVersions.designId, designId),
+            eq(
+              schema.designVersions.id,
+              designVersionIdForIdempotencyKey(
+                designId,
+                `chat-start:${threadId}`,
+              ),
+            ),
+          )
+        : and(
+            eq(schema.designVersions.designId, designId),
+            like(schema.designVersions.chatContext, '%"phase":"start"%'),
+          ),
+    )
+    .orderBy(
+      asc(isNull(schema.designVersions.createdAt)),
+      asc(schema.designVersions.createdAt),
+    )
+    .limit(threadId ? 1 : limit);
+  const rowsById = new Map(
+    [...rows, ...beginningRows].map((row) => [row.id, row]),
+  );
 
   const regular: DesignVersionListEntry[] = [];
   const chat = new Map<string, DesignVersionListEntry>();
+  const activeStartEntries: DesignVersionListEntry[] = [];
   let invalidCount = 0;
-  for (const row of rows) {
+  for (const row of rowsById.values()) {
     let chatContext: DesignVersionChatContext | undefined;
     try {
       chatContext = parseStoredChatContext(row.chatContext);
@@ -1195,19 +1283,47 @@ export async function listDesignVersions(
       regular.push(entry);
       continue;
     }
-    const previous = chat.get(key);
     if (
-      !previous ||
-      versionTime(entry.createdAt) < versionTime(previous.createdAt)
+      threadId &&
+      chatContext?.threadId === threadId &&
+      chatContext.phase === "start"
     ) {
-      chat.set(key, entry);
+      activeStartEntries.push(entry);
+      continue;
     }
+    const previous = chat.get(key);
+    const replacePrevious =
+      !previous ||
+      (chatContext?.phase === "end"
+        ? versionTime(entry.createdAt) > versionTime(previous.createdAt)
+        : versionTime(entry.createdAt) < versionTime(previous.createdAt));
+    if (replacePrevious) chat.set(key, entry);
   }
 
-  const versions = [...regular, ...chat.values()].sort(
+  const versions = [...regular, ...chat.values(), ...activeStartEntries].sort(
     (left, right) => versionTime(right.createdAt) - versionTime(left.createdAt),
   );
-  return { designId, count: versions.length, invalidCount, versions };
+  const limitedVersions = versions.slice(0, limit);
+  const activeStart = threadId
+    ? versions.find(
+        (version) =>
+          version.chatContext?.threadId === threadId &&
+          version.chatContext.phase === "start",
+      )
+    : undefined;
+  if (activeStart && !limitedVersions.includes(activeStart)) {
+    limitedVersions[limitedVersions.length - 1] = activeStart;
+    limitedVersions.sort(
+      (left, right) =>
+        versionTime(right.createdAt) - versionTime(left.createdAt),
+    );
+  }
+  return {
+    designId,
+    count: limitedVersions.length,
+    invalidCount,
+    versions: limitedVersions,
+  };
 }
 
 interface RestoreFile {

package/corpus/templates/design/server/plugins/agent-chat.ts

@@ -232,21 +232,37 @@ async function autosaveDesignAfterAgentTurn(
   },
 ): Promise<void> {
   if (scope.type !== "design" || !(await hasDesignEdit(run, scope.id))) return;
+  if (!run.threadId || !run.runId) return;
 
   const { createDesignVersionSnapshot } =
     await import("../lib/design-versions.js");
   await createDesignVersionSnapshot(scope.id, {
     label: "Chat autosave",
     chatContext: {
-      ...(run.threadId ? { threadId: run.threadId } : {}),
-      ...(run.runId ? { runId: run.runId } : {}),
+      threadId: run.threadId,
+      runId: run.runId,
       ...(run.turnId ? { turnId: run.turnId } : {}),
+      phase: "end",
     },
   });
 }
 
+async function autosaveDesignBeforeAgentTurn(
+  scope: { type: string; id: string },
+  run: { threadId?: string; runId?: string },
+): Promise<void> {
+  if (scope.type !== "design" || !run.threadId || !run.runId) return;
+  const { createDesignChatBeginningSnapshot } =
+    await import("../lib/design-versions.js");
+  await createDesignChatBeginningSnapshot(scope.id, {
+    threadId: run.threadId,
+    runId: run.runId,
+  });
+}
+
 export default createAgentChatPlugin({
   appId: "design",
+  onAgentTurnStart: autosaveDesignBeforeAgentTurn,
   onAgentTurnComplete: autosaveDesignAfterAgentTurn,
   actions: guardRepromptActionRegistry(
     loadActionsFromStaticRegistry(actionsRegistry),

package/corpus/templates/mail/app/components/layout/AppLayout.tsx

@@ -101,7 +101,9 @@ import {
 import {
   INBOX_PAGE_SIZE,
   invalidateInboxThreads,
+  mergeOptimisticInboxTabCounts,
   resolveInboxTabId,
+  useInboxOverview,
   useInboxThreads,
 } from "@/hooks/use-inbox-threads";
 import {
@@ -563,18 +565,43 @@ function AppLayoutInner({ children }: AppLayoutProps) {
   const resolvedInboxTab = resolveInboxTabId(searchParams);
   const inboxAccountEmails =
     activeAccounts.size > 0 ? [...activeAccounts] : undefined;
-  const inboxThreads = useInboxThreads({
+  const inboxThreadInput = {
     tab: resolvedInboxTab,
     accountEmails: inboxAccountEmails,
     limit: INBOX_PAGE_SIZE,
     offset: 0,
-  });
+  };
+  const inboxThreads = useInboxThreads(inboxThreadInput);
+  const inboxRawPage = queryClient.getQueryData<
+    NonNullable<typeof inboxThreads.data>
+  >(["action", "list-inbox-threads", inboxThreadInput]);
+  const inboxOverview = useInboxOverview(inboxAccountEmails);
+  const inboxMetadata =
+    inboxOverview.data ??
+    (inboxThreads.isPlaceholderData ? undefined : inboxThreads.data);
+  const inboxTabs = useMemo(() => {
+    const tabs = inboxMetadata?.tabs ?? [];
+    if (!inboxOverview.data || inboxThreads.isPlaceholderData) {
+      return tabs;
+    }
+    return mergeOptimisticInboxTabCounts(
+      inboxOverview.data,
+      inboxRawPage,
+      inboxThreads.data,
+    );
+  }, [
+    inboxMetadata?.tabs,
+    inboxOverview.data,
+    inboxThreads.data,
+    inboxThreads.isPlaceholderData,
+    inboxRawPage,
+  ]);
   const activeInboxTabId = inboxThreads.isPlaceholderData
     ? (resolvedInboxTab ?? inboxThreads.data?.tabs[0]?.id)
     : (inboxThreads.data?.activeTabId ?? resolvedInboxTab);
   const inboxIsFetching = inboxThreads.isFetching;
-  const inboxSyncing = inboxThreads.data?.syncing === true;
-  const needsReauthAccount = inboxThreads.data?.accounts.find(
+  const inboxSyncing = inboxMetadata?.syncing === true;
+  const needsReauthAccount = inboxMetadata?.accounts.find(
     (account) => account.state === "needs_reauth",
   );
 
@@ -721,12 +748,10 @@ function AppLayoutInner({ children }: AppLayoutProps) {
   }, [combineInbox, pinnedLabels, view, t]);
 
   // The inbox split (Important / pinned labels / saved filters / Other) with
-  // its counts comes straight from the server — see the useInboxThreads call
-  // above. A tab's badge can never disagree with what it lists because both
-  // are read off the same row.
+  // its counts comes from one account-scoped snapshot, shared across each
+  // tab's separately cached row page.
   const dataTabs = useMemo<RenderedTab[]>(() => {
-    const tabs = inboxThreads.data?.tabs ?? [];
-    return tabs.map((tab) => {
+    return inboxTabs.map((tab) => {
       const label = labels.find((l) => l.id === tab.id);
       return {
         id: tab.id,
@@ -743,7 +768,7 @@ function AppLayoutInner({ children }: AppLayoutProps) {
         isSystemView: false,
       };
     });
-  }, [inboxThreads.data?.tabs, activeInboxTabId, labels, t, view]);
+  }, [inboxTabs, activeInboxTabId, labels, t, view]);
 
   const topBarTabs = useMemo<RenderedTab[]>(
     () => [...systemViewTabs, ...dataTabs],
@@ -1265,7 +1290,7 @@ function AppLayoutInner({ children }: AppLayoutProps) {
   // unread count from the same sync-cache label list the tab bar uses —
   // summing the (possibly overlapping) split tabs would double-count threads
   // that match more than one label/filter tab.
-  const inboxSidebarUnreadCount = inboxThreads.data?.labels.find(
+  const inboxSidebarUnreadCount = inboxMetadata?.labels.find(
     (label) => label.id === "inbox",
   )?.unreadCount;
   const railNavItems = [

package/corpus/templates/mail/app/hooks/use-inbox-threads.ts

@@ -7,6 +7,7 @@ import type {
 } from "@shared/inbox-threads";
 import {
   keepPreviousData,
+  skipToken,
   useQuery,
   useQueries,
   useQueryClient,
@@ -22,6 +23,79 @@ export const INBOX_THREADS_QUERY_KEY = ["action", "list-inbox-threads"];
 
 const SYNCING_POLL_MS = 3_000;
 const IDLE_POLL_MS = 20_000;
+const INBOX_THREADS_STALE_TIME_MS = IDLE_POLL_MS;
+
+export type InboxOverview = Pick<
+  ListInboxThreadsResult,
+  "tabs" | "syncing" | "accounts" | "labels"
+> & { clientSnapshotId: number };
+
+type InboxPageCountSnapshot = Pick<
+  ListInboxThreadsResult,
+  "activeTabId" | "tabs"
+> & { clientSnapshotId: number };
+
+export function mergeOptimisticInboxTabCounts(
+  overview: Pick<InboxOverview, "tabs" | "clientSnapshotId">,
+  base: InboxPageCountSnapshot | undefined,
+  projected: InboxPageCountSnapshot | undefined,
+) {
+  if (
+    !base ||
+    !projected ||
+    base.clientSnapshotId !== overview.clientSnapshotId ||
+    projected.clientSnapshotId !== overview.clientSnapshotId ||
+    base.activeTabId !== projected.activeTabId
+  ) {
+    return overview.tabs;
+  }
+  const baseTab = base.tabs.find((tab) => tab.id === base.activeTabId);
+  const projectedTab = projected.tabs.find(
+    (tab) => tab.id === projected.activeTabId,
+  );
+  if (!baseTab || !projectedTab) return overview.tabs;
+
+  const totalDelta = projectedTab.total - baseTab.total;
+  const unreadDelta = projectedTab.unread - baseTab.unread;
+  if (totalDelta === 0 && unreadDelta === 0) return overview.tabs;
+
+  return overview.tabs.map((tab) =>
+    tab.id === projectedTab.id
+      ? {
+          ...tab,
+          total: Math.max(0, tab.total + totalDelta),
+          unread: Math.max(0, tab.unread + unreadDelta),
+        }
+      : tab,
+  );
+}
+
+export function inboxOverviewQueryKey(accountEmails?: readonly string[]) {
+  const accounts = accountEmails
+    ? [...accountEmails].map((email) => email.toLowerCase()).sort()
+    : undefined;
+  return ["mail-inbox-overview", accounts] as const;
+}
+
+export function publishInboxOverview(
+  qc: QueryClient,
+  accountEmails: readonly string[] | undefined,
+  incoming: InboxOverview,
+) {
+  const queryKey = inboxOverviewQueryKey(accountEmails);
+  const current = qc.getQueryData<InboxOverview>(queryKey);
+  if (current && current.clientSnapshotId >= incoming.clientSnapshotId) return;
+  qc.setQueryData(queryKey, incoming);
+}
+
+/** Shared metadata is populated by the active tab query and never fetches separately. */
+export function useInboxOverview(accountEmails?: readonly string[]) {
+  return useQuery<InboxOverview>({
+    queryKey: inboxOverviewQueryKey(accountEmails),
+    queryFn: skipToken,
+    staleTime: Infinity,
+  });
+}
 
 // Not yet re-exported for template use from
 // packages/core/src/client/create-query-client.ts's isTerminalAuthFailure.
@@ -124,6 +198,13 @@ function fetchInboxThreads(
     { method: "GET", signal },
   ).then((data) => {
     const incoming = { ...data, clientSnapshotId };
+    publishInboxOverview(qc, input.accountEmails, {
+      tabs: incoming.tabs,
+      syncing: incoming.syncing,
+      accounts: incoming.accounts,
+      labels: incoming.labels,
+      clientSnapshotId,
+    });
     const current = qc.getQueryData<InboxQueryResult>(queryKey);
     return keepLatestInboxSnapshot(current, incoming);
   });
@@ -151,6 +232,7 @@ export function useInboxThreads(
     // window-focus refetch fans out across every mounted instance (bar +
     // list) and isn't worth the added request-storm risk.
     refetchInterval: inboxThreadsRefetchInterval,
+    staleTime: INBOX_THREADS_STALE_TIME_MS,
     // Tab switches must never blank the list while the new tab's page loads.
     placeholderData: keepPreviousData,
     select: (data) => applyInboxMutationOverlay(qc, data) as InboxQueryResult,

package/corpus/templates/mail/app/pages/InboxPage.tsx

@@ -35,6 +35,7 @@ import {
   inboxThreadsHasNextPage,
   mergeInboxThreadPages,
   resolveInboxTabId,
+  useInboxOverview,
   useInboxThreads,
   useInboxThreadsPages,
 } from "@/hooks/use-inbox-threads";
@@ -450,13 +451,11 @@ export function InboxPage() {
   const searchQuery =
     activeSavedFilter?.query ?? searchParams.get("q") ?? undefined;
 
-  // The inbox view is split server-side (tabs, counts, and the rendered
-  // list all come from one `list-inbox-threads` call keyed by the resolved
-  // tab id) — see shared/inbox-threads.ts. Every other view still fetches
-  // through `useEmails` below, unchanged. A `q` search on /inbox is not a
-  // tab partition the store computes, so it falls through to the same
-  // `useEmails` search path non-inbox views use — the store path is only
-  // for a plain /inbox with no `q`.
+  // Inbox rows are tab-scoped; each response publishes its account-scoped
+  // counts and sync metadata to the shared overview cache. Other views still
+  // fetch through `useEmails` below, unchanged. A `q` search on /inbox is not
+  // a tab partition the store computes, so it uses the same `useEmails`
+  // search path as non-inbox views.
   const isInboxView = view === "inbox" && !searchParams.get("q");
   useEffect(() => {
     if (!jevAvailability.isSuccess) return;
@@ -473,10 +472,10 @@ export function InboxPage() {
   const resolvedInboxTab = resolveInboxTabId(searchParams);
   const inboxAccountEmails =
     activeAccounts.size > 0 ? [...activeAccounts] : undefined;
-  // Page 0 drives tabs/counts/syncing/accounts/labels and is the only page
-  // that polls. "Load more" grows `inboxExtraPageCount`, fetching one more
-  // unpolled page per step (see useInboxThreadsPages's doc for why this
-  // isn't one useInfiniteQuery).
+  // Page 0 drives rows and pagination totals and is the only page that polls.
+  // Its account-scoped metadata snapshot is shared across tabs. "Load more"
+  // grows `inboxExtraPageCount`, fetching one unpolled page per step (see
+  // useInboxThreadsPages's doc for why this isn't one useInfiniteQuery).
   const inboxThreads = useInboxThreads(
     {
       tab: resolvedInboxTab,
@@ -488,6 +487,10 @@ export function InboxPage() {
     // it stays keyed on the route alone, not `isInboxView`.
     { enabled: view === "inbox" },
   );
+  const inboxOverview = useInboxOverview(inboxAccountEmails);
+  const inboxMetadata =
+    inboxOverview.data ??
+    (inboxThreads.isPlaceholderData ? undefined : inboxThreads.data);
   const [inboxExtraPageCount, setInboxExtraPageCount] = useState(0);
   useEffect(() => {
     const priorityExtraPages = Math.max(
@@ -559,7 +562,7 @@ export function InboxPage() {
     // coverage the same as a sync error (the reconnect-specific banner in
     // AppLayout is unaffected — this only feeds the generic notice + the
     // Inbox Zero suppression below).
-    const errored = inboxThreads.data?.accounts.filter(
+    const errored = inboxMetadata?.accounts.filter(
       (account) =>
         account.state === "error" || account.state === "needs_reauth",
     );
@@ -579,7 +582,7 @@ export function InboxPage() {
     const combined = [...inboxErrors, ...labelErrors];
     return combined.length ? combined : undefined;
   }, [
-    inboxThreads.data?.accounts,
+    inboxMetadata?.accounts,
     inboxThreads.isPlaceholderData,
     labelAccountErrors,
   ]);
@@ -687,9 +690,7 @@ export function InboxPage() {
   // produced any rows yet, so the list shows skeleton rows (not Inbox Zero)
   // until there is something real to show either way.
   const inboxStillSyncingEmpty =
-    isInboxView &&
-    inboxThreads.data?.syncing === true &&
-    inboxItems.length === 0;
+    isInboxView && inboxMetadata?.syncing === true && inboxItems.length === 0;
   const isLoading = isInboxView
     ? inboxThreads.isLoading ||
       inboxThreads.isPlaceholderData ||
@@ -1152,9 +1153,7 @@ export function InboxPage() {
             emailsError={emailsError}
             accountErrors={accountErrors}
             labels={
-              isInboxView
-                ? (inboxThreads.data?.labels ?? EMPTY_LABELS)
-                : undefined
+              isInboxView ? (inboxMetadata?.labels ?? EMPTY_LABELS) : undefined
             }
             refetchEmails={refetchEmails}
             hasNextPage={hasNextPage}

package/corpus/templates/mail/changelog/2026-09-25-keep-inbox-tab-counts-consistent-when-switching-tabs.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-25
+---
+
+Keep inbox tab counts consistent when switching tabs

package/corpus/templates/slides/CHANGELOG.md

@@ -5,6 +5,10 @@ time from the command menu (Cmd+K → "What's new").
 
 ## 2026-09-25
 
+### Added
+
+- Chat messages can be reverted to their autosaved version, including a shortcut to restore the start of a chat.
+
 ### Fixed
 
 - Word document imports now complete successfully.