@toolbeltai/skills 0.1.2 → 0.1.3

package/README.md

@@ -9,8 +9,9 @@
 npx @toolbeltai/skills install
 ```
 
-Copies every skill to `~/.claude/skills/toolbelt/`. Restart Claude Code and
-you'll see them as slash commands: `/run-toolbelt`, `/geo-analyst`, …
+Copies every skill to `~/.claude/skills/` (flat, per the AgentSkills spec).
+Restart Claude Code and you'll see them as slash commands: `/run-toolbelt`,
+`/geo-analyst`, …
 
 No account required; no network calls to Toolbelt. Skills work against any
 Toolbelt MCP server (cloud or self-hosted).

package/bin/install.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * toolbelt-skills — install Toolbelt's Claude Code skills into ~/.claude/skills/toolbelt/
+ * toolbelt-skills — install Toolbelt's skills into ~/.claude/skills/
  *
  * Usage:
  *   npx @toolbeltai/skills install       # copy skills (default)
@@ -11,6 +11,11 @@
  * The @toolbeltai/cli package wraps this for its own install flow; this
  * CLI exists so the skills package stands on its own — anyone can install
  * without needing the Toolbelt CLI or hitting any Toolbelt-hosted service.
+ *
+ * Layout: skills install FLAT under ~/.claude/skills/ per AgentSkills spec
+ * (agentskills.io) and Claude Code docs. An earlier version nested them
+ * under ~/.claude/skills/toolbelt/; that broke discovery in OpenClaw and
+ * was non-standard for Claude Code. We clean up the legacy dir on install.
  */
 import { cpSync, existsSync, mkdirSync, readdirSync, rmSync, statSync } from 'node:fs';
 import { homedir } from 'node:os';
@@ -18,7 +23,8 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const PKG_ROOT = join(dirname(fileURLToPath(import.meta.url)), '..');
-const TARGET = join(homedir(), '.claude', 'skills', 'toolbelt');
+const TARGET = join(homedir(), '.claude', 'skills');
+const LEGACY_NESTED_DIR = join(TARGET, 'toolbelt');
 
 /** Any top-level directory containing a SKILL.md is a skill. */
 function listSkills() {
@@ -28,6 +34,13 @@ function listSkills() {
     .filter((name) => existsSync(join(PKG_ROOT, name, 'SKILL.md')));
 }
 
+function cleanupLegacy() {
+  if (existsSync(LEGACY_NESTED_DIR)) {
+    rmSync(LEGACY_NESTED_DIR, { recursive: true, force: true });
+    console.log(`  migrated: removed legacy ~/.claude/skills/toolbelt/`);
+  }
+}
+
 function cmdInstall() {
   const skills = listSkills();
   if (skills.length === 0) {
@@ -36,12 +49,14 @@ function cmdInstall() {
   }
 
   mkdirSync(TARGET, { recursive: true });
+  cleanupLegacy();
+
   for (const name of skills) {
     const src = join(PKG_ROOT, name);
     const dst = join(TARGET, name);
     rmSync(dst, { recursive: true, force: true });
     cpSync(src, dst, { recursive: true });
-    console.log(`  \u2713 ${name}`);
+    console.log(`  ✓ ${name}`);
   }
   // Optional assets (icons, tapes) — copy if present so popups render right.
   const assetsSrc = join(PKG_ROOT, 'assets');
@@ -57,12 +72,26 @@ function cmdInstall() {
 }
 
 function cmdUninstall() {
-  if (!existsSync(TARGET)) {
+  // Remove installed skills and legacy nested dir.
+  cleanupLegacy();
+  const skills = listSkills();
+  let removed = 0;
+  for (const name of skills) {
+    const dst = join(TARGET, name);
+    if (existsSync(dst)) {
+      rmSync(dst, { recursive: true, force: true });
+      removed++;
+    }
+  }
+  const assetsDst = join(TARGET, 'assets');
+  if (existsSync(assetsDst)) {
+    rmSync(assetsDst, { recursive: true, force: true });
+  }
+  if (removed === 0) {
     console.log('  (nothing to remove)');
-    return;
+  } else {
+    console.log(`  Removed ${removed} skills from ${TARGET}`);
   }
-  rmSync(TARGET, { recursive: true, force: true });
-  console.log(`  Removed ${TARGET}`);
 }
 
 function cmdList() {
@@ -74,7 +103,7 @@ function cmdPath() {
 }
 
 function usage() {
-  console.log(`toolbelt-skills — install Toolbelt skills into ~/.claude/skills/toolbelt/
+  console.log(`toolbelt-skills — install Toolbelt skills into ~/.claude/skills/
 
 Usage:
   npx @toolbeltai/skills install       Install skills (default)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolbeltai/skills",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Official Toolbelt skills for Claude Code and MCP agents — run-toolbelt, geo-analyst, knowledge-graph, sql-analyst, vector-search, streaming-analyst, multi-agent-workspace, data-blend.",
   "license": "MIT",
   "homepage": "https://toolbelt.ai",