@contentful/experience-design-system-cli 2.37.1-dev-build-8affe270.0 → 2.37.1-dev-build-ef8b693f.0

package/dist/index.js

@@ -1500,7 +1500,7 @@ async function runAgent(options) {
     promptLen: prompt.length,
     promptHead: prompt.slice(0, 500)
   });
-  return new Promise((resolve28) => {
+  return new Promise((resolve27) => {
     const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -1549,7 +1549,7 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve28(result);
+      resolve27(result);
     });
   });
 }
@@ -1571,7 +1571,7 @@ async function checkAgentAuth(agent) {
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve28) => {
+  return new Promise((resolve27) => {
     const child = spawn2(binary, ["auth", "status", "--json"], { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
     let done = false;
@@ -1580,7 +1580,7 @@ async function checkAgentAuth(agent) {
         return;
       done = true;
       child.kill("SIGTERM");
-      resolve28("unauthenticated");
+      resolve27("unauthenticated");
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
@@ -1591,14 +1591,14 @@ async function checkAgentAuth(agent) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve28("unauthenticated");
+        resolve27("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve28(status.loggedIn ? "ok" : "unauthenticated");
+        resolve27(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve28("unauthenticated");
+        resolve27("unauthenticated");
       }
     });
   });
@@ -1608,9 +1608,9 @@ async function binaryIsOnPath(binary) {
     const fs = await import("node:fs/promises");
     return fs.access(binary).then(() => true, () => false);
   }
-  return new Promise((resolve28) => {
+  return new Promise((resolve27) => {
     const child = spawn2(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve28(code === 0));
+    child.on("close", (code) => resolve27(code === 0));
   });
 }
 var init_check_agent_auth = __esm({
@@ -7916,10 +7916,10 @@ function extractVueSlotsFromSetup(options) {
   if (!body)
     return [];
   const slotsByName = /* @__PURE__ */ new Map();
-  for (const access7 of body.getDescendantsOfKind(SyntaxKind5.PropertyAccessExpression)) {
-    if (access7.getExpression().getText() !== slotsName)
+  for (const access6 of body.getDescendantsOfKind(SyntaxKind5.PropertyAccessExpression)) {
+    if (access6.getExpression().getText() !== slotsName)
       continue;
-    const slotName = access7.getName();
+    const slotName = access6.getName();
     if (!slotsByName.has(slotName)) {
       slotsByName.set(slotName, {
         name: slotName,
@@ -14333,7 +14333,7 @@ function errorMessage(error) {
   return error instanceof Error && error.message ? error.message : String(error);
 }
 function defaultSleep(delayMs) {
-  return new Promise((resolve28) => setTimeout(resolve28, delayMs));
+  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
 }
 var MAX_RETRY_AFTER_MS;
 var init_http_utils = __esm({
@@ -14609,7 +14609,7 @@ var init_api_client = __esm({
             const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
             const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
             const jitter = Math.random() * baseDelay * 0.15;
-            await new Promise((resolve28) => setTimeout(resolve28, baseDelay + jitter));
+            await new Promise((resolve27) => setTimeout(resolve27, baseDelay + jitter));
           }
         }
         throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -18527,7 +18527,7 @@ async function retryDatabaseWrite(operation, attempts = 8) {
       const message = error instanceof Error ? error.message : String(error);
       if (!/database is locked|database is busy/i.test(message) || attempt >= attempts)
         throw error;
-      await new Promise((resolve28) => setTimeout(resolve28, Math.min(250 * attempt, 2e3)));
+      await new Promise((resolve27) => setTimeout(resolve27, Math.min(250 * attempt, 2e3)));
     }
   }
 }
@@ -19446,7 +19446,6 @@ var init_src4 = __esm({
     init_agents();
     init_agent_name();
     init_models();
-    init_binaries();
     init_is_agent_name();
     init_agent_supports_bedrock();
     init_check_agent_auth();
@@ -19566,97 +19565,6 @@ var init_v1_store = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/tui/settings/agents/agent-store.ts
-function emptyAgents() {
-  return Object.fromEntries(AGENT_NAMES.map((name) => [name, { model: "", binary: "" }]));
-}
-async function readAgentConfig() {
-  const store = await readV1Store();
-  const stored = asString(store["agent"]);
-  const defaultAgent = isAgentName(stored) ? stored : DEFAULT_AGENT3;
-  const agents = emptyAgents();
-  const saved = store["agents"];
-  if (saved && typeof saved === "object") {
-    for (const name of AGENT_NAMES) {
-      const entry = saved[name];
-      if (entry && typeof entry === "object") {
-        const fields = entry;
-        agents[name] = { model: asString(fields["model"]), binary: asString(fields["binary"]) };
-      }
-    }
-  }
-  const legacyModel = asString(store["agentModel"]);
-  if (legacyModel && !agents[defaultAgent].model)
-    agents[defaultAgent] = { ...agents[defaultAgent], model: legacyModel };
-  return { defaultAgent, agents };
-}
-async function writeAgentConfig(config) {
-  const existing = await readV1Store();
-  const merged = { ...existing };
-  const agents = {};
-  for (const name of AGENT_NAMES) {
-    const model = config.agents[name].model.trim();
-    const binary = config.agents[name].binary.trim();
-    if (model || binary) agents[name] = { ...model ? { model } : {}, ...binary ? { binary } : {} };
-  }
-  merged["agent"] = config.defaultAgent;
-  const defaultModel = agents[config.defaultAgent]?.model;
-  if (defaultModel) merged["agentModel"] = defaultModel;
-  else delete merged["agentModel"];
-  if (Object.keys(agents).length > 0) merged["agents"] = agents;
-  else delete merged["agents"];
-  await writeV1Store(merged);
-}
-var DEFAULT_AGENT3, AGENT_LABELS, AGENT_HINTS, asString;
-var init_agent_store = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/agents/agent-store.ts"() {
-    "use strict";
-    init_src4();
-    init_v1_store();
-    DEFAULT_AGENT3 = "claude";
-    AGENT_LABELS = {
-      claude: "Claude Code",
-      codex: "OpenAI Codex",
-      opencode: "OpenCode",
-      cursor: "Cursor",
-      copilot: "GitHub Copilot"
-    };
-    AGENT_HINTS = {
-      claude: "claude",
-      codex: "codex",
-      opencode: "opencode",
-      cursor: "cursor-agent",
-      copilot: "copilot"
-    };
-    asString = (value) => typeof value === "string" ? value : "";
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/agents/apply-binary-overrides.ts
-function applyBinaryOverrides(config) {
-  for (const name of AGENT_NAMES) {
-    const key = `EDS_AGENT_BINARY_${name.toUpperCase()}`;
-    const binary = config.agents[name].binary.trim();
-    if (binary) {
-      if (!shellValues.has(key)) shellValues.set(key, process.env[key]);
-      process.env[key] = binary;
-    } else if (shellValues.has(key)) {
-      const shellValue = shellValues.get(key);
-      if (shellValue === void 0) delete process.env[key];
-      else process.env[key] = shellValue;
-      shellValues.delete(key);
-    }
-  }
-}
-var shellValues;
-var init_apply_binary_overrides = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/agents/apply-binary-overrides.ts"() {
-    "use strict";
-    init_src4();
-    shellValues = /* @__PURE__ */ new Map();
-  }
-});
-
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/analytics-store.ts
 async function readAnalyticsSetting() {
   const store = await readV1Store();
@@ -19678,6 +19586,52 @@ var init_analytics_store = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/tui/theme.ts
+function detectColorMode(env = process.env) {
+  const bg = env.COLORFGBG?.split(";").pop();
+  if (bg === "7" || bg === "15") return "light";
+  return "dark";
+}
+var DARK, LIGHT, PALETTE;
+var init_theme = __esm({
+  "packages/experience-design-system-cli/src/tui/theme.ts"() {
+    "use strict";
+    DARK = {
+      text: "#f7f9fa",
+      // gray100
+      muted: "#aec1cc",
+      // gray400
+      border: "#aec1cc",
+      // gray400
+      accent: "#40a0ff",
+      // blue400
+      error: "#ff707d",
+      // red400
+      success: "#5DB057",
+      // green400
+      warning: "#FFC835"
+      // yellow500
+    };
+    LIGHT = {
+      text: "#111B2B",
+      // gray900
+      muted: "#5A657C",
+      // gray600
+      border: "#5A657C",
+      // gray600
+      accent: "#0059c8",
+      // semantic primary
+      error: "#bd002a",
+      // semantic negative
+      success: "#006D23",
+      // semantic positive
+      warning: "#CC4500"
+      // semantic warning
+    };
+    PALETTE = detectColorMode() === "light" ? LIGHT : DARK;
+  }
+});
+
 // packages/experience-design-system-cli/src/tui/home/home.theme.ts
 function brandBar(width, ramp = BRAND_RAMP) {
   if (width <= 0 || ramp.length === 0) return [];
@@ -19688,28 +19642,11 @@ function brandBar(width, ramp = BRAND_RAMP) {
     color
   })).filter((segment) => segment.text.length > 0);
 }
-var BRAND, PALETTE, BRAND_RAMP, BAR_CELL, FOCUS_MARKER;
+var BRAND_RAMP, BAR_CELL, FOCUS_MARKER;
 var init_home_theme = __esm({
   "packages/experience-design-system-cli/src/tui/home/home.theme.ts"() {
     "use strict";
-    BRAND = {
-      blue: "#1773EB",
-      green: "#00C459",
-      orange: "#E44F20",
-      yellow: "#FFDA00",
-      white: "#FFFFFF",
-      slate: "#8B8D91",
-      steel: "#C4D1DE"
-    };
-    PALETTE = {
-      accent: BRAND.blue,
-      success: BRAND.green,
-      error: BRAND.orange,
-      warning: BRAND.yellow,
-      muted: BRAND.slate,
-      border: BRAND.steel
-    };
-    BRAND_RAMP = [BRAND.blue, BRAND.orange, BRAND.yellow];
+    BRAND_RAMP = ["#1773EB", "#E44F20", "#FFDA00"];
     BAR_CELL = "\u2501";
     FOCUS_MARKER = "\u276F";
   }
@@ -19789,11 +19726,12 @@ var init_use_terminal_width = __esm({
 import { Text } from "ink";
 import { jsx } from "react/jsx-runtime";
 function ControlHints({ hints }) {
-  return /* @__PURE__ */ jsx(Text, { children: hints.map((hint) => `[${hint.keys}] ${hint.label}`).join(" \xB7 ") });
+  return /* @__PURE__ */ jsx(Text, { color: PALETTE.muted, children: hints.map((hint) => `[${hint.keys}] ${hint.label}`).join(" \xB7 ") });
 }
 var init_control_hints = __esm({
   "packages/experience-design-system-cli/src/tui/control-hints.tsx"() {
     "use strict";
+    init_theme();
   }
 });
 
@@ -19891,6 +19829,7 @@ var VERSION, HEADING, SUBTITLE, MIN_TERMINAL_WIDTH, START_ITEMS;
 var init_home = __esm({
   "packages/experience-design-system-cli/src/tui/home/home.tsx"() {
     "use strict";
+    init_theme();
     init_home_theme();
     init_version();
     init_use_terminal_width();
@@ -19931,7 +19870,7 @@ function ImportScreen({ exitCode, onDone }) {
 var init_PageContainer = __esm({
   "packages/experience-design-system-cli/src/tui/import/PageContainer.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
   }
 });
 
@@ -19981,20 +19920,19 @@ function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
     if (path5) onContinue(path5);
   };
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.success, children: "\u{1F44B} Hey! Let's import your design system into Contentful." }),
-    /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: "I'll walk you through 5 steps to get your components into Contentful ExO." }),
+    /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.success, children: "Let's import your design system into Contentful." }),
     /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: RULE }),
+      /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: RULE }),
       OVERVIEW.map((item) => /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
         /* @__PURE__ */ jsx4(Text4, { bold: true, children: item.label }),
         /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: item.description })
       ] }, item.label)),
-      /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: RULE })
+      /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: RULE })
     ] }),
     /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, children: [
       /* @__PURE__ */ jsx4(Text4, { children: "Where is your component library?" }),
-      /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
-        /* @__PURE__ */ jsx4(Text4, { color: PALETTE.accent, children: "?" }),
+      /* @__PURE__ */ jsxs3(Box3, { children: [
+        /* @__PURE__ */ jsx4(Text4, { color: PALETTE.text, children: "?" }),
         /* @__PURE__ */ jsx4(Text4, { children: "Project path:" }),
         /* @__PURE__ */ jsx4(TextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
       ] })
@@ -20011,7 +19949,7 @@ var RULE, OVERVIEW;
 var init_screen = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/01-welcome/screen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_controls();
     init_logic();
     RULE = "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
@@ -20160,7 +20098,7 @@ function TokenInputScreen({ onConfirm, onBack, initialPath = "" }) {
 var init_screen2 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/02-token-input/screen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_controls2();
     init_logic2();
     init_validate_path();
@@ -20304,7 +20242,7 @@ import { useEffect as useEffect3, useMemo, useState as useState5 } from "react";
 import { Box as Box5, Text as Text6 } from "ink";
 import { jsx as jsx6, jsxs as jsxs5 } from "react/jsx-runtime";
 function Row({ row }) {
-  return /* @__PURE__ */ jsxs5(Text6, { color: row.tone === "accent" ? PALETTE.accent : void 0, dimColor: row.tone === "muted", children: [
+  return /* @__PURE__ */ jsxs5(Text6, { color: row.tone === "accent" ? PALETTE.accent : row.tone === "muted" ? PALETTE.muted : void 0, children: [
     "  \u2022 ",
     String(row.count).padStart(3),
     " ",
@@ -20318,7 +20256,7 @@ function Failure({ scan, path: path5 }) {
       "\u2717 ",
       headline
     ] }),
-    hints.map((hint) => /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: hint }, hint))
+    hints.map((hint) => /* @__PURE__ */ jsx6(Text6, { color: PALETTE.muted, children: hint }, hint))
   ] });
 }
 function Summary({ scan, path: path5 }) {
@@ -20363,14 +20301,14 @@ function PathValidationScreen({
     onBack
   });
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
-    scan === void 0 && /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
+    scan === void 0 && /* @__PURE__ */ jsxs5(Text6, { color: PALETTE.muted, children: [
       "Scanning ",
       /* @__PURE__ */ jsx6(Text6, { bold: true, children: resolvedPath }),
       "..."
     ] }),
     scan?.ok === false && /* @__PURE__ */ jsx6(Failure, { scan, path: resolvedPath }),
     scan?.ok === true && /* @__PURE__ */ jsx6(Summary, { scan, path: resolvedPath }),
-    /* @__PURE__ */ jsx6(Box5, { marginTop: 1, gap: 3, children: controlsFor(phase).map((control) => /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
+    /* @__PURE__ */ jsx6(Box5, { marginTop: 1, gap: 3, children: controlsFor(phase).map((control) => /* @__PURE__ */ jsxs5(Text6, { color: PALETTE.muted, children: [
       "[",
       control.keys,
       "] ",
@@ -20381,7 +20319,7 @@ function PathValidationScreen({
 var init_screen3 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/03-path-validation/screen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_resolve_user_path();
     init_controls3();
     init_scan_files();
@@ -20549,8 +20487,8 @@ function CredentialsScreen({
       /* @__PURE__ */ jsx7(Text7, { bold: true, children: "Contentful credentials" }),
       /* @__PURE__ */ jsx7(Text7, { children: prefilled ? "Credentials pre-filled from the configuration settings." : "Enter the Contentful space you want to import into." }),
       !prefilled && /* @__PURE__ */ jsxs6(Fragment, { children: [
-        /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "We use it to check what components already exist and to push your import. If you skip, files are saved locally and nothing is pushed." }),
-        /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "Tip: save these under Settings \u2192 Configuration so they pre-fill here." })
+        /* @__PURE__ */ jsx7(Text7, { color: PALETTE.muted, children: "We use it to check what components already exist and to push your import. If you skip, files are saved locally and nothing is pushed." }),
+        /* @__PURE__ */ jsx7(Text7, { color: PALETTE.muted, children: "Tip: save these under Settings \u2192 Configuration so they pre-fill here." })
       ] })
     ] }),
     /* @__PURE__ */ jsx7(Box6, { flexDirection: "column", children: FIELDS.map((field) => /* @__PURE__ */ jsxs6(Box6, { gap: 1, children: [
@@ -20571,14 +20509,14 @@ function CredentialsScreen({
         }
       )
     ] }, field)) }),
-    active === "host" && /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "Default: api.contentful.com \xB7 EU spaces: api.eu.contentful.com" }),
+    active === "host" && /* @__PURE__ */ jsx7(Text7, { color: PALETTE.muted, children: "Default: api.contentful.com \xB7 EU spaces: api.eu.contentful.com" }),
     error && /* @__PURE__ */ jsxs6(Text7, { color: PALETTE.error, children: [
       "\u2717 ",
       error
     ] }),
     validating && /* @__PURE__ */ jsx7(Text7, { color: PALETTE.accent, children: "Validating credentials..." }),
-    !validating && !error && !isUnchanged(normalize(values), initialValues) && /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "Changed values are saved after they validate." }),
-    /* @__PURE__ */ jsx7(Box6, { marginTop: 1, gap: 3, children: CREDENTIALS_CONTROLS.map((control) => /* @__PURE__ */ jsxs6(Text7, { dimColor: true, children: [
+    !validating && !error && !isUnchanged(normalize(values), initialValues) && /* @__PURE__ */ jsx7(Text7, { color: PALETTE.muted, children: "Changed values are saved after they validate." }),
+    /* @__PURE__ */ jsx7(Box6, { marginTop: 1, gap: 3, children: CREDENTIALS_CONTROLS.map((control) => /* @__PURE__ */ jsxs6(Text7, { color: PALETTE.muted, children: [
       "[",
       control.keys,
       "] ",
@@ -20590,7 +20528,7 @@ var LABELS;
 var init_screen4 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/04-credentials/screen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_controls4();
     init_src4();
     init_logic4();
@@ -20666,7 +20604,7 @@ function ErrorStep({
       " failed"
     ] }),
     /* @__PURE__ */ jsx8(Text8, { color: PALETTE.error, children: message }),
-    /* @__PURE__ */ jsx8(Box7, { marginTop: 1, gap: 3, children: controls.map((control) => /* @__PURE__ */ jsxs7(Text8, { dimColor: true, children: [
+    /* @__PURE__ */ jsx8(Box7, { marginTop: 1, gap: 3, children: controls.map((control) => /* @__PURE__ */ jsxs7(Text8, { color: PALETTE.muted, children: [
       "[",
       control.keys,
       "] ",
@@ -20677,7 +20615,7 @@ function ErrorStep({
 var init_error_step = __esm({
   "packages/experience-design-system-cli/src/tui/import/shared/error-step/error-step.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_controls5();
     init_logic5();
   }
@@ -20746,7 +20684,7 @@ function GateStep({
     ] }),
     summary && /* @__PURE__ */ jsx9(Text9, { color: PALETTE.muted, children: summary }),
     context && /* @__PURE__ */ jsx9(Box8, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text9, { children: context }) }),
-    /* @__PURE__ */ jsx9(Box8, { marginTop: 1, gap: 3, children: gateControls(continueLabel, skipLabel2, onSkip !== void 0).map((control) => /* @__PURE__ */ jsxs8(Text9, { dimColor: true, children: [
+    /* @__PURE__ */ jsx9(Box8, { marginTop: 1, gap: 3, children: gateControls(continueLabel, skipLabel2, onSkip !== void 0).map((control) => /* @__PURE__ */ jsxs8(Text9, { color: PALETTE.muted, children: [
       "[",
       control.keys,
       "] ",
@@ -20757,7 +20695,7 @@ function GateStep({
 var init_gate_step = __esm({
   "packages/experience-design-system-cli/src/tui/import/shared/gate-step/gate-step.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_controls6();
     init_logic6();
   }
@@ -20785,14 +20723,15 @@ var init_logic7 = __esm({
 // packages/experience-design-system-cli/src/tui/import/shared/running-step/theme.ts
 import { defaultTheme, extendTheme } from "@inkjs/ui";
 var PROGRESS_THEME;
-var init_theme = __esm({
+var init_theme2 = __esm({
   "packages/experience-design-system-cli/src/tui/import/shared/running-step/theme.ts"() {
     "use strict";
+    init_theme();
     PROGRESS_THEME = extendTheme(defaultTheme, {
       components: {
         ProgressBar: {
           styles: {
-            completed: () => ({ color: "blue" })
+            completed: () => ({ color: PALETTE.accent })
           }
         }
       }
@@ -20850,9 +20789,9 @@ function RunningStep({
   const elapsed = useElapsed();
   return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: RULE2 }),
+      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE2 }),
       /* @__PURE__ */ jsx10(Text10, { bold: true, children: stepLabel(stepNumber, totalSteps, title) }),
-      /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: RULE2 })
+      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE2 })
     ] }),
     /* @__PURE__ */ jsx10(Text10, { children: description }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, flexDirection: "column", gap: 1, children: lines.map((line, index) => /* @__PURE__ */ jsx10(Line, { line }, index)) }),
@@ -20866,9 +20805,9 @@ var RULE2;
 var init_running_step = __esm({
   "packages/experience-design-system-cli/src/tui/import/shared/running-step/running-step.tsx"() {
     "use strict";
-    init_home_theme();
-    init_logic7();
     init_theme();
+    init_logic7();
+    init_theme2();
     init_use_elapsed();
     RULE2 = "\u2500".repeat(40);
   }
@@ -21415,10 +21354,10 @@ var init_use_extraction = __esm({
 
 // packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/theme.ts
 var PALETTE2;
-var init_theme2 = __esm({
+var init_theme3 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/theme.ts"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     PALETTE2 = {
       info: PALETTE.accent,
       success: PALETTE.success,
@@ -21530,7 +21469,7 @@ var TWO_COLUMN_MIN_WIDTH, SCOPE_GATE_MAIN_COLUMN_WIDTH, ACCEPTED_COMPONENTS_COLU
 var init_columns = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/columns.ts"() {
     "use strict";
-    init_theme2();
+    init_theme3();
     TWO_COLUMN_MIN_WIDTH = 100;
     SCOPE_GATE_MAIN_COLUMN_WIDTH = 54;
     ACCEPTED_COMPONENTS_COLUMN_WIDTH = 36;
@@ -21596,7 +21535,7 @@ function WindowedPanelHeader({
 }) {
   return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx13(Text11, { bold: true, color: PALETTE2.info, inverse: focused, children: title }),
-    /* @__PURE__ */ jsx13(Text11, { dimColor: true, children: "\u2500".repeat(Math.max(0, width - 2)) })
+    /* @__PURE__ */ jsx13(Text11, { color: PALETTE2.muted, children: "\u2500".repeat(Math.max(0, width - 2)) })
   ] });
 }
 function formatWindowIndicator(direction, count) {
@@ -21610,7 +21549,7 @@ var MIN_TERMINAL_PANEL_HEIGHT;
 var init_windowed_panel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/windowed-panel.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
     MIN_TERMINAL_PANEL_HEIGHT = 5;
   }
 });
@@ -21635,7 +21574,7 @@ function AddedColumn(props) {
       const showSeparator = firstNonCycleIdx > 0 && i === firstNonCycleIdx;
       const style = sideColumnLabelStyle({ isCycle: entry.isCycle, isSelected, focused });
       return /* @__PURE__ */ jsxs11(React6.Fragment, { children: [
-        showSeparator && /* @__PURE__ */ jsx14(Text12, { dimColor: true, children: "\u2500".repeat(Math.max(0, width - 2)) }),
+        showSeparator && /* @__PURE__ */ jsx14(Text12, { color: PALETTE2.muted, children: "\u2500".repeat(Math.max(0, width - 2)) }),
         /* @__PURE__ */ jsxs11(Box11, { children: [
           isCursor ? /* @__PURE__ */ jsx14(Text12, { color: PALETTE2.info, bold: true, children: figures.pointer }) : /* @__PURE__ */ jsx14(Text12, { children: " " }),
           reserveAiBadge && (aiFlagged ? /* @__PURE__ */ jsx14(Text12, { color: PALETTE2.warning, bold: true, children: " [\xD7]" }) : /* @__PURE__ */ jsx14(Text12, { children: "    " })),
@@ -21661,7 +21600,7 @@ var init_added_column = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/panels/added-column.tsx"() {
     "use strict";
     init_columns();
-    init_theme2();
+    init_theme3();
     init_windowed_panel();
   }
 });
@@ -21696,7 +21635,7 @@ function CyclesPanel({ cycles, cursor }) {
 var init_cycles_panel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/panels/cycles-panel.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
   }
 });
 
@@ -21714,7 +21653,7 @@ function RejectPrompt({ pending }) {
 var init_reject_prompt = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/panels/reject-prompt.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
   }
 });
 
@@ -21730,7 +21669,7 @@ function legendEntry(keyBracket, label, active = false) {
 var init_LegendEntry = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/LegendEntry.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
   }
 });
 
@@ -21751,7 +21690,7 @@ function CompactControlBar({ hasGroupRoots, searchActive }) {
 var init_CompactControlBar = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/CompactControlBar.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
     init_LegendEntry();
   }
 });
@@ -21790,7 +21729,7 @@ function CounterStrip(props) {
 var init_CounterStrip = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/CounterStrip.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
   }
 });
 
@@ -21855,7 +21794,7 @@ var DEFAULT_MAX_ROWS;
 var init_GotoBanner = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/GotoBanner.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
     DEFAULT_MAX_ROWS = 15;
   }
 });
@@ -22234,7 +22173,7 @@ function PreviewBadge({
 var init_badge = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/badge.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
   }
 });
 
@@ -22729,7 +22668,7 @@ var init_GroupedSidebar = __esm({
     "use strict";
     init_composite_closure();
     init_badge();
-    init_theme2();
+    init_theme3();
     init_windowed_panel();
     GLYPH_EXPAND_COLLAPSED = "\u25B8";
     GLYPH_EXPAND_EXPANDED = "\u25BE";
@@ -23024,7 +22963,7 @@ function SearchMatchSummary({
 var init_SearchMatchSummary = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/sidebar/components/SearchMatchSummary.tsx"() {
     "use strict";
-    init_theme2();
+    init_theme3();
     init_sidebar_input();
   }
 });
@@ -24392,7 +24331,7 @@ var init_screen7 = __esm({
     init_HelpOverlay();
     init_SearchMatchSummary();
     init_sidebar_help();
-    init_theme2();
+    init_theme3();
     init_use_scope_gate();
     HELP_SECTIONS = [
       {
@@ -25280,24 +25219,6 @@ var init_screen9 = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/tui/import/steps/09-review/theme.ts
-var PALETTE3;
-var init_theme3 = __esm({
-  "packages/experience-design-system-cli/src/tui/import/steps/09-review/theme.ts"() {
-    "use strict";
-    init_home_theme();
-    PALETTE3 = {
-      info: PALETTE.accent,
-      success: PALETTE.success,
-      error: PALETTE.error,
-      warning: PALETTE.warning,
-      muted: PALETTE.muted,
-      border: PALETTE.border,
-      inverse: "#FFFFFF"
-    };
-  }
-});
-
 // packages/experience-design-system-cli/src/tui/import/steps/09-review/review-json-panel.ts
 function getReviewJsonPanelValue(selected, showHiddenProps) {
   if (!selected) return "";
@@ -25789,13 +25710,13 @@ function serializeState(state2, originalJson) {
 }
 function Picker({ value, active }) {
   return /* @__PURE__ */ jsxs22(Box21, { children: [
-    active && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u2039" }),
-    /* @__PURE__ */ jsx27(Text23, { color: active ? PALETTE3.warning : void 0, bold: active, children: value }),
-    active && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u203A" })
+    active && /* @__PURE__ */ jsx27(Text23, { color: PALETTE.warning, children: "\u2039" }),
+    /* @__PURE__ */ jsx27(Text23, { color: active ? PALETTE.warning : void 0, bold: active, children: value }),
+    active && /* @__PURE__ */ jsx27(Text23, { color: PALETTE.warning, children: "\u203A" })
   ] });
 }
 function Toggle({ value, active }) {
-  return /* @__PURE__ */ jsx27(Box21, { children: /* @__PURE__ */ jsx27(Text23, { color: active ? PALETTE3.warning : value ? PALETTE3.success : PALETTE3.border, children: value ? "[\u2713]" : "[ ]" }) });
+  return /* @__PURE__ */ jsx27(Box21, { children: /* @__PURE__ */ jsx27(Text23, { color: active ? PALETTE.warning : value ? PALETTE.success : PALETTE.border, children: value ? "[\u2713]" : "[ ]" }) });
 }
 function InlinePropField({
   label,
@@ -25805,7 +25726,7 @@ function InlinePropField({
   width
 }) {
   return /* @__PURE__ */ jsxs22(Box21, { width, gap: 1, flexShrink: flexible ? 1 : 0, flexGrow: flexible ? 1 : 0, flexWrap: "wrap", children: [
-    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, wrap: "truncate-end", children: [
+    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, wrap: "truncate-end", children: [
       focused ? "\u203A " : "  ",
       label
     ] }),
@@ -25826,7 +25747,7 @@ function DefaultValueRow({
   focused
 }) {
   return /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexWrap: "wrap", flexShrink: 0, children: [
-    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
       focused ? "\u203A " : "  ",
       "default:"
     ] }),
@@ -25841,9 +25762,9 @@ function RowLabel({
   return /* @__PURE__ */ jsxs22(
     Text23,
     {
-      color: selected ? PALETTE3.inverse : PALETTE3.info,
+      color: selected ? "#FFFFFF" : PALETTE.accent,
       bold: selected,
-      backgroundColor: selected ? "blue" : void 0,
+      backgroundColor: selected ? PALETTE.accent : void 0,
       wrap: "truncate-end",
       children: [
         " ",
@@ -25859,7 +25780,7 @@ function ValueInputRow({
   cursorVisible
 }) {
   return /* @__PURE__ */ jsxs22(Box21, { paddingLeft: 2, children: [
-    /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.info, children: mode === "edit" ? "\u270E " : "+ " }),
+    /* @__PURE__ */ jsx27(Text23, { color: PALETTE.accent, children: mode === "edit" ? "\u270E " : "+ " }),
     /* @__PURE__ */ jsx27(Text23, { children: valueText }),
     /* @__PURE__ */ jsx27(Text23, { inverse: cursorVisible, children: " " })
   ] });
@@ -25876,7 +25797,7 @@ function EditableListItem({
   if (isBeingEdited) {
     return /* @__PURE__ */ jsx27(ValueInputRow, { mode: "edit", valueText, cursorVisible });
   }
-  return /* @__PURE__ */ jsx27(Box21, { gap: 1, paddingLeft: 2, children: /* @__PURE__ */ jsx27(Text23, { color: active ? PALETTE3.info : void 0, children: active ? `${figures5.pointer} ${value}` : `  ${value}` }) });
+  return /* @__PURE__ */ jsx27(Box21, { gap: 1, paddingLeft: 2, children: /* @__PURE__ */ jsx27(Text23, { color: active ? PALETTE.accent : void 0, children: active ? `${figures5.pointer} ${value}` : `  ${value}` }) });
 }
 function EditableValueList({
   values,
@@ -25890,7 +25811,7 @@ function EditableValueList({
   showAddInput
 }) {
   return /* @__PURE__ */ jsxs22(Fragment5, { children: [
-    values.length === 0 && !editingValue && (emptyPaddingLeft === void 0 ? /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: emptyMessage }) : /* @__PURE__ */ jsx27(Box21, { paddingLeft: emptyPaddingLeft, children: /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: emptyMessage }) })),
+    values.length === 0 && !editingValue && (emptyPaddingLeft === void 0 ? /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: emptyMessage }) : /* @__PURE__ */ jsx27(Box21, { paddingLeft: emptyPaddingLeft, children: /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: emptyMessage }) })),
     values.map((value, index) => /* @__PURE__ */ jsx27(
       EditableListItem,
       {
@@ -25916,11 +25837,11 @@ function DefaultSubRow({
   const cursor = cursorVisible ? "\u2588" : " ";
   if (prop.type === "richtext" || prop.type === "media" || prop.type === "link") {
     return /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexShrink: 0, children: [
-      /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+      /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
         focused ? "\u203A " : "  ",
         "default:"
       ] }),
-      /* @__PURE__ */ jsx27(Text23, { color: focused ? void 0 : PALETTE3.muted, children: "(not applicable)" })
+      /* @__PURE__ */ jsx27(Text23, { color: focused ? void 0 : PALETTE.muted, children: "(not applicable)" })
     ] });
   }
   if (prop.type === "boolean") {
@@ -25930,11 +25851,11 @@ function DefaultSubRow({
   if (prop.type === "enum") {
     if (prop.values.length === 0) {
       return /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexShrink: 0, children: [
-        /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+        /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
           focused ? "\u203A " : "  ",
           "default:"
         ] }),
-        /* @__PURE__ */ jsx27(Text23, { color: focused ? void 0 : PALETTE3.muted, children: "(no values defined)" })
+        /* @__PURE__ */ jsx27(Text23, { color: focused ? void 0 : PALETTE.muted, children: "(no values defined)" })
       ] });
     }
     const display = typeof prop.default === "string" && prop.default !== "" ? prop.default : "(unset)";
@@ -25943,11 +25864,11 @@ function DefaultSubRow({
   const value = typeof prop.default === "string" ? prop.default : "";
   if (active) {
     return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "row", flexShrink: 0, children: [
-      /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+      /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
         focused ? "\u203A " : "  ",
         "default:"
       ] }),
-      /* @__PURE__ */ jsxs22(Box21, { flexGrow: 1, borderStyle: "round", borderColor: PALETTE3.warning, paddingX: 1, children: [
+      /* @__PURE__ */ jsxs22(Box21, { flexGrow: 1, borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
         /* @__PURE__ */ jsx27(Text23, { children: value.slice(0, textCursor) }),
         /* @__PURE__ */ jsx27(Text23, { inverse: cursorVisible, children: value[textCursor] ?? cursor }),
         /* @__PURE__ */ jsx27(Text23, { children: value.slice(textCursor + 1) })
@@ -25955,11 +25876,11 @@ function DefaultSubRow({
     ] });
   }
   return /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexShrink: 0, children: [
-    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
       focused ? "\u203A " : "  ",
       "default:"
     ] }),
-    /* @__PURE__ */ jsx27(Text23, { color: focused || value ? void 0 : PALETTE3.muted, children: value || "(none)" })
+    /* @__PURE__ */ jsx27(Text23, { color: focused || value ? void 0 : PALETTE.muted, children: value || "(none)" })
   ] });
 }
 function DescriptionField({
@@ -25975,15 +25896,15 @@ function DescriptionField({
 }) {
   if (compact) {
     return /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexWrap: "wrap", width, flexShrink: 0, children: [
-      /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+      /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
         focused ? "\u203A " : "  ",
         label
       ] }),
-      /* @__PURE__ */ jsx27(Text23, { wrap: "truncate-end", color: value ? void 0 : PALETTE3.muted, children: value || "\u2014" })
+      /* @__PURE__ */ jsx27(Text23, { wrap: "truncate-end", color: value ? void 0 : PALETTE.muted, children: value || "\u2014" })
     ] });
   }
   return /* @__PURE__ */ jsxs22(Box21, { paddingLeft, flexDirection: "column", width, flexShrink: 0, children: [
-    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE3.warning : PALETTE3.muted, bold: focused, children: [
+    /* @__PURE__ */ jsxs22(Text23, { color: focused ? PALETTE.warning : PALETTE.muted, bold: focused, children: [
       focused ? "\u203A " : "  ",
       label
     ] }),
@@ -26047,7 +25968,7 @@ function PropRow({
     ] }),
     prop.type === "token" && /* @__PURE__ */ jsx27(InlinePropField, { label: "kind:", focused: activeField === "tokenKind", width, children: editingField && activeField === "tokenKind" ? /* @__PURE__ */ jsx27(Picker, { value: prop.tokenKind || DESIGN_TOKEN_TYPES2[0], active: true }) : /* @__PURE__ */ jsx27(Text23, { wrap: "wrap", children: prop.tokenKind || "\u2014" }) }),
     prop.type === "enum" && /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexWrap: "wrap", width, flexShrink: 0, children: [
-      /* @__PURE__ */ jsxs22(Text23, { color: activeField === "values" ? PALETTE3.warning : PALETTE3.muted, bold: activeField === "values", children: [
+      /* @__PURE__ */ jsxs22(Text23, { color: activeField === "values" ? PALETTE.warning : PALETTE.muted, bold: activeField === "values", children: [
         activeField === "values" ? "\u203A " : "  ",
         "values:"
       ] }),
@@ -26068,27 +25989,27 @@ function PropRow({
       }
     ),
     prop.type === "token" && prop.category === "design" && /* @__PURE__ */ jsxs22(Box21, { gap: 1, flexWrap: "wrap", width, flexShrink: 0, children: [
-      /* @__PURE__ */ jsxs22(Text23, { color: activeField === "allowed" ? PALETTE3.warning : PALETTE3.muted, bold: activeField === "allowed", children: [
+      /* @__PURE__ */ jsxs22(Text23, { color: activeField === "allowed" ? PALETTE.warning : PALETTE.muted, bold: activeField === "allowed", children: [
         activeField === "allowed" ? "\u203A " : "  ",
         "allowed:"
       ] }),
-      editingField && activeField === "allowed" ? /* @__PURE__ */ jsx27(Box21, { width: Math.max(1, width - 4), borderStyle: "round", borderColor: PALETTE3.warning, paddingX: 1, children: /* @__PURE__ */ jsx27(Text23, { children: "press [t] to edit allowed tokens" }) }) : /* @__PURE__ */ jsx27(
+      editingField && activeField === "allowed" ? /* @__PURE__ */ jsx27(Box21, { width: Math.max(1, width - 4), borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: /* @__PURE__ */ jsx27(Text23, { children: "press [t] to edit allowed tokens" }) }) : /* @__PURE__ */ jsx27(
         Text23,
         {
-          color: activeField !== "allowed" && prop.allowed.length === 0 ? PALETTE3.muted : void 0,
+          color: activeField !== "allowed" && prop.allowed.length === 0 ? PALETTE.muted : void 0,
           wrap: "wrap",
           children: prop.allowed.length > 0 ? prop.allowed.join(", ") : "(any)"
         }
       )
     ] }),
-    selected && showRationale && rationale && rationale.trim().length > 0 && /* @__PURE__ */ jsx27(Box21, { paddingLeft: 2, children: /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: (() => {
+    selected && showRationale && rationale && rationale.trim().length > 0 && /* @__PURE__ */ jsx27(Box21, { paddingLeft: 2, children: /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: (() => {
       const max = Math.max(8, width - 8);
       const text = `~ ${rationale}`;
       return text.length > max ? text.slice(0, max - 1) + "\u2026" : text;
     })() }) }, rowKey ? `rationale-${rowKey}` : void 0),
     selected && prop.type === "enum" && activeField === "values" && /* @__PURE__ */ jsxs22(Box21, { paddingLeft: 2, flexDirection: "column", children: [
       /* @__PURE__ */ jsxs22(Box21, { children: [
-        /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "values:" }),
+        /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "values:" }),
         activeField === "values" && /* @__PURE__ */ jsx27(Text23, { children: "  [a] add  [e] edit  [r] remove  [\u2191\u2193] navigate  [K/J] reorder" })
       ] }),
       /* @__PURE__ */ jsx27(
@@ -26149,7 +26070,7 @@ function SlotRow({
       /* @__PURE__ */ jsxs22(
         Text23,
         {
-          color: activeField === "allowedComponents" ? PALETTE3.warning : PALETTE3.muted,
+          color: activeField === "allowedComponents" ? PALETTE.warning : PALETTE.muted,
           bold: activeField === "allowedComponents",
           children: [
             activeField === "allowedComponents" ? "\u203A " : "  ",
@@ -26157,14 +26078,14 @@ function SlotRow({
           ]
         }
       ),
-      slot.allowedComponents.length === 0 ? /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "(any)" }) : /* @__PURE__ */ jsx27(Text23, { wrap: "wrap", children: slot.allowedComponents.join(", ") })
+      slot.allowedComponents.length === 0 ? /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "(any)" }) : /* @__PURE__ */ jsx27(Text23, { wrap: "wrap", children: slot.allowedComponents.join(", ") })
     ] }),
     selected && editingField && activeField === "allowedComponents" && /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", children: [
       /* @__PURE__ */ jsxs22(Box21, { children: [
         /* @__PURE__ */ jsxs22(
           Text23,
           {
-            color: activeField === "allowedComponents" ? PALETTE3.warning : PALETTE3.muted,
+            color: activeField === "allowedComponents" ? PALETTE.warning : PALETTE.muted,
             bold: activeField === "allowedComponents",
             children: [
               activeField === "allowedComponents" ? "\u203A " : "  ",
@@ -26172,7 +26093,7 @@ function SlotRow({
             ]
           }
         ),
-        editingField && activeField === "allowedComponents" && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: slot.allowedComponents.length > 0 ? "  [a] add  [e] edit  [r] remove  [\u2190\u2192] cycle  [\u2191\u2193] navigate  [K/J] reorder" : "  [a] add  [e] edit  [r] remove  [\u2191\u2193] navigate  [K/J] reorder" })
+        editingField && activeField === "allowedComponents" && /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: slot.allowedComponents.length > 0 ? "  [a] add  [e] edit  [r] remove  [\u2190\u2192] cycle  [\u2191\u2193] navigate  [K/J] reorder" : "  [a] add  [e] edit  [r] remove  [\u2191\u2193] navigate  [K/J] reorder" })
       ] }),
       /* @__PURE__ */ jsx27(
         EditableValueList,
@@ -26188,21 +26109,21 @@ function SlotRow({
           showAddInput: editingField && activeField === "allowedComponents"
         }
       ),
-      editingField && editingValue?.mode === "add" && activeField === "allowedComponents" && pickerCandidates !== null && /* @__PURE__ */ jsx27(Box21, { paddingLeft: 2, flexDirection: "column", children: pickerCandidates.length === 0 ? /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "(no valid components to add \u2014 all remaining candidates would create cycles)" }) : (() => {
+      editingField && editingValue?.mode === "add" && activeField === "allowedComponents" && pickerCandidates !== null && /* @__PURE__ */ jsx27(Box21, { paddingLeft: 2, flexDirection: "column", children: pickerCandidates.length === 0 ? /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "(no valid components to add \u2014 all remaining candidates would create cycles)" }) : (() => {
         const filtered = valueText.length === 0 ? pickerCandidates : pickerCandidates.filter((n) => n.toLowerCase().includes(valueText.toLowerCase()));
         if (filtered.length === 0) {
-          return /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "(no candidates match \u2014 Enter to add as free text)" });
+          return /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "(no candidates match \u2014 Enter to add as free text)" });
         }
         const cursor = pickerCursor % filtered.length;
         const MAX_VISIBLE = 5;
         const start = Math.max(0, Math.min(filtered.length - MAX_VISIBLE, cursor - 2));
         const slice = filtered.slice(start, start + MAX_VISIBLE);
         return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", children: [
-          /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "  candidates (\u2191\u2193 cycle, Enter to add):" }),
+          /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "  candidates (\u2191\u2193 cycle, Enter to add):" }),
           slice.map((name, i) => {
             const absIdx = start + i;
             const isCursor = absIdx === cursor;
-            return /* @__PURE__ */ jsx27(Text23, { color: isCursor ? PALETTE3.info : PALETTE3.muted, children: isCursor ? `  ${figures5.pointer} ${name}` : `    ${name}` }, name);
+            return /* @__PURE__ */ jsx27(Text23, { color: isCursor ? PALETTE.accent : PALETTE.muted, children: isCursor ? `  ${figures5.pointer} ${name}` : `    ${name}` }, name);
           })
         ] });
       })() })
@@ -27030,18 +26951,18 @@ function FieldEditor({
   });
   const innerWidth = Math.max(1, width - 2);
   if (parseErr) {
-    return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", width, borderStyle: "single", borderColor: PALETTE3.error, children: [
-      /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE3.error, children: "FIELD EDITOR \u2014 parse error" }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.error, children: parseErr }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "Cannot display structured editor. Fix the JSON first." })
+    return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", width, borderStyle: "single", borderColor: PALETTE.error, children: [
+      /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE.error, children: "FIELD EDITOR \u2014 parse error" }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE.error, children: parseErr }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "Cannot display structured editor. Fix the JSON first." })
     ] });
   }
   if (props.length === 0 && slots.length === 0) {
-    return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", width, borderStyle: "single", borderColor: PALETTE3.warning, children: [
-      /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE3.warning, children: "FIELD EDITOR \u2014 no fields" }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify." }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "You can add fields manually below or reject this component." }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "Enter to save \xB7 Esc to discard" })
+    return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", width, borderStyle: "single", borderColor: PALETTE.warning, children: [
+      /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE.warning, children: "FIELD EDITOR \u2014 no fields" }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify." }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "You can add fields manually below or reject this component." }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "Enter to save \xB7 Esc to discard" })
     ] });
   }
   const hasEmptyProperties = props.length === 0 && slots.length === 0;
@@ -27170,7 +27091,7 @@ function FieldEditor({
   const renderRow = (row, index) => {
     const key = rowKey(row, index);
     if (row.kind === "header") {
-      return /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", paddingTop: 1, children: /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE3.success, children: row.label }) }, key);
+      return /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", paddingTop: 1, children: /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE.success, children: row.label }) }, key);
     }
     if (row.kind === "component-description") {
       const isSelected2 = inComponentDesc && active;
@@ -27252,9 +27173,9 @@ function FieldEditor({
       ...fixedHeight ? { height } : { minHeight: height },
       clipOverflow: fixedHeight,
       borderStyle: "single",
-      borderColor: hasEmptyProperties ? PALETTE3.warning : active ? PALETTE3.info : PALETTE3.border,
+      borderColor: hasEmptyProperties ? PALETTE.warning : active ? PALETTE.accent : PALETTE.border,
       children: [
-        hasEmptyProperties && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify. Reject this component or add fields manually." }),
+        hasEmptyProperties && /* @__PURE__ */ jsx27(Text23, { color: PALETTE.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify. Reject this component or add fields manually." }),
         header,
         /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", width: innerWidth, flexShrink: 0, children: focusLevel === "field" && !inComponentDesc && currentProp ? /* @__PURE__ */ jsx27(
           PropRow,
@@ -27305,7 +27226,7 @@ function FieldEditor({
             `visible-${key}`
           );
         }) }),
-        categoryBelow && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.success, bold: true, children: `(${categoryBelow} below)` }),
+        categoryBelow && /* @__PURE__ */ jsx27(Text23, { color: PALETTE.success, bold: true, children: `(${categoryBelow} below)` }),
         sourceOpen && !onToggleSourceExternal && (() => {
           const propMeta = !inSlots && !inComponentDesc && currentProp ? metadata?.props?.[currentProp.name] : void 0;
           const start = propMeta?.sourceStartLine ?? null;
@@ -27315,20 +27236,20 @@ function FieldEditor({
           const headerPath = path5 ?? "<unknown source path>";
           if (!start || !end2 || !src) {
             return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
-              /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, bold: true, children: `source: ${headerPath}` }),
-              /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "(no source location captured for this prop)" }),
+              /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, bold: true, children: `source: ${headerPath}` }),
+              /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "(no source location captured for this prop)" }),
               /* @__PURE__ */ jsx27(Text23, { children: "[s] close" })
             ] });
           }
           const lines = src.split("\n").slice(Math.max(0, start - 1), end2);
           return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [
-            /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, bold: true, children: `${headerPath}: lines ${start}\u2013${end2}` }),
-            lines.map((ln, i) => /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: ln }, `source-line-${i}`)),
+            /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, bold: true, children: `${headerPath}: lines ${start}\u2013${end2}` }),
+            lines.map((ln, i) => /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: ln }, `source-line-${i}`)),
             /* @__PURE__ */ jsx27(Text23, { children: "[s] close \xB7 [Esc] close" })
           ] });
         })(),
-        showHelp && /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE3.info, paddingX: 1, children: [
-          /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE3.info, children: "Keybindings" }),
+        showHelp && /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.accent, paddingX: 1, children: [
+          /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE.accent, children: "Keybindings" }),
           /* @__PURE__ */ jsx27(Text23, { children: " " }),
           /* @__PURE__ */ jsx27(Text23, { bold: true, children: "Row navigation" }),
           /* @__PURE__ */ jsx27(Text23, { children: "  \u2191/\u2193               move between rows" }),
@@ -27353,10 +27274,10 @@ function FieldEditor({
           /* @__PURE__ */ jsx27(Text23, { children: "  " + componentRationaleKey.padEnd(16) + " toggle component rationale panel" }),
           /* @__PURE__ */ jsx27(Text23, { children: "  ?                toggle this overlay" }),
           /* @__PURE__ */ jsx27(Text23, { children: " " }),
-          /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "press ? or Esc to close" })
+          /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: "press ? or Esc to close" })
         ] }),
-        validationError && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.error, children: "\u2717 " + validationError }),
-        /* @__PURE__ */ jsx27(Box21, { paddingTop: 1, children: /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: modeLabel }) })
+        validationError && /* @__PURE__ */ jsx27(Text23, { color: PALETTE.error, children: "\u2717 " + validationError }),
+        /* @__PURE__ */ jsx27(Box21, { paddingTop: 1, children: /* @__PURE__ */ jsx27(Text23, { color: PALETTE.muted, children: modeLabel }) })
       ]
     }
   );
