@contentful/experience-design-system-cli 2.32.1-dev-build-1fa72fc.0 → 2.32.1-dev-build-6df99c1.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-1fa72fc.0",
+  "version": "2.32.1-dev-build-6df99c1.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -43,6 +43,7 @@
     "@segment/analytics-node": "^3.0.0",
     "@vue/compiler-sfc": "^3.5.31",
     "commander": "^13.1.0",
+    "contentful-management": "^12.17.0",
     "ink": "^4.4.1",
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",

package/dist/src/helpers/cma-client.d.ts

@@ -0,0 +1,17 @@
+import { type PlainClientAPI } from 'contentful-management';
+interface CreateCmaClientOptions {
+    cmaToken: string;
+    /**
+     * Optional CMA host override. Accepts either a full URL
+     * (`https://api.contentful.com`) or a bare hostname (`api.contentful.com`);
+     * contentful-management wants the bare form so we normalize here.
+     */
+    host?: string;
+}
+/**
+ * Build a plain contentful-management client. Single place that picks the
+ * `{ type: 'plain' }` overload so callers never have to think about it,
+ * and normalizes host into the bare-hostname shape the SDK expects.
+ */
+export declare function createCmaClient(opts: CreateCmaClientOptions): PlainClientAPI;
+export {};

package/dist/src/helpers/fetch-existing-entities.d.ts

@@ -0,0 +1,16 @@
+import { type ComponentProps, type DesignTokenProps, type PlainClientAPI } from 'contentful-management';
+export interface ExistingEntities {
+    components: ComponentProps[];
+    tokens: DesignTokenProps[];
+}
+interface FetchExistingEntitiesParams {
+    spaceId: string;
+    environmentId: string;
+}
+/**
+ * Fetch all existing Components + DesignTokens for a space+env. Pagination
+ * is delegated to the SDK's `fetchAll()` helper. Caller supplies the
+ * pre-built plain client (see `createCmaClient()`).
+ */
+export declare function fetchExistingEntities(client: PlainClientAPI, params: FetchExistingEntitiesParams): Promise<ExistingEntities>;
+export {};

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

