@agents-inc/cli 0.74.7 → 0.74.10

package/dist/{chunk-UKYWXIDT.js → chunk-2EXAK22V.js}

@@ -799,56 +799,60 @@ function validateProjectConfig(config) {
 }
 
 // src/cli/lib/configuration/config-merger.ts
+function mergeConfigs(newConfig, existingConfig) {
+  const merged = { ...newConfig };
+  if (existingConfig.name) {
+    merged.name = existingConfig.name;
+  }
+  if (existingConfig.description) {
+    merged.description = existingConfig.description;
+  }
+  if (existingConfig.source) {
+    merged.source = existingConfig.source;
+  }
+  if (existingConfig.agents && existingConfig.agents.length > 0) {
+    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];
+  }
+  if (existingConfig.skills && existingConfig.skills.length > 0) {
+    const newSkillsById = indexBy(merged.skills, (s) => s.id);
+    const existingIds = new Set(existingConfig.skills.map((s) => s.id));
+    const updatedExisting = existingConfig.skills.map(
+      (existing) => newSkillsById[existing.id] ?? existing
+    );
+    const addedSkills = merged.skills.filter((s) => !existingIds.has(s.id));
+    merged.skills = [...updatedExisting, ...addedSkills];
+  }
+  if (existingConfig.stack) {
+    const mergedStack = { ...merged.stack };
+    for (const [agentId, agentConfig] of typedEntries(existingConfig.stack)) {
+      mergedStack[agentId] = { ...mergedStack[agentId], ...agentConfig };
+    }
+    merged.stack = mergedStack;
+  }
+  if (existingConfig.author) {
+    merged.author = existingConfig.author;
+  }
+  if (existingConfig.agentsSource) {
+    merged.agentsSource = existingConfig.agentsSource;
+  }
+  if (existingConfig.marketplace) {
+    merged.marketplace = existingConfig.marketplace;
+  }
+  return merged;
+}
 async function mergeWithExistingConfig(newConfig, context) {
-  const localConfig = { ...newConfig };
   const existingFullConfig = await loadProjectConfig(context.projectDir);
   if (existingFullConfig) {
-    const existingConfig = existingFullConfig.config;
-    if (existingConfig.name) {
-      localConfig.name = existingConfig.name;
-    }
-    if (existingConfig.description) {
-      localConfig.description = existingConfig.description;
-    }
-    if (existingConfig.source) {
-      localConfig.source = existingConfig.source;
-    }
-    if (existingConfig.agents && existingConfig.agents.length > 0) {
-      const existingNames = new Set(existingConfig.agents.map((a) => a.name));
-      const newAgents = localConfig.agents.filter((a) => !existingNames.has(a.name));
-      localConfig.agents = [...existingConfig.agents, ...newAgents];
-    }
-    if (existingConfig.skills && existingConfig.skills.length > 0) {
-      const newSkillsById = indexBy(localConfig.skills, (s) => s.id);
-      const existingIds = new Set(existingConfig.skills.map((s) => s.id));
-      const updatedExisting = existingConfig.skills.map(
-        (existing) => newSkillsById[existing.id] ?? existing
-      );
-      const addedSkills = localConfig.skills.filter((s) => !existingIds.has(s.id));
-      localConfig.skills = [...updatedExisting, ...addedSkills];
-    }
-    if (existingConfig.stack) {
-      const mergedStack = { ...localConfig.stack };
-      for (const [agentId, agentConfig] of typedEntries(existingConfig.stack)) {
-        mergedStack[agentId] = { ...mergedStack[agentId], ...agentConfig };
-      }
-      localConfig.stack = mergedStack;
-    }
-    if (existingConfig.author) {
-      localConfig.author = existingConfig.author;
-    }
-    if (existingConfig.agentsSource) {
-      localConfig.agentsSource = existingConfig.agentsSource;
-    }
-    if (existingConfig.marketplace) {
-      localConfig.marketplace = existingConfig.marketplace;
-    }
+    const config = mergeConfigs(newConfig, existingFullConfig.config);
     return {
-      config: localConfig,
+      config,
       merged: true,
       existingConfigPath: existingFullConfig.configPath
     };
   }
+  const localConfig = { ...newConfig };
   const existingProjectConfig = await loadProjectSourceConfig(context.projectDir);
   if (existingProjectConfig?.author) {
     localConfig.author = existingProjectConfig.author;
@@ -980,7 +984,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-HQTTAMS7.js");
+    const { loadSkillsMatrixFromSource: loadSkillsMatrixFromSource2 } = await import("./source-loader-WBDPZJEW.js");
     const { loadAllAgents: loadAllAgents2 } = await import("./loader-NHUCFMFQ.js");
     const sourceResult = await loadSkillsMatrixFromSource2({
       sourceFlag,
@@ -1740,22 +1744,33 @@ function mergeMatrixWithSkills(categories, relationships, skills) {
   };
   return merged;
 }
-function resolveConflicts(skillId, conflictRules, resolve) {
-  const conflicts = [];
-  for (const rule of conflictRules) {
+function resolveRelationships(skillId, relationships, resolve) {
+  const conflictsWith = [];
+  const discourages = [];
+  const compatible = /* @__PURE__ */ new Set();
+  const requires = [];
+  const alternatives = [];
+  for (const rule of relationships.conflicts) {
     const resolved = rule.skills.map((slug) => resolve(slug, "conflicts")).filter((id) => id !== null);
     if (!resolved.includes(skillId)) continue;
     for (const other of resolved) {
-      if (other !== skillId && !conflicts.some((c) => c.skillId === other)) {
-        conflicts.push({ skillId: other, reason: rule.reason });
+      if (other !== skillId && !conflictsWith.some((c) => c.skillId === other)) {
+        conflictsWith.push({ skillId: other, reason: rule.reason });
       }
     }
   }
-  return conflicts;
-}
-function resolveCompatibilityGroups(skillId, compatibilityGroups, resolve) {
-  const compatible = /* @__PURE__ */ new Set();
-  for (const group of compatibilityGroups) {
+  if (relationships.discourages) {
+    for (const rule of relationships.discourages) {
+      const resolved = rule.skills.map((slug) => resolve(slug, "discourages")).filter((id) => id !== null);
+      if (!resolved.includes(skillId)) continue;
+      for (const other of resolved) {
+        if (other !== skillId && !discourages.some((d) => d.skillId === other)) {
+          discourages.push({ skillId: other, reason: rule.reason });
+        }
+      }
+    }
+  }
+  for (const group of relationships.compatibleWith ?? []) {
     const resolved = group.skills.map((slug) => resolve(slug, "compatibleWith")).filter((id) => id !== null);
     if (!resolved.includes(skillId)) continue;
     for (const other of resolved) {
@@ -1764,11 +1779,7 @@ function resolveCompatibilityGroups(skillId, compatibilityGroups, resolve) {
       }
     }
   }
-  return [...compatible];
-}
-function resolveRequirements(skillId, requireRules, resolve) {
-  const requires = [];
-  for (const rule of requireRules) {
+  for (const rule of relationships.requires) {
     const ruleSkillId = resolve(rule.skill, "requires.skill");
     if (ruleSkillId !== skillId) continue;
     const resolvedNeeds = rule.needs.map((slug) => resolve(slug, "requires.needs")).filter((id) => id !== null);
@@ -1779,11 +1790,7 @@ function resolveRequirements(skillId, requireRules, resolve) {
       reason: rule.reason
     });
   }
-  return requires;
-}
-function resolveAlternatives(skillId, alternativeGroups, resolve) {
-  const alternatives = [];
-  for (const group of alternativeGroups) {
+  for (const group of relationships.alternatives) {
     const resolved = group.skills.map((slug) => resolve(slug, "alternatives")).filter((id) => id !== null);
     if (!resolved.includes(skillId)) continue;
     for (const alt of resolved) {
@@ -1792,26 +1799,19 @@ function resolveAlternatives(skillId, alternativeGroups, resolve) {
       }
     }
   }
-  return alternatives;
-}
-function resolveDiscourages(skillId, discourageRules, resolve) {
-  if (!discourageRules) return [];
-  const discourages = [];
-  for (const rule of discourageRules) {
-    const resolved = rule.skills.map((slug) => resolve(slug, "discourages")).filter((id) => id !== null);
-    if (!resolved.includes(skillId)) continue;
-    for (const other of resolved) {
-      if (other !== skillId && !discourages.some((d) => d.skillId === other)) {
-        discourages.push({ skillId: other, reason: rule.reason });
-      }
-    }
-  }
-  return discourages;
+  return {
+    conflictsWith,
+    discourages,
+    compatibleWith: [...compatible],
+    requires,
+    alternatives
+  };
 }
 function buildResolvedSkill(skill, _categories, relationships, slugMap) {
   const resolve = (slug2, context) => resolveToCanonicalId(slug2, slugMap.slugToId, context ? `${skill.id} ${context}` : void 0);
   const slug = skill.slug;
   const recommendation = relationships.recommends.find((r) => r.skill === skill.slug);
+  const resolved = resolveRelationships(skill.id, relationships, resolve);
   return {
     id: skill.id,
     slug,
@@ -1821,17 +1821,9 @@ function buildResolvedSkill(skill, _categories, relationships, slugMap) {
     category: skill.category,
     tags: skill.tags,
     author: skill.author,
-    conflictsWith: resolveConflicts(skill.id, relationships.conflicts, resolve),
+    ...resolved,
     isRecommended: recommendation != null,
     recommendedReason: recommendation?.reason,
-    requires: resolveRequirements(skill.id, relationships.requires, resolve),
-    alternatives: resolveAlternatives(skill.id, relationships.alternatives, resolve),
-    discourages: resolveDiscourages(skill.id, relationships.discourages, resolve),
-    compatibleWith: resolveCompatibilityGroups(
-      skill.id,
-      relationships.compatibleWith ?? [],
-      resolve
-    ),
     path: skill.path,
     ...skill.custom === true ? { custom: true } : {}
   };
@@ -3676,28 +3668,30 @@ async function buildLocalConfig(wizardResult, sourceResult) {
   return { config: localConfig, loadedStack };
 }
 function setConfigMetadata(config, wizardResult, sourceResult, sourceFlag) {
+  const result = { ...config };
   if (wizardResult.selectedDomains && wizardResult.selectedDomains.length > 0) {
-    config.domains = wizardResult.selectedDomains;
+    result.domains = wizardResult.selectedDomains;
   }
   if (wizardResult.selectedAgents && wizardResult.selectedAgents.length > 0) {
-    config.selectedAgents = wizardResult.selectedAgents;
+    result.selectedAgents = wizardResult.selectedAgents;
   }
   if (sourceFlag) {
-    config.source = sourceFlag;
+    result.source = sourceFlag;
   } else if (sourceResult.sourceConfig.source) {
-    config.source = sourceResult.sourceConfig.source;
+    result.source = sourceResult.sourceConfig.source;
   }
   if (sourceResult.marketplace) {
-    config.marketplace = sourceResult.marketplace;
+    result.marketplace = sourceResult.marketplace;
   }
+  return result;
 }
 async function buildAndMergeConfig(wizardResult, sourceResult, projectDir, sourceFlag) {
   const { config } = await buildLocalConfig(wizardResult, sourceResult);
   verbose(
     `buildAndMergeConfig: before merge \u2014 stack=${config.stack ? Object.keys(config.stack).length + " agents" : "UNDEFINED"}`
   );
-  setConfigMetadata(config, wizardResult, sourceResult, sourceFlag);
-  const result = await mergeWithExistingConfig(config, { projectDir });
+  const configWithMetadata = setConfigMetadata(config, wizardResult, sourceResult, sourceFlag);
+  const result = await mergeWithExistingConfig(configWithMetadata, { projectDir });
   verbose(
     `buildAndMergeConfig: after merge \u2014 stack=${result.config.stack ? Object.keys(result.config.stack).length + " agents" : "UNDEFINED"}, merged=${result.merged}`
   );
@@ -3783,7 +3777,7 @@ async function writeProjectConfigTypes(projectConfigPath, projectDir, projectCon
   await writeFile(typesPath, source);
   verbose("Using project config-types.ts that imports from global");
 }
-async function writeScopedConfigs(finalConfig, matrix2, agents, projectDir, projectConfigPath) {
+async function writeScopedConfigs(finalConfig, matrix2, agents, projectDir, projectConfigPath, projectInstallationExists) {
   const homeDir = os8.homedir();
   const isProjectContext = path20.resolve(projectDir) !== path20.resolve(homeDir);
   if (!isProjectContext) {
@@ -3798,10 +3792,17 @@ async function writeScopedConfigs(finalConfig, matrix2, agents, projectDir, proj
   verbose(`Updated global config at ${globalConfigPath}`);
   await writeStandaloneConfigTypes(globalConfigPath, matrix2, agents, globalConfig);
   verbose("Updated global config-types.ts with actual types");
-  await ensureDir(path20.dirname(projectConfigPath));
-  await writeConfigFile(projectSplitConfig, projectConfigPath, { isProjectConfig: true });
-  verbose(`Updated project config at ${projectConfigPath}`);
-  await writeProjectConfigTypes(projectConfigPath, projectDir, projectSplitConfig, matrix2);
+  const hasProjectItems = projectSplitConfig.skills.length > 0 || projectSplitConfig.agents.length > 0;
+  if (projectInstallationExists || hasProjectItems) {
+    await ensureDir(path20.dirname(projectConfigPath));
+    await writeConfigFile(projectSplitConfig, projectConfigPath, { isProjectConfig: true });
+    verbose(`Updated project config at ${projectConfigPath}`);
+    await writeProjectConfigTypes(projectConfigPath, projectDir, projectSplitConfig, matrix2);
+  } else {
+    verbose(
+      "Skipped project config \u2014 no existing project installation and no project-scoped items"
+    );
+  }
 }
 async function compileAndWriteAgents(compileConfig, agents, localSkills, sourceResult, projectDir, agentsDir, installMode, agentScopeMap) {
   const engine = await createLiquidEngine(projectDir);
@@ -3812,6 +3813,7 @@ async function compileAndWriteAgents(compileConfig, agents, localSkills, sourceR
     sourceResult.sourcePath
   );
   const globalAgentsDir = path20.join(os8.homedir(), CLAUDE_DIR, "agents");
+  await ensureDir(globalAgentsDir);
   const compiledAgentNames = [];
   for (const [name, agent] of typedEntries(resolvedAgents)) {
     const output = await compileAgentForPlugin(
@@ -3823,9 +3825,6 @@ async function compileAndWriteAgents(compileConfig, agents, localSkills, sourceR
     );
     const scope = agentScopeMap?.get(name) ?? "project";
     const targetDir = scope === "global" ? globalAgentsDir : agentsDir;
-    if (scope === "global") {
-      await ensureDir(targetDir);
-    }
     await writeFile(path20.join(targetDir, `${name}.md`), output);
     compiledAgentNames.push(name);
   }
@@ -3834,20 +3833,22 @@ async function compileAndWriteAgents(compileConfig, agents, localSkills, sourceR
 async function installPluginConfig(options) {
   const { wizardResult, sourceResult, projectDir, sourceFlag } = options;
   const projectPaths = resolveInstallPaths(projectDir, "project");
-  const hasProjectAgents = wizardResult.skills.some((s) => s.scope !== "global") || wizardResult.agentConfigs.some((a) => a.scope !== "global");
-  if (hasProjectAgents) {
+  const isProjectInstall = path20.resolve(projectDir) !== path20.resolve(os8.homedir());
+  if (isProjectInstall) {
     await ensureDir(projectPaths.agentsDir);
   }
   await ensureDir(path20.dirname(projectPaths.configPath));
   const agents = await loadMergedAgents(sourceResult.sourcePath);
   const mergeResult = await buildAndMergeConfig(wizardResult, sourceResult, projectDir, sourceFlag);
   const finalConfig = mergeResult.config;
+  const projectInstallationExists = path20.resolve(projectDir) !== path20.resolve(os8.homedir());
   await writeScopedConfigs(
     finalConfig,
     sourceResult.matrix,
     agents,
     projectDir,
-    projectPaths.configPath
+    projectPaths.configPath,
+    projectInstallationExists
   );
   const compileAgentsConfig = buildCompileAgents(finalConfig, agents);
   const compileConfig = {
@@ -3885,15 +3886,14 @@ async function installLocal(options) {
   const globalPaths = resolveInstallPaths(projectDir, "global");
   const projectSkills = wizardResult.skills.filter((s) => s.scope !== "global");
   const globalSkills = wizardResult.skills.filter((s) => s.scope === "global");
-  const hasProjectItems = projectSkills.length > 0 || wizardResult.agentConfigs.some((a) => a.scope !== "global");
-  if (hasProjectItems) {
+  const homeDir = os8.homedir();
+  const isProjectInstall = path20.resolve(projectDir) !== path20.resolve(homeDir);
+  if (isProjectInstall) {
     await prepareDirectories(projectPaths);
   } else {
     await ensureDir(path20.dirname(projectPaths.configPath));
   }
-  if (globalSkills.length > 0) {
-    await ensureDir(globalPaths.skillsDir);
-  }
+  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 copiedSkills = [...projectCopied, ...globalCopied];
@@ -3901,12 +3901,14 @@ async function installLocal(options) {
   const agents = await loadMergedAgents(sourceResult.sourcePath);
   const mergeResult = await buildAndMergeConfig(wizardResult, sourceResult, projectDir, sourceFlag);
   const finalConfig = mergeResult.config;
+  const isProjectContext = path20.resolve(projectDir) !== path20.resolve(os8.homedir());
   await writeScopedConfigs(
     finalConfig,
     sourceResult.matrix,
     agents,
     projectDir,
-    projectPaths.configPath
+    projectPaths.configPath,
+    isProjectContext
   );
   const compileAgentsConfig = buildCompileAgents(finalConfig, agents);
   const compileConfig = {
@@ -5462,7 +5464,10 @@ export {
   claudePluginMarketplaceAdd,
   claudePluginUninstall,
   loadSkillsMatrixFromSource,
+  convertStackToResolvedStack,
+  extractSourceName,
   getMarketplaceLabel,
+  mergeLocalSkillsIntoMatrix,
   loadConfigTypesDataInBackground,
   regenerateConfigTypes,
   generateConfigSource,
@@ -5491,4 +5496,4 @@ export {
   validateAllPlugins,
   printPluginValidationResult
 };
-//# sourceMappingURL=chunk-UKYWXIDT.js.map
+//# sourceMappingURL=chunk-2EXAK22V.js.map