agents-inc 0.172.0 → 0.174.0

package/dist/{chunk-VILFCMRN.js → chunk-E45IT3HC.js}

@@ -2,7 +2,7 @@
 import {
   BUILT_IN_MATRIX,
   getSkillById,
-  getSkillDisplayName,
+  getSkillEntryDisplayName,
   inertLine,
   initializeMatrix,
   matrix,
@@ -13,7 +13,7 @@ import {
   typedFromEntries,
   typedKeys,
   typedValues
-} from "./chunk-7OG635DK.js";
+} from "./chunk-AIBVAYHS.js";
 import {
   AGENT_NAMES,
   AUTHOR_HANDLE_PATTERN,
@@ -82,7 +82,7 @@ import {
   seedAgentScope,
   sourceDirName,
   validateSelection
-} from "./chunk-MHAQWMNJ.js";
+} from "./chunk-WUSEZFER.js";
 import {
   defaultCategories,
   defaultRules,
@@ -490,8 +490,9 @@ function sourceRootOf(root) {
   return { dir: path.join(root, SOURCE_ROOT_DIR), relName: SOURCE_ROOT_DIR };
 }
 var RETIRED_SOURCE_FOLDER = ".claude-src";
-function retiredSourceFolderIn(roots) {
-  return [...new Set(roots)].filter(holdsTheRetiredSourceFolder);
+function rootsHoldingTheRetiredSourceFolder(cwd) {
+  const roots = isHomeDirectory(cwd) ? [os2.homedir()] : [os2.homedir(), cwd];
+  return roots.filter(holdsTheRetiredSourceFolder);
 }
 function holdsTheRetiredSourceFolder(root) {
   return directoryExists(path.join(root, RETIRED_SOURCE_FOLDER));
@@ -504,6 +505,9 @@ var providerChosenForThisRun;
 function chooseProviderForThisRun(provider) {
   providerChosenForThisRun = provider;
 }
+function forgetTheProviderChosenForThisRun() {
+  providerChosenForThisRun = void 0;
+}
 function providerInUse(root) {
   if (providerChosenForThisRun !== void 0) return providerChosenForThisRun;
   if (root === void 0) return PROVIDER_OF_A_NEW_INSTALLATION;
@@ -744,8 +748,8 @@ async function fileExists(filePath) {
 }
 async function directoryExists2(dirPath) {
   try {
-    const stat = await fs3.stat(dirPath);
-    return stat.isDirectory();
+    const stat2 = await fs3.stat(dirPath);
+    return stat2.isDirectory();
   } catch {
     return false;
   }
@@ -953,6 +957,8 @@ var INFO_MESSAGES = {
   CONFIG_TYPES_REFRESHED: `Refreshed ${STANDARD_FILES.CONFIG_TYPES_TS}`,
   EJECTED_SKILLS_USER_OWNED: `Ejected skills are yours to own \u2014 '${CLI_INVOKE_COMMAND} update' does not change them.`,
   NO_PLUGIN_MARKETPLACES: "No plugin marketplaces are configured \u2014 nothing to refresh.",
+  /** Under doctor's marketplace row, when its download replaced a saved copy whose files differed. */
+  SAVED_COPY_REPLACED: "The saved copy differed from the marketplace and has been replaced",
   /** Printed under the destination already named, so it names files only. */
   AGENT_PARTIALS_CUSTOMIZABLE: `Each sub-agent directory there holds ${AGENT_PARTIAL_FILES.join(", ")} \u2014 edit those to customize that sub-agent.`
 };
@@ -1010,6 +1016,9 @@ function marketplaceRefreshFailed(marketplace, reason) {
 function sourceUnreachableUsingCache(source) {
   return `Could not reach ${source} \u2014 using the cached copy, which may be out of date.`;
 }
+function sourceRefusedUsingCache(source, status) {
+  return `${source} refused the request (${status}) \u2014 using the cached copy, which may be out of date.`;
+}
 function marketplacesRefreshFailed(marketplaces) {
   return `${plural(marketplaces.length, "marketplace")} could not be updated: ${marketplaces.join(", ")}`;
 }
@@ -1213,8 +1222,9 @@ function keptAsInstalledGlobally(skillIds, agentNames, idAppliedAtHome, provider
     ]
   ].join("\n");
 }
-function skillsMoved(verb, skillIds) {
-  return skillIds.length === 0 ? [] : [`${verb} ${listed(skillIds.map(getSkillDisplayName))}`];
+function skillsMoved(verb, skillIds, namedBy) {
+  const names = skillIds.map((id) => getSkillEntryDisplayName(namedBy[id] ?? { id }));
+  return names.length === 0 ? [] : [`${verb} ${listed(names)}`];
 }
 function settingMoved({ setting, from, to }) {
   return `${setting} ${from ?? "default"} \u2192 ${to ?? "default"}`;
@@ -1224,10 +1234,17 @@ function listed(names) {
   return `${names.slice(0, -1).join(", ")} and ${names.at(-1)}`;
 }
 var SKILLS_REASSIGNED = "skills reassigned";
-function subAgentChanged({ name, scope, gains, loses, settings }) {
+function subAgentChanged({
+  name,
+  scope,
+  gains,
+  loses,
+  settings,
+  namedBy = {}
+}) {
   const details = [
-    ...skillsMoved("gains", gains),
-    ...skillsMoved("loses", loses),
+    ...skillsMoved("gains", gains, namedBy),
+    ...skillsMoved("loses", loses, namedBy),
     ...settings.map(settingMoved)
   ];
   const where = scope === "global" ? " (global)" : "";
@@ -1316,8 +1333,9 @@ function sentenceCase(text) {
 function layoutIsCurrent(label, to) {
   return `${label} is on ${to}/`;
 }
-function retiredSourceFolderUnsupported(root) {
-  return `${path3.join(root, RETIRED_SOURCE_FOLDER)}/ is no longer supported (agents-inc now serves Claude and Codex). Move it to ${path3.join(root, sourceDirName("claude"))}/.`;
+function retiredSourceFolderIgnored(root, provider) {
+  const named = isHomeDirectory(root) ? "~" : root;
+  return `${path3.join(named, RETIRED_SOURCE_FOLDER)}/ is ignored; agents-inc reads ${path3.join(named, sourceDirName(provider))}/. Delete the old folder once you have kept anything you need from it.`;
 }
 
 // src/cli/types/generated/source-types.ts
@@ -2139,6 +2157,7 @@ var projectConfigFields = z2.object({
       id: z2.string(),
       scope: z2.enum(["project", "global"]),
       origin: z2.string(),
+      displayName: z2.string().exactOptional(),
       excluded: z2.boolean().exactOptional()
     })
   ).exactOptional(),
@@ -2549,14 +2568,12 @@ async function loadConfig(configPath, schema) {
   if (declaresNoDefaultExport(namespace)) {
     throw new ConfigDefaultExportError(configPath);
   }
-  if (schema) {
-    const result = schema.safeParse(raw);
-    if (!result.success) {
-      throw new ConfigSchemaError(configPath, formatZodIssues(result.error.issues));
-    }
-    return result.data;
+  if (!schema) return raw;
+  const result = schema.safeParse(raw);
+  if (!result.success) {
+    throw new ConfigSchemaError(configPath, formatZodIssues(result.error.issues));
   }
-  return raw;
+  return result.data;
 }
 async function importConfigModule(configPath) {
   try {
@@ -3177,7 +3194,16 @@ function brokenUnionLayout(members, bodyIndent) {
 }
 function renderUnionBody(members, layout, bodyIndent) {
   const padding = spaces(bodyIndent);
-  return layout === "indented" ? `${padding}${flatUnion(members)}` : members.map((member) => `${padding}| ${member}`).join("\n");
+  switch (layout) {
+    case "indented":
+      return `${padding}${flatUnion(members)}`;
+    case "stacked":
+      return members.map((member) => `${padding}| ${member}`).join("\n");
+    default: {
+      const _exhaustive = layout;
+      return _exhaustive;
+    }
+  }
 }
 function flatUnion(members) {
   return members.join(" | ");
@@ -3225,9 +3251,18 @@ function renderArray(entries, position) {
   return ["[", ...lines, `${spaces(position.indent)}]`].join("\n");
 }
 function renderEntryLine(entry, indent) {
-  if (entry.kind === "comment") return `${spaces(indent)}// ${entry.text}`;
-  if (entry.kind === "source") return `${spaces(indent)}${entry.source},`;
-  return renderValueLine(entry.value, { indent, prefix: "", suffix: "," });
+  switch (entry.kind) {
+    case "comment":
+      return `${spaces(indent)}// ${entry.text}`;
+    case "source":
+      return `${spaces(indent)}${entry.source},`;
+    case "value":
+      return renderValueLine(entry.value, { indent, prefix: "", suffix: "," });
+    default: {
+      const _exhaustive = entry;
+      return _exhaustive;
+    }
+  }
 }
 function renderRecord(record, position) {
   const properties = Object.entries(record);
@@ -3247,11 +3282,27 @@ function propertyPosition(key, indent) {
 function flatArray(entries) {
   const items = [];
   for (const entry of entries) {
-    if (entry.kind === "comment") return void 0;
-    items.push(entry.kind === "source" ? entry.source : flatValue(entry.value));
+    const item = flatEntry(entry);
+    if (item === void 0) return void 0;
+    items.push(item);
   }
   return flatList(items);
 }
+function flatEntry(entry) {
+  switch (entry.kind) {
+    // A `//` line cannot fold onto one line.
+    case "comment":
+      return void 0;
+    case "source":
+      return entry.source;
+    case "value":
+      return flatValue(entry.value);
+    default: {
+      const _exhaustive = entry;
+      return _exhaustive;
+    }
+  }
+}
 function flatValue(value) {
   if (Array.isArray(value)) return flatList(value.map(flatValue));
   if (isKeyedRecord(value)) return flatRecord(value);
@@ -3297,12 +3348,16 @@ var GLOBAL_IDENTITY_FIELDS = [
   ...HAND_WRITTEN_FIELDS,
   "description"
 ];
-var EXTRACTED_FIELDS = /* @__PURE__ */ new Set([
+var EXTRACTED_FIELDS = [
   "skills",
   "agents",
   "stack",
   "selectedDomains"
-]);
+];
+var extractedFields = new Set(EXTRACTED_FIELDS);
+function isExtractedField(key) {
+  return extractedFields.has(key);
+}
 var CANONICAL_FIELD_ORDER = [
   "name",
   "description",
@@ -3319,6 +3374,7 @@ var CANONICAL_SKILL_ENTRY_ORDER = [
   "id",
   "scope",
   "origin",
+  "displayName",
   "excluded"
 ];
 var CANONICAL_AGENT_ENTRY_ORDER = [
@@ -3503,11 +3559,21 @@ function generateStandaloneConfig(cleaned) {
   });
 }
 function standaloneExportField(key, value, emitted) {
-  if (!EXTRACTED_FIELDS.has(key)) return [renderScalarField(key, value)];
-  if (key === "skills") return [`  skills${emitted.hasSkills ? "" : ": []"},`];
-  if (key === "agents") return [`  agents${emitted.hasAgents ? "" : ": []"},`];
-  if (key === "stack") return emitted.hasStack ? [`  stack,`] : [];
-  return [`  selectedDomains${emitted.hasSelectedDomains ? "" : ": []"},`];
+  if (!isExtractedField(key)) return [renderScalarField(key, value)];
+  switch (key) {
+    case "skills":
+      return [`  skills${emitted.hasSkills ? "" : ": []"},`];
+    case "agents":
+      return [`  agents${emitted.hasAgents ? "" : ": []"},`];
+    case "stack":
+      return emitted.hasStack ? [`  stack,`] : [];
+    case "selectedDomains":
+      return [`  selectedDomains${emitted.hasSelectedDomains ? "" : ": []"},`];
+    default: {
+      const _exhaustive = key;
+      return _exhaustive;
+    }
+  }
 }
 function assembleConfigSource({
   imports,
@@ -3538,7 +3604,7 @@ function buildTypeImports(flags) {
   ].filter((t) => Boolean(t));
 }
 function isCopiedScalarField(key) {
-  return !EXTRACTED_FIELDS.has(key) && key !== "name";
+  return !isExtractedField(key) && key !== "name";
 }
 function resolveProjectName(cleaned) {
   return cleaned.name && cleaned.name !== GLOBAL_CONFIG_NAME ? cleaned.name : DEFAULT_PLUGIN_NAME;
@@ -4140,7 +4206,8 @@ function toSeedSkillConfig({
   return {
     id,
     scope: seedSkill.scope,
-    origin: seedSkill.install === "eject" ? EJECT_SOURCE : sourceForSkill(catalogSkill)
+    origin: seedSkill.install === "eject" ? EJECT_SOURCE : sourceForSkill(catalogSkill),
+    displayName: catalogSkill.displayName
   };
 }
 function sourceForSkill(skill) {
@@ -4310,12 +4377,12 @@ async function loadStackById(stackId, configDir, source) {
     );
     return null;
   }
-  const defaultStack = defaultStacks.find((s) => s.id === stackId) ?? null;
-  if (defaultStack) {
-    verbose(`Found default stack: ${defaultStack.name} (${stackId})`);
-  } else {
+  const defaultStack = defaultStacks.find((s) => s.id === stackId);
+  if (!defaultStack) {
     verbose(`Stack '${stackId}' not found in the default marketplace or the built-ins`);
+    return null;
   }
+  verbose(`Found default stack: ${defaultStack.name} (${stackId})`);
   return defaultStack;
 }
 function stackNotOfferedMessage(stackId, source) {
@@ -4446,10 +4513,8 @@ async function loadProjectConfig(projectDir) {
   const provider = providerInUse(projectDir);
   const projectResult = await loadProjectConfigFromDir(projectDir, provider);
   if (projectResult) return projectResult;
-  if (!isHomeDirectory(projectDir)) {
-    return loadProjectConfigFromDir(os5.homedir(), provider);
-  }
-  return null;
+  if (isHomeDirectory(projectDir)) return null;
+  return loadProjectConfigFromDir(os5.homedir(), provider);
 }
 function validateProjectConfig(config) {
   const result = projectConfigLoaderSchema.safeParse(config);
@@ -5236,10 +5301,13 @@ async function loadPluginSkills(pluginDir) {
 // src/cli/lib/loading/source-fetcher.ts
 import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
 import { createHash as createHash2 } from "crypto";
-import { rename } from "fs/promises";
+import { readFileSync } from "fs";
+import { rename, stat } from "fs/promises";
 import { downloadTemplate } from "giget";
 import os8 from "os";
 import path17 from "path";
+import { isDeepEqual } from "remeda";
+import { z as z4 } from "zod";
 
 // src/cli/lib/marketplace-generator.ts
 import path16 from "path";
@@ -5368,17 +5436,43 @@ var MarketplaceUnreachableError = class extends Error {
   reason;
 };
 var TarballWithheldError = class extends Error {
+  status;
   constructor({ status, statusText }) {
     super(`the marketplace answered ${status} ${statusText}`.trimEnd());
     this.name = "TarballWithheldError";
+    this.status = status;
   }
 };
 var marketplaceMustAnswer = new AsyncLocalStorage3();
 function askingEachMarketplaceItself(body) {
-  return marketplaceMustAnswer.run(true, body);
+  const differingCopiesReplaced = /* @__PURE__ */ new Set();
+  return marketplaceMustAnswer.run(differingCopiesReplaced, () => body(differingCopiesReplaced));
 }
 function mustAnswer() {
-  return marketplaceMustAnswer.getStore() === true;
+  return marketplaceMustAnswer.getStore() !== void 0;
+}
+var refusalStopsTheLoad = new AsyncLocalStorage3();
+function stoppingOnARefusal(body) {
+  return refusalStopsTheLoad.run(true, body);
+}
+function stopsOnARefusal() {
+  return refusalStopsTheLoad.getStore() !== void 0;
+}
+var METHOD_NOT_ALLOWED = 405;
+function postureOn(status) {
+  if (mustAnswer()) return "stop";
+  if (status === METHOD_NOT_ALLOWED || isServerError(status)) return "keep";
+  if (!isClientError(status)) return void 0;
+  return stopsOnARefusal() ? "stop" : "pass over";
+}
+var FIRST_CLIENT_ERROR = 400;
+var FIRST_SERVER_ERROR = 500;
+var PAST_THE_SERVER_ERRORS = 600;
+function isClientError(status) {
+  return status >= FIRST_CLIENT_ERROR && status < FIRST_SERVER_ERROR;
+}
+function isServerError(status) {
+  return status >= FIRST_SERVER_ERROR && status < PAST_THE_SERVER_ERRORS;
 }
 function sanitizeSourceForCache(source) {
   const hash = createHash2("sha256").update(source).digest("hex").slice(0, CACHE_HASH_LENGTH);
@@ -5430,8 +5524,10 @@ function getGigetCacheDir(source) {
     return void 0;
   }
   const templateName = uriMatch.groups.repo.replace("/", "-").replace(/[^\da-z-]/gi, "-");
-  const gigetCacheRoot = process.env.XDG_CACHE_HOME ? path17.resolve(process.env.XDG_CACHE_HOME, "giget") : path17.resolve(os8.homedir(), ".cache", "giget");
-  return path17.join(gigetCacheRoot, providerName, templateName);
+  return path17.join(gigetCacheRoot(), providerName, templateName);
+}
+function gigetCacheRoot() {
+  return process.env.XDG_CACHE_HOME ? path17.resolve(process.env.XDG_CACHE_HOME, "giget") : path17.resolve(os8.homedir(), ".cache", "giget");
 }
 async function clearGigetCache(source) {
   const gigetDir = getGigetCacheDir(source);
@@ -5448,7 +5544,7 @@ async function fetchFromRemoteSource(source, subdir) {
   verbose(`Cache directory: ${cacheDir}`);
   if (await directoryExists2(cacheDir)) {
     const verdict = await revalidateCachedCopy(cacheDir, source);
-    if (verdict === "current" || verdict === "unreachable") {
+    if (keepsTheCopy(verdict)) {
       verbose(`Using cached marketplace: ${cacheDir}`);
       return {
         path: cacheDir,
@@ -5460,7 +5556,8 @@ async function fetchFromRemoteSource(source, subdir) {
     announceRefetch(verdict);
     if (!mustAnswer()) await discardCachedCopy(cacheDir, source);
   }
-  return mustAnswer() ? downloadAnsweredFor(cacheDir, source, fullSource) : downloadFreshCopy(cacheDir, source, fullSource);
+  const differingCopiesReplaced = marketplaceMustAnswer.getStore();
+  return differingCopiesReplaced ? downloadAnsweredFor(cacheDir, source, fullSource, differingCopiesReplaced) : downloadFreshCopy(cacheDir, source, fullSource);
 }
 async function discardCachedCopy(cacheDir, source) {
   await clearGigetCache(source);
@@ -5469,14 +5566,15 @@ async function discardCachedCopy(cacheDir, source) {
 async function downloadFreshCopy(cacheDir, source, fullSource) {
   await ensureDir(path17.dirname(cacheDir));
   try {
-    const result = await downloadTemplate(fullSource, {
+    const { result, savedTarball } = await gigetDownload(source, fullSource, {
       dir: cacheDir,
       force: true,
       // Always force when downloading to avoid "already exists" error
       offline: false
     });
     verbose(`Downloaded to: ${result.dir}`);
-    await recordFetchedCopy(cacheDir, result);
+    if (savedTarball) await askBeforeKeepingTheSavedTarball(cacheDir, result, source);
+    await recordFetchedCopy(cacheDir, result, savedTarball);
     markCopyCurrentForThisRun(cacheDir);
     return {
       path: result.dir,
@@ -5488,19 +5586,50 @@ async function downloadFreshCopy(cacheDir, source, fullSource) {
     throw createDetailedFetchError(error, source);
   }
 }
+async function askBeforeKeepingTheSavedTarball(cacheDir, result, source) {
+  const tar = tarballOf(result);
+  if (tar === void 0) return;
+  const answer = await answerAbout(tar);
+  if (answer === "answered") return;
+  if (answer === "unreachable") {
+    warn(sourceUnreachableUsingCache(source));
+    return;
+  }
+  if (stopsTheLoad(answer)) {
+    await remove(cacheDir);
+    throw answer;
+  }
+  announceTheCopyKept(answer, source);
+}
+async function answerAbout(tar) {
+  try {
+    await fetchEtag(tar);
+    return "answered";
+  } catch (error) {
+    if (error instanceof TarballWithheldError) return error;
+    verbose(`Could not ask ${tar} about the tarball giget saved: ${getErrorMessage(error)}`);
+    return "unreachable";
+  }
+}
 var STAGED_DOWNLOAD_SUFFIX = ".download";
-async function downloadAnsweredFor(cacheDir, source, fullSource) {
+var ONLY_A_SAVED_COPY_CAME_BACK = "the download failed and only a saved copy came back";
+var SET_ASIDE_SUFFIX = ".set-aside";
+async function downloadAnsweredFor(cacheDir, source, fullSource, differingCopiesReplaced) {
   const staged = `${cacheDir}${STAGED_DOWNLOAD_SUFFIX}`;
+  const downloadStaged = () => gigetDownload(source, fullSource, {
+    dir: staged,
+    force: true,
+    forceClean: true,
+    offline: false
+  });
   await ensureDir(path17.dirname(cacheDir));
   try {
-    const result = await downloadTemplate(fullSource, {
-      dir: staged,
-      force: true,
-      forceClean: true,
-      offline: false
-    });
+    const { result, savedTarball } = await downloadStaged();
     const record = await askAfterTheDownload(result, source);
+    if (savedTarball) await downloadPast(savedTarball, record, downloadStaged, source);
+    const differed = await savedCopyDiffers(cacheDir, staged);
     await replaceCopy(cacheDir, staged, record);
+    if (differed) differingCopiesReplaced.add(source);
     markCopyCurrentForThisRun(cacheDir);
     return { path: cacheDir, fromCache: false, unreachable: false, source: fullSource };
   } catch (error) {
@@ -5510,11 +5639,99 @@ async function downloadAnsweredFor(cacheDir, source, fullSource) {
     await remove(staged);
   }
 }
+async function downloadPast(savedTarball, record, download, source) {
+  if (!savedUnder(savedTarball, record)) {
+    throw new MarketplaceUnreachableError(source, ONLY_A_SAVED_COPY_CAME_BACK);
+  }
+  await withTarballSetAside(savedTarball.path, download);
+}
+async function withTarballSetAside(tarball, download) {
+  const record = gigetRecordOf(tarball);
+  await rename(record, setAsideOf(record));
+  await rename(tarball, setAsideOf(tarball));
+  try {
+    await download();
+  } catch (error) {
+    await rename(setAsideOf(tarball), tarball);
+    await rename(setAsideOf(record), record);
+    throw error;
+  }
+  await Promise.all([remove(setAsideOf(tarball)), remove(setAsideOf(record))]);
+}
+function setAsideOf(file) {
+  return `${file}${SET_ASIDE_SUFFIX}`;
+}
+async function savedCopyDiffers(cacheDir, downloaded) {
+  if (!await directoryExists2(cacheDir)) return false;
+  try {
+    return !await holdSameFiles(cacheDir, downloaded);
+  } catch (error) {
+    verbose(`Could not read the saved copy at ${cacheDir}: ${getErrorMessage(error)}`);
+    return true;
+  }
+}
+async function holdSameFiles(left, right) {
+  const [leftFiles, rightFiles] = await Promise.all([everyFileIn(left), everyFileIn(right)]);
+  return isDeepEqual(leftFiles, rightFiles) && leftFiles.every((file) => sameBytesAt(file, left, right));
+}
+var EVERY_FILE = "**/*";
+function everyFileIn(dir) {
+  return glob(EVERY_FILE, dir, { dot: true });
+}
+function sameBytesAt(file, left, right) {
+  return readFileSync(path17.join(left, file)).equals(readFileSync(path17.join(right, file)));
+}
 async function replaceCopy(cacheDir, staged, record) {
   await remove(cacheDir);
   await rename(staged, cacheDir);
   await writeFile(fetchRecordPath(cacheDir), JSON.stringify(record));
 }
+var GIGET_TARBALLS = "**/*.tar.gz";
+var gigetTarballRecordSchema = z4.object({ etag: z4.string().min(1).optional() });
+async function gigetDownload(source, fullSource, options) {
+  const providerDir = gigetProviderDir(source);
+  const timesBefore = await tarballTimes(providerDir);
+  const result = await downloadTemplate(fullSource, options);
+  const tarball = path17.join(providerDir, gigetTarballOf(result));
+  const writtenByThisDownload = timesBefore.get(tarball) !== await modifiedAt(tarball);
+  if (writtenByThisDownload) return { result };
+  verbose(`giget extracted the tarball it saved earlier, not a download: ${tarball}`);
+  return { result, savedTarball: { path: tarball, etag: await etagSavedWith(tarball) } };
+}
+function gigetProviderDir(source) {
+  const provider = SOURCE_PROTO_RE.exec(source)?.[1];
+  if (provider === void 0) throw new Error(`No provider named in '${source}'`);
+  return path17.join(gigetCacheRoot(), provider);
+}
+async function tarballTimes(providerDir) {
+  const tarballs = await glob(GIGET_TARBALLS, providerDir);
+  const paths = tarballs.map((tarball) => path17.join(providerDir, tarball));
+  return new Map(await Promise.all(paths.map(async (at) => [at, await modifiedAt(at)])));
+}
+async function modifiedAt(file) {
+  return await fileExists(file) ? (await stat(file)).mtimeMs : void 0;
+}
+function gigetTarballOf(result) {
+  const name = result.name;
+  const version = result.version;
+  if (typeof name !== "string") throw new Error("the download named no template");
+  const stem = typeof version === "string" && version !== "" ? version : name;
+  return path17.join(name, `${stem}.tar.gz`);
+}
+function gigetRecordOf(tarball) {
+  return `${tarball}.json`;
+}
+async function etagSavedWith(tarballPath) {
+  const raw = await readFileOptional(gigetRecordOf(tarballPath));
+  const parsed = gigetTarballRecordSchema.safeParse(parseJsonOrUndefined(raw));
+  return parsed.success ? parsed.data.etag : void 0;
+}
+function savedUnder(savedTarball, record) {
+  return savedTarball.etag !== void 0 && savedTarball.etag === record.etag;
+}
+function keepsTheCopy(verdict) {
+  return verdict === "current" || verdict === "unreachable" || verdict === "refused";
+}
 var REVALIDATION_TIMEOUT_MS = 5e3;
 var FETCH_RECORD_SUFFIX = ".etag.json";
 var askedThisRun = /* @__PURE__ */ new Map();
@@ -5546,21 +5763,31 @@ async function classifyCachedCopy(cacheDir, source) {
     return "current";
   }
   try {
-    const live = await fetchEtag(record.tar);
-    if (live !== void 0 && record.etag !== void 0) {
-      return live === record.etag ? "current" : "superseded";
-    }
-    if (mustAnswer()) return "unconfirmed";
-    verbose(`${record.tar} answered without an ETag \u2014 keeping the cached copy`);
-    return "current";
+    return judgeAnswer(record, await fetchEtag(record.tar));
   } catch (error) {
-    if (error instanceof TarballWithheldError) throw createDetailedFetchError(error, source);
+    if (error instanceof TarballWithheldError) return stopOrKeepTheCopy(error, source);
     verbose(`Could not revalidate ${record.tar}: ${getErrorMessage(error)}`);
     if (mustAnswer()) throw new MarketplaceUnreachableError(source, getErrorMessage(error));
     warn(sourceUnreachableUsingCache(source));
     return "unreachable";
   }
 }
+function stopOrKeepTheCopy(refusal2, source) {
+  if (stopsTheLoad(refusal2)) throw createDetailedFetchError(refusal2, source);
+  announceTheCopyKept(refusal2, source);
+  return "refused";
+}
+function judgeAnswer(record, live) {
+  if (movedOn(record, live)) return "superseded";
+  if (mustAnswer()) return "answered";
+  if (live === void 0) {
+    verbose(`${record.tar} answered without an ETag \u2014 keeping the cached copy`);
+  }
+  return "current";
+}
+function movedOn(record, live) {
+  return live !== void 0 && record.etag !== void 0 && live !== record.etag;
+}
 async function fetchEtag(tar) {
   const auth = process.env.GIGET_AUTH;
   const response = await fetch(tar, {
@@ -5569,9 +5796,22 @@ async function fetchEtag(tar) {
     signal: AbortSignal.timeout(REVALIDATION_TIMEOUT_MS)
   });
   await response.body?.cancel();
-  if (mustAnswer() && !response.ok) throw new TarballWithheldError(response);
+  if (withheld(response)) throw new TarballWithheldError(response);
   return response.headers.get("etag") ?? void 0;
 }
+function withheld({ ok, status }) {
+  return !ok && postureOn(status) !== void 0;
+}
+function stopsTheLoad(refusal2) {
+  return postureOn(refusal2.status) === "stop";
+}
+function announceTheCopyKept(refusal2, source) {
+  if (postureOn(refusal2.status) === "keep") {
+    warn(sourceRefusedUsingCache(source, refusal2.status));
+    return;
+  }
+  verbose(`Keeping the saved copy of ${source} over its refusal: ${refusal2.message}`);
+}
 function fetchRecordPath(cacheDir) {
   return `${cacheDir}${FETCH_RECORD_SUFFIX}`;
 }
@@ -5585,13 +5825,13 @@ async function readFetchRecord(cacheDir) {
   }
   return parsed.data;
 }
-async function recordFetchedCopy(cacheDir, result) {
+async function recordFetchedCopy(cacheDir, result, savedTarball) {
   const tar = tarballOf(result);
   if (tar === void 0) {
     verbose("No tarball URL came back from the download \u2014 the copy cannot be revalidated");
     return;
   }
-  const etag = await etagIfAnswered(tar);
+  const etag = savedTarball ? savedTarball.etag : await etagIfAnswered(tar);
   await writeFile(fetchRecordPath(cacheDir), JSON.stringify(fetchRecord(tar, etag)));
 }
 async function etagIfAnswered(tar) {
@@ -6140,7 +6380,7 @@ async function installationIfPresent(candidate) {
 // src/cli/lib/hosts/claude-host.ts
 import os12 from "os";
 import path21 from "path";
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 
 // src/cli/utils/exec.ts
 import { spawn } from "child_process";
@@ -6243,24 +6483,24 @@ async function execCommand(command, args, options) {
 
 // src/cli/lib/plugins/plugin-settings.ts
 import path20 from "path";
-import { z as z4 } from "zod";
-var pluginSettingsSchema = z4.object({
+import { z as z5 } from "zod";
+var pluginSettingsSchema = z5.object({
   // Absent when no plugin is enabled.
-  enabledPlugins: z4.record(z4.string(), z4.unknown()).exactOptional()
+  enabledPlugins: z5.record(z5.string(), z5.unknown()).exactOptional()
 }).passthrough();
 var installationFields = {
-  installPath: z4.string(),
-  version: z4.string(),
-  installedAt: z4.string()
+  installPath: z5.string(),
+  version: z5.string(),
+  installedAt: z5.string()
 };
-var pluginInstallationSchema = z4.discriminatedUnion("scope", [
-  z4.object({ scope: z4.literal("project"), projectPath: z4.string(), ...installationFields }),
-  z4.object({ scope: z4.literal("user"), ...installationFields }),
-  z4.object({ scope: z4.literal("local"), ...installationFields })
+var pluginInstallationSchema = z5.discriminatedUnion("scope", [
+  z5.object({ scope: z5.literal("project"), projectPath: z5.string(), ...installationFields }),
+  z5.object({ scope: z5.literal("user"), ...installationFields }),
+  z5.object({ scope: z5.literal("local"), ...installationFields })
 ]);
-var installedPluginsSchema = z4.object({
-  version: z4.number(),
-  plugins: z4.record(z4.string(), z4.array(pluginInstallationSchema))
+var installedPluginsSchema = z5.object({
+  version: z5.number(),
+  plugins: z5.record(z5.string(), z5.array(pluginInstallationSchema))
 }).passthrough();
 function getInstalledPluginsRegistryPath(pluginsDir2) {
   return path20.join(pluginsDir2, INSTALLED_PLUGINS_FILE);
@@ -6364,12 +6604,12 @@ async function isClaudeCLIAvailable(options) {
     return false;
   }
 }
-var marketplaceInfoListSchema = z5.array(
-  z5.object({
-    name: z5.string(),
-    source: z5.string(),
-    repo: z5.string().exactOptional(),
-    path: z5.string().exactOptional()
+var marketplaceInfoListSchema = z6.array(
+  z6.object({
+    name: z6.string(),
+    source: z6.string(),
+    repo: z6.string().exactOptional(),
+    path: z6.string().exactOptional()
   })
 );
 async function claudePluginMarketplaceList(options) {
@@ -6480,7 +6720,7 @@ function claudeHost() {
 // src/cli/lib/hosts/codex-host.ts
 import os13 from "os";
 import path22 from "path";
-import { z as z6 } from "zod";
+import { z as z7 } from "zod";
 var CODEX = "codex";
 var PLUGIN_CACHE_SUBDIR = "cache";
 var STANDING_WARNING = /could not create PATH aliases/;
@@ -6543,22 +6783,22 @@ async function readJsonFromCodex(schema, args, options, attempt, askedFrom) {
   }
   return validated.data;
 }
-var marketplaceRegistrySchema = z6.object({
-  marketplaces: z6.array(
-    z6.object({
-      name: z6.string(),
-      marketplaceSource: z6.object({ sourceType: z6.string(), source: z6.string() })
+var marketplaceRegistrySchema = z7.object({
+  marketplaces: z7.array(
+    z7.object({
+      name: z7.string(),
+      marketplaceSource: z7.object({ sourceType: z7.string(), source: z7.string() })
     })
   )
 });
-var pluginListingSchema = z6.object({
-  installed: z6.array(
-    z6.object({
-      pluginId: z6.string(),
-      name: z6.string(),
-      marketplaceName: z6.string(),
-      version: z6.string(),
-      enabled: z6.boolean()
+var pluginListingSchema = z7.object({
+  installed: z7.array(
+    z7.object({
+      pluginId: z7.string(),
+      name: z7.string(),
+      marketplaceName: z7.string(),
+      version: z7.string(),
+      enabled: z7.boolean()
     })
   )
 });
@@ -7004,12 +7244,14 @@ async function countDirEntries(dir, pred) {
     return 0;
   }
 }
-function formatInstallationDisplay(info) {
+function formatInstallationDisplay(info, skillLines = []) {
+  const namedSkillLines = skillLines.map((line2) => `
+    ${line2}`).join("");
   const agentDirLines = info.agentDirs.map((dir) => `
   Agents:  ${dir}`).join("");
   return `Installation: ${info.name}
   Mode:    ${INSTALL_MODE_LABELS[info.mode]}
-  Skills:  ${info.skillCount}
+  Skills:  ${info.skillCount}${namedSkillLines}
   Agents:  ${info.agentCount}
   Config:  ${info.configPath}${agentDirLines}`;
 }
@@ -7529,16 +7771,15 @@ Compiled ${plural(results.length, "skill plugin")}:`);
 
 // src/cli/lib/skills/local-skill-loader.ts
 import path25 from "path";
-function copiedInSkillsAt(root) {
+function copiedInSkillsAt(root, provider) {
   const scope = isHomeDirectory(root) ? "global" : "project";
-  const provider = providerInUse(root);
   return {
     dir: skillsDir(provider, scope, root),
     pathPrefix: skillsPathPrefix(provider, scope, root)
   };
 }
-async function discoverLocalSkills(root) {
-  const { dir: localSkillsPath, pathPrefix } = copiedInSkillsAt(root);
+async function discoverLocalSkills(root, provider = providerInUse(root)) {
+  const { dir: localSkillsPath, pathPrefix } = copiedInSkillsAt(root, provider);
   if (!await directoryExists2(localSkillsPath)) {
     verbose(`Local skills directory not found: ${localSkillsPath}`);
     return null;
@@ -7739,9 +7980,10 @@ async function extractSkill(skillsDir2, metadataFile) {
   const frontmatter = parseFrontmatterOrWarn(skillDir, skillMdPath, await readFile(skillMdPath));
   if (!frontmatter) return null;
   if (!metadata.displayName) {
-    throw new Error(
-      `Skill at ${metadataFile} is missing required '${METADATA_KEYS.DISPLAY_NAME}' field in metadata.yaml`
+    warn(
+      `Skipping '${metadataFile}': invalid ${STANDARD_FILES.METADATA_YAML} \u2014 missing required field: ${METADATA_KEYS.DISPLAY_NAME}`
     );
+    return null;
   }
   const skillId = frontmatter.name;
   const extracted = {
@@ -9678,7 +9920,7 @@ async function loadCatalogue(options) {
     ...catalogue,
     marketplaceSkillIds: new Set(typedKeys(catalogue.matrix.skills))
   };
-  result.matrix = await mergeLocalSkills(result.matrix, resolvedProjectDir);
+  result.matrix = await mergeLocalSkills(result.matrix, resolvedProjectDir, provider);
   await seatGlobalInstallationSkills(result.matrix, source, purpose);
   if (!options.skipExtraSources) {
     await loadSkillsFromAllSources(
@@ -9840,12 +10082,12 @@ function goesOnWithoutManifest(source, purpose) {
 function configuredLabel(sourceConfig) {
   return sourceConfig.marketplace === void 0 ? {} : { marketplace: sourceConfig.marketplace };
 }
-async function mergeLocalSkills(matrix2, projectDir) {
-  const withGlobal = isHomeDirectory(projectDir) ? matrix2 : await mergeDiscoveredLocalSkills(matrix2, os14.homedir(), "global");
-  return mergeDiscoveredLocalSkills(withGlobal, projectDir, "project");
+async function mergeLocalSkills(matrix2, projectDir, provider) {
+  const withGlobal = isHomeDirectory(projectDir) ? matrix2 : await mergeDiscoveredLocalSkills(matrix2, os14.homedir(), "global", provider);
+  return mergeDiscoveredLocalSkills(withGlobal, projectDir, "project", provider);
 }
-async function mergeDiscoveredLocalSkills(matrix2, dir, label) {
-  const discovered = await discoverLocalSkills(dir);
+async function mergeDiscoveredLocalSkills(matrix2, dir, label, provider) {
+  const discovered = await discoverLocalSkills(dir, provider);
   if (!discovered || discovered.skills.length === 0) return matrix2;
   verbose(
     `Found ${discovered.skills.length} ${label} local skill(s) in ${discovered.localSkillsPath}`
@@ -10110,9 +10352,11 @@ export {
   pluginRefFor,
   renderAgent,
   renderAgentBody,
+  isHomeDirectory,
   sourceRootOf,
-  retiredSourceFolderIn,
+  rootsHoldingTheRetiredSourceFolder,
   chooseProviderForThisRun,
+  forgetTheProviderChosenForThisRun,
   providerInUse,
   sourceFolderInUse,
   relativeConfigPath,
@@ -10198,7 +10442,7 @@ export {
   scopeNoun,
   scopeLabel,
   layoutIsCurrent,
-  retiredSourceFolderUnsupported,
+  retiredSourceFolderIgnored,
   GlobalPairWriteViolation,
   withGateToken,
   assertGateToken,
@@ -10240,7 +10484,6 @@ export {
   resolveInstallPaths,
   providerToNameAt,
   initProviderToNameAt,
-  isHomeDirectory,
   SOURCE_ENV_VAR,
   readSourceRepoConfig,
   loadSourceRepoConfig,
@@ -10280,6 +10523,7 @@ export {
   flatUnion,
   renderTypeImportLine,
   spaces,
+  EXTRACTED_FIELDS,
   generateConfigSource,
   refuseUnwritableStack,
   generateBlankGlobalConfigSource,
@@ -10352,6 +10596,7 @@ export {
   getMarketplaceStats,
   MarketplaceUnreachableError,
   askingEachMarketplaceItself,
+  stoppingOnARefusal,
   MarketplaceNameRefusedError,
   fetchMarketplace,
   isLocalOnlySkill,
@@ -10375,4 +10620,4 @@ export {
   executeMigration,
   keepsGlobalInstall
 };
-//# sourceMappingURL=chunk-VILFCMRN.js.map
+//# sourceMappingURL=chunk-E45IT3HC.js.map