@amplitude/wizard 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/src/ui/tui/screens/AuthScreen.js

@@ -6,7 +6,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  *   1. OAuth waiting — spinner + login URL while browser auth happens
  *   2. Org selection — picker if the user belongs to multiple orgs
  *   3. Workspace selection — picker if the org has multiple workspaces
- *   4. API key entry — text input for the Amplitude analytics write key
+ *   4. Project selection — picker if the workspace has multiple environments
+ *   5. API key entry — text input (only if no project key could be resolved)
  *
  * The screen drives itself from session.pendingOrgs + session.credentials.
  * When credentials are set the router resolves past this screen.
@@ -16,54 +17,184 @@ import { useState, useEffect, useSyncExternalStore } from 'react';
 import { TextInput } from '@inkjs/ui';
 import { LoadingBox, PickerMenu } from '../primitives/index.js';
 import { Colors } from '../styles.js';
-import { DEFAULT_HOST_URL } from '../../../lib/constants.js';
+import { DEFAULT_HOST_URL, } from '../../../lib/constants.js';
 import { analytics } from '../../../utils/analytics.js';
+/**
+ * Returns the environments with usable API keys from a workspace, sorted by rank.
+ */
+function getSelectableEnvironments(workspace) {
+    if (!workspace?.environments)
+        return [];
+    return workspace.environments
+        .filter((env) => env.app?.apiKey)
+        .sort((a, b) => a.rank - b.rank);
+}
 export const AuthScreen = ({ store }) => {
     useSyncExternalStore((cb) => store.subscribe(cb), () => store.getSnapshot());
     const { session } = store;
     // Local step state — which org the user has selected in this render session
     const [selectedOrg, setSelectedOrg] = useState(null);
+    // Track the selected workspace locally so we can access its environments
+    const [selectedWorkspace, setSelectedWorkspace] = useState(null);
+    const [selectedEnv, setSelectedEnv] = useState(null);
     const [apiKeyError, setApiKeyError] = useState('');
     const [savedKeySource, setSavedKeySource] = useState(null);
     const pendingOrgs = session.pendingOrgs;
-    // Auto-select the org when there's only one
-    const effectiveOrg = selectedOrg ?? (pendingOrgs?.length === 1 ? pendingOrgs[0] : null);
-    // Auto-select workspace when org has only one
+    // Resolve org: user-picked > single-org auto-select > pre-populated from session
+    const prePopulatedOrg = session.selectedOrgId && pendingOrgs
+        ? pendingOrgs.find((o) => o.id === session.selectedOrgId) ?? null
+        : null;
+    const effectiveOrg = selectedOrg ??
+        (pendingOrgs?.length === 1 ? pendingOrgs[0] : null) ??
+        prePopulatedOrg;
+    // Resolve workspace: user-picked > single-workspace auto-select > pre-populated from session
     const singleWorkspace = effectiveOrg?.workspaces.length === 1 ? effectiveOrg.workspaces[0] : null;
+    const prePopulatedWorkspace = session.selectedWorkspaceId && effectiveOrg
+        ? effectiveOrg.workspaces.find((ws) => ws.id === session.selectedWorkspaceId) ?? null
+        : null;
+    const effectiveWorkspace = selectedWorkspace ?? singleWorkspace ?? prePopulatedWorkspace ?? null;
     useEffect(() => {
-        if (effectiveOrg && singleWorkspace && !session.selectedWorkspaceId) {
-            store.setOrgAndWorkspace(effectiveOrg, singleWorkspace, session.installDir);
+        if (effectiveOrg && effectiveWorkspace && !session.selectedWorkspaceId) {
+            store.setOrgAndWorkspace(effectiveOrg, effectiveWorkspace, session.installDir);
         }
-    }, [effectiveOrg?.id, singleWorkspace?.id, session.selectedWorkspaceId]);
-    const workspaceChosen = session.selectedWorkspaceId !== null ||
-        (effectiveOrg !== null && effectiveOrg.workspaces.length === 1);
-    // Auto-advance past API key step if a saved key exists for this project
+    }, [effectiveOrg?.id, effectiveWorkspace?.id, session.selectedWorkspaceId]);
+    // workspaceChosen requires the local workspace object (effectiveWorkspace)
+    // rather than just session.selectedWorkspaceId, because we need the
+    // environments list to drive the project picker. When selectedWorkspaceId is
+    // pre-populated from ampli.json but no workspace object exists yet,
+    // selectableEnvs would be empty and the picker would be bypassed.
+    const workspaceChosen = effectiveWorkspace !== null;
+    // Environments available in the selected workspace
+    const selectableEnvs = getSelectableEnvironments(effectiveWorkspace);
+    const hasMultipleEnvs = selectableEnvs.length > 1;
+    // Auto-select the environment when there's only one with an API key
     useEffect(() => {
-        if (!workspaceChosen || session.credentials !== null)
+        if (workspaceChosen && !selectedEnv && selectableEnvs.length === 1) {
+            setSelectedEnv(selectableEnvs[0]);
+            store.setSelectedProjectName(selectableEnvs[0].name);
+        }
+    }, [workspaceChosen, selectedEnv, selectableEnvs.length]);
+    // True once the user has picked an environment (or it was auto-selected),
+    // or there are no environments to pick from (falls through to manual key entry).
+    const envResolved = selectedEnv !== null || selectableEnvs.length === 0;
+    // Resolve API key from local storage, selected environment, or backend fetch.
+    useEffect(() => {
+        if (!workspaceChosen || !envResolved || session.credentials !== null)
             return;
-        void import('../../../utils/api-key-store.js').then(({ readApiKeyWithSource }) => {
-            const result = readApiKeyWithSource(session.installDir);
-            if (result) {
-                setSavedKeySource(result.source);
-                analytics.wizardCapture('api key submitted', {
-                    key_source: result.source,
+        let cancelled = false;
+        void (async () => {
+            const s = store.session;
+            if (s.credentials !== null)
+                return;
+            const { readApiKeyWithSource, persistApiKey } = await import('../../../utils/api-key-store.js');
+            if (cancelled)
+                return;
+            // 1. Check local storage first
+            const local = readApiKeyWithSource(s.installDir);
+            if (local) {
+                setSavedKeySource(local.source);
+                analytics.wizardCapture('API Key Submitted', {
+                    key_source: local.source,
                 });
                 store.setCredentials({
-                    accessToken: session.pendingAuthAccessToken ?? '',
-                    idToken: session.pendingAuthIdToken ?? undefined,
-                    projectApiKey: result.key,
+                    accessToken: s.pendingAuthAccessToken ?? '',
+                    idToken: s.pendingAuthIdToken ?? undefined,
+                    projectApiKey: local.key,
                     host: DEFAULT_HOST_URL,
                     projectId: 0,
                 });
                 store.setProjectHasData(false);
+                store.setApiKeyNotice(null);
+                return;
             }
-        });
-    }, [workspaceChosen, session.credentials]);
+            // 2. Use the API key from the selected environment
+            if (selectedEnv?.app?.apiKey) {
+                const apiKey = selectedEnv.app.apiKey;
+                const zone = (s.region ??
+                    s.pendingAuthCloudRegion ??
+                    'us');
+                const { getHostFromRegion } = await import('../../../utils/urls.js');
+                if (cancelled || store.session.credentials !== null)
+                    return;
+                persistApiKey(apiKey, s.installDir);
+                analytics.wizardCapture('API Key Submitted', {
+                    key_source: 'environment_picker',
+                });
+                store.setCredentials({
+                    accessToken: s.pendingAuthAccessToken ?? '',
+                    idToken: s.pendingAuthIdToken ?? undefined,
+                    projectApiKey: apiKey,
+                    host: getHostFromRegion(zone),
+                    projectId: 0,
+                });
+                store.setProjectHasData(false);
+                store.setApiKeyNotice(null);
+                return;
+            }
+            // 3. Fall back to backend fetch (no environments with keys available)
+            const idToken = s.pendingAuthIdToken;
+            if (!idToken)
+                return;
+            const zone = (s.region ??
+                s.pendingAuthCloudRegion ??
+                'us');
+            const { getAPIKey } = await import('../../../utils/get-api-key.js');
+            const { getHostFromRegion } = await import('../../../utils/urls.js');
+            const projectApiKey = await getAPIKey({
+                installDir: s.installDir,
+                idToken,
+                zone,
+                workspaceId: s.selectedWorkspaceId ?? undefined,
+            });
+            if (cancelled || store.session.credentials !== null)
+                return;
+            if (projectApiKey) {
+                persistApiKey(projectApiKey, s.installDir);
+                analytics.wizardCapture('API Key Submitted', {
+                    key_source: 'backend_fetch',
+                });
+                store.setCredentials({
+                    accessToken: s.pendingAuthAccessToken ?? '',
+                    idToken: s.pendingAuthIdToken ?? undefined,
+                    projectApiKey,
+                    host: getHostFromRegion(zone),
+                    projectId: 0,
+                });
+                store.setProjectHasData(false);
+                store.setApiKeyNotice(null);
+            }
+            else {
+                store.setApiKeyNotice("Your API key couldn't be fetched automatically. " +
+                    'Only organization admins can access project API keys — ' +
+                    'if you need one, ask an admin to share it with you.');
+            }
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [
+        workspaceChosen,
+        envResolved,
+        selectedEnv,
+        session.credentials,
+        session.selectedWorkspaceId,
+        session.pendingAuthIdToken,
+        session.region,
+        session.pendingAuthCloudRegion,
+        session.installDir,
+    ]);
     const needsOrgPick = pendingOrgs !== null && pendingOrgs.length > 1 && effectiveOrg === null;
     const needsWorkspacePick = effectiveOrg !== null &&
         effectiveOrg.workspaces.length > 1 &&
-        !session.selectedWorkspaceId;
-    const needsApiKey = effectiveOrg !== null && workspaceChosen && session.credentials === null;
+        !selectedWorkspace;
+    const needsProjectPick = workspaceChosen && hasMultipleEnvs && !selectedEnv;
+    const needsApiKey = effectiveOrg !== null &&
+        workspaceChosen &&
+        envResolved &&
+        session.credentials === null &&
+        // Only show manual input if there's no selected env with a key
+        // (either no envs available, or the env had no key)
+        !selectedEnv?.app?.apiKey;
     const handleApiKeySubmit = (value) => {
         const trimmed = value.trim();
         if (!trimmed) {
@@ -71,9 +202,10 @@ export const AuthScreen = ({ store }) => {
             return;
         }
         setApiKeyError('');
-        analytics.wizardCapture('api key submitted', {
+        analytics.wizardCapture('API Key Submitted', {
             key_source: 'manual_entry',
         });
+        store.setApiKeyNotice(null);
         store.setCredentials({
             accessToken: session.pendingAuthAccessToken ?? '',
             idToken: session.pendingAuthIdToken ?? undefined,
@@ -100,7 +232,15 @@ export const AuthScreen = ({ store }) => {
                             value: ws,
                         })), onSelect: (value) => {
                             const ws = Array.isArray(value) ? value[0] : value;
+                            setSelectedWorkspace(ws);
                             store.setOrgAndWorkspace(effectiveOrg, ws, session.installDir);
+                        } })] })), needsProjectPick && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: Colors.muted, children: "Select a project:" }), _jsx(PickerMenu, { options: selectableEnvs.map((env) => ({
+                            label: env.name,
+                            value: env,
+                        })), onSelect: (value) => {
+                            const env = Array.isArray(value) ? value[0] : value;
+                            setSelectedEnv(env);
+                            store.setSelectedProjectName(env.name);
                         } })] })), needsApiKey && (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Enter your Amplitude project ", _jsx(Text, { bold: true, children: "API Key" })] }), _jsx(Text, { color: Colors.muted, children: "Amplitude \u2192 Settings \u2192 Projects \u2192 [your project] \u2192 API Keys" }), session.apiKeyNotice && (_jsx(Text, { color: "yellow", children: session.apiKeyNotice }))] }), _jsx(TextInput, { placeholder: "Paste API key here\u2026", onSubmit: handleApiKeySubmit }), apiKeyError && _jsx(Text, { color: "red", children: apiKeyError }), savedKeySource && (_jsxs(Text, { color: "green", children: ['✔ ', savedKeySource === 'keychain'
                                 ? 'API key saved to system keychain'
                                 : 'API key saved to .env.local'] }))] }))] }));

