@jackwener/opencli 1.5.0 → 1.5.2

package/dist/browser/cdp.js

@@ -135,6 +135,7 @@ export class CDPBridge {
 class CDPPage {
     bridge;
     _pageEnabled = false;
+    _lastUrl = null;
     constructor(bridge) {
         this.bridge = bridge;
     }
@@ -146,6 +147,7 @@ class CDPPage {
         const loadPromise = this.bridge.waitForEvent('Page.loadEventFired', 30_000).catch(() => { });
         await this.bridge.send('Page.navigate', { url });
         await loadPromise;
+        this._lastUrl = url;
         if (options?.waitUntil !== 'none') {
             const maxMs = options?.settleMs ?? 1000;
             await this.evaluate(waitForDomStableJs(maxMs, Math.min(500, maxMs)));
@@ -251,6 +253,9 @@ class CDPPage {
     async consoleMessages(_level) {
         return [];
     }
+    async getCurrentUrl() {
+        return this._lastUrl;
+    }
     async installInterceptor(pattern) {
         const { generateInterceptorJs } = await import('../interceptor.js');
         await this.evaluate(generateInterceptorJs(JSON.stringify(pattern), {

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.
  */
@@ -18,6 +19,8 @@ export declare class Page implements IPage {
     constructor(workspace?: string);
     /** Active tab ID, set after navigate and used in all subsequent commands */
     private _tabId;
+    /** Last navigated URL, tracked in-memory to avoid extra round-trips */
+    private _lastUrl;
     /** Helper: spread workspace into command params */
     private _wsOpt;
     /** Helper: spread workspace + tabId into command params */
@@ -26,6 +29,7 @@ export declare class Page implements IPage {
         waitUntil?: 'load' | 'none';
         settleMs?: number;
     }): Promise<void>;
+    getCurrentUrl(): Promise<string | null>;
     /** Close the automation window in the extension */
     closeWindow(): Promise<void>;
     evaluate(js: string): Promise<unknown>;

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.
  */
@@ -26,6 +31,8 @@ export class Page {
     }
     /** Active tab ID, set after navigate and used in all subsequent commands */
     _tabId;
+    /** Last navigated URL, tracked in-memory to avoid extra round-trips */
+    _lastUrl = null;
     /** Helper: spread workspace into command params */
     _wsOpt() {
         return { workspace: this.workspace };
@@ -42,10 +49,11 @@ export class Page {
             url,
             ...this._cmdOpts(),
         });
-        // Remember the tabId for subsequent exec calls
+        // Remember the tabId and URL for subsequent calls
         if (result?.tabId) {
             this._tabId = result.tabId;
         }
+        this._lastUrl = url;
         // Inject stealth anti-detection patches (guard flag prevents double-injection).
         try {
             await sendCommand('exec', {
@@ -60,12 +68,36 @@ 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() {
+        return this._lastUrl;
+    }
     /** Close the automation window in the extension */
     async closeWindow() {
         try {
@@ -163,6 +195,23 @@ export class Page {
     }
     async wait(options) {
         if (typeof options === 'number') {
+            if (options >= 1) {
+                // For waits >= 1s, use DOM-stable check: return early when the page
+                // stops mutating, with the original wait time as the hard cap.
+                // This turns e.g. `page.wait(5)` from a fixed 5s sleep into
+                // "wait until DOM is stable, max 5s" — often completing in <1s.
+                try {
+                    const maxMs = options * 1000;
+                    await sendCommand('exec', {
+                        code: waitForDomStableJs(maxMs, Math.min(500, maxMs)),
+                        ...this._cmdOpts(),
+                    });
+                    return;
+                }
+                catch {
+                    // Fallback: fixed sleep (e.g. if page has no DOM yet)
+                }
+            }
             await new Promise(resolve => setTimeout(resolve, options * 1000));
             return;
         }

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

@@ -1311,6 +1311,464 @@
       "mediaLinks"
     ]
   },
+  {
+    "site": "bluesky",
+    "name": "feeds",
+    "description": "Popular Bluesky feed generators",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "positional": false,
+        "help": "Number of feeds"
+      }
+    ],
+    "columns": [
+      "rank",
+      "name",
+      "likes",
+      "creator",
+      "description"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.unspecced.getPopularFeedGenerators?limit=${{ args.limit }}"
+        }
+      },
+      {
+        "select": "feeds"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "name": "${{ item.displayName }}",
+          "likes": "${{ item.likeCount }}",
+          "creator": "${{ item.creator.handle }}",
+          "description": "${{ item.description }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "followers",
+    "description": "List followers of a Bluesky user",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "handle",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Bluesky handle"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "positional": false,
+        "help": "Number of followers"
+      }
+    ],
+    "columns": [
+      "rank",
+      "handle",
+      "name",
+      "description"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.graph.getFollowers?actor=${{ args.handle }}&limit=${{ args.limit }}"
+        }
+      },
+      {
+        "select": "followers"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "handle": "${{ item.handle }}",
+          "name": "${{ item.displayName }}",
+          "description": "${{ item.description }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "following",
+    "description": "List accounts a Bluesky user is following",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "handle",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Bluesky handle"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "positional": false,
+        "help": "Number of accounts"
+      }
+    ],
+    "columns": [
+      "rank",
+      "handle",
+      "name",
+      "description"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.graph.getFollows?actor=${{ args.handle }}&limit=${{ args.limit }}"
+        }
+      },
+      {
+        "select": "follows"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "handle": "${{ item.handle }}",
+          "name": "${{ item.displayName }}",
+          "description": "${{ item.description }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "profile",
+    "description": "Get Bluesky user profile info",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "handle",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Bluesky handle (e.g. bsky.app, jay.bsky.team)"
+      }
+    ],
+    "columns": [
+      "handle",
+      "name",
+      "followers",
+      "following",
+      "posts",
+      "description"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${{ args.handle }}"
+        }
+      },
+      {
+        "map": {
+          "handle": "${{ item.handle }}",
+          "name": "${{ item.displayName }}",
+          "followers": "${{ item.followersCount }}",
+          "following": "${{ item.followsCount }}",
+          "posts": "${{ item.postsCount }}",
+          "description": "${{ item.description }}"
+        }
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "search",
+    "description": "Search Bluesky users",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "query",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Search query"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 10,
+        "required": false,
+        "positional": false,
+        "help": "Number of results"
+      }
+    ],
+    "columns": [
+      "rank",
+      "handle",
+      "name",
+      "followers",
+      "description"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.actor.searchActors?q=${{ args.query }}&limit=${{ args.limit }}"
+        }
+      },
+      {
+        "select": "actors"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "handle": "${{ item.handle }}",
+          "name": "${{ item.displayName }}",
+          "followers": "${{ item.followersCount }}",
+          "description": "${{ item.description }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "starter-packs",
+    "description": "Get starter packs created by a Bluesky user",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "handle",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Bluesky handle"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 10,
+        "required": false,
+        "positional": false,
+        "help": "Number of starter packs"
+      }
+    ],
+    "columns": [
+      "rank",
+      "name",
+      "description",
+      "members",
+      "joins"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.graph.getActorStarterPacks?actor=${{ args.handle }}&limit=${{ args.limit }}"
+        }
+      },
+      {
+        "select": "starterPacks"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "name": "${{ item.record.name }}",
+          "description": "${{ item.record.description }}",
+          "members": "${{ item.listItemCount }}",
+          "joins": "${{ item.joinedAllTimeCount }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "thread",
+    "description": "Get a Bluesky post thread with replies",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "uri",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Post AT URI (at://did:.../app.bsky.feed.post/...) or bsky.app URL"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "positional": false,
+        "help": "Number of replies"
+      }
+    ],
+    "columns": [
+      "author",
+      "text",
+      "likes",
+      "reposts",
+      "replies_count"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread?uri=${{ args.uri }}&depth=2"
+        }
+      },
+      {
+        "select": "thread"
+      },
+      {
+        "map": {
+          "author": "${{ item.post.author.handle }}",
+          "text": "${{ item.post.record.text }}",
+          "likes": "${{ item.post.likeCount }}",
+          "reposts": "${{ item.post.repostCount }}",
+          "replies_count": "${{ item.post.replyCount }}"
+        }
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "trending",
+    "description": "Trending topics on Bluesky",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "positional": false,
+        "help": "Number of topics"
+      }
+    ],
+    "columns": [
+      "rank",
+      "topic",
+      "link"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.unspecced.getTrendingTopics"
+        }
+      },
+      {
+        "select": "topics"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "topic": "${{ item.topic }}",
+          "link": "${{ item.link }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
+  {
+    "site": "bluesky",
+    "name": "user",
+    "description": "Get recent posts from a Bluesky user",
+    "domain": "public.api.bsky.app",
+    "strategy": "public",
+    "browser": false,
+    "args": [
+      {
+        "name": "handle",
+        "type": "str",
+        "required": true,
+        "positional": true,
+        "help": "Bluesky handle (e.g. bsky.app)"
+      },
+      {
+        "name": "limit",
+        "type": "int",
+        "default": 20,
+        "required": false,
+        "positional": false,
+        "help": "Number of posts"
+      }
+    ],
+    "columns": [
+      "rank",
+      "text",
+      "likes",
+      "reposts",
+      "replies"
+    ],
+    "pipeline": [
+      {
+        "fetch": {
+          "url": "https://public.api.bsky.app/xrpc/app.bsky.feed.getAuthorFeed?actor=${{ args.handle }}&limit=${{ args.limit }}"
+        }
+      },
+      {
+        "select": "feed"
+      },
+      {
+        "map": {
+          "rank": "${{ index + 1 }}",
+          "text": "${{ item.post.record.text }}",
+          "likes": "${{ item.post.likeCount }}",
+          "reposts": "${{ item.post.repostCount }}",
+          "replies": "${{ item.post.replyCount }}"
+        }
+      },
+      {
+        "limit": "${{ args.limit }}"
+      }
+    ],
+    "type": "yaml"
+  },
   {
     "site": "boss",
     "name": "batchgreet",
@@ -11801,7 +12259,7 @@
       {
         "name": "images",
         "type": "str",
-        "required": false,
+        "required": true,
         "help": "图片路径，逗号分隔，最多9张 (jpg/png/gif/webp)"
       },
       {
@@ -11856,6 +12314,7 @@
       "title",
       "author",
       "likes",
+      "published_at",
       "url"
     ]
   },