funcoding-cli 0.2.1 → 0.4.0

package/dist/commands.js

@@ -0,0 +1,238 @@
+/**
+ * 命令表和选项表：cli.ts 用它解析参数、生成每条命令的 --help，gen-skill.ts 用它生成 funcoding-cli Skill 的 references/。
+ * 命令格式参照 android CLI 和 sentry-cli：按「名词 动词」分组（cli setup、skills add、mcp list…），顶层只有 info 和 help
+ */
+import { AGENT_IDS, resolveAgents } from './agents.js';
+import { login, logout, status } from './auth.js';
+import { docsFetch, docsSearch, find, newsDaily, newsList } from './content.js';
+import { envInfo } from './info.js';
+import { install, list, remove, skillInfo, update } from './install.js';
+import { listAdd, listInfo } from './lists.js';
+import { mcpAdd, mcpInfo, mcpList, mcpRemove } from './mcp.js';
+import { setup, upgrade } from './setup.js';
+import { favorites, sync } from './sync.js';
+import { fail, setQuiet } from './ui.js';
+/** 帮助和提示里统一写全名；fun 是同一个命令的简写 */
+export const BIN = 'funcoding';
+export const OPTIONS = {
+    json: { type: 'boolean', flag: '--json', desc: '只向 stdout 输出一个 JSON 对象（给智能体用）' },
+    help: { type: 'boolean', short: 'h', flag: '-h, --help', desc: '显示这条命令的帮助' },
+    version: { type: 'boolean', short: 'V', flag: '-V, --version', desc: '显示版本' },
+    agent: { type: 'string', short: 'a', flag: '-a, --agent=<name>', desc: `目标智能体：${AGENT_IDS.join('、')}，多个用逗号分隔，all 表示本机检测到的全部（默认：当前所在的智能体，否则 claude-code）` },
+    'scope-agent': { type: 'string', short: 'a', flag: '-a, --agent=<name>', desc: `只看这些智能体：${AGENT_IDS.join('、')}，多个用逗号分隔（默认全部）` },
+    'doc-agent': { type: 'string', short: 'a', flag: '-a, --agent=<slug>', desc: '只搜这个智能体的文档，比如 claude-code、codex、gemini-cli' },
+    project: { type: 'boolean', short: 'p', flag: '-p, --project', desc: '安装到当前项目（可随仓库提交），不加时安装到用户目录' },
+    'only-project': { type: 'boolean', short: 'p', flag: '-p, --project', desc: '只看当前项目' },
+    user: { type: 'boolean', short: 'u', flag: '-u, --user', desc: '只看用户目录（默认用户目录和当前项目都看）' },
+    force: { type: 'boolean', short: 'f', flag: '-f, --force', desc: '目标已存在时覆盖（原内容先备份到配置目录）' },
+    env: { type: 'string', short: 'e', multiple: true, flag: '-e, --env=<KEY=VALUE>', desc: 'stdio Server 的环境变量，可重复' },
+    header: { type: 'string', multiple: true, flag: '--header=<KEY=VALUE>', desc: '远程 Server 的请求头，可重复' },
+    via: { type: 'string', flag: '--via=<kind>', desc: '指定启动方式：remote、npm 或 pypi' },
+    name: { type: 'string', flag: '--name=<name>', desc: '自定义配置名（默认取自 Server 名称）' },
+    'dry-run': { type: 'boolean', flag: '--dry-run', desc: '只列出将要执行的操作' },
+    check: { type: 'boolean', flag: '--check', desc: '只检查远端有没有更新，不安装' },
+    limit: { type: 'string', flag: '--limit=<n>', desc: '返回条数（1–30，默认 10）' },
+    'no-browser': { type: 'boolean', flag: '--no-browser', desc: '不自动打开浏览器' },
+    'no-global': { type: 'boolean', flag: '--no-global', desc: '不全局安装' },
+    'no-agent-skills': { type: 'boolean', flag: '--no-agent-skills', desc: '不为智能体安装 funcoding-cli Skill' },
+    quiet: { type: 'boolean', short: 'q', flag: '-q, --quiet', desc: '不输出给人看的文字（脚本里用）' },
+};
+export const GLOBAL = ['json', 'help', 'version'];
+const str = (v) => (typeof v === 'string' ? v : undefined);
+const limitOf = (v) => Math.min(30, Math.max(1, Number(str(v.limit)) || 10));
+const need = (args, what, example) => {
+    if (!args[0])
+        fail('usage', `缺少${what}`, `例如 ${example}`);
+    return args;
+};
+/** 写入类命令的目标：智能体 × 一个范围 */
+function targets(v) {
+    const agents = resolveAgents(str(v.agent));
+    if (!agents)
+        return fail('usage', `不支持的智能体：${str(v.agent)}`, `可选：${AGENT_IDS.join('、')}、all`);
+    const scope = v.project ? 'project' : 'user';
+    return agents.map((agent) => ({ agent, scope }));
+}
+/** 读取和维护类命令的范围：默认全部智能体、两个范围 */
+function selection(v) {
+    const agents = str(v.agent) ? resolveAgents(str(v.agent)) : AGENT_IDS;
+    if (!agents)
+        return fail('usage', `不支持的智能体：${str(v.agent)}`, `可选：${AGENT_IDS.join('、')}、all`);
+    const scopes = v.project && !v.user ? ['project'] : v.user && !v.project ? ['user'] : ['user', 'project'];
+    return { agents, scopes };
+}
+/** KEY=VALUE 列表转成对象 */
+function pairs(list, flag) {
+    const out = {};
+    for (const item of Array.isArray(list) ? list : []) {
+        const i = item.indexOf('=');
+        if (i <= 0)
+            fail('usage', `${flag} 格式应为 KEY=VALUE：${item}`);
+        out[item.slice(0, i)] = item.slice(i + 1);
+    }
+    return out;
+}
+export const COMMANDS = [
+    {
+        name: 'info',
+        summary: '环境信息：版本、站点、登录状态、本机的智能体和 Skill 目录、配置目录',
+        params: [['<field>', '只输出这一项，比如 version、user、agents；不写时输出全部']],
+        run: ({ args }) => envInfo(args[0]),
+    },
+    {
+        name: 'help',
+        summary: '显示帮助',
+        params: [['<command>', '要查看帮助的命令，比如 skills add']],
+    },
+    {
+        name: 'cli',
+        summary: '安装、升级本工具',
+        commands: [
+            {
+                name: 'setup',
+                summary: '全局安装本工具，并为本机的智能体安装 funcoding-cli Skill',
+                options: ['no-global', 'no-agent-skills', 'force', 'quiet'],
+                examples: ['npx --yes funcoding-cli@latest cli setup', `${BIN} cli setup --no-agent-skills`],
+                run: ({ values: v }) => {
+                    setQuiet(!!v.quiet);
+                    return setup({ global: !v['no-global'], agentSkills: !v['no-agent-skills'], force: !!v.force });
+                },
+            },
+            { name: 'upgrade', summary: '升级到最新版本，并刷新已安装的 funcoding-cli Skill', run: () => upgrade() },
+        ],
+    },
+    {
+        name: 'skills',
+        summary: '查找、安装和管理 Agent Skills',
+        commands: [
+            { name: 'find', summary: '按关键词查找 Skill', params: [['<query>', '关键词']], options: ['limit'], run: ({ args, values }) => find('skill', args.join(' '), limitOf(values)) },
+            {
+                name: 'info',
+                summary: '查看 Skill 的描述、文件清单和 SKILL.md 全文（安装前检查用）',
+                params: [['<id>', 'owner/repo/skill，或网站上的详情页地址']],
+                run: ({ args }) => skillInfo(need(args, ' Skill', `${BIN} skills info anthropics/skills/pdf`)[0]),
+            },
+            {
+                name: 'add',
+                summary: '安装一个或多个 Skill',
+                params: [['<id>...', 'owner/repo/skill，或网站上的详情页地址']],
+                options: ['agent', 'project', 'force'],
+                examples: [`${BIN} skills add anthropics/skills/pdf`, `${BIN} skills add anthropics/skills/pdf --agent=codex,cursor --project`],
+                run: ({ args, values: v }) => install(need(args, '要安装的 Skill', `${BIN} skills add anthropics/skills/pdf`), targets(v), !!v.force),
+            },
+            { name: 'list', summary: '列出已安装的 Skill', options: ['scope-agent', 'only-project', 'user'], run: ({ values }) => list(selection(values)) },
+            {
+                name: 'update',
+                summary: '按原来源重新安装由 funcoding 安装的 Skill',
+                params: [['<name>', '目录名或 Skill id；不写时更新全部']],
+                options: ['check', 'scope-agent', 'only-project', 'user'],
+                run: ({ args, values: v }) => update(args[0], selection(v), !!v.check),
+            },
+            {
+                name: 'remove',
+                summary: '删除由 funcoding 安装的 Skill（先备份）',
+                params: [['<name>...', '目录名或 Skill id']],
+                options: ['force', 'scope-agent', 'only-project', 'user'],
+                run: ({ args, values: v }) => remove(need(args, '要删除的 Skill', `${BIN} skills remove pdf`), selection(v), !!v.force),
+            },
+        ],
+    },
+    {
+        name: 'mcp',
+        summary: '查找 MCP Server，并写入各智能体的 MCP 配置',
+        commands: [
+            { name: 'find', summary: '按关键词查找 MCP Server', params: [['<query>', '关键词']], options: ['limit'], run: ({ args, values }) => find('mcp', args.join(' '), limitOf(values)) },
+            {
+                name: 'info',
+                summary: '查看启动方式，以及需要提供的环境变量或请求头',
+                params: [['<id>', 'owner/repo 或 owner/repo/sub，或网站上的详情页地址']],
+                run: ({ args }) => mcpInfo(need(args, ' MCP Server', `${BIN} mcp info github/github-mcp-server`)[0]),
+            },
+            {
+                name: 'add',
+                summary: '把 MCP Server 写入智能体的配置',
+                params: [['<id>', 'owner/repo 或 owner/repo/sub，或网站上的详情页地址']],
+                options: ['agent', 'project', 'force', 'env', 'header', 'via', 'name'],
+                examples: [`${BIN} mcp add vexa-ai/vexa --header=Authorization="Bearer <key>" --agent=cursor`],
+                run: ({ args, values: v }) => {
+                    const via = str(v.via);
+                    if (via && !['remote', 'npm', 'pypi'].includes(via))
+                        fail('usage', `--via 可选 remote、npm、pypi：${via}`);
+                    return mcpAdd(need(args, ' MCP Server', `${BIN} mcp add github/github-mcp-server`)[0], {
+                        targets: targets(v),
+                        env: pairs(v.env, '--env'),
+                        headers: pairs(v.header, '--header'),
+                        via: via,
+                        name: str(v.name),
+                        force: !!v.force,
+                    });
+                },
+            },
+            { name: 'list', summary: '列出已配置的 MCP Server', options: ['scope-agent', 'only-project', 'user'], run: ({ values }) => mcpList(selection(values)) },
+            {
+                name: 'remove',
+                summary: '删除 MCP Server 配置（先备份原文件）',
+                params: [['<name>...', '配置名，见 mcp list']],
+                options: ['scope-agent', 'only-project', 'user'],
+                run: ({ args, values }) => mcpRemove(need(args, '要删除的配置名', `${BIN} mcp remove vexa`), selection(values)),
+            },
+        ],
+    },
+    {
+        name: 'favorites',
+        summary: '网站上收藏的 Skill 和 MCP Server（需要登录）',
+        commands: [
+            { name: 'list', summary: '列出收藏', run: () => favorites() },
+            { name: 'sync', summary: '安装全部收藏，已安装的跳过', options: ['agent', 'project', 'dry-run'], run: ({ values: v }) => sync(targets(v), !!v['dry-run']) },
+        ],
+    },
+    {
+        name: 'lists',
+        summary: '别人分享的 Skill 和 MCP 清单（不需要登录）',
+        commands: [
+            {
+                name: 'info',
+                summary: '查看清单里的 Skill 和 MCP Server',
+                params: [['<link>', '清单链接（https://funcoding.ai/share/<id>/）或 id']],
+                run: ({ args }) => listInfo(need(args, '清单链接', `${BIN} lists info https://funcoding.ai/share/k3x9q2abcd/`)[0]),
+            },
+            {
+                name: 'add',
+                summary: '安装清单里的全部 Skill 和 MCP Server，已安装的跳过',
+                params: [['<link>', '清单链接（https://funcoding.ai/share/<id>/）或 id']],
+                options: ['agent', 'project', 'dry-run'],
+                run: ({ args, values: v }) => listAdd(need(args, '清单链接', `${BIN} lists add https://funcoding.ai/share/k3x9q2abcd/`)[0], targets(v), !!v['dry-run']),
+            },
+        ],
+    },
+    {
+        name: 'auth',
+        summary: '登录 funcoding.ai',
+        commands: [
+            { name: 'login', summary: '在浏览器中授权登录（设备码）', options: ['no-browser'], run: ({ values }) => login({ browser: !values['no-browser'] }) },
+            { name: 'logout', summary: '退出登录，并使登录凭证失效', run: () => logout() },
+            { name: 'status', summary: '查看当前登录的账号', run: () => status() },
+        ],
+    },
+    {
+        name: 'news',
+        summary: 'AI 热点',
+        commands: [
+            { name: 'list', summary: '当前 AI 热榜：过去 48 小时被多个来源共同报道的事件，前 10 名', options: ['limit'], run: ({ values }) => newsList(limitOf(values)) },
+            { name: 'daily', summary: '某一天的 AI 日报', params: [['<date>', 'YYYY-MM-DD；不写时为最新一期']], run: ({ args }) => newsDaily(args[0]) },
+        ],
+    },
+    {
+        name: 'docs',
+        summary: 'AI 编程智能体的中文文档',
+        commands: [
+            { name: 'search', summary: '搜索文档', params: [['<query>', '关键词']], options: ['doc-agent', 'limit'], run: ({ args, values }) => docsSearch(args.join(' '), str(values.agent)?.toLowerCase(), limitOf(values)) },
+            {
+                name: 'fetch',
+                summary: '读取文档全文（Markdown），开头附官方来源和核实日期',
+                params: [['<path>', '<智能体>/<路径>，比如 claude-code/build/hooks；也可以是网站上的文档地址']],
+                run: ({ args }) => docsFetch(need(args, '文档路径', `${BIN} docs fetch claude-code/build/hooks`)[0]),
+            },
+        ],
+    },
+];

