fix(cloud-mirror): bound finish while draining polls

Session-Id: 01a0d409-e854-7540-a76e-a2f9cd136946

Author: khaliqgant

packages/sdk/src/cloud-mirror.ts

@@ -416,7 +416,7 @@ export function createRunMirror(options: RunMirrorOptions): RunMirror {
     try {
       const deadline = now() + budgetMs;
       await scan(deadline);
-      await publishSnapshot(deadline);
+      if (!stopped) await publishSnapshot(deadline);
     } catch (error) {
       diagnostic(`poll failed: ${error instanceof Error ? error.message : String(error)}`);
     } finally {
@@ -497,17 +497,27 @@ export function createRunMirror(options: RunMirrorOptions): RunMirror {
     },
     async finish(outcome) {
       if (timer !== undefined) { clearInterval(timer); timer = undefined; }
+      const deadline = now() + MIRROR_FINISH_BUDGET_MS;
+      const signal = AbortSignal.timeout(MIRROR_FINISH_BUDGET_MS);
       // Stop new polls and drain one already in flight before the terminal
       // scan; otherwise a stale poll can publish after the terminal callback.
       stopped = true;
-      if (activePoll !== undefined) await activePoll;
-      const deadline = now() + MIRROR_FINISH_BUDGET_MS;
-      const signal = AbortSignal.timeout(MIRROR_FINISH_BUDGET_MS);
+      let pollDrained = activePoll === undefined;
+      if (activePoll !== undefined) {
+        const waitForPoll = activePoll.then(() => { pollDrained = true; });
+        const remaining = Math.max(0, deadline - now());
+        await Promise.race([
+          waitForPoll,
+          new Promise<void>(resolve => { setTimeout(resolve, remaining); }),
+        ]);
+      }
       try {
         // One last reading, so the page shows the run's actual last moments
         // rather than whatever the previous poll happened to catch.
-        await scan(deadline);
-        await publishSnapshot(deadline);
+        if (pollDrained) {
+          await scan(deadline);
+          await publishSnapshot(deadline);
+        }
         if (outcome.log !== undefined && outcome.log.length > 0) {
           // The CLI's own output, redacted on the way out. It is not a
           // transcript the worker already scrubbed: it is whatever this