@contentful/experience-design-system-cli 2.37.1-dev-build-7e007460.0 → 2.37.1-dev-build-230b645f.0

package/dist/app.js

@@ -17350,7 +17350,7 @@ function initialProgress(input) {
     composition: "resolving",
     selection: "running",
     existingEntities: input.hasCredentials ? "running" : "idle",
-    tokens: input.hasRawTokens ? input.reuseTokens ? "complete" : "running" : "idle"
+    tokens: input.hasRawTokens ? "running" : "idle"
   };
 }
 function applyProgressEvent(progress, event) {
@@ -17582,8 +17582,7 @@ async function runExtraction(input, onProgress, deps = realDeps) {
   const outDir = input.outDir ?? join18(resolve22(input.projectPath), ".contentful");
   let progress = initialProgress({
     hasCredentials: input.credentials !== null,
-    hasRawTokens: input.rawTokensPath !== "",
-    reuseTokens: input.tokenStrategy === "reuse"
+    hasRawTokens: input.rawTokensPath !== ""
   });
   const update = (change) => {
     progress = { ...progress, ...change };
@@ -17600,15 +17599,14 @@ async function runExtraction(input, onProgress, deps = realDeps) {
   } catch (error) {
     return fail("selection agent", errorMessage2(error));
   }
-  const tokenGeneration = input.rawTokensPath !== "" && input.tokenStrategy !== "reuse" ? deps.runGenerateTokensSession({
+  const tokenGeneration = input.rawTokensPath !== "" ? deps.runGenerateTokensSession({
     rawTokensPath: input.rawTokensPath,
     outDir,
     agent: input.agent,
     ...input.agentModel ? { agentModel: input.agentModel } : {},
     promptOverrides: input.promptOverrides,
     skillPath: TOKENS_SKILL_PATH,
-    // the regenerate answer forces the cache off for this run only
-    noCache: input.noCache || input.tokenStrategy === "regenerate"
+    noCache: input.noCache
   }).then((result) => {
     update({ tokens: "complete" });
     return {
@@ -17670,11 +17668,11 @@ async function runExtraction(input, onProgress, deps = realDeps) {
   if (selectionError) return fail("selection agent", errorMessage2(selectionError));
   const tokens = await tokenGeneration;
   if (tokens && !tokens.ok) return fail(tokens.step, tokens.message);
-  const hasTokenSource = input.rawTokensPath !== "" || input.tokenStrategy === "reuse";
   const extraction = {
     sessionId: extracted.sessionId,
     outDir,
-    tokensPath: tokens?.ok ? tokens.tokensPath : hasTokenSource ? join18(outDir, "tokens.json") : "",
+    // With no raw tokens file nothing is generated, and the later steps read an empty path as "no tokens".
+    tokensPath: tokens?.ok ? tokens.tokensPath : "",
     tokenSessionId: tokens?.ok ? tokens.tokenSessionId : null,
     tokenCount: tokens?.ok ? tokens.tokenCount : 0,
     existingEntitiesPath,
@@ -17724,8 +17722,7 @@ function useExtraction(input) {
       status: "running",
       progress: initialProgress({
         hasCredentials: input.credentials !== null,
-        hasRawTokens: input.rawTokensPath !== "",
-        reuseTokens: input.tokenStrategy === "reuse"
+        hasRawTokens: input.rawTokensPath !== ""
       })
     });
     void runExtraction(input, (progress) => {
@@ -29634,9 +29631,9 @@ function App({ importOptions, inkClear }) {
       ...importOptions
     };
     if (target === "tokens") await startTokensOnly(launch, result);
-    else await startExtraction(launch, "generate", result);
+    else await startExtraction(launch, result);
   };
-  const prepareRun = async (launch, tokenStrategy, credentials) => {
+  const prepareRun = async (launch, credentials) => {
     const settings = await readSettings2();
     const { agent, agentModel } = resolveAgentChoice(launch.agent, settings);
     const generatePromptPath = typeof settings.generatePromptPath === "string" ? settings.generatePromptPath : void 0;
@@ -29651,7 +29648,6 @@ function App({ importOptions, inkClear }) {
         outDir,
         filePaths: launch.filePaths ?? [],
         rawTokensPath: launch.tokens ?? "",
-        tokenStrategy,
         credentials: credentials.skipped ? null : credentials.credentials,
         agent,
         ...agentModel ? { agentModel } : {},
@@ -29660,18 +29656,17 @@ function App({ importOptions, inkClear }) {
       }
     };
   };
-  const startExtraction = async (launch, tokenStrategy, credentials) => {
-    const run = await prepareRun(launch, tokenStrategy, credentials);
+  const startExtraction = async (launch, credentials) => {
+    const run = await prepareRun(launch, credentials);
     setExtractionRun({
       ...run.generatePromptPath ? { generatePromptPath: run.generatePromptPath } : {},
       launch: run.launch,
       credentialsSkipped: credentials.skipped,
-      tokenStrategy,
       input: run.input
     });
   };
   const startTokensOnly = async (launch, credentials) => {
-    const { input, outDir } = await prepareRun(launch, "generate", credentials);
+    const { input, outDir } = await prepareRun(launch, credentials);
     setTokensOnlyRun({
       credentialsSkipped: credentials.skipped,
       input,
@@ -29725,7 +29720,7 @@ function App({ importOptions, inkClear }) {
   }, [scopeFlow, scopeRun, generationInput]);
   useEffect28(() => {
     if (!scopeRun || generation?.status !== "done" || !generation.result.ok) return;
-    const { credentialsSkipped, tokenStrategy, extraction: produced, input, generatePromptPath } = scopeRun;
+    const { credentialsSkipped, extraction: produced, input, generatePromptPath } = scopeRun;
     inkClear();
     setScopeRun(void 0);
     setGenerationInput(void 0);
@@ -29735,7 +29730,7 @@ function App({ importOptions, inkClear }) {
         saved: importDefaults?.credentials,
         handoff: {
           credentialsSkipped,
-          tokens: { strategy: tokenStrategy },
+          tokens: { strategy: "generate" },
           extraction: produced,
           generation: generation.result.generation
         },

package/dist/index.js

@@ -19698,7 +19698,7 @@ function initialProgress(input) {
     composition: "resolving",
     selection: "running",
     existingEntities: input.hasCredentials ? "running" : "idle",
-    tokens: input.hasRawTokens ? input.reuseTokens ? "complete" : "running" : "idle"
+    tokens: input.hasRawTokens ? "running" : "idle"
   };
 }
 function applyProgressEvent(progress, event) {
@@ -19951,8 +19951,7 @@ async function runExtraction(input, onProgress, deps = realDeps) {
   const outDir = input.outDir ?? join19(resolve22(input.projectPath), ".contentful");
   let progress = initialProgress({
     hasCredentials: input.credentials !== null,
-    hasRawTokens: input.rawTokensPath !== "",
-    reuseTokens: input.tokenStrategy === "reuse"
+    hasRawTokens: input.rawTokensPath !== ""
   });
   const update = (change) => {
     progress = { ...progress, ...change };
@@ -19969,15 +19968,14 @@ async function runExtraction(input, onProgress, deps = realDeps) {
   } catch (error) {
     return fail("selection agent", errorMessage2(error));
   }
-  const tokenGeneration = input.rawTokensPath !== "" && input.tokenStrategy !== "reuse" ? deps.runGenerateTokensSession({
+  const tokenGeneration = input.rawTokensPath !== "" ? deps.runGenerateTokensSession({
     rawTokensPath: input.rawTokensPath,
     outDir,
     agent: input.agent,
     ...input.agentModel ? { agentModel: input.agentModel } : {},
     promptOverrides: input.promptOverrides,
     skillPath: TOKENS_SKILL_PATH,
-    // the regenerate answer forces the cache off for this run only
-    noCache: input.noCache || input.tokenStrategy === "regenerate"
+    noCache: input.noCache
   }).then((result) => {
     update({ tokens: "complete" });
     return {
@@ -20039,11 +20037,11 @@ async function runExtraction(input, onProgress, deps = realDeps) {
   if (selectionError) return fail("selection agent", errorMessage2(selectionError));
   const tokens = await tokenGeneration;
   if (tokens && !tokens.ok) return fail(tokens.step, tokens.message);
-  const hasTokenSource = input.rawTokensPath !== "" || input.tokenStrategy === "reuse";
   const extraction = {
     sessionId: extracted.sessionId,
     outDir,
-    tokensPath: tokens?.ok ? tokens.tokensPath : hasTokenSource ? join19(outDir, "tokens.json") : "",
+    // With no raw tokens file nothing is generated, and the later steps read an empty path as "no tokens".
+    tokensPath: tokens?.ok ? tokens.tokensPath : "",
     tokenSessionId: tokens?.ok ? tokens.tokenSessionId : null,
     tokenCount: tokens?.ok ? tokens.tokenCount : 0,
     existingEntitiesPath,
@@ -20114,8 +20112,7 @@ function useExtraction(input) {
       status: "running",
       progress: initialProgress({
         hasCredentials: input.credentials !== null,
-        hasRawTokens: input.rawTokensPath !== "",
-        reuseTokens: input.tokenStrategy === "reuse"
+        hasRawTokens: input.rawTokensPath !== ""
       })
     });
     void runExtraction(input, (progress) => {
@@ -33266,9 +33263,9 @@ function App({ importOptions, inkClear }) {
       ...importOptions
     };
     if (target === "tokens") await startTokensOnly(launch, result);
-    else await startExtraction(launch, "generate", result);
+    else await startExtraction(launch, result);
   };
-  const prepareRun = async (launch, tokenStrategy, credentials) => {
+  const prepareRun = async (launch, credentials) => {
     const settings = await readSettings2();
     const { agent, agentModel } = resolveAgentChoice(launch.agent, settings);
     const generatePromptPath = typeof settings.generatePromptPath === "string" ? settings.generatePromptPath : void 0;
@@ -33283,7 +33280,6 @@ function App({ importOptions, inkClear }) {
         outDir,
         filePaths: launch.filePaths ?? [],
         rawTokensPath: launch.tokens ?? "",
-        tokenStrategy,
         credentials: credentials.skipped ? null : credentials.credentials,
         agent,
         ...agentModel ? { agentModel } : {},
@@ -33292,18 +33288,17 @@ function App({ importOptions, inkClear }) {
       }
     };
   };
-  const startExtraction = async (launch, tokenStrategy, credentials) => {
-    const run = await prepareRun(launch, tokenStrategy, credentials);
+  const startExtraction = async (launch, credentials) => {
+    const run = await prepareRun(launch, credentials);
     setExtractionRun({
       ...run.generatePromptPath ? { generatePromptPath: run.generatePromptPath } : {},
       launch: run.launch,
       credentialsSkipped: credentials.skipped,
-      tokenStrategy,
       input: run.input
     });
   };
   const startTokensOnly = async (launch, credentials) => {
-    const { input, outDir } = await prepareRun(launch, "generate", credentials);
+    const { input, outDir } = await prepareRun(launch, credentials);
     setTokensOnlyRun({
       credentialsSkipped: credentials.skipped,
       input,
@@ -33357,7 +33352,7 @@ function App({ importOptions, inkClear }) {
   }, [scopeFlow, scopeRun, generationInput]);
   useEffect28(() => {
     if (!scopeRun || generation?.status !== "done" || !generation.result.ok) return;
-    const { credentialsSkipped, tokenStrategy, extraction: produced, input, generatePromptPath } = scopeRun;
+    const { credentialsSkipped, extraction: produced, input, generatePromptPath } = scopeRun;
     inkClear();
     setScopeRun(void 0);
     setGenerationInput(void 0);
@@ -33367,7 +33362,7 @@ function App({ importOptions, inkClear }) {
         saved: importDefaults?.credentials,
         handoff: {
           credentialsSkipped,
-          tokens: { strategy: tokenStrategy },
+          tokens: { strategy: "generate" },
           extraction: produced,
           generation: generation.result.generation
         },

package/dist/package.json

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

package/dist/src/tui/import/steps/00-preflight/logic.d.ts

@@ -1,12 +1,10 @@
+import type { OverviewStep } from '../../shared/index.js';
 export type ImportTarget = 'both' | 'tokens' | 'components';
 export declare const IMPORT_TARGET_OPTIONS: ReadonlyArray<{
     target: ImportTarget;
     label: string;
 }>;
-export declare const TOKENS_ONLY_OVERVIEW: ReadonlyArray<{
-    description: string;
-    ai: boolean;
-}>;
+export declare const TOKENS_ONLY_OVERVIEW: readonly OverviewStep[];
 export declare const TOKENS_ONLY_STEP_COUNT: number;
 export type ImportStepId = 'project' | 'token-file' | 'path-validation' | 'credentials' | 'component-extraction' | 'token-generation' | 'scope-gate' | 'generation' | 'review' | 'save-push';
 export declare function stepsFor(target: ImportTarget): readonly ImportStepId[];

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

@@ -4,13 +4,11 @@ import type { ExtractionProgress } from './types.js';
 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
- * reused tokens are already complete.
+ * apply stays 'idle' and has no row: existing entities need credentials, and token definitions need a raw tokens file.
  */
 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. */

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

@@ -1,15 +1,12 @@
-import type { ExtractionHandoff, ImportHandoff } from '@contentful/experience-design-system-types/handoff';
-export type TokenStrategy = ImportHandoff['tokens']['strategy'];
+import type { ExtractionHandoff } from '@contentful/experience-design-system-types/handoff';
 export interface ExtractionInput {
     projectPath: string;
     /** Where the stage writes tokens.json and the other files. Defaults to `<projectPath>/.contentful`. */
     outDir?: 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). */
+    /** Raw tokens file the user pointed at. Empty when the import does not generate tokens (components only). */
     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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-7e007460.0",
+  "version": "2.37.1-dev-build-230b645f.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-7e007460.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-7e007460.0"
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-230b645f.0",
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-230b645f.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",

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

@@ -1,15 +0,0 @@
-export type { TokenStrategy } from '../06-extraction/types.js';
-export type TokensState = {
-    kind: 'none';
-} | {
-    kind: 'cached';
-    tokensPath: string;
-    sourceChanged: boolean;
-};
-interface InspectInput {
-    rawTokensPath: string;
-    /** The `.contentful` folder: the sessions' `dsi-import` folders sit inside it, and an older `tokens.json` may sit in it. */
-    contentfulDir: string;
-    cache: boolean;
-}
-export declare function inspectTokens({ rawTokensPath, contentfulDir, cache }: InspectInput): Promise<TokensState>;