@@ -27365,7 +27286,7 @@ var SLOT_FIELDS;
 var init_FieldEditor = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/FieldEditor.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_src5();
     init_useImmediateInput();
     init_scroll_offset();
@@ -27420,21 +27341,21 @@ function RationaleLine({ line, active }) {
     return /* @__PURE__ */ jsx28(Box22, { children: /* @__PURE__ */ jsx28(Text24, { children: " " }) });
   }
   if (line.kind === "heading") {
-    return /* @__PURE__ */ jsx28(Box22, { children: /* @__PURE__ */ jsx28(Text24, { bold: true, color: active ? PALETTE3.info : PALETTE3.muted, children: line.text }) });
+    return /* @__PURE__ */ jsx28(Box22, { children: /* @__PURE__ */ jsx28(Text24, { bold: true, color: active ? PALETTE.accent : PALETTE.muted, children: line.text }) });
   }
   if (line.kind === "label") {
     return /* @__PURE__ */ jsxs23(Box22, { children: [
       line.prefix && /* @__PURE__ */ jsx28(Text24, { children: line.prefix }),
-      /* @__PURE__ */ jsx28(Text24, { bold: true, color: active ? line.color : PALETTE3.muted, children: line.text }),
-      line.suffix && /* @__PURE__ */ jsx28(Text24, { color: PALETTE3.muted, children: line.suffix })
+      /* @__PURE__ */ jsx28(Text24, { bold: true, color: active ? line.color : PALETTE.muted, children: line.text }),
+      line.suffix && /* @__PURE__ */ jsx28(Text24, { color: PALETTE.muted, children: line.suffix })
     ] });
   }
