@jackwener/opencli 1.7.7 → 1.7.9

package/clis/weixin/drafts.js

@@ -0,0 +1,65 @@
+import { AuthRequiredError, EmptyResultError } from '@jackwener/opencli/errors';
+import { cli, Strategy } from '@jackwener/opencli/registry';
+
+const WEIXIN_DOMAIN = 'mp.weixin.qq.com';
+
+export const draftsCommand = cli({
+    site: 'weixin',
+    name: 'drafts',
+    description: '列出微信公众号草稿箱',
+    domain: WEIXIN_DOMAIN,
+    strategy: Strategy.COOKIE,
+    browser: true,
+    navigateBefore: false,
+    timeoutSeconds: 60,
+    args: [
+        { name: 'limit', type: 'int', default: 10, help: '最多显示条数' },
+    ],
+    columns: ['Index', 'Title', 'Time'],
+
+    func: async (page, kwargs) => {
+        await page.goto('https://mp.weixin.qq.com/');
+        await page.wait(3);
+        const token = await page.evaluate(`(window.location.href.match(/token=(\\d+)/)||[])[1]`);
+        if (!token) {
+            throw new AuthRequiredError(WEIXIN_DOMAIN, '微信公众号草稿箱需要已登录的 mp.weixin.qq.com 会话');
+        }
+
+        await page.goto(`https://mp.weixin.qq.com/cgi-bin/appmsg?begin=0&count=${kwargs.limit}&type=77&action=list_card&token=${token}&lang=zh_CN`);
+        await page.wait(4);
+
+        const drafts = await page.evaluate(`(() => {
+            var results = [];
+            var idx = 0;
+
+            var cards = document.querySelectorAll('.weui-desktop-card');
+            for (var i = 0; i < cards.length; i++) {
+                if (cards[i].className.includes('card_new')) continue;
+                var titleEl = cards[i].querySelector('[class*=title]');
+                var timeEl = cards[i].querySelector('[class*=tips]');
+                var title = titleEl ? titleEl.textContent.trim() : '';
+                var time = timeEl ? timeEl.textContent.trim().replace(/\\s+/g, ' ') : '';
+                if (title) results.push({ Index: ++idx, Title: title, Time: time });
+            }
+            if (results.length > 0) return results;
+
+            var rows = document.querySelectorAll('tr, [class*=appmsg_item], [class*=list_item]');
+            rows.forEach(function(row) {
+                var titleEl = row.querySelector('[class*=title] a, [class*=title], h4');
+                var timeEl = row.querySelector('[class*=time], td:nth-child(2)');
+                var title = titleEl ? titleEl.textContent.trim() : '';
+                var time = timeEl ? timeEl.textContent.trim() : '';
+                if (title && title !== '内容' && title.length < 80) {
+                    results.push({ Index: ++idx, Title: title, Time: time });
+                }
+            });
+            return results;
+        })()`);
+
+        if (!drafts || drafts.length === 0) {
+            throw new EmptyResultError('weixin drafts', 'No structured drafts found in the current Weixin Official Account backend');
+        }
+
+        return drafts.slice(0, kwargs.limit);
+    },
+});

package/clis/weixin/drafts.test.js

