dsh-prompt-history 1.2.13 → 1.2.14

package/lib/client.js

@@ -242,6 +242,40 @@ window.__ModuleLoader__.load({
 			}
 		}
 		//#endregion
+		//#region src/client/nodes.ts
+		/** The node's ordering identity: anchorSeq (new), then seq (old), then data.seq. */
+		function nodeSeq(node) {
+			for (const key of ["anchorSeq", "seq"]) {
+				const value = node[key];
+				if (typeof value === "number" && Number.isFinite(value)) return value;
+			}
+			const data = node.data;
+			return typeof data?.seq === "number" && Number.isFinite(data.seq) ? data.seq : 0;
+		}
+		/** The node's text content blocks (old `content` or new `data.content`). */
+		function textBlocks(node) {
+			const content = node.content;
+			if (Array.isArray(content)) return content;
+			const data = node.data;
+			if (data !== void 0 && Array.isArray(data.content)) return data.content;
+			return [];
+		}
+		/** Normalize one node into {kind, seq, text}; null for non-text/unsupported. */
+		function promptMessage(node) {
+			const n = node;
+			if (n === null || n === void 0) return null;
+			if (n.kind !== "user" && n.kind !== "steering") return null;
+			let text = "";
+			for (const block of textBlocks(n)) if (block !== null && typeof block === "object" && block.type === "text" && typeof block.text === "string") text += block.text;
+			const trimmed = text.trim();
+			if (trimmed === "") return null;
+			return {
+				kind: n.kind,
+				seq: nodeSeq(n),
+				text: trimmed
+			};
+		}
+		//#endregion
 		//#region src/client/editor.ts
 		/**
 		* Composer editor abstraction for dsh-prompt-history.
@@ -378,16 +412,8 @@ window.__ModuleLoader__.load({
 		* message. Rendered via a portal to document.body so the fixed positioning is
 		* viewport-relative, and lives off the conversation snapshot's user nodes.
 		*/
-		/** Extract the plain text of a user-submitted node; null for others/empty. */
-		function entryText(node) {
-			if (node.kind !== "user" && node.kind !== "steering") return null;
-			let text = "";
-			for (const block of node.content) if (block.type === "text") text += block.text;
-			const trimmed = text.trim();
-			return trimmed === "" ? null : trimmed;
-		}
 		/** The TOC grip + panel entry. */
