@geminilight/mindos 0.5.8 → 0.5.9

package/app/lib/mcp-agents.ts

@@ -93,6 +93,87 @@ export const MCP_AGENTS: Record<string, AgentDef> = {
     presenceCli: 'claude-internal',
     presenceDirs: ['~/.claude-internal/'],
   },
+  'iflow-cli': {
+    name: 'iFlow CLI',
+    project: '.iflow/settings.json',
+    global: '~/.iflow/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'iflow',
+    presenceDirs: ['~/.iflow/'],
+  },
+  'kimi-cli': {
+    name: 'Kimi Code',
+    project: '.kimi/mcp.json',
+    global: '~/.kimi/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'kimi',
+    presenceDirs: ['~/.kimi/'],
+  },
+  'opencode': {
+    name: 'OpenCode',
+    project: null,
+    global: '~/.config/opencode/config.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'opencode',
+    presenceDirs: ['~/.config/opencode/'],
+  },
+  'pi': {
+    name: 'Pi',
+    project: '.pi/settings.json',
+    global: '~/.pi/agent/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'pi',
+    presenceDirs: ['~/.pi/'],
+  },
+  'augment': {
+    name: 'Augment',
+    project: '.augment/settings.json',
+    global: '~/.augment/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'auggie',
+    presenceDirs: ['~/.augment/'],
+  },
+  'qwen-code': {
+    name: 'Qwen Code',
+    project: '.qwen/settings.json',
+    global: '~/.qwen/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'qwen',
+    presenceDirs: ['~/.qwen/'],
+  },
+  'trae-cn': {
+    name: 'Trae CN',
+    project: '.trae/mcp.json',
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Trae CN/User/mcp.json'
+      : '~/.config/Trae CN/User/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'trae-cli',
+    presenceDirs: [
+      '~/Library/Application Support/Trae CN/',
+      '~/.config/Trae CN/',
+    ],
+  },
+  'roo': {
+    name: 'Roo Code',
+    project: '.roo/mcp.json',
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/mcp_settings.json'
+      : '~/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/mcp_settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: [
+      '~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline/',
+      '~/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline/',
+    ],
+  },
 };
 
 /* ── MindOS MCP Install Detection ──────────────────────────────────────── */

package/bin/lib/gateway.js

@@ -1,9 +1,10 @@
 import { execSync } from 'node:child_process';
