@agents-inc/cli 0.76.0 → 0.78.0

package/dist/{chunk-7PMFIL5L.js → chunk-NKLNT7N7.js}

@@ -1,14 +1,7 @@
 #!/usr/bin/env node
 import {
   getDomainDisplayName
-} from "./chunk-UBNHVBSV.js";
-import {
-  ViewTitle
-} from "./chunk-JNQKCZA3.js";
-import {
-  KEY_LABEL_ENTER,
-  KEY_LABEL_ESC
-} from "./chunk-CBYRFAUN.js";
+} from "./chunk-7JQIMEUX.js";
 import {
   CLI_COLORS
 } from "./chunk-FMYAYX6W.js";
@@ -48,11 +41,7 @@ var StepConfirm = ({
       onBack();
     }
   });
-  const domainsText = selectedDomains?.map(getDomainDisplayName).join(" + ") || "";
-  const title = stackName ? `Ready to install ${stackName}` : `Ready to install your custom stack${domainsText ? ` (${domainsText})` : ""}`;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 2, children: [
-    /* @__PURE__ */ jsx(ViewTitle, { children: title }),
-    /* @__PURE__ */ jsx(Text, { children: " " }),
     domainSelections && selectedDomains && !stackName && /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginBottom: 1, children: selectedDomains.map((domain) => {
       const selections = domainSelections[domain] || {};
       const techs = Object.values(selections).flat();
@@ -66,7 +55,7 @@ var StepConfirm = ({
         /* @__PURE__ */ jsx(Text, { children: techs.join(", ") })
       ] }, domain);
     }) }),
-    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
       technologyCount !== void 0 && /* @__PURE__ */ jsxs(Text, { children: [
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Technologies:" }),
         " ",
@@ -110,17 +99,11 @@ var StepConfirm = ({
           ] })
         ] })
       ] })
-    ] }),
-    /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-      KEY_LABEL_ENTER,
-      " install ",
-      KEY_LABEL_ESC,
-      " go back"
-    ] }) })
+    ] })
   ] });
 };
 
 export {
   StepConfirm
 };
-//# sourceMappingURL=chunk-7PMFIL5L.js.map
+//# sourceMappingURL=chunk-NKLNT7N7.js.map

