fix(watcher): stabilize daemon readiness and tests

test/helpers.ts

@@ -25,10 +25,11 @@ export const tsx = path.resolve(
   "cli.mjs",
 );
 
-// Unique Test Socket — each test run gets its own Unix socket so we don't
-// touch any real session daemon.
+// Unique Test Socket — each suite gets its own Unix socket so parallel
+// integration tests don't race through the same daemon.
 export function testSocket(): string {
-  return path.join(os.tmpdir(), `pi-lsp-test-${process.pid}.sock`);
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-lsp-test-"));
+  return path.join(dir, "daemon.sock");
 }
 
 // Set Test Socket — sets PI_LSP_SOCKET_PATH for the current process and
@@ -39,7 +40,7 @@ export function setTestSocket(env: Record<string, string | undefined>): () => vo
   return () => {
     delete env.PI_LSP_SOCKET_PATH;
     try {
-      fs.unlinkSync(sock);
+      fs.rmSync(path.dirname(sock), { recursive: true, force: true });
     } catch {
       // Socket may not exist — that's fine.
     }

test/integration/cli-daemon.test.ts

@@ -13,15 +13,15 @@ describe("cli daemon lifecycle", () => {
   const env = { ...process.env };
   let cleanup: () => void;
 
-  before(() => {
+  before(async () => {
     cleanup = setTestSocket(env);
     // Stop any stale daemon on this socket before tests run.
-    stopTestDaemon(env);
+    await stopTestDaemon(env);
   });
 
-  after(() => {
+  after(async () => {
     // Tear down daemon and clean up socket after all tests.
-    stopTestDaemon(env);
+    await stopTestDaemon(env);
     cleanup();
   });