Merge pull request #292 from esokullu/main

bugfixes

Author: esokullu

dist/webbrain-chrome-21.5.0.zip dist/webbrain-chrome-21.5.1.zipdist/webbrain-chrome-21.5.0.zip renamed to dist/webbrain-chrome-21.5.1.zip

@@ -1,6 +1,6 @@
 {
   "name": "webbrain",
-  "version": "21.5.0",
+  "version": "21.5.1",
   "description": "Open-source AI browser agent — chat with pages, automate tasks, multi-provider LLM support.",
   "private": true,
   "type": "module",

dist/webbrain-edge-21.5.0.zip dist/webbrain-edge-21.5.1.zipdist/webbrain-edge-21.5.0.zip renamed to dist/webbrain-edge-21.5.1.zip

@@ -1,6 +1,6 @@
 # WebBrain Chrome/Edge Extension — Architecture
 
-> Version 21.5.0 · Manifest V3 · Service Worker background
+> Version 21.5.1 · Manifest V3 · Service Worker background
 
 ## High-Level Overview
 

dist/webbrain-firefox-21.5.0.zip dist/webbrain-firefox-21.5.1.zipdist/webbrain-firefox-21.5.0.zip renamed to dist/webbrain-firefox-21.5.1.zip

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "WebBrain",
-  "version": "21.5.0",
+  "version": "21.5.1",
   "description": "Open-source AI browser agent — chat with pages, automate tasks, multi-provider LLM support.",
   "permissions": [
     "sidePanel",

package-lock.json

@@ -75,6 +75,7 @@ export class Agent {
     this._progressSessionCounter = 0;
     this.conversationModes = new Map(); // tabId -> 'ask' | 'act' | 'dev'
     this.conversationIds = new Map(); // tabId -> stable conversationId (regenerated on clearConversation)
+    this.plannerFollowUpSkipTabs = new Set(); // tabIds allowed one short follow-up after an approved try-mode plan
     this.hydratedTabs = new Set(); // tabIds we've already pulled from storage
     this.persistTimers = new Map(); // tabId -> debounce handle
     this.abortFlags = new Map(); // tabId -> boolean
@@ -287,6 +288,7 @@ export class Agent {
   }
 
   clearScratchpad(tabId) {
+    this.plannerFollowUpSkipTabs.delete(tabId);
     const messages = this.conversations.get(tabId);
     if (!messages) {
       return { success: true, existed: false, note: 'scratchpad already empty' };
@@ -3896,6 +3898,44 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
     return this._plannerMode() !== 'off';
   }
 
+  _messageHasPlannerFollowUpAttachmentBlocks(message) {
+    const content = message?.content ?? message;
+    if (!Array.isArray(content)) return false;
+    return content.some(block => {
+      if (!block || typeof block !== 'object') return false;
+      if (block.type !== 'text') return true;
+      const text = String(block.text || '');
+      return text.startsWith('[UNTRUSTED USER ATTACHMENTS') || text.startsWith('[UNTRUSTED DOCUMENT');
+    });
+  }
+
+  _plannerFollowUpText(message) {
+    const text = this._stripInjectedTaskContext(userMessageToText(message));
+    return text.replace(/\s+/g, ' ').trim();
+  }
+
+  _plannerFollowUpHasExplicitUrl(text) {
+    return /(?:https?:\/\/|www\.)\S+|\b(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,63}(?:\/[^\s]*)?/i.test(String(text || ''));
+  }
+
+  _hasApprovedPlannerHandoff(messages) {
+    const idx = this._findScratchpadIndex(messages || []);
+    if (idx < 0) return false;
+    const body = this._extractScratchpadBody(messages[idx].content);
+    return /\[Approved plan\b[^\]]*pinned by planner\]/.test(body);
+  }
+
+  _shouldSkipPlannerForShortFollowUp(tabId, priorMessages, enriched, plannerMode) {
+    if (plannerMode !== 'try') return false;
+    if (this._normalizePlanReviewMode(this.planReviewMode) === 'always') return false;
+    if (!this.plannerFollowUpSkipTabs.has(tabId)) return false;
+    if (!this._hasApprovedPlannerHandoff(priorMessages)) return false;
+    if (this._messageHasPlannerFollowUpAttachmentBlocks(enriched)) return false;
+    const text = this._plannerFollowUpText(enriched);
+    if (!text || text.length > 100) return false;
+    return !this._plannerFollowUpHasExplicitUrl(text);
+  }
+
   /**
    * Plan-before-Act gate: push user message, pin approved plan after it, or stop early.
    */
@@ -3910,7 +3950,15 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
     const priorMessages = runPlanner ? messages.slice() : null;
     messages.push(enriched);
     this._persist(tabId);
-    if (!runPlanner) return { proceed: true };
+    if (!runPlanner) {
+      this.plannerFollowUpSkipTabs.delete(tabId);
+      return { proceed: true };
+    }
+    if (this._shouldSkipPlannerForShortFollowUp(tabId, priorMessages, enriched, plannerMode)) {
+      this.plannerFollowUpSkipTabs.delete(tabId);
+      return { proceed: true };
+    }
+    this.plannerFollowUpSkipTabs.delete(tabId);
 
     const historyDigest = this._buildPlannerHistoryDigest(priorMessages);
     const gate = await this._runPlannerGate(tabId, enriched, onUpdate, costState, runId, historyDigest, tabInfo, plannerMode);
@@ -3935,6 +3983,7 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
         // Note: the "Plan approved — running…" confirmation is rendered locally
         // by submitPlanReview in the sidepanel, so there's no plan_approved
         // agent_update to emit here (no handler consumed it).
+        if (plannerMode === 'try') this.plannerFollowUpSkipTabs.add(tabId);
       }
       this._persist(tabId);
     }
@@ -4962,6 +5011,7 @@ Rules: no prose intro, no conclusion, no "this screenshot shows...", no layout d
     this._cancelClarifications(tabId, 'conversation cleared');
     this._cancelPendingPlans(tabId, 'conversation cleared');
     this.conversations.delete(tabId);
+    this.plannerFollowUpSkipTabs.delete(tabId);
     this.progressLedgers.delete(tabId);
     this.progressPageScopes.delete(tabId);
     this.progressSessions.delete(tabId);

package.json

@@ -19,7 +19,7 @@ import {
 
 // Version shown in the subtitle. Kept here so it only needs one update per
 // release; the subtitle string itself is translated.
-const EXT_VERSION = '21.5.0';
+const EXT_VERSION = '21.5.1';
 
 const providersContainer = document.getElementById('providers');
 const displaySettings = document.getElementById('display-settings');

src/chrome/ARCHITECTURE.md

@@ -1464,6 +1464,7 @@ async function handleScheduledJobEvent(data, tabId) {
     isProcessing = true;
     abortRequested = false;
     syncSendButtonState();
+    hideRecommendedActions();
     currentAssistantEl = addMessage('assistant', '');
     if (jobId) currentAssistantEl.dataset.scheduledJobId = jobId;
     showActivity(t('sp.scheduled.running', { title }));
@@ -1481,6 +1482,7 @@ async function handleScheduledJobEvent(data, tabId) {
       clearActiveChatPayloadForTab(tabId ?? currentTabId);
       isProcessing = true;
       syncSendButtonState();
+      hideRecommendedActions();
     } else {
       isProcessing = false;
       syncSendButtonState();
@@ -2077,6 +2079,7 @@ function conversationHasUserMessages() {
 }
 
 function hideRecommendedActions() {
+  recommendationsRequestId += 1;
   if (!recommendedActionsEl || !recommendedActionsListEl) return;
   recommendedActionsListEl.replaceChildren();
   recommendedActionsEl.classList.add('hidden');
@@ -3790,6 +3793,7 @@ function renderClarifyCard(data) {
   const tabId = data?.scheduledTabId ?? data?.tabId ?? currentTabId;
   if (tabId == null) return;
   const scheduledJobId = data?.scheduledJobId ? String(data.scheduledJobId) : '';
+  if (scheduledJobId) hideRecommendedActions();
   let assistantEl = currentAssistantEl;
   if (scheduledJobId && data.forceNewScheduledCard) {
     assistantEl = addMessage('assistant', '');
@@ -4133,6 +4137,7 @@ function submitClarify(card, tabId, clarifyId, answer, source) {
     }
     isProcessing = true;
     syncSendButtonState();
+    hideRecommendedActions();
     showActivity(t('sp.activity.thinking'));
   }
   sendToBackground('clarify_response', { tabId, clarifyId, answer, source })