@zooid/context-mcp 0.11.2 → 0.13.0

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   buildContextMcpServer,
   callDaemon,
   startDaemonSocketServer
-} from "./chunk-ZY2GPHFX.js";
+} from "./chunk-L5USYHTS.js";
 
 // src/spawn-registry.ts
 import { randomUUID } from "crypto";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zooid/context-mcp",
-  "version": "0.11.2",
+  "version": "0.13.0",
   "description": "Daemon-side stdio MCP server + per-spawn registry that exposes zooid_get_history / zooid_get_members / zooid_get_channel_info to ACP shims, backed by each transport's TransportContextProvider.",
   "type": "module",
   "license": "MIT",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.4",
     "zod": "^3.23.0",
-    "@zooid/core": "^0.11.2"
+    "@zooid/core": "^0.13.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/daemon-socket.test.ts

@@ -2,6 +2,7 @@ import { describe, it, expect, afterEach } from 'vitest'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { randomUUID } from 'node:crypto'
+import { createConnection } from 'node:net'
 import { SpawnRegistry } from './spawn-registry.js'
 import { startDaemonSocketServer, callDaemon } from './daemon-socket.js'
 import type { TransportContextProvider } from '@zooid/core'
@@ -219,3 +220,29 @@ describe('daemon-socket', () => {
     }
   })
 })
+
+describe('close()', () => {
+  it('does not hang on a connected client that never disconnects', async () => {
+    // The context-mcp servers spawned beside each agent outlive
+    // AcpClient.stop() (it SIGTERMs the agent and doesn't wait; these are its
+    // grandchildren). net.Server.close() waits for every open connection and,
+    // unlike http.Server, never drops idle ones — so before this was fixed,
+    // `zooid dev` hung on shutdown for as long as those processes lived.
+    const sockPath = join(tmpdir(), `zooid-close-${randomUUID()}.sock`)
+    const registry = new SpawnRegistry()
+    const handle = await startDaemonSocketServer({ sockPath, registry })
+
+    const client = createConnection(sockPath)
+    await new Promise<void>((resolve, reject) => {
+      client.once('connect', () => resolve())
+      client.once('error', reject)
+    })
+
+    const closed = await Promise.race([
+      handle.close().then(() => 'closed' as const),
+      new Promise<'hung'>((resolve) => setTimeout(() => resolve('hung'), 2000)),
+    ])
+    client.destroy()
+    expect(closed).toBe('closed')
+  })
+})

package/src/daemon-socket.ts

@@ -32,7 +32,17 @@ export async function startDaemonSocketServer(opts: {
   registry: SpawnRegistry
 }): Promise<DaemonSocketHandle> {
   await unlink(opts.sockPath).catch(() => {})
+  // net.Server.close() waits for every open connection and — unlike
+  // http.Server since Node 19 — never destroys idle ones, and there is no
+  // closeAllConnections() for it. The clients here are context-mcp servers
+  // spawned beside each agent, which outlive AcpClient.stop() (it SIGTERMs
+  // the agent without waiting, and these are its grandchildren). So without
+  // tracking them, close() hangs until they happen to die — which is what
+  // made `zooid dev` take ages to stop.
+  const open = new Set<Socket>()
   const server: Server = createServer((socket: Socket) => {
+    open.add(socket)
+    socket.on('close', () => open.delete(socket))
     let buf = ''
     socket.setEncoding('utf8')
     socket.on('data', async (chunk) => {
@@ -58,6 +68,11 @@ export async function startDaemonSocketServer(opts: {
     close: () =>
       new Promise<void>((resolve) => {
         server.close(() => resolve())
+        // Shutdown is already tearing the agents down, so there is no
+        // in-flight request worth waiting for. Drop the connections that
+        // would otherwise keep close() pending forever.
+        for (const socket of open) socket.destroy()
+        open.clear()
       }),
   }
 }