@contentful/experience-design-system-cli 2.34.5-dev-build-b70b5f29.0 → 2.34.5-dev-build-d8f04e9d.0

package/dist/src/index.js

@@ -160,253 +160,21 @@ var init_render_with_goodbye = __esm({
   }
 });
 
-// packages/experience-design-system-generation/dist/src/generate/model/agent.js
+// packages/experience-design-system-generation/dist/src/agent-names.js
 function isAgentName(value) {
   return AGENT_NAMES.includes(value);
 }
 var AGENT_NAMES, DEFAULT_AGENT_NAME;
-var init_agent = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/model/agent.js"() {
+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";
   }
 });
 
-// packages/experience-design-system-generation/dist/src/generate/services/agent-configuration-service.js
-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];
-}
-function resolveAgentEnvironment(agent, bedrock) {
-  return bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
-}
-function agentSupportsBedrock(agent) {
-  return BEDROCK_CAPABLE_AGENTS.has(agent);
-}
-function resolveAgentModel(agent, explicit, bedrock = false) {
-  if (explicit && explicit.trim())
-    return explicit.trim();
-  const override = process.env[`EDS_AGENT_MODEL_${agent.toUpperCase()}`];
-  if (override && override.trim())
-    return override.trim();
-  if (bedrock && agent === "codex")
-    return DEFAULT_CODEX_BEDROCK_MODEL;
-  if (bedrock && agent === "opencode")
-    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 buildArgs(agent, prompt, model, promptViaStdin = false, bedrock = false) {
-  const resolvedModel = resolveAgentModel(agent, model, bedrock);
-  const modelArg = resolvedModel ? ["--model", resolvedModel] : [];
-  const promptArg = promptViaStdin ? [] : [prompt];
-  switch (agent) {
-    case "claude":
-      return ["--print", ...modelArg, ...promptArg];
-    case "codex": {
-      const bedrockArgs = bedrock ? codexBedrockConfigArgs() : [];
-      return ["exec", ...bedrockArgs, ...modelArg, "--dangerously-bypass-approvals-and-sandbox", ...promptArg];
-    }
-    case "opencode":
-      return ["run", ...modelArg, ...promptArg];
-    case "cursor":
-      return ["--print", ...modelArg, ...promptArg];
-    case "copilot": {
-      const copilotModel = resolveAgentModel("copilot", model);
-      const copilotModelArg = !copilotModel || copilotModel === "Auto" ? [] : ["--model", copilotModel];
-      return ["-p", ...promptArg, ...copilotModelArg, "--allow-all-tools"];
-    }
-  }
-}
-var 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_configuration_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/agent-configuration-service.js"() {
-    "use strict";
-    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",
-      copilot: "Auto"
-    };
-    DEFAULT_CODEX_BEDROCK_MODEL = "openai.gpt-5.6-luna";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/agent-auth-service.js
+// packages/experience-design-system-generation/dist/src/agent-runner.js
 import { spawn } from "node:child_process";
