library-skills 0.0.6 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "library-skills",
-  "version": "0.0.6",
+  "version": "0.0.9",
   "description": "Library Skills, AI Agents using libraries, as intended, always up to date.",
   "type": "module",
   "exports": {

package/ts/dist/cli.d.ts

@@ -15,12 +15,20 @@ interface InstallTarget {
     path: string;
 }
 
+interface UvWorkspace {
+    root: string;
+    members: string[];
+    currentMember: string | null;
+}
+
 interface ProjectContext {
     cwd: string;
     projectRoot: string;
     targetEnvironment: string | null;
     sitePackagesDir: string | null;
     nodeModulesDir: string | null;
+    workspace: UvWorkspace | null;
+    dependencyFiles: string[];
 }
 interface InstalledStatus {
     target: InstallTarget;

package/ts/dist/cli.js

@@ -3,8 +3,8 @@
 // ts/src/cli.ts
 import checkbox from "@inquirer/checkbox";
 import { Command } from "commander";
-import { realpathSync as realpathSync2, statSync as statSync4 } from "fs";
-import { isAbsolute as isAbsolute3, relative as relative3, resolve as resolve4 } from "path";
+import { realpathSync as realpathSync2, statSync as statSync5 } from "fs";
+import { isAbsolute as isAbsolute3, relative as relative4, resolve as resolve5 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // ts/src/deps.ts
@@ -468,30 +468,51 @@ function getPythonTopLevelDeps(projectRoot) {
   if (!existsSync2(pyproject)) {
     return null;
   }
-  let data;
-  try {
-    data = parse2(readFileSync2(pyproject, "utf8"));
-  } catch {
+  return getPythonTopLevelDepsFromFiles([pyproject]);
+}
+function getPythonTopLevelDepsFromFiles(pyprojects) {
+  if (pyprojects.length === 0) {
     return null;
   }
   const deps = /* @__PURE__ */ new Set();
+  let found = false;
+  for (const pyproject of pyprojects) {
+    if (!existsSync2(pyproject)) {
+      continue;
+    }
+    let data;
+    try {
+      data = parse2(readFileSync2(pyproject, "utf8"));
+    } catch {
+      return null;
+    }
+    found = true;
+    extractPythonTopLevelDeps(data, deps);
+  }
+  return found ? deps : null;
+}
+function extractPythonTopLevelDeps(data, deps) {
   const project = data["project"];
-  if (!isRecord2(project)) {
-    return deps;
-  }
-  const dependencies = project["dependencies"];
-  if (Array.isArray(dependencies)) {
-    extractDepsFromSpecs(dependencies, deps);
-  }
-  const optionalDependencies = project["optional-dependencies"];
-  if (isRecord2(optionalDependencies)) {
-    for (const groupDependencies of Object.values(optionalDependencies)) {
-      if (Array.isArray(groupDependencies)) {
-        extractDepsFromSpecs(groupDependencies, deps);
+  if (isRecord2(project)) {
+    const dependencies = project["dependencies"];
+    if (Array.isArray(dependencies)) {
+      extractDepsFromSpecs(dependencies, deps);
+    }
+    const optionalDependencies = project["optional-dependencies"];
+    if (isRecord2(optionalDependencies)) {
+      for (const groupDependencies of Object.values(optionalDependencies)) {
+        if (Array.isArray(groupDependencies)) {
+          extractDepsFromSpecs(groupDependencies, deps);
+        }
       }
     }
   }
-  return deps;
+  const dependencyGroups = data["dependency-groups"];
+  if (isRecord2(dependencyGroups)) {
+    for (const groupName of Object.keys(dependencyGroups)) {
+      extractDepsFromDependencyGroup(groupName, dependencyGroups, deps, /* @__PURE__ */ new Set());
+    }
+  }
 }
 function getNodeTopLevelDeps(projectRoot) {
   const packageJson = join2(projectRoot, "package.json");
@@ -534,17 +555,45 @@ function getTopLevelDeps(projectRoot) {
   }
   return new Set(dependencySets.flatMap((deps) => [...deps]));
 }
+function getWorkspaceTopLevelDeps(pyprojects) {
+  return getPythonTopLevelDepsFromFiles(pyprojects);
+}
 function extractDepsFromSpecs(depSpecs, deps) {
   for (const depSpec of depSpecs) {
     if (typeof depSpec !== "string") {
       continue;
     }
-    const packageName = depSpec.split(/[>=<![\];,\s]/)[0]?.trim();
+    const packageName = depSpec.split(/[~>=<![\];,\s]/)[0]?.trim();
     if (packageName && !packageName.startsWith("#")) {
       deps.add(normalizePackageName(packageName));
     }
   }
 }
+function extractDepsFromDependencyGroup(groupName, dependencyGroups, deps, visited) {
+  if (visited.has(groupName)) {
+    return;
+  }
+  visited.add(groupName);
+  if (typeof groupName !== "string") {
+    return;
+  }
+  const groupDependencies = dependencyGroups[groupName];
+  if (!Array.isArray(groupDependencies)) {
+    return;
+  }
+  extractDepsFromSpecs(groupDependencies, deps);
+  for (const groupDependency of groupDependencies) {
+    if (!isRecord2(groupDependency)) {
+      continue;
+    }
+    extractDepsFromDependencyGroup(
+      groupDependency["include-group"],
+      dependencyGroups,
+      deps,
+      visited
+    );
+  }
+}
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -658,17 +707,201 @@ function isDirectory2(path) {
 }
 
 // ts/src/python-env.ts
-import { readFileSync as readFileSync3, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
-import { dirname as dirname3, isAbsolute as isAbsolute2, join as join4, resolve as resolve3, sep } from "path";
-function findProjectRoot(cwd) {
+import { readFileSync as readFileSync4, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { dirname as dirname3, isAbsolute as isAbsolute2, join as join4, resolve as resolve4, sep as sep2 } from "path";
+
+// ts/src/workspace.ts
+import { existsSync as existsSync4, readdirSync as readdirSync3, readFileSync as readFileSync3, statSync as statSync3 } from "fs";
+import { relative as relative3, resolve as resolve3, sep } from "path";
+import { parse as parse3 } from "smol-toml";
+function findUvWorkspace(cwd) {
   for (const directory of ancestors(cwd)) {
-    if (isFile(join4(directory, "pyproject.toml")) || isFile(join4(directory, "uv.lock")) || venvFromDotVenv(directory) !== null || isFile(join4(directory, "package.json")) || isDirectory3(join4(directory, "node_modules"))) {
+    const pyproject = `${directory}/pyproject.toml`;
+    if (!existsSync4(pyproject)) {
+      continue;
+    }
+    const data = readPyproject(pyproject);
+    if (!hasUvWorkspace(data)) {
+      continue;
+    }
+    const members = findWorkspaceMembers(directory, data);
+    return {
+      root: directory,
+      members,
+      currentMember: findCurrentMember(cwd, members)
+    };
+  }
+  return null;
+}
+function workspaceDependencyFiles(workspace) {
+  if (workspace.currentMember !== null) {
+    return [`${workspace.currentMember}/pyproject.toml`];
+  }
+  return [
+    `${workspace.root}/pyproject.toml`,
+    ...workspace.members.map((member) => `${member}/pyproject.toml`)
+  ].filter((path) => existsSync4(path));
+}
+function readPyproject(path) {
+  try {
+    const data = parse3(readFileSync3(path, "utf8"));
+    return isRecord3(data) ? data : {};
+  } catch {
+    return {};
+  }
+}
+function hasUvWorkspace(data) {
+  const tool = data["tool"];
+  if (!isRecord3(tool)) {
+    return false;
+  }
+  const uv = tool["uv"];
+  if (!isRecord3(uv)) {
+    return false;
+  }
+  return isRecord3(uv["workspace"]);
+}
+function findWorkspaceMembers(root, data) {
+  const workspace = getWorkspaceTable(data);
+  if (workspace === null || !Array.isArray(workspace["members"])) {
+    return [];
+  }
+  const excludes = Array.isArray(workspace["exclude"]) ? workspace["exclude"].filter(
+    (value) => typeof value === "string"
+  ) : [];
+  const members = /* @__PURE__ */ new Set();
+  for (const memberGlob of workspace["members"]) {
+    if (typeof memberGlob !== "string") {
+      continue;
+    }
+    for (const member of expandMemberGlob(root, memberGlob)) {
+      const relativePath = relative3(root, member).split(sep).join("/");
+      if (isExcluded(relativePath, excludes)) {
+        continue;
+      }
+      if (isFile(`${member}/pyproject.toml`)) {
+        members.add(resolve3(member));
+      }
+    }
+  }
+  return [...members].sort();
+}
+function getWorkspaceTable(data) {
+  const tool = data["tool"];
+  if (!isRecord3(tool)) {
+    return null;
+  }
+  const uv = tool["uv"];
+  if (!isRecord3(uv)) {
+    return null;
+  }
+  const workspace = uv["workspace"];
+  return isRecord3(workspace) ? workspace : null;
+}
+function expandMemberGlob(root, pattern) {
+  const parts = pattern.split("/");
+  const results = [];
+  walkGlob(root, parts, results);
+  return results;
+}
+function walkGlob(directory, parts, results) {
+  if (parts.length === 0) {
+    if (isDirectory3(directory)) {
+      results.push(directory);
+    }
+    return;
+  }
+  const [part, ...rest] = parts;
+  if (part === "*") {
+    for (const entry of readDirSafe(directory)) {
+      const child = `${directory}/${entry}`;
+      if (isDirectory3(child)) {
+        walkGlob(child, rest, results);
+      }
+    }
+    return;
+  }
+  walkGlob(`${directory}/${part}`, rest, results);
+}
+function isExcluded(relativePath, excludes) {
+  return excludes.some(
+    (pattern) => globMatches(relativePath, pattern.replace(/\/$/, ""))
+  );
+}
+function globMatches(value, pattern) {
+  if (pattern === value) {
+    return true;
+  }
+  const regex = new RegExp(`^${pattern.split("*").map(escapeRegex).join(".*")}$`);
+  return regex.test(value);
+}
+function findCurrentMember(cwd, members) {
+  const resolvedCwd = resolve3(cwd);
+  const matches = members.filter((member) => isRelativeTo2(resolvedCwd, member));
+  if (matches.length === 0) {
+    return null;
+  }
+  return matches.sort((left, right) => right.length - left.length)[0] ?? null;
+}
+function ancestors(start) {
+  const result = [];
+  let directory = resolve3(start);
+  while (true) {
+    result.push(directory);
+    const parent = resolve3(directory, "..");
+    if (parent === directory) {
+      break;
+    }
+    directory = parent;
+  }
+  return result;
+}
+function isRelativeTo2(path, parent) {
+  const normalizedPath = resolve3(path);
+  const normalizedParent = resolve3(parent);
+  return normalizedPath === normalizedParent || normalizedPath.startsWith(`${normalizedParent}${sep}`);
+}
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isFile(path) {
+  try {
+    return statSync3(path).isFile();
+  } catch {
+    return false;
+  }
+}
+function isDirectory3(path) {
+  try {
+    return statSync3(path).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function readDirSafe(path) {
+  try {
+    return isDirectory3(path) ? readdirSync3(path) : [];
+  } catch {
+    return [];
+  }
+}
+var escapeRegex = (value) => value.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+
+// ts/src/python-env.ts
+function findProjectRoot(cwd) {
+  const workspace = findUvWorkspace(cwd);
+  if (workspace !== null) {
+    return workspace.root;
+  }
+  for (const directory of ancestors2(cwd)) {
+    if (isFile2(join4(directory, "pyproject.toml")) || isFile2(join4(directory, "uv.lock")) || venvFromDotVenv(directory) !== null || isFile2(join4(directory, "package.json")) || isDirectory4(join4(directory, "node_modules"))) {
       return directory;
     }
   }
   return null;
 }
 function findVenv(cwd = process.cwd()) {
+  const workspace = findUvWorkspace(cwd);
   const projectRoot = findProjectRoot(cwd) ?? cwd;
   const uvProjectEnvironment = process.env["UV_PROJECT_ENVIRONMENT"];
   if (uvProjectEnvironment) {
@@ -677,35 +910,38 @@ function findVenv(cwd = process.cwd()) {
       return path;
     }
   }
-  for (const directory of ancestors(cwd)) {
+  if (workspace !== null) {
+    return venvFromDotVenv(workspace.root);
+  }
+  for (const directory of ancestors2(cwd)) {
     const venv = venvFromDotVenv(directory);
     if (venv !== null) {
       return venv;
     }
   }
   const virtualEnv = process.env["VIRTUAL_ENV"];
-  if (virtualEnv && isVenvDir(virtualEnv) && isRelativeTo2(virtualEnv, projectRoot)) {
+  if (virtualEnv && isVenvDir(virtualEnv) && isRelativeTo3(virtualEnv, projectRoot)) {
     return virtualEnv;
   }
   const condaPrefix = process.env["CONDA_PREFIX"];
-  if (condaPrefix && isDirectory3(condaPrefix)) {
+  if (condaPrefix && isDirectory4(condaPrefix)) {
     return condaPrefix;
   }
   return null;
 }
 function getSitePackagesDir(venvPath) {
   const windowsSitePackages = join4(venvPath, "Lib", "site-packages");
-  if (isDirectory3(windowsSitePackages)) {
+  if (isDirectory4(windowsSitePackages)) {
     return windowsSitePackages;
   }
   for (const libName of ["lib", "lib64"]) {
     const libDir = join4(venvPath, libName);
-    if (!isDirectory3(libDir)) {
+    if (!isDirectory4(libDir)) {
       continue;
     }
-    for (const child of readdirSync3(libDir).sort().reverse()) {
+    for (const child of readdirSync4(libDir).sort().reverse()) {
       const sitePackages = join4(libDir, child, "site-packages");
-      if (child.startsWith("python") && isDirectory3(sitePackages)) {
+      if (child.startsWith("python") && isDirectory4(sitePackages)) {
         return sitePackages;
       }
     }
@@ -713,23 +949,23 @@ function getSitePackagesDir(venvPath) {
   return null;
 }
 function findNodeModules(cwd = process.cwd()) {
-  for (const directory of ancestors(cwd)) {
+  for (const directory of ancestors2(cwd)) {
     const nodeModules = join4(directory, "node_modules");
-    if (isDirectory3(nodeModules)) {
+    if (isDirectory4(nodeModules)) {
       return nodeModules;
     }
   }
   return null;
 }
 function isVenvDir(directory) {
-  return isFile(join4(directory, "pyvenv.cfg"));
+  return isFile2(join4(directory, "pyvenv.cfg"));
 }
 function venvFromDotVenv(projectRoot) {
   const dotVenv = join4(projectRoot, ".venv");
-  if (isDirectory3(dotVenv)) {
+  if (isDirectory4(dotVenv)) {
     return isVenvDir(dotVenv) ? dotVenv : null;
   }
-  if (isFile(dotVenv)) {
+  if (isFile2(dotVenv)) {
     return readVenvRedirectFile(dotVenv);
   }
   return null;
@@ -737,7 +973,7 @@ function venvFromDotVenv(projectRoot) {
 function readVenvRedirectFile(path) {
   let content;
   try {
-    content = readFileSync3(path, "utf8");
+    content = readFileSync4(path, "utf8");
   } catch {
     return null;
   }
@@ -748,9 +984,9 @@ function readVenvRedirectFile(path) {
   const venv = isAbsolute2(redirect) ? redirect : join4(dirname3(path), redirect);
   return isVenvDir(venv) ? venv : null;
 }
-function ancestors(start) {
+function ancestors2(start) {
   const result = [];
-  let directory = resolve3(start);
+  let directory = resolve4(start);
   while (true) {
     result.push(directory);
     const parent = dirname3(directory);
@@ -761,21 +997,21 @@ function ancestors(start) {
   }
   return result;
 }
-function isRelativeTo2(path, parent) {
-  const normalizedPath = resolve3(path);
-  const normalizedParent = resolve3(parent);
-  return normalizedPath === normalizedParent || normalizedPath.startsWith(`${normalizedParent}${sep}`);
+function isRelativeTo3(path, parent) {
+  const normalizedPath = resolve4(path);
+  const normalizedParent = resolve4(parent);
+  return normalizedPath === normalizedParent || normalizedPath.startsWith(`${normalizedParent}${sep2}`);
 }
-function isFile(path) {
+function isFile2(path) {
   try {
-    return statSync3(path).isFile();
+    return statSync4(path).isFile();
   } catch {
     return false;
   }
 }
-function isDirectory3(path) {
+function isDirectory4(path) {
   try {
-    return statSync3(path).isDirectory();
+    return statSync4(path).isDirectory();
   } catch {
     return false;
   }
@@ -783,11 +1019,20 @@ function isDirectory3(path) {
 
 // ts/src/cli.ts
 function getProjectContext(cwd = process.cwd()) {
-  const projectRoot = findProjectRoot(cwd) ?? cwd;
+  const workspace = findUvWorkspace(cwd);
+  const projectRoot = workspace?.root ?? findProjectRoot(cwd) ?? cwd;
   const targetEnvironment = findVenv(cwd);
   const sitePackagesDir = targetEnvironment === null ? null : getSitePackagesDir(targetEnvironment);
   const nodeModulesDir = findNodeModules(cwd);
-  return { cwd, projectRoot, targetEnvironment, sitePackagesDir, nodeModulesDir };
+  return {
+    cwd,
+    projectRoot,
+    targetEnvironment,
+    sitePackagesDir,
+    nodeModulesDir,
+    workspace,
+    dependencyFiles: workspace ? workspaceDependencyFiles(workspace) : []
+  };
 }
 function scanContext(context) {
   const result = {
@@ -800,6 +1045,14 @@ function scanContext(context) {
     result.skills.push(...pythonResult.skills);
     result.warnings.push(...pythonResult.warnings);
   }
+  if (context.workspace?.currentMember) {
+    const memberVenv = `${context.workspace.currentMember}/.venv`;
+    if (exists(memberVenv)) {
+      result.warnings.push(
+        `Ignoring member-local .venv in uv workspace: ${memberVenv}`
+      );
+    }
+  }
   if (context.nodeModulesDir !== null) {
     const nodeResult = scanNodePackages(context.nodeModulesDir);
     result.skills.push(...nodeResult.skills);
@@ -821,11 +1074,13 @@ function topLevelSkills({
     return skills;
   }
   const topLevelDeps = getTopLevelDeps(context.projectRoot);
-  if (topLevelDeps === null) {
+  const workspaceTopLevelDeps = context.workspace === null ? null : getWorkspaceTopLevelDeps(context.dependencyFiles);
+  const selectedTopLevelDeps = context.workspace === null ? topLevelDeps : workspaceTopLevelDeps;
+  if (selectedTopLevelDeps === null) {
     return skills;
   }
   return skills.filter(
-    (skill) => topLevelDeps.has(normalizePackageName(skill.packageName))
+    (skill) => selectedTopLevelDeps.has(normalizePackageName(skill.packageName))
   );
 }
 function printWarnings(warnings) {
@@ -837,7 +1092,7 @@ function displayPath(path, projectRoot) {
   if (!path) {
     return "";
   }
-  const relativePath = relative3(resolve4(projectRoot), resolve4(path));
+  const relativePath = relative4(resolve5(projectRoot), resolve5(path));
   if (relativePath === "") {
     return ".";
   }
@@ -848,6 +1103,12 @@ function displayPath(path, projectRoot) {
 }
 function printContext(context) {
   console.log(`Project root: ${context.projectRoot}`);
+  if (context.workspace !== null) {
+    console.log(`Workspace root: ${context.workspace.root}`);
+    if (context.workspace.currentMember !== null) {
+      console.log(`Workspace member: ${context.workspace.currentMember}`);
+    }
+  }
   console.log(
     `Target Python environment: ${context.targetEnvironment ? displayPath(context.targetEnvironment, context.projectRoot) : "not found"}`
   );
@@ -887,6 +1148,9 @@ function scanJsonPayload({
 }) {
   return {
     project_root: context.projectRoot,
+    workspace_root: context.workspace?.root ?? "",
+    workspace_member: context.workspace?.currentMember ?? "",
+    dependency_files: context.dependencyFiles,
     target_environment: context.targetEnvironment ?? "",
     node_modules: context.nodeModulesDir ?? "",
     skills: skills.map((skill) => ({
@@ -942,13 +1206,13 @@ function installedStatuses({
   skills
 }) {
   const skillsByDir = new Map(
-    skills.map((skill) => [resolve4(skill.skillDir), skill])
+    skills.map((skill) => [resolve5(skill.skillDir), skill])
   );
   const skillsByName = new Map(skills.map((skill) => [skill.name, skill]));
   const statuses = [];
   for (const target of targets) {
     for (const installed of listInstalledSkills(target.path)) {
-      const skill = installed.target ? skillsByDir.get(resolve4(installed.target)) : null;
+      const skill = installed.target ? skillsByDir.get(resolve5(installed.target)) : null;
       let matchedSkill = skill ?? null;
       let status = "hand-authored";
       if (installed.type === "symlink") {
@@ -1312,13 +1576,13 @@ function collect(value, previous) {
 }
 function exists(path) {
   try {
-    statSync4(path);
+    statSync5(path);
     return true;
   } catch {
     return false;
   }
 }
-if (process.argv[1] && realpathSync2(fileURLToPath2(import.meta.url)) === realpathSync2(resolve4(process.argv[1]))) {
+if (process.argv[1] && realpathSync2(fileURLToPath2(import.meta.url)) === realpathSync2(resolve5(process.argv[1]))) {
   main().catch((error) => {
     console.error(error);
     process.exit(1);