@jackwener/opencli 0.2.0 → 0.3.0

package/src/clis/twitter/search.ts

@@ -0,0 +1,65 @@
+import { cli, Strategy } from '../../registry.js';
+
+cli({
+  site: 'twitter',
+  name: 'search',
+  description: 'Search Twitter/X for tweets',
+  domain: 'x.com',
+  strategy: Strategy.INTERCEPT, // Use intercept strategy
+  browser: true,
+  args: [
+    { name: 'query', type: 'string', required: true },
+    { name: 'limit', type: 'int', default: 15 },
+  ],
+  columns: ['id', 'author', 'text', 'likes', 'views', 'url'],
+  func: async (page, kwargs) => {
+    // 1. Navigate to the search page
+    const q = encodeURIComponent(kwargs.query);
+    await page.goto(`https://x.com/search?q=${q}&f=top`);
+    await page.wait(5);
+
+    // 2. Inject XHR interceptor
+    await page.installInterceptor('SearchTimeline');
+
+    // 3. Trigger API by scrolling
+    await page.autoScroll({ times: 3, delayMs: 2000 });
+    
+    // 4. Retrieve data
+    const requests = await page.getInterceptedRequests();
+    if (!requests || requests.length === 0) return [];
+
+    let results: any[] = [];
+    for (const req of requests) {
+      try {
+        const insts = req.data.data.search_by_raw_query.search_timeline.timeline.instructions;
+        const addEntries = insts.find((i: any) => i.type === 'TimelineAddEntries');
+        if (!addEntries) continue;
+
+        for (const entry of addEntries.entries) {
+          if (!entry.entryId.startsWith('tweet-')) continue;
+          
+          let tweet = entry.content?.itemContent?.tweet_results?.result;
+          if (!tweet) continue;
+
+          // Handle retweet wrapping
+          if (tweet.__typename === 'TweetWithVisibilityResults' && tweet.tweet) {
+              tweet = tweet.tweet;
+          }
+
+          results.push({
+            id: tweet.rest_id,
+            author: tweet.core?.user_results?.result?.legacy?.screen_name || 'unknown',
+            text: tweet.legacy?.full_text || '',
+            likes: tweet.legacy?.favorite_count || 0,
+            views: tweet.views?.count || '0',
+            url: `https://x.com/i/status/${tweet.rest_id}`
+          });
+        }
+      } catch (e) {
+        // ignore parsing errors for individual payloads
+      }
+    }
+
+    return results.slice(0, kwargs.limit);
+  }
+});

package/src/clis/twitter/timeline.ts

@@ -0,0 +1,50 @@
+import { cli, Strategy } from '../../registry.js';
+
+cli({
+  site: 'twitter',
+  name: 'timeline',
+  description: 'Twitter Home Timeline',
+  domain: 'x.com',
+  strategy: Strategy.COOKIE,
+  args: [
+    { name: 'limit', type: 'int', default: 20 },
+  ],
+  columns: ['responseType', 'first'],
+  func: async (page, kwargs) => {
+    await page.goto('https://x.com/home');
+    await page.wait(5);
+    // Inject the fetch interceptor manually to see exactly what happens
+    await page.evaluate(`
+      () => {
+        window.__intercept_data = [];
+        const origFetch = window.fetch;
+        window.fetch = async function(...args) {
+          let u = typeof args[0] === 'string' ? args[0] : (args[0] && args[0].url) || '';
+          const res = await origFetch.apply(this, args);
+          setTimeout(async () => {
+            try {
+              if (u.includes('HomeTimeline')) {
+                const clone = res.clone();
+                const j = await clone.json();
+                window.__intercept_data.push(j);
+              }
+            } catch(e) {}
+          }, 0);
+          return res;
+        };
+      }
+    `);
+    
+    // trigger scroll
+    for(let i=0; i<3; i++) {
+      await page.evaluate('() => window.scrollTo(0, document.body.scrollHeight)');
+      await page.wait(2);
+    }
+    
+    // extract
+    const data = await page.evaluate('() => window.__intercept_data');
+    if (!data || data.length === 0) return [{responseType: 'no data captured'}];
+    
+    return [{responseType: `captured ${data.length} responses`, first: JSON.stringify(data[0]).substring(0,300)}];
+  }
+});

package/src/clis/xiaohongshu/user.ts

