@jackwener/opencli 0.2.0 → 0.4.0

package/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/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/dist/engine.d.ts

@@ -3,5 +3,5 @@
  */
 import { type CliCommand } from './registry.js';
 import type { IPage } from './types.js';
-export declare function discoverClis(...dirs: string[]): void;
+export declare function discoverClis(...dirs: string[]): Promise<void>;
 export declare function executeCommand(cmd: CliCommand, page: IPage | null, kwargs: Record<string, any>, debug?: boolean): Promise<any>;

package/dist/engine.js

@@ -6,7 +6,8 @@ import * as path from 'node:path';
 import yaml from 'js-yaml';
 import { Strategy, registerCommand } from './registry.js';
 import { executePipeline } from './pipeline.js';
-export function discoverClis(...dirs) {
+export async function discoverClis(...dirs) {
+    const promises = [];
     for (const dir of dirs) {
         if (!fs.existsSync(dir))
             continue;
@@ -19,9 +20,16 @@ export function discoverClis(...dirs) {
                 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) => {
+                        process.stderr.write(`Warning: failed to load module ${filePath}: ${err.message}\n`);
+                    }));
+                }
             }
         }
     }
+    await Promise.all(promises);
 }
 function registerYamlCli(filePath, defaultSite) {
     try {

package/dist/explore.js

@@ -175,6 +175,9 @@ function scoreEndpoint(ep) {
         s += 2;
     if (ep.status === 200)
         s += 2;
+    // Anti-Bot Empty Value Detection: penalize JSON endpoints returning empty data
+    if (ep.responseAnalysis && ep.responseAnalysis.itemCount === 0 && ep.contentType.includes('json'))
+        s -= 3;
     return s;
 }
 function inferCapabilityName(url, goal) {
@@ -266,6 +269,28 @@ const STORE_DISCOVER_JS = `
     return stores;
   }
 `;
+// ── Auto-Interaction (Fuzzing) ─────────────────────────────────────────────
+const INTERACT_FUZZ_JS = `
+  async () => {
+    const sleep = ms => new Promise(r => setTimeout(r, ms));
+    const clickables = Array.from(document.querySelectorAll(
+      'button, [role="button"], [role="tab"], .tab, .btn, a[href="javascript:void(0)"], a[href="#"]'
+    )).slice(0, 15); // limit to 15 to avoid endless loops
+
+    let clicked = 0;
+    for (const el of clickables) {
+      try {
+        const rect = el.getBoundingClientRect();
+        if (rect.width > 0 && rect.height > 0) {
+          el.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true, view: window }));
+          clicked++;
+          await sleep(300); // give it time to trigger network
+        }
+      } catch {}
+    }
+    return clicked;
+  }
+`;
 // ── Main explore function ──────────────────────────────────────────────────
 export async function exploreUrl(url, opts) {
     const waitSeconds = opts.waitSeconds ?? 3.0;
@@ -283,6 +308,31 @@ export async function exploreUrl(url, opts) {
                 catch { }
                 await page.wait(1);
             }
+            // Step 2.5: Interactive Fuzzing (if requested)
+            if (opts.auto) {
+                try {
+                    // First: targeted clicks by label (e.g. "字幕", "CC", "评论")
+                    if (opts.clickLabels?.length) {
+                        for (const label of opts.clickLabels) {
+                            const safeLabel = label.replace(/'/g, "\\'");
+                            await page.evaluate(`
+                 (() => {
+                   const el = [...document.querySelectorAll('button, [role="button"], [role="tab"], a, span')]
+                     .find(e => e.textContent && e.textContent.trim().includes('${safeLabel}'));
+                   if (el) el.click();
+                 })()
+               `);
+                            await page.wait(1);
+                        }
+                    }
+                    // Then: blind fuzzing on generic interactive elements
+                    const clicks = await page.evaluate(INTERACT_FUZZ_JS);
+                    await page.wait(2); // wait for XHRs to settle
+                }
+                catch (e) {
+                    // fuzzing is best-effort, don't fail the whole explore
+                }
+            }
             // Step 3: Read page metadata
             const metadata = await readPageMetadata(page);
             // Step 4: Capture network traffic

package/dist/main.d.ts

@@ -2,4 +2,4 @@
 /**
  * opencli — Make any website your CLI. AI-powered.
  */
-import './clis/index.js';
+export {};

package/dist/main.js

@@ -11,7 +11,6 @@ import chalk from 'chalk';
 import { discoverClis, executeCommand } from './engine.js';
 import { 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';
 const __filename = fileURLToPath(import.meta.url);
@@ -21,7 +20,7 @@ const USER_CLIS = path.join(os.homedir(), '.opencli', 'clis');
 // Read version from package.json (single source of truth)
 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);
 // ── Built-in commands ──────────────────────────────────────────────────────
@@ -57,8 +56,8 @@ program.command('validate').description('Validate CLI definitions').argument('[t
     .action(async (target) => { const { validateClisWithTarget, renderValidationReport } = await import('./validate.js'); console.log(renderValidationReport(validateClisWithTarget([BUILTIN_CLIS, USER_CLIS], target))); });
 program.command('verify').description('Validate + smoke test').argument('[target]').option('--smoke', 'Run smoke tests', false)
     .action(async (target, opts) => { const { verifyClis, renderVerifyReport } = await import('./verify.js'); const r = await verifyClis({ builtinClis: BUILTIN_CLIS, userClis: USER_CLIS, target, smoke: opts.smoke }); console.log(renderVerifyReport(r)); process.exitCode = r.ok ? 0 : 1; });
-program.command('explore').alias('probe').description('Explore a website: discover APIs, stores, and recommend strategies').argument('<url>').option('--site <name>').option('--goal <text>').option('--wait <s>', '', '3')
-    .action(async (url, opts) => { const { exploreUrl, renderExploreSummary } = await import('./explore.js'); console.log(renderExploreSummary(await exploreUrl(url, { BrowserFactory: PlaywrightMCP, site: opts.site, goal: opts.goal, waitSeconds: parseFloat(opts.wait) }))); });
+program.command('explore').alias('probe').description('Explore a website: discover APIs, stores, and recommend strategies').argument('<url>').option('--site <name>').option('--goal <text>').option('--wait <s>', '', '3').option('--auto', 'Enable interactive fuzzing (simulate clicks to trigger lazy APIs)').option('--click <labels>', 'Comma-separated labels to click before fuzzing (e.g. "字幕,CC,评论")')
+    .action(async (url, opts) => { const { exploreUrl, renderExploreSummary } = await import('./explore.js'); const clickLabels = opts.click ? opts.click.split(',').map((s) => s.trim()) : undefined; console.log(renderExploreSummary(await exploreUrl(url, { BrowserFactory: PlaywrightMCP, site: opts.site, goal: opts.goal, waitSeconds: parseFloat(opts.wait), auto: opts.auto, clickLabels }))); });
 program.command('synthesize').description('Synthesize CLIs from explore').argument('<target>').option('--top <n>', '', '3')
     .action(async (target, opts) => { const { synthesizeFromExplore, renderSynthesizeSummary } = await import('./synthesize.js'); console.log(renderSynthesizeSummary(synthesizeFromExplore(target, { top: parseInt(opts.top) }))); });
 program.command('generate').description('One-shot: explore → synthesize → register').argument('<url>').option('--goal <text>').option('--site <name>')
@@ -116,10 +115,18 @@ for (const [, cmd] of registry) {
             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) {
-            console.error(chalk.red(`Error: ${err.message ?? err}`));
+            if (actionOpts.verbose && err.stack) {
+                console.error(chalk.red(err.stack));
+            }
+            else {
+                console.error(chalk.red(`Error: ${err.message ?? err}`));
+            }
             process.exitCode = 1;
         }
     });

package/dist/pipeline/steps/browser.js

@@ -27,14 +27,10 @@ export async function stepWait(page, params, data, args) {
         await page.wait(params);
     else if (typeof params === 'object' && params) {
         if ('text' in params) {
-            const timeout = params.timeout ?? 10;
-            const start = Date.now();
-            while ((Date.now() - start) / 1000 < timeout) {
-                const snap = await page.snapshot({ raw: true });
-                if (typeof snap === 'string' && snap.includes(params.text))
-                    break;
-                await page.wait(0.5);
-            }
+            await page.wait({
+                text: String(render(params.text, { args, data })),
+                timeout: params.timeout
+            });
         }
         else if ('time' in params)
             await page.wait(Number(params.time));

package/dist/pipeline/steps/fetch.js

@@ -2,6 +2,20 @@
  * Pipeline step: fetch — HTTP API requests.
  */
 import { render } from '../template.js';
+/** Simple async concurrency limiter */
+async function mapConcurrent(items, limit, fn) {
+    const results = new Array(items.length);
+    let index = 0;
+    async function worker() {
+        while (index < items.length) {
+            const i = index++;
+            results[i] = await fn(items[i], i);
+        }
+    }
+    const workers = Array.from({ length: Math.min(limit, items.length) }, () => worker());
+    await Promise.all(workers);
+    return results;
+}
 /** Single URL fetch helper */
 async function fetchSingle(page, url, method, queryParams, headers, args, data) {
     const renderedParams = {};
@@ -38,12 +52,11 @@ export async function stepFetch(page, params, data, args) {
     const urlTemplate = String(urlOrObj);
     // Per-item fetch when data is array and URL references item
     if (Array.isArray(data) && urlTemplate.includes('item')) {
-        const results = [];
-        for (let i = 0; i < data.length; i++) {
-            const itemUrl = String(render(urlTemplate, { args, data, item: data[i], index: i }));
-            results.push(await fetchSingle(page, itemUrl, method, queryParams, headers, args, data));
-        }
-        return results;
+        const concurrency = typeof params?.concurrency === 'number' ? params.concurrency : 5;
+        return mapConcurrent(data, concurrency, async (item, index) => {
+            const itemUrl = String(render(urlTemplate, { args, data, item, index }));
+            return fetchSingle(page, itemUrl, method, queryParams, headers, args, data);
+        });
     }
     const url = render(urlOrObj, { args, data });
     return fetchSingle(page, String(url), method, queryParams, headers, args, data);

package/dist/pipeline/steps/intercept.js

@@ -10,7 +10,54 @@ export async function stepIntercept(page, params, data, args) {
     const selectPath = cfg.select ?? null;
     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));
@@ -27,36 +74,16 @@ export async function stepIntercept(page, params, data, args) {
     else if (trigger === 'scroll') {
         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 = [];
-    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] :
         matchingResponses.length > 1 ? matchingResponses : data;