@jackwener/opencli 1.7.0 → 1.7.2

package/{dist/clis → clis}/yahoo-finance/quote.js

@@ -2,6 +2,7 @@
  * Yahoo Finance stock quote — multi-strategy API fallback.
  */
 import { cli, Strategy } from '@jackwener/opencli/registry';
+import { CommandExecutionError } from '@jackwener/opencli/errors';
 cli({
     site: 'yahoo-finance',
     name: 'quote',
@@ -66,7 +67,7 @@ cli({
       })()
     `);
         if (!data || data.error)
-            return [];
+            throw new CommandExecutionError(data?.error || `Failed to fetch quote for ${symbol}`);
         return [data];
     },
 });

package/{dist/clis → clis}/zsxq/topic.js

@@ -1,6 +1,6 @@
 import { cli, Strategy } from '@jackwener/opencli/registry';
 import { CliError } from '@jackwener/opencli/errors';
-import { browserJsonRequest, ensureZsxqAuth, ensureZsxqPage, fetchFirstJson, getCommentsFromResponse, getTopicFromResponse, getTopicUrl, summarizeComments, toTopicRow, } from './utils.js';
+import { getActiveGroupId, browserJsonRequest, ensureZsxqAuth, ensureZsxqPage, fetchFirstJson, getCommentsFromResponse, getTopicFromResponse, getTopicUrl, summarizeComments, toTopicRow, } from './utils.js';
 cli({
     site: 'zsxq',
     name: 'topic',
@@ -10,6 +10,7 @@ cli({
     browser: true,
     args: [
         { name: 'id', required: true, positional: true, help: 'Topic ID' },
+        { name: 'group_id', help: 'Group ID (optional; defaults to active group in Chrome)' },
         { name: 'comment_limit', type: 'int', default: 20, help: 'Number of comments to fetch' },
     ],
     columns: ['topic_id', 'type', 'author', 'title', 'comments', 'likes', 'comment_preview', 'url'],
@@ -17,8 +18,9 @@ cli({
         await ensureZsxqPage(page);
         await ensureZsxqAuth(page);
         const topicId = String(kwargs.id);
+        const groupId = String(kwargs.group_id || await getActiveGroupId(page));
         const commentLimit = Math.max(1, Number(kwargs.comment_limit) || 20);
-        const detailUrl = `https://api.zsxq.com/v2/topics/${topicId}`;
+        const detailUrl = `https://api.zsxq.com/v2/groups/${groupId}/topics/${topicId}`;
         const detailResp = await browserJsonRequest(page, detailUrl);
         if (detailResp.status === 404) {
             throw new CliError('NOT_FOUND', `Topic ${topicId} not found`);
@@ -27,7 +29,7 @@ cli({
             throw new CliError('FETCH_ERROR', detailResp.error || `Failed to fetch topic ${topicId}`, `Checked endpoint: ${detailUrl}`);
         }
         const commentsResp = await fetchFirstJson(page, [
-            `https://api.zsxq.com/v2/topics/${topicId}/comments?sort=asc&count=${commentLimit}`,
+            `https://api.zsxq.com/v2/groups/${groupId}/topics/${topicId}/comments?sort=asc&count=${commentLimit}`,
         ]);
         const topic = getTopicFromResponse(detailResp.data);
         if (!topic)

package/{dist/clis → clis}/zsxq/topic.test.js

@@ -11,11 +11,12 @@ describe('zsxq topic command', () => {
         const mockPage = {
             goto: vi.fn().mockResolvedValue(undefined),
             evaluate: vi.fn()
-                .mockResolvedValueOnce(true)
+                .mockResolvedValueOnce(true) // ensureZsxqAuth
+                .mockResolvedValueOnce('12345') // getActiveGroupId
                 .mockResolvedValueOnce({
                 ok: true,
                 status: 404,
-                url: 'https://api.zsxq.com/v2/topics/404',
+                url: 'https://api.zsxq.com/v2/groups/12345/topics/404',
                 data: null,
             }),
         };
@@ -24,6 +25,6 @@ describe('zsxq topic command', () => {
             message: 'Topic 404 not found',
         });
         expect(mockPage.goto).toHaveBeenCalledWith('https://wx.zsxq.com');
-        expect(mockPage.evaluate).toHaveBeenCalledTimes(2);
+        expect(mockPage.evaluate).toHaveBeenCalledTimes(3);
     });
 });

package/{dist/clis → clis}/zsxq/utils.js

@@ -168,7 +168,7 @@ export function getTopicFromResponse(payload) {
     const data = unwrapRespData(payload);
     if (Array.isArray(data))
         return data[0] ?? null;
-    if (typeof data.topic_id === 'number')
+    if (typeof data.topic_id === 'number' || typeof data.topic_id === 'string')
         return data;
     const record = asRecord(data);
     if (!record)

package/dist/src/browser/base-page.js

@@ -117,7 +117,7 @@ export class BasePage {
         catch (err) {
             // Log snapshot failure for debugging, then fallback to basic accessibility tree
             if (process.env.DEBUG_SNAPSHOT) {
-                console.error('[snapshot] DOM snapshot failed, falling back to accessibility tree:', err?.message?.slice(0, 200));
+                process.stderr.write(`[snapshot] DOM snapshot failed, falling back to accessibility tree: ${err?.message?.slice(0, 200)}\n`);
             }
             return this._basicSnapshot(opts);
         }

package/dist/src/browser/cdp.js

@@ -195,16 +195,18 @@ class CDPPage extends BasePage {
         return base64;
     }
     async startNetworkCapture(pattern = '') {
+        // Always update the filter pattern
         this._networkCapturePattern = pattern;
-        this._networkEntries = [];
-        this._pendingRequests.clear();
-        this._pendingBodyFetches.clear();
+        // Reset state only on first start; avoid wiping entries if already capturing
         if (!this._networkCapturing) {
+            this._networkEntries = [];
+            this._pendingRequests.clear();
+            this._pendingBodyFetches.clear();
             await this.bridge.send('Network.enable');
             // Step 1: Record request method/url on requestWillBeSent
             this.bridge.on('Network.requestWillBeSent', (params) => {
                 const p = params;
-                if (!pattern || p.request.url.includes(pattern)) {
+                if (!this._networkCapturePattern || p.request.url.includes(this._networkCapturePattern)) {
                     const idx = this._networkEntries.push({
                         url: p.request.url,
                         method: p.request.method,

package/dist/src/browser/stealth.d.ts

@@ -8,9 +8,4 @@
  *
  * Inspired by puppeteer-extra-plugin-stealth.
  */
-/**
- * Return a self-contained JS string that, when evaluated in a page context,
- * applies all stealth patches. Safe to call multiple times — the guard flag
- * ensures patches are applied only once.
- */
 export declare function generateStealthJs(): string;

package/dist/src/browser/stealth.js

@@ -12,9 +12,15 @@
  * Return a self-contained JS string that, when evaluated in a page context,
  * applies all stealth patches. Safe to call multiple times — the guard flag
  * ensures patches are applied only once.
+ *
+ * The generated string is pure static (no dynamic parameters), so we cache
+ * it after the first call to avoid re-building ~350 lines on every goto().
  */
+let _cachedStealthJs;
 export function generateStealthJs() {
-    return `
+    if (_cachedStealthJs !== undefined)
+        return _cachedStealthJs;
+    return (_cachedStealthJs = `
     (() => {
       // Guard: prevent double-injection across separate CDP evaluations.
       // We cannot use a closure variable (each eval is a fresh scope), and
@@ -349,5 +355,5 @@ export function generateStealthJs() {
 
       return 'applied';
     })()
-  `;
+  `);
 }

package/dist/src/build-manifest.d.ts

@@ -2,11 +2,11 @@
 /**
  * Build-time CLI manifest compiler.
  *
- * Scans all TS CLI definitions and pre-compiles them into a single
+ * Scans all JS CLI definitions in clis/ and pre-compiles them into a single
  * manifest.json for instant cold-start registration.
  *
  * Usage: npx tsx src/build-manifest.ts
- * Output: cli-manifest.json at the package root
+ * Output: cli-manifest.json next to clis/
  */
 export interface ManifestEntry {
     site: string;
@@ -31,13 +31,13 @@ export interface ManifestEntry {
     timeout?: number;
     deprecated?: boolean | string;
     replacedBy?: string;
-    type: 'ts';
+    type: 'js';
     /** Relative path from clis/ dir, e.g. 'bilibili/search.js' */
     modulePath?: string;
-    /** Relative path to the original source file from clis/ dir (e.g. 'site/cmd.ts') */
+    /** Relative path to the source file from clis/ dir (e.g. 'site/cmd.js') */
     sourceFile?: string;
     /** Pre-navigation control — see CliCommand.navigateBefore */
     navigateBefore?: boolean | string;
 }
-export declare function loadTsManifestEntries(filePath: string, site: string, importer?: (moduleHref: string) => Promise<unknown>): Promise<ManifestEntry[]>;
+export declare function loadManifestEntries(filePath: string, site: string, importer?: (moduleHref: string) => Promise<unknown>): Promise<ManifestEntry[]>;
 export declare function buildManifest(): Promise<ManifestEntry[]>;

package/dist/src/build-manifest.js

@@ -2,11 +2,11 @@
 /**
  * Build-time CLI manifest compiler.
  *
- * Scans all TS CLI definitions and pre-compiles them into a single
+ * Scans all JS CLI definitions in clis/ and pre-compiles them into a single
  * manifest.json for instant cold-start registration.
  *
  * Usage: npx tsx src/build-manifest.ts
- * Output: cli-manifest.json at the package root
+ * Output: cli-manifest.json next to clis/
  */
 import * as fs from 'node:fs';
 import * as path from 'node:path';
@@ -16,6 +16,7 @@ import { fullName, getRegistry } from './registry.js';
 import { findPackageRoot, getCliManifestPath } from './package-paths.js';
 const PACKAGE_ROOT = findPackageRoot(fileURLToPath(import.meta.url));
 const CLIS_DIR = path.join(PACKAGE_ROOT, 'clis');
+// Write manifest next to clis/ so both dev and installed runtime can find it.
 const OUTPUT = getCliManifestPath(CLIS_DIR);
 import { isRecord } from './utils.js';
 const CLI_MODULE_PATTERN = /\bcli\s*\(/;
@@ -31,7 +32,7 @@ function toManifestArgs(args) {
         choices: arg.choices,
     }));
 }
-function toTsModulePath(filePath, site) {
+function toModulePath(filePath, site) {
     const baseName = path.basename(filePath, path.extname(filePath));
     return `${site}/${baseName}.js`;
 }
@@ -56,19 +57,19 @@ function toManifestEntry(cmd, modulePath, sourceFile) {
         timeout: cmd.timeoutSeconds,
         deprecated: cmd.deprecated,
         replacedBy: cmd.replacedBy,
-        type: 'ts',
+        type: 'js',
         modulePath,
         sourceFile,
         navigateBefore: cmd.navigateBefore,
     };
 }
-export async function loadTsManifestEntries(filePath, site, importer = moduleHref => import(moduleHref)) {
+export async function loadManifestEntries(filePath, site, importer = moduleHref => import(moduleHref)) {
     try {
         const src = fs.readFileSync(filePath, 'utf-8');
         // Helper/test modules should not appear as CLI commands in the manifest.
         if (!CLI_MODULE_PATTERN.test(src))
             return [];
-        const modulePath = toTsModulePath(filePath, site);
+        const modulePath = toModulePath(filePath, site);
         const registry = getRegistry();
         const before = new Map(registry.entries());
         const mod = await importer(pathToFileURL(filePath).href);
@@ -84,6 +85,8 @@ export async function loadTsManifestEntries(filePath, site, importer = moduleHre
                 return !previous || previous !== cmd;
             })
                 .map(([, cmd]) => cmd);
+        // Resolve sourceFile relative to clis/.
+        const sourceRelative = path.relative(CLIS_DIR, filePath);
         const seen = new Set();
         return runtimeCommands
             .filter((cmd) => {
@@ -94,7 +97,7 @@ export async function loadTsManifestEntries(filePath, site, importer = moduleHre
             return true;
         })
             .sort((a, b) => a.name.localeCompare(b.name))
-            .map(cmd => toManifestEntry(cmd, modulePath, path.relative(CLIS_DIR, filePath)));
+            .map(cmd => toManifestEntry(cmd, modulePath, sourceRelative));
     }
     catch (err) {
         // If parsing fails, log a warning (matching scanYaml behaviour) and skip the entry.
@@ -104,16 +107,17 @@ export async function loadTsManifestEntries(filePath, site, importer = moduleHre
 }
 export async function buildManifest() {
     const manifest = new Map();
+    // Scan JS adapters directly from clis/.
+    // Adapters are now JS-first — no compilation step needed.
     if (fs.existsSync(CLIS_DIR)) {
         for (const site of fs.readdirSync(CLIS_DIR)) {
             const siteDir = path.join(CLIS_DIR, site);
             if (!fs.statSync(siteDir).isDirectory())
                 continue;
             for (const file of fs.readdirSync(siteDir)) {
-                if ((file.endsWith('.ts') && !file.endsWith('.d.ts') && !file.endsWith('.test.ts') && file !== 'index.ts') ||
-                    (file.endsWith('.js') && !file.endsWith('.d.js') && !file.endsWith('.test.js') && file !== 'index.js')) {
+                if (file.endsWith('.js') && !file.endsWith('.d.js') && !file.endsWith('.test.js') && file !== 'index.js') {
                     const filePath = path.join(siteDir, file);
-                    const entries = await loadTsManifestEntries(filePath, site);
+                    const entries = await loadManifestEntries(filePath, site);
                     for (const entry of entries) {
                         const key = `${entry.site}/${entry.name}`;
                         manifest.set(key, entry);

package/dist/src/build-manifest.test.js

@@ -3,7 +3,7 @@ import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { cli, getRegistry, Strategy } from './registry.js';
-import { loadTsManifestEntries } from './build-manifest.js';
+import { loadManifestEntries } from './build-manifest.js';
 describe('manifest helper rules', () => {
     const tempDirs = [];
     afterEach(() => {
@@ -16,7 +16,7 @@ describe('manifest helper rules', () => {
         tempDirs.push(dir);
         const file = path.join(dir, 'utils.ts');
         fs.writeFileSync(file, `export function helper() { return 'noop'; }`);
-        return expect(loadTsManifestEntries(file, 'demo', async () => ({}))).resolves.toEqual([]);
+        return expect(loadManifestEntries(file, 'demo', async () => ({}))).resolves.toEqual([]);
     });
     it('builds TS manifest entries from exported runtime commands', async () => {
         const site = `manifest-hydrate-${Date.now()}`;
@@ -25,7 +25,7 @@ describe('manifest helper rules', () => {
         tempDirs.push(dir);
         const file = path.join(dir, `${site}.ts`);
         fs.writeFileSync(file, `export const command = cli({ site: '${site}', name: 'dynamic' });`);
-        const entries = await loadTsManifestEntries(file, site, async () => ({
+        const entries = await loadManifestEntries(file, site, async () => ({
             command: cli({
                 site,
                 name: 'dynamic',
@@ -69,7 +69,7 @@ describe('manifest helper rules', () => {
                         default: '30',
                     }),
                 ],
-                type: 'ts',
+                type: 'js',
                 modulePath: `${site}/${site}.js`,
                 navigateBefore: 'https://example.com/session',
                 deprecated: 'legacy command',
@@ -87,7 +87,7 @@ describe('manifest helper rules', () => {
         tempDirs.push(dir);
         const file = path.join(dir, `${site}.ts`);
         fs.writeFileSync(file, `cli({ site: '${site}', name: 'legacy' });`);
-        const entries = await loadTsManifestEntries(file, site, async () => {
+        const entries = await loadManifestEntries(file, site, async () => {
             cli({
                 site,
                 name: 'legacy',
@@ -105,7 +105,7 @@ describe('manifest helper rules', () => {
                 strategy: 'cookie',
                 browser: true,
                 args: [],
-                type: 'ts',
+                type: 'js',
                 modulePath: `${site}/${site}.js`,
                 deprecated: 'legacy is deprecated',
                 replacedBy: 'opencli demo new',
@@ -123,7 +123,7 @@ describe('manifest helper rules', () => {
         tempDirs.push(dir);
         const file = path.join(dir, `${site}.ts`);
         fs.writeFileSync(file, `export const screen = cli({ site: '${site}', name: 'screen' });`);
-        const entries = await loadTsManifestEntries(file, site, async () => ({
+        const entries = await loadManifestEntries(file, site, async () => ({
             screen: cli({
                 site,
                 name: 'screen',

package/dist/src/capabilityRouting.d.ts

@@ -1,4 +1,4 @@
-import { type CliCommand } from './registry.js';
+import type { CliCommand } from './registry.js';
 /** Pipeline steps that require a live browser session. */
 export declare const BROWSER_ONLY_STEPS: Set<string>;
 export declare function shouldUseBrowserSession(cmd: CliCommand): boolean;

package/dist/src/capabilityRouting.js

@@ -1,4 +1,3 @@
-import { Strategy } from './registry.js';
 /** Pipeline steps that require a live browser session. */
 export const BROWSER_ONLY_STEPS = new Set([
     'navigate',
@@ -25,7 +24,10 @@ export function shouldUseBrowserSession(cmd) {
         return true;
     if (!cmd.pipeline || cmd.pipeline.length === 0)
         return true;
-    if (cmd.strategy !== Strategy.PUBLIC)
+    // normalizeCommand sets navigateBefore to a URL string (needs pre-nav) or
+    // boolean true (needs authenticated context, no specific URL). Either way
+    // the pipeline requires a browser session even if no step is browser-only.
+    if (cmd.navigateBefore)
         return true;
     return pipelineNeedsBrowserSession(cmd.pipeline);
 }

package/dist/src/capabilityRouting.test.js

@@ -25,10 +25,13 @@ describe('shouldUseBrowserSession', () => {
             pipeline: [{ navigate: 'https://example.com' }, { evaluate: '() => []' }],
         }))).toBe(true);
     });
-    it('keeps browser session for non-public strategies', () => {
+    it('keeps browser session for non-public strategies (via normalized navigateBefore)', () => {
+        // After normalizeCommand, COOKIE strategy without domain sets navigateBefore: true
+        // (signals "needs authenticated browser context" without a specific pre-nav URL).
         expect(shouldUseBrowserSession(makeCmd({
             browser: true,
             strategy: Strategy.COOKIE,
+            navigateBefore: true,
             pipeline: [{ fetch: 'https://example.com/api' }],
         }))).toBe(true);
     });