feat: add relay reconnect with grace period and branch suggestions

packages/server/src/client/daemon-client.test.ts

@@ -287,6 +287,65 @@ describe("DaemonClient", () => {
     );
   });
 
+  test("requests branch suggestions via RPC", async () => {
+    const logger = createMockLogger();
+    const mock = createMockTransport();
+
+    const client = new DaemonClient({
+      url: "ws://test",
+      logger,
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    const promise = client.getBranchSuggestions(
+      { cwd: "/tmp/project", query: "mai", limit: 5 },
+      "req-branches"
+    );
+
+    expect(mock.sent).toHaveLength(1);
+    const request = JSON.parse(mock.sent[0]) as {
+      type: "session";
+      message: {
+        type: "branch_suggestions_request";
+        cwd: string;
+        query?: string;
+        limit?: number;
+        requestId: string;
+      };
+    };
+    expect(request.message.type).toBe("branch_suggestions_request");
+    expect(request.message.cwd).toBe("/tmp/project");
+    expect(request.message.query).toBe("mai");
+    expect(request.message.limit).toBe(5);
+    expect(request.message.requestId).toBe("req-branches");
+
+    mock.triggerMessage(
+      JSON.stringify({
+        type: "session",
+        message: {
+          type: "branch_suggestions_response",
+          payload: {
+            branches: ["main"],
+            error: null,
+            requestId: "req-branches",
+          },
+        },
+      })
+    );
+
+    await expect(promise).resolves.toEqual({
+      branches: ["main"],
+      error: null,
+      requestId: "req-branches",
+    });
+  });
+
   test("resubscribes checkout diff streams after reconnect", async () => {
     const logger = createMockLogger();
     const mock = createMockTransport();

packages/server/src/client/daemon-client.ts

@@ -24,6 +24,7 @@ import type {
   CheckoutPrCreateResponse,
   CheckoutPrStatusResponse,
   ValidateBranchResponse,
+  BranchSuggestionsResponse,
   PaseoWorktreeListResponse,
   PaseoWorktreeArchiveResponse,
   ProjectIconResponse,
@@ -191,6 +192,7 @@ type CheckoutPushPayload = CheckoutPushResponse["payload"];
 type CheckoutPrCreatePayload = CheckoutPrCreateResponse["payload"];
 type CheckoutPrStatusPayload = CheckoutPrStatusResponse["payload"];
 type ValidateBranchPayload = ValidateBranchResponse["payload"];
+type BranchSuggestionsPayload = BranchSuggestionsResponse["payload"];
 type PaseoWorktreeListPayload = PaseoWorktreeListResponse["payload"];
 type PaseoWorktreeArchivePayload = PaseoWorktreeArchiveResponse["payload"];
 type FileExplorerPayload = FileExplorerResponse["payload"];
@@ -1936,6 +1938,35 @@ export class DaemonClient {
     });
   }
 
+  async getBranchSuggestions(
+    options: { cwd: string; query?: string; limit?: number },
+    requestId?: string
+  ): Promise<BranchSuggestionsPayload> {
+    const resolvedRequestId = this.createRequestId(requestId);
+    const message = SessionInboundMessageSchema.parse({
+      type: "branch_suggestions_request",
+      cwd: options.cwd,
+      query: options.query,
+      limit: options.limit,
+      requestId: resolvedRequestId,
+    });
+    return this.sendRequest({
+      requestId: resolvedRequestId,
+      message,
+      timeout: 10000,
+      options: { skipQueue: true },
+      select: (msg) => {
+        if (msg.type !== "branch_suggestions_response") {
+          return null;
+        }
+        if (msg.payload.requestId !== resolvedRequestId) {
+          return null;
+        }
+        return msg.payload;
+      },
+    });
+  }
+
   // ============================================================================
   // File Explorer
   // ============================================================================