@@ -0,0 +1,45 @@
+import { cli, Strategy } from '../../registry.js';
+
+cli({
+  site: 'xiaohongshu',
+  name: 'user',
+  description: 'Get user notes from Xiaohongshu',
+  domain: 'xiaohongshu.com',
+  strategy: Strategy.INTERCEPT,
+  browser: true,
+  args: [
+    { name: 'id', type: 'string', required: true },
+    { name: 'limit', type: 'int', default: 15 },
+  ],
+  columns: ['id', 'title', 'type', 'likes', 'url'],
+  func: async (page, kwargs) => {
+    await page.goto(`https://www.xiaohongshu.com/user/profile/${kwargs.id}`);
+    await page.wait(5);
+
+    await page.installInterceptor('v1/user/posted');
+
+    // Trigger API by scrolling
+    await page.autoScroll({ times: 2, delayMs: 2000 });
+    
+    // Retrieve data
+    const requests = await page.getInterceptedRequests();
+    if (!requests || requests.length === 0) return [];
+
+    let results: any[] = [];
+    for (const req of requests) {
+      if (req.data && req.data.data && req.data.data.notes) {
+         for (const note of req.data.data.notes) {
+           results.push({
+             id: note.note_id || note.id,
+             title: note.display_title || '',
+             type: note.type || '',
+             likes: note.interact_info?.liked_count || '0',
+             url: `https://www.xiaohongshu.com/explore/${note.note_id || note.id}`
+           });
+         }
+      }
+    }
+
+    return results.slice(0, kwargs.limit);
+  }
+});

package/src/clis/xueqiu/feed.yaml

@@ -0,0 +1,53 @@
+site: xueqiu
+name: feed
+description: 获取雪球首页时间线（关注用户的动态）
+domain: xueqiu.com
+browser: true
+
+args:
+  page:
+    type: int
+    default: 1
+    description: 页码，默认 1
+  limit:
+    type: int
+    default: 20
+    description: 每页数量，默认 20
+
+pipeline:
+  - navigate: https://xueqiu.com
+  - evaluate: |
+      (async () => {
+        const page = ${{ args.page }};
+        const count = ${{ args.limit }};
+        const resp = await fetch(`https://xueqiu.com/v4/statuses/home_timeline.json?page=${page}&count=${count}`, {credentials: 'include'});
+        if (!resp.ok) throw new Error('HTTP ' + resp.status + ' Hint: Not logged in?');
+        const d = await resp.json();
+        
+        const strip = (html) => (html || '').replace(/<[^>]+>/g, '').replace(/&nbsp;/g, ' ').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').trim();
+        const list = d.home_timeline || d.list || [];
+        return list.map(item => {
+          const user = item.user || {};
+          return {
+            id: item.id,
+            text: strip(item.description).substring(0, 200),
+            url: 'https://xueqiu.com/' + user.id + '/' + item.id,
+            author: user.screen_name,
+            likes: item.fav_count,
+            retweets: item.retweet_count,
+            replies: item.reply_count,
+            created_at: item.created_at ? new Date(item.created_at).toISOString() : null
+          };
+        });
+      })()
+
+  - map:
+      author: ${{ item.author }}
+      text: ${{ item.text }}
+      likes: ${{ item.likes }}
+      replies: ${{ item.replies }}
+      url: ${{ item.url }}
+      
+  - limit: ${{ args.limit }}
+
+columns: [author, text, likes, replies, url]

package/src/clis/xueqiu/hot-stock.yaml

@@ -0,0 +1,49 @@
+site: xueqiu
+name: hot-stock
+description: 获取雪球热门股票榜
+domain: xueqiu.com
+browser: true
+
+args:
+  limit:
+    type: int
+    default: 20
+    description: 返回数量，默认 20，最大 50
+  type:
+    type: str
+    default: "10"
+    description: 榜单类型 10=人气榜(默认) 12=关注榜
+
+pipeline:
+  - navigate: https://xueqiu.com
+  - evaluate: |
+      (async () => {
+        const count = ${{ args.limit }};
+        const type = ${{ args.type | json }};
+        const resp = await fetch(`https://stock.xueqiu.com/v5/stock/hot_stock/list.json?size=${count}&type=${type}`, {credentials: 'include'});
+        if (!resp.ok) throw new Error('HTTP ' + resp.status + ' Hint: Not logged in?');
+        const d = await resp.json();
+        if (!d.data || !d.data.items) throw new Error('获取失败');
+        return d.data.items.map((s, i) => ({
+          rank: i + 1,
+          symbol: s.symbol,
+          name: s.name,
+          price: s.current,
+          changePercent: s.percent != null ? s.percent.toFixed(2) + '%' : null,
+          heat: s.value,
+          rank_change: s.rank_change,
+          url: 'https://xueqiu.com/S/' + s.symbol
+        }));
+      })()
+
+  - map:
+      rank: ${{ item.rank }}
+      symbol: ${{ item.symbol }}
+      name: ${{ item.name }}
+      price: ${{ item.price }}
+      changePercent: ${{ item.changePercent }}
+      heat: ${{ item.heat }}
+
+  - limit: ${{ args.limit }}
+
+columns: [rank, symbol, name, price, changePercent, heat]

