@supa-magic/spm 0.2.3 → 0.2.4

package/dist/bin/spm.js

@@ -3,7 +3,7 @@ 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 { 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";
@@ -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;
@@ -436,7 +454,7 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir, model) => new P
       return;
     }
     if (state.setupReached || currentStepHeader.startsWith("Cleaning")) return;
-    const context = stepItems.length === 1 ? stepItems[0] : void 0;
+    const context = stepItems.length > 0 ? stepItems.join(", ") : void 0;
     stepper.succeed(base, context);
   };
   stepper.start("Analyzing existing setup...", "skills");
@@ -477,9 +495,11 @@ const spawnClaude = (instructionsFilePath, stepper, providerDir, model) => new P
                   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);
+                }
               }
             });
           }
@@ -800,7 +820,10 @@ const renderTree = (node, prefix = "") => node.children.flatMap((child, i) => {
 });
 const stripProviderPrefix = (file, prefix) => {
   const norm = prefix.replace(/\\/g, "/").replace(/^\.\//, "");
-  return file.startsWith(`${norm}/`) ? file.slice(norm.length + 1) : file;
+  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;
@@ -847,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");
         })
@@ -868,13 +897,12 @@ 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) {
@@ -932,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.3";
+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.3",
+  "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"
   }