package/dist/chunk-NKLNT7N7.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/cli/components/wizard/step-confirm.tsx"],"sourcesContent":["import { Box, Text, useInput } from \"ink\";\nimport React from \"react\";\nimport { CLI_COLORS } from \"../../consts.js\";\nimport type { AgentScopeConfig, SkillConfig } from \"../../types/config.js\";\nimport type { Domain, DomainSelections } from \"../../types/index.js\";\nimport { KEY_LABEL_ENTER, KEY_LABEL_ESC } from \"./hotkeys.js\";\nimport { getDomainDisplayName } from \"./utils.js\";\nimport { ViewTitle } from \"./view-title.js\";\n\ntype StepConfirmProps = {\n  onComplete: () => void;\n  stackName?: string;\n  selectedDomains?: Domain[];\n  domainSelections?: DomainSelections;\n  technologyCount?: number;\n  skillCount?: number;\n  agentCount?: number;\n  skillConfigs?: SkillConfig[];\n  agentConfigs?: AgentScopeConfig[];\n  onBack?: () => void;\n};\n\nconst getInstallModeLabel = (skillConfigs: SkillConfig[]): string => {\n  if (skillConfigs.length === 0) return \"Local (editable copies)\";\n\n  const localCount = skillConfigs.filter((s) => s.source === \"local\").length;\n  const pluginCount = skillConfigs.length - localCount;\n\n  if (localCount === 0) return \"Plugin\";\n  if (pluginCount === 0) return \"Local (editable copies)\";\n  return `Mixed (${localCount} local, ${pluginCount} plugin)`;\n};\n\nexport const StepConfirm: React.FC<StepConfirmProps> = ({\n  onComplete,\n  stackName,\n  selectedDomains,\n  domainSelections,\n  technologyCount,\n  skillCount,\n  agentCount,\n  skillConfigs,\n  agentConfigs,\n  onBack,\n}) => {\n  useInput((_input, key) => {\n    if (key.return) {\n      onComplete();\n    }\n    if (key.escape && onBack) {\n      onBack();\n    }\n  });\n\n  return (\n    <Box flexDirection=\"column\" paddingX={2}>\n      {domainSelections && selectedDomains && !stackName && (\n        <Box flexDirection=\"column\" marginBottom={1}>\n          {selectedDomains.map((domain) => {\n            const selections = domainSelections[domain] || {};\n            const techs = Object.values(selections).flat();\n            if (techs.length === 0) return null;\n            return (\n              <Text key={domain}>\n                <Text bold>{getDomainDisplayName(domain)}:</Text> <Text>{techs.join(\", \")}</Text>\n              </Text>\n            );\n          })}\n        </Box>\n      )}\n\n      <Box flexDirection=\"column\">\n        {technologyCount !== undefined && (\n          <Text>\n            <Text dimColor>Technologies:</Text> <Text bold>{technologyCount}</Text>\n          </Text>\n        )}\n        {skillCount !== undefined && (\n          <Text>\n            <Text dimColor>Skills:</Text> <Text bold>{skillCount}</Text>{\" \"}\n            <Text color={CLI_COLORS.PRIMARY}>(all verified)</Text>\n          </Text>\n        )}\n        {agentCount !== undefined && (\n          <Text>\n            <Text dimColor>Agents:</Text> <Text bold>{agentCount}</Text>\n            {agentConfigs && agentConfigs.length > 0 && (\n              <Text>\n                {\" \"}\n                <Text dimColor>\n                  ({agentConfigs.filter((a) => a.scope === \"project\").length} project\n                  {agentConfigs.some((a) => a.scope === \"global\") &&\n                    `, ${agentConfigs.filter((a) => a.scope === \"global\").length} global`}\n                  )\n                </Text>\n              </Text>\n            )}\n          </Text>\n        )}\n        {skillConfigs && skillConfigs.length > 0 && (\n          <>\n            <Text>\n              <Text dimColor>Install mode:</Text>{\" \"}\n              <Text bold>{getInstallModeLabel(skillConfigs)}</Text>\n            </Text>\n            <Text>\n              <Text dimColor>Scope:</Text>{\" \"}\n              <Text bold>\n                {skillConfigs.filter((s) => s.scope === \"project\").length} project\n                {skillConfigs.some((s) => s.scope === \"global\") &&\n                  `, ${skillConfigs.filter((s) => s.scope === \"global\").length} global`}\n              </Text>\n            </Text>\n          </>\n        )}\n      </Box>\n    </Box>\n  );\n};\n"],"mappings":"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","names":[]}

package/dist/{chunk-WS3TL2AO.js → chunk-OIHZ2YH3.js}

@@ -4,7 +4,7 @@ import {
   loadPluginSkills,
   loadSkillsByIds,
   parseFrontmatter
-} from "./chunk-I534EWJQ.js";
+} from "./chunk-IFCASC6R.js";
 import {
   BUILT_IN_MATRIX,
   getCategoryDomain,
@@ -14,7 +14,7 @@ import {
   matrix,
   typedEntries,
   typedKeys
-} from "./chunk-JWMYAJHD.js";
+} from "./chunk-FSK4TQX7.js";
 import {
   SKILL_ID_PATTERN,
   agentFrontmatterValidationSchema,
@@ -53,7 +53,7 @@ import {
   warn,
   warnUnknownFields,
   writeFile
-} from "./chunk-WN2TUP4M.js";
+} from "./chunk-XYPAOBBV.js";
 import {
   CACHE_DIR,
   CACHE_HASH_LENGTH,
@@ -94,14 +94,14 @@ import {
   defaultCategories,
   defaultRules,
   defaultStacks
-} from "./chunk-7XUKTYVD.js";
+} from "./chunk-EO6KJI5D.js";
 import {
   init_esm_shims
 } from "./chunk-DHET7RCE.js";
 
 // src/cli/lib/loading/source-loader.ts
 init_esm_shims();
