@agentrhq/webcmd 0.3.0 → 0.3.1

package/clis/chatgpt/utils.test.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { JSDOM } from 'jsdom';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import { ArgumentError, AuthRequiredError, CommandExecutionError } from '@agentrhq/webcmd/errors';
-import { __test__, getChatGPTDetailRows, getChatGPTImageAssets, getChatGPTResponsePairCounts, getChatGPTVisibleImageUrls, getCurrentChatGPTModel, getCurrentChatGPTTool, isGenerating, navigateToProject, openChatGPTConversation, prepareChatGPTImagePaths, selectChatGPTModel, selectChatGPTTool, sendChatGPTMessage, uploadChatGPTImages, waitForChatGPTDetailRows, waitForChatGPTImages, waitForChatGPTResponse } from './utils.js';
+import { __test__, getChatGPTDetailRows, getChatGPTImageAssets, getChatGPTResponsePairCounts, getChatGPTVisibleImageUrls, getCurrentChatGPTModel, getCurrentChatGPTTool, getVisibleMessages, isGenerating, navigateToProject, openChatGPTConversation, prepareChatGPTImagePaths, selectChatGPTModel, selectChatGPTTool, sendChatGPTMessage, uploadChatGPTImages, waitForChatGPTDeepResearchResult, waitForChatGPTDetailRows, waitForChatGPTImages, waitForChatGPTResponse } from './utils.js';
 
 const tempDirs = [];
 