package/dist/src/ui/tui/screens/ChecklistScreen.js

@@ -56,7 +56,7 @@ export const ChecklistScreen = ({ store }) => {
     const dashboardUrl = OUTBOUND_URLS.newDashboard(zone, selectedOrgId);
     function openInBrowser(url, item) {
         setOpening(item);
-        analytics.wizardCapture('checklist item opened', { item });
+        analytics.wizardCapture('Checklist Step Opened', { item });
         opn(url, { wait: false })
             .catch(() => {
             /* fire-and-forget */

package/dist/src/ui/tui/screens/DataIngestionCheckScreen.js

@@ -45,11 +45,23 @@ export const DataIngestionCheckScreen = ({ store, }) => {
             return;
         }
         const zone = (region ?? 'us');
+        const idToken = credentials.idToken ?? credentials.accessToken;
         try {
-            const status = await fetchProjectActivationStatus(credentials.idToken ?? credentials.accessToken, zone, appId, session.selectedOrgId);
+            const status = await fetchProjectActivationStatus(idToken, zone, appId, session.selectedOrgId);
             logToFile(`[DataIngestionCheck] poll result: hasAnyEvents=${status.hasAnyEvents} hasDetSource=${status.hasDetSource}`);
             if (status.hasAnyEvents) {
                 store.setDataIngestionConfirmed();
+                return;
+            }
+            // The activation API only checks autocapture events (page_viewed,
+            // session_start, session_end). Custom track() calls won't appear there.
+            // Fall back to the event catalog which includes all event types.
+            if (session.selectedOrgId && session.selectedWorkspaceId) {
+                const catalogEvents = await fetchWorkspaceEventTypes(idToken, zone, session.selectedOrgId, session.selectedWorkspaceId);
+                logToFile(`[DataIngestionCheck] catalog fallback: ${catalogEvents.length} event types found`);
+                if (catalogEvents.length > 0) {
+                    store.setDataIngestionConfirmed();
+                }
             }
         }
         catch (err) {
@@ -57,7 +69,6 @@ export const DataIngestionCheckScreen = ({ store, }) => {
             setApiUnavailable(true);
             // Fetch cataloged event types from the data API as a proxy for "events arrived"
             if (session.selectedOrgId && session.selectedWorkspaceId) {
-                const idToken = credentials.idToken ?? credentials.accessToken;
                 fetchWorkspaceEventTypes(idToken, zone, session.selectedOrgId, session.selectedWorkspaceId)
                     .then((names) => {
                     setEventTypes(names);

package/dist/src/ui/tui/screens/IntroScreen.js

@@ -46,7 +46,7 @@ export const IntroScreen = ({ store }) => {
                             { label: 'Cancel', value: 'cancel' },
                         ], onSelect: (value) => {
                             const choice = Array.isArray(value) ? value[0] : value;
-                            analytics.wizardCapture('intro action', {
+                            analytics.wizardCapture('Intro Action', {
                                 action: choice,
                                 integration: session.integration,
                                 detected_framework: session.detectedFrameworkLabel,
@@ -75,7 +75,7 @@ const FrameworkPicker = ({ store, onComplete, }) => {
     }));
     return (_jsx(PickerMenu, { centered: true, columns: 2, message: "Select your framework", options: options, onSelect: (value) => {
             const integration = Array.isArray(value) ? value[0] : value;
-            analytics.wizardCapture('framework manually selected', { integration });
+            analytics.wizardCapture('Framework Manually Selected', { integration });
             void import('../../../lib/registry.js').then(({ FRAMEWORK_REGISTRY }) => {
                 const config = FRAMEWORK_REGISTRY[integration];
                 store.setFrameworkConfig(integration, config);

package/dist/src/ui/tui/screens/McpScreen.js

@@ -17,7 +17,7 @@ import { useSyncExternalStore } from 'react';
 import { McpOutcome, RunPhase } from '../store.js';
 import { ConfirmationInput, PickerMenu } from '../primitives/index.js';
 import { Colors } from '../styles.js';
-import { analytics } from '../../../utils/analytics.js';
+import { analytics, captureWizardError } from '../../../utils/analytics.js';
 var Phase;
 (function (Phase) {
     Phase["Detecting"] = "detecting";
@@ -41,22 +41,25 @@ const markDone = (store, outcome, clients = [], standalone = false, onComplete)
 export const McpScreen = ({ store, installer, mode = 'install', standalone = false, onComplete, }) => {
     useSyncExternalStore((cb) => store.subscribe(cb), () => store.getSnapshot());
     const isRemove = mode === 'remove';
-    const { runPhase, amplitudePreDetected } = store.session;
+    const { runPhase, amplitudePreDetected, amplitudePreDetectedChoicePending } = store.session;
     const dataSetupComplete = runPhase === RunPhase.Completed;
     const [phase, setPhase] = useState(Phase.Detecting);
     const [clients, setClients] = useState([]);
     const [resultClients, setResultClients] = useState([]);
     useEffect(() => {
+        if (amplitudePreDetectedChoicePending) {
+            return;
+        }
         void (async () => {
             try {
                 const detected = await installer.detectClients();
                 if (detected.length === 0) {
-                    analytics.wizardCapture('mcp no clients detected', { mode });
+                    analytics.wizardCapture('MCP No Clients Detected', { mode });
                     setPhase(Phase.None);
                     setTimeout(() => markDone(store, McpOutcome.NoClients, [], standalone, onComplete), 1500);
                 }
                 else {
-                    analytics.wizardCapture('mcp clients detected', {
+                    analytics.wizardCapture('MCP Clients Detected', {
                         mode,
                         clients: detected.map((c) => c.name),
                         count: detected.length,
@@ -66,31 +69,31 @@ export const McpScreen = ({ store, installer, mode = 'install', standalone = fal
                 }
             }
             catch {
-                analytics.wizardCapture('mcp detection failed', { mode });
+                captureWizardError('MCP Client Detection', 'Editor client detection failed', 'McpScreen', { mode });
                 setPhase(Phase.None);
                 setTimeout(() => markDone(store, McpOutcome.Failed, [], standalone, onComplete), 1500);
             }
         })();
-    }, [installer]);
+    }, [installer, amplitudePreDetectedChoicePending]);
     const handleConfirm = () => {
         if (isRemove) {
-            analytics.wizardCapture('mcp remove confirmed');
+            analytics.wizardCapture('MCP Remove Confirmed');
             void doRemove();
         }
         else if (clients.length === 1) {
             const names = clients.map((c) => c.name);
-            analytics.wizardCapture('mcp install confirmed', { clients: names });
+            analytics.wizardCapture('MCP Install Confirmed', { clients: names });
             void doInstall(names);
         }
         else {
-            analytics.wizardCapture('mcp client picker shown', {
+            analytics.wizardCapture('MCP Client Picker Shown', {
                 available_clients: clients.map((c) => c.name),
             });
             setPhase(Phase.Pick);
         }
     };
     const handleSkip = () => {
-        analytics.wizardCapture('mcp skipped', { mode });
+        analytics.wizardCapture('MCP Skipped', { mode });
         markDone(store, McpOutcome.Skipped, [], standalone, onComplete);
     };
     const doInstall = async (names) => {
@@ -104,7 +107,7 @@ export const McpScreen = ({ store, installer, mode = 'install', standalone = fal
             setResultClients([]);
         }
         const failed = names.filter((n) => !result.includes(n));
-        analytics.wizardCapture('mcp install complete', {
+        analytics.wizardCapture('MCP Install Complete', {
             installed: result,
             failed,
             attempted: names,
@@ -123,26 +126,38 @@ export const McpScreen = ({ store, installer, mode = 'install', standalone = fal
         catch {
             setResultClients([]);
         }
-        analytics.wizardCapture('mcp remove complete', { removed: result });
+        analytics.wizardCapture('MCP Remove Complete', { removed: result });
         setPhase(Phase.Done);
         const outcome = result.length > 0 ? McpOutcome.Installed : McpOutcome.Failed;
         setTimeout(() => markDone(store, outcome, result, standalone, onComplete), 2000);
     };
     return (_jsxs(Box, { flexDirection: "column", flexGrow: 1, children: [dataSetupComplete && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "green", bold: true, children: amplitudePreDetected
                         ? '\u2714 Amplitude is already configured in this project!'
-                        : '\u2714 Data setup complete!' }) })), _jsxs(Text, { bold: true, color: Colors.accent, children: ["MCP Server ", isRemove ? 'Removal' : 'Setup'] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [phase === Phase.Detecting && (_jsx(Text, { color: Colors.muted, children: "Detecting supported editors..." })), phase === Phase.None && (_jsxs(Text, { color: Colors.muted, children: ["No ", isRemove ? 'installed' : 'supported', " MCP clients detected. Skipping..."] })), phase === Phase.Ask && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: Colors.muted, children: ["Detected: ", clients.map((c) => c.name).join(', ')] }), _jsx(Box, { marginTop: 1, children: _jsx(ConfirmationInput, { message: isRemove
-                                        ? 'Remove the Amplitude MCP server from your editor?'
-                                        : 'Install the Amplitude MCP server to your editor?', confirmLabel: isRemove ? 'Remove MCP' : 'Install MCP', cancelLabel: "No thanks", onConfirm: handleConfirm, onCancel: handleSkip }) })] })), phase === Phase.Pick && (_jsx(PickerMenu, { message: "Select editor to install MCP server", options: clients.map((c) => ({
-                            label: c.name,
-                            value: c.name,
-                        })), mode: "multi", onSelect: (selected) => {
-                            const names = Array.isArray(selected) ? selected : [selected];
-                            if (names.length === 0)
-                                return;
-                            analytics.wizardCapture('mcp clients selected', {
-                                selected_clients: names,
-                                available_clients: clients.map((c) => c.name),
-                            });
-                            void doInstall(names);
-                        } })), phase === Phase.Working && (_jsxs(Text, { color: Colors.muted, children: [isRemove ? 'Removing' : 'Installing', " MCP server..."] })), phase === Phase.Done && (_jsx(Box, { flexDirection: "column", children: resultClients.length > 0 ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "green", bold: true, children: ['\u2714', " MCP server", ' ', isRemove ? 'removed from' : 'installed for', ":"] }), resultClients.map((name, i) => (_jsxs(Text, { children: [' ', '\u2022', " ", name] }, i)))] })) : (_jsxs(Text, { color: Colors.muted, children: [isRemove ? 'Removal' : 'Installation', " skipped."] })) }))] })] }));
+                        : '\u2714 Data setup complete!' }) })), amplitudePreDetectedChoicePending && !isRemove && (_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { color: Colors.muted, children: "The installer skipped the automated setup step because Amplitude is already present. You can continue to editor MCP setup, or run the full setup wizard if you want to review or change the integration." }), _jsx(Box, { marginTop: 1, children: _jsx(PickerMenu, { message: "How would you like to proceed?", options: [
+                                { label: 'Continue to MCP setup', value: 'continue' },
+                                {
+                                    label: 'Run setup wizard anyway',
+                                    value: 'wizard',
+                                },
+                            ], onSelect: (value) => {
+                                const runWizard = value === 'wizard';
+                                analytics.wizardCapture('Amplitude Pre-Detected Choice', {
+                                    run_wizard_anyway: runWizard,
+                                });
+                                store.resolvePreDetectedChoice(runWizard);
+                            } }) })] })), !amplitudePreDetectedChoicePending && (_jsxs(_Fragment, { children: [_jsxs(Text, { bold: true, color: Colors.accent, children: ["MCP Server ", isRemove ? 'Removal' : 'Setup'] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [phase === Phase.Detecting && (_jsx(Text, { color: Colors.muted, children: "Detecting supported editors..." })), phase === Phase.None && (_jsxs(Text, { color: Colors.muted, children: ["No ", isRemove ? 'installed' : 'supported', " MCP clients detected. Skipping..."] })), phase === Phase.Ask && (_jsxs(_Fragment, { children: [_jsxs(Text, { color: Colors.muted, children: ["Detected: ", clients.map((c) => c.name).join(', ')] }), _jsx(Box, { marginTop: 1, children: _jsx(ConfirmationInput, { message: isRemove
+                                                ? 'Remove the Amplitude MCP server from your editor?'
+                                                : 'Install the Amplitude MCP server to your editor?', confirmLabel: isRemove ? 'Remove MCP' : 'Install MCP', cancelLabel: "No thanks", onConfirm: handleConfirm, onCancel: handleSkip }) })] })), phase === Phase.Pick && (_jsx(PickerMenu, { message: "Select editor to install MCP server", options: clients.map((c) => ({
+                                    label: c.name,
+                                    value: c.name,
+                                })), mode: "multi", onSelect: (selected) => {
+                                    const names = Array.isArray(selected) ? selected : [selected];
+                                    if (names.length === 0)
+                                        return;
+                                    analytics.wizardCapture('MCP Clients Selected', {
+                                        selected_clients: names,
+                                        available_clients: clients.map((c) => c.name),
+                                    });
+                                    void doInstall(names);
+                                } })), phase === Phase.Working && (_jsxs(Text, { color: Colors.muted, children: [isRemove ? 'Removing' : 'Installing', " MCP server..."] })), phase === Phase.Done && (_jsx(Box, { flexDirection: "column", children: resultClients.length > 0 ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "green", bold: true, children: ['\u2714', " MCP server", ' ', isRemove ? 'removed from' : 'installed for', ":"] }), resultClients.map((name, i) => (_jsxs(Text, { children: [' ', '\u2022', " ", name] }, i)))] })) : (_jsxs(Text, { color: Colors.muted, children: [isRemove ? 'Removal' : 'Installation', " skipped."] })) }))] })] }))] }));
 };

