@crafter/skillkit 0.1.7 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@crafter/skillkit",
-	"version": "0.1.7",
+	"version": "0.2.1",
 	"description": "Local-first analytics for AI agent skills. Track usage, measure context budget, and prune what you don't use.",
 	"type": "module",
 	"bin": {

package/src/bin.ts

@@ -1,7 +1,12 @@
 #!/usr/bin/env bun
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 import { bold, cyan, dim, yellow } from "./tui/colors";
 
-const VERSION = "0.1.7";
+const pkg = JSON.parse(
+	readFileSync(join(dirname(import.meta.dir), "package.json"), "utf-8"),
+);
+const VERSION: string = pkg.version;
 
 function printHelp(): void {
 	console.log(`

package/src/commands/health.ts

@@ -115,8 +115,10 @@ export async function runHealth(): Promise<void> {
 	console.log(`\n  ${bold("SKILLKIT HEALTH REPORT")}\n`);
 
 	const agents = getDetectedAgents();
-	console.log(check(`${skills.length} skills across ${agents.length} agents`));
-	console.log(dim(`    ${agents.join(", ")}`));
+	console.log(check(`${skills.length} skills installed`));
+	if (agents.length > 0) {
+		console.log(dim(`    ${agents.join(" + ")}`));
+	}
 
 	if (dbExists && hasDbData) {
 		console.log(

package/src/commands/list.ts

@@ -20,11 +20,6 @@ export function runList(): void {
 		return;
 	}
 
-	const agentCounts = new Map<string, number>();
-	for (const s of skills) {
-		agentCounts.set(s.agent, (agentCounts.get(s.agent) ?? 0) + 1);
-	}
-
 	const totalSize = skills.reduce((acc, s) => acc + s.size, 0);
 
 	console.log(`\n  ${bold(`INSTALLED SKILLS (${skills.length})`)}\n`);
@@ -45,10 +40,7 @@ export function runList(): void {
 		console.log(`  ${name}${desc}${size}`);
 	}
 
-	const agentSummary = [...agentCounts.entries()]
-		.map(([a, c]) => `${a} (${c})`)
-		.join(", ");
 	console.log(
-		`\n  ${dim(`Total: ${skills.length} skills | ${formatSize(totalSize)} | ${agentSummary}`)}\n`,
+		`\n  ${dim(`Total: ${skills.length} skills | ${formatSize(totalSize)}`)}\n`,
 	);
 }

package/src/commands/scan.ts

@@ -1,8 +1,8 @@
 import { existsSync, readdirSync, statSync } from "node:fs";
-import { join } from "node:path";
-import { upsertInstalledSkill } from "../db/queries";
+import { basename, join } from "node:path";
+import { upsertInstalledSkill, deduplicateInvocations } from "../db/queries";
 import { getDb } from "../db/schema";
-import { scanAllSessions, countAllSessions } from "../scanner/index";
+import { countAllSessions, scanAllSessions } from "../scanner/index";
 import { getDetectedAgents, scanInstalledSkills } from "../scanner/skills";
 import { bold, cyan, dim } from "../tui/colors";
 
@@ -26,10 +26,12 @@ export async function runScan(): Promise<void> {
 
 	const agents = getDetectedAgents();
 	if (agents.length === 0) {
-		console.log(`\n  ${dim("No agent skill directories found.")}\n`);
+		console.log(
+			`\n  ${dim("No supported agents found (Claude Code, OpenCode).")}\n`,
+		);
 		return;
 	}
-	console.log(`\n  ${dim(`Scanning ${agents.length} agents: ${agents.join(", ")}`)}`);
+	console.log(`\n  ${dim(`Scanning ${agents.join(" + ")}`)}`);
 
 	const skills = scanInstalledSkills();
 
@@ -84,10 +86,32 @@ export async function runScan(): Promise<void> {
 		} catch {}
 	}
 
+	const knownSkills = new Set<string>();
+	for (const skill of skills) {
+		knownSkills.add(skill.name);
+		knownSkills.add(basename(skill.path));
+	}
+	if (existsSync(localSkillsDir)) {
+		try {
+			for (const e of readdirSync(localSkillsDir)) {
+				try {
+					if (statSync(join(localSkillsDir, e)).isDirectory()) {
+						knownSkills.add(e);
+					}
+				} catch {}
+			}
+		} catch {}
+	}
+
+	const removed = deduplicateInvocations(db);
+	if (removed > 0) {
+		console.log(`  ${dim(`Cleaned ${removed} duplicate entries`)}`);
+	}
+
 	console.log(dim("  Scanning sessions..."));
 
 	const sessionCount = countAllSessions();
-	const newInvocations = await scanAllSessions(db);
+	const newInvocations = await scanAllSessions(db, knownSkills);
 	const totalRow = db
 		.query<{ count: number }, []>(
 			"SELECT COUNT(*) as count FROM skill_invocations",

package/src/db/queries.ts

@@ -76,18 +76,53 @@ export function recordInvocation(
 	skillName: string,
 	sessionId?: string,
 	project?: string,
+	timestamp?: string,
 ): void {
+	const ts = timestamp ?? new Date().toISOString();
 	db.run(
 		"INSERT INTO skill_invocations (skill_name, timestamp, session_id, project) VALUES (?, ?, ?, ?)",
-		[skillName, new Date().toISOString(), sessionId ?? null, project ?? null],
+		[skillName, ts, sessionId ?? null, project ?? null],
 	);
-	const date = new Date().toISOString().slice(0, 10);
+	const date = ts.slice(0, 10);
 	db.run(
 		"INSERT INTO skill_daily_stats (date, skill_name, count) VALUES (?, ?, 1) ON CONFLICT(date, skill_name) DO UPDATE SET count = count + 1",
 		[date, skillName],
 	);
 }
 
+export function deduplicateInvocations(db: Database): number {
+	const before = db
+		.query<{ count: number }, []>(
+			"SELECT COUNT(*) as count FROM skill_invocations",
+		)
+		.get()?.count ?? 0;
+
+	db.run(`
+		DELETE FROM skill_invocations WHERE id NOT IN (
+			SELECT MIN(id) FROM skill_invocations
+			GROUP BY skill_name, session_id, timestamp
+		)
+	`);
+
+	const after = db
+		.query<{ count: number }, []>(
+			"SELECT COUNT(*) as count FROM skill_invocations",
+		)
+		.get()?.count ?? 0;
+
+	if (before !== after) {
+		db.run("DELETE FROM skill_daily_stats");
+		db.run(`
+			INSERT INTO skill_daily_stats (date, skill_name, count)
+			SELECT date(timestamp), skill_name, COUNT(*)
+			FROM skill_invocations
+			GROUP BY date(timestamp), skill_name
+		`);
+	}
+
+	return before - after;
+}
+
 export function upsertInstalledSkill(
 	db: Database,
 	name: string,

package/src/index.ts

@@ -12,8 +12,8 @@ export {
 	upsertInstalledSkill,
 } from "./db/queries";
 export { getDb } from "./db/schema";
-export { scanAllSessions, countAllSessions } from "./scanner/index";
 export { parseSessionFile } from "./scanner/connectors/claude";
+export { countAllSessions, scanAllSessions } from "./scanner/index";
 export { getDetectedAgents, scanInstalledSkills } from "./scanner/skills";
 export type {
 	InstalledSkill,

package/src/scanner/connectors/claude.ts

@@ -19,7 +19,28 @@ function extractSkillName(block: ToolUseBlock): string | null {
 	return null;
 }
 
-export function parseSessionFile(filePath: string): Invocation[] {
+const COMMAND_NAME_RE = /<command-name>\/?([a-zA-Z][\w-]*(?::[\w-]*)*)<\/command-name>/g;
+
+function extractCommandNames(
+	text: string,
+	knownSkills: Set<string>,
+): string[] {
+	const names: string[] = [];
+	let match: RegExpExecArray | null;
+	while ((match = COMMAND_NAME_RE.exec(text)) !== null) {
+		const name = match[1];
+		if (knownSkills.has(name)) {
+			names.push(name);
+		}
+	}
+	COMMAND_NAME_RE.lastIndex = 0;
+	return names;
+}
+
+export function parseSessionFile(
+	filePath: string,
+	knownSkills: Set<string> = new Set(),
+): Invocation[] {
 	const results: Invocation[] = [];
 	const sessionId = basename(filePath, ".jsonl");
 
@@ -49,10 +70,35 @@ export function parseSessionFile(filePath: string): Invocation[] {
 				: new Date().toISOString();
 
 		const msg = obj.message as
-			| { content: Array<Record<string, unknown>> }
+			| { content: Array<Record<string, unknown>> | string }
 			| undefined;
+
+		if (obj.type === "user" && msg) {
+			const text =
+				typeof msg.content === "string"
+					? msg.content
+					: Array.isArray(msg.content)
+						? msg.content
+								.filter(
+									(b): b is { type: string; text: string } =>
+										typeof b === "object" &&
+										b !== null &&
+										b.type === "text" &&
+										typeof b.text === "string",
+								)
+								.map((b) => b.text)
+								.join("\n")
+						: "";
+			for (const name of extractCommandNames(text, knownSkills)) {
+				results.push({ skillName: name, timestamp, sessionId });
+			}
+			continue;
+		}
+
 		const msgContent =
-			obj.type === "assistant" && msg ? msg.content : null;
+			obj.type === "assistant" && msg && Array.isArray(msg.content)
+				? (msg.content as Array<Record<string, unknown>>)
+				: null;
 
 		if (!Array.isArray(msgContent)) continue;
 
@@ -63,9 +109,7 @@ export function parseSessionFile(filePath: string): Invocation[] {
 				block.type === "tool_use" &&
 				(block as unknown as ToolUseBlock).name === "Skill"
 			) {
-				const skillName = extractSkillName(
-					block as unknown as ToolUseBlock,
-				);
+				const skillName = extractSkillName(block as unknown as ToolUseBlock);
 				if (skillName) {
 					results.push({ skillName, timestamp, sessionId });
 				}
@@ -91,6 +135,7 @@ export function countClaudeSessions(): number {
 export async function scanClaudeSessions(
 	db: Database,
 	trackedSet: Set<string>,
+	knownSkills: Set<string> = new Set(),
 ): Promise<number> {
 	const projectsDir = join(homedir(), ".claude", "projects");
 	if (!existsSync(projectsDir)) return 0;
@@ -104,7 +149,7 @@ export async function scanClaudeSessions(
 
 	let total = 0;
 	for (const file of files) {
-		const invocations = parseSessionFile(file);
+		const invocations = parseSessionFile(file, knownSkills);
 		total += recordNewInvocations(db, trackedSet, invocations);
 	}
 

package/src/scanner/connectors/opencode.ts

@@ -1,10 +1,10 @@
-import { Database as BunDatabase } from "bun:sqlite";
 import type { Database } from "bun:sqlite";
+import { Database as BunDatabase } from "bun:sqlite";
 import { existsSync } from "node:fs";
 import { homedir, platform } from "node:os";
 import { join } from "node:path";
-import { recordNewInvocations } from "../index";
 import type { Invocation } from "../index";
+import { recordNewInvocations } from "../index";
 
 function getDbPath(): string | null {
 	const os = platform();
@@ -48,9 +48,7 @@ export function countOpenCodeSessions(): number {
 
 	try {
 		const row = ocDb
-			.query<{ count: number }, []>(
-				"SELECT COUNT(*) as count FROM session",
-			)
+			.query<{ count: number }, []>("SELECT COUNT(*) as count FROM session")
 			.get();
 		return row?.count ?? 0;
 	} catch {
@@ -70,7 +68,7 @@ export function scanOpenCodeSessions(
 	try {
 		const rows = ocDb
 			.query<PartRow, []>(
-				"SELECT p.session_id, p.time_created, p.data FROM part p WHERE p.data LIKE '%\"tool\":\"skill\"%'",
+				'SELECT p.session_id, p.time_created, p.data FROM part p WHERE p.data LIKE \'%"tool":"skill"%\'',
 			)
 			.all();
 

package/src/scanner/index.ts

@@ -1,9 +1,9 @@
 import type { Database } from "bun:sqlite";
 import { recordInvocation } from "../db/queries";
-import { scanClaudeSessions, countClaudeSessions } from "./connectors/claude";
+import { countClaudeSessions, scanClaudeSessions } from "./connectors/claude";
 import {
-	scanOpenCodeSessions,
 	countOpenCodeSessions,
+	scanOpenCodeSessions,
 } from "./connectors/opencode";
 
 interface AlreadyTracked {
@@ -35,7 +35,7 @@ export function recordNewInvocations(
 	for (const inv of invocations) {
 		const key = `${inv.sessionId}::${inv.timestamp}`;
 		if (!trackedSet.has(key)) {
-			recordInvocation(db, inv.skillName, inv.sessionId);
+			recordInvocation(db, inv.skillName, inv.sessionId, undefined, inv.timestamp);
 			trackedSet.add(key);
 			count++;
 		}
@@ -43,10 +43,13 @@ export function recordNewInvocations(
 	return count;
 }
 
-export async function scanAllSessions(db: Database): Promise<number> {
+export async function scanAllSessions(
+	db: Database,
+	knownSkills: Set<string> = new Set(),
+): Promise<number> {
 	const trackedSet = getTrackedSet(db);
 	let total = 0;
-	total += await scanClaudeSessions(db, trackedSet);
+	total += await scanClaudeSessions(db, trackedSet, knownSkills);
 	total += scanOpenCodeSessions(db, trackedSet);
 	return total;
 }

package/src/scanner/skills.ts

@@ -3,22 +3,23 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import type { InstalledSkill } from "../types";
 
-const AGENT_SKILL_PATHS: Array<{ agent: string; dir: string }> = [
+const SUPPORTED_AGENTS: Array<{ agent: string; dir: string }> = [
 	{ agent: "Claude Code", dir: join(homedir(), ".claude", "skills") },
-	{ agent: "Cursor", dir: join(homedir(), ".cursor", "skills") },
-	{ agent: "Codex", dir: join(homedir(), ".codex", "skills") },
-	{ agent: "Windsurf", dir: join(homedir(), ".codeium", "windsurf", "skills") },
-	{ agent: "Gemini CLI", dir: join(homedir(), ".gemini", "skills") },
-	{ agent: "Cline", dir: join(homedir(), ".cline", "skills") },
-	{ agent: "Roo Code", dir: join(homedir(), ".roo", "skills") },
-	{ agent: "Continue", dir: join(homedir(), ".continue", "skills") },
 	{ agent: "OpenCode", dir: join(homedir(), ".config", "opencode", "skills") },
-	{ agent: "GitHub Copilot", dir: join(homedir(), ".copilot", "skills") },
-	{ agent: "OpenHands", dir: join(homedir(), ".openhands", "skills") },
-	{ agent: "Amp", dir: join(homedir(), ".config", "agents", "skills") },
-	{ agent: "Goose", dir: join(homedir(), ".config", "goose", "skills") },
-	{ agent: "Kilo Code", dir: join(homedir(), ".kilocode", "skills") },
-	{ agent: "Trae", dir: join(homedir(), ".trae", "skills") },
+	// Planned — needs session connector to enable full analytics pipeline
+	// { agent: "Cursor", dir: join(homedir(), ".cursor", "skills") },                 // GH-1: injects skills as context rules, no discrete tool_use
+	// { agent: "Codex", dir: join(homedir(), ".codex", "skills") },                   // GH-2
+	// { agent: "Windsurf", dir: join(homedir(), ".codeium", "windsurf", "skills") },  // GH-3
+	// { agent: "Gemini CLI", dir: join(homedir(), ".gemini", "skills") },             // GH-4
+	// { agent: "Cline", dir: join(homedir(), ".cline", "skills") },                   // GH-5
+	// { agent: "Roo Code", dir: join(homedir(), ".roo", "skills") },                  // GH-6
+	// { agent: "Continue", dir: join(homedir(), ".continue", "skills") },             // GH-7
+	// { agent: "GitHub Copilot", dir: join(homedir(), ".copilot", "skills") },        // GH-8
+	// { agent: "OpenHands", dir: join(homedir(), ".openhands", "skills") },           // GH-9
+	// { agent: "Amp", dir: join(homedir(), ".config", "agents", "skills") },          // GH-10
+	// { agent: "Goose", dir: join(homedir(), ".config", "goose", "skills") },         // GH-11
+	// { agent: "Kilo Code", dir: join(homedir(), ".kilocode", "skills") },            // GH-12
+	// { agent: "Trae", dir: join(homedir(), ".trae", "skills") },                     // GH-13
 ];
 
 function parseYamlFrontmatter(content: string): Record<string, string> {
@@ -56,10 +57,7 @@ function getDirSize(dirPath: string): number {
 	return total;
 }
 
-function scanSkillsDir(
-	skillsDir: string,
-	agent: string,
-): InstalledSkill[] {
+function scanSkillsDir(skillsDir: string, agent: string): InstalledSkill[] {
 	if (!existsSync(skillsDir)) return [];
 
 	const skills: InstalledSkill[] = [];
@@ -125,7 +123,7 @@ export function scanInstalledSkills(): InstalledSkill[] {
 	const allSkills: InstalledSkill[] = [];
 	const seen = new Set<string>();
 
-	for (const { agent, dir } of AGENT_SKILL_PATHS) {
+	for (const { agent, dir } of SUPPORTED_AGENTS) {
 		const skills = scanSkillsDir(dir, agent);
 		for (const skill of skills) {
 			try {
@@ -143,7 +141,7 @@ export function scanInstalledSkills(): InstalledSkill[] {
 
 export function getDetectedAgents(): string[] {
 	const agents: string[] = [];
-	for (const { agent, dir } of AGENT_SKILL_PATHS) {
+	for (const { agent, dir } of SUPPORTED_AGENTS) {
 		if (existsSync(dir)) agents.push(agent);
 	}
 	return agents;