package/src/clis/xueqiu/hot.yaml

@@ -0,0 +1,46 @@
+site: xueqiu
+name: hot
+description: 获取雪球热门动态
+domain: xueqiu.com
+browser: true
+
+args:
+  limit:
+    type: int
+    default: 20
+    description: 返回数量，默认 20，最大 50
+
+pipeline:
+  - navigate: https://xueqiu.com
+  - evaluate: |
+      (async () => {
+        const resp = await fetch('https://xueqiu.com/statuses/hot/listV3.json?source=hot&page=1', {credentials: 'include'});
+        if (!resp.ok) throw new Error('HTTP ' + resp.status + ' Hint: Not logged in?');
+        const d = await resp.json();
+        const list = d.list || [];
+        
+        const strip = (html) => (html || '').replace(/<[^>]+>/g, '').replace(/&nbsp;/g, ' ').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').trim();
+        return list.map((item, i) => {
+          const user = item.user || {};
+          return {
+            rank: i + 1,
+            text: strip(item.description).substring(0, 200),
+            url: 'https://xueqiu.com/' + user.id + '/' + item.id,
+            author: user.screen_name,
+            likes: item.fav_count,
+            retweets: item.retweet_count,
+            replies: item.reply_count
+          };
+        });
+      })()
+
+  - map:
+      rank: ${{ item.rank }}
+      author: ${{ item.author }}
+      text: ${{ item.text }}
+      likes: ${{ item.likes }}
+      url: ${{ item.url }}
+
+  - limit: ${{ args.limit }}
+
+columns: [rank, author, text, likes, url]

package/src/clis/xueqiu/search.yaml

@@ -0,0 +1,53 @@
+site: xueqiu
+name: search
+description: 搜索雪球股票（代码或名称）
+domain: xueqiu.com
+browser: true
+
+args:
+  query:
+    type: str
+    description: 搜索关键词，如 茅台、AAPL、腾讯
+  limit:
+    type: int
+    default: 10
+    description: 返回数量，默认 10
+
+pipeline:
+  - navigate: https://xueqiu.com
+  - evaluate: |
+      (async () => {
+        const query = ${{ args.query | json }};
+        const count = ${{ args.limit }};
+        if (!query) throw new Error('Missing argument: query');
+        const resp = await fetch(`https://xueqiu.com/stock/search.json?code=${encodeURIComponent(query)}&size=${count}`, {credentials: 'include'});
+        if (!resp.ok) throw new Error('HTTP ' + resp.status + ' Hint: Not logged in?');
+        const d = await resp.json();
+        return (d.stocks || []).map(s => {
+          let symbol = '';
+          if (s.exchange === 'SH' || s.exchange === 'SZ' || s.exchange === 'BJ') {
+            symbol = s.code.startsWith(s.exchange) ? s.code : s.exchange + s.code;
+          } else {
+            symbol = s.code;
+          }
+          return {
+            symbol: symbol,
+            name: s.name,
+            exchange: s.exchange,
+            price: s.current,
+            changePercent: s.percentage != null ? s.percentage.toFixed(2) + '%' : null,
+            url: 'https://xueqiu.com/S/' + symbol
+          };
+        });
+      })()
+      
+  - map:
+      symbol: ${{ item.symbol }}
+      name: ${{ item.name }}
+      exchange: ${{ item.exchange }}
+      price: ${{ item.price }}
+      changePercent: ${{ item.changePercent }}
+      
+  - limit: ${{ args.limit }}
+
+columns: [symbol, name, exchange, price, changePercent]

package/src/clis/xueqiu/stock.yaml

