@jackwener/opencli 1.5.0 → 1.5.1

package/dist/runtime.d.ts

@@ -13,6 +13,7 @@ export declare const DEFAULT_BROWSER_EXPLORE_TIMEOUT: number;
 export declare function runWithTimeout<T>(promise: Promise<T>, opts: {
     timeout: number;
     label?: string;
+    hint?: string;
 }): Promise<T>;
 /**
  * Timeout with milliseconds unit. Used for low-level internal timeouts.

package/dist/runtime.js

@@ -26,7 +26,7 @@ export const DEFAULT_BROWSER_EXPLORE_TIMEOUT = parseEnvTimeout('OPENCLI_BROWSER_
  */
 export async function runWithTimeout(promise, opts) {
     const label = opts.label ?? 'Operation';
-    return withTimeoutMs(promise, opts.timeout * 1000, () => new TimeoutError(label, opts.timeout));
+    return withTimeoutMs(promise, opts.timeout * 1000, () => new TimeoutError(label, opts.timeout, opts.hint));
 }
 /**
  * Timeout with milliseconds unit. Used for low-level internal timeouts.

package/dist/types.d.ts

@@ -69,4 +69,6 @@ export interface IPage {
     getInterceptedRequests(): Promise<any[]>;
     screenshot(options?: ScreenshotOptions): Promise<string>;
     closeWindow?(): Promise<void>;
+    /** Returns the current page URL, or null if unavailable. */
+    getCurrentUrl?(): Promise<string | null>;
 }

package/docs/adapters/browser/bluesky.md

@@ -0,0 +1,53 @@
+# Bluesky
+
+**Mode**: 🌐 Public · **Domain**: `bsky.app`
+
+## Commands
+
+| Command | Description |
+|---------|-------------|
+| `opencli bluesky profile` | User profile info |
+| `opencli bluesky user` | Recent posts from a user |
+| `opencli bluesky trending` | Trending topics |
+| `opencli bluesky search` | Search users |
+| `opencli bluesky feeds` | Popular feed generators |
+| `opencli bluesky followers` | User's followers |
+| `opencli bluesky following` | Accounts a user follows |
+| `opencli bluesky thread` | Post thread with replies |
+| `opencli bluesky starter-packs` | User's starter packs |
+
+## Usage Examples
+
+```bash
+# User profile
+opencli bluesky profile --handle bsky.app
+
+# Recent posts
+opencli bluesky user --handle bsky.app --limit 10
+
+# Trending topics
+opencli bluesky trending --limit 10
+
+# Search users
+opencli bluesky search --query "AI" --limit 10
+
+# Popular feeds
+opencli bluesky feeds --limit 10
+
+# Followers / following
+opencli bluesky followers --handle bsky.app --limit 10
+opencli bluesky following --handle bsky.app
+
+# Post thread with replies
+opencli bluesky thread --uri "at://did:.../app.bsky.feed.post/..."
+
+# Starter packs
+opencli bluesky starter-packs --handle bsky.app
+
+# JSON output
+opencli bluesky profile --handle bsky.app -f json
+```
+
+## Prerequisites
+
+None — all commands use the public Bluesky AT Protocol API, no browser or login required.

package/docs/guide/plugins.md

@@ -31,9 +31,19 @@ Plugins live in `~/.opencli/plugins/<name>/`. Each subdirectory is scanned at st
 ### Supported Source Formats
 
 ```bash
+# GitHub shorthand
 opencli plugin install github:user/repo
 opencli plugin install github:user/repo/subplugin   # install specific sub-plugin from monorepo
 opencli plugin install https://github.com/user/repo
+
+# Any git-cloneable URL
+opencli plugin install https://gitlab.example.com/team/repo.git
+opencli plugin install ssh://git@gitlab.example.com/team/repo.git
+opencli plugin install git@gitlab.example.com:team/repo.git
+
+# Local plugin (for development)
+opencli plugin install file:///path/to/plugin
+opencli plugin install /path/to/plugin
 ```
 
 The repo name prefix `opencli-plugin-` is automatically stripped for the local directory name. For example, `opencli-plugin-hot-digest` becomes `hot-digest`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackwener/opencli",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "publishConfig": {
     "access": "public"
   },

package/src/browser/cdp.ts