-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 = spawn(binary, ["auth", "status", "--json"], {
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let stdout = "";
-    let done = false;
-    const timer = setTimeout(() => {
-      if (!done) {
-        done = true;
-        child.kill("SIGTERM");
-        resolve21("unauthenticated");
-      }
-    }, 5e3);
-    child.stdout?.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    child.on("close", (code) => {
-      if (done)
-        return;
-      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_agent_auth_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/agent-auth-service.js"() {
-    "use strict";
-    init_agent_configuration_service();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/failure-diagnostics-service.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_failure_diagnostics_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/failure-diagnostics-service.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/adapters/local/local-agent-process.js
-import { spawn as spawn2 } 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 = resolveBinary(agent);
-  const useStdin2 = !!promptViaStdin;
-  const args = buildArgs(agent, prompt, model, useStdin2, bedrock);
-  const startedAt = Date.now();
-  onDebugEvent?.("run.start", {
-    agent,
-    binary,
-    model,
-    bedrock: !!bedrock,
-    timeoutMs,
-    promptLen: prompt.length,
-    promptHead: prompt.slice(0, 500)
-  });
-  return new Promise((resolve21) => {
-    const bedrockEnv = resolveAgentEnvironment(agent, bedrock);
-    const child = spawn2(binary, args, {
-      stdio: ["pipe", "pipe", "pipe"],
-      ...bedrockEnv ? { env: { ...process.env, ...bedrockEnv } } : {}
-    });
-    if (useStdin2 && child.stdin) {
-      child.stdin.on("error", () => {
-      });
-      child.stdin.write(prompt, () => {
-        child.stdin?.end();
-      });
-    } else {
-      child.stdin?.end();
-    }
-    let stdout = "";
-    let stderr = "";
-    let timedOut = false;
-    let spawnError;
-    const timer = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
-    }, timeoutMs);
-    child.stdout?.on("data", (chunk) => {
-      const text = chunk.toString();
-      stdout += text;
-      onOutput?.(text);
-    });
-    child.stderr?.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    child.on("error", (error) => {
-      spawnError = error;
-    });
-    child.on("close", (code, signal) => {
-      clearTimeout(timer);
-      const result = {
-        exitCode: spawnError || signal ? 1 : code ?? 1,
-        stdout,
-        stderr: spawnError ? `${stderr}${spawnError.message}` : stderr,
-        timedOut
-      };
-      onDebugEvent?.("run.end", {
-        agent,
-        model,
-        durationMs: Date.now() - startedAt,
-        exitCode: result.exitCode,
-        signal,
-        timedOut,
-        stdoutLen: stdout.length,
-        stderrLen: stderr.length,
-        stderrTail: stderr.slice(-1e3)
-      });
-      resolve21(result);
-    });
-  });
-}
-var init_local_agent_process = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/adapters/local/local-agent-process.js"() {
-    "use strict";
-    init_agent_configuration_service();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/protocol-parser-service.js
 function findJsonObjectEnd(line) {
   let depth = 0;
   let inString = false;
@@ -642,229 +410,312 @@ function parseMapTokenPropToolCallLines(stdout) {
       warnings.push(`map_token_prop '${rec.component}.${String(rec.prop)}': missing or empty token_allowed \u2014 skipped`);
       continue;
     }
-    calls.push({
+    const call = {
       tool: "map_token_prop",
       component: rec.component,
       prop: rec.prop,
       token_allowed: rec.token_allowed
-    });
+    };
+    calls.push(call);
   }
   return { calls, warnings };
 }
