Merge pull request #79 from esokullu/codex/skip-planner-short-followups

Skip planner for short follow-up turns

Author: esokullu

src/chrome/src/agent/agent.js

@@ -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);

src/firefox/src/agent/agent.js

@@ -67,6 +67,7 @@ export class Agent {
     this._progressSessionCounter = 0;
     this.conversationIds = new Map(); // tabId -> stable conversationId (regenerated on clearConversation)
     this.conversationModes = new Map(); // tabId -> 'ask' | 'act' | 'dev'
+    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
@@ -281,6 +282,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' };
@@ -3174,6 +3176,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);
+  }
+
   async _maybeRunPlannerGate(tabId, messages, enriched, onUpdate, mode, costState, runId, tabInfo = null) {
     const plannerMode = this._isActionMode(mode) ? this._plannerMode() : 'off';
     const runPlanner = plannerMode !== 'off';
@@ -3185,7 +3225,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);
@@ -3209,6 +3257,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);
     }
@@ -4071,6 +4120,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);