@contentful/experience-design-system-cli 2.12.1-dev-build-bae15c7.0 → 2.12.1-dev-build-0b7de73.0

package/dist/package.json

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

package/dist/src/import/command.js

@@ -7,6 +7,7 @@ import { DEFAULT_CONFIGURED_HOST, toConfiguredHost } from '../host-utils.js';
 import { replayRun, modifyRun } from '../runs/replay-helpers.js';
 import { resolvePromptFlags } from './print-prompt.js';
 import { shouldShowRunPicker } from '../runs/run-picker-mount.js';
+import { dispatchPickerSelection } from './picker-dispatch.js';
 export function registerImportCommand(program) {
     program
         .command('import')
@@ -220,15 +221,20 @@ export function registerImportCommand(program) {
                 isTTY: !!process.stdin.isTTY,
             });
             let pickerSelection = null;
+            // Ink `unmount` handle captured after `render(...)` below so the
+            // picker callback can tear down the wizard cleanly. Prior to this
+            // fix the callback did `setImmediate(() => process.exit(0))`, which
+            // killed the process before `dispatchPickerSelection` could run.
+            let unmountInk = null;
             const pickerProps = {};
             if (pickerDecision.shouldShow) {
                 pickerProps.initialRuns = pickerDecision.runs;
                 pickerProps.onRunPicked = (selection) => {
                     pickerSelection = selection;
-                    setImmediate(() => process.exit(0));
+                    unmountInk?.();
                 };
             }
-            const { waitUntilExit } = render(createElement(WizardApp, {
+            const { waitUntilExit, unmount } = render(createElement(WizardApp, {
                 initialSpaceId: creds.spaceId,
                 initialEnvironmentId: creds.environmentId || 'master',
                 initialCmaToken: creds.cmaToken,
@@ -250,43 +256,24 @@ export function registerImportCommand(program) {
                 ...(opts.rawTokens ? { initialRawTokensPath: resolve(opts.rawTokens) } : {}),
                 ...pickerProps,
             }));
-            try {
-                await waitUntilExit();
-            }
-            catch {
-                /* Ink throws on process.exit; swallow so picker dispatch can run. */
-            }
+            unmountInk = unmount;
+            await waitUntilExit();
             // ── Picker dispatch ─────────────────────────────────────────────
-            // If the operator picked a run, route into the existing entry
-            // points so credential resolution and mutex checks stay in one
-            // place. The --modify path resolves the run record via
-            // resolveRunTarget and threads its session IDs through
-            // launchModifyWizard (see runs/replay-helpers.ts).
+            // If the operator picked a run, route into replayRun / modifyRun.
+            // dispatchPickerSelection lives in ./picker-dispatch.ts so this
+            // decision is testable without an Ink runtime.
             if (pickerSelection) {
-                const sel = pickerSelection;
-                if (sel.action === 'push' && sel.runId) {
-                    await replayRun({
-                        runIdOrPath: sel.runId,
-                        ...(opts.spaceId ? { spaceId: opts.spaceId } : {}),
-                        ...(opts.environmentId ? { environmentId: opts.environmentId } : {}),
-                        ...(opts.cmaToken ? { cmaToken: opts.cmaToken } : {}),
-                        ...(opts.host ? { host: opts.host } : {}),
-                        interactive: !!process.stdout.isTTY,
-                        ...(opts.force ? { force: true } : {}),
-                    });
-                    return;
-                }
-                if (sel.action === 'modify' && sel.runId) {
-                    await modifyRun({
-                        runIdOrPath: sel.runId,
-                        ...(opts.outDir ? { outDir: opts.outDir } : {}),
-                        ...(opts.overwrite ? { overwrite: true } : {}),
-                        ...(opts.saveAsNew ? { saveAsNew: true } : {}),
-                        ...(opts.force ? { force: true } : {}),
-                    });
-                    return;
-                }
-                // action === 'new' falls through — the wizard already advanced.
+                await dispatchPickerSelection(pickerSelection, {
+                    ...(opts.spaceId ? { spaceId: opts.spaceId } : {}),
+                    ...(opts.environmentId ? { environmentId: opts.environmentId } : {}),
+                    ...(opts.cmaToken ? { cmaToken: opts.cmaToken } : {}),
+                    ...(opts.host ? { host: opts.host } : {}),
+                    interactive: !!process.stdout.isTTY,
+                    ...(opts.outDir ? { outDir: opts.outDir } : {}),
+                    ...(opts.overwrite ? { overwrite: true } : {}),
+                    ...(opts.saveAsNew ? { saveAsNew: true } : {}),
+                    ...(opts.force ? { force: true } : {}),
+                }, { replayRun, modifyRun });
             }
             return;
         }

package/dist/src/import/picker-dispatch.d.ts

@@ -0,0 +1,18 @@
+import type { RunPickerSelection } from '../runs/run-picker.js';
+import type { replayRun as replayRunFn, modifyRun as modifyRunFn } from '../runs/replay-helpers.js';
+export type PickerDispatchOptions = {
+    spaceId?: string;
+    environmentId?: string;
+    cmaToken?: string;
+    host?: string;
+    interactive?: boolean;
+    outDir?: string;
+    overwrite?: boolean;
+    saveAsNew?: boolean;
+    force?: boolean;
+};
+export type PickerDispatchDeps = {
+    replayRun: typeof replayRunFn;
+    modifyRun: typeof modifyRunFn;
+};
+export declare function dispatchPickerSelection(selection: RunPickerSelection, opts: PickerDispatchOptions, deps: PickerDispatchDeps): Promise<void>;

package/dist/src/import/picker-dispatch.js

@@ -0,0 +1,29 @@
+// Route a resolved RunPickerSelection into replayRun / modifyRun. Extracted
+// from command.ts so the dispatch decision is testable without an Ink runtime
+// and so the picker callback in command.ts is a simple state-capture (no
+// process.exit shenanigans that would kill the process before dispatch runs).
+export async function dispatchPickerSelection(selection, opts, deps) {
+    if (selection.action === 'push' && selection.runId) {
+        await deps.replayRun({
+            runIdOrPath: selection.runId,
+            ...(opts.spaceId ? { spaceId: opts.spaceId } : {}),
+            ...(opts.environmentId ? { environmentId: opts.environmentId } : {}),
+            ...(opts.cmaToken ? { cmaToken: opts.cmaToken } : {}),
+            ...(opts.host ? { host: opts.host } : {}),
+            ...(opts.interactive !== undefined ? { interactive: opts.interactive } : {}),
+            ...(opts.force ? { force: true } : {}),
+        });
+        return;
+    }
+    if (selection.action === 'modify' && selection.runId) {
+        await deps.modifyRun({
+            runIdOrPath: selection.runId,
+            ...(opts.outDir ? { outDir: opts.outDir } : {}),
+            ...(opts.overwrite ? { overwrite: true } : {}),
+            ...(opts.saveAsNew ? { saveAsNew: true } : {}),
+            ...(opts.force ? { force: true } : {}),
+        });
+        return;
+    }
+    // action === 'new' → no-op; the wizard already advanced past the picker.
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.12.1-dev-build-bae15c7.0",
+  "version": "2.12.1-dev-build-0b7de73.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-bae15c7.0"
+    "@contentful/experience-design-system-types": "2.12.1-dev-build-0b7de73.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",