-  return /* @__PURE__ */ jsx28(Box22, { children: /* @__PURE__ */ jsx28(Text24, { color: !active || line.dim ? PALETTE3.muted : void 0, children: line.text }) });
+  return /* @__PURE__ */ jsx28(Box22, { children: /* @__PURE__ */ jsx28(Text24, { color: !active || line.dim ? PALETTE.muted : void 0, children: line.text }) });
 }
 var init_RationaleLine = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/RationaleLine.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -27514,9 +27435,9 @@ function ComponentRationalePanel({
       width,
       height: height + 2,
       borderStyle: "single",
-      borderColor: active ? PALETTE3.inverse : void 0,
+      borderColor: active ? PALETTE.text : void 0,
       children: [
-        /* @__PURE__ */ jsx29(Box23, { children: /* @__PURE__ */ jsx29(Text25, { bold: true, color: active ? void 0 : PALETTE3.muted, children: `Component rationale: ${data.name}` }) }),
+        /* @__PURE__ */ jsx29(Box23, { children: /* @__PURE__ */ jsx29(Text25, { bold: true, color: active ? void 0 : PALETTE.muted, children: `Component rationale: ${data.name}` }) }),
         visible.map((line, i) => /* @__PURE__ */ jsx29(RationaleLine, { line, active }, i)),
         /* @__PURE__ */ jsx29(Box23, { children: overflowed ? /* @__PURE__ */ jsx29(Text25, { children: `${visibleStart}-${visibleEnd}/${totalLines}    [\u2191\u2193] scroll    [I/Esc] close` }) : /* @__PURE__ */ jsx29(Text25, { children: "[I/Esc] close" }) })
       ]
@@ -27527,7 +27448,7 @@ var PLACEHOLDER;
 var init_ComponentRationalePanel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/ComponentRationalePanel.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_wrap_text();
     init_RationaleLine();
     PLACEHOLDER = "(no rationale captured)";
@@ -27538,12 +27459,12 @@ var init_ComponentRationalePanel = __esm({
 import { Text as Text26 } from "ink";
 import { Fragment as Fragment6, jsx as jsx30 } from "react/jsx-runtime";
 function HighlightedLine({ parts }) {
-  return /* @__PURE__ */ jsx30(Fragment6, { children: parts.map((part, i) => /* @__PURE__ */ jsx30(Text26, { color: part.dim ? PALETTE3.muted : part.color, children: part.text }, i)) });
+  return /* @__PURE__ */ jsx30(Fragment6, { children: parts.map((part, i) => /* @__PURE__ */ jsx30(Text26, { color: part.dim ? PALETTE.muted : part.color, children: part.text }, i)) });
 }
 var init_HighlightedLine = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/HighlightedLine.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -27564,10 +27485,10 @@ function ScrollablePanel({
   const overflowed = totalLines > height;
   return /* @__PURE__ */ jsxs25(Box24, { flexDirection: "column", width, height: height + 2, borderStyle: "single", borderColor, children: [
     /* @__PURE__ */ jsxs25(Box24, { children: [
-      /* @__PURE__ */ jsx31(Text27, { bold: true, color: active ? void 0 : PALETTE3.muted, children: title }),
+      /* @__PURE__ */ jsx31(Text27, { bold: true, color: active ? void 0 : PALETTE.muted, children: title }),
       overflowed && /* @__PURE__ */ jsxs25(Fragment7, { children: [
         /* @__PURE__ */ jsx31(Box24, { flexGrow: 1 }),
-        /* @__PURE__ */ jsx31(Text27, { color: active ? void 0 : PALETTE3.muted, children: `\u2195 ${visibleStart}-${visibleEnd}/${totalLines}` })
+        /* @__PURE__ */ jsx31(Text27, { color: active ? void 0 : PALETTE.muted, children: `\u2195 ${visibleStart}-${visibleEnd}/${totalLines}` })
       ] })
     ] }),
     children
@@ -27576,7 +27497,7 @@ function ScrollablePanel({
 var init_ScrollablePanel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/ScrollablePanel.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -27667,7 +27588,7 @@ function renderRationaleLines(rows, innerWidth) {
     out.push({
       kind: "label",
       text: row.name,
-      color: PALETTE3.info,
+      color: PALETTE.accent,
       suffix: row.kind === "slot" ? " (slot)" : void 0
     });
     for (const line of wrapText(row.rationale, innerWidth)) {
@@ -27703,7 +27624,7 @@ function RationalePanel({
       totalLines,
       visibleStart,
       visibleEnd,
-      borderColor: active ? PALETTE3.inverse : void 0,
+      borderColor: active ? PALETTE.text : void 0,
       children: visible.map((line, i) => /* @__PURE__ */ jsx33(RationaleLine, { line, active }, i))
     }
   );
@@ -27711,7 +27632,7 @@ function RationalePanel({
 var init_RationalePanel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/RationalePanel.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_wrap_text();
     init_RationaleLine();
     init_ScrollablePanel();
@@ -27747,21 +27668,29 @@ function TokenReviewPanel({
         width,
         height: height + 2,
         borderStyle: "single",
-        borderColor: active ? PALETTE3.inverse : void 0,
+        borderColor: active ? PALETTE.text : void 0,
         children: [
-          /* @__PURE__ */ jsx34(Text28, { bold: true, color: active ? void 0 : PALETTE3.muted, wrap: "truncate", children: `TOKEN REVIEW \u2014 ${componentName} \xB7 ${current.propName} (edit allowed)` }),
-          /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, wrap: "truncate", children: `select which tokens are allowed (${rangeLabel})` }),
+          /* @__PURE__ */ jsx34(Text28, { bold: true, color: active ? void 0 : PALETTE.muted, wrap: "truncate", children: `TOKEN REVIEW \u2014 ${componentName} \xB7 ${current.propName} (edit allowed)` }),
+          /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, wrap: "truncate", children: `select which tokens are allowed (${rangeLabel})` }),
           /* @__PURE__ */ jsx34(Text28, { children: " " }),
-          current.paths.length === 0 && /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, children: "(no compatible tokens found for this token kind)" }),
+          current.paths.length === 0 && /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, children: "(no compatible tokens found for this token kind)" }),
           visiblePaths.map((path5, i) => {
             const pathIndex = scrollStart + i;
             const checked = editSelection.has(path5);
             const focused = pathIndex === editCursor;
-            return /* @__PURE__ */ jsx34(Box26, { children: /* @__PURE__ */ jsx34(Text28, { color: focused ? PALETTE3.info : active ? void 0 : PALETTE3.muted, bold: focused, wrap: "truncate", children: `  [${checked ? "x" : " "}] ${path5}` }) }, path5);
+            return /* @__PURE__ */ jsx34(Box26, { children: /* @__PURE__ */ jsx34(
+              Text28,
+              {
+                color: focused ? PALETTE.accent : active ? void 0 : PALETTE.muted,
+                bold: focused,
+                wrap: "truncate",
+                children: `  [${checked ? "x" : " "}] ${path5}`
+              }
+            ) }, path5);
           }),
           /* @__PURE__ */ jsx34(Text28, { children: " " }),
-          /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, wrap: "truncate", children: "[\u2191/\u2193] move  [Space] toggle" }),
-          /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, wrap: "truncate", children: "[Ctrl+S] save  [Esc] cancel" })
+          /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, wrap: "truncate", children: "[\u2191/\u2193] move  [Space] toggle" }),
+          /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, wrap: "truncate", children: "[Ctrl+S] save  [Esc] cancel" })
         ]
       }
     );
@@ -27773,16 +27702,16 @@ function TokenReviewPanel({
       width,
       height: height + 2,
       borderStyle: "single",
-      borderColor: active ? PALETTE3.inverse : void 0,
+      borderColor: active ? PALETTE.text : void 0,
       children: [
-        /* @__PURE__ */ jsx34(Text28, { bold: true, color: active ? void 0 : PALETTE3.muted, children: `TOKEN REVIEW \u2014 ${componentName}` }),
-        suggestions.length === 0 && /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, children: "(no token suggestions for this component)" }),
+        /* @__PURE__ */ jsx34(Text28, { bold: true, color: active ? void 0 : PALETTE.muted, children: `TOKEN REVIEW \u2014 ${componentName}` }),
+        suggestions.length === 0 && /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, children: "(no token suggestions for this component)" }),
         suggestions.map((s, i) => {
           const focused = i === selectedRow;
           return /* @__PURE__ */ jsxs26(Box26, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsx34(Box26, { children: /* @__PURE__ */ jsx34(Text28, { color: focused ? PALETTE3.info : active ? void 0 : PALETTE3.muted, bold: focused, children: `${focused ? figures6.pointer : " "} ${s.propName}` }) }),
-            /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, children: `  suggested: ${s.suggested.join(", ")}` }),
-            /* @__PURE__ */ jsx34(Text28, { color: PALETTE3.muted, children: `  allowed: ${s.allowed.join(", ")}` })
+            /* @__PURE__ */ jsx34(Box26, { children: /* @__PURE__ */ jsx34(Text28, { color: focused ? PALETTE.accent : active ? void 0 : PALETTE.muted, bold: focused, children: `${focused ? figures6.pointer : " "} ${s.propName}` }) }),
+            /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, children: `  suggested: ${s.suggested.join(", ")}` }),
+            /* @__PURE__ */ jsx34(Text28, { color: PALETTE.muted, children: `  allowed: ${s.allowed.join(", ")}` })
           ] }, s.propName);
         }),
         /* @__PURE__ */ jsx34(Text28, { children: " " }),
