@volter-ai-dev/supercode-ui 0.1.38 → 0.1.39

package/README.md

@@ -135,7 +135,7 @@ Hosts do not need to fork the messenger to connect their own object model:
 ```
 
 `navigation` is an event, not duplicated router state: change its `id` to open a conversation or
-prefill a new one, while `onViewChange` observes user navigation. Context candidates use the exact
+prefill either an existing or new one, while `onViewChange` observes user navigation. Context candidates use the exact
 bounded `TranscriptAttachment` envelope sent to the harness; a custom candidate component changes
 presentation without inventing a second context protocol. `beforeSessions` and `afterSessions`
 place host-owned rows inside the same searchable scroller. `confirmIntent` runs before resume,

package/components.mjs

@@ -2627,7 +2627,7 @@ function ChatHeader({ state, adapter, pendingStatus, actionPending, onBack, onNe
     onClose ? /* @__PURE__ */ jsx10("button", { type: "button", "aria-label": "Close", onClick: onClose, children: /* @__PURE__ */ jsx10(UiIcon, { name: "close", size: 18 }) }) : null
   ] });
 }
-function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates }) {
+function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates, navigation }) {
   const Header = slots.header;
   const HeaderActions = slots.headerActions;
   const memoryKey = state.attached?.key || `${state.harness}:${state.workspace}`;
@@ -2637,6 +2637,7 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
   const [settings, setSettings] = useState6(null);
   const restoreSequence = useRef7(0);
   const actionSequence = useRef7(0);
+  const lastNavigation = useRef7(null);
   const acknowledged = useRef7(/* @__PURE__ */ new Set());
   const setPending = (update) => setPendingState((current) => {
     const next = typeof update === "function" ? update(current) : update;
@@ -2649,6 +2650,17 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
     setPendingAction(null);
     setRestoreDraft(null);
   }, [memoryKey]);
+  useEffect8(() => {
+    if (!navigation || navigation.id === lastNavigation.current) return;
+    lastNavigation.current = navigation.id;
+    if (navigation.draft === void 0 && !navigation.context?.length && !navigation.images?.length) return;
+    setRestoreDraft({
+      id: `host:${String(navigation.id)}`,
+      text: navigation.draft ?? "",
+      context: navigation.context,
+      images: navigation.images
+    });
+  }, [navigation]);
   useEffect8(() => {
     if (!pending) return;
     if (state.transcript.some((entry) => entry.role === "user" && entry.text.trim() === pending.text.trim() && !pending.baselineIds.includes(entry.id))) {
@@ -2973,6 +2985,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   const [view, setViewState] = useState6(initialView ?? (state.attention.length ? "list" : messengerViewMemory.get(memoryKey) ?? (state.attached || state.transcript.length ? "chat" : "list")));
   const [opening, setOpening] = useState6(null);
   const [newNavigation, setNewNavigation] = useState6(null);
+  const [chatNavigation, setChatNavigation] = useState6(null);
   const [listFocus, setListFocus] = useState6(null);
   const lastNavigation = useRef7(null);
   const setView = (next) => {
@@ -2985,17 +2998,21 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
     lastNavigation.current = navigation.id;
     if (navigation.view === "list") {
       setOpening(null);
+      setChatNavigation(null);
       setView("list");
       return;
     }
     if (navigation.view === "new") {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(navigation);
       setView("new");
       return;
     }
     if (navigation.view === "chat" && typeof navigation.sessionKey === "string" && navigation.sessionKey) {
       setListFocus(navigation.sessionKey);
+      setNewNavigation(null);
+      setChatNavigation(navigation);
       if (state.attached?.key === navigation.sessionKey) {
         setOpening(null);
         setView("chat");
@@ -3017,6 +3034,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   }, [opening, state.attachError?.key, state.attached?.key, state.error, state.operation]);
   const open = (row) => {
     setListFocus(row.key);
+    setChatNavigation(null);
     setOpening(row);
     adapter.onIntent({ action: "attach", key: row.key });
   };
@@ -3026,6 +3044,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   return /* @__PURE__ */ jsxs9("main", { className: `scui-root ${className}`, "data-view": view, "data-mode": state.mode, "aria-label": "Supercode messenger", children: [
     view === "list" ? /* @__PURE__ */ jsx10(SessionList, { state, adapter, focusKey: listFocus, onOpen: open, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
     }, onClose: adapter.onClose ? close : void 0, components, labels: copy, memoryKey, slots, headerActions: HeaderActions }) : null,
@@ -3035,9 +3054,10 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
       setView("list");
     }, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
-    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates }) : null,
+    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates, navigation: chatNavigation?.sessionKey === state.attached?.key ? chatNavigation : null }) : null,
     opening ? /* @__PURE__ */ jsxs9("div", { className: "scui-opening", role: "status", "aria-busy": "true", children: [
       /* @__PURE__ */ jsx10(HarnessLogo, { id: opening.harness, size: 34 }),
       /* @__PURE__ */ jsxs9("span", { children: [

package/embed.mjs

@@ -2547,7 +2547,7 @@ function ChatHeader({ state, adapter, pendingStatus, actionPending, onBack, onNe
     onClose ? /* @__PURE__ */ jsx9("button", { type: "button", "aria-label": "Close", onClick: onClose, children: /* @__PURE__ */ jsx9(UiIcon, { name: "close", size: 18 }) }) : null
   ] });
 }
-function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates }) {
+function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates, navigation }) {
   const Header = slots.header;
   const HeaderActions = slots.headerActions;
   const memoryKey = state.attached?.key || `${state.harness}:${state.workspace}`;
@@ -2557,6 +2557,7 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
   const [settings, setSettings] = useState6(null);
   const restoreSequence = useRef7(0);
   const actionSequence = useRef7(0);
+  const lastNavigation = useRef7(null);
   const acknowledged = useRef7(/* @__PURE__ */ new Set());
   const setPending = (update) => setPendingState((current) => {
     const next = typeof update === "function" ? update(current) : update;
@@ -2569,6 +2570,17 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
     setPendingAction(null);
     setRestoreDraft(null);
   }, [memoryKey]);
+  useEffect8(() => {
+    if (!navigation || navigation.id === lastNavigation.current) return;
+    lastNavigation.current = navigation.id;
+    if (navigation.draft === void 0 && !navigation.context?.length && !navigation.images?.length) return;
+    setRestoreDraft({
+      id: `host:${String(navigation.id)}`,
+      text: navigation.draft ?? "",
+      context: navigation.context,
+      images: navigation.images
+    });
+  }, [navigation]);
   useEffect8(() => {
     if (!pending) return;
     if (state.transcript.some((entry) => entry.role === "user" && entry.text.trim() === pending.text.trim() && !pending.baselineIds.includes(entry.id))) {
@@ -2893,6 +2905,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   const [view, setViewState] = useState6(initialView ?? (state.attention.length ? "list" : messengerViewMemory.get(memoryKey) ?? (state.attached || state.transcript.length ? "chat" : "list")));
   const [opening, setOpening] = useState6(null);
   const [newNavigation, setNewNavigation] = useState6(null);
+  const [chatNavigation, setChatNavigation] = useState6(null);
   const [listFocus, setListFocus] = useState6(null);
   const lastNavigation = useRef7(null);
   const setView = (next) => {
@@ -2905,17 +2918,21 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
     lastNavigation.current = navigation.id;
     if (navigation.view === "list") {
       setOpening(null);
+      setChatNavigation(null);
       setView("list");
       return;
     }
     if (navigation.view === "new") {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(navigation);
       setView("new");
       return;
     }
     if (navigation.view === "chat" && typeof navigation.sessionKey === "string" && navigation.sessionKey) {
       setListFocus(navigation.sessionKey);
+      setNewNavigation(null);
+      setChatNavigation(navigation);
       if (state.attached?.key === navigation.sessionKey) {
         setOpening(null);
         setView("chat");
@@ -2937,6 +2954,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   }, [opening, state.attachError?.key, state.attached?.key, state.error, state.operation]);
   const open = (row) => {
     setListFocus(row.key);
+    setChatNavigation(null);
     setOpening(row);
     adapter.onIntent({ action: "attach", key: row.key });
   };
@@ -2946,6 +2964,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   return /* @__PURE__ */ jsxs8("main", { className: `scui-root ${className}`, "data-view": view, "data-mode": state.mode, "aria-label": "Supercode messenger", children: [
     view === "list" ? /* @__PURE__ */ jsx9(SessionList, { state, adapter, focusKey: listFocus, onOpen: open, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
     }, onClose: adapter.onClose ? close : void 0, components, labels: copy, memoryKey, slots, headerActions: HeaderActions }) : null,
@@ -2955,9 +2974,10 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
       setView("list");
     }, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
-    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates }) : null,
+    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates, navigation: chatNavigation?.sessionKey === state.attached?.key ? chatNavigation : null }) : null,
     opening ? /* @__PURE__ */ jsxs8("div", { className: "scui-opening", role: "status", "aria-busy": "true", children: [
       /* @__PURE__ */ jsx9(HarnessLogo, { id: opening.harness, size: 34 }),
       /* @__PURE__ */ jsxs8("span", { children: [

package/index.d.ts

@@ -468,7 +468,7 @@ export interface MessengerSlots {
 
 export type MessengerNavigation =
   | { id: string | number; view: 'list' }
-  | { id: string | number; view: 'chat'; sessionKey: string }
+  | { id: string | number; view: 'chat'; sessionKey: string; draft?: string; context?: TranscriptContext[]; images?: Array<TranscriptImage & { url: string }> }
   | { id: string | number; view: 'new'; harness?: HarnessId; draft?: string; context?: TranscriptContext[]; images?: Array<TranscriptImage & { url: string }> };
 
 export interface MessengerProps {

package/messenger.mjs

@@ -2544,7 +2544,7 @@ function ChatHeader({ state, adapter, pendingStatus, actionPending, onBack, onNe
     onClose ? /* @__PURE__ */ jsx9("button", { type: "button", "aria-label": "Close", onClick: onClose, children: /* @__PURE__ */ jsx9(UiIcon, { name: "close", size: 18 }) }) : null
   ] });
 }
-function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates }) {
+function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates, navigation }) {
   const Header = slots.header;
   const HeaderActions = slots.headerActions;
   const memoryKey = state.attached?.key || `${state.harness}:${state.workspace}`;
@@ -2554,6 +2554,7 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
   const [settings, setSettings] = useState6(null);
   const restoreSequence = useRef7(0);
   const actionSequence = useRef7(0);
+  const lastNavigation = useRef7(null);
   const acknowledged = useRef7(/* @__PURE__ */ new Set());
   const setPending = (update) => setPendingState((current) => {
     const next = typeof update === "function" ? update(current) : update;
@@ -2566,6 +2567,17 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
     setPendingAction(null);
     setRestoreDraft(null);
   }, [memoryKey]);
+  useEffect8(() => {
+    if (!navigation || navigation.id === lastNavigation.current) return;
+    lastNavigation.current = navigation.id;
+    if (navigation.draft === void 0 && !navigation.context?.length && !navigation.images?.length) return;
+    setRestoreDraft({
+      id: `host:${String(navigation.id)}`,
+      text: navigation.draft ?? "",
+      context: navigation.context,
+      images: navigation.images
+    });
+  }, [navigation]);
   useEffect8(() => {
     if (!pending) return;
     if (state.transcript.some((entry) => entry.role === "user" && entry.text.trim() === pending.text.trim() && !pending.baselineIds.includes(entry.id))) {
@@ -2890,6 +2902,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   const [view, setViewState] = useState6(initialView ?? (state.attention.length ? "list" : messengerViewMemory.get(memoryKey) ?? (state.attached || state.transcript.length ? "chat" : "list")));
   const [opening, setOpening] = useState6(null);
   const [newNavigation, setNewNavigation] = useState6(null);
+  const [chatNavigation, setChatNavigation] = useState6(null);
   const [listFocus, setListFocus] = useState6(null);
   const lastNavigation = useRef7(null);
   const setView = (next) => {
@@ -2902,17 +2915,21 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
     lastNavigation.current = navigation.id;
     if (navigation.view === "list") {
       setOpening(null);
+      setChatNavigation(null);
       setView("list");
       return;
     }
     if (navigation.view === "new") {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(navigation);
       setView("new");
       return;
     }
     if (navigation.view === "chat" && typeof navigation.sessionKey === "string" && navigation.sessionKey) {
       setListFocus(navigation.sessionKey);
+      setNewNavigation(null);
+      setChatNavigation(navigation);
       if (state.attached?.key === navigation.sessionKey) {
         setOpening(null);
         setView("chat");
@@ -2934,6 +2951,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   }, [opening, state.attachError?.key, state.attached?.key, state.error, state.operation]);
   const open = (row) => {
     setListFocus(row.key);
+    setChatNavigation(null);
     setOpening(row);
     adapter.onIntent({ action: "attach", key: row.key });
   };
@@ -2943,6 +2961,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   return /* @__PURE__ */ jsxs8("main", { className: `scui-root ${className}`, "data-view": view, "data-mode": state.mode, "aria-label": "Supercode messenger", children: [
     view === "list" ? /* @__PURE__ */ jsx9(SessionList, { state, adapter, focusKey: listFocus, onOpen: open, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
     }, onClose: adapter.onClose ? close : void 0, components, labels: copy, memoryKey, slots, headerActions: HeaderActions }) : null,
@@ -2952,9 +2971,10 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
       setView("list");
     }, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
-    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates }) : null,
+    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates, navigation: chatNavigation?.sessionKey === state.attached?.key ? chatNavigation : null }) : null,
     opening ? /* @__PURE__ */ jsxs8("div", { className: "scui-opening", role: "status", "aria-busy": "true", children: [
       /* @__PURE__ */ jsx9(HarnessLogo, { id: opening.harness, size: 34 }),
       /* @__PURE__ */ jsxs8("span", { children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter-ai-dev/supercode-ui",
-  "version": "0.1.38",
+  "version": "0.1.39",
   "type": "module",
   "description": "Composable default UI kit for Supercode-powered coding-agent experiences",
   "exports": {

package/react/components.mjs

@@ -2627,7 +2627,7 @@ function ChatHeader({ state, adapter, pendingStatus, actionPending, onBack, onNe
     onClose ? /* @__PURE__ */ jsx10("button", { type: "button", "aria-label": "Close", onClick: onClose, children: /* @__PURE__ */ jsx10(UiIcon, { name: "close", size: 18 }) }) : null
   ] });
 }
-function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates }) {
+function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates, navigation }) {
   const Header = slots.header;
   const HeaderActions = slots.headerActions;
   const memoryKey = state.attached?.key || `${state.harness}:${state.workspace}`;
@@ -2637,6 +2637,7 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
   const [settings, setSettings] = useState6(null);
   const restoreSequence = useRef7(0);
   const actionSequence = useRef7(0);
+  const lastNavigation = useRef7(null);
   const acknowledged = useRef7(/* @__PURE__ */ new Set());
   const setPending = (update) => setPendingState((current) => {
     const next = typeof update === "function" ? update(current) : update;
@@ -2649,6 +2650,17 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
     setPendingAction(null);
     setRestoreDraft(null);
   }, [memoryKey]);
+  useEffect8(() => {
+    if (!navigation || navigation.id === lastNavigation.current) return;
+    lastNavigation.current = navigation.id;
+    if (navigation.draft === void 0 && !navigation.context?.length && !navigation.images?.length) return;
+    setRestoreDraft({
+      id: `host:${String(navigation.id)}`,
+      text: navigation.draft ?? "",
+      context: navigation.context,
+      images: navigation.images
+    });
+  }, [navigation]);
   useEffect8(() => {
     if (!pending) return;
     if (state.transcript.some((entry) => entry.role === "user" && entry.text.trim() === pending.text.trim() && !pending.baselineIds.includes(entry.id))) {
@@ -2973,6 +2985,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   const [view, setViewState] = useState6(initialView ?? (state.attention.length ? "list" : messengerViewMemory.get(memoryKey) ?? (state.attached || state.transcript.length ? "chat" : "list")));
   const [opening, setOpening] = useState6(null);
   const [newNavigation, setNewNavigation] = useState6(null);
+  const [chatNavigation, setChatNavigation] = useState6(null);
   const [listFocus, setListFocus] = useState6(null);
   const lastNavigation = useRef7(null);
   const setView = (next) => {
@@ -2985,17 +2998,21 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
     lastNavigation.current = navigation.id;
     if (navigation.view === "list") {
       setOpening(null);
+      setChatNavigation(null);
       setView("list");
       return;
     }
     if (navigation.view === "new") {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(navigation);
       setView("new");
       return;
     }
     if (navigation.view === "chat" && typeof navigation.sessionKey === "string" && navigation.sessionKey) {
       setListFocus(navigation.sessionKey);
+      setNewNavigation(null);
+      setChatNavigation(navigation);
       if (state.attached?.key === navigation.sessionKey) {
         setOpening(null);
         setView("chat");
@@ -3017,6 +3034,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   }, [opening, state.attachError?.key, state.attached?.key, state.error, state.operation]);
   const open = (row) => {
     setListFocus(row.key);
+    setChatNavigation(null);
     setOpening(row);
     adapter.onIntent({ action: "attach", key: row.key });
   };
@@ -3026,6 +3044,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   return /* @__PURE__ */ jsxs9("main", { className: `scui-root ${className}`, "data-view": view, "data-mode": state.mode, "aria-label": "Supercode messenger", children: [
     view === "list" ? /* @__PURE__ */ jsx10(SessionList, { state, adapter, focusKey: listFocus, onOpen: open, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
     }, onClose: adapter.onClose ? close : void 0, components, labels: copy, memoryKey, slots, headerActions: HeaderActions }) : null,
@@ -3035,9 +3054,10 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
       setView("list");
     }, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
-    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates }) : null,
+    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates, navigation: chatNavigation?.sessionKey === state.attached?.key ? chatNavigation : null }) : null,
     opening ? /* @__PURE__ */ jsxs9("div", { className: "scui-opening", role: "status", "aria-busy": "true", children: [
       /* @__PURE__ */ jsx10(HarnessLogo, { id: opening.harness, size: 34 }),
       /* @__PURE__ */ jsxs9("span", { children: [

package/react/messenger.mjs

@@ -2544,7 +2544,7 @@ function ChatHeader({ state, adapter, pendingStatus, actionPending, onBack, onNe
     onClose ? /* @__PURE__ */ jsx9("button", { type: "button", "aria-label": "Close", onClick: onClose, children: /* @__PURE__ */ jsx9(UiIcon, { name: "close", size: 18 }) }) : null
   ] });
 }
-function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates }) {
+function Chat({ state, adapter, onBack, onNew, onClose, components, slots, labels, contextCandidates, navigation }) {
   const Header = slots.header;
   const HeaderActions = slots.headerActions;
   const memoryKey = state.attached?.key || `${state.harness}:${state.workspace}`;
@@ -2554,6 +2554,7 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
   const [settings, setSettings] = useState6(null);
   const restoreSequence = useRef7(0);
   const actionSequence = useRef7(0);
+  const lastNavigation = useRef7(null);
   const acknowledged = useRef7(/* @__PURE__ */ new Set());
   const setPending = (update) => setPendingState((current) => {
     const next = typeof update === "function" ? update(current) : update;
@@ -2566,6 +2567,17 @@ function Chat({ state, adapter, onBack, onNew, onClose, components, slots, label
     setPendingAction(null);
     setRestoreDraft(null);
   }, [memoryKey]);
+  useEffect8(() => {
+    if (!navigation || navigation.id === lastNavigation.current) return;
+    lastNavigation.current = navigation.id;
+    if (navigation.draft === void 0 && !navigation.context?.length && !navigation.images?.length) return;
+    setRestoreDraft({
+      id: `host:${String(navigation.id)}`,
+      text: navigation.draft ?? "",
+      context: navigation.context,
+      images: navigation.images
+    });
+  }, [navigation]);
   useEffect8(() => {
     if (!pending) return;
     if (state.transcript.some((entry) => entry.role === "user" && entry.text.trim() === pending.text.trim() && !pending.baselineIds.includes(entry.id))) {
@@ -2890,6 +2902,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   const [view, setViewState] = useState6(initialView ?? (state.attention.length ? "list" : messengerViewMemory.get(memoryKey) ?? (state.attached || state.transcript.length ? "chat" : "list")));
   const [opening, setOpening] = useState6(null);
   const [newNavigation, setNewNavigation] = useState6(null);
+  const [chatNavigation, setChatNavigation] = useState6(null);
   const [listFocus, setListFocus] = useState6(null);
   const lastNavigation = useRef7(null);
   const setView = (next) => {
@@ -2902,17 +2915,21 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
     lastNavigation.current = navigation.id;
     if (navigation.view === "list") {
       setOpening(null);
+      setChatNavigation(null);
       setView("list");
       return;
     }
     if (navigation.view === "new") {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(navigation);
       setView("new");
       return;
     }
     if (navigation.view === "chat" && typeof navigation.sessionKey === "string" && navigation.sessionKey) {
       setListFocus(navigation.sessionKey);
+      setNewNavigation(null);
+      setChatNavigation(navigation);
       if (state.attached?.key === navigation.sessionKey) {
         setOpening(null);
         setView("chat");
@@ -2934,6 +2951,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   }, [opening, state.attachError?.key, state.attached?.key, state.error, state.operation]);
   const open = (row) => {
     setListFocus(row.key);
+    setChatNavigation(null);
     setOpening(row);
     adapter.onIntent({ action: "attach", key: row.key });
   };
@@ -2943,6 +2961,7 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
   return /* @__PURE__ */ jsxs8("main", { className: `scui-root ${className}`, "data-view": view, "data-mode": state.mode, "aria-label": "Supercode messenger", children: [
     view === "list" ? /* @__PURE__ */ jsx9(SessionList, { state, adapter, focusKey: listFocus, onOpen: open, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
     }, onClose: adapter.onClose ? close : void 0, components, labels: copy, memoryKey, slots, headerActions: HeaderActions }) : null,
@@ -2952,9 +2971,10 @@ function SupercodeMessenger({ state: stateInput, adapter, class: className = "",
       setView("list");
     }, onNew: () => {
       setListFocus("@new");
+      setChatNavigation(null);
       setNewNavigation(null);
       setView("new");
-    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates }) : null,
+    }, onClose: adapter.onClose ? close : void 0, components, slots, labels: copy, contextCandidates, navigation: chatNavigation?.sessionKey === state.attached?.key ? chatNavigation : null }) : null,
     opening ? /* @__PURE__ */ jsxs8("div", { className: "scui-opening", role: "status", "aria-busy": "true", children: [
       /* @__PURE__ */ jsx9(HarnessLogo, { id: opening.harness, size: 34 }),
       /* @__PURE__ */ jsxs8("span", { children: [