-		function ChatToc({ nodes, onWiden }) {
+		function ChatToc({ texts, onWiden }) {
 			const [open, setOpen] = (0, react.useState)(false);
 			const [origin, setOrigin] = (0, react.useState)({
 				left: 0,
@@ -398,35 +424,26 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				if (open && onWiden !== void 0) onWiden();
 			}, [open]);
-			const entries = (0, react.useMemo)(() => {
-				const out = [];
-				for (const node of nodes) {
-					const text = entryText(node);
-					if (text === null) continue;
-					if (out[out.length - 1]?.text !== text) out.push({ text });
-				}
-				return out;
-			}, [nodes]);
 			const USER_ROW = "[data-chat-anchor-key][data-chat-flow-kind=\"user\"], [data-chat-anchor-key][data-chat-flow-kind=\"steering\"]";
 			const [rowMap, setRowMap] = (0, react.useState)([]);
 			(0, react.useLayoutEffect)(() => {
-				if (!open || entries.length === 0) {
+				if (!open || texts.length === 0) {
 					setRowMap([]);
 					return;
 				}
 				const norm = (t) => (t ?? "").replace(/\s+/g, " ").trim();
 				let rows = [...document.querySelectorAll(USER_ROW)];
 				if (rows.length === 0) rows = [...document.querySelectorAll("[data-chat-anchor-key]")];
-				const texts = rows.map((row) => norm(row.textContent ?? ""));
+				const rowTexts = rows.map((row) => norm(row.textContent ?? ""));
 				const map = [];
 				let cursor = 0;
-				for (const entry of entries) {
-					const target = norm(entry.text);
-					while (cursor < texts.length && !(texts[cursor]?.includes(target) ?? false)) cursor++;
-					map.push(cursor < texts.length ? cursor : -1);
+				for (const text of texts) {
+					const target = norm(text);
+					while (cursor < rowTexts.length && !(rowTexts[cursor]?.includes(target) ?? false)) cursor++;
+					map.push(cursor < rowTexts.length ? cursor : -1);
 				}
 				setRowMap(map);
-			}, [open, entries]);
+			}, [open, texts]);
 			const tipSetterRef = (0, react.useRef)(null);
 			const jumpTo = (index) => {
 				const mapped = rowMap[index];
@@ -437,7 +454,7 @@ window.__ModuleLoader__.load({
 				}
 				if (hit === void 0) {
 					const norm = (t) => (t ?? "").replace(/\s+/g, " ").trim();
-					const target = norm(entries[index]?.text ?? "");
+					const target = norm(texts[index] ?? "");
 					hit = [...document.querySelectorAll("[data-chat-anchor-key]")].find((row) => norm(row.textContent ?? "").includes(target));
 				}
 				if (hit === void 0) return;
@@ -583,7 +600,7 @@ window.__ModuleLoader__.load({
 			const gripTop = pos?.top ?? gripY() - 26;
 			const [panelStyle, setPanelStyle] = (0, react.useState)(null);
 			(0, react.useLayoutEffect)(() => {
-				if (!open || entries.length === 0) return;
+				if (!open || texts.length === 0) return;
 				const panel = panelRef.current;
 				if (panel === null) return;
 				const gap = 8;
@@ -607,7 +624,7 @@ window.__ModuleLoader__.load({
 				setPanelStyle((prev) => prev !== null && prev.top === next.top && prev.left === next.left && prev.width === next.width && prev.maxHeight === next.maxHeight && prev.height === next.height ? prev : next);
 			}, [
 				open,
-				entries.length,
+				texts.length,
 				gripLeft,
 				gripTop,
 				size
@@ -654,7 +671,7 @@ window.__ModuleLoader__.load({
 					},
 					children: "☰"
 				}),
-				open && entries.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				open && texts.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					ref: panelRef,
 					className: "dsh-ph-toc",
 					style: panelStyle ?? {
@@ -671,14 +688,14 @@ window.__ModuleLoader__.load({
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "dsh-ph-toc-list",
 							onScroll: hideTip,
-							children: entries.map((entry, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							children: texts.map((text, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 								type: "button",
 								className: "dsh-ph-toc-item",
 								onClick: () => {
 									jumpTo(i);
 								},
 								onMouseEnter: (e) => {
-									enterRow(e, entry.text);
+									enterRow(e, text);
 								},
 								onMouseLeave: hideTip,
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -686,9 +703,9 @@ window.__ModuleLoader__.load({
 									children: i + 1
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 									className: "dsh-ph-toc-label",
-									children: entry.text
+									children: text
 								})]
-							}, `${i}:${entry.text}`))
+							}, `${i}:${text}`))
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "dsh-ph-toc-resize",
@@ -752,13 +769,15 @@ window.__ModuleLoader__.load({
 		};
 		/** The suggestion menu (slash/at) renders a listbox inside the card while open. */
 		const OPEN_MENU = "[role=\"listbox\"]";
-		/** Extract the trimmed plain text of one user-submitted message node; null when empty. */
-		function promptText(node) {
-			if (node.kind !== "user" && node.kind !== "steering") return null;
-			let text = "";
-			for (const block of node.content) if (block.type === "text") text += block.text;
-			const trimmed = text.trim();
-			return trimmed === "" ? null : trimmed;
+		/** Pull the ordered node array out of whichever snapshot shape is present. */
+		function rawNodesOf(snapshot) {
+			const legacy = snapshot.legacy?.nodes;
+			if (Array.isArray(legacy)) return legacy;
+			const order = snapshot.order;
+			const store = snapshot.nodes;
+			if (Array.isArray(order) && store !== void 0 && typeof store.get === "function") return order.map((key) => store.get?.(key)).filter((n) => n !== null && n !== void 0);
+			if (Array.isArray(snapshot.nodes)) return snapshot.nodes;
+			return [];
 		}
 		/**
 		* The composer history + right-click-paste entry.
@@ -772,12 +791,13 @@ window.__ModuleLoader__.load({
 			const sessionHook = useSession;
 			const draft = useInput((s) => s.draft);
 			const phase = useInput((s) => s.phase);
-			const nodes = nodesHook?.((s) => {
-				const legacy = s.legacy?.nodes;
-				if (Array.isArray(legacy)) return legacy;
-				const direct = s.nodes;
-				return Array.isArray(direct) ? direct : [];
-			}) ?? [];
+			const rawNodes = nodesHook?.((s) => rawNodesOf(s)) ?? [];
+			const messages = (0, react.useMemo)(() => rawNodes.map(promptMessage).filter((m) => m !== null), [rawNodes]);
+			const tocTexts = (0, react.useMemo)(() => {
+				const out = [];
+				for (const message of messages) if (message.text !== null && out[out.length - 1] !== message.text) out.push(message.text);
+				return out;
+			}, [messages]);
 			const removed = sessionHook?.((s) => s.removed) ?? false;
 			const hasMore = sessionHook?.((s) => s.hasMore) ?? false;
 			const loadingOlder = sessionHook?.((s) => s.loadingOlder) ?? false;
@@ -864,16 +884,14 @@ window.__ModuleLoader__.load({
 				const seen = seenRef.current;
 				const history = historyRef.current;
 				const globalOn = getPrefs().globalHistory;
-				for (const node of nodes) {
-					if (node.kind !== "user" && node.kind !== "steering") continue;
-					if (seen.has(node.seq)) continue;
-					seen.add(node.seq);
-					const text = promptText(node);
-					if (text === null) continue;
-					if (globalOn ? !history.includes(text) : history[history.length - 1] !== text) history.push(text);
+				for (const message of messages) {
+					if (seen.has(message.seq)) continue;
+					seen.add(message.seq);
+					if (message.text === null) continue;
+					if (globalOn ? !history.includes(message.text) : history[history.length - 1] !== message.text) history.push(message.text);
 				}
 				if (globalOn) saveRing(historyRef.current);
-			}, [nodes]);
+			}, [messages]);
 			(0, react.useEffect)(() => {
 				const browse = browseRef.current;
 				if (browse.index !== -1 && draft !== browse.lastSet) browseRef.current = RESET_BROWSE;
@@ -1273,7 +1291,7 @@ window.__ModuleLoader__.load({
 				};
 			}, []);
 			return (0, react.useSyncExternalStore)(subscribePrefs, getPrefs).tocVisible ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ChatToc, {
-				nodes,
+				texts: tocTexts,
 				onWiden: requestWiden
 			}) : null;
 		}

package/lib/types/client/ChatToc.d.ts

@@ -1,11 +1,8 @@
-import type { ConversationNode } from '@deepseek-ai/dsh-client-runtime/client';
 /** One directory entry: the prompt text and a row index for scroll targeting. */
-export interface TocEntry {
-    readonly text: string;
-}
-/** Full props: the conversation nodes to build the directory from. */
+/** Full props: the directory texts, in conversation order (already collapsed). */
 export interface ChatTocProps {
-    readonly nodes: readonly ConversationNode[];
+    /** Every user/steering prompt text, oldest → newest (parent dedups). */
+    readonly texts: readonly string[];
     /**
      * Called when the directory opens: the parent widens the loaded history
      * window (loadOlder pages) so the directory can list earlier messages too.
@@ -13,5 +10,5 @@ export interface ChatTocProps {
     readonly onWiden?: () => void;
 }
 /** The TOC grip + panel entry. */
-export declare function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element;
+export declare function ChatToc({ texts, onWiden }: ChatTocProps): JSX.Element;
 //# sourceMappingURL=ChatToc.d.ts.map

package/lib/types/client/nodes.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Tolerant conversation-node reading across DSH generations.
+ *
+ * ≤ 0.1.1 (web): session nodes are `{ kind, seq, content: ContentBlock[] }`.
+ * 0.1.2 rc (web): the same old-shaped array is exposed as the chat snapshot's
+ *   `legacy.nodes` (and `nodes` holds a ChatNodeStore). 2.0.x (desktop) nodes
+ *   are `chatNode`-shaped `{ key, kind, ..., anchorSeq, data }` with the text
+ *   content under `data.content`. Everything below normalizes one node to the
+ *   three facts the plugin needs: kind, seq, plain text.
+ */
+export interface PromptMessage {
+    readonly kind: string;
+    /** Stable order identity for append-once dedup. */
+    readonly seq: number;
+    /** Trimmed plain text of the message, or null when empty/unsupported. */
+    readonly text: string | null;
+}
+type NodeLike = {
+    kind?: unknown;
+    seq?: unknown;
+    anchorSeq?: unknown;
+    content?: unknown;
+    data?: unknown;
+};
+/** The node's ordering identity: anchorSeq (new), then seq (old), then data.seq. */
+export declare function nodeSeq(node: NodeLike): number;
+/** Normalize one node into {kind, seq, text}; null for non-text/unsupported. */
+export declare function promptMessage(node: unknown): PromptMessage | null;
+export {};
+//# sourceMappingURL=nodes.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-prompt-history",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "DSH web plugin: terminal-style input for the composer — bash-like Up/Down prompt history with prefix search and Ctrl+R, selection toolbar with copy and quote (Codex-style > blockquote), right-click paste, toggleable draggable chat TOC, fully internationalized (zh/en), with copy modes in Settings (history sourced from the session's own message log; zero config required).",
   "keywords": [
     "dsh",

package/src/client/ChatToc.tsx

@@ -8,28 +8,13 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import type { MouseEvent as ReactMouseEvent } from 'react'
 import { createPortal } from 'react-dom'
-import type { ConversationNode } from '@deepseek-ai/dsh-client-runtime/client'
 import { T } from './i18n.ts'
 
 /** One directory entry: the prompt text and a row index for scroll targeting. */
-export interface TocEntry {
-  readonly text: string
-}
-
-/** Extract the plain text of a user-submitted node; null for others/empty. */
-function entryText(node: ConversationNode): string | null {
-  if (node.kind !== 'user' && node.kind !== 'steering') return null
-  let text = ''
-  for (const block of node.content) {
-    if (block.type === 'text') text += block.text
-  }
-  const trimmed = text.trim()
-  return trimmed === '' ? null : trimmed
-}
-
-/** Full props: the conversation nodes to build the directory from. */
+/** Full props: the directory texts, in conversation order (already collapsed). */
 export interface ChatTocProps {
-  readonly nodes: readonly ConversationNode[]
+  /** Every user/steering prompt text, oldest → newest (parent dedups). */
+  readonly texts: readonly string[]
   /**
    * Called when the directory opens: the parent widens the loaded history
    * window (loadOlder pages) so the directory can list earlier messages too.
@@ -38,7 +23,7 @@ export interface ChatTocProps {
 }
 
 /** The TOC grip + panel entry. */
-export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
+export function ChatToc({ texts, onWiden }: ChatTocProps): JSX.Element {
   const [open, setOpen] = useState(false)
   const [origin, setOrigin] = useState({ left: 0, top: 0, bottom: 0 })
   const panelRef = useRef<HTMLDivElement | null>(null)
@@ -49,17 +34,6 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open])
 
-  // Directory entries: user/steering prompts, consecutive duplicates collapsed.
-  const entries = useMemo<TocEntry[]>(() => {
-    const out: TocEntry[] = []
-    for (const node of nodes) {
-      const text = entryText(node)
-      if (text === null) continue
-      if (out[out.length - 1]?.text !== text) out.push({ text })
-    }
-    return out
-  }, [nodes])
-
   // Map every directory entry to its conversation row (user/steering rows only,
   // matched in DOM order with whitespace-normalized text). Entries and rows
   // share the same loaded event window, so the ordinal walk stays exact — and
@@ -67,23 +41,23 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
   const USER_ROW = '[data-chat-anchor-key][data-chat-flow-kind="user"], [data-chat-anchor-key][data-chat-flow-kind="steering"]'
   const [rowMap, setRowMap] = useState<readonly number[]>([])
   useLayoutEffect(() => {
-    if (!open || entries.length === 0) {
+    if (!open || texts.length === 0) {
       setRowMap([])
       return
     }
     const norm = (t: string): string => (t ?? '').replace(/\s+/g, ' ').trim()
     let rows = [...document.querySelectorAll<HTMLElement>(USER_ROW)]
     if (rows.length === 0) rows = [...document.querySelectorAll<HTMLElement>('[data-chat-anchor-key]')]
-    const texts = rows.map((row) => norm(row.textContent ?? ''))
+    const rowTexts = rows.map((row) => norm(row.textContent ?? ''))
     const map: number[] = []
     let cursor = 0
-    for (const entry of entries) {
-      const target = norm(entry.text)
-      while (cursor < texts.length && !(texts[cursor]?.includes(target) ?? false)) cursor++
-      map.push(cursor < texts.length ? cursor : -1)
+    for (const text of texts) {
+      const target = norm(text)
+      while (cursor < rowTexts.length && !(rowTexts[cursor]?.includes(target) ?? false)) cursor++
+      map.push(cursor < rowTexts.length ? cursor : -1)
     }
     setRowMap(map)
-  }, [open, entries])
+  }, [open, texts])
 
   // Scroll the conversation to the message behind entry `index`.
   // jumpTo is defined before the tip state, so read/clear it through a ref
@@ -101,7 +75,7 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
     if (hit === undefined) {
       // Fallback: first row whose (normalized) text contains this entry.
       const norm = (t: string): string => (t ?? '').replace(/\s+/g, ' ').trim()
-      const target = norm(entries[index]?.text ?? '')
+      const target = norm(texts[index] ?? '')
       hit = [...document.querySelectorAll<HTMLElement>('[data-chat-anchor-key]')]
         .find((row) => norm(row.textContent ?? '').includes(target))
     }
@@ -249,7 +223,7 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
   // its content up to the cap.
   const [panelStyle, setPanelStyle] = useState<{ top: number; left: number; width: number; maxHeight?: number; height?: number } | null>(null)
   useLayoutEffect(() => {
-    if (!open || entries.length === 0) return
+    if (!open || texts.length === 0) return
     const panel = panelRef.current
     if (panel === null) return
     const gap = 8
@@ -271,7 +245,7 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
         ? prev
         : next
     ))
-  }, [open, entries.length, gripLeft, gripTop, size])
+  }, [open, texts.length, gripLeft, gripTop, size])
 
   // Hover tooltip with the FULL entry text: rows are clamped previews, so the
   // Hover tooltip with the FULL entry text. It appears only when the row's
@@ -314,7 +288,7 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
       >
         ☰
       </button>
-      {open && entries.length > 0 && (
+      {open && texts.length > 0 && (
         <div
           ref={panelRef}
           className="dsh-ph-toc"
@@ -323,17 +297,17 @@ export function ChatToc({ nodes, onWiden }: ChatTocProps): JSX.Element {
         >
           <div className="dsh-ph-toc-title">{T('toc.title')}</div>
           <div className="dsh-ph-toc-list" onScroll={hideTip}>
-            {entries.map((entry, i) => (
+            {texts.map((text, i) => (
               <button
                 type="button"
-                key={`${i}:${entry.text}`}
+                key={`${i}:${text}`}
                 className="dsh-ph-toc-item"
                 onClick={() => { jumpTo(i) }}
-                onMouseEnter={(e) => { enterRow(e, entry.text) }}
+                onMouseEnter={(e) => { enterRow(e, text) }}
                 onMouseLeave={hideTip}
               >
                 <span className="dsh-ph-toc-idx">{i + 1}</span>
-                <span className="dsh-ph-toc-label">{entry.text}</span>
+                <span className="dsh-ph-toc-label">{text}</span>
               </button>
             ))}
           </div>

package/src/client/InputHistory.tsx

@@ -33,7 +33,7 @@
  * (Shift+Up still extends selection), no IME composition, machine not
  * adjudicating/submitting, session not removed.
  */
-import { useCallback, useEffect, useRef, useSyncExternalStore, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useSyncExternalStore, useState } from 'react'
 import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
 // Type-only: the ui-conversation SlotMap merge (the input.right entry) and the
 // session standard kit members (useInput/inputActions).
@@ -47,6 +47,7 @@ import {
 } from './feedback.ts'
 import { T } from './i18n.ts'
 import { pullOlderPage } from './sessionCtx.ts'
+import { promptMessage, type PromptMessage } from './nodes.ts'
 import {
   COMPOSER_CARD, editorFocused, editorHost, editorSelectedText, editorSelectionOffsets,
   focusEditor, isEditorTarget, setEditorCaret,
@@ -85,28 +86,34 @@ const RESET_BROWSE: BrowseState = { index: -1, saved: '', lastSet: null }
 const OPEN_MENU = '[role="listbox"]'
 
 /** DSH ≥ 0.1.2 moved the conversation nodes off the session snapshot onto the
- * chat view's legacy slice (`useChat(s => s.legacy.nodes)`); the lifecycle
- * fields (removed/hasMore/loadingOlder/openState) stay on useSession. Reads
- * either source so the plugin works on both generations of the harness. */
-interface SnapshotLike {
-  nodes?: readonly ConversationNode[]
-  legacy?: { nodes?: readonly ConversationNode[] }
+ * chat view (useChat); the lifecycle fields (removed/hasMore/loadingOlder/
+ * openState) stay on useSession. Node shapes differ per generation, so reads
+ * go through rawNodesOf + promptMessage (nodes.ts). */
+interface ChatLike {
+  /** 0.1.1 session snapshot nodes, or a direct array on newer shapes. */
+  nodes?: unknown
+  /** 0.1.2 web: the old-shaped node array compatibility slice. */
+  legacy?: { nodes?: unknown }
+  /** 2.0.x desktop: ordered node keys + a store whose .get(key) returns a node. */
+  order?: readonly string[]
   removed?: boolean
   hasMore?: boolean
   loadingOlder?: boolean
   openState?: string
 }
-type SelectorHook = (select: (snapshot: SnapshotLike) => unknown) => unknown
-
-/** Extract the trimmed plain text of one user-submitted message node; null when empty. */
-function promptText(node: ConversationNode): string | null {
-  if (node.kind !== 'user' && node.kind !== 'steering') return null
-  let text = ''
-  for (const block of node.content) {
-    if (block.type === 'text') text += block.text
+type SelectorHook = (select: (snapshot: ChatLike) => unknown) => unknown
+
+/** Pull the ordered node array out of whichever snapshot shape is present. */
+function rawNodesOf(snapshot: ChatLike): readonly unknown[] {
+  const legacy = snapshot.legacy?.nodes
+  if (Array.isArray(legacy)) return legacy
+  const order = snapshot.order
+  const store = snapshot.nodes as { get?: (key: string) => unknown } | undefined
+  if (Array.isArray(order) && store !== undefined && typeof store.get === 'function') {
+    return order.map((key) => store.get?.(key)).filter((n): n is unknown => n !== null && n !== undefined)
   }
-  const trimmed = text.trim()
-  return trimmed === '' ? null : trimmed
+  if (Array.isArray(snapshot.nodes)) return snapshot.nodes
+  return []
 }
 
 /**
@@ -124,16 +131,23 @@ export function InputHistory(props: InputHistoryProps) {
   // Latest machine/session facts at event time (the listeners mount once).
   const draft = useInput(s => s.draft)
   const phase = useInput(s => s.phase)
-  // On rc.1 the chat snapshot's `nodes` is a ChatNodeStore (an object), NOT an
-  // array — the conversation-node array lives on `legacy.nodes`. Only accept
-  // an actual array (legacy slice preferred) so nothing non-iterable reaches
-  // ChatToc or the history fold.
-  const nodes = (nodesHook?.((s: SnapshotLike) => {
-    const legacy = s.legacy?.nodes
-    if (Array.isArray(legacy)) return legacy
-    const direct = s.nodes
-    return Array.isArray(direct) ? direct : []
-  }) as readonly ConversationNode[] | undefined) ?? []
+  // Node shapes differ by DSH generation (old {kind,seq,content} vs 2.0.x
+  // chatNode with data.content/anchorSeq, and rc.1's nodes being a store, not
+  // an array). rawNodesOf + promptMessage normalize them to {kind, seq, text},
+  // so nothing non-iterable or mis-shaped reaches the history or the directory.
+  const rawNodes = (nodesHook?.((s: ChatLike) => rawNodesOf(s)) as readonly unknown[] | undefined) ?? []
+  const messages = useMemo(
+    () => rawNodes.map(promptMessage).filter((m): m is PromptMessage => m !== null),
+    [rawNodes],
+  )
+  // Directory texts: consecutive duplicates collapsed, in conversation order.
+  const tocTexts = useMemo(() => {
+    const out: string[] = []
+    for (const message of messages) {
+      if (message.text !== null && out[out.length - 1] !== message.text) out.push(message.text)
+    }
+    return out
+  }, [messages])
   const removed = sessionHook?.((s) => s.removed) as boolean | undefined ?? false
 
   // Full-history TOC: when the directory opens it asks us to widen the loaded
@@ -212,18 +226,16 @@ export function InputHistory(props: InputHistoryProps) {
     const seen = seenRef.current
     const history = historyRef.current
     const globalOn = getPrefs().globalHistory
-    for (const node of nodes) {
-      if (node.kind !== 'user' && node.kind !== 'steering') continue
-      if (seen.has(node.seq)) continue
-      seen.add(node.seq)
-      const text = promptText(node)
-      if (text === null) continue
-      if (globalOn ? !history.includes(text) : history[history.length - 1] !== text) {
-        history.push(text)
+    for (const message of messages) {
+      if (seen.has(message.seq)) continue
+      seen.add(message.seq)
+      if (message.text === null) continue
+      if (globalOn ? !history.includes(message.text) : history[history.length - 1] !== message.text) {
+        history.push(message.text)
       }
     }
     if (globalOn) saveRing(historyRef.current)
-  }, [nodes])
+  }, [messages])
 
   // Any draft change that is not our own history write ends the browse
   // session (bash drops the recalled line when you edit it).
@@ -644,6 +656,6 @@ export function InputHistory(props: InputHistoryProps) {
   }, [])
 
   return useSyncExternalStore(subscribePrefs, getPrefs).tocVisible
-    ? <ChatToc nodes={nodes} onWiden={requestWiden} />
+    ? <ChatToc texts={tocTexts} onWiden={requestWiden} />
     : null
 }

package/src/client/nodes.ts

@@ -0,0 +1,61 @@
+/**
+ * Tolerant conversation-node reading across DSH generations.
+ *
+ * ≤ 0.1.1 (web): session nodes are `{ kind, seq, content: ContentBlock[] }`.
+ * 0.1.2 rc (web): the same old-shaped array is exposed as the chat snapshot's
+ *   `legacy.nodes` (and `nodes` holds a ChatNodeStore). 2.0.x (desktop) nodes
+ *   are `chatNode`-shaped `{ key, kind, ..., anchorSeq, data }` with the text
+ *   content under `data.content`. Everything below normalizes one node to the
+ *   three facts the plugin needs: kind, seq, plain text.
+ */
+
+export interface PromptMessage {
+  readonly kind: string
+  /** Stable order identity for append-once dedup. */
+  readonly seq: number
+  /** Trimmed plain text of the message, or null when empty/unsupported. */
+  readonly text: string | null
+}
+
+type NodeLike = {
+  kind?: unknown
+  seq?: unknown
+  anchorSeq?: unknown
+  content?: unknown
+  data?: unknown
+}
+
+/** The node's ordering identity: anchorSeq (new), then seq (old), then data.seq. */
+export function nodeSeq(node: NodeLike): number {
+  for (const key of ['anchorSeq', 'seq'] as const) {
+    const value = node[key]
+    if (typeof value === 'number' && Number.isFinite(value)) return value
+  }
+  const data = node.data as { seq?: unknown } | undefined
+  return typeof data?.seq === 'number' && Number.isFinite(data.seq) ? data.seq : 0
+}
+
+/** The node's text content blocks (old `content` or new `data.content`). */
+function textBlocks(node: NodeLike): unknown {
+  const content = node.content
+  if (Array.isArray(content)) return content
+  const data = node.data as { content?: unknown } | undefined
+  if (data !== undefined && Array.isArray(data.content)) return data.content
+  return []
+}
+
+/** Normalize one node into {kind, seq, text}; null for non-text/unsupported. */
+export function promptMessage(node: unknown): PromptMessage | null {
+  const n = node as NodeLike | null | undefined
+  if (n === null || n === undefined) return null
+  if (n.kind !== 'user' && n.kind !== 'steering') return null
+  let text = ''
+  for (const block of textBlocks(n) as ReadonlyArray<{ type?: unknown; text?: unknown }>) {
+    if (block !== null && typeof block === 'object' && block.type === 'text' && typeof block.text === 'string') {
+      text += block.text
+    }
+  }
+  const trimmed = text.trim()
+  if (trimmed === '') return null
+  return { kind: n.kind as string, seq: nodeSeq(n), text: trimmed }
+}