agentskillscanner 0.1.2 → 0.2.1

package/README.md

@@ -6,14 +6,24 @@
 
 ## English
 
-Scan and report all available skills for AI coding assistants (Claude Code).
-
-Scans across four levels:
-
-1. **User** — `~/.claude/skills/*/SKILL.md`
-2. **Project** — `<project>/.claude/skills/*/SKILL.md`
-3. **Plugin** — `installed_plugins.json` + each plugin directory
-4. **Enterprise** — `/Library/Application Support/ClaudeCode/`
+Scan and report all available skills for AI coding assistants — supports **Claude Code**, **OpenAI Codex CLI**, **Gemini CLI**, and **GitHub Copilot CLI**.
+
+### Supported Tools & Scan Paths
+
+| Tool | Level | Path |
+|------|-------|------|
+| Claude Code | User | `~/.claude/skills/*/SKILL.md` |
+| Claude Code | Project | `<project>/.claude/skills/*/SKILL.md` |
+| Claude Code | Plugin | `installed_plugins.json` + each plugin directory |
+| Claude Code | Enterprise | `/Library/Application Support/ClaudeCode/` |
+| Codex CLI | User | `~/.codex/skills/*/SKILL.md` |
+| Codex CLI | Project | `<repoRoot>/.agents/skills/*/SKILL.md` |
+| Codex CLI | Enterprise | `/etc/codex/skills/*/SKILL.md` |
+| Gemini CLI | User | `~/.gemini/skills/*/SKILL.md` |
+| Gemini CLI | Project | `<project>/.gemini/skills/*/SKILL.md` |
+| Gemini CLI | Plugin | `~/.gemini/extensions/*/gemini-extension.json` |
+| Copilot CLI | User | `~/.copilot/mcp-config.json` (MCP servers) |
+| Copilot CLI | Project | `<project>/.github/copilot-instructions.md` |
 
 ### Installation & Usage
 
@@ -32,6 +42,7 @@ agentskillscanner
 -j, --json              Output in JSON format
 -d, --project-dir DIR   Project directory (default: current working directory)
 -l, --level LEVELS      Filter levels (comma-separated: user,project,plugin,enterprise)
+-t, --tool TOOLS        Filter tools (comma-separated: claude-code,codex,gemini,copilot)
 -v, --verbose           Show full descriptions and paths
 -h, --help              Show help
 ```
@@ -39,12 +50,24 @@ agentskillscanner
 ### Examples
 
 ```bash
-# Scan all levels (default)
+# Scan all tools (default)
 agentskillscanner
 
-# JSON output
+# Only scan Claude Code
+agentskillscanner --tool claude-code
+
+# Only scan Codex CLI
+agentskillscanner --tool codex
+
+# Scan multiple tools
+agentskillscanner --tool codex,gemini
+
+# JSON output (includes tool field)
 agentskillscanner --json
 
+# Combine tool and level filters
+agentskillscanner --level user --tool codex
+
 # Only user and project levels
 agentskillscanner --level user,project
 
@@ -58,11 +81,11 @@ All scan levels (User, Project, Plugin, Enterprise) are supported on macOS, Linu
 
 The Enterprise-level scan directory varies by OS:
 
-| OS      | Enterprise Directory                      |
-| ------- | ----------------------------------------- |
-| macOS   | `/Library/Application Support/ClaudeCode` |
-| Linux   | `/etc/claude-code`                        |
-| Windows | `C:\ProgramData\ClaudeCode`               |
+| OS      | Claude Code Enterprise Dir                | Codex CLI Enterprise Dir |
+| ------- | ----------------------------------------- | ------------------------ |
+| macOS   | `/Library/Application Support/ClaudeCode` | `/etc/codex/skills`      |
+| Linux   | `/etc/claude-code`                        | `/etc/codex/skills`      |
+| Windows | `C:\ProgramData\ClaudeCode`               | —                        |
 
 ### Development
 
@@ -76,12 +99,24 @@ node dist/index.js
 
 ## 繁體中文
 
