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

package/dist/package.json

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

package/dist/src/tui/import/shared/error-step/controls.d.ts

@@ -0,0 +1,7 @@
+interface ErrorHandlers {
+    onExit: () => void;
+    onRetry?: () => void;
+    onAcknowledge?: () => void;
+}
+export declare function useErrorControls(handlers: ErrorHandlers): void;
+export {};

package/dist/src/tui/import/shared/error-step/error-step.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+interface ErrorStepProps {
+    stepName: string;
+    message: string;
+    onExit: () => void;
+    onRetryCredentials?: () => void;
+    onAcknowledgeBreakingChanges?: () => void;
+}
+export declare function ErrorStep({ stepName, message, onExit, onRetryCredentials, onAcknowledgeBreakingChanges, }: ErrorStepProps): React.ReactElement;
+export {};

package/dist/src/tui/import/shared/error-step/logic.d.ts

@@ -0,0 +1,15 @@
+interface Key {
+    return: boolean;
+    escape: boolean;
+}
+export type ErrorAction = 'exit' | 'retry' | 'acknowledge' | null;
+interface Available {
+    canRetry: boolean;
+    canAcknowledge: boolean;
+}
+export declare function errorAction(input: string, key: Key, available: Available): ErrorAction;
+export declare function errorControls(available: Available): {
+    keys: string;
+    label: string;
+}[];
+export {};

package/dist/src/tui/import/shared/gate-step/controls.d.ts

@@ -0,0 +1,8 @@
+interface GateHandlers {
+    canSkip: boolean;
+    onContinue: () => void;
+    onSkip: () => void;
+    onQuit: () => void;
+}
+export declare function useGateControls(handlers: GateHandlers): void;
+export {};

package/dist/src/tui/import/shared/gate-step/gate-step.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+interface GateStepProps {
+    message: string;
+    onContinue: () => void;
+    onQuit: () => void;
+    summary?: string;
+    context?: string;
+    continueLabel?: string;
+    skipLabel?: string;
+    onSkip?: () => void;
+    intent?: 'success' | 'error';
+}
+export declare function GateStep({ message, onContinue, onQuit, summary, context, continueLabel, skipLabel, onSkip, intent, }: GateStepProps): React.ReactElement;
+export {};

package/dist/src/tui/import/shared/gate-step/logic.d.ts

@@ -0,0 +1,11 @@
+interface Key {
+    return: boolean;
+    escape: boolean;
+}
+export type GateAction = 'continue' | 'skip' | 'quit' | null;
+export declare function gateAction(input: string, key: Key, canSkip: boolean): GateAction;
+export declare function gateControls(continueLabel: string, skipLabel: string, canSkip: boolean): {
+    keys: string;
+    label: string;
+}[];
+export {};

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

@@ -0,0 +1,3 @@
+export { ErrorStep } from './error-step/error-step.js';
+export { GateStep } from './gate-step/gate-step.js';
+export { RunningStep } from './running-step/running-step.js';

package/dist/src/tui/import/shared/running-step/logic.d.ts

@@ -0,0 +1,12 @@
+export interface Progress {
+    done: number;
+    total: number;
+}
+export interface RunningLine {
+    text: string;
+    complete?: boolean;
+    progress?: Progress;
+}
+export declare function progressPercent(progress: Progress): number;
+export declare function formatElapsed(totalSeconds: number): string;
+export declare function stepLabel(stepNumber: number, totalSteps: number, title: string): string;

package/dist/src/tui/import/shared/running-step/running-step.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { type RunningLine } from './logic.js';
+interface RunningStepProps {
+    stepNumber: number;
+    totalSteps: number;
+    title: string;
+    description: string;
+    lines?: readonly RunningLine[];
+}
+export declare function RunningStep({ stepNumber, totalSteps, title, description, lines, }: RunningStepProps): React.ReactElement;
+export {};

package/dist/src/tui/import/shared/running-step/theme.d.ts