@@ -27794,7 +27723,7 @@ function TokenReviewPanel({
 var init_TokenReviewPanel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/TokenReviewPanel.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -27874,9 +27803,9 @@ function ReviewDetailsPanel({
     const sourceLineCount = Math.max(1, height - 4);
     const lines = source ? source.split("\n").slice(panelScrollOffset, panelScrollOffset + sourceLineCount) : [];
     return /* @__PURE__ */ jsxs27(FixedPanel, { width, height, borderStyle: "single", borderColor: sourceBorderColor, paddingLeft: 1, children: [
-      /* @__PURE__ */ jsx35(Text29, { color: PALETTE3.muted, bold: true, wrap: "truncate-end", children: `source: ${headerPath}` }),
-      source ? lines.map((line, index) => /* @__PURE__ */ jsx35(Text29, { color: PALETTE3.muted, wrap: "truncate-end", children: line }, `source-line-${index}`)) : /* @__PURE__ */ jsx35(Text29, { color: PALETTE3.muted, children: "(no source captured)" }),
-      /* @__PURE__ */ jsx35(Text29, { color: PALETTE3.muted, wrap: "truncate-end", children: "[s/Esc] close" })
+      /* @__PURE__ */ jsx35(Text29, { color: PALETTE.muted, bold: true, wrap: "truncate-end", children: `source: ${headerPath}` }),
+      source ? lines.map((line, index) => /* @__PURE__ */ jsx35(Text29, { color: PALETTE.muted, wrap: "truncate-end", children: line }, `source-line-${index}`)) : /* @__PURE__ */ jsx35(Text29, { color: PALETTE.muted, children: "(no source captured)" }),
+      /* @__PURE__ */ jsx35(Text29, { color: PALETTE.muted, wrap: "truncate-end", children: "[s/Esc] close" })
     ] });
   }
   if (panelOpen === "token-review") {
@@ -27918,7 +27847,7 @@ var init_review_details_panel = __esm({
     init_RationalePanel();
     init_TokenReviewPanel();
     init_windowed_panel();
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -28045,17 +27974,17 @@ function ReviewEmptyComponentsWarning({
   hidden
 }) {
   if (hidden || count === 0) return null;
-  return /* @__PURE__ */ jsx37(Text30, { color: PALETTE3.warning, children: `\u26A0 ${count} component${count === 1 ? "" : "s"} had no classifiable props \u2014 review with care` });
+  return /* @__PURE__ */ jsx37(Text30, { color: PALETTE.warning, children: `\u26A0 ${count} component${count === 1 ? "" : "s"} had no classifiable props \u2014 review with care` });
 }
 function ReviewNoSelection() {
-  return /* @__PURE__ */ jsx37(Box27, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: /* @__PURE__ */ jsx37(Text30, { color: PALETTE3.muted, children: "No component selected" }) });
+  return /* @__PURE__ */ jsx37(Box27, { flexGrow: 1, paddingLeft: 1, flexDirection: "column", children: /* @__PURE__ */ jsx37(Text30, { color: PALETTE.muted, children: "No component selected" }) });
 }
 function ReviewFinalizeError({
   message,
   hidden
 }) {
   if (hidden || !message) return null;
-  return /* @__PURE__ */ jsx37(Text30, { color: PALETTE3.error, children: `\u26A0 ${message}` });
+  return /* @__PURE__ */ jsx37(Text30, { color: PALETTE.error, children: `\u26A0 ${message}` });
 }
 function ReviewPanelFooter({
   reviewEditor,
@@ -28079,7 +28008,7 @@ function ReviewComponentTitle({
   return /* @__PURE__ */ jsxs28(Box27, { paddingLeft: 2, paddingBottom: 1, children: [
     /* @__PURE__ */ jsx37(Text30, { bold: true, wrap: "truncate-end", children: selectedKey }),
     /* @__PURE__ */ jsx37(Box27, { flexGrow: 1 }),
-    /* @__PURE__ */ jsxs28(Text30, { color: PALETTE3.muted, wrap: "truncate-end", children: [
+    /* @__PURE__ */ jsxs28(Text30, { color: PALETTE.muted, wrap: "truncate-end", children: [
       propCount,
       " prop",
       propCount !== 1 ? "s" : "",
@@ -28135,8 +28064,8 @@ function ReviewComponentPanel({
         )
       }
     ) }),
-    /* @__PURE__ */ jsx37(Box27, { width: contentWidth, height: 1, flexShrink: 0, children: /* @__PURE__ */ jsx37(Text30, { color: saveError ? PALETTE3.error : void 0, wrap: "truncate-end", children: saveError ? "\u2717 " + saveError : " " }) }),
-    /* @__PURE__ */ jsx37(Box27, { width: contentWidth, height: 1, flexShrink: 0, children: /* @__PURE__ */ jsx37(Text30, { color: PALETTE3.muted, wrap: "truncate-end", children: /* @__PURE__ */ jsx37(
+    /* @__PURE__ */ jsx37(Box27, { width: contentWidth, height: 1, flexShrink: 0, children: /* @__PURE__ */ jsx37(Text30, { color: saveError ? PALETTE.error : void 0, wrap: "truncate-end", children: saveError ? "\u2717 " + saveError : " " }) }),
+    /* @__PURE__ */ jsx37(Box27, { width: contentWidth, height: 1, flexShrink: 0, children: /* @__PURE__ */ jsx37(Text30, { color: PALETTE.muted, wrap: "truncate-end", children: /* @__PURE__ */ jsx37(
       ReviewPanelFooter,
       {
         reviewEditor,
@@ -28151,7 +28080,7 @@ function ReviewComponentPanel({
 var init_ReviewComponentPanel = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/ReviewComponentPanel.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_review_json_panel();
     init_ReviewDetailsEditor();
     init_windowed_panel();
@@ -28173,11 +28102,11 @@ function countReviewStatuses(entries) {
   );
 }
 function ReviewLoadingState() {
-  return /* @__PURE__ */ jsx38(Box28, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx38(Text31, { color: PALETTE3.muted, children: "Loading generated definitions..." }) });
+  return /* @__PURE__ */ jsx38(Box28, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx38(Text31, { color: PALETTE.muted, children: "Loading generated definitions..." }) });
 }
 function ReviewLoadError({ message }) {
   return /* @__PURE__ */ jsxs29(Box28, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx38(Text31, { color: PALETTE3.error, children: message }),
+    /* @__PURE__ */ jsx38(Text31, { color: PALETTE.error, children: message }),
     /* @__PURE__ */ jsx38(Text31, { children: " " }),
     /* @__PURE__ */ jsx38(Text31, { children: "[q / Enter / Esc] Quit" })
   ] });
@@ -28185,7 +28114,7 @@ function ReviewLoadError({ message }) {
 var init_ReviewStatus = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/ReviewStatus.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -28435,41 +28364,41 @@ function FinalizeDialog({
     /* @__PURE__ */ jsx39(Text32, { bold: true, children: "\u2500".repeat(22) + " Finalize " + "\u2500".repeat(22) }),
     /* @__PURE__ */ jsx39(Text32, { children: " " }),
     /* @__PURE__ */ jsxs30(Text32, { children: [
-      /* @__PURE__ */ jsxs30(Text32, { color: PALETTE3.success, children: [
+      /* @__PURE__ */ jsxs30(Text32, { color: PALETTE.success, children: [
         accepted,
         " accepted"
       ] }),
       /* @__PURE__ */ jsx39(Text32, { children: " \xB7 " }),
-      /* @__PURE__ */ jsxs30(Text32, { color: PALETTE3.error, children: [
+      /* @__PURE__ */ jsxs30(Text32, { color: PALETTE.error, children: [
         rejected,
         " rejected"
       ] }),
       /* @__PURE__ */ jsx39(Text32, { children: " \xB7 " }),
-      /* @__PURE__ */ jsxs30(Text32, { color: PALETTE3.muted, children: [
+      /* @__PURE__ */ jsxs30(Text32, { color: PALETTE.muted, children: [
         needsReview,
         " unresolved"
       ] })
     ] }),
     /* @__PURE__ */ jsx39(Text32, { children: " " }),
     noneAccepted && /* @__PURE__ */ jsxs30(Fragment10, { children: [
-      /* @__PURE__ */ jsx39(Text32, { bold: true, color: PALETTE3.warning, children: "\u26A0 No components are accepted \u2014 nothing will be pushed." }),
-      /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.warning, children: "Accept at least one component ([a] a row, [A] accept all) to push." }),
+      /* @__PURE__ */ jsx39(Text32, { bold: true, color: PALETTE.warning, children: "\u26A0 No components are accepted \u2014 nothing will be pushed." }),
+      /* @__PURE__ */ jsx39(Text32, { color: PALETTE.warning, children: "Accept at least one component ([a] a row, [A] accept all) to push." }),
       /* @__PURE__ */ jsx39(Text32, { children: " " })
     ] }),
     !allResolved && /* @__PURE__ */ jsxs30(Fragment10, { children: [
-      /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.warning, children: "\u26A0 " + needsReview + " unresolved component" + (needsReview === 1 ? "" : "s") + " will not be pushed." }),
-      /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.warning, children: "Only explicitly accepted components ship." }),
+      /* @__PURE__ */ jsx39(Text32, { color: PALETTE.warning, children: "\u26A0 " + needsReview + " unresolved component" + (needsReview === 1 ? "" : "s") + " will not be pushed." }),
+      /* @__PURE__ */ jsx39(Text32, { color: PALETTE.warning, children: "Only explicitly accepted components ship." }),
       /* @__PURE__ */ jsx39(Text32, { children: " " })
     ] }),
     /* @__PURE__ */ jsxs30(Box29, { flexDirection: "column", height: 2, children: [
-      previewStatus === "running" ? /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.muted, children: "Previewing deletions against the target space\u2026" }) : previewStatus === "error" ? /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.warning, children: "\u26A0 Could not preview deletions (the push will still proceed)." }) : /* @__PURE__ */ jsx39(Text32, { children: " " }),
+      previewStatus === "running" ? /* @__PURE__ */ jsx39(Text32, { color: PALETTE.muted, children: "Previewing deletions against the target space\u2026" }) : previewStatus === "error" ? /* @__PURE__ */ jsx39(Text32, { color: PALETTE.warning, children: "\u26A0 Could not preview deletions (the push will still proceed)." }) : /* @__PURE__ */ jsx39(Text32, { children: " " }),
       /* @__PURE__ */ jsx39(Text32, { children: " " })
     ] }),
     previewStatus === "done" && removed.length > 0 && /* @__PURE__ */ jsxs30(Fragment10, { children: [
-      /* @__PURE__ */ jsx39(Text32, { bold: true, color: PALETTE3.error, children: removedComponentsHeader(removed.length, false) }),
-      hasMoreAbove && /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.muted, children: "\u2191 more above" }),
-      windowed.map((rc) => /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.error, children: removedComponentLine(rc) }, rc.id)),
-      hasMoreBelow && /* @__PURE__ */ jsx39(Text32, { color: PALETTE3.muted, children: "\u2193 more below" }),
+      /* @__PURE__ */ jsx39(Text32, { bold: true, color: PALETTE.error, children: removedComponentsHeader(removed.length, false) }),
+      hasMoreAbove && /* @__PURE__ */ jsx39(Text32, { color: PALETTE.muted, children: "\u2191 more above" }),
+      windowed.map((rc) => /* @__PURE__ */ jsx39(Text32, { color: PALETTE.error, children: removedComponentLine(rc) }, rc.id)),
+      hasMoreBelow && /* @__PURE__ */ jsx39(Text32, { color: PALETTE.muted, children: "\u2193 more below" }),
       removed.length > FINALIZE_REMOVED_WINDOW && /* @__PURE__ */ jsx39(Text32, { children: "[\u2191\u2193] scroll deletions" }),
       /* @__PURE__ */ jsx39(Text32, { children: " " })
     ] }),
@@ -28482,7 +28411,7 @@ var FINALIZE_REMOVED_WINDOW;
 var init_FinalizeDialog = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/FinalizeDialog.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_useImmediateInput();
     init_removed_components_text();
     FINALIZE_REMOVED_WINDOW = 6;
@@ -29010,8 +28939,8 @@ function ReviewStepDialogs({
 }
 function ReviewReloadDialog({ open }) {
   if (!open) return null;
-  return /* @__PURE__ */ jsxs32(Box31, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE3.warning, paddingX: 1, children: [
-    /* @__PURE__ */ jsx41(Text34, { bold: true, color: PALETTE3.warning, children: "Reload from saved state?" }),
+  return /* @__PURE__ */ jsxs32(Box31, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+    /* @__PURE__ */ jsx41(Text34, { bold: true, color: PALETTE.warning, children: "Reload from saved state?" }),
     /* @__PURE__ */ jsx41(Text34, { children: "Unsaved in-memory changes will be lost." }),
     /* @__PURE__ */ jsx41(Text34, { children: " " }),
     /* @__PURE__ */ jsx41(Text34, { children: "  [Enter]  Confirm" }),
@@ -29021,7 +28950,7 @@ function ReviewReloadDialog({ open }) {
 var init_ReviewDialogs = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/ReviewDialogs.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_FinalizeDialog();
     init_QuitDialog();
     init_ReviewStatus();
@@ -29432,25 +29361,25 @@ function LivePreviewSummary({
   const counts = { new: 0, changed: 0, removed: 0, breaking: 0 };
   for (const annotation of previewAnnotations.values()) counts[annotation] += 1;
   const hasCounts = counts.new + counts.changed + counts.removed + counts.breaking > 0;
-  if (disabled) return /* @__PURE__ */ jsx42(Text35, { color: PALETTE3.muted, children: "Preview: disabled (creds rejected)" });
-  if (status === "running" && !hasCounts) return /* @__PURE__ */ jsx42(Text35, { color: PALETTE3.muted, children: `Preview: ${spinner} running...` });
+  if (disabled) return /* @__PURE__ */ jsx42(Text35, { color: PALETTE.muted, children: "Preview: disabled (creds rejected)" });
+  if (status === "running" && !hasCounts) return /* @__PURE__ */ jsx42(Text35, { color: PALETTE.muted, children: `Preview: ${spinner} running...` });
   if (!hasCounts) return null;
   return /* @__PURE__ */ jsxs33(Box32, { children: [
     /* @__PURE__ */ jsx42(Text35, { children: "Preview: " }),
-    /* @__PURE__ */ jsx42(Text35, { color: PALETTE3.success, children: `${counts.new} new` }),
+    /* @__PURE__ */ jsx42(Text35, { color: PALETTE.success, children: `${counts.new} new` }),
     /* @__PURE__ */ jsx42(Text35, { children: " \xB7 " }),
-    /* @__PURE__ */ jsx42(Text35, { color: PALETTE3.warning, children: `${counts.changed} changed` }),
+    /* @__PURE__ */ jsx42(Text35, { color: PALETTE.warning, children: `${counts.changed} changed` }),
     /* @__PURE__ */ jsx42(Text35, { children: " \xB7 " }),
-    /* @__PURE__ */ jsx42(Text35, { color: PALETTE3.muted, children: `${counts.removed} removed` }),
+    /* @__PURE__ */ jsx42(Text35, { color: PALETTE.muted, children: `${counts.removed} removed` }),
     showRemovedListHint && removedCount > 0 && /* @__PURE__ */ jsx42(Text35, { children: " ([d] removed list)" }),
     /* @__PURE__ */ jsx42(Text35, { children: " \xB7 " }),
-    /* @__PURE__ */ jsx42(Text35, { color: PALETTE3.error, bold: true, children: `${counts.breaking} breaking` })
+    /* @__PURE__ */ jsx42(Text35, { color: PALETTE.error, bold: true, children: `${counts.breaking} breaking` })
   ] });
 }
 var init_LivePreviewSummary = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/components/LivePreviewSummary.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
   }
 });
 
@@ -29499,10 +29428,10 @@ function CyclePathLine({
   highlightComponents = false,
   highlightLine = false
 }) {
-  return /* @__PURE__ */ jsxs34(Text36, { color: highlightLine ? PALETTE3.warning : void 0, children: [
+  return /* @__PURE__ */ jsxs34(Text36, { color: highlightLine ? PALETTE.warning : void 0, children: [
     prefix,
     segments.map(
-      (segment, index) => segment.kind === "slot" ? /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.info, children: segment.text }, index) : segment.kind === "arrow" ? /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: segment.text }, index) : /* @__PURE__ */ jsx43(Text36, { color: highlightComponents ? PALETTE3.warning : void 0, children: segment.text }, index)
+      (segment, index) => segment.kind === "slot" ? /* @__PURE__ */ jsx43(Text36, { color: PALETTE.accent, children: segment.text }, index) : segment.kind === "arrow" ? /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: segment.text }, index) : /* @__PURE__ */ jsx43(Text36, { color: highlightComponents ? PALETTE.warning : void 0, children: segment.text }, index)
     )
   ] });
 }
@@ -29514,9 +29443,9 @@ function CycleDetailPanel({
   height
 }) {
   const lines = [
-    /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE3.warning, children: `SLOT DEPENDENCY CYCLES (${cycles.length})` }, "cyc-title"),
-    /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: "push will fail until these are resolved" }, "cyc-sub"),
-    /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: "Reject a cycle member or remove a slot edge to break the cycle." }, "cyc-guidance"),
+    /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE.warning, children: `SLOT DEPENDENCY CYCLES (${cycles.length})` }, "cyc-title"),
+    /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: "push will fail until these are resolved" }, "cyc-sub"),
+    /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: "Reject a cycle member or remove a slot edge to break the cycle." }, "cyc-guidance"),
     /* @__PURE__ */ jsx43(Text36, { children: " " }, "cyc-space")
   ];
   cycles.forEach((cycle, index) => {
@@ -29528,7 +29457,7 @@ function CycleDetailPanel({
     );
     if (cycle.suggestedBreak) {
       lines.push(
-        /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: `    Suggested fix: remove [${cycle.suggestedBreak.slotName}] from ${cycle.suggestedBreak.fromComponent}` }, `cyc-fix-${index}`)
+        /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: `    Suggested fix: remove [${cycle.suggestedBreak.slotName}] from ${cycle.suggestedBreak.fromComponent}` }, `cyc-fix-${index}`)
       );
     }
     lines.push(/* @__PURE__ */ jsx43(Text36, { children: " " }, `cyc-s-${index}`));
@@ -29536,9 +29465,9 @@ function CycleDetailPanel({
   const footer = "[\u2191\u2193] move  [Enter] fix cycle  [c/q/Esc] close";
   const viewportHeight = Math.max(1, height - 3);
   const visible = lines.slice(scrollOffset, scrollOffset + viewportHeight - 1);
-  return /* @__PURE__ */ jsxs34(FixedPanel, { width, height, borderStyle: "round", borderColor: PALETTE3.warning, paddingLeft: 1, children: [
+  return /* @__PURE__ */ jsxs34(FixedPanel, { width, height, borderStyle: "round", borderColor: PALETTE.warning, paddingLeft: 1, children: [
     visible,
-    /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: footer })
+    /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: footer })
   ] });
 }
 function BreakCyclePanel({
@@ -29549,14 +29478,14 @@ function BreakCyclePanel({
   width,
   height
 }) {
-  return /* @__PURE__ */ jsxs34(FixedPanel, { width, height, borderStyle: "round", borderColor: PALETTE3.warning, paddingLeft: 1, children: [
-    /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE3.warning, children: "BREAK CYCLE \u2014 remove a slot edge" }),
+  return /* @__PURE__ */ jsxs34(FixedPanel, { width, height, borderStyle: "round", borderColor: PALETTE.warning, paddingLeft: 1, children: [
+    /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE.warning, children: "BREAK CYCLE \u2014 remove a slot edge" }),
     cycle && /* @__PURE__ */ jsx43(CyclePathLine, { segments: formatCyclePathSegments2(cycle), prefix: "  ", highlightComponents: true }),
-    /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: cycle ? "Deleting an edge removes it from $allowedComponents (undo with Ctrl+Z)." : "No cycle highlighted." }),
+    /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: cycle ? "Deleting an edge removes it from $allowedComponents (undo with Ctrl+Z)." : "No cycle highlighted." }),
     /* @__PURE__ */ jsx43(Text36, { children: " " }),
-    edges.length > 0 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: "remove slot edge:" }),
+    edges.length > 0 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: "remove slot edge:" }),
     edges.map((edge, index) => /* @__PURE__ */ jsx43(Text36, { inverse: index === cursor, children: `${index === cursor ? figures7.pointer : " "} remove '${edge.toComponent}' from ${edge.fromComponent}.$slots.${edge.slotName}.$allowedComponents` }, `${edge.fromComponent}-${edge.slotName}-${edge.toComponent}`)),
-    confirming ? /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE3.warning, children: "Delete this slot edge? [y] confirm  [n] cancel" }) : /* @__PURE__ */ jsx43(Text36, { children: "[\u2191\u2193] move  [Enter] delete  [x/Esc] close" })
+    confirming ? /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE.warning, children: "Delete this slot edge? [y] confirm  [n] cancel" }) : /* @__PURE__ */ jsx43(Text36, { children: "[\u2191\u2193] move  [Enter] delete  [x/Esc] close" })
   ] });
 }
 function buildBreakingRows(breakingChanges) {
@@ -29602,7 +29531,7 @@ function deriveBreakingChanges(response) {
 }
 function GenerateReviewStep(props) {
   if (!props.extractSessionId) {
-    return /* @__PURE__ */ jsx43(Box33, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.error, children: "Error: no session ID \u2014 cannot load generated definitions." }) });
+    return /* @__PURE__ */ jsx43(Box33, { paddingX: 2, paddingY: 1, children: /* @__PURE__ */ jsx43(Text36, { color: PALETTE.error, children: "Error: no session ID \u2014 cannot load generated definitions." }) });
   }
   return /* @__PURE__ */ jsx43(GenerateReviewStepView, { ...props, extractSessionId: props.extractSessionId });
 }
@@ -30519,8 +30448,8 @@ function GenerateReviewStepView({
       }
     ),
     /* @__PURE__ */ jsx43(ReviewReloadDialog, { open: showReloadDialog && !dialogOpen }),
-    removedComponents.length > 0 && !dialogOpen && /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE3.error, paddingX: 1, children: [
-      /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE3.error, children: removedComponentsHeader(removedComponents.length, true) }),
+    removedComponents.length > 0 && !dialogOpen && /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.error, paddingX: 1, children: [
+      /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE.error, children: removedComponentsHeader(removedComponents.length, true) }),
       !removedBannerCollapsed && /* @__PURE__ */ jsxs34(Fragment13, { children: [
         /* @__PURE__ */ jsx43(Text36, { children: " " }),
         removedComponents.map((rc) => /* @__PURE__ */ jsx43(Text36, { children: removedComponentLine(rc) }, rc.id))
@@ -30529,7 +30458,7 @@ function GenerateReviewStepView({
     breakingChanges.length > 0 && !dialogOpen && /* @__PURE__ */ jsx43(Box33, { paddingX: 1, children: /* @__PURE__ */ jsx43(
       Text36,
       {
-        color: PALETTE3.warning,
+        color: PALETTE.warning,
         children: `[b] ${breakingChanges.length} breaking change${breakingChanges.length === 1 ? "" : "s"}`
       }
     ) }),
@@ -30537,10 +30466,10 @@ function GenerateReviewStepView({
       const row = breakingRows[breakingCursor];
       const comp = row ? breakingChanges.find((b) => b.componentName === row.componentName) : void 0;
       if (!comp) return null;
-      return /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE3.warning, paddingX: 1, children: [
-        /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE3.warning, children: `Breaking changes \u2014 ${comp.componentName}` }),
-        comp.impact && /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: `  affects ${comp.impact.affectedExperiences} experience${comp.impact.affectedExperiences === 1 ? "" : "s"}, ${comp.impact.affectedFragments} fragment${comp.impact.affectedFragments === 1 ? "" : "s"}` }),
-        comp.changes.length === 0 ? /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: "  (no enumerated changes)" }) : comp.changes.map((change, ci) => /* @__PURE__ */ jsx43(Text36, { children: `  \u2022 ${formatBreakingChange(change, comp.current)}` }, `bd-detail-${ci}`)),
+      return /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+        /* @__PURE__ */ jsx43(Text36, { bold: true, color: PALETTE.warning, children: `Breaking changes \u2014 ${comp.componentName}` }),
+        comp.impact && /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: `  affects ${comp.impact.affectedExperiences} experience${comp.impact.affectedExperiences === 1 ? "" : "s"}, ${comp.impact.affectedFragments} fragment${comp.impact.affectedFragments === 1 ? "" : "s"}` }),
+        comp.changes.length === 0 ? /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: "  (no enumerated changes)" }) : comp.changes.map((change, ci) => /* @__PURE__ */ jsx43(Text36, { children: `  \u2022 ${formatBreakingChange(change, comp.current)}` }, `bd-detail-${ci}`)),
         /* @__PURE__ */ jsx43(Text36, { children: "[D/Esc] close detail" })
       ] });
     })(),
@@ -30563,11 +30492,11 @@ function GenerateReviewStepView({
       const participantSet = cycleView.structural;
       const members = stillRejected.filter((n) => participantSet.has(n)).sort();
       const ancestors = stillRejected.filter((n) => !participantSet.has(n)).sort();
-      return /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", borderStyle: "single", borderColor: PALETTE3.error, paddingX: 1, children: [
-        /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.error, bold: true, children: `Cyclic component graph \u2014 auto-rejected ${stillRejected.length} component${stillRejected.length === 1 ? "" : "s"}:` }),
-        members.length > 0 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.error, children: `  Cycle members: ${members.join(", ")}` }),
-        ancestors.length > 0 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.error, children: `  Ancestors: ${ancestors.join(", ")}` }),
-        /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.muted, children: undoSnapshot ? "  [Ctrl+Z] undo \xB7 [r]/[a] manually toggle \xB7 [F] continue" : "  [r]/[a] manually toggle \xB7 [F] continue" })
+      return /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", borderStyle: "single", borderColor: PALETTE.error, paddingX: 1, children: [
+        /* @__PURE__ */ jsx43(Text36, { color: PALETTE.error, bold: true, children: `Cyclic component graph \u2014 auto-rejected ${stillRejected.length} component${stillRejected.length === 1 ? "" : "s"}:` }),
+        members.length > 0 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE.error, children: `  Cycle members: ${members.join(", ")}` }),
+        ancestors.length > 0 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE.error, children: `  Ancestors: ${ancestors.join(", ")}` }),
+        /* @__PURE__ */ jsx43(Text36, { color: PALETTE.muted, children: undoSnapshot ? "  [Ctrl+Z] undo \xB7 [r]/[a] manually toggle \xB7 [F] continue" : "  [r]/[a] manually toggle \xB7 [F] continue" })
       ] });
     })(),
     /* @__PURE__ */ jsx43(ReviewEmptyComponentsWarning, { count: emptyCount, hidden: dialogOpen }),
@@ -30683,7 +30612,7 @@ function GenerateReviewStepView({
       ) : /* @__PURE__ */ jsx43(ReviewNoSelection, {})
     ] }),
     !dialogOpen && cycleRows.length > 0 && !cyclePanel.isOpen && !breakPanel.isOpen && /* @__PURE__ */ jsxs34(Box33, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.warning, children: `\u26A0 ${cycleRows.length} slot dependency cycle${cycleRows.length === 1 ? "" : "s"} detected \u2014 push will fail` }),
+      /* @__PURE__ */ jsx43(Text36, { color: PALETTE.warning, children: `\u26A0 ${cycleRows.length} slot dependency cycle${cycleRows.length === 1 ? "" : "s"} detected \u2014 push will fail` }),
       cycleRows.slice(0, 3).map((cycle, idx) => {
         return /* @__PURE__ */ jsx43(
           CyclePathLine,
@@ -30696,7 +30625,7 @@ function GenerateReviewStepView({
           `cyc-banner-${idx}`
         );
       }),
-      cycleRows.length > 3 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE3.warning, children: `  \u2026${cycleRows.length - 3} more` }),
+      cycleRows.length > 3 && /* @__PURE__ */ jsx43(Text36, { color: PALETTE.warning, children: `  \u2026${cycleRows.length - 3} more` }),
       /* @__PURE__ */ jsx43(Text36, { children: "  press [c] for detail" })
     ] }),
     /* @__PURE__ */ jsx43(
@@ -30717,7 +30646,7 @@ var HELP_SECTIONS2;
 var init_generate_review_step = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/09-review/generate-review-step.tsx"() {
     "use strict";
-    init_theme3();
+    init_theme();
     init_review_json_panel();
     init_GroupedSidebar();
     init_composite_closure();
@@ -30824,49 +30753,24 @@ var init_generate_review_step = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/tui/import/steps/10-flow/theme.ts
-import { defaultTheme as defaultTheme2, extendTheme as extendTheme2 } from "@inkjs/ui";
-var PALETTE4, INK_UI_THEME;
-var init_theme4 = __esm({
-  "packages/experience-design-system-cli/src/tui/import/steps/10-flow/theme.ts"() {
-    "use strict";
-    init_theme3();
-    PALETTE4 = {
-      ...PALETTE3,
-      link: "#58A6FF"
-    };
-    INK_UI_THEME = extendTheme2(defaultTheme2, {
-      components: {
-        ProgressBar: {
-          styles: {
-            completed: () => ({
-              color: "blue"
-            })
-          }
-        }
-      }
-    });
-  }
-});
-
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/components/CustomPromptBanner.tsx
 import { Box as Box34, Text as Text37 } from "ink";
 import { jsx as jsx44, jsxs as jsxs35 } from "react/jsx-runtime";
 function CustomPromptBanner({ generatePromptPath }) {
   if (!generatePromptPath) return null;
-  return /* @__PURE__ */ jsxs35(Box34, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE4.warning, paddingX: 1, children: [
-    /* @__PURE__ */ jsx44(Text37, { color: PALETTE4.warning, bold: true, children: "WARNING: Custom prompt active" }),
-    generatePromptPath ? /* @__PURE__ */ jsxs35(Text37, { color: PALETTE4.warning, children: [
+  return /* @__PURE__ */ jsxs35(Box34, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.warning, paddingX: 1, children: [
+    /* @__PURE__ */ jsx44(Text37, { color: PALETTE.warning, bold: true, children: "WARNING: Custom prompt active" }),
+    generatePromptPath ? /* @__PURE__ */ jsxs35(Text37, { color: PALETTE.warning, children: [
       "components: ",
       generatePromptPath
     ] }) : null,
-    /* @__PURE__ */ jsx44(Text37, { color: PALETTE4.warning, children: "Bundled invariants (utility-wrapper rejection, description content rules) do NOT apply." })
+    /* @__PURE__ */ jsx44(Text37, { color: PALETTE.warning, children: "Bundled invariants (utility-wrapper rejection, description content rules) do NOT apply." })
   ] });
 }
 var init_CustomPromptBanner = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/components/CustomPromptBanner.tsx"() {
     "use strict";
-    init_theme4();
+    init_theme();
   }
 });
 
@@ -30893,17 +30797,17 @@ import { Box as Box35, Text as Text38 } from "ink";
 import { jsx as jsx45, jsxs as jsxs36 } from "react/jsx-runtime";
 function SpaceEnvironment({ spaceId, environmentId }) {
   return /* @__PURE__ */ jsxs36(Box35, { gap: 1, marginTop: 1, children: [
-    /* @__PURE__ */ jsx45(Text38, { color: PALETTE4.muted, children: "Space:" }),
+    /* @__PURE__ */ jsx45(Text38, { color: PALETTE.muted, children: "Space:" }),
     /* @__PURE__ */ jsx45(Text38, { children: spaceId }),
-    /* @__PURE__ */ jsx45(Text38, { color: PALETTE4.muted, children: "/" }),
-    /* @__PURE__ */ jsx45(Text38, { color: PALETTE4.muted, children: "Environment:" }),
+    /* @__PURE__ */ jsx45(Text38, { color: PALETTE.muted, children: "/" }),
+    /* @__PURE__ */ jsx45(Text38, { color: PALETTE.muted, children: "Environment:" }),
     /* @__PURE__ */ jsx45(Text38, { children: environmentId })
   ] });
 }
 var init_SpaceEnvironment = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/components/SpaceEnvironment.tsx"() {
     "use strict";
-    init_theme4();
+    init_theme();
   }
 });
 