-掃描並彙整所有可用的 Claude Code skills，涵蓋四個層級：
-
-1. **使用者層級 (User)** — `~/.claude/skills/*/SKILL.md`
-2. **專案層級 (Project)** — `<project>/.claude/skills/*/SKILL.md`
-3. **外掛層級 (Plugin)** — `installed_plugins.json` + 各外掛目錄
-4. **企業層級 (Enterprise)** — `/Library/Application Support/ClaudeCode/`
+掃描並彙整所有 AI 編碼工具的技能配置 — 支援 **Claude Code**、**OpenAI Codex CLI**、**Gemini CLI** 與 **GitHub Copilot CLI**。
+
+### 支援工具與掃描路徑
+
+| 工具 | 層級 | 路徑 |
+|------|------|------|
+| Claude Code | 使用者 | `~/.claude/skills/*/SKILL.md` |
+| Claude Code | 專案 | `<project>/.claude/skills/*/SKILL.md` |
+| Claude Code | 外掛 | `installed_plugins.json` + 各外掛目錄 |
+| Claude Code | 企業 | `/Library/Application Support/ClaudeCode/` |
+| Codex CLI | 使用者 | `~/.codex/skills/*/SKILL.md` |
+| Codex CLI | 專案 | `<repoRoot>/.agents/skills/*/SKILL.md` |
+| Codex CLI | 企業 | `/etc/codex/skills/*/SKILL.md` |
+| Gemini CLI | 使用者 | `~/.gemini/skills/*/SKILL.md` |
+| Gemini CLI | 專案 | `<project>/.gemini/skills/*/SKILL.md` |
+| Gemini CLI | 外掛 | `~/.gemini/extensions/*/gemini-extension.json` |
+| Copilot CLI | 使用者 | `~/.copilot/mcp-config.json`（MCP 伺服器） |
+| Copilot CLI | 專案 | `<project>/.github/copilot-instructions.md` |
 
 ### 安裝與使用
 
@@ -100,6 +135,7 @@ agentskillscanner
 -j, --json              以 JSON 格式輸出
 -d, --project-dir DIR   專案目錄（預設：目前工作目錄）
 -l, --level LEVELS      篩選層級（逗號分隔：user,project,plugin,enterprise）
+-t, --tool TOOLS        篩選工具（逗號分隔：claude-code,codex,gemini,copilot）
 -v, --verbose           顯示完整描述與路徑
 -h, --help              顯示說明
 ```
@@ -107,12 +143,24 @@ agentskillscanner
 ### 範例
 
 ```bash
-# 預設掃描所有層級
+# 預設掃描所有工具
 agentskillscanner
 
-# JSON 輸出
+# 只掃描 Claude Code
+agentskillscanner --tool claude-code
+
+# 只掃描 Codex CLI
+agentskillscanner --tool codex
+
+# 掃描多個工具
+agentskillscanner --tool codex,gemini
+
+# JSON 輸出（含 tool 欄位）
 agentskillscanner --json
 
+# 組合工具與層級篩選
+agentskillscanner --level user --tool codex
+
 # 只看使用者與專案層級
 agentskillscanner --level user,project
 
@@ -126,11 +174,11 @@ agentskillscanner --verbose
 
 Enterprise 層級的掃描目錄依作業系統不同：
 
-| 作業系統 | Enterprise 目錄                            |
-| -------- | ----------------------------------------- |
-| macOS    | `/Library/Application Support/ClaudeCode` |
-| Linux    | `/etc/claude-code`                        |
-| Windows  | `C:\ProgramData\ClaudeCode`               |
+| 作業系統 | Claude Code Enterprise 目錄               | Codex CLI Enterprise 目錄 |
+| -------- | ----------------------------------------- | ------------------------- |
+| macOS    | `/Library/Application Support/ClaudeCode` | `/etc/codex/skills`       |
+| Linux    | `/etc/claude-code`                        | `/etc/codex/skills`       |
+| Windows  | `C:\ProgramData\ClaudeCode`               | —                         |
 
 ### 開發
 

package/dist/index.js

@@ -1,10 +1,60 @@
 #!/usr/bin/env node
