dsh-coding-sidebar 1.0.7 → 1.0.9

package/src/client/locales.ts

@@ -95,6 +95,7 @@ export const zh = {
   terminalDepsFailed: '终端依赖 node-pty 加载失败',
   terminalDepsHint: '在 DSH 所在环境的终端或 cmd 中执行以下命令修复，然后点重试（node-pty 与 DSH 核心保持同一版本）：',
   terminalDepsProfile: '（检测到 profile：{profile}）',
+  terminalShellNotFound: '未找到配置的 Shell：{name}，请到 设置 → 侧边卡片 → 终端 检查 Shell 路径',
   refresh: '刷新',
   refreshUnsavedConfirm: '文件已在磁盘更新，刷新将丢弃未保存编辑。继续吗？',
   save: '保存',
@@ -159,6 +160,18 @@ export const zh = {
   producedOpen: '在侧边栏中打开',
   showInFolder: '在文件夹中显示',
   disconnected: '终端连接断开，重连中…',
+  terminalWaitBanner: 'Agent 正在等待 {needle}',
+  terminalSkipWait: '跳过等待',
+  gitFoldExpand: '展开 {count} 行上下文',
+  gitFoldLoading: '展开中…',
+  gitFoldFailed: '展开失败',
+  rename: '重命名',
+  renameInvalid: '名称不能为空，且不能包含路径分隔符。',
+  delete: '删除',
+  deleteTitle: '删除「{name}」？',
+  deleteDescFile: '将永久删除该文件，此操作不可撤销。',
+  deleteDescDir: '将永久删除该目录及其全部内容，此操作不可撤销。',
+  dismiss: '关闭',
   exited: '终端进程已退出',
   noSession: '选择一个会话以使用侧边栏',
   pluginNotLoaded: '插件未加载，标签页暂不可用：',
@@ -218,10 +231,10 @@ export const zh = {
   settingsConflict: '设置已被其他窗口修改，请重试',
   binaryNoPreview: '此文件类型不支持预览',
   downloadToView: '下载查看',
-  settingsSubagentTitle: '检测到子代理时自动展开任务管理页',
-  settingsSubagentDesc: '当前会话产生新的子代理时，自动展开侧边栏并打开任务管理页；关闭后需手动打开',
-  settingsJobsTitle: '有新后台任务时自动展开后台任务页',
-  settingsJobsDesc: '当前会话出现新的后台任务时，自动展开侧边栏并打开后台任务页（每个新任务都会触发）；关闭后需手动打开',
+  settingsSubagentTitle: '检测到子代理时自动激活任务管理页',
+  settingsSubagentDesc: '当前会话产生新的子代理时，自动激活任务管理页；宽屏同时展开侧边栏，窄屏不强制展开全屏抽屉；关闭后需手动打开',
+  settingsJobsTitle: '有新后台任务时自动激活后台任务页',
+  settingsJobsDesc: '当前会话出现新的后台任务时，自动激活后台任务页（每个新任务都会触发）；宽屏同时展开侧边栏，窄屏不强制展开全屏抽屉；关闭后需手动打开',
   settingsToolsTitle: '为模型注入终端工具',
   settingsToolsDesc: '开启后，模型可通过 terminal_create 等 8 个工具创建并操作侧边栏终端（默认关闭）',
   settingsFontFamilyTitle: '终端字体',
@@ -431,6 +444,7 @@ export const en: Record<keyof typeof zh, string> = {
   terminalDepsFailed: 'Terminal dependency node-pty failed to load',
   terminalDepsHint: 'Run the command below in a terminal or cmd on the DSH machine to repair it, then retry (node-pty stays in sync with the DSH core version):',
   terminalDepsProfile: ' (detected profile: {profile})',
+  terminalShellNotFound: 'Configured shell not found: {name} — check the shell path under Settings → Side card → Terminal',
   refresh: 'Refresh',
   refreshUnsavedConfirm: 'The file changed on disk. Refreshing will discard unsaved edits. Continue?',
   save: 'Save',
@@ -495,6 +509,18 @@ export const en: Record<keyof typeof zh, string> = {
   producedOpen: 'Open in sidebar',
   showInFolder: 'Show in folder',
   disconnected: 'Terminal disconnected, reconnecting…',
+  terminalWaitBanner: 'Agent is waiting for {needle}',
+  terminalSkipWait: 'Skip wait',
+  gitFoldExpand: 'Expand {count} context lines',
+  gitFoldLoading: 'Expanding…',
+  gitFoldFailed: 'Failed to expand',
+  rename: 'Rename',
+  renameInvalid: 'The name cannot be empty or contain path separators.',
+  delete: 'Delete',
+  deleteTitle: 'Delete "{name}"?',
+  deleteDescFile: 'This permanently deletes the file. This cannot be undone.',
+  deleteDescDir: 'This permanently deletes the directory and everything inside it. This cannot be undone.',
+  dismiss: 'Dismiss',
   exited: 'Terminal process exited',
   noSession: 'Select a conversation to use the sidebar',
   pluginNotLoaded: 'Plugin not loaded; tab unavailable:',
@@ -554,10 +580,10 @@ export const en: Record<keyof typeof zh, string> = {
   settingsConflict: 'The setting changed in another window — please retry',
   binaryNoPreview: 'This file type cannot be previewed',
   downloadToView: 'Download to view',
-  settingsSubagentTitle: 'Auto-open the Tasks page when a subagent appears',
-  settingsSubagentDesc: 'Expand the side card and open the Tasks page when the current conversation spawns a new subagent; turn off to open it manually',
-  settingsJobsTitle: 'Auto-open the Jobs page on a new background job',
-  settingsJobsDesc: 'Expand the side card and open the Jobs page whenever a new background job appears for the current conversation (every new job triggers); turn off to open it manually',
+  settingsSubagentTitle: 'Auto-activate the Tasks page when a subagent appears',
+  settingsSubagentDesc: 'Activate the Tasks page when the current conversation spawns a new subagent; on wide screens the side card expands with it, narrow screens never force the full-screen drawer; turn off to open it manually',
+  settingsJobsTitle: 'Auto-activate the Jobs page on a new background job',
+  settingsJobsDesc: 'Activate the Jobs page whenever a new background job appears for the current conversation (every new job triggers); on wide screens the side card expands with it, narrow screens never force the full-screen drawer; turn off to open it manually',
   settingsToolsTitle: 'Inject terminal tools for the model',
   settingsToolsDesc: 'When enabled, the model can create and drive sidebar terminals through the 8 terminal_* tools (off by default)',
   settingsFontFamilyTitle: 'Terminal font family',
@@ -699,49 +725,13 @@ export const en: Record<keyof typeof zh, string> = {
  */
 export const LOCALE_NS = 'betterSidebar'
 
-// The ja dictionary lives in a sibling file (326 keys) so this module
-// stays readable. Type-checked against the zh key set: a missing or extra
-// ja key is a compile error.
-import { ja as jaDict } from './locales-ja.ts'
-import { de as deDict } from './locales-de.ts'
-import { fr as frDict } from './locales-fr.ts'
-import { pt as ptDict } from './locales-pt.ts'
-import { ko as koDict } from './locales-ko.ts'
-import { ar as arDict } from './locales-ar.ts'
-import { hi as hiDict } from './locales-hi.ts'
-import { id as idDict } from './locales-id.ts'
-import { tr as trDict } from './locales-tr.ts'
-import { vi as viDict } from './locales-vi.ts'
-import { th as thDict } from './locales-th.ts'
-import { ru as ruDict } from './locales-ru.ts'
-import { it as itDict } from './locales-it.ts'
-import { nl as nlDict } from './locales-nl.ts'
-import { sv as svDict } from './locales-sv.ts'
-import { pl as plDict } from './locales-pl.ts'
-import { zhHK as zhHKDict } from './locales-zh-HK.ts'
-import { zhTW as zhTWDict } from './locales-zh-TW.ts'
-import { zhMO as zhMODict } from './locales-zh-MO.ts'
-
-/** The ja dictionary (key-set-equal to zh, enforced by the type annotation). */
-export const ja: Record<keyof typeof zh, string> = jaDict as Record<keyof typeof zh, string>
-export const de: Record<keyof typeof zh, string> = deDict as Record<keyof typeof zh, string>
-export const fr: Record<keyof typeof zh, string> = frDict as Record<keyof typeof zh, string>
-export const pt: Record<keyof typeof zh, string> = ptDict as Record<keyof typeof zh, string>
-export const ko: Record<keyof typeof zh, string> = koDict as Record<keyof typeof zh, string>
-export const ar: Record<keyof typeof zh, string> = arDict as Record<keyof typeof zh, string>
-export const hi: Record<keyof typeof zh, string> = hiDict as Record<keyof typeof zh, string>
-export const id: Record<keyof typeof zh, string> = idDict as Record<keyof typeof zh, string>
-export const tr: Record<keyof typeof zh, string> = trDict as Record<keyof typeof zh, string>
-export const vi: Record<keyof typeof zh, string> = viDict as Record<keyof typeof zh, string>
-export const th: Record<keyof typeof zh, string> = thDict as Record<keyof typeof zh, string>
-export const ru: Record<keyof typeof zh, string> = ruDict as Record<keyof typeof zh, string>
-export const it: Record<keyof typeof zh, string> = itDict as Record<keyof typeof zh, string>
-export const nl: Record<keyof typeof zh, string> = nlDict as Record<keyof typeof zh, string>
-export const sv: Record<keyof typeof zh, string> = svDict as Record<keyof typeof zh, string>
-export const pl: Record<keyof typeof zh, string> = plDict as Record<keyof typeof zh, string>
-export const zhHK: Record<keyof typeof zh, string> = zhHKDict as Record<keyof typeof zh, string>
-export const zhTW: Record<keyof typeof zh, string> = zhTWDict as Record<keyof typeof zh, string>
-export const zhMO: Record<keyof typeof zh, string> = zhMODict as Record<keyof typeof zh, string>
+// The 19 non-zh/en dictionaries live in the LAZY `locale` chunk
+// (src/client/chunks/locale.tsx → lib/client-locale.js): `t()` only ever
+// consults zh/en plus the better-locale override store, so those dicts are
+// needed only when better-locale is installed — the client apply fetches the
+// chunk there and registers its `localeDicts` into the override store. They
+// used to sit statically in the core bundle (≈ half its weight) for a code
+// path most sessions never enter.
 
 /** The DSH locale service attached by the client apply (absent → browser detection). */
 let localeService: { getSnapshot(): { active: string } } | undefined

package/src/client/selection-popup.ts

@@ -0,0 +1,155 @@
+/**
+ * The floating "add selection to conversation" popup shared by the text
+ * viewer: a viewport-anchored button portaled to `document.body`, kept alive
+ * across the selection gesture and committed on click.
+ *
+ * Dismissal contract (upstream issue #425): the popup must never outlive its
+ * editor surface. The sidebar keeps every tab MOUNTED — switching tabs only
+ * flips the pane cell to `display:none` and collapsing the panel translates
+ * it off-screen — while the portaled `position:fixed` button stays pinned to
+ * its viewport anchor, ignoring both. The caller already hides on surface
+ * scrolls, selection collapse and content swaps; this hook adds the global
+ * dismissal that covers everything else:
+ *
+ * - any `mousedown` outside the button (tab bar, composer, another pane,
+ *   the collapse toggle, …) closes it;
+ * - `Escape` closes it;
+ * - the document going hidden (`visibilitychange`) or the window losing
+ *   focus closes it;
+ * - an `IntersectionObserver` on the editor surface closes it as soon as the
+ *   surface leaves the viewport — the tab-switch (`display:none`) and
+ *   panel-collapse (translated off-screen) paths have no DOM events of their
+ *   own, so the geometry signal is the only reliable one.
+ *
+ * The button's own `mousedown` is never treated as an outside click: the
+ * caller preventDefaults it to keep the selection/caret alive until the
+ * click commits (the hook's capture-phase listener runs first and must not
+ * hide for it).
+ */
+import { useEffect, useRef, useState, type RefObject } from 'react'
+
+/** The floating "add to conversation" action: payload + viewport anchor. */
+export interface SelectionPopup {
+  insert: string
+  left: number
+  top: number
+}
+
+export interface SelectionPopupOptions {
+  /** Commit the payload into the composer draft (button click). */
+  onCommit(insert: string): void
+  /**
+   * The DOM surface that must stay on screen for the popup to live: the
+   * CodeMirror host element. Called lazily (refs are null until the content
+   * loads).
+   */
+  getSurface(): HTMLElement | null
+}
+
+export interface SelectionPopupControls {
+  /** The current popup (null = hidden). */
+  popup: SelectionPopup | null
+  /** Attach to the portaled button element. */
+  buttonRef: RefObject<HTMLButtonElement>
+  /** Anchor the popup above a selection (viewport-clamped). */
+  show(insert: string, left: number, top: number): void
+  /** Hide the popup (idempotent). */
+  hide(): void
+  /** The button's click: commit the stored payload, then hide. */
+  commit(): void
+}
+
+export function useSelectionPopup(options: SelectionPopupOptions): SelectionPopupControls {
+  // Latest-callback refs: the dismissal listeners live for the mount's
+  // lifetime, so they must not capture stale closures across renders.
+  const onCommitRef = useRef(options.onCommit)
+  const getSurfaceRef = useRef(options.getSurface)
+  onCommitRef.current = options.onCommit
+  getSurfaceRef.current = options.getSurface
+
+  const [popup, setPopup] = useState<SelectionPopup | null>(null)
+  /** Live mirror for click/event-time reads (no re-render race). */
+  const popupRef = useRef<SelectionPopup | null>(null)
+  /** The portaled button itself (for the outside-click guard). */
+  const buttonRef = useRef<HTMLButtonElement>(null)
+  /** The surface visibility observer (created lazily on open). */
+  const observerRef = useRef<IntersectionObserver | null>(null)
+
+  const show = (insert: string, left: number, top: number): void => {
+    const next: SelectionPopup = {
+      insert,
+      left: Math.min(Math.max(left, 80), window.innerWidth - 80),
+      top,
+    }
+    popupRef.current = next
+    setPopup(next)
+  }
+
+  const hide = (): void => {
+    popupRef.current = null
+    setPopup(null)
+  }
+
+  const commit = (): void => {
+    const current = popupRef.current
+    if (current === null) return
+    onCommitRef.current(current.insert)
+    hide()
+  }
+
+  // Global dismissal listeners, registered once; every handler reads the
+  // live popup ref so it no-ops while no popup is open.
+  useEffect(() => {
+    const onMouseDown = (event: MouseEvent): void => {
+      if (popupRef.current === null) return
+      const button = buttonRef.current
+      if (button !== null && (button === event.target || button.contains(event.target as Node))) return
+      hide()
+    }
+    const onKeyDown = (event: KeyboardEvent): void => {
+      if (event.key === 'Escape' && popupRef.current !== null) hide()
+    }
+    const onVisibilityChange = (): void => {
+      if (document.hidden && popupRef.current !== null) hide()
+    }
+    const onWindowBlur = (): void => {
+      if (popupRef.current !== null) hide()
+    }
+    document.addEventListener('mousedown', onMouseDown, true)
+    document.addEventListener('keydown', onKeyDown, true)
+    document.addEventListener('visibilitychange', onVisibilityChange)
+    window.addEventListener('blur', onWindowBlur)
+    return () => {
+      document.removeEventListener('mousedown', onMouseDown, true)
+      document.removeEventListener('keydown', onKeyDown, true)
+      document.removeEventListener('visibilitychange', onVisibilityChange)
+      window.removeEventListener('blur', onWindowBlur)
+      observerRef.current?.disconnect()
+      observerRef.current = null
+    }
+  }, [])
+
+  // Re-target the visibility observer whenever a popup opens: the surface
+  // refs may have been null at mount (content loads async), so the surface
+  // is only trustworthy at open time.
+  useEffect(() => {
+    if (popup === null) return
+    observerRef.current?.disconnect()
+    observerRef.current = null
+    if (typeof IntersectionObserver === 'undefined') return
+    const surface = getSurfaceRef.current()
+    if (surface === null) return
+    const observer = new IntersectionObserver((entries) => {
+      for (const entry of entries) {
+        if (!entry.isIntersecting) hide()
+      }
+    }, { threshold: 0 })
+    observerRef.current = observer
+    observer.observe(surface)
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- the boolean
+    // flip is the only thing that must re-run this; an anchor move while
+    // open keeps the same surface.
+  }, [popup !== null])
+
+  return { popup, buttonRef, show, hide, commit }
+}

package/src/client/service.ts

@@ -150,7 +150,7 @@ export interface TabComponentProps {
   /** The explorer's reveal-highlight set (ExplorerView; "Show in folder" targets). */
   revealed?: string[]
   onToggleDir?: (path: string) => void
-  onReferenceFile?: (path: string) => void
+  onReferenceFile?: (path: string, isDir: boolean) => void
   onOpenFile?: (path: string) => void
   onOpenDiff?: (tab: SidebarTab) => void
   onSubagentJump?: (childSessionId: string) => void

package/src/client/sidebar.module.css

@@ -1651,6 +1651,74 @@ body[data-dsh-sidebar-dragging] .panel {
   color: var(--dsw-alias-label-primary);
 }
 
+/* A hunk-gap fold in a diff: the "expand hidden context" chip between two
+   hunks (loading is inert, failure degrades to a static marker). */
+.gitFoldRow {
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 2px 12px;
+  border: none;
+  background: var(--dsw-alias-bg-layer-1);
+  color: var(--dsw-alias-label-tertiary);
+  font: var(--dsw-font-xxxs-11);
+  text-align: center;
+  cursor: pointer;
+  outline: none;
+}
+
+.gitFoldRow:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+  color: var(--dsw-alias-label-secondary);
+}
+
+.gitFoldRow:disabled {
+  cursor: default;
+}
+
+.gitFoldRowFailed {
+  color: var(--dsw-alias-state-error-primary);
+  opacity: 0.7;
+}
+
+/* The tree row's inline rename editor: fills the row's name slot, keeps the
+   row's metrics so the tree does not jump when editing starts. */
+.explorerRenameInput {
+  flex: 1;
+  min-width: 0;
+  height: 20px;
+  padding: 0 4px;
+  border: 1px solid var(--dsw-alias-border-l2);
+  border-radius: 4px;
+  background: var(--dsw-alias-bg-layer-2);
+  color: var(--dsw-alias-label-primary);
+  font: var(--dsw-font-xxs-12);
+  outline: none;
+}
+
+/* The "Agent 正在等待 {needle}" wait banner: a warn-toned strip above the
+   terminal surface while the model blocks in terminal_wait_for; the needle
+   ellipsizes inline and the full text rides the title tooltip. */
+.terminalWaitBanner {
+  flex: none;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 3px 10px;
+  font: var(--dsw-font-xxxs-11);
+  color: var(--dsw-alias-state-warn-label);
+  background: var(--dsw-alias-state-warn-tertiary);
+}
+
+.terminalWaitNeedle {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+}
+
 /* The node-pty dependency failure banner (issue #140): a taller warn block
    carrying the pasteable repair command (bash / cmd / PowerShell). */
 .terminalDepsBanner {

package/src/client/state.ts

@@ -104,6 +104,14 @@ export interface SidebarState {
   splits: SplitNode
   /** Free windows (tabs dragged out onto the conversation area). */
   floats: FloatWindow[]
+  /**
+   * Live agent-terminal wait state (uuid → the wait the model currently
+   * blocks on in `terminal_wait_for`), mirrored from the host's
+   * agent-terminals push. Transient by design: sanitizeState never restores
+   * it, so a reload starts clean and the next push (sent immediately on WS
+   * attach) repopulates it.
+   */
+  agentWaits: Record<string, { needle: string; since: number }>
 }
 
 export const PANEL_MIN = 280
@@ -137,7 +145,7 @@ export function mintTabId(): string {
 
 /**
  * The largest numeric suffix across a raw persisted state's counter ids
- * (`pane:N` / `tab:N` / `split:N`). The uid counter is module-global and
+ * (`pane:N` / `tab:N` / `split:N` / `float:N`). The uid counter is module-global and
  * resets on every reload, so a split minted AFTER a reload would collide
  * with the persisted ids (a fresh "pane:1" beside the persisted "pane:1");
  * mapLeaf would then visit BOTH leaves and every open would land in both
@@ -148,7 +156,7 @@ function maxCounterId(parsed: unknown): number {
   let max = 0
   const consider = (id: unknown): void => {
     if (typeof id !== 'string') return
-    const match = /^(?:pane|tab|split):(\d+)$/.exec(id)
+    const match = /^(?:pane|tab|split|float):(\d+)$/.exec(id)
     if (match !== null) max = Math.max(max, Number(match[1]))
   }
   const walk = (node: unknown): void => {
@@ -209,6 +217,7 @@ export function makeDefaultState(width = PANEL_DEFAULT, panelOpen = true, seed:
     revealed: [],
     splits: leaf,
     floats: [],
+    agentWaits: {},
   }
 }
 
@@ -854,6 +863,23 @@ export function agentTabId(uuid: string): string {
   return `${AGENT_TAB_PREFIX}${uuid}`
 }
 
+/** Shallow equality of two agent-wait maps (same keys, same needle+since). */
+function sameAgentWaits(
+  a: SidebarState['agentWaits'] | undefined,
+  b: Record<string, { needle: string; since: number }>,
+): boolean {
+  if (a === undefined) return Object.keys(b).length === 0
+  const aKeys = Object.keys(a)
+  if (aKeys.length !== Object.keys(b).length) return false
+  for (const key of aKeys) {
+    const av = a[key]
+    const bv = b[key]
+    if (av === undefined || bv === undefined) return false
+    if (av.needle !== bv.needle || av.since !== bv.since) return false
+  }
+  return true
+}
+
 /**
  * Reconcile the sidebar's agent-terminal tabs with the host's live list.
  * The host pushes the current list of agent terminals (created by the model
@@ -868,7 +894,7 @@ export function agentTabId(uuid: string): string {
  */
 export function reconcileAgentTerminals(
   state: SidebarState,
-  agentTerminals: ReadonlyArray<{ uuid: string; title: string }>,
+  agentTerminals: ReadonlyArray<{ uuid: string; title: string; waiting?: { needle: string; since: number } | null }>,
 ): SidebarState {
   const existingTabs = allLeaves(state.splits).flatMap(leaf => leaf.tabs)
     .concat(state.floats.map(float => float.tab))
@@ -883,7 +909,17 @@ export function reconcileAgentTerminals(
   // convergence: no title suffix, no meta write — the tab keeps its uuid
   // so a later reconcile push revives it if the agent reopens the same one).
   const toRemove = existingAgentTabs.filter(tab => !serverUuids.has(agentUuidOf(tab.id)) && tab.pin === undefined)
-  if (toAdd.length === 0 && toRemove.length === 0) return state
+  // Mirror the live wait state from the push (authoritative: a vanished
+  // waiting field simply drops the entry). A waits-only change must still
+  // produce a new state — the tab add/remove no-change check alone would
+  // swallow banner updates.
+  const serverWaits: Record<string, { needle: string; since: number }> = {}
+  for (const terminal of agentTerminals) {
+    if (terminal.waiting !== undefined && terminal.waiting !== null) {
+      serverWaits[terminal.uuid] = { needle: terminal.waiting.needle, since: terminal.waiting.since }
+    }
+  }
+  if (toAdd.length === 0 && toRemove.length === 0 && sameAgentWaits(state.agentWaits, serverWaits)) return state
   // Remove tabs whose uuids vanished from the server list (the agent closed
   // them, or the pty exited and was reaped). Reuse closeTab's leaf cleanup;
   // a FLOATED agent terminal leaves with its window.
@@ -900,7 +936,7 @@ export function reconcileAgentTerminals(
   }
   // Add tabs for new uuids (the agent created a terminal). They land in the
   // active pane via openTabInActivePane; the next reconcile is a no-op for them.
-  let next: SidebarState = { ...state, splits, floats }
+  let next: SidebarState = { ...state, splits, floats, agentWaits: serverWaits }
   for (const terminal of toAdd) {
     const tab: SidebarTab = {
       id: agentTabId(terminal.uuid),
@@ -994,6 +1030,7 @@ function resetRequested(): boolean {
 
 function loadState(sessionId: string, prefs: SidebarPrefs): SidebarState {
   const reset = resetRequested()
+  const viewport = typeof window !== 'undefined' ? window.innerWidth : undefined
   if (reset) {
     try {
       localStorage.removeItem(`${STORAGE_PREFIX}:${sessionId}`)
@@ -1016,7 +1053,15 @@ function loadState(sessionId: string, prefs: SidebarPrefs): SidebarState {
         nextIdCounter = maxCounterId(parsed)
         const sanitized = sanitizeState(parsed)
         if (sanitized !== undefined) {
-          return globalWidth === undefined ? sanitized : { ...sanitized, width: globalWidth }
+          const restored = globalWidth === undefined ? sanitized : { ...sanitized, width: globalWidth }
+          // A narrow panel is a full-screen drawer, so every page/session load
+          // starts it closed even when the prior desktop/mobile state persisted
+          // `panelOpen: true`. Preserve the entire restored workbench (panes,
+          // tabs, and free windows); visibility is the sole viewport-derived
+          // override.
+          return viewport !== undefined && isNarrowWidth(viewport) && restored.panelOpen
+            ? { ...restored, panelOpen: false }
+            : restored
         }
       }
     } catch {
@@ -1031,10 +1076,8 @@ function loadState(sessionId: string, prefs: SidebarPrefs): SidebarState {
   // disabled editor type seeds nothing. On a NARROW viewport a brand-new
   // session starts collapsed instead — the panel is a full-screen drawer
   // there, and auto-opening it on first paint would cover the conversation
-  // before the user asked. Only the first seeding is affected: once the
-  // user expands the drawer, `panelOpen: true` persists like any other
-  // state.
-  const viewport = typeof window !== 'undefined' ? window.innerWidth : undefined
+  // before the user asked. Persisted layouts follow the same narrow-load
+  // visibility rule above, while their workbench contents remain intact.
   const width = globalWidth ?? (viewport === undefined
     ? PANEL_DEFAULT
     : defaultWidthFor(viewport, prefs.defaultWidthPercent))
@@ -1143,6 +1186,9 @@ export function sanitizeState(parsed: unknown): SidebarState | undefined {
     revealed: [],
     splits: migratedSplits,
     floats,
+    // Live wait state is transient: a reload starts clean; the next
+    // agent-terminals push (sent on WS attach) repopulates it.
+    agentWaits: {},
   }
 }
 

package/src/client/terminal-font.ts

@@ -198,12 +198,43 @@ function usableBase(value: string | undefined): string {
   return trimmed
 }
 
+/**
+ * Guarantee the stack ends in a generic family, so a font the browser cannot
+ * resolve degrades to a monospace one.
+ *
+ * Without this a stack of unresolvable names (a misspelled family, or one only
+ * installed on the machine running the shell rather than the one running the
+ * browser) falls through to the browser's *standard* font, which is
+ * proportional — xterm then measures its cell from a proportional advance and
+ * the whole grid breaks, rather than merely losing the requested typeface.
+ *
+ * This does not sniff whether the named families exist (an explicit non-goal
+ * of the terminal font design): it only terminates the stack. A stack that
+ * already names a generic family is returned untouched, so a user who
+ * deliberately wrote one keeps it. Generics are matched unquoted only — a
+ * quoted `"monospace"` is a family *name*, not the keyword.
+ *
+ * @param stack - the resolved font-family value.
+ * @returns the stack, ending in a generic family.
+ */
+export function withMonospaceFallback(stack: string): string {
+  const families = splitFamilies(stack)
+  if (families.length === 0) return DEFAULT_TERMINAL_FONT_FAMILY
+  const only = families.length === 1 ? families[0] : undefined
+  if (only !== undefined && CSS_WIDE_KEYWORDS.has(only.toLowerCase())) return DEFAULT_TERMINAL_FONT_FAMILY
+  if (families.some((family) => GENERIC_FAMILIES.has(family.toLowerCase()))) return families.join(', ')
+  return `${families.join(', ')}, monospace`
+}
+
 /**
  * Resolve the xterm font options for the given prefs.
  *
  * The base family keeps its existing precedence — user pref > theme code
- * font > built-in stack — and then {@link withIconFontFallbacks} tops it up
- * so prompt icons resolve regardless of which base won.
+ * font > built-in stack. {@link withMonospaceFallback} then terminates the
+ * stack with a generic family so an unresolvable name degrades to a
+ * monospace instead of the proportional standard font, and finally
+ * {@link withIconFontFallbacks} tops it up so prompt icons resolve
+ * regardless of which base won.
  *
  * @param prefs - the current side card preferences.
  * @param themeFontFamily - the app's theme code font (`--ds-font-family-code`
@@ -218,7 +249,7 @@ export function resolveTerminalFont(
     || usableBase(themeFontFamily)
     || DEFAULT_TERMINAL_FONT_FAMILY
   return {
-    fontFamily: withIconFontFallbacks(base),
+    fontFamily: withIconFontFallbacks(withMonospaceFallback(base)),
     fontSize: clampTerminalFontSize(prefs.terminalFontSize),
   }
 }

package/src/context-types.ts

@@ -428,9 +428,10 @@ export interface SidebarLocaleService {
 
 /** The composer draft face the sidebar reaches through `ctx.conversation.input`. */
 export interface SidebarSessionInput {
-  /** The live input store (draft read for append). */
+  /** The live input store (draft read for append). `draftRev` is the machine's
+   *  span-CAS revision — required to mint a structured file-reference chip. */
   state: {
-    getSnapshot(): { draft: string }
+    getSnapshot(): { draft: string; draftRev?: number }
   }
   /** Replace the draft text (the input machine's single public write path). */
   setDraft(text: string): void