@@ -0,0 +1,3 @@
+export declare const PROGRESS_THEME: {
+    components: Record<string, import("@inkjs/ui").ComponentTheme>;
+};

package/dist/src/tui/import/shared/running-step/use-elapsed.d.ts

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

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

@@ -1,4 +1,5 @@
 import { type ImportOptions } from '../../commands/import-options.js';
+import type { TokenStrategy } from './steps/05-token-reuse/logic.js';
 interface StepResult {
     step: string;
     status: 'complete' | 'failed' | 'skipped';
@@ -20,6 +21,7 @@ export interface SpawnV1ImportOptions extends Partial<ImportOptions> {
     tokens?: string;
     filePaths?: string[];
     skipCredentials?: boolean;
+    tokenStrategy?: TokenStrategy;
     onProgress?: (line: string) => void;
 }
 export interface SpawnV1ImportResult {
@@ -29,5 +31,6 @@ export interface SpawnV1ImportResult {
     stderr: string;
 }
 export declare function buildArgs(options: SpawnV1ImportOptions): string[];
+export declare function buildEnv(options: SpawnV1ImportOptions, base?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare function spawnV1Import(options?: SpawnV1ImportOptions): Promise<SpawnV1ImportResult>;
 export {};

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

@@ -0,0 +1,22 @@
+export type TokenStrategy = 'reuse' | 'regenerate' | 'generate';
+export type TokensState = {
+    kind: 'none';
+} | {
+    kind: 'cached';
+    tokensPath: string;
+    sourceChanged: boolean;
+};
+interface InspectInput {
+    rawTokensPath: string;
+    outDir: string;
+    cache: boolean;
+}
+export declare function inspectTokens({ rawTokensPath, outDir, cache }: InspectInput): Promise<TokensState>;
+export declare function gateText({ tokensPath, sourceChanged }: {
+    tokensPath: string;
+    sourceChanged: boolean;
+}): {
+    summary: string;
+    context?: string;
+};
+export {};

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

@@ -0,0 +1,10 @@
+import React from 'react';
+interface TokenReuseScreenProps {
+    tokensPath: string;
+    sourceChanged: boolean;
+    onReuse: () => void;
+    onRegenerate: () => void;
+    onQuit: () => void;
+}
+export declare function TokenReuseScreen({ tokensPath, sourceChanged, onReuse, onRegenerate, onQuit, }: TokenReuseScreenProps): React.ReactElement;
+export {};

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

@@ -2,3 +2,4 @@ export { WelcomeScreen } from './01-welcome/screen.js';
 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';

package/legacy/dist/src/index.js

@@ -16569,10 +16569,10 @@ function extractSlotsFromSetupFunction(options) {
   if (!body)
     return [];
   const slotsByName = /* @__PURE__ */ new Map();
-  for (const access9 of body.getDescendantsOfKind(SyntaxKind11.PropertyAccessExpression)) {
-    if (access9.getExpression().getText() !== slotsName)
+  for (const access8 of body.getDescendantsOfKind(SyntaxKind11.PropertyAccessExpression)) {
+    if (access8.getExpression().getText() !== slotsName)
       continue;
-    const slotName = access9.getName();
+    const slotName = access8.getName();
     if (!slotsByName.has(slotName)) {
       slotsByName.set(slotName, {
         name: slotName,
@@ -27475,7 +27475,7 @@ import { useEffect as useEffect14, useRef as useRef9, useState as useState19 } f
 import { Box as Box38, Text as Text40 } from "ink";
 import { join as join20, resolve as resolve18 } from "node:path";
 import { appendFileSync as appendFileSync2, writeFileSync } from "node:fs";
-import { access as access7, stat as stat5, writeFile as writeFile5 } from "node:fs/promises";
+import { writeFile as writeFile5 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { execFile as execFile2, spawn as spawn5 } from "node:child_process";
 import { mkdir as mkdir4 } from "node:fs/promises";
@@ -27646,7 +27646,6 @@ function WizardApp({
     outDir: initialOutDir,
     rawTokensPath: rawTokensEntryReady ? initialRawTokensPath : "",
     tokensPath: "",
-    tokenSourceChanged: null,
     skipComponents: false,
     tokenSessionId: null,
     tokenGenerationStatus: "idle",
@@ -28903,49 +28902,30 @@ If using a custom host configuration, make sure the space exists on that host.`
       void runPreview(extractSessionId, tokensPath, state.spaceId, state.environmentId, state.cmaToken, state.host);
     }
   };
-  const tokenReuseChecked = useRef9(false);
-  const [tokenReuseSettled, setTokenReuseSettled] = useState19(!state.rawTokensPath);
+  const tokenStrategyApplied = useRef9(false);
   useEffect14(() => {
-    if (state.rawTokensPath) {
-      if (tokenReuseChecked.current) return;
-      tokenReuseChecked.current = true;
-      const existingTokensPath = join20(state.outDir, "tokens.json");
-      if (effectiveNoCache) {
-        tokenGenerationPromiseRef.current = runAgentAuthCheck("credentials").then(
-          (ok2) => ok2 ? runGenerateTokens(state.rawTokensPath, state.outDir) : false
-        );
-        setTokenReuseSettled(true);
-        return;
-      }
-      (async () => {
-        try {
-          await access7(existingTokensPath);
-          const [tokensStat, sourceStat] = await Promise.all([
-            stat5(existingTokensPath),
-            stat5(state.rawTokensPath).catch(() => null)
-          ]);
-          const sourceChanged = sourceStat ? sourceStat.mtimeMs > tokensStat.mtimeMs : false;
-          update({
-            step: "token-reuse-gate",
-            tokensPath: existingTokensPath,
-            tokenSourceChanged: sourceChanged
-          });
-        } catch {
-          tokenGenerationPromiseRef.current = runAgentAuthCheck("credentials").then(
-            (ok2) => ok2 ? runGenerateTokens(state.rawTokensPath, state.outDir) : false
-          );
-          setTokenReuseSettled(true);
-        }
-      })();
+    if (!state.rawTokensPath || tokenStrategyApplied.current) return;
+    tokenStrategyApplied.current = true;
+    const strategy = process.env["EDS_IMPORT_TOKENS"];
+    if (strategy === "reuse") {
+      update({
+        tokensPath: join20(state.outDir, "tokens.json"),
+        tokenSessionId: null,
+        tokenGenerationStatus: "complete"
+      });
+      return;
     }
+    tokenGenerationPromiseRef.current = runAgentAuthCheck("credentials").then(
+      (ok2) => ok2 ? runGenerateTokens(state.rawTokensPath, state.outDir, strategy === "regenerate") : false
+    );
   }, [state.rawTokensPath]);
   const credentialsHandedOff = useRef9(false);
   useEffect14(() => {
-    if (state.step !== "credentials" || !tokenReuseSettled || credentialsHandedOff.current) return;
+    if (state.step !== "credentials" || credentialsHandedOff.current) return;
     credentialsHandedOff.current = true;
     if (process.env["EDS_IMPORT_SKIP_CREDENTIALS"] === "1") update({ credentialsSkipped: true });
     void advanceAfterCredentialsValidated();
-  }, [state.step, tokenReuseSettled]);
+  }, [state.step]);
   const noQuitSteps = [
     "checking-claude-auth",
     "validating-credentials",
@@ -28963,39 +28943,6 @@ If using a custom host configuration, make sure the space exists on that host.`
   const totalSteps = 3 + (hasTokenStage ? 1 : 0) + (hasComponents ? 2 : 0) + (state.mapTokensEligible === true ? 1 : 0);
   const stepContent = (() => {
     switch (state.step) {
-      case "token-reuse-gate":
-        return /* @__PURE__ */ jsx47(
-          GateStep,
-          {
-            successMessage: "Existing tokens.json found",
-            summary: state.tokenSourceChanged ? `Source file has been modified since tokens were last generated.
-
-Tokens Path: ${state.tokensPath}` : `Source file has not changed since tokens were last generated.
-
-Tokens Path: ${state.tokensPath}`,
-            context: state.tokenSourceChanged ? "The source tokens file changed \u2014 regenerating is recommended." : void 0,
-            continueLabel: "Reuse existing tokens",
-            skipLabel: "Regenerate tokens",
-            showSkip: true,
-            onContinue: () => {
-              setTokenReuseSettled(true);
-              update({
-                step: "credentials",
-                tokenSessionId: null,
-                tokenGenerationStatus: "complete"
-              });
-            },
-            onSkip: async () => {
-              update({ tokenSourceChanged: null });
-              setTokenReuseSettled(true);
-              update({ step: "credentials" });
-              if (await runAgentAuthCheck("credentials")) {
-                tokenGenerationPromiseRef.current = runGenerateTokens(state.rawTokensPath, state.outDir, true);
-              }
-            },
-            onQuit: () => process.exit(0)
-          }
-        );
       case "checking-claude-auth":
         return /* @__PURE__ */ jsx47(
           RunningStep,
@@ -29469,9 +29416,9 @@ function registerImportCommand(program) {
   ).option("--no-cache", "Re-run all steps even if output already exists").action(async (opts) => {
     const interactiveTerminalSupported = getInteractiveTerminalSupport().supported;
     if (opts.tokens !== void 0) {
-      const { access: access9 } = await import("node:fs/promises");
+      const { access: access8 } = await import("node:fs/promises");
       try {
-        await access9(normalizePath(opts.tokens));
+        await access8(normalizePath(opts.tokens));
       } catch {
         process.stderr.write(`Error: --tokens: file not found: ${opts.tokens}
 `);
@@ -29577,7 +29524,7 @@ var init_agent_definitions = __esm({
 
 // packages/experience-design-system-cli-legacy/src/setup/lib/shell.ts
 import { execFile as execFile3, spawn as spawn6 } from "node:child_process";
-import { access as access8 } from "node:fs/promises";
+import { access as access7 } from "node:fs/promises";
 import { promisify as promisify2 } from "node:util";
 async function binaryExists(name) {
   try {
@@ -29588,7 +29535,7 @@ async function binaryExists(name) {
   }
 }
 async function pathExists3(path) {
-  return access8(path).then(() => true).catch(() => false);
+  return access7(path).then(() => true).catch(() => false);
 }
 function runSpawn(cmd, args, opts = {}) {
   return new Promise((resolve22) => {
@@ -31500,7 +31447,7 @@ var init_manifest_doc_evidence = __esm({
 });
 
 // packages/experience-design-system-cli-legacy/src/analyze/extract-command.ts
-import { mkdir as mkdir5, readdir as readdir3, readFile as readFile18, stat as stat6 } from "node:fs/promises";
+import { mkdir as mkdir5, readdir as readdir3, readFile as readFile18, stat as stat5 } from "node:fs/promises";
 import { isAbsolute as isAbsolute2, join as join25, relative as relative2, resolve as resolve20 } from "node:path";
 function resolveExtractNoCache(opts) {
   return opts.noCache === true || opts.cache === false;
@@ -31526,7 +31473,7 @@ function resolveFromProjectRoot(projectRoot, inputPath) {
   return isAbsolute2(inputPath) ? inputPath : resolve20(projectRoot, inputPath);
 }
 async function pathExists4(path) {
-  return Boolean(await stat6(path).catch(() => null));
+  return Boolean(await stat5(path).catch(() => null));
 }
 async function collectSourceFiles(directory, onProgress) {
   const files = [];

package/legacy/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-932fd115.0",
+  "version": "2.37.1-dev-build-91b5f8aa.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -44,8 +44,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-932fd115.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-932fd115.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-91b5f8aa.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-91b5f8aa.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",