@geminilight/mindos 0.6.39 → 0.6.41

package/_standalone/components/settings/UninstallTab.tsx

@@ -3,7 +3,7 @@
 import { useState } from 'react';
 import { Trash2, AlertTriangle, CheckCircle2, Loader2, ShieldCheck } from 'lucide-react';
 import { apiFetch } from '@/lib/api';
-import { useLocale } from '@/lib/LocaleContext';
+import { useLocale } from '@/lib/stores/locale-store';
 import { SettingCard } from './Primitives';
 
 type Phase = 'idle' | 'confirming' | 'running' | 'success' | 'error';

package/_standalone/components/settings/UpdateTab.tsx

@@ -3,7 +3,7 @@
 import { useState, useEffect, useCallback, useRef } from 'react';
 import { Download, RefreshCw, CheckCircle2, AlertCircle, Loader2, ExternalLink, Circle, Monitor } from 'lucide-react';
 import { apiFetch, ApiError } from '@/lib/api';
-import { useLocale } from '@/lib/LocaleContext';
+import { useLocale } from '@/lib/stores/locale-store';
 
 interface MindosDesktopBridge {
   checkUpdate: () => Promise<{ available: boolean; version?: string }>;
@@ -56,7 +56,7 @@ type UpdateState = 'idle' | 'checking' | 'updating' | 'updated' | 'error' | 'tim
 
 const CHANGELOG_URL = 'https://github.com/GeminiLight/MindOS/releases';
 const POLL_INTERVAL = 3_000;
-const POLL_TIMEOUT = 5 * 60 * 1000; // 5 minutes
+const POLL_TIMEOUT = 15 * 60 * 1000; // 15 minutes — legacy fallback build can take 10min+ on slow machines
 const UPDATE_STATE_KEY = 'mindos_update_in_progress';
 
 const STAGE_LABELS: Record<string, { en: string; zh: string }> = {

package/_standalone/components/settings/types.ts

@@ -1,5 +1,6 @@
 import type { Locale, Messages } from '@/lib/i18n';
 import type React from 'react';
+import type { ProviderId } from '@/lib/agent/providers';
 
 export interface ProviderConfig {
   apiKey: string;
@@ -8,11 +9,8 @@ export interface ProviderConfig {
 }
 
 export interface AiSettings {
-  provider: 'anthropic' | 'openai';
-  providers: {
-    anthropic?: ProviderConfig;
-    openai?: ProviderConfig;
-  };
+  provider: ProviderId;
+  providers: Partial<Record<ProviderId, ProviderConfig>>;
 }
 
 export interface AgentSettings {
@@ -68,6 +66,7 @@ export interface McpStatus {
   authConfigured: boolean;
   maskedToken?: string;
   authToken?: string;
+  localIP?: string | null;
 }
 
 export interface AgentInfo {
@@ -115,6 +114,7 @@ export interface SkillInfo {
 /** 🟢 MINOR #7: Moved from SyncTab.tsx for consistency */
 export interface SyncStatus {
   enabled: boolean;
+  needsSetup?: boolean;
   provider?: string;
   remote?: string;
   branch?: string;
@@ -178,6 +178,8 @@ export interface McpAgentInstallProps {
   agents: AgentInfo[];
   t: Messages;
   onRefresh: () => void;
+  mode?: 'cli' | 'mcp';
+  activeSkillName?: string;
 }
 
 export interface McpSkillsSectionProps {

package/_standalone/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/_standalone/components/setup/StepAgents.tsx

@@ -2,16 +2,18 @@
 
 import { useState, useMemo } from 'react';
 import {
-  Loader2, CheckCircle2, XCircle, Brain, ChevronDown,
+  Loader2, CheckCircle2, XCircle, Brain, ChevronDown, Terminal, Plug,
 } from 'lucide-react';
 import { Field, Select } from '@/components/settings/Primitives';
-import type { SetupMessages, McpMessages, Template, AgentEntry, AgentInstallStatus } from './types';
+import type { SetupMessages, McpMessages, AgentEntry, AgentInstallStatus, ConnectionMode } from './types';
 
 export interface StepAgentsProps {
   agents: AgentEntry[];
   agentsLoading: boolean;
   selectedAgents: Set<string>;
   setSelectedAgents: React.Dispatch<React.SetStateAction<Set<string>>>;
+  connectionMode: ConnectionMode;
+  setConnectionMode: React.Dispatch<React.SetStateAction<ConnectionMode>>;
   agentTransport: 'auto' | 'stdio' | 'http';
   setAgentTransport: (v: 'auto' | 'stdio' | 'http') => void;
   agentScope: 'global' | 'project';
@@ -19,13 +21,13 @@ export interface StepAgentsProps {
   agentStatuses: Record<string, AgentInstallStatus>;
   s: SetupMessages;
   settingsMcp: McpMessages;
-  template: Template;
 }
 
 export default function StepAgents({
   agents, agentsLoading, selectedAgents, setSelectedAgents,
+  connectionMode, setConnectionMode,
   agentTransport, setAgentTransport, agentScope, setAgentScope,
-  agentStatuses, s, settingsMcp, template,
+  agentStatuses, s, settingsMcp,
 }: StepAgentsProps) {
   const toggleAgent = (key: string) => {
     setSelectedAgents(prev => {
@@ -105,17 +107,82 @@ export default function StepAgents({
         disabled={agentStatuses[agent.key]?.state === 'installing'}
       />
       <span className="text-sm flex-1" style={{ color: 'var(--foreground)' }}>{agent.name}</span>
-      <span className="text-2xs px-1.5 py-0.5 rounded font-mono"
-        style={{ background: 'color-mix(in srgb, var(--muted-foreground) 8%, transparent)', color: 'var(--muted-foreground)' }}>
-        {getEffectiveTransport(agent)}
-      </span>
+      {connectionMode.mcp && (
+        <span className="text-2xs px-1.5 py-0.5 rounded font-mono"
+          style={{ background: 'color-mix(in srgb, var(--muted-foreground) 8%, transparent)', color: 'var(--muted-foreground)' }}>
+          {getEffectiveTransport(agent)}
+        </span>
+      )}
       {getStatusBadge(agent.key, agent)}
     </label>
   );
 
   return (
     <div className="space-y-5">
-      <p className="text-sm" style={{ color: 'var(--muted-foreground)' }}>{s.agentToolsHint}</p>
+      {/* Connection Mode Toggle */}
+      <div className="space-y-2">
+        <p className="text-xs font-medium" style={{ color: 'var(--muted-foreground)' }}>
+          {s.connectionModeTitle}
+        </p>
+        <div className="grid grid-cols-2 gap-3">
+          <label
+            className="flex items-start gap-3 px-4 py-3 rounded-xl border cursor-pointer transition-all"
+            style={{
+              borderColor: connectionMode.cli ? 'var(--amber)' : 'var(--border)',
+              background: connectionMode.cli ? 'color-mix(in srgb, var(--amber) 6%, transparent)' : 'transparent',
+            }}>
+            <input
+              type="checkbox"
+              checked={connectionMode.cli}
+              onChange={() => setConnectionMode(prev => ({ ...prev, cli: !prev.cli }))}
+              className="form-check mt-0.5"
+            />
+            <div className="flex-1 min-w-0">
+              <div className="flex items-center gap-1.5 text-sm font-medium" style={{ color: 'var(--foreground)' }}>
+                <Terminal size={13} className="shrink-0" /> CLI
+              </div>
+              <p className="text-2xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>
+                {s.connectionModeCliHint}
+              </p>
+            </div>
+          </label>
+          <label
+            className="flex items-start gap-3 px-4 py-3 rounded-xl border cursor-pointer transition-all"
+            style={{
+              borderColor: connectionMode.mcp ? 'var(--amber)' : 'var(--border)',
+              background: connectionMode.mcp ? 'color-mix(in srgb, var(--amber) 6%, transparent)' : 'transparent',
+            }}>
+            <input
+              type="checkbox"
+              checked={connectionMode.mcp}
+              onChange={() => setConnectionMode(prev => ({ ...prev, mcp: !prev.mcp }))}
+              className="form-check mt-0.5"
+            />
+            <div className="flex-1 min-w-0">
+              <div className="flex items-center gap-1.5 text-sm font-medium" style={{ color: 'var(--foreground)' }}>
+                <Plug size={13} className="shrink-0" /> MCP
+              </div>
+              <p className="text-2xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>
+                {s.connectionModeMcpHint}
+              </p>
+            </div>
+          </label>
+        </div>
+      </div>
+
+      {/* Hint — contextual based on connection mode */}
+      {!connectionMode.cli && !connectionMode.mcp ? (
+        <div className="flex items-center gap-2 px-3 py-2.5 rounded-lg text-xs"
+          style={{ background: 'color-mix(in srgb, var(--amber) 8%, transparent)', color: 'var(--amber)' }}>
+          <Brain size={13} className="shrink-0" />
+          <span>{s.agentToolsHintNone}</span>
+        </div>
+      ) : (
+        <p className="text-sm" style={{ color: 'var(--muted-foreground)' }}>
+          {!connectionMode.mcp && connectionMode.cli ? s.agentToolsHintCliOnly : s.agentToolsHint}
+        </p>
+      )}
+
       {agentsLoading ? (
         <div className="flex items-center gap-2 py-4" style={{ color: 'var(--muted-foreground)' }}>
           <Loader2 size={14} className="animate-spin" />
@@ -172,46 +239,45 @@ export default function StepAgents({
               )}
             </div>
           )}
-          {/* Skill context + auto-install hint */}
-          <div className="space-y-1.5">
-            <p className="text-xs" style={{ color: 'var(--muted-foreground)' }}>
-              {s.skillWhat}
-            </p>
-            <div className="flex items-center gap-2 px-3 py-2 rounded-lg text-xs"
-              style={{ background: 'color-mix(in srgb, var(--muted-foreground) 6%, transparent)', color: 'var(--muted-foreground)' }}>
+          {/* Hint when no agents selected — only relevant for MCP mode */}
+          {connectionMode.mcp && selectedAgents.size === 0 && (
+            <div className="flex items-center gap-2 px-3 py-2.5 rounded-lg text-xs"
+              style={{ background: 'color-mix(in srgb, var(--amber) 8%, transparent)', color: 'var(--amber)' }}>
               <Brain size={13} className="shrink-0" />
-              <span>{s.skillAutoHint(template === 'zh' ? 'mindos-zh' : 'mindos')}</span>
+              <span>{s.agentNoneSelected}</span>
             </div>
-          </div>
-          {/* Advanced options — collapsed by default */}
-          <div>
-            <button
-              type="button"
-              onClick={() => setShowAdvanced(!showAdvanced)}
-              aria-expanded={showAdvanced}
-              className="flex items-center gap-1.5 text-xs py-1.5 transition-colors"
-              style={{ color: 'var(--muted-foreground)' }}>
-              <ChevronDown size={12} className={`transition-transform ${showAdvanced ? 'rotate-180' : ''}`} />
-              {s.agentAdvanced}
-            </button>
-            {showAdvanced && (
-              <div className="grid grid-cols-2 gap-4 mt-2">
-                <Field label={s.agentTransport}>
-                  <Select value={agentTransport} onChange={e => setAgentTransport(e.target.value as 'auto' | 'stdio' | 'http')}>
-                    <option value="auto">{s.agentTransportAuto}</option>
-                    <option value="stdio">{settingsMcp.transportStdio}</option>
-                    <option value="http">{settingsMcp.transportHttp}</option>
-                  </Select>
-                </Field>
-                <Field label={s.agentScope}>
-                  <Select value={agentScope} onChange={e => setAgentScope(e.target.value as 'global' | 'project')}>
-                    <option value="global">{s.agentScopeGlobal}</option>
-                    <option value="project">{s.agentScopeProject}</option>
-                  </Select>
-                </Field>
-              </div>
-            )}
-          </div>
+          )}
+          {/* Advanced options — only when MCP is enabled */}
+          {connectionMode.mcp && (
+            <div>
+              <button
+                type="button"
+                onClick={() => setShowAdvanced(!showAdvanced)}
+                aria-expanded={showAdvanced}
+                className="flex items-center gap-1.5 text-xs py-1.5 transition-colors"
+                style={{ color: 'var(--muted-foreground)' }}>
+                <ChevronDown size={12} className={`transition-transform ${showAdvanced ? 'rotate-180' : ''}`} />
+                {s.agentAdvanced}
+              </button>
+              {showAdvanced && (
+                <div className="grid grid-cols-2 gap-4 mt-2">
+                  <Field label={s.agentTransport}>
+                    <Select value={agentTransport} onChange={e => setAgentTransport(e.target.value as 'auto' | 'stdio' | 'http')}>
+                      <option value="auto">{s.agentTransportAuto}</option>
+                      <option value="stdio">{settingsMcp.transportStdio}</option>
+                      <option value="http">{settingsMcp.transportHttp}</option>
+                    </Select>
+                  </Field>
+                  <Field label={s.agentScope}>
+                    <Select value={agentScope} onChange={e => setAgentScope(e.target.value as 'global' | 'project')}>
+                      <option value="global">{s.agentScopeGlobal}</option>
+                      <option value="project">{s.agentScopeProject}</option>
+                    </Select>
+                  </Field>
+                </div>
+              )}
+            </div>
+          )}
           <div className="flex gap-2 mt-1">
             <button
               type="button"

package/_standalone/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;