From 575502ec0539791097c0064dfa248420c1c98e28 Mon Sep 17 00:00:00 2001
From: mehmet turac <mehmetturac@gmail.com>
Date: Tue, 2 Jun 2026 12:13:41 +0300
Subject: [PATCH] fix: quiet successful daemon attach logs

---
 __tests__/mcp-daemon.test.ts | 13 ++++---------
 src/mcp/proxy.ts             | 16 ++++++++++------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/__tests__/mcp-daemon.test.ts b/__tests__/mcp-daemon.test.ts
index 1711d673..af4f9155 100644
--- a/__tests__/mcp-daemon.test.ts
+++ b/__tests__/mcp-daemon.test.ts
@@ -198,9 +198,6 @@ describe('Shared MCP daemon (issue #411)', () => {
     const firstResp = await waitFor(() => findResponse(first.stdout, 1), 10000);
     expect(firstResp.result.serverInfo.name).toBe('codegraph');
 
-    // The launcher is a PROXY (not the daemon itself) — that's the detach fix.
-    await waitFor(() => first.stderr.some((l) => l.includes('Attached to shared daemon')), 8000);
-
     // A detached daemon came up and recorded itself.
     await waitFor(() => fs.existsSync(path.join(realRoot, '.codegraph', 'daemon.pid')), 8000);
     await waitFor(() => countListeningLines(realRoot) >= 1, 8000);
@@ -221,11 +218,12 @@ describe('Shared MCP daemon (issue #411)', () => {
     sendInitialize(second.child, `file://${tempDir}`, 2);
     const secondResp = await waitFor(() => findResponse(second.stdout, 2), 10000);
     expect(secondResp.result.serverInfo.name).toBe('codegraph');
-    await waitFor(() => second.stderr.some((l) => l.includes('Attached to shared daemon')), 8000);
 
     // Exactly one daemon ever bound, and it's the same pid both attached to.
     expect(countListeningLines(realRoot)).toBe(1);
     expect(readLockPid(realRoot)).toBe(daemonPid);
+    expect(first.stderr.some((l) => l.includes('Attached to shared daemon'))).toBe(false);
+    expect(second.stderr.some((l) => l === 'undefined' || l.includes(' undefined'))).toBe(false);
   }, 40000);
 
   it('concurrent launchers converge on a single daemon (lockfile race — must-fix 1)', async () => {
@@ -241,10 +239,7 @@ describe('Shared MCP daemon (issue #411)', () => {
       const resp = await waitFor(() => findResponse(procs[i].stdout, i + 1), 12000);
       expect(resp.result.serverInfo.name).toBe('codegraph');
     }
-    // ...and all three attached as proxies (none fell back / wedged).
-    for (const p of procs) {
-      await waitFor(() => p.stderr.some((l) => l.includes('Attached to shared daemon')), 10000);
-    }
+    await waitFor(() => countListeningLines(realRoot) >= 1, 10000);
 
     // The decisive assertion: exactly ONE daemon bound the socket. Losing
     // candidates log "already holds the lock; exiting" and never listen.
@@ -271,7 +266,7 @@ describe('Shared MCP daemon (issue #411)', () => {
     servers.push(second);
     sendInitialize(second.child, `file://${tempDir}`, 1);
     await waitFor(() => findResponse(second.stdout, 1), 10000);
-    await waitFor(() => second.stderr.some((l) => l.includes('Attached to shared daemon')), 8000);
+    await waitFor(() => readLockPid(realRoot) === daemonPid, 8000);
 
     // Kill the launcher that spawned the daemon. With the old in-process design
     // this would take the daemon (and thus the second client) down.
diff --git a/src/mcp/proxy.ts b/src/mcp/proxy.ts
index 36f72e2d..88fa3eb4 100644
--- a/src/mcp/proxy.ts
+++ b/src/mcp/proxy.ts
@@ -30,6 +30,7 @@ import type { MCPEngine } from './engine';
 
 /** Default poll cadence for the PPID watchdog (same as the direct server). */
 const DEFAULT_PPID_POLL_MS = 5000;
+const LOG_ATTACH_ENV = 'CODEGRAPH_MCP_LOG_ATTACH';
 
 export interface ProxyResult {
   /**
@@ -42,6 +43,13 @@ export interface ProxyResult {
   reason?: string;
 }
 
+function logAttachedDaemon(socketPath: string, hello: DaemonHello): void {
+  if (process.env[LOG_ATTACH_ENV] !== '1') return;
+  process.stderr.write(
+    `[CodeGraph MCP] Attached to shared daemon on ${socketPath} (pid ${hello.pid}, v${hello.codegraph}).\n`
+  );
+}
+
 /**
  * Attempt to connect to the daemon at `socketPath` and pipe stdio through it.
  *
@@ -88,9 +96,7 @@ export async function runProxy(
     return { outcome: 'fallback-needed', reason: 'version mismatch' };
   }
 
-  process.stderr.write(
-    `[CodeGraph MCP] Attached to shared daemon on ${socketPath} (pid ${hello.pid}, v${hello.codegraph}).\n`
-  );
+  logAttachedDaemon(socketPath, hello);
 
   startPpidWatchdog(socket);
   await pipeUntilClose(socket);
@@ -128,9 +134,7 @@ export async function connectWithHello(
     socket.destroy();
     return 'version-mismatch';
   }
-  process.stderr.write(
-    `[CodeGraph MCP] Attached to shared daemon on ${socketPath} (pid ${hello.pid}, v${hello.codegraph}).\n`
-  );
+  logAttachedDaemon(socketPath, hello);
   return socket;
 }