@dealdeploy/skl 0.4.0 → 1.1.0

package/add.ts

@@ -1,25 +1,24 @@
-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 } from "@opentui/core";
 import {
-  createCliRenderer,
-  BoxRenderable,
-  TextRenderable,
-  ScrollBoxRenderable,
-  TextAttributes,
-  type KeyEvent,
-} from "@opentui/core";
-
-const LIBRARY = join(homedir(), "dotfiles/skills");
-
-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 (!repo || !/^[^/]+\/[^/]+$/.test(repo)) {
-  console.error("Usage: skl add owner/repo");
+  catalogDir,
+  addToLock,
+  downloadSkillFiles,
+  findSkillEntries,
+  parseRepoArg,
+  type LockEntry,
+  type TreeEntry,
+} from "./lib.ts";
+import { createAddTui, type AddSkillEntry } from "./add-tui.ts";
+
+const CATALOG = catalogDir();
+
+const allFlag = process.argv.includes("--all");
+const repoArg = process.argv.slice(3).find((a) => !a.startsWith("-")) ?? "";
+const repo = parseRepoArg(repoArg);
+if (!repo) {
+  console.error("Usage: skl add owner/repo [--all]");
   process.exit(1);
 }
 
@@ -40,38 +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) ───────────────────────────────────────
-
-const C = {
-  bg: "#1a1a2e",
-  rowBg: "#1a1a2e",
-  rowAltBg: "#1f1f38",
-  cursorBg: "#2a2a5a",
-  accentBg: "#3a3a7a",
-  border: "#444477",
-  fg: "#ccccdd",
-  fgDim: "#666688",
-  checked: "#66ff88",
-  unchecked: "#555566",
-  warning: "#ffaa44",
-  accent: "#8888ff",
-  title: "#aaaaff",
-  footer: "#888899",
-  statusOk: "#66ff88",
-  statusErr: "#ff6666",
-};
-
-// ── Fetch phase (plain stdout) ───────────────────────────────────────
+// ── Fetch phase ─────────────────────────────────────────────────────
 
 console.log(`Fetching ${repo}...`);
 
