@contentful/experience-design-system-cli 2.32.1-dev-build-b78fe18.0 → 2.32.1-dev-build-d28a6f8.0

package/dist/src/index.js

@@ -335,7 +335,7 @@ async function runAgent(options) {
     promptLen: prompt2.length,
     promptHead: prompt2.slice(0, 500)
   });
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -384,25 +384,25 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve27(result);
+      resolve28(result);
     });
   });
 }
 async function checkAgentAuth(agent) {
   const binary = resolveBinary(agent);
-  const binaryExists2 = await new Promise((resolve27) => {
+  const binaryExists2 = await new Promise((resolve28) => {
     if (binary.startsWith("/")) {
-      import("node:fs/promises").then((fs2) => fs2.access(binary).then(() => resolve27(true), () => resolve27(false)));
+      import("node:fs/promises").then((fs2) => fs2.access(binary).then(() => resolve28(true), () => resolve28(false)));
       return;
     }
     const child = spawn("which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve27(code === 0));
+    child.on("close", (code) => resolve28(code === 0));
   });
   if (!binaryExists2)
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     const child = spawn(binary, ["auth", "status", "--json"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -412,7 +412,7 @@ async function checkAgentAuth(agent) {
       if (!done) {
         done = true;
         child.kill("SIGTERM");
-        resolve27("unauthenticated");
+        resolve28("unauthenticated");
       }
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
@@ -424,14 +424,14 @@ async function checkAgentAuth(agent) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve27("unauthenticated");
+        resolve28("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve27(status.loggedIn ? "ok" : "unauthenticated");
+        resolve28(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve27("unauthenticated");
+        resolve28("unauthenticated");
       }
     });
   });
@@ -624,8 +624,20 @@ function renderTokenCandidateSection(kind, entries) {
 ${formatTokenCandidateLines(entries)}`;
 }
 function buildPreamble(options) {
-  const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs } = options;
+  const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs, existingComponentsInline, existingTokensInline } = options;
   const sections = [];
+  if (existingComponentsInline) {
+    sections.push(`Existing components in the target Contentful space (JSON) \u2014 use for alignment, not as a hard filter:
+\`\`\`json
+${existingComponentsInline}
+\`\`\``);
+  }
+  if (existingTokensInline) {
+    sections.push(`Existing design tokens in the target Contentful space (JSON) \u2014 prefer binding to these paths over inventing new ones:
+\`\`\`json
+${existingTokensInline}
+\`\`\``);
+  }
   if (rawComponentsInline) {
     sections.push(`Raw component data (JSON):
 \`\`\`json
@@ -8460,6 +8472,230 @@ var init_terminal_capabilities = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/session/source-excerpt.ts
+function escapeForRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function identifierPattern(name) {
+  return new RegExp(`(?<![A-Za-z0-9_$])${escapeForRegExp(name)}(?![A-Za-z0-9_$])`);
+}
+function excerptAroundNames(text, names, maxChars, contextLines = 6) {
+  if (text.length <= maxChars) return { content: text, usesNotShown: [] };
+  const patterns = names.filter((name) => name.length > 0).map((name) => ({ name, pattern: identifierPattern(name) }));
+  const lines = text.split("\n");
+  const windows = [];
+  lines.forEach((line, index) => {
+    const mentioned = patterns.filter(({ pattern }) => pattern.test(line)).map(({ name }) => name);
+    if (mentioned.length === 0) return;
+    const start = Math.max(0, index - contextLines);
+    const end = Math.min(lines.length - 1, index + contextLines);
+    const last = windows[windows.length - 1];
+    if (last && start <= last.end + 1) {
+      last.end = Math.max(last.end, end);
+      for (const name of mentioned) last.names.add(name);
+    } else {
+      windows.push({ start, end, names: new Set(mentioned) });
+    }
+  });
+  if (windows.length === 0) {
+    return { content: `${text.slice(0, maxChars)}
+${TRUNCATED_MARKER}`, usesNotShown: [] };
+  }
+  const lastWindowFor = /* @__PURE__ */ new Map();
+  for (const window of windows) for (const name of window.names) lastWindowFor.set(name, window);
+  const kept = [];
+  const cut = /* @__PURE__ */ new Set();
+  let used = 0;
+  for (const window of [...windows].reverse()) {
+    const chunk = lines.slice(window.start, window.end + 1).join("\n");
+    const separator = kept.length > 0 ? `
+${ELLIPSIS_MARKER}
+` : "";
+    if (used + separator.length + chunk.length > maxChars) {
+      if (kept.length === 0) {
+        const head = chunk.slice(0, maxChars);
+        kept.push({ window, text: head });
+        used += head.length;
+        for (const name of window.names) {
+          if (lastWindowFor.get(name) === window && !identifierPattern(name).test(head)) cut.add(name);
+        }
+        continue;
+      }
+      for (const name of window.names) {
+        if (lastWindowFor.get(name) === window) cut.add(name);
+      }
+      continue;
+    }
+    kept.push({ window, text: chunk });
+    used += separator.length + chunk.length;
+  }
+  kept.sort((a, b) => a.window.start - b.window.start);
+  const parts = kept.map((entry, index) => (index > 0 ? `
+${ELLIPSIS_MARKER}
+` : "") + entry.text);
+  const usesNotShown = names.filter((name, index) => cut.has(name) && names.indexOf(name) === index);
+  return { content: `${parts.join("")}
+${TRUNCATED_MARKER}`, usesNotShown };
+}
+var ELLIPSIS_MARKER, TRUNCATED_MARKER;
+var init_source_excerpt = __esm({
+  "packages/experience-design-system-cli/src/session/source-excerpt.ts"() {
+    "use strict";
+    ELLIPSIS_MARKER = "/* \u2026 */";
+    TRUNCATED_MARKER = "/* truncated */";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/components/component-id.ts
+import { createHash } from "node:crypto";
+function deriveComponentId(name, source) {
+  return createHash("sha256").update(`${name}:${source}`).digest("hex").slice(0, 12);
+}
+var init_component_id = __esm({
+  "packages/experience-design-system-cli/src/session/core/components/component-id.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/cdf/server-type-map.ts
+function mapServerTypeToCdfType(serverType) {
+  switch (serverType.toLowerCase()) {
+    case "string":
+    case "text":
+      return "string";
+    case "richtext":
+      return "richtext";
+    case "media":
+      return "media";
+    case "link":
+      return "link";
+    case "enum":
+    case "symbol":
+      return "enum";
+    case "token":
+      return "token";
+    case "boolean":
+      return "boolean";
+    default:
+      return "string";
+  }
+}
+function resolveCdfCategory(serverCategory, propName, contentProps, designProps) {
+  if (serverCategory && VALID_CATEGORIES2.includes(serverCategory)) {
+    return serverCategory;
+  }
+  if (contentProps.has(propName)) return "content";
+  if (designProps.has(propName)) return "design";
+  return "state";
+}
+var VALID_CATEGORIES2;
+var init_server_type_map = __esm({
+  "packages/experience-design-system-cli/src/session/core/cdf/server-type-map.ts"() {
+    "use strict";
+    VALID_CATEGORIES2 = ["content", "design", "state"];
+  }
+});
+
+// packages/experience-design-system-cli/src/session/core/shared/group-by.ts
+function groupBy(items, key) {
+  const map = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const k = key(item);
+    let arr = map.get(k);
+    if (!arr) {
+      arr = [];
+      map.set(k, arr);
+    }
+    arr.push(item);
+  }
+  return map;
+}
+var init_group_by = __esm({
+  "packages/experience-design-system-cli/src/session/core/shared/group-by.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/sessions/read.ts
+function findSession(db, sessionId2) {
+  const row = db.prepare("SELECT id FROM sessions WHERE id = ?").get(sessionId2);
+  return row ?? null;
+}
+function findLatestSessionForCommand(db, command) {
+  const row = db.prepare(
+    `SELECT s.id FROM sessions s
+       JOIN steps st ON st.session_id = s.id
+       WHERE st.command = ? AND st.status = 'complete'
+       ORDER BY st.started_at DESC, st.id DESC
+       LIMIT 1`
+  ).get(command);
+  return row?.id ?? null;
+}
+var init_read = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/sessions/read.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/sessions/write.ts
+function createSession(db, id, name, timestamp) {
+  db.prepare("INSERT INTO sessions (id, name, created_at, updated_at) VALUES (?, ?, ?, ?)").run(
+    id,
+    name,
+    timestamp,
+    timestamp
+  );
+}
+function touchSession(db, sessionId2, timestamp) {
+  db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(timestamp, sessionId2);
+}
+var init_write = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/sessions/write.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/steps/read.ts
+function findStepSessionId(db, stepId) {
+  const row = db.prepare("SELECT session_id FROM steps WHERE id = ?").get(stepId);
+  return row?.session_id ?? null;
+}
+var init_read2 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/steps/read.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/session/repositories/steps/write.ts
+function markPendingStepsInterrupted(db, sessionId2, command, timestamp) {
+  db.prepare(
+    `UPDATE steps SET status = 'interrupted', completed_at = ?, updated_at = ?
+     WHERE session_id = ? AND command = ? AND status = 'pending'`
+  ).run(timestamp, timestamp, sessionId2, command);
+}
+function insertPendingStep(db, sessionId2, command, inputs, timestamp) {
+  const result = db.prepare(
+    `INSERT INTO steps (session_id, command, status, started_at, inputs, outputs, updated_at)
+       VALUES (?, ?, 'pending', ?, ?, '{}', ?)`
+  ).run(sessionId2, command, timestamp, JSON.stringify(inputs), timestamp);
+  return Number(result.lastInsertRowid);
+}
+function updateStepResult(db, stepId, status, outputs, error, timestamp) {
+  db.prepare(`UPDATE steps SET status = ?, completed_at = ?, outputs = ?, error = ?, updated_at = ? WHERE id = ?`).run(
+    status,
+    timestamp,
+    JSON.stringify(outputs),
+    error,
+    timestamp,
+    stepId
+  );
+}
+var init_write2 = __esm({
+  "packages/experience-design-system-cli/src/session/repositories/steps/write.ts"() {
+    "use strict";
+  }
+});
+
 // packages/experience-design-system-cli/src/session/session-id.ts
 var session_id_exports = {};
 __export(session_id_exports, {
@@ -8684,77 +8920,61 @@ var init_session_id = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/session/source-excerpt.ts
-function escapeForRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function identifierPattern(name) {
-  return new RegExp(`(?<![A-Za-z0-9_$])${escapeForRegExp(name)}(?![A-Za-z0-9_$])`);
+// packages/experience-design-system-cli/src/session/services/session-resolver.ts
+function resolveSession(db, sessionFlag, sessionName, _hints) {
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  if (sessionFlag === "new" || sessionFlag === void 0) {
+    const id = generateSessionId();
+    createSession(db, id, sessionName ?? null, now);
+    return { sessionId: id, isNew: true, isResumed: false };
+  }
+  if (!findSession(db, sessionFlag)) {
+    throw new Error(`session '${sessionFlag}' not found. Run 'session list' to see active sessions.`);
+  }
+  return { sessionId: sessionFlag, isNew: false, isResumed: false };
 }
-function excerptAroundNames(text, names, maxChars, contextLines = 6) {
-  if (text.length <= maxChars) return { content: text, usesNotShown: [] };
-  const patterns = names.filter((name) => name.length > 0).map((name) => ({ name, pattern: identifierPattern(name) }));
-  const lines = text.split("\n");
-  const windows = [];
-  lines.forEach((line, index) => {
-    const mentioned = patterns.filter(({ pattern }) => pattern.test(line)).map(({ name }) => name);
-    if (mentioned.length === 0) return;
-    const start = Math.max(0, index - contextLines);
-    const end = Math.min(lines.length - 1, index + contextLines);
-    const last = windows[windows.length - 1];
-    if (last && start <= last.end + 1) {
-      last.end = Math.max(last.end, end);
-      for (const name of mentioned) last.names.add(name);
-    } else {
-      windows.push({ start, end, names: new Set(mentioned) });
-    }
-  });
-  if (windows.length === 0) {
-    return { content: `${text.slice(0, maxChars)}
-${TRUNCATED_MARKER}`, usesNotShown: [] };
+var init_session_resolver = __esm({
+  "packages/experience-design-system-cli/src/session/services/session-resolver.ts"() {
+    "use strict";
+    init_session_id();
+    init_read();
+    init_write();
   }
-  const lastWindowFor = /* @__PURE__ */ new Map();
-  for (const window of windows) for (const name of window.names) lastWindowFor.set(name, window);
-  const kept = [];
-  const cut = /* @__PURE__ */ new Set();
-  let used = 0;
-  for (const window of [...windows].reverse()) {
-    const chunk = lines.slice(window.start, window.end + 1).join("\n");
-    const separator = kept.length > 0 ? `
-${ELLIPSIS_MARKER}
-` : "";
-    if (used + separator.length + chunk.length > maxChars) {
-      if (kept.length === 0) {
-        const head = chunk.slice(0, maxChars);
-        kept.push({ window, text: head });
-        used += head.length;
-        for (const name of window.names) {
-          if (lastWindowFor.get(name) === window && !identifierPattern(name).test(head)) cut.add(name);
-        }
-        continue;
-      }
-      for (const name of window.names) {
-        if (lastWindowFor.get(name) === window) cut.add(name);
-      }
-      continue;
-    }
-    kept.push({ window, text: chunk });
-    used += separator.length + chunk.length;
+});
+
+// packages/experience-design-system-cli/src/session/core/components/input-hash.ts
+import { createHash as createHash2 } from "node:crypto";
+function computeComponentInputHash(component) {
+  const payload = {
+    framework: component.framework,
+    name: component.name,
+    source: component.source,
+    props: component.props.map((p) => ({
+      name: p.name,
+      type: p.type
+    })),
+    slots: component.slots.map((s) => ({
+      name: s.name,
+      isDefault: s.isDefault,
+      allowedComponents: [...s.allowedComponents ?? []].sort()
+    }))
+  };
+  return createHash2("sha256").update(JSON.stringify(payload)).digest("hex");
+}
+var init_input_hash = __esm({
+  "packages/experience-design-system-cli/src/session/core/components/input-hash.ts"() {
+    "use strict";
   }
-  kept.sort((a, b) => a.window.start - b.window.start);
-  const parts = kept.map((entry, index) => (index > 0 ? `
-${ELLIPSIS_MARKER}
-` : "") + entry.text);
-  const usesNotShown = names.filter((name, index) => cut.has(name) && names.indexOf(name) === index);
-  return { content: `${parts.join("")}
-${TRUNCATED_MARKER}`, usesNotShown };
+});
+
+// packages/experience-design-system-cli/src/session/core/tokens/input-hash.ts
+import { createHash as createHash3 } from "node:crypto";
+function computeTokenInputHash(rawTokenContent) {
+  return createHash3("sha256").update(rawTokenContent.trim()).digest("hex");
 }
-var ELLIPSIS_MARKER, TRUNCATED_MARKER;
-var init_source_excerpt = __esm({
-  "packages/experience-design-system-cli/src/session/source-excerpt.ts"() {
+var init_input_hash2 = __esm({
+  "packages/experience-design-system-cli/src/session/core/tokens/input-hash.ts"() {
     "use strict";
-    ELLIPSIS_MARKER = "/* \u2026 */";
-    TRUNCATED_MARKER = "/* truncated */";
   }
 });
 
@@ -8765,19 +8985,20 @@ __export(cache_keys_exports, {
   hashFile: () => hashFile,
   hashPromptForSkill: () => hashPromptForSkill
 });
-import { createHash } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 import { readFile as readFile6 } from "node:fs/promises";
 import { resolve as resolve6 } from "node:path";
 function hashContent(content) {
-  return createHash("sha256").update(content).digest("hex");
+  return createHash4("sha256").update(content).digest("hex");
 }
 async function hashFile(filePath) {
   const content = await readFile6(filePath, "utf8");
   return hashContent(content);
 }
-async function hashPromptForSkill(skill, agent, model, skillPathOverride) {
+async function hashPromptForSkill(skill, agent, model, skillPathOverride, extraInputs = []) {
   const promptHash = skillPathOverride ? await hashFile(resolve6(skillPathOverride)) : await hashFile(resolveSkillPath(skill));
-  return hashContent(`${promptHash}|${agent}|${model ?? ""}`);
+  const extraSegment = extraInputs.length > 0 ? `|${extraInputs.join("|")}` : "";
+  return hashContent(`${promptHash}|${agent}|${model ?? ""}${extraSegment}`);
 }
 var init_cache_keys = __esm({
   "packages/experience-design-system-cli/src/session/cache-keys.ts"() {
@@ -8790,7 +9011,7 @@ var init_cache_keys = __esm({
 import { DatabaseSync } from "node:sqlite";
 import { mkdirSync, readFileSync as readFileSync5 } from "node:fs";
 import { readFile as readFile7 } from "node:fs/promises";
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 import { homedir } from "node:os";
 import { dirname as dirname7, resolve as resolve7 } from "node:path";
 function getPipelineDbPath() {
@@ -9321,39 +9542,18 @@ function applyToolCalls(db, sessionId2, componentId, componentName, calls, incom
   }
   return { classified, excluded, slots, warnings };
 }
-function getOrCreateSession(db, sessionFlag, sessionName, _hints) {
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  if (sessionFlag === "new" || sessionFlag === void 0) {
-    const id = generateSessionId();
-    db.prepare("INSERT INTO sessions (id, name, created_at, updated_at) VALUES (?, ?, ?, ?)").run(
-      id,
-      sessionName ?? null,
-      now,
-      now
-    );
-    return { sessionId: id, isNew: true, isResumed: false };
-  }
-  const existing = db.prepare("SELECT id FROM sessions WHERE id = ?").get(sessionFlag);
-  if (!existing) {
-    throw new Error(`session '${sessionFlag}' not found. Run 'session list' to see active sessions.`);
-  }
-  return { sessionId: sessionFlag, isNew: false, isResumed: false };
+function getOrCreateSession(db, sessionFlag, sessionName, hints) {
+  return resolveSession(db, sessionFlag, sessionName, hints);
 }
 function createStep(db, sessionId2, command, inputs) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   db.exec("BEGIN");
   try {
-    db.prepare(
-      `UPDATE steps SET status = 'interrupted', completed_at = ?, updated_at = ?
-       WHERE session_id = ? AND command = ? AND status = 'pending'`
-    ).run(now, now, sessionId2, command);
-    const result = db.prepare(
-      `INSERT INTO steps (session_id, command, status, started_at, inputs, outputs, updated_at)
-         VALUES (?, ?, 'pending', ?, ?, '{}', ?)`
-    ).run(sessionId2, command, now, JSON.stringify(inputs), now);
-    db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId2);
+    markPendingStepsInterrupted(db, sessionId2, command, now);
+    const stepId = insertPendingStep(db, sessionId2, command, inputs, now);
+    touchSession(db, sessionId2, now);
     db.exec("COMMIT");
-    return Number(result.lastInsertRowid);
+    return stepId;
   } catch (e) {
     db.exec("ROLLBACK");
     throw e;
@@ -9363,12 +9563,10 @@ function updateStep(db, stepId, status, outputs, error) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   db.exec("BEGIN");
   try {
-    const step = db.prepare("SELECT session_id FROM steps WHERE id = ?").get(stepId);
-    db.prepare(
-      `UPDATE steps SET status = ?, completed_at = ?, outputs = ?, error = ?, updated_at = ? WHERE id = ?`
-    ).run(status, now, JSON.stringify(outputs), error ?? null, now, stepId);
-    if (step) {
-      db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, step.session_id);
+    const stepSessionId = findStepSessionId(db, stepId);
+    updateStepResult(db, stepId, status, outputs, error ?? null, now);
+    if (stepSessionId) {
+      touchSession(db, stepSessionId, now);
     }
     db.exec("COMMIT");
   } catch (e) {
@@ -9795,22 +9993,6 @@ function parseReviewReasons(raw) {
     return [];
   }
 }
-function groupBy(items, key) {
-  const map = /* @__PURE__ */ new Map();
-  for (const item of items) {
-    const k = key(item);
-    let arr = map.get(k);
-    if (!arr) {
-      arr = [];
-      map.set(k, arr);
-    }
-    arr.push(item);
-  }
-  return map;
-}
-function deriveComponentId(name, source) {
-  return createHash2("sha256").update(`${name}:${source}`).digest("hex").slice(0, 12);
-}
 function storeCDFComponents(db, sessionId2, components) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const updateComp = db.prepare(
@@ -9903,7 +10085,7 @@ function storeCDFComponents(db, sessionId2, components) {
           }
         }
       } else {
-        const componentId = createHash2("sha256").update(`${key}:generated`).digest("hex").slice(0, 12);
+        const componentId = deriveComponentId(key, "generated");
         db.prepare(
           `INSERT INTO raw_components (session_id, component_id, name, source, framework, extracted_at, status, description)
            VALUES (?, ?, ?, '', 'react', ?, 'generated', ?)`
@@ -10169,15 +10351,8 @@ function loadDTCGTokens(db, sessionId2) {
   });
   return { groups, tokens };
 }
-function findLatestSessionForCommand(db, command) {
-  const row = db.prepare(
-    `SELECT s.id FROM sessions s
-       JOIN steps st ON st.session_id = s.id
-       WHERE st.command = ? AND st.status = 'complete'
-       ORDER BY st.started_at DESC, st.id DESC
-       LIMIT 1`
-  ).get(command);
-  return row?.id ?? null;
+function findLatestSessionForCommand2(db, command) {
+  return findLatestSessionForCommand(db, command);
 }
 function seedCDFFromPreviewResponse(db, sessionId2, removedItems) {
   if (removedItems.length === 0) return 0;
@@ -10194,14 +10369,8 @@ function seedCDFFromPreviewResponse(db, sessionId2, removedItems) {
     const contentProps = new Set(item.contentProperties);
     const designProps = new Set(item.designProperties);
     for (const [propName, propSummary] of Object.entries(item.fullProperties)) {
-      const cdfType = mapServerTypeToCDFType(propSummary.type);
-      if (!cdfType) continue;
-      let cdfCategory = propSummary.category || null;
-      if (!cdfCategory || !["content", "design", "state"].includes(cdfCategory)) {
-        if (contentProps.has(propName)) cdfCategory = "content";
-        else if (designProps.has(propName)) cdfCategory = "design";
-        else cdfCategory = "state";
-      }
+      const cdfType = mapServerTypeToCdfType(propSummary.type);
+      const cdfCategory = resolveCdfCategory(propSummary.category, propName, contentProps, designProps);
       const result = updateStmt.run(cdfType, cdfCategory, sessionId2, localComponent.component_id, propName);
       totalSeeded += Number(result.changes);
     }
@@ -10231,14 +10400,8 @@ function seedDefaultsFromChangedItems(db, sessionId2, changedItems) {
         const result2 = updateDefaultStmt.run(defaultStr, sessionId2, localComponent.component_id, propName);
         totalSeeded += Number(result2.changes);
       }
-      const cdfType = mapServerTypeToCDFType(propSummary.type);
-      if (!cdfType) continue;
-      let cdfCategory = propSummary.category || null;
-      if (!cdfCategory || !["content", "design", "state"].includes(cdfCategory)) {
-        if (contentProps.has(propName)) cdfCategory = "content";
-        else if (designProps.has(propName)) cdfCategory = "design";
-        else cdfCategory = "state";
-      }
+      const cdfType = mapServerTypeToCdfType(propSummary.type);
+      const cdfCategory = resolveCdfCategory(propSummary.category, propName, contentProps, designProps);
       const result = updateCDFStmt.run(cdfType, cdfCategory, sessionId2, localComponent.component_id, propName);
       totalSeeded += Number(result.changes);
     }
@@ -10262,48 +10425,6 @@ function backfillUnclassifiedProps(db, sessionId2) {
   ).run(sessionId2, sessionId2);
   return Number(withCategory.changes) + Number(withoutCategory.changes);
 }
-function mapServerTypeToCDFType(serverType) {
-  switch (serverType.toLowerCase()) {
-    case "string":
-    case "text":
-      return "string";
-    case "richtext":
-      return "richtext";
-    case "media":
-      return "media";
-    case "link":
-      return "link";
-    case "enum":
-    case "symbol":
-      return "enum";
-    case "token":
-      return "token";
-    case "boolean":
-      return "boolean";
-    default:
-      return "string";
-  }
-}
-function computeComponentInputHash(component) {
-  const payload = {
-    framework: component.framework,
-    name: component.name,
-    source: component.source,
-    props: component.props.map((p) => ({
-      name: p.name,
-      type: p.type
-    })),
-    slots: component.slots.map((s) => ({
-      name: s.name,
-      isDefault: s.isDefault,
-      allowedComponents: [...s.allowedComponents ?? []].sort()
-    }))
-  };
-  return createHash2("sha256").update(JSON.stringify(payload)).digest("hex");
-}
-function computeTokenInputHash(rawTokenContent) {
-  return createHash2("sha256").update(rawTokenContent.trim()).digest("hex");
-}
 function computeMapTokensInputHash(db, sessionId2, componentSourceRefs = []) {
   const props = db.prepare(
     `SELECT rc.name AS component_name, rp.name AS prop_name, rp.cdf_token_kind, rp.default_value
@@ -10333,7 +10454,7 @@ function computeMapTokensInputHash(db, sessionId2, componentSourceRefs = []) {
       usesNotShown: [...ref.usesNotShown ?? []].sort()
     }))
   };
-  return createHash2("sha256").update(JSON.stringify(payload)).digest("hex");
+  return createHash5("sha256").update(JSON.stringify(payload)).digest("hex");
 }
 function lookupCache(db, inputHash, entityType, entityId, promptHash = "") {
   const row = db.prepare(
@@ -10641,8 +10762,19 @@ var SCHEMA, MAX_COMPONENT_SOURCE_CHARS, MAX_SIBLING_FILES, MAX_SIBLING_SNIPPET_C
 var init_db = __esm({
   "packages/experience-design-system-cli/src/session/db.ts"() {
     "use strict";
-    init_session_id();
     init_source_excerpt();
+    init_component_id();
+    init_server_type_map();
+    init_group_by();
+    init_read();
+    init_write();
+    init_read2();
+    init_write2();
+    init_session_resolver();
+    init_component_id();
+    init_input_hash();
+    init_input_hash2();
+    init_server_type_map();
     SCHEMA = `
 PRAGMA journal_mode = WAL;
 PRAGMA foreign_keys = ON;
@@ -10919,11 +11051,11 @@ var init_persistence = __esm({
 });
 
 // packages/experience-design-system-cli/src/analyze/select/parser.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 import { access as access2 } from "node:fs/promises";
 import { isAbsolute, relative, resolve as resolve9 } from "node:path";
 function createComponentId(name, resolvedSourcePath) {
-  const sourceHash = createHash3("sha256").update(`${name}:${resolvedSourcePath}`).digest("hex").slice(0, 12);
+  const sourceHash = createHash6("sha256").update(`${name}:${resolvedSourcePath}`).digest("hex").slice(0, 12);
   return `${name}-${sourceHash}`;
 }
 async function resolveComponentSourcePath(source, reviewRoot) {
@@ -12885,7 +13017,7 @@ var init_user_agent = __esm({
 
 // packages/experience-design-system-cli/src/apply/api-client.ts
 function defaultSleep(delayMs) {
-  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
+  return new Promise((resolve28) => setTimeout(resolve28, delayMs));
 }
 function isTransientStatus(status) {
   return status >= 500 && status <= 599;
@@ -13273,7 +13405,7 @@ ${trimmed}`;
             const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
             const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
             const jitter = Math.random() * baseDelay * 0.15;
-            await new Promise((resolve27) => setTimeout(resolve27, baseDelay + jitter));
+            await new Promise((resolve28) => setTimeout(resolve28, baseDelay + jitter));
           }
         }
         throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -16565,7 +16697,7 @@ var init_command2 = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/path-utils.ts
-import { resolve as resolve20 } from "node:path";
+import { resolve as resolve21 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 function expandTilde(input) {
   if (input === "~" || input.startsWith("~/") || input.startsWith("~\\")) {
@@ -16579,7 +16711,7 @@ function normalizePath(input) {
     p = p.slice(1, -1);
   }
   p = expandTilde(p);
-  return resolve20(p);
+  return resolve21(p);
 }
 var init_path_utils = __esm({
   "packages/experience-design-system-cli/src/import/path-utils.ts"() {
@@ -16587,9 +16719,74 @@ var init_path_utils = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/helpers/build-contentful-management-client.ts
+import { createClient as createClient2 } from "contentful-management";
+function buildContentfulManagementClient(opts) {
+  return createClient2(
+    {
+      accessToken: opts.cmaToken,
+      ...opts.host ? { host: toConfiguredHost(opts.host) } : {}
+    },
+    { type: "plain" }
+  );
+}
+var init_build_contentful_management_client = __esm({
+  "packages/experience-design-system-cli/src/helpers/build-contentful-management-client.ts"() {
+    "use strict";
+    init_host_utils();
+  }
+});
+
+// packages/experience-design-system-cli/src/helpers/fetch-existing-contentful-entities.ts
+import { fetchAll } from "contentful-management";
+async function fetchExistingContentfulEntitiesFromContentful(client2, params) {
+  const scope = { spaceId: params.spaceId, environmentId: params.environmentId, query: {} };
+  const components = await fetchAll(client2.component.getMany, scope);
+  const tokens = await fetchAll(client2.designToken.getMany, scope);
+  return { components, tokens };
+}
+var init_fetch_existing_contentful_entities = __esm({
+  "packages/experience-design-system-cli/src/helpers/fetch-existing-contentful-entities.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli/src/helpers/fetch-and-persist-existing-contentful-entities.ts
+import { writeFile as writeFile5 } from "node:fs/promises";
+import { join as join18 } from "node:path";
+async function fetchAndPersistExistingContentfulEntities(params) {
+  const t0 = Date.now();
+  try {
+    const client2 = buildContentfulManagementClient({
+      cmaToken: params.cmaToken,
+      ...params.host ? { host: params.host } : {}
+    });
+    const entities = await fetchExistingContentfulEntitiesFromContentful(client2, {
+      spaceId: params.spaceId,
+      environmentId: params.environmentId
+    });
+    const path = join18(params.outDir, ".existing-entities.json");
+    await writeFile5(path, JSON.stringify(entities, null, 2), "utf8");
+    return { ok: true, path, durationMs: Date.now() - t0, entities };
+  } catch (error) {
+    return {
+      ok: false,
+      durationMs: Date.now() - t0,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+var init_fetch_and_persist_existing_contentful_entities = __esm({
+  "packages/experience-design-system-cli/src/helpers/fetch-and-persist-existing-contentful-entities.ts"() {
+    "use strict";
+    init_build_contentful_management_client();
+    init_fetch_existing_contentful_entities();
+  }
+});
+
 // packages/experience-design-system-cli/src/runs/save-path-resolver.ts
 import { access as access8 } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 function isConflictMode(value) {
   return CONFLICT_MODES.includes(value);
 }
@@ -16597,7 +16794,7 @@ async function listConflictingFiles(path) {
   const conflicts = [];
   for (const name of SAVE_FILES) {
     try {
-      await access8(join19(path, name));
+      await access8(join20(path, name));
       conflicts.push(name);
     } catch {
     }
@@ -16617,7 +16814,7 @@ function buildTimestampedSubdir(base, now = /* @__PURE__ */ new Date()) {
   const hh = pad2(now.getHours());
   const mm = pad2(now.getMinutes());
   const ss = pad2(now.getSeconds());
-  return join19(base, `dsi-${y}${m}${d}-${hh}${mm}${ss}`);
+  return join20(base, `dsi-${y}${m}${d}-${hh}${mm}${ss}`);
 }
 async function resolveSavePath(path, options = {}) {
   const conflicts = await listConflictingFiles(path);
@@ -16647,8 +16844,8 @@ var init_save_path_resolver = __esm({
 });
 
 // packages/experience-design-system-cli/src/runs/store.ts
-import { readFile as readFile22, writeFile as writeFile6, mkdir as mkdir6, rename } from "node:fs/promises";
-import { join as join20 } from "node:path";
+import { readFile as readFile23, writeFile as writeFile6, mkdir as mkdir6, rename } from "node:fs/promises";
+import { join as join21 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 import { randomBytes as randomBytes2 } from "node:crypto";
 function runsFilePath() {
@@ -16691,7 +16888,7 @@ function migrateRecord(rec) {
 }
 async function readFileMaybe() {
   try {
-    const raw = await readFile22(RUNS_PATH, "utf8");
+    const raw = await readFile23(RUNS_PATH, "utf8");
     const parsed = JSON.parse(raw);
     if (!READABLE_VERSIONS.has(parsed.version)) {
       throw new Error(
@@ -16769,8 +16966,8 @@ var init_store = __esm({
     RUNS_FILE_VERSION = 3;
     RUNS_FILE_CAP = 200;
     READABLE_VERSIONS = /* @__PURE__ */ new Set([1, 2, 3]);
-    RUNS_DIR = join20(homedir7(), ".config", "experiences");
-    RUNS_PATH = join20(RUNS_DIR, "runs.json");
+    RUNS_DIR = join21(homedir7(), ".config", "experiences");
+    RUNS_PATH = join21(RUNS_DIR, "runs.json");
     CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
   }
 });
@@ -16834,7 +17031,7 @@ var init_run_teaser = __esm({
 import { useState as useState9, useEffect as useEffect3 } from "react";
 import { Box as Box20, Text as Text20 } from "ink";
 import { readdirSync as readdirSync3 } from "node:fs";
-import { dirname as dirname13, basename as basename6, join as join21 } from "node:path";
+import { dirname as dirname13, basename as basename6, join as join22 } from "node:path";
 import { jsx as jsx20, jsxs as jsxs20 } from "react/jsx-runtime";
 function autocomplete(partial) {
   if (!partial) return null;
@@ -16849,13 +17046,13 @@ function autocomplete(partial) {
   }
   const matches = entries.filter((e) => e.startsWith(base));
   if (matches.length === 0) return null;
-  if (matches.length === 1) return join21(dir, matches[0]);
+  if (matches.length === 1) return join22(dir, matches[0]);
   let prefix = matches[0];
   for (const m of matches) {
     while (!m.startsWith(prefix)) prefix = prefix.slice(0, -1);
     if (!prefix) break;
   }
-  return prefix.length > base.length ? join21(dir, prefix) : null;
+  return prefix.length > base.length ? join22(dir, prefix) : null;
 }
 function PathPrompt({
   defaultPath,
@@ -17286,15 +17483,15 @@ var init_save_conflict = __esm({
 });
 
 // packages/experience-design-system-cli/src/runs/fingerprint.ts
-import { createHash as createHash4 } from "node:crypto";
-import { readFile as readFile23, stat as stat5 } from "node:fs/promises";
-import { resolve as resolve22 } from "node:path";
+import { createHash as createHash7 } from "node:crypto";
+import { readFile as readFile24, stat as stat5 } from "node:fs/promises";
+import { resolve as resolve23 } from "node:path";
 function rowField(row, key) {
   const v = row[key];
   return typeof v === "string" ? v : null;
 }
 function sha256Hex(buf) {
-  return createHash4("sha256").update(buf).digest("hex");
+  return createHash7("sha256").update(buf).digest("hex");
 }
 async function buildSourceFingerprint(opts) {
   const rows = opts.db.prepare("SELECT name, source_path FROM raw_components WHERE session_id = ?").all(opts.extractSessionId);
@@ -17304,7 +17501,7 @@ async function buildSourceFingerprint(opts) {
     const sourcePath = rowField(row, "source_path");
     const name = rowField(row, "name");
     if (!sourcePath) continue;
-    const abs = resolve22(sourcePath);
+    const abs = resolve23(sourcePath);
     if (seen.has(abs)) continue;
     seen.add(abs);
     try {
@@ -17319,10 +17516,10 @@ async function buildSourceFingerprint(opts) {
   let rawTokensMtime = null;
   let rawTokensContentHash = null;
   if (opts.rawTokensPath) {
-    const abs = resolve22(opts.rawTokensPath);
+    const abs = resolve23(opts.rawTokensPath);
     rawTokensPath = abs;
     try {
-      const [st, buf] = await Promise.all([stat5(abs), readFile23(abs)]);
+      const [st, buf] = await Promise.all([stat5(abs), readFile24(abs)]);
       rawTokensMtime = st.mtime.toISOString();
       rawTokensContentHash = sha256Hex(buf);
     } catch {
@@ -17453,7 +17650,7 @@ var init_WelcomeStep = __esm({
 import { useState as useState13, useEffect as useEffect5 } from "react";
 import { Box as Box25, Text as Text25 } from "ink";
 import { promises as fs } from "node:fs";
-import { join as join22 } from "node:path";
+import { join as join23 } from "node:path";
 import { jsx as jsx25, jsxs as jsxs25 } from "react/jsx-runtime";
 async function countFiles(dir) {
   const counts = {
@@ -17477,7 +17674,7 @@ async function countFiles(dir) {
     await Promise.all(
       entries.map(async (entry) => {
         if (IGNORE_DIRS.has(entry)) return;
-        const full = join22(current, entry);
+        const full = join23(current, entry);
         let stat8;
         try {
           stat8 = await fs.stat(full);
@@ -17821,7 +18018,7 @@ __export(CredentialsStep_exports, {
 });
 import { useState as useState15, useEffect as useEffect7, useRef as useRef3 } from "react";
 import { Box as Box28, Text as Text28 } from "ink";
-import { jsx as jsx28, jsxs as jsxs28 } from "react/jsx-runtime";
+import { Fragment as Fragment9, jsx as jsx28, jsxs as jsxs28 } from "react/jsx-runtime";
 function CredentialsStep({
   summary,
   error: externalError,
@@ -17935,8 +18132,13 @@ function CredentialsStep({
       "\u2713 ",
       summary
     ] }),
-    /* @__PURE__ */ jsx28(Box28, { marginTop: 1, children: /* @__PURE__ */ jsx28(Text28, { children: initialSpaceId && initialCmaToken ? "Credentials pre-filled from experiences setup. Press Enter to continue or edit any field to update." : "Enter your Contentful credentials to continue." }) }),
-    !(initialSpaceId && initialCmaToken) && /* @__PURE__ */ jsx28(Text28, { dimColor: true, children: "Tip: run experiences setup to save these to ~/.config/experiences/credentials.json so they pre-fill here automatically." }),
+    /* @__PURE__ */ jsxs28(Box28, { flexDirection: "column", marginTop: 1, gap: 0, children: [
+      /* @__PURE__ */ jsx28(Text28, { children: initialSpaceId && initialCmaToken ? "Credentials pre-filled from experiences setup. Press Enter to continue or edit any field to update." : "Enter the Contentful space you want to import into." }),
+      !(initialSpaceId && initialCmaToken) && /* @__PURE__ */ jsxs28(Fragment9, { children: [
+        /* @__PURE__ */ jsx28(Text28, { dimColor: true, children: "These credentials are used both to align agent suggestions with what already exists in the space and to push your import at the end. Press S to skip and run without space context (push will be disabled)." }),
+        /* @__PURE__ */ jsx28(Text28, { dimColor: true, children: "Tip: run experiences setup to save these to ~/.config/experiences/credentials.json so they pre-fill here automatically." })
+      ] })
+    ] }),
     /* @__PURE__ */ jsxs28(Box28, { flexDirection: "column", gap: 0, marginTop: 1, children: [
       renderField("Space ID", spaceId, "spaceId"),
       renderField("Environment", environmentId, "environmentId"),
@@ -18134,7 +18336,7 @@ var init_preview_diff = __esm({
 // packages/experience-design-system-cli/src/import/tui/steps/WizardPreviewStep.tsx
 import { useState as useState16, useMemo as useMemo3 } from "react";
 import { Box as Box29, Text as Text29, useStdout as useStdout3 } from "ink";
-import { Fragment as Fragment9, jsx as jsx29, jsxs as jsxs29 } from "react/jsx-runtime";
+import { Fragment as Fragment10, jsx as jsx29, jsxs as jsxs29 } from "react/jsx-runtime";
 function buildPreviewDiffLines(preview) {
   const lines = [];
   const { components, tokens } = preview;
@@ -18311,7 +18513,7 @@ function WizardPreviewStep({
       ] }),
       /* @__PURE__ */ jsx29(Text29, { dimColor: true, children: "\u2500".repeat(40) })
     ] }),
-    hasAnything ? /* @__PURE__ */ jsxs29(Fragment9, { children: [
+    hasAnything ? /* @__PURE__ */ jsxs29(Fragment10, { children: [
       /* @__PURE__ */ jsx29(Text29, { children: "Here's what will happen in your space:" }),
       hasComponents && /* @__PURE__ */ jsxs29(Box29, { flexDirection: "column", gap: 0, children: [
         /* @__PURE__ */ jsx29(Box29, { gap: 1, marginTop: 1, children: /* @__PURE__ */ jsx29(Text29, { bold: true, dimColor: true, children: "ComponentTypes" }) }),
@@ -18477,7 +18679,7 @@ var init_WizardPreviewStep = __esm({
 
 // packages/experience-design-system-cli/src/import/tui/steps/DoneStep.tsx
 import { Box as Box30, Text as Text30 } from "ink";
-import { Fragment as Fragment10, jsx as jsx30, jsxs as jsxs30 } from "react/jsx-runtime";
+import { Fragment as Fragment11, jsx as jsx30, jsxs as jsxs30 } from "react/jsx-runtime";
 function DoneStep({
   componentTypes,
   designTokens,
@@ -18498,7 +18700,7 @@ function DoneStep({
   const totalPushed = componentTypes.created + componentTypes.updated + componentTypes.removed + designTokens.created + designTokens.updated + designTokens.removed;
   const success = totalFailed === 0;
   function EntityRows({ entity, label }) {
-    return /* @__PURE__ */ jsxs30(Fragment10, { children: [
+    return /* @__PURE__ */ jsxs30(Fragment11, { children: [
       entity.created > 0 && /* @__PURE__ */ jsxs30(Box30, { gap: 1, children: [
         /* @__PURE__ */ jsx30(Text30, { color: PALETTE.success, children: "\u2713" }),
         /* @__PURE__ */ jsxs30(Text30, { children: [
@@ -19103,9 +19305,9 @@ function spawnGenerateChild(opts) {
     stderr += chunk;
     opts.onStderr?.(chunk);
   });
-  const donePromise = new Promise((resolve27) => {
+  const donePromise = new Promise((resolve28) => {
     child.on("close", (code, signal) => {
-      resolve27({
+      resolve28({
         exitCode: code ?? 0,
         signal: signal ?? null,
         stdout,
@@ -19113,7 +19315,7 @@ function spawnGenerateChild(opts) {
       });
     });
     child.on("error", (err) => {
-      resolve27({
+      resolve28({
         exitCode: 1,
         signal: null,
         stdout,
@@ -20670,7 +20872,7 @@ var init_scope_gate_columns = __esm({
 // packages/experience-design-system-cli/src/import/tui/steps/ScopeGateStep.tsx
 import { Box as Box39, Text as Text41, useStdout as useStdout4 } from "ink";
 import React21, { useEffect as useEffect10, useMemo as useMemo5, useRef as useRef4, useState as useState21 } from "react";
-import { Fragment as Fragment11, jsx as jsx42, jsxs as jsxs41 } from "react/jsx-runtime";
+import { Fragment as Fragment12, jsx as jsx42, jsxs as jsxs41 } from "react/jsx-runtime";
 function capReasonForFocusedRow(reason, width) {
   const safeWidth = Math.max(20, width);
   const budget = safeWidth * FOCUSED_REASON_MAX_LINES;
@@ -21419,7 +21621,7 @@ function ScopeGateStep({
           graph
         }
       ),
-      columnPlan.layout === "three-column" && /* @__PURE__ */ jsxs41(Fragment11, { children: [
+      columnPlan.layout === "three-column" && /* @__PURE__ */ jsxs41(Fragment12, { children: [
         /* @__PURE__ */ jsx42(Box39, { width: 2, flexShrink: 0 }),
         /* @__PURE__ */ jsx42(
           AddedComponentsColumn,
@@ -21594,7 +21796,7 @@ function AddedComponentsColumn(props) {
       borderColor: focused ? PALETTE.inverse : void 0,
       children: [
         /* @__PURE__ */ jsx42(ColumnHeader, { title: "Added components", width, focused }),
-        entries.length === 0 ? /* @__PURE__ */ jsx42(Text41, { dimColor: true, children: "(none)" }) : /* @__PURE__ */ jsxs41(Fragment11, { children: [
+        entries.length === 0 ? /* @__PURE__ */ jsx42(Text41, { dimColor: true, children: "(none)" }) : /* @__PURE__ */ jsxs41(Fragment12, { children: [
           window.above > 0 && /* @__PURE__ */ jsx42(Text41, { dimColor: true, children: `\u2191 ${window.above} more` }),
           entries.slice(window.start, window.end).map((entry, vi) => {
             const i = window.start + vi;
@@ -21657,7 +21859,7 @@ function AddedGroupsColumn(props) {
       borderColor: focused ? PALETTE.inverse : void 0,
       children: [
         /* @__PURE__ */ jsx42(ColumnHeader, { title: "Added groups", width, focused }),
-        entries.length === 0 ? /* @__PURE__ */ jsx42(Text41, { dimColor: true, children: "(none)" }) : /* @__PURE__ */ jsxs41(Fragment11, { children: [
+        entries.length === 0 ? /* @__PURE__ */ jsx42(Text41, { dimColor: true, children: "(none)" }) : /* @__PURE__ */ jsxs41(Fragment12, { children: [
           window.above > 0 && /* @__PURE__ */ jsx42(Text41, { dimColor: true, children: `\u2191 ${window.above} more` }),
           entries.slice(window.start, window.end).map((g, vi) => {
             const i = window.start + vi;
@@ -22363,7 +22565,7 @@ import {
   CDF_PROPERTY_CATEGORIES,
   DESIGN_TOKEN_TYPES as DESIGN_TOKEN_TYPES2
 } from "@contentful/experience-design-system-types";
-import { Fragment as Fragment12, jsx as jsx45, jsxs as jsxs44 } from "react/jsx-runtime";
+import { Fragment as Fragment13, jsx as jsx45, jsxs as jsxs44 } from "react/jsx-runtime";
 function parseToState(json) {
   let parsed;
   try {
@@ -22565,7 +22767,7 @@ function PropRow({
       activeField === "category" && /* @__PURE__ */ jsx45(Picker, { value: prop.category, active: true }),
       /* @__PURE__ */ jsx45(Text44, { dimColor: !selected, children: "req:" }),
       activeField === "required" ? /* @__PURE__ */ jsx45(Toggle, { value: prop.required, active: true }) : /* @__PURE__ */ jsx45(Toggle, { value: prop.required, active: false }),
-      prop.type === "enum" && /* @__PURE__ */ jsxs44(Fragment12, { children: [
+      prop.type === "enum" && /* @__PURE__ */ jsxs44(Fragment13, { children: [
         /* @__PURE__ */ jsx45(Text44, { dimColor: !selected, children: "values:" }),
         /* @__PURE__ */ jsxs44(Text44, { color: selected ? PALETTE.warning : PALETTE.inverse, children: [
           "[",
@@ -22573,7 +22775,7 @@ function PropRow({
           "]"
         ] })
       ] }),
-      prop.type === "token" && /* @__PURE__ */ jsxs44(Fragment12, { children: [
+      prop.type === "token" && /* @__PURE__ */ jsxs44(Fragment13, { children: [
         /* @__PURE__ */ jsx45(Text44, { dimColor: !selected, children: "kind:" }),
         activeField === "tokenKind" ? /* @__PURE__ */ jsx45(Picker, { value: prop.tokenKind || DESIGN_TOKEN_TYPES2[0], active: true }) : /* @__PURE__ */ jsx45(Text44, { color: selected ? PALETTE.success : PALETTE.inverse, children: prop.tokenKind || "\u2014" })
       ] })
@@ -23778,7 +23980,7 @@ var init_cycle_panel_scroll = __esm({
 
 // packages/experience-design-system-cli/src/analyze/select/tui/components/RationalePanel.tsx
 import { Box as Box43, Text as Text45 } from "ink";
-import { Fragment as Fragment13, jsx as jsx46, jsxs as jsxs45 } from "react/jsx-runtime";
+import { Fragment as Fragment14, jsx as jsx46, jsxs as jsxs45 } from "react/jsx-runtime";
 function wrapText(text, innerWidth) {
   if (!text) return [""];
   const width = Math.max(1, innerWidth);
@@ -23858,7 +24060,7 @@ function RationalePanel({
       children: [
         /* @__PURE__ */ jsxs45(Box43, { children: [
           /* @__PURE__ */ jsx46(Text45, { bold: true, dimColor: !active, children: `RATIONALE \u2014 ${componentName}` }),
-          overflowed && /* @__PURE__ */ jsxs45(Fragment13, { children: [
+          overflowed && /* @__PURE__ */ jsxs45(Fragment14, { children: [
             /* @__PURE__ */ jsx46(Box43, { flexGrow: 1 }),
             /* @__PURE__ */ jsx46(Text45, { dimColor: !active, children: `\u2195 ${visibleStart}-${visibleEnd}/${totalLines}` })
           ] })
@@ -24582,7 +24784,7 @@ var init_history = __esm({
 // packages/experience-design-system-cli/src/import/tui/steps/GenerateReviewStep.tsx
 import { useEffect as useEffect13, useMemo as useMemo7, useRef as useRef7, useState as useState26 } from "react";
 import { Box as Box46, Text as Text48, useStdout as useStdout6 } from "ink";
-import { Fragment as Fragment14, jsx as jsx49, jsxs as jsxs48 } from "react/jsx-runtime";
+import { Fragment as Fragment15, jsx as jsx49, jsxs as jsxs48 } from "react/jsx-runtime";
 function sortComponentsForSidebar2(components, cycleParticipants) {
   const isEmpty2 = (entry) => Object.keys(entry.$properties ?? {}).length === 0 && Object.keys(entry.$slots ?? {}).length === 0;
   const tier = (c2) => {
@@ -25976,7 +26178,7 @@ function GenerateReviewStep({
         const isCursor = idx === breakCursor;
         return /* @__PURE__ */ jsx49(Text48, { inverse: isCursor, children: `${isCursor ? "\u25B6" : " "} remove '${edge.toComponent}' from ${edge.fromComponent}.$slots.${edge.slotName}.$allowedComponents` }, `break-${idx}`);
       }),
-      breakConfirm ? /* @__PURE__ */ jsxs48(Fragment14, { children: [
+      breakConfirm ? /* @__PURE__ */ jsxs48(Fragment15, { children: [
         /* @__PURE__ */ jsx49(Text48, { children: " " }),
         /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.warning, children: "Delete this slot edge? [y] confirm  [n] cancel" })
       ] }) : /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: "[\u2191\u2193/j/k] move  [Enter] delete  [x/Esc] close" })
@@ -26058,7 +26260,7 @@ function GenerateReviewStep({
     ] }),
     removedComponents.length > 0 && !dialogOpen && /* @__PURE__ */ jsxs48(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.error, paddingX: 1, children: [
       /* @__PURE__ */ jsx49(Text48, { bold: true, color: PALETTE.error, children: removedComponentsHeader(removedComponents.length, true) }),
-      !removedBannerCollapsed && /* @__PURE__ */ jsxs48(Fragment14, { children: [
+      !removedBannerCollapsed && /* @__PURE__ */ jsxs48(Fragment15, { children: [
         /* @__PURE__ */ jsx49(Text48, { children: " " }),
         removedComponents.map((rc) => /* @__PURE__ */ jsx49(Text48, { children: removedComponentLine(rc) }, rc.id))
       ] })
@@ -26235,7 +26437,7 @@ function GenerateReviewStep({
           graph: sidebarGraph
         }
       ),
-      /* @__PURE__ */ jsx49(Box46, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs48(Fragment14, { children: [
+      /* @__PURE__ */ jsx49(Box46, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs48(Fragment15, { children: [
         /* @__PURE__ */ jsxs48(Box46, { children: [
           /* @__PURE__ */ jsx49(Text48, { bold: true, children: selected.key }),
           /* @__PURE__ */ jsx49(Box46, { flexGrow: 1 }),
@@ -26404,11 +26606,11 @@ function GenerateReviewStep({
       autocompleteCandidates.length > 1 && /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `  possibilities: ${autocompleteCandidates.join(" \xB7 ").slice(0, 120)}` })
     ] }),
     !dialogOpen && !searchOpen && searchQuery && /* @__PURE__ */ jsx49(Box46, { children: /* @__PURE__ */ jsx49(Text48, { dimColor: true, children: `/${searchQuery}  (${searchMatchCount}/${components.length} matches) \xB7 [Esc] clear` }) }),
-    !dialogOpen && sidebarFocused && /* @__PURE__ */ jsx49(Box46, { columnGap: 2, flexWrap: "wrap", children: panelOpen === "token-review" ? /* @__PURE__ */ jsxs48(Fragment14, { children: [
+    !dialogOpen && sidebarFocused && /* @__PURE__ */ jsx49(Box46, { columnGap: 2, flexWrap: "wrap", children: panelOpen === "token-review" ? /* @__PURE__ */ jsxs48(Fragment15, { children: [
       legendEntry("[\u2191/\u2193]", "move"),
       legendEntry("[Enter]", "edit allowed"),
       legendEntry("[Esc]", "close")
-    ] }) : /* @__PURE__ */ jsxs48(Fragment14, { children: [
+    ] }) : /* @__PURE__ */ jsxs48(Fragment15, { children: [
       legendEntry("[j/k]", "move"),
       legendEntry("[a]", "accept"),
       legendEntry("[r]", "reject"),
@@ -26576,7 +26778,7 @@ var init_GenerateReviewStep = __esm({
 // packages/experience-design-system-cli/src/import/tui/steps/AtomicGenerateReviewStep.tsx
 import { useEffect as useEffect14, useRef as useRef8, useState as useState27 } from "react";
 import { Box as Box47, Text as Text49, useStdout as useStdout7 } from "ink";
-import { Fragment as Fragment15, jsx as jsx50, jsxs as jsxs49 } from "react/jsx-runtime";
+import { Fragment as Fragment16, jsx as jsx50, jsxs as jsxs49 } from "react/jsx-runtime";
 function sortComponentsForSidebar3(components) {
   return [...components].sort((a, b) => {
     const aEmpty = Object.keys(a.entry.$properties ?? {}).length === 0;
@@ -27301,7 +27503,7 @@ function AtomicGenerateReviewStep({
           width: sidebarWidth
         }
       ),
-      /* @__PURE__ */ jsx50(Box47, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs49(Fragment15, { children: [
+      /* @__PURE__ */ jsx50(Box47, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: selected ? /* @__PURE__ */ jsxs49(Fragment16, { children: [
         /* @__PURE__ */ jsxs49(Box47, { children: [
           /* @__PURE__ */ jsx50(Text49, { bold: true, children: selected.key }),
           /* @__PURE__ */ jsx50(Box47, { flexGrow: 1 }),
@@ -27656,9 +27858,9 @@ __export(WizardApp_exports, {
 });
 import { useEffect as useEffect15, useRef as useRef9, useState as useState28 } from "react";
 import { Box as Box49, Text as Text51, useStdout as useStdout8 } from "ink";
-import { join as join23, resolve as resolve23 } from "node:path";
+import { join as join24, resolve as resolve24 } from "node:path";
 import { appendFileSync as appendFileSync2, writeFileSync } from "node:fs";
-import { access as access9, readFile as readFile24, stat as stat6 } from "node:fs/promises";
+import { access as access9, readFile as readFile25, stat as stat6 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { execFile as execFile4, spawn as spawn4 } from "node:child_process";
 import { mkdir as mkdir7 } from "node:fs/promises";
@@ -27670,6 +27872,7 @@ function buildSelectAgentArgs(opts) {
   if (opts.bedrock) args.push("--bedrock");
   if (opts.selectPromptPath) args.push("--select-prompt-path", opts.selectPromptPath);
   if (opts.noCache) args.push("--no-cache");
+  if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
 function parseAutoFilterProgressLine(line) {
@@ -27706,6 +27909,7 @@ function buildGenerateComponentsArgs(opts) {
   if (opts.bedrock) args.push("--bedrock");
   if (opts.noCache) args.push("--no-cache");
   if (opts.generatePromptPath) args.push("--generate-prompt-path", opts.generatePromptPath);
+  if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
 function buildMapTokensArgs(opts) {
@@ -27713,6 +27917,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");
+  if (opts.existingEntitiesPath) args.push("--existing-entities-path", opts.existingEntitiesPath);
   return args;
 }
 function shouldRunMapTokens(opts) {
@@ -27802,8 +28007,8 @@ function WizardApp({
   const rawTokensEntryReady = !modifyEntryReady && !pushFromPickerReady && !!initialRawTokensPath;
   const effectiveNoCache = resolveNoCacheForGenerate({ cliNoCache: noCache });
   const initialStepResolved = modifyEntryReady ? "final-review" : pushFromPickerReady ? "push-from-picker" : rawTokensEntryReady ? "generating-tokens" : initialProjectPath ? "token-input" : "welcome";
-  const initialOutDir = initialProjectPath ? join23(resolve23(initialProjectPath), ".contentful") : "";
-  const initialTokensPath = (modifyEntryReady || pushFromPickerReady) && initialOutDir && seedTokenSessionId ? join23(initialOutDir, "tokens.json") : "";
+  const initialOutDir = initialProjectPath ? join24(resolve24(initialProjectPath), ".contentful") : "";
+  const initialTokensPath = (modifyEntryReady || pushFromPickerReady) && initialOutDir && seedTokenSessionId ? join24(initialOutDir, "tokens.json") : "";
   const [state, setState] = useState28({
     step: modifyEntryReady || rawTokensEntryReady || pushFromPickerReady ? initialStepResolved : initialRuns && initialRuns.length > 0 ? "run-picker" : initialStepResolved,
     agent: initialAgent ?? "claude",
@@ -27856,6 +28061,7 @@ function WizardApp({
     generatePrefetchError: null,
     mapTokensEligible: null,
     credentialsSkipped: false,
+    existingEntitiesPath: null,
     lastRunId: null,
     finalizeErrorBanner: null,
     finalReviewPassed: modifyEntryReady || pushFromPickerReady,
@@ -27970,7 +28176,7 @@ If you are using AWS Bedrock, run:
     }
     const sessionMatch = /^session=(.+)$/m.exec(result.stdout);
     const tokenSessionId = sessionMatch ? sessionMatch[1].trim() : null;
-    const tokensPath = join23(outDir, "tokens.json");
+    const tokensPath = join24(outDir, "tokens.json");
     const printArgs = ["print", "tokens", "--out", tokensPath];
     if (tokenSessionId) printArgs.push("--session", tokenSessionId);
     const r = await runCli2(printArgs);
@@ -27990,7 +28196,7 @@ If you are using AWS Bedrock, run:
         tokenCount,
         skipComponents: true,
         acceptedCount: 0,
-        outDir: state.outDir || join23(process.cwd(), ".contentful")
+        outDir: state.outDir || join24(process.cwd(), ".contentful")
       });
       if (noPush) {
         void startSaveFlow();
@@ -28042,7 +28248,8 @@ If you are using AWS Bedrock, run:
       agent: state.agent,
       ...state.agentModel ? { model: state.agentModel } : {},
       noCache: effectiveNoCache,
-      skipAgent: skipMapTokens
+      skipAgent: skipMapTokens,
+      ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
     });
     const result = await runCli2(args);
     if (result.exitCode !== 0) {
@@ -28056,7 +28263,7 @@ If you are using AWS Bedrock, run:
     return true;
   };
   const runExtract = async (projectPath) => {
-    const outDir = join23(resolve23(projectPath), ".contentful");
+    const outDir = join24(resolve24(projectPath), ".contentful");
     update({ step: "extracting", outDir, extractProgress: null, compositionPhase: null });
     const r = await new Promise((res) => {
       const extractArgs = [findCliPath(), "analyze", "extract", "--project", projectPath];
@@ -28163,7 +28370,8 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         ...state.agentModel ? { model: state.agentModel } : {},
         ...state.bedrock ? { bedrock: true } : {},
         selectPromptPath,
-        noCache
+        noCache,
+        ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
       });
       const child = spawn4("node", [findCliPath(), ...args]);
       autoFilterChildRef.current = child;
@@ -28261,7 +28469,8 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
         ...state.bedrock ? { bedrock: true } : {},
-        noCache: effectiveNoCache
+        noCache: effectiveNoCache,
+        ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
       })
     ];
     let progressCursor = null;
@@ -28332,7 +28541,8 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         ...state.agentModel ? { model: state.agentModel } : {},
         ...state.bedrock ? { bedrock: true } : {},
         noCache: effectiveNoCache,
-        generatePromptPath
+        generatePromptPath,
+        ...state.existingEntitiesPath ? { existingEntitiesPath: state.existingEntitiesPath } : {}
       })
     ];
     let progressCursor = state.generateProgress;
@@ -28372,7 +28582,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     if (await runMapTokens2(mappedSessionId)) update({ step: "final-review" });
   };
   const advanceToPushFlow = (generatedAcceptedCount) => {
-    update({ generatedAcceptedCount, step: "credentials" });
+    update({ generatedAcceptedCount, step: "push-decision-gate" });
   };
   const runEditFromPreview = async () => {
     update({ step: "final-review" });
@@ -28443,6 +28653,24 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     }
   };
   const advanceAfterCredentialsValidated = async () => {
+    if (!state.credentialsSkipped && state.spaceId && state.environmentId && state.cmaToken && state.projectPath) {
+      const outDir = join24(resolve24(state.projectPath), ".contentful");
+      await mkdir7(outDir, { recursive: true });
+      const result = await fetchAndPersistExistingContentfulEntities({
+        spaceId: state.spaceId,
+        environmentId: state.environmentId,
+        cmaToken: state.cmaToken,
+        ...state.host ? { host: state.host } : {},
+        outDir
+      });
+      if (result.ok) {
+        update({ existingEntitiesPath: result.path });
+      }
+    }
+    if (!sessionRef.current.extractSessionId && state.projectPath) {
+      void runExtract(state.projectPath);
+      return;
+    }
     if (shouldSkipFinalReviewAfterCredentials(state)) {
       update({ step: "push-decision-gate" });
       return;
@@ -28798,7 +29026,7 @@ If using a custom --host, make sure the space exists on that host.`
   };
   const runPrintFiles = async (extractSessionId, outDir, opts = {}) => {
     update({ step: "printing" });
-    const componentsPath = join23(outDir, "components.json");
+    const componentsPath = join24(outDir, "components.json");
     const printArgs = ["print", "components", "--out", componentsPath];
     if (extractSessionId) printArgs.push("--session", extractSessionId);
     if (opts.allowEmpty) printArgs.push("--allow-empty");
@@ -28814,7 +29042,7 @@ If using a custom --host, make sure the space exists on that host.`
     let emittedTokensPath;
     let emittedTokenCount;
     if (opts.tokenSessionId) {
-      const tokensOut = join23(outDir, "tokens.json");
+      const tokensOut = join24(outDir, "tokens.json");
       const tokenArgs = ["print", "tokens", "--out", tokensOut, "--session", opts.tokenSessionId];
       const tr = await runCli2(tokenArgs);
       if (tr.exitCode !== 0) {
@@ -28901,8 +29129,8 @@ If using a custom --host, make sure the space exists on that host.`
           );
         }
         try {
-          const componentsBuf = await readFile24(join23(path, "components.json")).catch(() => null);
-          const tokensBuf = recordedTokensPath ? await readFile24(recordedTokensPath).catch(() => null) : null;
+          const componentsBuf = await readFile25(join24(path, "components.json")).catch(() => null);
+          const tokensBuf = recordedTokensPath ? await readFile25(recordedTokensPath).catch(() => null) : null;
           savedFingerprint = buildSavedFingerprint({
             componentsJson: componentsBuf,
             tokensJson: tokensBuf
@@ -28943,7 +29171,7 @@ If using a custom --host, make sure the space exists on that host.`
     if (state.step === "generating-tokens") {
       if (tokenReuseChecked.current) return;
       tokenReuseChecked.current = true;
-      const existingTokensPath = join23(state.outDir, "tokens.json");
+      const existingTokensPath = join24(state.outDir, "tokens.json");
       (async () => {
         try {
           await access9(existingTokensPath);
@@ -29019,7 +29247,7 @@ If using a custom --host, make sure the space exists on that host.`
           {
             onContinue: (path) => {
               const projectPath = normalizePath(path);
-              const outDir = join23(projectPath, ".contentful");
+              const outDir = join24(projectPath, ".contentful");
               update({ step: "token-input", projectPath, outDir });
             },
             onQuit: () => process.exit(0)
@@ -29084,7 +29312,7 @@ If using a custom --host, make sure the space exists on that host.`
           {
             projectPath: state.projectPath,
             onConfirm: (path) => {
-              void runExtract(path);
+              update({ projectPath: path, step: "credentials" });
             },
             onSkipComponents: () => {
               if (noPush) {
@@ -29168,12 +29396,7 @@ If using a custom --host, make sure the space exists on that host.`
                     }
                     return;
                   }
-                  if (acceptedCount > 0 && !noPush) {
-                    if (await runAgentAuthCheck("credentials")) {
-                      startGeneratePrefetch(sid, state.tokensPath);
-                    }
-                  }
-                  update({ step: "credentials" });
+                  update({ step: "push-decision-gate" });
                 },
                 onAdvanceToPushFlow: (count) => {
                   update({ acceptedCount: count, autoRejectedCount: 0 });
@@ -29644,10 +29867,11 @@ var init_WizardApp = __esm({
     init_path_utils();
     init_host_utils();
     init_credentials_store();
+    init_fetch_and_persist_existing_contentful_entities();
     init_wizard_state_transitions();
     init_cycle_auto_reject();
     init_cli_path();
-    WIZARD_LOG = join23(tmpdir(), "experiences-import-wizard.log");
+    WIZARD_LOG = join24(tmpdir(), "experiences-import-wizard.log");
   }
 });
 
@@ -29658,8 +29882,8 @@ __export(staleness_exports, {
   formatStalenessDetail: () => formatStalenessDetail,
   shortStalenessSummary: () => shortStalenessSummary
 });
-import { readFile as readFile25, stat as stat7 } from "node:fs/promises";
-import { join as join24 } from "node:path";
+import { readFile as readFile26, stat as stat7 } from "node:fs/promises";
+import { join as join25 } from "node:path";
 async function checkRunStaleness(run) {
   if (!run.sourceFingerprint) return { ...UNKNOWN };
   const result = {
@@ -29685,7 +29909,7 @@ async function checkRunStaleness(run) {
   if (run.sourceFingerprint.rawTokensPath) {
     const absPath = run.sourceFingerprint.rawTokensPath;
     try {
-      const [st, buf] = await Promise.all([stat7(absPath), readFile25(absPath)]);
+      const [st, buf] = await Promise.all([stat7(absPath), readFile26(absPath)]);
       const mtime = st.mtime.toISOString();
       const hash = sha256Hex(buf);
       const mtimeChanged = run.sourceFingerprint.rawTokensMtime !== null && mtime !== run.sourceFingerprint.rawTokensMtime;
@@ -29701,9 +29925,9 @@ async function checkRunStaleness(run) {
   }
   if (run.savedFingerprint) {
     if (run.savedFingerprint.componentsJsonHash !== null) {
-      const compPath = join24(run.savePath, "components.json");
+      const compPath = join25(run.savePath, "components.json");
       try {
-        const buf = await readFile25(compPath);
+        const buf = await readFile26(compPath);
         if (sha256Hex(buf) !== run.savedFingerprint.componentsJsonHash) {
           result.savedComponentsEdited = true;
           result.stale = true;
@@ -29714,9 +29938,9 @@ async function checkRunStaleness(run) {
       }
     }
     if (run.savedFingerprint.tokensJsonHash !== null) {
-      const tokensPath = run.tokensPath ?? join24(run.savePath, "tokens.json");
+      const tokensPath = run.tokensPath ?? join25(run.savePath, "tokens.json");
       try {
-        const buf = await readFile25(tokensPath);
+        const buf = await readFile26(tokensPath);
         if (sha256Hex(buf) !== run.savedFingerprint.tokensJsonHash) {
           result.savedTokensEdited = true;
           result.stale = true;
@@ -29783,7 +30007,7 @@ async function promptForPushCredentials(opts = {}) {
   const { render: render7, Box: Box50, Text: Text52 } = await import("ink");
   const { useState: useState29 } = await import("react");
   const { CredentialsStep: CredentialsStep2 } = await Promise.resolve().then(() => (init_CredentialsStep(), CredentialsStep_exports));
-  return new Promise((resolve27, reject) => {
+  return new Promise((resolve28, reject) => {
     let app = null;
     function App2() {
       const [done, setDone] = useState29(false);
@@ -29792,7 +30016,7 @@ async function promptForPushCredentials(opts = {}) {
         setDone(true);
         queueMicrotask(() => {
           app?.unmount();
-          resolve27({ spaceId, environmentId, cmaToken, host });
+          resolve28({ spaceId, environmentId, cmaToken, host });
         });
       };
       if (done) {
@@ -29824,14 +30048,14 @@ var init_push_creds_prompt = __esm({
 // packages/experience-design-system-cli/src/program.ts
 import { spawn as spawn6 } from "node:child_process";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
-import { dirname as dirname14, join as join27, resolve as resolve26 } from "node:path";
+import { dirname as dirname14, join as join28, resolve as resolve27 } from "node:path";
 import { readFileSync as readFileSync10 } from "node:fs";
 import { Command } from "commander";
 
 // packages/experience-design-system-cli/src/analyze/command.ts
 import { createElement as createElement3 } from "react";
 import { render as render3 } from "ink";
-import { mkdir as mkdir3, readdir as readdir2, readFile as readFile16, stat as stat2, writeFile as writeFile3 } from "node:fs/promises";
+import { mkdir as mkdir3, readdir as readdir2, readFile as readFile17, stat as stat2, writeFile as writeFile3 } from "node:fs/promises";
 import { isAbsolute as isAbsolute4, join as join15, relative as relative3, resolve as resolve15 } from "node:path";
 
 // packages/experience-design-system-cli/src/lib/agent-model-options.ts
@@ -29958,6 +30182,104 @@ init_command2();
 // packages/experience-design-system-cli/src/analyze/select-agent/command.ts
 init_db();
 init_cache_keys();
+
+// packages/experience-design-system-cli/src/helpers/read-existing-contentful-entities-from-session.ts
+import { readFile as readFile13 } from "node:fs/promises";
+async function readExistingContentfulEntitiesFromSession(path) {
+  if (!path) return void 0;
+  try {
+    const raw = await readFile13(path, "utf8");
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed.components) || !Array.isArray(parsed.tokens)) return void 0;
+    return parsed;
+  } catch {
+    return void 0;
+  }
+}
+
+// packages/experience-design-system-cli/src/helpers/find-nearly-matching-component.ts
+var MAX_CHARACTER_EDITS_FOR_LIKELY_MATCH = 2;
+function findNearlyMatchingComponent(components, codebaseName) {
+  const target = simplifyNameForComparison(codebaseName);
+  if (!target) return void 0;
+  let best;
+  for (const c2 of components) {
+    const edits = countCharacterEdits(target, simplifyNameForComparison(c2.name));
+    if (edits > MAX_CHARACTER_EDITS_FOR_LIKELY_MATCH) continue;
+    if (!best || edits < best.edits) best = { component: c2, edits };
+    if (edits === 0) break;
+  }
+  return best?.component;
+}
+function simplifyNameForComparison(name) {
+  const stripped = name.toLowerCase().replace(/[^a-z0-9]/g, "");
+  return stripped.endsWith("s") && stripped.length > 1 ? stripped.slice(0, -1) : stripped;
+}
+function countCharacterEdits(a, b) {
+  if (a === b) return 0;
+  if (a.length === 0) return b.length;
+  if (b.length === 0) return a.length;
+  if (a.length > b.length) [a, b] = [b, a];
+  let prev = new Array(a.length + 1);
+  let curr = new Array(a.length + 1);
+  for (let i = 0; i <= a.length; i++) prev[i] = i;
+  for (let j = 1; j <= b.length; j++) {
+    curr[0] = j;
+    for (let i = 1; i <= a.length; i++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+      curr[i] = Math.min(curr[i - 1] + 1, prev[i] + 1, prev[i - 1] + cost);
+    }
+    [prev, curr] = [curr, prev];
+  }
+  return prev[a.length];
+}
+
+// packages/experience-design-system-cli/src/helpers/summarize-existing-contentful-entities.ts
+function summarizeForSelectAgent(entities) {
+  return {
+    components: entities.components.map((c2) => ({
+      id: c2.sys.id,
+      name: c2.name,
+      description: c2.description
+    })),
+    tokens: summarizeTokens(entities.tokens)
+  };
+}
+function summarizeForGenerateAgent(entities, codebaseComponentName) {
+  const match2 = findNearlyMatchingComponent(entities.components, codebaseComponentName);
+  const otherComponents = entities.components.filter((c2) => c2.sys.id !== match2?.sys.id).map((c2) => ({ id: c2.sys.id, name: c2.name }));
+  return {
+    likelyMatch: match2 ? {
+      id: match2.sys.id,
+      name: match2.name,
+      designProperties: match2.designProperties.map((p) => ({
+        id: p.id,
+        name: p.name,
+        type: p.type
+      })),
+      contentProperties: match2.contentProperties.map((p) => ({
+        id: p.id,
+        name: p.name,
+        type: p.type
+      })),
+      slots: (match2.slots ?? []).map((s) => ({ id: s.id, name: s.name }))
+    } : void 0,
+    otherComponents,
+    tokens: summarizeTokens(entities.tokens)
+  };
+}
+function summarizeForMapTokens(entities) {
+  return {
+    tokens: entities.tokens.map((t) => ({ id: t.sys.id, name: t.name, type: t.type }))
+  };
+}
+function summarizeTokens(tokens) {
+  const kinds = /* @__PURE__ */ new Set();
+  for (const t of tokens) kinds.add(t.type);
+  return { count: tokens.length, kinds: [...kinds].sort() };
+}
+
+// packages/experience-design-system-cli/src/analyze/select-agent/command.ts
 init_persistence();
 init_parser();
 init_src();
@@ -30059,7 +30381,7 @@ var OutputFormatter = class {
 };
 
 // packages/experience-design-system-cli/src/analyze/select-agent/context-builder.ts
-import { readFile as readFile13 } from "node:fs/promises";
+import { readFile as readFile14 } from "node:fs/promises";
 import { dirname as dirname10, isAbsolute as isAbsolute2, join as join13, relative as relative2, resolve as resolve11, sep } from "node:path";
 var SCANNED_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".astro", ".js", ".jsx", ".svelte", ".ts", ".tsx", ".vue"]);
 var IMPORT_PATTERN2 = /import\s+(?:type\s+)?(.+?)\s+from\s+['"]([^'"]+)['"]/g;
@@ -30188,7 +30510,7 @@ async function buildRepoContextIndex(root, filePaths) {
         absolutePath,
         relativePath: toPosixPath(relative2(resolvedRoot, absolutePath)),
         directory: dirname10(absolutePath),
-        text: await readFile13(absolutePath, "utf8").catch(() => "")
+        text: await readFile14(absolutePath, "utf8").catch(() => "")
       })
     )
   );
@@ -30255,7 +30577,7 @@ function resolveRationaleSession(sessionFlag, dbPath) {
       }
       return sessionFlag;
     }
-    const latest = findLatestSessionForCommand(db, "analyze select");
+    const latest = findLatestSessionForCommand2(db, "analyze select");
     if (!latest) {
       throw new Error(
         `No completed 'analyze select' session found. Run 'analyze select-agent' first, or pass --session <id>.`
@@ -30401,7 +30723,7 @@ function resolveProjectRoot(sessionId2, projectRootFlag) {
     db.close();
   }
 }
-async function selectBatch(agent, model, batch, total, verbose, skillPathOverride) {
+async function selectBatch(agent, model, batch, total, verbose, skillPathOverride, existingComponentsInline) {
   const prompt2 = await buildPrompt({
     skill: "select",
     mode: "autonomous",
@@ -30411,7 +30733,8 @@ async function selectBatch(agent, model, batch, total, verbose, skillPathOverrid
       2
     ),
     outDir: process.cwd(),
-    skillPathOverride
+    skillPathOverride,
+    existingComponentsInline
   });
   let outputBuf = "";
   const formatter = new OutputFormatter(verbose, (s) => {
@@ -30506,7 +30829,7 @@ ${outputBuf}`);
   }
   return results;
 }
-async function selectAllComponents(agent, model, components, verbose, skillPathOverride, cacheConfig = { noCache: true }) {
+async function selectAllComponents(agent, model, components, verbose, skillPathOverride, existingComponentsInline, cacheConfig = { noCache: true }) {
   const concurrency = Number(process.env.EDS_GENERATE_CONCURRENCY ?? DEFAULT_CONCURRENCY);
   const batchSize = resolveBatchSize();
   const total = components.length;
@@ -30515,7 +30838,13 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
   let cliVersion2 = "";
   if (!cacheConfig.noCache) {
     try {
-      promptHash = await hashPromptForSkill("select", agent, model, skillPathOverride);
+      promptHash = await hashPromptForSkill(
+        "select",
+        agent,
+        model,
+        skillPathOverride,
+        existingComponentsInline ? [hashContent(existingComponentsInline)] : []
+      );
       cliVersion2 = await getCliCacheVersion();
       const db = openPipelineDb(cacheConfig.dbPath);
       try {
@@ -30571,7 +30900,15 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
     while (nextBatch < batches.length) {
       const b = nextBatch++;
       const batch = batches[b];
-      const batchResults = await selectBatch(agent, model, batch, total, verbose, skillPathOverride);
+      const batchResults = await selectBatch(
+        agent,
+        model,
+        batch,
+        total,
+        verbose,
+        skillPathOverride,
+        existingComponentsInline
+      );
       for (let k = 0; k < batch.length; k++) {
         results[batch[k].index] = batchResults[k];
       }
@@ -30607,6 +30944,9 @@ function registerAnalyzeSelectAgentCommand(program) {
     "--select-prompt-path <path>",
     "Path to a custom .md skill prompt for select-agent (bypasses bundled prompt invariants)"
   ).option("--no-select-cache", "Skip the per-component select cache and re-LLM every component").option("--no-cache", "Skip ALL fine-grained caches (extract, select, generate)").option(
+    "--existing-entities-path <path>",
+    "Path to the .existing-entities.json file written by the orchestrator when CMA credentials are supplied. When present, the agent gets an existing-components summary to align rejection/acceptance reasoning with the target space. Missing/malformed files are treated as no-op."
+  ).option(
     "--show-rationale",
     "Read-only: print the AI rejection rationale persisted by a prior select-agent run and exit. No LLM call. Combine with --json for machine-readable output."
   ).option("--json", "When used with --show-rationale, emit a JSON array instead of a human-readable table").action(
@@ -30715,6 +31055,20 @@ function registerAnalyzeSelectAgentCommand(program) {
           }));
         }
       }
+      let existingComponentsInline;
+      if (opts.existingEntitiesPath) {
+        const existingContentfulEntities = await readExistingContentfulEntitiesFromSession(
+          resolve12(opts.existingEntitiesPath)
+        );
+        if (existingContentfulEntities) {
+          existingComponentsInline = JSON.stringify(summarizeForSelectAgent(existingContentfulEntities));
+        } else {
+          process.stderr.write(
+            `warn: --existing-entities-path ${opts.existingEntitiesPath} could not be read as JSON \u2014 proceeding without space-context enrichment
+`
+          );
+        }
+      }
       if (opts.dryRun) {
         if (selectionCandidates.length === 0) {
           process.stderr.write(
@@ -30729,7 +31083,8 @@ function registerAnalyzeSelectAgentCommand(program) {
           mode: "autonomous",
           rawComponentsInline: JSON.stringify([buildComponentData(first)], null, 2),
           outDir: process.cwd(),
-          skillPathOverride: selectPromptPath ? resolve12(selectPromptPath) : void 0
+          skillPathOverride: selectPromptPath ? resolve12(selectPromptPath) : void 0,
+          existingComponentsInline
         });
         process.stdout.write(prompt2 + "\n");
         await exitWithAnalytics(0);
@@ -30742,6 +31097,7 @@ function registerAnalyzeSelectAgentCommand(program) {
         selectionCandidates,
         opts.verbose ?? false,
         selectPromptPath ? resolve12(selectPromptPath) : void 0,
+        existingComponentsInline,
         { noCache }
       );
       const decisions = /* @__PURE__ */ new Map();
@@ -31129,11 +31485,11 @@ ${f.content}`).join("\n\n");
 }
 
 // packages/experience-design-system-cli/src/analyze/composition/resolve-mapping-cli.ts
-import { readFile as readFile14 } from "node:fs/promises";
+import { readFile as readFile15 } from "node:fs/promises";
 async function loadUserMap(path) {
   let text;
   try {
-    text = await readFile14(path, "utf8");
+    text = await readFile15(path, "utf8");
   } catch {
     return { ok: false, error: `--composition-map: file not found: ${path}` };
   }
@@ -31369,16 +31725,16 @@ var HEAP_CAP_MB = 128;
 var MAX_INPUT_BYTES = 8 * 1024 * 1024;
 function runParserInSandbox(source, ctx, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     let input;
     try {
       input = JSON.stringify({ source, ctx, timeoutMs });
     } catch {
-      resolve27({ edges: [], error: "ctx is not serializable" });
+      resolve28({ edges: [], error: "ctx is not serializable" });
       return;
     }
     if (input.length > MAX_INPUT_BYTES) {
-      resolve27({ edges: [], error: "parser input exceeds size limit" });
+      resolve28({ edges: [], error: "parser input exceeds size limit" });
       return;
     }
     let settled = false;
@@ -31410,7 +31766,7 @@ function runParserInSandbox(source, ctx, opts = {}) {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve27(r);
+      resolve28(r);
     };
     const timer = setTimeout(
       () => done({ edges: [], error: `parser timed out after ${timeoutMs}ms` }),
@@ -31622,7 +31978,7 @@ ${loadPrompt("composition-parser-repair-error.md").trim().replace("{{error}}", f
 }
 
 // packages/experience-design-system-cli/src/lib/prompt-overrides.ts
-import { readFile as readFile15 } from "node:fs/promises";
+import { readFile as readFile16 } from "node:fs/promises";
 import { resolve as resolve14 } from "node:path";
 var PROMPT_FILE_EXTENSIONS = [".md", ".txt", ".prompt"];
 function looksLikePath(value) {
@@ -31658,7 +32014,7 @@ async function resolvePromptOverride(override) {
   if (override.kind === "text") return override.value;
   const abs = resolve14(override.value);
   try {
-    return await readFile15(abs, "utf8");
+    return await readFile16(abs, "utf8");
   } catch {
     throw new Error(`--prompt: could not read prompt file: ${abs}`);
   }
@@ -31841,7 +32197,7 @@ async function readCandidateFiles(components, extraFiles = []) {
   await Promise.all(
     [...paths].map(async (p) => {
       try {
-        const content = await readFile16(p, "utf8");
+        const content = await readFile17(p, "utf8");
         out.push({ path: p, content });
       } catch {
       }
@@ -32245,7 +32601,7 @@ function registerAnalyzeCommand(program) {
 init_src();
 import { createElement as createElement4 } from "react";
 import { render as render4 } from "ink";
-import { access as access6, readFile as readFile18, readdir as readdir3, stat as stat3 } from "node:fs/promises";
+import { access as access6, readFile as readFile19, readdir as readdir3, stat as stat3 } from "node:fs/promises";
 import { join as join16, resolve as resolve17 } from "node:path";
 init_debug_logger();
 
@@ -32286,7 +32642,7 @@ function GenerateView({ result, onExit }) {
 }
 
 // packages/experience-design-system-cli/src/generate/edit/command.ts
-import { readFile as readFile17 } from "node:fs/promises";
+import { readFile as readFile18 } from "node:fs/promises";
 import { resolve as resolve16 } from "node:path";
 var SAFE_PATH_RE2 = /^[a-zA-Z0-9_.$[\]=]+$/;
 var PROTO_KEYS2 = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
@@ -32369,7 +32725,7 @@ async function runNonInteractive2(opts, skill) {
   if (opts.patch) {
     let patchOps;
     try {
-      const raw = await readFile17(resolve16(opts.patch), "utf8");
+      const raw = await readFile18(resolve16(opts.patch), "utf8");
       patchOps = JSON.parse(raw);
     } catch {
       process.stderr.write(`Error: cannot read or parse --patch file: ${opts.patch}
@@ -32463,7 +32819,7 @@ async function readFileInline(path) {
   } catch {
     return void 0;
   }
-  if (!s.isDirectory()) return readFile18(resolved, "utf8");
+  if (!s.isDirectory()) return readFile19(resolved, "utf8");
   const files = [];
   async function walk(dir) {
     let entries;
@@ -32489,7 +32845,7 @@ async function readFileInline(path) {
   }
   await walk(resolved);
   if (files.length === 0) return void 0;
-  const parts = await Promise.all(files.map((f) => readFile18(f, "utf8").catch(() => "")));
+  const parts = await Promise.all(files.map((f) => readFile19(f, "utf8").catch(() => "")));
   return parts.filter(Boolean).join("\n\n");
 }
 function printFallbackInstructions(options) {
@@ -32511,7 +32867,7 @@ function printFallbackInstructions(options) {
   lines.push(`  Re-run the generate command with the agent available, or use --dry-run to inspect the prompt.`);
   process.stderr.write(lines.join("\n") + "\n");
 }
-async function runOneComponent(agent, model, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash) {
+async function runOneComponent(agent, model, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash, existingContentfulEntities, existingTokensInline) {
   const pos = c.dim(`[${index + 1}/${total}]`);
   if (!noCache) {
     const inputHash = computeComponentInputHash(component);
@@ -32581,6 +32937,7 @@ async function runOneComponent(agent, model, db, sessionId2, component, tokensIn
     component.props.map((p) => p.name),
     component.props.map((p) => p.type)
   );
+  const existingComponentsInline = existingContentfulEntities ? JSON.stringify(summarizeForGenerateAgent(existingContentfulEntities, component.name)) : void 0;
   const prompt2 = await buildPrompt({
     skill: "components",
     mode: "autonomous",
@@ -32590,7 +32947,9 @@ async function runOneComponent(agent, model, db, sessionId2, component, tokensIn
     outDir: process.cwd(),
     componentName: component.name,
     componentSourceRefs: [sourceRef],
-    skillPathOverride
+    skillPathOverride,
+    existingComponentsInline,
+    existingTokensInline
   });
   const maxAttempts = 2;
   let lastError = "";
@@ -32658,7 +33017,7 @@ ${outputBuf}`);
     renamedSlotsCount: renames.length
   };
 }
-async function runAllComponents(agent, model, db, sessionId2, components, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, promptHash) {
+async function runAllComponents(agent, model, db, sessionId2, components, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, promptHash, existingContentfulEntities, existingTokensInline) {
   const concurrency = Number(process.env.EDS_GENERATE_CONCURRENCY ?? DEFAULT_COMPONENT_CONCURRENCY);
   process.stderr.write(
     `Categorizing ${c.bold(String(components.length))} component${components.length === 1 ? "" : "s"}` + c.dim(`  (concurrency: ${concurrency})`) + "\n"
@@ -32682,7 +33041,9 @@ async function runAllComponents(agent, model, db, sessionId2, components, tokens
         verbose,
         noCache,
         skillPathOverride,
-        promptHash
+        promptHash,
+        existingContentfulEntities,
+        existingTokensInline
       );
       completed += 1;
       process.stderr.write(`${formatGenerateProgressLine(completed, components.length, results[i].componentName)}
@@ -32720,7 +33081,7 @@ async function loadAcceptedNames(sessionId2) {
   try {
     const artifactsRoot = getRefineArtifactsRoot();
     const paths = await getRefineSessionPaths(sessionId2, artifactsRoot);
-    const raw = await readFile18(paths.statePath, "utf8");
+    const raw = await readFile19(paths.statePath, "utf8");
     const snapshot = JSON.parse(raw);
     const accepted = snapshot.components.filter((c2) => c2.status === "accepted").map((c2) => c2.name);
     if (accepted.length === 0) return null;
@@ -32766,6 +33127,19 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     readFileInline(opts.tokens),
     readFileInline(opts.tokenMap)
   ]);
+  let existingContentfulEntities;
+  let existingTokensInline;
+  if (opts.existingEntitiesPath) {
+    existingContentfulEntities = await readExistingContentfulEntitiesFromSession(resolve17(opts.existingEntitiesPath));
+    if (existingContentfulEntities) {
+      existingTokensInline = JSON.stringify(summarizeForMapTokens(existingContentfulEntities));
+    } else {
+      process.stderr.write(
+        `warn: --existing-entities-path ${opts.existingEntitiesPath} could not be read as JSON \u2014 proceeding without space-context enrichment
+`
+      );
+    }
+  }
   let sessionId2;
   let allComponents;
   if (skill === "components") {
@@ -32826,6 +33200,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       sampleComponent.props.map((p) => p.name),
       sampleComponent.props.map((p) => p.type)
     ) : void 0;
+    const dryRunExistingComponentsInline = skill === "components" && existingContentfulEntities && sampleComponent ? JSON.stringify(summarizeForGenerateAgent(existingContentfulEntities, sampleComponent.name)) : void 0;
     const prompt2 = await buildPrompt({
       skill,
       mode: "autonomous",
@@ -32836,7 +33211,9 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       tokenMapInline,
       outDir: process.cwd(),
       componentSourceRefs: sampleSourceRef ? [sampleSourceRef] : void 0,
-      skillPathOverride: generatePromptPath
+      skillPathOverride: generatePromptPath,
+      existingComponentsInline: dryRunExistingComponentsInline,
+      existingTokensInline: skill === "components" ? existingTokensInline : void 0
     });
     process.stdout.write(prompt2 + "\n");
     await exitWithAnalytics(0);
@@ -32854,7 +33231,15 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     const db = openPipelineDb();
     let componentResults;
     try {
-      const promptHash = await hashPromptForSkill("components", agent, model, generatePromptPath);
+      const existingContentfulEntitiesHashInputs = [];
+      if (existingTokensInline) existingContentfulEntitiesHashInputs.push(hashContent(existingTokensInline));
+      const promptHash = await hashPromptForSkill(
+        "components",
+        agent,
+        model,
+        generatePromptPath,
+        existingContentfulEntitiesHashInputs
+      );
       componentResults = await runAllComponents(
         agent,
         model,
@@ -32866,7 +33251,9 @@ async function runGenerateSkill(skill, opts, verbose = false) {
         verbose,
         opts.cache === false || process.env.EDS_NO_CACHE === "1",
         generatePromptPath,
-        promptHash
+        promptHash,
+        existingContentfulEntities,
+        existingTokensInline
       );
     } finally {
       db.close();
@@ -33043,6 +33430,9 @@ function registerGenerateCommand(program) {
   const componentsCmd = generate.command("components").description("Invoke a coding agent to produce components.json from raw analysis output").option("--session <id>", "Session ID from analyze extract (defaults to most recent)").option("--tokens <path>", "Path to tokens.json for token-linked prop resolution").option("--token-map <path>", "Path to token-name-map.json sidecar").option(
     "--generate-prompt-path <path>",
     "Path to a custom .md skill prompt for components generation (bypasses bundled prompt invariants)"
+  ).option(
+    "--existing-entities-path <path>",
+    "Path to the .existing-entities.json file written by the orchestrator when CMA credentials are supplied. When present, per-component prompts include a summary of the target space so classifications can align to existing prop names/tokens. Missing/malformed files are treated as no-op."
   );
   addAgentFlags(componentsCmd).action(async (opts) => {
     await runGenerateSkill("components", opts, opts.verbose ?? false);
@@ -33058,7 +33448,7 @@ function registerGenerateCommand(program) {
 // packages/experience-design-system-cli/src/program.ts
 init_command();
 
-// packages/experience-design-system-cli/src/session/command.ts
+// packages/experience-design-system-cli/src/session/cli.ts
 init_db();
 
 // packages/experience-design-system-cli/src/session/stats.ts
@@ -33262,7 +33652,7 @@ function migrateImportDb(db, _now) {
   }
 }
 
-// packages/experience-design-system-cli/src/session/command.ts
+// packages/experience-design-system-cli/src/session/cli.ts
 function parseDuration(str) {
   const m = /^(\d+)([dwmy])$/.exec(str);
   if (!m) return null;
@@ -33489,9 +33879,9 @@ ${"\u2500".repeat(60)}
 `);
       }
       process.stdout.write("\nDelete these sessions? (y/N) ");
-      const answer = await new Promise((resolve27) => {
+      const answer = await new Promise((resolve28) => {
         process.stdin.setEncoding("utf8");
-        process.stdin.once("data", (chunk) => resolve27(String(chunk).trim().toLowerCase()));
+        process.stdin.once("data", (chunk) => resolve28(String(chunk).trim().toLowerCase()));
       });
       if (answer !== "y") {
         db.close();
@@ -33526,7 +33916,7 @@ import { access as access7, mkdir as mkdir4, stat as stat4, writeFile as writeFi
 import { basename as basename5, resolve as resolve19 } from "node:path";
 
 // packages/experience-design-system-cli/src/print/validate/validators/cdf-validator.ts
-import { readFile as readFile19 } from "node:fs/promises";
+import { readFile as readFile20 } from "node:fs/promises";
 import { validateCDF as validateCDF2 } from "@contentful/experience-design-system-types";
 function extractValue(input, path) {
   if (path === "/") return void 0;
@@ -33585,7 +33975,7 @@ function rewriteDiagnostic(error, input) {
 async function validateCDFFile(filePath) {
   let content;
   try {
-    content = await readFile19(filePath, "utf-8");
+    content = await readFile20(filePath, "utf-8");
   } catch (err) {
     return {
       valid: false,
@@ -33620,7 +34010,7 @@ async function validateCDFFile(filePath) {
 }
 
 // packages/experience-design-system-cli/src/print/validate/validators/dtcg-validator.ts
-import { readFile as readFile20 } from "node:fs/promises";
+import { readFile as readFile21 } from "node:fs/promises";
 import { DESIGN_TOKEN_TYPES } from "@contentful/experience-design-system-types";
 function walkDTCG(obj, path, diagnostics, counts) {
   for (const [key, value] of Object.entries(obj)) {
@@ -33665,7 +34055,7 @@ function walkDTCG(obj, path, diagnostics, counts) {
 async function validateDTCGTokenFile(filePath) {
   let content;
   try {
-    content = await readFile20(filePath, "utf-8");
+    content = await readFile21(filePath, "utf-8");
   } catch (err) {
     return {
       valid: false,
@@ -33809,10 +34199,10 @@ async function assertOutIsNotDirectory(outPath) {
     if (s.isDirectory()) await die3(`Error: --out must be a file path, not a directory: ${outPath}`);
   }
 }
-async function resolveSession(sessionFlag, command) {
+async function resolveSession2(sessionFlag, command) {
   const db = openPipelineDb();
   try {
-    const sessionId2 = sessionFlag ?? findLatestSessionForCommand(db, command);
+    const sessionId2 = sessionFlag ?? findLatestSessionForCommand2(db, command);
     if (!sessionId2) {
       const hint = command === "generate components" ? "generate components" : "generate tokens";
       return await die3(`Error: no completed ${hint} session found. Run ${hint} first, or pass --session <id>.`);
@@ -33862,7 +34252,7 @@ function registerPrintCommand(program) {
   ).action(async (opts) => {
     const outPath = resolve19(opts.out);
     await assertOutIsNotDirectory(outPath);
-    const sessionId2 = await resolveSession(opts.session, "generate components");
+    const sessionId2 = await resolveSession2(opts.session, "generate components");
     await bindAnalyticsSessionId(sessionId2);
     const db = openPipelineDb();
     let components;
@@ -33919,7 +34309,7 @@ function registerPrintCommand(program) {
   print.command("tokens").description("Write generated tokens to a DTCG JSON file").option("--session <id>", "Session ID to print from (default: most recent generate tokens session)").option("--out <path>", "Output file path", "tokens.json").action(async (opts) => {
     const outPath = resolve19(opts.out);
     await assertOutIsNotDirectory(outPath);
-    const sessionId2 = await resolveSession(opts.session, "generate tokens");
+    const sessionId2 = await resolveSession2(opts.session, "generate tokens");
     await bindAnalyticsSessionId(sessionId2);
     const db = openPipelineDb();
     let result;
@@ -33998,7 +34388,8 @@ init_db();
 init_cache_keys();
 import { createElement as createElement6 } from "react";
 import { render as render6 } from "ink";
-import { readFile as readFile21 } from "node:fs/promises";
+import { readFile as readFile22 } from "node:fs/promises";
+import { resolve as resolve20 } from "node:path";
 
 // packages/experience-design-system-cli/src/map-tokens/apply.ts
 init_db();
@@ -34235,7 +34626,7 @@ async function runMapTokens(opts) {
   const resultAgent = configuredAgent ?? "skipped";
   const db = openPipelineDb();
   try {
-    const sessionId2 = opts.session ?? findLatestSessionForCommand(db, "generate components");
+    const sessionId2 = opts.session ?? findLatestSessionForCommand2(db, "generate components");
     if (!sessionId2) {
       die2(
         "Error: no completed generate components session found. Run generate components first, or pass --session <id>."
@@ -34246,7 +34637,7 @@ async function runMapTokens(opts) {
     const knownTokenPaths = new Set(tokenLeaves.map((t) => t.path));
     const tokenMapDiagnostics = [];
     if (opts.tokenMap) {
-      const fileMappings = JSON.parse(await readFile21(opts.tokenMap, "utf8"));
+      const fileMappings = JSON.parse(await readFile22(opts.tokenMap, "utf8"));
       const validMappings = {};
       for (const [rawName, path] of Object.entries(fileMappings)) {
         if (knownTokenPaths.has(path)) {
@@ -34321,6 +34712,20 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
     const generatedCdf = Object.fromEntries(cdfEntries.map((c2) => [c2.key, c2.entry]));
     const tokenTree = rebuildDTCGTree(groups, tokens);
     const componentSourceRefs = await loadComponentSourceRefs(db, sessionId2);
+    let existingTokensInline;
+    if (opts.existingEntitiesPath) {
+      const existingContentfulEntities = await readExistingContentfulEntitiesFromSession(
+        resolve20(opts.existingEntitiesPath)
+      );
+      if (existingContentfulEntities) {
+        existingTokensInline = JSON.stringify(summarizeForMapTokens(existingContentfulEntities));
+      } else {
+        process.stderr.write(
+          `warn: --existing-entities-path ${opts.existingEntitiesPath} could not be read as JSON \u2014 proceeding without space-context enrichment
+`
+        );
+      }
+    }
     if (opts.printPrompt) {
       const prompt3 = await buildPrompt({
         skill: "map-tokens",
@@ -34328,7 +34733,8 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
         generatedCdf,
         tokenTree,
         componentSourceRefs,
-        outDir: process.cwd()
+        outDir: process.cwd(),
+        existingTokensInline
       });
       process.stdout.write(prompt3 + "\n");
       await exitWithAnalytics(0);
@@ -34346,7 +34752,13 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
     }
     const agent = configuredAgent;
     const noCache = opts.cache === false || process.env.EDS_NO_CACHE === "1";
-    const promptHash = await hashPromptForSkill("map-tokens", agent, model);
+    const promptHash = await hashPromptForSkill(
+      "map-tokens",
+      agent,
+      model,
+      void 0,
+      existingTokensInline ? [hashContent(existingTokensInline)] : []
+    );
     const inputHash = computeMapTokensInputHash(db, sessionId2, componentSourceRefs);
     if (!noCache) {
       const cached = lookupCache(db, inputHash, "token_mapping", "__map_tokens__", promptHash);
@@ -34373,7 +34785,8 @@ Install it, choose another agent with --agent, or use --print-prompt to run the
       generatedCdf,
       tokenTree,
       componentSourceRefs,
-      outDir: process.cwd()
+      outDir: process.cwd(),
+      existingTokensInline
     });
     const invoker3 = createLocalCliAgentInvoker();
     const result = await invoker3.invoke({ agent, model, prompt: prompt2, timeoutMs: DEFAULT_TIMEOUT_MS4 });
@@ -34400,7 +34813,10 @@ ${warnings.map((w) => `  ${w}`).join("\n")}
 }
 function registerMapTokensCommand(program) {
   const map = program.command("map").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");
+  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(
+    "--existing-entities-path <path>",
+    "Path to the .existing-entities.json file written by the orchestrator when 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."
+  );
   addAgentModelOptions(tokensCmd).action(async (opts) => {
     await runMapTokens(opts);
   });
@@ -34409,45 +34825,22 @@ function registerMapTokensCommand(program) {
 // packages/experience-design-system-cli/src/import/command.ts
 init_src();
 init_path_utils();
-import { resolve as resolve25, join as join25 } from "node:path";
+import { resolve as resolve26, join as join26 } from "node:path";
 
 // packages/experience-design-system-cli/src/import/orchestrator.ts
 init_db();
 init_command();
 init_manifest();
 init_api_client();
-import { mkdir as mkdir5, writeFile as writeFile5 } from "node:fs/promises";
-import { join as join18, resolve as resolve21 } from "node:path";
-import { execFile as execFile2 } from "node:child_process";
-
-// packages/experience-design-system-cli/src/helpers/fetch-existing-entities.ts
-import { fetchAll } from "contentful-management";
-async function fetchExistingEntities(client2, params) {
-  const scope = { spaceId: params.spaceId, environmentId: params.environmentId, query: {} };
-  const components = await fetchAll(client2.component.getMany, scope);
-  const tokens = await fetchAll(client2.designToken.getMany, scope);
-  return { components, tokens };
-}
-
-// packages/experience-design-system-cli/src/helpers/cma-client.ts
-init_host_utils();
-import { createClient as createClient2 } from "contentful-management";
-function createCmaClient(opts) {
-  return createClient2(
-    {
-      accessToken: opts.cmaToken,
-      ...opts.host ? { host: toConfiguredHost(opts.host) } : {}
-    },
-    { type: "plain" }
-  );
-}
-
-// packages/experience-design-system-cli/src/import/orchestrator.ts
+init_fetch_and_persist_existing_contentful_entities();
 init_contentful_urls();
 init_debug_logger();
 init_analytics();
 init_env();
 init_cli_path();
+import { mkdir as mkdir5 } from "node:fs/promises";
+import { join as join19, resolve as resolve22 } from "node:path";
+import { execFile as execFile2 } from "node:child_process";
 async function runStep(args, cliPath, analyticsSessionId, env = {}, streamStderr = false) {
   const debug = getDebugLogger();
   const startedAt = Date.now();
@@ -34532,9 +34925,9 @@ function buildPushStepResult(args) {
   };
 }
 async function runPipeline(opts, progressWriter, cliPathOverride) {
-  const projectRoot = resolve21(opts.project);
-  const outDir = resolve21(opts.out);
-  const componentsPath = join18(outDir, "components.json");
+  const projectRoot = resolve22(opts.project);
+  const outDir = resolve22(opts.out);
+  const componentsPath = join19(outDir, "components.json");
   const cliPath = cliPathOverride ?? findCliPath();
   const db = openPipelineDb();
   const { sessionId: sessionId2 } = getOrCreateSession(db, void 0, void 0, {
@@ -34555,67 +34948,56 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
   await mkdir5(outDir, { recursive: true });
   const steps = [];
   let stepNum = 0;
-  const wantsSpaceContext = opts.withSpaceContext === true;
-  const canFetchSpaceContext = wantsSpaceContext && !!opts.spaceId && !!opts.environmentId && !!opts.cmaToken;
-  const totalSteps = 5 + (opts.print ? 1 : 0) + (canFetchSpaceContext ? 1 : 0);
+  const canFetchExistingContentfulEntities = !!opts.spaceId && !!opts.environmentId && !!opts.cmaToken;
+  const totalSteps = 5 + (opts.print ? 1 : 0) + (canFetchExistingContentfulEntities ? 1 : 0);
   function stepLabel(name) {
     stepNum++;
     return `  Step ${stepNum}/${totalSteps}  ${name}  `;
   }
-  if (wantsSpaceContext && !canFetchSpaceContext) {
-    progressWriter(
-      "  Note: --with-space-context requires --space-id, --environment-id, and --cma-token; skipping context fetch."
-    );
-  }
-  if (canFetchSpaceContext) {
+  let existingEntitiesPath;
+  if (canFetchExistingContentfulEntities) {
     const fetchLabel = stepLabel("Fetching existing components + design tokens");
     const fetchStepId = createStep(db, sessionId2, "fetch existing entities", {
       spaceId: opts.spaceId,
       environmentId: opts.environmentId
     });
-    const t0 = Date.now();
-    try {
-      const cmaClient = createCmaClient({
-        cmaToken: opts.cmaToken,
-        ...opts.host ? { host: opts.host } : {}
-      });
-      const existingComponentsAndTokens = await fetchExistingEntities(cmaClient, {
-        spaceId: opts.spaceId,
-        environmentId: opts.environmentId
-      });
-      const fetchDurationMs = Date.now() - t0;
-      const existingEntitiesPath = join18(outDir, ".existing-entities.json");
-      await writeFile5(existingEntitiesPath, JSON.stringify(existingComponentsAndTokens, null, 2), "utf8");
+    const result = await fetchAndPersistExistingContentfulEntities({
+      spaceId: opts.spaceId,
+      environmentId: opts.environmentId,
+      cmaToken: opts.cmaToken,
+      ...opts.host ? { host: opts.host } : {},
+      outDir
+    });
+    if (result.ok) {
+      existingEntitiesPath = result.path;
       updateStep(db, fetchStepId, "complete", {
-        components: String(existingComponentsAndTokens.components.length),
-        tokens: String(existingComponentsAndTokens.tokens.length),
-        path: existingEntitiesPath
+        components: String(result.entities.components.length),
+        tokens: String(result.entities.tokens.length),
+        path: result.path
       });
       progressWriter(
-        `${fetchLabel}\u2713  ${existingComponentsAndTokens.components.length} component${existingComponentsAndTokens.components.length === 1 ? "" : "s"}, ${existingComponentsAndTokens.tokens.length} token${existingComponentsAndTokens.tokens.length === 1 ? "" : "s"}  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+        `${fetchLabel}\u2713  ${result.entities.components.length} component${result.entities.components.length === 1 ? "" : "s"}, ${result.entities.tokens.length} token${result.entities.tokens.length === 1 ? "" : "s"}  (${(result.durationMs / 1e3).toFixed(1)}s)`
       );
       steps.push({
         step: "fetch existing entities",
         status: "complete",
-        durationMs: fetchDurationMs,
+        durationMs: result.durationMs,
         detail: {
-          components: existingComponentsAndTokens.components.length,
-          tokens: existingComponentsAndTokens.tokens.length
+          components: result.entities.components.length,
+          tokens: result.entities.tokens.length
         }
       });
-    } catch (error) {
-      const fetchDurationMs = Date.now() - t0;
-      const message = error instanceof Error ? error.message : String(error);
-      updateStep(db, fetchStepId, "complete", {}, message);
+    } else {
+      updateStep(db, fetchStepId, "complete", {}, result.error);
       progressWriter(
-        `${fetchLabel}\u26A0  fetch failed, continuing without space context  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+        `${fetchLabel}\u26A0  fetch failed, continuing without space context  (${(result.durationMs / 1e3).toFixed(1)}s)`
       );
-      progressWriter(`    ${message.split("\n")[0]}`);
+      progressWriter(`    ${result.error.split("\n")[0]}`);
       steps.push({
         step: "fetch existing entities",
         status: "skipped",
-        durationMs: fetchDurationMs,
-        reason: `fetch failed: ${message.split("\n")[0]}`
+        durationMs: result.durationMs,
+        reason: `fetch failed: ${result.error.split("\n")[0]}`
       });
     }
   }
@@ -34629,7 +35011,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
       status: "skipped",
       reason: "--skip-analyze"
     });
-    const prior = findLatestSessionForCommand(db, "analyze extract");
+    const prior = findLatestSessionForCommand2(db, "analyze extract");
     extractSessionId = prior ?? null;
   } else {
     const stepId = createStep(db, sessionId2, "analyze extract", {
@@ -34663,7 +35045,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
       db.close();
       return { session: sessionId2, project: projectRoot, steps };
     }
-    extractSessionId = findLatestSessionForCommand(db, "analyze extract") ?? null;
+    extractSessionId = findLatestSessionForCommand2(db, "analyze extract") ?? null;
     const componentMatch = /Extracted (\d+) component/.exec(r.stderr);
     const componentCount = componentMatch ? Number(componentMatch[1]) : 0;
     updateStep(db, stepId, "complete", {
@@ -34701,6 +35083,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
       if (opts.excludeInvalid) editArgs.push("--exclude-invalid");
       if (opts.noCache) editArgs.push("--no-cache");
       if (opts.selectPromptPath) editArgs.push("--select-prompt-path", opts.selectPromptPath);
+      if (existingEntitiesPath) editArgs.push("--existing-entities-path", existingEntitiesPath);
     } else {
       editArgs = ["analyze", "select", "--session", extractSessionId];
       if (opts.select && opts.select.length > 0) {
@@ -34763,6 +35146,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     if (extractSessionId) generateArgs.push("--session", extractSessionId);
     if (opts.dryRun) generateArgs.push("--dry-run");
     if (opts.verbose) generateArgs.push("--verbose");
+    if (existingEntitiesPath) generateArgs.push("--existing-entities-path", existingEntitiesPath);
     const stepId = createStep(db, sessionId2, "generate components", {
       extractSession: extractSessionId ?? ""
     });
@@ -34817,6 +35201,7 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     if (opts.model) mapTokensArgs.push("--model", opts.model);
     if (opts.noCache) mapTokensArgs.push("--no-cache");
     if (opts.skipMapTokens) mapTokensArgs.push("--skip-agent");
+    if (existingEntitiesPath) mapTokensArgs.push("--existing-entities-path", existingEntitiesPath);
     const mapTokensStepId = createStep(db, sessionId2, "map tokens", {
       extractSession: extractSessionId,
       skipAgent: String(opts.skipMapTokens === true)
@@ -35178,7 +35563,7 @@ init_host_utils();
 // packages/experience-design-system-cli/src/runs/replay-helpers.ts
 init_resolve_run_target();
 init_store();
-import { resolve as resolve24 } from "node:path";
+import { resolve as resolve25 } from "node:path";
 
 // packages/experience-design-system-cli/src/runs/push-helpers.ts
 init_cli_path();
@@ -35368,7 +35753,7 @@ async function modifyRun(opts) {
     entryStep: "final-review",
     saveMode,
     ...run.compositionMode ? { compositionMode: run.compositionMode } : {},
-    ...opts.outDir ? { outDirOverride: resolve24(opts.outDir) } : {},
+    ...opts.outDir ? { outDirOverride: resolve25(opts.outDir) } : {},
     ...mergedSpaceId ? { initialSpaceId: mergedSpaceId } : {},
     ...mergedEnvironmentId ? { initialEnvironmentId: mergedEnvironmentId } : {},
     ...mergedHost ? { initialHost: mergedHost } : {},
@@ -35445,7 +35830,7 @@ function resolvePromptFlags(flags) {
 
 // packages/experience-design-system-cli/src/runs/run-picker-mount.ts
 init_store();
-import { readFile as readFile26 } from "node:fs/promises";
+import { readFile as readFile27 } from "node:fs/promises";
 function migrateRecord2(rec) {
   return {
     ...rec,
@@ -35468,7 +35853,7 @@ async function shouldShowRunPicker(input) {
   const path = input.runsJsonPath ?? runsFilePath();
   let raw;
   try {
-    raw = await readFile26(path, "utf8");
+    raw = await readFile27(path, "utf8");
   } catch {
     return { shouldShow: false, runs: [] };
   }
@@ -35573,10 +35958,7 @@ function registerImportCommand(program) {
     "Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md",
     (v, acc) => [...acc, v],
     []
-  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option(
-    "--with-space-context",
-    "Fetch existing Components + DesignTokens from the target space+env and persist them under <out>/.existing-entities.json for future agent-context enrichment. Requires --space-id, --environment-id, and --cma-token."
-  ).option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
+  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
     "--no-auto-filter",
     "Skip the automatic AI pre-filter; jump straight to manual scope-gate (overrides the credentials.json autoFilter preference; no-op when paired with --auto-accept-scope)"
   ).option(
@@ -35844,7 +36226,7 @@ function registerImportCommand(program) {
             livePreview: opts.livePreview !== false,
             noPush: noPushRequested,
             noSave: opts.save === false,
-            ...opts.outDir ? { outDirOverride: resolve25(opts.outDir) } : {},
+            ...opts.outDir ? { outDirOverride: resolve26(opts.outDir) } : {},
             ...opts.onConflict ? { onConflictMode: opts.onConflict } : {},
             selectPromptPath: opts.selectPromptPath ?? creds.selectPromptPath,
             generatePromptPath: opts.generatePromptPath ?? creds.generatePromptPath,
@@ -35885,7 +36267,7 @@ function registerImportCommand(program) {
         return;
       }
       const projectRoot = normalizePath(opts.project);
-      const outDir = opts.out ? resolve25(opts.out) : join25(projectRoot, ".contentful");
+      const outDir = opts.out ? resolve26(opts.out) : join26(projectRoot, ".contentful");
       const headlessCreds = await readExperiencesCredentials();
       const headlessAgent = resolveAgent(opts.agent, headlessCreds.agent);
       const headlessModel = resolveModel(opts.model, headlessCreds.agentModel);
@@ -35923,7 +36305,6 @@ function registerImportCommand(program) {
           dryRun: dryRunForward,
           selectPromptPath: opts.selectPromptPath,
           autoRejectCycles: opts.autoRejectCycles ?? false,
-          withSpaceContext: opts.withSpaceContext ?? false,
           allowDeletions: opts.allowDeletions ?? false,
           compositionMode: headlessCompositionMode,
           ...opts.compositionMap ? { compositionMap: opts.compositionMap } : {},
@@ -35948,8 +36329,8 @@ function registerImportCommand(program) {
 // packages/experience-design-system-cli/src/setup/command.ts
 init_credentials_store();
 import { execFile as execFile5, spawn as spawn5 } from "node:child_process";
-import { appendFile as appendFile2, readFile as readFile27, access as access10 } from "node:fs/promises";
-import { join as join26 } from "node:path";
+import { appendFile as appendFile2, readFile as readFile28, access as access10 } from "node:fs/promises";
+import { join as join27 } from "node:path";
 import { homedir as homedir9 } from "node:os";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { createInterface } from "node:readline";
@@ -36027,10 +36408,10 @@ function prompt(question) {
     return Promise.resolve("");
   }
   const rl = createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     rl.question(question, (answer) => {
       rl.close();
-      resolve27(answer.trim());
+      resolve28(answer.trim());
     });
   });
 }
@@ -36038,7 +36419,7 @@ function promptSecret(question) {
   if (!isInteractivePromptSession()) {
     return Promise.resolve("");
   }
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     const rl = createInterface({
       input: process.stdin,
       output: process.stdout,
@@ -36065,7 +36446,7 @@ function promptSecret(question) {
       }
       if (!process.stdin.isTTY) process.stdout.write("\n");
       process.stdin.resume();
-      resolve27(value);
+      resolve28(value);
     });
   });
 }
@@ -36087,7 +36468,7 @@ async function binaryExists(name) {
   }
 }
 function runSpawn(cmd, args, opts = {}) {
-  return new Promise((resolve27) => {
+  return new Promise((resolve28) => {
     const child = spawn5(cmd, args, {
       cwd: opts.cwd,
       env: opts.env ?? process.env,
@@ -36099,7 +36480,7 @@ function runSpawn(cmd, args, opts = {}) {
     child.on("error", (err) => {
       if (!settled) {
         settled = true;
-        resolve27({ exitCode: 1, stdout: "", stderr: err.message });
+        resolve28({ exitCode: 1, stdout: "", stderr: err.message });
       }
     });
     child.stdout.on("data", (d) => {
@@ -36111,7 +36492,7 @@ function runSpawn(cmd, args, opts = {}) {
     child.on("exit", (code) => {
       if (!settled) {
         settled = true;
-        resolve27({ exitCode: code ?? 1, stdout, stderr });
+        resolve28({ exitCode: code ?? 1, stdout, stderr });
       }
     });
   });
@@ -36120,21 +36501,21 @@ async function detectShellProfile() {
   const shell = process.env["SHELL"] ?? "";
   const home = homedir9();
   if (shell.includes("zsh")) {
-    return join26(home, ".zshrc");
+    return join27(home, ".zshrc");
   }
   if (shell.includes("bash")) {
-    const bashProfile = join26(home, ".bash_profile");
+    const bashProfile = join27(home, ".bash_profile");
     const exists = await access10(bashProfile).then(() => true).catch(() => false);
-    return exists ? bashProfile : join26(home, ".bashrc");
+    return exists ? bashProfile : join27(home, ".bashrc");
   }
   if (shell.includes("fish")) {
-    return join26(home, ".config", "fish", "config.fish");
+    return join27(home, ".config", "fish", "config.fish");
   }
-  return join26(home, ".profile");
+  return join27(home, ".profile");
 }
 async function profileContains(profilePath, str) {
   try {
-    const content = await readFile27(profilePath, "utf8");
+    const content = await readFile28(profilePath, "utf8");
     return content.includes(str);
   } catch {
     return false;
@@ -36155,7 +36536,7 @@ async function setupNode() {
   }
   fail(`Node.js v${current} \u2014 need v${REQUIRED_NODE_MAJOR}+`);
   info("");
-  const hasNvm = await binaryExists("nvm") || await access10(join26(homedir9(), ".nvm", "nvm.sh")).then(() => true).catch(() => false);
+  const hasNvm = await binaryExists("nvm") || await access10(join27(homedir9(), ".nvm", "nvm.sh")).then(() => true).catch(() => false);
   const hasFnm = await binaryExists("fnm");
   if (hasNvm) {
     info(`nvm detected. Will run: nvm install ${REQUIRED_NODE_MAJOR} && nvm use ${REQUIRED_NODE_MAJOR}`);
@@ -36164,7 +36545,7 @@ async function setupNode() {
       warn(`Skipped. Re-run experiences setup after switching to Node ${REQUIRED_NODE_MAJOR}.`);
       return false;
     }
-    const nvmScript = join26(homedir9(), ".nvm", "nvm.sh");
+    const nvmScript = join27(homedir9(), ".nvm", "nvm.sh");
     const result = await runSpawn("bash", [
       "-c",
       `source "${nvmScript}" && nvm install ${REQUIRED_NODE_MAJOR} && nvm alias default ${REQUIRED_NODE_MAJOR}`
@@ -36631,13 +37012,13 @@ async function checkPnpm(pkgRoot) {
 }
 async function checkDependencies(pkgRoot) {
   section("Checking dependencies (pnpm install)");
-  const nodeModulesExists = await access10(join26(pkgRoot, "node_modules")).then(() => true).catch(() => false);
+  const nodeModulesExists = await access10(join27(pkgRoot, "node_modules")).then(() => true).catch(() => false);
   if (!nodeModulesExists) {
     info("node_modules not found \u2014 running pnpm install...");
   } else {
     info("Running pnpm install to ensure dependencies are up to date...");
   }
-  const repoRoot = join26(pkgRoot, "..", "..");
+  const repoRoot = join27(pkgRoot, "..", "..");
   const result = await runSpawn("pnpm", ["install", "--frozen-lockfile"], { cwd: repoRoot });
   if (result.exitCode !== 0) {
     fail("pnpm install failed");
@@ -36656,7 +37037,7 @@ async function checkDependencies(pkgRoot) {
 async function checkBuild(pkgRoot) {
   section("Building CLI");
   info("Running pnpm build...");
-  const repoRoot = join26(pkgRoot, "..", "..");
+  const repoRoot = join27(pkgRoot, "..", "..");
   const result = await runSpawn("pnpm", ["--filter", "@contentful/experience-design-system-cli", "run", "build"], {
     cwd: repoRoot
   });
@@ -36772,7 +37153,7 @@ function registerSetupCommand(program) {
       process.stdout.write("\n\x1B[1mexperiences setup\x1B[0m \u2014 interactive setup wizard\n");
       process.stdout.write("Sets up everything you need to run \x1B[1mexperiences import\x1B[0m.\n");
       const pkgRoot = findPkgRoot();
-      const repoRoot = join26(pkgRoot, "..", "..");
+      const repoRoot = join27(pkgRoot, "..", "..");
       const profilePath = await detectShellProfile();
       const results = [];
       const nodeOk = await setupNode();
@@ -37012,7 +37393,7 @@ async function beginCommand(command, opts) {
 init_analytics();
 init_credentials_store();
 init_cli_path();
-var pkg3 = JSON.parse(readFileSync10(join27(findPkgRoot(), "package.json"), "utf8"));
+var pkg3 = JSON.parse(readFileSync10(join28(findPkgRoot(), "package.json"), "utf8"));
 async function runBuild(opts) {
   return new Promise((resolvePromise) => {
     const child = opts.spawnFn();
@@ -37049,7 +37430,7 @@ function registerImportV2Command(program) {
 }
 function registerBuildCommand(program) {
   program.command("build").description("Rebuild from source and re-link exo/experiences binaries to this build").action(async () => {
-    const pkgRoot = resolve26(dirname14(fileURLToPath5(import.meta.url)), "..", "..");
+    const pkgRoot = resolve27(dirname14(fileURLToPath5(import.meta.url)), "..", "..");
     process.stderr.write("\u2699  Building from source...\n");
     const { exitCode } = await runBuild({
       spawnFn: () => spawn6("pnpm", ["build"], { cwd: pkgRoot, stdio: "inherit" }),