@geminilight/mindos 0.6.8 → 0.6.13

package/mcp/src/index.ts

@@ -92,9 +92,9 @@ async function logOp(tool: string, params: Record<string, unknown>, result: 'ok'
   }
 }
 
-// ─── MCP Server ──────────────────────────────────────────────────────────────
+// ─── Tool Registration ───────────────────────────────────────────────────────
 
-const server = new McpServer({ name: "mindos-mcp-server", version: "1.0.0" });
+function registerTools(server: McpServer) {
 
 // ── mindos_list_files ───────────────────────────────────────────────────────
 
@@ -582,23 +582,29 @@ server.registerTool("mindos_get_file_at_version", {
   } catch (e) { return error(String(e)); }
 });
 
+} // end registerTools
+
+// ─── Server Factory ──────────────────────────────────────────────────────────
+
+function createMcpServer(): McpServer {
+  const server = new McpServer({ name: "mindos-mcp-server", version: "1.0.0" });
+  registerTools(server);
+  return server;
+}
+
 // ─── Start ───────────────────────────────────────────────────────────────────
 
 async function main() {
   if (MCP_TRANSPORT === "http") {
-    // ── Streamable HTTP mode ──────────────────────────────────────────────
-    const transport = new StreamableHTTPServerTransport({
-      sessionIdGenerator: () => randomUUID(),
-    });
+    // ── Streamable HTTP mode (per-session transport) ─────────────────────
+    const sessions = new Map<string, { transport: StreamableHTTPServerTransport; server: McpServer }>();
 
     const expressApp = createMcpExpressApp({ host: MCP_HOST });
 
-    // Health endpoint — allows check-port to detect this is a MindOS MCP instance
     expressApp.get("/api/health", (_req, res) => {
       res.json({ ok: true, service: "mindos" });
     });
 
-    // Auth middleware
     if (AUTH_TOKEN) {
       expressApp.use(MCP_ENDPOINT, (req, res, next) => {
         const bearer = req.headers.authorization?.replace("Bearer ", "");
@@ -611,11 +617,40 @@ async function main() {
     }
 
     expressApp.all(MCP_ENDPOINT, async (req, res) => {
-      // Pass pre-parsed body: express.json() already parsed it, SDK >= 1.7 expects it as 3rd arg
+      const sessionId = req.headers["mcp-session-id"] as string | undefined;
+
+      if (sessionId && sessions.has(sessionId)) {
+        const session = sessions.get(sessionId)!;
+        await session.transport.handleRequest(req, res, req.body);
+        return;
+      }
+
+      if (sessionId && !sessions.has(sessionId)) {
+        res.status(404).json({ jsonrpc: "2.0", error: { code: -32000, message: "Session not found" } });
+        return;
+      }
+
+      // New session: create dedicated transport + server
+      const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: () => randomUUID(),
+      });
+      const server = createMcpServer();
+
+      transport.onclose = () => {
+        const sid = transport.sessionId;
+        if (sid) sessions.delete(sid);
+        console.error(`[MCP] Session ${sid?.slice(0, 8)} closed (${sessions.size} active)`);
+      };
+
+      await server.connect(transport);
       await transport.handleRequest(req, res, req.body);
-    });
 
-    await server.connect(transport);
+      const sid = transport.sessionId;
+      if (sid) {
+        sessions.set(sid, { transport, server });
+        console.error(`[MCP] New session ${sid.slice(0, 8)} (${sessions.size} active)`);
+      }
+    });
 
     const httpServer = createServer(expressApp as Parameters<typeof createServer>[1]);
     httpServer.listen(MCP_PORT, MCP_HOST, () => {
@@ -623,8 +658,19 @@ async function main() {
       console.error(`MindOS MCP server (HTTP) listening on http://${displayHost}:${MCP_PORT}${MCP_ENDPOINT}`);
       console.error(`API backend: ${BASE_URL}`);
     });
+
+    if (!process.stdin.isTTY) {
+      process.stdin.resume();
+      process.stdin.on('end', () => {
+        console.error('[MindOS MCP] Parent process exited (stdin closed), shutting down');
+        httpServer.close();
+        setTimeout(() => process.exit(0), 1000);
+      });
+      process.stdin.on('error', () => {});
+    }
   } else {
-    // ── stdio mode (default) ──────────────────────────────────────────────
+    // ── stdio mode ───────────────────────────────────────────────────────
+    const server = createMcpServer();
     const transport = new StdioServerTransport();
     await server.connect(transport);
     console.error(`MindOS MCP server started (stdio, API: ${BASE_URL})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geminilight/mindos",
-  "version": "0.6.8",
+  "version": "0.6.13",
   "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

@@ -906,9 +906,9 @@ async function startGuiSetup() {
     write(c.dim('  First run: installing dependencies and building app (may take a few minutes)...\n'));
   }
 
-  // Wait for the server to be ready (120s timeout)
+  // Wait for the server to be ready (10min timeout — first run involves npm install + build)
   const { waitForHttp } = await import('../bin/lib/gateway.js');
-  const ready = await waitForHttp(usePort, { retries: 180, intervalMs: 1000, label: 'MindOS', logFile: LOG_PATH });
+  const ready = await waitForHttp(usePort, { retries: 600, intervalMs: 1000, label: 'MindOS', logFile: LOG_PATH });
 
   if (!ready) {
     write(c.red('\n✘ Server failed to start.\n'));