skillio 0.1.7 → 0.1.9

package/README.md

@@ -66,14 +66,16 @@ audits both Claude Code and Codex over all time).
 ## Usage
 
 ```sh
-# bare command — quick summary across global + local sources, with verdict
+# bare command — per-skill ambient token cost, sorted desc, with verdict
 skl
 skillio                                # equivalent
 
 # subcommands
 skl ls                                 # list skills per source with diffs
 skl cost                               # ambient ballast cost (frontmatter tokens) per skill
+skl cst                                # alias for cost
 skl usage                              # consumption: usage count × frontmatter tokens
+skl usg                                # alias for usage
 skl rm brainstorming                   # remove from lock + delete on-disk dir (with Y/n prompt)
 skl rm brainstorming writing-plans     # remove multiple
 skl rm --yes brainstorming             # skip confirmation
@@ -97,11 +99,9 @@ skl usage -a claude -a codex           # equivalent: repeated --agent flag
 | anywhere with `-g` / `--global` | global override |
 | with `--root <dir>` | that exact dir, treated as global |
 
-> Bare `skl` (no subcommand) ignores `-g` — it always shows both Global and Local sections plus a grand Total.
-
 ## What it does
 
-- **Summary** (`skl`) — counts and tokens across `.claude/skills`, `.agents/skills`, and `skills-lock.json` for both global and local scopes, with a cleanup verdict.
+- **Cost** (`skl`) — per-skill ambient token cost sorted descending, with a cleanup verdict. Bare `skl` = `skl cost` in local scope; `skl -g` = global scope.
 - **Audit skill usage** (`skl usage`) — parse agent session logs and count which skills were invoked, when, and how often.
 - **Manage a skills lock** (`skl ls`, `skl rm`) — inspect and remove skills from a local or global lock file.
 

package/dist/cli.js

@@ -596,6 +596,9 @@ function yellow(s) {
 function red(s) {
   return enabled ? `\x1B[31m${s}\x1B[0m` : s;
 }
+function cyan2(s) {
+  return enabled ? `\x1B[36m${s}\x1B[0m` : s;
+}
 
 // src/utils/discover-skills.ts
 import { existsSync as existsSync3, readdirSync, readFileSync as readFileSync3, statSync } from "node:fs";
@@ -717,7 +720,8 @@ var costCommand = defineCommand({
         cell = "missing";
       else
         cell = "(no frontmatter)";
-      console.log(`${r.name.padEnd(nameWidth)}  ${cell}`);
+      const pad = " ".repeat(nameWidth - r.name.length);
+      console.log(`${cyan2(r.name)}${pad}  ${cell}`);
     }
     console.log("");
     console.log(`Total: ~${total} tok across ${rows.length} skills    ${paint(message)}`);
@@ -788,19 +792,19 @@ var listCommand = defineCommand({
       if (!row)
         continue;
       const countCell = countCells[i] ?? "";
-      const namesText = row.names.length ? row.names.join(" ") : "";
+      const namesText = row.names.length ? row.names.map(cyan2).join(" ") : "";
       const line = `${row.label.padEnd(labelWidth)} : ${countCell.padEnd(countWidth)}${namesText ? ` : ${namesText}` : ""}`;
       console.log(line.trimEnd());
     }
     const diffs = [];
     if (lockOnly.length) {
-      diffs.push(`skills-lock.json has ${lockOnly.length} skill${lockOnly.length === 1 ? "" : "s"} missing on disk: ${lockOnly.join(", ")}`);
+      diffs.push(`skills-lock.json has ${lockOnly.length} skill${lockOnly.length === 1 ? "" : "s"} missing on disk: ${lockOnly.map(cyan2).join(", ")}`);
     }
     if (claudeNotInLock.length) {
-      diffs.push(`.claude/skills has ${claudeNotInLock.length} skill${claudeNotInLock.length === 1 ? "" : "s"} not in lock: ${claudeNotInLock.join(", ")}`);
+      diffs.push(`.claude/skills has ${claudeNotInLock.length} skill${claudeNotInLock.length === 1 ? "" : "s"} not in lock: ${claudeNotInLock.map(cyan2).join(", ")}`);
     }
     if (agentsNotInLock.length) {
-      diffs.push(`.agents/skills has ${agentsNotInLock.length} skill${agentsNotInLock.length === 1 ? "" : "s"} not in lock: ${agentsNotInLock.join(", ")}`);
+      diffs.push(`.agents/skills has ${agentsNotInLock.length} skill${agentsNotInLock.length === 1 ? "" : "s"} not in lock: ${agentsNotInLock.map(cyan2).join(", ")}`);
     }
     if (diffs.length) {
       console.log("");
@@ -867,6 +871,7 @@ function rmSkillDir(path, opts) {
 }
 
 // src/commands/remove.ts
+var q = (name) => `"${cyan2(name)}"`;
 function buildTarget(name, isGlobal, lockPath) {
   const lock = readLock(lockPath);
   const inLock = Object.hasOwn(lock.skills, name);
@@ -893,7 +898,7 @@ function fileCount(dir) {
 }
 function printPlan(plan) {
   const { target } = plan;
-  console.log(`Will remove "${target.name}":`);
+  console.log(`Will remove ${q(target.name)}:`);
   if (target.inLock)
     console.log("  - skills-lock.json");
   else
@@ -927,7 +932,7 @@ var removeCommand = defineCommand({
     const orphan = targets.filter((t) => !t.inLock && !t.claudeDir && !t.agentsDir);
     if (orphan.length) {
       for (const o of orphan)
-        console.log(`"${o.name}" is not in lock or on disk`);
+        console.log(`${q(o.name)} is not in lock or on disk`);
       process.exit(1);
     }
     const plans = targets.map((t) => ({
@@ -956,19 +961,19 @@ var removeCommand = defineCommand({
       if (target.inLock) {
         const r = removeSkillFromLock(lockPath, target.name);
         if (r.removed)
-          console.log(`Removed "${target.name}" from skills-lock.json`);
+          console.log(`Removed ${q(target.name)} from skills-lock.json`);
       } else {
         console.log(`Skipped skills-lock.json (not in lock)`);
       }
       if (target.claudeDir) {
         const r = rmSkillDir(target.claudeDir, { allowedRoots });
-        console.log(`Removed "${target.name}" from .claude/skills (${r.fileCount} files)`);
+        console.log(`Removed ${q(target.name)} from .claude/skills (${r.fileCount} files)`);
       } else {
         console.log("Skipped .claude/skills (not found)");
       }
       if (target.agentsDir) {
         const r = rmSkillDir(target.agentsDir, { allowedRoots });
-        console.log(`Removed "${target.name}" from .agents/skills (${r.fileCount} files)`);
+        console.log(`Removed ${q(target.name)} from .agents/skills (${r.fileCount} files)`);
       } else {
         console.log("Skipped .agents/skills (not found)");
       }
@@ -976,89 +981,6 @@ var removeCommand = defineCommand({
   }
 });
 
-// src/commands/summary.ts
-function classify2(total) {
-  if (total < 1000)
-    return { verdict: "ok", message: "OK — keep it lean", paint: green };
-  if (total <= 1500)
-    return { verdict: "plan", message: "time to plan some cleanup", paint: yellow };
-  return { verdict: "cleanup", message: "ballast — clean it up", paint: red };
-}
-function bucketTokens(records, source) {
-  return records.filter((r) => r.sources.includes(source)).reduce((acc, r) => acc + (r.frontmatterTokens ?? 0), 0);
-}
-function bucketCount(records, source) {
-  return records.filter((r) => r.sources.includes(source)).length;
-}
-function buildSection(opts) {
-  const lockPath = getLockPath(opts.isGlobal);
-  const records = [
-    ...discoverSkills({ isGlobal: opts.isGlobal, cwd: opts.cwd, lockPath }).values()
-  ];
-  const rows = [
-    {
-      label: `${opts.prefix}.claude/skills`,
-      count: bucketCount(records, ".claude"),
-      tokens: bucketTokens(records, ".claude")
-    },
-    {
-      label: `${opts.prefix}.agents/skills`,
-      count: bucketCount(records, ".agents"),
-      tokens: bucketTokens(records, ".agents")
-    },
-    {
-      label: `${opts.prefix}skills-lock.json`,
-      count: bucketCount(records, "lock"),
-      tokens: bucketTokens(records, "lock")
-    }
-  ];
-  const totalTokens = records.reduce((acc, r) => acc + (r.frontmatterTokens ?? 0), 0);
-  const totalCount = records.length;
-  return {
-    title: opts.isGlobal ? "Global" : "Local",
-    rows,
-    totalCount,
-    totalTokens
-  };
-}
-function formatRow(row, labelW, countW, tokenW) {
-  const countCell = row.count === 0 ? "(empty)" : `${row.count} skill${row.count === 1 ? "" : "s"}`;
-  const tokensCell = `~${row.tokens} tok`;
-  return `${row.label.padEnd(labelW)} : ${countCell.padEnd(countW)}  ${tokensCell.padStart(tokenW)}`;
-}
-function renderSection(section) {
-  const labelW = Math.max(...section.rows.map((r) => r.label.length));
-  const countCells = section.rows.map((r) => r.count === 0 ? "(empty)" : `${r.count} skill${r.count === 1 ? "" : "s"}`);
-  const countW = Math.max(...countCells.map((c) => c.length));
-  const tokenW = Math.max(...section.rows.map((r) => `~${r.tokens} tok`.length));
-  return [section.title, ...section.rows.map((r) => formatRow(r, labelW, countW, tokenW))];
-}
-function runSummary(args) {
-  const cwd = process.cwd();
-  const global = buildSection({ isGlobal: true, cwd, prefix: "~/" });
-  const local = buildSection({ isGlobal: false, cwd, prefix: "" });
-  const lines = [];
-  lines.push(...renderSection(global));
-  lines.push("");
-  lines.push(...renderSection(local));
-  lines.push("");
-  const grandTokens = global.totalTokens + local.totalTokens;
-  const grandCount = global.totalCount + local.totalCount;
-  const { message, paint } = classify2(grandTokens);
-  lines.push(`Total: ${grandCount} skills  ~${grandTokens} tok    ${paint(message)}`);
-  console.log(lines.join(`
-`));
-}
-var summaryCommand = defineCommand({
-  meta: { description: "Show skill counts and tokens across global + local sources" },
-  args: {
-    global: { type: "boolean", alias: "g", default: false, description: "Use global scope" }
-  },
-  run({ args }) {
-    runSummary({ global: args.global });
-  }
-});
-
 // src/commands/usage.ts
 import { existsSync as existsSync9 } from "node:fs";
 import { join as join10 } from "node:path";
@@ -1126,6 +1048,26 @@ function extractCodexActivations(entry) {
     }
     return [...paths].map(skillNameFromPath).filter((s) => s !== null);
   }
+  if (e.type === "response_item" && payload?.type === "function_call" && payload?.name === "exec_command") {
+    const argsStr = payload?.arguments;
+    if (typeof argsStr !== "string")
+      return [];
+    let parsed;
+    try {
+      parsed = JSON.parse(argsStr);
+    } catch {
+      return [];
+    }
+    const cmd = parsed?.cmd;
+    if (typeof cmd !== "string")
+      return [];
+    const paths = new Set;
+    for (const m of cmd.matchAll(/(?:^|['"\s])([^'"\s]+\/SKILL\.md)(?=$|['"\s])/g)) {
+      if (m[1])
+        paths.add(m[1]);
+    }
+    return [...paths].map(skillNameFromPath).filter((s) => s !== null);
+  }
   return [];
 }
 
@@ -1210,13 +1152,6 @@ function isRecentEntry(entry, since) {
 }
 
 // src/readers/claude.ts
-function extractSkills(entry, mode) {
-  if (mode === "attributed")
-    return extractAttributed(entry);
-  if (mode === "activations")
-    return extractClaudeActivations(entry);
-  return extractClaudeMentions(entry);
-}
 function readClaudeUsage(options) {
   const root = expandHome(options.root ?? "~/.claude/projects");
   const counts = new Map;
@@ -1225,6 +1160,9 @@ function readClaudeUsage(options) {
   const since = options.scanAllFiles ? undefined : options.since;
   for (const file of findJsonlFiles(root, since)) {
     filesRead++;
+    let prevSkill = null;
+    const sessionAttr = new Map;
+    const sessionAct = new Map;
     for (const line of readFileSync5(file, "utf8").split(`
 `)) {
       if (!line.trim())
@@ -1238,8 +1176,37 @@ function readClaudeUsage(options) {
       }
       if (!isRecentEntry(entry, options.since))
         continue;
-      for (const skill of extractSkills(entry, options.mode)) {
-        counts.set(skill, (counts.get(skill) ?? 0) + 1);
+      if (options.mode === "attributed" || options.mode === "merged") {
+        const cur = extractAttributed(entry)[0];
+        if (cur !== undefined) {
+          if (cur !== prevSkill) {
+            sessionAttr.set(cur, (sessionAttr.get(cur) ?? 0) + 1);
+          }
+          prevSkill = cur;
+        }
+      }
+      if (options.mode === "activations" || options.mode === "merged") {
+        for (const skill of extractClaudeActivations(entry)) {
+          sessionAct.set(skill, (sessionAct.get(skill) ?? 0) + 1);
+        }
+      }
+      if (options.mode === "mentions") {
+        for (const skill of extractClaudeMentions(entry)) {
+          counts.set(skill, (counts.get(skill) ?? 0) + 1);
+        }
+      }
+    }
+    if (options.mode === "attributed") {
+      for (const [k, v] of sessionAttr)
+        counts.set(k, (counts.get(k) ?? 0) + v);
+    } else if (options.mode === "activations") {
+      for (const [k, v] of sessionAct)
+        counts.set(k, (counts.get(k) ?? 0) + v);
+    } else if (options.mode === "merged") {
+      const keys = new Set([...sessionAttr.keys(), ...sessionAct.keys()]);
+      for (const k of keys) {
+        const merged = Math.max(sessionAttr.get(k) ?? 0, sessionAct.get(k) ?? 0);
+        counts.set(k, (counts.get(k) ?? 0) + merged);
       }
     }
   }
@@ -1397,7 +1364,7 @@ function pad(n, width) {
   return String(n).padStart(width);
 }
 function formatUsageRow(row) {
-  return `${pad(row.count, row.countWidth)} ${row.name}`;
+  return `${pad(row.count, row.countWidth)} ${cyan2(row.name)}`;
 }
 function parseAgents(agent) {
   if (!agent)
@@ -1424,7 +1391,10 @@ var usageArgs = {
     description: "30sec, 5min, 12h, 7d, 2w, 1m, 1y, all"
   },
   since: { type: "string", description: "yyyy-mm-dd, overrides --period" },
-  mode: { type: "string", description: "attributed | activations | mentions" },
+  mode: {
+    type: "string",
+    description: "merged (default for claude-code) | attributed | activations | mentions"
+  },
   format: { type: "string", default: "text", description: "text | json" },
   root: { type: "string", description: "Override agent sessions directory; implies global" },
   "scan-all-files": { type: "boolean", default: false, description: "Ignore file mtime" },
@@ -1464,7 +1434,7 @@ async function runUsage(args) {
     let stats;
     let mode;
     if (agent === "claude-code") {
-      mode = args.mode ?? "attributed";
+      mode = args.mode ?? "merged";
       const result = claudeRootMissing ? { counts: new Map, filesRead: 0, linesRead: 0 } : readClaudeUsage({ since, mode, root: claudeRoot, scanAllFiles });
       counts = result.counts;
       stats = { filesRead: result.filesRead, linesRead: result.linesRead };
@@ -1670,7 +1640,18 @@ function mergeAgentArgs(argv) {
     out.splice(slotIdx, 0, "--agent", values.join("\x1F"));
   return out;
 }
-var SUBCOMMAND_NAMES = new Set(["list", "ls", "remove", "rm", "cost", "co", "usage", "us"]);
+var SUBCOMMAND_NAMES = new Set([
+  "list",
+  "ls",
+  "remove",
+  "rm",
+  "cost",
+  "co",
+  "cst",
+  "usage",
+  "us",
+  "usg"
+]);
 function reorderRootFlagsToSubcommand(argv) {
   const tail = argv.slice(2);
   const subIdx = tail.findIndex((t) => !!t && SUBCOMMAND_NAMES.has(t));
@@ -1702,8 +1683,8 @@ function printRootHelp() {
     "",
     "  list, ls         List skills per source with totals and lock-vs-disk diff",
     "  remove, rm       Remove skills from lock and delete their on-disk dirs",
-    "  cost, co         Show ambient ballast cost (per-skill frontmatter tokens) sorted desc",
-    "  usage, us        Show skill usage × cost (consumption) with missed rows"
+    "  cost, co, cst    Show ambient ballast cost (per-skill frontmatter tokens) sorted desc",
+    "  usage, us, usg   Show skill usage × cost (consumption) with missed rows"
   ];
   console.log(lines.join(`
 `));
@@ -1754,13 +1735,13 @@ var main = defineCommand({
     version,
     description: "Audit and manage AI agent skills"
   },
-  args: summaryCommand.args,
+  args: costCommand.args,
   async run({ args }) {
     if (hasSubcommand(process.argv))
       return;
-    await summaryCommand.run?.({
+    await costCommand.run?.({
       args,
-      cmd: summaryCommand,
+      cmd: costCommand,
       rawArgs: process.argv.slice(2)
     });
   },
@@ -1771,8 +1752,10 @@ var main = defineCommand({
     rm: removeCommand,
     cost: costCommand,
     co: costCommand,
+    cst: costCommand,
     usage: usageCommand,
-    us: usageCommand
+    us: usageCommand,
+    usg: usageCommand
   }
 });
 (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillio",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Audit and manage AI agent skills for Claude Code and Codex",
   "license": "MIT",
   "author": "ihororlovskyi",