Fix UI bugs, re-enable built-in tools, v1.0.3

Author: BarricadeBandit

src/main/copilot-service.ts

@@ -193,16 +193,16 @@ You're a helpful AI integrated into a web browser with full browser automation c
 - Type text into search boxes and forms
 - Scroll pages up/down
 - Find text on pages
-- Take screenshots and get DETAILED VISUAL DESCRIPTIONS of page state (video playing, buttons visible, text content, etc.)
+- Take screenshots - the image is saved to disk and you can use the built-in view tool to see page contents visually
 - Navigate back/forward in history
 - Wait for page content or specific elements to load
 - Ask clarifying questions to the user rather than ending the turn.
 </capabilities>
 
 <instructions>
 - Be concise and direct.
-- IMPORTANT: You are a browser automation agent. DO NOT use any tools other than the provided \`browser_*\` tools.
-- **VISUAL AWARENESS**: Use \`browser_take_screenshot\` to get a detailed structured description of what's visible on the page. This tells you:
+- IMPORTANT: You are a browser automation agent. DO NOT use any tools other than the provided \`browser_*\` tools and the built-in \`view\` tool for viewing screenshots.
+- **VISUAL AWARENESS**: Use \`browser_take_screenshot\` to capture the page. It saves the image to a file and returns the path. Then use the built-in \`view\` tool with that path to see what's on the page visually.
   - Whether a video is playing, paused, buffering, or showing an ad
   - All visible buttons and their labels
   - Video titles, channels, and URLs on YouTube
@@ -244,7 +244,8 @@ If you've opened multiple tabs trying to find something please close the old unu
 </best_practices>
 
 <never_do>
-Never use any tools or take any actions outside of the provided browser tools. You ARE a BROWSER AUTOMATION AGENT.
+- Never use any tools other than browser_* tools and the view tool. You ARE a BROWSER AUTOMATION AGENT.
+- Never use shell, edit_file, read_file (except view for screenshots), or any file manipulation tools.
 </never_do>
 `,
             },
