@geminilight/mindos 0.6.40 → 0.6.42

package/app/app/api/ask/route.ts

@@ -13,6 +13,7 @@ import {
   type ToolDefinition,
   SessionManager,
   SettingsManager,
+  bashTool,
 } from '@mariozechner/pi-coding-agent';
 import { NextRequest, NextResponse } from 'next/server';
 import fs from 'fs';
@@ -316,7 +317,7 @@ function toPiCustomToolDefinitions(tools: AgentTool<any>[]): ToolDefinition<any,
           params: args,
           result: outputText.startsWith('Error:') ? 'error' : 'ok',
           message: outputText.slice(0, 200),
-          agentName: 'MindOS Ask',
+          agentName: 'MindOS',
         });
       } catch {
         // logging must never kill the stream
@@ -669,7 +670,7 @@ export async function POST(req: NextRequest) {
       resourceLoader,
       sessionManager: SessionManager.inMemory(),
       settingsManager,
-      tools: [],
+      tools: askMode === 'agent' ? [bashTool] : [],
       customTools,
     });
 

package/app/app/api/mcp/install/route.ts

@@ -2,13 +2,14 @@ export const dynamic = 'force-dynamic';
 import { NextRequest, NextResponse } from 'next/server';
 import fs from 'fs';
 import path from 'path';
-import { MCP_AGENTS, expandHome } from '@/lib/mcp-agents';
-import { readSettings } from '@/lib/settings';
+import { MCP_AGENTS, expandHome, resolveSkillWorkspaceProfile } from '@/lib/mcp-agents';
+import { readSettings, recordSkillInstall } from '@/lib/settings';
 
-/** Parse JSONC — strips single-line (//) and block comments before JSON.parse */
+/** Parse JSONC — strips comments before JSON.parse. Returns {} for empty/whitespace-only input. */
 function parseJsonc(text: string): Record<string, unknown> {
   let stripped = text.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*$)/gm, (m, g) => g ? '' : m);
   stripped = stripped.replace(/\/\*[\s\S]*?\*\//g, '');
+  if (!stripped.trim()) return {};
   return JSON.parse(stripped);
 }
 