@@ -0,0 +1,67 @@
+site: xueqiu
+name: stock
+description: 获取雪球股票实时行情
+domain: xueqiu.com
+browser: true
+
+args:
+  symbol:
+    type: str
+    description: 股票代码，如 SH600519、SZ000858、AAPL、00700
+
+pipeline:
+  - navigate: https://xueqiu.com
+  - evaluate: |
+      (async () => {
+        const symbol = (${{ args.symbol | json }} || '').toUpperCase();
+        if (!symbol) throw new Error('Missing argument: symbol');
+        const resp = await fetch(`https://stock.xueqiu.com/v5/stock/batch/quote.json?symbol=${encodeURIComponent(symbol)}`, {credentials: 'include'});
+        if (!resp.ok) throw new Error('HTTP ' + resp.status + ' Hint: Not logged in?');
+        const d = await resp.json();
+        if (!d.data || !d.data.items || d.data.items.length === 0) throw new Error('未找到股票: ' + symbol);
+        
+        function fmtAmount(v) {
+          if (v == null) return null;
+          if (Math.abs(v) >= 1e12) return (v / 1e12).toFixed(2) + '万亿';
+          if (Math.abs(v) >= 1e8) return (v / 1e8).toFixed(2) + '亿';
+          if (Math.abs(v) >= 1e4) return (v / 1e4).toFixed(2) + '万';
+          return v.toString();
+        }
+        
+        const item = d.data.items[0];
+        const q = item.quote || {};
+        const m = item.market || {};
+        
+        return [{
+          name: q.name,
+          symbol: q.symbol,
+          exchange: q.exchange,
+          currency: q.currency,
+          price: q.current,
+          change: q.chg,
+          changePercent: q.percent != null ? q.percent.toFixed(2) + '%' : null,
+          open: q.open,
+          high: q.high,
+          low: q.low,
+          prevClose: q.last_close,
+          amplitude: q.amplitude != null ? q.amplitude.toFixed(2) + '%' : null,
+          volume: q.volume,
+          amount: fmtAmount(q.amount),
+          turnover_rate: q.turnover_rate != null ? q.turnover_rate.toFixed(2) + '%' : null,
+          marketCap: fmtAmount(q.market_capital),
+          floatMarketCap: fmtAmount(q.float_market_capital),
+          ytdPercent: q.current_year_percent != null ? q.current_year_percent.toFixed(2) + '%' : null,
+          market_status: m.status || null,
+          time: q.timestamp ? new Date(q.timestamp).toISOString() : null,
+          url: 'https://xueqiu.com/S/' + q.symbol
+        }];
+      })()
+
+  - map:
+      name: ${{ item.name }}
+      symbol: ${{ item.symbol }}
+      price: ${{ item.price }}
+      changePercent: ${{ item.changePercent }}
+      marketCap: ${{ item.marketCap }}
+
+columns: [name, symbol, price, changePercent, marketCap]

package/src/clis/xueqiu/watchlist.yaml

@@ -0,0 +1,46 @@
+site: xueqiu
+name: watchlist
+description: 获取雪球自选股列表
+domain: xueqiu.com
+browser: true
+
+args:
+  category:
+    type: str # using str to prevent parsing issues like 01
+    default: "1"
+    description: "分类：1=自选(默认) 2=持仓 3=关注"
+  limit:
+    type: int
+    default: 100
+    description: 默认 100
+
+pipeline:
+  - navigate: https://xueqiu.com
+  - evaluate: |
+      (async () => {
+        const category = parseInt(${{ args.category | json }}) || 1;
+        const resp = await fetch(`https://stock.xueqiu.com/v5/stock/portfolio/stock/list.json?size=100&category=${category}&pid=-1`, {credentials: 'include'});
+        if (!resp.ok) throw new Error('HTTP ' + resp.status + ' Hint: Not logged in?');
+        const d = await resp.json();
+        if (!d.data || !d.data.stocks) throw new Error('获取失败，可能未登录');
+        
+        return d.data.stocks.map(s => ({
+          symbol: s.symbol,
+          name: s.name,
+          price: s.current,
+          change: s.chg,
+          changePercent: s.percent != null ? s.percent.toFixed(2) + '%' : null,
+          volume: s.volume,
+          url: 'https://xueqiu.com/S/' + s.symbol
+        }));
+      })()
+
+  - map:
+      symbol: ${{ item.symbol }}
+      name: ${{ item.name }}
+      price: ${{ item.price }}
+      changePercent: ${{ item.changePercent }}
+      
+  - limit: ${{ args.limit }}
+
+columns: [symbol, name, price, changePercent]

package/src/clis/zhihu/hot.yaml

