@contentful/experience-design-system-cli 2.26.7-dev-build-6f3b072.0 → 2.26.7-dev-build-8206e92.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.26.7-dev-build-6f3b072.0",
+  "version": "2.26.7-dev-build-8206e92.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/import/tui/steps/review-json-panel.d.ts

@@ -0,0 +1,13 @@
+import type { CDFComponentEntry } from '@contentful/experience-design-system-types';
+type ReviewJsonComponent = {
+    key: string;
+    entry: CDFComponentEntry;
+};
+/**
+ * Builds the exact JSON string rendered by the read-only review panel.
+ *
+ * The FieldEditor intentionally continues to use the unfiltered component
+ * definition so toggling the panel never changes what an operator can save.
+ */
+export declare function getReviewJsonPanelValue(selected: ReviewJsonComponent | null, showHiddenProps: boolean): string;
+export {};

package/dist/src/index.js

@@ -23,87 +23,23 @@ var init_agent_names = __esm({
 
 // packages/experience-design-system-generation/dist/src/agent-runner.js
 import { spawn } from "node:child_process";
-function scanJsonObjects(line) {
-  const objects = [];
-  let i = 0;
-  while (i < line.length) {
-    while (i < line.length && /\s/.test(line[i]))
-      i++;
-    if (i >= line.length)
-      break;
-    if (line[i] !== "{")
-      return { objects, trailing: line.slice(i), malformed: objects.length === 0 };
-    let depth = 0;
-    let inString = false;
-    let escaped = false;
-    let end = -1;
-    for (let j = i; j < line.length; j++) {
-      const ch = line[j];
-      if (escaped) {
-        escaped = false;
-        continue;
-      }
-      if (ch === "\\") {
-        if (inString)
-          escaped = true;
-        continue;
-      }
-      if (ch === '"') {
-        inString = !inString;
-        continue;
-      }
-      if (inString)
-        continue;
-      if (ch === "{")
-        depth++;
-      else if (ch === "}") {
-        depth--;
-        if (depth === 0) {
-          end = j;
-          break;
-        }
-      }
-    }
-    if (end === -1)
-      return { objects, trailing: "", malformed: true };
-    let parsed;
-    try {
-      parsed = JSON.parse(line.slice(i, end + 1));
-    } catch {
-      return { objects, trailing: "", malformed: true };
-    }
-    if (typeof parsed === "object" && parsed !== null)
-      objects.push(parsed);
-    i = end + 1;
-  }
-  return { objects, trailing: "", malformed: false };
-}
-function readToolCallObjects(stdout) {
-  const objects = [];
+function parseSelectToolCallLines(stdout) {
+  const calls = [];
   const warnings = [];
   for (const raw of stdout.split("\n")) {
     const line = raw.trim();
     if (!line.startsWith("{"))
       continue;
-    const { objects: found, trailing, malformed } = scanJsonObjects(line);
-    if (malformed) {
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
       warnings.push(`unparseable line: ${line.slice(0, 120)}`);
       continue;
     }
-    if (trailing.trim()) {
-      warnings.push(`ignored trailing content after JSON: ${trailing.trim().slice(0, 120)}`);
-    }
-    for (const obj of found) {
-      if ("tool" in obj)
-        objects.push(obj);
-    }
-  }
-  return { objects, warnings };
-}
-function parseSelectToolCallLines(stdout) {
-  const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
-  for (const rec of objects) {
+    if (typeof obj !== "object" || obj === null || !("tool" in obj))
+      continue;
+    const rec = obj;
     if (!VALID_SELECT_TOOL_NAMES.has(rec.tool))
       continue;
     if (typeof rec.name !== "string" || !rec.name) {
@@ -129,8 +65,21 @@ function parseSelectToolCallLines(stdout) {
 }
 function parseToolCallLines(stdout) {
   const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
-  for (const rec of objects) {
+  const warnings = [];
+  for (const raw of stdout.split("\n")) {
+    const line = raw.trim();
+    if (!line.startsWith("{"))
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      continue;
+    }
+    if (typeof obj !== "object" || obj === null || !("tool" in obj))
+      continue;
+    const rec = obj;
     if (!VALID_TOOL_NAMES.has(rec.tool)) {
       warnings.push(`unknown tool: ${String(rec.tool)}`);
       continue;
@@ -218,8 +167,21 @@ function parseToolCallLines(stdout) {
 }
 function parseTokenToolCallLines(stdout) {
   const calls = [];
-  const { objects, warnings } = readToolCallObjects(stdout);
-  for (const rec of objects) {
+  const warnings = [];
+  for (const raw of stdout.split("\n")) {
+    const line = raw.trim();
+    if (!line.startsWith("{"))
+      continue;
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      warnings.push(`unparseable line: ${line.slice(0, 120)}`);
+      continue;
+    }
+    if (typeof obj !== "object" || obj === null || !("tool" in obj))
+      continue;
+    const rec = obj;
     if (!VALID_TOKEN_TOOL_NAMES.has(rec.tool))
       continue;
     if (rec.tool === "set_token") {
@@ -8592,6 +8554,66 @@ function applyDbMigrations(db) {
   if (!rawPropColNames.has("source_end_line")) {
     db.exec("ALTER TABLE raw_props ADD COLUMN source_end_line INTEGER");
   }
+  const rawPropsDdl = db.prepare(`SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'raw_props'`).get();
+  if (rawPropsDdl && !rawPropsDdl.sql.includes(`'unattached'`)) {
+    db.exec("PRAGMA foreign_keys = OFF");
+    try {
+      db.exec("BEGIN");
+      try {
+        db.exec(`
+        CREATE TABLE raw_props__new (
+          session_id        TEXT NOT NULL,
+          component_id      TEXT NOT NULL,
+          name              TEXT NOT NULL,
+          type              TEXT NOT NULL,
+          required          INTEGER NOT NULL CHECK (required IN (0, 1)),
+          category          TEXT CHECK (category IN ('content', 'design', 'state')),
+          default_value     TEXT,
+          description       TEXT,
+          token_reference   TEXT,
+          position          INTEGER NOT NULL,
+          cdf_type          TEXT,
+          cdf_category      TEXT CHECK (cdf_category IN ('content', 'design', 'state', 'unattached')),
+          cdf_token_kind    TEXT,
+          rationale         TEXT,
+          source_start_line INTEGER,
+          source_end_line   INTEGER,
+          PRIMARY KEY (session_id, component_id, name),
+          FOREIGN KEY (session_id, component_id) REFERENCES raw_components(session_id, component_id) ON DELETE CASCADE
+        );
+
+        INSERT INTO raw_props__new
+          (session_id, component_id, name, type, required, category, default_value,
+           description, token_reference, position, cdf_type, cdf_category, cdf_token_kind,
+           rationale, source_start_line, source_end_line)
+        SELECT
+          session_id, component_id, name, type, required, category, default_value,
+          description, token_reference, position, cdf_type, cdf_category, cdf_token_kind,
+          rationale, source_start_line, source_end_line
+        FROM raw_props;
+
+        DROP TABLE raw_props;
+        ALTER TABLE raw_props__new RENAME TO raw_props;
+        CREATE INDEX IF NOT EXISTS idx_raw_props_session ON raw_props(session_id, component_id);
+
+        -- Rows written by a pre-migration exclude_prop still say cdf_type = 'excluded'
+        -- with cdf_category = NULL. Backfill them into the new unattached shape so an
+        -- in-flight local session doesn't end up with an unprintable half-migrated row.
+        UPDATE raw_props
+        SET cdf_category = 'unattached',
+            cdf_type = CASE WHEN type = 'boolean' THEN 'boolean' ELSE 'string' END,
+            required = 0
+        WHERE cdf_type = 'excluded';
+      `);
+        db.exec("COMMIT");
+      } catch (e) {
+        db.exec("ROLLBACK");
+        throw e;
+      }
+    } finally {
+      db.exec("PRAGMA foreign_keys = ON");
+    }
+  }
   if (!rawCompColNames.has("reject_reason")) {
     db.exec("ALTER TABLE raw_components ADD COLUMN reject_reason TEXT");
   }
@@ -8777,7 +8799,12 @@ function applyToolCalls(db, sessionId2, componentId, componentName, calls, incom
      WHERE session_id = ? AND component_id = ? AND name = ?`
   );
   const clearProp = db.prepare(
-    `UPDATE raw_props SET cdf_type = 'excluded', cdf_category = NULL, cdf_token_kind = NULL, rationale = ?
+    `UPDATE raw_props
+     SET cdf_type = CASE WHEN type = 'boolean' THEN 'boolean' ELSE 'string' END,
+         cdf_category = 'unattached',
+         cdf_token_kind = NULL,
+         required = 0,
+         rationale = ?
      WHERE session_id = ? AND component_id = ? AND name = ?`
   );
   const deleteAllowedValues = db.prepare(
@@ -9376,7 +9403,7 @@ function loadCDFComponents(db, sessionId2) {
     `SELECT component_id, name, required, default_value, description,
               cdf_type, cdf_category, cdf_token_kind, position
        FROM raw_props
-       WHERE session_id = ? AND cdf_type IS NOT NULL AND cdf_type != 'excluded'
+       WHERE session_id = ? AND cdf_type IS NOT NULL
        ORDER BY component_id, position`
   ).all(sessionId2);
   const allowedValues = db.prepare(
@@ -21346,6 +21373,27 @@ var init_merge_ai_decisions = __esm({
   }
 });
 
+// packages/experience-design-system-cli/src/import/tui/steps/review-json-panel.ts
+function getReviewJsonPanelValue(selected, showHiddenProps) {
+  if (!selected) return "";
+  const entry = showHiddenProps ? selected.entry : {
+    ...selected.entry,
+    $properties: Object.fromEntries(
+      Object.entries(selected.entry.$properties ?? {}).filter(
+        ([, definition]) => !HIDDEN_PROP_CATEGORIES.has(definition.$category)
+      )
+    )
+  };
+  return JSON.stringify({ [selected.key]: entry }, null, 2);
+}
+var HIDDEN_PROP_CATEGORIES;
+var init_review_json_panel = __esm({
+  "packages/experience-design-system-cli/src/import/tui/steps/review-json-panel.ts"() {
+    "use strict";
+    HIDDEN_PROP_CATEGORIES = /* @__PURE__ */ new Set(["state", "unattached"]);
+  }
+});
+
 // packages/experience-design-system-cli/src/analyze/cycle-view.ts
 function computeCycleView(components) {
   const filtered = components.filter((c2) => c2.status !== "rejected");
@@ -23638,6 +23686,7 @@ function GenerateReviewStep({
   const [showFinalize, setShowFinalize] = useState26(false);
   const [showQuit, setShowQuit] = useState26(false);
   const [showJson, setShowJson] = useState26(false);
+  const [showHiddenProps, setShowHiddenProps] = useState26(false);
   const [draftValue, setDraftValue] = useState26("");
   const [saveError, setSaveError] = useState26(null);
   const [finalizeError, setFinalizeError] = useState26(initialFinalizeError);
@@ -24587,7 +24636,7 @@ function GenerateReviewStep({
     }
     if (!sidebarFocused && showJson) {
       const current = components[selectedIdx];
-      const currentJson = current ? JSON.stringify({ [current.key]: current.entry }, null, 2) : "";
+      const currentJson = getReviewJsonPanelValue(current ?? null, showHiddenProps);
       const totalLines = currentJson.split("\n").length;
       const maxOffset = Math.max(0, totalLines - PANEL_HEIGHT);
       if (input === "g" && !key.ctrl) {
@@ -24724,6 +24773,12 @@ function GenerateReviewStep({
       pendingGRef.current = false;
       return;
     }
+    if (input === "H") {
+      setShowHiddenProps((prev) => !prev);
+      setJsonScrollOffset(0);
+      pendingGRef.current = false;
+      return;
+    }
     if (key.return) {
       const current = components[selectedIdx];
       if (!current) return;
@@ -24824,6 +24879,7 @@ function GenerateReviewStep({
   }
   const selected = components[selectedIdx] ?? null;
   const selectedJson = selected ? JSON.stringify({ [selected.key]: selected.entry }, null, 2) : "";
+  const visibleJsonPanelValue = getReviewJsonPanelValue(selected, showHiddenProps);
   const isEmpty2 = (c2) => Object.keys(c2.entry.$properties).length === 0 && Object.keys(c2.entry.$slots ?? {}).length === 0;
   const emptyCount = components.filter(isEmpty2).length;
   const cycleParticipantSet = cycleView.structural;
@@ -25145,7 +25201,7 @@ function GenerateReviewStep({
           JsonPanel,
           {
             label: "GENERATED DEFINITION (read-only)",
-            value: selectedJson,
+            value: visibleJsonPanelValue,
             scrollOffset: jsonScrollOffset,
             width: panelWidth,
             height: PANEL_HEIGHT,
@@ -25238,6 +25294,7 @@ function GenerateReviewStep({
       legendEntry("[P]", "component rationale", panelOpen === "component-rationale"),
       legendEntry("[s]", "source", panelOpen === "source"),
       legendEntry("[J]", showJson ? "hide JSON" : "show JSON", showJson),
+      legendEntry("[H]", showHiddenProps ? "hide state/unattached" : "show state/unattached", showHiddenProps),
       breakingChanges.length > 0 && legendEntry("[b]", "see breaking changes", breakingPanel.isOpen),
       removedComponents.length > 0 && legendEntry("[d]", removedBannerCollapsed ? "show removed" : "hide removed", !removedBannerCollapsed),
       legendEntry("[/]", "search", searchOpen || searchQuery.length > 0),
@@ -25268,6 +25325,7 @@ var init_GenerateReviewStep = __esm({
   "packages/experience-design-system-cli/src/import/tui/steps/GenerateReviewStep.tsx"() {
     "use strict";
     init_theme();
+    init_review_json_panel();
     init_GroupedSidebar();
     init_composite_closure();
     init_slot_graph();
@@ -25418,6 +25476,7 @@ function AtomicGenerateReviewStep({
   const [showFinalize, setShowFinalize] = useState27(false);
   const [showQuit, setShowQuit] = useState27(false);
   const [showJson, setShowJson] = useState27(false);
+  const [showHiddenProps, setShowHiddenProps] = useState27(false);
   const [draftValue, setDraftValue] = useState27("");
   const [saveError, setSaveError] = useState27(null);
   const [finalizeError, setFinalizeError] = useState27(initialFinalizeError);
@@ -25781,7 +25840,7 @@ function AtomicGenerateReviewStep({
     }
     if (!sidebarFocused && showJson) {
       const current = components[selectedIdx];
-      const currentJson = current ? JSON.stringify({ [current.key]: current.entry }, null, 2) : "";
+      const currentJson = getReviewJsonPanelValue(current ?? null, showHiddenProps);
       const totalLines = currentJson.split("\n").length;
       const maxOffset = Math.max(0, totalLines - PANEL_HEIGHT2);
       if (input === "g" && !key.ctrl) {
@@ -25837,6 +25896,12 @@ function AtomicGenerateReviewStep({
       pendingGRef.current = false;
       return;
     }
+    if (input === "H") {
+      setShowHiddenProps((prev) => !prev);
+      setJsonScrollOffset(0);
+      pendingGRef.current = false;
+      return;
+    }
     if (key.upArrow || input === "k") {
       setSelectedIdx((prev) => {
         const newIdx = Math.max(0, prev - 1);
@@ -25869,6 +25934,7 @@ function AtomicGenerateReviewStep({
   }
   const selected = components[selectedIdx] ?? null;
   const selectedJson = selected ? JSON.stringify({ [selected.key]: selected.entry }, null, 2) : "";
+  const visibleJsonPanelValue = getReviewJsonPanelValue(selected, showHiddenProps);
   const isEmpty2 = (c2) => Object.keys(c2.entry.$properties).length === 0;
   const emptyCount = components.filter(isEmpty2).length;
   const sidebarItems = components.map((c2) => ({
@@ -26044,7 +26110,7 @@ function AtomicGenerateReviewStep({
           JsonPanel,
           {
             label: "GENERATED DEFINITION (read-only)",
-            value: selectedJson,
+            value: visibleJsonPanelValue,
             scrollOffset: jsonScrollOffset,
             width: panelWidth,
             height: PANEL_HEIGHT2,
@@ -26084,7 +26150,7 @@ function AtomicGenerateReviewStep({
         ),
         saveError && /* @__PURE__ */ jsx48(Text47, { color: PALETTE.error, children: "\u2717 " + saveError }),
         /* @__PURE__ */ jsxs47(Text47, { dimColor: true, children: [
-          sidebarFocused ? "  [a] accept  [r] reject  [A] accept all  [i] prop rationale  [I] component rationale  [s] source  [J] " + (showJson ? "hide JSON" : "show JSON") + "  [^z] undo  [^y] redo  [^r] reload  [F] finalize  [e/Tab] focus panel" + (livePreview && removedComponents.length > 0 ? "  [d] removed list" : "") + "  [q] quit" : showJson ? "  [j/k] scroll  [Ctrl+u/d] half-page  [gg/G] top/bottom  [Tab] focus list" : "  [Tab] focus list  (edit fields)",
+          sidebarFocused ? "  [a] accept  [r] reject  [A] accept all  [i] prop rationale  [I] component rationale  [s] source  [J] " + (showJson ? "hide JSON" : "show JSON") + "  [H] " + (showHiddenProps ? "hide state/unattached" : "show state/unattached") + "  [^z] undo  [^y] redo  [^r] reload  [F] finalize  [e/Tab] focus panel" + (livePreview && removedComponents.length > 0 ? "  [d] removed list" : "") + "  [q] quit" : showJson ? "  [j/k] scroll  [Ctrl+u/d] half-page  [gg/G] top/bottom  [Tab] focus list" : "  [Tab] focus list  (edit fields)",
           livePreviewHook.status === "running" && /* @__PURE__ */ jsx48(Text47, { children: `  ${livePreviewSpinner} live preview` }),
           livePreviewHook.disabled && /* @__PURE__ */ jsx48(Text47, { children: "  \xB7 live preview disabled" })
         ] })
@@ -26131,6 +26197,7 @@ var init_AtomicGenerateReviewStep = __esm({
     init_useFinalizePreview();
     init_scroll_offset();
     init_theme();
+    init_review_json_panel();
     VISIBLE_COUNT3 = 20;
     PANEL_HEIGHT2 = 22;
   }
@@ -31385,7 +31452,7 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     const allOk = failed.length === 0;
     const cachedNote = cachedResults.length > 0 ? c.dim(`  (${cachedResults.length} cached)`) : "";
     process.stderr.write(
-      (allOk ? c.green("\u2713") : c.yellow("\u26A0")) + `  ${generated.length + cachedResults.length}/${componentResults.length} components` + cachedNote + c.dim(`  ${totalClassified} classified, ${totalExcluded} excluded`) + "\n"
+      (allOk ? c.green("\u2713") : c.yellow("\u26A0")) + `  ${generated.length + cachedResults.length}/${componentResults.length} components` + cachedNote + c.dim(`  ${totalClassified} classified, ${totalExcluded} unattached`) + "\n"
     );
     process.stdout.write(`renamed-slots: ${totalRenamedSlots}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.26.7-dev-build-6f3b072.0",
+  "version": "2.26.7-dev-build-8206e92.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.26.7-dev-build-6f3b072.0"
+    "@contentful/experience-design-system-types": "2.26.7-dev-build-8206e92.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.26.7-dev-build-6f3b072.0",
-    "@contentful/experience-design-system-extraction": "2.26.7-dev-build-6f3b072.0",
-    "@contentful/experience-design-system-generation": "2.26.7-dev-build-6f3b072.0"
+    "@contentful/experience-design-system-client": "2.26.7-dev-build-8206e92.0",
+    "@contentful/experience-design-system-extraction": "2.26.7-dev-build-8206e92.0",
+    "@contentful/experience-design-system-generation": "2.26.7-dev-build-8206e92.0"
   },
   "repository": {
     "type": "git",