Remove keepalive, use long timeout for user feedback

**Simpler Solution:**

**Problem:** Keepalive mechanism had race conditions and added complexity
**Solution:** Just use long timeout (1 hour) for user feedback messages

**Changes:**
- Removed KeepAlive variant from FeedbackData enum
- Removed keepalive logic from extension
- Added message-type-based timeout selection in send_message_with_reply()
- CreateSyntheticPr/UpdateSyntheticPr: 1 hour timeout
- Other IPC messages: 5 second timeout

**Benefits:**
- **No race conditions** - Single response per request
- **Simple implementation** - No complex keepalive protocol
- **User control** - Users can Ctrl-C if they want to abort
- **Reasonable timeout** - 1 hour is plenty for code review

**Result:** Clean, simple solution that handles long user interactions without complexity.

Author: nikomatsakis

extension/src/extension.ts

@@ -97,7 +97,7 @@ interface CommentThread {
 }
 
 interface UserFeedback {
-    feedback_type: 'comment' | 'complete_review' | 'keep_alive';
+    feedback_type: 'comment' | 'complete_review';
     review_id: string;
     // For Comment variant
     file_path?: string;
@@ -476,96 +476,76 @@ class DaemonClient implements vscode.Disposable {
      * This method blocks until the user provides feedback via UI
      */
     private async collectUserFeedback(reviewId: string): Promise<UserFeedback> {
-        // Set up keepalive mechanism
-        const keepaliveInterval = setInterval(() => {
-            // Send keepalive back to server
-            this.sendKeepAlive(reviewId);
-        }, 30000); // Every 30 seconds
+        // Show quick pick for user action
+        const action = await vscode.window.showQuickPick([
+            {
+                label: '💬 Add Comment',
+                description: 'Leave a comment on the review',
+                action: 'comment'
+            },
+            {
+                label: '✅ Request Changes',
+                description: 'Ask the agent to make changes',
+                action: 'request_changes'
+            },
+            {
+                label: '📝 Checkpoint Work',
+                description: 'Ask the agent to commit and document progress',
+                action: 'checkpoint'
+            },
+            {
+                label: '↩️ Return to Agent',
+                description: 'Return control without specific request',
+                action: 'return'
+            }
+        ], {
+            placeHolder: 'What would you like to do with this review?',
+            ignoreFocusOut: true
+        });
 
-        try {
-            // Show quick pick for user action
-            const action = await vscode.window.showQuickPick([
-                {
-                    label: '💬 Add Comment',
-                    description: 'Leave a comment on the review',
-                    action: 'comment'
-                },
-                {
-                    label: '✅ Request Changes',
-                    description: 'Ask the agent to make changes',
-                    action: 'request_changes'
-                },
-                {
-                    label: '📝 Checkpoint Work',
-                    description: 'Ask the agent to commit and document progress',
-                    action: 'checkpoint'
-                },
-                {
-                    label: '↩️ Return to Agent',
-                    description: 'Return control without specific request',
-                    action: 'return'
-                }
-            ], {
-                placeHolder: 'What would you like to do with this review?',
+        if (!action) {
+            // User cancelled - return default feedback
+            return {
+                feedback_type: 'complete_review',
+                review_id: reviewId,
+                completion_action: 'return'
+            };
+        }
+
+        if (action.action === 'comment') {
+            // Collect comment from user
+            const commentText = await vscode.window.showInputBox({
+                prompt: 'Enter your comment',
+                placeHolder: 'Type your comment here...',
                 ignoreFocusOut: true
             });
 
-            if (!action) {
-                // User cancelled - return default feedback
-                return {
-                    feedback_type: 'complete_review',
-                    review_id: reviewId,
-                    completion_action: 'return'
-                };
-            }
-
-            if (action.action === 'comment') {
-                // Collect comment from user
-                const commentText = await vscode.window.showInputBox({
-                    prompt: 'Enter your comment',
-                    placeHolder: 'Type your comment here...',
+            return {
+                feedback_type: 'comment',
+                review_id: reviewId,
+                comment_text: commentText || '',
+                file_path: 'review', // TODO: Get actual file if commenting on specific file
+                line_number: 1 // TODO: Get actual line number
+            };
+        } else {
+            // Completion action
+            let additionalNotes: string | undefined;
+            
+            if (action.action === 'request_changes' || action.action === 'checkpoint') {
+                additionalNotes = await vscode.window.showInputBox({
+                    prompt: 'Any additional notes? (optional)',
+                    placeHolder: 'Additional instructions or context...',
                     ignoreFocusOut: true
                 });
-
-                return {
-                    feedback_type: 'comment',
-                    review_id: reviewId,
-                    comment_text: commentText || '',
-                    file_path: 'review', // TODO: Get actual file if commenting on specific file
-                    line_number: 1 // TODO: Get actual line number
-                };
-            } else {
-                // Completion action
-                let additionalNotes: string | undefined;
-                
-                if (action.action === 'request_changes' || action.action === 'checkpoint') {
-                    additionalNotes = await vscode.window.showInputBox({
-                        prompt: 'Any additional notes? (optional)',
-                        placeHolder: 'Additional instructions or context...',
-                        ignoreFocusOut: true
-                    });
-                }
-
-                return {
-                    feedback_type: 'complete_review',
-                    review_id: reviewId,
-                    completion_action: action.action as 'request_changes' | 'checkpoint' | 'return',
-                    additional_notes: additionalNotes
-                };
             }
-        } finally {
-            // Always clear the keepalive interval
-            clearInterval(keepaliveInterval);
-        }
-    }
 
-    /**
-     * Send keepalive message to indicate user is still active
-     */
-    private sendKeepAlive(reviewId: string): void {
-        this.outputChannel.appendLine(`[KEEPALIVE] Sending keepalive for review: ${reviewId}`);
-        // Note: This would need to be sent back through the same response channel
-        // For now, we'll implement this as a separate message or extend the current response mechanism
+            return {
+                feedback_type: 'complete_review',
+                review_id: reviewId,
+                completion_action: action.action as 'request_changes' | 'checkpoint' | 'return',
+                additional_notes: additionalNotes
+            };
+        }
     }
 
     private sendResponse(messageId: string, response: ResponsePayload): void {

server/src/ipc.rs

@@ -497,13 +497,19 @@ impl IPCCommunicator {
 
     /// Sends an IPC message and waits for a response from VSCode extension
     ///
-    /// Sets up response correlation using the message UUID and waits up to 5 seconds
-    /// for the background reader task to deliver the matching response.
+    /// Sets up response correlation using the message UUID and waits for response.
     /// Uses the underlying `write_message` primitive to send the data.
     async fn send_message_with_reply<R>(&self, message: IPCMessage) -> Result<R>
     where
         R: DeserializeOwned,
     {
+        // Use longer timeout for user feedback messages
+        let timeout_duration = match message.message_type {
+            IPCMessageType::CreateSyntheticPr | IPCMessageType::UpdateSyntheticPr => {
+                std::time::Duration::from_secs(3600) // 1 hour for user interactions
+            }
+            _ => std::time::Duration::from_secs(5), // 5 seconds for normal operations
+        };
         debug!(
             "Sending IPC message with ID: {} (PID: {})",
             message.id,
@@ -530,8 +536,8 @@ impl IPCCommunicator {
 
         trace!("Waiting for response with 5 second timeout...");
 
-        // Wait for response with timeout
-        let response = tokio::time::timeout(std::time::Duration::from_secs(5), rx)
+        // Wait for response with appropriate timeout
+        let response = tokio::time::timeout(timeout_duration, rx)
             .await
             .map_err(|_| {
                 // Clean up the leaked entry on timeout to fix memory leak
@@ -893,7 +899,6 @@ impl IPCCommunicator {
                                 additional_notes: feedback_payload.additional_notes,
                             }
                         }
-                        "keep_alive" => crate::synthetic_pr::FeedbackData::KeepAlive,
                         _ => crate::synthetic_pr::FeedbackData::CompleteReview {
                             completion_action: crate::synthetic_pr::CompletionAction::Return,
                             additional_notes: None,

server/src/server.rs

@@ -154,13 +154,6 @@ impl DialecticServer {
                     ),
                 }
             }
-            crate::synthetic_pr::FeedbackData::KeepAlive => {
-                format!(
-                    "User is still reviewing (keepalive received). Please wait for their feedback.\n\n\
-                    Invoke: update_review(review_id: '{}', action: WaitForFeedback)",
-                    &feedback.review_id
-                )
-            }
         }
     }
 

server/src/synthetic_pr/mcp_tools.rs

@@ -56,7 +56,6 @@ pub enum FeedbackData {
         completion_action: CompletionAction,
         additional_notes: Option<String>,
     },
-    KeepAlive,
 }
 
 /// Data generated from the working directory and sent over IPC to the extension