skillcellar 0.6.1 → 0.8.0

package/src/manifests.mjs

@@ -0,0 +1,290 @@
+// Readers for the manifests that list a project's packages. Each takes the file's text and answers
+// the names it lists, never throwing: a file it cannot read lists nothing. The names stay on this
+// computer; only the ids of the technologies they match are sent.
+
+const NAME_MAX = 214;
+// Longer lines are skipped by the line readers: no dependency is written on one, and a pattern run on
+// a long hostile line could take minutes.
+const LINE_MAX = 1000;
+const lines = (text) => text.split(/\r?\n/).filter((line) => line.length <= LINE_MAX);
+
+/**
+ * The registry whose manifest a file is, by its name and its folder's, or null. Lockfiles are never
+ * read. pip's requirements go by many names: requirements.txt, dev-requirements.txt, requirements/base.txt.
+ */
+export function manifestEcosystem(file, folder = "") {
+  if (file === "package.json") return "npm";
+  if (file === "composer.json") return "composer";
+  if (file === "pyproject.toml" || file === "Pipfile" || /^(?:[\w.-]+[-_.])?requirements[\w.-]*\.txt$/.test(file) || (folder === "requirements" && file.endsWith(".txt"))) return "pypi";
+  if (file === "go.mod") return "go";
+  if (file === "Cargo.toml") return "cargo";
+  if (file === "Gemfile") return "gem";
+  if (file === "pubspec.yaml") return "pub";
+  return null;
+}
+
+/** A package name as its registry compares it: PyPI by PEP 503, crates with - for _, and npm, Composer and gems in lowercase. */
+export function normalizeName(ecosystem, name) {
+  if (ecosystem === "pypi") return name.toLowerCase().replace(/[-_.]+/g, "-");
+  if (ecosystem === "cargo") return name.toLowerCase().replace(/_/g, "-");
+  if (ecosystem === "npm" || ecosystem === "composer" || ecosystem === "gem") return name.toLowerCase();
+  return name;
+}
+
+/** The package names a manifest lists, in its order, as written. */
+export function dependencyNames(ecosystem, file, text) {
+  try {
+    const body = text.replace(/^/, "");
+    const names =
+      ecosystem === "npm"
+        ? npmNames(body)
+        : ecosystem === "composer"
+          ? composerNames(body)
+          : ecosystem === "pypi"
+            ? file === "pyproject.toml"
+              ? pyprojectNames(body)
+              : file === "Pipfile"
+                ? pipfileNames(body)
+                : requirementsNames(body)
+            : ecosystem === "go"
+              ? goNames(body)
+              : ecosystem === "cargo"
+                ? cargoNames(body)
+                : ecosystem === "gem"
+                  ? gemNames(body)
+                  : ecosystem === "pub"
+                    ? pubNames(body)
+                    : [];
+    return names.filter((name) => typeof name === "string" && name !== "" && name.length <= NAME_MAX && !/\s/.test(name));
+  } catch {
+    return [];
+  }
+}
+
+const isTable = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+
+function npmNames(text) {
+  const json = JSON.parse(text);
+  if (!isTable(json)) return [];
+  const names = [];
+  for (const list of ["dependencies", "devDependencies", "optionalDependencies", "peerDependencies"]) {
+    if (!isTable(json[list])) continue;
+    for (const [name, spec] of Object.entries(json[list])) {
+      names.push(name);
+      // "x": "npm:real@1" installs real under the name x.
+      if (typeof spec === "string" && spec.startsWith("npm:")) {
+        const alias = spec.slice(4);
+        const at = alias.indexOf("@", alias.startsWith("@") ? 1 : 0);
+        names.push(at === -1 ? alias : alias.slice(0, at));
+      }
+    }
+  }
+  return names;
+}
+
+function composerNames(text) {
+  const json = JSON.parse(text);
+  if (!isTable(json)) return [];
+  const platform = (name) => name === "php" || name.startsWith("ext-") || name.startsWith("lib-") || name.startsWith("composer-");
+  return ["require", "require-dev"].flatMap((list) => (isTable(json[list]) ? Object.keys(json[list]).filter((name) => !platform(name.toLowerCase())) : []));
+}
+
+/** A requirement's name, as PEP 508 writes one first, or null for anything else: an option, a path or a URL. */
+function requirementName(requirement) {
+  const match = /^([A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?)(?=$|[\s[;=<>!~@,(])/.exec(requirement.trim());
+  return match ? match[1] : null;
+}
+
+function requirementsNames(text) {
+  const names = [];
+  for (const line of lines(text.replace(/\\\r?\n/g, " "))) {
+    const requirement = line.replace(/(^|\s)#.*$/, "").trim();
+    if (!requirement || requirement.startsWith("-")) continue;
+    const name = requirementName(requirement);
+    if (name) names.push(name);
+  }
+  return names;
+}
+
+/** A line of TOML up to a # outside a string. */
+function withoutComment(line) {
+  let quote = null;
+  for (let i = 0; i < line.length; i += 1) {
+    const char = line[i];
+    if (quote) {
+      if (char === "\\" && quote === '"') i += 1;
+      else if (char === quote) quote = null;
+    } else if (char === '"' || char === "'") quote = char;
+    else if (char === "#") return line.slice(0, i);
+  }
+  return line;
+}
+
+/** How deep in brackets and braces, outside strings, a line of a TOML value leaves it, from `depth`. */
+function depthAfter(line, depth) {
+  let quote = null;
+  for (let i = 0; i < line.length; i += 1) {
+    const char = line[i];
+    if (quote) {
+      if (char === "\\" && quote === '"') i += 1;
+      else if (char === quote) quote = null;
+    } else if (char === '"' || char === "'") quote = char;
+    else if (char === "[" || char === "{") depth += 1;
+    else if (char === "]" || char === "}") depth -= 1;
+  }
+  return depth;
+}
+
+/** The strings in a TOML value, leaving out those inside an inline table such as { include-group = "x" }. */
+function valueStrings(value) {
+  const strings = [];
+  let depth = 0;
+  let quote = null;
+  let start = 0;
+  for (let i = 0; i < value.length; i += 1) {
+    const char = value[i];
+    if (quote) {
+      if (char === "\\" && quote === '"') i += 1;
+      else if (char === quote) {
+        if (depth === 0) strings.push(value.slice(start, i));
+        quote = null;
+      }
+    } else if (char === '"' || char === "'") {
+      quote = char;
+      start = i + 1;
+    } else if (char === "{") depth += 1;
+    else if (char === "}") depth -= 1;
+  }
+  return strings;
+}
+
+/** A TOML key's name: a quoted one as it is, a dotted one by its first part. */
+const keyName = (key) => (/^["']/.test(key) ? key.slice(1, -1) : key.split(".")[0].trim());
+
+/**
+ * The tables and key = value lines of a TOML file, as far as the readers here need: each table's
+ * header (key null), then each of its keys with the value's text, an array or inline table spread
+ * over several lines joined.
+ */
+function* tomlEntries(text) {
+  const rows = lines(text);
+  let section = "";
+  for (let i = 0; i < rows.length; i += 1) {
+    const line = withoutComment(rows[i]).trim();
+    if (!line) continue;
+    if (line.startsWith("[")) {
+      const header = /^\[\[?([^\]]+)\]\]?$/.exec(line);
+      section = header ? header[1].trim() : "";
+      if (header) yield { section, key: null, value: "" };
+      continue;
+    }
+    const at = line.indexOf("=");
+    if (at < 1) continue;
+    let value = line.slice(at + 1).trim();
+    // Counted line by line, so a value left open to the end of the file costs one pass over it.
+    let depth = /^[[{]/.test(value) ? depthAfter(value, 0) : 0;
+    while (depth > 0 && i + 1 < rows.length) {
+      i += 1;
+      const next = withoutComment(rows[i]);
+      value += `\n${next}`;
+      depth = depthAfter(next, depth);
+    }
+    yield { section, key: line.slice(0, at).trim(), value };
+  }
+}
+
+const POETRY_RE = /^tool\.poetry\.(?:dependencies|dev-dependencies|group\.[^.]+\.dependencies)$/;
+
+function pyprojectNames(text) {
+  const names = [];
+  for (const { section, key, value } of tomlEntries(text)) {
+    if (key === null) continue;
+    const lists = (section === "project" && keyName(key) === "dependencies") || section === "project.optional-dependencies" || section === "dependency-groups" || (section === "tool.uv" && keyName(key) === "dev-dependencies");
+    if (lists) {
+      // One push per name: spreading a long list into push() passes the engine's limit on arguments.
+      for (const requirement of valueStrings(value)) {
+        const name = requirementName(requirement);
+        if (name) names.push(name);
+      }
+    } else if (POETRY_RE.test(section) && keyName(key).toLowerCase() !== "python") names.push(keyName(key));
+  }
+  return names;
+}
+
+function pipfileNames(text) {
+  return [...tomlEntries(text)].flatMap(({ section, key }) => (key !== null && (section === "packages" || section === "dev-packages") ? [keyName(key)] : []));
+}
+
+const CARGO_TABLE_RE = /^(?:target\..+\.)?(?:dependencies|dev-dependencies|build-dependencies)$|^workspace\.dependencies$/;
+const CARGO_NAMED_RE = /^(?:(?:target\..+\.)?(?:dependencies|dev-dependencies|build-dependencies)|workspace\.dependencies)\.([^.]+)$/;
+
+function cargoNames(text) {
+  const names = [];
+  const quoted = (value) => /^["']([^"']+)["']$/.exec(value.trim())?.[1];
+  for (const { section, key, value } of tomlEntries(text)) {
+    if (CARGO_TABLE_RE.test(section)) {
+      if (key === null) continue;
+      names.push(keyName(key));
+      // db = { package = "rusqlite" } installs rusqlite under the name db.
+      const renamed = value.startsWith("{") ? /\bpackage\s*=\s*["']([^"']+)["']/.exec(value)?.[1] : undefined;
+      if (renamed) names.push(renamed);
+      continue;
+    }
+    const named = CARGO_NAMED_RE.exec(section);
+    if (!named) continue;
+    if (key === null) names.push(keyName(named[1]));
+    else if (keyName(key) === "package" && quoted(value)) names.push(quoted(value));
+  }
+  return names;
+}
+
+function goNames(text) {
+  const names = [];
+  let block = false;
+  for (const raw of lines(text)) {
+    const indirect = /\/\/\s*indirect\b/.test(raw);
+    const line = raw.replace(/\/\/.*$/, "").trim();
+    if (!line) continue;
+    let path = null;
+    if (block) {
+      if (line === ")") {
+        block = false;
+        continue;
+      }
+      path = line.split(/\s+/)[0];
+    } else if (/^require\s*\($/.test(line)) {
+      block = true;
+      continue;
+    } else {
+      path = /^require\s+(\S+)/.exec(line)?.[1] ?? null;
+    }
+    // A module's major version past 1 ends its path: github.com/jackc/pgx/v5.
+    if (path && !indirect) names.push(path.replace(/^"|"$/g, "").replace(/\/v\d+$/, ""));
+  }
+  return names;
+}
+
+function gemNames(text) {
+  return lines(text).flatMap((line) => /^gem[\s(]+["']([^"']+)["']/.exec(line.trimStart())?.[1] ?? []);
+}
+
+function pubNames(text) {
+  const names = [];
+  let section = false;
+  let indent = null;
+  for (const raw of lines(text)) {
+    const trimmed = raw.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const lead = raw.length - raw.trimStart().length;
+    if (lead === 0) {
+      section = /^(?:dependencies|dev_dependencies)\s*:/.test(raw);
+      indent = null;
+      continue;
+    }
+    if (!section) continue;
+    indent ??= lead;
+    const name = lead === indent ? /^([A-Za-z0-9_]+)\s*:/.exec(trimmed)?.[1] : undefined;
+    if (name) names.push(name);
+  }
+  return names;
+}

package/src/places.mjs

@@ -36,11 +36,12 @@ async function sessionFolder(dir) {
 }
 
 /**
- * Every folder Claude Code knows on this computer: the projects `~/.claude.json` lists, and the
- * folder each of `~/.claude/projects/*` ran in. Folders that are gone are skipped.
+ * Every folder Claude Code knows on this computer: the projects `~/.claude.json` lists, the folder
+ * each of `~/.claude/projects/*` ran in, and those a restore wrote into, which Claude Code may never
+ * have been opened in. Folders that are gone are skipped.
  */
-async function knownFolders(claudeDir, claudeJson) {
-  const folders = new Set(Object.keys(claudeJson?.projects ?? {}));
+async function knownFolders(claudeDir, claudeJson, restored) {
+  const folders = new Set([...Object.keys(claudeJson?.projects ?? {}), ...restored.filter((folder) => typeof folder === "string" && isAbsolute(folder))]);
   const sessions = join(claudeDir, "projects");
   const names = await readdir(sessions).catch(() => []);
   const listed = new Set([...folders].map(sessionFolderName));
@@ -59,12 +60,13 @@ const real = (path) => realpath(path).catch(() => path);
 /**
  * The projects on this computer, one per checkout or folder, each with the folders Claude Code ran
  * in inside it: their local MCP servers and session memory belong to it. `cwd` is added when it is
- * in a project. The home folder, those above it and Claude Code's own folder are never one.
+ * in a project, and so is each folder in `restored`, the config's list of folders a restore wrote
+ * into. The home folder, those above it and Claude Code's own folder are never one.
  */
-export async function findProjects({ home, claudeDir, claudeJson, cwd }) {
+export async function findProjects({ home, claudeDir, claudeJson, cwd, restored = [] }) {
   const projects = new Map();
   const own = await real(claudeDir);
-  for (const folder of [...(await knownFolders(claudeDir, claudeJson)), cwd]) {
+  for (const folder of [...(await knownFolders(claudeDir, claudeJson, Array.isArray(restored) ? restored : [])), cwd]) {
     const project = await findProject(folder, home);
     const inside = project && relative(own, project.root);
     if (!project || inside === "" || (inside && !inside.startsWith("..") && !isAbsolute(inside))) continue;

package/src/plan.mjs

@@ -140,8 +140,8 @@ export function describePlan(plan) {
     if (task.project && !task.folder) {
       detail.push(
         task.action === "copy"
-          ? `This computer has no folder of ${task.project.name}: clone it, then run skillcellar restore from inside it; or dismiss it on the site.`
-          : `This computer has no folder of ${task.project.name}: skip it, or dismiss it on the site.`,
+          ? `No folder of ${task.project.name} that Claude Code knows on this computer. If you cloned it, run skillcellar restore inside the clone; or dismiss the task on the site.`
+          : `No folder of ${task.project.name} that Claude Code knows on this computer: skip it, or dismiss it on the site.`,
       );
     }
     else if (task.problem) detail.push(`Cannot be carried out: ${task.problem}`);
@@ -156,7 +156,7 @@ export function describePlan(plan) {
     else if (task.install) detail.push(`${task.install.method}: ${task.install.command}`);
     if (task.item?.page && !task.link) detail.push(`Page: ${task.item.page}`);
     lines.push(...detail.map((line) => `   ${line}`));
-    if (task.action === "copy" && task.copy && !(task.project && !task.folder)) lines.push(...copyLines(task.copy));
+    if (task.action === "copy" && task.copy) lines.push(...copyLines(task.copy));
   });
   lines.push("", "Ask Claude Code to carry them out with the skillcellar skill, or do them yourself, then run skillcellar sync.");
   return lines;