@geminilight/mindos 0.6.38 → 0.6.40

package/app/components/setup/StepAI.tsx

@@ -1,17 +1,20 @@
 'use client';
 
 import { useState, useEffect } from 'react';
-import { Brain, Zap, SkipForward, CheckCircle2, ChevronDown, ChevronRight, Copy } from 'lucide-react';
+import { ChevronDown, ChevronRight, Copy, ExternalLink } from 'lucide-react';
 import { Field, Input, ApiKeyInput } from '@/components/settings/Primitives';
-import type { SetupState, SetupMessages, PortStatus } from './types';
+import type { SetupState, SetupMessages, PortStatus, ProviderSetupConfig } from './types';
+import type { ProviderId } from '@/lib/agent/providers';
+import { PROVIDER_PRESETS, isProviderId, getApiKeyEnvVar, getDefaultBaseUrl } from '@/lib/agent/providers';
+import ProviderSelect from '@/components/shared/ProviderSelect';
 import StepPorts from './StepPorts';
+import { useLocale } from '@/lib/stores/locale-store';
 
 export interface StepAIProps {
   state: SetupState;
   update: <K extends keyof SetupState>(key: K, val: SetupState[K]) => void;
   s: SetupMessages;
   onCopyToken: () => void;
-  // Port props (embedded in Advanced section)
   webPortStatus: PortStatus;
   mcpPortStatus: PortStatus;
   setWebPortStatus: (s: PortStatus) => void;
@@ -21,76 +24,96 @@ export interface StepAIProps {
 }
 
 export default function StepAI({ state, update, s, onCopyToken, webPortStatus, mcpPortStatus, setWebPortStatus, setMcpPortStatus, checkPort, portConflict }: StepAIProps) {
+  const { locale } = useLocale();
   const [portsOpen, setPortsOpen] = useState(false);
 
-  // Auto-expand Advanced section if port check finds a problem
   useEffect(() => {
     if (!portsOpen && (webPortStatus.available === false || mcpPortStatus.available === false || portConflict)) {
       setPortsOpen(true);
     }
   }, [webPortStatus.available, mcpPortStatus.available, portConflict, portsOpen]);
 
-  const providers = [
-    { id: 'anthropic' as const, icon: <Brain size={18} />, label: 'Anthropic', desc: 'Claude — claude-sonnet-4-6' },
-    { id: 'openai' as const, icon: <Zap size={18} />, label: 'OpenAI', desc: 'GPT or any OpenAI-compatible API' },
-    { id: 'skip' as const, icon: <SkipForward size={18} />, label: s.aiSkipTitle, desc: s.aiSkipDesc },
-  ];
+  const currentProvider = state.provider !== 'skip' && isProviderId(state.provider) ? state.provider : null;
+  const currentPreset = currentProvider ? PROVIDER_PRESETS[currentProvider] : null;
+  const currentConfig = currentProvider ? (state.providerConfigs[currentProvider] ?? { apiKey: '', model: currentPreset?.defaultModel ?? '' }) : null;
+
+  const patchConfig = (patch: Partial<ProviderSetupConfig>) => {
+    if (!currentProvider) return;
+    const prev = state.providerConfigs[currentProvider] ?? { apiKey: '', model: currentPreset?.defaultModel ?? '' };
+    update('providerConfigs', {
+      ...state.providerConfigs,
+      [currentProvider]: { ...prev, ...patch },
+    });
+  };
+
+  const configuredProviders = new Set(
+    Object.entries(state.providerConfigs)
+      .filter(([id, cfg]) => (cfg && (cfg.apiKey || cfg.apiKeyMask)) || PROVIDER_PRESETS[id as ProviderId]?.apiKeyFallback)
+      .map(([id]) => id as ProviderId),
+  );
+
   return (
     <div className="space-y-5">
-      <div className="grid grid-cols-1 gap-3">
-        {providers.map(p => (
-          <button key={p.id} onClick={() => update('provider', p.id)}
-            className="flex items-start gap-3 p-4 rounded-xl border text-left transition-all duration-150"
-            style={{
-              background: state.provider === p.id ? 'var(--amber-dim)' : 'var(--card)',
-              borderColor: state.provider === p.id ? 'var(--amber)' : 'var(--border)',
-            }}>
-            <span className="mt-0.5" style={{ color: state.provider === p.id ? 'var(--amber)' : 'var(--muted-foreground)' }}>
-              {p.icon}
-            </span>
-            <div>
-              <p className="text-sm font-medium" style={{ color: 'var(--foreground)' }}>{p.label}</p>
-              <p className="text-xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>{p.desc}</p>
-            </div>
-            {state.provider === p.id && (
-              <CheckCircle2 size={16} className="ml-auto mt-0.5 shrink-0" style={{ color: 'var(--amber)' }} />
-            )}
-          </button>
-        ))}
-      </div>
-      {state.provider !== 'skip' && (
+      <ProviderSelect
+        value={state.provider}
+        onChange={id => update('provider', id)}
+        showSkip
+        configuredProviders={configuredProviders}
+      />
+
+      {currentProvider && currentPreset && currentConfig && (
         <div className="space-y-4 pt-2">
+          {/* API Key */}
           <Field label={s.apiKey}>
             <ApiKeyInput
-              value={state.provider === 'anthropic' ? state.anthropicKey : state.openaiKey}
-              onChange={v => update(state.provider === 'anthropic' ? 'anthropicKey' : 'openaiKey', v)}
-              placeholder={
-                (state.provider === 'anthropic' ? state.anthropicKeyMask : state.openaiKeyMask)
-                || (state.provider === 'anthropic' ? 'sk-ant-...' : 'sk-...')
-              }
+              value={currentConfig.apiKey}
+              onChange={v => patchConfig({ apiKey: v })}
+              placeholder={currentConfig.apiKeyMask || `${getApiKeyEnvVar(currentProvider as ProviderId) ?? 'API Key'}...`}
             />
-            {(state.provider === 'anthropic' ? state.anthropicKeyMask : state.openaiKeyMask) && !(state.provider === 'anthropic' ? state.anthropicKey : state.openaiKey) && (
+            {currentConfig.apiKeyMask && !currentConfig.apiKey && (
               <p className="text-xs mt-1" style={{ color: 'var(--muted-foreground)' }}>
                 {s.apiKeyExisting ?? 'Existing key configured. Leave blank to keep it.'}
               </p>
             )}
+            {currentPreset.signupUrl && !currentConfig.apiKey && !currentConfig.apiKeyMask && (
+              <a
+                href={currentPreset.signupUrl}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="inline-flex items-center gap-1 text-xs mt-1.5 hover:underline"
+                style={{ color: 'var(--amber)' }}
+              >
+                <ExternalLink size={10} />
+                {currentPreset.apiKeyFallback
+                  ? (locale === 'zh' ? `下载 ${currentPreset.nameZh}` : `Download ${currentPreset.name}`)
+                  : (locale === 'zh' ? `获取 ${currentPreset.nameZh} API Key` : `Get ${currentPreset.name} API Key`)}
+              </a>
+            )}
           </Field>
+
+          {/* Base URL — before Model so defaults are correct when listing models */}
+          {currentPreset.supportsBaseUrl && (
+            <Field label={s.baseUrl} hint={s.baseUrlHint}>
+              <Input
+                value={currentConfig.baseUrl ?? ''}
+                onChange={e => patchConfig({ baseUrl: e.target.value })}
+                placeholder={currentPreset.fixedBaseUrl || getDefaultBaseUrl(currentProvider as ProviderId) || 'https://api.openai.com/v1'}
+              />
+            </Field>
+          )}
+
+          {/* Model */}
           <Field label={s.model}>
             <Input
-              value={state.provider === 'anthropic' ? state.anthropicModel : state.openaiModel}
-              onChange={e => update(state.provider === 'anthropic' ? 'anthropicModel' : 'openaiModel', e.target.value)}
+              value={currentConfig.model}
+              onChange={e => patchConfig({ model: e.target.value })}
+              placeholder={currentPreset.defaultModel}
             />
           </Field>
-          {state.provider === 'openai' && (
-            <Field label={s.baseUrl} hint={s.baseUrlHint}>
-              <Input value={state.openaiBaseUrl} onChange={e => update('openaiBaseUrl', e.target.value)}
-                placeholder="https://api.openai.com/v1" />
-            </Field>
-          )}
         </div>
       )}
 
-      {/* Advanced: Port Settings (collapsed) */}
+      {/* Advanced: Port Settings */}
       <div className="pt-3 mt-1" style={{ borderTop: '1px solid var(--border)' }}>
         <button
           type="button"
@@ -102,7 +125,6 @@ export default function StepAI({ state, update, s, onCopyToken, webPortStatus, m
         </button>
         {portsOpen && (
           <div className="mt-3 space-y-5">
-            {/* MCP Auth Token (read-only) */}
             <div className="space-y-1.5">
               <p className="text-xs font-medium" style={{ color: 'var(--foreground)' }}>
                 🔑 {s.tokenSectionTitle}
@@ -123,7 +145,6 @@ export default function StepAI({ state, update, s, onCopyToken, webPortStatus, m
               </p>
             </div>
 
-            {/* Port Settings */}
             <StepPorts
               state={state} update={update}
               webPortStatus={webPortStatus} mcpPortStatus={mcpPortStatus}

package/app/components/setup/StepDots.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { CheckCircle2 } from 'lucide-react';
-import { useLocale } from '@/lib/LocaleContext';
+import { useLocale } from '@/lib/stores/locale-store';
 
 export interface StepDotsProps {
   step: number;

package/app/components/setup/StepReview.tsx

@@ -1,10 +1,15 @@
 'use client';
 
-import { useState, useRef, useEffect } from 'react';
+import { useState, useRef, useEffect, useCallback } from 'react';
 import {
-  Loader2, AlertTriangle, CheckCircle2, XCircle,
+  Loader2, AlertTriangle, CheckCircle2, XCircle, Copy, Check,
+  FolderOpen, Brain, Plug, Shield,
 } from 'lucide-react';
+import { copyToClipboard } from '@/lib/clipboard';
+import { toast } from '@/lib/toast';
 import type { SetupState, SetupMessages, AgentInstallStatus } from './types';
+import { PROVIDER_PRESETS, isProviderId } from '@/lib/agent/providers';
+import { useLocale } from '@/lib/stores/locale-store';
 
 // ─── Restart Block ────────────────────────────────────────────────────────────
 
@@ -116,7 +121,8 @@ export default function StepReview({
 
   return (
     <div className="space-y-5">
-      {/* Compact config summary */}
+      {/* Compact config summary — hidden once done (health check replaces it) */}
+      {setupPhase !== 'done' && (
       <div className="rounded-xl border overflow-hidden" style={{ borderColor: 'var(--border)' }}>
         {summaryRows.map(([label, value], i) => (
           <div key={i} className="flex items-center justify-between px-4 py-2.5 text-sm"
@@ -129,19 +135,20 @@ export default function StepReview({
           </div>
         ))}
       </div>
+      )}
 
       {/* Before submit: review hint */}
       {setupPhase === 'review' && (
         <p className="text-sm" style={{ color: 'var(--muted-foreground)' }}>{s.reviewHint}</p>
       )}
 
-      {/* Progress stepper — visible during/after setup */}
-      {setupPhase !== 'review' && (
+      {/* Progress stepper — visible during setup, hidden once done */}
+      {setupPhase !== 'review' && setupPhase !== 'done' && (
         <div className="space-y-2 py-2">
           {phases.map(({ key, label }, i) => {
             const idx = phaseOrder.indexOf(key);
-            const isDone = currentIdx > idx || (key === 'done' && setupPhase === 'done');
-            const isActive = setupPhase === key && key !== 'done';
+            const isDone = currentIdx > idx;
+            const isActive = setupPhase === key;
             const isPending = currentIdx < idx;
             return (
               <div key={key} className="flex items-center gap-3">
@@ -211,7 +218,168 @@ export default function StepReview({
           {s.completeFailed}: {error}
         </div>
       )}
-      {needsRestart && setupPhase === 'done' && <RestartBanner s={s} />}
+
+      {/* Health Check Summary — shown when setup is done */}
+      {setupPhase === 'done' && (
+        <HealthCheckView
+          state={state}
+          selectedAgents={selectedAgents}
+          agentStatuses={agentStatuses}
+          needsRestart={needsRestart}
+          s={s}
+        />
+      )}
+    </div>
+  );
+}
+
+/* ── Health Check Summary ─────────────────────────────────────────────────── */
+
+function HealthCheckView({ state, selectedAgents, agentStatuses, needsRestart, s }: {
+  state: SetupState;
+  selectedAgents: Set<string>;
+  agentStatuses: Record<string, AgentInstallStatus>;
+  needsRestart: boolean;
+  s: SetupMessages;
+}) {
+  const [copied, setCopied] = useState(false);
+
+  useEffect(() => {
+    if (!copied) return;
+    const t = setTimeout(() => setCopied(false), 2000);
+    return () => clearTimeout(t);
+  }, [copied]);
+
+  const handleCopyToken = useCallback(async () => {
+    if (!state.authToken) return;
+    const ok = await copyToClipboard(state.authToken);
+    if (ok) { setCopied(true); toast.copy(); }
+  }, [state.authToken]);
+
+  const { locale } = useLocale();
+
+  // Derive health check statuses
+  const kbOk = !!state.mindRoot;
+  const aiOk = state.provider !== 'skip';
+  const successAgents = Object.values(agentStatuses).filter(a => a.state === 'ok').length;
+  const agentsOk = successAgents > 0;
+  const hasToken = !!state.authToken;
+
+  // Resolve provider display name and model from dynamic config
+  let providerDisplayName = '';
+  let providerModelName = '';
+  if (aiOk && isProviderId(state.provider as string)) {
+    const preset = PROVIDER_PRESETS[state.provider as keyof typeof PROVIDER_PRESETS];
+    providerDisplayName = locale === 'zh' ? preset.nameZh : preset.name;
+    const cfg = state.providerConfigs[state.provider as keyof typeof PROVIDER_PRESETS];
+    providerModelName = cfg?.model || preset.defaultModel;
+  }
+
+  const checks: Array<{
+    ok: boolean;
+    icon: React.ReactNode;
+    title: string;
+    detail: string;
+    action?: string;
+  }> = [
+    {
+      ok: kbOk,
+      icon: <FolderOpen size={14} />,
+      title: s.healthKb ?? 'Knowledge Base',
+      detail: kbOk ? state.mindRoot : (s.healthKbNone ?? 'Not configured'),
+    },
+    {
+      ok: aiOk,
+      icon: <Brain size={14} />,
+      title: s.healthAi ?? 'AI Provider',
+      detail: aiOk
+        ? `${providerDisplayName} (${providerModelName || 'default'})`
+        : (s.healthAiNone ?? 'Not configured — AI features disabled'),
+      action: aiOk ? undefined : (s.healthAiAction ?? 'Add an API key in Settings → AI.'),
+    },
+    {
+      ok: agentsOk,
+      icon: <Plug size={14} />,
+      title: s.healthAgents ?? 'Agent Tools',
+      detail: agentsOk
+        ? (s.healthAgentsOk?.(successAgents) ?? `${successAgents} agent(s) configured`)
+        : selectedAgents.size > 0
+          ? (s.healthAgentsPartial ?? 'Configuration in progress...')
+          : (s.healthAgentsNone ?? 'No agents configured'),
+      action: agentsOk ? undefined : (s.healthAgentsAction ?? 'You can add agents later in Settings → MCP.'),
+    },
+  ];
+
+  return (
+    <div className="space-y-4">
+      {/* Health check items */}
+      <div className="rounded-xl border overflow-hidden" style={{ borderColor: 'var(--border)' }}>
+        {checks.map(({ ok, icon, title, detail, action }, i) => (
+          <div key={i}
+            className="flex items-start gap-3 px-4 py-3"
+            style={{
+              background: i % 2 === 0 ? 'var(--card)' : 'transparent',
+              borderTop: i > 0 ? '1px solid var(--border)' : undefined,
+            }}>
+            <div className="w-5 h-5 rounded-full flex items-center justify-center shrink-0 mt-0.5"
+              style={{
+                background: ok
+                  ? 'color-mix(in srgb, var(--success) 15%, transparent)'
+                  : 'color-mix(in srgb, var(--amber) 15%, transparent)',
+                color: ok ? 'var(--success)' : 'var(--amber)',
+              }}>
+              {ok ? <CheckCircle2 size={12} /> : <AlertTriangle size={10} />}
+            </div>
+            <div className="flex-1 min-w-0">
+              <div className="flex items-center gap-1.5 text-sm font-medium" style={{ color: 'var(--foreground)' }}>
+                {icon} {title}
+              </div>
+              <p className="text-xs mt-0.5 break-words" style={{ color: ok ? 'var(--muted-foreground)' : 'var(--amber-text)' }}>
+                {detail}
+              </p>
+              {action && (
+                <p className="text-xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>{action}</p>
+              )}
+            </div>
+          </div>
+        ))}
+      </div>
+
+      {/* Auth Token — always shown prominently */}
+      {hasToken && (
+        <div className="rounded-xl border p-4 space-y-2" style={{ borderColor: 'var(--border)', background: 'var(--card)' }}>
+          <div className="flex items-center gap-1.5 text-xs font-medium uppercase tracking-wider" style={{ color: 'var(--muted-foreground)' }}>
+            <Shield size={11} />
+            {s.healthTokenTitle ?? 'MCP Auth Token'}
+          </div>
+          <div className="flex items-center gap-2">
+            <div className="flex-1 flex items-center px-3 py-2 rounded-lg min-h-[38px]"
+              style={{ background: 'var(--muted)', border: '1px solid var(--border)' }}>
+              <code className="flex-1 text-xs font-mono break-all select-all leading-relaxed" style={{ color: 'var(--foreground)' }}>
+                {state.authToken}
+              </code>
+            </div>
+            <button
+              type="button"
+              onClick={handleCopyToken}
+              className="shrink-0 p-2 rounded-lg border transition-colors focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1"
+              style={{
+                borderColor: copied ? 'color-mix(in srgb, var(--success) 50%, transparent)' : 'var(--border)',
+                background: copied ? 'color-mix(in srgb, var(--success) 10%, transparent)' : 'transparent',
+                color: copied ? 'var(--success)' : 'var(--muted-foreground)',
+              }}
+              title={s.healthTokenCopy ?? 'Copy token'}>
+              {copied ? <Check size={14} /> : <Copy size={14} />}
+            </button>
+          </div>
+          <p className="text-xs" style={{ color: 'var(--muted-foreground)' }}>
+            {s.healthTokenHint ?? 'Use this token when connecting AI agents. Also available in Settings → MCP.'}
+          </p>
+        </div>
+      )}
+
+      {/* Restart banner */}
+      {needsRestart && <RestartBanner s={s} />}
     </div>
   );
 }

package/app/components/setup/index.tsx

@@ -2,10 +2,11 @@
 
 import { useState, useEffect, useCallback } from 'react';
 import { Sparkles, Loader2, ChevronLeft, ChevronRight } from 'lucide-react';
-import { useLocale } from '@/lib/LocaleContext';
+import { useLocale } from '@/lib/stores/locale-store';
 import { copyToClipboard } from '@/lib/clipboard';
 import { toast } from '@/lib/toast';
-import type { SetupState, PortStatus, AgentEntry, AgentInstallStatus } from './types';
+import type { SetupState, PortStatus, AgentEntry, AgentInstallStatus, ProviderSetupConfig } from './types';
+import { type ProviderId, isProviderId, PROVIDER_PRESETS } from '@/lib/agent/providers';
 import { TOTAL_STEPS, STEP_KB, STEP_AI, STEP_AGENTS, STEP_REVIEW } from './constants';
 import StepKB from './StepKB';
 import StepAI from './StepAI';
@@ -47,6 +48,19 @@ function parseInstallResult(
 
 /** Phase 1: Save setup config. Returns whether restart is needed. Throws on failure. */
 async function saveConfig(state: SetupState): Promise<boolean> {
+  // Build providers dict from dynamic providerConfigs
+  const providers: Record<string, { apiKey: string; model: string; baseUrl?: string }> = {};
+  if (state.provider !== 'skip') {
+    for (const [id, cfg] of Object.entries(state.providerConfigs)) {
+      if (!cfg) continue;
+      providers[id] = {
+        apiKey: cfg.apiKey,
+        model: cfg.model,
+        ...(cfg.baseUrl ? { baseUrl: cfg.baseUrl } : {}),
+      };
+    }
+  }
+
   const payload = {
     mindRoot: state.mindRoot,
     template: state.template || undefined,
@@ -56,10 +70,7 @@ async function saveConfig(state: SetupState): Promise<boolean> {
     webPassword: state.webPassword,
     ai: state.provider === 'skip' ? undefined : {
       provider: state.provider,
-      providers: {
-        anthropic: { apiKey: state.anthropicKey, model: state.anthropicModel },
-        openai: { apiKey: state.openaiKey, model: state.openaiModel, baseUrl: state.openaiBaseUrl },
-      },
+      providers,
     },
   };
   const res = await fetch('/api/setup', {
@@ -113,13 +124,10 @@ export default function SetupWizard() {
     mindRoot: '~/MindOS/mind',
     template: 'en',
     provider: 'anthropic',
-    anthropicKey: '',
-    anthropicModel: 'claude-sonnet-4-6',
-    anthropicKeyMask: '',
-    openaiKey: '',
-    openaiModel: 'gpt-5.4',
-    openaiBaseUrl: '',
-    openaiKeyMask: '',
+    providerConfigs: {
+      anthropic: { apiKey: '', model: 'claude-sonnet-4-6' },
+      openai: { apiKey: '', model: 'gpt-5.4', baseUrl: '' },
+    },
     webPort: 3456,
     mcpPort: 8781,
     authToken: '',
@@ -150,20 +158,37 @@ export default function SetupWizard() {
       .then(r => r.json())
       .then(data => {
         if (data.homeDir) setHomeDir(data.homeDir);
-        setState(prev => ({
-          ...prev,
-          mindRoot: data.mindRoot || prev.mindRoot,
-          webPort: typeof data.port === 'number' ? data.port : prev.webPort,
-          mcpPort: typeof data.mcpPort === 'number' ? data.mcpPort : prev.mcpPort,
-          authToken: data.authToken || prev.authToken,
-          webPassword: data.webPassword || prev.webPassword,
-          provider: (data.provider === 'anthropic' || data.provider === 'openai') ? data.provider : prev.provider,
-          anthropicModel: data.anthropicModel || prev.anthropicModel,
-          anthropicKeyMask: data.anthropicApiKey || '',
-          openaiModel: data.openaiModel || prev.openaiModel,
-          openaiBaseUrl: data.openaiBaseUrl ?? prev.openaiBaseUrl,
-          openaiKeyMask: data.openaiApiKey || '',
-        }));
+
+        setState(prev => {
+          const provConfigs: Partial<Record<ProviderId, ProviderSetupConfig>> = { ...prev.providerConfigs };
+
+          // Load dynamic providers format from server
+          if (data.providerConfigs && typeof data.providerConfigs === 'object') {
+            for (const [id, cfg] of Object.entries(data.providerConfigs as Record<string, any>)) {
+              if (isProviderId(id) && cfg) {
+                provConfigs[id] = {
+                  apiKey: provConfigs[id]?.apiKey ?? '',
+                  model: cfg.model || PROVIDER_PRESETS[id].defaultModel,
+                  baseUrl: cfg.baseUrl ?? '',
+                  apiKeyMask: cfg.apiKeyMask || '',
+                };
+              }
+            }
+          }
+
+          const resolvedProvider = data.provider && isProviderId(data.provider) ? data.provider : prev.provider;
+
+          return {
+            ...prev,
+            mindRoot: data.mindRoot || prev.mindRoot,
+            webPort: typeof data.port === 'number' ? data.port : prev.webPort,
+            mcpPort: typeof data.mcpPort === 'number' ? data.mcpPort : prev.mcpPort,
+            authToken: data.authToken || prev.authToken,
+            webPassword: data.webPassword || prev.webPassword,
+            provider: resolvedProvider,
+            providerConfigs: provConfigs,
+          };
+        });
         // Generate a new token only if none exists yet
         if (!data.authToken) {
           fetch('/api/setup/generate-token', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: '{}' })
@@ -274,11 +299,24 @@ export default function SetupWizard() {
     setError('');
     const agentKeys = Array.from(selectedAgents);
 
+    // Ensure auth token exists before saving (race: token generation may still be in-flight)
+    let finalState = state;
+    if (!state.authToken) {
+      try {
+        const res = await fetch('/api/setup/generate-token', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: '{}' });
+        const data = await res.json();
+        if (data.token) {
+          finalState = { ...state, authToken: data.token };
+          setState(finalState);
+        }
+      } catch { /* proceed without — server will generate one */ }
+    }
+
     // Phase 1: Save config
     setSetupPhase('saving');
     let restartNeeded = false;
     try {
-      restartNeeded = await saveConfig(state);
+      restartNeeded = await saveConfig(finalState);
       if (restartNeeded) setNeedsRestart(true);
     } catch (e) {
       setError(e instanceof Error ? e.message : String(e));
@@ -295,7 +333,7 @@ export default function SetupWizard() {
       setAgentStatuses(initialStatuses);
 
       try {
-        const statuses = await installAgents(agentKeys, agents, agentTransport, agentScope, state.mcpPort, state.authToken);
+        const statuses = await installAgents(agentKeys, agents, agentTransport, agentScope, finalState.mcpPort, finalState.authToken);
         setAgentStatuses(statuses);
       } catch (e) {
         console.warn('[SetupWizard] agent batch install failed:', e);
@@ -306,17 +344,13 @@ export default function SetupWizard() {
     }
 
     // Phase 3: Skill is now built into SKILL.md — no install needed.
-    // user-skill-rules.md will be created on first preference capture.
+    // .mindos/user-preferences.md will be created on first preference capture.
 
     setSubmitting(false);
     setCompleted(true);
     setSetupPhase('done');
-
-    if (restartNeeded) {
-      // Config changed requiring restart — stay on page, show restart block
-      return;
-    }
-    window.location.href = '/?welcome=1';
+    // Always stay on done page to show health check summary.
+    // User navigates away via the "Go to MindOS" button.
   };
 
   const retryAgent = useCallback(async (key: string) => {
@@ -414,14 +448,14 @@ export default function SetupWizard() {
               {s.next} <ChevronRight size={14} />
             </button>
           ) : completed ? (
-            // After completing: show Done link or Restart button in the same position
+            // After completing: show Restart button or Go link
             needsRestart ? (
               <RestartButton s={s} newPort={state.webPort} />
             ) : (
               <a href="/?welcome=1"
-                className="flex items-center gap-1 px-5 py-2 text-sm font-medium rounded-lg transition-colors"
+                className="flex items-center gap-1.5 px-5 py-2 text-sm font-medium rounded-lg transition-colors hover:opacity-90 focus-visible:ring-2 focus-visible:ring-ring"
                 style={{ background: 'var(--amber)', color: 'var(--amber-foreground)' }}>
-                {s.completeDone} &rarr;
+                {s.healthGoHome ?? 'Go to MindOS'} &rarr;
               </a>
             )
           ) : (

package/app/components/setup/types.ts

@@ -1,4 +1,5 @@
 import type { Messages } from '@/lib/i18n';
+import type { ProviderId } from '@/lib/agent/providers';
 
 // ─── i18n type aliases ───────────────────────────────────────────────────────
 export type SetupMessages = Messages['setup'];
@@ -7,18 +8,20 @@ export type McpMessages = Messages['settings']['mcp'];
 // ─── Template ────────────────────────────────────────────────────────────────
 export type Template = 'en' | 'zh' | 'empty' | '';
 
+// ─── Per-provider config stored in setup state ───────────────────────────────
+export interface ProviderSetupConfig {
+  apiKey: string;
+  model: string;
+  baseUrl?: string;
+  apiKeyMask?: string;
+}
+
 // ─── Setup state ─────────────────────────────────────────────────────────────
 export interface SetupState {
   mindRoot: string;
   template: Template;
-  provider: 'anthropic' | 'openai' | 'skip';
-  anthropicKey: string;
-  anthropicModel: string;
-  anthropicKeyMask: string;   // masked existing key from server (display only)
-  openaiKey: string;
-  openaiModel: string;
-  openaiBaseUrl: string;
-  openaiKeyMask: string;      // masked existing key from server (display only)
+  provider: ProviderId | 'skip';
+  providerConfigs: Partial<Record<ProviderId, ProviderSetupConfig>>;
   webPort: number;
   mcpPort: number;
   authToken: string;