@@ -203,6 +204,17 @@ export async function POST(req: NextRequest) {
 
         const result: typeof results[number] = { agent: key, status: 'ok', path: configPath, transport: effectiveTransport };
 
+        // Record skill install path for auto-update on future version bumps
+        try {
+          const skillProfile = resolveSkillWorkspaceProfile(key);
+          const settings = readSettings();
+          const activeSkill = settings.disabledSkills?.includes('mindos') ? 'mindos-zh' : 'mindos';
+          const skillPath = path.join(skillProfile.workspacePath, activeSkill, 'SKILL.md');
+          if (fs.existsSync(skillPath)) {
+            recordSkillInstall(key, activeSkill, skillPath);
+          }
+        } catch { /* best-effort, don't fail the install */ }
+
         // Verify http connections
         if (effectiveTransport === 'http') {
           const mcpUrl = (entry as Record<string, unknown>).url as string;

package/app/app/api/mcp/status/route.ts

@@ -2,18 +2,29 @@ export const dynamic = 'force-dynamic';
 import { NextRequest, NextResponse } from 'next/server';
 import { readSettings } from '@/lib/settings';
 import { maskToken } from '@/lib/format';
+import { networkInterfaces } from 'os';
 
 /** Parse hostname from Host header, handling IPv6 brackets */
 function parseHostname(host: string): string {
-  // IPv6: [::1]:3003 → [::1]
   if (host.includes(']')) {
     return host.slice(0, host.lastIndexOf(']') + 1);
   }
-  // IPv4/hostname: 192.168.1.1:3003 → 192.168.1.1
   const colonIdx = host.lastIndexOf(':');
   return colonIdx > 0 ? host.slice(0, colonIdx) : host;
 }
 
+/** Get first non-internal IPv4 address */
+function getLocalIP(): string | null {
+  try {
+    for (const ifaces of Object.values(networkInterfaces())) {
+      for (const iface of ifaces ?? []) {
+        if (iface.family === 'IPv4' && !iface.internal) return iface.address;
+      }
+    }
+  } catch { /* ignore */ }
+  return null;
+}
+
 export async function GET(req: NextRequest) {
   try {
     const settings = readSettings();
@@ -52,12 +63,9 @@ export async function GET(req: NextRequest) {
       port,
       toolCount: running ? 24 : 0,
       authConfigured,
-      // Masked for display; full token only used server-side in snippet generation
       maskedToken: authConfigured ? maskToken(token) : undefined,
-      // Full token for config snippet copy — this API is protected by proxy.ts middleware
-      // (same-origin or bearer token required). Consistent with /api/settings which also
-      // exposes the token to authenticated users.
       authToken: authConfigured ? token : undefined,
+      localIP: getLocalIP(),
     });
   } catch (err) {
     return NextResponse.json({ error: String(err) }, { status: 500 });

package/app/app/api/mcp/uninstall/route.ts

@@ -0,0 +1,130 @@
+export const dynamic = 'force-dynamic';
+import { NextRequest, NextResponse } from 'next/server';
+import fs from 'fs';
+import path from 'path';
+import { MCP_AGENTS, expandHome } from '@/lib/mcp-agents';
+
+/** Parse JSONC — strips comments before JSON.parse. Returns {} for empty/whitespace-only input. */
+function parseJsonc(text: string): Record<string, unknown> {
+  let stripped = text.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*$)/gm, (m, g) => g ? '' : m);
+  stripped = stripped.replace(/\/\*[\s\S]*?\*\//g, '');
+  if (!stripped.trim()) return {};
+  return JSON.parse(stripped);
+}
+
+/** Navigate a dot-path (e.g. "mcp.servers") and return the leaf container, or null. */
+function getNestedPath(obj: Record<string, unknown>, dotPath: string): Record<string, unknown> | null {
+  const parts = dotPath.split('.').filter(Boolean);
+  let current: unknown = obj;
+  for (const part of parts) {
+    if (!current || typeof current !== 'object') return null;
+    current = (current as Record<string, unknown>)[part];
+  }
+  return (current && typeof current === 'object') ? current as Record<string, unknown> : null;
+}
+
+/** Remove a [section.server] block from a TOML file */
+function removeTomlEntry(existing: string, sectionKey: string, serverName: string): string {
+  const sectionHeader = `[${sectionKey}.${serverName}]`;
+  const envHeader = `[${sectionKey}.${serverName}.env]`;
+  const headersHeader = `[${sectionKey}.${serverName}.headers]`;
+
+  const lines = existing.split('\n');
+  const result: string[] = [];
+  let skipping = false;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed === sectionHeader || trimmed === envHeader || trimmed === headersHeader) {
+      skipping = true;
+      continue;
+    }
+    if (skipping && trimmed.startsWith('[')) {
+      skipping = false;
+    }
+    if (!skipping) {
+      result.push(line);
+    }
+  }
+
+  // Clean up consecutive blank lines
+  const cleaned: string[] = [];
+  for (const line of result) {
+    if (line.trim() === '' && cleaned.length > 0 && cleaned[cleaned.length - 1].trim() === '') continue;
+    cleaned.push(line);
+  }
+
+  return cleaned.join('\n');
+}
+
+interface UninstallRequest {
+  agents: Array<{
+    key: string;
+    scope: 'project' | 'global';
+  }>;
+}
+
+export async function POST(req: NextRequest) {
+  try {
+    const body = (await req.json()) as UninstallRequest;
+    const { agents } = body;
+    const results: Array<{
+      agent: string;
+      status: string;
+      path?: string;
+      message?: string;
+    }> = [];
+
+    for (const item of agents) {
+      const { key, scope } = item;
+      const agent = MCP_AGENTS[key];
+      if (!agent) {
+        results.push({ agent: key, status: 'error', message: `Unknown agent: ${key}` });
+        continue;
+      }
+
+      const isGlobal = scope === 'global';
+      const configPath = isGlobal ? agent.global : agent.project;
+      if (!configPath) {
+        results.push({ agent: key, status: 'error', message: `${agent.name} does not support ${scope} scope` });
+        continue;
+      }
+
+      const absPath = expandHome(configPath);
+
+      if (!fs.existsSync(absPath)) {
+        results.push({ agent: key, status: 'ok', message: 'Config file does not exist' });
+        continue;
+      }
+
+      try {
+        if (agent.format === 'toml') {
+          const existing = fs.readFileSync(absPath, 'utf-8');
+          const updated = removeTomlEntry(existing, agent.key, 'mindos');
+          fs.writeFileSync(absPath, updated, 'utf-8');
+        } else {
+          const config = parseJsonc(fs.readFileSync(absPath, 'utf-8'));
+
+          // Handle nested keys (e.g. VS Code: mcp.servers)
+          const useNestedKey = isGlobal && agent.globalNestedKey;
+          const container = useNestedKey
+            ? getNestedPath(config, agent.globalNestedKey!)
+            : (config[agent.key] as Record<string, unknown> | undefined);
+
+          if (container && 'mindos' in container) {
+            delete container.mindos;
+            fs.writeFileSync(absPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+          }
+        }
+
+        results.push({ agent: key, status: 'ok', path: configPath });
+      } catch (err) {
+        results.push({ agent: key, status: 'error', message: String(err) });
+      }
+    }
+
+    return NextResponse.json({ results });
+  } catch (err) {
+    return NextResponse.json({ error: String(err) }, { status: 500 });
+  }
+}

package/app/app/api/skills/route.ts

@@ -32,7 +32,7 @@ export async function POST(req: NextRequest) {
   try {
     const body = await req.json();
     const { action, name, description, content, enabled, sourcePath } = body as {
-      action: 'create' | 'update' | 'delete' | 'toggle' | 'read' | 'read-native';
+      action: 'create' | 'update' | 'delete' | 'toggle' | 'read' | 'read-native' | 'record-install';
       name?: string;
       description?: string;
       content?: string;
@@ -130,6 +130,19 @@ export async function POST(req: NextRequest) {
         return NextResponse.json({ content: nativeContent, description: nativeDesc });
       }
 
+      case 'record-install': {
+        // Record that a skill was installed to a specific agent (for auto-update tracking)
+        const agentKey = (body as { agentKey?: string }).agentKey;
+        const skillName = name;
+        const installPath = (body as { installPath?: string }).installPath;
+        if (!agentKey || !skillName || !installPath) {
+          return NextResponse.json({ error: 'agentKey, name, and installPath are required' }, { status: 400 });
+        }
+        const { recordSkillInstall } = await import('@/lib/settings');
+        recordSkillInstall(agentKey, skillName, installPath);
+        return NextResponse.json({ ok: true });
+      }
+
       default:
         return NextResponse.json({ error: `Unknown action: ${action}` }, { status: 400 });
     }

package/app/app/view/[...path]/ViewPageClient.tsx

@@ -58,8 +58,8 @@ export default function ViewPageClient({
   );
 
   const [useRaw, setUseRaw] = useRendererState<boolean>('_raw', filePath, false);
-  // Global graph mode — shared across all md files (not per-file)
-  const [graphMode, setGraphMode] = useRendererState<boolean>('_graphMode', '_global', false);
+  // Graph mode — per-view, resets when navigating to a different file
+  const [graphMode, setGraphMode] = useState(false);
   const router = useRouter();
   const [editing, setEditing] = useState(initialEditing || content === '');
   const [editContent, setEditContent] = useState(content);
@@ -167,7 +167,7 @@ export default function ViewPageClient({
     setGraphMode(prev => !prev);
   }, [setGraphMode]);
 
-  const effectiveGraphMode = hydrated ? graphMode : false;
+  const effectiveGraphMode = graphMode;
 
   // Resolve renderer: for md files, graph mode overrides normal resolution
   const registryRenderer = resolveRenderer(filePath, extension);
@@ -383,22 +383,6 @@ export default function ViewPageClient({
               <span className="text-xs text-error hidden sm:inline">{saveError}</span>
             )}
 
-            {/* Graph toggle — only for md files, hidden when graph plugin is disabled */}
-            {extension === 'md' && !editing && !isDraft && isRendererEnabled('graph') && (
-              <button
-                onClick={handleToggleGraph}
-                className="flex items-center gap-1.5 px-3 py-1.5 rounded-md text-xs font-medium transition-colors font-display"
-                style={{
-                  background: effectiveGraphMode ? `${'var(--amber)'}22` : 'var(--muted)',
-                  color: effectiveGraphMode ? 'var(--amber)' : 'var(--muted-foreground)',
-                }}
-                title={effectiveGraphMode ? 'Switch to document view' : 'Switch to Wiki Graph'}
-              >
-                {effectiveGraphMode ? <FileText size={13} /> : <Share2 size={13} />}
-                <span className="hidden sm:inline">{effectiveGraphMode ? 'Doc' : 'Graph'}</span>
-              </button>
-            )}
-
             {/* Renderer toggle — only shown when a custom renderer exists (excludes graph-mode override) */}
             {registryRenderer && !editing && !isDraft && !graphRenderer && (
               <button
@@ -463,14 +447,6 @@ export default function ViewPageClient({
                 >
                   <Star size={16} className={pinned ? 'fill-[var(--amber)] text-[var(--amber)]' : ''} />
                 </button>
-                <button
-                  type="button"
-                  onClick={() => setExportOpen(true)}
-                  className="p-1.5 rounded-md text-muted-foreground hover:text-foreground hover:bg-muted transition-colors"
-                  title={t.fileTree.export}
-                >
-                  <Download size={16} />
-                </button>
                 <button
                   ref={moreRef}
                   type="button"
@@ -485,6 +461,15 @@ export default function ViewPageClient({
                     ref={moreMenuRef}
                     className="absolute right-0 top-full mt-1 z-50 min-w-[160px] rounded-lg border border-border bg-card shadow-lg py-1"
                   >
+                    {extension === 'md' && !editing && !isDraft && isRendererEnabled('graph') && (
+                      <button className="w-full flex items-center gap-2 px-3 py-2 text-sm text-foreground hover:bg-muted transition-colors text-left" onClick={() => { setMoreOpen(false); handleToggleGraph(); }}>
+                        {effectiveGraphMode ? <FileText size={14} className="shrink-0" /> : <Share2 size={14} className="shrink-0" />}
+                        {effectiveGraphMode ? (t.view?.switchToDoc ?? 'Document view') : (t.view?.switchToGraph ?? 'Wiki Graph')}
+                      </button>
+                    )}
+                    <button className="w-full flex items-center gap-2 px-3 py-2 text-sm text-foreground hover:bg-muted transition-colors text-left" onClick={() => { setMoreOpen(false); setExportOpen(true); }}>
+                      <Download size={14} className="shrink-0" /> {t.fileTree?.export ?? 'Export'}
+                    </button>
                     <button className="w-full flex items-center gap-2 px-3 py-2 text-sm text-foreground hover:bg-muted transition-colors text-left" onClick={handleCopyPath}>
                       <Copy size={14} className="shrink-0" /> {t.view?.copyPath ?? t.fileTree?.copyPath ?? 'Copy Path'}
                     </button>

package/app/components/FileTree.tsx

@@ -77,11 +77,12 @@ function countContentFiles(node: FileNode): number {
   return (node.children ?? []).reduce((sum, c) => sum + countContentFiles(c), 0);
 }
 
-/** Filter out system files and dot-entries that shouldn't appear by default. */
+/** Filter out hidden entries (dot-files at root, system files) when show-hidden is off. */
 function filterHiddenNodes(nodes: FileNode[], isRoot: boolean): FileNode[] {
   return nodes.filter(node => {
     if (isRoot && node.name.startsWith('.')) return false;
     if (node.type === 'file' && SYSTEM_FILES.has(node.name)) return false;
+    if (node.type === 'directory' && node.name.startsWith('.')) return false;
     return true;
   });
 }
@@ -426,7 +427,7 @@ function DirectoryNode({ node, depth, currentPath, onNavigate, maxOpenDepth, onI
           onClick={toggle}
           className="shrink-0 p-1 rounded hover:bg-muted text-muted-foreground transition-colors"
           style={{ marginLeft: `${depth * 12 + 4}px` }}
-          aria-label={open ? 'Collapse' : 'Expand'}
+          aria-label={open ? `Collapse ${node.name}` : `Expand ${node.name}`}
         >
           <span className="block transition-transform duration-150" style={{ transform: open ? 'rotate(0deg)' : 'rotate(-90deg)' }}>
             <ChevronDown size={13} />

package/app/components/MarkdownView.tsx

@@ -51,11 +51,18 @@ function CopyButton({ code }: { code: string }) {
   );
 }
 
-// Heading components with suppressHydrationWarning to prevent
-// rehype-slug + emoji hydration mismatches between server and client
+// react-markdown passes an AST `node` prop to custom components;
+// strip it (and any other non-DOM keys) before forwarding to the real element.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function stripNonDom(props: Record<string, any>): Record<string, any> {
+  const { node, inline, ordered, depth, isHeader, ...domProps } = props;
+  return domProps;
+}
+
 function makeHeading(Tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6') {
-  const HeadingComponent = ({ children, ...props }: React.HTMLAttributes<HTMLHeadingElement>) => (
-    <Tag {...props} suppressHydrationWarning>{children}</Tag>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const HeadingComponent = ({ children, ...props }: any) => (
+    <Tag {...stripNonDom(props)} suppressHydrationWarning>{children}</Tag>
   );
   HeadingComponent.displayName = Tag;
   return HeadingComponent;
@@ -68,11 +75,12 @@ const components: Components = {
   h4: makeHeading('h4'),
   h5: makeHeading('h5'),
   h6: makeHeading('h6'),
-  code({ children, ...props }) {
-    return <code {...props} suppressHydrationWarning>{children}</code>;
+  code({ children, node, ...rest }) {
+    void node;
+    return <code {...stripNonDom(rest)} suppressHydrationWarning>{children}</code>;
   },
-  pre({ children, ...props }) {
-    // Extract code string from children
+  pre({ children, node, ...rest }) {
+    void node;
     let codeString = '';
     if (children && typeof children === 'object' && 'props' in children) {
       const codeEl = children as React.ReactElement<{ children?: React.ReactNode }>;
@@ -80,31 +88,38 @@ const components: Components = {
     }
     return (
       <div className="relative group">
-        <pre {...props} suppressHydrationWarning>{children}</pre>
+        <pre {...stripNonDom(rest)} suppressHydrationWarning>{children}</pre>
         <CopyButton code={codeString} />
       </div>
     );
   },
-  li({ children, ...props }) {
-    return <li {...props} suppressHydrationWarning>{children}</li>;
+  li({ children, node, ...rest }) {
+    void node;
+    return <li {...stripNonDom(rest)} suppressHydrationWarning>{children}</li>;
+  },
+  p({ children, node, ...rest }) {
+    void node;
+    return <p {...stripNonDom(rest)} suppressHydrationWarning>{children}</p>;
   },
-  a({ href, children, ...props }) {
+  a({ href, children, node, ...rest }) {
+    void node;
     const isExternal = href?.startsWith('http');
     return (
       <a
         href={href}
         target={isExternal ? '_blank' : undefined}
         rel={isExternal ? 'noopener noreferrer' : undefined}
-        {...props}
+        {...stripNonDom(rest)}
       >
         {children}
       </a>
     );
   },
-  img({ src, alt, ...props }) {
+  img({ src, alt, node, ...rest }) {
+    void node;
     if (!src) return null;
     // eslint-disable-next-line @next/next/no-img-element
-    return <img src={src} alt={alt ?? ''} {...props} />;
+    return <img src={src} alt={alt ?? ''} {...stripNonDom(rest)} />;
   },
 };
 

package/app/components/RightAskPanel.tsx

@@ -9,7 +9,9 @@ import { useResizeDrag } from '@/hooks/useResizeDrag';
 const DEFAULT_WIDTH = 420;
 const MIN_WIDTH = 400;
 const MAX_WIDTH_ABS = 4000;
-const FOCUS_SNAP_THRESHOLD = 80;
+const ENTER_SNAP_THRESHOLD = 80;
+const EXIT_SNAP_THRESHOLD = 16;
+const MIN_CONTENT_WIDTH = 360;
 
 import type { AcpAgentSelection } from '@/hooks/useAskModal';
 
@@ -37,6 +39,7 @@ export default function RightAskPanel({
   maximized = false, onMaximize, sidebarOffset = 0,
 }: RightAskPanelProps) {
   const snapFiredRef = useRef(false);
+  const justExitedMaxRef = useRef(false);
 
   const maxAvailable = typeof window !== 'undefined'
     ? window.innerWidth - sidebarOffset
@@ -45,12 +48,28 @@ export default function RightAskPanel({
   const handleResize = useCallback((w: number) => {
     if (snapFiredRef.current) return;
     const clamped = Math.min(w, maxAvailable);
-    if (maximized && clamped < maxAvailable - FOCUS_SNAP_THRESHOLD && onMaximize) {
+
+    // Exit maximized: user drags right even a little (16px) → exit immediately
+    if (maximized && clamped < maxAvailable - EXIT_SNAP_THRESHOLD && onMaximize) {
+      justExitedMaxRef.current = true;
       onMaximize();
-      onWidthChange(clamped);
+      const maxPanelForContent = typeof window !== 'undefined'
+        ? window.innerWidth - sidebarOffset - MIN_CONTENT_WIDTH
+        : clamped;
+      onWidthChange(Math.min(clamped, maxPanelForContent));
       return;
     }
-    if (!maximized && clamped >= maxAvailable - FOCUS_SNAP_THRESHOLD && onMaximize) {
+
+    // Snap to fullscreen: panel near max edge OR content squeezed below minimum.
+    // Suppress content-based snap while justExitedMaxRef is true (user recently
+    // exited fullscreen and panel is still wide); only re-enable once the panel
+    // has been shrunk enough that content is comfortable (reset in handleMouseDown).
+    const contentRemaining = typeof window !== 'undefined'
+      ? window.innerWidth - sidebarOffset - clamped
+      : Infinity;
+    const shouldSnap = clamped >= maxAvailable - ENTER_SNAP_THRESHOLD
+      || (!justExitedMaxRef.current && contentRemaining < MIN_CONTENT_WIDTH);
+    if (!maximized && shouldSnap && onMaximize) {
       snapFiredRef.current = true;
       onMaximize();
       return;
@@ -58,7 +77,7 @@ export default function RightAskPanel({
     if (!maximized) {
       onWidthChange(clamped);
     }
-  }, [maxAvailable, onMaximize, maximized, onWidthChange]);
+  }, [maxAvailable, sidebarOffset, onMaximize, maximized, onWidthChange]);
 
   const handleResizeEnd = useCallback((w: number) => {
     if (snapFiredRef.current) return;
@@ -77,8 +96,19 @@ export default function RightAskPanel({
 
   const handleMouseDown = useCallback((e: React.MouseEvent) => {
     snapFiredRef.current = false;
+    // Only re-enable content-based snap once the panel has been shrunk enough
+    // that content is comfortably above minimum. This prevents the bounce:
+    // exit fullscreen → new drag → immediately re-snap because panel still wide.
+    if (justExitedMaxRef.current) {
+      const currentContent = typeof window !== 'undefined'
+        ? window.innerWidth - sidebarOffset - width
+        : Infinity;
+      if (currentContent >= MIN_CONTENT_WIDTH) {
+        justExitedMaxRef.current = false;
+      }
+    }
     rawMouseDown(e);
-  }, [rawMouseDown]);
+  }, [rawMouseDown, sidebarOffset, width]);
 
   const effectiveWidth = maximized
     ? `calc(100vw - ${sidebarOffset}px)`

package/app/components/Sidebar.tsx

@@ -102,13 +102,13 @@ export default function Sidebar({ fileTree, collapsed = false, onCollapse, onExp
         </button>
         {/* Desktop action buttons — trimmed to 4 */}
         <div className="hidden md:flex items-center gap-1">
-          <button onClick={() => setSearchOpen(true)} className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.sidebar.searchTitle} aria-label={t.sidebar.searchTitle}>
+          <button onClick={() => setSearchOpen(true)} className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.sidebar.searchTitle} aria-hidden="true" tabIndex={-1}>
             <Search size={15} />
           </button>
-          <button onClick={() => setSettingsOpen(true)} className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.sidebar.settingsTitle} aria-label={t.sidebar.settingsTitle}>
+          <button onClick={() => setSettingsOpen(true)} className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.sidebar.settingsTitle} aria-hidden="true" tabIndex={-1}>
             <Settings size={15} />
           </button>
-          <button onClick={onCollapse} className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.sidebar.collapseTitle} aria-label={t.sidebar.collapseTitle}>
+          <button onClick={onCollapse} className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.sidebar.collapseTitle} aria-hidden="true" tabIndex={-1}>
             <PanelLeftClose size={15} />
           </button>
         </div>

package/app/components/agents/AgentsMcpSection.tsx

@@ -3,6 +3,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import Link from 'next/link';
 import { RefreshCw, Search, Server } from 'lucide-react';
+import { apiFetch } from '@/lib/api';
 import type { McpContextValue } from '@/lib/stores/mcp-store';
 import type { AgentBuckets, AgentStatusFilter, AgentTransportFilter } from './agents-content-model';
 import {
@@ -58,6 +59,8 @@ export default function AgentsMcpSection({
     cancel: string;
     noAvailableAgents: string;
     manualRemoveHint: string;
+    removeSuccess: string;
+    removeFailed: string;
     reconnectAllInServer: string;
     reconnectAllRunning: string;
     reconnectAllDone: (ok: number, failed: number) => string;
@@ -339,6 +342,9 @@ function ByAgentView({
                         variant="primary"
                       />
                     )}
+                    {!agent.installed && (
+                      <span className="text-2xs text-muted-foreground/60">or CLI Skill</span>
+                    )}
                   </div>
                 </div>
 
@@ -380,7 +386,7 @@ function ByServerView({
   onReconnect: (agent: ReturnType<typeof sortAgentsByStatus>[number]) => Promise<void>;
 }) {
   const [pickerServer, setPickerServer] = useState<string | null>(null);
-  const [confirmState, setConfirmState] = useState<{ agentName: string; serverName: string } | null>(null);
+  const [confirmState, setConfirmState] = useState<{ agentKey: string; agentName: string; serverName: string } | null>(null);
   const [hintMessage, setHintMessage] = useState<string | null>(null);
   const [reconnectingServer, setReconnectingServer] = useState<string | null>(null);
   const [reconnectMsg, setReconnectMsg] = useState<Record<string, string>>({});
@@ -393,11 +399,27 @@ function ByServerView({
     [onInstallMindos],
   );
 
-  const handleConfirmRemove = useCallback(() => {
+  const handleConfirmRemove = useCallback(async () => {
+    if (!confirmState) return;
+    const { agentKey } = confirmState;
     setConfirmState(null);
-    setHintMessage(copy.manualRemoveHint);
+
+    // Find agent info to determine scope
+    const agent = allAgents.find(a => a.key === agentKey);
+    const scope = agent?.scope === 'project' ? 'project' : 'global';
+
+    try {
+      await apiFetch('/api/mcp/uninstall', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ agents: [{ key: agentKey, scope }] }),
+      });
+      setHintMessage(copy.removeSuccess ?? 'Removed. Restart your agent to apply.');
+    } catch {
+      setHintMessage(copy.removeFailed ?? 'Failed to remove. Try editing the config file manually.');
+    }
     setTimeout(() => setHintMessage(null), 4000);
-  }, [copy.manualRemoveHint]);
+  }, [confirmState, allAgents, copy]);
 
   const handleReconnectAllInServer = useCallback(
     async (serverName: string, agents: typeof allAgents) => {
@@ -517,7 +539,7 @@ function ByServerView({
                       <AgentAvatar
                         name={agent.name}
                         status={agentStatus}
-                        onRemove={() => setConfirmState({ agentName: agent.name, serverName: srv.serverName })}
+                        onRemove={() => setConfirmState({ agentKey: agent.key, agentName: agent.name, serverName: srv.serverName })}
                       />
                     </Link>
                   );

package/app/components/help/HelpContent.tsx

@@ -18,6 +18,7 @@ function Section({ id, icon, title, defaultOpen = false, children }: {
 
   return (
     <div id={id} className="bg-card border border-border rounded-lg overflow-hidden scroll-mt-4">
+      <h2 className="sr-only">{title}</h2>
       <button
         onClick={() => setOpen(v => !v)}
         className="w-full flex items-center gap-3 px-5 py-4 text-left hover:bg-muted/50 transition-colors focus-visible:ring-2 focus-visible:ring-ring"