@contentful/experience-design-system-cli 2.34.5-dev-build-a4f15b7e.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-a4f15b7e.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/import/agent-model-resolve.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Resolution chain for the combined `--agent` override on `experiences import`.
+ *
+ * The wizard path previously hard-defaulted `--agent` to `'claude'` at the
+ * commander layer, which (a) shadowed the stored `credentials.json` value when
+ * the user passed no flag, and (b) made it impossible to distinguish "user
+ * explicitly passed --agent claude" from "user passed nothing". The combined
+ * flag accepts either `agent:model` or `agent model`.
+ *
+ * These helpers produce the resolved values to feed into `WizardApp` /
+ * the import wizard:
+ *
+ *   1. CLI flag wins when provided.
+ *   2. Otherwise, the value persisted in `credentials.json` (written by
+ *      `experiences setup`) is used.
+ *   3. Otherwise, the built-in default (currently `'claude'`) is used for
+ *      the agent. Model has no default — agents pick a small/fast model
+ *      themselves when no model is included in `--agent`.
+ */
+/** Built-in fallback agent when neither a flag nor a stored preference is set. */
+export declare const DEFAULT_AGENT = "claude";
+export declare function parseAgentModel(value: string | undefined): {
+    agent?: string;
+    model?: string;
+};
+export declare function resolveAgent(flagValue: string | undefined, storedValue: string | undefined): string;
+export declare function resolveModel(flagValue: string | undefined, storedValue: string | undefined): string | undefined;

package/dist/src/import/tui/WizardApp.d.ts