-function extractSentinelOutput(stdout) {
-  const startMarker = "<<<EDS_OUTPUT_START>>>";
-  const endMarker = "<<<EDS_OUTPUT_END>>>";
-  const startIndex = stdout.indexOf(startMarker);
-  const endIndex = stdout.indexOf(endMarker);
-  if (startIndex === -1 || endIndex === -1 || endIndex <= startIndex)
-    return null;
-  const secondStart = stdout.indexOf(startMarker, startIndex + startMarker.length);
-  if (secondStart !== -1 && secondStart < endIndex)
-    return "multiple";
-  const firstEnd = stdout.indexOf(endMarker, startIndex);
-  const secondEnd = stdout.indexOf(endMarker, firstEnd + endMarker.length);
-  if (secondEnd !== -1)
-    return "multiple";
-  return stdout.slice(startIndex + startMarker.length, endIndex).trim();
+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 VALID_SELECT_TOOL_NAMES, VALID_TOOL_NAMES, VALID_TOKEN_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES;
-var init_protocol_parser_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/protocol-parser-service.js"() {
-    "use strict";
-    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"]);
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/adapters/local/local-agent-invoker.js
-function createLocalCliAgentInvoker(options = {}) {
-  const { onDebugEvent } = options;
-  return {
-    invoke(invokeOptions) {
-      return runAgent({ ...invokeOptions, onDebugEvent });
-    },
-    checkAuth(agent) {
-      return checkAgentAuth(agent);
-    }
-  };
+function agentSupportsBedrock(agent) {
+  return BEDROCK_CAPABLE_AGENTS.has(agent);
 }
-var init_local_agent_invoker = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/adapters/local/local-agent-invoker.js"() {
-    "use strict";
-    init_agent_auth_service();
-    init_local_agent_process();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/preambles/components.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".
-- 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 resolveAgentModel(agent, explicit, bedrock = false) {
+  if (explicit && explicit.trim())
+    return explicit.trim();
+  const override = process.env[`EDS_AGENT_MODEL_${agent.toUpperCase()}`];
+  if (override && override.trim())
+    return override.trim();
+  if (bedrock && agent === "codex")
+    return DEFAULT_CODEX_BEDROCK_MODEL;
+  if (bedrock && agent === "opencode")
+    return withBedrockProviderPrefix(DEFAULT_OPENCODE_MODEL);
+  return DEFAULT_MODELS[agent];
 }
-var init_components = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/preambles/components.js"() {
-    "use strict";
+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 buildArgs(agent, prompt, model, promptViaStdin = false, bedrock = false) {
+  const resolvedModel = resolveAgentModel(agent, model, bedrock);
+  const modelArg = resolvedModel ? ["--model", resolvedModel] : [];
+  const promptArg = promptViaStdin ? [] : [prompt];
+  switch (agent) {
+    case "claude":
+      return ["--print", ...modelArg, ...promptArg];
+    case "codex": {
+      const bedrockArgs = bedrock ? codexBedrockConfigArgs() : [];
+      return ["exec", ...bedrockArgs, ...modelArg, "--dangerously-bypass-approvals-and-sandbox", ...promptArg];
+    }
+    case "opencode":
+      return ["run", ...modelArg, ...promptArg];
+    case "cursor":
+      return ["--print", ...modelArg, ...promptArg];
+    case "copilot": {
+      const copilotModel = resolveAgentModel("copilot", model);
+      const copilotModelArg = !copilotModel || copilotModel === "Auto" ? [] : ["--model", copilotModel];
+      return ["-p", ...promptArg, ...copilotModelArg, "--allow-all-tools"];
+    }
   }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/preambles/map-tokens.js
-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.`;
 }
-var init_map_tokens = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/preambles/map-tokens.js"() {
+async function runAgent(options) {
+  const { agent, prompt, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
+  const bedrock = options.bedrock ?? process.env.EDS_BEDROCK === "1";
+  const binary = resolveBinary(agent);
+  const useStdin2 = !!promptViaStdin;
+  const args = buildArgs(agent, prompt, model, useStdin2, bedrock);
+  const startedAt = Date.now();
+  onDebugEvent?.("run.start", {
+    agent,
+    binary,
+    model,
+    bedrock: !!bedrock,
+    timeoutMs,
+    promptLen: prompt.length,
+    promptHead: prompt.slice(0, 500)
+  });
+  return new Promise((resolve21) => {
+    const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
+    const child = spawn(binary, args, {
+      stdio: ["pipe", "pipe", "pipe"],
+      ...bedrockEnv ? { env: { ...process.env, ...bedrockEnv } } : {}
+    });
+    if (useStdin2 && child.stdin) {
+      child.stdin.on("error", () => {
+      });
+      child.stdin.write(prompt, () => {
+        child.stdin?.end();
+      });
+    } else {
+      child.stdin?.end();
+    }
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    const timer = setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+    }, timeoutMs);
+    child.stdout?.on("data", (chunk) => {
+      const text = chunk.toString();
+      stdout += text;
+      onOutput?.(text);
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("close", (code, signal) => {
+      clearTimeout(timer);
+      const result = {
+        exitCode: signal ? 1 : code ?? 1,
+        stdout,
+        stderr,
+        timedOut
+      };
+      onDebugEvent?.("run.end", {
+        agent,
+        model,
+        durationMs: Date.now() - startedAt,
+        exitCode: result.exitCode,
+        signal,
+        timedOut,
+        stdoutLen: stdout.length,
+        stderrLen: stderr.length,
+        stderrTail: stderr.slice(-1e3)
+      });
+      resolve21(result);
+    });
+  });
+}
+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 = spawn(binary, ["auth", "status", "--json"], {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let done = false;
+    const timer = setTimeout(() => {
+      if (!done) {
+        done = true;
+        child.kill("SIGTERM");
+        resolve21("unauthenticated");
+      }
+    }, 5e3);
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.on("close", (code) => {
+      if (done)
+        return;
+      done = true;
+      clearTimeout(timer);
+      if (code !== 0) {
+        resolve21("unauthenticated");
+        return;
+      }
+      try {
+        const status = JSON.parse(stdout);
+        resolve21(status.loggedIn ? "ok" : "unauthenticated");
+      } catch {
+        resolve21("unauthenticated");
+      }
+    });
+  });
+}
+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_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/generate/services/preambles/select.js
-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.`;
+// packages/experience-design-system-generation/dist/src/agent-invoker.js
+function createLocalCliAgentInvoker(options = {}) {
+  const { onDebugEvent } = options;
+  return {
+    invoke(invokeOptions) {
+      return runAgent({ ...invokeOptions, onDebugEvent });
+    },
+    checkAuth(agent) {
+      return checkAgentAuth(agent);
+    }
+  };
 }
-var init_select = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/preambles/select.js"() {
+var init_agent_invoker = __esm({
+  "packages/experience-design-system-generation/dist/src/agent-invoker.js"() {
     "use strict";
+    init_agent_runner();
   }
 });
 
-// packages/experience-design-system-generation/dist/src/generate/services/preambles/tokens.js
-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>"}
-\`\`\`
+// 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.
+`;
+}
+async function buildPrompt(options) {
+  const skillContent = options.skillContentOverride ?? await readSkillFile(options.skill, options.skillPathOverride);
+  const preamble = buildPreamble(options);
+  return `${preamble}
 
-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.`;
+Skill instructions follow:
+---
+${skillContent}`;
 }
-var init_tokens = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/preambles/tokens.js"() {
-    "use strict";
+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;
+  }
+}
+async function readSkillFile(skill, override) {
+  if (override) {
+    const skillPath2 = resolve(override);
+    try {
+      return await readFile2(skillPath2, "utf8");
+    } catch {
+      throw new Error(`custom prompt file not found (skill: ${skill}, path: ${skillPath2})`);
+    }
   }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/preambles/index.js
-var init_preambles = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/preambles/index.js"() {
-    "use strict";
-    init_components();
-    init_map_tokens();
-    init_select();
-    init_tokens();
+  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/generate/services/prompt-context-service.js
-import { flattenDTCG } from "@contentful/experience-design-system-types";
+}
 function inferFenceLang(filename) {
   if (!filename)
     return "json";
@@ -924,7 +775,7 @@ function renderTokenCandidateSection(kind, entries) {
   return `${label}, one leaf token per line as \`path \xB7 type\`, no \`$value\`:
 ${formatTokenCandidateLines(entries)}`;
 }
-function renderPromptContext(options) {
+function buildPreamble(options) {
   const { skill, rawComponentsInline, rawTokensInline, rawTokensFilename, tokensInline, tokenMapInline, generatedCdf, tokenTree, componentSourceRefs, existingComponentsInline, existingTokensInline, componentAllowlistInline } = options;
   const sections = [];
   if (existingComponentsInline) {
@@ -940,7 +791,7 @@ ${existingTokensInline}
 \`\`\``);
   }
   if (componentAllowlistInline) {
-    sections.push(`Known component names for slot allowed_components (hard allowlist; never use any other name). Never invent a child from an import, JSX element, type name, icon name, or implementation helper.
+    sections.push(`Known component names for slot allowed_components (hard allowlist; never use any other name):
 \`\`\`json
 ${componentAllowlistInline}
 \`\`\``);
@@ -1030,56 +881,149 @@ ${JSON.stringify(withoutContent.map((ref) => ({ component: ref.component, source
 \`\`\``);
     }
   }
-  return sections.length > 0 ? `
+  const inputBlock = sections.length > 0 ? `
 
 ${sections.join("\n\n")}` : "";
-}
-var init_prompt_context_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/prompt-context-service.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/skill-loader.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})`);
-    }
-    dir = parent;
+  if (skill === "components") {
+    return buildComponentsAutonomousPreamble(inputBlock);
   }
-}
-async function loadSkillContent(skill, override) {
-  if (override) {
-    const skillPath2 = resolve(override);
-    try {
-      return await readFile2(skillPath2, "utf8");
-    } catch {
-      throw new Error(`custom prompt file not found (skill: ${skill}, path: ${skillPath2})`);
-    }
+  if (skill === "select") {
+    return buildSelectAutonomousPreamble(inputBlock);
   }
-  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})`);
+  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:
+
+\`\`\`
+{"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 SKILL_FILES;
-var init_skill_loader = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/skill-loader.js"() {
+var init_prompt_builder = __esm({
+  "packages/experience-design-system-generation/dist/src/prompt-builder.js"() {
     "use strict";
     SKILL_FILES = {
       components: "generate-components.md",
@@ -1090,131 +1034,13 @@ var init_skill_loader = __esm({
   }
 });
 
-// packages/experience-design-system-generation/dist/src/generate/services/prompt-service.js
-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 buildPrompt(options) {
-  const skillContent = options.skillContentOverride ?? await loadSkillContent(options.skill, options.skillPathOverride);
-  const preamble = buildPreamble(options);
-  return `${preamble}
-
-Skill instructions follow:
----
-${skillContent}`;
-}
-function buildPreamble(options) {
-  const inputBlock = renderPromptContext(options);
-  switch (options.skill) {
-    case "components":
-      return buildComponentsAutonomousPreamble(inputBlock);
-    case "select":
-      return buildSelectAutonomousPreamble(inputBlock);
-    case "map-tokens":
-      return buildMapTokensAutonomousPreamble(inputBlock);
-    case "tokens":
-      return buildTokensAutonomousPreamble(inputBlock);
-    default:
-      return buildTokensAutonomousPreamble(inputBlock);
-  }
-}
-var init_prompt_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/prompt-service.js"() {
-    "use strict";
-    init_preambles();
-    init_prompt_context_service();
-    init_skill_loader();
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/services/progress-service.js
+// packages/experience-design-system-generation/dist/src/progress.js
 function formatGenerateProgressLine(done, total, name) {
   return `progress=generate:${done}/${total}:${name}`;
 }
-var init_progress_service = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/services/progress-service.js"() {
-    "use strict";
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/model/errors.js
-var GenerateRequestError;
-var init_errors = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/model/errors.js"() {
+var init_progress = __esm({
+  "packages/experience-design-system-generation/dist/src/progress.js"() {
     "use strict";
-    GenerateRequestError = class extends Error {
-      reason;
-      stage;
-      constructor(reason, stage) {
-        super(`unsupported generation stage '${String(stage)}'`);
-        this.name = "GenerateRequestError";
-        this.reason = reason;
-        this.stage = stage;
-      }
-    };
-  }
-});
-
-// packages/experience-design-system-generation/dist/src/generate/controller/generate-endpoint.js
-function createGenerateEndpoint(dependencies) {
-  const promptService = dependencies.promptService ?? defaultPromptService;
-  const protocolParser = dependencies.protocolParser ?? defaultProtocolParser;
-  const getFailure = dependencies.describeFailure ?? describeAgentFailure;
-  const stageParsers = {
-    components: protocolParser.parseComponents,
-    tokens: protocolParser.parseTokens,
-    select: protocolParser.parseSelect,
-    "map-tokens": protocolParser.parseMapTokens
-  };
-  function requireStage(request2) {
-    const stage = request2.prompt.skill;
-    if (!Object.hasOwn(stageParsers, stage))
-      throw new GenerateRequestError("unknown-stage", stage);
-    return stage;
-  }
-  return {
-    async execute(request2) {
-      const stage = requireStage(request2);
-      const prompt = await promptService.buildPrompt(request2.prompt);
-      const run = await dependencies.invoker.invoke({ ...request2.invocation, prompt });
-      const { calls, warnings } = stageParsers[stage](run.stdout);
-      const failure = getRunFailure(run, stage, calls.length, getFailure);
-      return { stage, prompt, run, calls, warnings, ...failure ? { failure } : {} };
-    },
-    async preview(request2) {
-      const stage = requireStage(request2);
-      return { stage, prompt: await promptService.buildPrompt(request2.prompt) };
-    }
-  };
-}
-function getRunFailure(run, stage, callCount, describeFailure) {
-  if (run.timedOut)
-    return "agent timed out";
-  if (run.exitCode !== 0)
-    return describeFailure(run);
-  if (callCount === 0 && !STAGES_WITH_OPTIONAL_CALLS.has(stage))
-    return describeFailure(run);
-  return void 0;
-}
-var defaultPromptService, defaultProtocolParser, STAGES_WITH_OPTIONAL_CALLS;
-var init_generate_endpoint = __esm({
-  "packages/experience-design-system-generation/dist/src/generate/controller/generate-endpoint.js"() {
-    "use strict";
-    init_errors();
-    init_failure_diagnostics_service();
-    init_prompt_service();
-    init_protocol_parser_service();
-    defaultPromptService = { buildPrompt };
-    defaultProtocolParser = {
-      parseComponents: parseToolCallLines,
-      parseTokens: parseTokenToolCallLines,
-      parseSelect: parseSelectToolCallLines,
-      parseMapTokens: parseMapTokenPropToolCallLines
-    };
-    STAGES_WITH_OPTIONAL_CALLS = /* @__PURE__ */ new Set(["map-tokens"]);
   }
 });
 
@@ -1223,12 +1049,10 @@ var src_exports = {};
 __export(src_exports, {
   AGENT_NAMES: () => AGENT_NAMES,
   DEFAULT_AGENT_NAME: () => DEFAULT_AGENT_NAME,
-  GenerateRequestError: () => GenerateRequestError,
   agentSupportsBedrock: () => agentSupportsBedrock,
   buildArgs: () => buildArgs,
   buildPrompt: () => buildPrompt,
   checkAgentAuth: () => checkAgentAuth,
-  createGenerateEndpoint: () => createGenerateEndpoint,
   createLocalCliAgentInvoker: () => createLocalCliAgentInvoker,
   describeAgentFailure: () => describeAgentFailure,
   extractSentinelOutput: () => extractSentinelOutput,
@@ -1247,18 +1071,11 @@ __export(src_exports, {
 var init_src = __esm({
   "packages/experience-design-system-generation/dist/src/index.js"() {
     "use strict";
-    init_agent();
-    init_agent_configuration_service();
-    init_agent_auth_service();
-    init_failure_diagnostics_service();
-    init_local_agent_process();
-    init_protocol_parser_service();
-    init_local_agent_invoker();
-    init_prompt_service();
-    init_skill_loader();
-    init_progress_service();
-    init_generate_endpoint();
-    init_errors();
+    init_agent_names();
+    init_agent_runner();
+    init_agent_invoker();
+    init_prompt_builder();
+    init_progress();
   }
 });
 
@@ -1526,23 +1343,17 @@ var init_debug_logger = __esm({
 });
 
 // packages/experience-design-system-cli/src/lib/agent-output.ts
-function createAgentOutputCapture(verbose) {
+async function invokeAgentWithOutput(invoker2, options, verbose) {
   let output = "";
   const formatter = new OutputFormatter(verbose, (chunk) => {
     output += chunk;
   });
-  return {
-    onOutput: (chunk) => formatter.push(chunk),
-    finish() {
-      formatter.flush();
-      return output;
-    }
-  };
-}
-async function invokeAgentWithOutput(invoker2, options, verbose) {
-  const capture = createAgentOutputCapture(verbose);
-  const result = await invoker2.invoke({ ...options, onOutput: capture.onOutput });
-  return { result, output: capture.finish() };
+  const result = await invoker2.invoke({
+    ...options,
+    onOutput: (chunk) => formatter.push(chunk)
+  });
+  formatter.flush();
+  return { result, output };
 }
 var init_agent_output = __esm({
   "packages/experience-design-system-cli/src/lib/agent-output.ts"() {
@@ -5271,7 +5082,7 @@ async function runOneComponent(options, component, index, total) {
     component.props.map((p) => p.type)
   );
   const existingComponentsInline = existingContentfulEntities ? JSON.stringify(summarizeForGenerateAgent(existingContentfulEntities, component.name)) : void 0;
-  const promptOptions = {
+  const prompt = await buildPrompt({
     skill: "components",
     mode: "autonomous",
     rawComponentsInline,
@@ -5285,22 +5096,20 @@ async function runOneComponent(options, component, index, total) {
     existingComponentsInline,
     existingTokensInline,
     componentAllowlistInline: JSON.stringify([...allowedComponentNames2].sort())
-  };
-  const endpoint = createGenerateEndpoint({ invoker });
+  });
   const maxAttempts = 2;
   let lastError = "";
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     if (attempt > 1) await new Promise((res) => setTimeout(res, RETRY_BACKOFF_MS));
-    const outputCapture = createAgentOutputCapture(verbose);
-    const response = await endpoint.execute({
-      prompt: promptOptions,
-      invocation: { agent, model, timeoutMs: DEFAULT_TIMEOUT_MS, onOutput: outputCapture.onOutput }
-    });
-    const outputBuf = outputCapture.finish();
+    const { result, output: outputBuf } = await invokeAgentWithOutput(
+      invoker,
+      { agent, model, prompt, timeoutMs: DEFAULT_TIMEOUT_MS },
+      verbose
+    );
     const retryNote = attempt > 1 ? `  ${c.yellow(`retrying (${attempt}/${maxAttempts})`)}` : "";
     process.stderr.write(`  ${pos}  ${c.bold(component.name)}${retryNote}
 ${outputBuf}`);
-    if (response.run.timedOut) {
+    if (result.timedOut) {
       return {
         componentName: component.name,
         classified: 0,
@@ -5312,19 +5121,18 @@ ${outputBuf}`);
         renamedSlotsCount: renames.length
       };
     }
