@contentful/experience-design-system-cli 2.37.1-dev-build-91b5f8aa.0 → 2.37.1-dev-build-fb8573b6.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-91b5f8aa.0",
+  "version": "2.37.1-dev-build-fb8573b6.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "@contentful/experience-design-system-backend-pipeline": "workspace:*",
+    "@contentful/experience-design-system-generation": "workspace:*",
     "@contentful/experience-design-system-types": "workspace:*",
     "@inkjs/ui": "^2.0.0",
     "@segment/analytics-node": "^3.0.0",

package/dist/src/tui/import/spawn-v1-import.d.ts

@@ -1,5 +1,5 @@
 import { type ImportOptions } from '../../commands/import-options.js';
-import type { TokenStrategy } from './steps/05-token-reuse/logic.js';
+import { type ImportHandoff } from '@contentful/experience-design-system-types/handoff';
 interface StepResult {
     step: string;
     status: 'complete' | 'failed' | 'skipped';
@@ -20,8 +20,8 @@ export interface SpawnV1ImportOptions extends Partial<ImportOptions> {
     projectPath?: string;
     tokens?: string;
     filePaths?: string[];
-    skipCredentials?: boolean;
-    tokenStrategy?: TokenStrategy;
+    /** What the CLI already settled and did; the legacy wizard starts from it. */
+    handoff?: ImportHandoff;
     onProgress?: (line: string) => void;
 }
 export interface SpawnV1ImportResult {

package/dist/src/tui/import/steps/04-credentials/logic.d.ts

@@ -1,7 +1,6 @@
 export declare const FIELDS: readonly ["spaceId", "environmentId", "cmaToken", "host"];
 export type CredentialField = (typeof FIELDS)[number];
 export type CredentialValues = Record<CredentialField, string>;
-export declare const DEFAULT_HOST = "api.contentful.com";
 interface Key {
     escape: boolean;
     tab: boolean;
@@ -10,8 +9,6 @@ interface Key {
 export type KeyAction = 'back' | 'next-field' | 'skip' | null;
 export declare function keyAction(input: string, key: Key): KeyAction;
 export declare function nextField(field: CredentialField): CredentialField;
-export declare function toConfiguredHost(host: string | undefined): string;
-export declare function toApiHost(host: string): string;
 export declare function normalize(values: CredentialValues): CredentialValues;
 export declare function missingField(values: CredentialValues): boolean;
 export declare function isUnchanged(current: CredentialValues, initial: CredentialValues): boolean;

package/dist/src/tui/import/steps/04-credentials/validate.d.ts

@@ -1,4 +1,4 @@
-import { type CredentialValues } from './logic.js';
+import type { CredentialValues } from './logic.js';
 export type ValidationResult = {
     ok: true;
 } | {

package/dist/src/tui/import/steps/05-token-reuse/logic.d.ts

@@ -1,4 +1,4 @@
-export type TokenStrategy = 'reuse' | 'regenerate' | 'generate';
+export type { TokenStrategy } from '../06-extraction/types.js';
 export type TokensState = {
     kind: 'none';
 } | {
@@ -19,4 +19,3 @@ export declare function gateText({ tokensPath, sourceChanged }: {
     summary: string;
     context?: string;
 };
-export {};

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

@@ -0,0 +1,69 @@
+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;
+/**
+ * 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
+ * reused tokens are already complete.
+ */
+export declare function initialProgress(input: {
+    hasCredentials: boolean;
+    hasRawTokens: boolean;
+    reuseTokens: boolean;
+}): ExtractionProgress;
+export declare function applyProgressEvent(progress: ExtractionProgress, event: ProgressEvent): ExtractionProgress;
+/** The rows the screen shows, in the order the wizard showed them. Rows that do not apply are left out. */
+export declare function progressRows(progress: ExtractionProgress, agent: string): Array<{
+    text: string;
+    complete: boolean;
+}>;
+/** True when every job is already done, so the screen would only flash. The wizard shows nothing in this case. */
+export declare function isFullCacheHit(progress: ExtractionProgress): boolean;
+/**
+ * The wizard's step counts: three fixed steps, one more when there is a token stage, two more when components are
+ * imported, and one more when the tokens can be mapped (not known yet at this stage, so it adds nothing here).
+ * Extraction is step 2 when there is a token stage, otherwise step 1.
+ */
+export declare function stepNumbers(input: {
+    hasRawTokens: boolean;
+    skipComponents?: boolean;
+    mapTokensEligible?: boolean | null;
+}): {
+    stepNumber: number;
+    totalSteps: number;
+};
+export declare function noComponentsMessage(projectPath: string): string;
+export declare function agentAuthMessage(agent: string, status: 'not-found' | 'unauthenticated'): string;
+/**
+ * The agent and model the import runs with: what was typed after `--agent` (either `agent` or `agent:model`), else
+ * what `experiences setup` saved, else Claude with no model. Same chain the legacy import command uses.
+ */
+export declare function resolveAgentChoice(flag: string | undefined, stored: {
+    agent?: unknown;
+    agentModel?: unknown;
+}): {
+    agent: string;
+    agentModel?: string;
+};

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

@@ -0,0 +1,45 @@
+/** The legacy commands the stage drives, started the way the wizard starts them. */
+export interface SpawnedResult {
+    exitCode: number;
+    stdout: string;
+    stderr: string;
+}
+export interface ExtractCommand {
+    projectPath: string;
+    agent: string;
+    promptOverrides: string[];
+    noCache: boolean;
+}
+export interface TokenGenerationInput {
+    rawTokensPath: string;
+    outDir: string;
+    agent: string;
+    agentModel?: string;
+    promptOverrides: string[];
+    noCache: boolean;
+}
+export type TokenGenerationResult = {
+    ok: true;
+    tokensPath: string;
+    tokenSessionId: string | null;
+    tokenCount: number;
+} | {
+    ok: false;
+    step: 'generate tokens' | 'print tokens';
+    message: string;
+};
+/** Splits a stream into lines as chunks arrive, holding back a trailing partial line until the next chunk completes it. */
+export declare function lineSplitter(onLine: (line: string) => void): (chunk: string) => void;
+/** Arguments for `__extract`, in the order the wizard passes them. The extract command takes an agent but no model. */
+export declare function buildExtractArgs(cliPath: string, command: ExtractCommand): string[];
+/** Arguments for `__generate tokens`, in the order the wizard passes them. */
+export declare function buildGenerateTokensArgs(cliPath: string, input: TokenGenerationInput): string[];
+/** Arguments for `print tokens`, which writes the generated catalog next to the project. */
+export declare function buildPrintTokensArgs(tokensPath: string, tokenSessionId: string | null): string[];
+/** `node <legacy cli> __extract …`, with stderr and stdout delivered line by line while it runs. */
+export declare function spawnExtract(command: ExtractCommand, handlers: {
+    onStderrLine: (line: string) => void;
+    onStdoutLine: (line: string) => void;
+}): Promise<SpawnedResult>;
+/** `__generate tokens`, then `print tokens` to write `<outDir>/tokens.json`. */
+export declare function runTokenGeneration(input: TokenGenerationInput): Promise<TokenGenerationResult>;

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

@@ -0,0 +1,24 @@
+import { checkAgentAuth } from '@contentful/experience-design-system-generation';
+import { runTokenGeneration, spawnExtract } from './processes.js';
+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;
+    runSelection: typeof runSelection;
+}
+/**
+ * Runs the stage. The jobs overlap exactly as they do in the legacy wizard:
+ *
+ *   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)
+ *
+ * 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.
+ */
+export declare function runExtraction(input: ExtractionInput, onProgress: (progress: ExtractionProgress) => void, deps?: ExtractionDeps): Promise<ExtractionResult>;

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

@@ -0,0 +1,10 @@
+import React from 'react';
+import type { ExtractionProgress } from './types.js';
+interface ExtractionScreenProps {
+    progress: ExtractionProgress;
+    agent: string;
+    stepNumber: number;
+    totalSteps: number;
+}
+export declare function ExtractionScreen({ progress, agent, stepNumber, totalSteps, }: ExtractionScreenProps): React.ReactElement;
+export {};

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

@@ -0,0 +1,18 @@
+import { type AgentName } from '@contentful/experience-design-system-generation';
+export interface SelectionOptions {
+    sessionId: string;
+    agent: AgentName;
+    model?: string;
+    promptText?: string;
+    promptPath?: string;
+    noCache: boolean;
+}
+/**
+ * The selection agent run, as the legacy wizard ran it.
+ *
+ * Reads the extracted components from the session database and skips the ones already decided (cache keyed by
+ * component hash, prompt hash and CLI version). It asks the agent about the rest, then writes accepted or rejected to
+ * raw_components and stores the new decisions in the cache in one transaction. Throws on a timeout, a non-zero exit,
+ * or a database error.
+ */
+export declare function runSelection(options: SelectionOptions): Promise<void>;

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

@@ -0,0 +1,44 @@
+import type { ExtractionHandoff, ImportHandoff } from '@contentful/experience-design-system-types/handoff';
+export type TokenStrategy = ImportHandoff['tokens']['strategy'];
+export interface ExtractionInput {
+    projectPath: 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. */
+    tokenStrategy: TokenStrategy;
+    /** Null when the user skipped credentials: no existing-entities fetch happens. */
+    credentials: {
+        spaceId: string;
+        environmentId: string;
+        cmaToken: string;
+        host: string;
+    } | null;
+    agent: string;
+    agentModel?: string;
+    promptOverrides: string[];
+    noCache: boolean;
+}
+export 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 {
+    scan: {
+        scanned: number;
+        total: number | null;
+    } | null;
+    composition: CompositionPhase;
+    selection: 'running' | 'complete';
+    existingEntities: JobStatus;
+    tokens: JobStatus;
+}
+/** The label the error screen shows, as the wizard labelled it. */
+type ExtractionStepName = 'analyze extract' | 'selection agent' | 'generate tokens' | 'print tokens' | `${string} auth check`;
+export type ExtractionResult = {
+    ok: true;
+    extraction: ExtractionHandoff;
+} | {
+    ok: false;
+    step: ExtractionStepName;
+    message: string;
+};
+export {};

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

@@ -0,0 +1,14 @@
+import type { ExtractionInput, ExtractionProgress, ExtractionResult } from './types.js';
+export type ExtractionState = {
+    status: 'running';
+    progress: ExtractionProgress;
+} | {
+    status: 'done';
+    result: ExtractionResult;
+};
+/**
+ * Runs the extraction stage once for the given input and reports its progress. Passing a different input starts a new
+ * run; passing nothing leaves the stage idle. A run that finishes after the input changed or the screen went away is
+ * ignored.
+ */
+export declare function useExtraction(input: ExtractionInput | undefined): ExtractionState | undefined;

package/dist/src/tui/import/steps/index.d.ts

@@ -3,3 +3,4 @@ export { TokenInputScreen } from './02-token-input/screen.js';
 export { PathValidationScreen } from './03-path-validation/screen.js';
 export { CredentialsScreen } from './04-credentials/screen.js';
 export { TokenReuseScreen } from './05-token-reuse/screen.js';
+export { ExtractionScreen } from './06-extraction/screen.js';

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

@@ -14,14 +14,6 @@ export declare function buildGenerateComponentsArgs(opts: {
     restoreCache?: boolean;
     cachedComponents?: string[];
 }): string[];
-export declare function buildGenerateTokensArgs(opts: {
-    rawTokensPath: string;
-    agent: string;
-    model?: string;
-    bedrock?: boolean;
-    noCache?: boolean;
-    promptOverrides?: string[];
-}): string[];
 export declare function buildMapTokensArgs(opts: {
     sessionId: string;
     agent: string;

package/legacy/dist/src/import/tui/handoff.d.ts

@@ -0,0 +1,26 @@
+import { type ImportHandoff } from '@contentful/experience-design-system-types/handoff';
+/** The wizard state the early stages produce. Every field is one the stage used to write. */
+export interface HandoffState {
+    credentialsSkipped: boolean;
+    tokensPath?: string;
+    tokenSessionId?: string | null;
+    tokenCount?: number;
+    tokenGenerationStatus?: 'complete';
+    outDir?: string;
+    extractSessionId?: string;
+    compositionPhase?: 'done' | 'cache-hit';
+    selectionAgentStatus?: 'complete';
+    existingEntitiesStatus?: 'idle' | 'complete' | 'failed';
+    existingEntitiesPath?: string | null;
+}
+export declare function stateFromHandoff(handoff: ImportHandoff): HandoffState;
+export type StartFromHandoff = {
+    ok: true;
+    handoff: ImportHandoff;
+    state: HandoffState;
+} | {
+    ok: false;
+    error: string;
+};
+/** Reads the handoff the CLI passed. A missing or broken one is an error to show, never a guess at a start. */
+export declare function readHandoff(env?: NodeJS.ProcessEnv): StartFromHandoff;