@supa-magic/spm 0.2.2 → 0.2.4

package/dist/bin/spm.js

@@ -3,8 +3,8 @@ import { Command } from "commander";
 import { existsSync, readFileSync, writeFileSync, mkdirSync, unlinkSync, readdirSync, statSync } from "node:fs";
 import { join, dirname, relative, resolve, normalize } from "node:path";
 import { parse, stringify } from "yaml";
-import { execSync, spawn } from "node:child_process";
-import { readFile, mkdir, writeFile } from "node:fs/promises";
+import { execFileSync, execSync, spawn } from "node:child_process";
+import { readFile, mkdir, writeFile, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { createHash } from "node:crypto";
 const registerDoctorCommand = (program2) => {
@@ -20,10 +20,28 @@ const knownProviders = {
   codeium: ".codeium",
   cody: ".cody"
 };
+const cliCommands = {
+  claude: "claude",
+  aider: "aider"
+};
+const hasCliInstalled = (command) => {
+  try {
+    execFileSync(command, ["--version"], {
+      stdio: "ignore",
+      timeout: 5e3,
+      shell: process.platform === "win32"
+    });
+    return true;
+  } catch {
+    return false;
+  }
+};
 const detectProviders = (root) => Object.entries(knownProviders).reduce(
   (providers, [name, path]) => {
-    const fullPath = join(root, path);
-    if (existsSync(fullPath)) {
+    const hasDir = existsSync(join(root, path));
+    const cli = cliCommands[name];
+    const hasCli = cli ? hasCliInstalled(cli) : false;
+    if (hasDir || hasCli) {
       providers[name] = { path };
     }
     return providers;
@@ -350,7 +368,7 @@ const downloadFile = async (source) => {
   const content = await getContent(source);
   return { content, source };
 };
-const template = '# Skillset Integration\n\nYou are integrating a new skillset into the project. Analyze the existing project setup and intelligently integrate the new files.\n\n## Context\n\n- **Downloaded files**: `{{downloadDir}}`\n- **Provider directory**: `{{providerDir}}`\n- **Skillset**: `{{skillsetName}}` v`{{skillsetVersion}}`\n- **Source**: `{{source}}`\n- **Config file**: `{{configPath}}`\n\nIdentical files have already been removed from the download folder. Only files that need action remain. If the download folder is empty, skip to the config update step.\n\n## Output Format\n\nCRITICAL — follow exactly:\n- NEVER wrap output in code blocks or backticks\n- NEVER write conversational text ("Now let me...", "Let me check...", "The files are...")\n- NEVER use emojis\n- Output ONLY structured log lines\n- Step headers are plain text ending with `...` — these are parsed by the CLI to drive spinner states\n- Items below headers are indented with 2 spaces and use `• ` prefix\n- File lists use ASCII tree: `├─`, `└─`, `│`\n- End with `Done` on its own line\n\nStep headers (use these exactly):\n\n1. `Analyzing existing setup...`\n2. `Analyzing downloaded files...`\n3. `Detecting conflicts...`\n4. `Integrating...`\n5. `Updating config...`\n6. `Running setup...` (only if a setup file exists)\n7. `Cleaning up...`\n8. `Done`\n\nExample output:\n\nAnalyzing existing setup...\n  • 4 skills, 2 rules, 1 hook\n\nAnalyzing downloaded files...\n  • skills: git, github, implement\n  • rules: coding\n  • hook: biome-format\n\nDetecting conflicts...\n  • No conflicts\n\nIntegrating...\n  • skills/git/SKILL.md\n  • skills/git/branch.md\n  • skills/github/SKILL.md\n\nUpdating config...\n  • skillset: skill-creator@1.0.0\n\nRunning setup...\n  • Configured MCP server: biome\n\nCleaning up...\n  • Removed .spm/skill-creator\n\nDone\n\n## Step 1: Analyzing existing setup\n\nRead the provider directory (`{{providerDir}}`) and catalog what is already in place: skills, rules, agents, hooks, mcp servers, memory files.\n\n## Step 2: Analyzing downloaded files\n\nRead all files in `{{downloadDir}}`. Only files present in this folder need to be installed.\n\n## Step 3: Detecting conflicts\n\nFor each downloaded file, check if a file with the same name exists in the provider directory.\n\n- **No existing file** → install as new\n- **Different skillset version** → replace silently (new version supersedes)\n- **Same version or no version info** → conflict — ask the user:\n\nDetecting conflicts...\n  • rules/coding.md — local has custom rules\n  • Choose: (r)eplace / (s)kip / (m)erge\n\nWait for response before proceeding.\n\n## Step 4: Integrating\n\nInstall files into `{{providerDir}}`, following the directory structure from the download folder.\n\n**Integrate, don\'t copy.** When a new skill can leverage existing project conventions, adapt it:\n\n- If the project has `rules/coding.md` with specific conventions → make new skills follow those rules instead of their own defaults\n- If existing skills handle branching or committing → reference them instead of duplicating instructions\n- If the project has naming conventions, testing patterns, or architectural rules → align new skills with them\n\n## Step 5: Updating config\n\nUpdate `{{configPath}}`:\n\n- Under the provider with path `{{providerDir}}`, add the skillset entry under `skillsets`:\n  `{{skillsetName}}: "{{source}}@{{skillsetVersion}}"`\n- Do NOT add individual skill, agent, or file names to the config\n- The `skills` map is reserved for standalone skill installations\n\n{{setupSection}}\n\n## Step 7: Cleaning up (last step before Done)\n\nDelete the download folder `{{downloadDir}}` and its contents.\n\n## Rules\n\n- Setup files are NOT installed — they contain instructions to configure the project\n- Do not delete or modify existing files in the provider directory unless resolving a conflict\n- Always delete the download folder when done\n';
+const template = '# Skillset Integration\n\nYou are integrating a new skillset into the project. Analyze the existing project setup and intelligently integrate the new files.\n\n## Context\n\n- **Downloaded files**: `{{downloadDir}}`\n- **Provider directory**: `{{providerDir}}`\n- **Skillset**: `{{skillsetName}}` v`{{skillsetVersion}}`\n- **Source**: `{{source}}`\n- **Config file**: `{{configPath}}`\n\nIdentical files have already been removed from the download folder. Only files that need action remain. If the download folder is empty, skip to the config update step.\n\n## Output Format\n\nCRITICAL — follow exactly:\n- NEVER wrap output in code blocks or backticks\n- NEVER write conversational text ("Now let me...", "Let me check...", "The files are...")\n- NEVER use emojis\n- Output ONLY structured log lines\n- Step headers are plain text ending with `...` — these are parsed by the CLI to drive spinner states\n- Items below headers are indented with 2 spaces and use `• ` prefix\n- File lists use ASCII tree: `├─`, `└─`, `│`\n- End with `Done` on its own line\n\nStep headers (use these exactly):\n\n1. `Analyzing existing setup...`\n2. `Analyzing downloaded files...`\n3. `Detecting conflicts...`\n4. `Integrating...`\n5. `Updating config...`\n6. `Running setup...` (only if a setup file exists)\n7. `Done`\n\nExample output:\n\nAnalyzing existing setup...\n  • 4 skills, 2 rules, 1 hook\n\nAnalyzing downloaded files...\n  • skills: git, github, implement\n  • rules: coding\n  • hook: biome-format\n\nDetecting conflicts...\n  • No conflicts\n\nIntegrating...\n  • skills/git/SKILL.md\n  • skills/git/branch.md\n  • skills/github/SKILL.md\n\nUpdating config...\n  • skillset: skill-creator@1.0.0\n\nRunning setup...\n  • Configured MCP server: biome\n\nDone\n\n## Step 1: Analyzing existing setup\n\nRead the provider directory (`{{providerDir}}`) and catalog what is already in place: skills, rules, agents, hooks, mcp servers files.\n\n## Step 2: Analyzing downloaded files\n\nRead all files in `{{downloadDir}}`. Only files present in this folder need to be installed.\n\n## Step 3: Detecting conflicts\n\nFor each downloaded file, check if a file with the same name exists in the provider directory.\n\n- **No existing file** → install as new\n- **Different skillset version** → replace silently (new version supersedes)\n- **Same version or no version info** → conflict — ask the user:\n\nDetecting conflicts...\n  • rules/coding.md — local has custom rules\n  • Choose: (r)eplace / (s)kip / (m)erge\n\nWait for response before proceeding.\n\n## Step 4: Integrating\n\nInstall files into `{{providerDir}}`, following the directory structure from the download folder.\n\n**Integrate, don\'t copy.** When a new skill can leverage existing project conventions, adapt it:\n\n- If the project has `rules/coding.md` with specific conventions → make new skills follow those rules instead of their own defaults\n- If existing skills handle branching or committing → reference them instead of duplicating instructions\n- If the project has naming conventions, testing patterns, or architectural rules → align new skills with them\n\n## Step 5: Updating config\n\nUpdate `{{configPath}}`:\n\n- Under the provider with path `{{providerDir}}`, add the skillset entry under `skillsets`:\n  `{{skillsetName}}: "{{source}}@{{skillsetVersion}}"`\n- Do NOT add individual skill, agent, or file names to the config\n- The `skills` map is reserved for standalone skill installations\n\n{{setupSection}}\n\n## Rules\n\n- Setup files are NOT installed — they contain instructions to configure the project\n- Do not delete or modify existing files in the provider directory unless resolving a conflict\n- Do NOT delete the download folder — cleanup is handled externally\n';
 const buildSetupSection = (setupFile) => setupFile ? [
   "## Step 6: Running setup",
   "",
@@ -365,7 +383,6 @@ const writeInstructionsFile = (input) => {
   writeFileSync(filePath, buildInstructions(input), "utf-8");
   return filePath;
 };
-const TIMEOUT_MS = 12e4;
 const isNoise = (line) => line === "```" || line.startsWith("```") || /^(now |let me |the files? |i'll |i will |looking |checking )/i.test(line);
 const isStepHeader = (raw, trimmed) => !raw.startsWith(" ") && !raw.startsWith("	") && trimmed.endsWith("...");
 const stepCategory = (header) => {
@@ -392,7 +409,7 @@ const toRelativePath = (filePath, providerDir) => {
   if (idx !== -1) return normalized.slice(idx + marker.length);
   return normalized.split("/").pop() ?? normalized;
 };
-const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise((resolve2, reject) => {
+const spawnClaude = (instructionsFilePath, stepper, providerDir, model) => new Promise((resolve2, reject) => {
   const args = [
     "-p",
     "Install the skill as instructed.",
@@ -402,11 +419,11 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
     "--output-format",
     "stream-json",
     "--allowedTools",
-    "Read,Write,Edit,Bash,Glob,Grep"
+    "Read,Write,Edit,Bash,Glob,Grep",
+    ...model ? ["--model", model] : []
   ];
   const isWindows = process.platform === "win32";
   const child = spawn("claude", args, {
-    timeout: TIMEOUT_MS,
     shell: isWindows,
     stdio: ["ignore", "pipe", "pipe"]
   });
@@ -415,7 +432,7 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
   let currentStepHeader = "Analyzing existing setup...";
   let stepItems = [];
   let stepFileCount = 0;
-  const state = { doneReceived: false };
+  const state = { doneReceived: false, setupReached: false };
   const writtenFiles = [];
   const succeedCurrentStep = () => {
     if (!currentStepHeader) return;
@@ -432,11 +449,12 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
       return;
     }
     if (currentStepHeader.startsWith("Running setup")) {
-      const context2 = stepItems.length === 1 ? stepItems[0] : void 0;
-      stepper.succeed("Skillset setup completed", context2);
+      stepper.succeed("Skillset setup completed");
+      currentStepHeader = "";
       return;
     }
-    const context = stepItems.length === 1 ? stepItems[0] : void 0;
+    if (state.setupReached || currentStepHeader.startsWith("Cleaning")) return;
+    const context = stepItems.length > 0 ? stepItems.join(", ") : void 0;
     stepper.succeed(base, context);
   };
   stepper.start("Analyzing existing setup...", "skills");
@@ -468,13 +486,20 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
               if (isStepHeader(ln, trimmed)) {
                 if (trimmed === currentStepHeader) return;
                 succeedCurrentStep();
+                if (state.setupReached || trimmed.startsWith("Cleaning"))
+                  return;
                 currentStepHeader = trimmed;
                 stepItems = [];
                 stepFileCount = 0;
+                if (trimmed.startsWith("Running setup")) {
+                  state.setupReached = true;
+                }
                 stepper.start(trimmed, stepCategory(trimmed));
-              } else if (!currentStepHeader.startsWith("Integrating")) {
+              } else {
                 stepItems.push(trimmed);
-                stepper.item(trimmed);
+                if (currentStepHeader.startsWith("Integrating")) {
+                  stepper.item(trimmed);
+                }
               }
             });
           }
@@ -497,7 +522,9 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
       }
     });
   });
-  child.stderr.on("data", () => {
+  let stderrBuffer = "";
+  child.stderr.on("data", (chunk) => {
+    stderrBuffer += chunk.toString();
   });
   child.on("error", (err) => {
     if ("code" in err && err.code === "ENOENT") {
@@ -514,13 +541,20 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
     if (currentStepHeader) {
       succeedCurrentStep();
     }
-    const completed = state.doneReceived || resultText.length > 0;
+    state.doneReceived || resultText.length > 0;
+    const stderr = stderrBuffer.trim();
     if (code !== 0 && code !== null) {
-      reject(new Error(`Claude CLI exited with code ${code}`));
+      const detail = stderr ? `
+${stderr}` : "";
+      reject(new Error(`Claude CLI exited with code ${code}${detail}`));
       return;
     }
-    if (code === null && !completed) {
-      reject(new Error("Claude CLI was interrupted before completing"));
+    if (code === null) {
+      const detail = stderr ? `
+${stderr}` : "";
+      reject(
+        new Error(`Claude CLI was interrupted before completing${detail}`)
+      );
       return;
     }
     resolve2({
@@ -530,7 +564,12 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir) => new Promise(
     });
   });
 });
-const installSkillset = (input, stepper) => spawnClaude(writeInstructionsFile(input), stepper, input.providerDir);
+const installSkillset = (input, stepper) => spawnClaude(
+  writeInstructionsFile(input),
+  stepper,
+  input.providerDir,
+  input.model
+);
 const hash = (content) => createHash("sha256").update(content).digest("hex");
 const collectFiles = (dir) => readdirSync(dir).flatMap((entry) => {
   const fullPath = join(dir, entry);
@@ -779,12 +818,21 @@ const renderTree = (node, prefix = "") => node.children.flatMap((child, i) => {
   const name = isDir ? `${child.name}/` : child.name;
   return [`${prefix}${connector} ${name}`, ...renderTree(child, childPrefix)];
 });
-const printSummary = (files) => {
+const stripProviderPrefix = (file, prefix) => {
+  const norm = prefix.replace(/\\/g, "/").replace(/^\.\//, "");
+  if (file.startsWith(`${norm}/`)) return file.slice(norm.length + 1);
+  const bare = norm.replace(/^\./, "");
+  if (bare && file.startsWith(`${bare}/`)) return file.slice(bare.length + 1);
+  return file;
+};
+const printSummary = (files, providerPath) => {
   if (files.length === 0) return;
-  const unique = [...new Set(files)];
+  const unique = [...new Set(files)].map(
+    (f) => stripProviderPrefix(f, providerPath)
+  );
   const tree = buildFileTree(unique);
   process.stdout.write(`
-📂 Installed files:
+📂${providerPath}
 `);
   renderTree(tree).forEach((line) => {
     process.stdout.write(`  ${dim$1}${line}${reset$2}
@@ -796,7 +844,7 @@ const registerInstallCommand = (program2) => {
     const stepper = createStepper();
     const startedAt = Date.now();
     try {
-      const { config } = readConfig();
+      readConfig();
       stepper.start("Resolving endpoint...", "packages");
       const location = await resolveIdentifier(input);
       const locationRef = `${location.owner}/${location.repository}@${location.ref}`;
@@ -807,15 +855,13 @@ const registerInstallCommand = (program2) => {
         `Fetched skillset manifest`,
         `${skillset.name} v${skillset.version}`
       );
-      const providerEntry = Object.entries(config.providers).find(
-        ([name]) => name === skillset.provider
-      );
-      if (!providerEntry) {
+      const providerPath = knownProviders[skillset.provider];
+      if (!providerPath) {
         throw new Error(
-          `Provider "${skillset.provider}" not found in config. Run "spm init" to detect providers.`
+          `Unknown provider "${skillset.provider}". Known providers: ${Object.keys(knownProviders).join(", ")}`
         );
       }
-      const [, provider] = providerEntry;
+      const provider = { path: providerPath };
       const entries = resolveSkillset(skillset, location);
       if (entries.length === 0) {
         stepper.succeed("No files to download");
@@ -824,20 +870,26 @@ const registerInstallCommand = (program2) => {
       }
       const projectRoot = getProjectRoot();
       const downloadDir = join(projectRoot, ".spm", skillset.name);
-      const skillsetDir = location.path.replace(/\/[^/]+$/, "");
-      const stripPrefix = (p) => p.startsWith(`${skillsetDir}/`) ? p.slice(skillsetDir.length + 1) : p;
+      const toTargetPath = (entry) => {
+        if (entry.type === "skill" && entry.skillName) {
+          const fileName = entry.path.split("/").pop() ?? entry.path;
+          return `skills/${entry.skillName}/${fileName}`;
+        }
+        const skillsetDir = location.path.replace(/\/[^/]+$/, "");
+        return entry.path.startsWith(`${skillsetDir}/`) ? entry.path.slice(skillsetDir.length + 1) : entry.path;
+      };
       stepper.start(`Downloading ${entries.length} file(s)...`, "packages");
       const results = await downloadEntries(
         entries,
         location,
-        (type, path) => stepper.item(`${type} ${stripPrefix(path)}`)
+        (type, path) => stepper.item(`${type} ${path.split("/").pop() ?? path}`)
       );
       const setupResults = results.filter((r) => r.type === "setup");
       const installResults = results.filter((r) => r.type !== "setup");
       await Promise.all(
         installResults.map(async (result2) => {
-          const relative2 = stripPrefix(result2.path);
-          const filePath = safePath(downloadDir, relative2);
+          const target = toTargetPath(result2);
+          const filePath = safePath(downloadDir, target);
           await mkdir(dirname(filePath), { recursive: true });
           await writeFile(filePath, result2.content, "utf-8");
         })
@@ -845,30 +897,32 @@ const registerInstallCommand = (program2) => {
       let setupFile;
       if (setupResults.length > 0) {
         const setup = setupResults[0];
-        const relative2 = stripPrefix(setup.path);
-        setupFile = join(downloadDir, relative2);
+        setupFile = join(downloadDir, "SETUP.md");
         await mkdir(dirname(setupFile), { recursive: true });
         await writeFile(setupFile, setup.content, "utf-8");
       }
       stepper.succeed(`Downloaded ${results.length} file(s)`);
-      const downloadedPaths = installResults.map((r) => stripPrefix(r.path));
+      const downloadedPaths = installResults.map((r) => toTargetPath(r));
       const providerFullPath = join(projectRoot, provider.path);
       const pruned = pruneUnchanged(downloadDir, providerFullPath);
       if (pruned > 0) {
         stepper.succeed(`Skipped ${pruned} unchanged file(s)`);
       }
+      const model = skillset.provider === "claude" ? "haiku" : void 0;
       const result = await installSkillset(
         {
           downloadDir,
           setupFile,
-          providerDir: provider.path,
+          providerDir: providerFullPath,
           skillsetName: skillset.name,
           skillsetVersion: skillset.version,
           source: `@${location.owner}/${location.repository}`,
-          configPath: getConfigPath()
+          configPath: getConfigPath(),
+          model
         },
         stepper
       );
+      await rm(downloadDir, { recursive: true, force: true });
       stepper.stop();
       const elapsed = Math.round((Date.now() - startedAt) / 1e3);
       const timeStr = elapsed >= 60 ? `${Math.floor(elapsed / 60)}m${(elapsed % 60).toString().padStart(2, "0")}s` : `${elapsed}s`;
@@ -877,7 +931,12 @@ const registerInstallCommand = (program2) => {
 `
       );
       const summaryFiles = result.files.length > 0 ? result.files : downloadedPaths;
-      printSummary(summaryFiles);
+      printSummary(summaryFiles, provider.path);
+      process.stdout.write(
+        `
+🪄  ${cyan}Restart your AI agent to apply the new skills.${reset$2}
+`
+      );
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       stepper.fail(message);
@@ -901,7 +960,7 @@ const banner = (version2) => [
   `${shade}▝▜${light}████▛▘  ${reset$1}${dim}v${version2} ✨ supa-magic${reset$1}`,
   `${shade}  ▘${light}  ▝`
 ].join("\n");
-const version = "0.2.2";
+const version = "0.2.4";
 const program = new Command();
 const gray = "\x1B[90m";
 const reset = "\x1B[0m";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supa-magic/spm",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "CLI tool for managing AI skillsets",
   "license": "MIT",
   "contributors": [
@@ -28,11 +28,14 @@
   },
   "scripts": {
     "build": "vite build",
+    "install": "npm install @supa-magic/spm",
+    "link": "npm link",
     "pretest": "npm run build",
     "start": "clear && claude --dangerously-skip-permissions",
     "test": "vitest run",
     "test:watch": "vitest",
-    "tokscale": "npx tokscale@latest"
+    "un": "npm uninstall @supa-magic/spm",
+    "unlink": "npm unlink spm"
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.6",
@@ -43,6 +46,7 @@
     "vitest": "^4.0.18"
   },
   "dependencies": {
+    "@supa-magic/spm": "^0.2.3",
     "commander": "^14.0.3",
     "yaml": "^2.8.2"
   }