simba-skills 0.1.2 → 0.2.0

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "simba-skills",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "AI skills manager - central store with symlink-based distribution across 14+ coding agents",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "type": "module",
   "license": "MIT",

package/src/commands/adopt.ts

@@ -70,9 +70,12 @@ export async function runAdopt(options: AdoptOptions): Promise<void> {
   }
 
   const toAdopt: Array<{ name: string; skill: DiscoveredSkill }> = []
+  const toTakeover: Array<{ name: string; skills: DiscoveredSkill[] }> = []
+  
   for (const [name, skills] of byName) {
     if (await skillsStore.hasSkill(name)) {
-      console.log(`  Skipping ${name} (already in store)`)
+      // Already in store - take over rogue copies
+      toTakeover.push({ name, skills })
       continue
     }
 
@@ -86,12 +89,14 @@ export async function runAdopt(options: AdoptOptions): Promise<void> {
     }
   }
 
-  if (toAdopt.length === 0) {
+  if (toAdopt.length === 0 && toTakeover.length === 0) {
     console.log("\nNo new skills to adopt.")
     return
   }
 
-  console.log(`\nAdopting ${toAdopt.length} skills...`)
+  if (toAdopt.length > 0) {
+    console.log(`\nAdopting ${toAdopt.length} skills...`)
+  }
 
   if (options.dryRun) {
     for (const { name, skill } of toAdopt) {
@@ -117,6 +122,33 @@ export async function runAdopt(options: AdoptOptions): Promise<void> {
     console.log(`  Adopted: ${name} (from ${skill.agentId})`)
   }
 
+  // Take over rogue copies (skill already in store, but real dirs exist at agents)
+  if (toTakeover.length > 0) {
+    console.log(`\nTaking over ${toTakeover.length} rogue skills...`)
+    
+    if (!options.dryRun) {
+      for (const { name, skills } of toTakeover) {
+        for (const skill of skills) {
+          await rm(skill.path, { recursive: true })
+          await createSymlink(join(options.skillsDir, name), skill.path)
+          
+          // Update registry assignment
+          if (!registry.skills[name].assignments[skill.agentId]) {
+            registry.skills[name].assignments[skill.agentId] = { type: "directory" }
+          }
+          
+          console.log(`  Replaced: ${name} (${skill.agentId})`)
+        }
+      }
+    } else {
+      for (const { name, skills } of toTakeover) {
+        for (const skill of skills) {
+          console.log(`  Would replace: ${name} (${skill.agentId})`)
+        }
+      }
+    }
+  }
+
   await registryStore.save(registry)
   console.log("\nAdoption complete!")
 }

package/src/commands/doctor.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from "citty"
-import { access } from "node:fs/promises"
+import { access, rm } from "node:fs/promises"
 import { join } from "node:path"
 import * as p from "@clack/prompts"
 import { ConfigStore } from "../core/config-store"
@@ -164,6 +164,17 @@ export default defineCommand({
       console.log(`Fixed: ${broken.skill} (${broken.agent})`)
     }
 
+    for (const rogue of results.rogue) {
+      const agent = detected[rogue.agent]
+      if (!agent) continue
+
+      // Delete rogue directory/file and replace with symlink
+      await rm(rogue.path, { recursive: true })
+      const expectedTarget = join(getSkillsDir(), rogue.skill)
+      await createSymlink(expectedTarget, rogue.path)
+      console.log(`Fixed rogue: ${rogue.skill} (${rogue.agent})`)
+    }
+
     console.log("\nRepairs complete!")
   },
 })

