@arbidocs/react 0.5.72 → 0.5.74

package/dist/{chunk-QGOYIYLI.js → chunk-YWU7HEHL.js}

@@ -6,6 +6,93 @@ import { getUserEncryptionKeypair, sealedBoxDecrypt, sealedBoxEncrypt } from '@a
 import { useSyncExternalStore, useCallback, useMemo, useRef, useEffect } from 'react';
 import { useQuery, useMutation, useQueryClient, useInfiniteQuery, useQueries } from '@tanstack/react-query';
 
+// src/chat/run-state.ts
+var MIN_QUEUED_MESSAGE_VISIBILITY_MS = 800;
+var mapQueues = (queues, update) => Object.fromEntries(Object.entries(queues).map(([id, messages]) => [id, update(messages)]));
+function findConsumedMessages(messages, combinedContent) {
+  const text = combinedContent.trim();
+  const taken = /* @__PURE__ */ new Set();
+  let cursor = 0;
+  for (const message of messages) {
+    if (cursor >= text.length) break;
+    const content = message.content.trim();
+    if (!content) continue;
+    const separator = cursor === 0 ? "" : "\n\n";
+    if (text.startsWith(separator + content, cursor)) {
+      taken.add(message.clientId);
+      cursor += separator.length + content.length;
+    }
+  }
+  return cursor === text.length ? taken : /* @__PURE__ */ new Set();
+}
+var queuedMessages = {
+  add: (q, responseId, message) => ({
+    ...q,
+    [responseId]: [...q[responseId] ?? [], message]
+  }),
+  acknowledge: (q, clientId, serverId) => mapQueues(
+    q,
+    (messages) => messages.map((m) => m.clientId === clientId ? { ...m, serverId, acknowledged: true } : m)
+  ),
+  remove: (q, clientId) => mapQueues(q, (messages) => messages.filter((m) => m.clientId !== clientId)),
+  removeByServerId: (q, serverId) => mapQueues(q, (messages) => messages.filter((m) => m.serverId !== serverId)),
+  removeByContent: (q, responseId, content) => {
+    let removed = false;
+    return {
+      ...q,
+      [responseId]: (q[responseId] ?? []).filter((m) => {
+        if (!removed && m.content === content) {
+          removed = true;
+          return false;
+        }
+        return true;
+      })
+    };
+  },
+  /** Take out the prompts a steering interjection delivered into the run. */
+  consume: (q, responseId, combinedContent) => {
+    const messages = q[responseId] ?? [];
+    const consumed = findConsumedMessages(messages, combinedContent);
+    return { ...q, [responseId]: messages.filter((m) => !consumed.has(m.clientId)) };
+  },
+  clear: (q, responseId) => ({ ...q, [responseId]: [] }),
+  /** Move the entries still waiting on a finished turn to the turn that is now running. */
+  move: (q, fromResponseId, toResponseId) => {
+    const waiting = q[fromResponseId] ?? [];
+    if (fromResponseId === toResponseId || waiting.length === 0) return q;
+    return { ...q, [fromResponseId]: [], [toResponseId]: [...q[toResponseId] ?? [], ...waiting] };
+  },
+  /** Find a queued follow-up by its client id, under whichever turn holds it. */
+  find: (q, clientId) => Object.values(q).flat().find((m) => m.clientId === clientId)
+};
+var without = (record, key) => {
+  const next = { ...record };
+  delete next[key];
+  return next;
+};
+var agentControl = {
+  setState: (c, id, state) => ({
+    ...c,
+    agentControlStates: { ...c.agentControlStates, [id]: state }
+  }),
+  /** A probe answered: the latest answer, and nothing pending any more. */
+  setProbeAnswer: (c, id, probe) => ({
+    ...c,
+    agentProbeAnswers: { ...c.agentProbeAnswers, [id]: probe },
+    agentProbePending: { ...c.agentProbePending, [id]: false }
+  }),
+  setProbePending: (c, id, pending) => ({
+    ...c,
+    agentProbePending: { ...c.agentProbePending, [id]: pending }
+  }),
+  /** The turn is over: drop its control state. */
+  clear: (c, id) => ({
+    agentControlStates: without(c.agentControlStates, id),
+    agentProbeAnswers: without(c.agentProbeAnswers, id),
+    agentProbePending: without(c.agentProbePending, id)
+  })
+};
+
 // src/session/thread-tabs.ts
 var threadTabId = (tab) => tab.conversationId ?? "new";
 var MAX_THREAD_TABS = 12;
@@ -84,16 +171,6 @@ function renameThreadTabIn(tabs, fromId, toId) {
     )
   };
 }
-function withThreadDrafts(threads, drafts) {
-  let changed = false;
-  const next = threads.map((tab) => {
-    const draft = drafts[threadTabId(tab)];
-    if (!draft || !tab.view || tab.view.draft) return tab;
-    changed = true;
-    return { ...tab, view: { ...tab.view, draft } };
-  });
-  return changed ? next : threads;
-}
 var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var stringOrNull = (v) => typeof v === "string" ? v : null;
 var stringOrUndefined = (v) => typeof v === "string" ? v : void 0;
