@contentful/experience-design-system-cli 2.27.1-dev-build-fd316dc.0 → 2.27.1-dev-build-7cd07de.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.27.1-dev-build-fd316dc.0",
+  "version": "2.27.1-dev-build-7cd07de.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/analyze/select/tui/components/FieldEditor.d.ts

@@ -34,6 +34,8 @@ type FieldEditorProps = {
     onDirtyChange?: (isDirty: boolean) => void;
     discardTrigger?: number;
     initialFocusTarget?: {
+        kind: 'description';
+    } | {
         kind: 'prop' | 'slot';
         name: string;
     };

package/dist/src/import/orchestrator.d.ts

@@ -7,7 +7,6 @@ export interface PipelineOptions {
     cmaToken?: string;
     agent: string;
     model?: string;
-    bedrock?: boolean;
     skipAnalyze: boolean;
     skipGenerate: boolean;
     print: boolean;

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

@@ -7,7 +7,6 @@ export declare function buildSelectAgentArgs(opts: {
     sessionId: string;
     agent: string;
     model?: string;
-    bedrock?: boolean;
     selectPromptPath?: string;
     noCache?: boolean;
 }): string[];
@@ -24,7 +23,6 @@ export declare function buildGenerateComponentsArgs(opts: {
     tokensPath?: string;
     agent: string;
     model?: string;
-    bedrock?: boolean;
     noCache?: boolean;
     generatePromptPath?: string;
 }): string[];
@@ -40,7 +38,6 @@ export type WizardAppProps = {
     initialHost?: string;
     initialAgent?: string;
     initialModel?: string;
-    bedrock?: boolean;
     initialProjectPath?: string;
     host?: string;
     autoAcceptScope?: boolean;
@@ -71,4 +68,4 @@ export type WizardAppProps = {
     onRunPicked?: (selection: RunPickerSelection) => void;
     allowDeletions?: boolean;
 };
-export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, bedrock, initialProjectPath, host, autoAcceptScope, autoRejectCycles, compositionMode, compositionMap, compositionAgent, compositionAgentMode, compositionRefresh, generateMap, promptOverrides, noCache, autoFilter, livePreview, noPush, noSave, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, allowDeletions, }?: WizardAppProps): React.ReactElement;
+export declare function WizardApp({ initialSpaceId, initialEnvironmentId, initialCmaToken, initialHost, initialAgent, initialModel, initialProjectPath, host, autoAcceptScope, autoRejectCycles, compositionMode, compositionMap, compositionAgent, compositionAgentMode, compositionRefresh, generateMap, promptOverrides, noCache, autoFilter, livePreview, noPush, noSave, outDirOverride, onConflictMode, selectPromptPath, generatePromptPath, seedExtractSessionId, seedGenerateSessionId, seedTokenSessionId, seedTokensPath, initialStep, initialRawTokensPath, initialRuns, onRunPicked, allowDeletions, }?: WizardAppProps): React.ReactElement;

package/dist/src/index.js

@@ -231,9 +231,6 @@ function resolveBinary(agent) {
     return override.trim();
   return AGENT_BINARIES[agent];
 }
-function agentSupportsBedrock(agent) {
-  return agent in BEDROCK_ENV_BY_AGENT;
-}
 function resolveAgentModel(agent, explicit) {
   if (explicit && explicit.trim())
     return explicit.trim();
@@ -257,7 +254,7 @@ function buildArgs(agent, prompt2, model, promptViaStdin = false) {
   }
 }
 async function runAgent(options) {
-  const { agent, prompt: prompt2, timeoutMs, model, bedrock, onOutput, promptViaStdin, onDebugEvent } = options;
+  const { agent, prompt: prompt2, timeoutMs, model, onOutput, promptViaStdin, onDebugEvent } = options;
   const binary = resolveBinary(agent);
   const useStdin2 = !!promptViaStdin;
   const args = buildArgs(agent, prompt2, model, useStdin2);
@@ -266,16 +263,13 @@ async function runAgent(options) {
     agent,
     binary,
     model,
-    bedrock: !!bedrock,
     timeoutMs,
     promptLen: prompt2.length,
     promptHead: prompt2.slice(0, 500)
   });
   return new Promise((resolve27) => {
-    const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
-      stdio: ["pipe", "pipe", "pipe"],
-      ...bedrockEnv ? { env: { ...process.env, ...bedrockEnv } } : {}
+      stdio: ["pipe", "pipe", "pipe"]
     });
     if (useStdin2 && child.stdin) {
       child.stdin.on("error", () => {
@@ -393,7 +387,7 @@ function extractSentinelOutput(stdout) {
     return "multiple";
   return stdout.slice(startIdx + START.length, endIdx).trim();
 }
-var VALID_SELECT_TOOL_NAMES, VALID_TOOL_NAMES, VALID_TOKEN_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES, AGENT_BINARIES, BEDROCK_ENV_BY_AGENT, DEFAULT_MODELS;
+var VALID_SELECT_TOOL_NAMES, VALID_TOOL_NAMES, VALID_TOKEN_TOOL_NAMES, VALID_CDF_TYPES, VALID_CATEGORIES, AGENT_BINARIES, DEFAULT_MODELS;
 var init_agent_runner = __esm({
   "packages/experience-design-system-generation/dist/src/agent-runner.js"() {
     "use strict";
@@ -409,9 +403,6 @@ var init_agent_runner = __esm({
       opencode: "opencode",
       cursor: "cursor-agent"
     };
-    BEDROCK_ENV_BY_AGENT = {
-      claude: { CLAUDE_CODE_USE_BEDROCK: "1" }
-    };
     DEFAULT_MODELS = {
       claude: "haiku",
       codex: "gpt-5.4-mini",
@@ -680,7 +671,6 @@ var src_exports = {};
 __export(src_exports, {
   AGENT_NAMES: () => AGENT_NAMES,
   DEFAULT_AGENT_NAME: () => DEFAULT_AGENT_NAME,
-  agentSupportsBedrock: () => agentSupportsBedrock,
   buildArgs: () => buildArgs,
   buildPrompt: () => buildPrompt,
   checkAgentAuth: () => checkAgentAuth,
@@ -21765,10 +21755,17 @@ function PropRow({
       ] }),
       /* @__PURE__ */ jsx44(Text43, { dimColor: !selected, children: "type:" }),
       activeField === "type" ? /* @__PURE__ */ jsx44(Picker, { value: prop.type, active: true }) : /* @__PURE__ */ jsx44(Text43, { color: selected ? PALETTE.warning : PALETTE.inverse, children: prop.type }),
-      /* @__PURE__ */ jsx44(Text43, { dimColor: !selected, children: "cat:" }),
-      activeField === "category" ? /* @__PURE__ */ jsx44(Picker, { value: prop.category, active: true }) : /* @__PURE__ */ jsx44(Text43, { color: selected ? PALETTE.info : PALETTE.inverse, children: prop.category }),
+      activeField === "category" && /* @__PURE__ */ jsx44(Picker, { value: prop.category, active: true }),
       /* @__PURE__ */ jsx44(Text43, { dimColor: !selected, children: "req:" }),
       activeField === "required" ? /* @__PURE__ */ jsx44(Toggle, { value: prop.required, active: true }) : /* @__PURE__ */ jsx44(Toggle, { value: prop.required, active: false }),
+      prop.type === "enum" && /* @__PURE__ */ jsxs43(Fragment12, { children: [
+        /* @__PURE__ */ jsx44(Text43, { dimColor: !selected, children: "values:" }),
+        /* @__PURE__ */ jsxs43(Text43, { color: selected ? PALETTE.warning : PALETTE.inverse, children: [
+          "[",
+          prop.values.join(", "),
+          "]"
+        ] })
+      ] }),
       prop.type === "token" && /* @__PURE__ */ jsxs43(Fragment12, { children: [
         /* @__PURE__ */ jsx44(Text43, { dimColor: !selected, children: "kind:" }),
         activeField === "tokenKind" ? /* @__PURE__ */ jsx44(Picker, { value: prop.tokenKind || DESIGN_TOKEN_TYPES2[0], active: true }) : /* @__PURE__ */ jsx44(Text43, { color: selected ? PALETTE.success : PALETTE.inverse, children: prop.tokenKind || "\u2014" })
@@ -21800,7 +21797,7 @@ function PropRow({
       const text = `~ ${rationale}`;
       return text.length > max ? text.slice(0, max - 1) + "\u2026" : text;
     })() }) }, rowKey ? `rationale-${rowKey}` : void 0),
-    selected && prop.type === "enum" && /* @__PURE__ */ jsxs43(Box41, { paddingLeft: 2, flexDirection: "column", children: [
+    selected && prop.type === "enum" && activeField === "values" && /* @__PURE__ */ jsxs43(Box41, { paddingLeft: 2, flexDirection: "column", children: [
       /* @__PURE__ */ jsxs43(Box41, { children: [
         /* @__PURE__ */ jsx44(Text43, { dimColor: true, children: "values:" }),
         activeField === "values" && /* @__PURE__ */ jsx44(Text43, { dimColor: true, children: "  [a]dd  [e]dit  [r]emove  [\u2191\u2193] navigate  [K/J] reorder" })
@@ -22024,31 +22021,40 @@ function FieldEditor({
   const [editorState, setEditorState] = useState23(initialState);
   const [parseErr] = useState23(parseError);
   const initialFocus = (() => {
-    if (initialFocusTarget) {
-      if (initialFocusTarget.kind === "prop") {
-        const idx = initialState.props.findIndex((p) => p.name === initialFocusTarget.name);
-        if (idx >= 0) {
-          return {
-            focusLevel: "prop",
-            inSlots: false,
-            propIdx: idx,
-            slotIdx: 0,
-            activeField: null,
-            textCursor: 0
-          };
-        }
-      } else {
-        const idx = initialState.slots.findIndex((s) => s.name === initialFocusTarget.name);
-        if (idx >= 0) {
-          return {
-            focusLevel: "slot",
-            inSlots: true,
-            propIdx: 0,
-            slotIdx: idx,
-            activeField: null,
-            textCursor: 0
-          };
-        }
+    if (initialFocusTarget?.kind === "description") {
+      return {
+        focusLevel: "componentDescription",
+        inSlots: false,
+        propIdx: 0,
+        slotIdx: 0,
+        activeField: null,
+        textCursor: 0
+      };
+    }
+    if (initialFocusTarget?.kind === "prop") {
+      const idx = initialState.props.findIndex((p) => p.name === initialFocusTarget.name);
+      if (idx >= 0) {
+        return {
+          focusLevel: "prop",
+          inSlots: false,
+          propIdx: idx,
+          slotIdx: 0,
+          activeField: null,
+          textCursor: 0
+        };
+      }
+    }
+    if (initialFocusTarget?.kind === "slot") {
+      const idx = initialState.slots.findIndex((s) => s.name === initialFocusTarget.name);
+      if (idx >= 0) {
+        return {
+          focusLevel: "slot",
+          inSlots: true,
+          propIdx: 0,
+          slotIdx: idx,
+          activeField: null,
+          textCursor: 0
+        };
       }
     }
     if (initialState.props.length > 0) {
@@ -22084,7 +22090,7 @@ function FieldEditor({
   const [propIdx, setPropIdx] = useState23(initialFocus.propIdx);
   const [slotIdx, setSlotIdx] = useState23(initialFocus.slotIdx);
   const [inSlots, setInSlots] = useState23(initialFocus.inSlots);
-  const [inComponentDesc, setInComponentDesc] = useState23(false);
+  const [inComponentDesc, setInComponentDesc] = useState23(initialFocus.focusLevel === "componentDescription");
   const [activeField, setActiveField] = useState23(initialFocus.activeField);
   const [textCursor, setTextCursor] = useState23(initialFocus.textCursor);
   const [valueCursor, setValueCursor] = useState23(0);
@@ -22099,13 +22105,58 @@ function FieldEditor({
   const [showHelp, setShowHelp] = useState23(false);
   const props = editorState.props;
   const slots = editorState.slots;
-  const visiblePropIndexes = React23.useMemo(
-    () => props.flatMap(
-      (prop, index) => showHiddenProps || prop.category !== "state" && prop.category !== "unattached" ? [index] : []
-    ),
+  const contentPropIndexes = React23.useMemo(
+    () => props.flatMap((prop, index) => prop.category === "content" ? [index] : []),
+    [props]
+  );
+  const designPropIndexes = React23.useMemo(
+    () => props.flatMap((prop, index) => prop.category === "design" ? [index] : []),
+    [props]
+  );
+  const hiddenPropIndexes = React23.useMemo(
+    () => showHiddenProps ? props.flatMap((prop, index) => prop.category === "state" || prop.category === "unattached" ? [index] : []) : [],
     [props, showHiddenProps]
   );
+  const visiblePropIndexes = React23.useMemo(
+    () => [...contentPropIndexes, ...designPropIndexes, ...hiddenPropIndexes],
+    [contentPropIndexes, designPropIndexes, hiddenPropIndexes]
+  );
+  const propGroups = React23.useMemo(
+    () => [
+      { kind: "content", label: "\u2500\u2500 CONTENT PROPERTIES", indexes: contentPropIndexes },
+      { kind: "design", label: "\u2500\u2500 DESIGN PROPERTIES", indexes: designPropIndexes },
+      { kind: "hidden", label: "\u2500\u2500 OTHER / HIDDEN", indexes: hiddenPropIndexes }
+    ],
+    [contentPropIndexes, designPropIndexes, hiddenPropIndexes]
+  );
+  const selectableRows = React23.useMemo(
+    () => [
+      ...contentPropIndexes.map((idx) => ({ kind: "prop", idx })),
+      ...designPropIndexes.map((idx) => ({ kind: "prop", idx })),
+      ...slots.map((_, idx) => ({ kind: "slot", idx })),
+      ...hiddenPropIndexes.map((idx) => ({ kind: "prop", idx }))
+    ],
+    [contentPropIndexes, designPropIndexes, hiddenPropIndexes, slots]
+  );
   const visiblePropPosition = visiblePropIndexes.indexOf(propIdx);
+  const selectedSelectableIndex = React23.useMemo(
+    () => selectableRows.findIndex(
+      (row) => inSlots ? row.kind === "slot" && row.idx === slotIdx : row.kind === "prop" && row.idx === propIdx
+    ),
+    [inSlots, propIdx, selectableRows, slotIdx]
+  );
+  const focusSelectableRow = (row) => {
+    setInComponentDesc(false);
+    if (row.kind === "prop") {
+      setInSlots(false);
+      setPropIdx(row.idx);
+      setFocusLevel("prop");
+    } else {
+      setInSlots(true);
+      setSlotIdx(row.idx);
+      setFocusLevel("slot");
+    }
+  };
   const textEntryActive = focusLevel === "field" && activeField === "description" || focusLevel === "field" && activeField === "default" && (editorState.props[propIdx]?.type === "string" || editorState.props[propIdx]?.type === "token") || editingValue != null;
   React23.useEffect(() => {
     onTextEntryActiveChange?.(textEntryActive);
@@ -22326,51 +22377,13 @@ function FieldEditor({
       }
       return;
     }
-    if (focusLevel === "prop") {
-      if (key.upArrow || input === "k") {
-        if (visiblePropPosition > 0) {
-          setPropIdx(visiblePropIndexes[visiblePropPosition - 1]);
-        } else {
-          setFocusLevel("componentDescription");
-          setInSlots(false);
-          setInComponentDesc(true);
-        }
-        return;
-      }
-      if (key.downArrow || input === "j") {
-        if (visiblePropPosition >= 0 && visiblePropPosition < visiblePropIndexes.length - 1) {
-          setPropIdx(visiblePropIndexes[visiblePropPosition + 1]);
-        } else if (slots.length > 0) {
-          setInSlots(true);
-          setSlotIdx(0);
-          setFocusLevel("slot");
-        }
-        return;
-      }
-      if (key.return && currentProp) {
-        setFocusLevel("field");
-        setActiveField(propFields(currentProp)[0] ?? null);
-        setTextCursor(currentProp.description.length);
-        return;
-      }
-      return;
-    }
     if (focusLevel === "componentDescription") {
       if (key.upArrow || input === "k") {
         return;
       }
       if (key.downArrow || input === "j") {
-        if (visiblePropIndexes.length > 0) {
-          setFocusLevel("prop");
-          setPropIdx(visiblePropIndexes[0]);
-          setInSlots(false);
-          setInComponentDesc(false);
-        } else if (slots.length > 0) {
-          setFocusLevel("slot");
-          setSlotIdx(0);
-          setInSlots(true);
-          setInComponentDesc(false);
-        }
+        const firstSelectableRow = selectableRows[0];
+        if (firstSelectableRow) focusSelectableRow(firstSelectableRow);
         return;
       }
       if (key.return) {
@@ -22381,29 +22394,35 @@ function FieldEditor({
       }
       return;
     }
-    if (focusLevel === "slot") {
+    if (focusLevel === "prop" || focusLevel === "slot") {
       if (key.upArrow || input === "k") {
-        if (slotIdx > 0) {
-          setSlotIdx(slotIdx - 1);
-        } else if (visiblePropIndexes.length > 0) {
+        if (selectedSelectableIndex > 0) {
+          focusSelectableRow(selectableRows[selectedSelectableIndex - 1]);
+        } else if (selectedSelectableIndex === 0) {
+          setFocusLevel("componentDescription");
           setInSlots(false);
-          setPropIdx(visiblePropIndexes[visiblePropIndexes.length - 1]);
-          setFocusLevel("prop");
+          setInComponentDesc(true);
         }
         return;
       }
       if (key.downArrow || input === "j") {
-        if (slotIdx < slots.length - 1) {
-          setSlotIdx(slotIdx + 1);
+        if (selectedSelectableIndex >= 0 && selectedSelectableIndex < selectableRows.length - 1) {
+          focusSelectableRow(selectableRows[selectedSelectableIndex + 1]);
         }
         return;
       }
-      if (key.return && currentSlot) {
+      if (focusLevel === "slot" && key.return && currentSlot) {
         setFocusLevel("field");
         setActiveField(SLOT_FIELDS[0] ?? null);
         setTextCursor(currentSlot.description.length);
         return;
       }
+      if (focusLevel === "prop" && key.return && currentProp) {
+        setFocusLevel("field");
+        setActiveField(propFields(currentProp)[0] ?? null);
+        setTextCursor(currentProp.description.length);
+        return;
+      }
       return;
     }
     if (focusLevel === "field") {
@@ -22732,14 +22751,24 @@ function FieldEditor({
   })();
   const rows = [];
   rows.push({ kind: "component-description" });
-  if (visiblePropIndexes.length > 0) {
-    rows.push({ kind: "header", label: `\u2500\u2500 PROPERTIES (${visiblePropIndexes.length}) `, section: "properties" });
-    visiblePropIndexes.forEach((idx) => rows.push({ kind: "prop", idx }));
+  for (const group of propGroups.filter((candidate) => candidate.kind !== "hidden")) {
+    if (group.indexes.length === 0) continue;
+    rows.push({ kind: "header", label: `${group.label} (${group.indexes.length}) `, section: group.kind });
+    group.indexes.forEach((idx) => rows.push({ kind: "prop", idx }));
   }
   if (slots.length > 0) {
     rows.push({ kind: "header", label: `\u2500\u2500 SLOTS (${slots.length}) `, section: "slots" });
     slots.forEach((_, i) => rows.push({ kind: "slot", idx: i }));
   }
+  const hiddenGroup = propGroups.find((group) => group.kind === "hidden");
+  if (hiddenGroup && hiddenGroup.indexes.length > 0) {
+    rows.push({
+      kind: "header",
+      label: `${hiddenGroup.label} (${hiddenGroup.indexes.length}) `,
+      section: "hidden"
+    });
+    hiddenGroup.indexes.forEach((idx) => rows.push({ kind: "prop", idx }));
+  }
   const selectedRowIdx = rows.findIndex(
     (r) => r.kind === "prop" && !inSlots && !inComponentDesc && r.idx === propIdx || r.kind === "slot" && inSlots && r.idx === slotIdx || r.kind === "component-description" && inComponentDesc
   );
@@ -22754,32 +22783,31 @@ function FieldEditor({
       borderStyle: "single",
       borderColor: hasEmptyProperties ? PALETTE.warning : PALETTE.info,
       children: [
-        /* @__PURE__ */ jsx44(Text43, { bold: true, color: hasEmptyProperties ? PALETTE.warning : PALETTE.info, children: "FIELDS [Ctrl+S save \xB7 Esc discard]" }),
         hasEmptyProperties && /* @__PURE__ */ jsx44(Text43, { 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." }),
         /* @__PURE__ */ jsx44(Box41, { flexDirection: "column", width: innerWidth, children: visibleRowSlice.map((row, i) => {
           if (row.kind === "header") {
-            return /* @__PURE__ */ jsx44(Text43, { bold: true, color: row.section === "slots" ? PALETTE.info : PALETTE.success, children: row.label }, `header-${i}`);
+            return /* @__PURE__ */ jsx44(Text43, { bold: true, color: PALETTE.success, children: row.label }, `header-${i}`);
           }
           if (row.kind === "component-description") {
             const isSelected2 = inComponentDesc;
             const isEditing = isSelected2 && focusLevel === "field" && activeField === "description";
             const desc = editorState.componentDescription;
-            return /* @__PURE__ */ jsxs43(Box41, { flexDirection: "column", children: [
-              /* @__PURE__ */ jsx44(Box41, { gap: 1, children: /* @__PURE__ */ jsx44(
+            return /* @__PURE__ */ jsx44(Box41, { flexDirection: "column", children: /* @__PURE__ */ jsxs43(Box41, { gap: 1, children: [
+              /* @__PURE__ */ jsx44(
                 Text43,
                 {
                   color: isSelected2 ? PALETTE.inverse : PALETTE.info,
                   bold: isSelected2,
                   backgroundColor: isSelected2 ? "blue" : void 0,
-                  children: " component-$description "
+                  children: " description: "
                 }
-              ) }),
-              isEditing ? /* @__PURE__ */ jsx44(Box41, { paddingLeft: 2, flexDirection: "row", children: /* @__PURE__ */ jsxs43(Box41, { flexGrow: 1, borderStyle: "round", borderColor: PALETTE.info, paddingX: 1, children: [
+              ),
+              isEditing ? /* @__PURE__ */ jsxs43(Box41, { flexGrow: 1, borderStyle: "round", borderColor: PALETTE.info, paddingX: 1, children: [
                 /* @__PURE__ */ jsx44(Text43, { children: desc.slice(0, textCursor) }),
                 /* @__PURE__ */ jsx44(Text43, { inverse: cursorVisible, children: desc[textCursor] ?? (cursorVisible ? "\u2588" : " ") }),
                 /* @__PURE__ */ jsx44(Text43, { children: desc.slice(textCursor + 1) })
-              ] }) }) : /* @__PURE__ */ jsx44(Box41, { paddingLeft: 2, children: /* @__PURE__ */ jsx44(Text43, { color: desc ? PALETTE.success : void 0, dimColor: !desc, children: desc || "(none \u2014 Return to edit)" }) })
-            ] }, `component-description-${i}`);
+              ] }) : /* @__PURE__ */ jsx44(Text43, { color: isSelected2 ? PALETTE.warning : PALETTE.inverse, dimColor: !desc, children: desc || "(none \u2014 Return to edit)" })
+            ] }) }, `component-description-${i}`);
           }
           if (row.kind === "prop") {
             const p = props[row.idx];
@@ -25283,7 +25311,7 @@ function GenerateReviewStep({
             currentComponentName: selected.key,
             onDirtyChange: setEditorDirty,
             discardTrigger,
-            initialFocusTarget: pendingEditorFocus && pendingEditorFocus.componentName === selected.key ? pendingEditorFocus.target : void 0
+            initialFocusTarget: pendingEditorFocus && pendingEditorFocus.componentName === selected.key ? pendingEditorFocus.target : { kind: "description" }
           },
           pendingEditorFocus && pendingEditorFocus.componentName === selected.key ? `${selected.key}::${pendingEditorFocus.target.kind}:${pendingEditorFocus.target.name}` : selected.key
         ),
@@ -26186,7 +26214,8 @@ function AtomicGenerateReviewStep({
               setPanelOpen("source");
               setPanelScrollOffset(() => 0);
             },
-            onTextEntryActiveChange: setTextEntryActive
+            onTextEntryActiveChange: setTextEntryActive,
+            initialFocusTarget: { kind: "description" }
           },
           selected.key
         ),
@@ -26419,7 +26448,6 @@ import { jsx as jsx50, jsxs as jsxs49 } from "react/jsx-runtime";
 function buildSelectAgentArgs(opts) {
   const args = ["analyze", "select-agent", "--agent", opts.agent, "--session", opts.sessionId, "--exclude-invalid"];
   if (opts.model) args.push("--model", opts.model);
-  if (opts.bedrock) args.push("--bedrock");
   if (opts.selectPromptPath) args.push("--select-prompt-path", opts.selectPromptPath);
   if (opts.noCache) args.push("--no-cache");
   return args;
@@ -26455,7 +26483,6 @@ function buildGenerateComponentsArgs(opts) {
   const args = ["generate", "components", "--agent", opts.agent, "--session", opts.sessionId];
   if (opts.tokensPath) args.push("--tokens", opts.tokensPath);
   if (opts.model) args.push("--model", opts.model);
-  if (opts.bedrock) args.push("--bedrock");
   if (opts.noCache) args.push("--no-cache");
   if (opts.generatePromptPath) args.push("--generate-prompt-path", opts.generatePromptPath);
   return args;
@@ -26488,7 +26515,6 @@ function WizardApp({
   initialHost,
   initialAgent,
   initialModel,
-  bedrock = false,
   initialProjectPath,
   host,
   autoAcceptScope = false,
@@ -26549,7 +26575,6 @@ function WizardApp({
     step: modifyEntryReady || rawTokensEntryReady || pushFromPickerReady ? initialStepResolved : initialRuns && initialRuns.length > 0 ? "run-picker" : initialStepResolved,
     agent: initialAgent ?? "claude",
     ...initialModel ? { agentModel: initialModel } : {},
-    ...bedrock ? { bedrock: true } : {},
     projectPath: initialProjectPath ?? "",
     outDir: initialOutDir,
     rawTokensPath: rawTokensEntryReady ? initialRawTokensPath : "",
@@ -26688,7 +26713,6 @@ If you are using AWS Bedrock, run:
     const result = await new Promise((res) => {
       const tokenArgs = [findCliPath(), "generate", "tokens", "--agent", state.agent, "--raw-tokens", rawTokensPath];
       if (state.agentModel) tokenArgs.push("--model", state.agentModel);
-      if (state.bedrock) tokenArgs.push("--bedrock");
       const child = spawn4("node", tokenArgs);
       let stdout2 = "";
       let stderr = "";
@@ -26846,7 +26870,6 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         sessionId: sessionId2,
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
-        ...state.bedrock ? { bedrock: true } : {},
         selectPromptPath,
         noCache
       });
@@ -26945,7 +26968,6 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         tokensPath,
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
-        ...state.bedrock ? { bedrock: true } : {},
         noCache: effectiveNoCache
       })
     ];
@@ -27015,7 +27037,6 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         tokensPath,
         agent: state.agent,
         ...state.agentModel ? { model: state.agentModel } : {},
-        ...state.bedrock ? { bedrock: true } : {},
         noCache: effectiveNoCache,
         generatePromptPath
       })
@@ -28491,14 +28512,11 @@ import { isAbsolute as isAbsolute4, join as join15, relative as relative3, resol
 init_src();
 var AGENT_DESCRIPTION = `Agent to use: ${AGENT_NAMES.join(", ")} (defaults to value saved by experiences setup)`;
 var MODEL_DESCRIPTION = "Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)";
-var BEDROCK_AGENTS = AGENT_NAMES.filter((agent) => agentSupportsBedrock(agent)).join(", ");
-var BEDROCK_DESCRIPTION = `Route the selected agent through AWS Bedrock instead of its default model provider (requires AWS credentials in the environment: AWS_PROFILE, or AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY/AWS_SESSION_TOKEN, plus AWS_REGION). Only supported by agents with a Bedrock routing mechanism (currently: ${BEDROCK_AGENTS}).`;
 function addAgentModelOptions(cmd, config = {}) {
   const { agentDescription = AGENT_DESCRIPTION, includeModel = true, modelDescription = MODEL_DESCRIPTION } = config;
   cmd.option("--agent <name>", agentDescription);
   if (includeModel) {
     cmd.option("--model <name>", modelDescription);
-    cmd.option("--bedrock", BEDROCK_DESCRIPTION);
   }
   return cmd;
 }
@@ -29051,7 +29069,7 @@ function resolveProjectRoot(sessionId2, projectRootFlag) {
     db.close();
   }
 }
-async function selectBatch(agent, model, bedrock, batch, total, verbose, skillPathOverride) {
+async function selectBatch(agent, model, batch, total, verbose, skillPathOverride) {
   const prompt2 = await buildPrompt({
     skill: "select",
     mode: "autonomous",
@@ -29070,7 +29088,6 @@ async function selectBatch(agent, model, bedrock, batch, total, verbose, skillPa
   const result = await invoker.invoke({
     agent,
     model,
-    bedrock,
     prompt: prompt2,
     timeoutMs: DEFAULT_TIMEOUT_MS,
     onOutput: (chunk) => formatter.push(chunk)
@@ -29157,7 +29174,7 @@ ${outputBuf}`);
   }
   return results;
 }
-async function selectAllComponents(agent, model, bedrock, components, verbose, skillPathOverride, cacheConfig = { noCache: true }) {
+async function selectAllComponents(agent, model, components, verbose, skillPathOverride, cacheConfig = { noCache: true }) {
   const concurrency = Number(process.env.EDS_GENERATE_CONCURRENCY ?? DEFAULT_CONCURRENCY);
   const batchSize = resolveBatchSize();
   const total = components.length;
@@ -29222,7 +29239,7 @@ async function selectAllComponents(agent, model, bedrock, components, verbose, s
     while (nextBatch < batches.length) {
       const b = nextBatch++;
       const batch = batches[b];
-      const batchResults = await selectBatch(agent, model, bedrock, batch, total, verbose, skillPathOverride);
+      const batchResults = await selectBatch(agent, model, batch, total, verbose, skillPathOverride);
       for (let k = 0; k < batch.length; k++) {
         results[batch[k].index] = batchResults[k];
       }
@@ -29286,12 +29303,6 @@ function registerAnalyzeSelectAgentCommand(program) {
         return;
       }
       const agent = agentName;
-      if (opts.bedrock && !agentSupportsBedrock(agent)) {
-        process.stderr.write(`Error: --bedrock is not supported for --agent ${agent}
-`);
-        await exitWithAnalytics(1);
-        return;
-      }
       const selectPromptPath = opts.selectPromptPath ?? savedCreds.selectPromptPath;
       if (selectPromptPath) {
         const resolvedPath = resolve12(selectPromptPath);
@@ -29390,7 +29401,6 @@ function registerAnalyzeSelectAgentCommand(program) {
       const selectResults = await selectAllComponents(
         agent,
         model,
-        opts.bedrock,
         selectionCandidates,
         opts.verbose ?? false,
         selectPromptPath ? resolve12(selectPromptPath) : void 0,
@@ -31150,7 +31160,7 @@ function printFallbackInstructions(options) {
   lines.push(`  Re-run the generate command with the agent available, or use --dry-run to inspect the prompt.`);
   process.stderr.write(lines.join("\n") + "\n");
 }
-async function runOneComponent(agent, model, bedrock, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash) {
+async function runOneComponent(agent, model, db, sessionId2, component, tokensInline, tokenMapInline, index, total, verbose, noCache, skillPathOverride, promptHash) {
   const pos = c.dim(`[${index + 1}/${total}]`);
   if (!noCache) {
     const inputHash = computeComponentInputHash(component);
@@ -31235,7 +31245,6 @@ async function runOneComponent(agent, model, bedrock, db, sessionId2, component,
     const result = await invoker2.invoke({
       agent,
       model,
-      bedrock,
       prompt: prompt2,
       timeoutMs: DEFAULT_TIMEOUT_MS3,
       onOutput: (chunk) => formatter.push(chunk)
@@ -31291,7 +31300,7 @@ ${outputBuf}`);
     renamedSlotsCount: renames.length
   };
 }
-async function runAllComponents(agent, model, bedrock, db, sessionId2, components, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, promptHash) {
+async function runAllComponents(agent, model, db, sessionId2, components, tokensInline, tokenMapInline, verbose, noCache, skillPathOverride, promptHash) {
   const concurrency = Number(process.env.EDS_GENERATE_CONCURRENCY ?? DEFAULT_COMPONENT_CONCURRENCY);
   process.stderr.write(
     `Categorizing ${c.bold(String(components.length))} component${components.length === 1 ? "" : "s"}` + c.dim(`  (concurrency: ${concurrency})`) + "\n"
@@ -31305,7 +31314,6 @@ async function runAllComponents(agent, model, bedrock, db, sessionId2, component
       results[i] = await runOneComponent(
         agent,
         model,
-        bedrock,
         db,
         sessionId2,
         components[i],
@@ -31373,9 +31381,6 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     );
   }
   const agent = agentName;
-  if (opts.bedrock && !agentSupportsBedrock(agent)) {
-    die2(`Error: --bedrock is not supported for --agent ${agent}`);
-  }
   const generatePromptPath = skill === "components" ? opts.generatePromptPath ?? savedCreds.generatePromptPath : void 0;
   if (generatePromptPath) {
     if (!await pathExists3(resolve17(generatePromptPath))) {
@@ -31485,7 +31490,6 @@ async function runGenerateSkill(skill, opts, verbose = false) {
       componentResults = await runAllComponents(
         agent,
         model,
-        opts.bedrock,
         db,
         sessionId2,
         allComponents,
@@ -31598,7 +31602,6 @@ session=${sessionId2 ?? ""}
       const result = await invoker2.invoke({
         agent,
         model,
-        bedrock: opts.bedrock,
         prompt: prompt2,
         timeoutMs: DEFAULT_TIMEOUT_MS3 * 5
       });
@@ -32622,7 +32625,6 @@ function registerPrintCommand(program) {
 }
 
 // packages/experience-design-system-cli/src/import/command.ts
-init_src();
 init_path_utils();
 import { resolve as resolve25, join as join25 } from "node:path";
 
@@ -32827,7 +32829,6 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     if (useAgentSelect) {
       editArgs = ["analyze", "select-agent", "--session", extractSessionId, "--agent", opts.agent];
       if (opts.model) editArgs.push("--model", opts.model);
-      if (opts.bedrock) editArgs.push("--bedrock");
       if (opts.excludeInvalid) editArgs.push("--exclude-invalid");
       if (opts.noCache) editArgs.push("--no-cache");
       if (opts.selectPromptPath) editArgs.push("--select-prompt-path", opts.selectPromptPath);
@@ -32889,7 +32890,6 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
     const generateLabel = stepLabel("Categorizing component props");
     const generateArgs = ["generate", "components", "--agent", opts.agent];
     if (opts.model) generateArgs.push("--model", opts.model);
-    if (opts.bedrock) generateArgs.push("--bedrock");
     if (extractSessionId) generateArgs.push("--session", extractSessionId);
     if (opts.dryRun) generateArgs.push("--dry-run");
     if (opts.verbose) generateArgs.push("--verbose");
@@ -33833,11 +33833,6 @@ function registerImportCommand(program) {
         const resolvedAgent = resolveAgent(opts.agent, creds.agent);
         const resolvedModel = resolveModel(opts.model, creds.agentModel);
         const resolvedCompositionMode = resolveCompositionMode(opts, creds.compositionMode);
-        if (opts.bedrock && !(isAgentName(resolvedAgent) && agentSupportsBedrock(resolvedAgent))) {
-          process.stderr.write(`Error: --bedrock is not supported for --agent ${resolvedAgent}
-`);
-          process.exit(1);
-        }
         const pickerDecision = await shouldShowRunPicker({
           flags: {
             ...opts.pushFromRun !== void 0 ? { pushFromRun: opts.pushFromRun } : {},
@@ -33866,7 +33861,6 @@ function registerImportCommand(program) {
             initialHost: toConfiguredHost(opts.host ?? creds.host) ?? DEFAULT_CONFIGURED_HOST,
             initialAgent: resolvedAgent,
             ...resolvedModel ? { initialModel: resolvedModel } : {},
-            ...opts.bedrock ? { bedrock: true } : {},
             initialProjectPath: opts.project !== "." ? normalizePath(opts.project) : void 0,
             host: opts.host,
             autoAcceptScope,
@@ -33929,11 +33923,6 @@ function registerImportCommand(program) {
       const headlessAgent = resolveAgent(opts.agent, headlessCreds.agent);
       const headlessModel = resolveModel(opts.model, headlessCreds.agentModel);
       const headlessCompositionMode = resolveCompositionMode(opts, headlessCreds.compositionMode);
-      if (opts.bedrock && !(isAgentName(headlessAgent) && agentSupportsBedrock(headlessAgent))) {
-        process.stderr.write(`Error: --bedrock is not supported for --agent ${headlessAgent}
-`);
-        process.exit(1);
-      }
       const result = await runPipeline(
         {
           project: projectRoot,
@@ -33943,7 +33932,6 @@ function registerImportCommand(program) {
           cmaToken,
           agent: headlessAgent,
           model: headlessModel,
-          ...opts.bedrock ? { bedrock: true } : {},
           tokens: opts.tokens,
           selectAll: opts.selectAll,
           select: opts.select.length > 0 ? opts.select : void 0,

package/dist/src/lib/agent-model-options.d.ts

@@ -1,11 +1,13 @@
 import type { Command } from 'commander';
 export declare const AGENT_DESCRIPTION: string;
 export declare const MODEL_DESCRIPTION = "Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)";
-export declare const BEDROCK_DESCRIPTION: string;
 export interface AgentModelOptionsConfig {
     agentDescription?: string;
     includeModel?: boolean;
     modelDescription?: string;
 }
-/** Register --agent and optional --model/--bedrock flags with a Commander command. Pass includeModel: false to omit both. */
+/**
+ * Register --agent and optionally --model flags to a Commander command, with customizable descriptions.
+ * Pass `includeModel: false` for commands where the model dimension is not applicable (e.g., mapping-resolution agents that select an agent for logic, not model choice).
+ */
 export declare function addAgentModelOptions(cmd: Command, config?: AgentModelOptionsConfig): Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.27.1-dev-build-fd316dc.0",
+  "version": "2.27.1-dev-build-7cd07de.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.27.1-dev-build-fd316dc.0"
+    "@contentful/experience-design-system-types": "2.27.1-dev-build-7cd07de.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -51,9 +51,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-client": "2.27.1-dev-build-fd316dc.0",
-    "@contentful/experience-design-system-extraction": "2.27.1-dev-build-fd316dc.0",
-    "@contentful/experience-design-system-generation": "2.27.1-dev-build-fd316dc.0"
+    "@contentful/experience-design-system-client": "2.27.1-dev-build-7cd07de.0",
+    "@contentful/experience-design-system-generation": "2.27.1-dev-build-7cd07de.0",
+    "@contentful/experience-design-system-extraction": "2.27.1-dev-build-7cd07de.0"
   },
   "repository": {
     "type": "git",