refactor: return agent on create and resume instead of waiting

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

@@ -200,9 +200,6 @@ type SubscribeTerminalPayload = SubscribeTerminalResponse["payload"];
 type TerminalOutputPayload = TerminalOutput["payload"];
 type KillTerminalPayload = KillTerminalResponse["payload"];
 
-type AgentCreateFailedStatusPayload = z.infer<
-  typeof AgentCreateFailedStatusPayloadSchema
->;
 type AgentRefreshedStatusPayload = z.infer<
   typeof AgentRefreshedStatusPayloadSchema
 >;
@@ -889,43 +886,7 @@ export class DaemonClientV2 {
       throw new Error(status.error);
     }
 
-    return this.waitForAgentUpsert(
-      status.agentId,
-      (snapshot) => snapshot.status === "idle",
-      60000
-    );
-  }
-
-  async createAgentExpectFail(
-    options: CreateAgentRequestOptions
-  ): Promise<AgentCreateFailedStatusPayload> {
-    const requestId = this.createRequestId(options.requestId);
-    const config = resolveAgentConfig(options);
-
-    const message = SessionInboundMessageSchema.parse({
-      type: "create_agent_request",
-      requestId,
-      config,
-      ...(options.initialPrompt ? { initialPrompt: options.initialPrompt } : {}),
-    });
-
-    const response = this.waitFor(
-      (msg) => {
-        if (msg.type !== "status") {
-          return null;
-        }
-        const failed = AgentCreateFailedStatusPayloadSchema.safeParse(msg.payload);
-        if (failed.success && failed.data.requestId === requestId) {
-          return failed.data;
-        }
-        return null;
-      },
-      10000,
-      { skipQueue: true }
-    );
-
-    await this.sendSessionMessageOrThrow(message);
-    return response;
+    return status.agent;
   }
 
   async deleteAgent(agentId: string): Promise<void> {
@@ -1007,11 +968,7 @@ export class DaemonClientV2 {
     await this.sendSessionMessageOrThrow(message);
     const status = await statusPromise;
 
-    return this.waitForAgentUpsert(
-      status.agentId,
-      (snapshot) => snapshot.status === "idle",
-      60000
-    );
+    return status.agent;
   }
 
   async refreshAgent(

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

@@ -185,13 +185,14 @@ describe("daemon client v2 E2E", () => {
         return unsubscribe;
       });
 
-      const failResult = await ctx.client.createAgentExpectFail({
-        ...getFullAccessConfig("codex"),
-        cwd: "/this/path/does/not/exist/12345",
-        title: "Should Fail",
-        requestId: failRequestId,
-      });
-      expect(failResult.error).toContain("Working directory does not exist");
+      await expect(
+        ctx.client.createAgent({
+          ...getFullAccessConfig("codex"),
+          cwd: "/this/path/does/not/exist/12345",
+          title: "Should Fail",
+          requestId: failRequestId,
+        })
+      ).rejects.toThrow("Working directory does not exist");
       await failedStatusPromise;
 
       let sawRefresh = false;

packages/server/src/server/daemon-e2e/agent-basics.e2e.test.ts

@@ -93,14 +93,13 @@ describe("daemon E2E", () => {
   test("fails to create agent with non-existent cwd", async () => {
     const nonExistentCwd = "/this/path/does/not/exist/12345";
 
-    const result = await ctx.client.createAgentExpectFail({
-      provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT,
-      cwd: nonExistentCwd,
-      title: "Should Fail Agent",
-    });
-
-    expect(result.error).toContain("Working directory does not exist");
-    expect(result.error).toContain(nonExistentCwd);
+    await expect(
+      ctx.client.createAgent({
+        provider: "codex", model: CODEX_TEST_MODEL, reasoningEffort: CODEX_TEST_REASONING_EFFORT,
+        cwd: nonExistentCwd,
+        title: "Should Fail Agent",
+      })
+    ).rejects.toThrow(nonExistentCwd);
   });
 
 

packages/server/src/server/session.ts

@@ -1435,12 +1435,17 @@ export class Session {
       }
 
       if (requestId) {
+        const agentPayload = await this.getAgentPayloadById(snapshot.id);
+        if (!agentPayload) {
+          throw new Error(`Agent ${snapshot.id} not found after creation`);
+        }
         this.emit({
           type: "status",
           payload: {
             status: "agent_created",
             agentId: snapshot.id,
             requestId,
+            agent: agentPayload,
           },
         });
       }
@@ -1510,6 +1515,10 @@ export class Session {
       await this.forwardAgentUpdate(snapshot);
       const timelineSize = this.emitAgentTimelineSnapshot(snapshot);
       if (requestId) {
+        const agentPayload = await this.getAgentPayloadById(snapshot.id);
+        if (!agentPayload) {
+          throw new Error(`Agent ${snapshot.id} not found after resume`);
+        }
         this.emit({
           type: "status",
           payload: {
@@ -1517,6 +1526,7 @@ export class Session {
             agentId: snapshot.id,
             requestId,
             timelineSize,
+            agent: agentPayload,
           },
         });
       }

packages/server/src/shared/messages.ts

@@ -979,6 +979,7 @@ const AgentStatusWithTimelineSchema = AgentStatusWithRequestSchema.extend({
 export const AgentCreatedStatusPayloadSchema = z
   .object({
     status: z.literal("agent_created"),
+    agent: AgentSnapshotPayloadSchema,
   })
   .extend(AgentStatusWithRequestSchema.shape);
 
@@ -991,6 +992,7 @@ export const AgentCreateFailedStatusPayloadSchema = z.object({
 export const AgentResumedStatusPayloadSchema = z
   .object({
     status: z.literal("agent_resumed"),
+    agent: AgentSnapshotPayloadSchema,
   })
   .extend(AgentStatusWithTimelineSchema.shape);