-    if (response.failure) {
-      lastError = response.failure;
+    if (result.exitCode !== 0) {
+      lastError = describeAgentFailure(result);
+      continue;
+    }
+    const { calls, warnings } = parseToolCallLines(result.stdout);
+    if (calls.length === 0) {
+      lastError = describeAgentFailure(result);
       continue;
     }
-    const applied = applyToolCalls(
-      db,
-      sessionId2,
-      component.component_id,
-      component.name,
-      response.calls,
-      response.warnings,
-      { allowedComponentNames: allowedComponentNames2 }
-    );
+    const applied = applyToolCalls(db, sessionId2, component.component_id, component.name, calls, warnings, {
+      allowedComponentNames: allowedComponentNames2
+    });
     if (!noCache) {
       const inputHash = hashComponentShape(cacheComponent);
       storeCache(db, inputHash, "component", component.component_id, sessionId2, false, promptHash);
@@ -5544,7 +5352,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       sampleComponent.props.map((p) => p.type)
     ) : void 0;
     const dryRunExistingComponentsInline = skill === "components" && existingContentfulEntities && sampleComponent ? JSON.stringify(summarizeForGenerateAgent(existingContentfulEntities, sampleComponent.name)) : void 0;
-    const promptOptions = {
+    const prompt = await buildPrompt({
       skill,
       mode: "autonomous",
       rawComponentsInline: sampleInline ?? rawTokensInline,
@@ -5559,9 +5367,8 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       existingComponentsInline: dryRunExistingComponentsInline,
       existingTokensInline: skill === "components" ? existingTokensInline : void 0,
       componentAllowlistInline: skill === "components" && allowedComponentNames2 ? JSON.stringify([...allowedComponentNames2].sort()) : void 0
-    };
-    const promptResponse = await createGenerateEndpoint({ invoker }).preview({ prompt: promptOptions });
-    process.stdout.write(promptResponse.prompt + "\n");
+    });
+    process.stdout.write(prompt + "\n");
     await exitWithAnalytics(0);
   }
   const binary = resolveBinary(agent);
