@agents-inc/cli 0.77.0 → 0.78.0

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

@@ -101,7 +101,7 @@ import {
 
 // 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,7 +996,7 @@ 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-H3QLG5AE.js");
+    const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-D3VIG3GM.js");
     const { loadAllAgents: loadAllAgents2 } = await import("./loader-JMOO2A7C.js");
     const sourceResult = await loadSkillsMatrixFromSource2({
       sourceFlag,
@@ -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();
@@ -2483,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
   };
 }
@@ -2508,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
   };
 }
@@ -3639,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);
@@ -3667,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);
@@ -3988,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);
@@ -4033,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 = [];
@@ -4068,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 {
@@ -4096,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) {
@@ -4125,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()
@@ -4176,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 [];
@@ -5239,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,
@@ -5247,7 +5275,7 @@ async function loadSkillsMatrixFromSource(options = {}) {
         suggestedStacks: [...BUILT_IN_MATRIX.suggestedStacks]
       },
       sourceConfig,
-      sourcePath: "",
+      sourcePath: fetchResult.path,
       isLocal: false,
       marketplace: sourceConfig.marketplace
     };
@@ -5260,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(
@@ -5501,6 +5535,7 @@ export {
   resolveAllSources,
   loadStacks,
   getStackSkillIds,
+  loadProjectConfigFromDir,
   loadProjectConfig,
   validateProjectConfig,
   IMPORT_DEFAULTS,
@@ -5540,6 +5575,7 @@ export {
   isClaudeCLIAvailable,
   claudePluginMarketplaceExists,
   claudePluginMarketplaceAdd,
+  claudePluginMarketplaceUpdate,
   claudePluginUninstall,
   loadSkillsMatrixFromSource,
   convertStackToResolvedStack,
@@ -5559,7 +5595,9 @@ export {
   detectProjectInstallation,
   detectGlobalInstallation,
   detectInstallation,
+  resolveInstallPaths,
   buildAndMergeConfig,
+  buildAgentScopeMap,
   writeScopedConfigs,
   installPluginConfig,
   installLocal,
@@ -5573,4 +5611,4 @@ export {
   validateAllPlugins,
   printPluginValidationResult
 };
-//# sourceMappingURL=chunk-CZLXZ75E.js.map
+//# sourceMappingURL=chunk-OIHZ2YH3.js.map