@contentful/experience-design-system-cli 2.37.1-dev-build-1c5cd11a.0 → 2.37.1-dev-build-a1707be5.0

package/dist/app.js

@@ -14772,7 +14772,7 @@ async function runMapTokens(request) {
     }
     const agent = request.agent;
     const noCache = request.cache === false || process.env["EDS_NO_CACHE"] === "1";
-    const promptHash = await hashPromptForSkill("map-tokens", agent, request.model, void 0, request.existingEntitiesInline ? [hashContent(request.existingEntitiesInline)] : [], request.skillContentOverride);
+    const promptHash = await hashPromptForSkill("map-tokens", agent, request.model, request.skillPathOverride, request.existingEntitiesInline ? [hashContent(request.existingEntitiesInline)] : [], request.skillContentOverride);
     const inputHash = computeMapTokensInputHash(db, sessionId, componentSourceRefs);
     if (!noCache) {
       const cached = lookupCache(db, inputHash, "token_mapping", "__map_tokens__", promptHash);
@@ -16241,6 +16241,37 @@ init_build_prompt();
 init_describe_agent_failure();
 init_invoke_agent_with_output();
 init_parse_tool_calls();
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-cached-component-result.js
+function buildCachedComponentResult(componentName, warnings = []) {
+  return {
+    componentName,
+    classified: 0,
+    excluded: 0,
+    slots: 0,
+    warnings,
+    failed: false,
+    cached: true,
+    renamedSlotsCount: 0
+  };
+}
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-failed-component-result.js
+function buildFailedComponentResult(componentName, error, renamedSlotsCount) {
+  return {
+    componentName,
+    classified: 0,
+    excluded: 0,
+    slots: 0,
+    warnings: [],
+    failed: true,
+    error,
+    cached: false,
+    renamedSlotsCount
+  };
+}
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-one-generate-component.js
 var DEFAULT_TIMEOUT_MS4 = Number(process.env["EDS_AGENT_TIMEOUT_MS"] ?? 5 * 60 * 1e3);
 var RETRY_BACKOFF_MS = Number(process.env["EDS_RETRY_BACKOFF_MS"] ?? 5e3);
 async function runOneGenerateComponent(options, component, index, total) {
@@ -16263,7 +16294,7 @@ async function runOneGenerateComponent(options, component, index, total) {
   const cacheComponent = normalizeComponentForCache(component);
   if (!noCache && precomputedCachedNames.has(component.name)) {
     onProgress?.({ kind: "component:cached", index, total, name: component.name, pinned: false });
-    return cachedResult(component.name);
+    return buildCachedComponentResult(component.name);
   }
   if (!noCache) {
     const resolution = resolveComponentCache(db, component, promptHash, allowedComponentNames2);
@@ -16273,14 +16304,16 @@ async function runOneGenerateComponent(options, component, index, total) {
       });
       storeCache(db, hashComponentShape(cacheComponent), "component", component.component_id, resolution.entry.sourceSessionId, resolution.entry.humanEdited, promptHash);
       onProgress?.({ kind: "component:cached", index, total, name: component.name, pinned: false });
-      return cachedResult(component.name);
+      return buildCachedComponentResult(component.name);
     }
     if (resolution?.humanEdited) {
       copyComponentFromCache(db, resolution.entry.sourceSessionId, sessionId, component.component_id, true, {
         allowedComponentNames: allowedComponentNames2
       });
       onProgress?.({ kind: "component:cached", index, total, name: component.name, pinned: true });
-      return cachedResult(component.name, [`${component.name}: source changed but human edits preserved`]);
+      return buildCachedComponentResult(component.name, [
+        `${component.name}: source changed but human edits preserved`
+      ]);
     }
   }
   const rawComponentsInline = JSON.stringify([
@@ -16319,7 +16352,7 @@ async function runOneGenerateComponent(options, component, index, total) {
     if (result.timedOut) {
       const error = `timed out after ${DEFAULT_TIMEOUT_MS4 / 6e4} minutes`;
       onProgress?.({ kind: "component:failed", index, total, name: component.name, error });
-      return failed(component.name, error, renames.length);
+      return buildFailedComponentResult(component.name, error, renames.length);
     }
     if (result.exitCode !== 0) {
       lastError = describeAgentFailure(result);
@@ -16358,32 +16391,7 @@ async function runOneGenerateComponent(options, component, index, total) {
     };
   }
   onProgress?.({ kind: "component:failed", index, total, name: component.name, error: lastError });
-  return failed(component.name, lastError, renames.length);
-}
-function cachedResult(componentName, warnings = []) {
-  return {
-    componentName,
-    classified: 0,
-    excluded: 0,
-    slots: 0,
-    warnings,
-    failed: false,
-    cached: true,
-    renamedSlotsCount: 0
-  };
-}
-function failed(componentName, error, renamedSlotsCount) {
-  return {
-    componentName,
-    classified: 0,
-    excluded: 0,
-    slots: 0,
-    warnings: [],
-    failed: true,
-    error,
-    cached: false,
-    renamedSlotsCount
-  };
+  return buildFailedComponentResult(component.name, lastError, renames.length);
 }
 
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-with-pool.js
@@ -16402,6 +16410,36 @@ async function runWithPool(items, concurrency, worker) {
 
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js
 init_cache_keys();
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js
+function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
+  const restorations = [];
+  const rekeyed = [];
+  const componentStatus = db.prepare("SELECT status FROM raw_components WHERE session_id = ? AND component_id = ?");
+  for (const { component, resolution } of cachedComponents) {
+    const current = componentStatus.get(sessionId, component.component_id);
+    if (current?.status === "generated")
+      continue;
+    renameEmptySlots(db, sessionId, component.component_id, component.name, component.slots.length);
+    restorations.push({
+      sourceSessionId: resolution.entry.sourceSessionId,
+      targetSessionId: sessionId,
+      componentId: component.component_id
+    });
+    rekeyed.push({ component, cached: resolution.entry });
+  }
+  copyComponentsFromCache(db, restorations, { allowedComponentNames: allowedComponentNames2 });
+  storeCaches(db, rekeyed.map(({ component, cached }) => ({
+    inputHash: hashComponentShape(normalizeComponentForCache(component)),
+    entityType: "component",
+    entityId: component.component_id,
+    sourceSessionId: cached.sourceSessionId,
+    humanEdited: cached.humanEdited,
+    promptHash
+  })));
+}
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js
 async function checkGenerateComponentsCache(request) {
   if (request.noCache) {
     return { sessionId: request.sessionId, cachedComponentNames: [], fullyCached: false, cacheDisabled: true };
@@ -16426,8 +16464,9 @@ async function checkGenerateComponentsCache(request) {
       const resolution = resolveComponentCache(db, component, promptHash, allowedComponentNames2);
       return resolution ? [{ component, resolution }] : [];
     });
-    if (request.restoreCache)
-      restoreCached(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
+    if (request.restoreCache) {
+      restoreCachedComponents(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
+    }
     return {
       sessionId: request.sessionId,
       cachedComponentNames: cachedComponents.map(({ component }) => component.name),
@@ -16438,42 +16477,17 @@ async function checkGenerateComponentsCache(request) {
     db.close();
   }
 }
-function restoreCached(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
-  const restorations = [];
-  const rekeyed = [];
-  const componentStatus = db.prepare("SELECT status FROM raw_components WHERE session_id = ? AND component_id = ?");
-  for (const { component, resolution } of cachedComponents) {
-    const current = componentStatus.get(sessionId, component.component_id);
-    if (current?.status === "generated")
-      continue;
-    renameEmptySlots(db, sessionId, component.component_id, component.name, component.slots.length);
-    restorations.push({
-      sourceSessionId: resolution.entry.sourceSessionId,
-      targetSessionId: sessionId,
-      componentId: component.component_id
-    });
-    rekeyed.push({ component, cached: resolution.entry });
-  }
-  copyComponentsFromCache(db, restorations, { allowedComponentNames: allowedComponentNames2 });
-  storeCaches(db, rekeyed.map(({ component, cached }) => ({
-    inputHash: hashComponentShape(normalizeComponentForCache(component)),
-    entityType: "component",
-    entityId: component.component_id,
-    sourceSessionId: cached.sourceSessionId,
-    humanEdited: cached.humanEdited,
-    promptHash
-  })));
-}
 
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/run-generate-components-session.js
 var DEFAULT_COMPONENT_CONCURRENCY = Number(process.env["EDS_GENERATE_CONCURRENCY"] ?? 10);
 async function runGenerateComponentsSession(request) {
   const prompt = await resolveGeneratePrompt(request.promptOverrides);
+  const effectiveSkillPath = prompt.path ?? request.skillPath;
   const existingEntities = await readExistingEntities(request);
   const existingTokensInline = existingEntities ? JSON.stringify(summarizeForMapTokens({ entities: existingEntities })) : void 0;
   const existingTokensHash = existingTokensInline ? [hashContent(existingTokensInline)] : [];
   const agent = request.agent;
-  const promptHash = await hashPromptForSkill("components", agent, request.agentModel, prompt.path, existingTokensHash, prompt.text);
+  const promptHash = await hashPromptForSkill("components", agent, request.agentModel, effectiveSkillPath, existingTokensHash, prompt.text);
   const db = openPipelineDb();
   try {
     const acceptedNames = await loadAcceptedNames(request.sessionId);
@@ -16500,7 +16514,7 @@ async function runGenerateComponentsSession(request) {
       tokenMapInline: request.tokenMapInline,
       verbose: request.verbose ?? false,
       noCache: request.noCache,
-      skillPathOverride: prompt.path,
+      skillPathOverride: effectiveSkillPath,
       skillContentOverride: prompt.text,
       promptHash,
       existingContentfulEntities: existingEntities,
@@ -20400,6 +20414,8 @@ async function saveDecisions(input) {
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/08-generation/run.ts
+var COMPONENTS_SKILL_PATH = findSkillPath("generate-components.md");
+var MAP_TOKENS_SKILL_PATH = findSkillPath("map-tokens.md");
 var realDeps3 = {
   checkAgentAuth,
   saveDecisions,
@@ -20434,6 +20450,7 @@ async function runGeneration(input, onProgress, deps = realDeps3) {
       agent: input.agent,
       ...input.agentModel ? { agentModel: input.agentModel } : {},
       promptOverrides: appendGeneratePromptOverride(input),
+      skillPath: COMPONENTS_SKILL_PATH,
       noCache: input.noCache,
       existingEntitiesPath: input.existingEntitiesPath,
       precomputedCachedNames: new Set(handedOverNames),
@@ -20463,6 +20480,7 @@ async function runGeneration(input, onProgress, deps = realDeps3) {
         agent: input.agent,
         ...input.agentModel ? { model: input.agentModel } : {},
         cache: !input.noCache,
+        skillPathOverride: MAP_TOKENS_SKILL_PATH,
         ...mapTokensOptions
       });
     } catch (error) {
@@ -20875,8 +20893,8 @@ function missingNote(missingNames) {
 Note: ${plural2(missingNames.length, "component name")} from the server (${missingNames.join(", ")}) ${verb} not match anything in this session \u2014 they cannot be edited or skipped from here.`;
 }
 function contextText(errors, missingNames) {
-  const failed2 = failedComponentNames(errors);
-  return `${plural2(failed2.length, "component")} failed server validation. Edit their definitions in the review TUI, or skip them and retry preview without them.${missingNote(missingNames)}`;
+  const failed = failedComponentNames(errors);
+  return `${plural2(failed.length, "component")} failed server validation. Edit their definitions in the review TUI, or skip them and retry preview without them.${missingNote(missingNames)}`;
 }
 function skipLabel(matchedNames) {
   if (matchedNames.length === 0) return "No matching components to skip";
@@ -27388,19 +27406,19 @@ function resultOf(operation, preview) {
   const items = operation.items ?? [];
   if (items.length > 0) {
     const count = (entityType, action) => items.filter((i) => i.entityType === entityType && i.action === action && i.status === "succeeded").length;
-    const failed2 = (entityType) => items.filter((i) => i.entityType === entityType && i.status === "failed").length;
+    const failed = (entityType) => items.filter((i) => i.entityType === entityType && i.status === "failed").length;
     return {
       componentTypes: {
         created: count("ComponentType", "create"),
         updated: count("ComponentType", "update"),
         removed: count("ComponentType", "delete"),
-        failed: failed2("ComponentType")
+        failed: failed("ComponentType")
       },
       designTokens: {
         created: count("DesignToken", "create"),
         updated: count("DesignToken", "update"),
         removed: count("DesignToken", "delete"),
-        failed: failed2("DesignToken")
+        failed: failed("DesignToken")
       },
       summary: operation.summary,
       failures: items.filter((item) => item.status === "failed").map((item) => ({

package/dist/index.js

@@ -16593,7 +16593,7 @@ async function runMapTokens(request) {
     }
     const agent = request.agent;
     const noCache = request.cache === false || process.env["EDS_NO_CACHE"] === "1";
-    const promptHash = await hashPromptForSkill("map-tokens", agent, request.model, void 0, request.existingEntitiesInline ? [hashContent(request.existingEntitiesInline)] : [], request.skillContentOverride);
+    const promptHash = await hashPromptForSkill("map-tokens", agent, request.model, request.skillPathOverride, request.existingEntitiesInline ? [hashContent(request.existingEntitiesInline)] : [], request.skillContentOverride);
     const inputHash = computeMapTokensInputHash(db, sessionId, componentSourceRefs);
     if (!noCache) {
       const cached = lookupCache(db, inputHash, "token_mapping", "__map_tokens__", promptHash);
@@ -19204,6 +19204,45 @@ var init_resolve_generate_prompt = __esm({
   }
 });
 
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-cached-component-result.js
+function buildCachedComponentResult(componentName, warnings = []) {
+  return {
+    componentName,
+    classified: 0,
+    excluded: 0,
+    slots: 0,
+    warnings,
+    failed: false,
+    cached: true,
+    renamedSlotsCount: 0
+  };
+}
+var init_build_cached_component_result = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-cached-component-result.js"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-failed-component-result.js
+function buildFailedComponentResult(componentName, error, renamedSlotsCount) {
+  return {
+    componentName,
+    classified: 0,
+    excluded: 0,
+    slots: 0,
+    warnings: [],
+    failed: true,
+    error,
+    cached: false,
+    renamedSlotsCount
+  };
+}
+var init_build_failed_component_result = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-failed-component-result.js"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-one-generate-component.js
 async function runOneGenerateComponent(options, component, index, total) {
   const { db, sessionId, invoker, agent, model, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, skillContentOverride, promptHash, existingContentfulEntities, existingTokensInline, precomputedCachedNames, allowedComponentNames: allowedComponentNames2, onProgress } = options;
@@ -19225,7 +19264,7 @@ async function runOneGenerateComponent(options, component, index, total) {
   const cacheComponent = normalizeComponentForCache(component);
   if (!noCache && precomputedCachedNames.has(component.name)) {
     onProgress?.({ kind: "component:cached", index, total, name: component.name, pinned: false });
-    return cachedResult(component.name);
+    return buildCachedComponentResult(component.name);
   }
   if (!noCache) {
     const resolution = resolveComponentCache(db, component, promptHash, allowedComponentNames2);
@@ -19235,14 +19274,16 @@ async function runOneGenerateComponent(options, component, index, total) {
       });
       storeCache(db, hashComponentShape(cacheComponent), "component", component.component_id, resolution.entry.sourceSessionId, resolution.entry.humanEdited, promptHash);
       onProgress?.({ kind: "component:cached", index, total, name: component.name, pinned: false });
-      return cachedResult(component.name);
+      return buildCachedComponentResult(component.name);
     }
     if (resolution?.humanEdited) {
       copyComponentFromCache(db, resolution.entry.sourceSessionId, sessionId, component.component_id, true, {
         allowedComponentNames: allowedComponentNames2
       });
       onProgress?.({ kind: "component:cached", index, total, name: component.name, pinned: true });
-      return cachedResult(component.name, [`${component.name}: source changed but human edits preserved`]);
+      return buildCachedComponentResult(component.name, [
+        `${component.name}: source changed but human edits preserved`
+      ]);
     }
   }
   const rawComponentsInline = JSON.stringify([
@@ -19281,7 +19322,7 @@ async function runOneGenerateComponent(options, component, index, total) {
     if (result.timedOut) {
       const error = `timed out after ${DEFAULT_TIMEOUT_MS4 / 6e4} minutes`;
       onProgress?.({ kind: "component:failed", index, total, name: component.name, error });
-      return failed(component.name, error, renames.length);
+      return buildFailedComponentResult(component.name, error, renames.length);
     }
     if (result.exitCode !== 0) {
       lastError = describeAgentFailure(result);
@@ -19320,32 +19361,7 @@ async function runOneGenerateComponent(options, component, index, total) {
     };
   }
   onProgress?.({ kind: "component:failed", index, total, name: component.name, error: lastError });
-  return failed(component.name, lastError, renames.length);
-}
-function cachedResult(componentName, warnings = []) {
-  return {
-    componentName,
-    classified: 0,
-    excluded: 0,
-    slots: 0,
-    warnings,
-    failed: false,
-    cached: true,
-    renamedSlotsCount: 0
-  };
-}
-function failed(componentName, error, renamedSlotsCount) {
-  return {
-    componentName,
-    classified: 0,
-    excluded: 0,
-    slots: 0,
-    warnings: [],
-    failed: true,
-    error,
-    cached: false,
-    renamedSlotsCount
-  };
+  return buildFailedComponentResult(component.name, lastError, renames.length);
 }
 var DEFAULT_TIMEOUT_MS4, RETRY_BACKOFF_MS;
 var init_run_one_generate_component = __esm({
@@ -19359,6 +19375,8 @@ var init_run_one_generate_component = __esm({
     init_normalize_component_for_cache();
     init_resolve_component_cache();
     init_summarize_for_generate();
+    init_build_cached_component_result();
+    init_build_failed_component_result();
     DEFAULT_TIMEOUT_MS4 = Number(process.env["EDS_AGENT_TIMEOUT_MS"] ?? 5 * 60 * 1e3);
     RETRY_BACKOFF_MS = Number(process.env["EDS_RETRY_BACKOFF_MS"] ?? 5e3);
   }
@@ -19383,6 +19401,41 @@ var init_run_with_pool = __esm({
   }
 });
 
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js
+function restoreCachedComponents(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
+  const restorations = [];
+  const rekeyed = [];
+  const componentStatus = db.prepare("SELECT status FROM raw_components WHERE session_id = ? AND component_id = ?");
+  for (const { component, resolution } of cachedComponents) {
+    const current = componentStatus.get(sessionId, component.component_id);
+    if (current?.status === "generated")
+      continue;
+    renameEmptySlots(db, sessionId, component.component_id, component.name, component.slots.length);
+    restorations.push({
+      sourceSessionId: resolution.entry.sourceSessionId,
+      targetSessionId: sessionId,
+      componentId: component.component_id
+    });
+    rekeyed.push({ component, cached: resolution.entry });
+  }
+  copyComponentsFromCache(db, restorations, { allowedComponentNames: allowedComponentNames2 });
+  storeCaches(db, rekeyed.map(({ component, cached }) => ({
+    inputHash: hashComponentShape(normalizeComponentForCache(component)),
+    entityType: "component",
+    entityId: component.component_id,
+    sourceSessionId: cached.sourceSessionId,
+    humanEdited: cached.humanEdited,
+    promptHash
+  })));
+}
+var init_restore_cached_components = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js"() {
+    "use strict";
+    init_db();
+    init_normalize_component_for_cache();
+  }
+});
+
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js
 async function checkGenerateComponentsCache(request) {
   if (request.noCache) {
@@ -19408,8 +19461,9 @@ async function checkGenerateComponentsCache(request) {
       const resolution = resolveComponentCache(db, component, promptHash, allowedComponentNames2);
       return resolution ? [{ component, resolution }] : [];
     });
-    if (request.restoreCache)
-      restoreCached(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
+    if (request.restoreCache) {
+      restoreCachedComponents(db, request.sessionId, cachedComponents, promptHash, allowedComponentNames2);
+    }
     return {
       sessionId: request.sessionId,
       cachedComponentNames: cachedComponents.map(({ component }) => component.name),
@@ -19420,54 +19474,29 @@ async function checkGenerateComponentsCache(request) {
     db.close();
   }
 }
-function restoreCached(db, sessionId, cachedComponents, promptHash, allowedComponentNames2) {
-  const restorations = [];
-  const rekeyed = [];
-  const componentStatus = db.prepare("SELECT status FROM raw_components WHERE session_id = ? AND component_id = ?");
-  for (const { component, resolution } of cachedComponents) {
-    const current = componentStatus.get(sessionId, component.component_id);
-    if (current?.status === "generated")
-      continue;
-    renameEmptySlots(db, sessionId, component.component_id, component.name, component.slots.length);
-    restorations.push({
-      sourceSessionId: resolution.entry.sourceSessionId,
-      targetSessionId: sessionId,
-      componentId: component.component_id
-    });
-    rekeyed.push({ component, cached: resolution.entry });
-  }
-  copyComponentsFromCache(db, restorations, { allowedComponentNames: allowedComponentNames2 });
-  storeCaches(db, rekeyed.map(({ component, cached }) => ({
-    inputHash: hashComponentShape(normalizeComponentForCache(component)),
-    entityType: "component",
-    entityId: component.component_id,
-    sourceSessionId: cached.sourceSessionId,
-    humanEdited: cached.humanEdited,
-    promptHash
-  })));
-}
 var init_check_generate_components_cache = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js"() {
     "use strict";
     init_summarize_for_map_tokens();
     init_resolve_component_cache();
-    init_normalize_component_for_cache();
     init_db();
     init_cache_keys();
     init_src();
     init_read_existing_entities();
     init_resolve_generate_prompt();
+    init_restore_cached_components();
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/run-generate-components-session.js
 async function runGenerateComponentsSession(request) {
   const prompt = await resolveGeneratePrompt(request.promptOverrides);
+  const effectiveSkillPath = prompt.path ?? request.skillPath;
   const existingEntities = await readExistingEntities(request);
   const existingTokensInline = existingEntities ? JSON.stringify(summarizeForMapTokens({ entities: existingEntities })) : void 0;
   const existingTokensHash = existingTokensInline ? [hashContent(existingTokensInline)] : [];
   const agent = request.agent;
-  const promptHash = await hashPromptForSkill("components", agent, request.agentModel, prompt.path, existingTokensHash, prompt.text);
+  const promptHash = await hashPromptForSkill("components", agent, request.agentModel, effectiveSkillPath, existingTokensHash, prompt.text);
   const db = openPipelineDb();
   try {
     const acceptedNames = await loadAcceptedNames(request.sessionId);
@@ -19494,7 +19523,7 @@ async function runGenerateComponentsSession(request) {
       tokenMapInline: request.tokenMapInline,
       verbose: request.verbose ?? false,
       noCache: request.noCache,
-      skillPathOverride: prompt.path,
+      skillPathOverride: effectiveSkillPath,
       skillContentOverride: prompt.text,
       promptHash,
       existingContentfulEntities: existingEntities,
@@ -24038,6 +24067,7 @@ async function runGeneration(input, onProgress, deps = realDeps3) {
       agent: input.agent,
       ...input.agentModel ? { agentModel: input.agentModel } : {},
       promptOverrides: appendGeneratePromptOverride(input),
+      skillPath: COMPONENTS_SKILL_PATH,
       noCache: input.noCache,
       existingEntitiesPath: input.existingEntitiesPath,
       precomputedCachedNames: new Set(handedOverNames),
@@ -24067,6 +24097,7 @@ async function runGeneration(input, onProgress, deps = realDeps3) {
         agent: input.agent,
         ...input.agentModel ? { model: input.agentModel } : {},
         cache: !input.noCache,
+        skillPathOverride: MAP_TOKENS_SKILL_PATH,
         ...mapTokensOptions
       });
     } catch (error) {
@@ -24118,14 +24149,17 @@ function applyProgressEvent2(event, previous, total) {
   }
   return previous;
 }
-var realDeps3, fail2, errorMessage3;
+var COMPONENTS_SKILL_PATH, MAP_TOKENS_SKILL_PATH, realDeps3, fail2, errorMessage3;
 var init_run2 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/08-generation/run.ts"() {
     "use strict";
     init_src4();
+    init_find_skill_path();
     init_logic9();
     init_map_tokens();
     init_save_decisions();
+    COMPONENTS_SKILL_PATH = findSkillPath("generate-components.md");
+    MAP_TOKENS_SKILL_PATH = findSkillPath("map-tokens.md");
     realDeps3 = {
       checkAgentAuth,
       saveDecisions,
@@ -24604,8 +24638,8 @@ function missingNote(missingNames) {
 Note: ${plural2(missingNames.length, "component name")} from the server (${missingNames.join(", ")}) ${verb} not match anything in this session \u2014 they cannot be edited or skipped from here.`;
 }
 function contextText(errors, missingNames) {
-  const failed2 = failedComponentNames(errors);
-  return `${plural2(failed2.length, "component")} failed server validation. Edit their definitions in the review TUI, or skip them and retry preview without them.${missingNote(missingNames)}`;
+  const failed = failedComponentNames(errors);
+  return `${plural2(failed.length, "component")} failed server validation. Edit their definitions in the review TUI, or skip them and retry preview without them.${missingNote(missingNames)}`;
 }
 function skipLabel(matchedNames) {
   if (matchedNames.length === 0) return "No matching components to skip";
@@ -31546,19 +31580,19 @@ function resultOf(operation, preview) {
   const items = operation.items ?? [];
   if (items.length > 0) {
     const count = (entityType, action) => items.filter((i) => i.entityType === entityType && i.action === action && i.status === "succeeded").length;
-    const failed2 = (entityType) => items.filter((i) => i.entityType === entityType && i.status === "failed").length;
+    const failed = (entityType) => items.filter((i) => i.entityType === entityType && i.status === "failed").length;
     return {
       componentTypes: {
         created: count("ComponentType", "create"),
         updated: count("ComponentType", "update"),
         removed: count("ComponentType", "delete"),
-        failed: failed2("ComponentType")
+        failed: failed("ComponentType")
       },
       designTokens: {
         created: count("DesignToken", "create"),
         updated: count("DesignToken", "update"),
         removed: count("DesignToken", "delete"),
-        failed: failed2("DesignToken")
+        failed: failed("DesignToken")
       },
       summary: operation.summary,
       failures: items.filter((item) => item.status === "failed").map((item) => ({

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-1c5cd11a.0",
+  "version": "2.37.1-dev-build-a1707be5.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/tui/import/steps/07-scope-gate/cache-check.d.ts

@@ -7,11 +7,4 @@ export interface CacheCheckInput {
     existingEntitiesPath: string | null;
     noCache: boolean;
 }
-/**
- * Runs the generation cache check in-process while the scope gate is open.
- * Restores cached CDF entries into the pipeline database as a side-effect so
- * the generate run that follows can skip them. A failed check is
- * indistinguishable from "nothing cached", as in legacy. INTEG-5050 tracks
- * surfacing it.
- */
 export declare function checkGenerationCache(input: CacheCheckInput): Promise<string[]>;

package/dist/src/tui/import/steps/08-generation/logic.d.ts

@@ -1,22 +1,18 @@
 import type { GenerationProgress } from './types.js';
 export declare function initialProgress(): GenerationProgress;
-/** Token mapping runs only when there is something to map and tokens to map it from. */
 export declare function shouldRunMapTokens(counts: {
     mappablePropCount: number;
     rawTokenCount: number;
 }): boolean;
-/** "5 components accepted." or, with some left out, "5 components accepted, 2 excluded due to validation errors." */
 export declare function formatAcceptanceSummary(counts: {
     accepted: number;
     autoRejected: number;
 }): string;
-/** The screen's description: what was accepted, what is happening to it, and whether the tokens are used. */
 export declare function describeGeneration(input: {
     acceptedCount: number;
     agent: string;
     hasTokens: boolean;
 }): string;
-/** The rows the generating screen shows for this progress. */
 export declare function progressRows(progress: GenerationProgress, agent: string): Array<{
     text: string;
     complete: boolean;

package/dist/src/tui/import/steps/08-generation/run.d.ts

@@ -9,14 +9,4 @@ export interface GenerationDeps {
     runMapTokens: typeof runMapTokens;
     prepareMapTokens: typeof prepareMapTokens;
 }
-/**
- * The whole stage, in the order the wizard ran it:
- *  1. Wait for the cache check that ran while the scope gate was open, then save the decisions. Both write to the
- *     pipeline database and the cache has to be restored first. With nothing accepted the stage ends here.
- *  2. Generate the accepted components in-process. The orchestrator handles per-component cache lookup, so the names
- *     from the cache check are forwarded as `precomputedCachedNames` to skip a redundant lookup.
- *  3. Map tokens onto the generated session. Skipped when there is nothing to map.
- * A failed token mapping after a successful generation is an error to show. It neither retries nor throws away what was
- * generated.
- */
 export declare function runGeneration(input: GenerationInput, onProgress: (progress: GenerationProgress) => void, deps?: GenerationDeps): Promise<GenerationResult>;

package/legacy/dist/src/index.js

@@ -24452,6 +24452,20 @@ var init_resolve_generate_prompt = __esm({
   }
 });
 
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-cached-component-result.js
+var init_build_cached_component_result = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-cached-component-result.js"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-failed-component-result.js
+var init_build_failed_component_result = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/build-failed-component-result.js"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/run-one-generate-component.js
 var DEFAULT_TIMEOUT_MS6, RETRY_BACKOFF_MS2;
 var init_run_one_generate_component = __esm({
@@ -24465,6 +24479,8 @@ var init_run_one_generate_component = __esm({
     init_normalize_component_for_cache();
     init_resolve_component_cache();
     init_summarize_for_generate();
+    init_build_cached_component_result();
+    init_build_failed_component_result();
     DEFAULT_TIMEOUT_MS6 = Number(process.env["EDS_AGENT_TIMEOUT_MS"] ?? 5 * 60 * 1e3);
     RETRY_BACKOFF_MS2 = Number(process.env["EDS_RETRY_BACKOFF_MS"] ?? 5e3);
   }
@@ -24477,18 +24493,27 @@ var init_run_with_pool = __esm({
   }
 });
 
+// packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js
+var init_restore_cached_components = __esm({
+  "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/helpers/restore-cached-components.js"() {
+    "use strict";
+    init_db2();
+    init_normalize_component_for_cache();
+  }
+});
+
 // packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js
 var init_check_generate_components_cache = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/orchestrators/run-generate-components-session/check-generate-components-cache.js"() {
     "use strict";
     init_summarize_for_map_tokens();
     init_resolve_component_cache();
-    init_normalize_component_for_cache();
     init_db2();
     init_cache_keys2();
     init_src3();
     init_read_existing_entities();
     init_resolve_generate_prompt();
+    init_restore_cached_components();
   }
 });
 

package/legacy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-1c5cd11a.0",
+  "version": "2.37.1-dev-build-a1707be5.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-1c5cd11a.0",
+  "version": "2.37.1-dev-build-a1707be5.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-1c5cd11a.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-1c5cd11a.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-a1707be5.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-a1707be5.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",