package/dist/content.js

@@ -1,6 +1,6 @@
 /** skills find / mcp find / news / docs：只读查询网站内容 */
 import { api, siteUrl } from './api.js';
-import { bold, CliError, cyan, dim, done, fail, info, stars, truncate } from './ui.js';
+import { bold, CliError, cyan, dim, done, fail, info, next, stars, truncate } from './ui.js';
 function printCards(title, cards, hrefOf) {
     if (cards.length === 0)
         return;
@@ -17,70 +17,80 @@ function printCards(title, cards, hrefOf) {
 export async function find(kind, query, limit) {
     const cmd = kind === 'skill' ? 'skills' : 'mcp';
     if (!query)
-        fail('usage', '缺少关键词。', `例如 funcoding ${cmd} find pdf`);
+        fail('usage', '缺少关键词', `例如 funcoding ${cmd} find pdf`);
     const r = await api(`/api/cli/search?q=${encodeURIComponent(query)}&limit=${limit}`);
     const items = kind === 'skill' ? r.skills : r.mcp;
     done({ [kind === 'skill' ? 'skills' : 'servers']: items }, () => {
         if (items.length === 0)
-            return info(`没有找到「${query}」相关的${kind === 'skill' ? ' Skill' : ' MCP Server'}。`);
+            return info(`没有找到和「${query}」相关的${kind === 'skill' ? ' Skill' : ' MCP Server'}`);
         printCards(kind === 'skill' ? 'Skills' : 'MCP Server', items, (c) => `funcoding ${cmd} add ${c.id}`);
     });
 }
-function printStory(s, n) {
-    info(`${n ? `${String(n).padStart(2)}. ` : '  · '}${bold(s.title)}${dim(`  ${s.sourceCount} 家报道`)}`);
-    if (s.summary)
-        info(`    ${truncate(s.summary, (process.stdout.columns || 100) - 6)}`);
-    info(dim(`    ${s.url}`));
-}
+const width = () => (process.stdout.columns || 100) - 6;
 export async function newsDaily(date) {
     const day = date || 'latest';
     if (day !== 'latest' && !/^\d{4}-\d{2}-\d{2}$/.test(day))
-        fail('usage', `日期要写成 YYYY-MM-DD：${day}`);
+        fail('usage', `日期格式应为 YYYY-MM-DD：${day}`);
     const issue = await api(`/api/cli/news?daily=${day}`);
     done({ daily: issue }, () => {
-        info(bold(`AI 日报 · 第 ${issue.no} 期 · ${issue.day}`));
+        info(bold(`AI 日报 · ${issue.day}`));
         info(dim(issue.url));
-        info('');
-        info(bold('头条'));
-        printStory(issue.headline);
+        if (issue.lead) {
+            info('');
+            info(bold(issue.lead.title));
+            info(`  ${truncate(issue.lead.summary, width())}`);
+        }
         for (const sec of issue.sections) {
             info('');
             info(bold(sec.label));
-            for (const s of sec.stories)
-                printStory(s);
+            for (const i of sec.items) {
+                info(`  · ${bold(i.title)}${dim(`  ${i.source}`)}`);
+                if (i.summary)
+                    info(`    ${truncate(i.summary, width())}`);
+                info(dim(`    ${i.url}`));
+            }
         }
-        if (issue.flash.length > 0) {
+        if (issue.flashes.length > 0) {
             info('');
             info(bold('快讯'));
-            for (const s of issue.flash)
-                info(`  · ${s.title} ${dim(s.url)}`);
+            for (const i of issue.flashes)
+                info(`  · ${i.title} ${dim(i.url)}`);
         }
+        info('');
+        info(dim('数据来自 AIHOT（aihot.news）'));
     });
 }
 export async function newsList(limit) {
     const r = await api(`/api/cli/news?limit=${limit}`);
     done({ updatedAt: r.updatedAt, stories: r.stories }, () => {
         if (r.stories.length === 0)
-            return info('暂无热点。');
+            return info('暂无热点');
         info(bold('AI 热榜') + dim(`  ${siteUrl('/news/')}`));
-        r.stories.forEach((s, i) => printStory(s, i + 1));
+        for (const s of r.stories) {
+            info(`${String(s.rank).padStart(2)}. ${bold(s.title)}${dim(`  ${s.sourceCount} 个来源`)}`);
+            if (s.latest)
+                info(`    ${truncate(s.latest, width() - 5)}`);
+            info(dim(`    ${s.url}`));
+        }
+        info('');
+        info(dim('数据来自 AIHOT（aihot.news）'));
     });
 }
 export async function docsSearch(query, agent, limit) {
     if (!query)
-        fail('usage', '缺少搜索词。', '例如 funcoding docs search hooks --agent=claude-code');
+        fail('usage', '缺少关键词', '例如 funcoding docs search hooks --agent=claude-code');
     const params = new URLSearchParams({ q: query, limit: String(limit), ...(agent ? { agent } : {}) });
     const r = await api(`/api/cli/docs/search?${params}`);
     done({ docs: r.docs }, () => {
         if (r.docs.length === 0)
-            return info(`没有找到「${query}」相关的文档。`);
+            return info(`没有找到和「${query}」相关的文档`);
         for (const d of r.docs) {
             info(`${cyan(d.id)} ${bold(d.title)} ${dim(d.agent)}`);
             if (d.description)
                 info(`  ${truncate(d.description, (process.stdout.columns || 100) - 4)}`);
         }
         info('');
-        info(dim(`运行 ${cyan('funcoding docs fetch <id>')} 阅读全文。`));
+        next(cyan('funcoding docs fetch <id>'));
     });
 }
 export async function docsFetch(id) {
@@ -90,10 +100,10 @@ export async function docsFetch(id) {
         .replace(/^\/?agents\//, '')
         .replace(/^\/+|\/+$/g, '');
     if (!/^[a-z0-9][\w-]*(\/[\w.-]+)*$/i.test(path))
-        fail('usage', '文档要写成 <智能体>/<路径>，例如 claude-code/hooks。', '运行 funcoding docs search <关键词> 查找');
+        fail('usage', `无法识别的文档路径：${path}`, '写成 <智能体>/<路径>，例如 claude-code/build/hooks');
     const markdown = await api(`/api/cli/docs/${path}`, { headers: { Accept: 'text/markdown' } }).catch((err) => {
         if (err instanceof CliError && err.code === 'not_found')
-            fail('not_found', `没有找到文档：${path}`, '运行 funcoding docs search <关键词> 查找');
+            fail('not_found', `没有找到文档：${path}`, '运行 funcoding docs search <关键词>');
         throw err;
     });
     done({ id: path, url: siteUrl(`/agents/${path}/`), markdown }, () => info(markdown));

package/dist/info.js

@@ -2,7 +2,7 @@
 import { AGENT_IDS, AGENTS, currentAgent, installedAgents, skillsRoot } from './agents.js';
 import { SITE, VERSION } from './api.js';
 import { configDir, credentialsPath, loadCredentials } from './credentials.js';
-import { onPath } from './init.js';
+import { AGENT_SKILL, agentSkillDirs, onPath } from './setup.js';
 import { bold, dim, done, fail, info } from './ui.js';
 export async function envInfo(field) {
     const creds = await loadCredentials(SITE);
@@ -14,6 +14,8 @@ export async function envInfo(field) {
         /** 是否已全局安装（终端里能直接用 funcoding / fun） */
         global: onPath('funcoding'),
         user: creds?.user ?? null,
+        /** 已安装的 funcoding-cli Skill 目录 */
+        agentSkill: agentSkillDirs(),
         currentAgent: currentAgent(),
         agents: AGENT_IDS.map((id) => ({ id, installed: found.includes(id), skills: { user: skillsRoot(id, 'user'), project: skillsRoot(id, 'project') } })),
         configDir: configDir(),
@@ -30,11 +32,12 @@ export async function envInfo(field) {
         row('version', VERSION);
         row('site', SITE);
         row('node', process.versions.node);
-        row('global', data.global ? '已全局安装（funcoding / fun）' : '未全局安装，运行 npx --yes funcoding-cli@latest init');
+        row('global', data.global ? '已安装（funcoding、fun）' : '未安装，运行 npx --yes funcoding-cli@latest cli setup');
+        row('agentSkill', data.agentSkill.length > 0 ? data.agentSkill.join('、') : `未安装，运行 funcoding cli setup 安装 ${AGENT_SKILL}`);
         row('user', creds?.user ? `${creds.user.name}${creds.user.githubLogin ? ` (@${creds.user.githubLogin})` : ''}` : '未登录');
         row('currentAgent', data.currentAgent ? AGENTS[data.currentAgent].label : '无');
         for (const id of AGENT_IDS)
-            row(id, `${found.includes(id) ? '已安装' : dim('未检测到')}  ${dim(skillsRoot(id, 'user'))}`);
+            row(id, `${found.includes(id) ? '已检测到' : dim('未检测到')}  ${dim(skillsRoot(id, 'user'))}`);
         row('configDir', configDir());
     });
 }

package/dist/install.js

@@ -10,8 +10,8 @@ import { AGENT_IDS, AGENTS, skillsRoot } from './agents.js';
 import { api, SITE, siteUrl, USER_AGENT } from './api.js';
 import { configDir } from './credentials.js';
 import { isSafeFolderName, resolveInside } from './paths.js';
-import { builtinContent, installBuiltin } from './init.js';
-import { bold, CliError, cyan, dim, done, fail, green, info, stars, warn } from './ui.js';
+import { AGENT_SKILL, agentSkillContent, installAgentSkill } from './setup.js';
+import { bold, CliError, cyan, dim, done, fail, green, info, next, stars, step, success, warn } from './ui.js';
 /** 和服务端一致的上限 */
 const MAX_FILES = 200;
 const MAX_BYTES = 10 * 1024 * 1024;
@@ -34,7 +34,7 @@ async function download(url, maxBytes) {
     }
     const buf = new Uint8Array(await res.arrayBuffer());
     if (buf.byteLength > maxBytes)
-        throw new CliError('error', `文件太大：${url}`);
+        throw new CliError('error', `文件超过 10 MB：${url}`);
     return buf;
 }
 async function mapLimit(items, limit, fn) {
@@ -60,13 +60,13 @@ export async function moveAway(dir, agent, folder) {
 export async function fetchSkill(spec) {
     const id = parseSkillSpec(spec);
     if (!id)
-        return fail('usage', `Skill 要写成 owner/repo/skill，或者 ${SITE}/skills/ 下的详情页地址：${spec}`);
+        return fail('usage', `无法识别的 Skill：${spec}`, `写成 owner/repo/skill，或 ${SITE}/skills/ 下的详情页地址`);
     try {
         return await api(`/api/cli/skills/${id}`);
     }
     catch (err) {
         if (err instanceof CliError && err.code === 'not_found')
-            fail('not_found', `没有找到 Skill：${id}`, '运行 funcoding skills find <关键词> 查找');
+            fail('not_found', `没有找到 Skill：${id}`, '运行 funcoding skills find <关键词>');
         throw err;
     }
 }
@@ -82,7 +82,7 @@ export async function skillInfo(spec) {
         info(dim(`${s.repo.url}${s.path ? `/tree/${s.repo.branch}/${s.path}` : ''}`));
         info(dim(page));
         info('');
-        info(bold(`文件（${s.files.length}${s.truncated ? '，未列全' : ''}）`));
+        info(bold(`文件（${s.files.length} 个${s.truncated ? '，未列全' : ''}）`));
         for (const f of s.files)
             info(`  ${f.path}${scripts.includes(f.path) ? dim('  可执行脚本') : ''}`);
         info('');
@@ -96,12 +96,12 @@ async function downloadTo(skill, dir) {
     await mapLimit(skill.files, 4, async (f) => {
         const target = resolveInside(dir, f.path);
         if (!target)
-            throw new CliError('error', `拒绝写入可疑路径：${f.path}`);
+            throw new CliError('error', `已拒绝超出目标目录的路径：${f.path}`);
         const url = skill.rawBase + f.path.split('/').map(encodeURIComponent).join('/');
         const data = await download(url, MAX_BYTES);
         total += data.byteLength;
         if (total > MAX_BYTES)
-            throw new CliError('error', 'Skill 总大小超过 10 MB，请手动安装。', `仓库地址：${skill.repo.url}`);
+            throw new CliError('error', 'Skill 超过 10 MB', `从仓库手动安装：${skill.repo.url}`);
         await mkdir(dirname(target), { recursive: true });
         await writeFile(target, data);
     });
@@ -112,13 +112,13 @@ async function downloadTo(skill, dir) {
 /** 装到多个目标：只下载一次，其余目标复制 */
 export async function installSkill(skill, targets, force) {
     if (!isSafeFolderName(skill.folder))
-        fail('error', `服务端返回的目录名不合法：${skill.folder}`);
+        fail('error', `目录名不合法：${skill.folder}`);
     if (skill.files.length === 0 || !skill.files.some((f) => f.path === 'SKILL.md'))
-        fail('not_found', `${skill.id} 没有 SKILL.md，可能已被仓库删除。`);
+        fail('not_found', `${skill.id} 缺少 SKILL.md，可能已从仓库删除`);
     if (skill.files.length > MAX_FILES)
-        fail('error', `文件太多（${skill.files.length} 个），请手动安装。`, `仓库地址：${skill.repo.url}`);
+        fail('error', `文件超过 ${MAX_FILES} 个（${skill.files.length} 个）`, `从仓库手动安装：${skill.repo.url}`);
     if (skill.truncated)
-        warn(`${skill.id} 的文件太多，只会安装前一部分，缺少的请从仓库补齐。`);
+        warn(`文件过多，只安装前 ${skill.files.length} 个，其余从仓库补齐：${skill.repo.url}`);
     const plan = targets.map((t) => ({ ...t, root: skillsRoot(t.agent, t.scope), dest: join(skillsRoot(t.agent, t.scope), skill.folder) }));
     if (!force) {
         const taken = [];
@@ -126,9 +126,9 @@ export async function installSkill(skill, targets, force) {
             if (await exists(p.dest))
                 taken.push(p.dest);
         if (taken.length > 0)
-            fail('exists', `已经存在：${taken.join('、')}`, '确认要覆盖就加 --force（旧版本会备份到配置目录）', { paths: taken });
+            fail('exists', `已存在：${taken.join('、')}`, '覆盖请加 --force（会先备份）', { paths: taken });
     }
-    info(`${bold(skill.name)} ${dim(`${skill.repo.owner}/${skill.repo.name}${skill.path ? `/${skill.path}` : ''} · ${skill.files.length} 个文件`)}`);
+    step(`正在安装 ${skill.id}（${skill.files.length} 个文件）`);
     const results = [];
     let source = null;
     for (const p of plan) {
@@ -151,23 +151,18 @@ export async function installSkill(skill, targets, force) {
     }
     return results;
 }
-function printInstalled(r) {
-    const a = AGENTS[r.agent];
-    info(green(`✓ 已安装到 ${r.dir}`));
-    if (r.backup)
-        info(dim(`  旧版本备份在 ${r.backup}`));
-    info(`  在 ${a.label} 里输入 ${cyan(a.invoke(r.dir.split(/[\\/]/).pop()))} 调用，或直接描述任务让它自动选用。`);
-}
 export async function install(specs, targets, force) {
     if (specs.length === 0)
-        fail('usage', '缺少要安装的 Skill。', '例如 funcoding skills add anthropics/skills/pdf');
+        fail('usage', '缺少要安装的 Skill', '例如 funcoding skills add anthropics/skills/pdf');
     const installed = [];
     for (const spec of specs)
         installed.push(...(await installSkill(await fetchSkill(spec), targets, force)));
     done({ installed }, () => {
         for (const r of installed)
-            printInstalled(r);
-        info(dim('Skill 会按 SKILL.md 的指示行事，可能运行其中的脚本，使用前请先阅读 SKILL.md。'));
+            success(`已安装 ${r.dir.split(/[\\/]/).pop()}（${AGENTS[r.agent].label}）`, [r.dir, r.backup && `备份：${r.backup}`]);
+        warn('Skill 可能运行其中的脚本，使用前先阅读 SKILL.md');
+        const invokes = [...new Set(installed.map((r) => `${AGENTS[r.agent].label} 输入 ${cyan(AGENTS[r.agent].invoke(r.dir.split(/[\\/]/).pop()))}`))];
+        next(`新开会话，${invokes.join('，')}`);
     });
 }
 const frontmatter = (text, key) => new RegExp(`^${key}:\\s*["']?(.+?)["']?\\s*$`, 'm').exec(/^---\r?\n([\s\S]*?)\r?\n---/.exec(text)?.[1] ?? '')?.[1];
@@ -199,14 +194,16 @@ export async function scanAll(sel) {
 export async function list(sel) {
     const items = await scanAll(sel);
     done({ skills: items }, () => {
-        if (items.length === 0)
-            return info(`还没有安装 Skill。可以运行 ${cyan('funcoding skills find <关键词>')} 查找。`);
+        if (items.length === 0) {
+            info('暂无已安装的 Skill');
+            return next(cyan('funcoding skills find <关键词>'));
+        }
         for (const agent of AGENT_IDS) {
             for (const scope of sel.scopes) {
                 const group = items.filter((s) => s.agent === agent && s.scope === scope);
                 if (group.length === 0)
                     continue;
-                info(`${bold(AGENTS[agent].label)} ${dim(`${scope === 'user' ? '个人' : '项目'} · ${skillsRoot(agent, scope)}`)}`);
+                info(`${bold(AGENTS[agent].label)} ${dim(`${scope === 'user' ? '用户目录' : '当前项目'}  ${skillsRoot(agent, scope)}`)}`);
                 for (const s of group)
                     info(`  ${s.folder}${s.source ? dim(`  ← ${s.source.id}`) : ''}`);
                 info('');
@@ -215,12 +212,13 @@ export async function list(sel) {
     });
 }
 // ---------------- update ----------------
-const matches = (s, name) => !name || s.folder === name || s.source?.id === name.toLowerCase();
+// 旧版本的 funcoding Skill 也按 funcoding-cli 匹配，刷新时换成新版
+const matches = (s, name) => !name || s.folder === name || s.source?.id === name.toLowerCase() || (!!s.source?.builtin && name === AGENT_SKILL);
 /** 按 .funcoding.json 记录的来源重新安装；check 时只比较远端 SKILL.md 有没有变化 */
 export async function update(name, sel, check) {
     const items = (await scanAll(sel)).filter((s) => s.source && matches(s, name));
     if (items.length === 0)
-        fail('not_found', name ? `没有找到由 funcoding 安装的 ${name}` : '没有由 funcoding 安装的 Skill', '运行 funcoding skills list 查看已安装的 Skill');
+        fail('not_found', name ? `没有找到由 funcoding 安装的 ${name}` : '暂无由 funcoding 安装的 Skill', '运行 funcoding skills list');
     const results = [];
     const cache = new Map();
     for (const s of items) {
@@ -228,10 +226,10 @@ export async function update(name, sel, check) {
         if (s.source.builtin) {
             const local = await readFile(join(s.dir, 'SKILL.md'), 'utf8').catch(() => null);
             if (check)
-                results.push({ id, agent: s.agent, scope: s.scope, dir: s.dir, status: local === (await builtinContent()) ? 'up_to_date' : 'outdated' });
+                results.push({ id: AGENT_SKILL, agent: s.agent, scope: s.scope, dir: s.dir, status: local === (await agentSkillContent()) ? 'up_to_date' : 'outdated' });
             else {
-                await installBuiltin([{ agent: s.agent, scope: s.scope }], true);
-                results.push({ id, agent: s.agent, scope: s.scope, dir: s.dir, status: 'updated' });
+                const [r] = await installAgentSkill([{ agent: s.agent, scope: s.scope }], true);
+                results.push({ id: AGENT_SKILL, agent: s.agent, scope: s.scope, dir: r.dir, status: 'updated' });
             }
             continue;
         }
@@ -250,29 +248,29 @@ export async function update(name, sel, check) {
     done({ skills: results }, () => {
         const label = { updated: green('已更新'), up_to_date: dim('已是最新'), outdated: cyan('有更新'), unknown: dim('无法比较') };
         for (const r of results)
-            info(`${label[r.status]}  ${r.id} ${dim(r.dir)}`);
+            info(`${label[r.status]}  ${r.id}  ${dim(r.dir)}`);
         if (check && results.some((r) => r.status === 'outdated'))
-            info(dim(`运行 ${cyan('funcoding skills update')} 更新。`));
+            next(cyan('funcoding skills update'));
     });
 }
 // ---------------- remove ----------------
 export async function remove(names, sel, force) {
     if (names.length === 0)
-        fail('usage', '缺少要删除的 Skill。', '运行 funcoding skills list 查看已安装的 Skill');
+        fail('usage', '缺少要删除的 Skill', '运行 funcoding skills list');
     const all = await scanAll(sel);
     const removed = [];
     for (const name of names) {
         const found = all.filter((s) => s.folder === name || s.source?.id === name.toLowerCase());
         if (found.length === 0)
-            fail('not_found', `没有找到已安装的 ${name}`, '运行 funcoding skills list 查看已安装的 Skill');
+            fail('not_found', `没有找到已安装的 ${name}`, '运行 funcoding skills list');
         const manual = found.filter((s) => !s.source);
         if (manual.length > 0 && !force)
-            fail('usage', `${manual.map((s) => s.dir).join('、')} 不是由 funcoding 安装的。`, '确认要删除就加 --force（会先备份到配置目录）', { paths: manual.map((s) => s.dir) });
+            fail('usage', `不是由 funcoding 安装的：${manual.map((s) => s.dir).join('、')}`, '删除请加 --force（会先备份）', { paths: manual.map((s) => s.dir) });
         for (const s of found)
             removed.push({ id: s.source?.id ?? null, agent: s.agent, scope: s.scope, dir: s.dir, backup: await moveAway(s.dir, s.agent, s.folder) });
     }
     done({ removed }, () => {
         for (const r of removed)
-            info(`${green('✓ 已删除')} ${r.dir} ${dim(`（备份在 ${r.backup}）`)}`);
+            success(`已删除 ${r.dir.split(/[\\/]/).pop()}（${AGENTS[r.agent].label}）`, [r.dir, `备份：${r.backup}`]);
     });
 }