@@ -0,0 +1,65 @@
+import { describe, expect, it, vi } from 'vitest';
+import { AuthRequiredError, EmptyResultError } from '@jackwener/opencli/errors';
+import { getRegistry } from '@jackwener/opencli/registry';
+import './create-draft.js';
+import './drafts.js';
+
+function createPageMock(overrides = {}) {
+    return {
+        goto: vi.fn().mockResolvedValue(undefined),
+        wait: vi.fn().mockResolvedValue(undefined),
+        evaluate: overrides.evaluate ?? vi.fn().mockResolvedValue(undefined),
+        setFileInput: vi.fn().mockResolvedValue(undefined),
+    };
+}
+
+describe('weixin command registration', () => {
+    it('registers create-draft and drafts commands', () => {
+        const registry = getRegistry();
+        const values = [...registry.values()];
+        expect(values.find(c => c.site === 'weixin' && c.name === 'create-draft')).toBeDefined();
+        expect(values.find(c => c.site === 'weixin' && c.name === 'drafts')).toBeDefined();
+    });
+});
+
+describe('weixin drafts command', () => {
+    it('throws AuthRequiredError when no session token is available', async () => {
+        const command = getRegistry().get('weixin/drafts');
+        const page = createPageMock({
+            evaluate: vi.fn().mockResolvedValueOnce(undefined),
+        });
+
+        await expect(command.func(page, { limit: 10 })).rejects.toBeInstanceOf(AuthRequiredError);
+    });
+
+    it('fails instead of scraping arbitrary body text when structured selectors miss', async () => {
+        const command = getRegistry().get('weixin/drafts');
+        const evaluate = vi.fn()
+            .mockResolvedValueOnce('123456')
+            .mockImplementationOnce(async (script) => {
+                expect(script).not.toContain('document.body.innerText');
+                return [];
+            });
+        const page = createPageMock({ evaluate });
+
+        await expect(command.func(page, { limit: 10 })).rejects.toBeInstanceOf(EmptyResultError);
+    });
+
+    it('returns structured drafts and respects the requested limit', async () => {
+        const command = getRegistry().get('weixin/drafts');
+        const page = createPageMock({
+            evaluate: vi.fn()
+                .mockResolvedValueOnce('123456')
+                .mockResolvedValueOnce([
+                    { Index: 1, Title: '第一篇草稿', Time: '2026-04-24 10:00' },
+                    { Index: 2, Title: '第二篇草稿', Time: '2026-04-24 11:00' },
+                ]),
+        });
+
+        const result = await command.func(page, { limit: 1 });
+
+        expect(result).toEqual([
+            { Index: 1, Title: '第一篇草稿', Time: '2026-04-24 10:00' },
+        ]);
+    });
+});

package/clis/weread/ranking.js