package/dist/src/ui/tui/screens/OutroScreen.js

@@ -47,7 +47,7 @@ export const OutroScreen = ({ store }) => {
                         { label: 'Exit', value: 'exit' },
                     ], onSelect: (value) => {
                         const choice = Array.isArray(value) ? value[0] : value;
-                        analytics.wizardCapture('outro action', {
+                        analytics.wizardCapture('Outro Action', {
                             action: choice,
                             outro_kind: outroData.kind,
                         });
@@ -60,7 +60,6 @@ export const OutroScreen = ({ store }) => {
                             opn(url, { wait: false }).catch(() => {
                                 /* fire-and-forget */
                             });
-                            process.exit(0);
                         }
                         else {
                             process.exit(0);

package/dist/src/ui/tui/screens/SlackScreen.d.ts

@@ -16,10 +16,5 @@ interface SlackScreenProps {
     /** When provided, called on completion instead of setSlackComplete (overlay mode). */
     onComplete?: () => void;
 }
-/**
- * Build the Amplitude settings URL for Slack connection.
- * Uses the org name from the API; falls back to base URL.
- */
-export declare function slackSettingsUrl(baseUrl: string, orgName: string | null): string;
 export declare const SlackScreen: ({ store, standalone, onComplete, }: SlackScreenProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/src/ui/tui/screens/SlackScreen.js

@@ -26,16 +26,6 @@ var Phase;
     Phase["Waiting"] = "waiting";
     Phase["Done"] = "done";
 })(Phase || (Phase = {}));
-/**
- * Build the Amplitude settings URL for Slack connection.
- * Uses the org name from the API; falls back to base URL.
- */
-export function slackSettingsUrl(baseUrl, orgName) {
-    if (orgName) {
-        return `${baseUrl}/analytics/${encodeURIComponent(orgName)}/settings/profile`;
-    }
-    return `${baseUrl}/settings/profile`;
-}
 const markDone = (store, outcome, standalone, onComplete) => {
     if (onComplete) {
         onComplete();
@@ -78,7 +68,7 @@ export const SlackScreen = ({ store, standalone = false, onComplete, }) => {
             logToFile(`[SlackScreen] API fetch failed: ${err instanceof Error ? err.message : String(err)}`);
         });
     }, []);
-    const settingsUrl = slackSettingsUrl(OUTBOUND_URLS.overview[(region ?? 'us')], resolvedOrgName);
+    const settingsUrl = OUTBOUND_URLS.slackSettings((region ?? 'us'), store.session.selectedOrgId, resolvedOrgName);
     const handleConnect = () => {
         setPhase(Phase.Opening);
         opn(settingsUrl, { wait: false }).catch(() => {

package/dist/src/ui/tui/store.d.ts

@@ -72,6 +72,8 @@ export declare class WizardStore {
     private _backupAndFixSettings;
     /** Pending confirmation or choice prompt from the agent. */
     private $pendingPrompt;
+    /** Resolves when the user picks continue vs run wizard after Amplitude pre-detection. */
+    private _preDetectedChoiceResolver;
     constructor(flow?: Flow);
     get session(): WizardSession;
     set session(value: WizardSession);
@@ -94,6 +96,8 @@ export declare class WizardStore {
     completeSetup(): void;
     setRunPhase(phase: RunPhase): void;
     setCredentials(credentials: WizardSession['credentials']): void;
+    setApiKeyNotice(notice: string | null): void;
+    setSelectedProjectName(name: string | null): void;
     setFrameworkConfig(integration: WizardSession['integration'], config: WizardSession['frameworkConfig']): void;
     setDetectionComplete(): void;
     setDetectedFramework(label: string): void;
@@ -185,9 +189,25 @@ export declare class WizardStore {
     /**
      * Enable an additional feature: enqueue it for the stop hook
      * and set any feature-specific session flags.
+     * Respects Amplitude Experiment feature flags — if the corresponding
+     * flag is off the feature is silently skipped.
      */
     enableFeature(feature: AdditionalFeature): void;
     setAmplitudePreDetected(): void;
+    /**
+     * Blocks bin.ts until McpScreen resolves via resolvePreDetectedChoice().
+     */
+    waitForPreDetectedChoice(): Promise<boolean>;
+    /**
+     * Called from McpScreen when the user chooses to skip the agent (continue to
+     * MCP) or run the full setup wizard anyway.
+     */
+    resolvePreDetectedChoice(runWizardAnyway: boolean): void;
+    /**
+     * Undo the pre-detection fast-path so runWizard can run; used when the user
+     * opts into the setup agent after Amplitude was already found in the project.
+     */
+    resetForAgentAfterPreDetected(): void;
     setMcpComplete(outcome?: McpOutcome, installedClients?: string[]): void;
     setSlackComplete(outcome?: SlackOutcome): void;
     setOutroData(data: OutroData): void;