@@ -5731,20 +5538,21 @@ async function runGenerateSkill(skill, opts, verbose = false) {
           return;
         }
       }
-      const endpoint = createGenerateEndpoint({ invoker });
-      const response = await endpoint.execute({
-        prompt: {
-          skill,
-          mode: "autonomous",
-          rawTokensInline,
-          rawTokensFilename: opts.rawTokens ? resolve6(opts.rawTokens).split("/").pop() : void 0,
-          tokensInline,
-          tokenMapInline,
-          outDir: process.cwd()
-        },
-        invocation: { agent, model, timeoutMs: DEFAULT_TIMEOUT_MS * 5 }
+      const prompt = await buildPrompt({
+        skill,
+        mode: "autonomous",
+        rawTokensInline,
+        rawTokensFilename: opts.rawTokens ? resolve6(opts.rawTokens).split("/").pop() : void 0,
+        tokensInline,
+        tokenMapInline,
+        outDir: process.cwd()
+      });
+      const result = await invoker.invoke({
+        agent,
+        model,
+        prompt,
+        timeoutMs: DEFAULT_TIMEOUT_MS * 5
       });
-      const result = response.run;
       if (result.timedOut) {
         die(`Error: agent did not complete within ${DEFAULT_TIMEOUT_MS * 5 / 6e4} minutes`);
       }
@@ -5752,7 +5560,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
         if (result.stderr) process.stderr.write(result.stderr);
         die(`Error: agent exited with code ${result.exitCode}`);
       }
-      const { calls: tokenCalls, warnings: tokenWarnings } = response;
+      const { calls: tokenCalls, warnings: tokenWarnings } = parseTokenToolCallLines(result.stdout);
       const tokenCount = tokenCalls.filter((tc) => tc.tool === "set_token").length;
       if (tokenCount === 0) {
         process.stderr.write(
@@ -9176,7 +8984,7 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
         );
       }
     }
