@dexto/tui 1.13.4 → 1.14.0

package/dist/hooks/useCLIState.cjs

@@ -150,20 +150,35 @@ function useCLIState({
       overlay: overlayHandler
     }
   });
+  const previousSessionId = (0, import_react.useRef)(session.id);
+  (0, import_react.useEffect)(() => {
+    if (previousSessionId.current !== null && previousSessionId.current !== session.id) {
+      setUi((previous) => ({
+        ...previous,
+        autoApproveEdits: false,
+        bypassPermissions: false
+      }));
+    }
+    previousSessionId.current = session.id;
+  }, [session.id]);
   (0, import_react.useEffect)(() => {
     setTodos([]);
   }, [session.id]);
+  const hydratedSessionId = (0, import_react.useRef)(null);
+  const [isHydratingHistory, setIsHydratingHistory] = (0, import_react.useState)(initialSessionId !== null);
   (0, import_react.useEffect)(() => {
-    if (!initialSessionId || !session.hasActiveSession || messages.length > 0) {
+    if (!initialSessionId || session.id !== initialSessionId || !session.hasActiveSession || hydratedSessionId.current === initialSessionId) {
       return;
     }
     let cancelled = false;
+    setIsHydratingHistory(true);
     (async () => {
       try {
         const history = await agent.getSessionHistory(initialSessionId);
-        if (!history?.length || cancelled) return;
+        if (cancelled) return;
+        if (!history.length) return;
         const historyMessages = (0, import_messageFormatting.convertHistoryToUIMessages)(history, initialSessionId);
-        setMessages(historyMessages);
+        setMessages((previous) => [...historyMessages, ...previous]);
         const userInputHistory = history.filter(import_core.isUserMessage).map(
           (msg) => msg.content.filter(
             (part) => part.type === "text"
@@ -171,9 +186,8 @@ function useCLIState({
         ).filter((text) => text.trim().length > 0);
         setInput((prev) => ({
           ...prev,
-          history: userInputHistory,
-          historyIndex: -1,
-          editingQueuedFollowUp: false
+          history: [...userInputHistory, ...prev.history],
+          historyIndex: prev.historyIndex < 0 ? prev.historyIndex : prev.historyIndex + userInputHistory.length
         }));
       } catch (error) {
         if (cancelled) return;
@@ -186,13 +200,18 @@ function useCLIState({
             timestamp: /* @__PURE__ */ new Date()
           }
         ]);
+      } finally {
+        if (!cancelled) {
+          hydratedSessionId.current = initialSessionId;
+          setIsHydratingHistory(false);
+        }
       }
     })();
     return () => {
       cancelled = true;
     };
-  }, [agent, initialSessionId, messages.length, session.hasActiveSession]);
-  const visibleMessages = messages;
+  }, [agent, initialSessionId, session.id, session.hasActiveSession]);
+  const visibleMessages = isHydratingHistory && session.id === initialSessionId ? [] : messages;
   return {
     messages,
     setMessages,
@@ -221,6 +240,7 @@ function useCLIState({
     messageService,
     overlayContainerRef,
     visibleMessages,
+    isHydratingHistory: isHydratingHistory && session.id === initialSessionId,
     agent,
     startupInfo
   };

package/dist/hooks/useCLIState.d.ts

@@ -49,6 +49,7 @@ export interface CLIStateReturn {
     messageService: MessageService;
     overlayContainerRef: React.RefObject<OverlayContainerHandle | null>;
     visibleMessages: Message[];
+    isHydratingHistory: boolean;
     agent: TuiAgentBackend;
     startupInfo: StartupInfo;
 }

package/dist/hooks/useCLIState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCLIState.d.ts","sourceRoot":"","sources":["../../src/hooks/useCLIState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useCLIState.d.ts","sourceRoot":"","sources":["../../src/hooks/useCLIState.ts"],"names":[],"mappings":"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"}

package/dist/hooks/useCLIState.js

@@ -127,20 +127,35 @@ function useCLIState({
       overlay: overlayHandler
     }
   });
+  const previousSessionId = useRef(session.id);
+  useEffect(() => {
+    if (previousSessionId.current !== null && previousSessionId.current !== session.id) {
+      setUi((previous) => ({
+        ...previous,
+        autoApproveEdits: false,
+        bypassPermissions: false
+      }));
+    }
+    previousSessionId.current = session.id;
+  }, [session.id]);
   useEffect(() => {
     setTodos([]);
   }, [session.id]);
+  const hydratedSessionId = useRef(null);
+  const [isHydratingHistory, setIsHydratingHistory] = useState(initialSessionId !== null);
   useEffect(() => {
-    if (!initialSessionId || !session.hasActiveSession || messages.length > 0) {
+    if (!initialSessionId || session.id !== initialSessionId || !session.hasActiveSession || hydratedSessionId.current === initialSessionId) {
       return;
     }
     let cancelled = false;
+    setIsHydratingHistory(true);
     (async () => {
       try {
         const history = await agent.getSessionHistory(initialSessionId);
-        if (!history?.length || cancelled) return;
+        if (cancelled) return;
+        if (!history.length) return;
         const historyMessages = convertHistoryToUIMessages(history, initialSessionId);
-        setMessages(historyMessages);
+        setMessages((previous) => [...historyMessages, ...previous]);
         const userInputHistory = history.filter(isUserMessage).map(
           (msg) => msg.content.filter(
             (part) => part.type === "text"
@@ -148,9 +163,8 @@ function useCLIState({
         ).filter((text) => text.trim().length > 0);
         setInput((prev) => ({
           ...prev,
-          history: userInputHistory,
-          historyIndex: -1,
-          editingQueuedFollowUp: false
+          history: [...userInputHistory, ...prev.history],
+          historyIndex: prev.historyIndex < 0 ? prev.historyIndex : prev.historyIndex + userInputHistory.length
         }));
       } catch (error) {
         if (cancelled) return;
@@ -163,13 +177,18 @@ function useCLIState({
             timestamp: /* @__PURE__ */ new Date()
           }
         ]);
+      } finally {
+        if (!cancelled) {
+          hydratedSessionId.current = initialSessionId;
+          setIsHydratingHistory(false);
+        }
       }
     })();
     return () => {
       cancelled = true;
     };
-  }, [agent, initialSessionId, messages.length, session.hasActiveSession]);
-  const visibleMessages = messages;
+  }, [agent, initialSessionId, session.id, session.hasActiveSession]);
+  const visibleMessages = isHydratingHistory && session.id === initialSessionId ? [] : messages;
   return {
     messages,
     setMessages,
@@ -198,6 +217,7 @@ function useCLIState({
     messageService,
     overlayContainerRef,
     visibleMessages,
+    isHydratingHistory: isHydratingHistory && session.id === initialSessionId,
     agent,
     startupInfo
   };