nx 23.2.0-beta.1 → 23.2.0-beta.11

package/README.md

@@ -7,9 +7,9 @@
 
 <div style="text-align: center;">
 
-[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
+[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)](<>)
 [![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
-[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
+[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](<>)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
 [![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)

package/dist/bin/init-local.js

@@ -6,7 +6,7 @@ const perf_hooks_1 = require("perf_hooks");
 const nx_commands_1 = require("../src/command-line/nx-commands");
 const strip_indents_1 = require("../src/utils/strip-indents");
 const client_1 = require("../src/daemon/client/client");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../src/utils/prompt-helpers");
 const output_1 = require("../src/utils/output");
 const analytics_1 = require("../src/analytics");
 /**
@@ -136,11 +136,9 @@ async function ensureNxConsoleInstalledViaDaemon() {
             ],
         });
         try {
-            const { shouldInstallNxConsole } = await (0, enquirer_1.prompt)({
-                type: 'confirm',
-                name: 'shouldInstallNxConsole',
+            const shouldInstallNxConsole = await (0, prompt_helpers_1.confirmationPrompt)({
                 message: 'Install Nx Console? (you can uninstall anytime)',
-                initial: true,
+                onCancel: () => false,
             });
             // Set preference and install if user said yes
             const result = await client_1.daemonClient.setNxConsolePreferenceAndInstall(shouldInstallNxConsole);

package/dist/bin/nx.js

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 if (process.env.FORCE_COLOR === '0') {
+    process.env.NX_ORIGINAL_FORCE_COLOR = '0';
     process.env.NO_COLOR = '1';
     delete process.env.FORCE_COLOR;
 }
@@ -208,6 +209,7 @@ function resolveNx(workspace) {
 function isNxCloudCommand(command) {
     const nxCloudCommands = [
         'start-ci-run',
+        'start-nx-agents',
         'start-agent',
         'stop-all-agents',
         'complete-ci-run',

package/dist/release/changelog-renderer/index.js

@@ -215,12 +215,11 @@ class DefaultChangelogRenderer {
                 if (!name || name.includes('[bot]')) {
                     continue;
                 }
-                if (_authors.has(name)) {
-                    const entry = _authors.get(name);
-                    entry.email.add(author.email);
+                if (!_authors.has(name)) {
+                    _authors.set(name, { email: new Set() });
                 }
-                else {
-                    _authors.set(name, { email: new Set([author.email]) });
+                if (author.email) {
+                    _authors.get(name).email.add(author.email);
                 }
             }
         }

package/dist/release/index.d.ts

@@ -1,4 +1,4 @@
 /**
  * @public Programmatic API for nx release
  */
-export { ReleaseClient, release, releaseChangelog, releasePublish, releaseVersion, VersionActions, AfterAllProjectsVersioned, } from '../src/command-line/release';
+export { ReleaseClient, release, releaseChangelog, releasePublish, releaseVersion, VersionActions, AfterAllProjectsVersioned, ResolveVersionForDependency, } from '../src/command-line/release';

package/dist/src/adapter/ngcli-adapter.js

@@ -31,6 +31,7 @@ const executor_utils_1 = require("../command-line/run/executor-utils");
 const plugins_1 = require("../project-graph/plugins");
 const schema_utils_1 = require("../config/schema-utils");
 const handle_import_1 = require("../utils/handle-import");
+const prompt_helpers_1 = require("../utils/prompt-helpers");
 const target_merging_1 = require("../project-graph/utils/project-configuration/target-merging");
 function getProjectGraph() {
     try {
@@ -653,8 +654,66 @@ function createPromptProvider() {
                     return { ...question, type: definition.type };
             }
         });
-        return require('enquirer').prompt(questions);
+        // Angular hands over a whole form at once; clack asks one question at a
+        // time, so they are run in order and the answers reassembled.
+        return (async () => {
+            const answers = {};
+            for (const question of questions) {
+                answers[question.name] = await askSchematicQuestion(question);
+            }
+            return answers;
+        })();
     };
+    async function askSchematicQuestion(question) {
+        const validate = question.validate
+            ? (value) => {
+                const result = question.validate(value);
+                if (result === true)
+                    return undefined;
+                return typeof result === 'string' ? result : 'Invalid value';
+            }
+            : undefined;
+        const choices = (question.choices ?? []).map((c) => typeof c === 'string' ? { value: c } : { value: c.name, label: c.message });
+        switch (question.type) {
+            case 'confirm':
+                return (0, prompt_helpers_1.confirmationPrompt)({
+                    message: question.message,
+                    initial: question.initial !== false,
+                });
+            case 'select':
+                return (0, prompt_helpers_1.selectPrompt)({
+                    message: question.message,
+                    choices,
+                    initial: question.initial,
+                });
+            case 'multiselect':
+                return (0, prompt_helpers_1.multiselectPrompt)({
+                    message: question.message,
+                    choices,
+                    initialValues: question.initial,
+                });
+            case 'numeral': {
+                // No numeric prompt; the answer is parsed back so callers still get a
+                // number rather than the typed string.
+                const answer = await (0, prompt_helpers_1.textPrompt)({
+                    message: question.message,
+                    initialValue: question.initial === undefined
+                        ? undefined
+                        : String(question.initial),
+                    validate: (value) => value !== '' && !Number.isNaN(Number(value))
+                        ? validate?.(value)
+                        : 'Please enter a number',
+                });
+                return Number(answer);
+            }
+            default:
+                return (0, prompt_helpers_1.textPrompt)({
+                    message: question.message,
+                    initialValue: question.initial,
+                    validate,
+                });
+        }
+    }
 }
 async function runMigration(root, packageName, migrationName, projects, isVerbose, projectGraph) {
     const logger = (0, exports.getLogger)(isVerbose);

package/dist/src/ai/set-up-ai-agents/set-up-ai-agents.js

@@ -7,9 +7,11 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const smol_toml_1 = tslib_1.__importDefault(require("smol-toml"));
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const format_changed_files_1 = require("../../generators/internal-utils/format-changed-files");
 const generate_files_1 = require("../../generators/utils/generate-files");
 const json_1 = require("../../generators/utils/json");
+const nx_json_1 = require("../../generators/utils/nx-json");
+const analytics_enabled_1 = require("../../utils/analytics-enabled");
 const native_1 = require("../../native");
 const package_json_1 = require("../../utils/package-json");
 const package_manager_1 = require("../../utils/package-manager");
@@ -71,6 +73,8 @@ function normalizeOptions(options) {
 async function setupAiAgentsGeneratorImpl(tree, options) {
     const hasAgent = (agent) => options.agents.includes(agent);
     const nxVersion = (0, installed_nx_version_1.getInstalledNxVersion)() ?? getDeclaredNxVersionOrDefault();
+    const analyticsEnabled = (0, analytics_enabled_1.isAnalyticsEnabled)((0, nx_json_1.readNxJson)(tree));
+    let addedAnalyticsDomain = false;
     const agentsMd = (0, constants_1.agentsMdPath)(options.directory);
     // write AGENTS.md for most agents
     if (hasAgent('cursor') ||
@@ -87,6 +91,9 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
         if (!tree.exists(claudeSettingsPath)) {
             (0, json_1.writeJson)(tree, claudeSettingsPath, {});
         }
+        const allowedDomains = (0, json_1.readJson)(tree, claudeSettingsPath).sandbox?.network?.allowedDomains;
+        addedAnalyticsDomain =
+            analyticsEnabled && !allowedDomains?.includes(constants_1.analyticsDomain);
         (0, json_1.updateJson)(tree, claudeSettingsPath, (json) => ({
             ...json,
             extraKnownMarketplaces: {
@@ -103,19 +110,11 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
                 ...json.enabledPlugins,
                 'nx@nx-claude-plugins': true,
             },
-            // Allow Nx analytics requests through Claude Code's sandbox network filter
-            sandbox: {
-                ...json.sandbox,
-                network: {
-                    ...json.sandbox?.network,
-                    allowedDomains: json.sandbox?.network?.allowedDomains?.includes(constants_1.analyticsDomain)
-                        ? json.sandbox.network.allowedDomains
-                        : [
-                            ...(json.sandbox?.network?.allowedDomains ?? []),
-                            constants_1.analyticsDomain,
-                        ],
-                },
-            },
+            // Widening the sandbox's egress is only justified while events are
+            // actually being sent, so it follows the workspace's analytics opt-in.
+            ...(analyticsEnabled
+                ? { sandbox: allowAnalyticsDomain(json.sandbox) }
+                : {}),
         }));
         // Clean up .mcp.json (nx-mcp now handled by plugin)
         const mcpJsonPath = (0, constants_1.claudeMcpJsonPath)(options.directory);
@@ -234,11 +233,20 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.nx/polygraph');
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/worktrees');
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/settings.local.json');
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+    await (0, format_changed_files_1.formatChangedFiles)(tree);
     // we use the check variable to determine if we should actually make changes or just report what would be changed
     return async (check = false) => {
         const messages = [];
         const errors = [];
+        if (addedAnalyticsDomain) {
+            messages.push({
+                title: `Allowed ${constants_1.analyticsDomain} through Claude Code's sandbox network filter`,
+                bodyLines: [
+                    `Nx sends analytics there because this workspace sets "analytics": true in nx.json.`,
+                    `Set it to false to opt out, then remove the domain from .claude/settings.json.`,
+                ],
+            });
+        }
         if (hasAgent('copilot')) {
             try {
                 if ((await (0, native_1.isEditorInstalled)(0 /* SupportedEditor.VSCode */)) &&
@@ -300,6 +308,18 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
         };
     };
 }
+function allowAnalyticsDomain(sandbox) {
+    const allowedDomains = sandbox?.network?.allowedDomains ?? [];
+    return {
+        ...sandbox,
+        network: {
+            ...sandbox?.network,
+            allowedDomains: allowedDomains.includes(constants_1.analyticsDomain)
+                ? allowedDomains
+                : [...allowedDomains, constants_1.analyticsDomain],
+        },
+    };
+}
 function writeAgentRules(tree, path, writeNxCloudRules) {
     if (!tree.exists(path)) {
         // File doesn't exist - create with h1 header (standalone content)

package/dist/src/analytics/analytics.d.ts

@@ -1,6 +1,12 @@
 import type { EventDimensions } from '../native';
 export declare const customDimensions: EventDimensions;
 export type EventParameters = Partial<Record<EventDimensions[keyof EventDimensions], string | number | boolean>>;
+/**
+ * Fraction of sessions that report perf spans. Stamping this rate on a
+ * measure's detail (as the sampleRate dimension) opts it into sampling; see
+ * is_sampled_in in native/telemetry/service.rs. Multiply GA counts by 1/rate.
+ */
+export declare const PERF_SPAN_SAMPLE_RATE = 0.1;
 export declare function startAnalytics(): Promise<void>;
 export declare function reportNxAddCommand(packageName: string, version: string): void;
 export declare function reportNxGenerateCommand(generator: string): void;

package/dist/src/analytics/analytics.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.customDimensions = void 0;
+exports.PERF_SPAN_SAMPLE_RATE = exports.customDimensions = void 0;
 exports.startAnalytics = startAnalytics;
 exports.reportNxAddCommand = reportNxAddCommand;
 exports.reportNxGenerateCommand = reportNxGenerateCommand;
@@ -10,6 +10,7 @@ exports.argsToQueryString = argsToQueryString;
 exports.flushAnalytics = flushAnalytics;
 const tslib_1 = require("tslib");
 const nx_json_1 = require("../config/nx-json");
+const analytics_enabled_1 = require("../utils/analytics-enabled");
 const workspace_root_1 = require("../utils/workspace-root");
 const versions_1 = require("../utils/versions");
 const native_1 = require("../native");
@@ -19,7 +20,7 @@ const os = tslib_1.__importStar(require("os"));
 const crypto_1 = require("crypto");
 const machine_id_cache_1 = require("../utils/machine-id-cache");
 const is_ci_1 = require("../utils/is-ci");
-const analytics_prompt_1 = require("../utils/analytics-prompt");
+const workspace_id_1 = require("../utils/workspace-id");
 const db_connection_1 = require("../utils/db-connection");
 // Conditionally import telemetry functions only on non-WASM platforms
 let initializeTelemetry;
@@ -42,6 +43,12 @@ exports.customDimensions = native_1.IS_WASM
     ? null
     : (getEventDimensions?.() ?? null);
 let _telemetryInitialized = false;
+/**
+ * Fraction of sessions that report perf spans. Stamping this rate on a
+ * measure's detail (as the sampleRate dimension) opts it into sampling; see
+ * is_sampled_in in native/telemetry/service.rs. Multiply GA counts by 1/rate.
+ */
+exports.PERF_SPAN_SAMPLE_RATE = 0.1;
 async function startAnalytics() {
     // Analytics not supported on WASM
     if (native_1.IS_WASM) {
@@ -52,17 +59,20 @@ async function startAnalytics() {
     // detection, machine id, telemetry init) may throw past this boundary -
     // on any failure, continue without telemetry.
     try {
-        if (!isAnalyticsEnabled()) {
+        const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
+        if (!(0, analytics_enabled_1.isAnalyticsEnabled)(nxJson)) {
             return;
         }
-        const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
-        const workspaceId = (0, analytics_prompt_1.generateWorkspaceId)();
+        const workspaceId = (0, workspace_id_1.generateWorkspaceId)(workspace_root_1.workspaceRoot, nxJson);
         if (!workspaceId) {
             // Not a git repo — no telemetry
             return;
         }
         const isNxCloud = !!(nxJson?.nxCloudId ?? nxJson?.nxCloudAccessToken);
-        const userId = await getTelemetryUserId(workspaceId);
+        // A CI fleet is not a user: shared images bake in /etc/machine-id, so a
+        // uid would collapse whole fleets into one GA "user" (and trip per-user
+        // collection caps). GA falls back to cid = workspace for CI traffic.
+        const userId = (0, is_ci_1.isCI)() ? undefined : await getTelemetryUserId(workspaceId);
         const packageManagerInfo = getPackageManagerInfo();
         const nodeVersion = (0, semver_1.parse)(process.version);
         const nodeVersionString = nodeVersion
@@ -226,10 +236,6 @@ function getPackageManagerInfo() {
         version: (0, package_manager_1.getPackageManagerVersion)(pm),
     };
 }
-function isAnalyticsEnabled() {
-    const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
-    return nxJson?.analytics === true;
-}
 // Mix workspace id in: shared Docker images (Gitpod, Cypress, etc.) bake
 // in /etc/machine-id, so machine-id alone collapses many users into one.
 async function getTelemetryUserId(workspaceId) {

package/dist/src/analytics/index.d.ts

@@ -1 +1 @@
-export { customDimensions, EventParameters, startAnalytics, reportNxAddCommand, reportNxGenerateCommand, reportCommandRunEvent, reportEvent, flushAnalytics, } from './analytics';
+export { customDimensions, EventParameters, PERF_SPAN_SAMPLE_RATE, startAnalytics, reportNxAddCommand, reportNxGenerateCommand, reportCommandRunEvent, reportEvent, flushAnalytics, } from './analytics';

package/dist/src/analytics/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flushAnalytics = exports.reportEvent = exports.reportCommandRunEvent = exports.reportNxGenerateCommand = exports.reportNxAddCommand = exports.startAnalytics = exports.customDimensions = void 0;
+exports.flushAnalytics = exports.reportEvent = exports.reportCommandRunEvent = exports.reportNxGenerateCommand = exports.reportNxAddCommand = exports.startAnalytics = exports.PERF_SPAN_SAMPLE_RATE = exports.customDimensions = void 0;
 var analytics_1 = require("./analytics");
 Object.defineProperty(exports, "customDimensions", { enumerable: true, get: function () { return analytics_1.customDimensions; } });
+Object.defineProperty(exports, "PERF_SPAN_SAMPLE_RATE", { enumerable: true, get: function () { return analytics_1.PERF_SPAN_SAMPLE_RATE; } });
 Object.defineProperty(exports, "startAnalytics", { enumerable: true, get: function () { return analytics_1.startAnalytics; } });
 Object.defineProperty(exports, "reportNxAddCommand", { enumerable: true, get: function () { return analytics_1.reportNxAddCommand; } });
 Object.defineProperty(exports, "reportNxGenerateCommand", { enumerable: true, get: function () { return analytics_1.reportNxGenerateCommand; } });

package/dist/src/command-line/add/add.js

@@ -18,9 +18,14 @@ const semver_1 = require("semver");
 const configure_plugins_1 = require("../init/configure-plugins");
 const spinner_1 = require("../../utils/spinner");
 const analytics_1 = require("../../analytics");
+const client_1 = require("../../daemon/client/client");
 function addHandler(options) {
     return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
         output_1.output.addNewline();
+        // Package managers write the lock file before node_modules is fully linked,
+        // so a live daemon restarts mid-install and caches a graph whose plugins,
+        // still being relinked, no longer resolve.
+        await client_1.daemonClient.stop();
         const [pkgName, version] = parsePackageSpecifier(options.packageSpecifier);
         (0, analytics_1.reportNxAddCommand)(pkgName, version);
         const nxJson = (0, nx_json_1.readNxJson)();

package/dist/src/command-line/affected/affected.js

@@ -49,6 +49,7 @@ async function affected(command, args, extraTargetDependencies = {}, extraOption
                 }
                 else {
                     const status = await (0, run_command_1.runCommand)(projectsWithTarget, projectGraph, { nxJson }, nxArgs, overrides, null, extraTargetDependencies, extraOptions);
+                    await output_1.output.drain();
                     process.exit(status);
                 }
                 break;

package/dist/src/command-line/completion/command-object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsCompletionCommand = void 0;
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -69,18 +69,13 @@ async function pickShellsInteractively() {
         process.exit(1);
     }
     const detected = detectAvailableShells();
-    const answer = (await (0, enquirer_1.prompt)({
-        type: 'multiselect',
-        name: 'shells',
+    return await (0, prompt_helpers_1.multiselectPrompt)({
         message: 'Install nx completion for which shell(s)?',
-        choices: SHELL_CHOICES.map((name) => ({
-            name,
-            value: name,
-            // Pre-check shells we can detect on this machine.
-            enabled: detected.has(name),
-        })),
-    }));
-    return answer.shells ?? [];
+        choices: SHELL_CHOICES,
+        // Pre-select shells we can detect on this machine.
+        initialValues: SHELL_CHOICES.filter((name) => detected.has(name)),
+        onCancel: () => [],
+    });
 }
 /** Best-effort detect-which-shells-the-user-has. Pre-checks the multiselect.
  *  Signals: $SHELL basename, presence of conventional rc files, $PSModulePath

package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureAiAgentsHandler = configureAiAgentsHandler;
 exports.configureAiAgentsHandlerImpl = configureAiAgentsHandlerImpl;
 const tslib_1 = require("tslib");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const pc = tslib_1.__importStar(require("picocolors"));
@@ -11,7 +11,7 @@ const constants_1 = require("../../ai/constants");
 const detect_ai_agent_1 = require("../../ai/detect-ai-agent");
 const utils_1 = require("../../ai/utils");
 const client_1 = require("../../daemon/client/client");
-const devkit_internals_1 = require("../../devkit-internals");
+const package_json_1 = require("../../utils/package-json");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
 const provenance_1 = require("../../utils/provenance");
@@ -44,7 +44,7 @@ async function configureAiAgentsHandler(args, inner = false) {
     let cleanup;
     try {
         await (0, provenance_1.ensurePackageHasProvenance)('nx', 'latest');
-        const packageInstallResults = (0, devkit_internals_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot));
+        const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot));
         cleanup = packageInstallResults.cleanup;
         let modulePath = require.resolve('nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
@@ -63,8 +63,10 @@ async function configureAiAgentsHandler(args, inner = false) {
     await resetDaemonAgentStatus();
 }
 async function configureAiAgentsHandlerImpl(options) {
-    // Node 24 has stricter readline behavior, and enquirer is not checking for closed state
-    // when invoking operations, thus you get an ERR_USE_AFTER_CLOSE error.
+    // Node 24's stricter readline throws ERR_USE_AFTER_CLOSE when a prompt
+    // library operates on a closed interface. Added for enquirer, which nx no
+    // longer uses; verify against Node 24 before removing.
+    // TODO(v24): drop if @clack/prompts proves not to need it.
     process.on('uncaughtException', (error) => {
         if (error &&
             typeof error === 'object' &&
@@ -158,7 +160,7 @@ async function configureAiAgentsHandlerImpl(options) {
                     ...partiallyConfiguredAgents,
                     ...outOfDateAgents,
                     ...nonConfiguredAgents,
-                ].map((a) => getAgentChoiceForPrompt(a).message),
+                ].map((a) => getAgentChoiceForPrompt(a).label),
             });
             process.exit(1);
         }
@@ -239,26 +241,22 @@ async function configureAiAgentsHandlerImpl(options) {
     }
     // Interactive mode (or non-interactive with explicit --agents)
     const allAgentChoices = [];
-    const preselectedIndices = [];
-    let currentIndex = 0;
+    const preselectedAgents = [];
     // Partially configured agents first (highest priority)
     partiallyConfiguredAgents.forEach((a) => {
         allAgentChoices.push(getAgentChoiceForPrompt(a));
-        preselectedIndices.push(currentIndex);
-        currentIndex++;
+        preselectedAgents.push(a.name);
     });
     // Outdated agents second
     for (const a of fullyConfiguredAgents) {
         if (a.outdated) {
             allAgentChoices.push(getAgentChoiceForPrompt(a));
-            preselectedIndices.push(currentIndex);
-            currentIndex++;
+            preselectedAgents.push(a.name);
         }
     }
     // Non-configured agents last
     nonConfiguredAgents.forEach((a) => {
         allAgentChoices.push(getAgentChoiceForPrompt(a));
-        currentIndex++;
     });
     if (allAgentChoices.length === 0) {
         output_1.output.success({
@@ -270,18 +268,13 @@ async function configureAiAgentsHandlerImpl(options) {
     let selectedAgents;
     if (options.interactive !== false) {
         try {
-            selectedAgents = (await (0, enquirer_1.prompt)({
-                type: 'multiselect',
-                name: 'agents',
+            selectedAgents = await (0, prompt_helpers_1.multiselectPrompt)({
                 message: 'Which AI agents would you like to configure? (space to select, enter to confirm)',
                 choices: allAgentChoices,
-                initial: preselectedIndices,
+                initialValues: preselectedAgents,
                 required: true,
-                footer: function () {
-                    const focused = this.focused;
-                    return pc.dim(`  ${getAgentFooterDescription(focused.agentConfiguration)}`);
-                },
-            })).agents;
+                onCancel: () => process.exit(1),
+            });
         }
         catch {
             process.exit(1);
@@ -289,7 +282,7 @@ async function configureAiAgentsHandlerImpl(options) {
     }
     else {
         // non-interactive with explicit --agents: configure all requested
-        selectedAgents = allAgentChoices.map((a) => a.name);
+        selectedAgents = allAgentChoices.map((a) => a.value);
     }
     if (selectedAgents?.length === 0) {
         output_1.output.log({
@@ -388,10 +381,11 @@ function getAgentChoiceForPrompt(agent) {
     const partiallyConfigured = agent.mcp !== agent.rules;
     const needsUpdate = partiallyConfigured || agent.outdated;
     return {
-        name: agent.name,
-        message: needsUpdate
+        value: agent.name,
+        label: needsUpdate
             ? `${agent.displayName} (update available)`
             : agent.displayName,
+        hint: getAgentFooterDescription(agent),
         agentConfiguration: agent,
     };
 }