-import { existsSync, writeFileSync, rmSync, mkdirSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync, rmSync, mkdirSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { homedir } from 'node:os';
-import { MINDOS_DIR, LOG_PATH, CLI_PATH, NODE_BIN } from './constants.js';
-import { green, red, dim, cyan } from './colors.js';
+import { MINDOS_DIR, LOG_PATH, CLI_PATH, NODE_BIN, CONFIG_PATH } from './constants.js';
+import { green, red, dim, cyan, yellow } from './colors.js';
+import { isPortInUse } from './port.js';
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -25,6 +26,18 @@ export async function waitForService(check, { retries = 10, intervalMs = 1000 }
   return check();
 }
 
+/**
+ * Wait until a port is free (no process listening).
+ * Returns true if port is free, false on timeout.
+ */
+export async function waitForPortFree(port, { retries = 30, intervalMs = 500 } = {}) {
+  for (let i = 0; i < retries; i++) {
+    if (!(await isPortInUse(port))) return true;
+    await new Promise(r => setTimeout(r, intervalMs));
+  }
+  return !(await isPortInUse(port));
+}
+
 export async function waitForHttp(port, { retries = 120, intervalMs = 2000, label = 'service' } = {}) {
   process.stdout.write(cyan(`  Waiting for ${label} to be ready`));
   for (let i = 0; i < retries; i++) {
@@ -194,10 +207,37 @@ const launchd = {
     console.log(green('\u2714 Service started'));
   },
 
-  stop() {
+  async stop() {
+    // Read ports before bootout so we can wait for them to be freed
+    let webPort = 3000, mcpPort = 8787;
+    try {
+      const config = JSON.parse(readFileSync(CONFIG_PATH, 'utf-8'));
+      if (config.port) webPort = Number(config.port);
+      if (config.mcpPort) mcpPort = Number(config.mcpPort);
+    } catch {}
+
     try {
       execSync(`launchctl bootout gui/${launchctlUid()} ${LAUNCHD_PLIST}`, { stdio: 'inherit' });
     } catch { /* may not be running */ }
+
+    // launchctl bootout is async — wait for ports to actually be freed
+    let [webFree, mcpFree] = await Promise.all([
+      waitForPortFree(webPort),
+      waitForPortFree(mcpPort),
+    ]);
+    if (!webFree || !mcpFree) {
+      console.log(yellow('Ports still in use after bootout, force-killing...'));
+      const { stopMindos } = await import('./stop.js');
+      stopMindos();
+      // stopMindos() sends SIGTERM synchronously — wait for processes to exit
+      [webFree, mcpFree] = await Promise.all([
+        waitForPortFree(webPort),
+        waitForPortFree(mcpPort),
+      ]);
+      if (!webFree || !mcpFree) {
+        console.error(red('Warning: ports still in use after force-kill. Continuing anyway.'));
+      }
+    }
     console.log(green('\u2714 Service stopped'));
   },
 

package/bin/lib/mcp-agents.js

@@ -100,6 +100,87 @@ export const MCP_AGENTS = {
     presenceCli: 'claude-internal',
     presenceDirs: ['~/.claude-internal/'],
   },
+  'iflow-cli': {
+    name: 'iFlow CLI',
+    project: '.iflow/settings.json',
+    global: '~/.iflow/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'iflow',
+    presenceDirs: ['~/.iflow/'],
+  },
+  'kimi-cli': {
+    name: 'Kimi Code',
+    project: '.kimi/mcp.json',
+    global: '~/.kimi/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'kimi',
+    presenceDirs: ['~/.kimi/'],
+  },
+  'opencode': {
+    name: 'OpenCode',
+    project: null,
+    global: '~/.config/opencode/config.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'opencode',
+    presenceDirs: ['~/.config/opencode/'],
+  },
+  'pi': {
+    name: 'Pi',
+    project: '.pi/settings.json',
+    global: '~/.pi/agent/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'pi',
+    presenceDirs: ['~/.pi/'],
+  },
+  'augment': {
+    name: 'Augment',
+    project: '.augment/settings.json',
+    global: '~/.augment/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'auggie',
+    presenceDirs: ['~/.augment/'],
+  },
+  'qwen-code': {
+    name: 'Qwen Code',
+    project: '.qwen/settings.json',
+    global: '~/.qwen/settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'qwen',
+    presenceDirs: ['~/.qwen/'],
+  },
+  'trae-cn': {
+    name: 'Trae CN',
+    project: '.trae/mcp.json',
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Trae CN/User/mcp.json'
+      : '~/.config/Trae CN/User/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'trae-cli',
+    presenceDirs: [
+      '~/Library/Application Support/Trae CN/',
+      '~/.config/Trae CN/',
+    ],
+  },
+  'roo': {
+    name: 'Roo Code',
+    project: '.roo/mcp.json',
+    global: process.platform === 'darwin'
+      ? '~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/mcp_settings.json'
+      : '~/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline/settings/mcp_settings.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: [
+      '~/Library/Application Support/Code/User/globalStorage/rooveterinaryinc.roo-cline/',
+      '~/.config/Code/User/globalStorage/rooveterinaryinc.roo-cline/',
+    ],
+  },
 };
 
 export function detectAgentPresence(agentKey) {

package/bin/lib/mcp-install.js

@@ -3,7 +3,7 @@ import { resolve } from 'node:path';
 import { CONFIG_PATH } from './constants.js';
 import { bold, dim, cyan, green, red, yellow } from './colors.js';
 import { expandHome } from './utils.js';
-import { MCP_AGENTS } from './mcp-agents.js';
+import { MCP_AGENTS, detectAgentPresence } from './mcp-agents.js';
 
 export { MCP_AGENTS };
 
@@ -76,7 +76,7 @@ async function interactiveSelect(title, options) {
 async function interactiveMultiSelect(title, options) {
   return new Promise((resolve) => {
     let cursor = 0;
-    const selected = new Set();
+    const selected = new Set(options.map((o, i) => o.preselect ? i : -1).filter(i => i >= 0));
     const { stdin, stdout } = process;
 
     function render() {
@@ -85,7 +85,7 @@ async function interactiveMultiSelect(title, options) {
     }
 
     function draw() {
-      stdout.write(`${bold(title)}  ${dim('(↑↓ move, Space select, A all, Enter confirm)')}\n`);
+      stdout.write(`${bold(title)}  ${dim('(↑↓ move, Space select, D detected, A all, Enter confirm)')}\n`);
       for (let i = 0; i < options.length; i++) {
         const o = options[i];
         const check = selected.has(i) ? green('✔') : dim('○');
@@ -120,6 +120,10 @@ async function interactiveMultiSelect(title, options) {
         if (selected.size === options.length) selected.clear();
         else options.forEach((_, i) => selected.add(i));
         render();
+      } else if (key === 'd' || key === 'D') { // select detected only
+        selected.clear();
+        options.forEach((o, i) => { if (o.preselect) selected.add(i); });
+        render();
       } else if (key === '\r' || key === '\n') { // enter
         cleanup();
         const result = [...selected].sort().map(i => options[i]);
@@ -178,9 +182,35 @@ export async function mcpInstall() {
       agentKeys = keys;
     } else {
       rl.close(); // close readline so raw mode works
+
+      // Build options with detected status and preselect
+      const agentOptions = keys.map(k => {
+        const agent = MCP_AGENTS[k];
+        const present = detectAgentPresence(k);
+        // Check if already configured
+        let installed = false;
+        for (const cfgPath of [agent.global, agent.project]) {
+          if (!cfgPath) continue;
+          const abs = expandHome(cfgPath);
+          if (!existsSync(abs)) continue;
+          try {
+            const config = JSON.parse(readFileSync(abs, 'utf-8'));
+            if (config[agent.key]?.mindos) { installed = true; break; }
+          } catch {}
+        }
+        const hint = installed ? 'configured' : present ? 'detected' : 'not found';
+        return { label: agent.name, hint, value: k, preselect: installed || present };
+      });
+
+      // Sort: configured > detected > not found
+      agentOptions.sort((a, b) => {
+        const rank = (o) => o.hint === 'configured' ? 0 : o.preselect ? 1 : 2;
+        return rank(a) - rank(b);
+      });
+
       const picked = await interactiveMultiSelect(
         'Which Agents to configure?',
-        keys.map(k => ({ label: MCP_AGENTS[k].name, hint: k, value: k })),
+        agentOptions,
       );
       if (picked.length === 0) {
         console.log(dim('\nNo agents selected. Exiting.\n'));

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@geminilight/mindos",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "MindOS — Human-Agent Collaborative Mind System. Local-first knowledge base that syncs your mind to all AI Agents via MCP.",
   "keywords": [
     "mindos",
     "mcp",
     "knowledge-base",
+    "knowledge-management",
     "ai-agent",
     "local-first",
+    "markdown",
     "second-brain"
   ],
   "type": "module",

package/scripts/setup.js

@@ -429,7 +429,8 @@ function isPortInUse(port) {
   return new Promise((resolve) => {
     const sock = createConnection({ port, host: '127.0.0.1' });
     const cleanup = (result) => { sock.destroy(); resolve(result); };
-    sock.setTimeout(500, () => cleanup(true));
+    // On localhost, timeout means no response — treat as free (same as bin/lib/port.js)
+    sock.setTimeout(500, () => cleanup(false));
     sock.once('connect', () => cleanup(true));
     sock.once('error', (err) => {
       // ECONNREFUSED = nothing listening → free; other errors = treat as in-use
@@ -628,6 +629,12 @@ async function runMcpInstallStep(mcpPort, authToken) {
     };
   });
 
+  // Sort: configured > detected > not found (stable within each group)
+  options.sort((a, b) => {
+    const rank = (o) => o.hint.includes('configured') || o.hint.includes('已配置') ? 0 : o.preselect ? 1 : 2;
+    return rank(a) - rank(b);
+  });
+
   // Multi-select using raw mode
   const selected = await (async () => {
     return new Promise((resolveSelected) => {
@@ -636,7 +643,7 @@ async function runMcpInstallStep(mcpPort, authToken) {
 
       const render = (first = false) => {
         if (!first) write(`\x1b[${options.length + 2}A\x1b[J`);
-        write(`${c.bold(uiLang === 'zh' ? '选择 Agent：' : 'Select agents:')}  ${c.dim(uiLang === 'zh' ? '(↑↓ 移动  空格 切换  A 全选  Enter 确认)' : '(↑↓ move  Space toggle  A all  Enter confirm)')}\n`);
+        write(`${c.bold(uiLang === 'zh' ? '选择 Agent：' : 'Select agents:')}  ${c.dim(uiLang === 'zh' ? '(↑↓ 移动  空格 切换  D 已检测  A 全选  Enter 确认)' : '(↑↓ move  Space toggle  D detected  A all  Enter confirm)')}\n`);
         for (let i = 0; i < options.length; i++) {
           const o = options[i];
           const check   = chosen.has(i) ? c.green('✔') : c.dim('○');
@@ -665,6 +672,11 @@ async function runMcpInstallStep(mcpPort, authToken) {
           if (chosen.size === options.length) chosen.clear();
           else options.forEach((_, i) => chosen.add(i));
           render();
+        } else if (key === 'd' || key === 'D') {
+          // Select only detected/configured agents
+          chosen.clear();
+          options.forEach((o, i) => { if (o.preselect) chosen.add(i); });
+          render();
         } else if (key === '\r' || key === '\n') {
           cleanup();
           resolveSelected([...chosen].sort().map(i => options[i].value));
@@ -733,6 +745,12 @@ const AGENT_NAME_MAP = {
   'trae': 'trae',
   'openclaw': 'openclaw',
   'codebuddy': 'codebuddy',
+  'iflow-cli': 'iflow-cli',
+  'pi': 'pi',
+  'augment': 'augment',
+  'qwen-code': 'qwen-code',
+  'trae-cn': 'trae-cn',
+  'roo': 'roo',
 };
 
 /**
@@ -840,19 +858,38 @@ async function startGuiSetup() {
       process.exit(0);
     }
     // Service not running — start on existing port
-    usePort = await isPortInUse(existingPort)
-      ? await findFreePort(9100)  // existing port occupied by another process
-      : existingPort;
+    if (await isPortInUse(existingPort)) {
+      // Port occupied — try stopping leftover MindOS processes first
+      try {
+        const { stopMindos } = await import('../bin/lib/stop.js');
+        stopMindos();
+        // stopMindos() sends SIGTERM synchronously — wait for both web and mcp
+        // ports to free, since `start` will assertPortFree on both.
+        const { waitForPortFree } = await import('../bin/lib/gateway.js');
+        const mcpPort = config.mcpPort || 8787;
+        const [webFreed, mcpFreed] = await Promise.all([
+          waitForPortFree(existingPort),
+          waitForPortFree(mcpPort),
+        ]);
+        usePort = webFreed ? existingPort : await findFreePort(9100);
+      } catch {
+        usePort = await findFreePort(9100);
+      }
+    } else {
+      usePort = existingPort;
+    }
   }
 
   write(c.yellow(t('guiStarting') + '\n'));
 
   // Start the server in the background
+  // Pass MINDOS_WEB_PORT (not PORT) so loadConfig() won't override with the
+  // config file port — this is critical when we need a temporary port.
   const cliPath = resolve(__dirname, '../bin/cli.js');
   const child = spawn(process.execPath, [cliPath, 'start'], {
     detached: true,
     stdio: 'ignore',
-    env: { ...process.env, PORT: String(usePort) },
+    env: { ...process.env, MINDOS_WEB_PORT: String(usePort) },
   });
   child.unref();