@dealdeploy/skl 0.4.0 → 1.0.0

package/add.ts

@@ -1,6 +1,5 @@
-import { existsSync, lstatSync, mkdirSync, writeFileSync, unlinkSync } from "fs";
+import { existsSync, lstatSync, mkdirSync, rmSync } from "fs";
 import { join } from "path";
-import { homedir } from "os";
 import {
   createCliRenderer,
   BoxRenderable,
@@ -9,14 +8,14 @@ import {
   TextAttributes,
   type KeyEvent,
 } from "@opentui/core";
+import { catalogDir, addToLock, downloadSkillFiles, type LockEntry } from "./lib.ts";
 
-const LIBRARY = join(homedir(), "dotfiles/skills");
+const CATALOG = catalogDir();
 
-let repo = process.argv[3];
+let repo = process.argv[3] ?? "";
 if (repo) {
-  // Accept GitHub URLs: https://github.com/owner/repo[/...]
   const urlMatch = repo.match(/github\.com\/([^/]+\/[^/]+)/);
-  if (urlMatch) repo = urlMatch[1].replace(/\.git$/, "");
+  if (urlMatch) repo = urlMatch[1]!.replace(/\.git$/, "");
 }
 if (!repo || !/^[^/]+\/[^/]+$/.test(repo)) {
   console.error("Usage: skl add owner/repo");
@@ -40,17 +39,15 @@ async function gh(args: string): Promise<string> {
 }
 
 function skillExists(name: string): boolean {
-  const p = join(LIBRARY, name);
+  const p = join(CATALOG, name);
   try {
-    const stat = lstatSync(p);
-    if (stat.isDirectory()) return true;
-    return false;
+    return lstatSync(p).isDirectory();
   } catch {
     return false;
   }
 }
 
-// ── Colors (matching index.ts) ───────────────────────────────────────
+// ── Colors ───────────────────────────────────────────────────────────
 
 const C = {
   bg: "#1a1a2e",
@@ -71,7 +68,7 @@ const C = {
   statusErr: "#ff6666",
 };
 
-// ── Fetch phase (plain stdout) ───────────────────────────────────────
+// ── Fetch phase ─────────────────────────────────────────────────────
 
 console.log(`Fetching ${repo}...`);
 
@@ -87,15 +84,19 @@ try {
 const treeJson = JSON.parse(
   await gh(`repos/${repo}/git/trees/${branch}?recursive=1`)
 );
-const tree: { path: string; type: string }[] = treeJson.tree;
+const tree: { path: string; type: string; sha: string }[] = treeJson.tree;
 
-// Find SKILL.md at any depth (supports both flat "name/SKILL.md" and nested "skill/name/SKILL.md")
+// Find SKILL.md at any depth
 const skillEntries = tree
   .filter((e) => e.type === "blob" && e.path.endsWith("/SKILL.md"))
   .map((e) => {
-    const prefix = e.path.replace(/\/SKILL\.md$/, ""); // e.g. "skill/opentui" or "opentui"
-    const name = prefix.split("/").pop()!; // last segment is the skill name
-    return { prefix, name };
+    const prefix = e.path.replace(/\/SKILL\.md$/, "");
+    const name = prefix.split("/").pop()!;
+    // Find the tree SHA for this skill's directory
+    const dirEntry = tree.find(
+      (t) => t.path === prefix && t.type === "tree"
+    );
+    return { prefix, name, treeSHA: dirEntry?.sha ?? "" };
   })
   .sort((a, b) => a.name.localeCompare(b.name));
 
@@ -106,16 +107,17 @@ if (skillEntries.length === 0) {
 
 // ── Classify skills ──────────────────────────────────────────────────
 
-type SkillEntry = { name: string; prefix: string; exists: boolean };
-const skills: SkillEntry[] = skillEntries.map(({ name, prefix }) => ({
+type SkillEntry = { name: string; prefix: string; treeSHA: string; exists: boolean };
+const skills: SkillEntry[] = skillEntries.map(({ name, prefix, treeSHA }) => ({
   name,
   prefix,
+  treeSHA,
   exists: skillExists(name),
 }));
 
 const addableCount = skills.filter((s) => !s.exists).length;
 if (addableCount === 0) {
-  console.log("All skills already exist in your library.");
+  console.log("All skills already exist in your catalog.");
   process.exit(0);
 }
 
@@ -126,9 +128,8 @@ const checked = new Set<number>();
 let statusTimeout: ReturnType<typeof setTimeout> | null = null;
 let exitResolve: () => void;
 
-// Start cursor on first addable skill
 for (let i = 0; i < skills.length; i++) {
-  if (!skills[i].exists) { cursor = i; break; }
+  if (!skills[i]!.exists) { cursor = i; break; }
 }
 
 // ── Build TUI ────────────────────────────────────────────────────────
@@ -153,7 +154,7 @@ const header = new TextRenderable(renderer, {
 
 const sep = new TextRenderable(renderer, {
   id: "sep",
-  content: "─".repeat(60),
+  content: "\u2500".repeat(60),
   fg: C.border,
   height: 1,
 });
@@ -172,7 +173,7 @@ type RowRefs = {
 const rows: RowRefs[] = [];
 
 for (let i = 0; i < skills.length; i++) {
-  const skill = skills[i];
+  const skill = skills[i]!;
 
   const row = new BoxRenderable(renderer, {
     id: `row-${i}`,
@@ -206,7 +207,7 @@ for (let i = 0; i < skills.length; i++) {
 
 const footerSep = new TextRenderable(renderer, {
   id: "footer-sep",
-  content: "─".repeat(60),
+  content: "\u2500".repeat(60),
   fg: C.border,
   height: 1,
 });
@@ -236,8 +237,8 @@ renderer.root.add(outer);
 // ── Display helpers ──────────────────────────────────────────────────
 
 function updateRow(i: number) {
-  const skill = skills[i];
-  const r = rows[i];
+  const skill = skills[i]!;
+  const r = rows[i]!;
   const isCursor = cursor === i;
 
   const baseBg = i % 2 === 0 ? C.rowBg : C.rowAltBg;
@@ -246,7 +247,7 @@ function updateRow(i: number) {
   if (skill.exists) {
     r.checkText.content = "[*]";
     r.checkText.fg = C.fgDim;
-    const pointer = isCursor ? "▸" : " ";
+    const pointer = isCursor ? "\u25b8" : " ";
     r.nameText.content = `${pointer} ${skill.name} (exists)`;
     r.nameText.fg = C.fgDim;
     r.nameText.attributes = isCursor ? TextAttributes.BOLD : TextAttributes.NONE;
@@ -254,7 +255,7 @@ function updateRow(i: number) {
     const isChecked = checked.has(i);
     r.checkText.content = isChecked ? "[x]" : "[ ]";
     r.checkText.fg = isCursor ? C.accent : (isChecked ? C.checked : C.unchecked);
-    const pointer = isCursor ? "▸" : " ";
+    const pointer = isCursor ? "\u25b8" : " ";
     r.nameText.content = `${pointer} ${skill.name}`;
     r.nameText.fg = isCursor ? "#ffffff" : C.fg;
     r.nameText.attributes = isCursor ? TextAttributes.BOLD : TextAttributes.NONE;
@@ -292,56 +293,48 @@ refreshAll();
 // ── Confirm & download ───────────────────────────────────────────────
 
 async function confirmAndDownload() {
-  const selected = [...checked].map((i) => skills[i].name);
+  const selected = [...checked].map((i) => skills[i]!);
   if (selected.length === 0) {
-    setStatus("Nothing selected — use space to toggle", C.warning);
+    setStatus("Nothing selected \u2014 use space to toggle", C.warning);
     return;
   }
 
   renderer.destroy();
 
-  // Download phase — plain stdout like before
-  const baseUrl = `https://raw.githubusercontent.com/${repo}/${branch}`;
+  mkdirSync(CATALOG, { recursive: true });
 
-  for (const skillName of selected) {
-    const skill = skills.find((s) => s.name === skillName)!;
-    const skillDir = join(LIBRARY, skillName);
+  for (const skill of selected) {
+    const skillDir = join(CATALOG, skill.name);
 
-    // Remove broken symlink if present
+    // Remove broken remnant if present
     try {
       if (lstatSync(skillDir).isSymbolicLink()) {
-        unlinkSync(skillDir);
+        rmSync(skillDir, { force: true });
       }
     } catch {}
 
     mkdirSync(skillDir, { recursive: true });
 
-    const prefix = skill.prefix + "/";
-    const files = tree
-      .filter((e) => e.type === "blob" && e.path.startsWith(prefix))
-      .map((e) => e.path);
+    process.stdout.write(`  ${skill.name}...`);
 
-    process.stdout.write(`  ${skillName} (${files.length} files)...`);
+    const fileCount = await downloadSkillFiles(
+      repo!, branch, skill.prefix, skillDir, tree,
+    );
 
-    for (const filePath of files) {
-      const url = `${baseUrl}/${filePath}`;
-      const resp = await fetch(url);
-      if (!resp.ok) {
-        console.error(`\n    Failed to fetch ${filePath}: ${resp.status}`);
-        continue;
-      }
-      const content = await resp.arrayBuffer();
-      // Remap: strip the repo prefix and save under the skill name
-      const relativePath = filePath.substring(prefix.length);
-      const dest = join(LIBRARY, skillName, relativePath);
-      const dir = dest.substring(0, dest.lastIndexOf("/"));
-      mkdirSync(dir, { recursive: true });
-      writeFileSync(dest, Buffer.from(content));
-    }
-    console.log(" done");
+    // Write lock entry
+    const entry: LockEntry = {
+      source: repo!,
+      sourceUrl: `https://github.com/${repo}`,
+      skillPath: skill.prefix,
+      treeSHA: skill.treeSHA,
+      addedAt: new Date().toISOString(),
+    };
+    addToLock(skill.name, entry);
+
+    console.log(` done (${fileCount} files)`);
   }
 
-  console.log(`\nAdded ${selected.length} skill(s) to ~/dotfiles/skills/`);
+  console.log(`\nAdded ${selected.length} skill(s) to ~/.skl/catalog/`);
   exitResolve();
 }
 
@@ -360,8 +353,8 @@ renderer.keyInput.on("keypress", (key: KeyEvent) => {
       if (cursor > 0) cursor--;
       break;
     case "space": {
-      if (skills[cursor].exists) {
-        setStatus(`${skills[cursor].name} already exists`, C.warning);
+      if (skills[cursor]!.exists) {
+        setStatus(`${skills[cursor]!.name} already exists`, C.warning);
         break;
       }
       if (checked.has(cursor)) {
@@ -372,7 +365,6 @@ renderer.keyInput.on("keypress", (key: KeyEvent) => {
       break;
     }
     case "a": {
-      // Toggle all addable skills
       const addable = skills
         .map((s, i) => (!s.exists ? i : -1))
         .filter((i) => i >= 0);
@@ -405,7 +397,6 @@ renderer.keyInput.on("keypress", (key: KeyEvent) => {
   ensureVisible();
 });
 
-// Block module from resolving until TUI exits
 await new Promise<void>((resolve) => {
   exitResolve = resolve;
 });