@@ -20,6 +20,7 @@ function createPageMock({ location = '', generating = [], imageUrls = [] } = {})
     let imageIndex = 0;
     return {
         wait: vi.fn().mockResolvedValue(undefined),
+        sleep: vi.fn().mockResolvedValue(undefined),
         goto: vi.fn().mockResolvedValue(undefined),
         evaluate: vi.fn((script) => {
             if (script === 'window.location.href') return Promise.resolve(location);
@@ -51,6 +52,7 @@ function createDomEvaluatePage(html) {
         dom,
         goto: vi.fn().mockResolvedValue(undefined),
         wait: vi.fn().mockResolvedValue(undefined),
+        sleep: vi.fn().mockResolvedValue(undefined),
         evaluate: vi.fn((script) => Promise.resolve(dom.window.eval(script))),
     };
 }
@@ -188,6 +190,37 @@ function makeDeepResearchPayload(report = makeDeepResearchReport(), { conversati
     return payload;
 }
 
+function makeDeepResearchProgressPayload(status = 'waiting_for_user_response_on_plan') {
+    return {
+        mapping: {
+            progress_node: {
+                message: {
+                    metadata: {
+                        chatgpt_sdk: {
+                            widget_state: JSON.stringify({
+                                status,
+                                waiting_for_user_response_on_plan_until: '2026-07-02T02:29:48.298274Z',
+                                plan: {
+                                    plan_id: 'plan-demo',
+                                    title: 'Research plan',
+                                    steps: [{ id: 'step-1', title: 'Collect sources', status: 'pending' }],
+                                },
+                                step_statuses_by_plan: { 'step-1': 'pending' },
+                            }),
+                            response_metadata: {
+                                async_task_conversation_id: 'async-conversation-123',
+                                'openai/widgetSessionId': 'widget-session-123',
+                                'openai/asyncStatus': 7,
+                                venus_message_type: 'initial_loading_message',
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    };
+}
+
 describe('chatgpt deep research result extraction', () => {
     it('extracts report markdown and sources from conversation widget_state', () => {
         const result = __test__.extractDeepResearchFromConversationPayload(makeDeepResearchPayload());
@@ -251,9 +284,150 @@ describe('chatgpt deep research result extraction', () => {
             .toThrow(CommandExecutionError);
     });
 
+    it('extracts waiting-for-user progress from widget metadata without a report', () => {
+        const result = __test__.extractDeepResearchFromConversationPayload(makeDeepResearchProgressPayload());
+
+        expect(result).toMatchObject({
+            status: 'waiting_for_user',
+            method: 'conversation-widget-progress',
+            asyncTaskConversationId: 'async-conversation-123',
+            widgetSessionId: 'widget-session-123',
+            asyncStatus: 7,
+            venusMessageType: 'initial_loading_message',
+            venusStatus: 'waiting_for_user_response_on_plan',
+            waitingForUserUntil: '2026-07-02T02:29:48.298274Z',
+            planId: 'plan-demo',
+            planTitle: 'Research plan',
+        });
+        expect(result.report).toBe('');
+        expect(result.progress.planSteps).toEqual([
+            { id: 'step-1', title: 'Collect sources', status: 'pending' },
+        ]);
+    });
+
+    it('ignores unrelated SDK response metadata without Deep Research identity', () => {
+        const payload = {
+            mapping: {
+                app_widget: {
+                    message: {
+                        metadata: {
+                            chatgpt_sdk: {
+                                response_metadata: {
+                                    'openai/widgetSessionId': 'unrelated-widget',
+                                    'openai/asyncStatus': 1,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        };
+
+        expect(__test__.extractDeepResearchFromConversationPayload(payload)).toBeNull();
+    });
+
+    it('prefers the current Deep Research progress over stale actionable progress', () => {
+        const stale = makeDeepResearchProgressPayload().mapping.progress_node;
+        stale.message.create_time = 1;
+        const current = makeDeepResearchProgressPayload('running').mapping.progress_node;
+        current.message.create_time = 2;
+        const payload = {
+            current_node: 'running_node',
+            mapping: {
+                waiting_node: { ...stale, parent: null },
+                running_node: { ...current, parent: 'waiting_node' },
+            },
+        };
+
+        expect(__test__.extractDeepResearchFromConversationPayload(payload)).toMatchObject({
+            status: 'running',
+            venusStatus: 'running',
+        });
+    });
+
     it('ignores short widget previews that are not completed reports', () => {
         expect(__test__.extractDeepResearchFromConversationPayload(makeDeepResearchPayload('short preview'))).toBeNull();
     });
+
+    it('stops waiting immediately when widget state needs user input', async () => {
+        const page = {
+            getCookies: vi.fn().mockResolvedValue([]),
+            wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
+            evaluate: vi.fn((script) => {
+                const source = String(script);
+                if (source.includes("document.querySelectorAll('iframe')")) {
+                    return Promise.resolve({
+                        url: 'https://chatgpt.com/c/requested123',
+                        title: 'ChatGPT',
+                        iframes: [],
+                        deepResearchIframe: null,
+                    });
+                }
+                if (source.includes('Stop generating') || source.includes('Thinking')) return Promise.resolve(false);
+                if (source.includes('/backend-api/conversation/')) {
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        contentType: 'application/json',
+                        text: JSON.stringify(makeDeepResearchProgressPayload()),
+                    });
+                }
+                return Promise.resolve(undefined);
+            }),
+        };
+
+        const result = await waitForChatGPTDeepResearchResult(page, {
+            conversationId: 'requested123',
+            timeoutSeconds: 180,
+            stableSeconds: 3,
+        });
+
+        expect(result.status).toBe('waiting_for_user');
+        expect(result.venusStatus).toBe('waiting_for_user_response_on_plan');
+        expect(page.sleep).not.toHaveBeenCalled();
+    });
+
+    it('continues waiting through a transient missing state before progress appears', async () => {
+        let conversationReads = 0;
+        const page = {
+            getCookies: vi.fn().mockResolvedValue([]),
+            wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
+            evaluate: vi.fn((script) => {
+                const source = String(script);
+                if (source.includes("document.querySelectorAll('iframe')")) {
+                    return Promise.resolve({
+                        url: 'https://chatgpt.com/c/requested123',
+                        title: 'ChatGPT',
+                        iframes: [],
+                        deepResearchIframe: null,
+                    });
+                }
+                if (source.includes('Stop generating') || source.includes('Thinking')) return Promise.resolve(false);
+                if (source.includes('/backend-api/conversation/')) {
+                    conversationReads += 1;
+                    return Promise.resolve({
+                        ok: true,
+                        status: 200,
+                        contentType: 'application/json',
+                        text: JSON.stringify(conversationReads === 1 ? { mapping: {} } : makeDeepResearchProgressPayload()),
+                    });
+                }
+                return Promise.resolve(undefined);
+            }),
+        };
+
+        const result = await waitForChatGPTDeepResearchResult(page, {
+            conversationId: 'requested123',
+            timeoutSeconds: 180,
+            stableSeconds: 3,
+        });
+
+        expect(result.status).toBe('waiting_for_user');
+        expect(page.sleep).toHaveBeenCalledWith(3);
+        expect(conversationReads).toBe(2);
+    });
 });
 
 describe('chatgpt model selection validation', () => {
@@ -662,6 +836,7 @@ describe('chatgpt detail completion state', () => {
     function createDetailPageMock({ generating = false, messages = [] } = {}) {
         return {
             wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn((script) => {
                 if (script.includes('Stop generating') || script.includes('Thinking')) {
                     return Promise.resolve(generating);
@@ -721,6 +896,7 @@ describe('chatgpt ask response extraction boundary', () => {
         let messageIndex = 0;
         return {
             wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn((script) => {
                 if (script === 'window.location.href') return Promise.resolve(url);
                 if (script.includes('Stop generating') || script.includes('Thinking')) {
@@ -856,6 +1032,43 @@ describe('chatgpt ask response extraction boundary', () => {
             conversationUrl: 'https://chatgpt.com/c/demo',
         })).rejects.toThrow(/navigated away from the target conversation/);
     });
+
+    it('polls with pure sleeps instead of DOM-stable numeric waits', async () => {
+        mockAdvancingClock();
+        const page = createResponseWaitPage([[], [], []]);
+
+        await expect(waitForChatGPTResponse(page, 0, 'unmatched prompt', 4, {}))
+            .rejects.toThrow(/chatgpt ask timed out/);
+
+        expect(page.sleep).toHaveBeenCalled();
+        expect(page.wait).not.toHaveBeenCalled();
+    });
+
+    it('uses textContent instead of layout-triggering innerText in text-only polls', async () => {
+        const page = createDomEvaluatePage(`
+            <article data-testid="conversation-turn-2">
+              <div data-message-author-role="assistant">
+                <div class="markdown">done answer</div>
+              </div>
+            </article>
+        `);
+        for (const node of page.dom.window.document.querySelectorAll('*')) {
+            node.getBoundingClientRect = () => ({ width: 120, height: 36 });
+        }
+        Object.defineProperty(page.dom.window.HTMLElement.prototype, 'innerText', {
+            configurable: true,
+            get() {
+                throw new Error('innerText should not be read during text-only polls');
+            },
+        });
+
+        await expect(getVisibleMessages(page, { textOnly: true })).resolves.toEqual([{
+            Index: 1,
+            Role: 'Assistant',
+            Text: 'done answer',
+            Html: '',
+        }]);
+    });
 });
 
 describe('chatgpt generation state', () => {
@@ -869,6 +1082,47 @@ describe('chatgpt generation state', () => {
 
         await expect(isGenerating(page)).resolves.toBe(true);
     });
+
+    it('detects a plain-text Thinking pill in the latest message turn', async () => {
+        const page = createDomEvaluatePage(`
+            <div data-message-author-role="assistant">
+              <div>partial answer</div>
+              <div>Thinking</div>
+            </div>
+        `);
+
+        await expect(isGenerating(page)).resolves.toBe(true);
+    });
+
+    it('stays idle when Thinking is only the selected composer model', async () => {
+        const page = createDomEvaluatePage(`
+            <article data-testid="conversation-turn-2">
+              <div data-message-author-role="assistant"><div class="markdown">done answer</div></div>
+            </article>
+            <form>
+              <div id="prompt-textarea" contenteditable="true"></div>
+              <button aria-label="Thinking">Thinking</button>
+            </form>
+        `);
+
+        await expect(isGenerating(page)).resolves.toBe(false);
+    });
+
+    it('ignores finished answer text that merely mentions Thinking', async () => {
+        const page = createDomEvaluatePage(`
+            <article data-testid="conversation-turn-2">
+              <div data-message-author-role="assistant">
+                <div class="markdown"><p>The answer discusses Thinking mode.</p></div>
+              </div>
+            </article>
+        `);
+        Object.defineProperty(page.dom.window.document.body, 'innerText', {
+            configurable: true,
+            get: () => 'The answer discusses Thinking mode.',
+        });
+
+        await expect(isGenerating(page)).resolves.toBe(false);
+    });
 });
 
 describe('chatgpt current model detection', () => {
@@ -1203,6 +1457,7 @@ describe('chatgpt image upload helper', () => {
         const page = {
             setFileInput: vi.fn().mockResolvedValue(undefined),
             wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn().mockResolvedValue(true),
         };
 
@@ -1254,6 +1509,7 @@ describe('chatgpt image upload helper', () => {
         const page = {
             setFileInput: vi.fn().mockRejectedValue(new Error('No element found')),
             wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn((script) => {
                 if (String(script).includes('new DataTransfer()')) {
                     return Promise.resolve({ ok: true });
@@ -1289,6 +1545,7 @@ describe('chatgpt image upload helper', () => {
         const page = {
             setFileInput: vi.fn().mockResolvedValue(undefined),
             wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn((script) => Promise.resolve(dom.window.eval(String(script)))),
         };
 
@@ -1319,6 +1576,7 @@ describe('chatgpt image upload helper', () => {
         const page = {
             setFileInput: vi.fn().mockResolvedValue(undefined),
             wait: vi.fn().mockResolvedValue(undefined),
+            sleep: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn((script) => Promise.resolve(dom.window.eval(String(script)))),
         };
 

package/clis/claude/ask.js

@@ -23,7 +23,27 @@ export const askCommand = cli({
         { name: 'new', type: 'boolean', default: false, help: 'Start a new chat before sending' },
         { name: 'model', default: 'sonnet', choices: ['sonnet', 'opus', 'haiku'], help: 'Model to use: sonnet, opus, or haiku' },
         { name: 'think', type: 'boolean', default: false, help: 'Enable Adaptive thinking' },
-        { name: 'file', help: 'Attach a file (image, PDF, text) with the prompt' },
+        {
+            name: 'file',
+            help: 'Attach a file (image, PDF, text) with the prompt',
+            file: {
+                direction: 'input',
+                pathKind: 'file',
+                multiple: false,
+                contentTypes: [
+                    'application/pdf',
+                    'text/plain',
+                    'text/markdown',
+                    'text/csv',
+                    'application/json',
+                    'image/jpeg',
+                    'image/png',
+                    'image/gif',
+                    'image/webp',
+                ],
+                maxBytes: 26_214_400,
+            },
+        },
     ],
     columns: ['response'],
 

package/clis/facebook/feed.js

@@ -24,7 +24,26 @@ function buildFeedExtractScript(limit) {
     const limit = ${limit};
 
     function clean(value) {
-      return String(value || '').replace(/\\s+/g, ' ').trim();
+      // Strip zero-width / bidi control chars first: Facebook injects them into
+      // decoy nodes to poison scrapers. See issue #2089.
+      return String(value || '')
+        .replace(/[\\u200b-\\u200f\\u202a-\\u202e\\u2060\\ufeff]/g, '')
+        .replace(/\\s+/g, ' ')
+        .trim();
+    }
+
+    // FB anti-scrape decoys: long spaceless digit runs, spaced single-char
+    // strings ("a b c d e"), and hidden-domain .com spam. Real author/content
+    // text never looks like this.
+    function isDecoyText(text) {
+      if (!text) return true;
+      if (/^\\d{8,}$/.test(text)) return true;
+      if (/^(?:\\S ){4,}\\S$/.test(text) && text.replace(/\\s/g, '').length <= 12) return true;
+      return false;
+    }
+
+    function isReelsOrCarouselChrome(text) {
+      return /^(Reels|Reels and short videos|People you may know)/i.test(text);
     }
 
     function textOf(el) {
@@ -39,36 +58,35 @@ function buildFeedExtractScript(limit) {
       const path = window.location && window.location.pathname ? window.location.pathname : '';
       const body = textOf(document.body);
       return /^\\/(login|checkpoint)(\\/|$|\\.php)/.test(path)
-        || /^(Log in to Facebook|FacebookLog in|Log in Facebook)/i.test(body)
+        || /^(Log in to Facebook|Facebook Log in|Log in Facebook)/i.test(body)
         || /You must log in to continue/i.test(body);
     }
 
     function isExplicitEmptyFeed() {
       const body = textOf(document.body);
-      return /No posts available|Nothing to show|No posts available|No more posts|No posts yet/i.test(body);
+      return /No posts available|Nothing to show|No more posts|No posts yet/i.test(body);
     }
 
     function isSuggestionOrChrome(text) {
-      return /^(People you may know|People You May Know|People you may know?|People you may know?)/i.test(text)
-        || /^(Suggested for you|Suggested Groups|Suggested groups|Suggested content)/i.test(text);
+      return /^(People you may know|People You May Know)/i.test(text)
+        || /^(Suggested for you|Suggested Groups|Suggested content)/i.test(text);
     }
 
     function isSponsored(text) {
-      return /(^|\\s)(Sponsored|Sponsored|Advertisement)(\\s|$)/i.test(text);
+      return /(^|\\s)(Sponsored|Advertisement)(\\s|$)/i.test(text);
     }
 
     function isActionText(text) {
-      return /^(Like|Comment|Share|Send|Follow|Like|Comment|Share|Send|Follow)$/i.test(text);
+      return /^(Like|Comment|Share|Send|Follow)$/i.test(text);
     }
 
     function isMetricText(text) {
       return /^(All:|All reactions:)/i.test(text)
         || /\\b(likes?|reactions?|comments?|shares?)\\b/i.test(text)
-        || /(comments|shares)$/.test(text);
     }
 
     function isTimestampText(text) {
-      return /^(\\d+\\s*(s|m|h|d|w|mo|yr|min|sec|second|minute|hour|day|week|month|year)s?|Just now|Yesterday|just now|yesterday|\\d+hours|\\d+days)(\\s*[\u00b7•.])?$/i.test(text);
+      return /^(\\d+\\s*(s|m|h|d|w|mo|yr|min|sec|second|minute|hour|day|week|month|year)s?|Just now|Yesterday)(\\s*[·•.])?$/i.test(text);
     }
 
     function postUrlFrom(root) {
@@ -86,9 +104,9 @@ function buildFeedExtractScript(limit) {
       const kinds = new Set();
       for (const el of root.querySelectorAll('[aria-label]')) {
         const label = labelOf(el);
-        if (/^(Like|Like)$/i.test(label)) kinds.add('like');
-        if (/^(Comment|Comment)$/i.test(label)) kinds.add('comment');
-        if (/^(Share|Share)$/i.test(label)) kinds.add('share');
+        if (/^(Like)$/i.test(label)) kinds.add('like');
+        if (/^(Comment)$/i.test(label)) kinds.add('comment');
+        if (/^(Share)$/i.test(label)) kinds.add('share');
       }
       return kinds;
     }
@@ -116,6 +134,8 @@ function buildFeedExtractScript(limit) {
           && !isActionText(text)
           && !isMetricText(text)
           && !isTimestampText(text)
+          && !isDecoyText(text)
+          && !/^[\\d\\s.,-]+$/.test(text)   // reject all-digit decoy names, but keep "Class of 2024" (#2089)
           && !/\\/groups\\/|\\/watch\\/|\\/reel\\/|\\/events\\/|\\/friends\\//i.test(href)) {
           return text;
         }
@@ -129,7 +149,8 @@ function buildFeedExtractScript(limit) {
         if (text.length <= 10) return false;
         if (isSuggestionOrChrome(text) || isSponsored(text)) return false;
         if (isActionText(text) || isMetricText(text) || isTimestampText(text)) return false;
-        if (/^(See more|See more|More)$/i.test(text)) return false;
+        if (isDecoyText(text) || isReelsOrCarouselChrome(text)) return false;
+        if (/^(See more|More)$/i.test(text)) return false;
         return true;
       });
     }
@@ -147,13 +168,11 @@ function buildFeedExtractScript(limit) {
       if (!author && !content) return null;
       if (!content && !postUrl && kinds.size < 2) return null;
 
-      const likesMatch = fullText.match(/All reactions:\\s*(\\d[\\d,.\\slocalized textKMk]*)/)
+      const likesMatch = fullText.match(/All reactions:\\s*(\\d[\\d,.\\sKMk]*)/)
         || fullText.match(/All:\\s*(\\d[\\d,.KMk]*)/)
         || fullText.match(/(\\d[\\d,.KMk]*)\\s*(?:likes?|reactions?)/i);
-      const commentsMatch = fullText.match(/([\\d,.]+\\s*[localized text]?)\\s*comments/)
-        || fullText.match(/(\\d[\\d,.KMk]*)\\s*comments?/i);
-      const sharesMatch = fullText.match(/([\\d,.]+\\s*[localized text]?)\\s*shares/)
-        || fullText.match(/(\\d[\\d,.KMk]*)\\s*shares?/i);
+      const commentsMatch = fullText.match(/(\\d[\\d,.KMk]*)\\s*comments?/i);
+      const sharesMatch = fullText.match(/(\\d[\\d,.KMk]*)\\s*shares?/i);
 
       return {
         index,
@@ -170,10 +189,51 @@ function buildFeedExtractScript(limit) {
         .filter((el) => textOf(el).length > 30);
     }
 
+    // Modern Facebook no longer wraps posts in [role="article"] nor exposes the
+    // Like/Comment/Share aria-labels the fallback keyed on. Every post still
+    // carries one "Actions for this post" control (the ⋯ menu). Anchor on it and
+    // walk up to the HIGHEST ancestor that still contains exactly one such
+    // control — that bounds the node to a single post. See issue #2089.
+    function actionMenuAnchors() {
+      // Post menus only — NOT "Actions for this comment", so the anchor set,
+      // countMenus, and loadFeedPosts all key on the same thing (#2089).
+      return Array.from(document.querySelectorAll('[aria-label]')).filter((el) =>
+        /^(Actions for this post)$/i.test(labelOf(el)));
+    }
+
+    function actionAnchoredContainers() {
+      const menus = actionMenuAnchors();
+      const seen = new WeakSet();
+      const containers = [];
+      const countMenus = (node) => {
+        let n = 0;
+        for (const el of node.querySelectorAll('[aria-label]')) {
+          if (/^(Actions for this post)$/i.test(labelOf(el))) n += 1;
+        }
+        return n;
+      };
+      const LANDMARK_ROLES = new Set(['main', 'feed', 'banner', 'navigation', 'complementary', 'contentinfo', 'region']);
+      for (const menu of menus) {
+        let node = menu.parentElement;
+        let best = null;
+        for (let depth = 0; depth < 22 && node && node !== document.body && node !== document.documentElement; depth += 1, node = node.parentElement) {
+          // Never let a single-post page climb the container up to a page
+          // landmark (role=main/feed/...) and emit the whole region as a post.
+          if (LANDMARK_ROLES.has(node.getAttribute('role') || '')) break;
+          if (countMenus(node) === 1) best = node; else break;
+        }
+        if (best && !seen.has(best) && textOf(best).length > 30) {
+          seen.add(best);
+          containers.push(best);
+        }
+      }
+      return containers;
+    }
+
     function fallbackContainers() {
       const main = document.querySelector('[role="main"]');
       if (!main) return [];
-      const buttons = Array.from(main.querySelectorAll('[aria-label="Like"], [aria-label="Like"], [aria-label="Comment"], [aria-label="Comment"], [aria-label="Share"], [aria-label="Share"]'));
+      const buttons = Array.from(main.querySelectorAll('[aria-label="Like"], [aria-label="Comment"], [aria-label="Share"]'));
       const seen = new WeakSet();
       const containers = [];
       for (const button of buttons) {
@@ -210,7 +270,8 @@ function buildFeedExtractScript(limit) {
     if (isAuthPage()) return { status: 'auth', rows: [], diagnostics: {} };
 
     const primary = primaryContainers();
-    const combined = dedupe([...primary, ...fallbackContainers()]);
+    const actionAnchored = actionAnchoredContainers();
+    const combined = dedupe([...primary, ...actionAnchored, ...fallbackContainers()]);
     const rows = [];
     for (const container of combined) {
       const row = extractPost(container, rows.length + 1);
@@ -224,13 +285,36 @@ function buildFeedExtractScript(limit) {
       diagnostics: {
         articleCount: document.querySelectorAll('[role="article"]').length,
         primaryCount: primary.length,
-        fallbackActionCount: document.querySelectorAll('[role="main"] [aria-label="Like"], [role="main"] [aria-label="Like"], [role="main"] [aria-label="Comment"], [role="main"] [aria-label="Comment"]').length,
+        actionMenuCount: actionMenuAnchors().length,
+        fallbackActionCount: document.querySelectorAll('[role="main"] [aria-label="Like"], [role="main"] [aria-label="Comment"]').length,
         mainTextLength: textOf(document.querySelector('[role="main"]')).length,
       },
     };
   })()`;
 }
 
+// Facebook streams feed posts in lazily as you scroll, so a single extraction
+// off the initial viewport under-returns. Scroll a bounded number of times
+// until enough post action-menus are present (or we stop growing). See #2089.
+async function loadFeedPosts(page, limit) {
+  const scrollStep = `(async () => {
+    const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+    window.scrollTo(0, document.body.scrollHeight);
+    await sleep(800);
+    return document.querySelectorAll('[aria-label]').length
+      ? document.querySelectorAll('[role="article"]').length
+        + Array.from(document.querySelectorAll('[aria-label]')).filter((el) => /^(Actions for this post)$/i.test((el.getAttribute('aria-label') || '').trim())).length
+      : 0;
+  })()`;
+  let prev = -1;
+  for (let i = 0; i < 8; i += 1) {
+    let count = 0;
+    try { count = Number(unwrapBrowserResult(await page.evaluate(scrollStep))) || 0; } catch { break; }
+    if (count >= limit || count === prev) break;
+    prev = count;
+  }
+}
+
 async function getFacebookFeed(page, kwargs) {
   const limit = requireLimit(kwargs.limit ?? 10);
   try {
@@ -238,10 +322,12 @@ async function getFacebookFeed(page, kwargs) {
   } catch (err) {
     throw new CommandExecutionError(
       `Failed to navigate to facebook feed: ${err instanceof Error ? err.message : err}`,
-      'Check that facebook.com is reachable and the browser extension is connected.',
+      'Check that facebook.com is reachable and the Cloak browser session is running.',
     );
   }
 
+  await loadFeedPosts(page, limit);
+
   let payload;
   try {
     payload = unwrapBrowserResult(await page.evaluate(buildFeedExtractScript(limit)));
@@ -257,7 +343,7 @@ async function getFacebookFeed(page, kwargs) {
   }
 
   if (payload.status === 'auth') {
-    throw new AuthRequiredError('www.facebook.com', 'Open Chrome and log in to Facebook before retrying.');
+    throw new AuthRequiredError('www.facebook.com', 'Log in to Facebook in the active Cloak browser session before retrying.');
   }
 
   if (payload.rows.length > 0) {
@@ -269,7 +355,7 @@ async function getFacebookFeed(page, kwargs) {
   }
 
   const diagnostics = payload.diagnostics || {};
-  if (diagnostics.articleCount || diagnostics.fallbackActionCount || diagnostics.mainTextLength > 200) {
+  if (diagnostics.articleCount || diagnostics.actionMenuCount || diagnostics.fallbackActionCount || diagnostics.mainTextLength > 200) {
     throw new CommandExecutionError(
       'facebook feed page rendered but no feed rows could be extracted',
       `Diagnostics: articles=${diagnostics.articleCount || 0}, actions=${diagnostics.fallbackActionCount || 0}, mainTextLength=${diagnostics.mainTextLength || 0}.`,