@dealdeploy/skl 1.4.0 → 1.6.0

package/add-tui.ts

@@ -202,7 +202,9 @@ export function createAddTui(renderer: CliRenderer, deps: AddTuiDeps) {
   renderer.keyInput.on("keypress", (key: KeyEvent) => {
     const prevCursor = cursor;
 
-    switch (key.name) {
+    const navKey = (key.ctrl && { h: "left", j: "down", k: "up", l: "right" }[key.name]) || key.name;
+
+    switch (navKey) {
       case "j":
       case "down":
         if (cursor < skills.length - 1) cursor++;

package/index.ts

@@ -4,7 +4,7 @@ import { createCliRenderer } from "@opentui/core";
 import { existsSync, rmSync, mkdirSync, readdirSync, statSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
-import { getCatalogSkills, removeFromLock, catalogDir, buildAddArgs, readLock, detectProjectAgents } from "./lib.ts";
+import { getCatalogSkills, removeFromLock, removeFromProjectLock, catalogDir, buildAddArgs, readLock, detectProjectAgents } from "./lib.ts";
 import { createTui, type ColId } from "./tui.ts";
 import { checkForUpdate } from "./update-check.ts";
 
@@ -122,7 +122,10 @@ const tui = createTui(renderer, {
       new Response(proc.stdout).text(),
       new Response(proc.stderr).text(),
     ]);
-    if (code === 0) return true;
+    if (code === 0) {
+      if (!enable && !isGlobal) removeFromProjectLock(name, process.cwd());
+      return true;
+    }
     if (debug) {
       return (stderr || stdout).trim() || `exit code ${code}`;
     }
@@ -148,6 +151,7 @@ const tui = createTui(renderer, {
     for (const p of procs) await p.exited;
     rmSync(join(CATALOG, name), { recursive: true, force: true });
     removeFromLock(name);
+    removeFromProjectLock(name, process.cwd());
   },
 
   async onEdit(name: string) {

package/lib.test.ts

@@ -16,7 +16,6 @@ import {
   findSkillEntries,
   parseRepoArg,
   buildAddArgs,
-  readSkillFrontmatterName,
   detectProjectAgents,
   parseSkillsListOutput,
   planUpdates,
@@ -289,7 +288,7 @@ describe("parseRepoArg", () => {
 // ── buildAddArgs ────────────────────────────────────────────────────
 
 describe("buildAddArgs", () => {
-  test("uses lock entry sourceUrl for remote skill with project agents", () => {
+  test("uses owner/repo/skillPath shorthand for remote skill with project agents", () => {
     const entry: LockEntry = {
       source: "owner/repo",
       sourceUrl: "https://github.com/owner/repo",
@@ -300,7 +299,7 @@ describe("buildAddArgs", () => {
     addToLock("myskill", entry);
 
     const args = buildAddArgs("/catalog", "myskill", false, ["claude-code", "roo"]);
-    expect(args).toEqual(["add", "https://github.com/owner/repo", "--skill", "myskill", "-y", "--agent", "claude-code", "roo"]);
+    expect(args).toEqual(["add", "owner/repo/skills/myskill", "-y", "--agent", "claude-code", "roo"]);
   });
 
   test("global install does not pass --agent", () => {
@@ -316,6 +315,7 @@ describe("buildAddArgs", () => {
     const args = buildAddArgs("/catalog", "myskill", true, ["claude-code"]);
     expect(args).toContain("-g");
     expect(args).not.toContain("--agent");
+    expect(args).toContain("owner/repo/skills/myskill");
   });
 
   test("uses catalog path for hand-authored skill with project agents", () => {
@@ -328,14 +328,7 @@ describe("buildAddArgs", () => {
     expect(args).toEqual(["add", "/my/catalog/custom-skill", "-y", "-g"]);
   });
 
-  test("uses SKILL.md frontmatter name for --skill flag when it differs from dir name", () => {
-    const catalog = catalogDir();
-    mkdirSync(join(catalog, "code-review"), { recursive: true });
-    writeFileSync(
-      join(catalog, "code-review", "SKILL.md"),
-      "---\nname: code-review:code-review\ndescription: Review PRs\n---\n# Code Review"
-    );
-
+  test("uses subpath for nested skill paths", () => {
     const entry: LockEntry = {
       source: "owner/repo",
       sourceUrl: "https://github.com/owner/repo",
@@ -345,48 +338,9 @@ describe("buildAddArgs", () => {
     };
     addToLock("code-review", entry);
 
-    const args = buildAddArgs(catalog, "code-review", true);
-    expect(args).toContain("--skill");
-    expect(args).toContain("code-review:code-review");
-    expect(args).not.toContain("--agent");
-    expect(args).toContain("-g");
-  });
-});
-
-// ── readSkillFrontmatterName ────────────────────────────────────────
-
-describe("readSkillFrontmatterName", () => {
-  test("reads name from valid frontmatter", () => {
-    const catalog = catalogDir();
-    mkdirSync(join(catalog, "my-skill"), { recursive: true });
-    writeFileSync(
-      join(catalog, "my-skill", "SKILL.md"),
-      "---\nname: my-skill:variant\ndescription: test\n---\n# Content"
-    );
-    expect(readSkillFrontmatterName(catalog, "my-skill")).toBe("my-skill:variant");
-  });
-
-  test("returns null when no frontmatter", () => {
-    const catalog = catalogDir();
-    mkdirSync(join(catalog, "no-fm"), { recursive: true });
-    writeFileSync(join(catalog, "no-fm", "SKILL.md"), "# Just markdown");
-    expect(readSkillFrontmatterName(catalog, "no-fm")).toBeNull();
-  });
-
-  test("returns null when SKILL.md missing", () => {
-    const catalog = catalogDir();
-    mkdirSync(join(catalog, "empty"), { recursive: true });
-    expect(readSkillFrontmatterName(catalog, "empty")).toBeNull();
-  });
-
-  test("returns null when name field missing from frontmatter", () => {
-    const catalog = catalogDir();
-    mkdirSync(join(catalog, "no-name"), { recursive: true });
-    writeFileSync(
-      join(catalog, "no-name", "SKILL.md"),
-      "---\ndescription: has no name\n---\n# Content"
-    );
-    expect(readSkillFrontmatterName(catalog, "no-name")).toBeNull();
+    const args = buildAddArgs("/catalog", "code-review", true);
+    expect(args).toEqual(["add", "owner/repo/skills/code-review", "-y", "-g"]);
+    expect(args).not.toContain("--skill");
   });
 });
 

package/lib.ts

@@ -52,6 +52,22 @@ export function removeFromLock(name: string): void {
   writeLock(lock);
 }
 
+export function removeFromProjectLock(name: string, cwd: string): void {
+  const lockFile = join(cwd, "skills-lock.json");
+  try {
+    const data = JSON.parse(readFileSync(lockFile, "utf-8"));
+    if (data?.skills?.[name]) {
+      delete data.skills[name];
+      const sorted: Record<string, unknown> = {};
+      for (const key of Object.keys(data.skills).sort()) {
+        sorted[key] = data.skills[key];
+      }
+      data.skills = sorted;
+      writeFileSync(lockFile, JSON.stringify(data, null, 2) + "\n");
+    }
+  } catch {}
+}
+
 export function getLockEntry(name: string): LockEntry | null {
   const lock = readLock();
   return lock.skills[name] ?? null;
@@ -160,19 +176,6 @@ export function detectProjectAgents(cwd: string): string[] {
   return agents;
 }
 
-/** Read the frontmatter `name` from a skill's SKILL.md in the catalog. */
-export function readSkillFrontmatterName(catalogPath: string, dirName: string): string | null {
-  try {
-    const content = readFileSync(join(catalogPath, dirName, "SKILL.md"), "utf-8");
-    const match = content.match(/^---\s*\n([\s\S]*?)\n---/);
-    if (!match) return null;
-    const nameMatch = match[1]!.match(/^name:\s*(.+)$/m);
-    return nameMatch ? nameMatch[1]!.trim() : null;
-  } catch {
-    return null;
-  }
-}
-
 /** Build npx skills add args for a skill. */
 export function buildAddArgs(
   catalogPath: string,
@@ -185,8 +188,9 @@ export function buildAddArgs(
     ? ["--agent", ...projectAgents]
     : [];
   if (lockEntry) {
-    const skillName = readSkillFrontmatterName(catalogPath, name) ?? name;
-    const args = ["add", lockEntry.sourceUrl, "--skill", skillName, "-y", ...agentArgs];
+    // Use owner/repo/skillPath shorthand so the CLI narrows via subpath
+    const source = `${lockEntry.source}/${lockEntry.skillPath}`;
+    const args = ["add", source, "-y", ...agentArgs];
     if (isGlobal) args.push("-g");
     return args;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dealdeploy/skl",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "TUI skill manager for Claude Code agents",
   "module": "index.ts",
   "bin": {

package/tui.ts

@@ -227,7 +227,7 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
     width: "100%",
   });
 
-  type HeaderRef = { spacer: BoxRenderable | null; row: BoxRenderable; text: TextRenderable };
+  type HeaderRef = { spacer: BoxRenderable; row: BoxRenderable; text: TextRenderable };
   const headerRefs = new Map<number, HeaderRef>();
 
   type RowRefs = {
@@ -239,28 +239,17 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
   const rows: RowRefs[] = new Array(allSkills.length);
 
   scrollBox.add(searchRow);
-  scrollBox.add(
-    new BoxRenderable(renderer, {
-      id: "spacer-search",
-      height: 1,
-      width: "100%",
-      backgroundColor: C.rowBg,
-    })
-  );
 
   for (let di = 0; di < displayItems.length; di++) {
     const item = displayItems[di]!;
     if (item.type === "header") {
-      let spacer: BoxRenderable | null = null;
-      if (di > 0) {
-        spacer = new BoxRenderable(renderer, {
-          id: `spacer-${di}`,
-          height: 1,
-          width: "100%",
-          backgroundColor: C.rowBg,
-        });
-        scrollBox.add(spacer);
-      }
+      const spacer = new BoxRenderable(renderer, {
+        id: `spacer-${di}`,
+        height: 1,
+        width: "100%",
+        backgroundColor: C.rowBg,
+      });
+      scrollBox.add(spacer);
       const hRow = new BoxRenderable(renderer, {
         id: `header-${di}`,
         flexDirection: "row",
@@ -376,7 +365,7 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
         const visible = visibleRepos.has(item.repo);
         const ref = headerRefs.get(di)!;
         ref.row.visible = visible;
-        if (ref.spacer) ref.spacer.visible = visible;
+        ref.spacer.visible = visible;
       } else {
         const visible = matchingSkills.has(item.skillIndex);
         rows[item.skillIndex]!.row.visible = visible;
@@ -447,7 +436,7 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
     statusLine.fg = color;
     if (statusTimeout) clearTimeout(statusTimeout);
     statusTimeout = setTimeout(() => {
-      statusLine.content = "";
+      try { statusLine.content = ""; } catch {}
     }, 3000);
   }
 
@@ -492,7 +481,7 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
           const ref = headerRefs.get(di)!;
           if (ref.row.visible) {
             visibleBefore++;
-            if (ref.spacer?.visible) visibleBefore++;
+            if (ref.spacer.visible) visibleBefore++;
           }
         } else {
           if (rows[item.skillIndex]!.row.visible) visibleBefore++;
@@ -622,7 +611,7 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
         }
         return;
       }
-      if (key.name === "down" || key.name === "return") {
+      if (key.name === "down" || key.name === "return" || (key.ctrl && key.name === "j")) {
         focusArea = "grid";
         refreshAll();
         ensureVisible();
@@ -642,7 +631,15 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
     // ── Grid-focused input ──
 
     if (key.name === "backspace") return;
-    if (key.ctrl) return;
+    const ctrlNav: Record<string, string> = { h: "left", j: "down", k: "up", l: "right" };
+    let navKey = key.name;
+    if (key.ctrl) {
+      if (ctrlNav[key.name]) {
+        navKey = ctrlNav[key.name]!;
+      } else {
+        return;
+      }
+    }
 
     if (key.sequence === "q") {
       deps.onQuit();
@@ -672,7 +669,7 @@ export function createTui(renderer: CliRenderer, deps: TuiDeps) {
     }
 
     // ── Navigation & actions ──
-    switch (key.name) {
+    switch (navKey) {
       case "down":
         if (cursor < filteredDisplayIndices.length - 1) cursor++;
         break;