@caliber-ai/cli 0.21.0 → 0.22.0

package/dist/bin.js

@@ -583,11 +583,18 @@ function readExistingConfigs(dir) {
   const skillsDir = path7.join(dir, ".claude", "skills");
   if (fs6.existsSync(skillsDir)) {
     try {
-      const files = fs6.readdirSync(skillsDir).filter((f) => f.endsWith(".md"));
-      configs.claudeSkills = files.map((f) => ({
-        filename: f,
-        content: fs6.readFileSync(path7.join(skillsDir, f), "utf-8")
-      }));
+      const entries = fs6.readdirSync(skillsDir);
+      const skills = [];
+      for (const entry of entries) {
+        const entryPath = path7.join(skillsDir, entry);
+        const skillMdPath = path7.join(entryPath, "SKILL.md");
+        if (fs6.statSync(entryPath).isDirectory() && fs6.existsSync(skillMdPath)) {
+          skills.push({ filename: `${entry}/SKILL.md`, content: fs6.readFileSync(skillMdPath, "utf-8") });
+        } else if (entry.endsWith(".md")) {
+          skills.push({ filename: entry, content: fs6.readFileSync(entryPath, "utf-8") });
+        }
+      }
+      if (skills.length > 0) configs.claudeSkills = skills;
     } catch {
     }
   }
@@ -612,10 +619,10 @@ function readExistingConfigs(dir) {
       const slugs = fs6.readdirSync(cursorSkillsDir).filter((f) => {
         return fs6.statSync(path7.join(cursorSkillsDir, f)).isDirectory();
       });
-      configs.cursorSkills = slugs.filter((slug) => fs6.existsSync(path7.join(cursorSkillsDir, slug, "SKILL.md"))).map((slug) => ({
-        slug,
+      configs.cursorSkills = slugs.filter((slug) => fs6.existsSync(path7.join(cursorSkillsDir, slug, "SKILL.md"))).map((name) => ({
+        name,
         filename: "SKILL.md",
-        content: fs6.readFileSync(path7.join(cursorSkillsDir, slug, "SKILL.md"), "utf-8")
+        content: fs6.readFileSync(path7.join(cursorSkillsDir, name, "SKILL.md"), "utf-8")
       }));
     } catch {
     }
@@ -1126,12 +1133,18 @@ function writeClaudeConfig(config) {
   fs9.writeFileSync("CLAUDE.md", config.claudeMd);
   written.push("CLAUDE.md");
   if (config.skills?.length) {
-    const skillsDir = path10.join(".claude", "skills");
-    if (!fs9.existsSync(skillsDir)) fs9.mkdirSync(skillsDir, { recursive: true });
     for (const skill of config.skills) {
-      const filename = `${skill.name.replace(/[^a-z0-9-]/gi, "-").toLowerCase()}.md`;
-      const skillPath = path10.join(skillsDir, filename);
-      fs9.writeFileSync(skillPath, skill.content);
+      const skillDir = path10.join(".claude", "skills", skill.name);
+      if (!fs9.existsSync(skillDir)) fs9.mkdirSync(skillDir, { recursive: true });
+      const skillPath = path10.join(skillDir, "SKILL.md");
+      const frontmatter = [
+        "---",
+        `name: ${skill.name}`,
+        `description: ${skill.description}`,
+        "---",
+        ""
+      ].join("\n");
+      fs9.writeFileSync(skillPath, frontmatter + skill.content);
       written.push(skillPath);
     }
   }
@@ -1171,10 +1184,17 @@ function writeCursorConfig(config) {
   }
   if (config.skills?.length) {
     for (const skill of config.skills) {
-      const skillDir = path11.join(".cursor", "skills", skill.slug);
+      const skillDir = path11.join(".cursor", "skills", skill.name);
       if (!fs10.existsSync(skillDir)) fs10.mkdirSync(skillDir, { recursive: true });
       const skillPath = path11.join(skillDir, "SKILL.md");
-      fs10.writeFileSync(skillPath, skill.content);
+      const frontmatter = [
+        "---",
+        `name: ${skill.name}`,
+        `description: ${skill.description}`,
+        "---",
+        ""
+      ].join("\n");
+      fs10.writeFileSync(skillPath, frontmatter + skill.content);
       written.push(skillPath);
     }
   }
@@ -1186,9 +1206,7 @@ function writeCursorConfig(config) {
     try {
       if (fs10.existsSync(mcpPath)) {
         const existing = JSON.parse(fs10.readFileSync(mcpPath, "utf-8"));
-        if (existing.mcpServers) {
-          existingServers = existing.mcpServers;
-        }
+        if (existing.mcpServers) existingServers = existing.mcpServers;
       }
     } catch {
     }
@@ -1681,7 +1699,7 @@ async function initCommand(options) {
   }
   if (Array.isArray(ec.cursorSkills)) {
     for (const skill of ec.cursorSkills) {
-      localConfigs.push(`.cursor/skills/${skill.slug}/SKILL.md`);
+      localConfigs.push(`.cursor/skills/${skill.name}/SKILL.md`);
     }
   }
   let existingSetup = null;
@@ -1997,25 +2015,24 @@ function openReview(method, stagedFiles) {
     console.log(chalk3.dim("  Diffs opened in your editor.\n"));
   } else {
     for (const file of stagedFiles) {
-      console.log(chalk3.bold(`  ${file.relativePath}`));
       if (file.currentPath) {
-        const current = fs17.readFileSync(file.currentPath, "utf-8");
-        const proposed = fs17.readFileSync(file.proposedPath, "utf-8");
-        const patch = createTwoFilesPatch(file.relativePath, file.relativePath, current, proposed, "current", "proposed");
-        for (const line of patch.split("\n").slice(2)) {
-          if (line.startsWith("+")) console.log(chalk3.green(`    ${line}`));
-          else if (line.startsWith("-")) console.log(chalk3.red(`    ${line}`));
-          else console.log(chalk3.dim(`    ${line}`));
+        const currentLines = fs17.readFileSync(file.currentPath, "utf-8").split("\n");
+        const proposedLines = fs17.readFileSync(file.proposedPath, "utf-8").split("\n");
+        const patch = createTwoFilesPatch(file.relativePath, file.relativePath, currentLines.join("\n"), proposedLines.join("\n"));
+        let added = 0, removed = 0;
+        for (const line of patch.split("\n")) {
+          if (line.startsWith("+") && !line.startsWith("+++")) added++;
+          if (line.startsWith("-") && !line.startsWith("---")) removed++;
         }
+        console.log(`    ${chalk3.yellow("~")} ${file.relativePath}  ${chalk3.green(`+${added}`)} ${chalk3.red(`-${removed}`)}`);
       } else {
-        console.log(chalk3.green("    (new file)"));
-        const content = fs17.readFileSync(file.proposedPath, "utf-8");
-        const preview = content.split("\n").slice(0, 20);
-        for (const line of preview) console.log(chalk3.green(`    +${line}`));
-        if (content.split("\n").length > 20) console.log(chalk3.dim(`    ... ${content.split("\n").length - 20} more lines`));
+        const lines = fs17.readFileSync(file.proposedPath, "utf-8").split("\n").length;
+        console.log(`    ${chalk3.green("+")} ${file.relativePath}  ${chalk3.dim(`${lines} lines`)}`);
       }
-      console.log("");
     }
+    console.log("");
+    console.log(chalk3.dim(`  Files staged at .caliber/staged/ for manual inspection.
+`));
   }
 }
 async function promptReviewAction() {
@@ -2051,11 +2068,11 @@ function printSetupSummary(setup) {
     const skills = claude.skills;
     if (Array.isArray(skills) && skills.length > 0) {
       for (const skill of skills) {
-        const skillPath = `.claude/skills/${skill.name.replace(/[^a-z0-9-]/gi, "-").toLowerCase()}.md`;
+        const skillPath = `.claude/skills/${skill.name}/SKILL.md`;
         const icon = fs17.existsSync(skillPath) ? chalk3.yellow("~") : chalk3.green("+");
         const desc = getDescription(skillPath);
         console.log(`  ${icon} ${chalk3.bold(skillPath)}`);
-        console.log(chalk3.dim(`    ${desc || summarizeSkill(skill)}`));
+        console.log(chalk3.dim(`    ${desc || skill.description || skill.name}`));
         console.log("");
       }
     }
@@ -2071,16 +2088,11 @@ function printSetupSummary(setup) {
     const cursorSkills = cursor.skills;
     if (Array.isArray(cursorSkills) && cursorSkills.length > 0) {
       for (const skill of cursorSkills) {
-        const skillPath = `.cursor/skills/${skill.slug}/SKILL.md`;
+        const skillPath = `.cursor/skills/${skill.name}/SKILL.md`;
         const icon = fs17.existsSync(skillPath) ? chalk3.yellow("~") : chalk3.green("+");
         const desc = getDescription(skillPath);
         console.log(`  ${icon} ${chalk3.bold(skillPath)}`);
-        if (desc) {
-          console.log(chalk3.dim(`    ${desc}`));
-        } else {
-          const firstLine = skill.content.split("\n").filter((l) => l.trim() && !l.trim().startsWith("#") && !l.trim().startsWith("---"))[0];
-          if (firstLine) console.log(chalk3.dim(`    ${firstLine.trim().slice(0, 80)}`));
-        }
+        console.log(chalk3.dim(`    ${desc || skill.description || skill.name}`));
         console.log("");
       }
     }
@@ -2111,9 +2123,14 @@ function printSetupSummary(setup) {
   console.log(`  ${chalk3.green("+")} ${chalk3.dim("new")}  ${chalk3.yellow("~")} ${chalk3.dim("modified")}  ${chalk3.red("-")} ${chalk3.dim("removed")}`);
   console.log("");
 }
-function summarizeSkill(skill) {
-  const lines = skill.content.split("\n").filter((l) => l.trim() && !l.trim().startsWith("#"));
-  return lines[0]?.trim().slice(0, 80) || skill.name;
+function buildSkillContent(skill) {
+  const frontmatter = `---
+name: ${skill.name}
+description: ${skill.description}
+---
+
+`;
+  return frontmatter + skill.content;
 }
 function collectSetupFiles(setup) {
   const files = [];
@@ -2124,8 +2141,7 @@ function collectSetupFiles(setup) {
     const skills = claude.skills;
     if (Array.isArray(skills)) {
       for (const skill of skills) {
-        const skillPath = `.claude/skills/${skill.name.replace(/[^a-z0-9-]/gi, "-").toLowerCase()}.md`;
-        files.push({ path: skillPath, content: skill.content });
+        files.push({ path: `.claude/skills/${skill.name}/SKILL.md`, content: buildSkillContent(skill) });
       }
     }
   }
@@ -2134,7 +2150,7 @@ function collectSetupFiles(setup) {
     const cursorSkills = cursor.skills;
     if (Array.isArray(cursorSkills)) {
       for (const skill of cursorSkills) {
-        files.push({ path: `.cursor/skills/${skill.slug}/SKILL.md`, content: skill.content });
+        files.push({ path: `.cursor/skills/${skill.name}/SKILL.md`, content: buildSkillContent(skill) });
       }
     }
     const rules = cursor.rules;
@@ -2256,13 +2272,13 @@ function scanLocalState(dir) {
   const cursorSkillsDir = path16.join(dir, ".cursor", "skills");
   if (fs18.existsSync(cursorSkillsDir)) {
     try {
-      for (const slug of fs18.readdirSync(cursorSkillsDir)) {
-        const skillFile = path16.join(cursorSkillsDir, slug, "SKILL.md");
+      for (const name of fs18.readdirSync(cursorSkillsDir)) {
+        const skillFile = path16.join(cursorSkillsDir, name, "SKILL.md");
         if (fs18.existsSync(skillFile)) {
           items.push({
             type: "skill",
             platform: "cursor",
-            name: `${slug}/SKILL.md`,
+            name: `${name}/SKILL.md`,
             contentHash: hashFile(skillFile),
             path: skillFile
           });
@@ -2500,7 +2516,7 @@ function getSkillPath(platform, slug) {
   if (platform === "cursor") {
     return join(".cursor", "skills", slug, "SKILL.md");
   }
-  return join(".claude", "skills", `${slug}.md`);
+  return join(".claude", "skills", slug, "SKILL.md");
 }
 async function recommendCommand(options) {
   const auth2 = getStoredAuth();