-    const mapTokensPrompt = {
+    const buildMapPrompt = () => buildPrompt({
       skill: "map-tokens",
       mode: "autonomous",
       generatedCdf,
@@ -9186,11 +8994,10 @@ ${defaultDiagnostics.map((diagnostic) => `  ${diagnostic}`).join("\n")}
       existingTokensInline,
       ...mapPromptText !== void 0 ? { skillContentOverride: mapPromptText } : {},
       ...mapPromptText === void 0 && mapPromptPath ? { skillPathOverride: mapPromptPath } : {}
-    };
+    });
     if (opts.printPrompt) {
-      const promptEndpoint = createGenerateEndpoint({ invoker: createLocalCliAgentInvoker() });
-      const promptResponse = await promptEndpoint.preview({ prompt: mapTokensPrompt });
-      process.stdout.write(promptResponse.prompt + "\n");
+      const prompt2 = await buildMapPrompt();
+      process.stdout.write(prompt2 + "\n");
       await exitWithAnalytics(0);
       return;
     }
@@ -9234,18 +9041,16 @@ Install it, choose another agent with --agent, or use --print-prompt to run the
       );
     }
     const stepId = createStep(db, sessionId2, "map tokens", { agent, model: model ?? "" });
+    const prompt = await buildMapPrompt();
     const invoker2 = createLocalCliAgentInvoker();
