@lythos/skill-deck 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lythos/skill-deck",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Declarative skill deck governance — cold pool, working set, deny-by-default",
   "license": "MIT",
   "type": "module",

package/src/cli.ts

@@ -3,13 +3,15 @@ import { linkDeck } from './link.js'
 
 const command = process.argv[2]
 const deckFlagIdx = process.argv.indexOf('--deck')
+const workdirFlagIdx = process.argv.indexOf('--workdir')
 const deckPath = deckFlagIdx >= 0 ? process.argv[deckFlagIdx + 1] : undefined
+const workdir = workdirFlagIdx >= 0 ? process.argv[workdirFlagIdx + 1] : undefined
 
 switch (command) {
   case 'link':
-    linkDeck(deckPath)
+    linkDeck(deckPath, workdir)
     break
   default:
-    console.error('Usage: lythoskill-deck link [--deck <path>]')
+    console.error('Usage: lythoskill-deck link [--deck <path>] [--workdir <dir>]')
     process.exit(1)
 }

package/src/link.ts

@@ -23,14 +23,8 @@ import {
 // ── 路径工具 ────────────────────────────────────────────────
 
 function findDeckToml(from: string): string | null {
-  let dir = from;
-  for (let i = 0; i < 10; i++) {
-    const p = join(dir, "skill-deck.toml");
-    if (existsSync(p)) return p;
-    const parent = dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
+  const p = join(from, "skill-deck.toml");
+  if (existsSync(p)) return p;
   return null;
 }
 
@@ -89,6 +83,26 @@ function extractArrayField(fm: string, field: string): string[] {
 // ── 冷池查找 ────────────────────────────────────────────────
 
 function findSource(name: string, coldPool: string, projectDir: string): string | null {
+  // 0. Fully-qualified path: host.tld/owner/repo/skill
+  //    → cold_pool/host.tld/owner/repo/skills/skill
+  //    Also handles host.tld/owner/repo (standalone skill without skills/ subdir)
+  const fqMatch = name.match(/^[a-z0-9-]+\.[a-z0-9-]+\//);
+  if (fqMatch) {
+    const parts = name.split("/");
+    const host = parts[0];      // github.com
+    const owner = parts[1];     // lythos-labs
+    const repo = parts[2];      // lythoskill
+    const skill = parts.slice(3).join("/"); // lythoskill-deck
+
+    if (skill) {
+      const fqPath = join(coldPool, host, owner, repo, "skills", skill);
+      if (existsSync(join(fqPath, "SKILL.md"))) return fqPath;
+    }
+    // fallback: standalone skill at repo root
+    const directPath = join(coldPool, host, owner, repo);
+    if (existsSync(join(directPath, "SKILL.md"))) return directPath;
+  }
+
   // 1. 直接路径
   const direct = resolve(coldPool, name);
   if (existsSync(join(direct, "SKILL.md"))) return direct;
@@ -100,10 +114,17 @@ function findSource(name: string, coldPool: string, projectDir: string): string
     if (existsSync(join(mono, "SKILL.md"))) return mono;
   }
 
-  // 3. 扁平扫描: cold_pool/<any-repo>/<name> 或 <any-repo>/skills/<name>
+  // 3. 项目本地: <project>/skills/<name>（build 输出目录，优先级高于扁平扫描）
+  const local = resolve(projectDir, "skills", name);
+  if (existsSync(join(local, "SKILL.md"))) return local;
+
+  // 4. 扁平扫描: cold_pool/<any-repo>/<name> 或 <any-repo>/skills/<name>
+  //    跳过 agent/working-set 相关目录，避免把 symlink 误判为有效源
+  const skipDirs = new Set(['.claude', '.kimi', '.git', 'node_modules', '.lythos-curator']);
   try {
     for (const entry of readdirSync(coldPool, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
+      if (skipDirs.has(entry.name)) continue;
       const base = join(coldPool, entry.name);
       for (const sub of [join(base, name), join(base, "skills", name)]) {
         if (existsSync(join(sub, "SKILL.md"))) return sub;
@@ -111,27 +132,31 @@ function findSource(name: string, coldPool: string, projectDir: string): string
     }
   } catch {}
 
-  // 4. 项目本地: <project>/skills/<name>
-  const local = resolve(projectDir, "skills", name);
-  if (existsSync(join(local, "SKILL.md"))) return local;
-
   return null;
 }
 
 // ── 主流程 ──────────────────────────────────────────────────
 
-export function linkDeck(cliDeckPath?: string): void {
+export function linkDeck(cliDeckPath?: string, cliWorkdir?: string): void {
 const cliDeck = cliDeckPath || process.argv.find((_, i, a) => a[i - 1] === "--deck");
 const DECK_PATH = cliDeck
   ? resolve(cliDeck)
   : findDeckToml(process.cwd()) || resolve("skill-deck.toml");
 
 if (!existsSync(DECK_PATH)) {
-  console.error(`❌ ${DECK_PATH} 不存在`);
+  console.error(`❌ skill-deck.toml not found in ${process.cwd()}`);
+  console.error(`\nCreate one:`);
+  console.error(`  cat > skill-deck.toml <<'EOF'`);
+  console.error(`  [deck]`);
+  console.error(`  max_cards = 10`);
+  console.error(`  \n  [tool]`);
+  console.error(`  skills = ["lythoskill-deck"]`);
+  console.error(`  EOF`);
+  console.error(`\nOr specify a path: bunx @lythos/skill-deck link --deck /path/to/deck.toml`);
   process.exit(1);
 }
 
-const PROJECT_DIR = dirname(DECK_PATH);
+const PROJECT_DIR = cliWorkdir ? resolve(cliWorkdir) : dirname(DECK_PATH);
 const deckRaw = readFileSync(DECK_PATH, "utf-8");
 const deckHash = hashContent(deckRaw);
 const deck = parseToml(deckRaw) as any;
@@ -211,10 +236,11 @@ const linkedSkills: LinkedSkill[] = [];
 for (const item of declared) {
   const dest = join(WORKING_SET, item.name);
 
-  // 幂等：已存在则删除重建
-  if (existsSync(dest)) {
+  // 幂等：已存在则删除重建（lstat 不跟随 symlink，能处理断链/自引用 symlink）
+  try {
+    lstatSync(dest);
     rmSync(dest, { recursive: true, force: true });
-  }
+  } catch {}
 
   try {
     mkdirSync(dirname(dest), { recursive: true });