@aident-ai/cli 0.1.5 → 0.1.6-rc.0

package/dist/cli.mjs

@@ -560,7 +560,7 @@ function normalizeBaseUrl(url) {
 }
 
 // src/version.ts
-var VERSION = "0.1.5";
+var VERSION = "0.1.6-rc.0";
 
 // src/catalogCache.ts
 var CACHE_TTL_MS = 5 * 60 * 1000;
@@ -643,7 +643,9 @@ function getLoadoutSkillTargets(cwd = process.cwd(), home = homedir2(), env = pr
     add("claude-code" /* ClaudeCode */, "project" /* Project */, join3(root, ".claude"));
     add("cursor" /* Cursor */, "project" /* Project */, join3(root, ".cursor"));
     add("gemini" /* Gemini */, "project" /* Project */, join3(root, ".gemini"));
-    add("workbuddy" /* WorkBuddy */, "project" /* Project */, join3(root, ".workbuddy-ai"));
+    for (const workBuddyRoot of getWorkBuddySkillHostRoots(root, {})) {
+      add("workbuddy" /* WorkBuddy */, "project" /* Project */, workBuddyRoot);
+    }
   }
   for (const root of getConfiguredLoadoutSkillHostRoots(home, env, repositoryRoot)) {
     add(root.agent, root.scope, root.root, root.canonical, root.prefer);
@@ -659,6 +661,17 @@ function getGlobalLoadoutSkillHostRoots(home = homedir2(), env = process.env) {
 function getManagedLoadoutSkillReleasesRoot(home = homedir2()) {
   return join3(home, ".aident", "skills", "aident-skill", "releases");
 }
+function getWorkBuddySkillHostRoots(home = homedir2(), env = process.env) {
+  const defaultRoot = join3(home, ".workbuddy");
+  const configuredRoot = resolveConfiguredRoot(env.WORKBUDDY_CONFIG_DIR, defaultRoot);
+  return [...new Set([configuredRoot, defaultRoot, join3(home, ".workbuddy-ai")])];
+}
+function getDetectedWorkBuddySkillHostRoots(home = homedir2(), env = process.env) {
+  const configured = env.WORKBUDDY_CONFIG_DIR?.trim();
+  const configuredRoot = configured && isAbsolute(configured) ? resolve(configured) : undefined;
+  const detectedRoots = getWorkBuddySkillHostRoots(home, env).filter((root) => root === configuredRoot || existsSync(root));
+  return detectedRoots.length > 0 ? detectedRoots : [join3(home, ".workbuddy")];
+}
 function formatLoadoutAgentHost(agent) {
   switch (agent) {
     case "claude-code" /* ClaudeCode */:
@@ -737,13 +750,13 @@ function getConfiguredLoadoutSkillHostRoots(home, env, repositoryRoot) {
       canonical: false,
       prefer: true
     },
-    {
+    ...getWorkBuddySkillHostRoots(home, env).map((root) => ({
       agent: "workbuddy" /* WorkBuddy */,
-      scope: "global" /* Global */,
-      root: join3(home, ".workbuddy-ai"),
+      scope: getConfiguredScope(root, repositoryRoot),
+      root,
       canonical: false,
-      prefer: true
-    },
+      prefer: root === join3(home, ".workbuddy") || root === join3(home, ".workbuddy-ai")
+    })),
     {
       agent: "codex" /* Codex */,
       scope: "admin" /* Admin */,
@@ -6637,8 +6650,12 @@ function getHome() {
 function getCanonicalRoot(home, env) {
   return path.join(getGlobalLoadoutSkillHostRoots(home, env).find(({ canonical }) => canonical).root, "skills");
 }
+function getHarnessHosts(home, env) {
+  return getGlobalLoadoutSkillHostRoots(home, env).filter(({ canonical }) => !canonical);
+}
 function getHarnessRoots(home, env) {
-  return getGlobalLoadoutSkillHostRoots(home, env).filter(({ canonical }) => !canonical).map(({ root }) => path.join(root, "skills"));
+  const detectedWorkBuddyRoots = new Set(getDetectedWorkBuddySkillHostRoots(home, env));
+  return getHarnessHosts(home, env).filter(({ agent, root }) => agent !== "workbuddy" /* WorkBuddy */ || detectedWorkBuddyRoots.has(root)).map(({ root }) => path.join(root, "skills"));
 }
 function getManifestPath(home) {
   return path.join(home, ".aident", "favorite-skills.json");
@@ -6717,7 +6734,7 @@ async function readManifest(home, env) {
     const value = JSON.parse(await readFile7(getManifestPath(home), "utf8"));
     if (value.version !== MANIFEST_VERSION || !Array.isArray(value.skills))
       throw new Error("Unsupported manifest");
-    const harnessRoots = new Set(getHarnessRoots(home, env));
+    const harnessRoots = new Set(getHarnessHosts(home, env).map(({ root }) => path.join(root, "skills")));
     for (const skill of value.skills) {
       if (!LOADOUT_SKILL_NAME_PATTERN.test(skill.name) || !isCanonicalUuid(skill.artifactVersionId) || !/^loadout-[a-z0-9-]+-[0-9a-f]{8}$/.test(skill.commandName) || skill.installPath !== path.join(getCanonicalRoot(home, env), skill.commandName) || skill.linkPaths.some((linkPath) => !harnessRoots.has(path.dirname(linkPath)) || path.basename(linkPath) !== skill.commandName)) {
         throw new Error("Invalid favorite Skills ownership manifest");
@@ -6805,7 +6822,7 @@ async function reconcileLoadoutFavoriteSkills(payload, home = getHome(), env = p
       continue;
     }
     const allLinksExist = (await Promise.all(linkPaths.map(pathExists))).every(Boolean);
-    if (previous?.artifactVersionId === pkg.artifactVersionId && previous.installPath === installPath && await pathExists(installPath) && allLinksExist) {
+    if (previous?.artifactVersionId === pkg.artifactVersionId && previous.installPath === installPath && previous.linkPaths.length === linkPaths.length && previous.linkPaths.every((linkPath) => linkPaths.includes(linkPath)) && await pathExists(installPath) && allLinksExist) {
       result.unchanged.push(pkg.name);
       nextSkills.push(previous);
       continue;
@@ -7748,6 +7765,7 @@ async function reconcileLoadoutSkill(policyValue, options = {}, injected = {}) {
   const cwd = options.cwd ?? process.cwd();
   const env = options.env ?? process.env;
   const targets = getLoadoutSkillTargets(cwd, home, env);
+  const detectedWorkBuddyRoots = new Set(getDetectedWorkBuddySkillHostRoots(home, env).map((root) => resolve2(root)));
   const canonicalTarget = targets.find((target) => target.canonical);
   if (!canonicalTarget)
     throw new Error("Aident canonical global skill target is unavailable");
@@ -7790,7 +7808,9 @@ async function reconcileLoadoutSkill(policyValue, options = {}, injected = {}) {
             getPathPresence(target.skillDirectory)
           ]);
           if (hostPresence === "missing" /* Missing */ && skillPresence2 === "missing" /* Missing */) {
-            continue;
+            if (target.candidate.agent !== "workbuddy" /* WorkBuddy */ || !detectedWorkBuddyRoots.has(resolve2(target.hostRoot))) {
+              continue;
+            }
           }
           if (hostPresence === "unreadable" /* Unreadable */ || skillPresence2 === "unreadable" /* Unreadable */) {
             results.push(unreadableTargetResult(target));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aident-ai/cli",
-  "version": "0.1.5",
+  "version": "0.1.6-rc.0",
   "description": "Aident CLI — umbrella access to Loadout integrations, Playbook automation, Intern tools, and the Aident platform.",
   "homepage": "https://aident.ai",
   "repository": {