Fix project registry: key by cwd, defer registration until session succeeds

- registerProject now finds existing entries by cwd (not name), so two
  repos with the same name get separate entries
- removeProject takes cwd instead of name for unambiguous deletion
- Server DELETE /daemon/projects now accepts JSON body with cwd
- Session factory defers registerProject until after session creation
  succeeds, avoiding phantom entries from failed requests
- Hub-client: add missing scheduleReconnect after protocol error frames

Author: backnotprop

apps/debug-frontend/src/daemon/events/hub-client.ts

@@ -221,6 +221,7 @@ export class DaemonHubClient {
       this.socket = undefined;
       this.daemonSubscribed = false;
       socket?.close();
+      this.scheduleReconnect();
       return;
     }
     if (

apps/frontend/src/daemon/api/client.ts

@@ -64,7 +64,7 @@ export interface DaemonApiClient {
     cwd: string,
     name?: string,
   ): Promise<DaemonApiResult<{ ok: true; project: ProjectEntry }>>;
-  removeProject(name: string): Promise<DaemonApiResult<{ ok: true }>>;
+  removeProject(cwd: string): Promise<DaemonApiResult<{ ok: true }>>;
   createReviewSession(cwd: string): Promise<DaemonApiResult<SessionResponse>>;
   createArchiveSession(cwd: string): Promise<DaemonApiResult<SessionResponse>>;
 }
@@ -442,12 +442,12 @@ export function createDaemonApiClient(options: DaemonApiClientOptions = {}): Dae
       );
     },
 
-    removeProject(name) {
+    removeProject(cwd) {
       return requestJson(
         fetchImpl,
-        joinUrl(options.baseUrl, `/daemon/projects/${encodeURIComponent(name)}`),
+        joinUrl(options.baseUrl, "/daemon/projects"),
         isDeleteSessionResponse,
-        { method: "DELETE" },
+        { method: "DELETE", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ cwd }) },
       );
     },
 

apps/frontend/src/stores/project-store.ts

@@ -18,7 +18,7 @@ export interface ProjectStoreActions {
     name?: string,
     client?: DaemonApiClient,
   ): Promise<ProjectEntry | undefined>;
-  removeProject(name: string, client?: DaemonApiClient): Promise<boolean>;
+  removeProject(cwd: string, client?: DaemonApiClient): Promise<boolean>;
 }
 
 export type ProjectStore = ProjectStoreState & ProjectStoreActions;
