@geminilight/mindos 0.5.64 → 0.5.65

package/app/components/SidebarLayout.tsx

@@ -137,18 +137,43 @@ export default function SidebarLayout({ fileTree, children }: SidebarLayoutProps
 
   const agentDockOpen = agentDetailKey !== null && lp.activePanel === 'agents';
 
-  // Refresh file tree periodically
+  // Refresh file tree when server-side tree version changes.
+  // Polls a lightweight version counter every 3s — only calls router.refresh()
+  // (which rebuilds the full tree) when the version actually changes.
   useEffect(() => {
+    let lastVersion = -1;
+    let stopped = false;
+
+    const checkVersion = async () => {
+      if (stopped || document.visibilityState === 'hidden') return;
+      try {
+        const res = await fetch('/api/tree-version');
+        if (!res.ok) return;
+        const { v } = (await res.json()) as { v: number };
+        if (lastVersion === -1) {
+          lastVersion = v;
+          return;
+        }
+        if (v !== lastVersion) {
+          lastVersion = v;
+          router.refresh();
+          window.dispatchEvent(new Event('mindos:files-changed'));
+        }
+      } catch (err) { console.debug('[tree-version] poll failed', err); }
+    };
+
     const onVisible = () => {
-      if (document.visibilityState === 'visible') router.refresh();
+      if (document.visibilityState === 'visible') void checkVersion();
     };
+
+    void checkVersion();
+    const interval = setInterval(() => void checkVersion(), 3_000);
     document.addEventListener('visibilitychange', onVisible);
-    const interval = setInterval(() => {
-      if (document.visibilityState === 'visible') router.refresh();
-    }, 30_000);
+
     return () => {
-      document.removeEventListener('visibilitychange', onVisible);
+      stopped = true;
       clearInterval(interval);
+      document.removeEventListener('visibilitychange', onVisible);
     };
   }, [router]);
 
@@ -224,8 +249,7 @@ export default function SidebarLayout({ fileTree, children }: SidebarLayoutProps
       {/* Skip link */}
       <a
         href="#main-content"
-        className="sr-only focus:not-sr-only focus:fixed focus:top-2 focus:left-2 focus:z-[60] focus:px-4 focus:py-2 focus:rounded-lg focus:text-sm focus:font-medium focus:font-display"
-        style={{ background: 'var(--amber)', color: 'var(--amber-foreground)' }}
+        className="sr-only focus:not-sr-only focus:fixed focus:top-2 focus:left-2 focus:z-[60] focus:px-4 focus:py-2 focus:rounded-lg focus:text-sm focus:font-medium focus:font-display bg-[var(--amber)] text-[var(--amber-foreground)]"
       >
         Skip to main content
       </a>
@@ -235,7 +259,9 @@ export default function SidebarLayout({ fileTree, children }: SidebarLayoutProps
         activePanel={railActivePanel}
         onPanelChange={lp.setActivePanel}
         onAgentsClick={() => {
-          lp.setActivePanel((current) => (current === 'agents' ? null : 'agents'));
+          const wasActive = lp.activePanel === 'agents';
+          lp.setActivePanel(wasActive ? null : 'agents');
+          if (!wasActive) router.push('/agents');
           setAgentDetailKey(null);
         }}
         syncStatus={syncStatus}
@@ -273,7 +299,6 @@ export default function SidebarLayout({ fileTree, children }: SidebarLayoutProps
             maximized={lp.panelMaximized}
             onMaximize={lp.handlePanelMaximize}
             selectedAgentKey={agentDockOpen ? agentDetailKey : null}
-            onOpenAgentDetail={setAgentDetailKey}
           />
         </div>
         <div className={`flex flex-col h-full ${lp.activePanel === 'discover' ? '' : 'hidden'}`}>

package/app/components/ThemeToggle.tsx

@@ -27,7 +27,7 @@ export default function ThemeToggle() {
   return (
     <button
       onClick={toggle}
-      className="p-1.5 rounded-lg hover:bg-zinc-800 text-zinc-500 hover:text-zinc-300 transition-colors"
+      className="p-1.5 rounded-lg hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
       title={dark ? 'Switch to light mode' : 'Switch to dark mode'}
     >
       {dark ? <Sun size={15} /> : <Moon size={15} />}

package/app/components/agents/AgentDetailContent.tsx

@@ -1,11 +1,22 @@
 'use client';
 
 import Link from 'next/link';
-import { useMemo } from 'react';
-import { ArrowLeft, Server, ShieldCheck, Activity, Compass } from 'lucide-react';
+import { useCallback, useMemo, useState } from 'react';
+import { ArrowLeft, Server, Search, Trash2, Zap } from 'lucide-react';
 import { useLocale } from '@/lib/LocaleContext';
 import { useMcpData } from '@/hooks/useMcpData';
-import { resolveAgentStatus } from './agents-content-model';
+import { apiFetch } from '@/lib/api';
+import { copyToClipboard } from '@/lib/clipboard';
+import { generateSnippet } from '@/lib/mcp-snippets';
+import {
+  aggregateCrossAgentMcpServers,
+  aggregateCrossAgentSkills,
+  filterSkillsForAgentDetail,
+  resolveAgentStatus,
+  type AgentDetailSkillSourceFilter,
+} from './agents-content-model';
+import { AgentAvatar, ActionButton, ConfirmDialog, PillButton } from './AgentsPrimitives';
+import SkillDetailPopover from './SkillDetailPopover';
 
 export default function AgentDetailContent({ agentKey }: { agentKey: string }) {
   const { t } = useLocale();
@@ -13,7 +24,171 @@ export default function AgentDetailContent({ agentKey }: { agentKey: string }) {
   const mcp = useMcpData();
 
   const agent = useMemo(() => mcp.agents.find((item) => item.key === agentKey), [mcp.agents, agentKey]);
-  const enabledSkills = useMemo(() => mcp.skills.filter((s) => s.enabled), [mcp.skills]);
+  const [skillQuery, setSkillQuery] = useState('');
+  const [skillSource, setSkillSource] = useState<AgentDetailSkillSourceFilter>('all');
+  const [skillBusy, setSkillBusy] = useState<string | null>(null);
+  const [editingSkill, setEditingSkill] = useState<string | null>(null);
+  const [editContent, setEditContent] = useState('');
+  const [editError, setEditError] = useState<string | null>(null);
+  const [saveBusy, setSaveBusy] = useState(false);
+  const [snippetCopied, setSnippetCopied] = useState(false);
+  const [mcpBusy, setMcpBusy] = useState(false);
+  const [mcpMessage, setMcpMessage] = useState<string | null>(null);
+  const [confirmDelete, setConfirmDelete] = useState<string | null>(null);
+  const [deleteMsg, setDeleteMsg] = useState<string | null>(null);
+  const [confirmMcpRemove, setConfirmMcpRemove] = useState<string | null>(null);
+  const [mcpHint, setMcpHint] = useState<string | null>(null);
+  const [detailSkillName, setDetailSkillName] = useState<string | null>(null);
+
+  const filteredSkills = useMemo(
+    () =>
+      filterSkillsForAgentDetail(mcp.skills, {
+        query: skillQuery,
+        source: skillSource,
+      }),
+    [mcp.skills, skillQuery, skillSource],
+  );
+
+  const skillSummary = useMemo(
+    () => ({
+      total: mcp.skills.length,
+      enabled: mcp.skills.filter((s) => s.enabled).length,
+      builtin: mcp.skills.filter((s) => s.source === 'builtin').length,
+      user: mcp.skills.filter((s) => s.source === 'user').length,
+    }),
+    [mcp.skills],
+  );
+
+  const crossAgentMcpMap = useMemo(() => {
+    const all = aggregateCrossAgentMcpServers(mcp.agents);
+    const map = new Map<string, string[]>();
+    for (const srv of all) map.set(srv.serverName, srv.agents);
+    return map;
+  }, [mcp.agents]);
+
+  const crossAgentSkillMap = useMemo(() => {
+    const all = aggregateCrossAgentSkills(mcp.agents);
+    const map = new Map<string, string[]>();
+    for (const sk of all) map.set(sk.skillName, sk.agents);
+    return map;
+  }, [mcp.agents]);
+
+  const status = agent ? resolveAgentStatus(agent) : 'notFound';
+  const currentScope = agent?.scope === 'project' ? 'project' : 'global';
+  const currentTransport: 'stdio' | 'http' = agent?.transport === 'http' ? 'http' : 'stdio';
+  const snippet = useMemo(
+    () => agent ? generateSnippet(agent, mcp.status, currentTransport) : { snippet: '', path: '' },
+    [agent, mcp.status, currentTransport],
+  );
+  const nativeInstalledSkills = agent?.installedSkillNames ?? [];
+  const configuredMcpServers = agent?.configuredMcpServers ?? [];
+
+
+  const handleSkillToggle = useCallback(async (name: string, enabled: boolean) => {
+    setSkillBusy(name);
+    setEditError(null);
+    try {
+      await mcp.toggleSkill(name, enabled);
+      await mcp.refresh();
+    } finally {
+      setSkillBusy(null);
+    }
+  }, [mcp]);
+
+  const handleStartEditSkill = useCallback(async (name: string) => {
+    setEditError(null);
+    setSkillBusy(name);
+    try {
+      const res = await apiFetch<{ content: string }>('/api/skills', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ action: 'read', name }),
+      });
+      setEditingSkill(name);
+      setEditContent(res.content);
+    } catch (err: unknown) {
+      setEditError(err instanceof Error ? err.message : a.detail.skillReadFailed);
+    } finally {
+      setSkillBusy(null);
+    }
+  }, [a.detail.skillReadFailed]);
+
+  const handleSaveSkill = useCallback(async () => {
+    if (!editingSkill) return;
+    setSaveBusy(true);
+    setEditError(null);
+    try {
+      await apiFetch('/api/skills', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ action: 'update', name: editingSkill, content: editContent }),
+      });
+      setEditingSkill(null);
+      setEditContent('');
+      window.dispatchEvent(new Event('mindos:skills-changed'));
+      await mcp.refresh();
+    } catch (err: unknown) {
+      setEditError(err instanceof Error ? err.message : a.detail.skillSaveFailed);
+    } finally {
+      setSaveBusy(false);
+    }
+  }, [editingSkill, editContent, a.detail.skillSaveFailed, mcp]);
+
+  const handleDeleteSkill = useCallback(async (name: string) => {
+    setConfirmDelete(null);
+    setSkillBusy(name);
+    try {
+      await apiFetch('/api/skills', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ action: 'delete', name }),
+      });
+      setDeleteMsg(a.detail.skillDeleteSuccess);
+      window.dispatchEvent(new Event('mindos:skills-changed'));
+      await mcp.refresh();
+    } catch {
+      setDeleteMsg(a.detail.skillDeleteFailed);
+    } finally {
+      setSkillBusy(null);
+      setTimeout(() => setDeleteMsg(null), 3000);
+    }
+  }, [a.detail.skillDeleteSuccess, a.detail.skillDeleteFailed, mcp]);
+
+  const handleCopySnippet = useCallback(async () => {
+    const ok = await copyToClipboard(snippet.snippet);
+    if (!ok) return;
+    setSnippetCopied(true);
+    setTimeout(() => setSnippetCopied(false), 1200);
+  }, [snippet.snippet]);
+
+  const handleApplyMcpConfig = useCallback(async (scope: 'project' | 'global', transport: 'stdio' | 'http') => {
+    if (!agent) return;
+    setMcpBusy(true);
+    setMcpMessage(a.detail.mcpApplying);
+    try {
+      const ok = await mcp.installAgent(agent.key, { scope, transport });
+      await mcp.refresh();
+      setMcpMessage(ok ? a.detail.mcpApplySuccess : a.detail.mcpApplyFailed);
+    } finally {
+      setMcpBusy(false);
+    }
+  }, [a.detail.mcpApplying, a.detail.mcpApplySuccess, a.detail.mcpApplyFailed, mcp, agent]);
+
+  const handleDeleteSkillFromPopover = useCallback(async (name: string) => {
+    await apiFetch('/api/skills', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ action: 'delete', name }),
+    });
+    window.dispatchEvent(new Event('mindos:skills-changed'));
+    await mcp.refresh();
+  }, [mcp]);
+
+  const handleMcpRemoveConfirm = useCallback(() => {
+    setConfirmMcpRemove(null);
+    setMcpHint(a.detail.mcpServerHint);
+    setTimeout(() => setMcpHint(null), 4000);
+  }, [a.detail.mcpServerHint]);
 
   if (!agent) {
     return (
@@ -29,80 +204,300 @@ export default function AgentDetailContent({ agentKey }: { agentKey: string }) {
     );
   }
 
-  const status = resolveAgentStatus(agent);
 
   return (
     <div className="content-width px-4 md:px-6 py-8 md:py-10 space-y-4">
-      <div>
-        <Link href="/agents" className="inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground mb-3">
-          <ArrowLeft size={14} />
-          {a.backToOverview}
-        </Link>
-        <h1 className="text-2xl font-semibold tracking-tight font-display text-foreground">{agent.name}</h1>
-        <p className="mt-1 text-sm text-muted-foreground">{a.detailSubtitle}</p>
-      </div>
+      {/* Back link */}
+      <Link href="/agents" className="inline-flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground">
+        <ArrowLeft size={14} />
+        {a.backToOverview}
+      </Link>
 
-      <section className="rounded-lg border border-border bg-card p-4">
-        <h2 className="text-sm font-medium text-foreground mb-2">{a.detail.identity}</h2>
-        <div className="grid grid-cols-1 md:grid-cols-3 gap-3 text-sm">
-          <DetailLine label={a.detail.agentKey} value={agent.key} />
-          <DetailLine label={a.detail.status} value={status} />
-          <DetailLine label={a.detail.transport} value={agent.transport ?? agent.preferredTransport} />
+      {/* ═══════════ AGENT PROFILE (consolidated header) ═══════════ */}
+      <section className="rounded-lg border border-border bg-card p-4 space-y-3">
+        <div className="flex items-center gap-3">
+          <AgentAvatar name={agent.name} status={status} size="md" />
+          <div className="min-w-0">
+            <h1 className="text-xl font-semibold tracking-tight font-display text-foreground">{agent.name}</h1>
+            <div className="flex flex-wrap items-center gap-x-2 gap-y-0.5 mt-0.5">
+              <span className={`text-2xs font-medium px-1.5 py-0.5 rounded ${
+                status === 'connected' ? 'bg-success/10 text-success'
+                  : status === 'detected' ? 'bg-[var(--amber-subtle)] text-[var(--amber)]'
+                    : 'bg-muted text-muted-foreground'
+              }`}>{status}</span>
+              <span className="text-2xs text-muted-foreground font-mono">{agent.transport ?? agent.preferredTransport}</span>
+              <span className="text-2xs text-muted-foreground">·</span>
+              <span className="text-2xs text-muted-foreground">{agent.skillMode ?? a.na}</span>
+            </div>
+          </div>
+        </div>
+        <div className="flex flex-wrap items-center gap-x-4 gap-y-1 text-xs text-muted-foreground pt-2 border-t border-border">
+          <span>{a.detail.format}: <span className="text-foreground">{agent.format}</span></span>
+          <span>{a.detail.lastActivityAt}: <span className="text-foreground tabular-nums">{agent.runtimeLastActivityAt ?? a.na}</span></span>
+          <span>{configuredMcpServers.length} MCP · {nativeInstalledSkills.length} skills</span>
         </div>
       </section>
 
-      <section className="rounded-lg border border-border bg-card p-4">
-        <h2 className="text-sm font-medium text-foreground mb-2 flex items-center gap-1.5">
+      {/* ═══════════ MCP MANAGEMENT ═══════════ */}
+      <section className="rounded-lg border border-border bg-card p-4 space-y-3">
+        <h2 className="text-sm font-medium text-foreground flex items-center gap-1.5">
           <Server size={14} className="text-muted-foreground" />
-          {a.detail.connection}
+          {a.detail.mcpManagement}
         </h2>
+
+        {/* MCP status row */}
         <div className="grid grid-cols-1 md:grid-cols-3 gap-3 text-sm">
-          <DetailLine label={a.detail.endpoint} value={mcp.status?.endpoint ?? a.na} />
-          <DetailLine label={a.detail.port} value={String(mcp.status?.port ?? a.na)} />
-          <DetailLine label={a.detail.auth} value={mcp.status?.authConfigured ? a.detail.authConfigured : a.detail.authMissing} />
+          <DetailLine label={a.detail.mcpInstalled} value={agent.installed ? a.detail.yes : a.detail.no} />
+          <DetailLine label={a.detail.mcpScope} value={agent.scope ?? a.na} />
+          <DetailLine label={a.detail.mcpConfigPath} value={agent.configPath ?? a.na} />
         </div>
-      </section>
 
-      <section className="rounded-lg border border-border bg-card p-4">
-        <h2 className="text-sm font-medium text-foreground mb-2 flex items-center gap-1.5">
-          <ShieldCheck size={14} className="text-muted-foreground" />
-          {a.detail.capabilities}
-        </h2>
-        <ul className="text-sm text-muted-foreground space-y-1">
-          <li>{a.detail.projectScope}: {agent.hasProjectScope ? a.detail.yes : a.detail.no}</li>
-          <li>{a.detail.globalScope}: {agent.hasGlobalScope ? a.detail.yes : a.detail.no}</li>
-          <li>{a.detail.format}: {agent.format}</li>
-        </ul>
+        {/* Configured MCP servers with management */}
+        <div className="rounded-lg border border-border bg-background p-4 space-y-2">
+          <div className="flex items-center justify-between">
+            <p className="text-xs font-semibold text-foreground">{a.detail.configuredMcpServers}</p>
+            <span className="text-2xs text-muted-foreground tabular-nums">{a.detail.configuredMcpServersCount(configuredMcpServers.length)}</span>
+          </div>
+
+          {mcpHint && (
+            <div role="status" aria-live="polite" className="rounded-md border border-border bg-muted/50 px-3 py-2 text-xs text-muted-foreground animate-in fade-in duration-200">
+              {mcpHint}
+            </div>
+          )}
+
+          {configuredMcpServers.length === 0 ? (
+            <p className="text-xs text-muted-foreground">{a.detail.configuredMcpServersEmpty}</p>
+          ) : (
+            <div className="space-y-1.5 max-h-[280px] overflow-y-auto">
+              {configuredMcpServers.map((name) => {
+                const sharedWith = (crossAgentMcpMap.get(name) ?? []).filter((n) => n !== agent.name);
+                return (
+                  <div key={name} className="flex items-center gap-2 rounded-md border border-border/60 px-2.5 py-2 group/mcp hover:border-border hover:bg-muted/20 transition-all duration-100">
+                    <Server size={11} className="text-[var(--amber)] shrink-0" />
+                    <span className="text-xs font-medium text-foreground flex-1 min-w-0 truncate">{name}</span>
+                    {sharedWith.length > 0 && (
+                      <div className="flex items-center gap-1">
+                        {sharedWith.slice(0, 3).map((n) => (
+                          <AgentAvatar key={n} name={n} size="sm" />
+                        ))}
+                        {sharedWith.length > 3 && <span className="text-2xs text-muted-foreground">+{sharedWith.length - 3}</span>}
+                      </div>
+                    )}
+                    <button
+                      type="button"
+                      onClick={() => setConfirmMcpRemove(name)}
+                      className="text-2xs text-muted-foreground hover:text-destructive cursor-pointer opacity-0 group-hover/mcp:opacity-100 focus-visible:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring rounded px-1 py-0.5 transition-all duration-150"
+                      aria-label={`${a.detail.mcpServerRemove} ${name}`}
+                    >
+                      <Trash2 size={12} />
+                    </button>
+                  </div>
+                );
+              })}
+            </div>
+          )}
+        </div>
+
+        {/* MCP actions */}
+        <div className="flex flex-wrap items-center gap-2">
+          <ActionButton
+            onClick={() => void handleCopySnippet()}
+            disabled={false}
+            busy={false}
+            label={snippetCopied ? a.detail.mcpCopied : a.detail.mcpCopySnippet}
+          />
+          <ActionButton
+            onClick={() => void mcp.refresh()}
+            disabled={false}
+            busy={false}
+            label={a.detail.mcpRefresh}
+          />
+          <ActionButton
+            onClick={() => void handleApplyMcpConfig(currentScope, currentTransport)}
+            disabled={mcpBusy}
+            busy={mcpBusy}
+            label={a.detail.mcpReconnect}
+            variant="primary"
+          />
+        </div>
+        <p className="text-2xs text-muted-foreground truncate">{snippet.path}</p>
+        {mcpMessage && <p className="text-xs text-muted-foreground animate-in fade-in duration-200">{mcpMessage}</p>}
       </section>
 
-      <section className="rounded-lg border border-border bg-card p-4">
-        <h2 className="text-sm font-medium text-foreground mb-2">{a.detail.skillAssignments}</h2>
-        {enabledSkills.length === 0 ? (
+      {/* ═══════════ SKILL ASSIGNMENTS ═══════════ */}
+      <section className="rounded-lg border border-border bg-card p-4 space-y-3">
+        <div className="flex items-center justify-between">
+          <h2 className="text-sm font-medium text-foreground">{a.detail.skillAssignments}</h2>
+          <div className="flex items-center gap-3 text-2xs text-muted-foreground tabular-nums">
+            <span>MindOS {skillSummary.total}</span>
+            <span>{a.detail.skillsEnabled.split(' ')[0]} {skillSummary.enabled}</span>
+            <span>{a.detail.nativeInstalledSkills} {nativeInstalledSkills.length}</span>
+          </div>
+        </div>
+
+        {/* Search + filters */}
+        <div className="flex flex-col md:flex-row gap-2">
+          <label className="relative flex-1">
+            <Search size={14} className="absolute left-2.5 top-1/2 -translate-y-1/2 text-muted-foreground pointer-events-none" />
+            <input
+              value={skillQuery}
+              onChange={(e) => setSkillQuery(e.target.value)}
+              placeholder={a.detail.skillsSearchPlaceholder}
+              className="w-full h-9 rounded-md border border-border bg-background pl-8 pr-3 text-sm text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring transition-colors duration-150"
+            />
+          </label>
+          <div className="flex items-center gap-0.5 rounded-md border border-border p-0.5 bg-background">
+            <PillButton active={skillSource === 'all'} label={a.detail.skillsFilterAll} onClick={() => setSkillSource('all')} />
+            <PillButton active={skillSource === 'builtin'} label={a.detail.skillsFilterBuiltin} onClick={() => setSkillSource('builtin')} />
+            <PillButton active={skillSource === 'user'} label={a.detail.skillsFilterUser} onClick={() => setSkillSource('user')} />
+          </div>
+        </div>
+
+        {deleteMsg && (
+          <div role="status" aria-live="polite" className="rounded-md border border-border bg-muted/50 px-3 py-2 text-xs text-muted-foreground animate-in fade-in duration-200">
+            {deleteMsg}
+          </div>
+        )}
+
+        {/* MindOS Skills */}
+        {filteredSkills.length > 0 && (
+          <div>
+            <p className="text-2xs font-medium text-muted-foreground uppercase tracking-wider mb-1.5">
+              MindOS Skills <span className="tabular-nums">({filteredSkills.filter((s) => s.enabled).length}/{filteredSkills.length})</span>
+            </p>
+            <ul className="space-y-0.5">
+              {filteredSkills.map((skill) => {
+                const isEditing = editingSkill === skill.name;
+                return (
+                  <li key={skill.name} className="rounded-md hover:bg-muted/30 transition-colors duration-100">
+                    <div className="flex items-center gap-2 py-1.5 px-1.5 group/skill">
+                      <Zap size={13} className={`shrink-0 ${skill.enabled ? 'text-[var(--amber)]' : 'text-muted-foreground/50'}`} aria-hidden="true" />
+                      <button
+                        type="button"
+                        onClick={() => setDetailSkillName(skill.name)}
+                        className="text-xs text-foreground flex-1 min-w-0 truncate hover:text-[var(--amber)] cursor-pointer transition-colors duration-150 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring rounded text-left"
+                      >
+                        {skill.name}
+                      </button>
+                      <span className={`text-2xs px-1.5 py-0.5 rounded shrink-0 ${skill.source === 'builtin' ? 'bg-muted text-muted-foreground' : 'bg-[var(--amber-dim)] text-[var(--amber)]'}`}>
+                        {skill.source === 'builtin' ? a.detail.skillsSourceBuiltin : a.detail.skillsSourceUser}
+                      </span>
+
+                      <div className="flex items-center gap-1 shrink-0 md:opacity-0 md:group-hover/skill:opacity-100 md:focus-within:opacity-100 transition-opacity duration-150">
+                        <ActionButton
+                          onClick={() => void handleSkillToggle(skill.name, !skill.enabled)}
+                          disabled={skillBusy === skill.name}
+                          busy={skillBusy === skill.name}
+                          label={skill.enabled ? a.detail.skillDisable : a.detail.skillEnable}
+                        />
+                        {skill.editable && (
+                          <>
+                            <ActionButton
+                              onClick={() => void handleStartEditSkill(skill.name)}
+                              disabled={skillBusy === skill.name || saveBusy}
+                              busy={false}
+                              label={a.detail.skillEdit}
+                            />
+                            <button
+                              type="button"
+                              onClick={() => setConfirmDelete(skill.name)}
+                              disabled={skillBusy === skill.name}
+                              className="inline-flex items-center justify-center min-h-[28px] px-1.5 rounded-md text-muted-foreground hover:text-destructive cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50 disabled:cursor-not-allowed transition-colors duration-150"
+                              aria-label={`${a.detail.skillDelete} ${skill.name}`}
+                            >
+                              <Trash2 size={13} />
+                            </button>
+                          </>
+                        )}
+                      </div>
+                    </div>
+
+                    {isEditing && (
+                      <div className="px-3 pb-3 pt-0 space-y-2">
+                        <textarea
+                          value={editContent}
+                          onChange={(e) => setEditContent(e.target.value)}
+                          className="mt-2 w-full h-40 rounded-md border border-border bg-background px-3 py-2 text-xs font-mono text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring resize-y"
+                        />
+                        <div className="flex items-center gap-2">
+                          <ActionButton onClick={() => void handleSaveSkill()} disabled={saveBusy} busy={saveBusy} label={a.detail.skillSave} variant="primary" />
+                          <ActionButton onClick={() => setEditingSkill(null)} disabled={false} busy={false} label={a.detail.skillCancel} />
+                        </div>
+                      </div>
+                    )}
+                  </li>
+                );
+              })}
+            </ul>
+          </div>
+        )}
+
+        {filteredSkills.length === 0 && nativeInstalledSkills.length === 0 && (
           <p className="text-sm text-muted-foreground">{a.detail.noSkills}</p>
-        ) : (
-          <ul className="text-sm text-muted-foreground space-y-1">
-            {enabledSkills.map((skill) => (
-              <li key={skill.name}>- {skill.name}</li>
-            ))}
-          </ul>
         )}
-      </section>
 
-      <section className="rounded-lg border border-border bg-card p-4">
-        <h2 className="text-sm font-medium text-foreground mb-2 flex items-center gap-1.5">
-          <Activity size={14} className="text-muted-foreground" />
-          {a.detail.recentActivity}
-        </h2>
-        <p className="text-sm text-muted-foreground">{a.detail.noActivity}</p>
-      </section>
+        {/* Native installed skills — same row style */}
+        {nativeInstalledSkills.length > 0 && (
+          <div>
+            <p className="text-2xs font-medium text-muted-foreground uppercase tracking-wider mb-1.5">
+              {a.detail.nativeInstalledSkills} <span className="tabular-nums">({nativeInstalledSkills.length})</span>
+            </p>
+            <div className="space-y-0.5 max-h-[280px] overflow-y-auto">
+              {nativeInstalledSkills.map((name) => (
+                <button
+                  key={name}
+                  type="button"
+                  onClick={() => setDetailSkillName(name)}
+                  className="w-full flex items-center gap-2 py-1.5 px-1.5 rounded-md hover:bg-muted/30 transition-colors duration-100 cursor-pointer text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                >
+                  <Zap size={13} className="shrink-0 text-muted-foreground/50" aria-hidden="true" />
+                  <span className="text-xs text-foreground flex-1 min-w-0 truncate hover:text-[var(--amber)] transition-colors duration-150">{name}</span>
+                </button>
+              ))}
+            </div>
+          </div>
+        )}
 
-      <section className="rounded-lg border border-border bg-card p-4">
-        <h2 className="text-sm font-medium text-foreground mb-2 flex items-center gap-1.5">
-          <Compass size={14} className="text-muted-foreground" />
-          {a.detail.spaceReach}
-        </h2>
-        <p className="text-sm text-muted-foreground">{a.detail.noSpaceReach}</p>
+        {editError && <p className="text-xs text-error">{editError}</p>}
       </section>
+
+      {/* ═══════════ Confirm Dialogs ═══════════ */}
+      <ConfirmDialog
+        open={confirmDelete !== null}
+        title={a.detail.skillDelete}
+        message={confirmDelete ? a.detail.skillDeleteConfirm(confirmDelete) : ''}
+        confirmLabel={a.detail.skillDelete}
+        cancelLabel={a.detail.skillCancel}
+        onConfirm={() => confirmDelete && void handleDeleteSkill(confirmDelete)}
+        onCancel={() => setConfirmDelete(null)}
+        variant="destructive"
+      />
+
+      <ConfirmDialog
+        open={confirmMcpRemove !== null}
+        title={a.detail.mcpServerRemove}
+        message={confirmMcpRemove ? a.detail.mcpServerRemoveConfirm(confirmMcpRemove) : ''}
+        confirmLabel={a.detail.mcpServerRemove}
+        cancelLabel={a.detail.skillCancel}
+        onConfirm={handleMcpRemoveConfirm}
+        onCancel={() => setConfirmMcpRemove(null)}
+        variant="destructive"
+      />
+
+      {/* Skill detail popover */}
+      <SkillDetailPopover
+        open={detailSkillName !== null}
+        skillName={detailSkillName}
+        skill={detailSkillName ? mcp.skills.find((s) => s.name === detailSkillName) ?? null : null}
+        agentNames={detailSkillName ? (crossAgentSkillMap.get(detailSkillName) ?? []) : []}
+        isNative={detailSkillName ? !mcp.skills.some((s) => s.name === detailSkillName) : false}
+        nativeSourcePath={agent?.installedSkillSourcePath}
+        copy={a.skills.skillPopover}
+        onClose={() => setDetailSkillName(null)}
+        onToggle={mcp.toggleSkill}
+        onDelete={handleDeleteSkillFromPopover}
+        onRefresh={mcp.refresh}
+      />
     </div>
   );
 }