@@ -28,6 +28,7 @@ export interface PipelineOptions {
     /** When true, auto-reject cycle participants and retry push instead of surfacing an error. */
     autoRejectCycles?: boolean;
     allowDeletions?: boolean;
+    withSpaceContext?: boolean;
     compositionMode?: CompositionMode;
     compositionMap?: string;
     compositionAgent?: boolean;

package/dist/src/index.js

@@ -16647,7 +16647,7 @@ var init_save_path_resolver = __esm({
 });
 
 // packages/experience-design-system-cli/src/runs/store.ts
-import { readFile as readFile22, writeFile as writeFile5, mkdir as mkdir6, rename } from "node:fs/promises";
+import { readFile as readFile22, writeFile as writeFile6, mkdir as mkdir6, rename } from "node:fs/promises";
 import { join as join20 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 import { randomBytes as randomBytes2 } from "node:crypto";
@@ -16710,7 +16710,7 @@ async function writeAtomic(file) {
   await mkdir6(RUNS_DIR, { recursive: true });
   const body = JSON.stringify(file, null, 2) + "\n";
   const tmp = `${RUNS_PATH}.${process.pid}.${Date.now()}.tmp`;
-  await writeFile5(tmp, body, { mode: 384 });
+  await writeFile6(tmp, body, { mode: 384 });
   await rename(tmp, RUNS_PATH);
 }
 async function appendRun(input) {
@@ -34416,14 +34416,38 @@ init_db();
 init_command();
 init_manifest();
 init_api_client();
+import { mkdir as mkdir5, writeFile as writeFile5 } from "node:fs/promises";
+import { join as join18, resolve as resolve21 } from "node:path";
+import { execFile as execFile2 } from "node:child_process";
+
+// packages/experience-design-system-cli/src/helpers/fetch-existing-entities.ts
+import { fetchAll } from "contentful-management";
+async function fetchExistingEntities(client2, params) {
+  const scope = { spaceId: params.spaceId, environmentId: params.environmentId, query: {} };
+  const components = await fetchAll(client2.component.getMany, scope);
+  const tokens = await fetchAll(client2.designToken.getMany, scope);
+  return { components, tokens };
+}
+
+// packages/experience-design-system-cli/src/helpers/cma-client.ts
+init_host_utils();
+import { createClient as createClient2 } from "contentful-management";
+function createCmaClient(opts) {
+  return createClient2(
+    {
+      accessToken: opts.cmaToken,
+      ...opts.host ? { host: toConfiguredHost(opts.host) } : {}
+    },
+    { type: "plain" }
+  );
+}
+
+// packages/experience-design-system-cli/src/import/orchestrator.ts
 init_contentful_urls();
 init_debug_logger();
 init_analytics();
 init_env();
 init_cli_path();
-import { mkdir as mkdir5 } from "node:fs/promises";
-import { join as join18, resolve as resolve21 } from "node:path";
-import { execFile as execFile2 } from "node:child_process";
 async function runStep(args, cliPath, analyticsSessionId, env = {}, streamStderr = false) {
   const debug = getDebugLogger();
   const startedAt = Date.now();
@@ -34531,11 +34555,70 @@ async function runPipeline(opts, progressWriter, cliPathOverride) {
   await mkdir5(outDir, { recursive: true });
   const steps = [];
   let stepNum = 0;
-  const totalSteps = 5 + (opts.print ? 1 : 0);
+  const wantsSpaceContext = opts.withSpaceContext === true;
+  const canFetchSpaceContext = wantsSpaceContext && !!opts.spaceId && !!opts.environmentId && !!opts.cmaToken;
+  const totalSteps = 5 + (opts.print ? 1 : 0) + (canFetchSpaceContext ? 1 : 0);
   function stepLabel(name) {
     stepNum++;
     return `  Step ${stepNum}/${totalSteps}  ${name}  `;
   }
+  if (wantsSpaceContext && !canFetchSpaceContext) {
+    progressWriter(
+      "  Note: --with-space-context requires --space-id, --environment-id, and --cma-token; skipping context fetch."
+    );
+  }
+  if (canFetchSpaceContext) {
+    const fetchLabel = stepLabel("Fetching existing components + design tokens");
+    const fetchStepId = createStep(db, sessionId2, "fetch existing entities", {
+      spaceId: opts.spaceId,
+      environmentId: opts.environmentId
+    });
+    const t0 = Date.now();
+    try {
+      const cmaClient = createCmaClient({
+        cmaToken: opts.cmaToken,
+        ...opts.host ? { host: opts.host } : {}
+      });
+      const existingComponentsAndTokens = await fetchExistingEntities(cmaClient, {
+        spaceId: opts.spaceId,
+        environmentId: opts.environmentId
+      });
+      const fetchDurationMs = Date.now() - t0;
+      const existingEntitiesPath = join18(outDir, ".existing-entities.json");
+      await writeFile5(existingEntitiesPath, JSON.stringify(existingComponentsAndTokens, null, 2), "utf8");
+      updateStep(db, fetchStepId, "complete", {
+        components: String(existingComponentsAndTokens.components.length),
+        tokens: String(existingComponentsAndTokens.tokens.length),
+        path: existingEntitiesPath
+      });
+      progressWriter(
+        `${fetchLabel}\u2713  ${existingComponentsAndTokens.components.length} component${existingComponentsAndTokens.components.length === 1 ? "" : "s"}, ${existingComponentsAndTokens.tokens.length} token${existingComponentsAndTokens.tokens.length === 1 ? "" : "s"}  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+      );
+      steps.push({
+        step: "fetch existing entities",
+        status: "complete",
+        durationMs: fetchDurationMs,
+        detail: {
+          components: existingComponentsAndTokens.components.length,
+          tokens: existingComponentsAndTokens.tokens.length
+        }
+      });
+    } catch (error) {
+      const fetchDurationMs = Date.now() - t0;
+      const message = error instanceof Error ? error.message : String(error);
+      updateStep(db, fetchStepId, "complete", {}, message);
+      progressWriter(
+        `${fetchLabel}\u26A0  fetch failed, continuing without space context  (${(fetchDurationMs / 1e3).toFixed(1)}s)`
+      );
+      progressWriter(`    ${message.split("\n")[0]}`);
+      steps.push({
+        step: "fetch existing entities",
+        status: "skipped",
+        durationMs: fetchDurationMs,
+        reason: `fetch failed: ${message.split("\n")[0]}`
+      });
+    }
+  }
   const analyzeLabel = stepLabel("Statically analyzing project");
   const analyzeSkipped = !opts.noCache && opts.skipAnalyze;
   let extractSessionId = null;
@@ -35490,7 +35573,10 @@ function registerImportCommand(program) {
     "Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md",
     (v, acc) => [...acc, v],
     []
-  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
+  ).option("--auto-reject-cycles", "Automatically reject components involved in slot cycles and retry").option(
+    "--with-space-context",
+    "Fetch existing Components + DesignTokens from the target space+env and persist them under <out>/.existing-entities.json for future agent-context enrichment. Requires --space-id, --environment-id, and --cma-token."
+  ).option("--auto-filter", "Force the AI auto-filter ON (overrides the credentials.json autoFilter preference)").option(
     "--no-auto-filter",
     "Skip the automatic AI pre-filter; jump straight to manual scope-gate (overrides the credentials.json autoFilter preference; no-op when paired with --auto-accept-scope)"
   ).option(
@@ -35837,6 +35923,7 @@ function registerImportCommand(program) {
           dryRun: dryRunForward,
           selectPromptPath: opts.selectPromptPath,
           autoRejectCycles: opts.autoRejectCycles ?? false,
+          withSpaceContext: opts.withSpaceContext ?? false,
           allowDeletions: opts.allowDeletions ?? false,
           compositionMode: headlessCompositionMode,
           ...opts.compositionMap ? { compositionMap: opts.compositionMap } : {},

package/dist/src/session/db.d.ts

@@ -5,7 +5,7 @@ import type { ToolCall, TokenToolCall, ComponentSourceRef } from '@contentful/ex
 import type { ComponentTypeSummary } from '@contentful/experience-design-system-types';
 import type { SlotCycle, SlotEdge } from '../analyze/cycle-detection.js';
 export type StepStatus = 'pending' | 'complete' | 'failed' | 'interrupted';
-export type CommandName = 'analyze extract' | 'analyze select' | 'generate components' | 'generate tokens' | 'generate edit' | 'apply preview' | 'apply select' | 'apply push' | 'print components' | 'print tokens' | 'map tokens' | 'import';
+export type CommandName = 'analyze extract' | 'analyze select' | 'generate components' | 'generate tokens' | 'generate edit' | 'apply preview' | 'apply select' | 'apply push' | 'print components' | 'print tokens' | 'map tokens' | 'fetch existing entities' | 'import';
 export interface SessionRow {
     id: string;
     name: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.32.1-dev-build-1fa72fc.0",
+  "version": "2.32.1-dev-build-6df99c1.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -32,6 +32,7 @@
     "@segment/analytics-node": "^3.0.0",
     "@vue/compiler-sfc": "^3.5.31",
     "commander": "^13.1.0",
+    "contentful-management": "^12.17.0",
     "ink": "^4.4.1",
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
@@ -39,8 +40,8 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-1fa72fc.0",
-    "@contentful/experience-design-system-types": "2.32.1-dev-build-1fa72fc.0"
+    "@contentful/experience-design-system-cli-v2": "2.32.1-dev-build-6df99c1.0",
+    "@contentful/experience-design-system-types": "2.32.1-dev-build-6df99c1.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",
@@ -52,9 +53,9 @@
     "ink-testing-library": "^4.0.0",
     "typescript-eslint": "^8.67.0",
     "vitest": "^4.0.16",
-    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-1fa72fc.0",
-    "@contentful/experience-design-system-client": "2.32.1-dev-build-1fa72fc.0",
-    "@contentful/experience-design-system-generation": "2.32.1-dev-build-1fa72fc.0"
+    "@contentful/experience-design-system-generation": "2.32.1-dev-build-6df99c1.0",
+    "@contentful/experience-design-system-client": "2.32.1-dev-build-6df99c1.0",
+    "@contentful/experience-design-system-extraction": "2.32.1-dev-build-6df99c1.0"
   },
   "repository": {
     "type": "git",