fix(web): remove activation heartbeat

Author: pallyoung

docs/help/assets/screenshot-desktop-workspace-full.png

@@ -131,55 +131,6 @@ describe("activation commands", () => {
     });
   });
 
-  it("does not allow a stale websocket to heartbeat after same-client rebind", async () => {
-    const request = createMockRequest();
-    const broadcaster = {
-      broadcast: vi.fn(),
-      sendToClient: vi.fn(() => true),
-      sendBinaryToClient: vi.fn(() => true),
-      getRequestMetadata: vi.fn(() => request),
-    } satisfies Broadcaster;
-    const ctx = createBaseContext({ broadcaster });
-
-    await dispatch(
-      {
-        kind: "command",
-        id: "claim-1",
-        op: "activation.claim",
-        args: { clientInstanceId: "client-a" },
-      },
-      ctx,
-      "ws-a"
-    );
-
-    const rebound = await dispatch(
-      {
-        kind: "command",
-        id: "claim-2",
-        op: "activation.claim",
-        args: { clientInstanceId: "client-a" },
-      },
-      ctx,
-      "ws-b"
-    );
-
-    expect(rebound.ok).toBe(true);
-
-    const heartbeat = await dispatch(
-      {
-        kind: "command",
-        id: "heartbeat-stale",
-        op: "activation.heartbeat",
-        args: { clientInstanceId: "client-a", generation: 1 },
-      },
-      ctx,
-      "ws-a"
-    );
-
-    expect(heartbeat.ok).toBe(true);
-    expect(heartbeat.data).toEqual({ ok: false });
-  });
-
   it("does not allow a stale websocket to release after same-client rebind", async () => {
     const request = createMockRequest();
     const broadcaster = {

docs/help/assets/screenshot-workspace-overview.png

@@ -16,8 +16,6 @@ describe("ActivationManager", () => {
   beforeEach(() => {
     vi.useRealTimers();
     manager = new ActivationManager({
-      heartbeatMs: 10_000,
-      leaseExpirationMs: 30_000,
       graceMs: 3_000,
     });
   });
@@ -71,15 +69,6 @@ describe("ActivationManager", () => {
     });
   });
 
-  it("rejects heartbeat for stale generations", () => {
-    const first = manager.claim("client-a", "ws-a", request);
-    manager.claim("client-b", "ws-b", request);
-
-    const ok = manager.heartbeat("client-a", first.generation);
-
-    expect(ok).toBe(false);
-  });
-
   it("ignores release for stale generations and clears only the current lease", () => {
     const first = manager.claim("client-a", "ws-a", request);
     const current = manager.claim("client-b", "ws-b", request);
@@ -91,34 +80,18 @@ describe("ActivationManager", () => {
     expect(manager.getLease()).toBeNull();
   });
 
-  it("nulls expired state when getLease is called after expiry", () => {
-    vi.useFakeTimers();
-    vi.setSystemTime(new Date("2026-05-12T00:00:00.000Z"));
-
-    manager.claim("client-a", "ws-a", request);
-
-    vi.advanceTimersByTime(30_001);
-
-    expect(manager.getLease()).toBeNull();
-    expect(manager.getLease()).toBeNull();
-  });
-
-  it("refreshes expiry on heartbeat for the active generation", () => {
+  it("retains the active lease without idle expiration", () => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date("2026-05-12T00:00:00.000Z"));
 
-    const claim = manager.claim("client-a", "ws-a", request);
-    const beforeExpiresAt = manager.getLease()?.expiresAt;
+    const lease = manager.claim("client-a", "ws-a", request);
 
-    expect(beforeExpiresAt).toBe(Date.now() + 30_000);
+    vi.advanceTimersByTime(12 * 60 * 60 * 1000);
 
-    vi.advanceTimersByTime(5_000);
-
-    const ok = manager.heartbeat("client-a", claim.generation);
-    const after = manager.getLease();
-
-    expect(ok).toBe(true);
-    expect(after?.expiresAt).toBe(Date.now() + 30_000);
-    expect(after?.expiresAt).toBeGreaterThan(beforeExpiresAt ?? 0);
+    expect(manager.getLease()).toMatchObject({
+      clientInstanceId: "client-a",
+      wsClientId: "ws-a",
+      generation: lease.generation,
+    });
   });
 });

packages/server/src/__tests__/activation-commands.test.ts

@@ -67,8 +67,6 @@ const createMockRequest = (): FastifyRequest =>
 
 const createActivationManager = () =>
   new ActivationManager({
-    heartbeatMs: 10_000,
-    leaseExpirationMs: 30_000,
     graceMs: 3_000,
   });
 

packages/server/src/__tests__/activation-manager.test.ts

@@ -29,21 +29,6 @@ registerCommand(
   }
 );
 
-registerCommand(
-  "activation.heartbeat",
-  z.object({ clientInstanceId: z.string(), generation: z.number().int().positive() }),
-  async (args, ctx, clientId) => {
-    const lease = ctx.activationMgr.getLease();
-    if (!clientId || !lease || lease.wsClientId !== clientId) {
-      return { ok: false };
-    }
-
-    return {
-      ok: ctx.activationMgr.heartbeat(args.clientInstanceId, args.generation),
-    };
-  }
-);
-
 registerCommand(
   "activation.release",
   z.object({ clientInstanceId: z.string(), generation: z.number().int().positive() }),

packages/server/src/__tests__/ws-hub.test.ts

@@ -113,6 +113,7 @@ describe("SupervisorEvaluator windows child-process options", () => {
 
     await expect(evaluator.evaluate(makeSupervisor(), makeContext())).resolves.toEqual({
       message: "Run pnpm vitest to verify",
+      objectiveComplete: false,
     });
 
     expect(spawnMock).toHaveBeenCalledWith(

packages/server/src/commands/activation.ts

@@ -5,7 +5,6 @@ export interface ActivationLease {
   wsClientId: string;
   generation: number;
   issuedAt: number;
-  expiresAt: number;
   graceUntil: number | null;
   ip: string;
   userAgent: string;
@@ -19,14 +18,10 @@ export interface ActivationClaimResult {
 }
 
 export interface ActivationManagerOptions {
-  heartbeatMs: number;
-  leaseExpirationMs: number;
   graceMs: number;
 }
 
 const DEFAULT_OPTIONS: ActivationManagerOptions = {
-  heartbeatMs: 10_000,
-  leaseExpirationMs: 30_000,
   graceMs: 3_000,
 };
 
@@ -54,7 +49,6 @@ export class ActivationManager {
 
       activeLease.wsClientId = wsClientId;
       activeLease.graceUntil = null;
-      activeLease.expiresAt = now + this.options.leaseExpirationMs;
 
       return {
         active: true,
@@ -76,7 +70,6 @@ export class ActivationManager {
       wsClientId,
       generation: this.generation,
       issuedAt: now,
-      expiresAt: now + this.options.leaseExpirationMs,
       graceUntil: null,
       ip: request.ip,
       userAgent: request.headers["user-agent"] ?? "",
@@ -90,20 +83,6 @@ export class ActivationManager {
     };
   }
 
-  heartbeat(clientInstanceId: string, generation: number): boolean {
-    const lease = this.getLease();
-    if (!lease) {
-      return false;
-    }
-
-    if (lease.clientInstanceId !== clientInstanceId || lease.generation !== generation) {
-      return false;
-    }
-
-    lease.expiresAt = Date.now() + this.options.leaseExpirationMs;
-    return true;
-  }
-
   release(clientInstanceId: string, generation: number): void {
     const lease = this.getLease();
     if (!lease) {
@@ -131,11 +110,6 @@ export class ActivationManager {
       return null;
     }
 
-    if (Date.now() > this.lease.expiresAt) {
-      this.lease = null;
-      return null;
-    }
-
     return this.lease;
   }
 }

packages/server/src/supervisor/evaluator.windows.test.ts

@@ -60,7 +60,6 @@ const handlers = new Map<string, CommandHandler>();
 const schemas = new Map<string, CommandSchema>();
 const ACTIVATION_ALLOWLIST = new Set([
   "activation.claim",
-  "activation.heartbeat",
   "activation.release",
   "connection.probe",
 ]);

packages/server/src/ws/activation.ts

@@ -76,7 +76,7 @@ function createWsSendCommandMock(
       };
     }
 
-    if (op === "activation.heartbeat" || op === "activation.release") {
+    if (op === "activation.release") {
       return { ok: true };
     }
 
@@ -513,6 +513,34 @@ describe("AppProviders lifecycle recovery", () => {
     });
   });
 
+  it("does not send activation.heartbeat after the session becomes active", async () => {
+    const store = createStore();
+    setVisibilityState("visible");
+    vi.useFakeTimers();
+
+    renderProviders(store);
+
+    await vi.waitFor(() => {
+      expect(wsState.client?.connect).toHaveBeenCalled();
+    });
+
+    act(() => {
+      wsState.client?.statusHandler?.("connected");
+    });
+
+    await vi.waitFor(() => {
+      expect(store.get(activationStatusAtom)).toBe("active");
+    });
+
+    act(() => {
+      vi.advanceTimersByTime(60_000);
+    });
+
+    expect(
+      wsState.client?.sendCommand?.mock.calls.filter(([op]) => op === "activation.heartbeat") ?? []
+    ).toHaveLength(0);
+  });
+
   it("disconnects and gates when activation.revoked is received", async () => {
     const store = createStore();
     seedWorkspaces(store, ["ws-1"], "ws-1");