refactor: align agent lifecycle

src/gateway/server.agent.test.ts

@@ -463,8 +463,8 @@ describe("gateway server agent", () => {
     });
     emitAgentEvent({
       runId: "run-auto-1",
-      stream: "job",
-      data: { state: "done" },
+      stream: "lifecycle",
+      data: { phase: "end" },
     });
 
     const evt = await finalChatP;
@@ -518,21 +518,20 @@ describe("gateway server agent", () => {
     await server.close();
   });
 
-  test("agent.wait resolves after job completes", async () => {
+  test("agent.wait resolves after lifecycle end", async () => {
     const { server, ws } = await startServerWithClient();
     await connectOk(ws);
 
     const waitP = rpcReq(ws, "agent.wait", {
       runId: "run-wait-1",
-      afterMs: 100,
       timeoutMs: 1000,
     });
 
     setTimeout(() => {
       emitAgentEvent({
         runId: "run-wait-1",
-        stream: "job",
-        data: { state: "done", startedAt: 200, endedAt: 210 },
+        stream: "lifecycle",
+        data: { phase: "end", startedAt: 200, endedAt: 210 },
       });
     }, 10);
 
@@ -545,14 +544,14 @@ describe("gateway server agent", () => {
     await server.close();
   });
 
-  test("agent.wait resolves when job completed before wait call", async () => {
+  test("agent.wait resolves when lifecycle ended before wait call", async () => {
     const { server, ws } = await startServerWithClient();
     await connectOk(ws);
 
     emitAgentEvent({
       runId: "run-wait-early",
-      stream: "job",
-      data: { state: "done", startedAt: 50, endedAt: 55 },
+      stream: "lifecycle",
+      data: { phase: "end", startedAt: 50, endedAt: 55 },
     });
 
     const res = await rpcReq(ws, "agent.wait", {
@@ -567,41 +566,7 @@ describe("gateway server agent", () => {
     await server.close();
   });
 
-  test("agent.wait ignores jobs before afterMs", async () => {
-    const { server, ws } = await startServerWithClient();
-    await connectOk(ws);
-
-    const waitP = rpcReq(ws, "agent.wait", {
-      runId: "run-wait-2",
-      afterMs: 500,
-      timeoutMs: 1000,
-    });
-
-    setTimeout(() => {
-      emitAgentEvent({
-        runId: "run-wait-2",
-        stream: "job",
-        data: { state: "done", startedAt: 200, endedAt: 220 },
-      });
-    }, 10);
-    setTimeout(() => {
-      emitAgentEvent({
-        runId: "run-wait-2",
-        stream: "job",
-        data: { state: "done", startedAt: 700, endedAt: 710 },
-      });
-    }, 20);
-
-    const res = await waitP;
-    expect(res.ok).toBe(true);
-    expect(res.payload.status).toBe("ok");
-    expect(res.payload.startedAt).toBe(700);
-
-    ws.close();
-    await server.close();
-  });
-
-  test("agent.wait times out when no job completes", async () => {
+  test("agent.wait times out when no lifecycle ends", async () => {
     const { server, ws } = await startServerWithClient();
     await connectOk(ws);
 
@@ -615,4 +580,63 @@ describe("gateway server agent", () => {
     ws.close();
     await server.close();
   });
+
+  test("agent.wait returns error on lifecycle error", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
+    const waitP = rpcReq(ws, "agent.wait", {
+      runId: "run-wait-err",
+      timeoutMs: 1000,
+    });
+
+    setTimeout(() => {
+      emitAgentEvent({
+        runId: "run-wait-err",
+        stream: "lifecycle",
+        data: { phase: "error", error: "boom" },
+      });
+    }, 10);
+
+    const res = await waitP;
+    expect(res.ok).toBe(true);
+    expect(res.payload.status).toBe("error");
+    expect(res.payload.error).toBe("boom");
+
+    ws.close();
+    await server.close();
+  });
+
+  test("agent.wait uses lifecycle start timestamp when end omits it", async () => {
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
+    const waitP = rpcReq(ws, "agent.wait", {
+      runId: "run-wait-start",
+      timeoutMs: 1000,
+    });
+
+    emitAgentEvent({
+      runId: "run-wait-start",
+      stream: "lifecycle",
+      data: { phase: "start", startedAt: 123 },
+    });
+
+    setTimeout(() => {
+      emitAgentEvent({
+        runId: "run-wait-start",
+        stream: "lifecycle",
+        data: { phase: "end", endedAt: 456 },
+      });
+    }, 10);
+
+    const res = await waitP;
+    expect(res.ok).toBe(true);
+    expect(res.payload.status).toBe("ok");
+    expect(res.payload.startedAt).toBe(123);
+    expect(res.payload.endedAt).toBe(456);
+
+    ws.close();
+    await server.close();
+  });
 });