@geminilight/mindos 0.5.6 → 0.5.7

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

@@ -1,14 +1,16 @@
 export const dynamic = 'force-dynamic';
 import { NextResponse } from 'next/server';
-import { MCP_AGENTS, detectInstalled } from '@/lib/mcp-agents';
+import { MCP_AGENTS, detectInstalled, detectAgentPresence } from '@/lib/mcp-agents';
 
 export async function GET() {
   try {
     const agents = Object.entries(MCP_AGENTS).map(([key, agent]) => {
       const status = detectInstalled(key);
+      const present = detectAgentPresence(key);
       return {
         key,
         name: agent.name,
+        present,
         installed: status.installed,
         scope: status.scope,
         transport: status.transport,

package/app/app/api/restart/route.ts

@@ -7,14 +7,38 @@ export async function POST() {
   try {
     // process.cwd() is the Next.js app directory; cli.js is one level up at project root/bin/
     const cliPath = resolve(process.cwd(), '../bin/cli.js');
-    const child = spawn(process.execPath, [cliPath, 'start'], {
+    // Use 'restart' (stop all → wait for ports free → start) instead of bare
+    // 'start' which would fail assertPortFree because the current process and
+    // its MCP child are still holding the ports.
+    //
+    // IMPORTANT: Strip MINDOS_* env vars so the child's loadConfig() reads
+    // the *updated* config file instead of inheriting stale values from this
+    // process.  Without this, changing ports in the GUI has no effect on the
+    // restarted server — it would start on the old ports.
+    //
+    // Pass the current (old) ports via MINDOS_OLD_* so the restart command
+    // can clean up processes still listening on the previous ports.
+    const childEnv = { ...process.env };
+    const oldWebPort = childEnv.MINDOS_WEB_PORT;
+    const oldMcpPort = childEnv.MINDOS_MCP_PORT;
+    delete childEnv.MINDOS_WEB_PORT;
+    delete childEnv.MINDOS_MCP_PORT;
+    delete childEnv.MIND_ROOT;
+    delete childEnv.AUTH_TOKEN;
+    delete childEnv.WEB_PASSWORD;
+    if (oldWebPort) childEnv.MINDOS_OLD_WEB_PORT = oldWebPort;
+    if (oldMcpPort) childEnv.MINDOS_OLD_MCP_PORT = oldMcpPort;
+    const child = spawn(process.execPath, [cliPath, 'restart'], {
       detached: true,
       stdio: 'ignore',
-      env: process.env,
+      env: childEnv,
     });
     child.unref();
-    // Give a brief moment for the response to be sent before exiting
-    setTimeout(() => process.exit(0), 500);
+    // Give a brief moment for the response to be sent before exiting.
+    // The spawned 'restart' command will handle stopping this process via
+    // stopMindos() (kill by PID + port cleanup), so process.exit here is
+    // just a safety net in case the parent isn't killed cleanly.
+    setTimeout(() => process.exit(0), 1500);
     return NextResponse.json({ ok: true });
   } catch (err) {
     return NextResponse.json({ error: String(err) }, { status: 500 });

package/app/components/SetupWizard.tsx

@@ -36,6 +36,7 @@ interface PortStatus {
 interface AgentEntry {
   key: string;
   name: string;
+  present: boolean;
   installed: boolean;
   hasProjectScope: boolean;
   hasGlobalScope: boolean;
@@ -511,7 +512,7 @@ function Step5({
     return agentTransport;
   };
 
-  const getStatusBadge = (key: string, installed: boolean) => {
+  const getStatusBadge = (key: string, agent: AgentEntry) => {
     const st = agentStatuses[key];
     if (st) {
       if (st.state === 'installing') return (
@@ -533,16 +534,22 @@ function Step5({
         </span>
       );
     }
-    if (installed) return (
+    if (agent.installed) return (
       <span className="text-[11px] px-1.5 py-0.5 rounded"
         style={{ background: 'rgba(34,197,94,0.12)', color: '#22c55e' }}>
         {settingsMcp.installed}
       </span>
     );
+    if (agent.present) return (
+      <span className="text-[11px] px-1.5 py-0.5 rounded"
+        style={{ background: 'rgba(245,158,11,0.12)', color: '#f59e0b' }}>
+        {s.agentDetected ?? 'detected'}
+      </span>
+    );
     return (
       <span className="text-[11px] px-1.5 py-0.5 rounded"
         style={{ background: 'rgba(100,100,120,0.1)', color: 'var(--muted-foreground)' }}>
-        {s.agentNotInstalled}
+        {s.agentNotFound ?? s.agentNotInstalled}
       </span>
     );
   };
@@ -581,7 +588,7 @@ function Step5({
                   style={{ background: 'rgba(100,100,120,0.08)', color: 'var(--muted-foreground)' }}>
                   {getEffectiveTransport(agent)}
                 </span>
-                {getStatusBadge(agent.key, agent.installed)}
+                {getStatusBadge(agent.key, agent)}
               </label>
             ))}
           </div>
@@ -936,7 +943,7 @@ export default function SetupWizard() {
           if (data.agents) {
             setAgents(data.agents);
             setSelectedAgents(new Set(
-              (data.agents as AgentEntry[]).filter(a => a.installed).map(a => a.key)
+              (data.agents as AgentEntry[]).filter(a => a.installed || a.present).map(a => a.key)
             ));
           }
         })

package/app/components/settings/McpTab.tsx

@@ -22,6 +22,7 @@ interface McpStatus {
 interface AgentInfo {
   key: string;
   name: string;
+  present: boolean;
   installed: boolean;
   scope?: string;
   transport?: string;
@@ -231,7 +232,9 @@ function AgentInstall({ agents, t, onRefresh }: { agents: AgentInfo[]; t: any; o
                 <span className="text-[10px] text-muted-foreground">{agent.scope}</span>
               </>
             ) : (
-              <span className="text-[10px] text-muted-foreground">{m?.notInstalled ?? 'Not installed'}</span>
+              <span className="text-[10px] text-muted-foreground">
+                {agent.present ? (m?.detected ?? 'Detected') : (m?.notFound ?? 'Not found')}
+              </span>
             )}
             {/* Scope selector */}
             {selected.has(agent.key) && agent.hasProjectScope && agent.hasGlobalScope && (

package/app/lib/i18n.ts

@@ -197,6 +197,8 @@ export const messages = {
         global: 'Global',
         installed: 'Installed',
         notInstalled: 'Not installed',
+        detected: 'Detected',
+        notFound: 'Not found',
         transportStdio: 'stdio (recommended)',
         transportHttp: 'http',
         transportAuto: 'auto (recommended)',
@@ -325,6 +327,8 @@ export const messages = {
       agentNoneSelected: 'No agents selected — you can configure later in Settings → MCP.',
       agentSkipLater: 'Skip — configure later',
       agentNotInstalled: 'not installed',
+      agentDetected: 'detected',
+      agentNotFound: 'not found',
       agentStatusOk: 'configured',
       agentStatusError: 'failed',
       agentInstalling: 'Configuring…',
@@ -566,6 +570,8 @@ export const messages = {
         global: '全局',
         installed: '已安装',
         notInstalled: '未安装',
+        detected: '已检测',
+        notFound: '未找到',
         transportStdio: 'stdio（推荐）',
         transportHttp: 'http',
         transportAuto: '自动（推荐）',
@@ -694,6 +700,8 @@ export const messages = {
       agentNoneSelected: '未选择 agent — 可稍后在 设置 → MCP 中配置。',
       agentSkipLater: '跳过 — 稍后配置',
       agentNotInstalled: '未安装',
+      agentDetected: '已检测到',
+      agentNotFound: '未找到',
       agentStatusOk: '已配置',
       agentStatusError: '失败',
       agentInstalling: '配置中…',

package/app/lib/mcp-agents.ts

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
+import { execSync } from 'child_process';
 
 export function expandHome(p: string): string {
   return p.startsWith('~/') ? path.resolve(os.homedir(), p.slice(2)) : p;
@@ -12,20 +13,100 @@ export interface AgentDef {
   global: string;
   key: string;
   preferredTransport: 'stdio' | 'http';
+  /** CLI binary name for presence detection (e.g. 'claude'). Optional. */
+  presenceCli?: string;
+  /** Data directories for presence detection. Any one existing → present. */
+  presenceDirs?: string[];
 }
 
 export const MCP_AGENTS: Record<string, AgentDef> = {
-  'claude-code':    { name: 'Claude Code',    project: '.mcp.json',                       global: '~/.claude.json',    key: 'mcpServers', preferredTransport: 'stdio' },
-  'claude-desktop': { name: 'Claude Desktop', project: null,                               global: process.platform === 'darwin' ? '~/Library/Application Support/Claude/claude_desktop_config.json' : '~/.config/Claude/claude_desktop_config.json', key: 'mcpServers', preferredTransport: 'http' },
-  'cursor':         { name: 'Cursor',          project: '.cursor/mcp.json',                global: '~/.cursor/mcp.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'windsurf':       { name: 'Windsurf',        project: null,                               global: '~/.codeium/windsurf/mcp_config.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'cline':          { name: 'Cline',           project: null,                               global: process.platform === 'darwin' ? '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json' : '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'trae':           { name: 'Trae',            project: '.trae/mcp.json',                  global: '~/.trae/mcp.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'gemini-cli':     { name: 'Gemini CLI',      project: '.gemini/settings.json',           global: '~/.gemini/settings.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'openclaw':       { name: 'OpenClaw',        project: null,                               global: '~/.openclaw/mcp.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'codebuddy':      { name: 'CodeBuddy',       project: null,                               global: '~/.claude-internal/.claude.json', key: 'mcpServers', preferredTransport: 'stdio' },
+  'claude-code': {
+    name: 'Claude Code',
+    project: '.mcp.json',
+    global: '~/.claude.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'claude',
+    presenceDirs: ['~/.claude/'],
+  },
+  'claude-desktop': {
+    name: 'Claude Desktop',
+    project: null,
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Claude/claude_desktop_config.json'
+      : '~/.config/Claude/claude_desktop_config.json',
+    key: 'mcpServers',
+    preferredTransport: 'http',
+    presenceDirs: ['~/Library/Application Support/Claude/', '~/.config/Claude/'],
+  },
+  'cursor': {
+    name: 'Cursor',
+    project: '.cursor/mcp.json',
+    global: '~/.cursor/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.cursor/'],
+  },
+  'windsurf': {
+    name: 'Windsurf',
+    project: null,
+    global: '~/.codeium/windsurf/mcp_config.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.codeium/windsurf/'],
+  },
+  'cline': {
+    name: 'Cline',
+    project: null,
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json'
+      : '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: [
+      '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/',
+      '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/',
+    ],
+  },
+  'trae': {
+    name: 'Trae',
+    project: '.trae/mcp.json',
+    global: '~/.trae/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.trae/'],
+  },
+  'gemini-cli': {
+    name: 'Gemini CLI',
+    project: '.gemini/settings.json',
+    global: '~/.gemini/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'gemini',
+    presenceDirs: ['~/.gemini/'],
+  },
+  'openclaw': {
+    name: 'OpenClaw',
+    project: null,
+    global: '~/.openclaw/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'openclaw',
+    presenceDirs: ['~/.openclaw/'],
+  },
+  'codebuddy': {
+    name: 'CodeBuddy',
+    project: null,
+    global: '~/.claude-internal/.claude.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'claude-internal',
+    presenceDirs: ['~/.claude-internal/'],
+  },
 };
 
+/* ── MindOS MCP Install Detection ──────────────────────────────────────── */
+
 export function detectInstalled(agentKey: string): { installed: boolean; scope?: string; transport?: string; configPath?: string } {
   const agent = MCP_AGENTS[agentKey];
   if (!agent) return { installed: false };
@@ -47,3 +128,23 @@ export function detectInstalled(agentKey: string): { installed: boolean; scope?:
 
   return { installed: false };
 }
+
+/* ── Agent Presence Detection ──────────────────────────────────────────── */
+
+export function detectAgentPresence(agentKey: string): boolean {
+  const agent = MCP_AGENTS[agentKey];
+  if (!agent) return false;
+  // 1. CLI check
+  if (agent.presenceCli) {
+    try {
+      execSync(
+        process.platform === 'win32' ? `where ${agent.presenceCli}` : `which ${agent.presenceCli}`,
+        { stdio: 'pipe' },
+      );
+      return true;
+    } catch { /* not found */ }
+  }
+  // 2. Dir check
+  if (agent.presenceDirs?.some(d => fs.existsSync(expandHome(d)))) return true;
+  return false;
+}

package/app/proxy.ts

@@ -16,8 +16,9 @@ export async function proxy(req: NextRequest) {
 
   // --- API protection (AUTH_TOKEN) ---
   if (pathname.startsWith('/api/')) {
-    // /api/auth handles its own password validation — never block it
-    if (pathname === '/api/auth') return NextResponse.next();
+    // /api/auth handles its own password validation — never block it.
+    // /api/health is unauthenticated so check-port can detect this MindOS instance.
+    if (pathname === '/api/auth' || pathname === '/api/health') return NextResponse.next();
 
     if (!authToken) return NextResponse.next();
 

package/app/vitest.config.ts

@@ -3,7 +3,7 @@ import path from 'path';
 
 export default defineConfig({
   test: {
-    include: ['__tests__/**/*.test.ts'],
+    include: ['__tests__/**/*.test.ts', '../tests/unit/**/*.test.ts'],
     setupFiles: ['__tests__/setup.ts'],
   },
   resolve: {

package/bin/cli.js

@@ -317,16 +317,39 @@ const commands = {
   stop: () => stopMindos(),
 
   restart: async () => {
+    // Capture old ports BEFORE loadConfig overwrites env vars, so we can
+    // clean up processes that are still listening on the previous ports
+    // (e.g. user changed ports in the GUI and config was already saved).
+    // Sources: (1) MINDOS_OLD_* set by /api/restart when it strips the
+    //              current env, (2) current MINDOS_*_PORT env vars.
+    const oldWebPort = process.env.MINDOS_OLD_WEB_PORT || process.env.MINDOS_WEB_PORT;
+    const oldMcpPort = process.env.MINDOS_OLD_MCP_PORT || process.env.MINDOS_MCP_PORT;
+
     loadConfig();
-    const webPort = Number(process.env.MINDOS_WEB_PORT || '3000');
-    const mcpPort = Number(process.env.MINDOS_MCP_PORT || '8787');
-    stopMindos();
-    // Wait until both ports are actually free (up to 15s)
+
+    // After loadConfig, env vars reflect the NEW config (or old if unchanged).
+    const newWebPort = Number(process.env.MINDOS_WEB_PORT || '3000');
+    const newMcpPort = Number(process.env.MINDOS_MCP_PORT || '8787');
+
+    // Collect old ports that differ from new ones — processes may still be
+    // listening there even though config already points to the new ports.
+    const extraPorts = [];
+    if (oldWebPort && Number(oldWebPort) !== newWebPort) extraPorts.push(oldWebPort);
+    if (oldMcpPort && Number(oldMcpPort) !== newMcpPort) extraPorts.push(oldMcpPort);
+
+    stopMindos({ extraPorts });
+
+    // Wait until ALL ports (old + new) are actually free (up to 15s)
+    const allPorts = new Set([newWebPort, newMcpPort]);
+    for (const p of extraPorts) allPorts.add(Number(p));
+
     const deadline = Date.now() + 15_000;
     while (Date.now() < deadline) {
-      const webBusy = await isPortInUse(webPort);
-      const mcpBusy = await isPortInUse(mcpPort);
-      if (!webBusy && !mcpBusy) break;
+      let anyBusy = false;
+      for (const p of allPorts) {
+        if (await isPortInUse(p)) { anyBusy = true; break; }
+      }
+      if (!anyBusy) break;
       await new Promise((r) => setTimeout(r, 500));
     }
     await commands[getStartMode()]();

package/bin/lib/mcp-agents.js

@@ -1,16 +1,119 @@
 /**
  * Shared MCP agent definitions for CLI tools.
  * Mirrors app/lib/mcp-agents.ts — keep in sync manually.
+ *
+ * Each agent entry includes presenceCli / presenceDirs for detecting
+ * whether the agent is installed on the user's machine. To add a new
+ * agent, add a single entry here — no separate table needed.
  */
 
+import { existsSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { homedir } from 'node:os';
+import { execSync } from 'node:child_process';
+
+function expandHome(p) {
+  return p.startsWith('~/') ? resolve(homedir(), p.slice(2)) : p;
+}
+
 export const MCP_AGENTS = {
-  'claude-code':    { name: 'Claude Code',    project: '.mcp.json',                       global: '~/.claude.json',                                                                         key: 'mcpServers', preferredTransport: 'stdio' },
-  'claude-desktop': { name: 'Claude Desktop', project: null,                               global: process.platform === 'darwin' ? '~/Library/Application Support/Claude/claude_desktop_config.json' : '~/.config/Claude/claude_desktop_config.json', key: 'mcpServers', preferredTransport: 'http' },
-  'cursor':         { name: 'Cursor',          project: '.cursor/mcp.json',                global: '~/.cursor/mcp.json',                                                                     key: 'mcpServers', preferredTransport: 'stdio' },
-  'windsurf':       { name: 'Windsurf',        project: null,                               global: '~/.codeium/windsurf/mcp_config.json',                                                   key: 'mcpServers', preferredTransport: 'stdio' },
-  'cline':          { name: 'Cline',           project: null,                               global: process.platform === 'darwin' ? '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json' : '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json', key: 'mcpServers', preferredTransport: 'stdio' },
-  'trae':           { name: 'Trae',            project: '.trae/mcp.json',                  global: '~/.trae/mcp.json',                                                                       key: 'mcpServers', preferredTransport: 'stdio' },
-  'gemini-cli':     { name: 'Gemini CLI',      project: '.gemini/settings.json',           global: '~/.gemini/settings.json',                                                                key: 'mcpServers', preferredTransport: 'stdio' },
-  'openclaw':       { name: 'OpenClaw',        project: null,                               global: '~/.openclaw/mcp.json',                                                                   key: 'mcpServers', preferredTransport: 'stdio' },
-  'codebuddy':      { name: 'CodeBuddy',       project: null,                               global: '~/.claude-internal/.claude.json',                                                        key: 'mcpServers', preferredTransport: 'stdio' },
+  'claude-code': {
+    name: 'Claude Code',
+    project: '.mcp.json',
+    global: '~/.claude.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'claude',
+    presenceDirs: ['~/.claude/'],
+  },
+  'claude-desktop': {
+    name: 'Claude Desktop',
+    project: null,
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Claude/claude_desktop_config.json'
+      : '~/.config/Claude/claude_desktop_config.json',
+    key: 'mcpServers',
+    preferredTransport: 'http',
+    presenceDirs: ['~/Library/Application Support/Claude/', '~/.config/Claude/'],
+  },
+  'cursor': {
+    name: 'Cursor',
+    project: '.cursor/mcp.json',
+    global: '~/.cursor/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.cursor/'],
+  },
+  'windsurf': {
+    name: 'Windsurf',
+    project: null,
+    global: '~/.codeium/windsurf/mcp_config.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.codeium/windsurf/'],
+  },
+  'cline': {
+    name: 'Cline',
+    project: null,
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json'
+      : '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: [
+      '~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/',
+      '~/.config/Code/User/globalStorage/saoudrizwan.claude-dev/',
+    ],
+  },
+  'trae': {
+    name: 'Trae',
+    project: '.trae/mcp.json',
+    global: '~/.trae/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.trae/'],
+  },
+  'gemini-cli': {
+    name: 'Gemini CLI',
+    project: '.gemini/settings.json',
+    global: '~/.gemini/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'gemini',
+    presenceDirs: ['~/.gemini/'],
+  },
+  'openclaw': {
+    name: 'OpenClaw',
+    project: null,
+    global: '~/.openclaw/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'openclaw',
+    presenceDirs: ['~/.openclaw/'],
+  },
+  'codebuddy': {
+    name: 'CodeBuddy',
+    project: null,
+    global: '~/.claude-internal/.claude.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'claude-internal',
+    presenceDirs: ['~/.claude-internal/'],
+  },
 };
+
+export function detectAgentPresence(agentKey) {
+  const agent = MCP_AGENTS[agentKey];
+  if (!agent) return false;
+  if (agent.presenceCli) {
+    try {
+      execSync(
+        process.platform === 'win32' ? `where ${agent.presenceCli}` : `which ${agent.presenceCli}`,
+        { stdio: 'pipe' },
+      );
+      return true;
+    } catch { /* not found */ }
+  }
+  if (agent.presenceDirs?.some(d => existsSync(expandHome(d)))) return true;
+  return false;
+}

package/bin/lib/stop.js

@@ -66,7 +66,14 @@ function killTree(pid) {
   return false;
 }
 
-export function stopMindos() {
+/**
+ * Stop MindOS processes.
+ * @param {Object} [opts] - Optional overrides.
+ * @param {string[]} [opts.extraPorts] - Additional ports to clean up (e.g. old
+ *   ports before a config change).  These are cleaned in addition to the ports
+ *   read from the current config file.
+ */
+export function stopMindos(opts = {}) {
   // Read ports from config for port-based cleanup
   let webPort = '3000', mcpPort = '8787';
   try {
@@ -90,8 +97,14 @@ export function stopMindos() {
 
   // Always do port-based cleanup — Next.js spawns worker processes whose PIDs
   // are not recorded in the PID file and would otherwise become orphaned.
+  // Include any extra ports (e.g. old ports from before a config change).
+  const portsToClean = new Set([webPort, mcpPort]);
+  if (opts.extraPorts) {
+    for (const p of opts.extraPorts) portsToClean.add(String(p));
+  }
+
   let portKilled = 0;
-  for (const port of [webPort, mcpPort]) {
+  for (const port of portsToClean) {
     portKilled += killByPort(port);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geminilight/mindos",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "MindOS — Human-Agent Collaborative Mind System. Local-first knowledge base that syncs your mind to all AI Agents via MCP.",
   "keywords": [
     "mindos",

package/scripts/setup.js

@@ -30,7 +30,7 @@ import { execSync, spawn } from 'node:child_process';
 import { randomBytes, createHash } from 'node:crypto';
 import { createConnection } from 'node:net';
 import http from 'node:http';
-import { MCP_AGENTS } from '../bin/lib/mcp-agents.js';
+import { MCP_AGENTS, detectAgentPresence } from '../bin/lib/mcp-agents.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = resolve(__dirname, '..');
@@ -616,14 +616,15 @@ function isAgentInstalled(agentKey) {
 async function runMcpInstallStep(mcpPort, authToken) {
   const keys = Object.keys(MCP_AGENTS);
 
-  // Build options with installed status shown as hint
+  // Build options with installed/detected status shown as hint
   const options = keys.map(k => {
     const installed = isAgentInstalled(k);
+    const present = detectAgentPresence(k);
     return {
       label: MCP_AGENTS[k].name,
-      hint:  installed ? (uiLang === 'zh' ? '已安装' : 'installed') : (uiLang === 'zh' ? '未安装' : 'not installed'),
+      hint:  installed ? (uiLang === 'zh' ? '已配置' : 'configured') : present ? (uiLang === 'zh' ? '已检测' : 'detected') : (uiLang === 'zh' ? '未找到' : 'not found'),
       value: k,
-      preselect: installed,
+      preselect: installed || present,
     };
   });