-import os10 from "os";
+import os11 from "os";
 import path28 from "path";
 
 // src/cli/lib/metadata-keys.ts
@@ -580,12 +580,26 @@ function splitConfigByScope(config) {
   const projectSkills = config.skills.filter((s) => s.scope === "project");
   const globalAgents = config.agents.filter((a) => a.scope === "global");
   const projectAgents = config.agents.filter((a) => a.scope === "project");
+  const globalSkillIds = new Set(globalSkills.map((s) => s.id));
   const globalStack = {};
   const projectStack = {};
   if (config.stack) {
     for (const agent of globalAgents) {
-      if (config.stack[agent.name]) {
-        globalStack[agent.name] = config.stack[agent.name];
+      const agentStack = config.stack[agent.name];
+      if (agentStack) {
+        const filtered = {};
+        for (const [category, assignments] of typedEntries(
+          agentStack
+        )) {
+          if (!assignments) continue;
+          const globalOnly = assignments.filter((a) => globalSkillIds.has(a.id));
+          if (globalOnly.length > 0) {
+            filtered[category] = globalOnly;
+          }
+        }
+        if (typedKeys(filtered).length > 0) {
+          globalStack[agent.name] = filtered;
+        }
       }
     }
     for (const agent of projectAgents) {
@@ -597,29 +611,23 @@ function splitConfigByScope(config) {
   const globalAgentNames = new Set(globalAgents.map((a) => a.name));
   const globalSelectedAgents = config.selectedAgents?.filter((a) => globalAgentNames.has(a)) ?? [];
   const projectSelectedAgents = config.selectedAgents?.filter((a) => !globalAgentNames.has(a)) ?? [];
-  const globalDomains = config.domains ?? [];
-  const globalDomainSet = new Set(globalDomains);
-  const projectOnlyDomains = (config.domains ?? []).filter((d) => !globalDomainSet.has(d));
   const globalConfig = {
+    ...config,
     name: "global",
     agents: globalAgents,
     skills: globalSkills,
-    ...Object.keys(globalStack).length > 0 && { stack: globalStack },
-    ...globalDomains.length > 0 && { domains: globalDomains },
-    ...globalSelectedAgents.length > 0 && { selectedAgents: globalSelectedAgents }
+    ...Object.keys(globalStack).length > 0 ? { stack: globalStack } : { stack: void 0 },
+    domains: config.domains,
+    selectedAgents: globalSelectedAgents.length > 0 ? globalSelectedAgents : void 0
   };
   const projectConfig = {
+    ...config,
     name: config.name,
     agents: projectAgents,
     skills: projectSkills,
-    ...Object.keys(projectStack).length > 0 && { stack: projectStack },
-    ...config.description && { description: config.description },
-    ...config.author && { author: config.author },
-    ...config.source && { source: config.source },
-    ...config.marketplace && { marketplace: config.marketplace },
-    ...config.agentsSource && { agentsSource: config.agentsSource },
-    ...projectOnlyDomains.length > 0 && { domains: projectOnlyDomains },
-    ...projectSelectedAgents.length > 0 && { selectedAgents: projectSelectedAgents }
+    ...Object.keys(projectStack).length > 0 ? { stack: projectStack } : { stack: void 0 },
+    domains: void 0,
+    selectedAgents: projectSelectedAgents.length > 0 ? projectSelectedAgents : void 0
   };
   return { global: globalConfig, project: projectConfig };
 }
@@ -807,13 +815,17 @@ function mergeConfigs(newConfig, existingConfig) {
   if (existingConfig.description) {
     merged.description = existingConfig.description;
   }
-  if (existingConfig.source) {
+  if (existingConfig.source && !newConfig.source) {
     merged.source = existingConfig.source;
   }
   if (existingConfig.agents && existingConfig.agents.length > 0) {
+    const newAgentsByName = indexBy(merged.agents, (a) => a.name);
     const existingNames = new Set(existingConfig.agents.map((a) => a.name));
-    const newAgents = merged.agents.filter((a) => !existingNames.has(a.name));
-    merged.agents = [...existingConfig.agents, ...newAgents];
+    const updatedExisting = existingConfig.agents.map(
+      (existing) => newAgentsByName[existing.name] ?? existing
+    );
+    const addedAgents = merged.agents.filter((a) => !existingNames.has(a.name));
+    merged.agents = [...updatedExisting, ...addedAgents];
   }
   if (existingConfig.skills && existingConfig.skills.length > 0) {
     const newSkillsById = indexBy(merged.skills, (s) => s.id);
@@ -984,8 +996,8 @@ function loadConfigTypesDataInBackground(sourceFlag, projectDir) {
     if (!await directoryExists(claudeSrcDir)) {
       throw new Error(`${CLAUDE_SRC_DIR}/ not found \u2014 run '${CLI_BIN_NAME} init' first`);
     }
-    const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-CXCIDGWV.js");
-    const { loadAllAgents: loadAllAgents2 } = await import("./loader-7RQ4G4TH.js");
+    const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-D3VIG3GM.js");
+    const { loadAllAgents: loadAllAgents2 } = await import("./loader-JMOO2A7C.js");
     const sourceResult = await loadSkillsMatrixFromSource2({
       sourceFlag,
       projectDir,
@@ -1041,7 +1053,7 @@ function generateConfigTypesSource(matrix2, agentNames, customAgentNames = [], e
     const configCategories = deriveCategories(configSkillIds, matrix2);
     categories = unique2([...configCategories, ...extraCategoriesArr]).sort();
     const configDomains = deriveDomains(categories, matrix2);
-    domains = unique2([...configDomains, ...extraDomainsArr]).sort();
+    domains = unique2([...configDomains, ...config.domains ?? [], ...extraDomainsArr]).sort();
   } else {
     skillIds = unique2([...typedKeys(matrix2.skills), ...extraSkillIds]).sort();
     sortedAgents = unique2([...agentNames, ...extraAgentNamesArr]).sort();
@@ -1946,30 +1958,25 @@ function initializeSelectionContext(currentSelections) {
   const selectedSet = new Set(resolvedSelections);
   return { resolvedSelections, selectedSet };
 }
-function getDependentSkills(skillId, currentSelections) {
+function getUnmetRequiredBy(skillId, currentSelections) {
   const fullId = resolveAlias(skillId);
-  const skill = matrix.skills[fullId];
-  if (!skill) return [];
   const { resolvedSelections, selectedSet } = initializeSelectionContext(currentSelections);
-  const dependents = [];
+  if (selectedSet.has(fullId)) return void 0;
   for (const selectedId of resolvedSelections) {
-    if (selectedId === fullId) continue;
     const selectedSkill = matrix.skills[selectedId];
     if (!selectedSkill) continue;
-    for (const requirement of selectedSkill.requires) {
-      if (requirement.needsAny) {
-        const satisfiedReqs = requirement.skillIds.filter((reqId) => selectedSet.has(reqId));
-        if (satisfiedReqs.length === 1 && satisfiedReqs[0] === fullId) {
-          dependents.push(selectedId);
+    for (const req of selectedSkill.requires) {
+      if (!req.skillIds.includes(fullId)) continue;
+      if (req.needsAny) {
+        if (!req.skillIds.some((id) => selectedSet.has(id))) {
+          return selectedSkill.displayName;
         }
       } else {
-        if (requirement.skillIds.includes(fullId)) {
-          dependents.push(selectedId);
-        }
+        return selectedSkill.displayName;
       }
     }
   }
-  return dependents;
+  return void 0;
 }
 function isDiscouraged(skillId, currentSelections) {
   const fullId = resolveAlias(skillId);
@@ -1992,12 +1999,25 @@ function isIncompatible(skillId, currentSelections) {
   const skill = matrix.skills[fullId];
   if (!skill) return false;
   const { resolvedSelections } = initializeSelectionContext(currentSelections);
-  for (const selectedId of resolvedSelections) {
-    if (skill.conflictsWith.some((c) => c.skillId === selectedId)) return true;
-    const selectedSkill = matrix.skills[selectedId];
-    if (selectedSkill?.conflictsWith.some((c) => c.skillId === fullId)) return true;
-  }
-  return false;
+  return hasDirectConflict(skill, resolvedSelections) || hasUnsatisfiableRequires(skill, resolvedSelections) || isIncompatibleByFramework(skill, resolvedSelections);
+}
+function hasDirectConflict(skill, selections) {
+  return selections.some(
+    (selectedId) => skill.conflictsWith.some((c) => c.skillId === selectedId) || matrix.skills[selectedId]?.conflictsWith.some((c) => c.skillId === skill.id)
+  );
+}
+function isDepBlockedByConflict(depId, selections) {
+  const depSkill = matrix.skills[depId];
+  return depSkill ? hasDirectConflict(depSkill, selections) : false;
+}
+function hasUnsatisfiableRequires(skill, selections) {
+  return skill.requires.some(
+    (req) => req.needsAny ? req.skillIds.every((depId) => isDepBlockedByConflict(depId, selections)) : req.skillIds.some((depId) => isDepBlockedByConflict(depId, selections))
+  );
+}
+function isIncompatibleByFramework(skill, selections) {
+  if (skill.compatibleWith.length === 0) return false;
+  return selections.length > 0 && !selections.some((id) => skill.compatibleWith.includes(id));
 }
 function hasUnmetRequirements(skillId, currentSelections) {
   const fullId = resolveAlias(skillId);
@@ -2038,16 +2058,40 @@ function getIncompatibleReason(skillId, currentSelections) {
   const skill = matrix.skills[fullId];
   if (!skill) return void 0;
   const { resolvedSelections } = initializeSelectionContext(currentSelections);
-  for (const selectedId of resolvedSelections) {
-    const conflict = skill.conflictsWith.find((c) => c.skillId === selectedId);
-    if (conflict) {
+  const directReason = findDirectConflictReason(skill, fullId, resolvedSelections);
+  if (directReason) return directReason;
+  const reqReason = findUnsatisfiableRequiresReason(skill, resolvedSelections);
+  if (reqReason) return reqReason;
+  if (isIncompatibleByFramework(skill, resolvedSelections)) {
+    const compatLabels = skill.compatibleWith.map((id) => getLabel(getSkillById(id))).join(", ");
+    return `only compatible with ${compatLabels}`;
+  }
+  return void 0;
+}
+function findDirectConflictReason(skill, fullId, selections) {
+  for (const selectedId of selections) {
+    if (skill.conflictsWith.some((c) => c.skillId === selectedId)) {
       return `conflicts with ${getLabel(getSkillById(selectedId))}`;
     }
     const selectedSkill = matrix.skills[selectedId];
-    if (selectedSkill) {
-      const reverseConflict = selectedSkill.conflictsWith.find((c) => c.skillId === fullId);
-      if (reverseConflict) {
-        return `conflicts with ${getLabel(selectedSkill)}`;
+    if (selectedSkill?.conflictsWith.some((c) => c.skillId === fullId)) {
+      return `conflicts with ${getLabel(selectedSkill)}`;
+    }
+  }
+  return void 0;
+}
+function findUnsatisfiableRequiresReason(skill, selections) {
+  for (const req of skill.requires) {
+    if (req.needsAny) {
+      const allBlocked = req.skillIds.every((depId) => isDepBlockedByConflict(depId, selections));
+      if (allBlocked) {
+        const labels = req.skillIds.map((id) => getLabel(getSkillById(id))).join(" or ");
+        return `requires ${labels} (all conflict with current selection)`;
+      }
+    } else {
+      const blockedDep = req.skillIds.find((depId) => isDepBlockedByConflict(depId, selections));
+      if (blockedDep) {
+        return `requires ${getLabel(getSkillById(blockedDep))} which conflicts with current selection`;
       }
     }
   }
@@ -2451,20 +2495,13 @@ async function detectProjectInstallation(projectDir) {
   }
   const loaded = await loadProjectConfigFromDir(projectDir);
   const mode = deriveInstallMode(loaded?.config?.skills ?? []);
-  if (mode === "local") {
-    return {
-      mode: "local",
-      configPath,
-      agentsDir: path12.join(projectDir, CLAUDE_DIR, "agents"),
-      skillsDir: path12.join(projectDir, CLAUDE_DIR, "skills"),
-      projectDir
-    };
-  }
   return {
-    mode: "plugin",
+    mode,
     configPath,
     agentsDir: path12.join(projectDir, CLAUDE_DIR, "agents"),
-    skillsDir: path12.join(projectDir, CLAUDE_DIR, PLUGINS_SUBDIR),
+    // Mixed mode has local skills in .claude/skills/ and plugins in cache;
+    // use .claude/skills/ as the primary skillsDir (same as local mode)
+    skillsDir: path12.join(projectDir, CLAUDE_DIR, mode === "plugin" ? PLUGINS_SUBDIR : "skills"),
     projectDir
   };
 }
@@ -2476,20 +2513,11 @@ async function detectGlobalInstallation() {
   }
   const loaded = await loadProjectConfigFromDir(homeDir);
   const mode = deriveInstallMode(loaded?.config?.skills ?? []);
-  if (mode === "local") {
-    return {
-      mode: "local",
-      configPath,
-      agentsDir: path12.join(homeDir, CLAUDE_DIR, "agents"),
-      skillsDir: path12.join(homeDir, CLAUDE_DIR, "skills"),
-      projectDir: homeDir
-    };
-  }
   return {
-    mode: "plugin",
+    mode,
     configPath,
     agentsDir: path12.join(homeDir, CLAUDE_DIR, "agents"),
-    skillsDir: path12.join(homeDir, CLAUDE_DIR, PLUGINS_SUBDIR),
+    skillsDir: path12.join(homeDir, CLAUDE_DIR, mode === "plugin" ? PLUGINS_SUBDIR : "skills"),
     projectDir: homeDir
   };
 }
@@ -3607,6 +3635,20 @@ async function claudePluginMarketplaceAdd(source) {
     throw new Error(`Failed to add marketplace: ${errorMessage.trim()}`);
   }
 }
+async function claudePluginMarketplaceUpdate(name) {
+  validatePluginName(name);
+  const args = ["plugin", "marketplace", "update", name];
+  let result;
+  try {
+    result = await execCommand("claude", args, {});
+  } catch (err) {
+    throw new Error(`Failed to update marketplace: ${getErrorMessage(err)}`);
+  }
+  if (result.exitCode !== 0) {
+    const errorMessage = result.stderr || result.stdout || "Unknown error";
+    throw new Error(`Failed to update marketplace: ${errorMessage.trim()}`);
+  }
+}
 async function claudePluginUninstall(pluginName, scope, projectDir) {
   validatePluginName(pluginName);
   const cwd = resolvePluginCwd(scope, projectDir);
@@ -3635,11 +3677,11 @@ async function prepareDirectories(paths) {
   await ensureDir(paths.agentsDir);
   await ensureDir(path20.dirname(paths.configPath));
 }
-async function deleteAndCopySkills(skills, sourceResult, projectDir, skillsDir) {
+async function deleteAndCopySkills(skills, sourceResult, baseDir, skillsDir) {
   for (const skill of skills) {
     if (skill.source && skill.source !== "local") {
       verbose(`Using alternate source '${skill.source}' for ${skill.id}`);
-      await deleteLocalSkill(projectDir, skill.id);
+      await deleteLocalSkill(baseDir, skill.id);
     }
   }
   const skillIds = skills.map((s) => s.id);
@@ -3956,7 +3998,7 @@ async function installLocal(options) {
   }
   await ensureDir(globalPaths.skillsDir);
   const projectCopied = projectSkills.length > 0 ? await deleteAndCopySkills(projectSkills, sourceResult, projectDir, projectPaths.skillsDir) : [];
-  const globalCopied = globalSkills.length > 0 ? await deleteAndCopySkills(globalSkills, sourceResult, projectDir, globalPaths.skillsDir) : [];
+  const globalCopied = globalSkills.length > 0 ? await deleteAndCopySkills(globalSkills, sourceResult, os8.homedir(), globalPaths.skillsDir) : [];
   const copiedSkills = [...projectCopied, ...globalCopied];
   const localSkillsForResolution = buildLocalSkillsMap(copiedSkills);
   const agents = await loadMergedAgents(sourceResult.sourcePath);
@@ -4001,6 +4043,7 @@ async function installLocal(options) {
 
 // src/cli/lib/installation/mode-migrator.ts
 init_esm_shims();
+import os9 from "os";
 import path21 from "path";
 function detectMigrations(oldSkills, newSkills) {
   const toLocal = [];
@@ -4036,16 +4079,31 @@ async function executeMigration(plan, projectDir, sourceResult) {
   const pluginizedSkills = [];
   if (plan.toLocal.length > 0) {
     try {
-      const localSkillsDir = path21.join(projectDir, LOCAL_SKILLS_PATH);
-      const skillIds = plan.toLocal.map((m) => m.id);
-      const copied = await copySkillsToLocalFlattened(
-        skillIds,
-        localSkillsDir,
-        sourceResult.matrix,
-        sourceResult
-      );
-      for (const skill of copied) {
-        localizedSkills.push(skill.skillId);
+      const projectMigrations = plan.toLocal.filter((m) => m.newScope !== "global");
+      const globalMigrations = plan.toLocal.filter((m) => m.newScope === "global");
+      if (projectMigrations.length > 0) {
+        const projectSkillsDir = path21.join(projectDir, LOCAL_SKILLS_PATH);
+        const copied = await copySkillsToLocalFlattened(
+          projectMigrations.map((m) => m.id),
+          projectSkillsDir,
+          sourceResult.matrix,
+          sourceResult
+        );
+        for (const skill of copied) {
+          localizedSkills.push(skill.skillId);
+        }
+      }
+      if (globalMigrations.length > 0) {
+        const globalSkillsDir = path21.join(os9.homedir(), LOCAL_SKILLS_PATH);
+        const copied = await copySkillsToLocalFlattened(
+          globalMigrations.map((m) => m.id),
+          globalSkillsDir,
+          sourceResult.matrix,
+          sourceResult
+        );
+        for (const skill of copied) {
+          localizedSkills.push(skill.skillId);
+        }
       }
       for (const migration of plan.toLocal) {
         try {
@@ -4064,7 +4122,8 @@ async function executeMigration(plan, projectDir, sourceResult) {
   }
   if (plan.toPlugin.length > 0) {
     for (const migration of plan.toPlugin) {
-      await deleteLocalSkill(projectDir, migration.id);
+      const baseDir = migration.oldScope === "global" ? os9.homedir() : projectDir;
+      await deleteLocalSkill(baseDir, migration.id);
     }
     if (sourceResult.marketplace) {
       for (const migration of plan.toPlugin) {
@@ -4093,7 +4152,7 @@ init_esm_shims();
 // src/cli/lib/plugins/plugin-settings.ts
 init_esm_shims();
 import path22 from "path";
-import os9 from "os";
+import os10 from "os";
 import { z as z2 } from "zod";
 var pluginSettingsSchema = z2.object({
   enabledPlugins: z2.record(z2.string(), z2.unknown()).optional()
@@ -4144,7 +4203,7 @@ async function resolvePluginInstallPaths(pluginKeys, projectDir) {
   if (pluginKeys.length === 0) {
     return [];
   }
-  const registryPath = path22.join(os9.homedir(), CLAUDE_DIR, PLUGINS_SUBDIR, INSTALLED_PLUGINS_FILE);
+  const registryPath = path22.join(os10.homedir(), CLAUDE_DIR, PLUGINS_SUBDIR, INSTALLED_PLUGINS_FILE);
   if (!await fileExists(registryPath)) {
     verbose(`Plugin registry not found at '${registryPath}'`);
     return [];
@@ -5207,6 +5266,7 @@ async function loadSkillsMatrixFromSource(options = {}) {
   verbose(`Loading skills from source: ${source}`);
   let result;
   if (source === DEFAULT_SOURCE && !devMode) {
+    const fetchResult = await fetchFromSource(source, { forceRefresh });
     result = {
       matrix: {
         ...BUILT_IN_MATRIX,
@@ -5215,7 +5275,7 @@ async function loadSkillsMatrixFromSource(options = {}) {
         suggestedStacks: [...BUILT_IN_MATRIX.suggestedStacks]
       },
       sourceConfig,
-      sourcePath: "",
+      sourcePath: fetchResult.path,
       isLocal: false,
       marketplace: sourceConfig.marketplace
     };
@@ -5228,16 +5288,22 @@ async function loadSkillsMatrixFromSource(options = {}) {
     }
   }
   const resolvedProjectDir = projectDir || process.cwd();
-  let localSkillsResult = await discoverLocalSkills(resolvedProjectDir);
-  const homeDir = os10.homedir();
-  if ((!localSkillsResult || localSkillsResult.skills.length === 0) && resolvedProjectDir !== homeDir) {
-    localSkillsResult = await discoverLocalSkills(homeDir);
+  const homeDir = os11.homedir();
+  if (resolvedProjectDir !== homeDir) {
+    const globalLocalSkillsResult = await discoverLocalSkills(homeDir);
+    if (globalLocalSkillsResult && globalLocalSkillsResult.skills.length > 0) {
+      verbose(
+        `Found ${globalLocalSkillsResult.skills.length} global local skill(s) in ${globalLocalSkillsResult.localSkillsPath}`
+      );
+      result.matrix = mergeLocalSkillsIntoMatrix(result.matrix, globalLocalSkillsResult);
+    }
   }
-  if (localSkillsResult && localSkillsResult.skills.length > 0) {
+  const projectLocalSkillsResult = await discoverLocalSkills(resolvedProjectDir);
+  if (projectLocalSkillsResult && projectLocalSkillsResult.skills.length > 0) {
     verbose(
-      `Found ${localSkillsResult.skills.length} local skill(s) in ${localSkillsResult.localSkillsPath}`
+      `Found ${projectLocalSkillsResult.skills.length} project local skill(s) in ${projectLocalSkillsResult.localSkillsPath}`
     );
-    result.matrix = mergeLocalSkillsIntoMatrix(result.matrix, localSkillsResult);
+    result.matrix = mergeLocalSkillsIntoMatrix(result.matrix, projectLocalSkillsResult);
   }
   if (!options.skipExtraSources) {
     await loadSkillsFromAllSources(
@@ -5469,6 +5535,7 @@ export {
   resolveAllSources,
   loadStacks,
   getStackSkillIds,
+  loadProjectConfigFromDir,
   loadProjectConfig,
   validateProjectConfig,
   IMPORT_DEFAULTS,
@@ -5486,7 +5553,7 @@ export {
   fetchFromSource,
   fetchMarketplace,
   resolveAlias,
-  getDependentSkills,
+  getUnmetRequiredBy,
   validateSelection,
   getAvailableSkills,
   checkMatrixHealth,
@@ -5508,6 +5575,7 @@ export {
   isClaudeCLIAvailable,
   claudePluginMarketplaceExists,
   claudePluginMarketplaceAdd,
+  claudePluginMarketplaceUpdate,
   claudePluginUninstall,
   loadSkillsMatrixFromSource,
   convertStackToResolvedStack,
@@ -5527,7 +5595,9 @@ export {
   detectProjectInstallation,
   detectGlobalInstallation,
   detectInstallation,
+  resolveInstallPaths,
   buildAndMergeConfig,
+  buildAgentScopeMap,
   writeScopedConfigs,
   installPluginConfig,
   installLocal,
@@ -5541,4 +5611,4 @@ export {
   validateAllPlugins,
   printPluginValidationResult
 };
-//# sourceMappingURL=chunk-WS3TL2AO.js.map
+//# sourceMappingURL=chunk-OIHZ2YH3.js.map