@geminilight/mindos 0.5.8 → 0.5.10

package/app/components/settings/McpTab.tsx

@@ -5,7 +5,6 @@ import {
   Plug, CheckCircle2, AlertCircle, Loader2, Copy, Check,
   ChevronDown, ChevronRight, Trash2, Plus, X,
 } from 'lucide-react';
-import { SectionLabel } from './Primitives';
 import { apiFetch } from '@/lib/api';
 
 /* ── Types ─────────────────────────────────────────────────────── */
@@ -95,8 +94,8 @@ function ServerStatus({ status, t }: { status: McpStatus | null; t: any }) {
       <div className="space-y-1.5 text-sm pl-11">
         <div className="flex items-center gap-2">
           <span className="text-muted-foreground w-20 shrink-0 text-xs">{m?.status ?? 'Status'}</span>
-          <span className={`text-xs flex items-center gap-1 ${status.running ? 'text-green-500' : 'text-muted-foreground'}`}>
-            <span className={`inline-block w-1.5 h-1.5 rounded-full ${status.running ? 'bg-green-500' : 'bg-muted-foreground'}`} />
+          <span className={`text-xs flex items-center gap-1 ${status.running ? 'text-success' : 'text-muted-foreground'}`}>
+            <span className={`inline-block w-1.5 h-1.5 rounded-full ${status.running ? 'bg-success' : 'bg-muted-foreground'}`} />
             {status.running ? (m?.running ?? 'Running') : (m?.stopped ?? 'Stopped')}
           </span>
         </div>
@@ -116,7 +115,7 @@ function ServerStatus({ status, t }: { status: McpStatus | null; t: any }) {
           <span className="text-muted-foreground w-20 shrink-0 text-xs">{m?.auth ?? 'Auth'}</span>
           <span className="text-xs">
             {status.authConfigured
-              ? <span className="text-green-500">{m?.authSet ?? 'Token set'}</span>
+              ? <span className="text-success">{m?.authSet ?? 'Token set'}</span>
               : <span className="text-muted-foreground">{m?.authNotSet ?? 'No token'}</span>}
           </span>
         </div>
@@ -206,9 +205,7 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
   }));
 
   return (
-    <div className="space-y-3">
-      <SectionLabel>{m?.agentsTitle ?? 'Agent Configuration'}</SectionLabel>
-
+    <div className="space-y-3 pt-2">
       {/* Agent list */}
       <div className="space-y-1">
         {agents.map(agent => (
@@ -217,22 +214,23 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
               type="checkbox"
               checked={selected.has(agent.key)}
               onChange={() => toggle(agent.key)}
-              className="rounded border-border accent-amber-500"
+              className="rounded border-border"
+              style={{ accentColor: 'var(--amber)' }}
             />
             <span className="w-28 shrink-0 text-xs">{agent.name}</span>
-            <span className="text-[10px] px-1.5 py-0.5 rounded font-mono"
+            <span className="text-2xs px-1.5 py-0.5 rounded font-mono"
               style={{ background: 'rgba(100,100,120,0.08)' }}>
               {getEffectiveTransport(agent)}
             </span>
             {agent.installed ? (
               <>
-                <span className="text-[10px] px-1.5 py-0.5 rounded bg-green-500/15 text-green-500 font-mono">
+                <span className="text-2xs px-1.5 py-0.5 rounded bg-success/15 text-success font-mono">
                   {agent.transport}
                 </span>
-                <span className="text-[10px] text-muted-foreground">{agent.scope}</span>
+                <span className="text-2xs text-muted-foreground">{agent.scope}</span>
               </>
             ) : (
-              <span className="text-[10px] text-muted-foreground">
+              <span className="text-2xs text-muted-foreground">
                 {agent.present ? (m?.detected ?? 'Detected') : (m?.notFound ?? 'Not found')}
               </span>
             )}
@@ -241,7 +239,7 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
               <select
                 value={scopes[agent.key] || 'project'}
                 onChange={e => setScopes({ ...scopes, [agent.key]: e.target.value as 'project' | 'global' })}
-                className="ml-auto text-[10px] px-1.5 py-0.5 rounded border border-border bg-background text-foreground"
+                className="ml-auto text-2xs px-1.5 py-0.5 rounded border border-border bg-background text-foreground"
               >
                 <option value="project">{m?.project ?? 'Project'}</option>
                 <option value="global">{m?.global ?? 'Global'}</option>
@@ -251,6 +249,23 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
         ))}
       </div>
 
+      {/* Select detected / Clear buttons */}
+      <div className="flex gap-2 text-xs pt-1">
+        <button type="button"
+          onClick={() => setSelected(new Set(
+            agents.filter(a => !a.installed && a.present).map(a => a.key)
+          ))}
+          className="px-2.5 py-1 rounded-md border transition-colors hover:bg-muted/50"
+          style={{ borderColor: 'var(--amber)', color: 'var(--amber)' }}>
+          {m?.selectDetected ?? 'Select Detected'}
+        </button>
+        <button type="button"
+          onClick={() => setSelected(new Set())}
+          className="px-2.5 py-1 rounded-md border border-border text-muted-foreground transition-colors hover:bg-muted/50 hover:text-foreground">
+          {m?.clearSelection ?? 'Clear'}
+        </button>
+      </div>
+
       {/* Transport selector */}
       <div className="flex items-center gap-4 text-xs pt-1">
         <label className="flex items-center gap-1.5 cursor-pointer">
@@ -259,7 +274,8 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
             name="transport"
             checked={transport === 'auto'}
             onChange={() => setTransport('auto')}
-            className="accent-amber-500"
+            className=""
+            style={{ accentColor: 'var(--amber)' }}
           />
           {m?.transportAuto ?? 'auto (recommended)'}
         </label>
@@ -269,7 +285,8 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
             name="transport"
             checked={transport === 'stdio'}
             onChange={() => setTransport('stdio')}
-            className="accent-amber-500"
+            className=""
+            style={{ accentColor: 'var(--amber)' }}
           />
           {m?.transportStdio ?? 'stdio'}
         </label>
@@ -279,7 +296,8 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
             name="transport"
             checked={transport === 'http'}
             onChange={() => setTransport('http')}
-            className="accent-amber-500"
+            className=""
+            style={{ accentColor: 'var(--amber)' }}
           />
           {m?.transportHttp ?? 'http'}
         </label>
@@ -294,7 +312,7 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
               type="text"
               value={httpUrl}
               onChange={e => setHttpUrl(e.target.value)}
-              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background font-mono text-foreground outline-none focus:ring-1 focus:ring-ring"
+              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background font-mono text-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring"
             />
           </div>
           <div className="space-y-1">
@@ -304,7 +322,7 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
               value={httpToken}
               onChange={e => setHttpToken(e.target.value)}
               placeholder="Bearer token"
-              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background font-mono text-foreground outline-none focus:ring-1 focus:ring-ring"
+              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background font-mono text-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring"
             />
           </div>
         </div>
@@ -315,7 +333,7 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
         onClick={handleInstall}
         disabled={selected.size === 0 || installing}
         className="flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-lg transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
-        style={{ background: 'var(--amber)', color: '#131210' }}
+        style={{ background: 'var(--amber)', color: 'var(--amber-foreground)' }}
       >
         {installing && <Loader2 size={12} className="animate-spin" />}
         {installing ? (m?.installing ?? 'Installing...') : (m?.installSelected ?? 'Install Selected')}
@@ -325,7 +343,7 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
       {message && (
         <div className="flex items-center gap-1.5 text-xs" role="status">
           {message.type === 'success' ? (
-            <><CheckCircle2 size={12} className="text-green-500" /><span className="text-green-500">{message.text}</span></>
+            <><CheckCircle2 size={12} className="text-success" /><span className="text-success">{message.text}</span></>
           ) : (
             <><AlertCircle size={12} className="text-destructive" /><span className="text-destructive">{message.text}</span></>
           )}
@@ -414,9 +432,7 @@ function SkillsSection({ t }: { t: any }) {
   }
 
   return (
-    <div className="space-y-3">
-      <SectionLabel>{m?.skillsTitle ?? 'Skills'}</SectionLabel>
-
+    <div className="space-y-3 pt-2">
       {/* Skill language switcher */}
       {(() => {
         const mindosEnabled = skills.find(s => s.name === 'mindos')?.enabled ?? true;
@@ -468,7 +484,7 @@ function SkillsSection({ t }: { t: any }) {
           >
             {expanded === skill.name ? <ChevronDown size={12} /> : <ChevronRight size={12} />}
             <span className="text-xs font-medium flex-1">{skill.name}</span>
-            <span className={`text-[10px] px-1.5 py-0.5 rounded ${
+            <span className={`text-2xs px-1.5 py-0.5 rounded ${
               skill.source === 'builtin' ? 'bg-blue-500/15 text-blue-500' : 'bg-purple-500/15 text-purple-500'
             }`}>
               {skill.source === 'builtin' ? (m?.skillBuiltin ?? 'Built-in') : (m?.skillUser ?? 'Custom')}
@@ -477,7 +493,7 @@ function SkillsSection({ t }: { t: any }) {
             <button
               onClick={e => { e.stopPropagation(); handleToggle(skill.name, !skill.enabled); }}
               className={`relative inline-flex h-4 w-7 items-center rounded-full transition-colors ${
-                skill.enabled ? 'bg-green-500' : 'bg-muted-foreground/30'
+                skill.enabled ? 'bg-success' : 'bg-muted-foreground/30'
               }`}
             >
               <span className={`inline-block h-3 w-3 rounded-full bg-white transition-transform ${
@@ -489,11 +505,11 @@ function SkillsSection({ t }: { t: any }) {
           {expanded === skill.name && (
             <div className="px-3 py-2 border-t border-border text-xs space-y-1.5 bg-muted/20">
               <p className="text-muted-foreground">{skill.description || 'No description'}</p>
-              <p className="text-muted-foreground font-mono text-[10px]">{skill.path}</p>
+              <p className="text-muted-foreground font-mono text-2xs">{skill.path}</p>
               {skill.editable && (
                 <button
                   onClick={() => handleDelete(skill.name)}
-                  className="flex items-center gap-1 text-[10px] text-destructive hover:underline"
+                  className="flex items-center gap-1 text-2xs text-destructive hover:underline"
                 >
                   <Trash2 size={10} />
                   {m?.deleteSkill ?? 'Delete'}
@@ -514,37 +530,37 @@ function SkillsSection({ t }: { t: any }) {
             </button>
           </div>
           <div className="space-y-1">
-            <label className="text-[10px] text-muted-foreground">{m?.skillName ?? 'Name'}</label>
+            <label className="text-2xs text-muted-foreground">{m?.skillName ?? 'Name'}</label>
             <input
               type="text"
               value={newName}
               onChange={e => setNewName(e.target.value.replace(/[^a-z0-9-]/g, ''))}
               placeholder="my-skill"
-              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background font-mono text-foreground outline-none focus:ring-1 focus:ring-ring"
+              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background font-mono text-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring"
             />
           </div>
           <div className="space-y-1">
-            <label className="text-[10px] text-muted-foreground">{m?.skillDesc ?? 'Description'}</label>
+            <label className="text-2xs text-muted-foreground">{m?.skillDesc ?? 'Description'}</label>
             <input
               type="text"
               value={newDesc}
               onChange={e => setNewDesc(e.target.value)}
               placeholder="What does this skill do?"
-              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background text-foreground outline-none focus:ring-1 focus:ring-ring"
+              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background text-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring"
             />
           </div>
           <div className="space-y-1">
-            <label className="text-[10px] text-muted-foreground">{m?.skillContent ?? 'Content'}</label>
+            <label className="text-2xs text-muted-foreground">{m?.skillContent ?? 'Content'}</label>
             <textarea
               value={newContent}
               onChange={e => setNewContent(e.target.value)}
               rows={6}
               placeholder="Skill instructions (markdown)..."
-              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background text-foreground outline-none focus:ring-1 focus:ring-ring resize-y font-mono"
+              className="w-full px-2.5 py-1.5 text-xs rounded-md border border-border bg-background text-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring resize-y font-mono"
             />
           </div>
           {error && (
-            <p className="text-[10px] text-destructive flex items-center gap-1">
+            <p className="text-2xs text-destructive flex items-center gap-1">
               <AlertCircle size={10} />
               {error}
             </p>
@@ -554,7 +570,7 @@ function SkillsSection({ t }: { t: any }) {
               onClick={handleCreate}
               disabled={!newName.trim() || saving}
               className="flex items-center gap-1 px-2.5 py-1 text-xs rounded-md disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
-              style={{ background: 'var(--amber)', color: '#131210' }}
+              style={{ background: 'var(--amber)', color: 'var(--amber-foreground)' }}
             >
               {saving && <Loader2 size={10} className="animate-spin" />}
               {m?.saveSkill ?? 'Save'}
@@ -586,6 +602,8 @@ export function McpTab({ t }: McpTabProps) {
   const [mcpStatus, setMcpStatus] = useState<McpStatus | null>(null);
   const [agents, setAgents] = useState<AgentInfo[]>([]);
   const [loading, setLoading] = useState(true);
+  const [showAgents, setShowAgents] = useState(false);
+  const [showSkills, setShowSkills] = useState(false);
 
   const fetchAll = useCallback(async () => {
     try {
@@ -609,22 +627,50 @@ export function McpTab({ t }: McpTabProps) {
     );
   }
 
+  const m = t.settings?.mcp;
+
   return (
     <div className="space-y-6">
-      {/* MCP Server Status */}
-      <ServerStatus status={mcpStatus} t={t} />
-
-      {/* Divider */}
-      <div className="border-t border-border" />
-
-      {/* Agent Install */}
-      <AgentInstall agents={agents} t={t} onRefresh={fetchAll} />
+      {/* MCP Server Status — prominent card */}
+      <div className="rounded-xl border p-4" style={{ borderColor: 'var(--border)', background: 'var(--card)' }}>
+        <ServerStatus status={mcpStatus} t={t} />
+      </div>
 
-      {/* Divider */}
-      <div className="border-t border-border" />
+      {/* Agent Install — collapsible */}
+      <div className="rounded-xl border overflow-hidden" style={{ borderColor: 'var(--border)' }}>
+        <button
+          type="button"
+          onClick={() => setShowAgents(!showAgents)}
+          className="w-full flex items-center justify-between px-4 py-3 text-sm font-medium hover:bg-muted/50 transition-colors"
+          style={{ color: 'var(--foreground)' }}
+        >
+          <span>{m?.agentsTitle ?? 'Agent Configuration'}</span>
+          <ChevronDown size={14} className={`transition-transform text-muted-foreground ${showAgents ? 'rotate-180' : ''}`} />
+        </button>
+        {showAgents && (
+          <div className="px-4 pb-4 border-t" style={{ borderColor: 'var(--border)' }}>
+            <AgentInstall agents={agents} t={t} onRefresh={fetchAll} />
+          </div>
+        )}
+      </div>
 
-      {/* Skills */}
-      <SkillsSection t={t} />
+      {/* Skills — collapsible */}
+      <div className="rounded-xl border overflow-hidden" style={{ borderColor: 'var(--border)' }}>
+        <button
+          type="button"
+          onClick={() => setShowSkills(!showSkills)}
+          className="w-full flex items-center justify-between px-4 py-3 text-sm font-medium hover:bg-muted/50 transition-colors"
+          style={{ color: 'var(--foreground)' }}
+        >
+          <span>{m?.skillsTitle ?? 'Skills'}</span>
+          <ChevronDown size={14} className={`transition-transform text-muted-foreground ${showSkills ? 'rotate-180' : ''}`} />
+        </button>
+        {showSkills && (
+          <div className="px-4 pb-4 border-t" style={{ borderColor: 'var(--border)' }}>
+            <SkillsSection t={t} />
+          </div>
+        )}
+      </div>
     </div>
   );
 }

package/app/components/settings/PluginsTab.tsx

@@ -33,25 +33,25 @@ export function PluginsTab({ pluginStates, setPluginStates, t }: PluginsTabProps
                       <div className="flex items-center gap-2 flex-wrap">
                         <span className="text-sm font-medium text-foreground">{renderer.name}</span>
                         {isCore && (
-                          <span className="text-[10px] px-1.5 py-0.5 rounded bg-amber-600/15 text-amber-600 font-mono">
+                          <span className="text-2xs px-1.5 py-0.5 rounded bg-amber-600/15 text-amber-600 font-mono">
                             core
                           </span>
                         )}
                         {renderer.builtin && !isCore && (
-                          <span className="text-[10px] px-1.5 py-0.5 rounded bg-muted text-muted-foreground font-mono">
+                          <span className="text-2xs px-1.5 py-0.5 rounded bg-muted text-muted-foreground font-mono">
                             {t.settings.plugins.builtinBadge}
                           </span>
                         )}
                         <div className="flex gap-1 flex-wrap">
                           {renderer.tags.map(tag => (
-                            <span key={tag} className="text-[10px] px-1.5 py-0.5 rounded bg-muted/60 text-muted-foreground">
+                            <span key={tag} className="text-2xs px-1.5 py-0.5 rounded bg-muted/60 text-muted-foreground">
                               {tag}
                             </span>
                           ))}
                         </div>
                       </div>
                       <p className="text-xs text-muted-foreground mt-1 leading-relaxed">{renderer.description}</p>
-                      <p className="text-[11px] text-muted-foreground/60 mt-1.5 font-mono">
+                      <p className="text-xs text-muted-foreground/60 mt-1.5 font-mono">
                         {t.settings.plugins.matchHint}: <code className="bg-muted px-1 rounded">{renderer.match.toString().match(/\/(.+)\//)?.[1] ?? '—'}</code>
                       </p>
                     </div>

package/app/components/settings/Primitives.tsx

@@ -18,7 +18,7 @@ export function Input({ className = '', ...props }: React.InputHTMLAttributes<HT
   return (
     <input
       {...props}
-      className={`w-full px-3 py-2 text-sm bg-background border border-border rounded-lg text-foreground placeholder:text-muted-foreground outline-none focus:ring-1 focus:ring-ring disabled:opacity-50 ${className}`}
+      className={`w-full px-3 py-2 text-sm bg-background border border-border rounded-lg text-foreground placeholder:text-muted-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:opacity-50 ${className}`}
     />
   );
 }
@@ -27,7 +27,7 @@ export function Select({ className = '', ...props }: React.SelectHTMLAttributes<
   return (
     <select
       {...props}
-      className={`w-full px-3 py-2 text-sm bg-background border border-border rounded-lg text-foreground outline-none focus:ring-1 focus:ring-ring disabled:opacity-50 ${className}`}
+      className={`w-full px-3 py-2 text-sm bg-background border border-border rounded-lg text-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:opacity-50 ${className}`}
     />
   );
 }
@@ -35,7 +35,7 @@ export function Select({ className = '', ...props }: React.SelectHTMLAttributes<
 export function EnvBadge({ overridden }: { overridden: boolean }) {
   if (!overridden) return null;
   return (
-    <span className="text-[10px] px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-500 font-mono ml-1.5">env</span>
+    <span className="text-2xs px-1.5 py-0.5 rounded bg-amber-500/15 text-amber-500 font-mono ml-1.5">env</span>
   );
 }
 
@@ -53,7 +53,7 @@ export function ApiKeyInput({ value, onChange, placeholder, disabled }: {
       onChange={e => onChange(e.target.value)}
       placeholder={placeholder ?? 'sk-...'}
       disabled={disabled}
-      className="w-full px-3 py-2 text-sm bg-background border border-border rounded-lg text-foreground placeholder:text-muted-foreground outline-none focus:ring-1 focus:ring-ring disabled:opacity-50"
+      className="w-full px-3 py-2 text-sm bg-background border border-border rounded-lg text-foreground placeholder:text-muted-foreground outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:opacity-50"
       onFocus={() => { if (isMasked) onChange(''); }}
     />
   );

package/app/components/settings/SyncTab.tsx

@@ -104,19 +104,19 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
           value={remoteUrl}
           onChange={e => { setRemoteUrl(e.target.value); setError(''); }}
           placeholder="https://github.com/user/my-mind.git"
-          className="w-full px-3 py-2 text-sm rounded-lg border bg-transparent font-mono text-xs transition-colors focus:outline-none focus:ring-1"
+          className="w-full px-3 py-2 text-sm rounded-lg border bg-transparent font-mono text-xs transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
           style={{
             borderColor: remoteUrl.trim() && !isValid ? 'var(--destructive, red)' : 'var(--border)',
             color: 'var(--foreground)',
           }}
         />
         {remoteUrl.trim() && !isValid && (
-          <p className="text-[11px]" style={{ color: 'var(--destructive, red)' }}>
+          <p className="text-xs" style={{ color: 'var(--destructive, red)' }}>
             {syncT?.invalidUrl ?? 'Invalid Git URL — use HTTPS (https://...) or SSH (git@...)'}
           </p>
         )}
         {urlType === 'ssh' && (
-          <p className="text-[11px] text-muted-foreground flex items-center gap-1">
+          <p className="text-xs text-muted-foreground flex items-center gap-1">
             <AlertCircle size={11} className="shrink-0" />
             {syncT?.sshHint ?? 'SSH URLs require SSH key configured on this machine. HTTPS with token recommended.'}
           </p>
@@ -136,7 +136,7 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
               value={token}
               onChange={e => setToken(e.target.value)}
               placeholder="ghp_xxxxxxxxxxxx"
-              className="w-full px-3 py-2 pr-9 text-sm rounded-lg border bg-transparent font-mono text-xs transition-colors focus:outline-none focus:ring-1"
+              className="w-full px-3 py-2 pr-9 text-sm rounded-lg border bg-transparent font-mono text-xs transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
               style={{ borderColor: 'var(--border)', color: 'var(--foreground)' }}
             />
             <button
@@ -147,7 +147,7 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
               {showToken ? <EyeOff size={14} /> : <Eye size={14} />}
             </button>
           </div>
-          <p className="text-[11px] text-muted-foreground">
+          <p className="text-xs text-muted-foreground">
             {syncT?.tokenHint ?? 'GitHub: Settings → Developer settings → Personal access tokens → repo scope'}
           </p>
         </div>
@@ -163,7 +163,7 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
           value={branch}
           onChange={e => setBranch(e.target.value)}
           placeholder="main"
-          className="w-full max-w-[200px] px-3 py-2 text-sm rounded-lg border bg-transparent font-mono text-xs transition-colors focus:outline-none focus:ring-1"
+          className="w-full max-w-[200px] px-3 py-2 text-sm rounded-lg border bg-transparent font-mono text-xs transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
           style={{ borderColor: 'var(--border)', color: 'var(--foreground)' }}
         />
       </div>
@@ -174,7 +174,7 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
         onClick={handleConnect}
         disabled={!isValid || connecting}
         className="flex items-center gap-2 px-4 py-2 text-sm font-medium rounded-lg transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
-        style={{ background: 'var(--amber)', color: '#131210' }}
+        style={{ background: 'var(--amber)', color: 'var(--amber-foreground)' }}
       >
         {connecting && <Loader2 size={14} className="animate-spin" />}
         {connecting
@@ -184,14 +184,14 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
 
       {/* Error */}
       {error && (
-        <div className="flex items-start gap-2 text-xs p-3 rounded-lg" role="alert" aria-live="polite" style={{ background: 'rgba(239,68,68,0.1)', color: 'var(--destructive, red)' }}>
+        <div className="flex items-start gap-2 text-xs p-3 rounded-lg" role="alert" aria-live="polite" style={{ background: 'rgba(200,80,80,0.1)', color: 'var(--error)' }}>
           <AlertCircle size={13} className="shrink-0 mt-0.5" />
           <span>{error}</span>
         </div>
       )}
 
       {/* Features */}
-      <div className="grid grid-cols-2 gap-2 text-[11px] text-muted-foreground pt-2">
+      <div className="grid grid-cols-2 gap-2 text-xs text-muted-foreground pt-2">
         {[
           syncT?.featureAutoCommit ?? 'Auto-commit on save',
           syncT?.featureAutoPull ?? 'Auto-pull from remote',
@@ -199,7 +199,7 @@ function SyncEmptyState({ t, onInitComplete }: { t: any; onInitComplete: () => v
           syncT?.featureMultiDevice ?? 'Works across devices',
         ].map((f, i) => (
           <div key={i} className="flex items-center gap-1.5">
-            <CheckCircle2 size={11} className="text-green-500/60 shrink-0" />
+            <CheckCircle2 size={11} className="text-success/60 shrink-0" />
             <span>{f}</span>
           </div>
         ))}
@@ -336,7 +336,7 @@ export function SyncTab({ t }: SyncTabProps) {
           className={`flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-lg border transition-colors disabled:opacity-40 disabled:cursor-not-allowed ${
             status.enabled
               ? 'border-border text-muted-foreground hover:text-destructive hover:border-destructive/50'
-              : 'border-green-500/30 text-green-500 hover:bg-green-500/10'
+              : 'border-success/30 text-success hover:bg-success/10'
           }`}
         >
           {status.enabled ? 'Disable Auto-sync' : 'Enable Auto-sync'}
@@ -347,7 +347,7 @@ export function SyncTab({ t }: SyncTabProps) {
       {message && (
         <div className="flex items-center gap-1.5 text-xs" role="status" aria-live="polite">
           {message.type === 'success' ? (
-            <><CheckCircle2 size={13} className="text-green-500" /><span className="text-green-500">{message.text}</span></>
+            <><CheckCircle2 size={13} className="text-success" /><span className="text-success">{message.text}</span></>
           ) : (
             <><AlertCircle size={13} className="text-destructive" /><span className="text-destructive">{message.text}</span></>
           )}
@@ -361,7 +361,7 @@ export function SyncTab({ t }: SyncTabProps) {
           <div className="space-y-1.5">
             {conflicts.map((c, i) => (
               <div key={i} className="flex items-center gap-2 text-xs group">
-                <AlertCircle size={12} className="text-red-500 shrink-0" />
+                <AlertCircle size={12} className="text-error shrink-0" />
                 <a
                   href={`/view/${encodeURIComponent(c.file)}`}
                   className="font-mono truncate hover:text-foreground hover:underline transition-colors"

package/app/components/setup/StepAI.tsx

@@ -0,0 +1,67 @@
+'use client';
+
+import { Brain, Zap, SkipForward, CheckCircle2 } from 'lucide-react';
+import { Field, Input, ApiKeyInput } from '@/components/settings/Primitives';
+import type { SetupState, SetupMessages } from './types';
+
+export interface StepAIProps {
+  state: SetupState;
+  update: <K extends keyof SetupState>(key: K, val: SetupState[K]) => void;
+  s: SetupMessages;
+}
+
+export default function StepAI({ state, update, s }: StepAIProps) {
+  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 },
+  ];
+  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' && (
+        <div className="space-y-4 pt-2">
+          <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' ? 'sk-ant-...' : 'sk-...'}
+            />
+          </Field>
+          <Field label={s.model}>
+            <Input
+              value={state.provider === 'anthropic' ? state.anthropicModel : state.openaiModel}
+              onChange={e => update(state.provider === 'anthropic' ? 'anthropicModel' : 'openaiModel', e.target.value)}
+            />
+          </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>
+      )}
+    </div>
+  );
+}