@@ -17,6 +17,7 @@ export declare function buildGenerateTokensArgs(opts: {
     model?: string;
     bedrock?: boolean;
     noCache?: boolean;
+    promptOverrides?: string[];
 }): string[];
 export declare function buildMapTokensArgs(opts: {
     sessionId: string;
@@ -24,6 +25,7 @@ export declare function buildMapTokensArgs(opts: {
     model?: string;
     noCache?: boolean;
     skipAgent?: boolean;
+    promptOverrides?: string[];
     existingEntitiesPath?: string;
 }): string[];
 export declare function shouldRunMapTokens(opts: {
@@ -51,7 +53,6 @@ export type WizardAppProps = {
     bedrock?: boolean;
     initialProjectPath?: string;
     host?: string;
-    compositionMap?: string;
     promptOverrides?: string[];
     noCache?: boolean;
     livePreview?: boolean;
@@ -59,4 +60,4 @@ export type WizardAppProps = {
     skipMapTokens?: boolean;
     initialRawTokensPath?: string;
 };
-export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, bedrock, initialProjectPath, host, compositionMap, promptOverrides, noCache, livePreview, generatePromptPath, skipMapTokens, initialRawTokensPath, }?: WizardAppProps): React.ReactElement;
+export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, bedrock, initialProjectPath, host, promptOverrides, noCache, livePreview, generatePromptPath, skipMapTokens, initialRawTokensPath, }?: WizardAppProps): React.ReactElement;

package/dist/src/import/tui/run-selection-agent.d.ts

@@ -0,0 +1,8 @@
+import { type AgentName } from '@contentful/experience-design-system-generation';
+export declare function runSelectionAgent(options: {
+    sessionId: string;
+    agent: AgentName;
+    model?: string;
+    promptText?: string;
+    promptPath?: string;
+}): Promise<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(
@@ -4135,12 +4169,17 @@ var init_persistence = __esm({
 
 // packages/experience-design-system-cli/src/lib/agent-model-options.ts
 function addAgentModelOptions(cmd, config = {}) {
-  const { agentDescription = AGENT_DESCRIPTION, includeModel = true, modelDescription = MODEL_DESCRIPTION } = config;
+  const {
+    agentDescription = AGENT_DESCRIPTION,
+    includeModel = true,
+    includeBedrock = true,
+    modelDescription = MODEL_DESCRIPTION
+  } = config;
   cmd.option("--agent <name>", agentDescription);
   if (includeModel) {
     cmd.option("--model <name>", modelDescription);
   }
-  cmd.option("--bedrock", BEDROCK_DESCRIPTION);
+  if (includeBedrock) cmd.option("--bedrock", BEDROCK_DESCRIPTION);
   return cmd;
 }
 var AGENT_DESCRIPTION, MODEL_DESCRIPTION, BEDROCK_AGENTS, BEDROCK_DESCRIPTION;
@@ -4899,7 +4938,8 @@ async function runGenerateSkill(skill, opts, verbose = false) {
   const { overrides: promptOverrides, errors: promptErrors } = parsePromptOverrides(opts.prompt ?? []);
   if (promptErrors.length > 0) die(`Error: ${promptErrors.join("; ")}`);
   let generatePrompt;
-  const generateOverride = promptOverrides.get("generate");
+  const promptStage = skill === "tokens" ? "tokens" : "generate";
+  const generateOverride = promptOverrides.get(promptStage);
   if (generateOverride) {
     try {
       generatePrompt = await resolvePromptOverride(generateOverride);
@@ -5249,7 +5289,12 @@ function registerInternalGenerateCommand(program) {
   addAgentFlags(componentsCmd).action(async (opts) => {
     await runGenerateSkill("components", opts, opts.verbose ?? false);
   });
-  const tokensCmd = generate.command("tokens").description("Invoke a coding agent to produce tokens.json from raw token data").option("--raw-tokens <path>", "Path to raw token input file");
+  const tokensCmd = generate.command("tokens").description("Invoke a coding agent to produce tokens.json from raw token data").option("--raw-tokens <path>", "Path to raw token input file").option(
+    "--prompt <stage=value>",
+    "Override a stage prompt (repeatable). Used here for the tokens stage.",
+    (v, acc) => [...acc, v],
+    []
+  );
   addAgentFlags(tokensCmd).action(async (opts) => {
     await runGenerateSkill("tokens", opts, opts.verbose ?? false);
   });
@@ -8469,6 +8514,20 @@ async function runMapTokens(opts) {
     );
   }
   const resultAgent = configuredAgent ?? "skipped";
+  const { overrides: promptOverrides, errors: promptErrors } = parsePromptOverrides(opts.prompt ?? []);
+  if (promptErrors.length > 0) die(`Error: ${promptErrors.join("; ")}`);
+  const mapPromptOverride = promptOverrides.get("map-tokens");
+  let mapPromptText;
+  let mapPromptPath;
+  if (mapPromptOverride?.kind === "text") mapPromptText = mapPromptOverride.value;
+  if (mapPromptOverride?.kind === "path") {
+    mapPromptPath = resolve8(mapPromptOverride.value);
+    try {
+      await resolvePromptOverride(mapPromptOverride);
+    } catch (error) {
+      die(`Error: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
   const db = openPipelineDb();
   try {
     const sessionId2 = opts.session ?? findLatestSessionForCommand(db, "generate components");
@@ -8578,7 +8637,9 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
       tokenTree,
       componentSourceRefs,
       outDir: process.cwd(),
-      existingTokensInline
+      existingTokensInline,
+      ...mapPromptText !== void 0 ? { skillContentOverride: mapPromptText } : {},
+      ...mapPromptText === void 0 && mapPromptPath ? { skillPathOverride: mapPromptPath } : {}
     });
     if (opts.printPrompt) {
       const prompt2 = await buildMapPrompt();
@@ -8603,7 +8664,8 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
       agent,
       model,
       void 0,
-      existingTokensInline ? [hashContent(existingTokensInline)] : []
+      existingTokensInline ? [hashContent(existingTokensInline)] : [],
+      mapPromptText
     );
     const inputHash = computeMapTokensInputHash(db, sessionId2, componentSourceRefs);
     if (!noCache) {
@@ -8651,7 +8713,12 @@ ${warnings.map((w) => `  ${w}`).join("\n")}
 }
 function registerMapTokensCommand(program) {
   const map = program.command("map", { hidden: true }).description("Suggest token restrictions for generated design-token props");
-  const tokensCmd = map.command("tokens").description("Invoke a coding agent to suggest $token.allowed for design-category token props").option("--session <id>", "Session ID from generate components (defaults to most recent)").option("--print-prompt", "Print the prompt without invoking the agent").option("--skip-agent", "Resolve token defaults without agentic $token.allowed inference").option("--no-cache", "Bypass the map-tokens cache and force a re-run").option("--token-map <path>", "Path to token-name-map.json sidecar").option(
+  const tokensCmd = map.command("tokens").description("Invoke a coding agent to suggest $token.allowed for design-category token props").option("--session <id>", "Session ID from generate components (defaults to most recent)").option("--print-prompt", "Print the prompt without invoking the agent").option("--skip-agent", "Resolve token defaults without agentic $token.allowed inference").option("--no-cache", "Bypass the map-tokens cache and force a re-run").option(
+    "--prompt <stage=value>",
+    "Override a stage prompt (repeatable). Used here for the map-tokens stage.",
+    (v, acc) => [...acc, v],
+    []
+  ).option("--token-map <path>", "Path to token-name-map.json sidecar").option(
     "--existing-entities-path <path>",
     "Path to the .existing-entities.json file written after CMA credentials are supplied. When present, the agent gets a list of the space's existing design tokens so it can prefer binding to them. Missing/malformed files are treated as no-op."
   );
@@ -8676,6 +8743,7 @@ var init_command4 = __esm({
     init_MapTokensView();
     init_resolve_defaults();
     init_cli_errors();
+    init_prompt_overrides();
     DEFAULT_TIMEOUT_MS2 = Number(process.env.EDS_AGENT_TIMEOUT_MS ?? 5 * 60 * 1e3);
   }
 });
@@ -8703,6 +8771,50 @@ var init_path_utils = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/import/agent-model-resolve.ts
+function parseAgentModel(value) {
+  if (!value?.trim()) return {};
+  const trimmed = value.trim();
+  const separator = trimmed.indexOf(":");
+  if (separator >= 0) {
+    return {
+      agent: trimmed.slice(0, separator).trim() || void 0,
+      model: trimmed.slice(separator + 1).trim() || void 0
+    };
+  }
+  const [agent, ...modelParts] = trimmed.split(/\s+/);
+  return { agent, ...modelParts.length > 0 ? { model: modelParts.join(" ") } : {} };
+}
+function resolveAgent(flagValue, storedValue) {
+  if (flagValue && flagValue.length > 0) return flagValue;
+  if (storedValue && storedValue.length > 0) return storedValue;
+  return DEFAULT_AGENT;
+}
+function resolveModel(flagValue, storedValue) {
+  if (flagValue && flagValue.length > 0) return flagValue;
+  if (storedValue && storedValue.length > 0) return storedValue;
+  return void 0;
+}
+var DEFAULT_AGENT;
+var init_agent_model_resolve = __esm({
+  "packages/experience-design-system-cli/src/import/agent-model-resolve.ts"() {
+    "use strict";
+    DEFAULT_AGENT = "claude";
+  }
+});
+
+// packages/experience-design-system-cli/src/import/composition-options.ts
+function buildCompositionForwardingOptions(options) {
+  return {
+    ...options.prompt && options.prompt.length > 0 ? { promptOverrides: options.prompt } : {}
+  };
+}
+var init_composition_options = __esm({
+  "packages/experience-design-system-cli/src/import/composition-options.ts"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-cli/src/analyze/select/tui/theme.ts
 var PALETTE;
 var init_theme = __esm({
@@ -26548,6 +26660,70 @@ var init_wizard_state_transitions = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/import/tui/run-selection-agent.ts
+async function runSelectionAgent(options) {
+  const db = openPipelineDb();
+  let components;
+  try {
+    components = loadRawComponents(db, options.sessionId);
+  } finally {
+    db.close();
+  }
+  if (components.length === 0) return;
+  const invoker2 = createLocalCliAgentInvoker({
+    onDebugEvent: (name, payload) => getDebugLogger().event("agent", name, payload)
+  });
+  const prompt = await buildPrompt({
+    skill: "select",
+    mode: "autonomous",
+    rawComponentsInline: JSON.stringify(components, null, 2),
+    outDir: process.cwd(),
+    ...options.promptText !== void 0 ? { skillContentOverride: options.promptText } : {},
+    ...options.promptText === void 0 && options.promptPath ? { skillPathOverride: options.promptPath } : {}
+  });
+  const { result } = await invokeAgentWithOutput(
+    invoker2,
+    { agent: options.agent, model: options.model, prompt, timeoutMs: DEFAULT_TIMEOUT_MS4 },
+    false
+  );
+  if (result.timedOut) throw new Error("selection agent timed out");
+  if (result.exitCode !== 0) throw new Error(`selection agent exited with code ${result.exitCode}`);
+  const { calls, warnings } = parseSelectToolCallLines(result.stdout);
+  for (const warning of warnings) process.stderr.write(`Warning: selection agent: ${warning}
+`);
+  const byName = new Map(calls.map((call) => [call.name, call]));
+  const writeDb = openPipelineDb();
+  try {
+    const update = writeDb.prepare(
+      `UPDATE raw_components SET status = ?, reject_reason = ? WHERE session_id = ? AND component_id = ?`
+    );
+    for (const component of components) {
+      const call = byName.get(component.name);
+      if (!call) continue;
+      const rejected = call.tool === "reject_component";
+      update.run(
+        rejected ? "rejected" : "accepted",
+        rejected ? call.reason ?? null : null,
+        options.sessionId,
+        component.component_id
+      );
+    }
+  } finally {
+    writeDb.close();
+  }
+}
+var DEFAULT_TIMEOUT_MS4;
+var init_run_selection_agent = __esm({
+  "packages/experience-design-system-cli/src/import/tui/run-selection-agent.ts"() {
+    "use strict";
+    init_src();
+    init_debug_logger();
+    init_agent_output();
+    init_db();
+    DEFAULT_TIMEOUT_MS4 = Number(process.env.EDS_AGENT_TIMEOUT_MS ?? 5 * 60 * 1e3);
+  }
+});
+
 // packages/experience-design-system-cli/src/import/tui/WizardApp.tsx
 var WizardApp_exports = {};
 __export(WizardApp_exports, {
@@ -26586,6 +26762,7 @@ function buildGenerateTokensArgs(opts) {
   if (opts.model) args.push("--model", opts.model);
   if (opts.bedrock) args.push("--bedrock");
   if (opts.noCache) args.push("--no-cache");
+  for (const prompt of opts.promptOverrides ?? []) args.push("--prompt", prompt);
   return args;
 }
 function buildMapTokensArgs(opts) {
@@ -26593,6 +26770,7 @@ function buildMapTokensArgs(opts) {
   if (opts.model) args.push("--model", opts.model);
   if (opts.noCache) args.push("--no-cache");
   if (opts.skipAgent) args.push("--skip-agent");
+  for (const prompt of opts.promptOverrides ?? []) args.push("--prompt", prompt);
   if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
@@ -26668,7 +26846,6 @@ function WizardApp({
   bedrock = false,
   initialProjectPath,
   host,
-  compositionMap,
   promptOverrides,
   noCache = false,
   livePreview = true,
@@ -26838,7 +27015,8 @@ If you are using AWS Bedrock, run:
       agent: state.agent,
       ...state.agentModel ? { model: state.agentModel } : {},
       ...state.bedrock ? { bedrock: true } : {},
-      noCache: effectiveNoCache
+      noCache: effectiveNoCache,
+      promptOverrides
     });
     const result = await runSpawnedCli(tokenArgs);
     if (result.exitCode !== 0) {
@@ -26918,6 +27096,7 @@ If you are using AWS Bedrock, run:
       ...state.agentModel ? { model: state.agentModel } : {},
       noCache: effectiveNoCache,
       skipAgent: skipMapTokens,
+      promptOverrides,
       ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
     });
     const result = await runCli(args);
@@ -26936,7 +27115,6 @@ If you are using AWS Bedrock, run:
     update({ step: "extracting", outDir, extractProgress: null, compositionPhase: null });
     const extractArgs = [findCliPath(), "__extract", "--project", projectPath];
     if (noCache) extractArgs.push("--composition-refresh");
-    if (compositionMap) extractArgs.push("--composition-map", compositionMap);
     for (const p of promptOverrides ?? []) extractArgs.push("--prompt", p);
     if (state.agent) extractArgs.push("--agent", state.agent);
     if (state.bedrock) extractArgs.push("--bedrock");
@@ -27001,6 +27179,34 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
       });
       return;
     }
+    try {
+      const { overrides, errors } = parsePromptOverrides(promptOverrides ?? []);
+      if (errors.length > 0) throw new Error(errors.join("; "));
+      const selectOverride = overrides.get("select");
+      let promptText;
+      let promptPath;
+      if (selectOverride?.kind === "text") promptText = selectOverride.value;
+      if (selectOverride?.kind === "path") {
+        promptPath = resolve17(selectOverride.value);
+        await resolvePromptOverride(selectOverride);
+      }
+      if (state.agent) {
+        await runSelectionAgent({
+          sessionId: extractSessionId ?? "",
+          agent: state.agent,
+          ...state.agentModel ? { model: state.agentModel } : {},
+          ...promptText !== void 0 ? { promptText } : {},
+          ...promptPath ? { promptPath } : {}
+        });
+      }
+    } catch (error) {
+      update({
+        step: "error",
+        errorStep: "selection agent",
+        errorMessage: error instanceof Error ? error.message : String(error)
+      });
+      return;
+    }
     update({
       step: "scope-gate",
       extractSessionId
@@ -28247,15 +28453,27 @@ var init_WizardApp = __esm({
     init_fetch_and_persist_existing_contentful_entities();
     init_wizard_state_transitions();
     init_cli_path();
+    init_prompt_overrides();
+    init_run_selection_agent();
     WIZARD_LOG = join20(tmpdir(), "experiences-import-wizard.log");
   }
 });
 
 // packages/experience-design-system-cli/src/import/command.ts
 function registerImportCommand(program) {
-  program.command("import").description("Run the full pipeline: analyze \u2192 select \u2192 generate \u2192 push").option("--project <path>", "Path to the project root to analyze", ".").option("--tokens <path>", "Path to a raw token source file to import alongside components").option("--agent <name>", 'Agent to use for generation (overrides credentials.json; falls back to "claude")').option(
+  const cmd = program.command("import").description("Run the full pipeline: analyze \u2192 select \u2192 generate \u2192 push").option("--project <path>", "Path to the project root to analyze", ".");
+  cmd.option(
+    "--tokens <path>",
+    "Path to a raw token source file (SCSS, CSS variables, JS/TS, Style Dictionary, etc.) to classify and import alongside components. Bypasses the interactive token prompt."
+  );
+  addAgentModelOptions(cmd, {
+    agentDescription: 'Agent and optional model as agent:model or "agent model" (overrides credentials.json; falls back to "claude")',
+    includeModel: false,
+    includeBedrock: false
+  });
+  cmd.option(
     "--prompt <stage=value>",
-    "Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md",
+    "Override a composition, selection, token, generation, or token-mapping prompt (repeatable). value is a file path or literal text, e.g. --prompt select=./p.md",
     (v, acc) => [...acc, v],
     []
   ).option("--no-cache", "Re-run all steps even if output already exists").action(async (opts) => {
@@ -28281,8 +28499,9 @@ function registerImportCommand(program) {
       const { createElement: createElement6 } = await import("react");
       const { WizardApp: WizardApp2 } = await Promise.resolve().then(() => (init_WizardApp(), WizardApp_exports));
       const creds = await readExperiencesCredentials();
-      const resolvedAgent = opts.agent || creds.agent || "claude";
-      const resolvedModel = creds.agentModel || void 0;
+      const parsedAgentModel = parseAgentModel(opts.agent);
+      const resolvedAgent = resolveAgent(parsedAgentModel.agent, creds.agent);
+      const resolvedModel = resolveModel(parsedAgentModel.model, creds.agentModel);
       const { waitUntilExit } = render5(
         createElement6(WizardApp2, {
           initialSpaceId: creds.spaceId,
@@ -28292,8 +28511,9 @@ function registerImportCommand(program) {
           initialAgent: resolvedAgent,
           ...resolvedModel ? { initialModel: resolvedModel } : {},
           initialProjectPath: opts.project !== "." ? normalizePath(opts.project) : void 0,
-          ...opts.prompt && opts.prompt.length > 0 ? { promptOverrides: opts.prompt } : {},
+          ...buildCompositionForwardingOptions(opts),
           noCache: opts.cache === false,
+          skipMapTokens: false,
           livePreview: true,
           generatePromptPath: creds.generatePromptPath,
           ...opts.tokens ? { initialRawTokensPath: normalizePath(opts.tokens) } : {}
@@ -28308,8 +28528,11 @@ var init_command6 = __esm({
   "packages/experience-design-system-cli/src/import/command.ts"() {
     "use strict";
     init_path_utils();
+    init_agent_model_resolve();
+    init_agent_model_options();
     init_credentials_store();
     init_host_utils();
+    init_composition_options();
     init_terminal_capabilities();
   }
 });
@@ -30096,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({
@@ -30265,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);
 }
@@ -30343,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],
@@ -30353,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") {
@@ -30390,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, {
@@ -30414,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) => ({
@@ -30458,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}
@@ -30525,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");
@@ -30552,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 }))
@@ -30562,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];
@@ -30595,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/dist/src/lib/agent-model-options.d.ts

@@ -4,12 +4,12 @@ export declare const MODEL_DESCRIPTION = "Model to use (defaults to a lightweigh
 export interface AgentModelOptionsConfig {
     agentDescription?: string;
     includeModel?: boolean;
+    includeBedrock?: boolean;
     modelDescription?: string;
 }
 /**
- * Register --agent, --bedrock, and optional --model flags with a Commander
- * command. Pass includeModel: false to omit --model only — --bedrock is
- * independent of model selection (it's a routing switch, not a model choice)
- * and is always registered alongside --agent.
+ * Register --agent plus optional --model and --bedrock flags with a Commander
+ * command. The optional flags can be omitted for commands with a narrower
+ * public surface.
  */
 export declare function addAgentModelOptions(cmd: Command, config?: AgentModelOptionsConfig): Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.34.5-dev-build-a4f15b7e.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-cli-v2": "2.34.5-dev-build-a4f15b7e.0",
-    "@contentful/experience-design-system-types": "2.34.5-dev-build-a4f15b7e.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-a4f15b7e.0",
-    "@contentful/experience-design-system-generation": "2.34.5-dev-build-a4f15b7e.0",
-    "@contentful/experience-design-system-client": "2.34.5-dev-build-a4f15b7e.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",