@przeprogramowani/10x-cli 0.6.0 → 1.1.0

package/dist/index.mjs

@@ -2271,7 +2271,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "@przeprogramowani/10x-cli",
-  version: "0.6.0",
+  version: "1.1.0",
   description: "Open-source CLI for 10xDevs course content",
   repository: {
     type: "git",
@@ -3949,6 +3949,7 @@ import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as rea
 import { dirname as dirname2, join as join3 } from "node:path";
 var MANIFEST_FILENAME = ".10x-cli-manifest.json";
 var CLI_PACKAGE_NAME = "@przeprogramowani/10x-cli";
+var MANIFEST_VERSION = 2;
 function readManifest(dir) {
   const manifestPath = join3(dir, MANIFEST_FILENAME);
   if (!existsSync3(manifestPath))
@@ -3986,6 +3987,8 @@ function isManifest(value) {
     return false;
   if (typeof v2["version"] !== "string")
     return false;
+  if (v2["manifestVersion"] !== MANIFEST_VERSION)
+    return false;
   if (typeof v2["lastApplied"] !== "string")
     return false;
   if (typeof v2["lessonId"] !== "string")
@@ -3996,7 +3999,19 @@ function isManifest(value) {
   if (typeof files !== "object" || files === null)
     return false;
   const f2 = files;
-  return isStringArray(f2["skills"]) && isStringArray(f2["prompts"]) && isStringArray(f2["configs"]);
+  return isSkillsRecord(f2["skills"]) && isStringArray(f2["prompts"]) && isStringArray(f2["configs"]);
+}
+function isSkillsRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value))
+    return false;
+  for (const entry of Object.values(value)) {
+    if (typeof entry !== "object" || entry === null)
+      return false;
+    const e2 = entry;
+    if (!isStringArray(e2["files"]))
+      return false;
+  }
+  return true;
 }
 function isStringArray(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
@@ -4010,6 +4025,7 @@ var PROFILES = {
     toolId: "claude-code",
     displayName: "Claude Code",
     skillPath: (n) => `.claude/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.claude/skills/${n}`,
     promptPath: (n) => `.claude/prompts/${n}.md`,
     configPath: (n) => `.claude/config-templates/${n}`,
     rulesFile: "CLAUDE.md",
@@ -4021,6 +4037,7 @@ var PROFILES = {
     toolId: "cursor",
     displayName: "Cursor",
     skillPath: (n) => `.cursor/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.cursor/skills/${n}`,
     promptPath: (n) => `.cursor/prompts/${n}.md`,
     configPath: (n) => `.cursor/config-templates/${n}`,
     rulesFile: ".cursor/rules/10x-course.mdc",
@@ -4032,6 +4049,7 @@ var PROFILES = {
     toolId: "copilot",
     displayName: "GitHub Copilot",
     skillPath: (n) => `.github/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.github/skills/${n}`,
     promptPath: (n) => `.github/prompts/${n}.md`,
     configPath: (n) => `.github/config-templates/${n}`,
     rulesFile: ".github/copilot-instructions.md",
@@ -4043,6 +4061,7 @@ var PROFILES = {
     toolId: "codex",
     displayName: "Codex CLI",
     skillPath: (n) => `.agents/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.agents/skills/${n}`,
     promptPath: (n) => `.agents/prompts/${n}.md`,
     configPath: (n) => `.agents/config-templates/${n}`,
     rulesFile: "AGENTS.md",
@@ -4054,6 +4073,7 @@ var PROFILES = {
     toolId: "generic",
     displayName: "Other / Generic",
     skillPath: (n) => `.ai/skills/${n}/SKILL.md`,
+    skillDir: (n) => `.ai/skills/${n}`,
     promptPath: (n) => `.ai/prompts/${n}.md`,
     configPath: (n) => `.ai/config-templates/${n}`,
     rulesFile: "AGENTS.md",
@@ -4157,7 +4177,7 @@ import {
   mkdirSync as mkdirSync5,
   readFileSync as readFileSync5,
   renameSync as renameSync2,
-  rmdirSync,
+  rmdirSync as rmdirSync2,
   rmSync as rmSync3,
   statSync,
   writeFileSync as writeFileSync4
@@ -4243,9 +4263,12 @@ function stripBlock(content, begin, end, label, warnings) {
 
 // src/lib/writer.ts
 import {
+  chmodSync as chmodSync2,
   existsSync as existsSync5,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync4,
+  readdirSync,
+  rmdirSync,
   rmSync as rmSync2,
   writeFileSync as writeFileSync3
 } from "node:fs";
@@ -4259,19 +4282,30 @@ function applyBundle(bundle, projectRoot, options = {}) {
   const profile = options.profile ?? PROFILES[DEFAULT_TOOL];
   const manifestDir = join5(projectRoot, profile.manifestDir);
   const prevManifest = readManifest(manifestDir);
-  for (const skill of bundle.skills)
+  for (const skill of bundle.skills) {
     assertSafeName(skill.name, "skill");
+    for (const file of skill.files) {
+      assertSafeSkillFilePath(file.path, skill.name);
+    }
+  }
   for (const prompt of bundle.prompts)
     assertSafeName(prompt.name, "prompt");
   for (const config of bundle.configs)
     assertSafeName(config.name, "config");
   const skills = bundle.skills.map((skill) => {
-    const target = join5(projectRoot, profile.skillPath(skill.name));
-    const action = computeFileAction(target, skill.content);
-    if (!dryRun && action !== "unchanged") {
-      writeFileAt(target, skill.content);
-    }
-    return { name: skill.name, path: target, action };
+    const skillDir = join5(projectRoot, profile.skillDir(skill.name));
+    const fileWrites = skill.files.map((file) => {
+      const target = join5(skillDir, file.path);
+      const action = computeFileAction(target, file.content);
+      if (!dryRun && action !== "unchanged") {
+        writeFileAt(target, file.content);
+      }
+      if (!dryRun && file.executable === true && action !== "unchanged") {
+        chmodSync2(target, 493);
+      }
+      return { path: file.path, absolutePath: target, action };
+    });
+    return { name: skill.name, files: fileWrites };
   });
   const prompts = bundle.prompts.map((prompt) => {
     const target = join5(projectRoot, profile.promptPath(prompt.name));
@@ -4312,8 +4346,12 @@ function applyBundle(bundle, projectRoot, options = {}) {
   });
   if (!dryRun && !partial) {
     const removed = computeRemovals(prevManifest, bundle, profile, projectRoot);
-    for (const entry of removed.skills)
+    for (const entry of removed.skillDirs)
       rmSync2(entry.path, { recursive: true, force: true });
+    for (const entry of removed.skillFiles) {
+      rmSync2(entry.path, { force: true });
+      removeEmptyParentDirs(entry.path, entry.skillDirAbs);
+    }
     for (const entry of removed.prompts)
       rmSync2(entry.path, { force: true });
     for (const entry of removed.configs)
@@ -4323,12 +4361,13 @@ function applyBundle(bundle, projectRoot, options = {}) {
     const nextManifest = {
       package: CLI_PACKAGE_NAME,
       version: CLI_VERSION,
+      manifestVersion: MANIFEST_VERSION,
       lastApplied: new Date().toISOString(),
       lessonId: bundle.lessonId,
       course,
       tool: profile.toolId,
       files: {
-        skills: bundle.skills.map((s) => s.name),
+        skills: Object.fromEntries(bundle.skills.map((s) => [s.name, { files: s.files.map((f2) => f2.path) }])),
         prompts: bundle.prompts.map((p2) => `${p2.name}.md`),
         configs: bundle.configs.map((c2) => c2.name)
       }
@@ -4367,20 +4406,43 @@ function writeFileAt(filePath, content) {
   writeFileSync3(filePath, content);
 }
 function computeRemovals(prevManifest, bundle, profile, projectRoot) {
-  const empty = { skills: [], prompts: [], configs: [] };
+  const empty = {
+    skillDirs: [],
+    skillFiles: [],
+    prompts: [],
+    configs: []
+  };
   if (!prevManifest)
     return empty;
-  const currentSkills = new Set(bundle.skills.map((s) => s.name));
+  const currentSkills = new Map(bundle.skills.map((s) => [s.name, new Set(s.files.map((f2) => f2.path))]));
   const currentPrompts = new Set(bundle.prompts.map((p2) => `${p2.name}.md`));
   const currentConfigs = new Set(bundle.configs.map((c2) => c2.name));
-  const removed = { skills: [], prompts: [], configs: [] };
-  for (const skillName of prevManifest.files.skills) {
-    if (currentSkills.has(skillName))
-      continue;
+  const removed = {
+    skillDirs: [],
+    skillFiles: [],
+    prompts: [],
+    configs: []
+  };
+  for (const [skillName, entry] of Object.entries(prevManifest.files.skills)) {
     if (!isSafeName(skillName))
       continue;
-    const skillTarget = join5(projectRoot, profile.skillPath(skillName));
-    removed.skills.push({ name: skillName, path: dirname3(skillTarget) });
+    const skillDirAbs = join5(projectRoot, profile.skillDir(skillName));
+    if (!currentSkills.has(skillName)) {
+      removed.skillDirs.push({ name: skillName, path: skillDirAbs });
+      continue;
+    }
+    const currentFiles = currentSkills.get(skillName);
+    for (const relPath of entry.files) {
+      if (currentFiles.has(relPath))
+        continue;
+      if (!isSafeSkillFilePath(relPath))
+        continue;
+      removed.skillFiles.push({
+        name: `${skillName}/${relPath}`,
+        path: join5(skillDirAbs, relPath),
+        skillDirAbs
+      });
+    }
   }
   for (const promptFile of prevManifest.files.prompts) {
     if (currentPrompts.has(promptFile))
@@ -4405,6 +4467,19 @@ function computeRemovals(prevManifest, bundle, profile, projectRoot) {
   }
   return removed;
 }
+function removeEmptyParentDirs(filePath, skillDirAbs) {
+  let dir = dirname3(filePath);
+  while (dir.startsWith(skillDirAbs) && dir !== skillDirAbs) {
+    try {
+      if (readdirSync(dir).length > 0)
+        return;
+      rmdirSync(dir);
+    } catch {
+      return;
+    }
+    dir = dirname3(dir);
+  }
+}
 function findOrphanedManifests(projectRoot, currentProfile) {
   const out = [];
   for (const profile of Object.values(PROFILES)) {
@@ -4433,6 +4508,29 @@ function assertSafeName(name, kind) {
     throw new Error(`refused to write unsafe ${kind} name ${JSON.stringify(name)} — must not be empty, contain path separators, or start with '.'`);
   }
 }
+function assertSafeSkillFilePath(relPath, skillName) {
+  if (!isSafeSkillFilePath(relPath)) {
+    throw new Error(`refused to write unsafe file path ${JSON.stringify(relPath)} inside skill ${JSON.stringify(skillName)}`);
+  }
+}
+function isSafeSkillFilePath(relPath) {
+  if (typeof relPath !== "string" || relPath.length === 0)
+    return false;
+  if (relPath.startsWith("/") || relPath.startsWith("\\"))
+    return false;
+  if (/^[a-zA-Z]:/.test(relPath))
+    return false;
+  const segments = relPath.split(/[/\\]/);
+  if (segments.length === 0)
+    return false;
+  for (const seg of segments) {
+    if (seg === "" || seg === "." || seg === "..")
+      return false;
+    if (!isSafeName(seg))
+      return false;
+  }
+  return true;
+}
 function isSafeName(name) {
   if (typeof name !== "string" || name.length === 0)
     return false;
@@ -4464,16 +4562,30 @@ function migrateArtifacts(projectRoot, orphan, newProfile) {
     skipped: []
   };
   const oldProfile = orphan.profile;
-  for (const skillName of orphan.manifest.files.skills) {
+  for (const [skillName, entry] of Object.entries(orphan.manifest.files.skills)) {
     if (!isSafeName(skillName)) {
       summary.skipped.push({ path: skillName, reason: "unsafe name in manifest" });
       continue;
     }
-    const from = join6(projectRoot, oldProfile.skillPath(skillName));
-    const to = join6(projectRoot, newProfile.skillPath(skillName));
-    if (moveIfSafe(from, to, summary.skipped)) {
-      summary.movedOrRemoved.skills.push(skillName);
+    const fromSkillDir = join6(projectRoot, oldProfile.skillDir(skillName));
+    const toSkillDir = join6(projectRoot, newProfile.skillDir(skillName));
+    let anyMoved = false;
+    for (const relPath of entry.files) {
+      if (!isSafeSkillFilePath(relPath)) {
+        summary.skipped.push({
+          path: `${skillName}/${relPath}`,
+          reason: "unsafe path in manifest"
+        });
+        continue;
+      }
+      const from = join6(fromSkillDir, relPath);
+      const to = join6(toSkillDir, relPath);
+      if (moveIfSafe(from, to, summary.skipped))
+        anyMoved = true;
     }
+    tryRemoveEmptyDir(fromSkillDir);
+    if (anyMoved)
+      summary.movedOrRemoved.skills.push(skillName);
   }
   for (const promptFile of orphan.manifest.files.prompts) {
     if (!isSafeName(promptFile)) {
@@ -4512,15 +4624,23 @@ function deleteArtifacts(projectRoot, orphan) {
     skipped: []
   };
   const oldProfile = orphan.profile;
-  for (const skillName of orphan.manifest.files.skills) {
+  for (const [skillName, entry] of Object.entries(orphan.manifest.files.skills)) {
     if (!isSafeName(skillName)) {
       summary.skipped.push({ path: skillName, reason: "unsafe name in manifest" });
       continue;
     }
-    const skillFile = join6(projectRoot, oldProfile.skillPath(skillName));
-    const skillDir = dirname4(skillFile);
-    rmSync3(skillFile, { force: true });
-    tryRemoveEmptyDir(skillDir);
+    const skillDir = join6(projectRoot, oldProfile.skillDir(skillName));
+    for (const relPath of entry.files) {
+      if (!isSafeSkillFilePath(relPath)) {
+        summary.skipped.push({
+          path: `${skillName}/${relPath}`,
+          reason: "unsafe path in manifest"
+        });
+        continue;
+      }
+      rmSync3(join6(skillDir, relPath), { force: true });
+    }
+    rmSync3(skillDir, { recursive: true, force: true });
     summary.movedOrRemoved.skills.push(skillName);
   }
   for (const promptFile of orphan.manifest.files.prompts) {
@@ -4623,7 +4743,7 @@ function tryRemoveEmptyDir(dir) {
   if (!existsSync6(dir))
     return;
   try {
-    rmdirSync(dir);
+    rmdirSync2(dir);
   } catch {}
 }
 
@@ -4853,7 +4973,14 @@ async function runPrintMode(ctx, lessonId, course, profile, token, lang, options
     if (ctx.json) {
       output(ctx, "", result.data);
     } else {
-      process.stdout.write(result.data.content);
+      const data = result.data;
+      if (data.type === "skills") {
+        const skillMd = data.files.find((f2) => f2.path === "SKILL.md");
+        process.stdout.write(skillMd?.content ?? "");
+        emitMultiFileSkillNotice(data.name, data.files);
+      } else {
+        process.stdout.write(data.content);
+      }
     }
   } else {
     verbose(ctx, `fetching lesson ${course}/${lessonId} (filtering by ${options.type})`);
@@ -4861,17 +4988,40 @@ async function runPrintMode(ctx, lessonId, course, profile, token, lang, options
     if (!result.ok) {
       handleLessonError(ctx, result.status, result.code, result.error, result.payload);
     }
-    const artifacts = result.data[options.type];
-    if (ctx.json) {
-      output(ctx, "", artifacts);
+    const type = options.type;
+    if (type === "skills") {
+      const skills = result.data.skills;
+      if (ctx.json) {
+        output(ctx, "", skills);
+      } else {
+        const contents = skills.map((s) => s.files.find((f2) => f2.path === "SKILL.md")?.content ?? "");
+        process.stdout.write(contents.join(`
+---
+`));
+        for (const skill of skills)
+          emitMultiFileSkillNotice(skill.name, skill.files);
+      }
     } else {
-      const contents = artifacts.map((a2) => a2.content);
-      process.stdout.write(contents.join(`
+      const artifacts = result.data[type];
+      if (ctx.json) {
+        output(ctx, "", artifacts);
+      } else {
+        const contents = artifacts.map((a2) => a2.content);
+        process.stdout.write(contents.join(`
 ---
 `));
+      }
     }
   }
 }
+function emitMultiFileSkillNotice(skillName, files) {
+  const extras = files.filter((f2) => f2.path !== "SKILL.md").map((f2) => f2.path);
+  if (extras.length === 0)
+    return;
+  process.stderr.write(`Note: skill "${skillName}" has ${extras.length} additional file${extras.length === 1 ? "" : "s"} not shown in --print: ${extras.join(", ")}.
+` + `Run without --print to materialize all files.
+`);
+}
 function handleLessonError(ctx, status, code, error, payload) {
   verbose(ctx, `lesson fetch failed: status=${status} code=${code}`);
   if (status === 403) {
@@ -4938,7 +5088,15 @@ function renderGetResult(ctx, bundle, writeResult, dryRun, profile, langMeta = {
   lines.push("");
   lines.push(dryRun ? `Would write to ${targetDir}/:` : `Wrote to ${targetDir}/:`);
   for (const skill of writeResult.skills) {
-    lines.push(`  [${skill.action}] skill  ${skill.path}`);
+    if (skill.files.length === 1) {
+      const f2 = skill.files[0];
+      lines.push(`  [${f2.action}] skill  ${f2.absolutePath}`);
+    } else {
+      lines.push(`  skill  ${skill.name} (${skill.files.length} files)`);
+      for (const f2 of skill.files) {
+        lines.push(`    [${f2.action}] ${f2.path}`);
+      }
+    }
   }
   for (const prompt of writeResult.prompts) {
     lines.push(`  [${prompt.action}] prompt ${prompt.path}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@przeprogramowani/10x-cli",
-  "version": "0.6.0",
+  "version": "1.1.0",
   "description": "Open-source CLI for 10xDevs course content",
   "repository": {
     "type": "git",