@agents-inc/cli 0.35.0 → 0.41.1

package/dist/{chunk-WMVGRAFB.js → chunk-TTXV55NQ.js}

@@ -42,7 +42,7 @@ import {
   warn,
   warnUnknownFields,
   writeFile
-} from "./chunk-OI4WBRC7.js";
+} from "./chunk-XJXJZ2MJ.js";
 import {
   ARCHIVED_SKILLS_DIR_NAME,
   CACHE_DIR,
@@ -53,6 +53,7 @@ import {
   DEFAULT_BRANDING,
   DEFAULT_DISPLAY_VERSION,
   DEFAULT_PLUGIN_NAME,
+  DEFAULT_PUBLIC_SOURCE_NAME,
   DEFAULT_VERSION,
   DIRS,
   GITHUB_SOURCE,
@@ -75,7 +76,7 @@ import {
   STANDARD_FILES,
   YAML_FORMATTING,
   yamlSchemaComment
-} from "./chunk-YCS7GF6Y.js";
+} from "./chunk-BK7TANUV.js";
 import {
   init_esm_shims
 } from "./chunk-DHET7RCE.js";
@@ -196,10 +197,10 @@ async function resolveAgentsSource(flagValue, projectDir) {
     return { agentsSource: flagValue, agentsSourceOrigin: "flag" };
   }
   const projectConfig = projectDir ? await loadProjectSourceConfig(projectDir) : null;
-  if (projectConfig?.agents_source) {
-    verbose(`Agents source from project config: ${projectConfig.agents_source}`);
+  if (projectConfig?.agentsSource) {
+    verbose(`Agents source from project config: ${projectConfig.agentsSource}`);
     return {
-      agentsSource: projectConfig.agents_source,
+      agentsSource: projectConfig.agentsSource,
       agentsSourceOrigin: "project"
     };
   }
@@ -413,6 +414,7 @@ function isLocalSource(source) {
 init_esm_shims();
 import { createHash as createHash2 } from "crypto";
 import { downloadTemplate } from "giget";
+import os2 from "os";
 import path25 from "path";
 
 // src/cli/lib/configuration/index.ts
@@ -603,12 +605,12 @@ import path22 from "path";
 // src/cli/lib/metadata-keys.ts
 init_esm_shims();
 var METADATA_KEYS = {
-  CLI_NAME: "cli_name",
-  CLI_DESCRIPTION: "cli_description",
+  CLI_NAME: "cliName",
+  CLI_DESCRIPTION: "cliDescription",
   CATEGORY: "category",
-  FORKED_FROM: "forked_from",
-  CONTENT_HASH: "content_hash",
-  USAGE_GUIDANCE: "usage_guidance"
+  FORKED_FROM: "forkedFrom",
+  CONTENT_HASH: "contentHash",
+  USAGE_GUIDANCE: "usageGuidance"
 };
 var IMPORT_DEFAULTS = {
   CATEGORY: "imported",
@@ -739,20 +741,7 @@ async function readForkedFromMetadata(skillDir) {
     warn(`Invalid metadata.yaml at ${metadataPath}: ${formatZodErrors(result.error.issues)}`);
     return null;
   }
-  return result.data.forked_from ?? null;
-}
-async function readLocalSkillMetadata(skillDir) {
-  const metadataPath = path4.join(skillDir, STANDARD_FILES.METADATA_YAML);
-  if (!await fileExists(metadataPath)) {
-    return null;
-  }
-  const content = await readFile(metadataPath);
-  const result = localSkillMetadataSchema.safeParse(parseYaml3(content));
-  if (!result.success) {
-    warn(`Invalid metadata.yaml at ${metadataPath}: ${formatZodErrors(result.error.issues)}`);
-    return null;
-  }
-  return result.data;
+  return result.data.forkedFrom ?? null;
 }
 async function getLocalSkillsWithMetadata(projectDir) {
   const localSkillsPath = path4.join(projectDir, LOCAL_SKILLS_PATH);
@@ -764,7 +753,7 @@ async function getLocalSkillsWithMetadata(projectDir) {
   for (const dirName of skillDirs) {
     const skillDir = path4.join(localSkillsPath, dirName);
     const forkedFrom = await readForkedFromMetadata(skillDir);
-    const skillId = forkedFrom?.skill_id ?? dirName;
+    const skillId = forkedFrom?.skillId ?? dirName;
     result.set(skillId, { dirName, forkedFrom });
   }
   return result;
@@ -790,11 +779,11 @@ async function compareLocalSkillsWithSource(projectDir, sourcePath, sourceSkills
       });
       continue;
     }
-    const localHash = forkedFrom.content_hash;
-    const sourceSkill = sourceSkills[forkedFrom.skill_id];
+    const localHash = forkedFrom.contentHash;
+    const sourceSkill = sourceSkills[forkedFrom.skillId];
     if (!sourceSkill) {
       results.push({
-        id: forkedFrom.skill_id,
+        id: forkedFrom.skillId,
         localHash,
         sourceHash: null,
         status: "local-only",
@@ -805,7 +794,7 @@ async function compareLocalSkillsWithSource(projectDir, sourcePath, sourceSkills
     const sourceHash = await computeSourceHash(sourcePath, sourceSkill.path);
     if (sourceHash === null) {
       results.push({
-        id: forkedFrom.skill_id,
+        id: forkedFrom.skillId,
         localHash,
         sourceHash: null,
         status: "local-only",
@@ -815,7 +804,7 @@ async function compareLocalSkillsWithSource(projectDir, sourcePath, sourceSkills
     }
     const status = localHash === sourceHash ? "current" : "outdated";
     results.push({
-      id: forkedFrom.skill_id,
+      id: forkedFrom.skillId,
       localHash,
       sourceHash,
       status,
@@ -825,7 +814,7 @@ async function compareLocalSkillsWithSource(projectDir, sourcePath, sourceSkills
   }
   return sortBy(results, (r) => r.id);
 }
-async function injectForkedFromMetadata(destPath, skillId, contentHash) {
+async function injectForkedFromMetadata(destPath, skillId, contentHash, source) {
   const metadataPath = path4.join(destPath, STANDARD_FILES.METADATA_YAML);
   const rawContent = await readFile(metadataPath);
   const lines = rawContent.split("\n");
@@ -837,13 +826,13 @@ async function injectForkedFromMetadata(destPath, skillId, contentHash) {
   if (!parseResult.success) {
     warn(`Malformed metadata.yaml at '${metadataPath}' \u2014 existing fields may be lost`);
   }
-  const metadata = parseResult.success ? parseResult.data : { forked_from: void 0 };
-  metadata.forked_from = {
-    skill_id: skillId,
-    content_hash: contentHash,
-    date: getCurrentDate()
+  const metadata = parseResult.success ? parseResult.data : { forkedFrom: void 0 };
+  metadata.forkedFrom = {
+    skillId,
+    contentHash,
+    date: getCurrentDate(),
+    ...source ? { source } : {}
   };
-  metadata.generatedByAgentsInc = true;
   const schemaComment = `${yamlSchemaComment(SCHEMA_PATHS.metadata)}
 `;
   const newYamlContent = stringifyYaml2(metadata, { lineWidth: YAML_FORMATTING.LINE_WIDTH_NONE });
@@ -888,7 +877,7 @@ async function copySkillToLocalFlattened(skill, localSkillsDir, sourceResult) {
   const contentHash = await generateSkillHash(sourcePath);
   await ensureDir(path5.dirname(destPath));
   await copy(sourcePath, destPath);
-  await injectForkedFromMetadata(destPath, skill.id, contentHash);
+  await injectForkedFromMetadata(destPath, skill.id, contentHash, sourceResult.sourceConfig.source);
   return {
     skillId: skill.id,
     contentHash,
@@ -1324,11 +1313,11 @@ function sanitizeCompiledAgentData(data) {
     title: sanitizeLiquidSyntax(data.agent.title, "agent.title"),
     description: sanitizeLiquidSyntax(data.agent.description, "agent.description"),
     tools: sanitizeStringArray(data.agent.tools, "agent.tools") ?? data.agent.tools,
-    disallowed_tools: sanitizeStringArray(data.agent.disallowed_tools, "agent.disallowed_tools"),
+    disallowedTools: sanitizeStringArray(data.agent.disallowedTools, "agent.disallowedTools"),
     model: sanitizeString(data.agent.model, "agent.model"),
-    permission_mode: sanitizeString(
-      data.agent.permission_mode,
-      "agent.permission_mode"
+    permissionMode: sanitizeString(
+      data.agent.permissionMode,
+      "agent.permissionMode"
     )
   };
   const sanitizedSkills = sanitizeSkills(data.skills);
@@ -1671,20 +1660,28 @@ async function loadMergedAgents(sourcePath) {
   return { ...cliAgents, ...sourceAgents };
 }
 async function buildLocalConfig(wizardResult, sourceResult) {
+  verbose(
+    `buildLocalConfig: selectedStackId='${wizardResult.selectedStackId}', selectedSkills=[${wizardResult.selectedSkills.join(", ")}], selectedAgents=[${wizardResult.selectedAgents.join(", ")}], installMode='${wizardResult.installMode}'`
+  );
   let loadedStack = null;
   if (wizardResult.selectedStackId) {
     loadedStack = await loadStackById(wizardResult.selectedStackId, sourceResult.sourcePath);
     if (!loadedStack) {
       loadedStack = await loadStackById(wizardResult.selectedStackId, PROJECT_ROOT);
     }
+    verbose(
+      `buildLocalConfig: loadedStack=${loadedStack ? `found (id='${loadedStack.id}')` : "NOT FOUND"}`
+    );
   }
   let localConfig;
+  const agentOptions = wizardResult.selectedAgents.length > 0 ? { selectedAgents: wizardResult.selectedAgents } : void 0;
   if (wizardResult.selectedStackId) {
     if (loadedStack) {
       localConfig = generateProjectConfigFromSkills(
         DEFAULT_PLUGIN_NAME,
         wizardResult.selectedSkills,
-        sourceResult.matrix
+        sourceResult.matrix,
+        agentOptions
       );
       if (localConfig.stack) {
         const stackProperty = buildStackProperty(loadedStack);
@@ -1706,7 +1703,7 @@ async function buildLocalConfig(wizardResult, sourceResult) {
       localConfig.description = loadedStack.description;
       const stackAgentIds = typedKeys(loadedStack.agents);
       for (const agentId of stackAgentIds) {
-        if (!localConfig.agents.includes(agentId)) {
+        if (!localConfig.agents.includes(agentId) && (wizardResult.selectedAgents.length === 0 || wizardResult.selectedAgents.includes(agentId))) {
           localConfig.agents.push(agentId);
         }
       }
@@ -1720,9 +1717,13 @@ async function buildLocalConfig(wizardResult, sourceResult) {
     localConfig = generateProjectConfigFromSkills(
       DEFAULT_PLUGIN_NAME,
       wizardResult.selectedSkills,
-      sourceResult.matrix
+      sourceResult.matrix,
+      agentOptions
     );
   }
+  verbose(
+    `buildLocalConfig result: stack=${localConfig.stack ? Object.keys(localConfig.stack).length + " agents" : "UNDEFINED"}, agents=[${localConfig.agents.join(", ")}], skills=${localConfig.skills.length}`
+  );
   return { config: localConfig, loadedStack };
 }
 function setConfigMetadata(config, wizardResult, sourceResult, sourceFlag) {
@@ -1741,24 +1742,31 @@ function setConfigMetadata(config, wizardResult, sourceResult, sourceFlag) {
 }
 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);
-  return mergeWithExistingConfig(config, { projectDir });
+  const result = await mergeWithExistingConfig(config, { projectDir });
+  verbose(
+    `buildAndMergeConfig: after merge \u2014 stack=${result.config.stack ? Object.keys(result.config.stack).length + " agents" : "UNDEFINED"}, merged=${result.merged}`
+  );
+  return result;
 }
 var CONFIG_OPTIONS_COMMENT = [
   "",
   "# Additional config options:",
   `# source: ${DEFAULT_SOURCE}`,
   "# marketplace: my-company",
-  "# agents_source: github:my-org/agents",
+  "# agentsSource: github:my-org/agents",
   ""
 ].join("\n");
 var PATH_OVERRIDES_COMMENT = [
   "",
   "# Custom paths (for marketplace repos with non-standard layouts):",
-  `# skills_dir: ${SKILLS_DIR_PATH}`,
-  `# agents_dir: ${DIRS.agents}`,
-  `# stacks_file: ${STACKS_FILE_PATH}`,
-  `# matrix_file: ${SKILLS_MATRIX_PATH}`,
+  `# skillsDir: ${SKILLS_DIR_PATH}`,
+  `# agentsDir: ${DIRS.agents}`,
+  `# stacksFile: ${STACKS_FILE_PATH}`,
+  `# matrixFile: ${SKILLS_MATRIX_PATH}`,
   ""
 ].join("\n");
 async function writeConfigFile(config, configPath) {
@@ -2685,7 +2693,7 @@ async function extractLocalSkill(localSkillsPath, skillDirName) {
     return null;
   }
   const metadata = parsed.data;
-  if (!metadata.cli_name) {
+  if (!metadata.cliName) {
     warn(
       `Skipping local skill '${skillDirName}': missing required '${METADATA_KEYS.CLI_NAME}' in metadata.yaml`
     );
@@ -2708,17 +2716,17 @@ async function extractLocalSkill(localSkillsPath, skillDirName) {
   const extracted = {
     id: skillId,
     directoryPath: skillDirName,
-    description: metadata.cli_description || frontmatter.description,
-    usageGuidance: metadata.usage_guidance,
+    description: metadata.cliDescription || frontmatter.description,
+    usageGuidance: metadata.usageGuidance,
     category,
-    categoryExclusive: metadata.category_exclusive ?? false,
+    categoryExclusive: metadata.categoryExclusive ?? false,
     author: LOCAL_DEFAULTS.AUTHOR,
     tags: metadata.tags ?? [],
-    compatibleWith: metadata.compatible_with ?? [],
-    conflictsWith: metadata.conflicts_with ?? [],
+    compatibleWith: metadata.compatibleWith ?? [],
+    conflictsWith: metadata.conflictsWith ?? [],
     requires: metadata.requires ?? [],
-    requiresSetup: metadata.requires_setup ?? [],
-    providesSetupFor: metadata.provides_setup_for ?? [],
+    requiresSetup: metadata.requiresSetup ?? [],
+    providesSetupFor: metadata.providesSetupFor ?? [],
     path: relativePath,
     local: true,
     localPath: relativePath
@@ -2797,19 +2805,19 @@ import path20 from "path";
 import { z as z3 } from "zod";
 var rawMetadataSchema = z3.object({
   category: categoryPathSchema,
-  category_exclusive: z3.boolean().optional(),
+  categoryExclusive: z3.boolean().optional(),
   author: z3.string(),
   version: z3.coerce.string(),
-  cli_name: z3.string().optional(),
-  cli_description: z3.string().optional(),
-  usage_guidance: z3.string().optional(),
+  cliName: z3.string().optional(),
+  cliDescription: z3.string().optional(),
+  usageGuidance: z3.string().optional(),
   tags: z3.array(z3.string()).optional(),
   // Lenient: accepts display names and skill IDs from YAML, resolved to canonical IDs during matrix merge
-  compatible_with: z3.array(z3.string()).optional(),
-  conflicts_with: z3.array(z3.string()).optional(),
+  compatibleWith: z3.array(z3.string()).optional(),
+  conflictsWith: z3.array(z3.string()).optional(),
   requires: z3.array(z3.string()).optional(),
-  requires_setup: z3.array(z3.string()).optional(),
-  provides_setup_for: z3.array(z3.string()).optional()
+  requiresSetup: z3.array(z3.string()).optional(),
+  providesSetupFor: z3.array(z3.string()).optional()
 });
 async function loadSkillsMatrix(configPath) {
   const content = await readFile(configPath);
@@ -2850,7 +2858,7 @@ async function extractAllSkills(skillsDir) {
       verbose(`Skipping ${metadataFile}: Invalid SKILL.md frontmatter`);
       continue;
     }
-    if (!metadata.cli_name) {
+    if (!metadata.cliName) {
       throw new Error(
         `Skill at ${metadataFile} is missing required '${METADATA_KEYS.CLI_NAME}' field in metadata.yaml`
       );
@@ -2859,17 +2867,17 @@ async function extractAllSkills(skillsDir) {
     const extracted = {
       id: skillId,
       directoryPath: skillDir,
-      description: metadata.cli_description || frontmatter.description,
-      usageGuidance: metadata.usage_guidance,
+      description: metadata.cliDescription || frontmatter.description,
+      usageGuidance: metadata.usageGuidance,
       category: metadata.category,
-      categoryExclusive: metadata.category_exclusive ?? true,
+      categoryExclusive: metadata.categoryExclusive ?? true,
       author: metadata.author,
       tags: metadata.tags ?? [],
-      compatibleWith: metadata.compatible_with ?? [],
-      conflictsWith: metadata.conflicts_with ?? [],
+      compatibleWith: metadata.compatibleWith ?? [],
+      conflictsWith: metadata.conflictsWith ?? [],
       requires: metadata.requires ?? [],
-      requiresSetup: metadata.requires_setup ?? [],
-      providesSetupFor: metadata.provides_setup_for ?? [],
+      requiresSetup: metadata.requiresSetup ?? [],
+      providesSetupFor: metadata.providesSetupFor ?? [],
       path: `skills/${skillDir}/`
     };
     skills.push(extracted);
@@ -2943,7 +2951,7 @@ function resolveToCanonicalId(nameOrId, displayNameToId, directoryPathToId = {},
   return nameOrId;
 }
 async function mergeMatrixWithSkills(matrix, skills) {
-  const displayNameToId = matrix.skill_aliases;
+  const displayNameToId = matrix.skillAliases;
   const displayNames = buildReverseDisplayNames(displayNameToId);
   const directoryPathToId = buildDirectoryPathToIdMap(skills);
   const aliasTargetToSkillId = buildAliasTargetToSkillIdMap(displayNameToId, skills);
@@ -3022,7 +3030,7 @@ function resolveRequirements(skillId, metadataRequires, requireRules, resolve) {
     if (resolve(rule.skill, "requires.skill") !== skillId) continue;
     requires.push({
       skillIds: rule.needs.map((id) => resolve(id, "requires.needs")),
-      needsAny: rule.needs_any ?? false,
+      needsAny: rule.needsAny ?? false,
       reason: rule.reason
     });
   }
@@ -3287,7 +3295,7 @@ function validateRequirements(resolvedSelections, selectedSet, matrix) {
         const hasAny = requirement.skillIds.some((reqId) => selectedSet.has(reqId));
         if (!hasAny) {
           errors.push({
-            type: "missing_requirement",
+            type: "missingRequirement",
             message: `${getLabel(skill, skillId)} requires one of: ${requirement.skillIds.map((id) => getLabel(matrix.skills[id], id)).join(", ")}`,
             skills: [skillId, ...requirement.skillIds]
           });
@@ -3296,7 +3304,7 @@ function validateRequirements(resolvedSelections, selectedSet, matrix) {
         const missingIds = requirement.skillIds.filter((reqId) => !selectedSet.has(reqId));
         if (missingIds.length > 0) {
           errors.push({
-            type: "missing_requirement",
+            type: "missingRequirement",
             message: `${getLabel(skill, skillId)} requires: ${missingIds.map((id) => getLabel(matrix.skills[id], id)).join(", ")}`,
             skills: [skillId, ...missingIds]
           });
@@ -3316,7 +3324,7 @@ function validateExclusivity(resolvedSelections, matrix) {
       const category = matrix.categories[categoryId];
       if (category?.exclusive) {
         errors.push({
-          type: "category_exclusive",
+          type: "categoryExclusive",
           message: `Category "${category.displayName}" only allows one selection, but multiple selected: ${skillIds.map((id) => getLabel(matrix.skills[id], id)).join(", ")}`,
           skills: skillIds
         });
@@ -3555,22 +3563,29 @@ function checkStackSkillIds(matrix, skillIds, issues) {
 // src/cli/lib/loading/multi-source-loader.ts
 init_esm_shims();
 import path21 from "path";
-var PUBLIC_SOURCE_NAME = "public";
-async function loadSkillsFromAllSources(primaryMatrix, _sourceConfig, projectDir) {
-  tagPrimarySourceSkills(primaryMatrix);
+async function loadSkillsFromAllSources(primaryMatrix, sourceConfig, projectDir, forceRefresh = false, marketplace) {
+  const resolvedMarketplace = marketplace ?? sourceConfig.marketplace;
+  const isDefaultPublicSource = sourceConfig.source === DEFAULT_SOURCE;
+  const primarySourceName = resolvedMarketplace ?? DEFAULT_PUBLIC_SOURCE_NAME;
+  const primarySourceType = isDefaultPublicSource ? "public" : "private";
+  tagPrimarySourceSkills(primaryMatrix, primarySourceName, primarySourceType);
   tagLocalSkills(primaryMatrix);
-  await tagPluginSkills(primaryMatrix, projectDir);
-  await tagExtraSources(primaryMatrix, projectDir);
+  await tagPluginSkills(primaryMatrix, projectDir, primarySourceName, primarySourceType);
+  if (!isDefaultPublicSource) {
+    await tagPublicSourceSkills(primaryMatrix, forceRefresh);
+  }
+  await tagExtraSources(primaryMatrix, projectDir, forceRefresh);
   setActiveSources(primaryMatrix);
 }
-function tagPrimarySourceSkills(matrix) {
+function tagPrimarySourceSkills(matrix, sourceName, sourceType) {
   for (const [, skill] of typedEntries(matrix.skills)) {
     if (!skill) continue;
     const source = {
-      name: PUBLIC_SOURCE_NAME,
-      type: "public",
+      name: sourceName,
+      type: sourceType,
       version: skill.version,
-      installed: false
+      installed: false,
+      primary: true
     };
     skill.availableSources = skill.availableSources ?? [];
     skill.availableSources.push(source);
@@ -3593,7 +3608,7 @@ function tagLocalSkills(matrix) {
   }
   verbose(`Tagged ${count} local skills with local source`);
 }
-async function tagPluginSkills(matrix, projectDir) {
+async function tagPluginSkills(matrix, projectDir, primarySourceName, primarySourceType) {
   const allPluginSkillIds = await collectPluginSkillIds(matrix, projectDir);
   if (allPluginSkillIds.length === 0) {
     return;
@@ -3602,17 +3617,18 @@ async function tagPluginSkills(matrix, projectDir) {
     const skill = matrix.skills[skillId];
     if (!skill) continue;
     skill.availableSources = skill.availableSources ?? [];
-    const existingSource = skill.availableSources.find((s) => s.type === "public");
+    const existingSource = skill.availableSources.find((s) => s.name === primarySourceName);
     if (existingSource && !existingSource.installMode) {
       existingSource.installed = true;
       existingSource.installMode = "plugin";
     } else if (!skill.availableSources.some((s) => s.installMode === "plugin")) {
       skill.availableSources.push({
-        name: PUBLIC_SOURCE_NAME,
-        type: "public",
+        name: primarySourceName,
+        type: primarySourceType,
         version: skill.version,
         installed: true,
-        installMode: "plugin"
+        installMode: "plugin",
+        primary: true
       });
     }
   }
@@ -3620,18 +3636,51 @@ async function tagPluginSkills(matrix, projectDir) {
 }
 async function collectPluginSkillIds(_matrix, projectDir) {
   const pluginSkills = await discoverAllPluginSkills(projectDir);
-  const skillIds = Object.keys(pluginSkills);
+  const skillIds = typedKeys(pluginSkills);
   if (skillIds.length === 0) {
     verbose("No plugin skills discovered from settings.json");
   }
   return skillIds;
 }
-async function tagExtraSources(matrix, projectDir) {
+async function tagPublicSourceSkills(matrix, forceRefresh) {
+  let publicSourceName = DEFAULT_PUBLIC_SOURCE_NAME;
+  try {
+    const marketplaceResult = await fetchMarketplace(DEFAULT_SOURCE, { forceRefresh });
+    publicSourceName = marketplaceResult.marketplace.name;
+    verbose(`Public marketplace name from marketplace.json: ${publicSourceName}`);
+  } catch {
+    verbose("Public source has no marketplace.json -- using default label");
+  }
+  try {
+    const fetchResult = await fetchFromSource(DEFAULT_SOURCE, { forceRefresh });
+    const skillsDir = path21.join(fetchResult.path, SKILLS_DIR_PATH);
+    const publicSkills = await extractAllSkills(skillsDir);
+    let matchCount = 0;
+    for (const publicSkill of publicSkills) {
+      const matrixSkill = matrix.skills[publicSkill.id];
+      if (!matrixSkill) continue;
+      const source = {
+        name: publicSourceName,
+        type: "public",
+        installed: false
+      };
+      matrixSkill.availableSources = matrixSkill.availableSources ?? [];
+      matrixSkill.availableSources.push(source);
+      matchCount++;
+    }
+    verbose(
+      `Public source: ${publicSkills.length} skills found, ${matchCount} matching primary matrix`
+    );
+  } catch (error) {
+    warn(`Failed to load public source for alternative tagging: ${getErrorMessage(error)}`);
+  }
+}
+async function tagExtraSources(matrix, projectDir, forceRefresh) {
   let allSources;
   try {
     allSources = await resolveAllSources(projectDir);
   } catch (error) {
-    verbose(`Failed to resolve extra sources: ${error}`);
+    verbose(`Failed to resolve extra sources: ${getErrorMessage(error)}`);
     return;
   }
   if (allSources.extras.length === 0) {
@@ -3641,7 +3690,7 @@ async function tagExtraSources(matrix, projectDir) {
   for (const extraSource of allSources.extras) {
     verbose(`Loading extra source: ${extraSource.name} (${extraSource.url})`);
     try {
-      const fetchResult = await fetchFromSource(extraSource.url, { forceRefresh: false });
+      const fetchResult = await fetchFromSource(extraSource.url, { forceRefresh });
       const skillsDir = path21.join(fetchResult.path, SKILLS_DIR_PATH);
       const skills = await extractAllSkills(skillsDir);
       let matchCount = 0;
@@ -3662,7 +3711,9 @@ async function tagExtraSources(matrix, projectDir) {
         `Extra source '${extraSource.name}': ${skills.length} skills found, ${matchCount} matching`
       );
     } catch (error) {
-      warn(`Failed to load extra source '${extraSource.name}' ('${extraSource.url}'): ${error}`);
+      warn(
+        `Failed to load extra source '${extraSource.name}' ('${extraSource.url}'): ${getErrorMessage(error)}`
+      );
     }
   }
 }
@@ -3699,7 +3750,9 @@ async function searchExtraSources(alias, configuredSources) {
         }
       }
     } catch (error) {
-      warn(`Failed to search extra source '${source.name}' ('${source.url}'): ${error}`);
+      warn(
+        `Failed to search extra source '${source.name}' ('${source.url}'): ${getErrorMessage(error)}`
+      );
     }
   }
   return candidates;
@@ -3726,7 +3779,13 @@ async function loadSkillsMatrixFromSource(options = {}) {
     );
     result.matrix = mergeLocalSkillsIntoMatrix(result.matrix, localSkillsResult);
   }
-  await loadSkillsFromAllSources(result.matrix, sourceConfig, resolvedProjectDir);
+  await loadSkillsFromAllSources(
+    result.matrix,
+    sourceConfig,
+    resolvedProjectDir,
+    forceRefresh,
+    result.marketplace
+  );
   checkMatrixHealth(result.matrix);
   return result;
 }
@@ -3772,9 +3831,9 @@ async function loadFromRemote(source, sourceConfig, forceRefresh) {
 }
 async function loadAndMergeFromBasePath(basePath) {
   const sourceProjectConfig = await loadProjectSourceConfig(basePath);
-  const matrixRelPath = sourceProjectConfig?.matrix_file ?? SKILLS_MATRIX_PATH;
-  const skillsDirRelPath = sourceProjectConfig?.skills_dir ?? SKILLS_DIR_PATH;
-  const stacksRelFile = sourceProjectConfig?.stacks_file;
+  const matrixRelPath = sourceProjectConfig?.matrixFile ?? SKILLS_MATRIX_PATH;
+  const skillsDirRelPath = sourceProjectConfig?.skillsDir ?? SKILLS_DIR_PATH;
+  const stacksRelFile = sourceProjectConfig?.stacksFile;
   const sourceMatrixPath = path22.join(basePath, matrixRelPath);
   const cliMatrixPath = path22.join(PROJECT_ROOT, SKILLS_MATRIX_PATH);
   let matrixPath;
@@ -3886,7 +3945,8 @@ import { fileURLToPath } from "url";
 var cachedDefaults = null;
 function getDefaultsPath() {
   const currentDir = path23.dirname(fileURLToPath(import.meta.url));
-  return path23.join(currentDir, "../..", "defaults", "agent-mappings.yaml");
+  const isInDist = currentDir.includes("/dist");
+  return isInDist ? path23.join(currentDir, "cli", "defaults", "agent-mappings.yaml") : path23.join(currentDir, "../..", "defaults", "agent-mappings.yaml");
 }
 async function loadDefaultMappings() {
   if (cachedDefaults !== null) {
@@ -3911,8 +3971,8 @@ function getCachedDefaults() {
 var DEFAULT_AGENTS = ["agent-summoner", "skill-summoner", "documentor"];
 function getEffectiveSkillToAgents() {
   const defaults = getCachedDefaults();
-  if (defaults?.skill_to_agents) {
-    return defaults.skill_to_agents;
+  if (defaults?.skillToAgents) {
+    return defaults.skillToAgents;
   }
   return {};
 }
@@ -3939,22 +3999,39 @@ function getAgentsForSkill(skillPath, category) {
 }
 function extractSubcategoryFromPath(categoryPath) {
   if (categoryPath === "local") return void 0;
-  const parts = categoryPath.split("/");
-  return parts.length >= 2 ? parts[1] : parts[0];
+  return categoryPath;
 }
 function generateProjectConfigFromSkills(name, selectedSkillIds, matrix, options) {
   const neededAgents = /* @__PURE__ */ new Set();
   const stackProperty = {};
+  const selectedAgentSet = options?.selectedAgents ? new Set(options.selectedAgents) : null;
+  verbose(
+    `generateProjectConfigFromSkills: ${selectedSkillIds.length} skills, matrix has ${Object.keys(matrix.skills).length} entries, selectedAgentSet=${selectedAgentSet ? `[${[...selectedAgentSet].join(", ")}]` : "null"}`
+  );
+  let foundCount = 0;
+  let skippedCount = 0;
   for (const skillId of selectedSkillIds) {
     const skill = matrix.skills[skillId];
     if (!skill) {
+      skippedCount++;
+      warn(`Skill '${skillId}' NOT FOUND in matrix`);
       continue;
     }
+    foundCount++;
     const skillPath = skill.path;
     const category = skill.category;
     const agents = getAgentsForSkill(skillPath, category);
     const subcategory = extractSubcategoryFromPath(category);
-    for (const agentId of agents) {
+    const effectiveAgents = selectedAgentSet ? agents.filter((a) => selectedAgentSet.has(a)) : agents;
+    verbose(
+      `  skill '${skillId}': category='${category}', subcategory=${subcategory ?? "none"}, agents=[${agents.join(", ")}], effectiveAgents=[${effectiveAgents.join(", ")}]`
+    );
+    if (effectiveAgents.length === 0) {
+      warn(
+        `Skill '${skillId}': all agents filtered out by selectedAgentSet \u2014 derived=[${agents.join(", ")}], selected=[${[...selectedAgentSet ?? []].join(", ")}]`
+      );
+    }
+    for (const agentId of effectiveAgents) {
       neededAgents.add(agentId);
       if (subcategory) {
         if (!stackProperty[agentId]) {
@@ -3964,9 +4041,19 @@ function generateProjectConfigFromSkills(name, selectedSkillIds, matrix, options
       }
     }
   }
+  verbose(
+    `generateProjectConfigFromSkills: ${foundCount} found, ${skippedCount} not found, ${Object.keys(stackProperty).length} agents in stack`
+  );
+  if (skippedCount > 0) {
+    const matrixSample = Object.keys(matrix.skills).slice(0, 5).join(", ");
+    warn(
+      `${skippedCount}/${selectedSkillIds.length} skills not found in matrix. Matrix keys sample: [${matrixSample}]`
+    );
+  }
+  const agentList = options?.selectedAgents ? [...options.selectedAgents].sort() : Array.from(neededAgents).sort();
   const config = {
     name,
-    agents: Array.from(neededAgents).sort(),
+    agents: agentList,
     skills: [...selectedSkillIds]
   };
   if (Object.keys(stackProperty).length > 0) {
@@ -4131,8 +4218,8 @@ async function mergeWithExistingConfig(newConfig, context) {
     if (existingConfig.author) {
       localConfig.author = existingConfig.author;
     }
-    if (existingConfig.agents_source) {
-      localConfig.agents_source = existingConfig.agents_source;
+    if (existingConfig.agentsSource) {
+      localConfig.agentsSource = existingConfig.agentsSource;
     }
     if (existingConfig.marketplace) {
       localConfig.marketplace = existingConfig.marketplace;
@@ -4147,8 +4234,8 @@ async function mergeWithExistingConfig(newConfig, context) {
   if (existingProjectConfig?.author) {
     localConfig.author = existingProjectConfig.author;
   }
-  if (existingProjectConfig?.agents_source) {
-    localConfig.agents_source = existingProjectConfig.agents_source;
+  if (existingProjectConfig?.agentsSource) {
+    localConfig.agentsSource = existingProjectConfig.agentsSource;
   }
   return { config: localConfig, merged: false };
 }
@@ -4163,6 +4250,8 @@ async function saveSourceToProjectConfig(projectDir, source) {
 // src/cli/lib/loading/source-fetcher.ts
 var SAFE_NAME_PATTERN = /^[a-zA-Z0-9@._/ -]+$/;
 var MAX_NAME_LENGTH = 200;
+var SOURCE_PROTO_RE = /^([\w-.]+):/;
+var GIT_URI_RE = /^(?<repo>[\w.-]+\/[\w.-]+)(?<subdir>[^#]+)?(?<ref>#[\w./@-]+)?/;
 function sanitizeSourceForCache(source) {
   const hash = createHash2("sha256").update(source).digest("hex").slice(0, CACHE_HASH_LENGTH);
   const readable = source.replace(/[^a-zA-Z0-9]/g, "-").replace(/--+/g, "-").replace(/^-|-$/g, "").slice(0, CACHE_READABLE_PREFIX_LENGTH);
@@ -4192,6 +4281,33 @@ async function fetchFromLocalSource(source, subdir) {
     source
   };
 }
+function getGigetCacheDir(source) {
+  let providerName = "github";
+  let rawSource = source;
+  const protoMatch = source.match(SOURCE_PROTO_RE);
+  if (protoMatch) {
+    providerName = protoMatch[1];
+    rawSource = source.slice(protoMatch[0].length);
+    if (providerName === "http" || providerName === "https") {
+      return void 0;
+    }
+  }
+  const uriMatch = rawSource.match(GIT_URI_RE);
+  if (!uriMatch?.groups?.repo) {
+    return void 0;
+  }
+  const templateName = uriMatch.groups.repo.replace("/", "-").replace(/[^\da-z-]/gi, "-");
+  const gigetCacheRoot = process.env.XDG_CACHE_HOME ? path25.resolve(process.env.XDG_CACHE_HOME, "giget") : path25.resolve(os2.homedir(), ".cache", "giget");
+  return path25.join(gigetCacheRoot, providerName, templateName);
+}
+async function clearGigetCache(source) {
+  const gigetDir = getGigetCacheDir(source);
+  if (!gigetDir) return;
+  if (await directoryExists(gigetDir)) {
+    verbose(`Clearing giget cache: ${gigetDir}`);
+    await remove(gigetDir);
+  }
+}
 async function fetchFromRemoteSource(source, options) {
   const { forceRefresh = false, subdir } = options;
   const cacheDir = getCacheDir(source);
@@ -4206,6 +4322,9 @@ async function fetchFromRemoteSource(source, options) {
       source: fullSource
     };
   }
+  if (forceRefresh) {
+    await clearGigetCache(source);
+  }
   await ensureDir(path25.dirname(cacheDir));
   try {
     const result = await downloadTemplate(fullSource, {
@@ -4442,7 +4561,6 @@ export {
   determinePluginVersion,
   writeContentHash,
   readForkedFromMetadata,
-  readLocalSkillMetadata,
   compareLocalSkillsWithSource,
   injectForkedFromMetadata,
   copySkillsToLocalFlattened,
@@ -4490,4 +4608,4 @@ export {
   validateAllPlugins,
   printPluginValidationResult
 };
-//# sourceMappingURL=chunk-WMVGRAFB.js.map
+//# sourceMappingURL=chunk-TTXV55NQ.js.map