@contentful/experience-design-system-cli 2.12.1-dev-build-c47114b.0 → 2.12.2-dev-build-4dc32df.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.12.1-dev-build-c47114b.0",
+  "version": "2.12.2-dev-build-4dc32df.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/import/tui/WizardApp.js

@@ -49,7 +49,7 @@ import { checkAgentAuth } from '../../generate/agent-runner.js';
 import { normalizePath } from '../path-utils.js';
 import { DEFAULT_CONFIGURED_HOST, toConfiguredHost } from '../../host-utils.js';
 import { writeExperiencesCredentials } from '../../credentials-store.js';
-import { nextStepAfterScopeGate, nextStepAfterCredentialsValidated, shouldBypassPreview, buildSkippedPreviewTransition, shouldRefusePush, buildSkippedPushTransition, } from './wizard-state-transitions.js';
+import { nextStepAfterScopeGate, nextStepAfterCredentialsValidated, shouldBypassPreview, buildSkippedPreviewTransition, shouldRefusePush, buildSkippedPushTransition, shouldSkipFinalReviewAfterCredentials, } from './wizard-state-transitions.js';
 function findCliPath() {
     return join(fileURLToPath(import.meta.url), '..', '..', '..', '..', '..', 'bin', 'cli.js');
 }
@@ -263,6 +263,7 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
         credentialsSkipped: false,
         lastRunId: null,
         finalizeErrorBanner: null,
+        finalReviewPassed: false,
     });
     useEffect(() => {
         sessionRef.current = {
@@ -806,10 +807,15 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
     // accepted components) or jumps straight to push-decision-gate (if scope
     // rejected everything but tokens/removals still need to be pushed).
     const advanceAfterCredentialsValidated = async () => {
-        // If we already ran the generator (re-entering credentials from a late
-        // 401/403 raised by runPreview), skip back to push-decision-gate rather
-        // than re-running the LLM.
-        if (state.generateSessionId) {
+        // If the operator already went through final-review once (re-entering
+        // credentials from a late 401/403 raised by runPreview), skip back to
+        // push-decision-gate rather than making them review again. We gate on
+        // `finalReviewPassed` specifically — NOT `generateSessionId` alone —
+        // because the scope-gate background prefetch also populates
+        // `generateSessionId` as soon as its LLM finishes, and if that lands
+        // while the operator is still typing credentials it would otherwise
+        // trip this shortcut and skip past `final-review` entirely.
+        if (shouldSkipFinalReviewAfterCredentials(state)) {
             update({ step: 'push-decision-gate' });
             return;
         }
@@ -1504,6 +1510,10 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
             case 'final-review': {
                 return (_jsx(FinalReviewHost, { extractSessionId: state.extractSessionId, generatedCount: state.generatedCount, autoAccept: autoAcceptScope, livePreview: livePreview, spaceId: state.spaceId, environmentId: state.environmentId, cmaToken: state.cmaToken, host: state.host, tokensPath: state.tokensPath, initialFinalizeError: state.finalizeErrorBanner, onFinalize: (accepted, rejected, unresolved) => {
                         process.stderr.write(`Accepted: ${accepted}  Rejected: ${rejected}  Unresolved: ${unresolved}\n`);
+                        // Mark the review as passed so a later re-entry to credentials
+                        // (e.g. late 401 raised by runPreview) short-circuits back to
+                        // push-decision-gate instead of re-rendering final-review.
+                        update({ finalReviewPassed: true });
                         // INTEG-4411 refined: no `accepted === 0` up-front block here.
                         // A zero-accepted finalize can still be a valid push when the
                         // operator explicitly rejected component(s) that exist server-

package/dist/src/import/tui/wizard-state-transitions.d.ts

@@ -43,6 +43,26 @@ export declare function nextStepAfterScopeGate(opts: {
 export declare function nextStepAfterCredentialsValidated(opts: {
     acceptedCount: number;
 }): WizardStepAfterCredentials;
+/**
+ * Bug fix (2026-07): the "skip generator, jump to push-decision-gate" shortcut
+ * on the credentials → post-credentials edge was originally guarded by
+ * `state.generateSessionId != null`. That signal is ALSO set by the scope-gate
+ * background prefetch as soon as the LLM finishes — so when a fast prefetch
+ * completed while the operator was still typing credentials, submitting them
+ * skipped `final-review` entirely and jumped straight to `push-decision-gate`.
+ *
+ * The real invariant the guard wants is: has the operator already been through
+ * the final-review screen and finalized once? That's what `finalReviewPassed`
+ * captures — it flips true in `onFinalize` on the GenerateReviewStep, not on
+ * mere prefetch completion.
+ *
+ * Retained (and required) is `generateSessionId != null`, so we don't jump to
+ * push-decision-gate before generation is even complete.
+ */
+export declare function shouldSkipFinalReviewAfterCredentials(state: {
+    generateSessionId: string | null;
+    finalReviewPassed: boolean;
+}): boolean;
 /**
  * Skip-credentials spec — Task 2. When the operator pressed `s` on the
  * credentials screen, the wizard advanced without validating creds. That

package/dist/src/import/tui/wizard-state-transitions.js

@@ -43,6 +43,25 @@ export function nextStepAfterScopeGate(opts) {
 export function nextStepAfterCredentialsValidated(opts) {
     return opts.acceptedCount > 0 ? 'generating' : 'push-decision-gate';
 }
+/**
+ * Bug fix (2026-07): the "skip generator, jump to push-decision-gate" shortcut
+ * on the credentials → post-credentials edge was originally guarded by
+ * `state.generateSessionId != null`. That signal is ALSO set by the scope-gate
+ * background prefetch as soon as the LLM finishes — so when a fast prefetch
+ * completed while the operator was still typing credentials, submitting them
+ * skipped `final-review` entirely and jumped straight to `push-decision-gate`.
+ *
+ * The real invariant the guard wants is: has the operator already been through
+ * the final-review screen and finalized once? That's what `finalReviewPassed`
+ * captures — it flips true in `onFinalize` on the GenerateReviewStep, not on
+ * mere prefetch completion.
+ *
+ * Retained (and required) is `generateSessionId != null`, so we don't jump to
+ * push-decision-gate before generation is even complete.
+ */
+export function shouldSkipFinalReviewAfterCredentials(state) {
+    return state.finalReviewPassed && state.generateSessionId != null;
+}
 /**
  * Skip-credentials spec — Task 2. When the operator pressed `s` on the
  * credentials screen, the wizard advanced without validating creds. That

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.12.1-dev-build-c47114b.0",
+  "version": "2.12.2-dev-build-4dc32df.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -37,7 +37,7 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.12.1-dev-build-c47114b.0"
+    "@contentful/experience-design-system-types": "2.12.2-dev-build-4dc32df.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",