@@ -17,12 +17,16 @@ pipeline:
         const res = await fetch('https://www.zhihu.com/api/v3/feed/topstory/hot-lists/total?limit=50', {
           credentials: 'include'
         });
-        const d = await res.json();
+        const text = await res.text();
+        const d = JSON.parse(
+          text.replace(/("id"\s*:\s*)(\d{16,})/g, '$1"$2"')
+        );
         return (d?.data || []).map((item) => {
           const t = item.target || {};
+          const questionId = t.id == null ? '' : String(t.id);
           return {
             title: t.title,
-            url: 'https://www.zhihu.com/question/' + t.id,
+            url: 'https://www.zhihu.com/question/' + questionId,
             answer_count: t.answer_count,
             follower_count: t.follower_count,
             heat: item.detail_text || '',

package/src/clis/zhihu/search.yaml

@@ -19,7 +19,9 @@ pipeline:
   - evaluate: |
       (async () => {
         const strip = (html) => (html || '').replace(/<[^>]+>/g, '').replace(/&nbsp;/g, ' ').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&').replace(/<em>/g, '').replace(/<\/em>/g, '').trim();
-        const res = await fetch('https://www.zhihu.com/api/v4/search_v3?q=' + encodeURIComponent('${{ args.keyword }}') + '&t=general&offset=0&limit=${{ args.limit }}', {
+        const keyword = ${{ args.keyword | json }};
+        const limit = ${{ args.limit }};
+        const res = await fetch('https://www.zhihu.com/api/v4/search_v3?q=' + encodeURIComponent(keyword) + '&t=general&offset=0&limit=' + limit, {
           credentials: 'include'
         });
         const d = await res.json();

package/src/engine.ts

@@ -9,7 +9,8 @@ import { type CliCommand, type Arg, Strategy, registerCommand } from './registry
 import type { IPage } from './types.js';
 import { executePipeline } from './pipeline.js';
 
-export function discoverClis(...dirs: string[]): void {
+export async function discoverClis(...dirs: string[]): Promise<void> {
+  const promises: Promise<any>[] = [];
   for (const dir of dirs) {
     if (!fs.existsSync(dir)) continue;
     for (const site of fs.readdirSync(dir)) {
@@ -19,10 +20,18 @@ export function discoverClis(...dirs: string[]): void {
         const filePath = path.join(siteDir, file);
         if (file.endsWith('.yaml') || file.endsWith('.yml')) {
           registerYamlCli(filePath, site);
+        } else if (file.endsWith('.js')) {
+          // Dynamic import of compiled adapter modules
+          promises.push(
+            import(`file://${filePath}`).catch((err: any) => {
+              process.stderr.write(`Warning: failed to load module ${filePath}: ${err.message}\n`);
+            })
+          );
         }
       }
     }
   }
+  await Promise.all(promises);
 }
 
 function registerYamlCli(filePath: string, defaultSite: string): void {

package/src/main.ts

@@ -12,7 +12,6 @@ import chalk from 'chalk';
 import { discoverClis, executeCommand } from './engine.js';
 import { type CliCommand, fullName, getRegistry, strategyLabel } from './registry.js';
 import { render as renderOutput } from './output.js';
-import './clis/index.js';
 import { PlaywrightMCP } from './browser.js';
 import { browserSession, DEFAULT_BROWSER_COMMAND_TIMEOUT, runWithTimeout } from './runtime.js';
 
@@ -25,7 +24,7 @@ const USER_CLIS = path.join(os.homedir(), '.opencli', 'clis');
 const pkgJsonPath = path.resolve(__dirname, '..', 'package.json');
 const PKG_VERSION = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8')).version ?? '0.0.0';
 
-discoverClis(BUILTIN_CLIS, USER_CLIS);
+await discoverClis(BUILTIN_CLIS, USER_CLIS);
 
 const program = new Command();
 program.name('opencli').description('Make any website your CLI. Zero setup. AI-powered.').version(PKG_VERSION);
@@ -104,8 +103,15 @@ for (const [, cmd] of registry) {
       if (cmd.browser) {
         result = await browserSession(PlaywrightMCP, async (page) => runWithTimeout(executeCommand(cmd, page, kwargs, actionOpts.verbose), { timeout: cmd.timeoutSeconds ?? DEFAULT_BROWSER_COMMAND_TIMEOUT, label: fullName(cmd) }));
       } else { result = await executeCommand(cmd, null, kwargs, actionOpts.verbose); }
+      if (actionOpts.verbose && (!result || (Array.isArray(result) && result.length === 0))) {
+        console.error(chalk.yellow(`[Verbose] Warning: Command returned an empty result. If the website structural API changed or requires authentication, check the network or update the adapter.`));
+      }
       renderOutput(result, { fmt: actionOpts.format, columns: cmd.columns, title: `${cmd.site}/${cmd.name}`, elapsed: (Date.now() - startTime) / 1000, source: fullName(cmd) });
-    } catch (err: any) { console.error(chalk.red(`Error: ${err.message ?? err}`)); process.exitCode = 1; }
+    } catch (err: any) { 
+      if (actionOpts.verbose && err.stack) { console.error(chalk.red(err.stack)); }
+      else { console.error(chalk.red(`Error: ${err.message ?? err}`)); }
+      process.exitCode = 1; 
+    }
   });
 }
 

package/src/pipeline/steps/intercept.ts

@@ -14,7 +14,55 @@ export async function stepIntercept(page: IPage, params: any, data: any, args: R
 
   if (!capturePattern) return data;
 
-  // Step 1: Execute the trigger action
+  // Step 1: Inject fetch/XHR interceptor BEFORE trigger
+  await page.evaluate(`
+    () => {
+      window.__opencli_intercepted = window.__opencli_intercepted || [];
+      const pattern = ${JSON.stringify(capturePattern)};
+      
+      if (!window.__opencli_fetch_patched) {
+        const origFetch = window.fetch;
+        window.fetch = async function(...args) {
+          const reqUrl = typeof args[0] === 'string' ? args[0] : (args[0] && args[0].url) || '';
+          const response = await origFetch.apply(this, args);
+          setTimeout(async () => {
+            try {
+              if (reqUrl.includes(pattern)) {
+                const clone = response.clone();
+                const json = await clone.json();
+                window.__opencli_intercepted.push(json);
+              }
+            } catch(e) {}
+          }, 0);
+          return response;
+        };
+        window.__opencli_fetch_patched = true;
+      }
+
+      if (!window.__opencli_xhr_patched) {
+        const XHR = XMLHttpRequest.prototype;
+        const open = XHR.open;
+        const send = XHR.send;
+        XHR.open = function(method, url, ...args) {
+          this._reqUrl = url;
+          return open.call(this, method, url, ...args);
+        };
+        XHR.send = function(...args) {
+          this.addEventListener('load', function() {
+            try {
+              if (this._reqUrl && this._reqUrl.includes(pattern)) {
+                window.__opencli_intercepted.push(JSON.parse(this.responseText));
+              }
+            } catch(e) {}
+          });
+          return send.apply(this, args);
+        };
+        window.__opencli_xhr_patched = true;
+      }
+    }
+  `);
+
+  // Step 2: Execute the trigger action
   if (trigger.startsWith('navigate:')) {
     const url = render(trigger.slice('navigate:'.length), { args, data });
     await page.goto(String(url));
@@ -29,36 +77,18 @@ export async function stepIntercept(page: IPage, params: any, data: any, args: R
     await page.scroll('down');
   }
 
-  // Step 2: Wait a bit for network requests to fire
+  // Step 3: Wait a bit for network requests to fire
   await page.wait(Math.min(timeout, 3));
 
-  // Step 3: Get network requests and find matching ones
-  const rawNetwork = await page.networkRequests(false);
-  const matchingResponses: any[] = [];
-
-  if (typeof rawNetwork === 'string') {
-    const lines = rawNetwork.split('\n');
-    for (const line of lines) {
-      const match = line.match(/\[?(GET|POST)\]?\s+(\S+)\s*(?:=>|→)\s*\[?(\d+)\]?/i);
-      if (match) {
-        const [, , url, status] = match;
-        if (url.includes(capturePattern) && status === '200') {
-          try {
-            const body = await page.evaluate(`
-              async () => {
-                try {
-                  const resp = await fetch(${JSON.stringify(url)}, { credentials: 'include' });
-                  if (!resp.ok) return null;
-                  return await resp.json();
-                } catch { return null; }
-              }
-            `);
-            if (body) matchingResponses.push(body);
-          } catch {}
-        }
-      }
+  // Step 4: Retrieve captured data
+  const matchingResponses = await page.evaluate(`
+    () => {
+      const data = window.__opencli_intercepted || [];
+      window.__opencli_intercepted = []; // clear after reading
+      return data;
     }
-  }
+  `);
+
 
   // Step 4: Select from response if specified
   let result = matchingResponses.length === 1 ? matchingResponses[0] :