skillio 0.1.8 → 0.1.9

package/dist/cli.js

@@ -871,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);
@@ -897,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
@@ -931,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) => ({
@@ -960,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)");
       }
@@ -1047,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 [];
 }
 
@@ -1131,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;
@@ -1146,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())
@@ -1159,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);
       }
     }
   }
@@ -1345,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" },
@@ -1385,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 };

package/package.json

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