@@ -60,7 +60,7 @@ export function createProjectStore(initial: Partial<ProjectStoreState> = {}) {
         }
         const entry = result.data.project;
         set((state) => {
-          const idx = state.projects.findIndex((p) => p.name === entry.name);
+          const idx = state.projects.findIndex((p) => p.cwd === entry.cwd);
           if (idx >= 0) {
             state.projects[idx] = entry;
           } else {
@@ -70,16 +70,16 @@ export function createProjectStore(initial: Partial<ProjectStoreState> = {}) {
         return entry;
       },
 
-      async removeProject(name, client = daemonApiClient) {
-        const result = await client.removeProject(name);
+      async removeProject(cwd, client = daemonApiClient) {
+        const result = await client.removeProject(cwd);
         if (!result.ok) {
           set((state) => {
             state.error = result.error.message;
           });
           return false;
         }
         set((state) => {
-          state.projects = state.projects.filter((p) => p.name !== name);
+          state.projects = state.projects.filter((p) => p.cwd !== cwd);
         });
         return true;
       },

packages/server/daemon/project-registry.test.ts

@@ -33,24 +33,32 @@ describe("project-registry", () => {
     expect(entries[0].cwd).toBe("/tmp/test");
   });
 
-  it("upserts on same name", () => {
+  it("upserts on same cwd, updating name", () => {
+    registerProject("proj-old", "/path/a", { baseDir });
+    registerProject("proj-new", "/path/a", { baseDir });
+    const entries = readProjectRegistry({ baseDir });
+    expect(entries).toHaveLength(1);
+    expect(entries[0].name).toBe("proj-new");
+    expect(entries[0].cwd).toBe("/path/a");
+  });
+
+  it("creates separate entries for same name, different cwd", () => {
     registerProject("proj", "/path/a", { baseDir });
     registerProject("proj", "/path/b", { baseDir });
     const entries = readProjectRegistry({ baseDir });
-    expect(entries).toHaveLength(1);
-    expect(entries[0].cwd).toBe("/path/b");
+    expect(entries).toHaveLength(2);
   });
 
-  it("removes a project", () => {
+  it("removes a project by cwd", () => {
     registerProject("a", "/a", { baseDir });
     registerProject("b", "/b", { baseDir });
-    expect(removeProject("a", { baseDir })).toBe(true);
+    expect(removeProject("/a", { baseDir })).toBe(true);
     expect(readProjectRegistry({ baseDir })).toHaveLength(1);
     expect(readProjectRegistry({ baseDir })[0].name).toBe("b");
   });
 
-  it("returns false when removing nonexistent project", () => {
-    expect(removeProject("nope", { baseDir })).toBe(false);
+  it("returns false when removing nonexistent cwd", () => {
+    expect(removeProject("/nope", { baseDir })).toBe(false);
   });
 
   it("lists sorted by lastSeen descending", async () => {

packages/server/daemon/project-registry.ts

@@ -51,9 +51,9 @@ export function registerProject(
 ): DaemonProjectEntry {
   const entries = readProjectRegistry(options);
   const now = new Date().toISOString();
-  const existing = entries.find((e) => e.name === name);
+  const existing = entries.find((e) => e.cwd === cwd);
   if (existing) {
-    existing.cwd = cwd;
+    existing.name = name;
     existing.lastSeen = now;
     writeProjectRegistry(entries, options);
     return existing;
@@ -65,11 +65,11 @@ export function registerProject(
 }
 
 export function removeProject(
-  name: string,
+  cwd: string,
   options: ProjectRegistryOptions = {},
 ): boolean {
   const entries = readProjectRegistry(options);
-  const filtered = entries.filter((e) => e.name !== name);
+  const filtered = entries.filter((e) => e.cwd !== cwd);
   if (filtered.length === entries.length) return false;
   writeProjectRegistry(filtered, options);
   return true;

packages/server/daemon/server.ts

@@ -483,12 +483,22 @@ export function createDaemonFetchHandler(options: DaemonServerOptions): DaemonFe
         }
       }
 
-      const projectRoute = url.pathname.match(/^\/daemon\/projects\/([^/]+)$/);
-      if (projectRoute && req.method === "DELETE") {
-        const name = decodeURIComponent(projectRoute[1]);
-        const removed = removeProject(name);
+      if (url.pathname === "/daemon/projects" && req.method === "DELETE") {
+        if (!isJsonRequest(req)) {
+          return json(createDaemonErrorResponse("invalid-request", "Project requests must use application/json."), { status: 415 });
+        }
+        let body: { cwd?: unknown };
+        try {
+          body = await req.json() as { cwd?: unknown };
+        } catch {
+          return json(createDaemonErrorResponse("invalid-request", "Invalid project request JSON."), { status: 400 });
+        }
+        if (typeof body.cwd !== "string" || body.cwd.length === 0) {
+          return json(createDaemonErrorResponse("invalid-request", "Project removal requires a cwd path."), { status: 400 });
+        }
+        const removed = removeProject(body.cwd);
         if (!removed) {
-          return json(createDaemonErrorResponse("invalid-request", `Project not found: ${name}`), { status: 404 });
+          return json(createDaemonErrorResponse("invalid-request", `Project not found: ${body.cwd}`), { status: 404 });
         }
         return json({ ok: true });
       }

packages/server/daemon/session-factory.ts

@@ -489,12 +489,13 @@ export function createDaemonSessionFactory(options: DaemonSessionFactoryOptions)
     const request = createRequest.request;
     const cwd = getRequestCwd(request);
     const project = (await detectProjectName(cwd)) ?? "_unknown";
-    try {
-      const tmp = tmpdir();
-      if (!cwd.startsWith(tmp)) registerProject(project, cwd);
-    } catch {}
     const id = createDaemonSessionId();
     const url = makeSessionUrl(context.endpoint.baseUrl, id);
+    const autoRegister = () => {
+      try {
+        if (!cwd.startsWith(tmpdir())) registerProject(project, cwd);
+      } catch {}
+    };
     const ttlMs = request.timeoutMs === null
       ? undefined
       : request.timeoutMs !== undefined
@@ -537,6 +538,7 @@ export function createDaemonSessionFactory(options: DaemonSessionFactoryOptions)
         dispose: registerSessionDecision(context, id, () => session.waitForDecision(), () => session.dispose()),
         remoteShare,
       });
+      autoRegister();
       return record;
     }
 
@@ -570,6 +572,7 @@ export function createDaemonSessionFactory(options: DaemonSessionFactoryOptions)
           () => ({ opened: true }),
         ),
       });
+      autoRegister();
       return record;
     }
 
@@ -607,6 +610,7 @@ export function createDaemonSessionFactory(options: DaemonSessionFactoryOptions)
         })),
         remoteShare,
       });
+      autoRegister();
       return record;
     }
 
@@ -659,6 +663,7 @@ export function createDaemonSessionFactory(options: DaemonSessionFactoryOptions)
         dispose: registerSessionDecision(context, id, () => session.waitForDecision(), () => session.dispose()),
         remoteShare,
       });
+      autoRegister();
       return record;
     }
 
@@ -683,6 +688,7 @@ export function createDaemonSessionFactory(options: DaemonSessionFactoryOptions)
         handleRequest: session.handleRequest,
         dispose: registerSessionDecision(context, id, () => session.waitForDecision(), () => session.dispose()),
       });
+      autoRegister();
       return record;
     }