@contentful/experience-design-system-cli 2.35.1-dev-build-45d6c918.0 → 2.35.1-dev-build-3ab9e99e.0

package/legacy/dist/src/index.js

@@ -164,506 +164,272 @@ var init_render_with_goodbye = __esm({
 function isAgentName(value) {
   return AGENT_NAMES.includes(value);
 }
-var AGENT_NAMES, DEFAULT_AGENT_NAME, AGENT_BINARIES;
+var AGENT_NAMES, DEFAULT_AGENT_NAME;
 var init_agent_names = __esm({
   "packages/experience-design-system-generation/dist/src/agent-names.js"() {
     "use strict";
     AGENT_NAMES = ["claude", "codex", "opencode", "cursor", "copilot"];
     DEFAULT_AGENT_NAME = "claude";
-    AGENT_BINARIES = {
-      claude: "claude",
-      codex: "codex",
-      opencode: "opencode",
-      cursor: "cursor-agent",
-      copilot: "copilot"
-    };
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/controller/helpers/validate-generation-request.js
-function validateGenerationRequest(request2) {
-  if (request2 === null || typeof request2 !== "object") {
-    throw new TypeError("createGenerationEndpoint requires a request object");
-  }
-  if (!isAgentName(request2.agent)) {
-    throw new TypeError(`createGenerationEndpoint requires agent to be a valid agent name, got: ${String(request2.agent)}`);
-  }
-  if (typeof request2.timeoutMs !== "number" || request2.timeoutMs <= 0) {
-    throw new TypeError("createGenerationEndpoint requires timeoutMs to be a positive number");
-  }
-  if (request2.promptOptions === null || typeof request2.promptOptions !== "object") {
-    throw new TypeError("createGenerationEndpoint requires promptOptions to be an object");
-  }
-  if (request2.onOutput !== void 0 && typeof request2.onOutput !== "function") {
-    throw new TypeError("createGenerationEndpoint requires onOutput to be a function when provided");
-  }
-}
-var init_validate_generation_request = __esm({
-  "packages/experience-design-system-generation/dist/src/controller/helpers/validate-generation-request.js"() {
-    "use strict";
-    init_agent_names();
   }
 });
 
-// packages/experience-design-system-generation/dist/src/services/prompts/helpers/resolve-skill-file.js
-import { existsSync } from "node:fs";
-import { readFile as readFile2 } from "node:fs/promises";
-import { dirname, join as join2, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-function resolveSkillPath(skill) {
-  if (!(skill in SKILL_FILES))
-    throw new Error(`Invalid skill: ${skill}`);
-  const thisDir = dirname(fileURLToPath(import.meta.url));
-  let dir = thisDir;
-  for (; ; ) {
-    const candidate = join2(dir, "skills");
-    if (existsSync(candidate))
-      return join2(candidate, SKILL_FILES[skill]);
-    const parent = resolve(dir, "..");
-    if (parent === dir) {
-      throw new Error(`skill file missing from CLI installation (could not locate skills/ directory from: ${thisDir})`);
+// packages/experience-design-system-generation/dist/src/agent-runner.js
+import { spawn } from "node:child_process";
+function findJsonObjectEnd(line) {
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (escaped) {
+      escaped = false;
+    } else if (ch === "\\" && inString) {
+      escaped = true;
+    } else if (ch === '"') {
+      inString = !inString;
+    } else if (!inString && ch === "{") {
+      depth++;
+    } else if (!inString && ch === "}" && --depth === 0) {
+      return i;
     }
-    dir = parent;
   }
+  return -1;
 }
-function formatCustomPromptBanner(skill, path) {
-  return `WARNING: Custom prompt active for ${skill}: ${path}
-  Bundled invariants (utility-wrapper rejection, description content rules) do NOT apply.
-  You are responsible for the prompt's correctness.
-`;
-}
-async function readSkillFile(skill, override) {
-  if (override) {
-    const skillPath2 = resolve(override);
+function readToolCallObjects(stdout) {
+  const objects = [];
+  const warnings = [];
+  for (const raw of stdout.split("\n")) {
+    const line = raw.trim();
+    if (!line.startsWith("{"))
+      continue;
+    const end = findJsonObjectEnd(line);
+    if (end === -1) {
+      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      continue;
+    }
+    let parsed;
     try {
-      return await readFile2(skillPath2, "utf8");
+      parsed = JSON.parse(line.slice(0, end + 1));
     } catch {
-      throw new Error(`custom prompt file not found (skill: ${skill}, path: ${skillPath2})`);
+      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      continue;
+    }
+    const trailing = line.slice(end + 1);
+    if (trailing.trim()) {
+      warnings.push(`ignored trailing content after JSON: ${trailing.trim().slice(0, 120)}`);
+    }
+    if (typeof parsed === "object" && parsed !== null && "tool" in parsed) {
+      objects.push(parsed);
     }
   }
-  const skillPath = resolveSkillPath(skill);
-  try {
-    return await readFile2(skillPath, "utf8");
-  } catch {
-    throw new Error(`skill file missing from CLI installation \u2014 try reinstalling the CLI (looked for: ${skillPath})`);
-  }
+  return { objects, warnings };
 }
-var SKILL_FILES;
-var init_resolve_skill_file = __esm({
-  "packages/experience-design-system-generation/dist/src/services/prompts/helpers/resolve-skill-file.js"() {
-    "use strict";
-    SKILL_FILES = {
-      components: "generate-components.md",
-      tokens: "generate-tokens.md",
-      select: "select-components.md",
-      "map-tokens": "map-tokens.md"
+function parseSelectToolCallLines(stdout) {
+  const calls = [];
+  const { objects, warnings } = readToolCallObjects(stdout);
+  for (const rec of objects) {
+    if (!VALID_SELECT_TOOL_NAMES.has(rec.tool))
+      continue;
+    if (typeof rec.name !== "string" || !rec.name) {
+      warnings.push(`${String(rec.tool)} missing name \u2014 skipped`);
+      continue;
+    }
+    const call = {
+      tool: rec.tool,
+      name: rec.name
     };
+    if (typeof rec.reason === "string")
+      call.reason = rec.reason;
+    if (typeof rec.confidence === "number" && rec.confidence >= 1 && rec.confidence <= 5) {
+      if (call.tool === "select_component") {
+        call.confidence = rec.confidence;
+      } else {
+        call.confidence = rec.confidence;
+      }
+    }
+    calls.push(call);
   }
-});
-
-// packages/experience-design-system-generation/dist/src/services/prompts/helpers/format-token-candidates.js
-import { flattenDTCG } from "@contentful/experience-design-system-types";
-function inferFenceLang(filename) {
-  if (!filename)
-    return "json";
-  const ext = filename.split(".").pop()?.toLowerCase() ?? "";
-  const map = {
-    js: "js",
-    mjs: "js",
-    cjs: "js",
-    ts: "ts",
-    mts: "ts",
-    cts: "ts",
-    tsx: "tsx",
-    jsx: "jsx",
-    vue: "vue",
-    svelte: "svelte",
-    astro: "astro",
-    scss: "scss",
-    sass: "scss",
-    css: "css",
-    json: "json",
-    json5: "json"
-  };
-  return map[ext] ?? "text";
+  return { calls, warnings };
 }
-function filterDesignTokenProps(cdf) {
-  const result = {};
-  const kinds = /* @__PURE__ */ new Set();
-  let hasUnscoped = false;
-  for (const [componentName, component] of Object.entries(cdf)) {
-    const properties = component.$properties;
-    if (!properties)
+function parseToolCallLines(stdout) {
+  const calls = [];
+  const { objects, warnings } = readToolCallObjects(stdout);
+  for (const rec of objects) {
+    if (!VALID_TOOL_NAMES.has(rec.tool)) {
+      warnings.push(`unknown tool: ${String(rec.tool)}`);
       continue;
-    const filteredProps = {};
-    for (const [propName, prop] of Object.entries(properties)) {
-      if (prop.$type === "token" && prop.$category === "design") {
-        const { "$token.allowed": _tokenAllowed, ...rest } = prop;
-        filteredProps[propName] = rest;
-        const kind = prop["$token.kind"];
-        if (typeof kind === "string" && kind.length > 0) {
-          kinds.add(kind);
-        } else {
-          hasUnscoped = true;
-        }
-      }
     }
-    if (Object.keys(filteredProps).length > 0) {
-      result[componentName] = { ...component, $properties: filteredProps };
+    const tool = rec.tool;
+    if (tool === "classify_prop") {
+      if (typeof rec.prop !== "string" || !rec.prop) {
+        warnings.push("classify_prop missing prop name \u2014 skipped");
+        continue;
+      }
+      if (typeof rec.cdf_type !== "string" || !VALID_CDF_TYPES.has(rec.cdf_type)) {
+        warnings.push(`classify_prop '${rec.prop}': invalid cdf_type '${String(rec.cdf_type)}' \u2014 skipped`);
+        continue;
+      }
+      if (typeof rec.cdf_category !== "string" || !VALID_CATEGORIES.has(rec.cdf_category)) {
+        warnings.push(`classify_prop '${rec.prop}': invalid cdf_category '${String(rec.cdf_category)}' \u2014 skipped`);
+        continue;
+      }
+      const call = {
+        tool: "classify_prop",
+        prop: rec.prop,
+        cdf_type: rec.cdf_type,
+        cdf_category: rec.cdf_category
+      };
+      if (Array.isArray(rec.values) && rec.values.every((v) => typeof v === "string")) {
+        call.values = rec.values;
+      }
+      if (typeof rec.token_kind === "string")
+        call.token_kind = rec.token_kind;
+      if (typeof rec.required === "boolean")
+        call.required = rec.required;
+      if (typeof rec.description === "string")
+        call.description = rec.description;
+      if (typeof rec.default === "string" || typeof rec.default === "boolean")
+        call.default = rec.default;
+      if (typeof rec.reason === "string")
+        call.reason = rec.reason;
+      calls.push(call);
+    } else if (tool === "exclude_prop") {
+      if (typeof rec.prop !== "string" || !rec.prop) {
+        warnings.push("exclude_prop missing prop name \u2014 skipped");
+        continue;
+      }
+      calls.push({
+        tool: "exclude_prop",
+        prop: rec.prop,
+        reason: typeof rec.reason === "string" ? rec.reason : ""
+      });
+    } else if (tool === "classify_component") {
+      const call = { tool: "classify_component" };
+      if (typeof rec.description === "string")
+        call.description = rec.description;
+      if (typeof rec.rationale === "object" && rec.rationale !== null) {
+        const r = rec.rationale;
+        const rationale = {};
+        if (typeof r.description === "string")
+          rationale.description = r.description;
+        if (typeof r.props === "string")
+          rationale.props = r.props;
+        if (typeof r.slots === "string")
+          rationale.slots = r.slots;
+        if (Object.keys(rationale).length > 0)
+          call.rationale = rationale;
+      }
+      calls.push(call);
+    } else if (tool === "classify_slot") {
+      if (typeof rec.slot !== "string" || !rec.slot) {
+        warnings.push("classify_slot missing slot name \u2014 skipped");
+        continue;
+      }
+      const call = { tool: "classify_slot", slot: rec.slot };
+      if (typeof rec.required === "boolean")
+        call.required = rec.required;
+      if (Array.isArray(rec.allowed_components) && rec.allowed_components.every((v) => typeof v === "string")) {
+        call.allowed_components = rec.allowed_components;
+      }
+      if (typeof rec.description === "string")
+        call.description = rec.description;
+      if (typeof rec.rationale === "string")
+        call.rationale = rec.rationale;
+      calls.push(call);
     }
   }
-  return { filtered: result, kinds: [...kinds].sort(), hasUnscoped };
-}
-function buildTokenCandidateSections(tokenTree, filteredTokenProps) {
-  const index = flattenDTCG(tokenTree, "").sort((a, b) => a.path.localeCompare(b.path));
-  if (index.length === 0)
-    return [];
-  const sections = [];
-  const renderSection = (kind, entries) => {
-    const label = kind ? `Token path index \u2014 ${kind} candidates only` : "Token path index \u2014 full tree (no $token.kind to scope by)";
-    const lines = entries.map((e) => `${e.path} \xB7 ${e.$type}`).join("\n");
-    return `${label}, one leaf token per line as \`path \xB7 type\`, no \`$value\`:
-${lines}`;
-  };
-  if (filteredTokenProps) {
-    const { kinds, hasUnscoped } = filteredTokenProps;
-    for (const kind of kinds) {
-      const scoped = index.filter((e) => e.$type === kind);
-      if (scoped.length > 0)
-        sections.push(renderSection(kind, scoped));
-    }
-    if (hasUnscoped)
-      sections.push(renderSection(null, index));
-  } else {
-    sections.push(renderSection(null, index));
-  }
-  return sections;
+  return { calls, warnings };
 }
-var init_format_token_candidates = __esm({
-  "packages/experience-design-system-generation/dist/src/services/prompts/helpers/format-token-candidates.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/prompts/helpers/format-source-refs.js
-function formatSourceRefBlock(ref) {
-  const mainBlock = `#### ${ref.component} (\`${ref.sourcePath}\`)
-\`\`\`${inferFenceLang(ref.sourcePath)}
-${ref.content}
-\`\`\``;
-  const siblingBlocks = (ref.siblingFiles ?? []).map((sibling) => `##### ${ref.component} \u2014 imported file \`${sibling.path}\`
-\`\`\`${inferFenceLang(sibling.path)}
-${sibling.content}
-\`\`\``);
-  const truncationNote = ref.truncatedSiblingCount && ref.truncatedSiblingCount > 0 ? [
-    `##### ${ref.component} \u2014 +${ref.truncatedSiblingCount} more imported file${ref.truncatedSiblingCount === 1 ? "" : "s"} not shown (evidence may be incomplete)`
-  ] : [];
-  const notShownNote = ref.usesNotShown && ref.usesNotShown.length > 0 ? [
-    `##### ${ref.component} \u2014 uses not shown: ${ref.usesNotShown.join(", ")}
-
-The files above are excerpts, and each of these properties has at least one use that fell outside the excerpt budget. Treat their consumption as unknown, not absent: do not classify them \`token\` on what is shown, and do not conclude they are unread.`
-  ] : [];
-  return [mainBlock, ...siblingBlocks, ...truncationNote, ...notShownNote].join("\n\n");
-}
-function formatSourceRefsSection(refs, skill) {
-  const sections = [];
-  const withContent = refs.filter((ref) => ref.content != null);
-  const withoutContent = refs.filter((ref) => ref.content == null);
-  if (withContent.length > 0) {
-    sections.push(`### Component source references
-
-${withContent.map(formatSourceRefBlock).join("\n\n")}`);
-  }
-  if (withoutContent.length > 0) {
-    const guidance = skill === "components" ? "there is no consumption evidence for these, so `token` cannot be earned for any of their props \u2014 classify from the prop signature alone, and any prop that would otherwise be enum-versus-token is `enum` (or `string`)" : "there is no source evidence to narrow from \u2014 emit nothing for their props";
-    sections.push(`Component source unavailable for (JSON) \u2014 ${guidance}:
-\`\`\`json
-${JSON.stringify(withoutContent.map((ref) => ({ component: ref.component, sourcePath: ref.sourcePath })))}
-\`\`\``);
-  }
-  return sections;
-}
-var init_format_source_refs = __esm({
-  "packages/experience-design-system-generation/dist/src/services/prompts/helpers/format-source-refs.js"() {
-    "use strict";
-    init_format_token_candidates();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/prompts/helpers/build-skill-preambles.js
-function buildComponentsAutonomousPreamble(inputBlock) {
-  return `You are running as part of the experience-design-system-cli generate pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
-
-Context: You are classifying a React component for **Contentful Experience Orchestration**. The result is a Component Type \u2014 a schema that tells Contentful what a marketer can configure. Properties fall into three categories:
-- **design**: controls how the component looks (variant, size, color, layout toggles)
-- **content**: the data a content editor fills in (text, images, URLs, rich text)
-- **state**: runtime behavioral flags (disabled, loading, expanded, identifiers)
-
-Your task: classify every prop and slot in the component below. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation. Include a "description" field on each tool call to document your reasoning so the developer can review it afterward.
-
-All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
-
-## Output protocol
-
-Do NOT write any files or emit any JSON blobs. Instead, emit one JSON object per line to stdout for each classification decision. The CLI reads your stdout line by line and writes each decision directly to the pipeline database.
-
-The four tool calls you may emit are:
-
-\`\`\`
-{"tool":"classify_component","description":"<optional component-level description>","rationale":{"description":"<why this component is classified the way it is>","props":"<why these props were chosen>","slots":"<why these slots were chosen>"}}
-
-{"tool":"classify_prop","prop":"<propName>","cdf_type":"<type>","cdf_category":"<category>","required":<bool>,"description":"<short customer-facing description>","reason":"<full internal rationale; not customer-facing>","values":["a","b"],"token_kind":"color","default":"<value>"}
-
-{"tool":"exclude_prop","prop":"<propName>","reason":"<why excluded>"}
-
-{"tool":"classify_slot","slot":"<slotName>","required":<bool>,"allowed_components":["ComponentName"],"description":"<reason>","rationale":"<why this slot was kept in the catalog>"}
-\`\`\`
-
-Rules:
-- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences around the lines.
-- Every prop in the input must have exactly one call: either classify_prop or exclude_prop.
-- Every slot in the input must have exactly one classify_slot call.
-- Valid cdf_type values: string, richtext, media, enum, token, boolean
-- Valid cdf_category values: content, design, state
-- For enum type, always include \`values\` (non-empty string array of the variant names the prop accepts).
-- For token type, always include \`token_kind\` (DTCG $type, e.g. "color"). **Never emit \`values\` for \`cdf_type: "token"\` props** \u2014 an enum prop's list holds variant names; a token prop's list holds design token paths, produced separately and never by you. Emitting \`values\` on a token prop makes the definition invalid.
-- Never emit both "values" and "token_kind" on one prop.
-- \`enum\` vs \`token\` is decided by three questions answered in order from the source shown \u2014 never from the TypeScript type. Q1: does the component look the value up, switch on it, or have a vocabulary for it (\`tokens[x]\`, \`switch (variant)\`, \`allowedValues\`)? yes \u2192 \`enum\`, stop.
-- Q2: is the value written straight into a style or attribute (\`rx={radius}\`, \`padding: \${padding}\`)? no \u2192 not \`token\`, apply the type rules.
-- Q3: is there a design-token reference at that use \u2014 a \`tokens.*\` parameter default, a \`tokenReference\`, an inline \`tokens.*\` / \`var(--*)\`? yes \u2192 \`token\` (cite both lines in "reason"); no \u2192 \`string\`. "Ambiguity resolves to \`enum\`" applies only when Q1\u2013Q3 cannot be answered from the source shown.
-- CSS design props (className, style, styles, positional/geometric props: top, bottom, left, right, rotation, offset, etc.) \u2192 classify_prop, cdf_type: "string", cdf_category: "design".
-- For \`classify_slot.allowed_components\`, use only exact names from the hard allowlist provided below. Never invent a child from an import, JSX element, type name, icon name, or implementation helper; if a child is not listed, omit it.
-- On classify_component, "rationale" fields are operator-facing (read-only) but may surface in customer-facing exports. The "rationale.description" field is subject to the description content rules in the skill prompt (no internal initiative names). "rationale.props" and "rationale.slots" describe your reasoning about scope; "classify_slot.rationale" explains why each slot was kept.
-- On classify_prop, "reason" is REQUIRED and is the LLM's internal rationale \u2014 shown to the developer reviewing the import, never to end-users. "description" is the customer-facing copy and is subject to the description content rules in the skill prompt. Keep them distinct: "description" is short and customer-facing; "reason" explains your reasoning in detail.
-- You may emit prose lines (not starting with {) anywhere \u2014 they are ignored by the parser and serve as your reasoning log.`;
-}
-function buildSelectAutonomousPreamble(inputBlock) {
-  return `You are running as part of the experience-design-system-cli import pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
-
-Your task: review the components provided below and decide whether each belongs in Contentful Experience Orchestration as a Component Type. The input is a JSON array \u2014 you may receive 1\u2013N components in a single message. Emit one tool call per input component, named after the component. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation. Include a brief "reason" to document your reasoning for each decision.
-
-Key rule: accept any component that renders visible UI \u2014 atoms, molecules, and organisms are all valid Component Types in Contentful Experience Orchestration. Reject only components that produce zero visual output: React hooks, pure context providers, A/B testing or variant-routing wrappers, analytics trackers, and security utilities. Do NOT reject a component because it has few props, is low-level, or has some A/B testing or personalization-related props mixed in \u2014 those props are handled in the generate step.
-
-All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
-
-## Output protocol
-
-Do NOT write any files or emit any JSON blobs. Instead, emit JSON tool calls one per line to stdout. The CLI reads your stdout line by line.
-
-The two tool calls \u2014 emit exactly one per input component:
-
-\`\`\`
-{"tool":"select_component","name":"<ComponentName>","reason":"<brief reason>"}
-
-{"tool":"reject_component","name":"<ComponentName>","reason":"<brief reason>"}
-\`\`\`
-
-Rules:
-- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences.
-- Emit exactly one tool call per input component. The "name" field must match a component name from the input array exactly. Tool calls may appear in any order.
-- You may emit prose lines (not starting with {) to reason before each tool call \u2014 they are ignored by the parser.`;
-}
-function buildMapTokensAutonomousPreamble(inputBlock) {
-  return `You are running as part of the experience-design-system-cli generate pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
-
-Context: The components below already have design-category, token-typed props (\`$token.kind\` set). Your task is to decide, from source evidence, whether to narrow each one to a restricted subset (\`token_allowed\`) of the tokens matching its \`$token.kind\`. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation.
-
-All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
-
-## Output protocol
-
-Do NOT write any files or emit any JSON blobs. Instead, emit one JSON object per line to stdout for each prop you narrow. The CLI reads your stdout line by line and writes each decision directly to the pipeline database.
-
-The one tool call you may emit:
-
-\`\`\`
-{"tool":"map_token_prop","component":"<ComponentName>","prop":"<propName>","token_allowed":["colors.brand.primary","colors.brand.secondary"]}
-\`\`\`
-
-Rules:
-- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences around the lines.
-- Only emit a call for a prop that appears in the "Generated CDF so far" section.
-- Each "Token path index" section below is already scoped to one \`$token.kind\` \u2014 a prop only draws candidates from the section matching its own \`$token.kind\` (or the "full tree" section, for a prop with no \`$token.kind\`). Never cross sections, never emit a group/prefix path, and never invent a path \u2014 every entry in \`token_allowed\` must exist verbatim in the matching section.
-- \`token_allowed\` is required and must be non-empty when the call is emitted.
-- For the judgment call of whether a prop should be narrowed at all, follow the decision tree in the map-tokens skill file: it explains defaults vs. restrictions, misclassified variant-name props, and when to emit nothing.
-- You may emit prose lines (not starting with \`{\`) anywhere \u2014 they are ignored by the parser and serve as your reasoning log.`;
-}
-function buildTokensAutonomousPreamble(inputBlock) {
-  return `You are running as part of the experience-design-system-cli generate pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
-
-Your task: classify every raw token from the input below into a DTCG token tree. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation. Include a "description" field on each set_token call to document your reasoning.
-
-All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
-
-## Output protocol
-
-Do NOT write any files or emit any JSON blobs. Instead, emit one JSON object per line to stdout for each token or group. The CLI reads your stdout line by line and writes each entry directly to the pipeline database.
-
-The two tool calls you may emit are:
-
-\`\`\`
-{"tool":"set_group","path":"<dot.notation.path>","description":"<optional group description>"}
-
-{"tool":"set_token","path":"<dot.notation.path>","type":"<DTCG type>","value":<value>,"description":"<reason>"}
-\`\`\`
-
-Rules:
-- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences.
-- Emit a set_group call for every intermediate group node in the tree.
-- Emit a set_token call for every leaf token.
-- "path" is dot-notation, e.g. "colors.brand.primary" \u2014 no leading dots or slashes.
-- "type" must be one of the 13 valid DTCG types: color, dimension, fontFamily, fontWeight, duration, cubicBezier, number, strokeStyle, border, transition, shadow, gradient, typography.
-- "value" must be valid JSON (string, number, array, or object depending on the type). Do NOT wrap it in quotes if it is a complex type.
-- Emit set_group calls before the set_token calls that fall under them.
-- You may emit prose lines (not starting with {) anywhere \u2014 they are ignored by the parser and serve as your reasoning log.`;
-}
-var init_build_skill_preambles = __esm({
-  "packages/experience-design-system-generation/dist/src/services/prompts/helpers/build-skill-preambles.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/prompts/helpers/build-preamble.js
-function buildPreamble(options) {
-  const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs, existingComponentsInline, existingTokensInline, componentAllowlistInline } = 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 (componentAllowlistInline) {
-    sections.push(`Known component names for slot allowed_components (hard allowlist; never use any other name):
-\`\`\`json
-${componentAllowlistInline}
-\`\`\``);
-  }
-  if (rawComponentsInline) {
-    sections.push(`Raw component data (JSON):
-\`\`\`json
-${rawComponentsInline}
-\`\`\``);
-  }
-  if (rawTokensInline) {
-    const lang = inferFenceLang(rawTokensFilename);
-    const label = rawTokensFilename ? `Raw token source (${rawTokensFilename})` : "Raw token source";
-    sections.push(`${label}:
-\`\`\`${lang}
-${rawTokensInline}
-\`\`\``);
-  }
-  if (tokensInline) {
-    sections.push(`DTCG token data (for token kind lookups):
-\`\`\`json
-${tokensInline}
-\`\`\``);
-  }
-  if (tokenMapInline) {
-    sections.push(`Token-name sidecar (raw name \u2192 DTCG path):
-\`\`\`json
-${tokenMapInline}
-\`\`\``);
-  }
-  const filteredTokenProps = generatedCdf ? filterDesignTokenProps(generatedCdf) : void 0;
-  if (filteredTokenProps && Object.keys(filteredTokenProps.filtered).length > 0) {
-    sections.push(`Generated CDF so far \u2014 design-category token props only (JSON):
-\`\`\`json
-${JSON.stringify(filteredTokenProps.filtered)}
-\`\`\``);
-  }
-  if (tokenTree) {
-    sections.push(...buildTokenCandidateSections(tokenTree, filteredTokenProps));
-  }
-  if (componentSourceRefs && componentSourceRefs.length > 0) {
-    sections.push(...formatSourceRefsSection(componentSourceRefs, skill));
+function parseTokenToolCallLines(stdout) {
+  const calls = [];
+  const { objects, warnings } = readToolCallObjects(stdout);
+  for (const rec of objects) {
+    if (!VALID_TOKEN_TOOL_NAMES.has(rec.tool))
+      continue;
+    if (rec.tool === "set_token") {
+      if (typeof rec.path !== "string" || !rec.path) {
+        warnings.push("set_token missing path \u2014 skipped");
+        continue;
+      }
+      if (typeof rec.type !== "string" || !rec.type) {
+        warnings.push(`set_token '${rec.path}': missing type \u2014 skipped`);
+        continue;
+      }
+      if (!("value" in rec)) {
+        warnings.push(`set_token '${rec.path}': missing value \u2014 skipped`);
+        continue;
+      }
+      const call = { tool: "set_token", path: rec.path, type: rec.type, value: rec.value };
+      if (typeof rec.description === "string")
+        call.description = rec.description;
+      calls.push(call);
+    } else if (rec.tool === "set_group") {
+      if (typeof rec.path !== "string" || !rec.path) {
+        warnings.push("set_group missing path \u2014 skipped");
+        continue;
+      }
+      const call = { tool: "set_group", path: rec.path };
+      if (typeof rec.description === "string")
+        call.description = rec.description;
+      calls.push(call);
+    }
   }
-  const inputBlock = sections.length > 0 ? `
-
-${sections.join("\n\n")}` : "";
-  if (skill === "components")
-    return buildComponentsAutonomousPreamble(inputBlock);
-  if (skill === "select")
-    return buildSelectAutonomousPreamble(inputBlock);
-  if (skill === "map-tokens")
-    return buildMapTokensAutonomousPreamble(inputBlock);
-  return buildTokensAutonomousPreamble(inputBlock);
+  return { calls, warnings };
 }
-var init_build_preamble = __esm({
-  "packages/experience-design-system-generation/dist/src/services/prompts/helpers/build-preamble.js"() {
-    "use strict";
-    init_format_token_candidates();
-    init_format_source_refs();
-    init_build_skill_preambles();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/prompts/build-prompt.js
-async function buildPrompt(options) {
-  const skillContent = options.skillContentOverride ?? await readSkillFile(options.skill, options.skillPathOverride);
-  const preamble = buildPreamble(options);
-  return `${preamble}
-
-Skill instructions follow:
----
-${skillContent}`;
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((v) => typeof v === "string");
 }
-var init_build_prompt = __esm({
-  "packages/experience-design-system-generation/dist/src/services/prompts/build-prompt.js"() {
-    "use strict";
-    init_resolve_skill_file();
-    init_build_preamble();
-    init_resolve_skill_file();
+function parseMapTokenPropToolCallLines(stdout) {
+  const calls = [];
+  const warnings = [];
+  for (const raw of stdout.split("\n")) {
+    const line = raw.trim();
+    if (!line.startsWith("{"))
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      continue;
+    }
+    if (typeof obj !== "object" || obj === null || !("tool" in obj))
+      continue;
+    const rec = obj;
+    if (rec.tool !== "map_token_prop")
+      continue;
+    if (typeof rec.component !== "string" || !rec.component) {
+      warnings.push("map_token_prop missing component \u2014 skipped");
+      continue;
+    }
+    if (typeof rec.prop !== "string" || !rec.prop) {
+      warnings.push(`map_token_prop '${rec.component}': missing prop \u2014 skipped`);
+      continue;
+    }
+    if (!isStringArray(rec.token_allowed) || rec.token_allowed.length === 0) {
+      warnings.push(`map_token_prop '${rec.component}.${String(rec.prop)}': missing or empty token_allowed \u2014 skipped`);
+      continue;
+    }
+    const call = {
+      tool: "map_token_prop",
+      component: rec.component,
+      prop: rec.prop,
+      token_allowed: rec.token_allowed
+    };
+    calls.push(call);
   }
-});
-
-// packages/experience-design-system-generation/dist/src/orchestrator/execute-generation-orchestrator.js
-async function executeGenerationOrchestrator(request2) {
-  const prompt = await buildPrompt(request2.promptOptions);
-  return request2.invoker.invoke({
-    agent: request2.agent,
-    model: request2.model,
-    bedrock: request2.bedrock,
-    prompt,
-    timeoutMs: request2.timeoutMs,
-    onOutput: request2.onOutput
-  });
+  return { calls, warnings };
 }
-var init_execute_generation_orchestrator = __esm({
-  "packages/experience-design-system-generation/dist/src/orchestrator/execute-generation-orchestrator.js"() {
-    "use strict";
-    init_build_prompt();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/helpers/resolve-agent-binary.js
-function resolveAgentBinary(agent) {
+function resolveBinary(agent) {
   const envKey = `EDS_AGENT_BINARY_${agent.toUpperCase()}`;
   const override = process.env[envKey];
   if (override && override.trim())
     return override.trim();
   return AGENT_BINARIES[agent];
 }
-var init_resolve_agent_binary = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/helpers/resolve-agent-binary.js"() {
-    "use strict";
-    init_agent_names();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/helpers/build-agent-args.js
 function agentSupportsBedrock(agent) {
   return BEDROCK_CAPABLE_AGENTS.has(agent);
 }
-function withBedrockProviderPrefix(model) {
-  return model.includes("/") ? model : `amazon-bedrock/${model}`;
-}
 function resolveAgentModel(agent, explicit, bedrock = false) {
   if (explicit && explicit.trim())
     return explicit.trim();
@@ -676,11 +442,14 @@ function resolveAgentModel(agent, explicit, bedrock = false) {
     return withBedrockProviderPrefix(DEFAULT_OPENCODE_MODEL);
   return DEFAULT_MODELS[agent];
 }
+function withBedrockProviderPrefix(model) {
+  return model.includes("/") ? model : `amazon-bedrock/${model}`;
+}
 function codexBedrockConfigArgs() {
   const region = process.env.AWS_REGION?.trim() || process.env.AWS_DEFAULT_REGION?.trim() || DEFAULT_CODEX_BEDROCK_REGION;
   return ["-c", "model_provider=amazon-bedrock", "-c", `model_providers.amazon-bedrock.region=${region}`];
 }
-function buildAgentArgs(agent, prompt, model, promptViaStdin = false, bedrock = false) {
+function buildArgs(agent, prompt, model, promptViaStdin = false, bedrock = false) {
   const resolvedModel = resolveAgentModel(agent, model, bedrock);
   const modelArg = resolvedModel ? ["--model", resolvedModel] : [];
   const promptArg = promptViaStdin ? [] : [prompt];
@@ -702,69 +471,12 @@ function buildAgentArgs(agent, prompt, model, promptViaStdin = false, bedrock =
     }
   }
 }
-var BEDROCK_ENV_BY_AGENT, BEDROCK_CAPABLE_AGENTS, DEFAULT_CODEX_BEDROCK_REGION, DEFAULT_OPENCODE_MODEL, DEFAULT_CODEX_BEDROCK_MODEL, DEFAULT_MODELS;
-var init_build_agent_args = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/helpers/build-agent-args.js"() {
-    "use strict";
-    BEDROCK_ENV_BY_AGENT = {
-      claude: { CLAUDE_CODE_USE_BEDROCK: "1" }
-    };
-    BEDROCK_CAPABLE_AGENTS = /* @__PURE__ */ new Set(["claude", "codex", "opencode"]);
-    DEFAULT_CODEX_BEDROCK_REGION = "us-east-1";
-    DEFAULT_OPENCODE_MODEL = "claude-haiku-4-5";
-    DEFAULT_CODEX_BEDROCK_MODEL = "openai.gpt-5.6-luna";
-    DEFAULT_MODELS = {
-      claude: "haiku",
-      opencode: DEFAULT_OPENCODE_MODEL,
-      cursor: "gpt-mini",
-      copilot: "Auto"
-    };
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/helpers/describe-agent-failure.js
-function describeAgentFailure(result, maxDetail = 800) {
-  const base = result.exitCode !== 0 ? `agent exited with code ${result.exitCode}` : "agent produced no tool calls";
-  const detail = (result.stderr.trim() || result.stdout.trim()).slice(-maxDetail).trim();
-  return detail ? `${base} \u2014 ${detail}` : base;
-}
-var init_describe_agent_failure = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/helpers/describe-agent-failure.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/helpers/extract-sentinel-output.js
-function extractSentinelOutput(stdout) {
-  const START = "<<<EDS_OUTPUT_START>>>";
-  const END = "<<<EDS_OUTPUT_END>>>";
-  const startIdx = stdout.indexOf(START);
-  const endIdx = stdout.indexOf(END);
-  if (startIdx === -1 || endIdx === -1 || endIdx <= startIdx)
-    return null;
-  const secondStart = stdout.indexOf(START, startIdx + START.length);
-  if (secondStart !== -1 && secondStart < endIdx)
-    return "multiple";
-  const afterStart = stdout.indexOf(END, startIdx);
-  const secondEnd = stdout.indexOf(END, afterStart + END.length);
-  if (secondEnd !== -1)
-    return "multiple";
-  return stdout.slice(startIdx + START.length, endIdx).trim();
-}
-var init_extract_sentinel_output = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/helpers/extract-sentinel-output.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/run-agent.js
-import { spawn } from "node:child_process";
 async function runAgent(options) {
   const { agent, prompt, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
   const bedrock = options.bedrock ?? process.env.EDS_BEDROCK === "1";
-  const binary = resolveAgentBinary(agent);
+  const binary = resolveBinary(agent);
   const useStdin2 = !!promptViaStdin;
-  const args = buildAgentArgs(agent, prompt, model, useStdin2, bedrock);
+  const args = buildArgs(agent, prompt, model, useStdin2, bedrock);
   const startedAt = Date.now();
   onDebugEvent?.("run.start", {
     agent,
@@ -807,7 +519,12 @@ async function runAgent(options) {
     });
     child.on("close", (code, signal) => {
       clearTimeout(timer);
-      const result = { exitCode: signal ? 1 : code ?? 1, stdout, stderr, timedOut };
+      const result = {
+        exitCode: signal ? 1 : code ?? 1,
+        stdout,
+        stderr,
+        timedOut
+      };
       onDebugEvent?.("run.end", {
         agent,
         model,
@@ -823,21 +540,22 @@ async function runAgent(options) {
     });
   });
 }
-var init_run_agent = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/run-agent.js"() {
-    "use strict";
-    init_resolve_agent_binary();
-    init_build_agent_args();
-    init_describe_agent_failure();
-    init_extract_sentinel_output();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/helpers/check-claude-auth.js
-import { spawn as spawn2 } from "node:child_process";
-function checkClaudeAuth(binary) {
+async function checkAgentAuth(agent) {
+  const binary = resolveBinary(agent);
+  const binaryExists2 = await new Promise((resolve21) => {
+    if (binary.startsWith("/")) {
+      import("node:fs/promises").then((fs2) => fs2.access(binary).then(() => resolve21(true), () => resolve21(false)));
+      return;
+    }
+    const child = spawn(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
+    child.on("close", (code) => resolve21(code === 0));
+  });
+  if (!binaryExists2)
+    return "not-found";
+  if (agent !== "claude")
+    return "ok";
   return new Promise((resolve21) => {
-    const child = spawn2(binary, ["auth", "status", "--json"], {
+    const child = spawn(binary, ["auth", "status", "--json"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     let stdout = "";
@@ -858,51 +576,75 @@ function checkClaudeAuth(binary) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve21("unauthenticated");
-        return;
-      }
-      try {
-        const status = JSON.parse(stdout);
-        resolve21(status.loggedIn ? "ok" : "unauthenticated");
-      } catch {
-        resolve21("unauthenticated");
-      }
-    });
-  });
-}
-var init_check_claude_auth = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/helpers/check-claude-auth.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/services/agent/helpers/check-agent-auth.js
-import { spawn as spawn3 } from "node:child_process";
-async function checkAgentAuth(agent) {
-  const binary = resolveAgentBinary(agent);
-  const binaryExists2 = await new Promise((resolve21) => {
-    if (binary.startsWith("/")) {
-      import("node:fs/promises").then((fs2) => fs2.access(binary).then(() => resolve21(true), () => resolve21(false)));
-      return;
-    }
-    const child = spawn3(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve21(code === 0));
+        resolve21("unauthenticated");
+        return;
+      }
+      try {
+        const status = JSON.parse(stdout);
+        resolve21(status.loggedIn ? "ok" : "unauthenticated");
+      } catch {
+        resolve21("unauthenticated");
+      }
+    });
   });
-  if (!binaryExists2)
-    return "not-found";
-  if (agent !== "claude")
-    return "ok";
-  return checkClaudeAuth(binary);
 }
-var init_check_agent_auth = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/helpers/check-agent-auth.js"() {
+function describeAgentFailure(result, maxDetail = 800) {
+  const base = result.exitCode !== 0 ? `agent exited with code ${result.exitCode}` : "agent produced no tool calls";
+  const detail = (result.stderr.trim() || result.stdout.trim()).slice(-maxDetail).trim();
+  return detail ? `${base} \u2014 ${detail}` : base;
+}
+function extractSentinelOutput(stdout) {
+  const START = "<<<EDS_OUTPUT_START>>>";
+  const END = "<<<EDS_OUTPUT_END>>>";
+  const startIdx = stdout.indexOf(START);
+  const endIdx = stdout.indexOf(END);
+  if (startIdx === -1 || endIdx === -1 || endIdx <= startIdx)
+    return null;
+  const secondStart = stdout.indexOf(START, startIdx + START.length);
+  if (secondStart !== -1 && secondStart < endIdx)
+    return "multiple";
+  const afterStart = stdout.indexOf(END, startIdx);
+  const secondEnd = stdout.indexOf(END, afterStart + END.length);
+  if (secondEnd !== -1)
+    return "multiple";
+  return stdout.slice(startIdx + START.length, endIdx).trim();
+}
+var VALID_SELECT_TOOL_NAMES, VALID_TOOL_NAMES, VALID_TOKEN_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES, AGENT_BINARIES, BEDROCK_ENV_BY_AGENT, BEDROCK_CAPABLE_AGENTS, DEFAULT_CODEX_BEDROCK_REGION, DEFAULT_OPENCODE_MODEL, DEFAULT_MODELS, DEFAULT_CODEX_BEDROCK_MODEL;
+var init_agent_runner = __esm({
+  "packages/experience-design-system-generation/dist/src/agent-runner.js"() {
     "use strict";
-    init_resolve_agent_binary();
-    init_check_claude_auth();
+    init_agent_names();
+    VALID_SELECT_TOOL_NAMES = /* @__PURE__ */ new Set(["select_component", "reject_component"]);
+    VALID_TOOL_NAMES = /* @__PURE__ */ new Set(["classify_prop", "exclude_prop", "classify_component", "classify_slot"]);
+    VALID_TOKEN_TOOL_NAMES = /* @__PURE__ */ new Set(["set_token", "set_group"]);
+    VALID_CDF_TYPES = /* @__PURE__ */ new Set(["string", "richtext", "media", "enum", "token", "boolean"]);
+    VALID_CATEGORIES = /* @__PURE__ */ new Set(["content", "design", "state"]);
+    AGENT_BINARIES = {
+      claude: "claude",
+      codex: "codex",
+      opencode: "opencode",
+      cursor: "cursor-agent",
+      copilot: "copilot"
+    };
+    BEDROCK_ENV_BY_AGENT = {
+      claude: { CLAUDE_CODE_USE_BEDROCK: "1" }
+    };
+    BEDROCK_CAPABLE_AGENTS = /* @__PURE__ */ new Set(["claude", "codex", "opencode"]);
+    DEFAULT_CODEX_BEDROCK_REGION = "us-east-1";
+    DEFAULT_OPENCODE_MODEL = "claude-haiku-4-5";
+    DEFAULT_MODELS = {
+      claude: "haiku",
+      opencode: DEFAULT_OPENCODE_MODEL,
+      cursor: "gpt-mini",
+      // cursor alias for gpt-5.4-mini-medium; haiku not in cursor's catalog
+      copilot: "Auto"
+      // the only model guaranteed on every Copilot plan (Free/Pro/Business/Enterprise); Pro+ users override via EDS_AGENT_MODEL_COPILOT
+    };
+    DEFAULT_CODEX_BEDROCK_MODEL = "openai.gpt-5.6-luna";
   }
 });
 
-// packages/experience-design-system-generation/dist/src/services/agent/local-cli-agent-invoker.js
+// packages/experience-design-system-generation/dist/src/agent-invoker.js
 function createLocalCliAgentInvoker(options = {}) {
   const { onDebugEvent } = options;
   return {
@@ -914,310 +656,381 @@ function createLocalCliAgentInvoker(options = {}) {
     }
   };
 }
-var init_local_cli_agent_invoker = __esm({
-  "packages/experience-design-system-generation/dist/src/services/agent/local-cli-agent-invoker.js"() {
+var init_agent_invoker = __esm({
+  "packages/experience-design-system-generation/dist/src/agent-invoker.js"() {
     "use strict";
-    init_run_agent();
-    init_check_agent_auth();
+    init_agent_runner();
   }
 });
 
-// packages/experience-design-system-generation/dist/src/controller/create-generation-endpoint.js
-function createGenerationEndpoint(options = {}) {
-  const invoker2 = createLocalCliAgentInvoker({ onDebugEvent: options.onDebugEvent });
-  return {
-    async run(request2) {
-      validateGenerationRequest(request2);
-      return executeGenerationOrchestrator({ ...request2, invoker: invoker2 });
-    },
-    checkAuth(agent) {
-      return invoker2.checkAuth(agent);
-    }
-  };
+// packages/experience-design-system-generation/dist/src/prompt-builder.js
+import { existsSync } from "node:fs";
+import { readFile as readFile2 } from "node:fs/promises";
+import { dirname, join as join2, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import { flattenDTCG } from "@contentful/experience-design-system-types";
+function formatCustomPromptBanner(skill, path) {
+  return `WARNING: Custom prompt active for ${skill}: ${path}
+  Bundled invariants (utility-wrapper rejection, description content rules) do NOT apply.
+  You are responsible for the prompt's correctness.
+`;
 }
-var init_create_generation_endpoint = __esm({
-  "packages/experience-design-system-generation/dist/src/controller/create-generation-endpoint.js"() {
-    "use strict";
-    init_validate_generation_request();
-    init_execute_generation_orchestrator();
-    init_local_cli_agent_invoker();
-  }
-});
+async function buildPrompt(options) {
+  const skillContent = options.skillContentOverride ?? await readSkillFile(options.skill, options.skillPathOverride);
+  const preamble = buildPreamble(options);
+  return `${preamble}
 
-// packages/experience-design-system-generation/dist/src/services/parsing/helpers/read-tool-call-objects.js
-function findJsonObjectEnd(line) {
-  let depth = 0;
-  let inString = false;
-  let escaped = false;
-  for (let i = 0; i < line.length; i++) {
-    const ch = line[i];
-    if (escaped) {
-      escaped = false;
-    } else if (ch === "\\" && inString) {
-      escaped = true;
-    } else if (ch === '"') {
-      inString = !inString;
-    } else if (!inString && ch === "{") {
-      depth++;
-    } else if (!inString && ch === "}" && --depth === 0) {
-      return i;
+Skill instructions follow:
+---
+${skillContent}`;
+}
+function resolveSkillPath(skill) {
+  if (!(skill in SKILL_FILES))
+    throw new Error(`Invalid skill: ${skill}`);
+  const thisDir = dirname(fileURLToPath(import.meta.url));
+  let dir = thisDir;
+  for (; ; ) {
+    const candidate = join2(dir, "skills");
+    if (existsSync(candidate))
+      return join2(candidate, SKILL_FILES[skill]);
+    const parent = resolve(dir, "..");
+    if (parent === dir) {
+      throw new Error(`skill file missing from CLI installation (could not locate skills/ directory from: ${thisDir})`);
     }
+    dir = parent;
   }
-  return -1;
 }
-function readToolCallObjects(stdout) {
-  const objects = [];
-  const warnings = [];
-  for (const raw of stdout.split("\n")) {
-    const line = raw.trim();
-    if (!line.startsWith("{"))
-      continue;
-    const end = findJsonObjectEnd(line);
-    if (end === -1) {
-      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
-      continue;
-    }
-    let parsed;
+async function readSkillFile(skill, override) {
+  if (override) {
+    const skillPath2 = resolve(override);
     try {
-      parsed = JSON.parse(line.slice(0, end + 1));
+      return await readFile2(skillPath2, "utf8");
     } catch {
-      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
-      continue;
-    }
-    const trailing = line.slice(end + 1);
-    if (trailing.trim()) {
-      warnings.push(`ignored trailing content after JSON: ${trailing.trim().slice(0, 120)}`);
-    }
-    if (typeof parsed === "object" && parsed !== null && "tool" in parsed) {
-      objects.push(parsed);
+      throw new Error(`custom prompt file not found (skill: ${skill}, path: ${skillPath2})`);
     }
   }
-  return { objects, warnings };
-}
-var init_read_tool_call_objects = __esm({
-  "packages/experience-design-system-generation/dist/src/services/parsing/helpers/read-tool-call-objects.js"() {
-    "use strict";
+  const skillPath = resolveSkillPath(skill);
+  try {
+    return await readFile2(skillPath, "utf8");
+  } catch {
+    throw new Error(`skill file missing from CLI installation \u2014 try reinstalling the CLI (looked for: ${skillPath})`);
   }
-});
-
-// packages/experience-design-system-generation/dist/src/services/parsing/parse-prop-tool-calls.js
-function parsePropToolCallLines(stdout) {
-  const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
-  for (const rec of objects) {
-    if (!VALID_TOOL_NAMES.has(rec.tool)) {
-      warnings.push(`unknown tool: ${String(rec.tool)}`);
-      continue;
-    }
-    const tool = rec.tool;
-    if (tool === "classify_prop") {
-      if (typeof rec.prop !== "string" || !rec.prop) {
-        warnings.push("classify_prop missing prop name \u2014 skipped");
-        continue;
-      }
-      if (typeof rec.cdf_type !== "string" || !VALID_CDF_TYPES.has(rec.cdf_type)) {
-        warnings.push(`classify_prop '${rec.prop}': invalid cdf_type '${String(rec.cdf_type)}' \u2014 skipped`);
-        continue;
-      }
-      if (typeof rec.cdf_category !== "string" || !VALID_CATEGORIES.has(rec.cdf_category)) {
-        warnings.push(`classify_prop '${rec.prop}': invalid cdf_category '${String(rec.cdf_category)}' \u2014 skipped`);
-        continue;
-      }
-      const call = {
-        tool: "classify_prop",
-        prop: rec.prop,
-        cdf_type: rec.cdf_type,
-        cdf_category: rec.cdf_category
-      };
-      if (Array.isArray(rec.values) && rec.values.every((v) => typeof v === "string"))
-        call.values = rec.values;
-      if (typeof rec.token_kind === "string")
-        call.token_kind = rec.token_kind;
-      if (typeof rec.required === "boolean")
-        call.required = rec.required;
-      if (typeof rec.description === "string")
-        call.description = rec.description;
-      if (typeof rec.default === "string" || typeof rec.default === "boolean")
-        call.default = rec.default;
-      if (typeof rec.reason === "string")
-        call.reason = rec.reason;
-      calls.push(call);
-    } else if (tool === "exclude_prop") {
-      if (typeof rec.prop !== "string" || !rec.prop) {
-        warnings.push("exclude_prop missing prop name \u2014 skipped");
-        continue;
-      }
-      calls.push({ tool: "exclude_prop", prop: rec.prop, reason: typeof rec.reason === "string" ? rec.reason : "" });
-    } else if (tool === "classify_component") {
-      const call = { tool: "classify_component" };
-      if (typeof rec.description === "string")
-        call.description = rec.description;
-      if (typeof rec.rationale === "object" && rec.rationale !== null) {
-        const r = rec.rationale;
-        const rationale = {};
-        if (typeof r.description === "string")
-          rationale.description = r.description;
-        if (typeof r.props === "string")
-          rationale.props = r.props;
-        if (typeof r.slots === "string")
-          rationale.slots = r.slots;
-        if (Object.keys(rationale).length > 0)
-          call.rationale = rationale;
-      }
-      calls.push(call);
-    } else if (tool === "classify_slot") {
-      if (typeof rec.slot !== "string" || !rec.slot) {
-        warnings.push("classify_slot missing slot name \u2014 skipped");
-        continue;
-      }
-      const call = { tool: "classify_slot", slot: rec.slot };
-      if (typeof rec.required === "boolean")
-        call.required = rec.required;
-      if (Array.isArray(rec.allowed_components) && rec.allowed_components.every((v) => typeof v === "string")) {
-        call.allowed_components = rec.allowed_components;
+}
+function inferFenceLang(filename) {
+  if (!filename)
+    return "json";
+  const ext = filename.split(".").pop()?.toLowerCase() ?? "";
+  const map = {
+    js: "js",
+    mjs: "js",
+    cjs: "js",
+    ts: "ts",
+    mts: "ts",
+    cts: "ts",
+    tsx: "tsx",
+    jsx: "jsx",
+    vue: "vue",
+    svelte: "svelte",
+    astro: "astro",
+    scss: "scss",
+    sass: "scss",
+    css: "css",
+    json: "json",
+    json5: "json"
+  };
+  return map[ext] ?? "text";
+}
+function filterDesignTokenProps(cdf) {
+  const result = {};
+  const kinds = /* @__PURE__ */ new Set();
+  let hasUnscoped = false;
+  for (const [componentName, component] of Object.entries(cdf)) {
+    const properties = component.$properties;
+    if (!properties)
+      continue;
+    const filteredProps = {};
+    for (const [propName, prop] of Object.entries(properties)) {
+      if (prop.$type === "token" && prop.$category === "design") {
+        const { "$token.allowed": _tokenAllowed, ...rest } = prop;
+        filteredProps[propName] = rest;
+        const kind = prop["$token.kind"];
+        if (typeof kind === "string" && kind.length > 0) {
+          kinds.add(kind);
+        } else {
+          hasUnscoped = true;
+        }
       }
-      if (typeof rec.description === "string")
-        call.description = rec.description;
-      if (typeof rec.rationale === "string")
-        call.rationale = rec.rationale;
-      calls.push(call);
+    }
+    if (Object.keys(filteredProps).length > 0) {
+      result[componentName] = { ...component, $properties: filteredProps };
     }
   }
-  return { calls, warnings };
+  return { filtered: result, kinds: [...kinds].sort(), hasUnscoped };
 }
-var VALID_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES;
-var init_parse_prop_tool_calls = __esm({
-  "packages/experience-design-system-generation/dist/src/services/parsing/parse-prop-tool-calls.js"() {
-    "use strict";
-    init_read_tool_call_objects();
-    VALID_TOOL_NAMES = /* @__PURE__ */ new Set(["classify_prop", "exclude_prop", "classify_component", "classify_slot"]);
-    VALID_CDF_TYPES = /* @__PURE__ */ new Set(["string", "richtext", "media", "enum", "token", "boolean"]);
-    VALID_CATEGORIES = /* @__PURE__ */ new Set(["content", "design", "state"]);
+function formatTokenCandidateLines(entries) {
+  return entries.map((entry) => `${entry.path} \xB7 ${entry.$type}`).join("\n");
+}
+function renderTokenCandidateSection(kind, entries) {
+  const label = kind ? `Token path index \u2014 ${kind} candidates only` : "Token path index \u2014 full tree (no $token.kind to scope by)";
+  return `${label}, one leaf token per line as \`path \xB7 type\`, no \`$value\`:
+${formatTokenCandidateLines(entries)}`;
+}
+function buildPreamble(options) {
+  const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs, existingComponentsInline, existingTokensInline, componentAllowlistInline } = 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}
+\`\`\``);
   }
-});
-
-// packages/experience-design-system-generation/dist/src/services/parsing/parse-select-tool-calls.js
-function parseSelectToolCallLines(stdout) {
-  const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
-  for (const rec of objects) {
-    if (!VALID_SELECT_TOOL_NAMES.has(rec.tool))
-      continue;
-    if (typeof rec.name !== "string" || !rec.name) {
-      warnings.push(`${String(rec.tool)} missing name \u2014 skipped`);
-      continue;
-    }
-    const call = { tool: rec.tool, name: rec.name };
-    if (typeof rec.reason === "string")
-      call.reason = rec.reason;
-    if (typeof rec.confidence === "number" && rec.confidence >= 1 && rec.confidence <= 5) {
-      if (call.tool === "select_component") {
-        call.confidence = rec.confidence;
+  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 (componentAllowlistInline) {
+    sections.push(`Known component names for slot allowed_components (hard allowlist; never use any other name):
+\`\`\`json
+${componentAllowlistInline}
+\`\`\``);
+  }
+  if (rawComponentsInline) {
+    sections.push(`Raw component data (JSON):
+\`\`\`json
+${rawComponentsInline}
+\`\`\``);
+  }
+  if (rawTokensInline) {
+    const lang = inferFenceLang(rawTokensFilename);
+    const label = rawTokensFilename ? `Raw token source (${rawTokensFilename})` : "Raw token source";
+    sections.push(`${label}:
+\`\`\`${lang}
+${rawTokensInline}
+\`\`\``);
+  }
+  if (tokensInline) {
+    sections.push(`DTCG token data (for token kind lookups):
+\`\`\`json
+${tokensInline}
+\`\`\``);
+  }
+  if (tokenMapInline) {
+    sections.push(`Token-name sidecar (raw name \u2192 DTCG path):
+\`\`\`json
+${tokenMapInline}
+\`\`\``);
+  }
+  const filteredTokenProps = generatedCdf ? filterDesignTokenProps(generatedCdf) : void 0;
+  if (filteredTokenProps && Object.keys(filteredTokenProps.filtered).length > 0) {
+    sections.push(`Generated CDF so far \u2014 design-category token props only (JSON):
+\`\`\`json
+${JSON.stringify(filteredTokenProps.filtered)}
+\`\`\``);
+  }
+  if (tokenTree) {
+    const index = flattenDTCG(tokenTree, "").sort((a, b) => a.path.localeCompare(b.path));
+    if (index.length > 0) {
+      if (filteredTokenProps) {
+        const { kinds, hasUnscoped } = filteredTokenProps;
+        for (const kind of kinds) {
+          const scoped = index.filter((entry) => entry.$type === kind);
+          if (scoped.length > 0)
+            sections.push(renderTokenCandidateSection(kind, scoped));
+        }
+        if (hasUnscoped)
+          sections.push(renderTokenCandidateSection(null, index));
       } else {
-        call.confidence = rec.confidence;
+        sections.push(renderTokenCandidateSection(null, index));
       }
     }
-    calls.push(call);
   }
-  return { calls, warnings };
-}
-var VALID_SELECT_TOOL_NAMES;
-var init_parse_select_tool_calls = __esm({
-  "packages/experience-design-system-generation/dist/src/services/parsing/parse-select-tool-calls.js"() {
-    "use strict";
-    init_read_tool_call_objects();
-    VALID_SELECT_TOOL_NAMES = /* @__PURE__ */ new Set(["select_component", "reject_component"]);
-  }
-});
+  if (componentSourceRefs && componentSourceRefs.length > 0) {
+    const withContent = componentSourceRefs.filter((ref) => ref.content != null);
+    const withoutContent = componentSourceRefs.filter((ref) => ref.content == null);
+    if (withContent.length > 0) {
+      const blocks = withContent.map((ref) => {
+        const mainBlock = `#### ${ref.component} (\`${ref.sourcePath}\`)
+\`\`\`${inferFenceLang(ref.sourcePath)}
+${ref.content}
+\`\`\``;
+        const siblingBlocks = (ref.siblingFiles ?? []).map((sibling) => `##### ${ref.component} \u2014 imported file \`${sibling.path}\`
+\`\`\`${inferFenceLang(sibling.path)}
+${sibling.content}
+\`\`\``);
+        const truncationNote = ref.truncatedSiblingCount && ref.truncatedSiblingCount > 0 ? [
+          `##### ${ref.component} \u2014 +${ref.truncatedSiblingCount} more imported file${ref.truncatedSiblingCount === 1 ? "" : "s"} not shown (evidence may be incomplete)`
+        ] : [];
+        const notShownNote = ref.usesNotShown && ref.usesNotShown.length > 0 ? [
+          `##### ${ref.component} \u2014 uses not shown: ${ref.usesNotShown.join(", ")}
 
-// packages/experience-design-system-generation/dist/src/services/parsing/parse-token-tool-calls.js
-function parseTokenToolCallLines(stdout) {
-  const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
-  for (const rec of objects) {
-    if (!VALID_TOKEN_TOOL_NAMES.has(rec.tool))
-      continue;
-    if (rec.tool === "set_token") {
-      if (typeof rec.path !== "string" || !rec.path) {
-        warnings.push("set_token missing path \u2014 skipped");
-        continue;
-      }
-      if (typeof rec.type !== "string" || !rec.type) {
-        warnings.push(`set_token '${rec.path}': missing type \u2014 skipped`);
-        continue;
-      }
-      if (!("value" in rec)) {
-        warnings.push(`set_token '${rec.path}': missing value \u2014 skipped`);
-        continue;
-      }
-      const call = { tool: "set_token", path: rec.path, type: rec.type, value: rec.value };
-      if (typeof rec.description === "string")
-        call.description = rec.description;
-      calls.push(call);
-    } else if (rec.tool === "set_group") {
-      if (typeof rec.path !== "string" || !rec.path) {
-        warnings.push("set_group missing path \u2014 skipped");
-        continue;
-      }
-      const call = { tool: "set_group", path: rec.path };
-      if (typeof rec.description === "string")
-        call.description = rec.description;
-      calls.push(call);
+The files above are excerpts, and each of these properties has at least one use that fell outside the excerpt budget. Treat their consumption as unknown, not absent: do not classify them \`token\` on what is shown, and do not conclude they are unread.`
+        ] : [];
+        return [mainBlock, ...siblingBlocks, ...truncationNote, ...notShownNote].join("\n\n");
+      });
+      sections.push(`### Component source references
+
+${blocks.join("\n\n")}`);
+    }
+    if (withoutContent.length > 0) {
+      const guidance = skill === "components" ? "there is no consumption evidence for these, so `token` cannot be earned for any of their props \u2014 classify from the prop signature alone, and any prop that would otherwise be enum-versus-token is `enum` (or `string`)" : "there is no source evidence to narrow from \u2014 emit nothing for their props";
+      sections.push(`Component source unavailable for (JSON) \u2014 ${guidance}:
+\`\`\`json
+${JSON.stringify(withoutContent.map((ref) => ({ component: ref.component, sourcePath: ref.sourcePath })))}
+\`\`\``);
     }
   }
-  return { calls, warnings };
-}
-var VALID_TOKEN_TOOL_NAMES;
-var init_parse_token_tool_calls = __esm({
-  "packages/experience-design-system-generation/dist/src/services/parsing/parse-token-tool-calls.js"() {
-    "use strict";
-    init_read_tool_call_objects();
-    VALID_TOKEN_TOOL_NAMES = /* @__PURE__ */ new Set(["set_token", "set_group"]);
+  const inputBlock = sections.length > 0 ? `
+
+${sections.join("\n\n")}` : "";
+  if (skill === "components") {
+    return buildComponentsAutonomousPreamble(inputBlock);
   }
-});
+  if (skill === "select") {
+    return buildSelectAutonomousPreamble(inputBlock);
+  }
+  if (skill === "map-tokens") {
+    return buildMapTokensAutonomousPreamble(inputBlock);
+  }
+  return buildTokensAutonomousPreamble(inputBlock);
+}
+function buildComponentsAutonomousPreamble(inputBlock) {
+  return `You are running as part of the experience-design-system-cli generate pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
+
+Context: You are classifying a React component for **Contentful Experience Orchestration**. The result is a Component Type \u2014 a schema that tells Contentful what a marketer can configure. Properties fall into three categories:
+- **design**: controls how the component looks (variant, size, color, layout toggles)
+- **content**: the data a content editor fills in (text, images, URLs, rich text)
+- **state**: runtime behavioral flags (disabled, loading, expanded, identifiers)
+
+Your task: classify every prop and slot in the component below. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation. Include a "description" field on each tool call to document your reasoning so the developer can review it afterward.
+
+All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
+
+## Output protocol
+
+Do NOT write any files or emit any JSON blobs. Instead, emit one JSON object per line to stdout for each classification decision. The CLI reads your stdout line by line and writes each decision directly to the pipeline database.
+
+The four tool calls you may emit are:
+
+\`\`\`
+{"tool":"classify_component","description":"<optional component-level description>","rationale":{"description":"<why this component is classified the way it is>","props":"<why these props were chosen>","slots":"<why these slots were chosen>"}}
+
+{"tool":"classify_prop","prop":"<propName>","cdf_type":"<type>","cdf_category":"<category>","required":<bool>,"description":"<short customer-facing description>","reason":"<full internal rationale; not customer-facing>","values":["a","b"],"token_kind":"color","default":"<value>"}
+
+{"tool":"exclude_prop","prop":"<propName>","reason":"<why excluded>"}
+
+{"tool":"classify_slot","slot":"<slotName>","required":<bool>,"allowed_components":["ComponentName"],"description":"<reason>","rationale":"<why this slot was kept in the catalog>"}
+\`\`\`
+
+Rules:
+- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences around the lines.
+- Every prop in the input must have exactly one call: either classify_prop or exclude_prop.
+- Every slot in the input must have exactly one classify_slot call.
+- Valid cdf_type values: string, richtext, media, enum, token, boolean
+- Valid cdf_category values: content, design, state
+- For enum type, always include \`values\` (non-empty string array of the variant names the prop accepts).
+- For token type, always include \`token_kind\` (DTCG $type, e.g. "color"). **Never emit \`values\` for \`cdf_type: "token"\` props** \u2014 an enum prop's list holds variant names; a token prop's list holds design token paths, produced separately and never by you. Emitting \`values\` on a token prop makes the definition invalid.
+- Never emit both "values" and "token_kind" on one prop.
+- \`enum\` vs \`token\` is decided by three questions answered in order from the source shown \u2014 never from the TypeScript type. Q1: does the component look the value up, switch on it, or have a vocabulary for it (\`tokens[x]\`, \`switch (variant)\`, \`allowedValues\`)? yes \u2192 \`enum\`, stop.
+- Q2: is the value written straight into a style or attribute (\`rx={radius}\`, \`padding: \${padding}\`)? no \u2192 not \`token\`, apply the type rules.
+- Q3: is there a design-token reference at that use \u2014 a \`tokens.*\` parameter default, a \`tokenReference\`, an inline \`tokens.*\` / \`var(--*)\`? yes \u2192 \`token\` (cite both lines in "reason"); no \u2192 \`string\`. "Ambiguity resolves to \`enum\`" applies only when Q1\u2013Q3 cannot be answered from the source shown.
+- CSS design props (className, style, styles, positional/geometric props: top, bottom, left, right, rotation, offset, etc.) \u2192 classify_prop, cdf_type: "string", cdf_category: "design".
+- For \`classify_slot.allowed_components\`, use only exact names from the hard allowlist provided below. Never invent a child from an import, JSX element, type name, icon name, or implementation helper; if a child is not listed, omit it.
+- On classify_component, "rationale" fields are operator-facing (read-only) but may surface in customer-facing exports. The "rationale.description" field is subject to the description content rules in the skill prompt (no internal initiative names). "rationale.props" and "rationale.slots" describe your reasoning about scope; "classify_slot.rationale" explains why each slot was kept.
+- On classify_prop, "reason" is REQUIRED and is the LLM's internal rationale \u2014 shown to the developer reviewing the import, never to end-users. "description" is the customer-facing copy and is subject to the description content rules in the skill prompt. Keep them distinct: "description" is short and customer-facing; "reason" explains your reasoning in detail.
+- You may emit prose lines (not starting with {) anywhere \u2014 they are ignored by the parser and serve as your reasoning log.`;
+}
+function buildSelectAutonomousPreamble(inputBlock) {
+  return `You are running as part of the experience-design-system-cli import pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
+
+Your task: review the components provided below and decide whether each belongs in Contentful Experience Orchestration as a Component Type. The input is a JSON array \u2014 you may receive 1\u2013N components in a single message. Emit one tool call per input component, named after the component. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation. Include a brief "reason" to document your reasoning for each decision.
+
+Key rule: accept any component that renders visible UI \u2014 atoms, molecules, and organisms are all valid Component Types in Contentful Experience Orchestration. Reject only components that produce zero visual output: React hooks, pure context providers, A/B testing or variant-routing wrappers, analytics trackers, and security utilities. Do NOT reject a component because it has few props, is low-level, or has some A/B testing or personalization-related props mixed in \u2014 those props are handled in the generate step.
+
+All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
+
+## Output protocol
+
+Do NOT write any files or emit any JSON blobs. Instead, emit JSON tool calls one per line to stdout. The CLI reads your stdout line by line.
+
+The two tool calls \u2014 emit exactly one per input component:
+
+\`\`\`
+{"tool":"select_component","name":"<ComponentName>","reason":"<brief reason>"}
+
+{"tool":"reject_component","name":"<ComponentName>","reason":"<brief reason>"}
+\`\`\`
+
+Rules:
+- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences.
+- Emit exactly one tool call per input component. The "name" field must match a component name from the input array exactly. Tool calls may appear in any order.
+- You may emit prose lines (not starting with {) to reason before each tool call \u2014 they are ignored by the parser.`;
+}
+function buildMapTokensAutonomousPreamble(inputBlock) {
+  return `You are running as part of the experience-design-system-cli generate pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
+
+Context: The components below already have design-category, token-typed props (\`$token.kind\` set). Your task is to decide, from source evidence, whether to narrow each one to a restricted subset (\`token_allowed\`) of the tokens matching its \`$token.kind\`. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation.
+
+All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
+
+## Output protocol
+
+Do NOT write any files or emit any JSON blobs. Instead, emit one JSON object per line to stdout for each prop you narrow. The CLI reads your stdout line by line and writes each decision directly to the pipeline database.
+
+The one tool call you may emit:
 
-// packages/experience-design-system-generation/dist/src/services/parsing/parse-map-token-tool-calls.js
-function isStringArray(value) {
-  return Array.isArray(value) && value.every((v) => typeof v === "string");
+\`\`\`
+{"tool":"map_token_prop","component":"<ComponentName>","prop":"<propName>","token_allowed":["colors.brand.primary","colors.brand.secondary"]}
+\`\`\`
+
+Rules:
+- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences around the lines.
+- Only emit a call for a prop that appears in the "Generated CDF so far" section.
+- Each "Token path index" section below is already scoped to one \`$token.kind\` \u2014 a prop only draws candidates from the section matching its own \`$token.kind\` (or the "full tree" section, for a prop with no \`$token.kind\`). Never cross sections, never emit a group/prefix path, and never invent a path \u2014 every entry in \`token_allowed\` must exist verbatim in the matching section.
+- \`token_allowed\` is required and must be non-empty when the call is emitted.
+- For the judgment call of whether a prop should be narrowed at all, follow the decision tree in the map-tokens skill file: it explains defaults vs. restrictions, misclassified variant-name props, and when to emit nothing.
+- You may emit prose lines (not starting with \`{\`) anywhere \u2014 they are ignored by the parser and serve as your reasoning log.`;
 }
-function parseMapTokenPropToolCallLines(stdout) {
-  const calls = [];
-  const warnings = [];
-  for (const raw of stdout.split("\n")) {
-    const line = raw.trim();
-    if (!line.startsWith("{"))
-      continue;
-    let obj;
-    try {
-      obj = JSON.parse(line);
-    } catch {
-      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
-      continue;
-    }
-    if (typeof obj !== "object" || obj === null || !("tool" in obj))
-      continue;
-    const rec = obj;
-    if (rec.tool !== "map_token_prop")
-      continue;
-    if (typeof rec.component !== "string" || !rec.component) {
-      warnings.push("map_token_prop missing component \u2014 skipped");
-      continue;
-    }
-    if (typeof rec.prop !== "string" || !rec.prop) {
-      warnings.push(`map_token_prop '${rec.component}': missing prop \u2014 skipped`);
-      continue;
-    }
-    if (!isStringArray(rec.token_allowed) || rec.token_allowed.length === 0) {
-      warnings.push(`map_token_prop '${rec.component}.${String(rec.prop)}': missing or empty token_allowed \u2014 skipped`);
-      continue;
-    }
-    calls.push({ tool: "map_token_prop", component: rec.component, prop: rec.prop, token_allowed: rec.token_allowed });
-  }
-  return { calls, warnings };
+function buildTokensAutonomousPreamble(inputBlock) {
+  return `You are running as part of the experience-design-system-cli generate pipeline in AUTONOMOUS mode. The developer is not present to answer questions.
+
+Your task: classify every raw token from the input below into a DTCG token tree. Apply all judgment calls yourself \u2014 do not pause to ask for confirmation. Include a "description" field on each set_token call to document your reasoning.
+
+All input data is provided inline below \u2014 do not read any additional files.${inputBlock}
+
+## Output protocol
+
+Do NOT write any files or emit any JSON blobs. Instead, emit one JSON object per line to stdout for each token or group. The CLI reads your stdout line by line and writes each entry directly to the pipeline database.
+
+The two tool calls you may emit are:
+
+\`\`\`
+{"tool":"set_group","path":"<dot.notation.path>","description":"<optional group description>"}
+
+{"tool":"set_token","path":"<dot.notation.path>","type":"<DTCG type>","value":<value>,"description":"<reason>"}
+\`\`\`
+
+Rules:
+- Emit exactly one JSON object per line. No multi-line JSON. No markdown fences.
+- Emit a set_group call for every intermediate group node in the tree.
+- Emit a set_token call for every leaf token.
+- "path" is dot-notation, e.g. "colors.brand.primary" \u2014 no leading dots or slashes.
+- "type" must be one of the 13 valid DTCG types: color, dimension, fontFamily, fontWeight, duration, cubicBezier, number, strokeStyle, border, transition, shadow, gradient, typography.
+- "value" must be valid JSON (string, number, array, or object depending on the type). Do NOT wrap it in quotes if it is a complex type.
+- Emit set_group calls before the set_token calls that fall under them.
+- You may emit prose lines (not starting with {) anywhere \u2014 they are ignored by the parser and serve as your reasoning log.`;
 }
-var init_parse_map_token_tool_calls = __esm({
-  "packages/experience-design-system-generation/dist/src/services/parsing/parse-map-token-tool-calls.js"() {
+var SKILL_FILES;
+var init_prompt_builder = __esm({
+  "packages/experience-design-system-generation/dist/src/prompt-builder.js"() {
     "use strict";
+    SKILL_FILES = {
+      components: "generate-components.md",
+      tokens: "generate-tokens.md",
+      select: "select-components.md",
+      "map-tokens": "map-tokens.md"
+    };
   }
 });
 
@@ -1234,17 +1047,14 @@ var init_progress = __esm({
 // packages/experience-design-system-generation/dist/src/index.js
 var src_exports = {};
 __export(src_exports, {
-  AGENT_BINARIES: () => AGENT_BINARIES,
   AGENT_NAMES: () => AGENT_NAMES,
   DEFAULT_AGENT_NAME: () => DEFAULT_AGENT_NAME,
   agentSupportsBedrock: () => agentSupportsBedrock,
-  buildArgs: () => buildAgentArgs,
+  buildArgs: () => buildArgs,
   buildPrompt: () => buildPrompt,
   checkAgentAuth: () => checkAgentAuth,
-  createGenerationEndpoint: () => createGenerationEndpoint,
   createLocalCliAgentInvoker: () => createLocalCliAgentInvoker,
   describeAgentFailure: () => describeAgentFailure,
-  executeGenerationOrchestrator: () => executeGenerationOrchestrator,
   extractSentinelOutput: () => extractSentinelOutput,
   formatCustomPromptBanner: () => formatCustomPromptBanner,
   formatGenerateProgressLine: () => formatGenerateProgressLine,
@@ -1252,9 +1062,9 @@ __export(src_exports, {
   parseMapTokenPropToolCallLines: () => parseMapTokenPropToolCallLines,
   parseSelectToolCallLines: () => parseSelectToolCallLines,
   parseTokenToolCallLines: () => parseTokenToolCallLines,
-  parseToolCallLines: () => parsePropToolCallLines,
+  parseToolCallLines: () => parseToolCallLines,
   resolveAgentModel: () => resolveAgentModel,
-  resolveBinary: () => resolveAgentBinary,
+  resolveBinary: () => resolveBinary,
   resolveSkillPath: () => resolveSkillPath,
   runAgent: () => runAgent
 });
@@ -1262,19 +1072,10 @@ var init_src = __esm({
   "packages/experience-design-system-generation/dist/src/index.js"() {
     "use strict";
     init_agent_names();
-    init_create_generation_endpoint();
-    init_execute_generation_orchestrator();
-    init_build_agent_args();
-    init_resolve_agent_binary();
-    init_check_agent_auth();
-    init_run_agent();
-    init_parse_prop_tool_calls();
-    init_parse_select_tool_calls();
-    init_parse_token_tool_calls();
-    init_parse_map_token_tool_calls();
-    init_build_prompt();
+    init_agent_runner();
+    init_agent_invoker();
+    init_prompt_builder();
     init_progress();
-    init_local_cli_agent_invoker();
   }
 });
 
@@ -1412,8 +1213,8 @@ function makeSessionTimestamp() {
   const override = process.env["EDSI_DEBUG_TS"];
   if (override) return override;
   const now = /* @__PURE__ */ new Date();
-  const pad = (n, w = 2) => n.toString().padStart(w, "0");
-  return `${now.getUTCFullYear()}${pad(now.getUTCMonth() + 1)}${pad(now.getUTCDate())}T${pad(now.getUTCHours())}${pad(now.getUTCMinutes())}${pad(now.getUTCSeconds())}Z`;
+  const pad3 = (n, w = 2) => n.toString().padStart(w, "0");
+  return `${now.getUTCFullYear()}${pad3(now.getUTCMonth() + 1)}${pad3(now.getUTCDate())}T${pad3(now.getUTCHours())}${pad3(now.getUTCMinutes())}${pad3(now.getUTCSeconds())}Z`;
 }
 function initDebugLogger(opts) {
   if (singleton) return singleton;
@@ -2210,8 +2011,8 @@ function deleteRawTokensForSession(db, sessionId2) {
 }
 function createRawTokenGroups(db, sessionId2, groups) {
   const insertGroup = db.prepare(`INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)`);
-  for (const group of groups) {
-    insertGroup.run(sessionId2, group.path, group.$description ?? null);
+  for (const group2 of groups) {
+    insertGroup.run(sessionId2, group2.path, group2.$description ?? null);
   }
 }
 function createRawTokens(db, sessionId2, tokens) {
@@ -5109,7 +4910,7 @@ async function readFileInline(path) {
   return parts.filter(Boolean).join("\n\n");
 }
 function printFallbackInstructions(options) {
-  const binary = resolveAgentBinary(options.agent);
+  const binary = resolveBinary(options.agent);
   const skillPath = resolveSkillPath(options.skill);
   const lines = [
     `Error: agent '${options.agent}' not found in $PATH (looked for binary: ${binary}).`,
@@ -5324,7 +5125,7 @@ ${outputBuf}`);
       lastError = describeAgentFailure(result);
       continue;
     }
-    const { calls, warnings } = parsePropToolCallLines(result.stdout);
+    const { calls, warnings } = parseToolCallLines(result.stdout);
     if (calls.length === 0) {
       lastError = describeAgentFailure(result);
       continue;
@@ -5570,7 +5371,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     process.stdout.write(prompt + "\n");
     await exitWithAnalytics(0);
   }
-  const binary = resolveAgentBinary(agent);
+  const binary = resolveBinary(agent);
   if (!await assertBinaryInPath(binary)) {
     printFallbackInstructions({
       agent,
@@ -7090,24 +6891,24 @@ function parseEdsiError(rawInput) {
     }
   }
   const cleaned = stripLambdaLogPrefix(body);
-  const json = parseJsonBody(cleaned) ?? parseJsonBody(body);
-  const bindingFromJson = typeof json?.message === "string" ? parseBindingDiagnostics(json.message) : null;
+  const json2 = parseJsonBody(cleaned) ?? parseJsonBody(body);
+  const bindingFromJson = typeof json2?.message === "string" ? parseBindingDiagnostics(json2.message) : null;
   if (bindingFromJson) {
     return {
-      code: bindingFromJson.code ?? json?.code ?? null,
+      code: bindingFromJson.code ?? json2?.code ?? null,
       message: bindingFromJson.message ?? cleaned,
       cycle: null,
       raw: false,
       ...bindingFromJson.diagnostics ? { diagnostics: bindingFromJson.diagnostics } : {}
     };
   }
-  if (json && (json.code || json.message || json.cycle)) {
+  if (json2 && (json2.code || json2.message || json2.cycle)) {
     return {
-      code: json.code ?? null,
-      message: json.message ?? (cleaned || prefix),
-      cycle: json.cycle ?? null,
+      code: json2.code ?? null,
+      message: json2.message ?? (cleaned || prefix),
+      cycle: json2.cycle ?? null,
       raw: false,
-      ...json.diagnostics ? { diagnostics: json.diagnostics } : {}
+      ...json2.diagnostics ? { diagnostics: json2.diagnostics } : {}
     };
   }
   const binding = parseBindingDiagnostics(cleaned);
@@ -8647,8 +8448,8 @@ async function resolveSession(sessionFlag, command) {
 }
 function rebuildDTCGTree(groups, tokens) {
   const root = {};
-  for (const group of groups) {
-    const segments = group.path.split(".");
+  for (const group2 of groups) {
+    const segments = group2.path.split(".");
     let node = root;
     for (const seg of segments) {
       if (typeof node[seg] !== "object" || node[seg] === null) {
@@ -8656,8 +8457,8 @@ function rebuildDTCGTree(groups, tokens) {
       }
       node = node[seg];
     }
-    if (group.$description) {
-      node["$description"] = group.$description;
+    if (group2.$description) {
+      node["$description"] = group2.$description;
     }
   }
   for (const token of tokens) {
@@ -9231,7 +9032,7 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
         return;
       }
     }
-    const binary = resolveAgentBinary(agent);
+    const binary = resolveBinary(agent);
     if (!await assertBinaryInPath(binary)) {
       die(
         `Error: agent '${agent}' not found in $PATH (looked for binary: ${binary}).
@@ -9400,6 +9201,214 @@ var init_run_teaser = __esm({
   }
 });
 
+// packages/experience-design-system-cli-legacy/src/lib/push-debug-log.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, readdirSync, writeFileSync } from "node:fs";
+import { join as join10 } from "node:path";
+function scrub(key, value) {
+  if (/^cma_?token$/i.test(key)) {
+    return typeof value === "string" && value ? `[present, ${value.length} chars]` : "[not set]";
+  }
+  if (typeof value === "string" && SECRET_VALUE.test(value)) return "[redacted]";
+  return value;
+}
+function json(value) {
+  const text = JSON.stringify(value, scrub, 2) ?? "null";
+  return text.length > MAX_BLOCK_CHARS ? `${text.slice(0, MAX_BLOCK_CHARS)}
+\u2026 truncated, ${text.length - MAX_BLOCK_CHARS} more characters` : text;
+}
+function pad(n, width = 2) {
+  return String(n).padStart(width, "0");
+}
+function datePrefix(now) {
+  return `${pad(now.getMonth() + 1)}-${pad(now.getDate())}-${now.getFullYear()}`;
+}
+function clock(now) {
+  return `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}.${pad(now.getMilliseconds(), 3)}`;
+}
+function nextFilename(dir, now) {
+  const today = datePrefix(now);
+  const pattern = new RegExp(`^${today}-push-attempt-(\\d+)\\.md$`);
+  const existing = existsSync3(dir) ? readdirSync(dir) : [];
+  const max = existing.reduce((acc, entry) => {
+    const match2 = pattern.exec(entry);
+    return match2 ? Math.max(acc, Number(match2[1])) : acc;
+  }, 0);
+  return `${today}-push-attempt-${max + 1}.md`;
+}
+function entityName(entry) {
+  if (typeof entry === "string") return entry;
+  if (entry && typeof entry === "object") {
+    const record = entry;
+    for (const field of ["key", "name", "$name", "id"]) {
+      if (typeof record[field] === "string") return record[field];
+    }
+    const current = record["current"];
+    if (current && typeof current === "object" && typeof current["name"] === "string") {
+      return current["name"];
+    }
+  }
+  return "unknown";
+}
+function group(diff) {
+  return {
+    new: diff.new.map(entityName),
+    changed: diff.changed.map((entry) => {
+      const breaking = entry && typeof entry === "object" && entry.changeClassification?.classification === "breaking";
+      return breaking ? `${entityName(entry)} (breaking)` : entityName(entry);
+    }),
+    unchanged: diff.unchanged,
+    removed: diff.removed.map(entityName)
+  };
+}
+function summarizePreview(preview) {
+  return { components: group(preview.components), tokens: group(preview.tokens) };
+}
+function summarizeCdf(cdf) {
+  return Object.entries(cdf).filter(([key]) => !key.startsWith("$") && key !== "allowDeletions").map(([key, value]) => {
+    const entry = value ?? {};
+    const properties = entry["$properties"];
+    const slots = entry["$slots"];
+    return {
+      name: key,
+      type: entry["$type"],
+      properties: properties && typeof properties === "object" ? Object.keys(properties) : [],
+      slots: slots && typeof slots === "object" ? Object.keys(slots) : []
+    };
+  });
+}
+function renderEvents(events) {
+  if (events.length === 0) return "_Nothing recorded yet._";
+  return events.map((event, index) => {
+    const note = event.note ? ` \u2014 ${event.note}` : "";
+    const request2 = event.requestId ? ` _(request ${event.requestId})_` : "";
+    return `${index + 1}. \`${clock(event.at)}\` (+${event.sinceStartMs}ms) **${event.title}**${note}${request2}`;
+  }).join("\n");
+}
+function renderDetails(events) {
+  const withData = events.map((event, index) => ({ event, index })).filter(({ event }) => event.data && Object.keys(event.data).length > 0);
+  if (withData.length === 0) return "";
+  return withData.map(
+    ({ event, index }) => `<details>
+<summary>${index + 1}. ${event.title}</summary>
+
+\`\`\`json
+${json(event.data)}
+\`\`\`
+
+</details>`
+  ).join("\n\n");
+}
+function render2(runId, inputs, events, startedAt, result, durationMs) {
+  const requestIds = [...new Set(events.map((event) => event.requestId).filter(Boolean))];
+  const text = (field) => String(inputs[field] ?? "\u2014");
+  const details = renderDetails(events);
+  return `# Push to Contentful \u2014 debug log
+
+## Summary
+
+| | |
+|---|---|
+| **Result** | ${OUTCOME_LABEL[result.outcome]} |
+| **What happened** | ${result.summary} |
+| **Space / environment** | \`${text("space_id")}\` / \`${text("environment_id")}\` |
+| **Host** | ${text("host")} |
+| **Started** | ${startedAt.toISOString()} |
+| **Duration** | ${durationMs}ms |
+| **Request IDs** | ${requestIds.length > 0 ? requestIds.map((id) => `\`${id}\``).join(", ") : "\u2014"} |
+| **CLI / runtime** | ${cliVersion()} \xB7 ${process.platform} \xB7 Node ${process.version} |
+| **Run ID** | ${runId} |
+
+## Timeline
+
+${renderEvents(events)}
+
+## Inputs
+
+\`\`\`json
+${json(inputs)}
+\`\`\`
+
+## Result
+
+\`\`\`json
+${json({ outcome: result.outcome, summary: result.summary, ...result.details ?? {} })}
+\`\`\`
+${details ? `
+## Details
+
+${details}
+` : ""}`;
+}
+function startPushDebugRun(inputs) {
+  const sessionDir = process.env[DEBUG_SESSION_DIR_ENV];
+  if (!sessionDir) return NOOP_RUN;
+  const startedAt = /* @__PURE__ */ new Date();
+  const runId = `${startedAt.getFullYear()}${pad(startedAt.getMonth() + 1)}${pad(startedAt.getDate())}-${pad(startedAt.getHours())}${pad(startedAt.getMinutes())}${pad(startedAt.getSeconds())}`;
+  const events = [];
+  let result = {
+    outcome: "in-progress",
+    summary: "The push started but no final result was recorded."
+  };
+  let finished = false;
+  let path;
+  const flush = () => {
+    try {
+      if (!path) {
+        const dir = join10(sessionDir, "import");
+        mkdirSync3(dir, { recursive: true });
+        path = join10(dir, nextFilename(dir, startedAt));
+      }
+      writeFileSync(path, render2(runId, inputs, events, startedAt, result, Date.now() - startedAt.getTime()), {
+        mode: 384
+      });
+    } catch {
+    }
+  };
+  flush();
+  return {
+    event(title, options = {}) {
+      if (finished) return;
+      const at = /* @__PURE__ */ new Date();
+      events.push({ at, sinceStartMs: at.getTime() - startedAt.getTime(), title, ...options });
+      flush();
+    },
+    finish(final) {
+      if (finished) return;
+      finished = true;
+      result = final;
+      const at = /* @__PURE__ */ new Date();
+      events.push({
+        at,
+        sinceStartMs: at.getTime() - startedAt.getTime(),
+        title: OUTCOME_LABEL[final.outcome].replace(/^\S+\s/, ""),
+        note: final.summary
+      });
+      flush();
+    }
+  };
+}
+var DEBUG_SESSION_DIR_ENV, NOOP_RUN, OUTCOME_LABEL, MAX_BLOCK_CHARS, SECRET_VALUE;
+var init_push_debug_log = __esm({
+  "packages/experience-design-system-cli-legacy/src/lib/push-debug-log.ts"() {
+    "use strict";
+    init_client();
+    DEBUG_SESSION_DIR_ENV = "EDS_DEBUG_SESSION_DIR";
+    NOOP_RUN = { event: () => void 0, finish: () => void 0 };
+    OUTCOME_LABEL = {
+      "in-progress": "\u23F3 In progress (the process ended before the push finished)",
+      pushed: "\u2705 Pushed",
+      partial: "\u26A0\uFE0F Partly pushed (some items failed)",
+      failed: "\u274C Push failed",
+      "preview-failed": "\u274C Preview failed (nothing was sent to apply)",
+      "nothing-to-push": "\u2139\uFE0F Nothing to push (the server says the space already matches)",
+      skipped: "\u23ED\uFE0F Skipped",
+      superseded: "\u21A9\uFE0F Superseded by a newer attempt"
+    };
+    MAX_BLOCK_CHARS = 1e5;
+    SECRET_VALUE = /CFPAT-[A-Za-z0-9_-]{20,}|^Bearer\s+\S+/;
+  }
+});
+
 // packages/experience-design-system-cli-legacy/src/tui/use-blinking-cursor.ts
 import { useEffect as useEffect2, useState as useState3 } from "react";
 function useBlinkingCursor() {
@@ -9419,8 +9428,8 @@ var init_use_blinking_cursor = __esm({
 // packages/experience-design-system-cli-legacy/src/runs/path-prompt.tsx
 import { useState as useState4 } from "react";
 import { Box as Box6, Text as Text7 } from "ink";
-import { readdirSync } from "node:fs";
-import { dirname as dirname5, basename as basename2, join as join10 } from "node:path";
+import { readdirSync as readdirSync2 } from "node:fs";
+import { dirname as dirname5, basename as basename2, join as join11 } from "node:path";
 import { jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
 function autocomplete(partial) {
   if (!partial) return null;
@@ -9429,19 +9438,19 @@ function autocomplete(partial) {
   const base = basename2(normalized);
   let entries;
   try {
-    entries = readdirSync(dir);
+    entries = readdirSync2(dir);
   } catch {
     return null;
   }
   const matches = entries.filter((e) => e.startsWith(base));
   if (matches.length === 0) return null;
-  if (matches.length === 1) return join10(dir, matches[0]);
+  if (matches.length === 1) return join11(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 ? join10(dir, prefix) : null;
+  return prefix.length > base.length ? join11(dir, prefix) : null;
 }
 function PathPrompt({
   defaultPath,
@@ -9506,12 +9515,12 @@ var init_path_prompt = __esm({
 
 // packages/experience-design-system-cli-legacy/src/runs/save-path-resolver.ts
 import { access as access4 } from "node:fs/promises";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 async function listConflictingFiles(path) {
   const conflicts = [];
   for (const name of SAVE_FILES) {
     try {
-      await access4(join11(path, name));
+      await access4(join12(path, name));
       conflicts.push(name);
     } catch {
     }
@@ -9531,7 +9540,7 @@ function buildTimestampedSubdir(base, now = /* @__PURE__ */ new Date()) {
   const hh = pad2(now.getHours());
   const mm = pad2(now.getMinutes());
   const ss = pad2(now.getSeconds());
-  return join11(base, `dsi-${y}${m}${d}-${hh}${mm}${ss}`);
+  return join12(base, `dsi-${y}${m}${d}-${hh}${mm}${ss}`);
 }
 var SAVE_FILES;
 var init_save_path_resolver = __esm({
@@ -9543,7 +9552,7 @@ var init_save_path_resolver = __esm({
 
 // packages/experience-design-system-cli-legacy/src/runs/store.ts
 import { readFile as readFile12, writeFile as writeFile4, mkdir as mkdir4, rename } from "node:fs/promises";
-import { join as join12 } from "node:path";
+import { join as join13 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 import { randomBytes as randomBytes2 } from "node:crypto";
 function encodeBase32(bytes, length) {
@@ -9639,8 +9648,8 @@ var init_store = __esm({
     RUNS_FILE_VERSION = 3;
     RUNS_FILE_CAP = 200;
     READABLE_VERSIONS = /* @__PURE__ */ new Set([1, 2, 3]);
-    RUNS_DIR = join12(homedir6(), ".config", "experiences");
-    RUNS_PATH = join12(RUNS_DIR, "runs.json");
+    RUNS_DIR = join13(homedir6(), ".config", "experiences");
+    RUNS_PATH = join13(RUNS_DIR, "runs.json");
     CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
   }
 });
@@ -9797,7 +9806,7 @@ var init_WelcomeStep = __esm({
 import { useState as useState6, useEffect as useEffect3 } from "react";
 import { Box as Box9, Text as Text10 } from "ink";
 import { promises as fs } from "node:fs";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 import { jsx as jsx12, jsxs as jsxs9 } from "react/jsx-runtime";
 async function countFiles(dir) {
   const counts = {
@@ -9821,7 +9830,7 @@ async function countFiles(dir) {
     await Promise.all(
       entries.map(async (entry) => {
         if (IGNORE_DIRS.has(entry)) return;
-        const full = join13(current, entry);
+        const full = join14(current, entry);
         let stat7;
         try {
           stat7 = await fs.stat(full);
@@ -10897,6 +10906,7 @@ function WizardPreviewStep({
   environmentId,
   stepNumber,
   totalSteps,
+  droppedTokenDefaults = [],
   onConfirm,
   onEdit,
   onQuit
@@ -10989,6 +10999,13 @@ function WizardPreviewStep({
         }
       )
     ] }) : /* @__PURE__ */ jsx19(Text17, { dimColor: true, children: "Nothing to push \u2014 everything is already up to date." }),
+    droppedTokenDefaults.length > 0 && /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx19(Text17, { color: PALETTE.warning, bold: true, children: "\u26A0 Some token defaults will be left out so the push can succeed:" }),
+      droppedTokenDefaults.map((line) => /* @__PURE__ */ jsxs16(Text17, { color: PALETTE.warning, wrap: "truncate-end", children: [
+        "  ",
+        line
+      ] }, line))
+    ] }),
     breakingWithImpact && /* @__PURE__ */ jsx19(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx19(Text17, { color: PALETTE.error, bold: true, children: "\u26A0 Breaking changes will affect downstream entities. Press Enter to acknowledge and apply." }) }),
     /* @__PURE__ */ jsx19(SpaceEnvironment, { spaceId, environmentId }),
     /* @__PURE__ */ jsxs16(Box16, { gap: 3, marginTop: 1, children: [
@@ -11040,7 +11057,7 @@ function DoneStep({
   });
   const totalFailed = componentTypes.failed + designTokens.failed;
   const totalPushed = componentTypes.created + componentTypes.updated + componentTypes.removed + designTokens.created + designTokens.updated + designTokens.removed;
-  const success = totalFailed === 0;
+  const success = totalFailed === 0 && (summary?.failed ?? 0) === 0;
   function EntityRows({ entity, label }) {
     return /* @__PURE__ */ jsxs17(Fragment5, { children: [
       entity.created > 0 && /* @__PURE__ */ jsxs17(Box17, { gap: 1, children: [
@@ -11086,7 +11103,7 @@ function DoneStep({
     ] });
   }
   return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
-    success ? /* @__PURE__ */ jsx20(Text18, { bold: true, color: PALETTE.success, children: "Done!" }) : /* @__PURE__ */ jsx20(Text18, { bold: true, color: PALETTE.warning, children: "\u26A0 Finished with errors" }),
+    success ? /* @__PURE__ */ jsx20(Text18, { bold: true, color: PALETTE.success, children: "Done!" }) : /* @__PURE__ */ jsx20(Text18, { bold: true, color: PALETTE.error, children: "\u2717 Push failed \u2014 nothing was changed for the items below" }),
     totalPushed === 0 && totalFailed === 0 && !summary ? /* @__PURE__ */ jsx20(Box17, { marginTop: 1, children: /* @__PURE__ */ jsx20(Text18, { dimColor: true, children: "Nothing was pushed \u2014 everything was already up to date." }) }) : /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", gap: 0, marginTop: 1, children: [
       /* @__PURE__ */ jsx20(EntityRows, { entity: componentTypes, label: "Component Type" }),
       /* @__PURE__ */ jsx20(EntityRows, { entity: designTokens, label: "Design Token" }),
@@ -11506,8 +11523,8 @@ var init_types = __esm({
 });
 
 // packages/experience-design-system-extraction/dist/src/extract/tsx-shared.js
-import { existsSync as existsSync3, readFileSync as readFileSync5 } from "node:fs";
-import { dirname as dirname6, join as join14, resolve as resolve12 } from "node:path";
+import { existsSync as existsSync4, readFileSync as readFileSync5 } from "node:fs";
+import { dirname as dirname6, join as join15, resolve as resolve12 } from "node:path";
 import { Node, Project, SyntaxKind } from "ts-morph";
 import ts from "typescript";
 function createTsxProject(filePaths) {
@@ -11706,8 +11723,8 @@ function findNearestTsConfigPath(filePath) {
   let currentDir = dirname6(filePath);
   while (true) {
     for (const candidateName of ["tsconfig.json", "jsconfig.json"]) {
-      const candidatePath = join14(currentDir, candidateName);
-      if (existsSync3(candidatePath)) {
+      const candidatePath = join15(currentDir, candidateName);
+      if (existsSync4(candidatePath)) {
         nearestTsConfigPathCache.set(filePath, candidatePath);
         return candidatePath;
       }
@@ -11763,12 +11780,12 @@ function resolveImportSourcePath(basePath) {
     `${basePath}.tsx`,
     `${basePath}.js`,
     `${basePath}.jsx`,
-    join14(basePath, "index.ts"),
-    join14(basePath, "index.tsx"),
-    join14(basePath, "index.js"),
-    join14(basePath, "index.jsx")
+    join15(basePath, "index.ts"),
+    join15(basePath, "index.tsx"),
+    join15(basePath, "index.js"),
+    join15(basePath, "index.jsx")
   ];
-  return candidates.find((candidatePath) => existsSync3(candidatePath));
+  return candidates.find((candidatePath) => existsSync4(candidatePath));
 }
 function findProjectSourceFileByImportPath(project, resolvedPath) {
   const candidatePaths = [
@@ -11777,10 +11794,10 @@ function findProjectSourceFileByImportPath(project, resolvedPath) {
     `${resolvedPath}.tsx`,
     `${resolvedPath}.js`,
     `${resolvedPath}.jsx`,
-    join14(resolvedPath, "index.ts"),
-    join14(resolvedPath, "index.tsx"),
-    join14(resolvedPath, "index.js"),
-    join14(resolvedPath, "index.jsx")
+    join15(resolvedPath, "index.ts"),
+    join15(resolvedPath, "index.tsx"),
+    join15(resolvedPath, "index.js"),
+    join15(resolvedPath, "index.jsx")
   ];
   for (const candidatePath of candidatePaths) {
     const sourceFile = project.getSourceFile(candidatePath);
@@ -11801,10 +11818,10 @@ function findWorkspacePackageEntrySourceFile(originSourceFile, moduleSpecifier)
   if (!packageRootDir)
     return void 0;
   const preferredEntryPaths = [
-    join14(packageRootDir, "src/index.ts"),
-    join14(packageRootDir, "src/index.tsx"),
-    join14(packageRootDir, "index.ts"),
-    join14(packageRootDir, "index.tsx")
+    join15(packageRootDir, "src/index.ts"),
+    join15(packageRootDir, "src/index.tsx"),
+    join15(packageRootDir, "index.ts"),
+    join15(packageRootDir, "index.tsx")
   ];
   for (const entryPath of preferredEntryPaths) {
     const entrySourceFile = project.getSourceFile(entryPath);
@@ -11812,7 +11829,7 @@ function findWorkspacePackageEntrySourceFile(originSourceFile, moduleSpecifier)
       return entrySourceFile;
     }
   }
-  return candidateSourceFiles.find((sourceFile) => sourceFile.getDirectoryPath() === join14(packageRootDir, "src"));
+  return candidateSourceFiles.find((sourceFile) => sourceFile.getDirectoryPath() === join15(packageRootDir, "src"));
 }
 function getWorkspacePackageManifestForSourceFile(sourceFile) {
   const packageRootDir = findNearestPackageRootDir(sourceFile.getFilePath());
@@ -11821,7 +11838,7 @@ function getWorkspacePackageManifestForSourceFile(sourceFile) {
   if (workspacePackageManifestCache.has(packageRootDir)) {
     return workspacePackageManifestCache.get(packageRootDir) ?? void 0;
   }
-  const packageJsonPath = join14(packageRootDir, "package.json");
+  const packageJsonPath = join15(packageRootDir, "package.json");
   try {
     const packageJson = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
     const manifest = typeof packageJson.name === "string" ? { name: packageJson.name, rootDir: packageRootDir } : null;
@@ -11838,7 +11855,7 @@ function findNearestPackageRootDir(filePath) {
   }
   let currentDir = dirname6(filePath);
   while (true) {
-    if (existsSync3(join14(currentDir, "package.json"))) {
+    if (existsSync4(join15(currentDir, "package.json"))) {
       packageRootByFilePathCache.set(filePath, currentDir);
       return currentDir;
     }
@@ -14900,8 +14917,8 @@ var init_vue_tsx = __esm({
 });
 
 // packages/experience-design-system-extraction/dist/src/extract/resolve-local-module.js
-import { existsSync as existsSync4, statSync as statSync2 } from "node:fs";
-import { dirname as dirname7, join as join15, resolve as resolve13 } from "node:path";
+import { existsSync as existsSync5, statSync as statSync2 } from "node:fs";
+import { dirname as dirname7, join as join16, resolve as resolve13 } from "node:path";
 function resolveLocalModule(importingFilePath, specifier, options = {}) {
   const basePath = resolve13(dirname7(importingFilePath), specifier);
   const candidates = [
@@ -14910,18 +14927,18 @@ function resolveLocalModule(importingFilePath, specifier, options = {}) {
     `${basePath}.ts`,
     `${basePath}.mjs`,
     `${basePath}.cjs`,
-    join15(basePath, "index.js"),
-    join15(basePath, "index.ts"),
-    join15(basePath, "index.mjs"),
-    join15(basePath, "index.cjs")
+    join16(basePath, "index.js"),
+    join16(basePath, "index.ts"),
+    join16(basePath, "index.mjs"),
+    join16(basePath, "index.cjs")
   ];
   for (const candidate of candidates) {
-    if (existsSync4(candidate) && statSync2(candidate).isFile())
+    if (existsSync5(candidate) && statSync2(candidate).isFile())
       return candidate;
   }
   if (options.allowJavaScriptExtensionFallback && basePath.endsWith(".js")) {
     const tsPath = `${basePath.slice(0, -".js".length)}.ts`;
-    if (existsSync4(tsPath) && statSync2(tsPath).isFile())
+    if (existsSync5(tsPath) && statSync2(tsPath).isFile())
       return tsPath;
   }
   return null;
@@ -14952,9 +14969,9 @@ var init_resolve_type_property = __esm({
 
 // packages/experience-design-system-extraction/dist/src/extract/vue.js
 import os from "node:os";
-import { basename as basename3, dirname as dirname8, resolve as resolve14, join as join16 } from "node:path";
+import { basename as basename3, dirname as dirname8, resolve as resolve14, join as join17 } from "node:path";
 import { readFile as readFile15 } from "node:fs/promises";
-import { existsSync as existsSync5, readFileSync as readFileSync6, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6, readdirSync as readdirSync3, statSync as statSync3 } from "node:fs";
 import { parse as parseSFC } from "@vue/compiler-sfc";
 import { Project as Project3, Node as Node6 } from "ts-morph";
 async function extractVueComponents(filePaths, onProgress) {
@@ -15167,11 +15184,11 @@ function findWorkspaceRoot(startDir) {
     return workspaceRootCache.get(startDir);
   let dir = startDir;
   while (true) {
-    const pkgJsonPath = join16(dir, "package.json");
-    if (existsSync5(pkgJsonPath)) {
+    const pkgJsonPath = join17(dir, "package.json");
+    if (existsSync6(pkgJsonPath)) {
       try {
         const pkg4 = JSON.parse(readFileSync6(pkgJsonPath, "utf8"));
-        if (pkg4.workspaces || existsSync5(join16(dir, "pnpm-workspace.yaml"))) {
+        if (pkg4.workspaces || existsSync6(join17(dir, "pnpm-workspace.yaml"))) {
           workspaceRootCache.set(startDir, dir);
           return dir;
         }
@@ -15191,8 +15208,8 @@ function getWorkspacePackageDirs(workspaceRoot) {
     return workspacePackageDirsCache.get(workspaceRoot);
   }
   const packageMap = /* @__PURE__ */ new Map();
-  const packagesDir = join16(workspaceRoot, "packages");
-  if (!existsSync5(packagesDir)) {
+  const packagesDir = join17(workspaceRoot, "packages");
+  if (!existsSync6(packagesDir)) {
     workspacePackageDirsCache.set(workspaceRoot, packageMap);
     return packageMap;
   }
@@ -15201,12 +15218,12 @@ function getWorkspacePackageDirs(workspaceRoot) {
       return;
     let entries;
     try {
-      entries = readdirSync2(dir);
+      entries = readdirSync3(dir);
     } catch {
       return;
     }
-    const pkgJsonPath = join16(dir, "package.json");
-    if (existsSync5(pkgJsonPath)) {
+    const pkgJsonPath = join17(dir, "package.json");
+    if (existsSync6(pkgJsonPath)) {
       try {
         const pkg4 = JSON.parse(readFileSync6(pkgJsonPath, "utf8"));
         if (typeof pkg4.name === "string") {
@@ -15218,7 +15235,7 @@ function getWorkspacePackageDirs(workspaceRoot) {
     for (const entry of entries) {
       if (entry === "node_modules" || entry === ".git" || entry.startsWith("."))
         continue;
-      const entryPath = join16(dir, entry);
+      const entryPath = join17(dir, entry);
       try {
         const stat7 = statSync3(entryPath);
         if (stat7.isDirectory()) {
@@ -15258,28 +15275,28 @@ function resolveWorkspaceVueImport(specifier, importingFilePath) {
   const packageDir = packageDirs.get(packageName);
   if (!packageDir)
     return null;
-  const pkgJsonPath = join16(packageDir, "package.json");
+  const pkgJsonPath = join17(packageDir, "package.json");
   try {
     const pkg4 = JSON.parse(readFileSync6(pkgJsonPath, "utf8"));
     if (pkg4.exports && subpath !== ".") {
       const exportValue = pkg4.exports[subpath];
       if (typeof exportValue === "string" && exportValue.endsWith(".vue")) {
         const resolved = resolve14(packageDir, exportValue);
-        if (existsSync5(resolved))
+        if (existsSync6(resolved))
           return resolved;
       }
     }
     if (subpath !== ".") {
       const subDir = resolve14(packageDir, subpath.replace(/^\.\//, ""));
-      for (const base of [join16(packageDir, "src", subpath.replace(/^\.\//, "")), subDir]) {
-        const subPkgPath = join16(base, "package.json");
-        if (existsSync5(subPkgPath)) {
+      for (const base of [join17(packageDir, "src", subpath.replace(/^\.\//, "")), subDir]) {
+        const subPkgPath = join17(base, "package.json");
+        if (existsSync6(subPkgPath)) {
           try {
             const subPkg = JSON.parse(readFileSync6(subPkgPath, "utf8"));
             const main = subPkg.main || subPkg.module;
             if (typeof main === "string" && main.endsWith(".vue")) {
               const resolved = resolve14(base, main);
-              if (existsSync5(resolved))
+              if (existsSync6(resolved))
                 return resolved;
             }
           } catch {
@@ -15291,7 +15308,7 @@ function resolveWorkspaceVueImport(specifier, importingFilePath) {
       const main = pkg4.main || pkg4.module;
       if (typeof main === "string" && main.endsWith(".vue")) {
         const resolved = resolve14(packageDir, main);
-        if (existsSync5(resolved))
+        if (existsSync6(resolved))
           return resolved;
       }
     }
@@ -15733,7 +15750,7 @@ var init_astro = __esm({
 });
 
 // packages/experience-design-system-extraction/dist/src/extract/web-components.js
-import { basename as basename5, dirname as dirname9, join as join17, resolve as resolve15 } from "node:path";
+import { basename as basename5, dirname as dirname9, join as join18, resolve as resolve15 } from "node:path";
 import { Project as Project5, Node as Node8, SyntaxKind as SyntaxKind6 } from "ts-morph";
 function normalizeComponentName(input) {
   return input.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
@@ -16386,14 +16403,14 @@ function resolveImportSourcePath2(fromFilePath, specifier) {
   if (!specifier.startsWith(spectrumPrefix)) {
     return null;
   }
-  const packagesMarker = `${join17("2nd-gen", "packages")}${fromFilePath.includes("\\") ? "\\" : "/"}`;
+  const packagesMarker = `${join18("2nd-gen", "packages")}${fromFilePath.includes("\\") ? "\\" : "/"}`;
   const markerIndex = fromFilePath.lastIndexOf(packagesMarker);
   if (markerIndex === -1) {
     return null;
   }
   const packagesRoot = fromFilePath.slice(0, markerIndex + packagesMarker.length - 1);
   const componentPath = specifier.slice(spectrumPrefix.length);
-  return join17(packagesRoot, "core", "components", componentPath, "index.ts");
+  return join18(packagesRoot, "core", "components", componentPath, "index.ts");
 }
 function getImportedBaseClass(classDecl, project, visitedFiles) {
   const extendsClause = classDecl.getHeritageClauses().find((clause) => clause.getToken() === SyntaxKind6.ExtendsKeyword);
@@ -16660,8 +16677,8 @@ var init_scoring = __esm({
 
 // packages/experience-design-system-extraction/dist/src/extract/svelte.js
 import os3 from "node:os";
-import { basename as basename6, dirname as dirname10, resolve as resolve16, join as join18 } from "node:path";
-import { existsSync as existsSync6, readFileSync as readFileSync7 } from "node:fs";
+import { basename as basename6, dirname as dirname10, resolve as resolve16, join as join19 } from "node:path";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "node:fs";
 import { createRequire } from "node:module";
 import { parse as parseSvelte } from "svelte/compiler";
 import { Project as Project6, Node as Node9, ScriptTarget, ModuleKind, ts as ts2 } from "ts-morph";
@@ -16794,8 +16811,8 @@ async function maybeRunResolveUnreachableRetry(components, warnings, retryContex
 function findNearestTsconfig(startDir) {
   let dir = startDir;
   for (let i = 0; i < 16; i++) {
-    const candidate = join18(dir, "tsconfig.json");
-    if (existsSync6(candidate))
+    const candidate = join19(dir, "tsconfig.json");
+    if (existsSync7(candidate))
       return candidate;
     const parent = dirname10(dir);
     if (!parent || parent === dir)
@@ -16930,29 +16947,29 @@ function locateDtsForSpecifier(req, specifier, parentFile) {
   const seedDir = resolvedJs ? dirname10(resolvedJs) : dirname10(parentFile);
   const pkgRoot = findPackageRootForSpecifier(seedDir, specifier);
   if (pkgRoot) {
-    const pkgJsonPath = join18(pkgRoot, "package.json");
-    if (existsSync6(pkgJsonPath)) {
+    const pkgJsonPath = join19(pkgRoot, "package.json");
+    if (existsSync7(pkgJsonPath)) {
       try {
         const pkgRaw = readFileSync7(pkgJsonPath, "utf-8");
         const pkg4 = JSON.parse(pkgRaw);
         const typesField = pkg4.types ?? pkg4.typings;
         if (typeof typesField === "string") {
           const candidate = resolve16(pkgRoot, typesField);
-          if (existsSync6(candidate))
+          if (existsSync7(candidate))
             return candidate;
         }
         const exportsTypes = extractTypesFromExports(pkg4.exports);
         if (exportsTypes) {
           const candidate = resolve16(pkgRoot, exportsTypes);
-          if (existsSync6(candidate))
+          if (existsSync7(candidate))
             return candidate;
         }
       } catch {
       }
     }
     for (const entry of ["index.d.ts", "index.d.mts"]) {
-      const candidate = join18(pkgRoot, entry);
-      if (existsSync6(candidate))
+      const candidate = join19(pkgRoot, entry);
+      if (existsSync7(candidate))
         return candidate;
     }
   }
@@ -16960,7 +16977,7 @@ function locateDtsForSpecifier(req, specifier, parentFile) {
     const noExt = resolvedJs.replace(/\.(m?js|cjs)$/, "");
     for (const ext of [".d.ts", ".d.mts"]) {
       const candidate = `${noExt}${ext}`;
-      if (existsSync6(candidate))
+      if (existsSync7(candidate))
         return candidate;
     }
   }
@@ -16969,9 +16986,9 @@ function locateDtsForSpecifier(req, specifier, parentFile) {
 function findPackageRootForSpecifier(seedDir, specifier) {
   let dir = seedDir;
   for (let i = 0; i < 32; i++) {
-    if (existsSync6(join18(dir, "package.json"))) {
+    if (existsSync7(join19(dir, "package.json"))) {
       try {
-        const pkgRaw = readFileSync7(join18(dir, "package.json"), "utf-8");
+        const pkgRaw = readFileSync7(join19(dir, "package.json"), "utf-8");
         const pkg4 = JSON.parse(pkgRaw);
         if (pkg4.name === specifier)
           return dir;
@@ -18943,9 +18960,9 @@ var init_wizard_generate_progress = __esm({
 });
 
 // packages/experience-design-system-cli-legacy/src/import/tui/spawn-generate.ts
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 function spawnGenerateChild(opts) {
-  const child = spawn4(opts.command, opts.args);
+  const child = spawn2(opts.command, opts.args);
   let stdout = "";
   let stderr = "";
   child.stdout?.on("data", (d) => {
@@ -18984,6 +19001,88 @@ var init_spawn_generate = __esm({
   }
 });
 
+// packages/experience-design-system-cli-legacy/src/apply/dangling-token-defaults.ts
+import { parseCDFComponents as parseCDFComponents3 } from "@contentful/experience-design-system-types";
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function dropDanglingTokenDefaults(cdf, existingTokenIds) {
+  const known = new Set(existingTokenIds);
+  for (const { path } of parseCDFComponents3(cdf).tokens) known.add(path);
+  const copy = structuredClone(cdf);
+  const dropped = [];
+  const walk = (node, prefix) => {
+    for (const [key, value] of Object.entries(node)) {
+      if (key.startsWith("$") || !isRecord(value)) continue;
+      const path = prefix ? `${prefix}.${key}` : key;
+      const properties = value["$properties"];
+      if (value["$type"] === "component" && isRecord(properties)) {
+        for (const [name, property] of Object.entries(properties)) {
+          if (!isRecord(property) || property["$type"] !== "token") continue;
+          const reference = property["$default"];
+          if (typeof reference === "string" && reference !== "" && !known.has(reference)) {
+            delete property["$default"];
+            dropped.push({ component: path, property: name, token: reference });
+          }
+        }
+      } else {
+        walk(value, path);
+      }
+    }
+  };
+  walk(copy, "");
+  return { cdf: copy, dropped };
+}
+function describeDroppedTokenDefaults(dropped) {
+  return dropped.map(
+    ({ component, property, token }) => `${component}.${property}: default "${token}" left out \u2014 that design token does not exist in this environment`
+  );
+}
+var init_dangling_token_defaults = __esm({
+  "packages/experience-design-system-cli-legacy/src/apply/dangling-token-defaults.ts"() {
+    "use strict";
+  }
+});
+
+// packages/experience-design-system-cli-legacy/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-legacy/src/helpers/build-contentful-management-client.ts"() {
+    "use strict";
+    init_host_utils();
+  }
+});
+
+// packages/experience-design-system-cli-legacy/src/helpers/fetch-existing-token-ids.ts
+import { fetchAll } from "contentful-management";
+async function fetchExistingTokenIds(params) {
+  const client2 = buildContentfulManagementClient({
+    cmaToken: params.cmaToken,
+    ...params.host ? { host: params.host } : {}
+  });
+  const tokens = await fetchAll(client2.designToken.getMany, {
+    spaceId: params.spaceId,
+    environmentId: params.environmentId,
+    query: { cursor: true, limit: 1e3 }
+  });
+  return new Set(tokens.map((token) => token.sys.id));
+}
+var init_fetch_existing_token_ids = __esm({
+  "packages/experience-design-system-cli-legacy/src/helpers/fetch-existing-token-ids.ts"() {
+    "use strict";
+    init_build_contentful_management_client();
+  }
+});
+
 // packages/experience-design-system-cli-legacy/src/analyze/composite-closure.ts
 function edgesFrom(component, known) {
   if (!component) return [];
@@ -20325,17 +20424,17 @@ function buildCycleUnits(slotCycles) {
   const groups = /* @__PURE__ */ new Map();
   for (const node of parent.keys()) {
     const root = find(node);
-    let group = groups.get(root);
-    if (!group) {
-      group = /* @__PURE__ */ new Set();
-      groups.set(root, group);
+    let group2 = groups.get(root);
+    if (!group2) {
+      group2 = /* @__PURE__ */ new Set();
+      groups.set(root, group2);
     }
-    group.add(node);
+    group2.add(node);
   }
   const out = /* @__PURE__ */ new Map();
-  for (const group of groups.values()) {
-    for (const node of group) {
-      out.set(node, group);
+  for (const group2 of groups.values()) {
+    for (const node of group2) {
+      out.set(node, group2);
     }
   }
   return out;
@@ -21829,10 +21928,10 @@ function swapValues(values, firstIndex, secondIndex) {
   [next[firstIndex], next[secondIndex]] = [next[secondIndex], next[firstIndex]];
   return next;
 }
-function parseToState(json) {
+function parseToState(json2) {
   let parsed;
   try {
-    parsed = JSON.parse(json);
+    parsed = JSON.parse(json2);
   } catch (e) {
     return {
       state: { componentDescription: "", props: [], slots: [] },
@@ -22685,11 +22784,11 @@ function FieldEditor({
     setEditorState(next);
     onChange(serializeState(next, value));
   };
-  const canonicalize = React14.useCallback((json) => {
+  const canonicalize = React14.useCallback((json2) => {
     try {
-      return JSON.stringify(JSON.parse(json));
+      return JSON.stringify(JSON.parse(json2));
     } catch {
-      return `__unparseable__:${json}`;
+      return `__unparseable__:${json2}`;
     }
   }, []);
   const initialStateRef = React14.useRef(initialState);
@@ -23263,14 +23362,14 @@ function FieldEditor({
   })();
   const rows = [];
   rows.push({ kind: "component-description" });
-  for (const group of propGroups.filter((candidate) => candidate.kind !== "hidden")) {
-    if (group.indexes.length === 0) continue;
+  for (const group2 of propGroups.filter((candidate) => candidate.kind !== "hidden")) {
+    if (group2.indexes.length === 0) continue;
     rows.push({
       kind: "header",
-      label: `${group.label} (${group.indexes.length}) `,
-      section: group.kind
+      label: `${group2.label} (${group2.indexes.length}) `,
+      section: group2.kind
     });
-    group.indexes.forEach((idx) => rows.push({ kind: "prop", idx }));
+    group2.indexes.forEach((idx) => rows.push({ kind: "prop", idx }));
   }
   if (slots.length > 0) {
     rows.push({
@@ -23280,7 +23379,7 @@ function FieldEditor({
     });
     slots.forEach((_, i) => rows.push({ kind: "slot", idx: i }));
   }
-  const hiddenGroup = propGroups.find((group) => group.kind === "hidden");
+  const hiddenGroup = propGroups.find((group2) => group2.kind === "hidden");
   if (hiddenGroup && hiddenGroup.indexes.length > 0) {
     rows.push({
       kind: "header",
@@ -27022,26 +27121,8 @@ var init_runScopeGate = __esm({
   }
 });
 
-// packages/experience-design-system-cli-legacy/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-legacy/src/helpers/build-contentful-management-client.ts"() {
-    "use strict";
-    init_host_utils();
-  }
-});
-
 // packages/experience-design-system-cli-legacy/src/helpers/fetch-existing-contentful-entities.ts
-import { fetchAll } from "contentful-management";
+import { fetchAll as fetchAll2 } from "contentful-management";
 async function fetchExistingContentfulEntitiesFromContentful(client2, params) {
   const componentScope = {
     spaceId: params.spaceId,
@@ -27053,8 +27134,8 @@ async function fetchExistingContentfulEntitiesFromContentful(client2, params) {
     environmentId: params.environmentId,
     query: { cursor: true, limit: 1e3 }
   };
-  const components = await fetchAll(client2.component.getMany, componentScope);
-  const tokens = await fetchAll(client2.designToken.getMany, tokenScope);
+  const components = await fetchAll2(client2.component.getMany, componentScope);
+  const tokens = await fetchAll2(client2.designToken.getMany, tokenScope);
   return { components, tokens };
 }
 var init_fetch_existing_contentful_entities = __esm({
@@ -27065,7 +27146,7 @@ var init_fetch_existing_contentful_entities = __esm({
 
 // packages/experience-design-system-cli-legacy/src/helpers/fetch-and-persist-existing-contentful-entities.ts
 import { writeFile as writeFile5 } from "node:fs/promises";
-import { join as join19 } from "node:path";
+import { join as join20 } from "node:path";
 async function fetchAndPersistExistingContentfulEntities(params) {
   const t0 = Date.now();
   try {
@@ -27077,7 +27158,7 @@ async function fetchAndPersistExistingContentfulEntities(params) {
       spaceId: params.spaceId,
       environmentId: params.environmentId
     });
-    const path = join19(params.outDir, ".existing-entities.json");
+    const path = join20(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) {
@@ -27254,11 +27335,11 @@ __export(WizardApp_exports, {
 });
 import { useEffect as useEffect15, useRef as useRef10, useState as useState23 } from "react";
 import { Box as Box42, Text as Text46 } from "ink";
-import { join as join20, resolve as resolve17 } from "node:path";
-import { appendFileSync as appendFileSync2, writeFileSync } from "node:fs";
+import { join as join21, resolve as resolve17 } from "node:path";
+import { appendFileSync as appendFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { access as access7, stat as stat5, writeFile as writeFile6 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { execFile as execFile2, spawn as spawn5 } from "node:child_process";
+import { execFile as execFile2, spawn as spawn3 } from "node:child_process";
 import { mkdir as mkdir5 } from "node:fs/promises";
 import { buildCDF as buildCDF3, validateCDF as validateCDF3, validateSlotReferences as validateSlotReferences2 } from "@contentful/experience-design-system-types";
 import { jsx as jsx50, jsxs as jsxs43 } from "react/jsx-runtime";
@@ -27320,7 +27401,7 @@ function runCli(args) {
 }
 function runSpawnedCli(args, onStderr, onStdout) {
   return new Promise((res) => {
-    const child = spawn5("node", args);
+    const child = spawn3("node", args);
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (d) => {
@@ -27395,7 +27476,7 @@ function WizardApp({
   const logInit = useRef10(false);
   const initialAgentAuthRef = useRef10(initialAgentAuth ?? null);
   if (!logInit.current) {
-    writeFileSync(WIZARD_LOG, `--- experiences import session ${(/* @__PURE__ */ new Date()).toISOString()} ---
+    writeFileSync2(WIZARD_LOG, `--- experiences import session ${(/* @__PURE__ */ new Date()).toISOString()} ---
 `);
     logInit.current = true;
   }
@@ -27404,6 +27485,7 @@ function WizardApp({
     tokensPath: ""
   });
   const allowEmptyDeleteAllRef = useRef10(false);
+  const pushDebugRef = useRef10(null);
   const generateChildRef = useRef10(null);
   const generationCachePreflightRef = useRef10(null);
   const selectionToReviewStartedAtRef = useRef10(null);
@@ -27422,7 +27504,7 @@ function WizardApp({
   const rawTokensEntryReady = !!initialRawTokensPath;
   const effectiveNoCache = resolveNoCacheForGenerate({ cliNoCache: noCache });
   const initialStepResolved = rawTokensEntryReady ? initialProjectPath ? "path-validation" : "credentials" : initialProjectPath ? "token-input" : "welcome";
-  const initialOutDir = initialProjectPath ? join20(resolve17(initialProjectPath), ".contentful") : "";
+  const initialOutDir = initialProjectPath ? join21(resolve17(initialProjectPath), ".contentful") : "";
   const [state, setState] = useState23({
     step: initialStepResolved,
     agent: initialAgent ?? "claude",
@@ -27478,6 +27560,7 @@ function WizardApp({
     existingEntitiesStatus: "idle",
     lastRunId: null,
     finalizeErrorBanner: null,
+    droppedTokenDefaults: [],
     finalReviewPassed: false
   });
   useEffect15(() => {
@@ -27620,7 +27703,7 @@ If you are using AWS Bedrock, run:
     }
     const sessionMatch = /^session=(.+)$/m.exec(result.stdout);
     const tokenSessionId = sessionMatch ? sessionMatch[1].trim() : null;
-    const tokensPath = join20(outDir, "tokens.json");
+    const tokensPath = join21(outDir, "tokens.json");
     const printArgs = ["print", "tokens", "--out", tokensPath];
     if (tokenSessionId) printArgs.push("--session", tokenSessionId);
     const r = await runCli(printArgs);
@@ -27642,7 +27725,7 @@ If you are using AWS Bedrock, run:
         tokenGenerationStatus: "complete",
         skipComponents: true,
         acceptedCount: 0,
-        outDir: state.outDir || join20(process.cwd(), ".contentful")
+        outDir: state.outDir || join21(process.cwd(), ".contentful")
       });
       update({ step: "credentials" });
       return true;
@@ -27783,7 +27866,7 @@ If you are using AWS Bedrock, run:
     return promise;
   };
   const runExtract = async (projectPath, showProgress = true) => {
-    const outDir = join20(resolve17(projectPath), ".contentful");
+    const outDir = join21(resolve17(projectPath), ".contentful");
     const existingEntitiesExpected = !state.credentialsSkipped && Boolean(state.spaceId && state.environmentId && state.cmaToken && projectPath);
     update({
       ...showProgress ? { step: "extracting" } : {},
@@ -28458,12 +28541,30 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     void runSaveAndPush();
   };
   const runPreview = async (extractSessionId, tokensPath, spaceId, environmentId, cmaToken, host2) => {
+    const resolvedHost = resolveWizardHost(host2);
+    pushDebugRef.current?.finish({
+      outcome: "superseded",
+      summary: "A new push attempt started before this one finished."
+    });
+    const pushDebug = startPushDebugRun({
+      space_id: spaceId,
+      environment_id: environmentId,
+      host: resolvedHost,
+      cma_token: cmaToken,
+      extract_session_id: extractSessionId,
+      tokens_file: tokensPath || null,
+      delete_everything_not_listed: allowEmptyDeleteAllRef.current
+    });
+    pushDebugRef.current = pushDebug;
     if (shouldBypassPreview(state)) {
+      pushDebug.finish({
+        outcome: "skipped",
+        summary: "Credentials were skipped, so nothing is previewed or pushed. Files were saved only."
+      });
       update(buildSkippedPreviewTransition());
       return;
     }
     update({ step: "previewing" });
-    const resolvedHost = resolveWizardHost(host2);
     try {
       const client2 = new ImportApiClient({
         cmaToken,
@@ -28471,6 +28572,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         environmentId,
         host: resolvedHost
       });
+      pushDebug.event("Preview started", { note: `POST ${resolvedHost}/\u2026/design_systems/imports/preview` });
       let components = [];
       if (extractSessionId) {
         const db = openPipelineDb();
@@ -28486,7 +28588,16 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         tokens = await readTokensFromPath("tokens", tokensPath);
       }
       let cdf = buildCDF3(components, toCDFTokens(tokens), { deleteAll: allowEmptyDeleteAllRef.current });
+      pushDebug.event("Built the CDF to send", {
+        note: `${summarizeCdf(cdf).length} entries`,
+        data: { entries: summarizeCdf(cdf), tokens_loaded: tokens.length }
+      });
       let preview = await client2.previewImport(cdf);
+      pushDebug.event("Server previewed the CDF", {
+        note: "what the server would create, change, leave alone or remove",
+        data: summarizePreview(preview),
+        requestId: client2.getLastRequestId()
+      });
       if (extractSessionId) {
         let needsRepreview = false;
         const db = openPipelineDb();
@@ -28506,15 +28617,27 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
             if (seededDefaults > 0) needsRepreview = true;
           }
           if (needsRepreview) {
+            pushDebug.event("Re-previewing", {
+              note: "the server listed components as removed or changed that exist locally, so defaults were filled in"
+            });
             components = loadCDFComponents(db, extractSessionId);
             cdf = buildCDF3(components, toCDFTokens(tokens), { deleteAll: allowEmptyDeleteAllRef.current });
             preview = await client2.previewImport(cdf);
+            pushDebug.event("Server previewed the updated CDF", {
+              data: summarizePreview(preview),
+              requestId: client2.getLastRequestId()
+            });
           }
         } finally {
           db.close();
         }
       }
       if (isEmptyPreview(preview)) {
+        pushDebug.finish({
+          outcome: "nothing-to-push",
+          summary: "The server says every component and token in the CDF already matches what is in this space, so no apply request was sent. If the space looks empty, check that this is the space and environment you are viewing.",
+          details: { preview: summarizePreview(preview), request_id: client2.getLastRequestId() }
+        });
         update({
           step: "done",
           serverPreview: preview,
@@ -28526,14 +28649,44 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         });
         return;
       }
+      let cdfToPush = cdf;
+      let droppedTokenDefaults = [];
+      try {
+        const existingTokenIds = await fetchExistingTokenIds({
+          spaceId,
+          environmentId,
+          cmaToken,
+          ...host2 ? { host: host2 } : {}
+        });
+        const checked = dropDanglingTokenDefaults(cdf, existingTokenIds);
+        cdfToPush = checked.cdf;
+        droppedTokenDefaults = describeDroppedTokenDefaults(checked.dropped);
+        pushDebug.event("Checked token references", {
+          note: checked.dropped.length === 0 ? `every token default exists (${existingTokenIds.size} tokens in this environment)` : `${checked.dropped.length} default(s) point at a token that does not exist and will be left out`,
+          data: { tokens_in_environment: existingTokenIds.size, dropped: checked.dropped }
+        });
+      } catch (tokenCheckError) {
+        pushDebug.event("Could not check token references", {
+          note: tokenCheckError instanceof Error ? tokenCheckError.message : String(tokenCheckError)
+        });
+      }
+      pushDebug.event("Waiting for confirmation", {
+        note: "the preview shows changes, so the wizard asks before pushing"
+      });
       update({
         step: "preview-gate",
         serverPreview: preview,
-        cdf,
+        cdf: cdfToPush,
+        droppedTokenDefaults,
         finalizeErrorBanner: null,
         ...clearedValidationErrorState()
       });
     } catch (e) {
+      pushDebug.finish({
+        outcome: "preview-failed",
+        summary: e instanceof ApiError ? `The preview request was rejected with HTTP ${e.status}.` : `The preview failed before the server answered: ${e instanceof Error ? e.message : String(e)}`,
+        details: e instanceof ApiError ? { status: e.status, body: (e.body ?? "").slice(0, 4e3) } : { error: e instanceof Error ? e.message : String(e) }
+      });
       if (e instanceof ApiError) {
         if (e.status === 401 || e.status === 403) {
           let bodyMsg = "";
@@ -28596,7 +28749,18 @@ If using a custom host configuration, make sure the space exists on that host.`
     }
   };
   const runPush = async (cdf, spaceId, environmentId, cmaToken, host2, acknowledgeBreakingChanges, preview) => {
+    const pushDebug = pushDebugRef.current ?? startPushDebugRun({
+      space_id: spaceId,
+      environment_id: environmentId,
+      host: resolveWizardHost(host2),
+      cma_token: cmaToken
+    });
+    pushDebugRef.current = pushDebug;
     if (shouldRefusePush(state)) {
+      pushDebug.finish({
+        outcome: "skipped",
+        summary: "Credentials were skipped, so the push was refused. Files were saved only."
+      });
       update(buildSkippedPushTransition());
       return;
     }
@@ -28604,6 +28768,11 @@ If using a custom host configuration, make sure the space exists on that host.`
       const hasComponentChanges = preview.components.new.length > 0 || preview.components.changed.length > 0 || preview.components.removed.length > 0;
       const hasTokenChanges = preview.tokens.new.length > 0 || preview.tokens.changed.length > 0 || preview.tokens.removed.length > 0;
       if (!hasComponentChanges && !hasTokenChanges) {
+        pushDebug.finish({
+          outcome: "nothing-to-push",
+          summary: "The preview had no new, changed or removed items, so no apply request was sent.",
+          details: { preview: summarizePreview(preview) }
+        });
         update({
           step: "done",
           pushResult: {
@@ -28616,6 +28785,11 @@ If using a custom host configuration, make sure the space exists on that host.`
     }
     const cycles = detectSlotCycles(extractComponents(cdf));
     if (cycles.length > 0) {
+      pushDebug.finish({
+        outcome: "failed",
+        summary: "The push was blocked locally because components slot each other in a cycle.",
+        details: { cycles: formatSlotCycleReport(cycles) }
+      });
       update({
         step: "error",
         errorStep: "apply",
@@ -28626,6 +28800,11 @@ If using a custom host configuration, make sure the space exists on that host.`
     }
     const unresolvedSlotReferences = validateSlotReferences2(extractComponents(cdf));
     if (unresolvedSlotReferences.length > 0) {
+      pushDebug.finish({
+        outcome: "failed",
+        summary: "The push was blocked locally because a slot refers to a component that is not in the CDF.",
+        details: { unresolved: formatUnresolvedSlotReferences(unresolvedSlotReferences) }
+      });
       update({
         step: "error",
         errorStep: "apply",
@@ -28635,6 +28814,14 @@ If using a custom host configuration, make sure the space exists on that host.`
       return;
     }
     update({ step: "pushing", pushProgress: null, errorAllowBreakingChangeAcknowledgment: false });
+    pushDebug.event("Apply started", {
+      note: `POST ${resolveWizardHost(host2)}/\u2026/design_systems/imports/apply`,
+      data: {
+        acknowledge_breaking_changes: acknowledgeBreakingChanges,
+        sending: summarizeCdf(cdf),
+        expected: preview ? summarizePreview(preview) : null
+      }
+    });
     try {
       const resolvedHost = resolveWizardHost(host2);
       const client2 = new ImportApiClient({
@@ -28644,6 +28831,11 @@ If using a custom host configuration, make sure the space exists on that host.`
         host: resolvedHost
       });
       let operation = await client2.applyImport(cdf, { acknowledgeBreakingChanges });
+      pushDebug.event("Server accepted the apply request", {
+        note: `operation ${operation.sys.id} is ${operation.sys.status}`,
+        data: { operation_id: operation.sys.id, status: operation.sys.status, summary: operation.summary },
+        requestId: client2.getLastRequestId()
+      });
       try {
         logStep({
           applyResponse: {
@@ -28660,9 +28852,15 @@ If using a custom host configuration, make sure the space exists on that host.`
         pushProgress: { kind: "queued", operationId: operation.sys.id }
       });
       let pollCount = 0;
+      let lastPolledStatus = "";
       operation = await client2.pollOperation(operation.sys.id, {
         onProgress: (op) => {
           pollCount++;
+          const polled = `${op.sys.status} ${op.summary ? `${op.summary.total - op.summary.pending}/${op.summary.total}` : ""}`;
+          if (polled !== lastPolledStatus) {
+            lastPolledStatus = polled;
+            pushDebug.event("Operation status changed", { note: polled.trim(), requestId: client2.getLastRequestId() });
+          }
           const s = op.summary;
           if (s) {
             const done = s.total - s.pending;
@@ -28767,6 +28965,29 @@ If using a custom host configuration, make sure the space exists on that host.`
           );
         }
       }
+      const failedItems = items.filter((item) => item.status === "failed");
+      const pushedCount = items.filter((item) => item.status === "succeeded").length;
+      pushDebug.finish({
+        outcome: pushSucceeded ? "pushed" : pushedCount > 0 ? "partial" : "failed",
+        summary: pushSucceeded ? items.length > 0 ? `The server reports ${pushedCount} of ${items.length} items applied.` : `The operation finished as ${operation.sys.status}, but the server returned no per-item results, so the counts come from the preview.` : `The operation finished as ${operation.sys.status}; ${failedItems.length} item(s) failed.`,
+        details: {
+          operation_id: operation.sys.id,
+          operation_status: operation.sys.status,
+          server_summary: operation.summary,
+          items: items.map((item) => ({
+            type: item.entityType,
+            id: item.id,
+            action: item.action,
+            status: item.status,
+            ...item.error ? { error: formatEdsiError(item.error) } : {}
+          })),
+          shown_to_user: {
+            component_types: pushResult.componentTypes,
+            design_tokens: pushResult.designTokens
+          },
+          request_id: client2.getLastRequestId()
+        }
+      });
       update({ step: "done", pushResult });
     } catch (e) {
       let msg;
@@ -28777,6 +28998,14 @@ If using a custom host configuration, make sure the space exists on that host.`
       } else {
         msg = "Push failed";
       }
+      pushDebug.finish({
+        outcome: "failed",
+        summary: e instanceof ApiError ? `The apply request failed with HTTP ${e.status}.` : `The apply request failed before the server answered: ${msg}`,
+        details: {
+          message: msg,
+          ...e instanceof ApiError ? { status: e.status, body: (e.body ?? "").slice(0, 4e3) } : {}
+        }
+      });
       update({
         step: "error",
         errorStep: "apply",
@@ -28788,7 +29017,7 @@ If using a custom host configuration, make sure the space exists on that host.`
   };
   const runPrintFiles = async (extractSessionId, outDir, opts = {}) => {
     update({ step: "printing" });
-    const componentsPath = join20(outDir, "components.json");
+    const componentsPath = join21(outDir, "components.json");
     try {
       const db = openPipelineDb();
       let components = [];
@@ -28891,7 +29120,7 @@ If using a custom host configuration, make sure the space exists on that host.`
       if (tokenReuseChecked.current) return;
       tokenReuseChecked.current = true;
       const tokenNextStep = state.projectPath ? "path-validation" : "credentials";
-      const existingTokensPath = join20(state.outDir, "tokens.json");
+      const existingTokensPath = join21(state.outDir, "tokens.json");
       if (effectiveNoCache) {
         tokenGenerationPromiseRef.current = runAgentAuthCheck(tokenNextStep).then(
           (ok2) => ok2 ? runGenerateTokens(state.rawTokensPath, state.outDir) : false
@@ -28942,7 +29171,7 @@ If using a custom host configuration, make sure the space exists on that host.`
           {
             onContinue: (path) => {
               const projectPath = normalizePath(path);
-              const outDir = join20(projectPath, ".contentful");
+              const outDir = join21(projectPath, ".contentful");
               update({ step: "token-input", projectPath, outDir });
             },
             onQuit: () => process.exit(0)
@@ -29304,6 +29533,7 @@ If using a custom host configuration, make sure the space exists on that host.`
             environmentId: state.environmentId,
             stepNumber: totalSteps,
             totalSteps,
+            droppedTokenDefaults: state.droppedTokenDefaults,
             onConfirm: (acknowledge) => {
               void runPush(
                 state.cdf,
@@ -29440,6 +29670,7 @@ var init_WizardApp = __esm({
     init_theme();
     init_run_teaser();
     init_debug_logger();
+    init_push_debug_log();
     init_credentials_store();
     init_path_prompt();
     init_save_path_resolver();
@@ -29468,6 +29699,8 @@ var init_WizardApp = __esm({
     init_wizard_generate_progress();
     init_spawn_generate();
     init_tokens();
+    init_dangling_token_defaults();
+    init_fetch_existing_token_ids();
     init_preview_utils();
     init_db();
     init_ScopeGateStep();
@@ -29484,7 +29717,7 @@ var init_WizardApp = __esm({
     init_use_terminal_size();
     init_render_with_goodbye();
     SAVE_CONFIRMATION_DELAY_MS = 1e3;
-    WIZARD_LOG = join20(tmpdir(), "experiences-import-wizard.log");
+    WIZARD_LOG = join21(tmpdir(), "experiences-import-wizard.log");
   }
 });
 
@@ -29615,7 +29848,7 @@ var init_agent_definitions = __esm({
 });
 
 // packages/experience-design-system-cli-legacy/src/setup/lib/shell.ts
-import { execFile as execFile3, spawn as spawn6 } from "node:child_process";
+import { execFile as execFile3, spawn as spawn4 } from "node:child_process";
 import { access as access8 } from "node:fs/promises";
 import { promisify as promisify2 } from "node:util";
 async function binaryExists(name) {
@@ -29631,7 +29864,7 @@ async function pathExists3(path) {
 }
 function runSpawn(cmd, args, opts = {}) {
   return new Promise((resolve21) => {
-    const child = spawn6(cmd, args, {
+    const child = spawn4(cmd, args, {
       cwd: opts.cwd,
       env: opts.env ?? process.env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -29664,7 +29897,7 @@ var init_shell = __esm({
 });
 
 // packages/experience-design-system-cli-legacy/src/setup/lib/checks.ts
-import { join as join21 } from "node:path";
+import { join as join22 } from "node:path";
 function checkNodeVersion(nodeVersion = process.versions.node) {
   const major = Number.parseInt(nodeVersion.split(".")[0], 10);
   return {
@@ -29678,7 +29911,7 @@ async function detectNodeVersionManagers(homeDir, deps = {
   binaryExists,
   pathExists: pathExists3
 }) {
-  const nvmScript = join21(homeDir, ".nvm", "nvm.sh");
+  const nvmScript = join22(homeDir, ".nvm", "nvm.sh");
   return {
     nvm: await deps.binaryExists("nvm") || await deps.pathExists(nvmScript),
     fnm: await deps.binaryExists("fnm"),
@@ -29757,7 +29990,7 @@ var init_report = __esm({
 
 // packages/experience-design-system-cli-legacy/src/doctor/checks.ts
 import { homedir as homedir7 } from "node:os";
-import { join as join22 } from "node:path";
+import { join as join23 } from "node:path";
 async function reportNode() {
   section("Checking Node.js version");
   const check = checkNodeVersion();
@@ -29808,12 +30041,12 @@ async function reportPnpm(pkgRoot) {
 }
 async function reportDependencies(pkgRoot) {
   section("Checking dependencies (pnpm install)");
-  if (!await pathExists3(join22(pkgRoot, "node_modules"))) {
+  if (!await pathExists3(join23(pkgRoot, "node_modules"))) {
     info("node_modules not found \u2014 running pnpm install...");
   } else {
     info("Running pnpm install to ensure dependencies are up to date...");
   }
-  const check = await installDependencies(join22(pkgRoot, "..", ".."));
+  const check = await installDependencies(join23(pkgRoot, "..", ".."));
   if (!check.passed) {
     fail("pnpm install failed");
     info("");
@@ -29830,7 +30063,7 @@ async function reportDependencies(pkgRoot) {
 async function reportBuild(pkgRoot) {
   section("Building CLI");
   info("Running pnpm build...");
-  const check = await buildCli(join22(pkgRoot, "..", ".."));
+  const check = await buildCli(join23(pkgRoot, "..", ".."));
   if (!check.passed) {
     fail("Build failed");
     info("");
@@ -31045,9 +31278,9 @@ var init_SetupScreen = __esm({
 
 // packages/experience-design-system-cli-legacy/src/setup/command.ts
 import { readFileSync as readFileSync8 } from "node:fs";
-import { join as join23 } from "node:path";
+import { join as join24 } from "node:path";
 function getCliVersion() {
-  const pkg4 = JSON.parse(readFileSync8(join23(findPkgRoot(), "package.json"), "utf8"));
+  const pkg4 = JSON.parse(readFileSync8(join24(findPkgRoot(), "package.json"), "utf8"));
   return pkg4.version;
 }
 async function runSetup(opts) {
@@ -31059,7 +31292,7 @@ async function runSetup(opts) {
   const { renderWithGoodbye: renderWithGoodbye2 } = await Promise.resolve().then(() => (init_render_with_goodbye(), render_with_goodbye_exports));
   const { createElement: createElement6 } = await import("react");
   const { SetupScreen: SetupScreen2 } = await Promise.resolve().then(() => (init_SetupScreen(), SetupScreen_exports));
-  const repoRoot = join23(findPkgRoot(), "..", "..");
+  const repoRoot = join24(findPkgRoot(), "..", "..");
   const completion = { outcome: null };
   let unmountInk = null;
   const { waitUntilExit, unmount } = renderWithGoodbye2(
@@ -31260,15 +31493,15 @@ var init_apply_mapping = __esm({
 });
 
 // packages/experience-design-system-cli-legacy/src/analyze/composition/prompt-loader.ts
-import { existsSync as existsSync7, readFileSync as readFileSync9 } from "node:fs";
-import { dirname as dirname11, join as join24, resolve as resolve18 } from "node:path";
+import { existsSync as existsSync8, readFileSync as readFileSync9 } from "node:fs";
+import { dirname as dirname11, join as join25, resolve as resolve18 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function resolvePromptPath(fileName) {
   const thisDir = dirname11(fileURLToPath3(import.meta.url));
   let dir = thisDir;
   for (; ; ) {
-    const candidate = join24(dir, "prompts");
-    if (existsSync7(candidate)) return join24(candidate, fileName);
+    const candidate = join25(dir, "prompts");
+    if (existsSync8(candidate)) return join25(candidate, fileName);
     const parent = resolve18(dir, "..");
     if (parent === dir) {
       throw new Error(
@@ -31536,7 +31769,7 @@ var init_manifest_doc_evidence = __esm({
 
 // packages/experience-design-system-cli-legacy/src/analyze/extract-command.ts
 import { mkdir as mkdir6, readdir as readdir3, readFile as readFile18, stat as stat6 } from "node:fs/promises";
-import { isAbsolute as isAbsolute2, join as join25, relative as relative2, resolve as resolve19 } from "node:path";
+import { isAbsolute as isAbsolute2, join as join26, relative as relative2, resolve as resolve19 } from "node:path";
 function resolveExtractNoCache(opts) {
   return opts.noCache === true || opts.cache === false;
 }
@@ -31574,7 +31807,7 @@ async function collectSourceFiles(directory, onProgress) {
     const entries = await readdir3(currentDirectory, { withFileTypes: true });
     const subdirs = [];
     for (const entry of entries) {
-      const fullPath = join25(currentDirectory, entry.name);
+      const fullPath = join26(currentDirectory, entry.name);
       if (entry.isDirectory()) {
         if (!IGNORED_DIRECTORY_NAMES.has(entry.name)) {
           subdirs.push(fullPath);
@@ -31658,7 +31891,7 @@ function registerInternalExtractCommand(program) {
       }
     }
     const projectRoot = resolve19(opts.project);
-    const outDir = join25(projectRoot, ".contentful");
+    const outDir = join26(projectRoot, ".contentful");
     let sourceDirectory;
     if (opts.dir !== void 0) {
       sourceDirectory = resolveFromProjectRoot(projectRoot, opts.dir);
@@ -32061,9 +32294,9 @@ __export(program_exports, {
   resolveBedrockFromAncestors: () => resolveBedrockFromAncestors,
   runBuild: () => runBuild
 });
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
-import { dirname as dirname13, join as join26, resolve as resolve20 } from "node:path";
+import { dirname as dirname13, join as join27, resolve as resolve20 } from "node:path";
 import { readFileSync as readFileSync10 } from "node:fs";
 import { Command } from "commander";
 async function runBuild(opts) {
@@ -32096,7 +32329,7 @@ function registerBuildCommand(program) {
     const pkgRoot = resolve20(dirname13(fileURLToPath4(import.meta.url)), "..", "..");
     process.stderr.write("\u2699  Building from source...\n");
     const { exitCode } = await runBuild({
-      spawnFn: () => spawn7("pnpm", ["build"], { cwd: pkgRoot, stdio: "inherit" }),
+      spawnFn: () => spawn5("pnpm", ["build"], { cwd: pkgRoot, stdio: "inherit" }),
       stderrWrite: (s) => process.stderr.write(s)
     });
     process.exit(exitCode);
@@ -32163,7 +32396,7 @@ var init_program = __esm({
     init_analytics();
     init_credentials_store();
     init_cli_path();
-    pkg3 = JSON.parse(readFileSync10(join26(findPkgRoot(), "package.json"), "utf8"));
+    pkg3 = JSON.parse(readFileSync10(join27(findPkgRoot(), "package.json"), "utf8"));
   }
 });