nx 23.2.0-beta.6 → 23.2.0-beta.8

package/dist/src/command-line/init/implementation/angular/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToAngularCliRepo = addNxToAngularCliRepo;
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
 const path_1 = require("path");
 const fileutils_1 = require("../../../../utils/fileutils");
 const versions_1 = require("../../../../utils/versions");
@@ -65,20 +65,11 @@ async function collectCacheableOperations(options) {
         output_1.output.log({
             title: '🧑‍🔧 Please answer the following questions about the targets found in your angular.json in order to generate task runner configuration',
         });
-        cacheableOperations = (await (0, enquirer_1.prompt)([
-            {
-                type: 'multiselect',
-                name: 'cacheableOperations',
-                initial: defaultCacheableTargetsInWorkspace,
-                message: 'Which of the following targets are cacheable? (Produce the same output given the same input, e.g. build, test and lint usually are, serve and start are not)',
-                // enquirer mutates the array below, create a new one to avoid it
-                choices: [...workspaceTargets],
-                /**
-                 * limit is missing from the interface but it limits the amount of options shown
-                 */
-                limit: process.stdout.rows - 4, // 4 leaves room for the header above, the prompt and some whitespace
-            },
-        ])).cacheableOperations;
+        cacheableOperations = await (0, prompt_helpers_1.multiselectPrompt)({
+            message: 'Which of the following targets are cacheable? (Produce the same output given the same input, e.g. build, test and lint usually are, serve and start are not)',
+            choices: workspaceTargets,
+            initialValues: defaultCacheableTargetsInWorkspace,
+        });
     }
     else {
         cacheableOperations =

package/dist/src/command-line/init/init-v1.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initHandler = initHandler;
 const child_process_1 = require("child_process");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const fs_1 = require("fs");
 const semver_1 = require("semver");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
@@ -54,23 +54,13 @@ async function initHandler(options) {
         }
     }
     else {
-        const useDotNxFolder = await (0, enquirer_1.prompt)([
-            {
-                name: 'useDotNxFolder',
-                type: 'autocomplete',
-                message: 'Where should your workspace be created?',
-                choices: [
-                    {
-                        name: 'In a new folder under this directory',
-                        value: 'false',
-                    },
-                    {
-                        name: 'In this directory',
-                        value: 'true',
-                    },
-                ],
-            },
-        ]).then((r) => r.useDotNxFolder === 'true');
+        const useDotNxFolder = (await (0, prompt_helpers_1.selectPrompt)({
+            message: 'Where should your workspace be created?',
+            choices: [
+                { value: 'false', label: 'In a new folder under this directory' },
+                { value: 'true', label: 'In this directory' },
+            ],
+        })) === 'true';
         if (useDotNxFolder) {
             setupDotNxInstallation(version);
         }

package/dist/src/command-line/init/init-v2.js

@@ -5,7 +5,7 @@ exports.getPluginReason = getPluginReason;
 exports.detectPlugins = detectPlugins;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const semver_1 = require("semver");
 const nx_json_1 = require("../../config/nx-json");
 const fileutils_1 = require("../../utils/fileutils");
@@ -33,7 +33,6 @@ const detect_ai_agent_1 = require("../../ai/detect-ai-agent");
 const ab_testing_1 = require("../../utils/ab-testing");
 const analytics_prompt_1 = require("../../utils/analytics-prompt");
 const is_ci_1 = require("../../utils/is-ci");
-const package_manager_2 = require("../../utils/package-manager");
 const ai_output_1 = require("./utils/ai-output");
 async function initHandler(options, inner = false) {
     // Use environment variable to force local execution
@@ -43,7 +42,7 @@ async function initHandler(options, inner = false) {
     let cleanup;
     try {
         await (0, provenance_1.ensurePackageHasProvenance)('nx', 'latest');
-        const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_2.detectPackageManager)(process.cwd()));
+        const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(process.cwd()));
         cleanup = packageInstallResults.cleanup;
         let modulePath = require.resolve('nx/src/command-line/init/init-v2.js', {
             paths: [packageInstallResults.tempDir],
@@ -95,7 +94,7 @@ async function initHandlerImpl(options) {
     const baseMeta = {
         nodeVersion: process.versions.node,
         os: process.platform,
-        packageManager: (0, package_manager_2.detectPackageManager)(),
+        packageManager: (0, package_manager_1.detectPackageManager)(),
         aiAgent: (0, native_1.isAiAgent)(),
         isCI: (0, is_ci_1.isCI)(),
     };
@@ -162,21 +161,17 @@ async function runInit(options, baseMeta) {
         options.interactive &&
         !aiMode &&
         process.stdin.isTTY) {
-        const setupMode = await (0, enquirer_1.prompt)([
-            {
-                type: 'select',
-                name: 'setupMode',
-                message: 'How would you like to set up Nx in this directory?',
-                choices: [
-                    {
-                        name: '.nx installation (recommended for non-JavaScript projects)',
-                    },
-                    {
-                        name: 'package.json installation (recommended for JavaScript/TypeScript projects)',
-                    },
-                ],
-            },
-        ]).then((r) => r.setupMode);
+        const setupMode = await (0, prompt_helpers_1.selectPrompt)({
+            message: 'How would you like to set up Nx in this directory?',
+            choices: [
+                {
+                    value: '.nx installation (recommended for non-JavaScript projects)',
+                },
+                {
+                    value: 'package.json installation (recommended for JavaScript/TypeScript projects)',
+                },
+            ],
+        });
         if (setupMode.startsWith('package.json')) {
             // Create a minimal package.json so the JS/TS workflow takes over
             const workspaceName = (0, path_1.basename)(process.cwd());
@@ -199,14 +194,10 @@ async function runInit(options, baseMeta) {
     // AI mode defaults to minimum setup, humans can choose
     let guided = !aiMode; // Default to minimum (false) for AI, guided (true) for humans
     if (options.interactive && !(_isTurborepo || _isNonJs)) {
-        const setupType = await (0, enquirer_1.prompt)([
-            {
-                type: 'select',
-                name: 'setupPreference',
-                message: 'Would you like a minimum or guided setup?',
-                choices: [{ name: 'Minimum' }, { name: 'Guided' }],
-            },
-        ]).then((r) => r.setupPreference);
+        const setupType = await (0, prompt_helpers_1.selectPrompt)({
+            message: 'Would you like a minimum or guided setup?',
+            choices: [{ value: 'Minimum' }, { value: 'Guided' }],
+        });
         guided = setupType === 'Guided';
     }
     /**
@@ -368,7 +359,7 @@ async function runInit(options, baseMeta) {
             analyticsPrompt,
             nodeVersion: process.versions.node,
             os: process.platform,
-            packageManager: (0, package_manager_2.detectPackageManager)(),
+            packageManager: (0, package_manager_1.detectPackageManager)(),
             aiAgent: aiMode,
             isCI: (0, is_ci_1.isCI)(),
             pluginsInstalled: pluginsToInstall.join(','),
@@ -401,6 +392,7 @@ async function runInit(options, baseMeta) {
 function getPluginReason(plugin) {
     const reasonMap = {
         '@nx/eslint': 'eslint detected in dependencies',
+        '@nx/oxlint': 'oxlint detected in dependencies',
         '@nx/storybook': 'storybook detected in dependencies',
         '@nx/vite': 'vite detected in dependencies',
         '@nx/vitest': 'vitest detected in dependencies',
@@ -448,6 +440,7 @@ function parsePluginsFlag(value) {
 const npmPackageToPluginMap = {
     // Generic JS tools
     eslint: '@nx/eslint',
+    oxlint: '@nx/oxlint',
     storybook: '@nx/storybook',
     // Bundlers
     vite: '@nx/vite',
@@ -574,39 +567,18 @@ async function detectPlugins(nxJson, packageJson, interactive, includeAngularCli
             `Add these Nx plugins to integrate with the tools used in your workspace.`,
         ],
     });
-    const pluginsToInstall = await (0, enquirer_1.prompt)([
-        {
-            name: 'plugins',
-            type: 'multiselect',
-            message: `Which plugins would you like to add? Press <Space> to select and <Enter> to submit.`,
-            choices: plugins.map((p) => ({ name: p, value: p })),
-            /**
-             * limit is missing from the interface but it limits the amount of options shown
-             */
-            limit: process.stdout.rows - 4, // 4 leaves room for the header above, the prompt and some whitespace
-        },
-    ]).then((r) => r.plugins);
+    const pluginsToInstall = await (0, prompt_helpers_1.multiselectPrompt)({
+        message: `Which plugins would you like to add? Press <Space> to select and <Enter> to submit.`,
+        choices: plugins,
+    });
     if (pluginsToInstall?.length === 0)
         return {
             plugins: [],
             updatePackageScripts: false,
         };
     const updatePackageScripts = (0, fs_1.existsSync)('package.json') &&
-        (await (0, enquirer_1.prompt)([
-            {
-                name: 'updatePackageScripts',
-                type: 'autocomplete',
-                message: `Do you want to start using Nx in your package.json scripts?`,
-                choices: [
-                    {
-                        name: 'Yes',
-                    },
-                    {
-                        name: 'No',
-                    },
-                ],
-                initial: 0,
-            },
-        ]).then((r) => r.updatePackageScripts === 'Yes'));
+        (await (0, prompt_helpers_1.confirmationPrompt)({
+            message: `Do you want to start using Nx in your package.json scripts?`,
+        }));
     return { plugins: pluginsToInstall, updatePackageScripts };
 }

package/dist/src/command-line/migrate/agentic/definitions.js

@@ -13,21 +13,48 @@ function claudeCodeWellKnownPaths() {
     }
     return [(0, path_1.join)((0, os_1.homedir)(), '.claude', 'local', 'claude')];
 }
-// Pre-authorizes the handoff write: Claude Code's default permission mode
-// asks before file writes it has no allow rule for, so without this each step
-// ends with an approval prompt for nx's own handoff scratch. Prefix-less
-// patterns resolve against the session cwd (pinned to the workspace root
-// below); `Edit` covers corrections to an already-written handoff.
-const CLAUDE_CODE_HANDOFF_ALLOWED_TOOLS = `Write(${types_1.MIGRATE_RUNS_RELATIVE_DIR}/**),Edit(${types_1.MIGRATE_RUNS_RELATIVE_DIR}/**)`;
+/**
+ * The run directory names Nx will interpolate into a permission rule. A rule
+ * is a gitignore pattern, which reads `*?[]\` as syntax, and `--allowedTools`
+ * splits its value on commas and spaces, so a name carrying any of those
+ * would change what the rule authorizes rather than what it names. Run
+ * directory names derive from a migration's own version string, which nothing
+ * upstream constrains to this alphabet. The leading character rejects `.`
+ * and `..`.
+ */
+const RULE_SAFE_RUN_DIR_NAME = /^[A-Za-z0-9][A-Za-z0-9._+-]*$/;
+/**
+ * Pre-authorizes the handoff write. Claude Code's default permission mode
+ * asks before a file write it has no allow rule for, so without this every
+ * step ends on an approval prompt for Nx's own handoff scratch.
+ *
+ * The rule reaches one run's handoffs and nothing else. Its own run
+ * directory also holds state Nx wrote and reads back, and the sibling
+ * directories belong to other runs, including an orchestrated run whose
+ * handoffs decide how its steps settle. `Edit` is the only tool name file
+ * rules are matched against, and it covers creating the file as well as
+ * correcting one already written. Prefix-less patterns resolve against the
+ * session cwd, pinned to the workspace root below.
+ *
+ * Returns null for a name it cannot express, which costs the approval prompt
+ * this exists to avoid. That beats widening the rule, and nothing narrower is
+ * available: Claude Code has no escape for a literal path.
+ */
+function claudeCodeHandoffAllowedTools(runDirName) {
+    if (!RULE_SAFE_RUN_DIR_NAME.test(runDirName)) {
+        return null;
+    }
+    return `Edit(${types_1.MIGRATE_RUNS_RELATIVE_DIR}/${runDirName}/${types_1.HANDOFFS_DIR_NAME}/**)`;
+}
 function claudeCodeBuildInteractive(ctx) {
+    const allowedTools = claudeCodeHandoffAllowedTools(ctx.runDirName);
     return {
         // `--allowedTools` is variadic (space/comma separated): a positional
         // placed right after its value gets swallowed as another rule. The rules
         // must stay in one comma-joined element with a non-variadic flag
         // (`--system-prompt`) between them and the user prompt.
         args: [
-            '--allowedTools',
-            CLAUDE_CODE_HANDOFF_ALLOWED_TOOLS,
+            ...(allowedTools ? ['--allowedTools', allowedTools] : []),
             '--system-prompt',
             ctx.systemContext,
             ctx.userPrompt,

package/dist/src/command-line/migrate/agentic/handoff-gitignore.d.ts

@@ -1,6 +1,7 @@
 /**
- * Under `--agentic`, the runner writes per-run scratch under
- * `.nx/migrate-runs/<run-id>/`. The v23 migration
+ * Both the agentic runner and the orchestrator write per-run scratch under
+ * `.nx/migrate-runs/<run-id>/`: handoff files in both cases, plus the durable
+ * run state and its plan snapshots for the orchestrator. The v23 migration
  * `23-0-0-add-migrate-runs-to-git-ignore` adds `.nx/migrate-runs` to
  * `.gitignore`; in its declared slot (typically late) earlier per-migration
  * commits would absorb the scratch into the user-visible diff.
@@ -23,7 +24,7 @@
  * had the entry historically; if it is gone, that is a conscious removal we
  * respect.
  */
-export declare function applyAgenticHandoffGitignoreFallback({ migrations, installedNxVersion, effectiveCreateCommits, commitPrefix, root, }: {
+export declare function applyAgenticHandoffGitignoreFallback({ migrations, installedNxVersion, effectiveCreateCommits, commitPrefix, root, applyWhenPlanned, commitStandalone, }: {
     migrations: ReadonlyArray<{
         package: string;
         name: string;
@@ -39,4 +40,22 @@ export declare function applyAgenticHandoffGitignoreFallback({ migrations, insta
     effectiveCreateCommits: boolean;
     commitPrefix: string;
     root: string;
+    /**
+     * Apply the entry even when the hoisted migration is in the plan. The
+     * classic loop can defer to that migration because its run scratch appears
+     * only after migration 1 has run; the orchestrator creates its run dir at
+     * init, before any migration, so it needs the entry immediately. A planned
+     * migration also means the missing entry is not a conscious removal, so the
+     * v23 cutoff does not apply.
+     */
+    applyWhenPlanned?: boolean;
+    /**
+     * Commit the applied entry as its own preflight commit (the default). The
+     * orchestrator suppresses this: it applies the fallback before its init
+     * checkpoint so the checkpoint's `git add -A` cannot sweep in older
+     * scratch, and in that ordering a standalone commit here would carry the
+     * user's pre-existing changes along with the entry. The checkpoint that
+     * follows captures both instead.
+     */
+    commitStandalone?: boolean;
 }): Promise<void>;

package/dist/src/command-line/migrate/agentic/handoff-gitignore.js

@@ -10,8 +10,9 @@ const git_utils_1 = require("../../../utils/git-utils");
 const logger_1 = require("../../../utils/logger");
 const types_1 = require("./types");
 /**
- * Under `--agentic`, the runner writes per-run scratch under
- * `.nx/migrate-runs/<run-id>/`. The v23 migration
+ * Both the agentic runner and the orchestrator write per-run scratch under
+ * `.nx/migrate-runs/<run-id>/`: handoff files in both cases, plus the durable
+ * run state and its plan snapshots for the orchestrator. The v23 migration
  * `23-0-0-add-migrate-runs-to-git-ignore` adds `.nx/migrate-runs` to
  * `.gitignore`; in its declared slot (typically late) earlier per-migration
  * commits would absorb the scratch into the user-visible diff.
@@ -34,13 +35,15 @@ const types_1 = require("./types");
  * had the entry historically; if it is gone, that is a conscious removal we
  * respect.
  */
-async function applyAgenticHandoffGitignoreFallback({ migrations, installedNxVersion, effectiveCreateCommits, commitPrefix, root, }) {
+async function applyAgenticHandoffGitignoreFallback({ migrations, installedNxVersion, effectiveCreateCommits, commitPrefix, root, applyWhenPlanned = false, commitStandalone = true, }) {
     if (migrations.some(types_1.isHandoffGitignoreMigration)) {
-        // The queue runs it itself: hoisted to the front by the sort comparator
-        // in a full run, or as the single requested migration in a worker run.
-        return;
+        if (!applyWhenPlanned) {
+            // The queue runs it itself: hoisted to the front by the sort comparator
+            // in a full run, or as the single requested migration in a worker run.
+            return;
+        }
     }
-    if ((0, semver_1.major)(installedNxVersion) >= 23) {
+    else if ((0, semver_1.major)(installedNxVersion) >= 23) {
         // User is past v23. Respect their `.gitignore` state — if the entry
         // is missing, that's a conscious removal.
         return;
@@ -54,13 +57,13 @@ async function applyAgenticHandoffGitignoreFallback({ migrations, installedNxVer
         return;
     }
     (0, tree_1.flushChanges)(root, changes);
-    logger_1.logger.info(pc.dim(`- Added .nx/migrate-runs to .gitignore so this --agentic run's handoff scratch is ignored.`));
-    if (!effectiveCreateCommits)
+    logger_1.logger.info(pc.dim(`- Added ${types_1.MIGRATE_RUNS_RELATIVE_DIR} to .gitignore so this run's scratch state is ignored.`));
+    if (!effectiveCreateCommits || !commitStandalone)
         return;
     if (!(0, git_utils_1.hasUncommittedChanges)(root))
         return;
     try {
-        const sha = (0, git_utils_1.tryCommitChanges)(`${commitPrefix}add .nx/migrate-runs to .gitignore`, root);
+        const sha = (0, git_utils_1.tryCommitChanges)(`${commitPrefix}add ${types_1.MIGRATE_RUNS_RELATIVE_DIR} to .gitignore`, root, [types_1.MIGRATE_RUNS_RELATIVE_DIR]);
         if (sha) {
             logger_1.logger.info(pc.dim(`  Commit: ${sha}`));
         }

package/dist/src/command-line/migrate/agentic/handoff.d.ts

@@ -20,7 +20,9 @@ export declare function mkdirSafely(dir: string, purpose: string): void;
  */
 export declare function initRunDir(workspaceRoot: string, runId: string): string;
 /**
- * Absolute path of the handoff file for a migration step within a run.
+ * Absolute path of the handoff file for a migration step within a run, under
+ * the run directory's `handoffs/` subtree: the pre-authorized write scope
+ * stops there, so a handoff placed anywhere else costs an approval prompt.
  * The package's scope (if any) becomes a real subdirectory so the package name
  * stays readable; two packages can ship a migration with the same name without
  * colliding because they land in different package subdirectories. Each

package/dist/src/command-line/migrate/agentic/handoff.js

@@ -72,14 +72,16 @@ function sanitizeSegment(value) {
     return sanitized || '_';
 }
 /**
- * Absolute path of the handoff file for a migration step within a run.
+ * Absolute path of the handoff file for a migration step within a run, under
+ * the run directory's `handoffs/` subtree: the pre-authorized write scope
+ * stops there, so a handoff placed anywhere else costs an approval prompt.
  * The package's scope (if any) becomes a real subdirectory so the package name
  * stays readable; two packages can ship a migration with the same name without
  * colliding because they land in different package subdirectories. Each
  * segment is sanitized so the path is always writable on every platform.
  */
 function stepHandoffPath(runDir, migration) {
-    return (0, path_1.join)(runDir, ...migration.package.split('/').map(sanitizeSegment), `${sanitizeSegment(migration.name)}.json`);
+    return (0, path_1.join)(runDir, types_1.HANDOFFS_DIR_NAME, ...migration.package.split('/').map(sanitizeSegment), `${sanitizeSegment(migration.name)}.json`);
 }
 /**
  * Reads and validates a handoff file written by an agent. Returns a tagged

package/dist/src/command-line/migrate/agentic/run-step.js

@@ -83,6 +83,7 @@ async function runAgenticPromptStep(input) {
             systemContext,
             userPrompt,
             workspaceRoot: root,
+            runDirName: (0, path_1.basename)(runDir),
         },
         handoffFilePath,
     });

package/dist/src/command-line/migrate/agentic/runner.js

@@ -41,10 +41,11 @@ async function runAgentic(args) {
         });
     }
     // Counts SIGINTs while the agent runs. Non-zero after exit means the
-    // user pressed Ctrl+C → skip the ambiguous abort/continue prompt, because
-    // enquirer misbehaves in the TTY state left by a SIGINT-killed child
-    // (ERR_USE_AFTER_CLOSE, setRawMode EIO) and the errors surface from async
-    // chains that `await` cannot catch.
+    // user pressed Ctrl+C → skip the ambiguous abort/continue prompt. Prompting
+    // in the TTY state left by a SIGINT-killed child misbehaved under enquirer
+    // (ERR_USE_AFTER_CLOSE, setRawMode EIO) from async chains `await` could not
+    // catch. Whether @clack/prompts shares that fault is unverified, so the skip
+    // stays; reproducing it needs a real terminal.
     let userInterruptCount = 0;
     const swallowSigint = () => {
         userInterruptCount++;
@@ -279,9 +280,10 @@ async function resolveFromHandoffOrPrompt(handoffFilePath, userInterrupted = fal
     };
     if (userInterrupted) {
         // User pressed Ctrl+C. Don't show the abort/continue prompt — they
-        // already told us what they want, and the TTY state after a
-        // SIGINT-killed child trips enquirer's setRawMode-EIO and
-        // ERR_USE_AFTER_CLOSE bugs. The orchestrator's standard failure
+        // already told us what they want. Prompting in the TTY state left by a
+        // SIGINT-killed child also tripped enquirer's setRawMode-EIO and
+        // ERR_USE_AFTER_CLOSE bugs; whether @clack/prompts shares that fault is
+        // unverified, so the skip stays. The orchestrator's standard failure
         // cascade surfaces the abort outcome.
         //
         // Forward the underlying cause as pre-rendered summary lines so the
@@ -357,13 +359,14 @@ function escapeCmdCommand(arg) {
 }
 async function promptAmbiguous(cause) {
     // stderr blank line so the spacer lands in the same stream as output.warn
-    // and the enquirer prompt — buffered stdout could otherwise reorder it
-    // and glue the prompt to the agent's trailing exit message.
+    // and the prompt — buffered stdout could otherwise reorder it and glue the
+    // prompt to the agent's trailing exit message.
     process.stderr.write('\n');
-    // Cause rendered ABOVE the prompt rather than inlined into prompt.message:
-    // enquirer's select redraw uses different math for clear (wrap-aware) vs
-    // restore (raw \n-split count), so a multi-line message can leave orphaned
-    // cells on arrow-key re-renders. Keeping message single-line sidesteps it.
+    // Cause rendered ABOVE the prompt rather than inlined into its message:
+    // enquirer's select redraw used different math for clear (wrap-aware) vs
+    // restore (raw \n-split count), so a multi-line message could leave orphaned
+    // cells on arrow-key re-renders. Kept single-line because that constraint is
+    // unverified under @clack/prompts, not because the cause still applies.
     const causeLines = describeAmbiguousCause(cause);
     if (causeLines.length > 0) {
         output_1.output.warn({
@@ -371,24 +374,21 @@ async function promptAmbiguous(cause) {
             bodyLines: causeLines,
         });
     }
-    // `migratePrompt` injects `options.cancel` so Ctrl+C and Esc exit cleanly
-    // via `process.exit(130)` before enquirer's broken cancel cleanup runs.
-    // Any other rejection we treat as abort.
+    // Cancelling exits 130 from inside the prompt; any other rejection is an
+    // abort.
     try {
-        const response = await (0, safe_prompt_1.migratePrompt)({
-            name: 'choice',
-            type: 'select',
+        const choice = await (0, safe_prompt_1.migrateChoice)({
             message: 'How should nx migrate proceed?',
             choices: [
-                { name: 'abort', message: 'Treat as failed — abort the run' },
+                { value: 'abort', label: 'Treat as failed — abort the run' },
                 {
-                    name: 'continue',
-                    message: 'Treat as completed — mark done and continue',
+                    value: 'continue',
+                    label: 'Treat as completed — mark done and continue',
                 },
             ],
         });
-        (0, migrate_analytics_1.reportMigratePrompt)('ambiguous_agent_outcome', response.choice);
-        return response.choice === 'continue'
+        (0, migrate_analytics_1.reportMigratePrompt)('ambiguous_agent_outcome', choice);
+        return choice === 'continue'
             ? { kind: 'ambiguous-continue' }
             : { kind: 'ambiguous-abort' };
     }

package/dist/src/command-line/migrate/agentic/select.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAgentic = resolveAgentic;
 exports.resolveShouldRunValidation = resolveShouldRunValidation;
-const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
 const path_1 = require("path");
-const pc = tslib_1.__importStar(require("picocolors"));
 const output_1 = require("../../../utils/output");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const migrate_analytics_1 = require("../migrate-analytics");
@@ -129,46 +127,40 @@ async function firePromptForAgentic(migrations, detected) {
     const pinChoice = multipleAgents
         ? [
             {
-                name: 'yes-pin',
-                message: 'Yes, always with the same agent',
-                description: rememberHint,
+                value: 'yes-pin',
+                label: 'Yes, always with the same agent',
+                hint: rememberHint,
             },
         ]
         : [];
     const choices = [
         {
-            name: 'yes-once',
-            message: 'Yes, just this time',
-            description: applyHint,
+            value: 'yes-once',
+            label: 'Yes, just this time',
+            hint: applyHint,
         },
         {
-            name: 'yes-flex',
-            message: multipleAgents
+            value: 'yes-flex',
+            label: multipleAgents
                 ? "Yes, always (I'll pick the agent each run)"
                 : 'Yes, always',
-            description: rememberHint,
+            hint: rememberHint,
         },
         ...pinChoice,
-        { name: 'no-once', message: 'No, just this time', description: skipHint },
-        { name: 'no-never', message: 'No, never', description: rememberHint },
+        { value: 'no-once', label: 'No, just this time', hint: skipHint },
+        { value: 'no-never', label: 'No, never', hint: rememberHint },
     ];
     // Blank line keeps the prompt from gluing to the previous `npm install`
     // output or any earlier orchestrator line.
     console.log();
-    // `as any`: `footer` and per-choice `description` aren't in enquirer's .d.ts.
-    const response = await (0, safe_prompt_1.migratePrompt)({
-        name: 'choice',
-        type: 'select',
+    // Each choice's hint renders beside it, so the description no longer needs a
+    // footer that tracks the cursor.
+    const choice = await (0, safe_prompt_1.migrateChoice)({
         message: 'Enable the agentic flow?',
         choices,
-        initial: 0,
-        footer: function () {
-            const focused = this.focused;
-            return focused?.description ? pc.dim(`  ${focused.description}`) : '';
-        },
     });
-    (0, migrate_analytics_1.reportMigratePrompt)('agentic', response.choice);
-    switch (response.choice) {
+    (0, migrate_analytics_1.reportMigratePrompt)('agentic', choice);
+    switch (choice) {
         case 'yes-once':
             return { enabled: true };
         case 'yes-flex':
@@ -250,12 +242,10 @@ async function selectAgent(detected, explicitId, isInteractive) {
     requireInteractiveOrAbort(isInteractive);
     // Blank line keeps the prompt from gluing to the preceding output.
     console.log();
-    const response = await (0, safe_prompt_1.migratePrompt)({
-        name: 'id',
-        type: 'select',
+    const id = await (0, safe_prompt_1.migrateChoice)({
         message: 'Multiple AI agents detected. Which one should Nx use?',
-        choices: detected.map((d) => ({ name: d.id, message: d.displayName })),
+        choices: detected.map((d) => ({ value: d.id, label: d.displayName })),
     });
-    (0, migrate_analytics_1.reportMigratePrompt)('agent_select', response.id);
-    return detected.find((d) => d.id === response.id);
+    (0, migrate_analytics_1.reportMigratePrompt)('agent_select', id);
+    return detected.find((d) => d.id === id);
 }