@@ -173,6 +173,7 @@ export class CDPBridge implements IBrowserFactory {
 
 class CDPPage implements IPage {
   private _pageEnabled = false;
+  private _lastUrl: string | null = null;
   constructor(private bridge: CDPBridge) {}
 
   async goto(url: string, options?: { waitUntil?: 'load' | 'none'; settleMs?: number }): Promise<void> {
@@ -183,6 +184,7 @@ class CDPPage implements IPage {
     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)));
@@ -307,6 +309,10 @@ class CDPPage implements IPage {
     return [];
   }
 
+  async getCurrentUrl(): Promise<string | null> {
+    return this._lastUrl;
+  }
+
   async installInterceptor(pattern: string): Promise<void> {
     const { generateInterceptorJs } = await import('../interceptor.js');
     await this.evaluate(generateInterceptorJs(JSON.stringify(pattern), {

package/src/browser/page.ts

@@ -36,6 +36,8 @@ export class Page implements IPage {
 
   /** Active tab ID, set after navigate and used in all subsequent commands */
   private _tabId: number | undefined;
+  /** Last navigated URL, tracked in-memory to avoid extra round-trips */
+  private _lastUrl: string | null = null;
 
   /** Helper: spread workspace into command params */
   private _wsOpt(): { workspace: string } {
@@ -55,10 +57,11 @@ export class Page implements IPage {
       url,
       ...this._cmdOpts(),
     }) as { tabId?: number };
-    // 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', {
@@ -79,6 +82,10 @@ export class Page implements IPage {
     }
   }
 
+  async getCurrentUrl(): Promise<string | null> {
+    return this._lastUrl;
+  }
+
   /** Close the automation window in the extension */
   async closeWindow(): Promise<void> {
     try {
@@ -183,6 +190,22 @@ export class Page implements IPage {
 
   async wait(options: number | WaitOptions): Promise<void> {
     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/src/cli.ts

@@ -76,9 +76,10 @@ export function runCli(BUILTIN_CLIS: string, USER_CLIS: string): void {
       for (const [site, cmds] of sites) {
         console.log(chalk.bold.cyan(`  ${site}`));
         for (const cmd of cmds) {
-          const tag = strategyLabel(cmd) === 'public'
+          const label = strategyLabel(cmd);
+          const tag = label === 'public'
             ? chalk.green('[public]')
-            : chalk.yellow(`[${strategyLabel(cmd)}]`);
+            : chalk.yellow(`[${label}]`);
           console.log(`    ${cmd.name} ${tag}${cmd.description ? chalk.dim(` — ${cmd.description}`) : ''}`);
         }
         console.log();
@@ -252,7 +253,7 @@ export function runCli(BUILTIN_CLIS: string, USER_CLIS: string): void {
 
   pluginCmd
     .command('install')
-    .description('Install a plugin from GitHub')
+    .description('Install a plugin from a git repository')
     .argument('<source>', 'Plugin source (e.g. github:user/repo)')
     .action(async (source: string) => {
       const { installPlugin } = await import('./plugin.js');
@@ -411,6 +412,36 @@ export function runCli(BUILTIN_CLIS: string, USER_CLIS: string): void {
       console.log();
     });
 
+  pluginCmd
+    .command('create')
+    .description('Create a new plugin scaffold')
+    .argument('<name>', 'Plugin name (lowercase, hyphens allowed)')
+    .option('-d, --dir <path>', 'Output directory (default: ./<name>)')
+    .option('--description <text>', 'Plugin description')
+    .action(async (name: string, opts: { dir?: string; description?: string }) => {
+      const { createPluginScaffold } = await import('./plugin-scaffold.js');
+      try {
+        const result = createPluginScaffold(name, {
+          dir: opts.dir,
+          description: opts.description,
+        });
+        console.log(chalk.green(`✅ Plugin scaffold created at ${result.dir}`));
+        console.log();
+        console.log(chalk.bold('  Files created:'));
+        for (const f of result.files) {
+          console.log(`    ${chalk.cyan(f)}`);
+        }
+        console.log();
+        console.log(chalk.dim('  Next steps:'));
+        console.log(chalk.dim(`    cd ${result.dir}`));
+        console.log(chalk.dim(`    opencli plugin install file://${result.dir}`));
+        console.log(chalk.dim(`    opencli ${name} hello`));
+      } catch (err) {
+        console.error(chalk.red(`Error: ${getErrorMessage(err)}`));
+        process.exitCode = 1;
+      }
+    });
+
   // ── External CLIs ─────────────────────────────────────────────────────────
 
   const externalClis = loadExternalClis();

package/src/clis/bluesky/feeds.yaml

@@ -0,0 +1,29 @@
+site: bluesky
+name: feeds
+description: Popular Bluesky feed generators
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  limit:
+    type: int
+    default: 20
+    description: Number of feeds
+
+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 }}
+
+columns: [rank, name, likes, creator, description]

package/src/clis/bluesky/followers.yaml

@@ -0,0 +1,33 @@
+site: bluesky
+name: followers
+description: List followers of a Bluesky user
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  handle:
+    type: str
+    required: true
+    positional: true
+    description: "Bluesky handle"
+  limit:
+    type: int
+    default: 20
+    description: Number of followers
+
+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 }}
+
+columns: [rank, handle, name, description]

package/src/clis/bluesky/following.yaml

@@ -0,0 +1,33 @@
+site: bluesky
+name: following
+description: List accounts a Bluesky user is following
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  handle:
+    type: str
+    required: true
+    positional: true
+    description: "Bluesky handle"
+  limit:
+    type: int
+    default: 20
+    description: Number of accounts
+
+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 }}
+
+columns: [rank, handle, name, description]

package/src/clis/bluesky/profile.yaml

@@ -0,0 +1,27 @@
+site: bluesky
+name: profile
+description: Get Bluesky user profile info
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  handle:
+    type: str
+    required: true
+    positional: true
+    description: "Bluesky handle (e.g. bsky.app, jay.bsky.team)"
+
+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 }}
+
+columns: [handle, name, followers, following, posts, description]

package/src/clis/bluesky/search.yaml

@@ -0,0 +1,34 @@
+site: bluesky
+name: search
+description: Search Bluesky users
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  query:
+    type: str
+    required: true
+    positional: true
+    description: Search query
+  limit:
+    type: int
+    default: 10
+    description: Number of results
+
+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 }}
+
+columns: [rank, handle, name, followers, description]

package/src/clis/bluesky/starter-packs.yaml

@@ -0,0 +1,34 @@
+site: bluesky
+name: starter-packs
+description: Get starter packs created by a Bluesky user
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  handle:
+    type: str
+    required: true
+    positional: true
+    description: "Bluesky handle"
+  limit:
+    type: int
+    default: 10
+    description: Number of starter packs
+
+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 }}
+
+columns: [rank, name, description, members, joins]

package/src/clis/bluesky/thread.yaml

@@ -0,0 +1,32 @@
+site: bluesky
+name: thread
+description: Get a Bluesky post thread with replies
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  uri:
+    type: str
+    required: true
+    positional: true
+    description: "Post AT URI (at://did:.../app.bsky.feed.post/...) or bsky.app URL"
+  limit:
+    type: int
+    default: 20
+    description: Number of replies
+
+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 }}
+
+columns: [author, text, likes, reposts, replies_count]