@@ -87,17 +63,9 @@ try {
 const treeJson = JSON.parse(
   await gh(`repos/${repo}/git/trees/${branch}?recursive=1`)
 );
-const tree: { path: string; type: string }[] = treeJson.tree;
+const tree: TreeEntry[] = treeJson.tree;
 
-// Find SKILL.md at any depth (supports both flat "name/SKILL.md" and nested "skill/name/SKILL.md")
-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 };
-  })
-  .sort((a, b) => a.name.localeCompare(b.name));
+const skillEntries = findSkillEntries(tree);
 
 if (skillEntries.length === 0) {
   console.error(`No skills found in ${repo} (no directories with SKILL.md)`);
@@ -106,306 +74,91 @@ if (skillEntries.length === 0) {
 
 // ── Classify skills ──────────────────────────────────────────────────
 
-type SkillEntry = { name: string; prefix: string; exists: boolean };
-const skills: SkillEntry[] = skillEntries.map(({ name, prefix }) => ({
+const skills: AddSkillEntry[] = 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.");
+const addable = skills.filter((s) => !s.exists);
+if (addable.length === 0) {
+  console.log("All skills already exist in your catalog.");
   process.exit(0);
 }
 
-// ── State ────────────────────────────────────────────────────────────
-
-let cursor = 0;
-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; }
-}
-
-// ── Build TUI ────────────────────────────────────────────────────────
-
-const renderer = await createCliRenderer({ exitOnCtrlC: true });
-
-const outer = new BoxRenderable(renderer, {
-  id: "outer",
-  width: "100%",
-  height: "100%",
-  flexDirection: "column",
-  backgroundColor: C.bg,
-});
-
-const header = new TextRenderable(renderer, {
-  id: "header",
-  content: ` Add skills from ${repo}`,
-  fg: C.title,
-  attributes: TextAttributes.BOLD,
-  height: 1,
-});
-
-const sep = new TextRenderable(renderer, {
-  id: "sep",
-  content: "─".repeat(60),
-  fg: C.border,
-  height: 1,
-});
-
-const scrollBox = new ScrollBoxRenderable(renderer, {
-  id: "skill-list",
-  flexGrow: 1,
-  width: "100%",
-});
-
-type RowRefs = {
-  row: BoxRenderable;
-  checkText: TextRenderable;
-  nameText: TextRenderable;
-};
-const rows: RowRefs[] = [];
-
-for (let i = 0; i < skills.length; i++) {
-  const skill = skills[i];
-
-  const row = new BoxRenderable(renderer, {
-    id: `row-${i}`,
-    flexDirection: "row",
-    height: 1,
-    width: "100%",
-    paddingLeft: 1,
-    backgroundColor: i % 2 === 0 ? C.rowBg : C.rowAltBg,
-  });
-
-  const checkText = new TextRenderable(renderer, {
-    id: `check-${i}`,
-    content: skill.exists ? "[*]" : "[ ]",
-    fg: skill.exists ? C.fgDim : C.unchecked,
-    width: 4,
-  });
-
-  const label = skill.exists ? `${skill.name} (exists)` : skill.name;
-  const nameText = new TextRenderable(renderer, {
-    id: `name-${i}`,
-    content: `  ${label}`,
-    fg: skill.exists ? C.fgDim : C.fg,
-    width: 40,
-  });
-
-  row.add(checkText);
-  row.add(nameText);
-  scrollBox.add(row);
-  rows.push({ row, checkText, nameText });
-}
-
-const footerSep = new TextRenderable(renderer, {
-  id: "footer-sep",
-  content: "─".repeat(60),
-  fg: C.border,
-  height: 1,
-});
-
-const footer = new TextRenderable(renderer, {
-  id: "footer",
-  content: " j/k move  space toggle  a all  enter confirm  q cancel",
-  fg: C.footer,
-  height: 1,
-});
-
-const statusLine = new TextRenderable(renderer, {
-  id: "status",
-  content: "",
-  fg: C.statusOk,
-  height: 1,
-});
-
-outer.add(header);
-outer.add(sep);
-outer.add(scrollBox);
-outer.add(footerSep);
-outer.add(footer);
-outer.add(statusLine);
-renderer.root.add(outer);
+// ── Download helper ─────────────────────────────────────────────────
 
-// ── Display helpers ──────────────────────────────────────────────────
+async function downloadSelected(selected: AddSkillEntry[]) {
+  mkdirSync(CATALOG, { recursive: true });
+  let added = 0;
 
-function updateRow(i: number) {
-  const skill = skills[i];
-  const r = rows[i];
-  const isCursor = cursor === i;
+  for (const skill of selected) {
+    const skillDir = join(CATALOG, skill.name);
 
-  const baseBg = i % 2 === 0 ? C.rowBg : C.rowAltBg;
-  r.row.backgroundColor = isCursor ? C.cursorBg : baseBg;
-
-  if (skill.exists) {
-    r.checkText.content = "[*]";
-    r.checkText.fg = C.fgDim;
-    const pointer = isCursor ? "▸" : " ";
-    r.nameText.content = `${pointer} ${skill.name} (exists)`;
-    r.nameText.fg = C.fgDim;
-    r.nameText.attributes = isCursor ? TextAttributes.BOLD : TextAttributes.NONE;
-  } else {
-    const isChecked = checked.has(i);
-    r.checkText.content = isChecked ? "[x]" : "[ ]";
-    r.checkText.fg = isCursor ? C.accent : (isChecked ? C.checked : C.unchecked);
-    const pointer = isCursor ? "▸" : " ";
-    r.nameText.content = `${pointer} ${skill.name}`;
-    r.nameText.fg = isCursor ? "#ffffff" : C.fg;
-    r.nameText.attributes = isCursor ? TextAttributes.BOLD : TextAttributes.NONE;
-  }
-}
-
-function setStatus(msg: string, color: string) {
-  statusLine.content = ` ${msg}`;
-  statusLine.fg = color;
-  if (statusTimeout) clearTimeout(statusTimeout);
-  statusTimeout = setTimeout(() => {
-    statusLine.content = "";
-  }, 3000);
-}
-
-function selectedCount(): number {
-  return checked.size;
-}
-
-function updateHeader() {
-  header.content = ` Add skills from ${repo}  (${selectedCount()} selected)`;
-}
-
-function refreshAll() {
-  for (let i = 0; i < skills.length; i++) updateRow(i);
-  updateHeader();
-}
-
-function ensureVisible() {
-  scrollBox.scrollTo(Math.max(0, cursor - 2));
-}
-
-refreshAll();
-
-// ── Confirm & download ───────────────────────────────────────────────
-
-async function confirmAndDownload() {
-  const selected = [...checked].map((i) => skills[i].name);
-  if (selected.length === 0) {
-    setStatus("Nothing selected — use space to toggle", C.warning);
-    return;
-  }
-
-  renderer.destroy();
-
-  // Download phase — plain stdout like before
-  const baseUrl = `https://raw.githubusercontent.com/${repo}/${branch}`;
-
-  for (const skillName of selected) {
-    const skill = skills.find((s) => s.name === skillName)!;
-    const skillDir = join(LIBRARY, skillName);
-
-    // Remove broken symlink if present
     try {
       if (lstatSync(skillDir).isSymbolicLink()) {
-        unlinkSync(skillDir);
+        rmSync(skillDir, { force: true });
       }
     } catch {}
 
     mkdirSync(skillDir, { recursive: true });
+    try {
+      const fileCount = await downloadSkillFiles(
+        repo, branch, skill.prefix, skillDir, tree,
+      );
+
+      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(`  ${skill.name} — added (${fileCount} files)`);
+      added++;
+    } catch (e: any) {
+      console.log(`  ${skill.name} — failed (${e.message})`);
+    }
+  }
 
-    const prefix = skill.prefix + "/";
-    const files = tree
-      .filter((e) => e.type === "blob" && e.path.startsWith(prefix))
-      .map((e) => e.path);
+  console.log(`\nAdded ${added}/${selected.length} skill(s) to ~/.skl/catalog/`);
+}
 
-    process.stdout.write(`  ${skillName} (${files.length} files)...`);
+// ── --all: skip TUI ─────────────────────────────────────────────────
 
-    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");
+if (allFlag) {
+  const skipped = skills.filter((s) => s.exists);
+  for (const s of skipped) {
+    console.log(`  ${s.name} — skipped (already exists)`);
   }
-
-  console.log(`\nAdded ${selected.length} skill(s) to ~/dotfiles/skills/`);
-  exitResolve();
+  console.log(`Adding ${addable.length} skill(s)...`);
+  await downloadSelected(addable);
+  process.exit(0);
 }
 
-// ── Key handler ──────────────────────────────────────────────────────
+// ── TUI ─────────────────────────────────────────────────────────────
 
-renderer.keyInput.on("keypress", (key: KeyEvent) => {
-  const prevCursor = cursor;
+let exitResolve: () => void;
 
-  switch (key.name) {
-    case "j":
-    case "down":
-      if (cursor < skills.length - 1) cursor++;
-      break;
-    case "k":
-    case "up":
-      if (cursor > 0) cursor--;
-      break;
-    case "space": {
-      if (skills[cursor].exists) {
-        setStatus(`${skills[cursor].name} already exists`, C.warning);
-        break;
-      }
-      if (checked.has(cursor)) {
-        checked.delete(cursor);
-      } else {
-        checked.add(cursor);
-      }
-      break;
-    }
-    case "a": {
-      // Toggle all addable skills
-      const addable = skills
-        .map((s, i) => (!s.exists ? i : -1))
-        .filter((i) => i >= 0);
-      const allChecked = addable.every((i) => checked.has(i));
-      if (allChecked) {
-        for (const i of addable) checked.delete(i);
-      } else {
-        for (const i of addable) checked.add(i);
-      }
-      for (const i of addable) updateRow(i);
-      updateHeader();
-      ensureVisible();
-      return;
-    }
-    case "return":
-      confirmAndDownload();
-      return;
-    case "q":
-    case "escape":
-      renderer.destroy();
-      exitResolve();
-      return;
-    default:
-      return;
-  }
+const renderer = await createCliRenderer({ exitOnCtrlC: true });
 
-  if (prevCursor !== cursor) updateRow(prevCursor);
-  updateRow(cursor);
-  updateHeader();
-  ensureVisible();
+createAddTui(renderer, {
+  repo,
+  skills,
+  async onConfirm(selected) {
+    renderer.destroy();
+    await downloadSelected(selected);
+    exitResolve();
+  },
+  onCancel() {
+    renderer.destroy();
+    exitResolve();
+  },
 });
 
-// Block module from resolving until TUI exits
 await new Promise<void>((resolve) => {
   exitResolve = resolve;
 });