-    const endpoint = createGenerateEndpoint({ invoker: invoker2 });
-    const response = await endpoint.execute({
-      prompt: mapTokensPrompt,
-      invocation: { agent, model, timeoutMs: DEFAULT_TIMEOUT_MS2 }
-    });
-    if (response.failure) {
-      const error = response.run.timedOut ? `timed out after ${DEFAULT_TIMEOUT_MS2 / 6e4} minutes` : response.failure;
+    const result = await invoker2.invoke({ agent, model, prompt, timeoutMs: DEFAULT_TIMEOUT_MS2 });
+    if (result.timedOut || result.exitCode !== 0) {
+      const error = result.timedOut ? `timed out after ${DEFAULT_TIMEOUT_MS2 / 6e4} minutes` : describeAgentFailure(result);
       updateStep(db, stepId, "failed", {}, error);
       die(`Error: map tokens agent failed \u2014 ${error}`);
     }
-    const { applied, warnings } = applyMapTokenPropCalls(db, sessionId2, response.calls, response.warnings);
+    const { calls, warnings: parseWarnings } = parseMapTokenPropToolCallLines(result.stdout);
+    const { applied, warnings } = applyMapTokenPropCalls(db, sessionId2, calls, parseWarnings);
     if (!noCache) {
       storeCache(db, inputHash, "token_mapping", "__map_tokens__", sessionId2, false, promptHash);
     }
@@ -10420,7 +10225,7 @@ var init_use_terminal_size = __esm({
 });
 
 // packages/experience-design-system-cli/src/apply/tokens.ts
-var init_tokens2 = __esm({
+var init_tokens = __esm({
   "packages/experience-design-system-cli/src/apply/tokens.ts"() {
     "use strict";
     init_command2();
@@ -11006,7 +10811,7 @@ var init_WizardPreviewStep = __esm({
     init_theme();
     init_useImmediateInput();
     init_use_terminal_size();
-    init_tokens2();
+    init_tokens();
     init_preview_diff();
     init_StepHeader();
     init_SpaceEnvironment();
@@ -18939,9 +18744,9 @@ var init_wizard_generate_progress = __esm({
 });
 
 // packages/experience-design-system-cli/src/import/tui/spawn-generate.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 function spawnGenerateChild(opts) {
-  const child = spawn3(opts.command, opts.args);
+  const child = spawn2(opts.command, opts.args);
   let stdout = "";
   let stderr = "";
   child.stdout?.on("data", (d) => {
@@ -24480,7 +24285,7 @@ var init_runLivePreview = __esm({
   "packages/experience-design-system-cli/src/import/tui/runLivePreview.ts"() {
     "use strict";
     init_api_client();
-    init_tokens2();
+    init_tokens();
     init_db();
     TimeoutError = class extends Error {
       constructor(message = "live-preview timed out") {
@@ -24886,7 +24691,7 @@ function useReviewFinalize({
 var init_useReviewSession = __esm({
   "packages/experience-design-system-cli/src/import/tui/hooks/useReviewSession.ts"() {
     "use strict";
-    init_tokens2();
+    init_tokens();
     init_db();
     init_history();
     init_useFinalizePreview();
@@ -27254,7 +27059,7 @@ import { join as join20, resolve as resolve17 } from "node:path";
 import { appendFileSync as appendFileSync2, writeFileSync } 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 spawn4 } 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";
@@ -27316,7 +27121,7 @@ function runCli(args) {
 }
 function runSpawnedCli(args, onStderr, onStdout) {
   return new Promise((res) => {
-    const child = spawn4("node", args);
+    const child = spawn3("node", args);
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (d) => {
@@ -29463,7 +29268,7 @@ var init_WizardApp = __esm({
     init_wizard_422_helpers();
     init_wizard_generate_progress();
     init_spawn_generate();
-    init_tokens2();
+    init_tokens();
     init_preview_utils();
     init_db();
     init_ScopeGateStep();
@@ -29611,7 +29416,7 @@ var init_agent_definitions = __esm({
 });
 
 // packages/experience-design-system-cli/src/setup/lib/shell.ts
-import { execFile as execFile3, spawn as spawn5 } 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) {
@@ -29627,7 +29432,7 @@ async function pathExists3(path) {
 }
 function runSpawn(cmd, args, opts = {}) {
   return new Promise((resolve21) => {
-    const child = spawn5(cmd, args, {
+    const child = spawn4(cmd, args, {
       cwd: opts.cwd,
       env: opts.env ?? process.env,
       stdio: ["ignore", "pipe", "pipe"]
@@ -32041,7 +31846,7 @@ __export(program_exports, {
   resolveBedrockFromAncestors: () => resolveBedrockFromAncestors,
   runBuild: () => runBuild
 });
-import { spawn as spawn6 } 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 { readFileSync as readFileSync10 } from "node:fs";
@@ -32083,7 +31888,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: () => spawn6("pnpm", ["build"], { cwd: pkgRoot, stdio: "inherit" }),
+      spawnFn: () => spawn5("pnpm", ["build"], { cwd: pkgRoot, stdio: "inherit" }),
       stderrWrite: (s) => process.stderr.write(s)
     });
     process.exit(exitCode);