+import { createRequire } from "node:module";
 import { cli, define } from "gunshi";
-import { readFileSync, readdirSync, statSync } from "node:fs";
-import { join, resolve } from "node:path";
+import updateNotifier from "update-notifier";
+import { dirname, join, resolve } from "node:path";
 import { homedir, platform } from "node:os";
+import { readFileSync, readdirSync, statSync } from "node:fs";
 import pc from "picocolors";
 
+//#region src/types.ts
+const Tool = {
+	CLAUDE_CODE: "claude-code",
+	CODEX: "codex",
+	GEMINI: "gemini",
+	COPILOT: "copilot"
+};
+const TOOL_LABELS = {
+	[Tool.CLAUDE_CODE]: "Claude Code",
+	[Tool.CODEX]: "OpenAI Codex CLI",
+	[Tool.GEMINI]: "Gemini CLI",
+	[Tool.COPILOT]: "GitHub Copilot CLI"
+};
+const SkillLevel = {
+	USER: "user",
+	PROJECT: "project",
+	PLUGIN: "plugin",
+	ENTERPRISE: "enterprise"
+};
+const SkillType = {
+	SKILL: "skill",
+	COMMAND: "command",
+	AGENT: "agent",
+	HOOK: "hook"
+};
+const LEVEL_LABELS = {
+	[SkillLevel.USER]: "使用者層級 (User)",
+	[SkillLevel.PROJECT]: "專案層級 (Project)",
+	[SkillLevel.PLUGIN]: "外掛層級 (Plugin)",
+	[SkillLevel.ENTERPRISE]: "企業層級 (Enterprise)"
+};
+const TYPE_LABELS = {
+	[SkillType.SKILL]: "技能",
+	[SkillType.COMMAND]: "命令",
+	[SkillType.AGENT]: "代理",
+	[SkillType.HOOK]: "鉤子"
+};
+function byLevel(result, level) {
+	return result.skills.filter((s) => s.level === level);
+}
+function byTool(result, tool) {
+	return {
+		skills: result.skills.filter((s) => s.tool === tool),
+		plugins: result.plugins.filter((p) => p.tool === tool)
+	};
+}
+
+//#endregion
 //#region src/frontmatter.ts
 function parseFrontmatter(text) {
 	const match = text.match(/^---\s*\n([\s\S]*?)\n---/);
@@ -42,38 +92,40 @@ function parseFrontmatter(text) {
 }
 
 //#endregion
-//#region src/types.ts
-const SkillLevel = {
-	USER: "user",
-	PROJECT: "project",
-	PLUGIN: "plugin",
-	ENTERPRISE: "enterprise"
-};
-const SkillType = {
-	SKILL: "skill",
-	COMMAND: "command",
-	AGENT: "agent",
-	HOOK: "hook"
-};
-const LEVEL_LABELS = {
-	[SkillLevel.USER]: "使用者層級 (User)",
-	[SkillLevel.PROJECT]: "專案層級 (Project)",
-	[SkillLevel.PLUGIN]: "外掛層級 (Plugin)",
-	[SkillLevel.ENTERPRISE]: "企業層級 (Enterprise)"
-};
-const TYPE_LABELS = {
-	[SkillType.SKILL]: "技能",
-	[SkillType.COMMAND]: "命令",
-	[SkillType.AGENT]: "代理",
-	[SkillType.HOOK]: "鉤子"
-};
-function byLevel(result, level) {
-	return result.skills.filter((s) => s.level === level);
+//#region src/fs-utils.ts
+function isDir(p) {
+	try {
+		return statSync(p).isDirectory();
+	} catch {
+		return false;
+	}
+}
+function isFile(p) {
+	try {
+		return statSync(p).isFile();
+	} catch {
+		return false;
+	}
+}
+function sortedDir(p) {
+	try {
+		return readdirSync(p).sort();
+	} catch {
+		return [];
+	}
+}
+function readFileSafe(p) {
+	try {
+		return readFileSync(p, "utf-8");
+	} catch {
+		return "";
+	}
 }
 
 //#endregion
-//#region src/scanner.ts
-var Scanner = class {
+//#region src/scanners/claude-code.ts
+var ClaudeCodeScanner = class {
+	tool = Tool.CLAUDE_CODE;
 	projectDir;
 	home;
 	claudeDir;
@@ -126,6 +178,7 @@ var Scanner = class {
 			delete fm.description;
 			items.push({
 				name,
+				tool: this.tool,
 				skillType: SkillType.SKILL,
 				level,
 				description: desc,
@@ -175,6 +228,7 @@ var Scanner = class {
 			} catch {}
 			const pinfo = {
 				name: pluginName,
+				tool: this.tool,
 				marketplace,
 				installPath,
 				version: ver,
@@ -191,6 +245,7 @@ var Scanner = class {
 	makePluginSkill(name, stype, path, pinfo, description = "", extra = {}) {
 		return {
 			name,
+			tool: this.tool,
 			skillType: stype,
 			level: SkillLevel.PLUGIN,
 			description,
@@ -294,6 +349,7 @@ var Scanner = class {
 			delete fm.description;
 			items.push({
 				name,
+				tool: this.tool,
 				skillType: SkillType.SKILL,
 				level: SkillLevel.ENTERPRISE,
 				description: desc,
@@ -307,35 +363,330 @@ var Scanner = class {
 		return items;
 	}
 };
-function isDir(p) {
-	try {
-		return statSync(p).isDirectory();
-	} catch {
-		return false;
+
+//#endregion
+//#region src/scanners/codex.ts
+var CodexScanner = class {
+	tool = Tool.CODEX;
+	projectDir;
+	home;
+	constructor(projectDir) {
+		this.projectDir = resolve(projectDir);
+		this.home = homedir();
 	}
-}
-function isFile(p) {
-	try {
-		return statSync(p).isFile();
-	} catch {
-		return false;
+	scan(levels) {
+		const targets = levels ?? [
+			SkillLevel.USER,
+			SkillLevel.PROJECT,
+			SkillLevel.PLUGIN,
+			SkillLevel.ENTERPRISE
+		];
+		const result = {
+			skills: [],
+			plugins: []
+		};
+		if (targets.includes(SkillLevel.USER)) result.skills.push(...this.scanUser());
+		if (targets.includes(SkillLevel.PROJECT)) result.skills.push(...this.scanProject());
+		if (targets.includes(SkillLevel.ENTERPRISE)) result.skills.push(...this.scanEnterprise());
+		return result;
 	}
-}
-function sortedDir(p) {
-	try {
-		return readdirSync(p).sort();
-	} catch {
-		return [];
+	scanUser() {
+		const skillsDir = join(this.home, ".codex", "skills");
+		if (!isDir(skillsDir)) return [];
+		const items = [];
+		for (const child of sortedDir(skillsDir)) {
+			if (child === ".system") continue;
+			const childPath = join(skillsDir, child);
+			if (!isDir(childPath)) continue;
+			const skill = this.readSkillMd(childPath, child, SkillLevel.USER);
+			if (skill) items.push(skill);
+		}
+		const systemDir = join(skillsDir, ".system");
+		if (isDir(systemDir)) for (const child of sortedDir(systemDir)) {
+			const childPath = join(systemDir, child);
+			if (!isDir(childPath)) continue;
+			const skill = this.readSkillMd(childPath, child, SkillLevel.USER);
+			if (skill) {
+				skill.extra = {
+					...skill.extra,
+					bundled: "true"
+				};
+				items.push(skill);
+			}
+		}
+		return items;
 	}
-}
-function readFileSafe(p) {
-	try {
-		return readFileSync(p, "utf-8");
-	} catch {
-		return "";
+	scanProject() {
+		const repoRoot = findRepoRoot(this.projectDir);
+		if (!repoRoot) return [];
+		const skillsDir = join(repoRoot, ".agents", "skills");
+		return this.scanSkillDir(skillsDir, SkillLevel.PROJECT);
+	}
+	scanEnterprise() {
+		return this.scanSkillDir("/etc/codex/skills", SkillLevel.ENTERPRISE);
+	}
+	scanSkillDir(skillsDir, level) {
+		if (!isDir(skillsDir)) return [];
+		const items = [];
+		for (const child of sortedDir(skillsDir)) {
+			const childPath = join(skillsDir, child);
+			if (!isDir(childPath)) continue;
+			const skill = this.readSkillMd(childPath, child, level);
+			if (skill) items.push(skill);
+		}
+		return items;
+	}
+	readSkillMd(dir, fallbackName, level) {
+		const skillMd = join(dir, "SKILL.md");
+		if (!isFile(skillMd)) return null;
+		const fm = parseFrontmatter(readFileSafe(skillMd));
+		const name = fm.name ?? fallbackName;
+		const desc = fm.description ?? "";
+		delete fm.name;
+		delete fm.description;
+		return {
+			name,
+			tool: this.tool,
+			skillType: SkillType.SKILL,
+			level,
+			description: desc,
+			path: skillMd,
+			pluginName: "",
+			marketplace: "",
+			enabled: true,
+			extra: fm
+		};
+	}
+};
+function findRepoRoot(startDir) {
+	let dir = resolve(startDir);
+	const root = dirname(dir) === dir ? dir : void 0;
+	while (true) {
+		if (isDir(join(dir, ".git"))) return dir;
+		const parent = dirname(dir);
+		if (parent === dir || parent === root) return null;
+		dir = parent;
 	}
 }
 
+//#endregion
+//#region src/scanners/gemini.ts
+var GeminiScanner = class {
+	tool = Tool.GEMINI;
+	projectDir;
+	home;
+	constructor(projectDir) {
+		this.projectDir = resolve(projectDir);
+		this.home = homedir();
+	}
+	scan(levels) {
+		const targets = levels ?? [
+			SkillLevel.USER,
+			SkillLevel.PROJECT,
+			SkillLevel.PLUGIN,
+			SkillLevel.ENTERPRISE
+		];
+		const result = {
+			skills: [],
+			plugins: []
+		};
+		if (targets.includes(SkillLevel.USER)) result.skills.push(...this.scanUser());
+		if (targets.includes(SkillLevel.PROJECT)) result.skills.push(...this.scanProject());
+		if (targets.includes(SkillLevel.PLUGIN)) {
+			const { skills, plugins } = this.scanExtensions();
+			result.skills.push(...skills);
+			result.plugins.push(...plugins);
+		}
+		return result;
+	}
+	scanUser() {
+		const skillsDir = join(this.home, ".gemini", "skills");
+		return this.scanSkillDir(skillsDir, SkillLevel.USER);
+	}
+	scanProject() {
+		const skillsDir = join(this.projectDir, ".gemini", "skills");
+		return this.scanSkillDir(skillsDir, SkillLevel.PROJECT);
+	}
+	scanSkillDir(skillsDir, level) {
+		if (!isDir(skillsDir)) return [];
+		const items = [];
+		for (const child of sortedDir(skillsDir)) {
+			const childPath = join(skillsDir, child);
+			if (!isDir(childPath)) continue;
+			const skillMd = join(childPath, "SKILL.md");
+			if (!isFile(skillMd)) continue;
+			const fm = parseFrontmatter(readFileSafe(skillMd));
+			const name = fm.name ?? child;
+			const desc = fm.description ?? "";
+			delete fm.name;
+			delete fm.description;
+			items.push({
+				name,
+				tool: this.tool,
+				skillType: SkillType.SKILL,
+				level,
+				description: desc,
+				path: skillMd,
+				pluginName: "",
+				marketplace: "",
+				enabled: true,
+				extra: fm
+			});
+		}
+		return items;
+	}
+	scanExtensions() {
+		const skills = [];
+		const plugins = [];
+		const dirs = [join(this.home, ".gemini", "extensions"), join(this.projectDir, ".gemini", "extensions")];
+		for (const extDir of dirs) {
+			if (!isDir(extDir)) continue;
+			for (const child of sortedDir(extDir)) {
+				const childPath = join(extDir, child);
+				if (!isDir(childPath)) continue;
+				const extJson = join(childPath, "gemini-extension.json");
+				if (!isFile(extJson)) continue;
+				let data;
+				try {
+					data = JSON.parse(readFileSafe(extJson));
+				} catch {
+					continue;
+				}
+				const name = data.name ?? child;
+				const desc = data.description ?? "";
+				const pinfo = {
+					name,
+					tool: this.tool,
+					marketplace: "",
+					installPath: childPath,
+					version: "",
+					enabled: true,
+					description: desc,
+					author: "",
+					items: []
+				};
+				plugins.push(pinfo);
+			}
+		}
+		return {
+			skills,
+			plugins
+		};
+	}
+};
+
+//#endregion
+//#region src/scanners/copilot.ts
+var CopilotScanner = class {
+	tool = Tool.COPILOT;
+	projectDir;
+	home;
+	constructor(projectDir) {
+		this.projectDir = resolve(projectDir);
+		this.home = homedir();
+	}
+	scan(levels) {
+		const targets = levels ?? [
+			SkillLevel.USER,
+			SkillLevel.PROJECT,
+			SkillLevel.PLUGIN,
+			SkillLevel.ENTERPRISE
+		];
+		const result = {
+			skills: [],
+			plugins: []
+		};
+		if (targets.includes(SkillLevel.USER)) result.skills.push(...this.scanUser());
+		if (targets.includes(SkillLevel.PROJECT)) result.skills.push(...this.scanProject());
+		return result;
+	}
+	scanUser() {
+		const mcpConfig = join(this.home, ".copilot", "mcp-config.json");
+		if (!isFile(mcpConfig)) return [];
+		let data;
+		try {
+			data = JSON.parse(readFileSafe(mcpConfig));
+		} catch {
+			return [];
+		}
+		const servers = data.mcpServers ?? data.servers ?? {};
+		const items = [];
+		for (const serverName of Object.keys(servers).sort()) {
+			const desc = servers[serverName]?.description ?? "";
+			items.push({
+				name: serverName,
+				tool: this.tool,
+				skillType: SkillType.COMMAND,
+				level: SkillLevel.USER,
+				description: desc,
+				path: mcpConfig,
+				pluginName: "",
+				marketplace: "",
+				enabled: true,
+				extra: { source: "mcp-config" }
+			});
+		}
+		return items;
+	}
+	scanProject() {
+		const instrFile = join(this.projectDir, ".github", "copilot-instructions.md");
+		if (!isFile(instrFile)) return [];
+		const firstLine = readFileSafe(instrFile).split("\n").find((l) => l.trim().length > 0)?.trim() ?? "";
+		const desc = firstLine.startsWith("#") ? firstLine.replace(/^#+\s*/, "") : firstLine.slice(0, 100);
+		return [{
+			name: "copilot-instructions",
+			tool: this.tool,
+			skillType: SkillType.SKILL,
+			level: SkillLevel.PROJECT,
+			description: desc || "Copilot project instructions",
+			path: instrFile,
+			pluginName: "",
+			marketplace: "",
+			enabled: true,
+			extra: {}
+		}];
+	}
+};
+
+//#endregion
+//#region src/multi-scanner.ts
+const ALL_TOOLS = [
+	Tool.CLAUDE_CODE,
+	Tool.CODEX,
+	Tool.GEMINI,
+	Tool.COPILOT
+];
+var MultiScanner = class {
+	projectDir;
+	constructor(projectDir) {
+		this.projectDir = resolve(projectDir);
+	}
+	scan(tools, levels) {
+		const targetTools = tools ?? ALL_TOOLS;
+		const result = {
+			skills: [],
+			plugins: []
+		};
+		for (const tool of targetTools) {
+			const scanner = this.createScanner(tool);
+			if (!scanner) continue;
+			const partial = scanner.scan(levels);
+			result.skills.push(...partial.skills);
+			result.plugins.push(...partial.plugins);
+		}
+		return result;
+	}
+	createScanner(tool) {
+		switch (tool) {
+			case Tool.CLAUDE_CODE: return new ClaudeCodeScanner(this.projectDir);
+			case Tool.CODEX: return new CodexScanner(this.projectDir);
+			case Tool.GEMINI: return new GeminiScanner(this.projectDir);
+			case Tool.COPILOT: return new CopilotScanner(this.projectDir);
+			default: return null;
+		}
+	}
+};
+
 //#endregion
 //#region src/formatter.ts
 function truncate(text, maxLen = 72) {
@@ -343,14 +694,13 @@ function truncate(text, maxLen = 72) {
 	if (clean.length <= maxLen) return clean;
 	return clean.slice(0, maxLen - 3) + "...";
 }
-function formatTerminal(result, verbose) {
-	const lines = [];
-	const title = "Claude Code 技能掃描報告";
-	const boxW = 58;
-	lines.push(pc.cyan("╔" + "═".repeat(boxW) + "╗"));
-	lines.push(pc.cyan("║") + pc.bold(pc.white("  " + title.padEnd(boxW - 2))) + pc.cyan("║"));
-	lines.push(pc.cyan("╚" + "═".repeat(boxW) + "╝"));
-	lines.push("");
+function getDistinctTools(result) {
+	const tools = /* @__PURE__ */ new Set();
+	for (const s of result.skills) tools.add(s.tool);
+	for (const p of result.plugins) tools.add(p.tool);
+	return [...tools];
+}
+function renderLevelBlock(result, verbose, lines) {
 	let anyOutput = false;
 	for (const level of [
 		SkillLevel.USER,
@@ -403,11 +753,52 @@ function formatTerminal(result, verbose) {
 			lines.push("");
 		}
 	}
+	return anyOutput;
+}
+function formatTerminal(result, verbose) {
+	const lines = [];
+	const tools = getDistinctTools(result);
+	const multiTool = tools.length > 1;
+	let title;
+	if (multiTool) title = "AI Coding Tools 技能掃描報告";
+	else if (tools.length === 1) title = `${TOOL_LABELS[tools[0]]} 技能掃描報告`;
+	else title = "AI Coding Tools 技能掃描報告";
+	const boxW = 58;
+	lines.push(pc.cyan("╔" + "═".repeat(boxW) + "╗"));
+	lines.push(pc.cyan("║") + pc.bold(pc.white("  " + title.padEnd(boxW - 2))) + pc.cyan("║"));
+	lines.push(pc.cyan("╚" + "═".repeat(boxW) + "╝"));
+	lines.push("");
+	let anyOutput = false;
+	if (multiTool) for (const tool of tools) {
+		const toolResult = byTool(result, tool);
+		const toolLabel = TOOL_LABELS[tool];
+		lines.push(pc.bold(pc.cyan(`▶ ${toolLabel}`)));
+		lines.push("");
+		const hadOutput = renderLevelBlock(toolResult, verbose, lines);
+		if (hadOutput) anyOutput = true;
+		if (!hadOutput) {
+			lines.push(`  ${pc.dim("(未掃描到任何技能)")}`);
+			lines.push("");
+		}
+	}
+	else anyOutput = renderLevelBlock(result, verbose, lines);
 	if (!anyOutput) {
 		lines.push(`  ${pc.dim("(未掃描到任何技能)")}`);
 		lines.push("");
 	}
 	lines.push(pc.bold(`── 統計摘要 ${"─".repeat(47)}`));
+	if (multiTool) {
+		for (const tool of tools) {
+			const toolResult = byTool(result, tool);
+			const toolLabel = TOOL_LABELS[tool];
+			const count = toolResult.skills.length;
+			const pluginCount = toolResult.plugins.length;
+			let detail = `${count} 個項目`;
+			if (pluginCount > 0) detail += `, ${pluginCount} 個外掛`;
+			lines.push(`  ${pc.bold(toolLabel)}: ${detail}`);
+		}
+		lines.push("");
+	}
 	const userCnt = byLevel(result, SkillLevel.USER).length;
 	const projCnt = byLevel(result, SkillLevel.PROJECT).length;
 	const entCnt = byLevel(result, SkillLevel.ENTERPRISE).length;
@@ -427,9 +818,11 @@ function formatTerminal(result, verbose) {
 	return lines.join("\n");
 }
 function formatJson(result) {
+	const tools = getDistinctTools(result);
 	const output = {
 		skills: result.skills.map((s) => ({
 			name: s.name,
+			tool: s.tool,
 			skill_type: s.skillType,
 			level: s.level,
 			description: s.description,
@@ -441,6 +834,7 @@ function formatJson(result) {
 		})),
 		plugins: result.plugins.map((p) => ({
 			name: p.name,
+			tool: p.tool,
 			marketplace: p.marketplace,
 			install_path: p.installPath,
 			version: p.version,
@@ -449,6 +843,7 @@ function formatJson(result) {
 			author: p.author,
 			items: p.items.map((i) => ({
 				name: i.name,
+				tool: i.tool,
 				skill_type: i.skillType,
 				level: i.level,
 				description: i.description,
@@ -465,7 +860,14 @@ function formatJson(result) {
 			enterprise: byLevel(result, SkillLevel.ENTERPRISE).length,
 			plugin_count: result.plugins.length,
 			plugin_items: byLevel(result, SkillLevel.PLUGIN).length,
-			total: result.skills.length
+			total: result.skills.length,
+			by_tool: Object.fromEntries(tools.map((t) => {
+				const tr = byTool(result, t);
+				return [t, {
+					skills: tr.skills.length,
+					plugins: tr.plugins.length
+				}];
+			}))
 		}
 	};
 	return JSON.stringify(output, null, 2);
@@ -479,6 +881,13 @@ const LEVEL_MAP = {
 	plugin: SkillLevel.PLUGIN,
 	enterprise: SkillLevel.ENTERPRISE
 };
+const TOOL_MAP = {
+	"claude-code": Tool.CLAUDE_CODE,
+	claude: Tool.CLAUDE_CODE,
+	codex: Tool.CODEX,
+	gemini: Tool.GEMINI,
+	copilot: Tool.COPILOT
+};
 const scanCommand = define({
 	name: "agentskillscanner",
 	description: "Scan and report all available skills for AI coding assistants",
@@ -500,6 +909,11 @@ const scanCommand = define({
 			short: "l",
 			description: "篩選層級：user, project, plugin, enterprise（可用逗號分隔多個）"
 		},
+		tool: {
+			type: "string",
+			short: "t",
+			description: "篩選工具：claude-code, codex, gemini, copilot（可用逗號分隔多個）"
+		},
 		verbose: {
 			type: "boolean",
 			short: "v",
@@ -516,7 +930,13 @@ const scanCommand = define({
 			levelFilter = levelArg.split(",").map((s) => s.trim().toLowerCase()).map((v) => LEVEL_MAP[v]).filter((v) => v !== void 0);
 			if (levelFilter.length === 0) levelFilter = void 0;
 		}
-		const result = new Scanner(projectDir).scan(levelFilter);
+		let toolFilter;
+		const toolArg = ctx.values.tool;
+		if (toolArg) {
+			toolFilter = toolArg.split(",").map((s) => s.trim().toLowerCase()).map((v) => TOOL_MAP[v]).filter((v) => v !== void 0);
+			if (toolFilter.length === 0) toolFilter = void 0;
+		}
+		const result = new MultiScanner(projectDir).scan(toolFilter, levelFilter);
 		if (json) console.log(formatJson(result));
 		else console.log(formatTerminal(result, verbose ?? false));
 	}
@@ -524,6 +944,7 @@ const scanCommand = define({
 
 //#endregion
 //#region src/index.ts
+updateNotifier({ pkg: createRequire(import.meta.url)("../package.json") }).notify();
 await cli(process.argv.slice(2), scanCommand);
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentskillscanner",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "type": "module",
   "description": "Scan and report all available skills for AI coding assistants",
   "license": "MIT",
@@ -19,7 +19,8 @@
   },
   "dependencies": {
     "gunshi": "^0.26.3",
-    "picocolors": "^1.1.1"
+    "picocolors": "^1.1.1",
+    "update-notifier": "^7.3.1"
   },
   "devDependencies": {
     "tsdown": "^0.12.5",