@contentful/experience-design-system-cli 2.37.1-dev-build-aa3ffe6f.0 → 2.37.1-dev-build-a029dc0a.0

package/dist/package.json

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

package/dist/src/tui/import/steps/06-extraction/find-skill-path.d.ts

@@ -0,0 +1 @@
+export declare function findSkillPath(fileName: string): string;

package/dist/src/tui/import/steps/06-extraction/logic.d.ts

@@ -1,28 +1,7 @@
-import type { CompositionPhase, ExtractionProgress } from './types.js';
-/** One line of the extract subprocess's stderr, decoded. Lines it does not recognise are ignored. */
-export type ProgressEvent = {
-    kind: 'scan';
-    scanned: number;
-} | {
-    kind: 'scan-done';
-    total: number;
-} | {
-    kind: 'extract';
-    totalFiles: number;
-} | {
-    kind: 'composition';
-    phase: CompositionPhase;
-};
-/** `progress=scan:12`, `progress=scan-done:40`, `progress=extract:3/40:7`, `progress=composition:cache-hit`. */
-export declare function parseProgressLine(line: string): ProgressEvent | null;
-/** `session=<id>` on the extract subprocess's stdout. It arrives before composition finishes, which is when selection starts. */
-export declare function parseSessionLine(line: string): string | null;
-/** The first `session=<id>` anywhere in a command's stdout. */
-export declare function findSession(stdout: string): string | null;
-/** `Extracted 7 components` in the extract command's stderr; 0 when it never printed one. */
-export declare function parseExtractedCount(stderr: string): number;
-/** `(12 tokens` in the output of `print tokens`. */
-export declare function parsePrintTokensCount(stdout: string): number;
+import type { ExtractAndComposeProgress } from '@contentful/experience-design-system-backend-pipeline';
+import type { ExtractionProgress } from './types.js';
+/** Structured progress events emitted by the orchestrator (extraction + composition). */
+export type ProgressEvent = ExtractAndComposeProgress;
 /**
  * Every job the stage will run starts on the first frame, so no row appears later as a surprise. A job that does not
  * apply stays 'idle' and has no row: existing entities need credentials, token definitions need a raw tokens file, and

package/dist/src/tui/import/steps/06-extraction/run.d.ts

@@ -1,24 +1,26 @@
-import { checkAgentAuth } from '@contentful/experience-design-system-generation';
-import { runTokenGeneration, spawnExtract } from './processes.js';
+import { checkAgentAuth, runExtractAndComposeSession, runGenerateTokensSession } from '@contentful/experience-design-system-backend-pipeline';
 import { runSelection } from './selection.js';
 import type { ExtractionInput, ExtractionProgress, ExtractionResult } from './types.js';
 /** The outside world the stage talks to, so the order of events can be tested without a network, an agent or a CLI. */
 export interface ExtractionDeps {
     checkAgentAuth: typeof checkAgentAuth;
     fetchEntities: (credentials: NonNullable<ExtractionInput['credentials']>, outDir: string) => Promise<string | null>;
-    spawnExtract: typeof spawnExtract;
-    runTokenGeneration: typeof runTokenGeneration;
+    runExtractAndComposeSession: typeof runExtractAndComposeSession;
+    runGenerateTokensSession: typeof runGenerateTokensSession;
     runSelection: typeof runSelection;
 }
 /**
- * Runs the stage. The jobs overlap exactly as they do in the legacy wizard:
+ * Runs the stage. The jobs overlap exactly as they did when extract was a
+ * subprocess:
  *
- *   entities fetch ───────┐
- *   __extract ── session= ┴─ selection agent (waits for the fetch) ──┐
- *        └──────────────────────────────── exits (composition done) ─┴─ result
- *   __generate tokens → print tokens   (only when the tokens are not being reused)
+ *   entities fetch ───────────────────┐
+ *   extract + compose (in-process)    │
+ *     └─ onSessionCreated(id) ────────┴─ selection agent (waits for fetch) ──┐
+ *     └──────────────────────── returns (composition done) ─────────────────┴─ result
+ *   token generation            (only when the tokens are not being reused)
  *
- * Selection starts the moment the session id is printed, so it overlaps with composition. When more than one job
- * fails, the error reported is the first of: extract, no components, selection, token generation.
+ * Selection starts the moment the orchestrator mints the sessionId, so it
+ * overlaps with composition. When more than one job fails, the error reported
+ * is the first of: extract, no components, selection, token generation.
  */
 export declare function runExtraction(input: ExtractionInput, onProgress: (progress: ExtractionProgress) => void, deps?: ExtractionDeps): Promise<ExtractionResult>;

package/dist/src/tui/import/steps/06-extraction/selection.d.ts

