@contentful/experience-design-system-cli 2.34.5-dev-build-13ecfbdc.0 → 2.34.5-dev-build-12a524fb.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-13ecfbdc.0",
+  "version": "2.34.5-dev-build-12a524fb.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/analyze/composition/resolve-mapping-cli.d.ts

@@ -1,6 +1,8 @@
 export type CompositionCliOptions = {
     /** `--composition-refresh` — force edge emission to run even over resolved residue. */
     compositionRefresh?: boolean;
+    /** `--no-cache` — force the composition agent to rerun with the rest of the pipeline. */
+    noCache?: boolean;
 };
 export type ResolvedCompositionSources = {
     forceAgent: boolean;

package/dist/src/analyze/extract-command.d.ts

@@ -1,3 +1,7 @@
 import type { Command } from 'commander';
+export declare function resolveExtractNoCache(opts: {
+    cache?: boolean;
+    noCache?: boolean;
+}): boolean;
 export declare function collectSourceFiles(directory: string, onProgress?: (scannedCount: number) => void): Promise<string[]>;
 export declare function registerInternalExtractCommand(program: Command): void;

package/dist/src/index.js

@@ -3703,6 +3703,40 @@ async function getCliCacheVersion() {
     return _cliCacheVersionCache;
   }
 }
+function storeExtractCache(db, filePath, fileHash, cliVersion2, components) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  const componentsJson = JSON.stringify(components);
+  db.prepare(
+    `INSERT INTO extract_cache (file_path, file_hash, cli_version, created_at, updated_at, components_json)
+     VALUES (?, ?, ?, ?, ?, ?)
+     ON CONFLICT(file_hash, cli_version) DO UPDATE SET
+       file_path = excluded.file_path,
+       updated_at = excluded.updated_at,
+       components_json = excluded.components_json`
+  ).run(filePath, fileHash, cliVersion2, now, now, componentsJson);
+}
+function lookupExtractCache(db, fileHash, cliVersion2) {
+  const row = db.prepare(
+    `SELECT file_path, file_hash, cli_version, created_at, updated_at, components_json
+       FROM extract_cache
+       WHERE file_hash = ? AND cli_version = ?`
+  ).get(fileHash, cliVersion2);
+  if (!row) return null;
+  let components = [];
+  try {
+    components = JSON.parse(row.components_json);
+  } catch {
+    return null;
+  }
+  return {
+    filePath: row.file_path,
+    fileHash: row.file_hash,
+    cliVersion: row.cli_version,
+    createdAt: row.created_at,
+    updatedAt: row.updated_at,
+    components
+  };
+}
 function storeCompositionCache(db, inputHash, cliVersion2, agentOutput) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   db.prepare(
@@ -30285,7 +30319,7 @@ var init_resolve_mapping = __esm({
 // packages/experience-design-system-cli/src/analyze/composition/resolve-mapping-cli.ts
 function resolveCompositionSources(opts) {
   return {
-    forceAgent: !!opts.compositionRefresh
+    forceAgent: opts.compositionRefresh === true || opts.noCache === true
   };
 }
 var init_resolve_mapping_cli = __esm({
@@ -30454,12 +30488,26 @@ var init_manifest_doc_evidence = __esm({
 // packages/experience-design-system-cli/src/analyze/extract-command.ts
 import { mkdir as mkdir6, readdir as readdir3, readFile as readFile18, stat as stat6 } from "node:fs/promises";
 import { isAbsolute as isAbsolute2, join as join25, relative as relative2, resolve as resolve19 } from "node:path";
+function resolveExtractNoCache(opts) {
+  return opts.noCache === true || opts.cache === false;
+}
 function isDenylistedNoiseFile(name) {
   return DENYLISTED_EXACT_FILE_NAMES.has(name) || DENYLISTED_FILE_NAME_PATTERNS.some((pattern) => pattern.test(name));
 }
 function pluralize(count, singular, plural = `${singular}s`) {
   return `${count} ${count === 1 ? singular : plural}`;
 }
+async function retryDatabaseWrite(operation, attempts = 8) {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return operation();
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (!/database is locked|database is busy/i.test(message) || attempt >= attempts) throw error;
+      await new Promise((resolve21) => setTimeout(resolve21, Math.min(250 * attempt, 2e3)));
+    }
+  }
+}
 function resolveFromProjectRoot(projectRoot, inputPath) {
   return isAbsolute2(inputPath) ? inputPath : resolve19(projectRoot, inputPath);
 }
@@ -30532,7 +30580,7 @@ function registerInternalExtractCommand(program) {
     "--resolve-unreachable <mode>",
     "Retry pass for unresolved Svelte Props types: 'auto' (default), 'always', or 'never'",
     "auto"
-  ).option("--composition-refresh", "Force the mapping agent to run even where deterministic sources answered").option(
+  ).option("--composition-refresh", "Force the mapping agent to run even where deterministic sources answered").option("--no-cache", "Re-run extraction even when all source files are unchanged").option(
     "--prompt <stage=value>",
     "Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md",
     (v, acc) => [...acc, v],
@@ -30542,6 +30590,7 @@ function registerInternalExtractCommand(program) {
     includeModel: false,
     agentDescription: "Coding agent for composition mapping resolution (claude|codex|opencode|cursor)"
   }).action(async (opts) => {
+    const noCache = resolveExtractNoCache(opts);
     const resolveUnreachable = (() => {
       const v = opts.resolveUnreachable ?? "auto";
       if (v !== "auto" && v !== "always" && v !== "never") {
@@ -30579,16 +30628,50 @@ function registerInternalExtractCommand(program) {
 `);
       }
     });
-    const extraction = await extractComponents2(
-      sourceFiles,
-      ({ filesProcessed, componentsFound }) => {
+    const extractionCacheDb = openPipelineDb();
+    let extraction;
+    let extractionCacheHits = 0;
+    try {
+      const cacheVersion = await getCliCacheVersion();
+      const cachedByPath = /* @__PURE__ */ new Map();
+      if (!noCache && sourceFiles.length > 0) {
+        const hashes = await Promise.all(
+          sourceFiles.map(async (filePath) => [filePath, await hashFile(filePath)])
+        );
+        for (const [filePath, fileHash] of hashes) {
+          cachedByPath.set(filePath, lookupExtractCache(extractionCacheDb, fileHash, cacheVersion));
+        }
+      }
+      const allFilesCached = !noCache && sourceFiles.length > 0 && sourceFiles.every((filePath) => cachedByPath.get(filePath) !== null);
+      if (allFilesCached) {
+        const cachedComponents = sourceFiles.flatMap((filePath) => cachedByPath.get(filePath).components);
+        extractionCacheHits = sourceFiles.length;
+        extraction = { components: cachedComponents, warnings: [] };
         if (!process.stdout.isTTY) {
-          process.stderr.write(`progress=extract:${filesProcessed}/${sourceFiles.length}:${componentsFound}
-`);
+          process.stderr.write(
+            `progress=extract:${sourceFiles.length}/${sourceFiles.length}:${cachedComponents.length}
+`
+          );
         }
-      },
-      { resolveUnreachable, projectRoot }
-    );
+        getDebugLogger().event("analyze", "extract.cache-hit", {
+          files: sourceFiles.length,
+          components: cachedComponents.length
+        });
+      } else {
+        extraction = await extractComponents2(
+          sourceFiles,
+          ({ filesProcessed, componentsFound }) => {
+            if (!process.stdout.isTTY) {
+              process.stderr.write(`progress=extract:${filesProcessed}/${sourceFiles.length}:${componentsFound}
+`);
+            }
+          },
+          { resolveUnreachable, projectRoot }
+        );
+      }
+    } finally {
+      extractionCacheDb.close();
+    }
     await mkdir6(outDir, { recursive: true });
     const db = openPipelineDb();
     const { sessionId: sessionId2 } = getOrCreateSession(db, void 0, void 0, {
@@ -30603,6 +30686,25 @@ function registerInternalExtractCommand(program) {
     const stepId = createStep(db, sessionId2, "analyze extract", {
       project: projectRoot
     });
+    if (extractionCacheHits === 0 && !noCache) {
+      const cacheVersion = await getCliCacheVersion();
+      const componentsBySourcePath = /* @__PURE__ */ new Map();
+      for (const component of extraction.components) {
+        if (!component.sourcePath) continue;
+        const components = componentsBySourcePath.get(component.sourcePath) ?? [];
+        components.push(component);
+        componentsBySourcePath.set(component.sourcePath, components);
+      }
+      for (const filePath of sourceFiles) {
+        storeExtractCache(
+          db,
+          filePath,
+          await hashFile(filePath),
+          cacheVersion,
+          componentsBySourcePath.get(filePath) ?? []
+        );
+      }
+    }
     const classifiedComponents = extraction.components.map(preClassifyComponent);
     const inspectedComponents = await Promise.all(
       classifiedComponents.map(async (component) => ({
@@ -30647,7 +30749,10 @@ function registerInternalExtractCommand(program) {
     }
     let validatedComponents = validateExtractedComponents(filteredComponents);
     {
-      const sources = resolveCompositionSources(opts);
+      const sources = resolveCompositionSources({
+        ...opts,
+        noCache
+      });
       const { overrides: promptOverrides, errors: promptErrors } = parsePromptOverrides(opts.prompt ?? []);
       for (const err of promptErrors) {
         process.stderr.write(`Error: ${err}
@@ -30714,7 +30819,7 @@ function registerInternalExtractCommand(program) {
           files: promptFiles,
           ...compositionPrompt ? { promptOverride: compositionPrompt } : {},
           runAgentFn: async ({ prompt }) => {
-            if (!opts.compositionRefresh) {
+            if (!noCache && !opts.compositionRefresh) {
               const cached = lookupCompositionCache(db, agentCacheKey, cacheVersion);
               if (cached !== null) {
                 emitCompositionProgress("cache-hit");
@@ -30741,7 +30846,7 @@ function registerInternalExtractCommand(program) {
         validatedComponents = result.components;
       }
     }
-    storeRawComponents(db, sessionId2, validatedComponents);
+    await retryDatabaseWrite(() => storeRawComponents(db, sessionId2, validatedComponents));
     const cycleInput = validatedComponents.map((c2) => ({
       name: c2.name,
       slots: c2.slots.map((s) => ({ name: s.name, allowedComponents: s.allowedComponents }))
@@ -30751,13 +30856,13 @@ function registerInternalExtractCommand(program) {
       ...cycle,
       suggestedBreak: suggestCycleBreakEdge(cycle, cycles)
     }));
-    storeSlotCycles(db, sessionId2, withBreaks);
+    await retryDatabaseWrite(() => storeSlotCycles(db, sessionId2, withBreaks));
     storeScannedFiles(
       db,
       sessionId2,
       sourceFiles.map((f) => relative2(projectRoot, f))
     );
-    updateStep(db, stepId, "complete", { sessionId: sessionId2 });
+    await retryDatabaseWrite(() => updateStep(db, stepId, "complete", { sessionId: sessionId2 }));
     enrichCommandResult({ extracted_component_count: validatedComponents.length });
     db.close();
     const allWarnings = [...extraction.warnings, ...filterWarnings];
@@ -30784,6 +30889,7 @@ var init_extract_command = __esm({
     init_agent_model_options();
     init_src3();
     init_db();
+    init_cache_keys();
     init_cycle_detection();
     init_resolve_mapping();
     init_resolve_mapping_cli();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-13ecfbdc.0",
+  "version": "2.34.5-dev-build-12a524fb.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -41,8 +41,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.34.5-dev-build-13ecfbdc.0",
-    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-13ecfbdc.0"
+    "@contentful/experience-design-system-cli-v2": "2.34.5-dev-build-12a524fb.0",
+    "@contentful/experience-design-system-types": "2.34.5-dev-build-12a524fb.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -54,9 +54,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-13ecfbdc.0",
-    "@contentful/experience-design-system-generation": "2.34.5-dev-build-13ecfbdc.0",
-    "@contentful/experience-design-system-client": "2.34.5-dev-build-13ecfbdc.0"
+    "@contentful/experience-design-system-client": "2.34.5-dev-build-12a524fb.0",
+    "@contentful/experience-design-system-generation": "2.34.5-dev-build-12a524fb.0",
+    "@contentful/experience-design-system-extraction": "2.34.5-dev-build-12a524fb.0"
   },
   "repository": {
     "type": "git",