Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions apps/tauri/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/tauri/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 2 additions & 0 deletions apps/tauri/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
5 changes: 4 additions & 1 deletion apps/tauri/src/components/ActiveSessionView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 22 additions & 2 deletions apps/tauri/src/hooks/useSessionMessages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ function toAcpMessage(r: MessageRecord): AcpMessage {

export interface UseSessionMessagesReturn {
clearMessages: () => void;
addOptimisticUserMessage: (text: string) => void;
messages: AcpMessage[];
isLoadingInitial: boolean;
isLoadingMore: boolean;
Expand Down Expand Up @@ -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;
Expand All @@ -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()); };
Expand Down Expand Up @@ -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 };
}