@@ -1,4 +1,4 @@
-import { type AgentName } from '@contentful/experience-design-system-generation';
+import { type AgentName } from '@contentful/experience-design-system-backend-pipeline';
 export interface SelectionOptions {
     sessionId: string;
     agent: AgentName;

package/dist/src/tui/import/steps/06-extraction/types.d.ts

@@ -2,6 +2,8 @@ import type { ExtractionHandoff, ImportHandoff } from '@contentful/experience-de
 export type TokenStrategy = ImportHandoff['tokens']['strategy'];
 export interface ExtractionInput {
     projectPath: string;
+    /** Absolute source files from the path-validation step (collectFiles output). */
+    filePaths: string[];
     /** Raw tokens file the user pointed at (always set: v2 asks for one). */
     rawTokensPath: string;
     /** From the token reuse step. 'reuse' skips token generation entirely. */
@@ -18,7 +20,7 @@ export interface ExtractionInput {
     promptOverrides: string[];
     noCache: boolean;
 }
-export type CompositionPhase = 'resolving' | 'cache-hit' | 'done' | `agent:${string}`;
+type CompositionPhase = 'resolving' | 'cache-hit' | 'done' | `agent:${string}`;
 type JobStatus = 'idle' | 'running' | 'complete' | 'failed';
 /** Everything the extracting screen shows. One field per row. */
 export interface ExtractionProgress {

package/dist/src/tui/import/steps/07-scope-gate/keymap.d.ts

@@ -80,5 +80,7 @@ export type GateAction = {
     type: 'toggle-jump-filter';
 } | {
     type: 'toggle-view';
+} | {
+    type: 'undo';
 };
 export declare function resolveKey(mode: GateMode, key: KeyPress, ctx: GateContext): GateAction;

package/dist/src/tui/import/steps/07-scope-gate/sidebar/components/GroupedSidebar.d.ts

@@ -45,6 +45,8 @@ export interface VisibleRow {
     cycleChild?: boolean;
     itemIdx: number;
     rootName?: string;
+    /** The parent whose slot the nested row sits in. */
+    parentName?: string;
 }
 export declare function buildVisibleRows(props: {
     items: GroupedSidebarItem[];

package/dist/src/tui/import/steps/07-scope-gate/state.d.ts

@@ -1,5 +1,5 @@
 import { type ScopeGraph } from './graph/index.js';
-import type { Decision, ScopeComponent, ScopeDecisions } from './types.js';
+import type { Decision, ParentChildEdge, ScopeComponent, ScopeDecisions } from './types.js';
 export type DecisionState = Map<string, Decision>;
 export type DecisionAction = {
     type: 'accept';
@@ -15,5 +15,6 @@ export type DecisionAction = {
 export declare function reduceDecisions(state: DecisionState, action: DecisionAction, components: ScopeComponent[], graph: ScopeGraph): DecisionState;
 /** Whether rejecting `name` touches 2 or more other components, so the screen has to ask first. */
 export declare function rejectNeedsConfirmation(graph: ScopeGraph, name: string, state: DecisionState): boolean;
+export declare function withoutSlotChildren(components: ScopeComponent[], removedEdges: ParentChildEdge[]): ScopeComponent[];
 /** Everything not accepted counts as rejected, as legacy's `partition` did. */
-export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState): ScopeDecisions;
+export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState, removedEdges: ParentChildEdge[]): ScopeDecisions;

package/dist/src/tui/import/steps/07-scope-gate/types.d.ts

@@ -10,10 +10,17 @@ export type ScopeComponent = Omit<ScopeComponentRow, 'aiDecision' | 'aiReason' |
     slots?: ScopeComponentRow['slots'];
 };
 export type Decision = 'accepted' | 'rejected' | 'undecided';
+/** One slot edge: `parent` allows `child` in a slot. */
+export interface ParentChildEdge {
+    parent: string;
+    child: string;
+}
 /** What the user confirmed. Becomes `ImportHandoff.scope`; the legacy wizard saves it and starts generation. */
 export interface ScopeDecisions {
     accepted: string[];
     rejected: string[];
+    /** Slot edges removed at the gate. The child keeps its own decision. Missing means none were removed. */
+    excludedSlotEdges?: ParentChildEdge[];
 }
 export type ScopeGateLoad = {
     ok: true;

package/dist/src/tui/import/steps/07-scope-gate/use-scope-gate.d.ts

@@ -10,7 +10,7 @@ export interface PendingRejectCascade {
     ancestors: string[];
     descendants: string[];
 }
-export declare function useScopeGate({ components, onConfirm, onQuit }: UseScopeGateOptions): {
+export declare function useScopeGate({ components: loadedComponents, onConfirm, onQuit }: UseScopeGateOptions): {
     totalWidth: number;
     columnPlan: {
         layout: "single" | "two-column";

package/dist/src/tui/import/steps/08-generation/types.d.ts

@@ -1,11 +1,9 @@
 import type { GenerationHandoff } from '@contentful/experience-design-system-types/handoff';
+import type { ScopeDecisions } from '../07-scope-gate/types.js';
 export interface GenerationInput {
     /** The extraction session the scope was decided on. */
     sessionId: string;
-    decisions: {
-        accepted: string[];
-        rejected: string[];
-    };
+    decisions: ScopeDecisions;
     /**
      * The cache check that ran while the scope gate was open, which restores cached definitions into the pipeline
      * database. The stage waits for it before saving the decisions, since both write to that database.

package/legacy/dist/package.json

@@ -30,10 +30,12 @@
     "lint:fix": "nx lint:fix experience-design-system-cli-legacy"
   },
   "dependencies": {
+    "@contentful/experience-design-system-backend-pipeline": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
     "@inkjs/ui": "^2.0.0",
     "@segment/analytics-node": "^3.0.0",
     "@vue/compiler-sfc": "^3.5.31",
+    "ajv": "^8.17.1",
     "commander": "^13.1.0",
     "contentful-management": "^12.17.0",
     "figures": "6.1.0",
@@ -42,7 +44,8 @@
     "react-devtools-core": "^4.19.1",
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@contentful/experience-design-system-client": "workspace:*",