@@ -30914,13 +30818,13 @@ function EntityRows({ entity, label }) {
   const plural3 = (n) => `${n} ${label}${n !== 1 ? "s" : ""}`;
   return /* @__PURE__ */ jsxs37(Fragment14, { children: [
     ACTIONS.filter((action) => entity[action] > 0).map((action) => /* @__PURE__ */ jsxs37(Text39, { children: [
-      /* @__PURE__ */ jsx46(Text39, { color: PALETTE4.success, children: "\u2713" }),
+      /* @__PURE__ */ jsx46(Text39, { color: PALETTE.success, children: "\u2713" }),
       " ",
       plural3(entity[action]),
       " ",
       action
     ] }, action)),
-    entity.failed > 0 && /* @__PURE__ */ jsxs37(Text39, { color: PALETTE4.error, children: [
+    entity.failed > 0 && /* @__PURE__ */ jsxs37(Text39, { color: PALETTE.error, children: [
       "\u2717 ",
       plural3(entity.failed),
       " failed \u2014 check logs above"
@@ -30929,8 +30833,8 @@ function EntityRows({ entity, label }) {
 }
 function LinkRow({ title, url }) {
   return /* @__PURE__ */ jsxs37(Box36, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx46(Text39, { color: PALETTE4.muted, children: title }),
-    /* @__PURE__ */ jsx46(Text39, { color: PALETTE4.link, children: url })
+    /* @__PURE__ */ jsx46(Text39, { color: PALETTE.muted, children: title }),
+    /* @__PURE__ */ jsx46(Text39, { color: PALETTE.accent, children: url })
   ] });
 }
 function DoneStep({
@@ -30953,17 +30857,17 @@ function DoneStep({
   const success = totalFailed === 0;
   const urlArgs = { host: host ?? "api.contentful.com", spaceId, environmentId };
   return /* @__PURE__ */ jsxs37(Box36, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
-    success ? /* @__PURE__ */ jsx46(Text39, { bold: true, color: PALETTE4.success, children: "Done!" }) : /* @__PURE__ */ jsx46(Text39, { bold: true, color: PALETTE4.warning, children: "\u26A0 Finished with errors" }),
-    totalPushed === 0 && totalFailed === 0 && !summary ? /* @__PURE__ */ jsx46(Text39, { color: PALETTE4.muted, children: "Nothing was pushed \u2014 everything was already up to date." }) : /* @__PURE__ */ jsxs37(Box36, { flexDirection: "column", children: [
+    success ? /* @__PURE__ */ jsx46(Text39, { bold: true, color: PALETTE.success, children: "Done!" }) : /* @__PURE__ */ jsx46(Text39, { bold: true, color: PALETTE.warning, children: "\u26A0 Finished with errors" }),
+    totalPushed === 0 && totalFailed === 0 && !summary ? /* @__PURE__ */ jsx46(Text39, { color: PALETTE.muted, children: "Nothing was pushed \u2014 everything was already up to date." }) : /* @__PURE__ */ jsxs37(Box36, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx46(EntityRows, { entity: componentTypes, label: "Component Type" }),
       /* @__PURE__ */ jsx46(EntityRows, { entity: designTokens, label: "Design Token" }),
-      summary && /* @__PURE__ */ jsx46(Box36, { marginTop: 1, children: /* @__PURE__ */ jsxs37(Text39, { color: PALETTE4.muted, children: [
+      summary && /* @__PURE__ */ jsx46(Box36, { marginTop: 1, children: /* @__PURE__ */ jsxs37(Text39, { color: PALETTE.muted, children: [
         "Push result: ",
         summary.succeeded,
         "/",
         summary.total,
         " succeeded",
-        summary.failed > 0 && /* @__PURE__ */ jsxs37(Text39, { color: PALETTE4.error, children: [
+        summary.failed > 0 && /* @__PURE__ */ jsxs37(Text39, { color: PALETTE.error, children: [
           ", ",
           summary.failed,
           " failed"
@@ -30971,8 +30875,8 @@ function DoneStep({
       ] }) })
     ] }),
     failures.length > 0 && /* @__PURE__ */ jsxs37(Box36, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx46(Text39, { bold: true, color: PALETTE4.error, children: "Failure details" }),
-      failures.map((failure) => /* @__PURE__ */ jsxs37(Text39, { color: PALETTE4.error, children: [
+      /* @__PURE__ */ jsx46(Text39, { bold: true, color: PALETTE.error, children: "Failure details" }),
+      failures.map((failure) => /* @__PURE__ */ jsxs37(Text39, { color: PALETTE.error, children: [
         failure.entityType,
         " ",
         failure.entityId,
@@ -30982,7 +30886,7 @@ function DoneStep({
     ] }),
     /* @__PURE__ */ jsx46(SpaceEnvironment, { spaceId, environmentId }),
     success && totalPushed > 0 && /* @__PURE__ */ jsxs37(Box36, { flexDirection: "column", gap: 1, children: [
-      /* @__PURE__ */ jsx46(Text39, { color: PALETTE4.success, children: "Your design system is now in Contentful Experiences." }),
+      /* @__PURE__ */ jsx46(Text39, { color: PALETTE.success, children: "Your design system is now in Contentful Experiences." }),
       /* @__PURE__ */ jsx46(LinkRow, { title: "View your components here:", url: buildPostPushUrl2(urlArgs) }),
       /* @__PURE__ */ jsx46(
         LinkRow,
@@ -30999,7 +30903,7 @@ var ACTIONS;
 var init_DoneStep = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/screens/DoneStep.tsx"() {
     "use strict";
-    init_theme4();
+    init_theme();
     init_useImmediateInput();
     init_contentful_urls2();
     init_SpaceEnvironment();
@@ -31110,12 +31014,12 @@ function PathPrompt({
   const cursor = cursorVisible ? "\u2588" : " ";
   return /* @__PURE__ */ jsxs38(Box37, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsxs38(Box37, { gap: 1, children: [
-      /* @__PURE__ */ jsx47(Text40, { color: "cyan", children: "?" }),
+      /* @__PURE__ */ jsx47(Text40, { color: PALETTE.accent, children: "?" }),
       /* @__PURE__ */ jsxs38(Text40, { bold: true, children: [
         label,
         ":"
       ] }),
-      /* @__PURE__ */ jsx47(Text40, { color: isPlaceholder ? PALETTE4.muted : void 0, children: shown }),
+      /* @__PURE__ */ jsx47(Text40, { color: isPlaceholder ? PALETTE.muted : void 0, children: shown }),
       /* @__PURE__ */ jsx47(Text40, { children: cursor })
     ] }),
     /* @__PURE__ */ jsxs38(Box37, { gap: 3, children: [
@@ -31131,7 +31035,7 @@ var init_PathPrompt = __esm({
     init_useImmediateInput();
     init_path_utils();
     init_use_blinking_cursor();
-    init_theme4();
+    init_theme();
   }
 });
 
@@ -31140,7 +31044,7 @@ import { Box as Box38, Text as Text41 } from "ink";
 import { jsx as jsx48, jsxs as jsxs39 } from "react/jsx-runtime";
 function StepHeader({ stepNumber, totalSteps, title }) {
   return /* @__PURE__ */ jsxs39(Box38, { flexDirection: "column", gap: 0, children: [
-    /* @__PURE__ */ jsx48(Text41, { dimColor: true, children: "\u2500".repeat(40) }),
+    /* @__PURE__ */ jsx48(Text41, { color: PALETTE.muted, children: "\u2500".repeat(40) }),
     /* @__PURE__ */ jsxs39(Box38, { gap: 1, children: [
       /* @__PURE__ */ jsxs39(Text41, { bold: true, children: [
         "Step ",
@@ -31151,12 +31055,13 @@ function StepHeader({ stepNumber, totalSteps, title }) {
       /* @__PURE__ */ jsx48(Text41, { bold: true, children: "\u2014" }),
       /* @__PURE__ */ jsx48(Text41, { bold: true, children: title })
     ] }),
-    /* @__PURE__ */ jsx48(Text41, { dimColor: true, children: "\u2500".repeat(40) })
+    /* @__PURE__ */ jsx48(Text41, { color: PALETTE.muted, children: "\u2500".repeat(40) })
   ] });
 }
 var init_StepHeader = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/components/StepHeader.tsx"() {
     "use strict";
+    init_theme();
   }
 });
 
@@ -31198,12 +31103,12 @@ function PushingStep({ stepNumber, totalSteps, progress }) {
     /* @__PURE__ */ jsx50(StepHeader, { stepNumber, totalSteps, title: "Push to Contentful" }),
     /* @__PURE__ */ jsx50(Text42, { children: "Writing component types and design tokens to your Contentful space..." }),
     operationId && /* @__PURE__ */ jsxs40(Box39, { gap: 1, children: [
-      /* @__PURE__ */ jsx50(Text42, { color: PALETTE4.muted, children: "Operation:" }),
+      /* @__PURE__ */ jsx50(Text42, { color: PALETTE.muted, children: "Operation:" }),
       /* @__PURE__ */ jsx50(Text42, { children: operationId })
     ] }),
     showGlobal && progress && progress.kind === "progress" && /* @__PURE__ */ jsx50(Box39, { gap: 1, flexDirection: "column", children: /* @__PURE__ */ jsxs40(Box39, { gap: 2, children: [
-      /* @__PURE__ */ jsx50(Box39, { width: 40, children: /* @__PURE__ */ jsx50(ThemeProvider2, { theme: INK_UI_THEME, children: /* @__PURE__ */ jsx50(ProgressBar2, { value: Math.round(progress.processed / progress.total * 100) }) }) }),
-      /* @__PURE__ */ jsxs40(Text42, { color: PALETTE4.muted, children: [
+      /* @__PURE__ */ jsx50(Box39, { width: 40, children: /* @__PURE__ */ jsx50(ThemeProvider2, { theme: PROGRESS_THEME, children: /* @__PURE__ */ jsx50(ProgressBar2, { value: Math.round(progress.processed / progress.total * 100) }) }) }),
+      /* @__PURE__ */ jsxs40(Text42, { color: PALETTE.muted, children: [
         progress.processed,
         "/",
         progress.total,
@@ -31211,10 +31116,10 @@ function PushingStep({ stepNumber, totalSteps, progress }) {
       ] })
     ] }) }),
     showCurrent && /* @__PURE__ */ jsxs40(Box39, { gap: 1, children: [
-      /* @__PURE__ */ jsx50(Text42, { color: PALETTE4.muted, children: "Now processing:" }),
+      /* @__PURE__ */ jsx50(Text42, { color: PALETTE.muted, children: "Now processing:" }),
       /* @__PURE__ */ jsx50(Text42, { children: showCurrent })
     ] }),
-    /* @__PURE__ */ jsx50(Box39, { marginTop: 1, children: /* @__PURE__ */ jsxs40(Text42, { color: PALETTE4.muted, children: [
+    /* @__PURE__ */ jsx50(Box39, { marginTop: 1, children: /* @__PURE__ */ jsxs40(Text42, { color: PALETTE.muted, children: [
       "Elapsed: ",
       elapsed
     ] }) })
@@ -31225,8 +31130,8 @@ var init_PushingStep = __esm({
     "use strict";
     init_StepHeader();
     init_use_timed_spinner();
-    init_theme4();
-    init_theme4();
+    init_theme2();
+    init_theme();
   }
 });
 
@@ -31421,25 +31326,25 @@ function buildPreviewSummaryLines(preview) {
   if (components.new.length > 0) {
     lines.push({
       key: "summary-components-new",
-      color: PALETTE4.success,
+      color: PALETTE.success,
       text: ` \uFF0B ${components.new.length} components will be created`
     });
     for (const [index, item] of components.new.entries()) {
       const name = item.key ?? item.$name ?? "unknown";
-      lines.push({ key: `summary-components-new-${index}`, color: PALETTE4.success, text: `  + ${name}` });
+      lines.push({ key: `summary-components-new-${index}`, color: PALETTE.success, text: `  + ${name}` });
     }
   }
   if (components.changed.length > 0) {
     lines.push({
       key: "summary-components-changed",
-      color: PALETTE4.warning,
+      color: PALETTE.warning,
       text: ` \uFF5E ${components.changed.length} components will be updated`
     });
     for (const [index, item] of components.changed.entries()) {
       const isBreaking = item.changeClassification?.classification === "breaking";
       lines.push({
         key: `summary-components-changed-${index}`,
-        color: isBreaking ? PALETTE4.error : PALETTE4.warning,
+        color: isBreaking ? PALETTE.error : PALETTE.warning,
         text: ` ${isBreaking ? "\u26A0" : "~"} ${item.current.name}`
       });
     }
@@ -31447,11 +31352,11 @@ function buildPreviewSummaryLines(preview) {
   if (components.removed.length > 0) {
     lines.push({
       key: "summary-components-removed",
-      color: PALETTE4.warning,
+      color: PALETTE.warning,
       text: ` \u2298 ${components.removed.length} components will be skipped`
     });
     for (const [index, item] of components.removed.entries()) {
-      lines.push({ key: `summary-components-removed-${index}`, color: PALETTE4.warning, text: ` \u2298 ${item.name}` });
+      lines.push({ key: `summary-components-removed-${index}`, color: PALETTE.warning, text: ` \u2298 ${item.name}` });
     }
   }
   if (components.unchanged.length > 0) {
@@ -31464,21 +31369,21 @@ function buildPreviewSummaryLines(preview) {
   if (tokens.new.length > 0) {
     lines.push({
       key: "summary-tokens-new",
-      color: PALETTE4.success,
+      color: PALETTE.success,
       text: ` \uFF0B ${tokens.new.length} design tokens will be created`
     });
   }
   if (tokens.changed.length > 0) {
     lines.push({
       key: "summary-tokens-changed",
-      color: PALETTE4.warning,
+      color: PALETTE.warning,
       text: ` \uFF5E ${tokens.changed.length} design tokens will be updated`
     });
   }
   if (tokens.removed.length > 0) {
     lines.push({
       key: "summary-tokens-removed",
-      color: PALETTE4.warning,
+      color: PALETTE.warning,
       text: ` \u2298 ${tokens.removed.length} design tokens will be skipped`
     });
   }
@@ -31522,12 +31427,12 @@ function getPreviewScrollOffset(input, downArrow, upArrow, diffExpanded, current
 function appendChangedPreviewLine(lines, keyPrefix, name, hasPendingDraftChanges, changeClassification) {
   lines.push({
     key: `${keyPrefix}-h-${name}`,
-    color: PALETTE4.warning,
+    color: PALETTE.warning,
     text: ` ~ ${name}${hasPendingDraftChanges ? " \u26A1 has pending draft changes" : ""}`
   });
   if (changeClassification?.classification !== "breaking") return;
   const reasons = changeClassification.breakingChanges.map((bc) => `${"slotId" in bc ? bc.slotId : bc.propertyId}: ${bc.reason}`).join(", ");
-  lines.push({ key: `${keyPrefix}-b-${name}`, color: PALETTE4.error, text: ` \u26A0 BREAKING: ${reasons}` });
+  lines.push({ key: `${keyPrefix}-b-${name}`, color: PALETTE.error, text: ` \u26A0 BREAKING: ${reasons}` });
 }
 function buildPreviewDiffLines(preview) {
   const lines = [];
@@ -31535,12 +31440,12 @@ function buildPreviewDiffLines(preview) {
   for (const item of components.new) {
     const raw = item;
     const name = raw.key ?? raw.$name ?? "unknown";
-    lines.push({ key: `comp-new-${name}`, color: PALETTE4.success, text: ` + ${name}` });
+    lines.push({ key: `comp-new-${name}`, color: PALETTE.success, text: ` + ${name}` });
     const slots = raw.$slots ?? {};
     for (const slotName of Object.keys(slots).sort()) {
       lines.push({
         key: `comp-new-${name}-slot-${slotName}`,
-        color: PALETTE4.success,
+        color: PALETTE.success,
         text: `   slot: ${slotName}`
       });
       const allowed = slots[slotName]?.["$allowedComponents"];
@@ -31548,14 +31453,14 @@ function buildPreviewDiffLines(preview) {
         const names = allowed.filter((n) => typeof n === "string");
         lines.push({
           key: `comp-new-${name}-slot-${slotName}-allow`,
-          color: PALETTE4.success,
+          color: PALETTE.success,
           text: `     allowedComponents: [${names.join(", ")}]`
         });
       }
     }
   }
   for (const item of components.removed) {
-    lines.push({ key: `comp-rm-${item.name}`, color: PALETTE4.error, text: ` - ${item.name}` });
+    lines.push({ key: `comp-rm-${item.name}`, color: PALETTE.error, text: ` - ${item.name}` });
   }
   for (const item of components.changed) {
     appendChangedPreviewLine(lines, "comp", item.current.name, item.hasPendingDraftChanges, item.changeClassification);
@@ -31586,10 +31491,10 @@ function buildPreviewDiffLines(preview) {
   for (const item of tokens.new) {
     const raw = item;
     const name = raw.name ?? raw.path ?? "unknown";
-    lines.push({ key: `tok-new-${name}`, color: PALETTE4.success, text: ` + ${name}` });
+    lines.push({ key: `tok-new-${name}`, color: PALETTE.success, text: ` + ${name}` });
   }
   for (const item of tokens.removed) {
-    lines.push({ key: `tok-rm-${item.name}`, color: PALETTE4.error, text: ` - ${item.name}` });
+    lines.push({ key: `tok-rm-${item.name}`, color: PALETTE.error, text: ` - ${item.name}` });
   }
   for (const item of tokens.changed) {
     const tokenName = item.current.name;
@@ -31680,13 +31585,13 @@ function WizardPreviewStep({
           title: diffExpanded ? `Diff (${diffLines.length} lines)` : "",
           focused: false,
           children: [
-            activeLines.slice(boundedScrollOffset, boundedScrollOffset + viewportHeight).map((line) => /* @__PURE__ */ jsx51(Text43, { color: line.color === "gray" ? PALETTE4.muted : line.color, wrap: "truncate-end", children: line.text }, line.key)),
-            /* @__PURE__ */ jsx51(Text43, { color: PALETTE4.muted, wrap: "truncate-end", children: formatPreviewScrollIndicator(activeLines.length, boundedScrollOffset, viewportHeight) })
+            activeLines.slice(boundedScrollOffset, boundedScrollOffset + viewportHeight).map((line) => /* @__PURE__ */ jsx51(Text43, { color: line.color === "gray" ? PALETTE.muted : line.color, wrap: "truncate-end", children: line.text }, line.key)),
+            /* @__PURE__ */ jsx51(Text43, { color: PALETTE.muted, wrap: "truncate-end", children: formatPreviewScrollIndicator(activeLines.length, boundedScrollOffset, viewportHeight) })
           ]
         }
       )
-    ] }) : /* @__PURE__ */ jsx51(Text43, { color: PALETTE4.muted, children: "Nothing to push \u2014 everything is already up to date." }),
-    breakingWithImpact && /* @__PURE__ */ jsx51(Box40, { marginTop: 1, children: /* @__PURE__ */ jsx51(Text43, { color: PALETTE4.error, bold: true, children: "\u26A0 Breaking changes will affect downstream entities. Press Enter to acknowledge and apply." }) }),
+    ] }) : /* @__PURE__ */ jsx51(Text43, { color: PALETTE.muted, children: "Nothing to push \u2014 everything is already up to date." }),
+    breakingWithImpact && /* @__PURE__ */ jsx51(Box40, { marginTop: 1, children: /* @__PURE__ */ jsx51(Text43, { color: PALETTE.error, bold: true, children: "\u26A0 Breaking changes will affect downstream entities. Press Enter to acknowledge and apply." }) }),
     /* @__PURE__ */ jsx51(SpaceEnvironment, { spaceId, environmentId }),
     /* @__PURE__ */ jsxs41(Box40, { gap: 3, marginTop: 1, children: [
       /* @__PURE__ */ jsx51(Text43, { children: "[Enter] Push to Contentful" }),
@@ -31704,7 +31609,7 @@ function WizardPreviewStep({
 var init_WizardPreviewStep = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/10-flow/screens/WizardPreviewStep.tsx"() {
     "use strict";
-    init_theme4();
+    init_theme();
     init_useImmediateInput();
     init_use_terminal_size();
     init_src4();
@@ -32368,7 +32273,7 @@ var init_save = __esm({
       writeFile: (path5, contents) => writeFile7(path5, contents),
       appendRun,
       buildSourceFingerprint,
-      sleep: (ms) => new Promise((resolve28) => setTimeout(resolve28, ms)),
+      sleep: (ms) => new Promise((resolve27) => setTimeout(resolve27, ms)),
       warn: (message) => process.stderr.write(message)
     });
   }
@@ -32919,48 +32824,13 @@ var init_debug_store = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/tui/help/file-locations.ts
-import { join as join27, resolve as resolve27 } from "node:path";
-function describeFileLocations({
-  contentfulBaseDir,
-  debugModeEnabled,
-  currentSessionDir: currentSessionDir2
-}) {
-  if (!debugModeEnabled) {
-    return {
-      debugLogs: "none while Debug Mode is off",
-      importFiles: `${join27("<project>", ".contentful")}/ (tokens.json, components.json)`
-    };
-  }
-  const base = contentfulBaseDir ? resolve27(contentfulBaseDir) : "<project>";
-  const session = currentSessionDir2 ?? join27(base, ".contentful", "<date>-session-<n>");
-  return {
-    debugLogs: join27(session, "debug"),
-    importFiles: `${join27(session, "dsi-import-<n>")}/ (tokens.json, components.json)`
-  };
-}
-var init_file_locations = __esm({
-  "packages/experience-design-system-cli/src/tui/help/file-locations.ts"() {
-    "use strict";
-  }
-});
-
 // packages/experience-design-system-cli/src/tui/help/help-info.ts
 async function readHelpInfo() {
-  const [debugMode, settings] = await Promise.all([readDebugModeSetting(), readSettings2()]);
-  const base = settings["contentfulBaseDir"];
-  const locations = describeFileLocations({
-    contentfulBaseDir: typeof base === "string" ? base : "",
-    debugModeEnabled: debugMode.enabled,
-    currentSessionDir: currentSessionDir()
-  });
+  const debugMode = await readDebugModeSetting();
   return {
     storage: [
       { label: "Config folder", value: configRoot2() },
-      { label: "Settings file", value: configFilePath2() },
-      { label: "Agent settings", value: `${configFilePath2()} (keys: agent, agentModel, agents)` },
-      { label: "Debug logs", value: locations.debugLogs },
-      { label: "Import files", value: locations.importFiles }
+      { label: "Settings file", value: configFilePath2() }
     ],
     troubleshooting: [
       { label: "CLI version", value: readPackageVersion() },
@@ -32981,7 +32851,6 @@ var init_help_info = __esm({
     init_debug_store();
     init_debug_mode_store();
     init_version();
-    init_file_locations();
   }
 });
 
@@ -32993,7 +32862,7 @@ function Section({ title, rows }) {
   return /* @__PURE__ */ jsxs43(Box42, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx53(Text44, { bold: true, color: PALETTE.accent, children: title }),
     rows.map((row) => /* @__PURE__ */ jsxs43(Box42, { gap: 1, children: [
-      /* @__PURE__ */ jsx53(Box42, { width: 16, flexShrink: 0, children: /* @__PURE__ */ jsx53(Text44, { color: PALETTE.muted, children: row.label }) }),
+      /* @__PURE__ */ jsx53(Box42, { width: 14, flexShrink: 0, children: /* @__PURE__ */ jsx53(Text44, { color: PALETTE.muted, children: row.label }) }),
       /* @__PURE__ */ jsx53(Text44, { children: row.value })
     ] }, row.label))
   ] });
@@ -33039,7 +32908,7 @@ function HelpScreen({ onDone }) {
 var init_PageContainer2 = __esm({
   "packages/experience-design-system-cli/src/tui/help/PageContainer.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_debug_store();
     init_control_hints();
     init_help_info();
@@ -33082,8 +32951,8 @@ function SettingsScreen({
   });
   return /* @__PURE__ */ jsxs44(Box43, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsx54(Text45, { bold: true, children: "Settings" }),
-    /* @__PURE__ */ jsx54(Text45, { children: " " }),
-    items.map((item, i) => /* @__PURE__ */ jsxs44(Text45, { color: i === focusIdx ? "cyan" : void 0, children: [
+    /* @__PURE__ */ jsx54(Text45, { color: PALETTE.muted, children: " " }),
+    items.map((item, i) => /* @__PURE__ */ jsxs44(Text45, { color: i === focusIdx ? PALETTE.accent : void 0, children: [
       i === focusIdx ? "> " : "  ",
       item.label
     ] }, item.label)),
@@ -33104,671 +32973,181 @@ var init_PageContainer3 = __esm({
   "packages/experience-design-system-cli/src/tui/settings/PageContainer.tsx"() {
     "use strict";
     init_control_hints();
+    init_theme();
   }
 });
 
-// packages/experience-design-system-cli/src/tui/settings/agents/agent-status.ts
-import { execFile as execFile2 } from "node:child_process";
-import { access as access6, constants } from "node:fs/promises";
-function effectiveBinary(name, savedBinary) {
-  return savedBinary.trim() || AGENT_BINARIES[name];
-}
-function defaultModelLabel(name) {
-  const model = DEFAULT_MODELS[name];
-  return model && model !== "Auto" ? model : "chosen by the agent";
-}
-function resolveOnPath(binary) {
-  if (binary.includes("/")) {
-    return access6(binary, constants.X_OK).then(
-      () => binary,
-      () => null
-    );
-  }
-  return new Promise((resolve28) => {
-    execFile2(
-      process.platform === "win32" ? "where" : "which",
-      [binary],
-      (error, stdout) => resolve28(error ? null : stdout.split("\n")[0]?.trim() ?? null)
-    );
-  });
+// packages/experience-design-system-cli/src/tui/settings/contentful-configuration/config-store.ts
+async function readCredentials() {
+  const store = await readV1Store();
+  return {
+    spaceId: store.spaceId || "",
+    environmentId: store.environmentId || "",
+    cmaToken: store.cmaToken || "",
+    host: store.host || "",
+    defaultComponentDir: store.defaultComponentDir || "",
+    defaultTokenFile: store.defaultTokenFile || "",
+    contentfulBaseDir: store.contentfulBaseDir || ""
+  };
 }
-function readVersion(binary) {
-  return new Promise((resolve28) => {
-    execFile2(binary, ["--version"], { timeout: VERSION_TIMEOUT_MS }, (error, stdout) => {
-      const line = stdout.split("\n")[0]?.trim() ?? "";
-      if (!error && line) resolve28(pass("version", line));
-      else resolve28(fail3("version", "runs, but did not report a version"));
-    });
+async function writeCredentials(config) {
+  const existing = await readV1Store();
+  const merged = {
+    ...existing,
+    ...config
+  };
+  Object.keys(merged).forEach((k) => {
+    if (!merged[k]) delete merged[k];
   });
+  await writeV1Store(merged);
 }
-async function inspectAgent(name, binary) {
-  const target = effectiveBinary(name, binary);
-  const found = await resolveOnPath(target);
-  if (!found) return [fail3("path", `\`${target}\` was not found or is not executable`)];
-  const checks = [pass("path", found)];
-  checks.push(await readVersion(found));
-  if (name === "claude") {
-    const auth = await withBinaryEnv(name, found, () => checkAgentAuth(name));
-    checks.push(
-      auth === "ok" ? pass("login", "logged in") : fail3("login", auth === "not-found" ? "binary not found" : `not logged in: ${LOGIN_HINTS.claude}`)
-    );
-  }
-  return checks;
-}
-async function testAgent(name, binary, model) {
-  const checks = await inspectAgent(name, binary);
-  if (!checks.every((check) => check.step === "version" || check.ok)) return checks;
-  const target = effectiveBinary(name, binary);
-  const found = await resolveOnPath(target) ?? target;
-  const started = Date.now();
-  const result = await withBinaryEnv(
-    name,
-    found,
-    () => createLocalCliAgentInvoker().invoke({
-      agent: name,
-      ...model.trim() ? { model: model.trim() } : {},
-      prompt: TEST_PROMPT,
-      timeoutMs: PROMPT_TIMEOUT_MS
-    })
-  );
-  const seconds = ((Date.now() - started) / 1e3).toFixed(1);
-  if (result.timedOut) return [...checks, fail3("prompt", `no answer within ${PROMPT_TIMEOUT_MS / 1e3}s`)];
-  if (result.exitCode !== 0) {
-    const reason = result.stderr.trim().split("\n").pop()?.slice(0, 160) || `exited with code ${result.exitCode}`;
-    return [...checks, fail3("prompt", reason)];
-  }
-  return [...checks, pass("prompt", `answered in ${seconds}s`)];
-}
-function statusFromChecks(name, checks, savedBinary) {
-  if (checks.length === 0) return "checking";
-  if (checks.some((check) => check.step === "path" && !check.ok)) {
-    return savedBinary.trim() ? "not-found" : "not-configured";
-  }
-  const login = checks.find((check) => check.step === "login");
-  if (login) return login.ok ? "ready" : "not-logged-in";
-  const prompt = checks.find((check) => check.step === "prompt");
-  if (prompt) return prompt.ok ? "ready" : "not-logged-in";
-  return name === "claude" ? "ready" : "unknown";
-}
-function setupHint(name, status) {
-  if (status === "not-configured") return `${INSTALL_HINTS[name]}, or set its command path in settings`;
-  if (status === "not-found") return `${INSTALL_HINTS[name]}, or correct the command path in settings`;
-  if (status === "not-logged-in") return LOGIN_HINTS[name];
-  if (status === "unknown") return "run a full test to confirm it is logged in";
-  return "";
-}
-function modelLine(name, savedModel) {
-  const model = savedModel.trim();
-  return model ? model : `${defaultModelLabel(name)} (built-in default)`;
-}
-function panelRows(name, checks, settings) {
-  if (!checks) return [{ label: "Command", value: "checking...", tone: "muted" }];
-  const status = statusFromChecks(name, checks, settings.binary);
-  const path5 = checks.find((check) => check.step === "path");
-  if (!path5?.ok) {
-    const rows2 = [
-      {
-        label: "Command",
-        value: settings.binary.trim() ? path5?.detail ?? "not found" : "not found on your PATH",
-        tone: settings.binary.trim() ? "bad" : "muted"
-      }
-    ];
-    const hint2 = setupHint(name, status);
-    if (hint2) rows2.push({ label: "Setup", value: hint2, tone: "muted" });
-    return rows2;
-  }
-  const rows = [{ label: "Command", value: path5.detail, tone: "ok" }];
-  const version = checks.find((check) => check.step === "version");
-  if (version?.ok) rows.push({ label: "Version", value: version.detail, tone: "ok" });
-  rows.push({ label: "Model", value: modelLine(name, settings.model), tone: "muted" });
-  const hint = setupHint(name, status);
-  if (hint) rows.push({ label: "Setup", value: hint, tone: "muted" });
-  return rows;
-}
-function statusRows(_name, checks, savedBinary) {
-  if (!checks) return [{ label: "Command", value: "checking...", tone: "muted" }];
-  const find = (step) => checks.find((check) => check.step === step);
-  const path5 = find("path");
-  if (!path5?.ok) {
-    if (savedBinary.trim()) return [{ label: "Command", value: path5?.detail ?? "not found", tone: "bad" }];
-    return [{ label: "Command", value: "not configured (not on the PATH)", tone: "muted" }];
-  }
-  const rows = [{ label: "Command", value: path5.detail, tone: "ok" }];
-  const version = find("version");
-  if (version) {
-    rows.push({
-      label: "Version",
-      value: version.ok ? version.detail : "could not be read",
-      tone: version.ok ? "ok" : "muted"
-    });
-  }
-  const login = find("login");
-  const prompt = find("prompt");
-  if (login) {
-    rows.push({ label: "Login", value: login.detail, tone: login.ok ? "ok" : "bad" });
-  } else if (prompt) {
-    rows.push({
-      label: "Login",
-      value: prompt.ok ? "confirmed by the test" : "see the test result",
-      tone: prompt.ok ? "ok" : "bad"
-    });
-  } else {
-    rows.push({ label: "Login", value: "not checked (use Run test)", tone: "muted" });
-  }
-  if (prompt) rows.push({ label: "Test", value: prompt.detail, tone: prompt.ok ? "ok" : "bad" });
-  return rows;
-}
-async function withBinaryEnv(name, binary, run) {
-  const key = `EDS_AGENT_BINARY_${name.toUpperCase()}`;
-  const previous = process.env[key];
-  process.env[key] = binary;
-  try {
-    return await run();
-  } finally {
-    if (previous === void 0) delete process.env[key];
-    else process.env[key] = previous;
-  }
-}
-var VERSION_TIMEOUT_MS, PROMPT_TIMEOUT_MS, TEST_PROMPT, INSTALL_HINTS, LOGIN_HINTS, fail3, pass, LIST_STATUS;
-var init_agent_status = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/agents/agent-status.ts"() {
-    "use strict";
-    init_src4();
-    VERSION_TIMEOUT_MS = 5e3;
-    PROMPT_TIMEOUT_MS = 6e4;
-    TEST_PROMPT = "Reply with the single word: ok";
-    INSTALL_HINTS = {
-      claude: "npm install -g @anthropic-ai/claude-code",
-      codex: "npm install -g @openai/codex",
-      opencode: "npm install -g opencode-ai",
-      cursor: "install Cursor\u2019s `cursor-agent` command",
-      copilot: "npm install -g @github/copilot"
-    };
-    LOGIN_HINTS = {
-      claude: "run `claude login`",
-      codex: "set OPENAI_API_KEY, or sign in with a ChatGPT account",
-      opencode: "run `opencode auth`",
-      cursor: "sign in from Cursor",
-      copilot: "run `copilot` and sign in"
-    };
-    fail3 = (step, detail) => ({ step, ok: false, detail });
-    pass = (step, detail) => ({ step, ok: true, detail });
-    LIST_STATUS = {
-      checking: { symbol: "\u2026", text: "checking", tone: "muted" },
-      ready: { symbol: "\u25CF", text: "ready", tone: "ok" },
-      "not-configured": { symbol: "\u25CB", text: "not installed", tone: "muted" },
-      "not-found": { symbol: "\u25CB", text: "not installed", tone: "bad" },
-      "not-logged-in": { symbol: "\u25D0", text: "not logged in", tone: "bad" },
-      unknown: { symbol: "\u25D0", text: "installed, login unknown", tone: "muted" }
-    };
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/agents/AgentStatusBadge.tsx
-import { Text as Text46 } from "ink";
-import { jsx as jsx55 } from "react/jsx-runtime";
-function AgentStatusBadge({
-  name,
-  checks,
-  binary
-}) {
-  const { symbol, text, tone } = LIST_STATUS[checks ? statusFromChecks(name, checks, binary) : "checking"];
-  return /* @__PURE__ */ jsx55(Text46, { color: TONE_COLOR[tone], children: `${symbol} ${text}` });
-}
-var TONE_COLOR;
-var init_AgentStatusBadge = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/agents/AgentStatusBadge.tsx"() {
+var init_config_store = __esm({
+  "packages/experience-design-system-cli/src/tui/settings/contentful-configuration/config-store.ts"() {
     "use strict";
-    init_home_theme();
-    init_agent_status();
-    TONE_COLOR = {
-      ok: PALETTE.success,
-      bad: PALETTE.error,
-      muted: PALETTE.muted
-    };
+    init_v1_store();
   }
 });
 
-// packages/experience-design-system-cli/src/tui/settings/agents/AgentDetail.tsx
+// packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
 import { useEffect as useEffect22, useState as useState29 } from "react";
-import { Box as Box44, Text as Text47, useInput as useInput11 } from "ink";
+import { Box as Box44, Text as Text46, useInput as useInput11 } from "ink";
 import TextInput4 from "ink-text-input";
-import { Fragment as Fragment17, jsx as jsx56, jsxs as jsxs45 } from "react/jsx-runtime";
-function Section2({
-  title,
-  note,
-  interactive = false,
-  children
-}) {
-  return /* @__PURE__ */ jsxs45(Box44, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsxs45(Box44, { gap: 1, children: [
-      /* @__PURE__ */ jsx56(Text47, { bold: true, color: interactive ? PALETTE.accent : PALETTE.muted, children: title }),
-      /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: `\xB7 ${note}` })
-    ] }),
-    children
-  ] });
-}
-function AgentDetail({
-  name,
-  config,
-  setConfig,
-  onBack
-}) {
-  const settings = config.agents[name];
-  const [focusIndex, setFocusIndex] = useState29(0);
-  const [editing, setEditing] = useState29(false);
-  const [valueBeforeEdit, setValueBeforeEdit] = useState29("");
-  const [saving, setSaving] = useState29(false);
-  const [testing, setTesting] = useState29(false);
-  const [notice, setNotice] = useState29(null);
-  const [checks, setChecks] = useState29(void 0);
-  useEffect22(() => {
-    let active = true;
-    setChecks(void 0);
-    void inspectAgent(name, settings.binary).then((result) => active && setChecks(result));
-    return () => {
-      active = false;
-    };
-  }, [name, settings.binary]);
-  const setField = (field, value) => {
-    setConfig({ ...config, agents: { ...config.agents, [name]: { ...settings, [field]: value } } });
-    setNotice(null);
-  };
-  const save = () => {
-    setSaving(true);
-    setNotice(null);
-    writeAgentConfig(config).then(() => {
-      applyBinaryOverrides(config);
-      setNotice({ kind: "success", text: `${AGENT_LABELS[name]} settings saved` });
-    }).catch(
-      (err) => setNotice({ kind: "error", text: err instanceof Error ? err.message : "Failed to save" })
-    ).finally(() => setSaving(false));
-  };
-  const runTest = () => {
-    setTesting(true);
-    setNotice(null);
-    setChecks(void 0);
-    testAgent(name, settings.binary, settings.model).then(setChecks).catch(
-      (err) => setNotice({ kind: "error", text: err instanceof Error ? err.message : "The test could not run" })
-    ).finally(() => setTesting(false));
+import { Fragment as Fragment17, jsx as jsx55, jsxs as jsxs45 } from "react/jsx-runtime";
+function debugFields(config) {
+  return {
+    space_id: config?.spaceId ?? "",
+    environment_id: config?.environmentId ?? "",
+    cma_token: config?.cmaToken ?? "",
+    host: config?.host ?? "",
+    default_component_dir: config?.defaultComponentDir ?? "",
+    default_token_file: config?.defaultTokenFile ?? "",
+    contentful_base_dir: config?.contentfulBaseDir ?? ""
   };
-  const focused = FOCUS_ORDER[focusIndex];
-  const focusedField = focused === "test" ? null : focused;
-  useInput11((input, key) => {
-    if (saving || testing) return;
-    if (editing) {
-      if (key.escape && focusedField) {
-        setField(focusedField, valueBeforeEdit);
-        setEditing(false);
-      }
-      return;
-    }
-    if (key.escape || input === "q") {
-      onBack();
-      return;
-    }
-    if (input === "s") {
-      save();
-      return;
-    }
-    if (key.upArrow) {
-      setFocusIndex((i) => (i - 1 + FOCUS_ORDER.length) % FOCUS_ORDER.length);
-      return;
-    }
-    if (key.downArrow || key.tab) {
-      setFocusIndex((i) => (i + 1) % FOCUS_ORDER.length);
-      return;
-    }
-    if (input === "c" && focusedField) {
-      setField(focusedField, "");
-      return;
-    }
-    if (key.return) {
-      if (focusedField) {
-        setValueBeforeEdit(settings[focusedField]);
-        setEditing(true);
-      } else {
-        runTest();
-      }
-    }
-  });
-  const status = checks ? statusFromChecks(name, checks, settings.binary) : "checking";
-  const hint = setupHint(name, status);
-  const pointer = (isFocused) => /* @__PURE__ */ jsx56(Text47, { color: isFocused ? PALETTE.accent : void 0, children: isFocused ? "\u276F" : " " });
-  return /* @__PURE__ */ jsxs45(Box44, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx56(Text47, { bold: true, children: AGENT_LABELS[name] }),
-    /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: config.defaultAgent === name ? "This is the default agent." : `Runs the \`${AGENT_HINTS[name]}\` command.` }),
-    /* @__PURE__ */ jsxs45(Section2, { title: "CONFIGURE", note: "you can change these", interactive: true, children: [
-      FIELDS2.map((field) => {
-        const isFocused = focused === field;
-        const value = settings[field];
-        return /* @__PURE__ */ jsxs45(Box44, { gap: 1, children: [
-          pointer(isFocused),
-          /* @__PURE__ */ jsx56(Box44, { width: LABEL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx56(Text47, { bold: isFocused, color: isFocused ? PALETTE.accent : PALETTE.muted, children: FIELD_LABEL[field] }) }),
-          isFocused && editing ? /* @__PURE__ */ jsx56(
-            TextInput4,
-            {
-              value,
-              onChange: (next) => setField(field, next),
-              onSubmit: () => setEditing(false)
-            }
-          ) : /* @__PURE__ */ jsx56(Text47, { bold: true, children: value }),
-          !value && /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: fieldHint(name, field) })
-        ] }, field);
-      }),
-      /* @__PURE__ */ jsxs45(Box44, { gap: 1, children: [
-        pointer(focused === "test"),
-        /* @__PURE__ */ jsx56(Box44, { width: LABEL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx56(Text47, { bold: focused === "test", color: focused === "test" ? PALETTE.accent : PALETTE.muted, children: "Run test" }) }),
-        /* @__PURE__ */ jsx56(Text47, { color: testing ? PALETTE.accent : PALETTE.muted, children: testing ? "running..." : "sends one small prompt (uses a few tokens)" })
-      ] })
-    ] }),
-    /* @__PURE__ */ jsxs45(Section2, { title: "STATUS", note: "read only", children: [
-      statusRows(name, checks, settings.binary).map((row) => /* @__PURE__ */ jsxs45(Box44, { gap: 1, paddingLeft: 2, children: [
-        /* @__PURE__ */ jsx56(Box44, { width: LABEL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: row.label }) }),
-        /* @__PURE__ */ jsx56(Text47, { color: TONE_COLOR[row.tone], children: row.value })
-      ] }, row.label)),
-      hint && /* @__PURE__ */ jsx56(Box44, { paddingLeft: 2, children: /* @__PURE__ */ jsxs45(Text47, { color: PALETTE.muted, children: [
-        "Setup: ",
-        hint
-      ] }) })
-    ] }),
-    notice && /* @__PURE__ */ jsxs45(Fragment17, { children: [
-      /* @__PURE__ */ jsx56(Text47, { children: " " }),
-      /* @__PURE__ */ jsxs45(Text47, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
-        notice.kind === "success" ? "\u2713" : "\u2717",
-        " ",
-        notice.text
-      ] })
-    ] }),
-    /* @__PURE__ */ jsx56(Text47, { children: " " }),
-    /* @__PURE__ */ jsx56(
-      ControlHints,
-      {
-        hints: editing ? [
-          { keys: "type", label: "edit" },
-          { keys: "\u2190/\u2192", label: "move cursor" },
-          { keys: "\u23CE", label: "done" },
-          { keys: "Esc", label: "cancel edit" }
-        ] : [
-          { keys: "\u2191/\u2193", label: "move" },
-          { keys: "\u23CE", label: focusedField ? "edit" : "run test" },
-          ...focusedField ? [{ keys: "c", label: "clear" }] : [],
-          { keys: "s", label: "save" },
-          { keys: "Esc/q", label: "back without saving" }
-        ]
-      }
-    )
-  ] });
 }
-var FOCUS_ORDER, FIELDS2, FIELD_LABEL, LABEL_WIDTH, fieldHint;
-var init_AgentDetail = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/agents/AgentDetail.tsx"() {
-    "use strict";
-    init_home_theme();
-    init_control_hints();
-    init_agent_store();
-    init_agent_status();
-    init_AgentStatusBadge();
-    init_apply_binary_overrides();
-    FOCUS_ORDER = ["binary", "model", "test"];
-    FIELDS2 = ["binary", "model"];
-    FIELD_LABEL = { binary: "Command path", model: "Model" };
-    LABEL_WIDTH = "Command path".length;
-    fieldHint = (name, field) => field === "binary" ? `(empty: \`${AGENT_HINTS[name]}\` from the PATH)` : `(empty: ${defaultModelLabel(name)})`;
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/agents/AgentScreens.tsx
-import { useEffect as useEffect23, useState as useState30 } from "react";
-import { Box as Box45, Text as Text48, useInput as useInput12 } from "ink";
-import { Fragment as Fragment18, jsx as jsx57, jsxs as jsxs46 } from "react/jsx-runtime";
-function AgentsScreen({ onDone }) {
-  const [config, setConfig] = useState30(null);
-  const [focus, setFocus] = useState30(0);
-  const [open, setOpen] = useState30(null);
-  const [notice, setNotice] = useState30(null);
-  const [checks, setChecks] = useState30({});
-  const inspectAll = (loaded) => {
-    for (const name of AGENT_NAMES) {
-      void inspectAgent(name, loaded.agents[name].binary).then(
-        (result) => setChecks((previous) => ({ ...previous, [name]: result }))
-      );
-    }
-  };
-  useEffect23(() => {
-    void readAgentConfig().then((loaded) => {
-      setConfig(loaded);
-      inspectAll(loaded);
+function ConfigurationScreen({ onDone }) {
+  const [stage, setStage] = useState29("loading");
+  const [config, setConfig] = useState29(null);
+  const [activeField, setActiveField] = useState29("spaceId");
+  const [notice, setNotice] = useState29(null);
+  const [lastSaved, setLastSaved] = useState29(null);
+  const [editing, setEditing] = useState29(false);
+  const [valueBeforeEdit, setValueBeforeEdit] = useState29("");
+  useEffect22(() => {
+    readCredentials().then((cfg) => {
+      setConfig(cfg);
+      setStage("form");
       startDebugRun({
-        flow: "settings/agents",
-        step: "01-agents",
-        menuOption: "Configuration > Agents",
-        inputs: { default_agent: loaded.defaultAgent }
+        flow: "settings/contentful-configuration",
+        step: "01-configuration",
+        menuOption: "Configuration",
+        inputs: debugFields(cfg)
       });
     });
   }, []);
-  const makeDefault = (name) => {
+  function fieldValue(field) {
+    if (!config) return "";
+    return config[field] || "";
+  }
+  function setFieldValue(field, value) {
     if (!config) return;
-    if (name === config.defaultAgent) {
-      setNotice({ kind: "success", text: `${AGENT_LABELS[name]} is already the default agent` });
-      return;
-    }
-    const next = { ...config, defaultAgent: name };
-    setConfig(next);
-    writeAgentConfig(next).then(() => setNotice({ kind: "success", text: `Default agent is now ${AGENT_LABELS[name]}` })).catch(
-      (err) => setNotice({ kind: "error", text: err instanceof Error ? err.message : "Failed to save" })
-    );
-  };
-  useInput12((input, key) => {
-    if (!config || open) return;
-    const focused = AGENT_NAMES[focus];
-    if (key.upArrow || key.downArrow || key.tab) setNotice(null);
-    if (key.upArrow) {
-      setFocus((i) => (i - 1 + AGENT_NAMES.length) % AGENT_NAMES.length);
-      return;
-    }
-    if (key.downArrow || key.tab) {
-      setFocus((i) => (i + 1) % AGENT_NAMES.length);
-      return;
-    }
-    if (key.return) {
-      makeDefault(focused);
-      return;
-    }
-    if (key.rightArrow) {
-      setNotice(null);
-      setOpen(focused);
-      return;
-    }
-    if (key.escape || input === "q") {
-      void finishDebugRun({ outputs: { default_agent: config.defaultAgent }, status: "success", exitMethod: "saved" });
-      onDone();
-    }
-  });
-  if (!config) {
-    return /* @__PURE__ */ jsxs46(Box45, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx57(Text48, { bold: true, children: "Agents" }),
-      /* @__PURE__ */ jsx57(Text48, { children: " " }),
-      /* @__PURE__ */ jsx57(Text48, { color: PALETTE.accent, children: "Loading..." })
-    ] });
+    setConfig({ ...config, [field]: value });
+    setNotice(null);
   }
-  if (open) {
-    return /* @__PURE__ */ jsx57(
-      AgentDetail,
-      {
-        name: open,
-        config,
-        setConfig,
-        onBack: () => {
-          setOpen(null);
-          void readAgentConfig().then((saved) => {
-            setConfig(saved);
-            inspectAll(saved);
-          });
-        }
-      }
-    );
+  function handleSave() {
+    if (!config) return;
+    setStage("saving");
+    setNotice(null);
+    writeCredentials(config).then(() => {
+      setLastSaved(config);
+      if (config.contentfulBaseDir) void startDebugSessionIn(config.contentfulBaseDir, { replace: true });
+      setNotice({ kind: "success", text: "Configuration saved" });
+      setStage("form");
+    }).catch((err) => {
+      setNotice({ kind: "error", text: err instanceof Error ? err.message : "Failed to save" });
+      setStage("form");
+    });
   }
-  const focusedAgent = AGENT_NAMES[focus];
-  return /* @__PURE__ */ jsxs46(Box45, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx57(Text48, { bold: true, children: "Agents" }),
-    /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: "The coding agent the CLI runs, and what was found for each one." }),
-    /* @__PURE__ */ jsx57(Text48, { children: " " }),
-    /* @__PURE__ */ jsxs46(Box45, { gap: 1, children: [
-      /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: "Default agent" }),
-      /* @__PURE__ */ jsx57(Text48, { bold: true, children: AGENT_LABELS[config.defaultAgent] })
-    ] }),
-    /* @__PURE__ */ jsxs46(Box45, { marginTop: 1, gap: 1, children: [
-      /* @__PURE__ */ jsx57(Text48, { children: " " }),
-      /* @__PURE__ */ jsx57(Text48, { children: " " }),
-      /* @__PURE__ */ jsx57(Box45, { width: NAME_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: "AGENT" }) }),
-      /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: "STATUS" })
-    ] }),
-    AGENT_NAMES.map((name) => {
-      const isFocused = focusedAgent === name;
-      return /* @__PURE__ */ jsxs46(Box45, { gap: 1, children: [
-        /* @__PURE__ */ jsx57(Text48, { color: isFocused ? PALETTE.accent : void 0, children: isFocused ? "\u276F" : " " }),
-        /* @__PURE__ */ jsx57(Text48, { color: PALETTE.success, children: name === config.defaultAgent ? "\u2605" : " " }),
-        /* @__PURE__ */ jsx57(Box45, { width: NAME_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx57(Text48, { bold: isFocused, color: isFocused ? PALETTE.accent : void 0, children: AGENT_LABELS[name] }) }),
-        /* @__PURE__ */ jsx57(AgentStatusBadge, { name, checks: checks[name], binary: config.agents[name].binary })
-      ] }, name);
-    }),
-    /* @__PURE__ */ jsxs46(Box45, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: `\u2500 ${AGENT_LABELS[focusedAgent]} ${"\u2500".repeat(30)}` }),
-      panelRows(focusedAgent, checks[focusedAgent], config.agents[focusedAgent]).map((row) => /* @__PURE__ */ jsxs46(Box45, { gap: 1, paddingLeft: 1, children: [
-        /* @__PURE__ */ jsx57(Box45, { width: PANEL_LABEL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: row.label }) }),
-        /* @__PURE__ */ jsx57(Text48, { color: TONE_COLOR[row.tone], children: row.value })
-      ] }, row.label))
-    ] }),
-    notice && /* @__PURE__ */ jsxs46(Fragment18, { children: [
-      /* @__PURE__ */ jsx57(Text48, { children: " " }),
-      /* @__PURE__ */ jsxs46(Text48, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
-        notice.kind === "success" ? "\u2713" : "\u2717",
-        " ",
-        notice.text
-      ] })
-    ] }),
-    /* @__PURE__ */ jsx57(Text48, { children: " " }),
-    /* @__PURE__ */ jsx57(
-      ControlHints,
-      {
-        hints: [
-          { keys: "\u2191/\u2193", label: "move" },
-          { keys: "\u23CE", label: "make default" },
-          { keys: "\u2192", label: "settings and test" },
-          { keys: "Esc/q", label: "back" }
-        ]
-      }
-    )
-  ] });
-}
-var NAME_WIDTH, PANEL_LABEL_WIDTH;
-var init_AgentScreens = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/agents/AgentScreens.tsx"() {
-    "use strict";
-    init_src4();
-    init_home_theme();
-    init_control_hints();
-    init_debug_store();
-    init_agent_store();
-    init_agent_status();
-    init_AgentDetail();
-    init_AgentStatusBadge();
-    NAME_WIDTH = 16;
-    PANEL_LABEL_WIDTH = "Command".length;
+  function quit() {
+    void finishDebugRun(
+      lastSaved ? { outputs: debugFields(lastSaved), status: "success", exitMethod: "saved" } : { outputs: {}, status: "success", exitMethod: "discarded" }
+    );
+    onDone();
   }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/shared/FieldForm.tsx
-import { useState as useState31 } from "react";
-import { Box as Box46, Text as Text49, useInput as useInput13 } from "ink";
-import TextInput5 from "ink-text-input";
-import { Fragment as Fragment19, jsx as jsx58, jsxs as jsxs47 } from "react/jsx-runtime";
-function FieldForm({
-  title,
-  subtitle,
-  fields,
-  values,
-  onChange,
-  onSave,
-  onQuit,
-  notice,
-  busy = false,
-  footer
-}) {
-  const [active, setActive] = useState31(0);
-  const [editing, setEditing] = useState31(false);
-  const [valueBeforeEdit, setValueBeforeEdit] = useState31("");
-  const labelWidth = Math.max(...fields.map((field) => field.label.length));
-  const current = fields[active];
-  useInput13((input, key) => {
-    if (busy) return;
+  useInput11((input, key) => {
+    if (stage === "loading" || stage === "saving") return;
     if (editing) {
       if (key.escape) {
-        onChange(current.key, valueBeforeEdit);
+        setFieldValue(activeField, valueBeforeEdit);
         setEditing(false);
       }
       return;
     }
     if (key.escape || input === "q") {
-      onQuit();
+      quit();
       return;
     }
     if (input === "s") {
-      onSave();
+      handleSave();
       return;
     }
     if (input === "c") {
-      onChange(current.key, "");
+      setFieldValue(activeField, "");
       return;
     }
     if (key.tab || key.downArrow) {
-      setActive((i) => (i + 1) % fields.length);
+      const idx = FIELD_ORDER.indexOf(activeField);
+      setActiveField(FIELD_ORDER[(idx + 1) % FIELD_ORDER.length]);
       return;
     }
     if (key.upArrow) {
-      setActive((i) => (i - 1 + fields.length) % fields.length);
+      const idx = FIELD_ORDER.indexOf(activeField);
+      setActiveField(FIELD_ORDER[(idx - 1 + FIELD_ORDER.length) % FIELD_ORDER.length]);
       return;
     }
     if (key.return) {
-      setValueBeforeEdit(values[current.key]);
+      setValueBeforeEdit(fieldValue(activeField));
       setEditing(true);
     }
   });
-  return /* @__PURE__ */ jsxs47(Box46, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx58(Text49, { bold: true, children: title }),
-    subtitle && /* @__PURE__ */ jsx58(Text49, { color: PALETTE.muted, children: subtitle }),
-    /* @__PURE__ */ jsx58(Text49, { children: " " }),
-    /* @__PURE__ */ jsx58(Box46, { flexDirection: "column", children: fields.map((field, index) => {
-      const isActive = index === active;
-      const value = values[field.key];
-      const display = field.masked ? "\u2022".repeat(value.length) : value;
-      return /* @__PURE__ */ jsxs47(Box46, { gap: 1, children: [
-        /* @__PURE__ */ jsx58(Text49, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
-        /* @__PURE__ */ jsx58(Box46, { width: labelWidth, flexShrink: 0, children: /* @__PURE__ */ jsx58(Text49, { bold: isActive, color: isActive ? PALETTE.accent : PALETTE.muted, children: field.label }) }),
-        isActive && editing ? /* @__PURE__ */ jsx58(
-          TextInput5,
+  if (stage === "loading") {
+    return /* @__PURE__ */ jsxs45(Box44, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+      /* @__PURE__ */ jsx55(Text46, { bold: true, children: "Configuration" }),
+      /* @__PURE__ */ jsx55(Text46, { children: " " }),
+      /* @__PURE__ */ jsx55(Text46, { color: PALETTE.accent, children: "Loading..." })
+    ] });
+  }
+  return /* @__PURE__ */ jsxs45(Box44, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx55(Text46, { bold: true, children: "Configuration" }),
+    /* @__PURE__ */ jsx55(Text46, { children: " " }),
+    /* @__PURE__ */ jsx55(Box44, { flexDirection: "column", children: FIELD_ORDER.map((field) => {
+      const isActive = activeField === field;
+      const value = fieldValue(field);
+      const display = field === "cmaToken" ? "\u2022".repeat(value.length) : value;
+      return /* @__PURE__ */ jsxs45(Box44, { gap: 1, children: [
+        /* @__PURE__ */ jsx55(Text46, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
+        /* @__PURE__ */ jsx55(Box44, { width: LABEL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx55(Text46, { bold: isActive, color: isActive ? PALETTE.accent : PALETTE.muted, children: FIELD_LABELS[field] }) }),
+        isActive && editing ? /* @__PURE__ */ jsx55(
+          TextInput4,
           {
             value,
-            onChange: (next) => onChange(field.key, next),
+            onChange: (next) => setFieldValue(field, next),
             onSubmit: () => setEditing(false),
-            mask: field.masked ? "\u2022" : void 0
+            mask: field === "cmaToken" ? "\u2022" : void 0
           }
-        ) : /* @__PURE__ */ jsx58(Text49, { bold: !!display, children: display || (field.hint ? "" : /* @__PURE__ */ jsx58(Text49, { color: PALETTE.muted, children: "(empty)" })) }),
-        field.hint && /* @__PURE__ */ jsx58(Text49, { color: PALETTE.muted, children: field.hint })
-      ] }, field.key);
+        ) : /* @__PURE__ */ jsx55(Text46, { bold: !!display, children: display || (FIELD_HINTS[field] ? "" : /* @__PURE__ */ jsx55(Text46, { color: PALETTE.muted, children: "(empty)" })) }),
+        FIELD_HINTS[field] && /* @__PURE__ */ jsx55(Text46, { color: PALETTE.muted, children: FIELD_HINTS[field] })
+      ] }, field);
     }) }),
-    notice && /* @__PURE__ */ jsxs47(Fragment19, { children: [
-      /* @__PURE__ */ jsx58(Text49, { children: " " }),
-      /* @__PURE__ */ jsxs47(Text49, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
+    notice && /* @__PURE__ */ jsxs45(Fragment17, { children: [
+      /* @__PURE__ */ jsx55(Text46, { children: " " }),
+      /* @__PURE__ */ jsxs45(Text46, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
         notice.kind === "success" ? "\u2713" : "\u2717",
         " ",
         notice.text
       ] })
     ] }),
-    footer,
-    /* @__PURE__ */ jsx58(Text49, { children: " " }),
-    /* @__PURE__ */ jsx58(
+    /* @__PURE__ */ jsx55(Text46, { children: " " }),
+    /* @__PURE__ */ jsx55(
       ControlHints,
       {
         hints: editing ? [
@@ -33781,219 +33160,53 @@ function FieldForm({
           { keys: "\u23CE", label: "edit" },
           { keys: "c", label: "clear" },
           { keys: "s", label: "save" },
-          { keys: "Esc/q", label: "back without saving" }
+          { keys: "Esc/q", label: "quit without saving" }
         ]
       }
     )
   ] });
 }
-var init_FieldForm = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/shared/FieldForm.tsx"() {
-    "use strict";
-    init_home_theme();
-    init_control_hints();
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/contentful-configuration/config-store.ts
-async function readCredentials() {
-  const store = await readV1Store();
-  return {
-    spaceId: store.spaceId || "",
-    environmentId: store.environmentId || "",
-    cmaToken: store.cmaToken || "",
-    host: store.host || "",
-    defaultComponentDir: store.defaultComponentDir || "",
-    defaultTokenFile: store.defaultTokenFile || "",
-    contentfulBaseDir: store.contentfulBaseDir || ""
-  };
-}
-async function writeCredentials(config) {
-  const existing = await readV1Store();
-  const merged = {
-    ...existing,
-    ...config
-  };
-  Object.keys(merged).forEach((k) => {
-    if (!merged[k]) delete merged[k];
-  });
-  await writeV1Store(merged);
-}
-var init_config_store = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/contentful-configuration/config-store.ts"() {
-    "use strict";
-    init_v1_store();
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ProjectConfigScreen.tsx
-import { useEffect as useEffect24, useState as useState32 } from "react";
-import { Box as Box47, Text as Text50 } from "ink";
-import { jsx as jsx59, jsxs as jsxs48 } from "react/jsx-runtime";
-function debugFields(config) {
-  return {
-    space_id: config?.spaceId ?? "",
-    environment_id: config?.environmentId ?? "",
-    cma_token: config?.cmaToken ?? "",
-    host: config?.host ?? "",
-    default_component_dir: config?.defaultComponentDir ?? "",
-    default_token_file: config?.defaultTokenFile ?? "",
-    contentful_base_dir: config?.contentfulBaseDir ?? ""
-  };
-}
-function ProjectConfigScreen({ onDone }) {
-  const [config, setConfig] = useState32(null);
-  const [saving, setSaving] = useState32(false);
-  const [notice, setNotice] = useState32(null);
-  const [lastSaved, setLastSaved] = useState32(null);
-  useEffect24(() => {
-    void readCredentials().then((cfg) => {
-      setConfig(cfg);
-      startDebugRun({
-        flow: "settings/contentful-configuration",
-        step: "01-configuration",
-        menuOption: "Configuration > Project",
-        inputs: debugFields(cfg)
-      });
-    });
-  }, []);
-  if (!config) {
-    return /* @__PURE__ */ jsxs48(Box47, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx59(Text50, { bold: true, children: "Project" }),
-      /* @__PURE__ */ jsx59(Text50, { children: " " }),
-      /* @__PURE__ */ jsx59(Text50, { color: PALETTE.accent, children: "Loading..." })
-    ] });
-  }
-  const save = () => {
-    setSaving(true);
-    setNotice(null);
-    writeCredentials(config).then(() => {
-      setLastSaved(config);
-      if (config.contentfulBaseDir) void startDebugSessionIn(config.contentfulBaseDir, { replace: true });
-      setNotice({ kind: "success", text: "Project settings saved" });
-    }).catch((err) => {
-      setNotice({ kind: "error", text: err instanceof Error ? err.message : "Failed to save" });
-    }).finally(() => setSaving(false));
-  };
-  const quit = () => {
-    void finishDebugRun(
-      lastSaved ? { outputs: debugFields(lastSaved), status: "success", exitMethod: "saved" } : { outputs: {}, status: "success", exitMethod: "discarded" }
-    );
-    onDone();
-  };
-  return /* @__PURE__ */ jsx59(
-    FieldForm,
-    {
-      title: "Project",
-      subtitle: "The Contentful space and where the CLI keeps its files.",
-      fields: FIELDS3,
-      values: valuesOf(config),
-      onChange: (key, value) => {
-        setConfig({ ...config, [key]: value });
-        setNotice(null);
-      },
-      onSave: save,
-      onQuit: quit,
-      notice,
-      busy: saving
-    }
-  );
-}
-var FIELDS3, valuesOf;
-var init_ProjectConfigScreen = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ProjectConfigScreen.tsx"() {
-    "use strict";
-    init_home_theme();
-    init_debug_store();
-    init_FieldForm();
-    init_config_store();
-    FIELDS3 = [
-      { key: "spaceId", label: "Space ID" },
-      { key: "environmentId", label: "Environment ID" },
-      { key: "cmaToken", label: "CMA Token", masked: true },
-      { key: "host", label: "API Host" },
-      { key: "defaultComponentDir", label: "Default component directory" },
-      { key: "defaultTokenFile", label: "Default token file" },
-      { key: "contentfulBaseDir", label: "Root Project Directory", hint: "(where .contentful goes)" }
-    ];
-    valuesOf = (config) => Object.fromEntries(FIELDS3.map(({ key }) => [key, config[key] || ""]));
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
-import { useState as useState33 } from "react";
-import { Box as Box48, Text as Text51, useInput as useInput14 } from "ink";
-import { jsx as jsx60, jsxs as jsxs49 } from "react/jsx-runtime";
-function ConfigurationScreen({ onDone }) {
-  const [focus, setFocus] = useState33(0);
-  const [open, setOpen] = useState33(null);
-  const close = () => setOpen(null);
-  useInput14((input, key) => {
-    if (open) return;
-    if (key.upArrow) {
-      setFocus((i) => (i - 1 + SECTIONS.length) % SECTIONS.length);
-      return;
-    }
-    if (key.downArrow || key.tab) {
-      setFocus((i) => (i + 1) % SECTIONS.length);
-      return;
-    }
-    if (key.return) {
-      setOpen(SECTIONS[focus].id);
-      return;
-    }
-    if (key.escape || input === "q") onDone();
-  });
-  if (open === "project") return /* @__PURE__ */ jsx60(ProjectConfigScreen, { onDone: close });
-  if (open === "agents") return /* @__PURE__ */ jsx60(AgentsScreen, { onDone: close });
-  return /* @__PURE__ */ jsxs49(Box48, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx60(Text51, { bold: true, children: "Configuration" }),
-    /* @__PURE__ */ jsx60(Text51, { children: " " }),
-    SECTIONS.map((section, index) => /* @__PURE__ */ jsxs49(Box48, { gap: 1, children: [
-      /* @__PURE__ */ jsx60(Text51, { color: index === focus ? PALETTE.accent : void 0, children: index === focus ? "\u276F" : " " }),
-      /* @__PURE__ */ jsx60(Box48, { width: 9, flexShrink: 0, children: /* @__PURE__ */ jsx60(Text51, { bold: index === focus, color: index === focus ? PALETTE.accent : void 0, children: section.label }) }),
-      /* @__PURE__ */ jsx60(Text51, { color: PALETTE.muted, children: section.description })
-    ] }, section.id)),
-    /* @__PURE__ */ jsx60(Text51, { children: " " }),
-    /* @__PURE__ */ jsx60(
-      ControlHints,
-      {
-        hints: [
-          { keys: "\u2191/\u2193", label: "move" },
-          { keys: "\u23CE", label: "open" },
-          { keys: "Esc/q", label: "back" }
-        ]
-      }
-    )
-  ] });
-}
-var SECTIONS;
+var FIELD_ORDER, FIELD_LABELS, FIELD_HINTS, LABEL_WIDTH;
 var init_ContentfulConfigScreen = __esm({
   "packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
+    init_config_store();
+    init_debug_store();
     init_control_hints();
-    init_AgentScreens();
-    init_ProjectConfigScreen();
-    SECTIONS = [
-      {
-        id: "project",
-        label: "Project",
-        description: "Contentful space, credentials, defaults and where .contentful goes"
-      },
-      { id: "agents", label: "Agents", description: "Which coding agent the CLI uses, and each agent\u2019s settings" }
+    FIELD_ORDER = [
+      "spaceId",
+      "environmentId",
+      "cmaToken",
+      "host",
+      "defaultComponentDir",
+      "defaultTokenFile",
+      "contentfulBaseDir"
     ];
+    FIELD_LABELS = {
+      spaceId: "Space ID",
+      environmentId: "Environment ID",
+      cmaToken: "CMA Token",
+      host: "API Host",
+      defaultComponentDir: "Default component directory",
+      defaultTokenFile: "Default token file",
+      contentfulBaseDir: "Root Project Directory"
+    };
+    FIELD_HINTS = {
+      contentfulBaseDir: "(where .contentful goes)"
+    };
+    LABEL_WIDTH = Math.max(...Object.values(FIELD_LABELS).map((label) => label.length));
   }
 });
 
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx
-import { useEffect as useEffect25, useState as useState34 } from "react";
-import { Box as Box49, Text as Text52, useInput as useInput15 } from "ink";
-import { Fragment as Fragment20, jsx as jsx61, jsxs as jsxs50 } from "react/jsx-runtime";
+import { useEffect as useEffect23, useState as useState30 } from "react";
+import { Box as Box45, Text as Text47, useInput as useInput12 } from "ink";
+import { Fragment as Fragment18, jsx as jsx56, jsxs as jsxs46 } from "react/jsx-runtime";
 function OptInAnalyticsScreen({ onDone }) {
-  const [loading, setLoading] = useState34(true);
-  const [enabled, setEnabled] = useState34(true);
-  useEffect25(() => {
+  const [loading, setLoading] = useState30(true);
+  const [enabled, setEnabled] = useState30(true);
+  useEffect23(() => {
     readAnalyticsSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -34005,7 +33218,7 @@ function OptInAnalyticsScreen({ onDone }) {
       });
     });
   }, []);
-  useInput15((input, key) => {
+  useInput12((input, key) => {
     if (loading) return;
     if (key.return || input === " ") {
       setEnabled((current) => {
@@ -34020,21 +33233,21 @@ function OptInAnalyticsScreen({ onDone }) {
       onDone();
     }
   });
-  return /* @__PURE__ */ jsxs50(Box49, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx61(Text52, { bold: true, children: "Settings \u203A Opt-in Analytics" }),
-    /* @__PURE__ */ jsx61(Text52, { children: " " }),
-    loading ? /* @__PURE__ */ jsx61(Text52, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs50(Fragment20, { children: [
-      /* @__PURE__ */ jsxs50(Text52, { children: [
+  return /* @__PURE__ */ jsxs46(Box45, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx56(Text47, { bold: true, children: "Settings \u203A Opt-in Analytics" }),
+    /* @__PURE__ */ jsx56(Text47, { children: " " }),
+    loading ? /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs46(Fragment18, { children: [
+      /* @__PURE__ */ jsxs46(Text47, { children: [
         "Share anonymous usage data:",
         " ",
-        /* @__PURE__ */ jsx61(Text52, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
+        /* @__PURE__ */ jsx56(Text47, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
       ] }),
-      /* @__PURE__ */ jsx61(Text52, { children: " " }),
-      /* @__PURE__ */ jsx61(Text52, { color: PALETTE.muted, children: "Shares which CLI commands are used and where imports succeed or fail." }),
-      /* @__PURE__ */ jsx61(Text52, { color: PALETTE.muted, children: "Never includes source code, file paths, credentials, or authored content." })
+      /* @__PURE__ */ jsx56(Text47, { children: " " }),
+      /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: "Shares which CLI commands are used and where imports succeed or fail." }),
+      /* @__PURE__ */ jsx56(Text47, { color: PALETTE.muted, children: "Never includes source code, file paths, credentials, or authored content." })
     ] }),
-    /* @__PURE__ */ jsx61(Text52, { children: " " }),
-    /* @__PURE__ */ jsx61(
+    /* @__PURE__ */ jsx56(Text47, { children: " " }),
+    /* @__PURE__ */ jsx56(
       ControlHints,
       {
         hints: [
@@ -34048,7 +33261,7 @@ function OptInAnalyticsScreen({ onDone }) {
 var init_screen11 = __esm({
   "packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_analytics_store();
     init_debug_store();
     init_control_hints();
@@ -34056,12 +33269,12 @@ var init_screen11 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/upgrade/PageContainer.tsx
-import { useEffect as useEffect26, useState as useState35 } from "react";
-import { Box as Box50, Text as Text53, useInput as useInput16 } from "ink";
-import { jsx as jsx62, jsxs as jsxs51 } from "react/jsx-runtime";
+import { useEffect as useEffect24, useState as useState31 } from "react";
+import { Box as Box46, Text as Text48, useInput as useInput13 } from "ink";
+import { jsx as jsx57, jsxs as jsxs47 } from "react/jsx-runtime";
 function UpgradeScreen({ onDone }) {
-  const [upgradeCheck, setUpgradeCheck] = useState35();
-  useEffect26(() => {
+  const [upgradeCheck, setUpgradeCheck] = useState31();
+  useEffect24(() => {
     startDebugRun({
       flow: "upgrade",
       step: "01-upgrade",
@@ -34070,7 +33283,7 @@ function UpgradeScreen({ onDone }) {
     });
     checkForUpgrade().then(setUpgradeCheck).catch(() => setUpgradeCheck({ status: "error" }));
   }, []);
-  useInput16((_input, key) => {
+  useInput13((_input, key) => {
     if (key.return) {
       void finishDebugRun({
         outputs: upgradeCheck ?? {},
@@ -34081,12 +33294,12 @@ function UpgradeScreen({ onDone }) {
       return;
     }
   });
-  return /* @__PURE__ */ jsxs51(Box50, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx62(Text53, { bold: true, children: "Upgrade" }),
-    /* @__PURE__ */ jsx62(Text53, { children: " " }),
+  return /* @__PURE__ */ jsxs47(Box46, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx57(Text48, { bold: true, children: "Upgrade" }),
+    /* @__PURE__ */ jsx57(Text48, { children: " " }),
     renderBody(upgradeCheck),
-    /* @__PURE__ */ jsx62(Text53, { children: " " }),
-    /* @__PURE__ */ jsxs51(Text53, { bold: true, color: PALETTE.accent, children: [
+    /* @__PURE__ */ jsx57(Text48, { children: " " }),
+    /* @__PURE__ */ jsxs47(Text48, { bold: true, color: PALETTE.accent, children: [
       FOCUS_MARKER,
       " Go Back"
     ] })
@@ -34094,40 +33307,41 @@ function UpgradeScreen({ onDone }) {
 }
 function renderBody(upgradeCheck) {
   if (!upgradeCheck) {
-    return /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "Checking for updates\u2026" });
+    return /* @__PURE__ */ jsx57(Text48, { color: PALETTE.muted, children: "Checking for updates\u2026" });
   }
   if (upgradeCheck.status === "error") {
-    return /* @__PURE__ */ jsx62(Text53, { color: PALETTE.warning, children: "Couldn't check for updates \u2014 check your network connection and try again." });
+    return /* @__PURE__ */ jsx57(Text48, { color: PALETTE.warning, children: "Couldn't check for updates \u2014 check your network connection and try again." });
   }
   if (upgradeCheck.status === "up-to-date") {
-    return /* @__PURE__ */ jsxs51(Text53, { color: PALETTE.success, children: [
+    return /* @__PURE__ */ jsxs47(Text48, { color: PALETTE.success, children: [
       "You're already on the latest version (v",
       upgradeCheck.current,
       ")."
     ] });
   }
-  return /* @__PURE__ */ jsxs51(Box50, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs51(Text53, { color: PALETTE.muted, children: [
-      /* @__PURE__ */ jsxs51(Text53, { bold: true, color: PALETTE.success, children: [
+  return /* @__PURE__ */ jsxs47(Box46, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs47(Text48, { color: PALETTE.muted, children: [
+      /* @__PURE__ */ jsxs47(Text48, { bold: true, color: PALETTE.success, children: [
         "v",
         upgradeCheck.latest
       ] }),
       " ",
       "is available (you're on ",
-      /* @__PURE__ */ jsxs51(Text53, { bold: true, children: [
+      /* @__PURE__ */ jsxs47(Text48, { bold: true, children: [
         "v",
         upgradeCheck.current
       ] }),
       "). Exit this program, cd into the root of your local clone of contentful/experience-design-system-sdk-public, then run:"
     ] }),
-    /* @__PURE__ */ jsx62(Text53, { children: " " }),
-    /* @__PURE__ */ jsx62(Box50, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.border, paddingX: 1, children: UPGRADE_COMMANDS.map((cmd) => /* @__PURE__ */ jsx62(Text53, { bold: true, children: cmd }, cmd)) })
+    /* @__PURE__ */ jsx57(Text48, { children: " " }),
+    /* @__PURE__ */ jsx57(Box46, { flexDirection: "column", borderStyle: "round", borderColor: PALETTE.border, paddingX: 1, children: UPGRADE_COMMANDS.map((cmd) => /* @__PURE__ */ jsx57(Text48, { bold: true, children: cmd }, cmd)) })
   ] });
 }
 var UPGRADE_COMMANDS;
 var init_PageContainer4 = __esm({
   "packages/experience-design-system-cli/src/tui/upgrade/PageContainer.tsx"() {
     "use strict";
+    init_theme();
     init_home_theme();
     init_version();
     init_debug_store();
@@ -34136,13 +33350,13 @@ var init_PageContainer4 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
-import { useEffect as useEffect27, useState as useState36 } from "react";
-import { Box as Box51, Text as Text54, useInput as useInput17 } from "ink";
-import { jsx as jsx63, jsxs as jsxs52 } from "react/jsx-runtime";
+import { useEffect as useEffect25, useState as useState32 } from "react";
+import { Box as Box47, Text as Text49, useInput as useInput14 } from "ink";
+import { jsx as jsx58, jsxs as jsxs48 } from "react/jsx-runtime";
 function DebugModeScreen({ onDone }) {
-  const [loading, setLoading] = useState36(true);
-  const [enabled, setEnabled] = useState36(true);
-  useEffect27(() => {
+  const [loading, setLoading] = useState32(true);
+  const [enabled, setEnabled] = useState32(true);
+  useEffect25(() => {
     readDebugModeSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -34154,7 +33368,7 @@ function DebugModeScreen({ onDone }) {
       });
     });
   }, []);
-  useInput17((input, key) => {
+  useInput14((input, key) => {
     if (loading) return;
     if (key.return || input === " ") {
       setEnabled((current) => {
@@ -34169,16 +33383,16 @@ function DebugModeScreen({ onDone }) {
       onDone();
     }
   });
-  return /* @__PURE__ */ jsxs52(Box51, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx63(Text54, { bold: true, children: "Settings \u203A Debug Mode" }),
-    /* @__PURE__ */ jsx63(Text54, { children: " " }),
-    loading ? /* @__PURE__ */ jsx63(Text54, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs52(Text54, { children: [
+  return /* @__PURE__ */ jsxs48(Box47, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
+    /* @__PURE__ */ jsx58(Text49, { bold: true, children: "Settings \u203A Debug Mode" }),
+    /* @__PURE__ */ jsx58(Text49, { children: " " }),
+    loading ? /* @__PURE__ */ jsx58(Text49, { color: PALETTE.muted, children: "Loading\u2026" }) : /* @__PURE__ */ jsxs48(Text49, { children: [
       "Debug logging:",
       " ",
-      /* @__PURE__ */ jsx63(Text54, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
+      /* @__PURE__ */ jsx58(Text49, { bold: true, color: enabled ? PALETTE.success : PALETTE.muted, children: enabled ? "On" : "Off" })
     ] }),
-    /* @__PURE__ */ jsx63(Text54, { children: " " }),
-    /* @__PURE__ */ jsx63(
+    /* @__PURE__ */ jsx58(Text49, { children: " " }),
+    /* @__PURE__ */ jsx58(
       ControlHints,
       {
         hints: [
@@ -34192,7 +33406,7 @@ function DebugModeScreen({ onDone }) {
 var init_screen12 = __esm({
   "packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx"() {
     "use strict";
-    init_home_theme();
+    init_theme();
     init_debug_mode_store();
     init_debug_store();
     init_control_hints();
@@ -34204,20 +33418,20 @@ var app_exports = {};
 __export(app_exports, {
   runApp: () => runApp
 });
-import { join as join28 } from "node:path";
-import { useEffect as useEffect28, useState as useState37 } from "react";
-import { Fragment as Fragment21, jsx as jsx64 } from "react/jsx-runtime";
+import { join as join27 } from "node:path";
+import { useEffect as useEffect26, useState as useState33 } from "react";
+import { Fragment as Fragment19, jsx as jsx59 } from "react/jsx-runtime";
 function App({ importOptions, inkClear }) {
-  const [screen, setScreen] = useState37("start");
-  const [importExitCode, setImportExitCode] = useState37();
+  const [screen, setScreen] = useState33("start");
+  const [importExitCode, setImportExitCode] = useState33();
   const showImportResult = importExitCode !== void 0;
-  const [projectPath, setProjectPath] = useState37();
-  const [tokensPath, setTokensPath] = useState37();
-  const [scannedFiles, setScannedFiles] = useState37();
-  const [pendingLaunch, setPendingLaunch] = useState37();
-  const [extractionRun, setExtractionRun] = useState37();
+  const [projectPath, setProjectPath] = useState33();
+  const [tokensPath, setTokensPath] = useState33();
+  const [scannedFiles, setScannedFiles] = useState33();
+  const [pendingLaunch, setPendingLaunch] = useState33();
+  const [extractionRun, setExtractionRun] = useState33();
   const extraction = useExtraction(extractionRun?.input);
-  const [scopeRun, setScopeRun] = useState37();
+  const [scopeRun, setScopeRun] = useState33();
   const scopeFlow = useScopeGateFlow(
     scopeRun && {
       sessionId: scopeRun.extraction.sessionId,
@@ -34232,12 +33446,12 @@ function App({ importOptions, inkClear }) {
       }
     }
   );
-  const [generationInput, setGenerationInput] = useState37();
+  const [generationInput, setGenerationInput] = useState33();
   const generation = useGeneration(generationInput);
-  const [flowStart, setFlowStart] = useState37();
+  const [flowStart, setFlowStart] = useState33();
   const flow = useFlow(flowStart, { beforeStepChange: inkClear });
-  const [importDefaults, setImportDefaults] = useState37();
-  useEffect28(() => {
+  const [importDefaults, setImportDefaults] = useState33();
+  useEffect26(() => {
     if (screen !== "import") {
       setImportDefaults(void 0);
       return;
@@ -34255,7 +33469,7 @@ function App({ importOptions, inkClear }) {
     const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
     const state2 = await inspectTokens({
       rawTokensPath: tokens,
-      contentfulDir: join28(resolveUserPath(projectPath2), ".contentful"),
+      contentfulDir: join27(resolveUserPath(projectPath2), ".contentful"),
       cache: importOptions.cache
     });
     if (state2.kind === "cached") {
@@ -34297,12 +33511,12 @@ function App({ importOptions, inkClear }) {
       }
     });
   };
-  useEffect28(() => {
+  useEffect26(() => {
     if (!extractionRun || extraction?.status !== "done" || !extraction.result.ok) return;
     setExtractionRun(void 0);
     setScopeRun({ ...extractionRun, extraction: extraction.result.extraction });
   }, [extraction, extractionRun]);
-  useEffect28(() => {
+  useEffect26(() => {
     if (!scopeRun || scopeFlow?.status !== "confirmed" || generationInput) return;
     const { extraction: produced, input, generatePromptPath } = scopeRun;
     setGenerationInput({
@@ -34320,7 +33534,7 @@ function App({ importOptions, inkClear }) {
       ...generatePromptPath ? { generatePromptPath } : {}
     });
   }, [scopeFlow, scopeRun, generationInput]);
-  useEffect28(() => {
+  useEffect26(() => {
     if (!scopeRun || generation?.status !== "done" || !generation.result.ok) return;
     const { credentialsSkipped, tokenStrategy, extraction: produced, input, generatePromptPath } = scopeRun;
     inkClear();
@@ -34363,9 +33577,9 @@ function App({ importOptions, inkClear }) {
   };
   switch (screen) {
     case "import":
-      if (showImportResult) return /* @__PURE__ */ jsx64(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
+      if (showImportResult) return /* @__PURE__ */ jsx59(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
       if (flow && flowStart) {
-        return /* @__PURE__ */ jsx64(
+        return /* @__PURE__ */ jsx59(
           FlowScreen,
           {
             state: flow.state,
@@ -34375,12 +33589,12 @@ function App({ importOptions, inkClear }) {
           }
         );
       }
-      if (importDefaults === void 0) return /* @__PURE__ */ jsx64(Fragment21, {});
+      if (importDefaults === void 0) return /* @__PURE__ */ jsx59(Fragment19, {});
       if (projectPath === void 0) {
-        return /* @__PURE__ */ jsx64(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
+        return /* @__PURE__ */ jsx59(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
       }
       if (tokensPath === void 0) {
-        return /* @__PURE__ */ jsx64(
+        return /* @__PURE__ */ jsx59(
           TokenInputScreen,
           {
             initialPath: importDefaults.tokenFile,
@@ -34390,7 +33604,7 @@ function App({ importOptions, inkClear }) {
         );
       }
       if (scannedFiles === void 0) {
-        return /* @__PURE__ */ jsx64(
+        return /* @__PURE__ */ jsx59(
           PathValidationScreen,
           {
             projectPath,
@@ -34402,10 +33616,10 @@ function App({ importOptions, inkClear }) {
       }
       if (extractionRun) {
         if (extraction?.status === "done" && !extraction.result.ok) {
-          return /* @__PURE__ */ jsx64(ErrorStep, { stepName: extraction.result.step, message: extraction.result.message, onExit: leaveImport });
+          return /* @__PURE__ */ jsx59(ErrorStep, { stepName: extraction.result.step, message: extraction.result.message, onExit: leaveImport });
         }
         if (extraction?.status === "running") {
-          return /* @__PURE__ */ jsx64(
+          return /* @__PURE__ */ jsx59(
             ExtractionScreen,
             {
               progress: extraction.progress,
@@ -34414,14 +33628,14 @@ function App({ importOptions, inkClear }) {
             }
           );
         }
-        return /* @__PURE__ */ jsx64(Fragment21, {});
+        return /* @__PURE__ */ jsx59(Fragment19, {});
       }
       if (scopeRun && scopeFlow) {
         if (scopeFlow.status === "failed") {
-          return /* @__PURE__ */ jsx64(ErrorStep, { stepName: "scope gate", message: scopeFlow.message, onExit: leaveImport });
+          return /* @__PURE__ */ jsx59(ErrorStep, { stepName: "scope gate", message: scopeFlow.message, onExit: leaveImport });
         }
         if (scopeFlow.status === "deciding") {
-          return /* @__PURE__ */ jsx64(
+          return /* @__PURE__ */ jsx59(
             ScopeGateScreen,
             {
               components: scopeFlow.load.components,
@@ -34431,7 +33645,7 @@ function App({ importOptions, inkClear }) {
           );
         }
         if (generation?.status === "done" && !generation.result.ok) {
-          return /* @__PURE__ */ jsx64(ErrorStep, { stepName: generation.result.step, message: generation.result.message, onExit: leaveImport });
+          return /* @__PURE__ */ jsx59(ErrorStep, { stepName: generation.result.step, message: generation.result.message, onExit: leaveImport });
         }
         if (generation?.status === "running") {
           const hasRawTokens = scopeRun.input.rawTokensPath !== "";
@@ -34439,7 +33653,7 @@ function App({ importOptions, inkClear }) {
             hasRawTokens,
             mapTokensEligible: generation.progress.mapTokensEligible
           });
-          return /* @__PURE__ */ jsx64(
+          return /* @__PURE__ */ jsx59(
             GenerationScreen,
             {
               progress: generation.progress,
@@ -34451,10 +33665,10 @@ function App({ importOptions, inkClear }) {
             }
           );
         }
-        return /* @__PURE__ */ jsx64(Fragment21, {});
+        return /* @__PURE__ */ jsx59(Fragment19, {});
       }
       if (pendingLaunch?.cached) {
-        return /* @__PURE__ */ jsx64(
+        return /* @__PURE__ */ jsx59(
           TokenReuseScreen,
           {
             tokensPath: pendingLaunch.cached.tokensPath,
@@ -34465,7 +33679,7 @@ function App({ importOptions, inkClear }) {
           }
         );
       }
-      return /* @__PURE__ */ jsx64(
+      return /* @__PURE__ */ jsx59(
         CredentialsScreen,
         {
           initial: importDefaults.credentials,
@@ -34474,19 +33688,19 @@ function App({ importOptions, inkClear }) {
         }
       );
     case "help":
-      return /* @__PURE__ */ jsx64(HelpScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx59(HelpScreen, { onDone: goToStart });
     case "upgrade":
-      return /* @__PURE__ */ jsx64(UpgradeScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx59(UpgradeScreen, { onDone: goToStart });
     case "settings":
-      return /* @__PURE__ */ jsx64(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
+      return /* @__PURE__ */ jsx59(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
     case "settings-configuration":
-      return /* @__PURE__ */ jsx64(ConfigurationScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx59(ConfigurationScreen, { onDone: goToSettings });
     case "settings-opt-in-analytics":
-      return /* @__PURE__ */ jsx64(OptInAnalyticsScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx59(OptInAnalyticsScreen, { onDone: goToSettings });
     case "settings-debug-mode":
-      return /* @__PURE__ */ jsx64(DebugModeScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx59(DebugModeScreen, { onDone: goToSettings });
     case "start":
-      return /* @__PURE__ */ jsx64(HomeScreen, { onNavigate: setScreen });
+      return /* @__PURE__ */ jsx59(HomeScreen, { onNavigate: setScreen });
   }
 }
 async function runApp(renderApp, importOptions) {
@@ -34494,7 +33708,7 @@ async function runApp(renderApp, importOptions) {
     instance.clear?.();
     process.stdout.write("\x1B[H\x1B[0J");
   };
-  const instance = renderApp(/* @__PURE__ */ jsx64(App, { importOptions, inkClear }));
+  const instance = renderApp(/* @__PURE__ */ jsx59(App, { importOptions, inkClear }));
   await instance.waitUntilExit();
 }
 var init_app = __esm({
@@ -34529,7 +33743,7 @@ var init_app = __esm({
 // packages/experience-design-system-cli/program.ts
 init_src4();
 import { readFileSync as readFileSync9 } from "node:fs";
-import { join as join29 } from "node:path";
+import { join as join28 } from "node:path";
 import { Command } from "commander";
 
 // packages/experience-design-system-cli/src/legacy/run-legacy.ts
@@ -34633,14 +33847,14 @@ function runDevWatch(args) {
     process.stderr.write("--watch only works from a checkout of the repo (scripts/dev.mjs is not in the package).\n");
     return Promise.resolve(1);
   }
-  return new Promise((resolve28) => {
+  return new Promise((resolve27) => {
     const child = spawn4(process.execPath, [script, ...args], { stdio: "inherit" });
     process.on("SIGINT", () => void 0);
-    child.on("exit", (code) => resolve28(code ?? 0));
+    child.on("exit", (code) => resolve27(code ?? 0));
     child.on("error", (err) => {
       process.stderr.write(`${err.message}
 `);
-      resolve28(1);
+      resolve27(1);
     });
   });
 }
@@ -34662,13 +33876,11 @@ function registerImportCommand(program, openTui) {
 }
 
 // packages/experience-design-system-cli/program.ts
-init_agent_store();
-init_apply_binary_overrides();
 init_analytics_store();
 init_package_root();
 var pkg = JSON.parse(
   readFileSync9(
-    join29(findPackageRoot(import.meta.url, "@contentful/experience-design-system-cli"), "package.json"),
+    join28(findPackageRoot(import.meta.url, "@contentful/experience-design-system-cli"), "package.json"),
     "utf8"
   )
 );
@@ -34686,7 +33898,6 @@ function createProgram() {
     const commandChain = chain.join(" ") || actionCommand.name();
     const { enabled } = await readAnalyticsSetting();
     setPersistedAnalyticsDisabled(!enabled);
-    await readAgentConfig().then(applyBinaryOverrides, () => void 0);
     setCliVersion(pkg.version);
     noteCommandStart(commandChain);
   });
@@ -34710,7 +33921,7 @@ init_config();
 init_package_root();
 import { existsSync as existsSync12 } from "node:fs";
 import { mkdir as mkdir10, readFile as readFile19, rename as rename3, rmdir, unlink } from "node:fs/promises";
-import { dirname as dirname16, join as join30 } from "node:path";
+import { dirname as dirname16, join as join29 } from "node:path";
 var PACKAGE_NAME4 = "@contentful/experience-design-system-cli";
 async function readJson(path5) {
   try {
@@ -34721,9 +33932,9 @@ async function readJson(path5) {
 }
 async function migrateOldConfig() {
   try {
-    const oldCredentials = join30(oldConfigDir2(), "credentials.json");
-    const oldRuns = join30(oldConfigDir2(), "runs.json");
-    const oldDebugMode = join30(
+    const oldCredentials = join29(oldConfigDir2(), "credentials.json");
+    const oldRuns = join29(oldConfigDir2(), "runs.json");
+    const oldDebugMode = join29(
       findPackageRoot(import.meta.url, PACKAGE_NAME4),
       ".contentful",
       "config",