feat: improve session manager disposal and cleanup logic

qorzj · qorzj · commit 4a6f569f787b · 2026-05-13T11:52:53.000+08:00
diff --git a/src/cli.tsx b/src/cli.tsx
@@ -64,19 +64,22 @@ async function main(): Promise<void> {
   const restartRef: { current: (() => void) | null } = { current: null };
 
   function startApp(): void {
+    let restarting = false;
     const inkInstance = render(
       <App projectRoot={projectRoot} version={packageInfo.version} onRestart={() => restartRef.current?.()} />,
       { exitOnCtrlC: false }
     );
 
     restartRef.current = () => {
+      restarting = true;
       process.stdout.write("\u001B[2J\u001B[3J\u001B[H");
       inkInstance.unmount();
       startApp();
     };
 
     inkInstance.waitUntilExit().then(() => {
-      if (!restartRef.current) {
+      if (!restarting) {
+        restartRef.current = null;
         process.exit(0);
       }
     });
diff --git a/src/session.ts b/src/session.ts
@@ -205,6 +205,10 @@ export class SessionManager {
     return this.mcpManager.getStatus();
   }
 
+  dispose(): void {
+    this.mcpManager.disconnect();
+  }
+
   private estimateStreamTokens(text: string): number {
     let tokens = 0;
     for (const char of text) {
diff --git a/src/tests/session.test.ts b/src/tests/session.test.ts
@@ -322,6 +322,46 @@ test("SessionManager lists project skills from .agents with legacy .deepcode com
   assert.equal(sharedSkill?.description, "Project .agents skill");
 });
 
+test("SessionManager dispose disconnects MCP servers", async () => {
+  const workspace = createTempDir("deepcode-mcp-dispose-workspace-");
+  const serverPath = path.join(workspace, "mcp-server.cjs");
+  fs.writeFileSync(
+    serverPath,
+    `
+const readline = require("readline");
+const rl = readline.createInterface({ input: process.stdin, crlfDelay: Infinity });
+function send(message) {
+  process.stdout.write(JSON.stringify(message) + "\\n");
+}
+rl.on("line", (line) => {
+  const request = JSON.parse(line);
+  if (!("id" in request)) {
+    return;
+  }
+  if (request.method === "initialize") {
+    send({ jsonrpc: "2.0", id: request.id, result: { protocolVersion: "2024-11-05", capabilities: { tools: {} } } });
+    return;
+  }
+  if (request.method === "tools/list") {
+    send({ jsonrpc: "2.0", id: request.id, result: { tools: [{ name: "echo", inputSchema: { type: "object", properties: {} } }] } });
+    return;
+  }
+  send({ jsonrpc: "2.0", id: request.id, result: { content: [] } });
+});
+`,
+    "utf8"
+  );
+
+  const manager = createSessionManager(workspace, "machine-id-mcp-dispose");
+  await manager.initMcpServers({ smoke: { command: process.execPath, args: [serverPath] } });
+
+  assert.deepEqual(manager.getMcpStatus(), [{ name: "smoke", connected: true, toolCount: 1, tools: ["echo"] }]);
+
+  manager.dispose();
+
+  assert.deepEqual(manager.getMcpStatus(), []);
+});
+
 test("createSession stores /init and sends the active .deepcode project AGENTS path to the LLM", async () => {
   const workspace = createTempDir("deepcode-init-deepcode-workspace-");
   const home = createTempDir("deepcode-init-deepcode-home-");
diff --git a/src/tools/mcp-client.ts b/src/tools/mcp-client.ts
@@ -88,7 +88,7 @@ export class McpClient {
       });
 
       if (this.process.stderr) {
-        this.process.stderr.on("data", (data: Buffer) => {
+        this.process.stderr.on("data", (_data: Buffer) => {
           // MCP servers log to stderr; we ignore for now
         });
       }
diff --git a/src/tools/mcp-manager.ts b/src/tools/mcp-manager.ts
@@ -140,6 +140,7 @@ export class McpManager {
     }
     this.clients = [];
     this.tools = [];
+    this.serverStatuses = [];
     this.initialized = false;
   }
 }
diff --git a/src/ui/App.tsx b/src/ui/App.tsx
@@ -131,6 +131,12 @@ export function App({ projectRoot, version = "", onRestart }: AppProps): React.R
     void sessionManager.initMcpServers(settings.mcpServers);
   }, [sessionManager]);
 
+  useEffect(() => {
+    return () => {
+      sessionManager.dispose();
+    };
+  }, [sessionManager]);
+
   const writeRef = useRef(write);
   writeRef.current = write;
   const handlePrompt = useCallback(
@@ -150,6 +156,7 @@ export function App({ projectRoot, version = "", onRestart }: AppProps): React.R
           process.stdout.write("\n\n");
           process.stdout.write(summary);
           process.stdout.write("\n\n");
+          sessionManager.dispose();
           exit();
         }, 0);
         return;

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export class McpClient {`
`88`	`88`	`});`
`89`	`89`
`90`	`90`	`if (this.process.stderr) {`
`91`		`- this.process.stderr.on("data", (data: Buffer) => {`
	`91`	`+ this.process.stderr.on("data", (_data: Buffer) => {`
`92`	`92`	`// MCP servers log to stderr; we ignore for now`
`93`	`93`	`});`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ export class McpManager {`
`140`	`140`	`}`
`141`	`141`	`this.clients = [];`
`142`	`142`	`this.tools = [];`
	`143`	`+ this.serverStatuses = [];`
`143`	`144`	`this.initialized = false;`
`144`	`145`	`}`
`145`	`146`	`}`