package/src/index.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 
-import { defineCommand, runMain } from "citty"
+import { defineCommand, runMain, showUsage } from "citty"
 
 const main = defineCommand({
   meta: {
@@ -8,6 +8,11 @@ const main = defineCommand({
     version: "0.2.0",
     description: "AI skills manager",
   },
+  async run({ cmd, rawArgs }) {
+    if (rawArgs.length === 0) {
+      await showUsage(cmd)
+    }
+  },
   subCommands: {
     adopt: () => import("./commands/adopt").then((m) => m.default),
     assign: () => import("./commands/assign").then((m) => m.default),

package/src/tui/matrix.ts

@@ -6,8 +6,7 @@ import { AgentRegistry } from "../core/agent-registry"
 import { getRegistryPath, getSkillsDir, getConfigPath, expandPath } from "../utils/paths"
 import type { Agent, Registry } from "../core/types"
 
-// Cast to any to access showCursor (missing from @types/terminal-kit)
-const term = termkit.terminal as typeof termkit.terminal & { showCursor: () => void }
+const term = termkit.terminal
 
 interface MatrixState {
   skills: string[]
@@ -102,7 +101,7 @@ export async function runMatrixTUI(): Promise<void> {
 
     term("\n")
     term("─".repeat(21 + state.agents.length * 10) + "\n")
-    term.dim("[Space] Toggle  [a] Assign all  [n] None  [q] Quit\n")
+    term.dim("[Space] Toggle  [a] Assign all  [n] None  [Enter] Confirm  [q] Cancel\n")
   }
 
   const toggle = async () => {
@@ -110,29 +109,43 @@ export async function runMatrixTUI(): Promise<void> {
     const agent = state.agents[state.cursorCol]
     const skill = state.registry.skills[skillName]
 
-    if (skill.assignments[agent.id]) {
-      await skillsStore.unassignSkill(skillName, expandPath(agent.globalPath))
-      delete skill.assignments[agent.id]
-    } else {
-      await skillsStore.assignSkill(skillName, expandPath(agent.globalPath), { type: "directory" })
-      skill.assignments[agent.id] = { type: "directory" }
+    try {
+      if (skill.assignments[agent.id]) {
+        await skillsStore.unassignSkill(skillName, expandPath(agent.globalPath))
+        delete skill.assignments[agent.id]
+      } else {
+        await skillsStore.assignSkill(skillName, expandPath(agent.globalPath), { type: "directory" })
+        skill.assignments[agent.id] = { type: "directory" }
+      }
+      await registryStore.save(state.registry)
+    } catch (err) {
+      term.moveTo(1, state.skills.length + 8)
+      term.yellow(`Error: ${(err as Error).message}\n`)
     }
-
-    await registryStore.save(state.registry)
   }
 
   const assignAll = async () => {
     const skillName = state.skills[state.cursorRow]
     const skill = state.registry.skills[skillName]
+    const errors: string[] = []
 
     for (const agent of state.agents) {
       if (!skill.assignments[agent.id]) {
-        await skillsStore.assignSkill(skillName, expandPath(agent.globalPath), { type: "directory" })
-        skill.assignments[agent.id] = { type: "directory" }
+        try {
+          await skillsStore.assignSkill(skillName, expandPath(agent.globalPath), { type: "directory" })
+          skill.assignments[agent.id] = { type: "directory" }
+        } catch (err) {
+          errors.push(`${agent.name}: ${(err as Error).message}`)
+        }
       }
     }
 
     await registryStore.save(state.registry)
+    
+    if (errors.length > 0) {
+      term.moveTo(1, state.skills.length + 8)
+      term.yellow(`Errors:\n${errors.join("\n")}\n`)
+    }
   }
 
   const unassignAll = async () => {
@@ -176,11 +189,18 @@ export async function runMatrixTUI(): Promise<void> {
       case "n":
         await unassignAll()
         break
+      case "ENTER":
+        term.clear()
+        term.hideCursor(false)
+        term.grabInput(false)
+        term.green("Changes saved.\n")
+        process.exit(0)
       case "q":
       case "CTRL_C":
         term.clear()
-        term.showCursor()
+        term.hideCursor(false)
         term.grabInput(false)
+        term.yellow("Cancelled.\n")
         process.exit(0)
     }
 

package/src/utils/symlinks.ts

@@ -3,7 +3,29 @@ import { dirname } from "node:path"
 
 export async function createSymlink(source: string, target: string): Promise<void> {
   await mkdir(dirname(target), { recursive: true })
-  await symlink(source, target)
+  try {
+    await symlink(source, target)
+  } catch (err) {
+    if ((err as NodeJS.ErrnoException).code === "EEXIST") {
+      // Already exists - check if it's a symlink pointing to the right place
+      const existing = await getSymlinkTarget(target)
+      if (existing === source) return // Already correct symlink
+      
+      // Check what we're dealing with
+      const stat = await lstat(target)
+      if (stat.isSymbolicLink()) {
+        await unlink(target)
+      } else if (stat.isDirectory()) {
+        // Real directory - don't delete, throw error
+        throw new Error(`Cannot create symlink: ${target} is a directory (not managed by simba)`)
+      } else {
+        await unlink(target)
+      }
+      await symlink(source, target)
+    } else {
+      throw err
+    }
+  }
 }
 
 export async function isSymlink(path: string): Promise<boolean> {
@@ -17,7 +39,15 @@ export async function isSymlink(path: string): Promise<boolean> {
 
 export async function removeSymlink(path: string): Promise<void> {
   try {
-    await unlink(path)
+    const stat = await lstat(path)
+    if (stat.isSymbolicLink()) {
+      await unlink(path)
+    } else if (stat.isDirectory()) {
+      // Real directory - don't delete, it's not managed by simba
+      throw new Error(`Cannot remove: ${path} is a directory (not managed by simba)`)
+    } else {
+      await unlink(path)
+    }
   } catch (err) {
     if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
       throw err