Merge pull request #50 from devitools/fix/optimistic-user-messages

fix(acp): Optimistic user messages and PATH fix for macOS

Author: wilcorrea

apps/tauri/src-tauri/Cargo.lock

@@ -35,3 +35,4 @@ rusqlite = { version = "0.31", features = ["bundled"] }
 uuid = { version = "1", features = ["v4"] }
 chrono = "0.4"
 indexmap = "2"
+fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }

apps/tauri/src-tauri/Cargo.toml

@@ -873,6 +873,8 @@ fn setup_macos_menu(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>>
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    let _ = fix_path_env::fix();
+
     let builder = tauri::Builder::default()
         .plugin(tauri_plugin_cli::init())
         .plugin(tauri_plugin_dialog::init())

apps/tauri/src-tauri/src/lib.rs

@@ -118,12 +118,15 @@ export function ActiveSessionView({
   // Core ACP actions using new per-session commands
   const sendPrompt = useCallback(async (text: string) => {
     try {
+      if (!text.startsWith("/")) {
+        sessionMessages.addOptimisticUserMessage(text);
+      }
       await invoke("acp_session_send_prompt", { sessionId: session.id, text });
     } catch (e) {
       setErrors((prev) => [...prev, String(e)]);
       updateSessionEntry(session.id, { isStreaming: false });
     }
-  }, [session.id]);
+  }, [session.id, sessionMessages.addOptimisticUserMessage]);
 
   const persistPreferences = useCallback((partial: Partial<AcpPreferences>) => {
     try {

apps/tauri/src/components/ActiveSessionView.tsx

@@ -32,6 +32,7 @@ function toAcpMessage(r: MessageRecord): AcpMessage {
 
 export interface UseSessionMessagesReturn {
   clearMessages: () => void;
+  addOptimisticUserMessage: (text: string) => void;
   messages: AcpMessage[];
   isLoadingInitial: boolean;
   isLoadingMore: boolean;
@@ -73,6 +74,16 @@ export function useSessionMessages(sessionId: string): UseSessionMessagesReturn
     void loadInitial();
   }, [loadInitial]);
 
+  const addOptimisticUserMessage = useCallback((text: string) => {
+    const optimisticMsg: AcpMessage = {
+      id: `optimistic-${Date.now()}`,
+      role: "user",
+      content: text,
+      timestamp: new Date(),
+    };
+    setMessages((prev) => [...prev, optimisticMsg]);
+  }, []);
+
   useEffect(() => {
     const unlisten = window.__TAURI__.event.listen<{
       sessionId: string;
@@ -84,7 +95,16 @@ export function useSessionMessages(sessionId: string): UseSessionMessagesReturn
       if (msgSessionId !== sessionId) return;
       setMessages((prev) => {
         if (prev.some((m) => m.id === id)) return prev;
-        return [...prev, { id, role: "user", content, timestamp: new Date() }];
+        const idx = prev.findIndex(
+          (m) => m.id.startsWith("optimistic-") && m.role === "user" && m.content === content
+        );
+        const persisted: AcpMessage = { id, role: "user", content, timestamp: new Date() };
+        if (idx >= 0) {
+          const updated = [...prev];
+          updated[idx] = persisted;
+          return updated;
+        }
+        return [...prev, persisted];
       });
     });
     return () => { void unlisten.then((fn) => fn()); };
@@ -151,5 +171,5 @@ export function useSessionMessages(sessionId: string): UseSessionMessagesReturn
     return [...messages, ...streamingMessages];
   }, [messages, streamingMessages]);
 
-  return { messages: merged, isLoadingInitial, isLoadingMore, hasMore, loadMore, clearMessages };
+  return { messages: merged, isLoadingInitial, isLoadingMore, hasMore, loadMore, clearMessages, addOptimisticUserMessage };
 }