@jackwener/opencli 1.5.1 → 1.5.2

package/dist/browser/discover.js

@@ -15,13 +15,17 @@ export async function checkDaemonStatus(opts) {
         const port = parseInt(process.env.OPENCLI_DAEMON_PORT ?? String(DEFAULT_DAEMON_PORT), 10);
         const controller = new AbortController();
         const timer = setTimeout(() => controller.abort(), opts?.timeout ?? 2000);
-        const res = await fetch(`http://127.0.0.1:${port}/status`, {
-            headers: { 'X-OpenCLI': '1' },
-            signal: controller.signal,
-        });
-        const data = await res.json();
-        clearTimeout(timer);
-        return { running: true, extensionConnected: data.extensionConnected, extensionVersion: data.extensionVersion };
+        try {
+            const res = await fetch(`http://127.0.0.1:${port}/status`, {
+                headers: { 'X-OpenCLI': '1' },
+                signal: controller.signal,
+            });
+            const data = await res.json();
+            return { running: true, extensionConnected: data.extensionConnected, extensionVersion: data.extensionVersion };
+        }
+        finally {
+            clearTimeout(timer);
+        }
     }
     catch {
         return { running: false, extensionConnected: false };

package/dist/browser/index.d.ts

@@ -12,6 +12,7 @@ export { generateSnapshotJs, scrollToRefJs, getFormStateJs } from './dom-snapsho
 export { generateStealthJs } from './stealth.js';
 export type { DomSnapshotOptions } from './dom-snapshot.js';
 import { extractTabEntries, diffTabIndexes, appendLimited } from './tabs.js';
+import { isRetryableSettleError } from './page.js';
 import { withTimeoutMs } from '../runtime.js';
 export declare const __test__: {
     extractTabEntries: typeof extractTabEntries;
@@ -20,4 +21,5 @@ export declare const __test__: {
     withTimeoutMs: typeof withTimeoutMs;
     selectCDPTarget: (targets: import("./cdp.js").CDPTarget[]) => import("./cdp.js").CDPTarget | undefined;
     scoreCDPTarget: (target: import("./cdp.js").CDPTarget, preferredPattern?: RegExp) => number;
+    isRetryableSettleError: typeof isRetryableSettleError;
 };

package/dist/browser/index.js

@@ -12,6 +12,7 @@ export { generateSnapshotJs, scrollToRefJs, getFormStateJs } from './dom-snapsho
 export { generateStealthJs } from './stealth.js';
 import { extractTabEntries, diffTabIndexes, appendLimited } from './tabs.js';
 import { __test__ as cdpTest } from './cdp.js';
+import { isRetryableSettleError } from './page.js';
 import { withTimeoutMs } from '../runtime.js';
 export const __test__ = {
     extractTabEntries,
@@ -20,4 +21,5 @@ export const __test__ = {
     withTimeoutMs,
     selectCDPTarget: cdpTest.selectCDPTarget,
     scoreCDPTarget: cdpTest.scoreCDPTarget,
+    isRetryableSettleError,
 };

package/dist/browser/page.d.ts

@@ -10,6 +10,7 @@
  * chrome-extension:// tab that can't be debugged.
  */
 import type { BrowserCookie, IPage, ScreenshotOptions, SnapshotOptions, WaitOptions } from '../types.js';
+export declare function isRetryableSettleError(err: unknown): boolean;
 /**
  * Page — implements IPage by talking to the daemon via HTTP.
  */

package/dist/browser/page.js

@@ -16,6 +16,11 @@ import { saveBase64ToFile } from '../utils.js';
 import { generateSnapshotJs, scrollToRefJs, getFormStateJs } from './dom-snapshot.js';
 import { generateStealthJs } from './stealth.js';
 import { clickJs, typeTextJs, pressKeyJs, waitForTextJs, scrollJs, autoScrollJs, networkRequestsJs, waitForDomStableJs, } from './dom-helpers.js';
+export function isRetryableSettleError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return message.includes('Inspected target navigated or closed')
+        || (message.includes('-32000') && message.toLowerCase().includes('target'));
+}
 /**
  * Page — implements IPage by talking to the daemon via HTTP.
  */
@@ -63,10 +68,31 @@ export class Page {
         // settleMs is now a timeout cap (default 1000ms), not a fixed wait.
         if (options?.waitUntil !== 'none') {
             const maxMs = options?.settleMs ?? 1000;
-            await sendCommand('exec', {
+            const settleOpts = {
                 code: waitForDomStableJs(maxMs, Math.min(500, maxMs)),
                 ...this._cmdOpts(),
-            });
+            };
+            try {
+                await sendCommand('exec', settleOpts);
+            }
+            catch (err) {
+                if (!isRetryableSettleError(err))
+                    throw err;
+                // SPA client-side redirects can invalidate the CDP target after
+                // chrome.tabs reports 'complete'. Wait briefly for the new document
+                // to load, then retry the settle probe once.
+                try {
+                    await new Promise((r) => setTimeout(r, 200));
+                    await sendCommand('exec', settleOpts);
+                }
+                catch (retryErr) {
+                    if (!isRetryableSettleError(retryErr))
+                        throw retryErr;
+                    // Retry also failed — give up silently. Settle is best-effort
+                    // after successful navigation; the next real command will surface
+                    // any persistent target error immediately.
+                }
+            }
         }
     }
     async getCurrentUrl() {

package/dist/browser.test.js

@@ -31,6 +31,11 @@ describe('browser helpers', () => {
     it('times out slow promises', async () => {
         await expect(__test__.withTimeoutMs(new Promise(() => { }), 10, 'timeout')).rejects.toThrow('timeout');
     });
+    it('retries settle only for target-invalidated errors', () => {
+        expect(__test__.isRetryableSettleError(new Error('{"code":-32000,"message":"Inspected target navigated or closed"}'))).toBe(true);
+        expect(__test__.isRetryableSettleError(new Error('attach failed: target no longer exists'))).toBe(false);
+        expect(__test__.isRetryableSettleError(new Error('malformed exec payload'))).toBe(false);
+    });
     it('prefers the real Electron app target over DevTools and blank pages', () => {
         const target = __test__.selectCDPTarget([
             {

package/dist/cli-manifest.json

@@ -10900,7 +10900,7 @@
     "description": "V2EX 热门话题",
     "domain": "www.v2ex.com",
     "strategy": "public",
-    "browser": true,
+    "browser": false,
     "args": [
       {
         "name": "limit",
@@ -10918,10 +10918,9 @@
     ],
     "pipeline": [
       {
-        "navigate": "https://www.v2ex.com/"
-      },
-      {
-        "evaluate": "(async () => {\n  const response = await fetch('/api/topics/hot.json', {\n    credentials: 'include',\n    headers: {\n      accept: 'application/json, text/plain, */*',\n      'x-requested-with': 'XMLHttpRequest',\n    },\n  });\n  if (!response.ok) {\n    throw new Error(`V2EX hot API request failed: ${response.status}`);\n  }\n  return await response.json();\n})()\n"
+        "fetch": {
+          "url": "https://www.v2ex.com/api/topics/hot.json"
+        }
       },
       {
         "map": {

package/dist/clis/apple-podcasts/commands.test.js

@@ -31,13 +31,14 @@ describe('apple-podcasts search command', () => {
         });
         expect(fetchMock).toHaveBeenCalledWith('https://itunes.apple.com/search?term=machine%20learning&media=podcast&limit=5');
         expect(result).toEqual([
-            {
+            expect.objectContaining({
                 id: 42,
                 title: 'Machine Learning Guide',
                 author: 'OpenCLI',
                 episodes: 12,
                 genre: 'Technology',
-            },
+                url: '',
+            }),
         ]);
     });
 });
@@ -45,6 +46,26 @@ describe('apple-podcasts top command', () => {
     beforeEach(() => {
         vi.restoreAllMocks();
     });
+    it('adds a timeout signal to chart fetches', async () => {
+        const cmd = getRegistry().get('apple-podcasts/top');
+        expect(cmd?.func).toBeTypeOf('function');
+        const fetchMock = vi.fn().mockResolvedValue({
+            ok: true,
+            json: () => Promise.resolve({
+                feed: {
+                    results: [
+                        { id: '100', name: 'Top Show', artistName: 'Host A' },
+                    ],
+                },
+            }),
+        });
+        vi.stubGlobal('fetch', fetchMock);
+        await cmd.func(null, { country: 'US', limit: 1 });
+        const [, options] = fetchMock.mock.calls[0] ?? [];
+        expect(options).toBeDefined();
+        expect(options.signal).toBeDefined();
+        expect(options.signal).toHaveProperty('aborted', false);
+    });
     it('uses the canonical Apple charts host and maps ranked results', async () => {
         const cmd = getRegistry().get('apple-podcasts/top');
         expect(cmd?.func).toBeTypeOf('function');
@@ -61,7 +82,9 @@ describe('apple-podcasts top command', () => {
         });
         vi.stubGlobal('fetch', fetchMock);
         const result = await cmd.func(null, { country: 'US', limit: 2 });
-        expect(fetchMock).toHaveBeenCalledWith('https://rss.marketingtools.apple.com/api/v2/us/podcasts/top/2/podcasts.json');
+        expect(fetchMock).toHaveBeenCalledWith('https://rss.marketingtools.apple.com/api/v2/us/podcasts/top/2/podcasts.json', expect.objectContaining({
+            signal: expect.any(Object),
+        }));
         expect(result).toEqual([
             { rank: 1, title: 'Top Show', author: 'Host A', id: '100' },
             { rank: 2, title: 'Second Show', author: 'Host B', id: '101' },

package/dist/clis/apple-podcasts/top.js

@@ -2,6 +2,7 @@ import { cli, Strategy } from '../../registry.js';
 import { CliError } from '../../errors.js';
 // Apple Marketing Tools RSS API — public, no key required
 const CHARTS_URL = 'https://rss.marketingtools.apple.com/api/v2';
+const CHARTS_TIMEOUT_MS = 15_000;
 cli({
     site: 'apple-podcasts',
     name: 'top',
@@ -19,7 +20,9 @@ cli({
         const url = `${CHARTS_URL}/${country}/podcasts/top/${limit}/podcasts.json`;
         let resp;
         try {
-            resp = await fetch(url);
+            resp = await fetch(url, {
+                signal: AbortSignal.timeout(CHARTS_TIMEOUT_MS),
+            });
         }
         catch (error) {
             const reason = error?.cause?.code ?? error?.message ?? 'unknown network error';

package/dist/clis/v2ex/hot.yaml

@@ -3,7 +3,7 @@ name: hot
 description: V2EX 热门话题
 domain: www.v2ex.com
 strategy: public
-browser: true
+browser: false
 
 args:
   limit:
@@ -12,22 +12,8 @@ args:
     description: Number of topics
 
 pipeline:
-  - navigate: https://www.v2ex.com/
-
-  - evaluate: |
-      (async () => {
-        const response = await fetch('/api/topics/hot.json', {
-          credentials: 'include',
-          headers: {
-            accept: 'application/json, text/plain, */*',
-            'x-requested-with': 'XMLHttpRequest',
-          },
-        });
-        if (!response.ok) {
-          throw new Error(`V2EX hot API request failed: ${response.status}`);
-        }
-        return await response.json();
-      })()
+  - fetch:
+      url: https://www.v2ex.com/api/topics/hot.json
 
   - map:
       rank: ${{ index + 1 }}

package/dist/clis/weread/shelf.js

@@ -1,5 +1,120 @@
 import { cli, Strategy } from '../../registry.js';
+import { CliError } from '../../errors.js';
 import { fetchPrivateApi } from './utils.js';
+const WEREAD_DOMAIN = 'weread.qq.com';
+const WEREAD_SHELF_URL = `https://${WEREAD_DOMAIN}/web/shelf`;
+function normalizeShelfLimit(limit) {
+    if (!Number.isFinite(limit))
+        return 0;
+    return Math.max(0, Math.trunc(limit));
+}
+function normalizePrivateApiRows(data, limit) {
+    const books = data?.books ?? [];
+    return books.slice(0, limit).map((item) => ({
+        title: item.bookInfo?.title ?? item.title ?? '',
+        author: item.bookInfo?.author ?? item.author ?? '',
+        // TODO: readingProgress field name from community docs, verify with real API response
+        progress: item.readingProgress != null ? `${item.readingProgress}%` : '-',
+        bookId: item.bookId ?? item.bookInfo?.bookId ?? '',
+    }));
+}
+function normalizeWebShelfRows(snapshot, limit) {
+    if (limit <= 0)
+        return [];
+    const bookById = new Map();
+    for (const book of snapshot.rawBooks) {
+        const bookId = String(book?.bookId || '').trim();
+        if (!bookId)
+            continue;
+        bookById.set(bookId, book);
+    }
+    const orderedBookIds = snapshot.shelfIndexes
+        .filter((entry) => String(entry?.role || 'book') === 'book')
+        .sort((left, right) => Number(left?.idx ?? Number.MAX_SAFE_INTEGER) - Number(right?.idx ?? Number.MAX_SAFE_INTEGER))
+        .map((entry) => String(entry?.bookId || '').trim())
+        .filter(Boolean);
+    const fallbackOrder = snapshot.rawBooks
+        .map((book) => String(book?.bookId || '').trim())
+        .filter(Boolean);
+    const orderedUniqueBookIds = Array.from(new Set([
+        ...orderedBookIds,
+        ...fallbackOrder,
+    ]));
+    return orderedUniqueBookIds
+        .map((bookId) => {
+        const book = bookById.get(bookId);
+        if (!book)
+            return null;
+        return {
+            title: String(book.title || '').trim(),
+            author: String(book.author || '').trim(),
+            progress: '-',
+            bookId,
+        };
+    })
+        .filter((item) => Boolean(item && (item.title || item.bookId)))
+        .slice(0, limit);
+}
+/**
+ * Read the structured shelf cache from the web shelf page.
+ * The page hydrates localStorage with raw book data plus shelf ordering.
+ */
+async function loadWebShelfSnapshot(page) {
+    await page.goto(WEREAD_SHELF_URL);
+    const cookies = await page.getCookies({ domain: WEREAD_DOMAIN });
+    const currentVid = String(cookies.find((cookie) => cookie.name === 'wr_vid')?.value || '').trim();
+    if (!currentVid) {
+        return { cacheFound: false, rawBooks: [], shelfIndexes: [] };
+    }
+    const rawBooksKey = `shelf:rawBooks:${currentVid}`;
+    const shelfIndexesKey = `shelf:shelfIndexes:${currentVid}`;
+    const result = await page.evaluate(`
+    (() => new Promise((resolve) => {
+      const deadline = Date.now() + 5000;
+      const rawBooksKey = ${JSON.stringify(rawBooksKey)};
+      const shelfIndexesKey = ${JSON.stringify(shelfIndexesKey)};
+
+      const readJson = (raw) => {
+        if (typeof raw !== 'string') return null;
+        try {
+          return JSON.parse(raw);
+        } catch {
+          return null;
+        }
+      };
+
+      const poll = () => {
+        const rawBooksRaw = localStorage.getItem(rawBooksKey);
+        const shelfIndexesRaw = localStorage.getItem(shelfIndexesKey);
+        const rawBooks = readJson(rawBooksRaw);
+        const shelfIndexes = readJson(shelfIndexesRaw);
+        const cacheFound = Array.isArray(rawBooks);
+
+        if (cacheFound || Date.now() >= deadline) {
+          resolve({
+            cacheFound,
+            rawBooks: Array.isArray(rawBooks) ? rawBooks : [],
+            shelfIndexes: Array.isArray(shelfIndexes) ? shelfIndexes : [],
+          });
+          return;
+        }
+
+        setTimeout(poll, 100);
+      };
+
+      poll();
+    }))
+  `);
+    if (!result || typeof result !== 'object') {
+        return { cacheFound: false, rawBooks: [], shelfIndexes: [] };
+    }
+    const snapshot = result;
+    return {
+        cacheFound: snapshot.cacheFound === true,
+        rawBooks: Array.isArray(snapshot.rawBooks) ? snapshot.rawBooks : [],
+        shelfIndexes: Array.isArray(snapshot.shelfIndexes) ? snapshot.shelfIndexes : [],
+    };
+}
 cli({
     site: 'weread',
     name: 'shelf',
@@ -11,14 +126,22 @@ cli({
     ],
     columns: ['title', 'author', 'progress', 'bookId'],
     func: async (page, args) => {
-        const data = await fetchPrivateApi(page, '/shelf/sync', { synckey: '0', lectureSynckey: '0' });
-        const books = data?.books ?? [];
-        return books.slice(0, Number(args.limit)).map((item) => ({
-            title: item.bookInfo?.title ?? item.title ?? '',
-            author: item.bookInfo?.author ?? item.author ?? '',
-            // TODO: readingProgress field name from community docs, verify with real API response
-            progress: item.readingProgress != null ? `${item.readingProgress}%` : '-',
-            bookId: item.bookId ?? item.bookInfo?.bookId ?? '',
-        }));
+        const limit = normalizeShelfLimit(Number(args.limit));
+        if (limit <= 0)
+            return [];
+        try {
+            const data = await fetchPrivateApi(page, '/shelf/sync', { synckey: '0', lectureSynckey: '0' });
+            return normalizePrivateApiRows(data, limit);
+        }
+        catch (error) {
+            if (!(error instanceof CliError) || error.code !== 'AUTH_REQUIRED') {
+                throw error;
+            }
+            const snapshot = await loadWebShelfSnapshot(page);
+            if (!snapshot.cacheFound) {
+                throw error;
+            }
+            return normalizeWebShelfRows(snapshot, limit);
+        }
     },
 });

package/dist/clis/weread/utils.js

@@ -9,9 +9,13 @@ import { CliError } from '../../errors.js';
 const WEB_API = 'https://weread.qq.com/web';
 const API = 'https://i.weread.qq.com';
 const UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36';
+const WEREAD_AUTH_ERRCODES = new Set([-2010, -2012]);
 function buildCookieHeader(cookies) {
     return cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join('; ');
 }
+function isAuthErrorResponse(resp, data) {
+    return resp.status === 401 || WEREAD_AUTH_ERRCODES.has(Number(data?.errcode));
+}
 /**
  * Fetch a public WeRead web endpoint (Node.js direct fetch).
  * Used by search and ranking commands (browser: false).
@@ -69,7 +73,7 @@ export async function fetchPrivateApi(page, path, params) {
     catch {
         throw new CliError('PARSE_ERROR', `Invalid JSON response for ${path}`, 'WeRead may have returned an HTML error page');
     }
-    if (resp.status === 401 || data?.errcode === -2010) {
+    if (isAuthErrorResponse(resp, data)) {
         throw new CliError('AUTH_REQUIRED', 'Not logged in to WeRead', 'Please log in to weread.qq.com in Chrome first');
     }
     if (!resp.ok) {

package/dist/daemon.js

@@ -175,6 +175,7 @@ const wss = new WebSocketServer({
 wss.on('connection', (ws) => {
     console.error('[daemon] Extension connected');
     extensionWs = ws;
+    extensionVersion = null; // cleared until hello message arrives
     // ── Heartbeat: ping every 15s, close if 2 pongs missed ──
     let missedPongs = 0;
     const heartbeatInterval = setInterval(() => {

package/dist/doctor.js

@@ -65,9 +65,13 @@ export async function runBrowserDoctor(opts = {}) {
     if (connectivity && !connectivity.ok) {
         issues.push(`Browser connectivity test failed: ${connectivity.error ?? 'unknown'}`);
     }
-    if (status.extensionVersion && opts.cliVersion && status.extensionVersion !== opts.cliVersion) {
-        issues.push(`Extension version mismatch: extension v${status.extensionVersion} ≠ CLI v${opts.cliVersion}\n` +
-            '  Download the latest extension from: https://github.com/jackwener/opencli/releases');
+    if (status.extensionVersion && opts.cliVersion) {
+        const extMajor = status.extensionVersion.split('.')[0];
+        const cliMajor = opts.cliVersion.split('.')[0];
+        if (extMajor !== cliMajor) {
+            issues.push(`Extension major version mismatch: extension v${status.extensionVersion} ≠ CLI v${opts.cliVersion}\n` +
+                '  Download the latest extension from: https://github.com/jackwener/opencli/releases');
+        }
     }
     return {
         cliVersion: opts.cliVersion,

package/dist/execution.js

@@ -17,8 +17,6 @@ import { shouldUseBrowserSession } from './capabilityRouting.js';
 import { getBrowserFactory, browserSession, runWithTimeout, DEFAULT_BROWSER_COMMAND_TIMEOUT } from './runtime.js';
 import { emitHook } from './hooks.js';
 import { checkDaemonStatus } from './browser/discover.js';
-import { PKG_VERSION } from './version.js';
-import chalk from 'chalk';
 const _loadedModules = new Set();
 export function coerceAndValidateArgs(cmdArgs, kwargs) {
     const result = { ...kwargs };
@@ -161,10 +159,6 @@ export async function executeCommand(cmd, rawKwargs, debug = false) {
                     '  2. chrome://extensions → Developer Mode → Load unpacked\n' +
                     '  Then run: opencli doctor');
             }
-            // ── Version mismatch: warn but don't block ──
-            if (status.extensionVersion && status.extensionVersion !== PKG_VERSION) {
-                process.stderr.write(chalk.yellow(`⚠  Extension v${status.extensionVersion} ≠ CLI v${PKG_VERSION} — consider updating the extension.\n`));
-            }
             ensureRequiredEnv(cmd);
             const BrowserFactory = getBrowserFactory();
             result = await browserSession(BrowserFactory, async (page) => {

package/dist/extension-manifest-regression.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/extension-manifest-regression.test.js

@@ -0,0 +1,12 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import { describe, expect, it } from 'vitest';
+describe('extension manifest regression', () => {
+    it('keeps host permissions required by chrome.cookies.getAll', async () => {
+        const manifestPath = path.resolve(process.cwd(), 'extension', 'manifest.json');
+        const raw = await fs.readFile(manifestPath, 'utf8');
+        const manifest = JSON.parse(raw);
+        expect(manifest.permissions).toContain('cookies');
+        expect(manifest.host_permissions).toContain('<all_urls>');
+    });
+});