package/src/clis/bluesky/trending.yaml

@@ -0,0 +1,27 @@
+site: bluesky
+name: trending
+description: Trending topics on Bluesky
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  limit:
+    type: int
+    default: 20
+    description: Number of topics
+
+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 }}
+
+columns: [rank, topic, link]

package/src/clis/bluesky/user.yaml

@@ -0,0 +1,34 @@
+site: bluesky
+name: user
+description: Get recent posts from a Bluesky user
+domain: public.api.bsky.app
+strategy: public
+browser: false
+
+args:
+  handle:
+    type: str
+    required: true
+    positional: true
+    description: "Bluesky handle (e.g. bsky.app)"
+  limit:
+    type: int
+    default: 20
+    description: Number of posts
+
+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 }}
+
+columns: [rank, text, likes, reposts, replies]

package/src/clis/twitter/trending.ts

@@ -1,19 +1,6 @@
 import { cli, Strategy } from '../../registry.js';
 import { AuthRequiredError, EmptyResultError } from '../../errors.js';
 
-// ── Twitter GraphQL constants ──────────────────────────────────────────
-
-const BEARER_TOKEN = 'AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA';
-
-// ── Types ──────────────────────────────────────────────────────────────
-
-interface TrendItem {
-  rank: number;
-  topic: string;
-  tweets: string;
-  category: string;
-}
-
 // ── CLI definition ────────────────────────────────────────────────────
 
 cli({
@@ -34,79 +21,44 @@ cli({
     await page.goto('https://x.com/explore/tabs/trending');
     await page.wait(3);
 
-    // Extract CSRF token to verify login
+    // Verify login via CSRF cookie
     const ct0 = await page.evaluate(`(() => {
       return document.cookie.split(';').map(c=>c.trim()).find(c=>c.startsWith('ct0='))?.split('=')[1] || null;
     })()`);
     if (!ct0) throw new AuthRequiredError('x.com', 'Not logged into x.com (no ct0 cookie)');
 
-    // Try legacy guide.json API first (faster than DOM scraping)
-    let trends: TrendItem[] = [];
-
-    const apiData = await page.evaluate(`(async () => {
-      const ct0 = document.cookie.split(';').map(c=>c.trim()).find(c=>c.startsWith('ct0='))?.split('=')[1] || '';
-      const r = await fetch('/i/api/2/guide.json?include_page_configuration=true', {
-        credentials: 'include',
-        headers: {
-          'x-twitter-active-user': 'yes',
-          'x-csrf-token': ct0,
-          'authorization': 'Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA'
+    // Scrape trends from DOM (consistent with what the user sees on the page)
+    // DOM children: [0] rank + category, [1] topic, optional post count,
+    // and a caret menu button identified by [data-testid="caret"].
+    await page.wait(2);
+    const trends = await page.evaluate(`(() => {
+      const items = [];
+      const cells = document.querySelectorAll('[data-testid="trend"]');
+      cells.forEach((cell) => {
+        const text = cell.textContent || '';
+        if (text.includes('Promoted')) return;
+        const container = cell.querySelector(':scope > div');
+        if (!container) return;
+        const divs = container.children;
+        if (divs.length < 2) return;
+        const topic = divs[1].textContent.trim();
+        if (!topic) return;
+        const catText = divs[0].textContent.trim();
+        const category = catText.replace(/^\\d+\\s*/, '').replace(/^\\xB7\\s*/, '').trim();
+        // Find post count: skip rank, topic, and the caret menu button
+        let tweets = 'N/A';
+        for (let j = 2; j < divs.length; j++) {
+          if (divs[j].matches('[data-testid="caret"]') || divs[j].querySelector('[data-testid="caret"]')) continue;
+          const t = divs[j].textContent.trim();
+          if (t && /\\d/.test(t)) { tweets = t; break; }
         }
+        items.push({ rank: items.length + 1, topic, tweets, category });
       });
-      return r.ok ? await r.json() : null;
+      return items;
     })()`);
 
-    if (apiData) {
-      const instructions = apiData?.timeline?.instructions || [];
-      const entries = instructions.flatMap((inst: any) => inst?.addEntries?.entries || inst?.entries || []);
-      const apiTrends = entries
-        .filter((e: any) => e.content?.timelineModule)
-        .flatMap((e: any) => e.content.timelineModule.items || [])
-        .map((t: any) => t?.item?.content?.trend)
-        .filter(Boolean);
-
-      trends = apiTrends.map((t: any, i: number) => ({
-        rank: i + 1,
-        topic: t.name,
-        tweets: t.tweetCount ? String(t.tweetCount) : 'N/A',
-        category: t.trendMetadata?.domainContext || '',
-      }));
-    }
-
-    // Fallback: scrape from the loaded DOM
-    if (trends.length === 0) {
-      await page.wait(2);
-      const domTrends = await page.evaluate(`(() => {
-        const items = [];
-        const cells = document.querySelectorAll('[data-testid="trend"]');
-        cells.forEach((cell) => {
-          const text = cell.textContent || '';
-          if (text.includes('Promoted')) return;
-          const container = cell.querySelector(':scope > div');
-          if (!container) return;
-          const divs = container.children;
-          // Structure: divs[0] = rank + category, divs[1] = topic name, divs[2] = extra
-          const topicEl = divs.length >= 2 ? divs[1] : null;
-          const topic = topicEl ? topicEl.textContent.trim() : '';
-          const catEl = divs.length >= 1 ? divs[0] : null;
-          const catText = catEl ? catEl.textContent.trim() : '';
-          const category = catText.replace(/^\\d+\\s*/, '').replace(/^\\xB7\\s*/, '').trim();
-          const extraEl = divs.length >= 3 ? divs[2] : null;
-          const extra = extraEl ? extraEl.textContent.trim() : '';
-          if (topic) {
-            items.push({ rank: items.length + 1, topic, tweets: extra || 'N/A', category });
-          }
-        });
-        return items;
-      })()`);
-
-      if (Array.isArray(domTrends) && domTrends.length > 0) {
-        trends = domTrends;
-      }
-    }
-
-    if (trends.length === 0) {
-      throw new EmptyResultError('twitter trending', 'API may have changed or login may be required.');
+    if (!Array.isArray(trends) || trends.length === 0) {
+      throw new EmptyResultError('twitter trending', 'No trends found. The page structure may have changed.');
     }
 
     return trends.slice(0, limit);