@@ -101,7 +178,6 @@ function parseView(value) {
   if (!isRecord(value)) return void 0;
   return {
     cursor: stringOrNull(value.cursor),
-    draft: "",
     editingMessageId: stringOrNull(value.editingMessageId),
     preEditDraft: null,
     preEditCursor: stringOrNull(value.preEditCursor),
@@ -126,181 +202,681 @@ function parseSavedThreadTabs(threads, activeThread) {
     activeThread: active && tabs.some((tab) => threadTabId(tab) === active) ? active : null
   };
 }
-var savedThreadTabs = (threads) => threads.map(
-  (tab) => tab.view ? { ...tab, view: { ...tab.view, draft: "", preEditDraft: null } } : tab
-);
+var savedThreadTabs = (threads) => threads.map((tab) => tab.view ? { ...tab, view: { ...tab.view, preEditDraft: null } } : tab);
 
-// src/session/layout.ts
-var PANEL_MODES = ["main", "docked", "overlay", "popout"];
-var defaultPinned = () => typeof window === "undefined" || window.innerWidth >= 640;
-function defaultLayoutState() {
-  return {
-    shell: {
-      page: "home",
-      sidebar: { pinned: defaultPinned(), hovering: false, drawerOpen: false },
-      panels: { main: null, docked: null, overlay: null, popout: null, modes: {}, sizes: {} },
-      focusedArea: "main"
-    },
-    tabs: {
-      threads: [],
-      activeThread: null,
-      threadScrollRestore: null,
-      dm: [],
-      activeDm: null,
-      dmMessageId: null,
-      projects: [],
-      activeProject: null
-    },
-    views: { tabs: {}, filters: {}, values: {}, transient: {} },
-    grid: { states: {}, rowHeights: {}, labelWidths: {}, savedViews: {} }
-  };
-}
+// src/session/chat.ts
+var EMPTY_CHAT_STATE = {
+  conversationId: null,
+  generating: {},
+  paMode: false,
+  conversationDocuments: {},
+  conversationDocumentAutoAdd: {},
+  conversationFacts: {},
+  cursor: null,
+  suggestedQuery: null,
+  queuedMessages: {},
+  agentControlStates: {},
+  agentProbeAnswers: {},
+  agentProbePending: {},
+  drafts: {},
+  editingMessageId: null,
+  deepLinkMessageId: null,
+  activeCitationKey: null,
+  chatModel: void 0,
+  chatModelName: void 0,
+  newConversationAssistantMode: "always",
+  pendingTools: null,
+  autoSendDraft: false,
+  agentChatOwners: {},
+  newAgentChat: null,
+  newChatDocumentId: null,
+  messageTimers: {}
+};
 var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-var recordOf = (value, keep) => isRecord2(value) ? Object.fromEntries(Object.entries(value).filter(([, v]) => keep(v))) : {};
 var isString = (v) => typeof v === "string";
-var isNumber = (v) => typeof v === "number" && Number.isFinite(v);
-var isAny = (v) => v !== void 0;
-var isMode = (v) => PANEL_MODES.includes(v);
-var isSize = (v) => isRecord2(v) && isNumber(v.width) && isNumber(v.height);
-var isList = (v) => Array.isArray(v);
 var stringOrNull2 = (v) => isString(v) ? v : null;
-function parseSavedLayout(saved) {
+var recordOf = (value, read) => {
+  if (!isRecord2(value)) return {};
+  const out = {};
+  for (const [key, entry] of Object.entries(value)) {
+    const parsed = read(entry);
+    if (parsed !== null) out[key] = parsed;
+  }
+  return out;
+};
+var readDocuments = (value) => Array.isArray(value) ? value.filter((doc) => isRecord2(doc) && isString(doc.docId)).map((doc) => ({ docId: doc.docId, isPinned: doc.isPinned === true })) : null;
+var readFacts = (value) => Array.isArray(value) ? Array.from(new Set(value.filter(isString))) : null;
+function parseSavedChat(saved) {
   if (!isRecord2(saved) || saved.version !== 1) return null;
-  const shell = isRecord2(saved.shell) ? saved.shell : {};
-  const panels = isRecord2(shell.panels) ? shell.panels : {};
-  const tabs = isRecord2(saved.tabs) ? saved.tabs : {};
-  const views = isRecord2(saved.views) ? saved.views : {};
-  const grid = isRecord2(saved.grid) ? saved.grid : {};
-  const defaults = defaultLayoutState();
   return {
     version: 1,
-    migrated: isList(saved.migrated) ? saved.migrated.filter(isString) : [],
-    shell: {
-      page: isString(shell.page) ? shell.page : defaults.shell.page,
-      sidebarPinned: typeof shell.sidebarPinned === "boolean" ? shell.sidebarPinned : defaults.shell.sidebar.pinned,
-      panels: {
-        main: stringOrNull2(panels.main),
-        docked: stringOrNull2(panels.docked),
-        modes: recordOf(panels.modes, isMode),
-        sizes: recordOf(panels.sizes, isSize)
-      }
-    },
-    tabs: parseSavedThreadTabs(tabs.threads, tabs.activeThread),
-    views: {
-      tabs: recordOf(views.tabs, isString),
-      filters: recordOf(views.filters, isAny),
-      values: recordOf(views.values, isAny)
-    },
-    grid: {
-      states: recordOf(grid.states, isRecord2),
-      rowHeights: recordOf(grid.rowHeights, isNumber),
-      labelWidths: recordOf(grid.labelWidths, isNumber),
-      savedViews: recordOf(grid.savedViews, isList)
-    }
+    migrated: Array.isArray(saved.migrated) ? saved.migrated.filter(isString) : [],
+    conversationId: stringOrNull2(saved.conversationId),
+    cursor: stringOrNull2(saved.cursor),
+    conversationDocuments: recordOf(saved.conversationDocuments, readDocuments),
+    conversationDocumentAutoAdd: recordOf(
+      saved.conversationDocumentAutoAdd,
+      (v) => typeof v === "boolean" ? v : null
+    ),
+    conversationFacts: recordOf(saved.conversationFacts, readFacts),
+    agentChatOwners: recordOf(saved.agentChatOwners, (v) => isString(v) ? v : null),
+    agentChatOwnersUser: stringOrNull2(saved.agentChatOwnersUser),
+    chatModel: stringOrNull2(saved.chatModel)
   };
 }
-function savedLayoutOf(layout, migrated) {
-  const { shell, tabs, views, grid } = layout;
+function savedChatOf(state, migrated, agentChatOwnersUser = null) {
   return {
     version: 1,
     migrated,
-    shell: {
-      page: shell.page,
-      sidebarPinned: shell.sidebar.pinned,
-      // A panel over the page or in its own window does not come back after a reload.
-      panels: {
-        main: shell.panels.main,
-        docked: shell.panels.docked,
-        modes: shell.panels.modes,
-        sizes: shell.panels.sizes
-      }
-    },
-    tabs: { threads: savedThreadTabs(tabs.threads), activeThread: tabs.activeThread },
-    views: { tabs: views.tabs, filters: views.filters, values: views.values },
-    grid
-  };
-}
-function restoreLayout(current, saved) {
-  return {
-    ...current,
-    shell: {
-      ...current.shell,
-      page: saved.shell.page,
-      sidebar: { ...current.shell.sidebar, pinned: saved.shell.sidebarPinned },
-      panels: { ...current.shell.panels, ...saved.shell.panels }
-    },
-    tabs: { ...current.tabs, ...saved.tabs },
-    views: { ...saved.views, transient: current.views.transient },
-    grid: saved.grid
-  };
-}
-function openPanelIn(panels, panelId, mode) {
-  const leave = (slot) => slot === panelId ? null : slot;
-  const next = {
-    ...panels,
-    main: leave(panels.main),
-    docked: leave(panels.docked),
-    overlay: leave(panels.overlay),
-    popout: leave(panels.popout),
-    modes: { ...panels.modes, [panelId]: mode }
+    conversationId: state.conversationId,
+    cursor: state.cursor,
+    conversationDocuments: state.conversationDocuments,
+    conversationDocumentAutoAdd: { ...state.conversationDocumentAutoAdd },
+    conversationFacts: state.conversationFacts,
+    agentChatOwners: { ...state.agentChatOwners },
+    agentChatOwnersUser,
+    chatModel: state.chatModel ?? null
   };
-  if (mode === "docked") return { ...next, docked: panelId, overlay: null };
-  if (mode === "overlay") return { ...next, overlay: panelId, docked: null };
-  return { ...next, [mode]: panelId };
 }
-function closePanelIn(panels, panelId) {
-  const leave = (slot) => slot === panelId ? null : slot;
-  return {
-    ...panels,
-    main: leave(panels.main),
-    docked: leave(panels.docked),
-    overlay: leave(panels.overlay),
-    popout: leave(panels.popout)
-  };
+var SAVED_FIELDS = [
+  "conversationId",
+  "cursor",
+  "conversationDocuments",
+  "conversationDocumentAutoAdd",
+  "conversationFacts",
+  "agentChatOwners",
+  "chatModel"
+];
+function withoutNew(record) {
+  const saved = { ...record };
+  delete saved.new;
+  return saved;
 }
-function panelPlace(panels, panelId) {
-  return PANEL_MODES.find((mode) => panels[mode] === panelId) ?? null;
+function moveKey(record, fromId, toId) {
+  if (!(fromId in record)) return record;
+  const next = { ...record, [toId]: record[fromId] };
+  delete next[fromId];
+  return next;
 }
-var isPanelOpen = (state, panelId) => panelPlace(state.shell.panels, panelId) !== null;
-var dmTabId = (tab) => tab.recipientId ?? "new";
-function createArbiLayoutStore({
+var NO_EDIT = { draft: "", cursor: null };
+function createArbiChatStore({
+  layout,
   persist,
+  draftStorage,
+  scrollTop = () => null,
+  user = () => draftStorage?.owner() ?? null,
   initial
-} = {}) {
-  let layout = { ...defaultLayoutState(), ...initial };
+}) {
+  let state = { ...EMPTY_CHAT_STATE, ...initial };
   let migrated = [];
+  let ownersUser = null;
   let isHydrated = !persist;
   const listeners = /* @__PURE__ */ new Set();
+  const waiting = /* @__PURE__ */ new Set();
+  let depth = 0;
+  const settle = (listener) => depth > 0 ? waiting.add(listener) : listener();
+  const notify = () => listeners.forEach(settle);
+  const batch = (change) => {
+    depth += 1;
+    try {
+      return change();
+    } finally {
+      depth -= 1;
+      if (depth === 0) {
+        const told = [...waiting];
+        waiting.clear();
+        told.forEach((listener) => listener());
+      }
+    }
+  };
   const save = () => {
-    if (persist && isHydrated) persist.save(savedLayoutOf(layout, migrated));
+    if (persist && isHydrated) persist.save(savedChatOf(state, migrated, ownersUser));
   };
-  const update = (next) => {
-    if (next === layout) return;
-    const persisted = next.tabs.threads !== layout.tabs.threads || next.tabs.activeThread !== layout.tabs.activeThread || next.views.tabs !== layout.views.tabs || next.views.filters !== layout.views.filters || next.views.values !== layout.views.values || next.grid !== layout.grid || next.shell.page !== layout.shell.page || next.shell.sidebar.pinned !== layout.shell.sidebar.pinned || next.shell.panels !== layout.shell.panels;
-    layout = next;
-    listeners.forEach((listener) => listener());
-    if (persisted) save();
+  const update = (patch) => {
+    const next = { ...state, ...patch };
+    const saved = SAVED_FIELDS.some((key) => next[key] !== state[key]);
+    state = next;
+    notify();
+    if (saved) save();
   };
-  const shell = (change) => update({ ...layout, shell: { ...layout.shell, ...change } });
-  const tabs = (change) => update({ ...layout, tabs: { ...layout.tabs, ...change } });
-  const views = (change) => update({ ...layout, views: { ...layout.views, ...change } });
-  const grid = (change) => update({ ...layout, grid: { ...layout.grid, ...change } });
-  const hydration = persist ? persist.load().then(
-    (saved) => {
-      const parsed = parseSavedLayout(saved);
-      if (parsed) {
-        migrated = parsed.migrated;
-        layout = restoreLayout(layout, parsed);
-      }
-      isHydrated = true;
-      listeners.forEach((listener) => listener());
-    },
-    () => {
-      isHydrated = true;
-      listeners.forEach((listener) => listener());
-    }
-  ) : Promise.resolve();
-  return {
+  let preEdit = NO_EDIT;
+  let draftsRestored = !draftStorage;
+  let restoring = false;
+  let draftsOwner = draftStorage?.owner() ?? null;
+  const setDrafts = (drafts) => {
+    if (drafts === state.drafts) return;
+    update({ drafts });
+    if (draftsRestored) draftStorage?.save(drafts);
+  };
+  const setDraftOf = (key, text) => {
+    if ((state.drafts[key] ?? "") === text) return;
+    const drafts = { ...state.drafts };
+    if (text) drafts[key] = text;
+    else delete drafts[key];
+    setDrafts(drafts);
+  };
+  const keptDrafts = (drafts) => {
+    const open = new Set(layout.getLayout().tabs.threads.map(threadTabId));
+    open.add(state.conversationId ?? "new");
+    const keys = Object.keys(drafts);
+    if (keys.every((key) => open.has(key))) return drafts;
+    return Object.fromEntries(keys.filter((key) => open.has(key)).map((key) => [key, drafts[key]]));
+  };
+  const restoreDrafts = () => {
+    if (!draftStorage) return;
+    const owner = draftStorage.owner();
+    if (owner !== draftsOwner) {
+      if (draftsOwner !== null) update({ drafts: {} });
+      draftsOwner = owner;
+      draftsRestored = false;
+    }
+    if (draftsRestored || restoring || owner === null) return;
+    restoring = true;
+    void Promise.all([layout.hydrated(), hydration]).then(() => draftStorage.load()).then(
+      (saved) => {
+        restoring = false;
+        if (!saved || draftStorage.owner() !== owner) return;
+        draftsRestored = true;
+        setDrafts(keptDrafts({ ...saved, ...state.drafts }));
+        draftStorage.save(state.drafts);
+      },
+      () => {
+        restoring = false;
+      }
+    );
+  };
+  draftStorage?.onClear(() => {
+    draftsRestored = false;
+    draftsOwner = null;
+    preEdit = NO_EDIT;
+    if (Object.keys(state.drafts).length > 0) update({ drafts: {} });
+  });
+  const composer = () => ({
+    conversationId: state.conversationId,
+    view: {
+      cursor: state.cursor,
+      editingMessageId: state.editingMessageId,
+      preEditDraft: state.editingMessageId ? preEdit.draft : null,
+      preEditCursor: state.editingMessageId ? preEdit.cursor : null,
+      chatModel: state.chatModel,
+      chatModelName: state.chatModelName,
+      scrollTop: scrollTop()
+    }
+  });
+  const show = (next) => {
+    if (next === null) return;
+    const target = next === "list" ? { conversationId: null, view: void 0 } : next;
+    const view = target.view;
+    preEdit = view ? { draft: view.preEditDraft ?? "", cursor: view.preEditCursor ?? null } : NO_EDIT;
+    update({
+      conversationId: target.conversationId,
+      cursor: view?.cursor ?? null,
+      editingMessageId: view?.editingMessageId ?? null,
+      chatModel: view?.chatModel,
+      chatModelName: view?.chatModelName
+    });
+    if (!view) setDraftOf(target.conversationId ?? "new", "");
+  };
+  const afterTabs = () => setDrafts(keptDrafts(state.drafts));
+  const openThreadTab = (conversationId) => batch(() => {
+    update(
+      conversationId === null ? { newAgentChat: null, newChatDocumentId: null } : { newAgentChat: null }
+    );
+    const { tabId, show: next } = layout.threads.open(conversationId, composer());
+    show(next);
+    layout.setPageTab("conversations", tabId);
+    afterTabs();
+    return tabId;
+  });
+  const hydration = persist ? persist.load().then(
+    (saved) => {
+      const parsed = parseSavedChat(saved);
+      if (parsed) {
+        migrated = parsed.migrated;
+        ownersUser ??= parsed.agentChatOwnersUser;
+        const conversationId = state.conversationId ?? parsed.conversationId;
+        const savedOpen = conversationId === parsed.conversationId;
+        state = {
+          ...state,
+          conversationId,
+          cursor: state.cursor ?? (savedOpen ? parsed.cursor : null),
+          chatModel: state.chatModel ?? (savedOpen ? parsed.chatModel ?? void 0 : void 0),
+          conversationDocuments: {
+            ...parsed.conversationDocuments,
+            ...state.conversationDocuments
+          },
+          conversationDocumentAutoAdd: {
+            ...parsed.conversationDocumentAutoAdd,
+            ...state.conversationDocumentAutoAdd
+          },
+          conversationFacts: { ...parsed.conversationFacts, ...state.conversationFacts },
+          agentChatOwners: { ...parsed.agentChatOwners, ...state.agentChatOwners }
+        };
+      }
+      isHydrated = true;
+      notify();
+    },
+    () => {
+      isHydrated = true;
+      notify();
+    }
+  ) : Promise.resolve();
+  void Promise.all([layout.hydrated(), hydration]).then(() => {
+    const { threads, activeThread } = layout.getLayout().tabs;
+    const tab = activeThread ? threads.find((t) => threadTabId(t) === activeThread) : null;
+    if (tab && state.conversationId !== tab.conversationId)
+      update({ conversationId: tab.conversationId });
+  });
+  const generationOf = (conversationId) => state.generating[conversationId];
+  const setGeneration = (conversationId, generation) => update({ generating: { ...state.generating, [conversationId]: generation } });
+  const stopAll = () => Object.values(state.generating).forEach((generation) => generation.abortController?.abort());
+  return {
+    getState: () => state,
+    subscribe: (listener) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+        waiting.delete(listener);
+      };
+    },
+    settled: (listener) => () => settle(listener),
+    forget: (listener) => void waiting.delete(listener),
+    batch,
+    hydrated: () => hydration,
+    isHydrated: () => isHydrated,
+    restoreDrafts,
+    leave: () => batch(() => {
+      stopAll();
+      preEdit = NO_EDIT;
+      update({
+        conversationId: null,
+        cursor: null,
+        editingMessageId: null,
+        chatModel: void 0,
+        chatModelName: void 0,
+        newConversationAssistantMode: "always",
+        paMode: false,
+        generating: {},
+        // Saved conversations keep their documents; the unsent new chat's belong to this workspace.
+        conversationDocuments: withoutNew(state.conversationDocuments),
+        conversationDocumentAutoAdd: withoutNew(state.conversationDocumentAutoAdd),
+        conversationFacts: {},
+        newAgentChat: null,
+        newChatDocumentId: null,
+        messageTimers: {}
+      });
+      layout.threads.clear();
+      setDrafts({});
+    }),
+    reset: () => batch(() => {
+      stopAll();
+      preEdit = NO_EDIT;
+      const signedIn = user();
+      const keepOwners = signedIn === null || ownersUser === null || signedIn === ownersUser;
+      if (signedIn !== null) ownersUser = signedIn;
+      update({ ...EMPTY_CHAT_STATE, agentChatOwners: keepOwners ? state.agentChatOwners : {} });
+    }),
+    setConversationId: (id) => void openThreadTab(id),
+    openThreadTab,
+    closeThreadTab: (tabId) => batch(() => {
+      show(layout.threads.close(tabId));
+      layout.setPageTab("conversations", layout.getLayout().tabs.activeThread ?? "history");
+      afterTabs();
+    }),
+    selectThreadTab: (tabId) => batch(() => {
+      if (tabId !== null) {
+        show(layout.threads.select(tabId, composer()));
+        layout.setPageTab("conversations", tabId);
+        return;
+      }
+      layout.threads.showList(composer());
+      preEdit = NO_EDIT;
+      update({ conversationId: null, cursor: null, editingMessageId: null });
+      layout.setPageTab("conversations", "history");
+      afterTabs();
+    }),
+    moveConversation: (fromId, toId) => batch(() => {
+      update({
+        generating: moveKey(state.generating, fromId, toId),
+        conversationDocuments: moveKey(state.conversationDocuments, fromId, toId),
+        conversationDocumentAutoAdd: moveKey(state.conversationDocumentAutoAdd, fromId, toId),
+        conversationFacts: moveKey(state.conversationFacts, fromId, toId),
+        conversationId: state.conversationId ?? toId
+      });
+      layout.threads.rename(fromId, toId);
+      setDrafts(moveKey(state.drafts, fromId, toId));
+    }),
+    setConversationGenerating: (conversationId, isGenerating, abortController) => {
+      const current = generationOf(conversationId);
+      setGeneration(conversationId, {
+        ...current,
+        isGenerating,
+        error: isGenerating ? null : current?.error ?? null,
+        // Starting with an explicit null means generation this client does not own (an attach to a
+        // run started elsewhere): it must not inherit a finished local turn's controller, or the
+        // view takes it for a local stream and detaches, which makes it attachable again (an
+        // endless loop that froze the tab after Stop). Stopping keeps the controller: the finished
+        // turn's bookkeeping still matches on it.
+        abortController: isGenerating && abortController === null ? null : abortController ?? current?.abortController ?? null,
+        // The run's start is set when the server names its answer (setStreamingAssistantId).
+        startTime: null,
+        streamingAssistantId: null,
+        ...isGenerating ? { lastFailedMessage: null, backendElapsed: null } : {}
+      });
+    },
+    setStreamingAssistantId: (conversationId, streamingAssistantId, startTime = Date.now()) => setGeneration(conversationId, {
+      ...generationOf(conversationId) ?? { isGenerating: false, error: null },
+      streamingAssistantId,
+      startTime
+    }),
+    setBackendElapsed: (conversationId, backendElapsed) => setGeneration(conversationId, {
+      ...generationOf(conversationId) ?? { isGenerating: false, error: null, startTime: null },
+      backendElapsed
+    }),
+    setConversationError: (conversationId, error, lastFailedMessage) => {
+      const current = generationOf(conversationId);
+      setGeneration(conversationId, {
+        ...current,
+        isGenerating: false,
+        error,
+        startTime: current?.startTime ?? null,
+        lastFailedMessage: lastFailedMessage ?? current?.lastFailedMessage ?? null
+      });
+    },
+    clearConversationError: (conversationId) => setGeneration(conversationId, {
+      ...generationOf(conversationId) ?? { isGenerating: false, startTime: null },
+      error: null,
+      lastFailedMessage: null
+    }),
+    abortConversationGeneration: (conversationId) => {
+      const current = generationOf(conversationId);
+      current?.abortController?.abort();
+      setGeneration(conversationId, {
+        ...current ?? { error: null, startTime: null },
+        isGenerating: false,
+        abortController: null
+      });
+    },
+    setPaMode: (paMode) => {
+      if (state.paMode !== paMode) update({ paMode });
+    },
+    setConversationDocuments: (conversationId, documents, autoAdd = false) => update({
+      conversationDocuments: { ...state.conversationDocuments, [conversationId]: documents },
+      conversationDocumentAutoAdd: {
+        ...state.conversationDocumentAutoAdd,
+        [conversationId]: autoAdd
+      }
+    }),
+    setConversationFacts: (conversationId, factIds) => update({
+      conversationFacts: {
+        ...state.conversationFacts,
+        [conversationId]: Array.from(new Set(factIds))
+      }
+    }),
+    setCursor: (cursor) => {
+      if (state.cursor !== cursor) update({ cursor });
+    },
+    setSuggestedQuery: (suggestedQuery) => update({ suggestedQuery }),
+    addQueuedMessage: (id, message) => update({ queuedMessages: queuedMessages.add(state.queuedMessages, id, message) }),
+    acknowledgeQueuedMessage: (clientId, serverId) => update({
+      queuedMessages: queuedMessages.acknowledge(state.queuedMessages, clientId, serverId)
+    }),
+    removeQueuedMessage: (clientId) => update({ queuedMessages: queuedMessages.remove(state.queuedMessages, clientId) }),
+    removeQueuedMessageByServerId: (serverId) => update({ queuedMessages: queuedMessages.removeByServerId(state.queuedMessages, serverId) }),
+    consumeQueuedMessage: (id, content) => update({ queuedMessages: queuedMessages.consume(state.queuedMessages, id, content) }),
+    clearQueuedMessages: (id) => update({ queuedMessages: queuedMessages.clear(state.queuedMessages, id) }),
+    moveQueuedMessages: (from, to) => update({ queuedMessages: queuedMessages.move(state.queuedMessages, from, to) }),
+    setAgentControlState: (id, control) => update(agentControl.setState(state, id, control)),
+    setAgentProbeAnswer: (id, probe) => update(agentControl.setProbeAnswer(state, id, probe)),
+    setAgentProbePending: (id, pending) => update(agentControl.setProbePending(state, id, pending)),
+    clearAgentControl: (id) => update(agentControl.clear(state, id)),
+    setDraft: (text) => setDraftOf(state.conversationId ?? "new", text),
+    setChatModel: (chatModel) => {
+      if (state.chatModel !== chatModel) update({ chatModel });
+    },
+    setChatModelName: (chatModelName) => {
+      if (state.chatModelName !== chatModelName) update({ chatModelName });
+    },
+    setNewConversationAssistantMode: (newConversationAssistantMode) => {
+      if (state.newConversationAssistantMode !== newConversationAssistantMode)
+        update({ newConversationAssistantMode });
+    },
+    setNewAgentChat: (newAgentChat) => {
+      const current = state.newAgentChat;
+      if (current?.agentId !== newAgentChat?.agentId || current?.workspaceId !== newAgentChat?.workspaceId)
+        update({ newAgentChat });
+    },
+    setNewChatDocumentId: (newChatDocumentId) => {
+      if (state.newChatDocumentId !== newChatDocumentId) update({ newChatDocumentId });
+    },
+    startEditing: (messageId, content) => batch(() => {
+      const key = state.conversationId ?? "new";
+      preEdit = { draft: state.drafts[key] ?? "", cursor: state.cursor };
+      update({ editingMessageId: messageId });
+      setDraftOf(key, content);
+    }),
+    cancelEditing: () => {
+      if (!state.editingMessageId) return;
+      const restore = preEdit;
+      preEdit = NO_EDIT;
+      batch(() => {
+        update({ editingMessageId: null, cursor: restore.cursor });
+        setDraftOf(state.conversationId ?? "new", restore.draft);
+      });
+    },
+    completeEditing: () => {
+      preEdit = NO_EDIT;
+      if (state.editingMessageId) update({ editingMessageId: null });
+    },
+    setDeepLinkMessageId: (deepLinkMessageId) => {
+      if (state.deepLinkMessageId !== deepLinkMessageId) update({ deepLinkMessageId });
+    },
+    setActiveCitationKey: (activeCitationKey) => {
+      if (state.activeCitationKey !== activeCitationKey) update({ activeCitationKey });
+    },
+    setPendingTools: (pendingTools) => update({ pendingTools }),
+    setAutoSendDraft: (autoSendDraft) => {
+      if (state.autoSendDraft !== autoSendDraft) update({ autoSendDraft });
+    },
+    setAgentChatOwner: (conversationId, agentId) => {
+      const signedIn = user();
+      ownersUser = signedIn ?? ownersUser;
+      update({ agentChatOwners: { ...state.agentChatOwners, [conversationId]: agentId } });
+    },
+    setMessageTimer: (key, timer) => update({ messageTimers: { ...state.messageTimers, [key]: timer } }),
+    clearMessageTimer: (key) => {
+      if (!(key in state.messageTimers)) return;
+      const messageTimers = { ...state.messageTimers };
+      delete messageTimers[key];
+      update({ messageTimers });
+    },
+    startNewConversation: () => batch(() => {
+      preEdit = NO_EDIT;
+      update({
+        conversationId: null,
+        cursor: null,
+        editingMessageId: null,
+        chatModel: void 0,
+        chatModelName: void 0,
+        newConversationAssistantMode: "always",
+        paMode: false,
+        newChatDocumentId: null
+      });
+    })
+  };
+}
+
+// src/session/layout.ts
+var PANEL_MODES = ["main", "docked", "overlay", "popout"];
+var defaultPinned = () => typeof window === "undefined" || window.innerWidth >= 640;
+function defaultLayoutState() {
+  return {
+    shell: {
+      page: "home",
+      sidebar: { pinned: defaultPinned(), hovering: false, drawerOpen: false },
+      panels: { main: null, docked: null, overlay: null, popout: null, modes: {}, sizes: {} },
+      focusedArea: "main"
+    },
+    tabs: {
+      threads: [],
+      activeThread: null,
+      threadScrollRestore: null,
+      dm: [],
+      activeDm: null,
+      dmMessageId: null,
+      projects: [],
+      activeProject: null
+    },
+    views: { tabs: {}, filters: {}, values: {}, transient: {} },
+    grid: { states: {}, rowHeights: {}, labelWidths: {}, savedViews: {} }
+  };
+}
+var isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var recordOf2 = (value, keep) => isRecord3(value) ? Object.fromEntries(Object.entries(value).filter(([, v]) => keep(v))) : {};
+var isString2 = (v) => typeof v === "string";
+var isNumber = (v) => typeof v === "number" && Number.isFinite(v);
+var isAny = (v) => v !== void 0;
+var isMode = (v) => PANEL_MODES.includes(v);
+var isSize = (v) => isRecord3(v) && isNumber(v.width) && isNumber(v.height);
+var isList = (v) => Array.isArray(v);
+var stringOrNull3 = (v) => isString2(v) ? v : null;
+function parseSavedLayout(saved) {
+  if (!isRecord3(saved) || saved.version !== 1) return null;
+  const shell = isRecord3(saved.shell) ? saved.shell : {};
+  const panels = isRecord3(shell.panels) ? shell.panels : {};
+  const tabs = isRecord3(saved.tabs) ? saved.tabs : {};
+  const views = isRecord3(saved.views) ? saved.views : {};
+  const grid = isRecord3(saved.grid) ? saved.grid : {};
+  const defaults = defaultLayoutState();
+  return {
+    version: 1,
+    migrated: isList(saved.migrated) ? saved.migrated.filter(isString2) : [],
+    shell: {
+      page: isString2(shell.page) ? shell.page : defaults.shell.page,
+      sidebarPinned: typeof shell.sidebarPinned === "boolean" ? shell.sidebarPinned : defaults.shell.sidebar.pinned,
+      panels: {
+        main: stringOrNull3(panels.main),
+        docked: stringOrNull3(panels.docked),
+        modes: recordOf2(panels.modes, isMode),
+        sizes: recordOf2(panels.sizes, isSize)
+      }
+    },
+    tabs: parseSavedThreadTabs(tabs.threads, tabs.activeThread),
+    views: {
+      tabs: recordOf2(views.tabs, isString2),
+      filters: recordOf2(views.filters, isAny),
+      values: recordOf2(views.values, isAny)
+    },
+    grid: {
+      states: recordOf2(grid.states, isRecord3),
+      rowHeights: recordOf2(grid.rowHeights, isNumber),
+      labelWidths: recordOf2(grid.labelWidths, isNumber),
+      savedViews: recordOf2(grid.savedViews, isList)
+    }
+  };
+}
+function savedLayoutOf(layout, migrated) {
+  const { shell, tabs, views, grid } = layout;
+  return {
+    version: 1,
+    migrated,
+    shell: {
+      page: shell.page,
+      sidebarPinned: shell.sidebar.pinned,
+      // A panel over the page or in its own window does not come back after a reload.
+      panels: {
+        main: shell.panels.main,
+        docked: shell.panels.docked,
+        modes: shell.panels.modes,
+        sizes: shell.panels.sizes
+      }
+    },
+    tabs: { threads: savedThreadTabs(tabs.threads), activeThread: tabs.activeThread },
+    views: { tabs: views.tabs, filters: views.filters, values: views.values },
+    grid
+  };
+}
+function restoreLayout(current, saved) {
+  return {
+    ...current,
+    shell: {
+      ...current.shell,
+      page: saved.shell.page,
+      sidebar: { ...current.shell.sidebar, pinned: saved.shell.sidebarPinned },
+      panels: { ...current.shell.panels, ...saved.shell.panels }
+    },
+    tabs: { ...current.tabs, ...saved.tabs },
+    views: { ...saved.views, transient: current.views.transient },
+    grid: saved.grid
+  };
+}
+function openPanelIn(panels, panelId, mode) {
+  const leave = (slot) => slot === panelId ? null : slot;
+  const next = {
+    ...panels,
+    main: leave(panels.main),
+    docked: leave(panels.docked),
+    overlay: leave(panels.overlay),
+    popout: leave(panels.popout),
+    modes: { ...panels.modes, [panelId]: mode }
+  };
+  if (mode === "docked") return { ...next, docked: panelId, overlay: null };
+  if (mode === "overlay") return { ...next, overlay: panelId, docked: null };
+  return { ...next, [mode]: panelId };
+}
+function closePanelIn(panels, panelId) {
+  const leave = (slot) => slot === panelId ? null : slot;
+  return {
+    ...panels,
+    main: leave(panels.main),
+    docked: leave(panels.docked),
+    overlay: leave(panels.overlay),
+    popout: leave(panels.popout)
+  };
+}
+function panelPlace(panels, panelId) {
+  return PANEL_MODES.find((mode) => panels[mode] === panelId) ?? null;
+}
+var isPanelOpen = (state, panelId) => panelPlace(state.shell.panels, panelId) !== null;
+var dmTabId = (tab) => tab.recipientId ?? "new";
+function createArbiLayoutStore({
+  persist,
+  initial
+} = {}) {
+  let layout = { ...defaultLayoutState(), ...initial };
+  let migrated = [];
+  let isHydrated = !persist;
+  const listeners = /* @__PURE__ */ new Set();
+  const save = () => {
+    if (persist && isHydrated) persist.save(savedLayoutOf(layout, migrated));
+  };
+  const update = (next) => {
+    if (next === layout) return;
+    const persisted = next.tabs.threads !== layout.tabs.threads || next.tabs.activeThread !== layout.tabs.activeThread || next.views.tabs !== layout.views.tabs || next.views.filters !== layout.views.filters || next.views.values !== layout.views.values || next.grid !== layout.grid || next.shell.page !== layout.shell.page || next.shell.sidebar.pinned !== layout.shell.sidebar.pinned || next.shell.panels !== layout.shell.panels;
+    layout = next;
+    listeners.forEach((listener) => listener());
+    if (persisted) save();
+  };
+  const shell = (change) => update({ ...layout, shell: { ...layout.shell, ...change } });
+  const tabs = (change) => update({ ...layout, tabs: { ...layout.tabs, ...change } });
+  const views = (change) => update({ ...layout, views: { ...layout.views, ...change } });
+  const grid = (change) => update({ ...layout, grid: { ...layout.grid, ...change } });
+  const hydration = persist ? persist.load().then(
+    (saved) => {
+      const parsed = parseSavedLayout(saved);
+      if (parsed) {
+        migrated = parsed.migrated;
+        layout = restoreLayout(layout, parsed);
+      }
+      isHydrated = true;
+      listeners.forEach((listener) => listener());
+    },
+    () => {
+      isHydrated = true;
+      listeners.forEach((listener) => listener());
+    }
+  ) : Promise.resolve();
+  return {
     getLayout: () => layout,
     reset: () => update(defaultLayoutState()),
     subscribe: (listener) => {
@@ -334,10 +910,6 @@ function createArbiLayoutStore({
         if (layout.tabs.threads.length > 0 || layout.tabs.activeThread !== null)
           tabs({ threads: [], activeThread: null });
       },
-      restoreDrafts: (drafts) => {
-        const threads = withThreadDrafts(layout.tabs.threads, drafts);
-        if (threads !== layout.tabs.threads) tabs({ threads });
-      },
       consumeScrollRestore: () => {
         const value = layout.tabs.threadScrollRestore;
         if (value !== null) tabs({ threadScrollRestore: null });
@@ -520,135 +1092,27 @@ function readWorkspaceLastOpened(lastOpenedKey = WORKSPACE_LAST_OPENED_KEY) {
   } catch {
     return {};
   }
-}
-
-// src/chat/run-state.ts
-var MIN_QUEUED_MESSAGE_VISIBILITY_MS = 800;
-var mapQueues = (queues, update) => Object.fromEntries(Object.entries(queues).map(([id, messages]) => [id, update(messages)]));
-function findConsumedMessages(messages, combinedContent) {
-  const text = combinedContent.trim();
-  const taken = /* @__PURE__ */ new Set();
-  let cursor = 0;
-  for (const message of messages) {
-    if (cursor >= text.length) break;
-    const content = message.content.trim();
-    if (!content) continue;
-    const separator = cursor === 0 ? "" : "\n\n";
-    if (text.startsWith(separator + content, cursor)) {
-      taken.add(message.clientId);
-      cursor += separator.length + content.length;
-    }
-  }
-  return cursor === text.length ? taken : /* @__PURE__ */ new Set();
-}
-var queuedMessages = {
-  add: (q, responseId, message) => ({
-    ...q,
-    [responseId]: [...q[responseId] ?? [], message]
-  }),
-  acknowledge: (q, clientId, serverId) => mapQueues(
-    q,
-    (messages) => messages.map((m) => m.clientId === clientId ? { ...m, serverId, acknowledged: true } : m)
-  ),
-  remove: (q, clientId) => mapQueues(q, (messages) => messages.filter((m) => m.clientId !== clientId)),
-  removeByServerId: (q, serverId) => mapQueues(q, (messages) => messages.filter((m) => m.serverId !== serverId)),
-  removeByContent: (q, responseId, content) => {
-    let removed = false;
-    return {
-      ...q,
-      [responseId]: (q[responseId] ?? []).filter((m) => {
-        if (!removed && m.content === content) {
-          removed = true;
-          return false;
-        }
-        return true;
-      })
-    };
-  },
-  /** Take out the prompts a steering interjection delivered into the run. */
-  consume: (q, responseId, combinedContent) => {
-    const messages = q[responseId] ?? [];
-    const consumed = findConsumedMessages(messages, combinedContent);
-    return { ...q, [responseId]: messages.filter((m) => !consumed.has(m.clientId)) };
-  },
-  clear: (q, responseId) => ({ ...q, [responseId]: [] }),
-  /** Move the entries still waiting on a finished turn to the turn that is now running. */
-  move: (q, fromResponseId, toResponseId) => {
-    const waiting = q[fromResponseId] ?? [];
-    if (fromResponseId === toResponseId || waiting.length === 0) return q;
-    return { ...q, [fromResponseId]: [], [toResponseId]: [...q[toResponseId] ?? [], ...waiting] };
-  },
-  /** Find a queued follow-up by its client id, under whichever turn holds it. */
-  find: (q, clientId) => Object.values(q).flat().find((m) => m.clientId === clientId)
-};
-var without = (record, key) => {
-  const next = { ...record };
-  delete next[key];
-  return next;
-};
-var agentControl = {
-  setState: (c, id, state) => ({
-    ...c,
-    agentControlStates: { ...c.agentControlStates, [id]: state }
-  }),
-  /** A probe answered: the latest answer, and nothing pending any more. */
-  setProbeAnswer: (c, id, probe) => ({
-    ...c,
-    agentProbeAnswers: { ...c.agentProbeAnswers, [id]: probe },
-    agentProbePending: { ...c.agentProbePending, [id]: false }
-  }),
-  setProbePending: (c, id, pending) => ({
-    ...c,
-    agentProbePending: { ...c.agentProbePending, [id]: pending }
-  }),
-  /** The turn is over: drop its control state. */
-  clear: (c, id) => ({
-    agentControlStates: without(c.agentControlStates, id),
-    agentProbeAnswers: without(c.agentProbeAnswers, id),
-    agentProbePending: without(c.agentProbePending, id)
-  })
-};
-
-// src/session/store.ts
-var DEFAULT_DOCUMENT_VIEWER_STATE = {
-  tab: "pdf",
-  compareId: null,
-  tabRequest: null,
-  textScale: 1,
-  phonePdfChosen: false
-};
-var EMPTY_SESSION_STATE = {
-  workspaceId: null,
-  workspaceStatus: "closed",
-  conversationId: null,
-  viewingDocument: null,
-  documentViewer: DEFAULT_DOCUMENT_VIEWER_STATE,
-  selectedDocumentIds: [],
-  generating: {},
-  paMode: false,
-  conversationDocuments: {},
-  conversationDocumentAutoAdd: {},
-  conversationFacts: {},
-  pinnedDocumentId: null,
-  cursor: null,
-  suggestedQuery: null,
-  queuedMessages: {},
-  agentControlStates: {},
-  agentProbeAnswers: {},
-  agentProbePending: {},
-  drafts: {},
-  editingMessageId: null,
-  deepLinkMessageId: null,
-  activeCitationKey: null,
-  chatModel: void 0,
-  chatModelName: void 0,
-  newConversationAssistantMode: "always",
-  pendingTools: null,
-  autoSendDraft: false,
-  agentChatOwners: {},
-  newAgentChat: null,
-  newChatDocumentId: null,
-  messageTimers: {},
+}
+
+// src/session/store.ts
+var DEFAULT_DOCUMENT_VIEWER_STATE = {
+  tab: "pdf",
+  compareId: null,
+  tabRequest: null,
+  textScale: 1,
+  phonePdfChosen: false
+};
+var EMPTY_DOCUMENT_STATE = {
+  viewingDocument: null,
+  documentViewer: DEFAULT_DOCUMENT_VIEWER_STATE,
+  selectedDocumentIds: [],
+  pinnedDocumentId: null
+};
+var EMPTY_SESSION_STATE = {
+  workspaceId: null,
+  workspaceStatus: "closed",
+  ...EMPTY_CHAT_STATE,
+  ...EMPTY_DOCUMENT_STATE,
   ...defaultLayoutState()
 };
 var selectViewingDocumentId = (state) => state.viewingDocument ? parseVersionRef(state.viewingDocument.id).docId : null;
@@ -664,155 +1128,19 @@ function nextViewingDocument(current, input) {
     passageId: input.passageId !== void 0 ? input.passageId : current?.passageId ?? null
   };
 }
-function layoutActionsOf(layout) {
-  const actions = { ...layout };
-  delete actions.getLayout;
-  delete actions.subscribe;
-  delete actions.hydrated;
-  delete actions.isHydrated;
-  delete actions.reset;
-  delete actions.threads;
-  return actions;
-}
-function withoutNew(record) {
-  const { new: _new, ...saved } = record;
-  return saved;
-}
-function createArbiSessionStore(initial = {}, {
-  draftStorage,
-  persist,
-  workspace = createArbiWorkspaceStore({ workspaceId: initial.workspaceId ?? null })
-} = {}) {
-  const { shell, tabs, views, grid, ...rest } = initial;
-  const layout = createArbiLayoutStore({
-    persist,
-    initial: Object.fromEntries(
-      Object.entries({ shell, tabs, views, grid }).filter(([, part]) => part !== void 0)
-    )
-  });
-  if (initial.workspaceStatus) workspace.setWorkspaceStatus(initial.workspaceStatus);
-  let state = {
-    ...EMPTY_SESSION_STATE,
-    ...rest,
-    ...layout.getLayout(),
-    ...workspace.getState()
-  };
+function createArbiDocumentSessionStore(initial = {}) {
+  let state = { ...EMPTY_DOCUMENT_STATE, ...initial };
   const listeners = /* @__PURE__ */ new Set();
   const update = (patch) => {
     state = { ...state, ...patch };
     listeners.forEach((listener) => listener());
   };
-  layout.subscribe(() => update(layout.getLayout()));
-  workspace.subscribe(() => update(workspace.getState()));
-  let preEdit = { draft: "", cursor: null };
-  let draftsRestored = !draftStorage;
-  let draftsOwner = draftStorage?.owner() ?? null;
-  const restoreDrafts = () => {
-    if (!draftStorage) return;
-    const owner = draftStorage.owner();
-    if (owner !== draftsOwner) {
-      if (draftsOwner !== null) update({ drafts: {} });
-      draftsOwner = owner;
-      draftsRestored = false;
-    }
-    if (draftsRestored) return;
-    draftsRestored = true;
-    void draftStorage.load().then(
-      (saved) => {
-        if (saved && draftStorage.owner() === owner)
-          update({ drafts: { ...saved, ...state.drafts } });
-        else draftsRestored = false;
-      },
-      () => {
-        draftsRestored = false;
-      }
-    );
-  };
-  draftStorage?.onClear(() => {
-    draftsRestored = false;
-    draftsOwner = null;
-    preEdit = { draft: "", cursor: null };
-    if (Object.keys(state.drafts).length > 0) update({ drafts: {} });
-  });
-  restoreDrafts();
-  const setDrafts = (drafts) => {
-    update({ drafts });
-    draftStorage?.save(drafts);
-  };
-  const setDraftOf = (key, text) => {
-    if ((state.drafts[key] ?? "") === text) return;
-    const drafts = { ...state.drafts };
-    if (text) drafts[key] = text;
-    else delete drafts[key];
-    setDrafts(drafts);
-  };
-  const composer = () => ({
-    conversationId: state.conversationId,
-    view: {
-      cursor: state.cursor,
-      draft: selectDraft(state),
-      editingMessageId: state.editingMessageId,
-      preEditDraft: state.editingMessageId ? preEdit.draft : null,
-      preEditCursor: state.editingMessageId ? preEdit.cursor : null,
-      chatModel: state.chatModel,
-      chatModelName: state.chatModelName,
-      scrollTop: null
-    }
-  });
-  const show = (next) => {
-    if (next === null) return;
-    if (next === "list") {
-      preEdit = { draft: "", cursor: null };
-      return update({ conversationId: null, cursor: null, editingMessageId: null });
-    }
-    const view = next.view;
-    preEdit = { draft: view?.preEditDraft ?? "", cursor: view?.preEditCursor ?? null };
-    update({
-      conversationId: next.conversationId,
-      cursor: view?.cursor ?? null,
-      editingMessageId: view?.editingMessageId ?? null,
-      chatModel: view?.chatModel,
-      chatModelName: view?.chatModelName
-    });
-  };
   return {
-    ...layoutActionsOf(layout),
-    layoutHydrated: () => layout.hydrated(),
-    isLayoutHydrated: () => layout.isHydrated(),
     getState: () => state,
     subscribe: (listener) => {
       listeners.add(listener);
       return () => listeners.delete(listener);
     },
-    setWorkspaceId: (workspaceId) => {
-      workspace.setWorkspaceId(workspaceId);
-      restoreDrafts();
-    },
-    setWorkspaceStatus: (workspaceStatus) => workspace.setWorkspaceStatus(workspaceStatus),
-    leaveWorkspace: () => {
-      Object.values(state.generating).forEach((generation) => generation.abortController?.abort());
-      workspace.setWorkspaceStatus("closed");
-      update({
-        conversationId: null,
-        cursor: null,
-        viewingDocument: null,
-        selectedDocumentIds: [],
-        generating: {},
-        // Saved conversations keep their documents; the unsent new chat's belong to this workspace.
-        conversationDocuments: withoutNew(state.conversationDocuments),
-        conversationDocumentAutoAdd: withoutNew(state.conversationDocumentAutoAdd),
-        conversationFacts: {},
-        pinnedDocumentId: null,
-        newAgentChat: null,
-        newChatDocumentId: null,
-        messageTimers: {}
-      });
-      layout.threads.clear();
-    },
-    setConversationId: (conversationId) => {
-      if (state.conversationId !== conversationId)
-        update({ conversationId, cursor: null, editingMessageId: null });
-    },
     setViewingDocument: (input) => update({ viewingDocument: nextViewingDocument(state.viewingDocument, input) }),
     setDocumentViewer: (change) => {
       const next = { ...state.documentViewer, ...change };
@@ -821,209 +1149,117 @@ function createArbiSessionStore(initial = {}, {
         update({ documentViewer: next });
     },
     setSelectedDocumentIds: (ids) => update({ selectedDocumentIds: ids }),
-    setConversationGenerating: (conversationId, isGenerating, abortController = null) => {
-      const current = state.generating[conversationId];
-      update({
-        generating: {
-          ...state.generating,
-          [conversationId]: {
-            ...current,
-            isGenerating,
-            error: isGenerating ? null : current?.error ?? null,
-            startTime: isGenerating ? Date.now() : null,
-            streamingAssistantId: isGenerating ? current?.streamingAssistantId ?? null : null,
-            backendElapsed: isGenerating ? current?.backendElapsed ?? null : null,
-            abortController
-          }
-        }
-      });
-    },
-    setStreamingAssistantId: (conversationId, streamingAssistantId, startTime = Date.now()) => {
-      const current = state.generating[conversationId];
-      update({
-        generating: {
-          ...state.generating,
-          [conversationId]: {
-            ...current ?? { isGenerating: false, error: null },
-            streamingAssistantId,
-            startTime
-          }
-        }
-      });
-    },
-    setBackendElapsed: (conversationId, backendElapsed) => {
-      const current = state.generating[conversationId] ?? {
-        isGenerating: false,
-        error: null,
-        startTime: null
-      };
-      update({
-        generating: { ...state.generating, [conversationId]: { ...current, backendElapsed } }
-      });
-    },
-    moveConversation: (fromId, toId) => {
-      const move = (record) => {
-        const next = { ...record };
-        if (fromId in next) {
-          next[toId] = next[fromId];
-          delete next[fromId];
-        }
-        return next;
-      };
-      update({
-        generating: move(state.generating),
-        conversationDocuments: move(state.conversationDocuments),
-        conversationDocumentAutoAdd: move(state.conversationDocumentAutoAdd),
-        conversationFacts: move(state.conversationFacts),
-        conversationId: state.conversationId ?? toId
-      });
-      layout.threads.rename(fromId, toId);
-      if (fromId in state.drafts) setDrafts(move(state.drafts));
-    },
-    setConversationFacts: (conversationId, factIds) => update({ conversationFacts: { ...state.conversationFacts, [conversationId]: factIds } }),
     setPinnedDocumentId: (pinnedDocumentId) => update({ pinnedDocumentId }),
-    setCursor: (cursor) => {
-      if (state.cursor !== cursor) update({ cursor });
-    },
-    setSuggestedQuery: (suggestedQuery) => update({ suggestedQuery }),
-    addQueuedMessage: (id, message) => update({ queuedMessages: queuedMessages.add(state.queuedMessages, id, message) }),
-    acknowledgeQueuedMessage: (clientId, serverId) => update({
-      queuedMessages: queuedMessages.acknowledge(state.queuedMessages, clientId, serverId)
-    }),
-    removeQueuedMessage: (clientId) => update({ queuedMessages: queuedMessages.remove(state.queuedMessages, clientId) }),
-    removeQueuedMessageByServerId: (serverId) => update({ queuedMessages: queuedMessages.removeByServerId(state.queuedMessages, serverId) }),
-    consumeQueuedMessage: (id, content) => update({ queuedMessages: queuedMessages.consume(state.queuedMessages, id, content) }),
-    clearQueuedMessages: (id) => update({ queuedMessages: queuedMessages.clear(state.queuedMessages, id) }),
-    moveQueuedMessages: (from, to) => update({ queuedMessages: queuedMessages.move(state.queuedMessages, from, to) }),
-    setAgentControlState: (id, control) => update(agentControl.setState(state, id, control)),
-    setAgentProbeAnswer: (id, probe) => update(agentControl.setProbeAnswer(state, id, probe)),
-    setAgentProbePending: (id, pending) => update(agentControl.setProbePending(state, id, pending)),
-    clearAgentControl: (id) => update(agentControl.clear(state, id)),
-    setDraft: (text) => setDraftOf(conversationKey(state), text),
-    setChatModel: (chatModel) => {
-      if (state.chatModel !== chatModel) update({ chatModel });
-    },
-    openThreadTab: (conversationId) => {
-      if (conversationId === null) update({ newAgentChat: null, newChatDocumentId: null });
-      else if (state.newAgentChat) update({ newAgentChat: null });
-      const { tabId, show: next } = layout.threads.open(conversationId, composer());
-      show(next);
-      return tabId;
-    },
-    closeThreadTab: (tabId) => show(layout.threads.close(tabId)),
-    selectThreadTab: (tabId) => {
-      if (tabId !== null) return show(layout.threads.select(tabId, composer()));
-      layout.threads.showList(composer());
-      show("list");
-    },
-    setChatModelName: (chatModelName) => {
-      if (state.chatModelName !== chatModelName) update({ chatModelName });
-    },
-    setNewConversationAssistantMode: (newConversationAssistantMode) => {
-      if (state.newConversationAssistantMode !== newConversationAssistantMode)
-        update({ newConversationAssistantMode });
-    },
-    setNewAgentChat: (newAgentChat) => {
-      const current = state.newAgentChat;
-      if (current?.agentId !== newAgentChat?.agentId || current?.workspaceId !== newAgentChat?.workspaceId)
-        update({ newAgentChat });
-    },
-    setNewChatDocumentId: (newChatDocumentId) => {
-      if (state.newChatDocumentId !== newChatDocumentId) update({ newChatDocumentId });
-    },
-    startEditing: (messageId, content) => {
-      preEdit = { draft: selectDraft(state), cursor: state.cursor };
-      update({ editingMessageId: messageId });
-      setDraftOf(conversationKey(state), content);
-    },
-    cancelEditing: () => {
-      if (!state.editingMessageId) return;
-      update({ editingMessageId: null, cursor: preEdit.cursor });
-      setDraftOf(conversationKey(state), preEdit.draft);
-      preEdit = { draft: "", cursor: null };
-    },
-    completeEditing: () => {
-      preEdit = { draft: "", cursor: null };
-      if (state.editingMessageId) update({ editingMessageId: null });
-    },
-    setDeepLinkMessageId: (deepLinkMessageId) => {
-      if (state.deepLinkMessageId !== deepLinkMessageId) update({ deepLinkMessageId });
-    },
-    setActiveCitationKey: (activeCitationKey) => {
-      if (state.activeCitationKey !== activeCitationKey) update({ activeCitationKey });
-    },
-    setPendingTools: (pendingTools) => update({ pendingTools }),
-    setAutoSendDraft: (autoSendDraft) => {
-      if (state.autoSendDraft !== autoSendDraft) update({ autoSendDraft });
-    },
-    setAgentChatOwner: (conversationId, agentId) => update({ agentChatOwners: { ...state.agentChatOwners, [conversationId]: agentId } }),
-    setMessageTimer: (key, timer) => update({ messageTimers: { ...state.messageTimers, [key]: timer } }),
-    clearMessageTimer: (key) => {
-      if (!(key in state.messageTimers)) return;
-      const messageTimers = { ...state.messageTimers };
-      delete messageTimers[key];
-      update({ messageTimers });
-    },
-    setConversationError: (conversationId, error, lastFailedMessage) => {
-      const current = state.generating[conversationId];
-      update({
-        generating: {
-          ...state.generating,
-          [conversationId]: {
-            ...current,
-            isGenerating: false,
-            error,
-            startTime: current?.startTime ?? null,
-            lastFailedMessage: lastFailedMessage ?? current?.lastFailedMessage ?? null
-          }
-        }
-      });
-    },
-    clearConversationError: (conversationId) => {
-      const current = state.generating[conversationId];
-      update({
-        generating: {
-          ...state.generating,
-          [conversationId]: {
-            ...current ?? { isGenerating: false, startTime: null },
-            error: null,
-            lastFailedMessage: null
-          }
-        }
-      });
-    },
-    abortConversationGeneration: (conversationId) => {
-      const current = state.generating[conversationId];
-      current?.abortController?.abort();
-      update({
-        generating: {
-          ...state.generating,
-          [conversationId]: {
-            ...current ?? { error: null, startTime: null },
-            isGenerating: false,
-            abortController: null
-          }
-        }
-      });
+    leave: () => update({ viewingDocument: null, selectedDocumentIds: [], pinnedDocumentId: null })
+  };
+}
+function layoutActionsOf(layout) {
+  const actions = { ...layout };
+  delete actions.getLayout;
+  delete actions.subscribe;
+  delete actions.hydrated;
+  delete actions.isHydrated;
+  delete actions.reset;
+  delete actions.threads;
+  return actions;
+}
+function chatActionsOf(chat) {
+  const actions = { ...chat };
+  delete actions.getState;
+  delete actions.subscribe;
+  delete actions.settled;
+  delete actions.forget;
+  delete actions.batch;
+  delete actions.hydrated;
+  delete actions.isHydrated;
+  delete actions.restoreDrafts;
+  delete actions.leave;
+  delete actions.reset;
+  return actions;
+}
+function composeArbiSessionStore({
+  layout,
+  workspace,
+  chat,
+  documents
+}) {
+  let last = null;
+  const getState = () => {
+    const parts = [
+      layout.getLayout(),
+      workspace.getState(),
+      documents.getState(),
+      chat.getState()
+    ];
+    if (last && parts.every((part, i) => part === last.parts[i])) return last.state;
+    const [l, w, d, c] = parts;
+    last = { parts, state: { ...l, ...w, ...d, ...c } };
+    return last.state;
+  };
+  chat.restoreDrafts();
+  workspace.subscribe(() => chat.restoreDrafts());
+  return {
+    ...layoutActionsOf(layout),
+    ...chatActionsOf(chat),
+    getState,
+    layoutHydrated: () => layout.hydrated(),
+    isLayoutHydrated: () => layout.isHydrated(),
+    subscribe: (onChange) => {
+      const told = chat.settled(onChange);
+      const unsubscribe = [
+        chat.subscribe(onChange),
+        layout.subscribe(told),
+        workspace.subscribe(told),
+        documents.subscribe(told)
+      ];
+      return () => {
+        chat.forget(onChange);
+        unsubscribe.forEach((stop) => stop());
+      };
     },
-    startNewConversation: () => update({
-      conversationId: null,
-      cursor: null,
-      editingMessageId: null,
-      newChatDocumentId: null
+    setWorkspaceId: (id) => workspace.setWorkspaceId(id),
+    setWorkspaceStatus: (status) => workspace.setWorkspaceStatus(status),
+    leaveWorkspace: () => chat.batch(() => {
+      workspace.setWorkspaceStatus("closed");
+      chat.leave();
+      documents.leave();
     }),
-    setPaMode: (paMode) => {
-      if (state.paMode !== paMode) update({ paMode });
-    },
-    setConversationDocuments: (conversationId, documents, autoAdd = false) => update({
-      conversationDocuments: { ...state.conversationDocuments, [conversationId]: documents },
-      conversationDocumentAutoAdd: {
-        ...state.conversationDocumentAutoAdd,
-        [conversationId]: autoAdd
-      }
-    })
+    setViewingDocument: (input) => documents.setViewingDocument(input),
+    setDocumentViewer: (change) => documents.setDocumentViewer(change),
+    setSelectedDocumentIds: (ids) => documents.setSelectedDocumentIds(ids),
+    setPinnedDocumentId: (id) => documents.setPinnedDocumentId(id)
   };
 }
+function createArbiSessionStore(initial = {}, {
+  draftStorage,
+  persist,
+  workspace = createArbiWorkspaceStore({ workspaceId: initial.workspaceId ?? null })
+} = {}) {
+  const {
+    shell,
+    tabs,
+    views,
+    grid,
+    workspaceStatus,
+    viewingDocument,
+    documentViewer,
+    selectedDocumentIds,
+    pinnedDocumentId,
+    ...chatInitial
+  } = initial;
+  delete chatInitial.workspaceId;
+  const defined = (parts) => Object.fromEntries(Object.entries(parts).filter(([, part]) => part !== void 0));
+  const layout = createArbiLayoutStore({ persist, initial: defined({ shell, tabs, views, grid }) });
+  if (workspaceStatus) workspace.setWorkspaceStatus(workspaceStatus);
+  return composeArbiSessionStore({
+    layout,
+    workspace,
+    chat: createArbiChatStore({ layout, draftStorage, initial: chatInitial }),
+    documents: createArbiDocumentSessionStore(
+      defined({ viewingDocument, documentViewer, selectedDocumentIds, pinnedDocumentId })
+    )
+  });
+}
 var SAVE_DELAY_MS = 500;
 var encoder = new TextEncoder();
 var decoder = new TextDecoder();
@@ -1663,6 +1899,6 @@ function useUserUsageToday(options) {
   });
 }
 
-export { DEFAULT_DOCUMENT_VIEWER_STATE, EMPTY_SESSION_STATE, MAX_THREAD_TABS, MIN_QUEUED_MESSAGE_VISIBILITY_MS, PROJECT_CREATION_DENIED_REASON, WORKSPACE_LAST_OPENED_KEY, WORKSPACE_STORAGE_KEY, agentControl, browserWorkspaceStorage, clearSealedDrafts, closePanelIn, conversationKey, createArbiLayoutStore, createArbiSessionStore, createArbiWorkspaceStore, createDebouncedWriter, createSealedDraftStorage, createStoragePersist, defaultLayoutState, dmTabId, flushOnPageExit, isPanelOpen, isUsageMetered, layoutActionsOf, nextViewingDocument, openPanelIn, panelPlace, parseSavedLayout, queuedMessages, readWorkspaceLastOpened, restoreLayout, savedLayoutOf, selectDraft, selectIsGenerating, selectViewingDocumentId, threadTabId, useActivity, useAgents, useArbiSession, useArbiSessionState, useArbiSessionStore, useAssistantQuery, useAvailableModels, useBoxRole, useBuiltinCommands, useCanCreateProjects, useConfig, useConfigs, useConversationThreads, useConversations, useCurrentUser, useDeleteAgents, useDocumentVersionList, useFirmPool, useHealth, useMessageDetails, useParsedDocument, useProjectInvoices, useProjectUsage, useProjects, useProjectsUsage, useSessionPageTab, useSessionView, useSignedInSession, useTags, useThumbnails, useTopUpFirmPool, useTransientView, useUserUsageToday, useWorkspaceActivity, useWorkspaces };
-//# sourceMappingURL=chunk-QGOYIYLI.js.map
-//# sourceMappingURL=chunk-QGOYIYLI.js.map
+export { DEFAULT_DOCUMENT_VIEWER_STATE, EMPTY_CHAT_STATE, EMPTY_SESSION_STATE, MAX_THREAD_TABS, MIN_QUEUED_MESSAGE_VISIBILITY_MS, PROJECT_CREATION_DENIED_REASON, WORKSPACE_LAST_OPENED_KEY, WORKSPACE_STORAGE_KEY, agentControl, browserWorkspaceStorage, clearSealedDrafts, closePanelIn, composeArbiSessionStore, conversationKey, createArbiChatStore, createArbiDocumentSessionStore, createArbiLayoutStore, createArbiSessionStore, createArbiWorkspaceStore, createDebouncedWriter, createSealedDraftStorage, createStoragePersist, defaultLayoutState, dmTabId, flushOnPageExit, isPanelOpen, isUsageMetered, layoutActionsOf, nextViewingDocument, openPanelIn, panelPlace, parseSavedChat, parseSavedLayout, queuedMessages, readWorkspaceLastOpened, restoreLayout, savedChatOf, savedLayoutOf, selectDraft, selectIsGenerating, selectViewingDocumentId, threadTabId, useActivity, useAgents, useArbiSession, useArbiSessionState, useArbiSessionStore, useAssistantQuery, useAvailableModels, useBoxRole, useBuiltinCommands, useCanCreateProjects, useConfig, useConfigs, useConversationThreads, useConversations, useCurrentUser, useDeleteAgents, useDocumentVersionList, useFirmPool, useHealth, useMessageDetails, useParsedDocument, useProjectInvoices, useProjectUsage, useProjects, useProjectsUsage, useSessionPageTab, useSessionView, useSignedInSession, useTags, useThumbnails, useTopUpFirmPool, useTransientView, useUserUsageToday, useWorkspaceActivity, useWorkspaces };
+//# sourceMappingURL=chunk-YWU7HEHL.js.map
+//# sourceMappingURL=chunk-YWU7HEHL.js.map