@@ -659,7 +660,7 @@ Never use any tools or take any actions outside of the provided browser tools. Y
                 },
             }),
             defineToolFn('browser_take_screenshot', {
-                description: 'Take a screenshot of the current page. Saves the image to disk and returns the file path. Use the built-in view tool to see the screenshot contents.',
+                description: 'Take a screenshot of the current page. Saves the image to disk and returns the file path. Use the built-in view tool with the returned path to see page contents.',
                 skipPermission: true,
                 parameters: {
                     type: 'object',
@@ -672,11 +673,10 @@ Never use any tools or take any actions outside of the provided browser tools. Y
                         // Capture screenshot for user display
                         const dataUrl = await withTimeout(callbacks.takeScreenshot(), 10000);
                         if (dataUrl) {
-                            // Send the image data to UI so user can see it in the chat
                             reportResult('browser_take_screenshot', dataUrl);
                         }
 
-                        // Save screenshot to file so the built-in view tool can read it
+                        // Save to file for view tool access
                         let filePath: string | null = null;
                         if (callbacks.saveScreenshotToFile) {
                             filePath = await callbacks.saveScreenshotToFile();
@@ -686,7 +686,7 @@ Never use any tools or take any actions outside of the provided browser tools. Y
                             return `Screenshot saved to: ${filePath}\nUse the view tool to see the screenshot contents.`;
                         }
 
-                        // Fallback to text description if file save failed
+                        // Fallback to text description if save failed
                         const visualDescription = await withTimeout(callbacks.getVisualDescription(), 10000);
                         return visualDescription;
                     } catch (error: any) {

src/renderer/app.js

@@ -10,10 +10,13 @@ const state = {
     currentTheme: 'system',
     copilotReady: false,
     isStreaming: false,
+    isSending: false, // Lock to prevent double-send
     currentModel: 'gpt-4.1',
     includePageContent: false,
     currentSessionId: null,
     messages: [], // Store messages in memory
+    streamGeneration: 0, // Counter to ignore stale stream results after new chat
+    sessionReady: Promise.resolve(), // Resolves when backend session is ready
 };
 
 // DOM Elements
@@ -410,9 +413,13 @@ function setupIpcListeners() {
     });
 
     window.electronAPI.onStreamEnd((result) => {
+        const expectedGeneration = state.streamGeneration;
         state.isStreaming = false;
         updateSendButton();
 
+        // Ignore stale stream results from before a chat was cleared
+        if (expectedGeneration !== state.streamGeneration) return;
+        
         // Check if we have a streaming message BEFORE removing the indicator/attribute
         const streamingMessage = elements.chatMessages.querySelector('[data-streaming="true"]');
 
@@ -467,8 +474,10 @@ function setupIpcListeners() {
     });
 
     window.electronAPI.onStreamError((error) => {
+        const expectedGen = state.streamGeneration;
         state.isStreaming = false;
         updateSendButton();
+        if (expectedGen !== state.streamGeneration) return;
         removeThinkingIndicator();
         addErrorMessage(error);
     });
@@ -668,6 +677,12 @@ async function sendMessage() {
 
     if (!message) return;
 
+    // Prevent double-send while processing
+    if (state.isSending) return;
+    state.isSending = true;
+    elements.sendBtn.disabled = true;
+    elements.chatInput.disabled = true;
+    
     let fullMessage = message;
 
     // Include page content if requested
@@ -689,12 +704,17 @@ async function sendMessage() {
     const welcomeMsg = elements.chatMessages.querySelector('.welcome-message');
     if (welcomeMsg) {
         welcomeMsg.remove();
-        // Start new session
-        await startNewSession();
+        // Only create session if one doesn't exist yet (startNewChat already created one)
+        if (!state.currentSessionId) {
+            await startNewSession();
+        }
     } else if (!state.currentSessionId) {
         await startNewSession();
     }
 
+    // Wait for any in-progress session reset to complete
+    await state.sessionReady;
+    
     // Add user message
     const userMessage = { id: Date.now().toString(), role: 'user', content: message, timestamp: Date.now() };
     state.messages.push(userMessage);
@@ -713,6 +733,11 @@ async function sendMessage() {
     state.isStreaming = true;
     updateSendButton();
 
+    // Unlock send
+    state.isSending = false;
+    elements.chatInput.disabled = false;
+    elements.chatInput.focus();
+    
     // Send to Copilot
     window.electronAPI.startStream(fullMessage, state.currentModel);
 }
@@ -721,12 +746,16 @@ async function startNewSession() {
     state.currentSessionId = Date.now().toString();
     state.messages = [];
 
-    // Reset the Copilot session context on the backend
-    try {
-        await window.electronAPI.resetSession();
-    } catch (err) {
-        console.warn('Failed to reset Copilot session:', err);
-    }
+    // Track session readiness so sendMessage can wait for it
+    const readyPromise = (async () => {
+        try {
+            await window.electronAPI.resetSession();
+        } catch (err) {
+            console.warn('Failed to reset Copilot session:', err);
+        }
+    })();
+    state.sessionReady = readyPromise;
+    await readyPromise;
 }
 
 function saveCurrentSession() {
@@ -1221,9 +1250,20 @@ function addErrorMessage(error) {
     scrollToBottom();
 }
 
-function startNewChat() {
+async function startNewChat() {
+    // Abort any active stream first
+    if (state.isStreaming) {
+        window.electronAPI.abortStream();
+        state.isStreaming = false;
+        updateSendButton();
+        removeThinkingIndicator();
+    }
+    
+    // Bump generation counter so stale stream results are ignored
+    state.streamGeneration++;
+    
     clearChat();
-    startNewSession();
+    await startNewSession();
 }
 
 // Sidebar Resize Logic