@@ -12,7 +12,7 @@ cli({
         { name: 'limit', type: 'int', default: 20, help: 'Max results' },
     ],
     columns: ['rank', 'title', 'author', 'category', 'readingCount', 'bookId'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const cat = encodeURIComponent(args.category ?? 'all');
         const data = await fetchWebApi(`/bookListInCategory/${cat}`, { rank: '1' });
         const books = data?.books ?? [];

package/clis/weread/search-regression.test.js

@@ -35,7 +35,7 @@ describe('weread/search regression', () => {
         `),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: 'deep work', limit: 5 });
+        const result = await command.func({ query: 'deep work', limit: 5 });
         expect(fetchMock).toHaveBeenCalledTimes(2);
         expect(String(fetchMock.mock.calls[0][0])).toContain('keyword=deep+work');
         expect(String(fetchMock.mock.calls[1][0])).toContain('/web/search/books?keyword=deep+work');
@@ -72,7 +72,7 @@ describe('weread/search regression', () => {
             text: () => Promise.resolve('<html><body><p>no search cards</p></body></html>'),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: 'deep work', limit: 5 });
+        const result = await command.func({ query: 'deep work', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,
@@ -128,7 +128,7 @@ describe('weread/search regression', () => {
         `),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: 'cal newport', limit: 5 });
+        const result = await command.func({ query: 'cal newport', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,
@@ -166,7 +166,7 @@ describe('weread/search regression', () => {
         })
             .mockRejectedValueOnce(new Error('network timeout'));
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: 'deep work', limit: 5 });
+        const result = await command.func({ query: 'deep work', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,
@@ -220,7 +220,7 @@ describe('weread/search regression', () => {
         `),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: '文明', limit: 5 });
+        const result = await command.func({ query: '文明', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,
@@ -279,7 +279,7 @@ describe('weread/search regression', () => {
         `),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: '文明', limit: 5 });
+        const result = await command.func({ query: '文明', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,
@@ -332,7 +332,7 @@ describe('weread/search regression', () => {
         `),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: '文明', limit: 5 });
+        const result = await command.func({ query: '文明', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,
@@ -386,7 +386,7 @@ describe('weread/search regression', () => {
         `),
         });
         vi.stubGlobal('fetch', fetchMock);
-        const result = await command.func(null, { query: '文明', limit: 5 });
+        const result = await command.func({ query: '文明', limit: 5 });
         expect(result).toEqual([
             {
                 rank: 1,

package/clis/weread/search.js

@@ -124,7 +124,7 @@ cli({
         { name: 'limit', type: 'int', default: 10, help: 'Max results' },
     ],
     columns: ['rank', 'title', 'author', 'bookId', 'url'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const [data, htmlEntries] = await Promise.all([
             fetchWebApi('/search/global', { keyword: args.query }),
             loadSearchHtmlEntries(String(args.query ?? '')),

package/clis/wikipedia/random.js

@@ -9,7 +9,7 @@ cli({
     browser: false,
     args: [{ name: 'lang', default: 'en', help: 'Language code (e.g. en, zh, ja)' }],
     columns: ['title', 'description', 'extract', 'url'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const lang = args.lang || 'en';
         const data = (await wikiFetch(lang, '/api/rest_v1/page/random/summary'));
         if (!data?.title)

package/clis/wikipedia/search.js

@@ -13,7 +13,7 @@ cli({
         { name: 'lang', default: 'en', help: 'Language code (e.g. en, zh, ja)' },
     ],
     columns: ['title', 'snippet', 'url'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const limit = Math.max(1, Math.min(Number(args.limit), 50));
         const lang = args.lang || 'en';
         const q = encodeURIComponent(args.query);

package/clis/wikipedia/summary.js

@@ -12,7 +12,7 @@ cli({
         { name: 'lang', default: 'en', help: 'Language code (e.g. en, zh, ja)' },
     ],
     columns: ['title', 'description', 'extract', 'url'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const lang = args.lang || 'en';
         const title = encodeURIComponent(args.title.replace(/ /g, '_'));
         const data = (await wikiFetch(lang, `/api/rest_v1/page/summary/${title}`));

package/clis/wikipedia/trending.js

@@ -12,7 +12,7 @@ cli({
         { name: 'lang', default: 'en', help: 'Language code (e.g. en, zh, ja)' },
     ],
     columns: ['rank', 'title', 'description', 'views'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const lang = args.lang || 'en';
         const limit = Math.max(1, Math.min(Number(args.limit), 50));
         // Use yesterday's UTC date — Wikipedia API expects UTC and yesterday

package/clis/xianyu/chat.js

@@ -1,4 +1,4 @@
-import { AuthRequiredError, SelectorError } from '@jackwener/opencli/errors';
+import { AuthRequiredError, selectorError } from '@jackwener/opencli/errors';
 import { cli, Strategy } from '@jackwener/opencli/registry';
 import { normalizeNumericId } from './utils.js';
 function buildChatUrl(itemId, peerUserId) {
@@ -105,7 +105,7 @@ cli({
             throw new AuthRequiredError('www.goofish.com', 'Xianyu chat requires a logged-in browser session');
         }
         if (!state?.can_input) {
-            throw new SelectorError('闲鱼聊天输入框', '未找到可用的聊天输入框，请确认该会话页已正确加载');
+            throw selectorError('闲鱼聊天输入框', '未找到可用的聊天输入框，请确认该会话页已正确加载');
         }
         if (!text) {
             return [{
@@ -123,7 +123,7 @@ cli({
         }
         const sent = await page.evaluate(buildSendMessageEvaluate(text));
         if (!sent?.ok) {
-            throw new SelectorError('闲鱼发送按钮', `消息发送失败：${sent?.reason || 'unknown-reason'}`);
+            throw selectorError('闲鱼发送按钮', `消息发送失败：${sent?.reason || 'unknown-reason'}`);
         }
         await page.wait(1);
         return [{

package/clis/xianyu/item.js

@@ -1,4 +1,4 @@
-import { AuthRequiredError, EmptyResultError, SelectorError } from '@jackwener/opencli/errors';
+import { AuthRequiredError, EmptyResultError, selectorError } from '@jackwener/opencli/errors';
 import { cli, Strategy } from '@jackwener/opencli/registry';
 import { normalizeNumericId } from './utils.js';
 function buildItemUrl(itemId) {
@@ -127,7 +127,7 @@ cli({
             throw new EmptyResultError('xianyu item', 'Xianyu item detail is blocked by verification or risk control');
         }
         if (result?.error === 'mtop-not-ready') {
-            throw new SelectorError('window.lib.mtop', '闲鱼页面未完成初始化，无法调用商品详情接口');
+            throw selectorError('window.lib.mtop', '闲鱼页面未完成初始化，无法调用商品详情接口');
         }
         if (!result || typeof result !== 'object') {
             throw new EmptyResultError('xianyu item', '闲鱼商品详情接口未返回有效数据');

package/clis/xianyu/item.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
-import { AuthRequiredError, EmptyResultError, SelectorError } from '@jackwener/opencli/errors';
+import { AuthRequiredError, EmptyResultError } from '@jackwener/opencli/errors';
 import { getRegistry } from '@jackwener/opencli/registry';
 import { __test__ } from './item.js';
 import './item.js';
@@ -49,8 +49,8 @@ describe('xianyu item command', () => {
         const page = createPageMock({ error: 'blocked' });
         await expect(command.func(page, { item_id: '1040754408976' })).rejects.toBeInstanceOf(EmptyResultError);
     });
-    it('keeps SelectorError for true mtop initialization failures', async () => {
+    it('keeps SELECTOR code for true mtop initialization failures', async () => {
         const page = createPageMock({ error: 'mtop-not-ready' });
-        await expect(command.func(page, { item_id: '1040754408976' })).rejects.toBeInstanceOf(SelectorError);
+        await expect(command.func(page, { item_id: '1040754408976' })).rejects.toMatchObject({ code: 'SELECTOR' });
     });
 });

package/clis/xiaohongshu/search.js

@@ -47,6 +47,11 @@ export function noteIdToDate(url) {
     // Offset by UTC+8 (China Standard Time) so the date matches what XHS users see
     return new Date((ts + 8 * 3600) * 1000).toISOString().slice(0, 10);
 }
+export function stripXhsAuthorDateSuffix(value) {
+    const text = (value || '').replace(/\s+/g, ' ').trim();
+    const stripped = text.replace(/\s*(?:\d{1,2}天前|\d+小时前|\d+分钟前|\d+秒前|刚刚|昨天|前天|\d+周前|\d+个月前|\d{1,2}-\d{1,2}|\d{4}-\d{1,2}-\d{1,2})$/u, '').trim();
+    return stripped || text;
+}
 cli({
     site: 'xiaohongshu',
     name: 'search',
@@ -81,6 +86,7 @@ cli({
         };
 
         const cleanText = (value) => (value || '').replace(/\\s+/g, ' ').trim();
+        const stripXhsAuthorDateSuffix = ${stripXhsAuthorDateSuffix.toString()};
 
         const results = [];
         const seen = new Set();
@@ -90,7 +96,13 @@ cli({
           if (el.classList.contains('query-note-item')) return;
 
           const titleEl = el.querySelector('.title, .note-title, a.title, .footer .title span');
-          const nameEl = el.querySelector('a.author .name, .name, .author-name, .nick-name, a.author');
+          const nameEl = el.querySelector('a.author .name, .author-name, .nick-name, .name');
+          const authorWrapEl = el.querySelector('a.author');
+          let author = cleanText(nameEl?.textContent || '');
+          if (!author && authorWrapEl) {
+            const nameChild = authorWrapEl.querySelector('.name');
+            author = nameChild ? cleanText(nameChild.textContent || '') : stripXhsAuthorDateSuffix(authorWrapEl.textContent || '');
+          }
           const likesEl = el.querySelector('.count, .like-count, .like-wrapper .count');
           // Prefer search_result link (preserves xsec_token) over generic /explore/ link
           const detailLinkEl =
@@ -109,7 +121,7 @@ cli({
 
           results.push({
             title: cleanText(titleEl?.textContent || ''),
-            author: cleanText(nameEl?.textContent || ''),
+            author,
             likes: cleanText(likesEl?.textContent || '0'),
             url,
             author_url: normalizeUrl(authorLinkEl?.getAttribute('href') || ''),
@@ -130,3 +142,6 @@ cli({
         }));
     },
 });
+export const __test__ = {
+    stripXhsAuthorDateSuffix,
+};

package/clis/xiaohongshu/search.test.js

@@ -1,6 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 import { getRegistry } from '@jackwener/opencli/registry';
-import { noteIdToDate } from './search.js';
+import { JSDOM } from 'jsdom';
+import { __test__, noteIdToDate } from './search.js';
 function createPageMock(evaluateResults) {
     const evaluate = vi.fn();
     for (const result of evaluateResults) {
@@ -127,6 +128,41 @@ describe('xiaohongshu search', () => {
         // Two evaluate calls: wait + extraction
         expect(page.evaluate).toHaveBeenCalledTimes(2);
     });
+    it('separates fallback author text from appended relative date', async () => {
+        const cmd = getRegistry().get('xiaohongshu/search');
+        expect(cmd?.func).toBeTypeOf('function');
+        const dom = new JSDOM(`
+          <section class="note-item">
+            <a class="cover mask" href="/search_result/68e90be80000000004022e66?xsec_token=test-token"></a>
+            <div class="title">数字作者测试</div>
+            <a class="author" href="/user/profile/author123">
+              <span>数字3天前端</span><span>3天前</span>
+            </a>
+            <span class="count">8</span>
+          </section>
+        `, { url: 'https://www.xiaohongshu.com/search_result?keyword=test' });
+        const page = createPageMock([]);
+        page.evaluate.mockImplementationOnce(async () => 'content');
+        page.evaluate.mockImplementationOnce(async (script) => Function('document', `return (${script})`)(dom.window.document));
+
+        const result = await cmd.func(page, { query: '测试', limit: 1 });
+
+        expect(result[0]).toMatchObject({
+            title: '数字作者测试',
+            author: '数字3天前端',
+            likes: '8',
+            author_url: 'https://www.xiaohongshu.com/user/profile/author123',
+        });
+    });
+});
+describe('stripXhsAuthorDateSuffix', () => {
+    it('only strips trailing date suffixes and preserves date-like author text', () => {
+        expect(__test__.stripXhsAuthorDateSuffix('作者名 3天前')).toBe('作者名');
+        expect(__test__.stripXhsAuthorDateSuffix('作者名2026-04-01')).toBe('作者名');
+        expect(__test__.stripXhsAuthorDateSuffix('3天前端工程师')).toBe('3天前端工程师');
+        expect(__test__.stripXhsAuthorDateSuffix('刚刚好')).toBe('刚刚好');
+        expect(__test__.stripXhsAuthorDateSuffix('刚刚')).toBe('刚刚');
+    });
 });
 describe('noteIdToDate (ObjectID timestamp parsing)', () => {
     it('parses a known note ID to the correct China-timezone date', () => {

package/clis/xiaoyuzhou/download.js

@@ -18,7 +18,7 @@ cli({
         { name: 'output', default: './xiaoyuzhou-downloads', help: 'Output directory' },
     ],
     columns: ['title', 'podcast', 'status', 'size', 'file'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const credentials = loadXiaoyuzhouCredentials();
         const response = await requestXiaoyuzhouJson('/v1/episode/get', {
             query: { eid: args.id },

package/clis/xiaoyuzhou/download.test.js

@@ -68,7 +68,7 @@ describe('xiaoyuzhou download', () => {
         });
         mockHttpDownload.mockResolvedValue({ success: true, size: 1234 });
 
-        const result = await cmd.func(null, {
+        const result = await cmd.func({
             id: 'ep123',
             output: '/tmp/xiaoyuzhou-test',
         });
@@ -106,7 +106,7 @@ describe('xiaoyuzhou download', () => {
         });
         mockHttpDownload.mockResolvedValue({ success: true, size: 2048 });
 
-        const result = await cmd.func(null, {
+        const result = await cmd.func({
             id: 'ep456',
             output: '/tmp/xiaoyuzhou-test',
         });
@@ -125,7 +125,7 @@ describe('xiaoyuzhou download', () => {
             },
         });
 
-        await expect(cmd.func(null, { id: 'ep789', output: '/tmp/xiaoyuzhou-test' })).rejects.toMatchObject({
+        await expect(cmd.func({ id: 'ep789', output: '/tmp/xiaoyuzhou-test' })).rejects.toMatchObject({
             code: 'PARSE_ERROR',
             message: 'Audio URL not found in episode payload',
             hint: 'Episode payload does not expose media.source.url',

package/clis/xiaoyuzhou/episode.js

@@ -11,7 +11,7 @@ cli({
     browser: false,
     args: [{ name: 'id', positional: true, required: true, help: 'Episode ID (eid from podcast-episodes output)' }],
     columns: ['title', 'podcast', 'duration', 'plays', 'comments', 'likes', 'date'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const credentials = loadXiaoyuzhouCredentials();
         const response = await requestXiaoyuzhouJson('/v1/episode/get', {
             query: { eid: args.id },

package/clis/xiaoyuzhou/podcast-episodes.js

@@ -14,7 +14,7 @@ cli({
         { name: 'limit', type: 'int', default: 20, help: 'Max episodes to show' },
     ],
     columns: ['eid', 'title', 'duration', 'plays', 'date'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const requestedLimit = Number(args.limit);
         if (!Number.isInteger(requestedLimit) || requestedLimit < 1) {
             throw new CliError('INVALID_ARGUMENT', 'limit must be a positive integer', 'Example: --limit 5');

package/clis/xiaoyuzhou/podcast-episodes.test.js

@@ -44,7 +44,7 @@ describe('xiaoyuzhou podcast-episodes', () => {
             ],
         });
 
-        const result = await cmd.func(null, {
+        const result = await cmd.func({
             id: 'podcast-1',
             limit: 3,
         });
@@ -66,7 +66,7 @@ describe('xiaoyuzhou podcast-episodes', () => {
     });
 
     it('rejects non-positive limits before hitting the API', async () => {
-        await expect(cmd.func(null, {
+        await expect(cmd.func({
             id: 'podcast-1',
             limit: 0,
         })).rejects.toMatchObject({

package/clis/xiaoyuzhou/podcast.js

@@ -11,7 +11,7 @@ cli({
     browser: false,
     args: [{ name: 'id', positional: true, required: true, help: 'Podcast ID (from xiaoyuzhoufm.com URL)' }],
     columns: ['title', 'author', 'description', 'subscribers', 'episodes', 'updated'],
-    func: async (_page, args) => {
+    func: async (args) => {
         const credentials = loadXiaoyuzhouCredentials();
         const response = await requestXiaoyuzhouJson('/v1/podcast/get', {
             query: { pid: args.id },

package/clis/xiaoyuzhou/transcript.js

@@ -18,7 +18,7 @@ cli({
         { name: 'text', type: 'boolean', default: true, help: 'Save extracted transcript text file' },
     ],
     columns: ['title', 'podcast', 'status', 'segments', 'json_file', 'text_file'],
-    func: async (_page, kwargs) => {
+    func: async (kwargs) => {
         if (kwargs.json === false && kwargs.text === false) {
             throw new ArgumentError('At least one of --json or --text must be enabled', 'Example: opencli xiaoyuzhou transcript 69dd0c98e2c8be31551f6a33 --text true');
         }

package/clis/xiaoyuzhou/transcript.test.js

@@ -67,7 +67,7 @@ describe('xiaoyuzhou transcript', () => {
         mockFetchTranscriptBody.mockResolvedValue(JSON.stringify({
             segments: [{ text: 'hello' }, { text: 'world' }],
         }));
-        const result = await cmd.func(null, {
+        const result = await cmd.func({
             id: 'ep123',
             output: '/tmp/xiaoyuzhou-transcripts',
             json: true,
@@ -112,7 +112,7 @@ describe('xiaoyuzhou transcript', () => {
             },
         });
         mockFetchTranscriptBody.mockResolvedValue(JSON.stringify({ text: 'hello' }));
-        await cmd.func(null, {
+        await cmd.func({
             id: 'ep456',
             output: '/tmp/xiaoyuzhou-transcripts',
             json: false,
@@ -137,7 +137,7 @@ describe('xiaoyuzhou transcript', () => {
             credentials: { access_token: 'access-1', refresh_token: 'refresh-1' },
             data: {},
         });
-        await expect(cmd.func(null, {
+        await expect(cmd.func({
             id: 'ep123',
             output: '/tmp/xiaoyuzhou-transcripts',
             json: true,
@@ -168,7 +168,7 @@ describe('xiaoyuzhou transcript', () => {
         mockFetchTranscriptBody.mockResolvedValue(JSON.stringify({
             segments: [{ startAt: 0, endAt: 1 }],
         }));
-        await expect(cmd.func(null, {
+        await expect(cmd.func({
             id: 'ep123',
             output: '/tmp/xiaoyuzhou-transcripts',
             json: true,
@@ -181,7 +181,7 @@ describe('xiaoyuzhou transcript', () => {
     });
 
     it('rejects disabling both json and text outputs', async () => {
-        await expect(cmd.func(null, {
+        await expect(cmd.func({
             id: 'ep123',
             output: '/tmp/xiaoyuzhou-transcripts',
             json: false,

package/clis/yollomi/models.js

@@ -10,7 +10,7 @@ cli({
         { name: 'type', default: 'all', choices: ['all', 'image', 'video', 'tool'], help: 'Filter by model type' },
     ],
     columns: ['type', 'model', 'credits', 'description'],
-    func: async (_page, kwargs) => {
+    func: async (kwargs) => {
         const filter = kwargs.type;
         const rows = [];
         if (filter === 'all' || filter === 'image') {

package/clis/youtube/channel.js

@@ -3,6 +3,21 @@
  */
 import { cli, Strategy } from '@jackwener/opencli/registry';
 import { CommandExecutionError } from '@jackwener/opencli/errors';
+
+export function extractSelectedRichGridContents(browseData) {
+    const tabs = browseData?.contents?.twoColumnBrowseResultsRenderer?.tabs || [];
+    const readRichGrid = (tab) => tab?.tabRenderer?.content?.richGridRenderer?.contents;
+    const selectedTab = tabs.find(t => t?.tabRenderer?.selected);
+    const selectedContents = readRichGrid(selectedTab);
+    if (Array.isArray(selectedContents))
+        return selectedContents;
+    const fallbackContents = readRichGrid(tabs.find(t => {
+        const contents = readRichGrid(t);
+        return Array.isArray(contents) && contents.length > 0;
+    })) || readRichGrid(tabs.find(t => Array.isArray(readRichGrid(t))));
+    return Array.isArray(fallbackContents) ? fallbackContents : [];
+}
+
 cli({
     site: 'youtube',
     name: 'channel',
@@ -27,6 +42,7 @@ cli({
         const apiKey = cfg.INNERTUBE_API_KEY;
         const context = cfg.INNERTUBE_CONTEXT;
         if (!apiKey || !context) return {error: 'YouTube config not found'};
+        const extractSelectedRichGridContents = ${extractSelectedRichGridContents.toString()};
 
         // Resolve handle to browseId if needed
         let browseId = channelId;
@@ -133,7 +149,10 @@ cli({
             });
             if (videosResp.ok) {
               const videosData = await videosResp.json();
-              const richGrid = videosData.contents?.twoColumnBrowseResultsRenderer?.tabs?.[0]?.tabRenderer?.content?.richGridRenderer?.contents || [];
+              // The InnerTube response includes ALL tabs (Home/Videos/Shorts/...),
+              // not just the requested one. Prefer the selected tab, but keep
+              // older single-tab responses working when YouTube omits selected.
+              const richGrid = extractSelectedRichGridContents(videosData);
               for (const item of richGrid) {
                 if (recentVideos.length >= limit) break;
                 const v = item.richItemRenderer?.content?.videoRenderer;
@@ -183,3 +202,7 @@ cli({
         return rows;
     },
 });
+
+export const __test__ = {
+    extractSelectedRichGridContents,
+};