@shipfox/api-runners 12.3.0 → 12.4.1

package/src/db/reservations.test.ts

@@ -1,4 +1,7 @@
+import {pgClient} from '@shipfox/node-postgres';
+import {vi} from '@shipfox/vitest/vi';
 import {and, eq, inArray, or, sql, sum} from 'drizzle-orm';
+import type {RunnerInstanceState} from '#core/entities/runner-instance.js';
 import {db} from '#db/db.js';
 import {
   deleteExpiredReservations,
@@ -7,10 +10,12 @@ import {
   pollInstallationDemandAndReserve,
   releaseReservationUnits,
 } from '#db/reservations.js';
+import {pendingJobExecutions} from '#db/schema/pending-job-executions.js';
 import {reservations} from '#db/schema/reservations.js';
 import {runnerActivationTokens} from '#db/schema/runner-activation-tokens.js';
 import {runnerControlSessions} from '#db/schema/runner-control-sessions.js';
 import {providerRunners} from '#db/schema/runner-instances.js';
+import {providerRunnerActivationOutcomeCount} from '#metrics/instance.js';
 import {pendingJobFactory, reservationFactory} from '#test/index.js';
 
 describe('pollDemandAndReserve', () => {
@@ -38,7 +43,24 @@ describe('pollDemandAndReserve', () => {
     expect(result.stats[0]).toMatchObject({labels: ['linux'], queued: 50, reserved: 20});
   });
 
-  it('binds the oldest matching enrolled runners to a new reservation', async () => {
+  it('does not create a bound reservation when no idle runner can be rebound', async () => {
+    await createPendingJobs(1, ['linux']);
+
+    const result = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux', ['linux'], 1)],
+    });
+
+    const storedReservations = await reservationsForTest();
+    expect(result.reservations).toHaveLength(1);
+    expect(storedReservations).toHaveLength(1);
+    expect(storedReservations[0]).toMatchObject({kind: 'launch', count: 1});
+  });
+
+  it('binds the oldest matching enrolled runners and returns only the launch remainder', async () => {
     const olderRunner = await createIdleRunner({
       labels: ['linux'],
       createdAt: new Date('2026-01-01T00:00:00.000Z'),
@@ -51,14 +73,14 @@ describe('pollDemandAndReserve', () => {
       labels: ['macos'],
       createdAt: new Date('2026-01-03T00:00:00.000Z'),
     });
-    await createPendingJobs(2, ['linux']);
+    await createPendingJobs(3, ['linux']);
 
     const result = await pollDemandAndReserve({
       workspaceId,
       provisionerId,
-      maxReservations: 2,
+      maxReservations: 3,
       ttlSeconds: 60,
-      templates: [template('linux', ['linux'], 2)],
+      templates: [template('linux', ['linux'], 3)],
     });
 
     const rows = await db()
@@ -66,9 +88,21 @@ describe('pollDemandAndReserve', () => {
       .from(providerRunners)
       .where(inArray(providerRunners.id, [olderRunner.id, newerRunner.id, unmatchedRunner.id]));
     const rowsById = new Map(rows.map((row) => [row.id, row]));
-    const reservationId = result.reservations[0]?.reservationId;
+    const [boundReservation] = await db()
+      .select()
+      .from(reservations)
+      .where(and(eq(reservations.workspaceId, workspaceId), eq(reservations.kind, 'bound')));
+    const [launchReservation] = await db()
+      .select()
+      .from(reservations)
+      .where(and(eq(reservations.workspaceId, workspaceId), eq(reservations.kind, 'launch')));
+    const reservationId = boundReservation?.id;
 
     expect(reservationId).toEqual(expect.any(String));
+    expect(result.reservations).toEqual([
+      expect.objectContaining({reservationId: launchReservation?.id, count: 1}),
+    ]);
+    expect(boundReservation).toMatchObject({kind: 'bound', count: 2});
     expect(rowsById.get(olderRunner.id)).toMatchObject({
       workspaceId,
       reservationId,
@@ -86,6 +120,421 @@ describe('pollDemandAndReserve', () => {
     });
   });
 
+  it('does not deadlock polling with expired-reservation cleanup', async () => {
+    const oldestRunnerId = `ffffffff-${crypto.randomUUID().slice(9)}`;
+    const lowestIdRunnerId = `00000000-${crypto.randomUUID().slice(9)}`;
+    const [expiredReservation] = await db()
+      .insert(reservations)
+      .values({
+        workspaceId,
+        provisionerId,
+        requiredLabels: ['linux'],
+        count: 2,
+        expiresAt: new Date('2000-01-01T00:00:00.000Z'),
+      })
+      .returning({id: reservations.id});
+    if (!expiredReservation) throw new Error('Expected expired reservation');
+
+    const oldestRunner = await createIdleRunner({
+      id: oldestRunnerId,
+      labels: ['linux'],
+      createdAt: new Date('2026-01-01T00:00:00.000Z'),
+      workspaceId,
+      reservationId: expiredReservation.id,
+    });
+    const lowestIdRunner = await createIdleRunner({
+      id: lowestIdRunnerId,
+      labels: ['linux'],
+      createdAt: new Date('2026-01-02T00:00:00.000Z'),
+      workspaceId,
+      reservationId: expiredReservation.id,
+    });
+    await createPendingJobs(2, ['linux']);
+
+    const lockClient = await pgClient().connect();
+    let transactionOpen = false;
+    let cleanupPromise: Promise<number> | undefined;
+    let pollPromise: ReturnType<typeof pollDemandAndReserve> | undefined;
+    try {
+      await lockClient.query('BEGIN');
+      transactionOpen = true;
+      const lockPidResult = await lockClient.query<{pid: number}>('SELECT pg_backend_pid() AS pid');
+      const lockPid = lockPidResult.rows[0]?.pid;
+      if (lockPid === undefined) throw new Error('Expected lock holder backend pid');
+      await lockClient.query('SELECT id FROM runners_runner_instances WHERE id = $1 FOR UPDATE', [
+        lowestIdRunner.id,
+      ]);
+
+      cleanupPromise = deleteExpiredReservations({limit: 1});
+      // Attach a handler before waiting for the second transaction so a deadlock loser cannot
+      // become an unhandled rejection while the test is coordinating the lock holders.
+      cleanupPromise.catch(() => undefined);
+      await waitForLockWait({blockingPid: lockPid});
+
+      pollPromise = pollDemandAndReserve({
+        workspaceId,
+        provisionerId,
+        maxReservations: 2,
+        ttlSeconds: 60,
+        templates: [template('linux', ['linux'], 2)],
+      });
+      pollPromise.catch(() => undefined);
+      await waitForLockWait({blockingPid: lockPid, minWaiters: 2});
+
+      await lockClient.query('COMMIT');
+      transactionOpen = false;
+
+      if (!cleanupPromise || !pollPromise) throw new Error('Expected concurrent operations');
+      const [deleted, result] = await Promise.all([cleanupPromise, pollPromise]);
+
+      expect(deleted).toBe(1);
+      expect(result.reservations).toEqual([]);
+      const rows = await db()
+        .select({id: providerRunners.id, reservationId: providerRunners.reservationId})
+        .from(providerRunners)
+        .where(inArray(providerRunners.id, [oldestRunner.id, lowestIdRunner.id]));
+      expect(rows).toHaveLength(2);
+      expect(rows.every((row) => row.reservationId !== expiredReservation.id)).toBe(true);
+    } finally {
+      if (transactionOpen) await lockClient.query('ROLLBACK');
+      if (cleanupPromise) await cleanupPromise.catch(() => undefined);
+      if (pollPromise) await pollPromise.catch(() => undefined);
+      lockClient.release();
+    }
+  }, 10_000);
+
+  it('refills with the next eligible runner when the oldest becomes ineligible', async () => {
+    const runner = await createIdleRunner({
+      labels: ['linux'],
+      createdAt: new Date('2026-01-01T00:00:00.000Z'),
+    });
+    const replacementRunner = await createIdleRunner({
+      labels: ['linux'],
+      createdAt: new Date('2026-01-02T00:00:00.000Z'),
+    });
+    await createPendingJobs(1, ['linux']);
+
+    const lockClient = await pgClient().connect();
+    const eligibilityClient = await pgClient().connect();
+    let lockTransactionOpen = false;
+    let eligibilityTransactionOpen = false;
+    let eligibilityLockPromise: Promise<unknown> | undefined;
+    let pollPromise: ReturnType<typeof pollDemandAndReserve> | undefined;
+    try {
+      await lockClient.query('BEGIN');
+      lockTransactionOpen = true;
+      const lockPidResult = await lockClient.query<{pid: number}>('SELECT pg_backend_pid() AS pid');
+      const lockPid = lockPidResult.rows[0]?.pid;
+      if (lockPid === undefined) throw new Error('Expected lock holder backend pid');
+      await lockClient.query('SELECT id FROM runners_runner_instances WHERE id = $1 FOR UPDATE', [
+        runner.id,
+      ]);
+
+      await eligibilityClient.query('BEGIN');
+      eligibilityTransactionOpen = true;
+      const eligibilityPidResult = await eligibilityClient.query<{pid: number}>(
+        'SELECT pg_backend_pid() AS pid',
+      );
+      const eligibilityPid = eligibilityPidResult.rows[0]?.pid;
+      if (eligibilityPid === undefined) throw new Error('Expected eligibility backend pid');
+      eligibilityLockPromise = eligibilityClient.query(
+        'SELECT id FROM runners_runner_instances WHERE id = $1 FOR UPDATE',
+        [runner.id],
+      );
+      // Attach a handler before starting the poll so cleanup can safely await a failed lock query.
+      eligibilityLockPromise.catch(() => undefined);
+      await waitForLockWait({blockingPid: lockPid});
+
+      pollPromise = pollDemandAndReserve({
+        workspaceId,
+        provisionerId,
+        maxReservations: 1,
+        ttlSeconds: 60,
+        templates: [template('linux', ['linux'], 1)],
+      });
+      pollPromise.catch(() => undefined);
+      await waitForLockWait({blockingPid: eligibilityPid});
+
+      await lockClient.query('COMMIT');
+      lockTransactionOpen = false;
+      await eligibilityLockPromise;
+      await eligibilityClient.query(
+        "UPDATE runners_runner_instances SET state = 'terminated', terminated_at = now(), updated_at = now() WHERE id = $1",
+        [runner.id],
+      );
+      await eligibilityClient.query(
+        "UPDATE runners_runner_control_sessions SET closed_at = now(), close_reason = 'test' WHERE runner_instance_id = $1 AND closed_at IS NULL",
+        [runner.id],
+      );
+      await eligibilityClient.query('COMMIT');
+      eligibilityTransactionOpen = false;
+
+      if (!pollPromise) throw new Error('Expected concurrent poll');
+      const result = await pollPromise;
+
+      expect(result.reservations).toEqual([]);
+      const rows = await db()
+        .select({
+          id: providerRunners.id,
+          state: providerRunners.state,
+          workspaceId: providerRunners.workspaceId,
+          reservationId: providerRunners.reservationId,
+        })
+        .from(providerRunners)
+        .where(inArray(providerRunners.id, [runner.id, replacementRunner.id]));
+      const rowsById = new Map(rows.map((row) => [row.id, row]));
+      expect(rowsById.get(runner.id)).toMatchObject({
+        state: 'terminated',
+        workspaceId: null,
+        reservationId: null,
+      });
+      expect(rowsById.get(replacementRunner.id)).toMatchObject({
+        state: 'running',
+        workspaceId,
+        reservationId: expect.any(String),
+      });
+    } finally {
+      if (lockTransactionOpen) await lockClient.query('ROLLBACK');
+      if (eligibilityTransactionOpen) await eligibilityClient.query('ROLLBACK');
+      if (eligibilityLockPromise) await eligibilityLockPromise.catch(() => undefined);
+      if (pollPromise) await pollPromise.catch(() => undefined);
+      lockClient.release();
+      eligibilityClient.release();
+    }
+  }, 10_000);
+
+  it('splits rebound and launch capacity with separate reservation lifetimes', async () => {
+    const runner = await createIdleRunner({labels: ['linux']});
+    await createPendingJobs(2, ['linux']);
+
+    const before = Date.now();
+    const result = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 2,
+      ttlSeconds: 120,
+      activationGraceSeconds: 5,
+      templates: [template('linux', ['linux'], 2)],
+    });
+
+    expect(result.reservations).toHaveLength(1);
+    expect(result.reservations[0]).toMatchObject({count: 1});
+    const rows = await db()
+      .select()
+      .from(reservations)
+      .where(
+        and(
+          eq(reservations.workspaceId, workspaceId),
+          eq(reservations.provisionerId, provisionerId),
+        ),
+      );
+    const boundReservation = rows.find((row) => row.kind === 'bound');
+    const launchReservation = rows.find((row) => row.kind === 'launch');
+    expect(boundReservation).toMatchObject({count: 1});
+    expect(launchReservation).toMatchObject({count: 1});
+    expect(boundReservation?.expiresAt.getTime()).toBeGreaterThan(before + 4_000);
+    expect(boundReservation?.expiresAt.getTime()).toBeLessThan(
+      launchReservation?.expiresAt.getTime() ?? 0,
+    );
+    expect(launchReservation?.id).toBe(result.reservations[0]?.reservationId);
+    const [storedRunner] = await db()
+      .select()
+      .from(providerRunners)
+      .where(eq(providerRunners.id, runner.id));
+    expect(storedRunner?.reservationId).toBe(boundReservation?.id);
+  });
+
+  it('records a rebound outcome for a demand-backed idle runner', async () => {
+    const outcomeSpy = vi.spyOn(providerRunnerActivationOutcomeCount, 'add');
+    await createIdleRunner({labels: ['linux'], launchKind: 'demand'});
+    await createPendingJobs(1, ['linux']);
+    const callsBefore = outcomeSpy.mock.calls.length;
+
+    await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux', ['linux'], 1)],
+    });
+
+    expect(
+      outcomeSpy.mock.calls
+        .slice(callsBefore)
+        .filter(
+          ([value, attributes]) =>
+            value === 1 && JSON.stringify(attributes) === JSON.stringify({outcome: 'rebound'}),
+        ),
+    ).toHaveLength(1);
+  });
+
+  it('does not charge adopted runners against later overlapping demand', async () => {
+    const adoptedRunner = await createIdleRunner({labels: ['linux', 'gpu']});
+    await createPendingJobs(1, ['linux', 'gpu']);
+
+    const firstPoll = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+    expect(firstPoll.reservations).toEqual([]);
+
+    await createPendingJobs(1, ['linux']);
+    const result = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+
+    const storedReservations = await reservationsForTest();
+    const boundReservation = storedReservations.find(
+      (reservation) => reservation.requiredLabels.includes('gpu') && reservation.kind === 'bound',
+    );
+    const launchReservation = storedReservations.find(
+      (reservation) => !reservation.requiredLabels.includes('gpu') && reservation.kind === 'launch',
+    );
+    const [storedRunner] = await db()
+      .select()
+      .from(providerRunners)
+      .where(eq(providerRunners.id, adoptedRunner.id));
+
+    expect(result.reservations).toEqual([
+      expect.objectContaining({
+        reservationId: launchReservation?.id,
+        labels: ['linux'],
+        count: 1,
+      }),
+    ]);
+    expect(boundReservation).toMatchObject({kind: 'bound', count: 1});
+    expect(storedRunner?.reservationId).toBe(boundReservation?.id);
+  });
+
+  it('deducts only pending launch units from a partially adopted reservation', async () => {
+    await createIdleRunner({labels: ['linux', 'gpu']});
+    await createIdleRunner({labels: ['linux', 'gpu']});
+    await createPendingJobs(3, ['linux', 'gpu']);
+
+    const firstPoll = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 3,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 3)],
+    });
+    expect(firstPoll.reservations).toEqual([expect.objectContaining({count: 1})]);
+
+    await createPendingJobs(1, ['linux']);
+    const secondPoll = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 2)],
+    });
+
+    expect(secondPoll.reservations).toEqual([
+      expect.objectContaining({labels: ['linux'], count: 1}),
+    ]);
+  });
+
+  it('deducts a launch reservation with no adopted units in full', async () => {
+    await createPendingJobs(1, ['linux', 'gpu']);
+
+    const firstPoll = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+    expect(firstPoll.reservations).toEqual([expect.objectContaining({count: 1})]);
+
+    await createPendingJobs(1, ['linux']);
+    const secondPoll = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+
+    expect(secondPoll.reservations).toEqual([]);
+  });
+
+  it('counts an intended runner while its reservation assignment is in flight', async () => {
+    const intendedReservation = await createIntendedReservation({
+      workspaceId,
+      expiresAt: new Date(Date.now() + 60_000),
+    });
+    await createIdleRunner({
+      labels: ['linux', 'gpu'],
+      intendedReservationId: intendedReservation.id,
+    });
+    await createPendingJobs(1, ['linux', 'gpu']);
+
+    const result = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+
+    expect(result.reservations).toEqual([
+      expect.objectContaining({labels: ['gpu', 'linux'], count: 1}),
+    ]);
+  });
+
+  it('deducts a released runner reservation unit as pending', async () => {
+    const reservation = await createIntendedReservation({
+      workspaceId,
+      expiresAt: new Date(Date.now() + 60_000),
+    });
+    await createIdleRunner({
+      labels: ['linux'],
+      reservationId: reservation.id,
+      reservationReleasedAt: new Date(Date.now() - 1_000),
+    });
+    await createPendingJobs(1, ['linux', 'gpu']);
+
+    const result = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+
+    expect(result.reservations).toEqual([]);
+  });
+
+  it('deducts a terminal intended runner reservation unit as pending', async () => {
+    const reservation = await createIntendedReservation({
+      workspaceId,
+      expiresAt: new Date(Date.now() + 60_000),
+    });
+    await createIdleRunner({
+      labels: ['linux'],
+      intendedReservationId: reservation.id,
+      state: 'terminated',
+    });
+    await createPendingJobs(1, ['linux', 'gpu']);
+
+    const result = await pollDemandAndReserve({
+      workspaceId,
+      provisionerId,
+      maxReservations: 1,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+    });
+
+    expect(result.reservations).toEqual([]);
+  });
+
   it('binds a runner whose intended reservation has passed its activation grace period', async () => {
     const intendedReservation = await createIntendedReservation({
       workspaceId,
@@ -109,9 +558,10 @@ describe('pollDemandAndReserve', () => {
       .select()
       .from(providerRunners)
       .where(eq(providerRunners.id, runner.id));
+    expect(result.reservations).toEqual([]);
     expect(storedRunner).toMatchObject({
       workspaceId,
-      reservationId: result.reservations[0]?.reservationId,
+      reservationId: expect.any(String),
       intendedReservationId: null,
       assignedAt: expect.any(Date),
     });
@@ -141,9 +591,10 @@ describe('pollDemandAndReserve', () => {
       .select()
       .from(providerRunners)
       .where(eq(providerRunners.id, runner.id));
+    expect(result.reservations).toEqual([]);
     expect(storedRunner).toMatchObject({
       workspaceId,
-      reservationId: result.reservations[0]?.reservationId,
+      reservationId: expect.any(String),
       intendedReservationId: null,
       assignedAt: expect.any(Date),
     });
@@ -188,9 +639,10 @@ describe('pollDemandAndReserve', () => {
       .select()
       .from(runnerActivationTokens)
       .where(eq(runnerActivationTokens.id, activationToken.id));
+    expect(result.reservations).toEqual([]);
     expect(storedRunner).toMatchObject({
       workspaceId,
-      reservationId: result.reservations[0]?.reservationId,
+      reservationId: expect.any(String),
       intendedReservationId: null,
       assignedAt: expect.any(Date),
     });
@@ -223,9 +675,10 @@ describe('pollDemandAndReserve', () => {
       .select()
       .from(providerRunners)
       .where(eq(providerRunners.id, runner.id));
+    expect(result.reservations).toEqual([]);
     expect(storedRunner).toMatchObject({
       workspaceId,
-      reservationId: result.reservations[0]?.reservationId,
+      reservationId: expect.any(String),
       intendedReservationId: null,
       assignedAt: expect.any(Date),
     });
@@ -349,9 +802,10 @@ describe('pollDemandAndReserve', () => {
       .select()
       .from(providerRunners)
       .where(eq(providerRunners.id, runner.id));
+    expect(result.reservations).toEqual([]);
     expect(storedRunner).toMatchObject({
       workspaceId,
-      reservationId: result.reservations[0]?.reservationId,
+      reservationId: expect.any(String),
       intendedReservationId: null,
       assignedAt: expect.any(Date),
     });
@@ -385,15 +839,164 @@ describe('pollDemandAndReserve', () => {
       .select()
       .from(providerRunners)
       .where(eq(providerRunners.id, runner.id));
-    expect(result.reservations[0]).toMatchObject({workspaceId: targetWorkspaceId, count: 1});
+    const [storedReservation] = await db()
+      .select()
+      .from(reservations)
+      .where(
+        and(
+          eq(reservations.workspaceId, targetWorkspaceId),
+          eq(reservations.provisionerId, provisionerId),
+          eq(reservations.kind, 'bound'),
+        ),
+      );
+    expect(result.reservations).toEqual([]);
+    expect(storedReservation).toMatchObject({workspaceId: targetWorkspaceId, count: 1});
     expect(storedRunner).toMatchObject({
       workspaceId: targetWorkspaceId,
-      reservationId: result.reservations[0]?.reservationId,
+      reservationId: storedReservation?.id,
       intendedReservationId: null,
       assignedAt: expect.any(Date),
     });
   });
 
+  it('does not rebind a runner reserved by a concurrent installation poll', async () => {
+    const previousWorkspaceId = crypto.randomUUID();
+    const targetWorkspaceId = crypto.randomUUID();
+    const runner = await createIdleRunner({labels: ['linux']});
+    await pendingJobFactory.create({workspaceId: targetWorkspaceId, requiredLabels: ['linux']});
+
+    const lockClient = await pgClient().connect();
+    let transactionOpen = false;
+    let pollPromise: ReturnType<typeof pollInstallationDemandAndReserve> | undefined;
+    try {
+      await lockClient.query('BEGIN');
+      transactionOpen = true;
+      const lockPidResult = await lockClient.query<{pid: number}>('SELECT pg_backend_pid() AS pid');
+      const lockPid = lockPidResult.rows[0]?.pid;
+      if (lockPid === undefined) throw new Error('Expected lock holder backend pid');
+      await lockClient.query('SELECT id FROM runners_runner_instances WHERE id = $1 FOR UPDATE', [
+        runner.id,
+      ]);
+
+      const reservationId = crypto.randomUUID();
+      await lockClient.query(
+        `INSERT INTO runners_reservations
+          (id, workspace_id, provisioner_id, required_labels, count, kind, expires_at)
+         VALUES ($1, $2, $3, $4, $5, 'bound', $6)`,
+        [
+          reservationId,
+          previousWorkspaceId,
+          provisionerId,
+          ['linux'],
+          1,
+          new Date(Date.now() + 60_000),
+        ],
+      );
+      await lockClient.query(
+        `UPDATE runners_runner_instances
+         SET workspace_id = $1, reservation_id = $2, updated_at = now()
+         WHERE id = $3`,
+        [previousWorkspaceId, reservationId, runner.id],
+      );
+
+      pollPromise = pollInstallationDemandAndReserve({
+        provisionerId,
+        maxReservations: 1,
+        ttlSeconds: 60,
+        templates: [template('linux', ['linux'], 1)],
+        capabilityWindowSeconds: 60,
+        eligibleWorkspaceIds: new Set([targetWorkspaceId]),
+      });
+      // waitForLockWait yields to the macrotask queue, so an early poll rejection would
+      // surface as an unhandled rejection before the finally block attaches its handler.
+      pollPromise.catch(() => undefined);
+      await waitForLockWait({blockingPid: lockPid});
+
+      await lockClient.query('COMMIT');
+      transactionOpen = false;
+      const result = await pollPromise;
+      const [storedRunner] = await db()
+        .select()
+        .from(providerRunners)
+        .where(eq(providerRunners.id, runner.id));
+      const storedReservations = await db()
+        .select()
+        .from(reservations)
+        .where(eq(reservations.provisionerId, provisionerId));
+
+      expect(result.reservations).toHaveLength(1);
+      expect(result.reservations[0]).toMatchObject({workspaceId: targetWorkspaceId, count: 1});
+      expect(storedRunner).toMatchObject({
+        workspaceId: previousWorkspaceId,
+        reservationId,
+      });
+      expect(storedReservations).toHaveLength(2);
+      expect(
+        storedReservations.find((reservation) => reservation.workspaceId === targetWorkspaceId),
+      ).toMatchObject({kind: 'launch', count: 1});
+    } finally {
+      if (transactionOpen) await lockClient.query('ROLLBACK');
+      if (pollPromise) await pollPromise.catch(() => undefined);
+      lockClient.release();
+    }
+  });
+
+  it.each([
+    ['template capacity', 5, 2, 2],
+    ['global reservation budget', 2, 5, 1],
+  ])('does not overcount rebound units for the %s case', async (_case, maxReservations, availableSlots, expectedLaunchCount) => {
+    const reboundWorkspaceId = crypto.randomUUID();
+    const launchWorkspaceId = crypto.randomUUID();
+    await pendingJobFactory.create({
+      workspaceId: reboundWorkspaceId,
+      requiredLabels: ['linux'],
+    });
+    await pendingJobFactory.create({
+      workspaceId: launchWorkspaceId,
+      requiredLabels: ['linux'],
+    });
+    await pendingJobFactory.create({
+      workspaceId: launchWorkspaceId,
+      requiredLabels: ['linux'],
+    });
+    await db()
+      .update(pendingJobExecutions)
+      .set({createdAt: new Date('2026-01-01T00:00:00.000Z')})
+      .where(eq(pendingJobExecutions.workspaceId, reboundWorkspaceId));
+    await db()
+      .update(pendingJobExecutions)
+      .set({createdAt: new Date('2026-01-02T00:00:00.000Z')})
+      .where(eq(pendingJobExecutions.workspaceId, launchWorkspaceId));
+    await createIdleRunner({labels: ['linux']});
+
+    const result = await pollInstallationDemandAndReserve({
+      provisionerId,
+      maxReservations,
+      ttlSeconds: 60,
+      templates: [template('linux', ['linux'], availableSlots)],
+      capabilityWindowSeconds: 60,
+      eligibleWorkspaceIds: new Set([reboundWorkspaceId, launchWorkspaceId]),
+    });
+
+    const storedReservations = await db()
+      .select()
+      .from(reservations)
+      .where(eq(reservations.provisionerId, provisionerId));
+    expect(result.reservations).toEqual([
+      expect.objectContaining({workspaceId: launchWorkspaceId, count: expectedLaunchCount}),
+    ]);
+    expect(storedReservations).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({workspaceId: reboundWorkspaceId, kind: 'bound', count: 1}),
+        expect.objectContaining({
+          workspaceId: launchWorkspaceId,
+          kind: 'launch',
+          count: expectedLaunchCount,
+        }),
+      ]),
+    );
+  });
+
   it('does not rebind a released runner after its reservation expires', async () => {
     const staleReservation = await createIntendedReservation({
       workspaceId,
@@ -402,6 +1005,7 @@ describe('pollDemandAndReserve', () => {
     const releasedAt = new Date(Date.now() - 30_000);
     const runner = await createIdleRunner({
       labels: ['linux'],
+      launchKind: 'demand',
       workspaceId,
       reservationId: staleReservation.id,
       intendedReservationId: staleReservation.id,
@@ -502,9 +1106,10 @@ describe('pollDemandAndReserve', () => {
       templates: [template('linux', ['linux'], 1)],
     });
 
-    expect(firstResult.reservations).toHaveLength(1);
+    expect(firstResult.reservations).toEqual([]);
     expect(secondResult.reservations).toEqual([]);
     expect(secondResult.stats[0]).toMatchObject({queued: 1, reserved: 1});
+    expect(await activeReservedCount()).toBe(1);
   });
 
   it('allocates overlapping label sets most-specific-first', async () => {
@@ -569,6 +1174,53 @@ describe('pollDemandAndReserve', () => {
     ]);
   });
 
+  it('does not charge adopted installation runners against later launch capacity', async () => {
+    const olderWorkspaceId = crypto.randomUUID();
+    const newerWorkspaceId = crypto.randomUUID();
+    const runner = await createIdleRunner({labels: ['linux', 'gpu']});
+    await pendingJobFactory.create({
+      workspaceId: olderWorkspaceId,
+      requiredLabels: ['linux', 'gpu'],
+    });
+    await pendingJobFactory.create({workspaceId: newerWorkspaceId, requiredLabels: ['linux']});
+
+    const result = await pollInstallationDemandAndReserve({
+      provisionerId,
+      maxReservations: 2,
+      ttlSeconds: 60,
+      templates: [template('linux-gpu', ['linux', 'gpu'], 1)],
+      capabilityWindowSeconds: 60,
+      eligibleWorkspaceIds: new Set([olderWorkspaceId, newerWorkspaceId]),
+    });
+
+    const storedReservations = await db()
+      .select()
+      .from(reservations)
+      .where(eq(reservations.provisionerId, provisionerId));
+    const boundReservation = storedReservations.find(
+      (reservation) => reservation.workspaceId === olderWorkspaceId,
+    );
+    const launchReservation = storedReservations.find(
+      (reservation) => reservation.workspaceId === newerWorkspaceId,
+    );
+    const [storedRunner] = await db()
+      .select()
+      .from(providerRunners)
+      .where(eq(providerRunners.id, runner.id));
+
+    expect(result.reservations).toEqual([
+      expect.objectContaining({
+        reservationId: launchReservation?.id,
+        workspaceId: newerWorkspaceId,
+        labels: ['linux'],
+        count: 1,
+      }),
+    ]);
+    expect(boundReservation?.count).toBe(1);
+    expect(storedRunner?.workspaceId).toBe(olderWorkspaceId);
+    expect(storedRunner?.reservationId).toBe(boundReservation?.id);
+  });
+
   it('reports committed installation grants before an aborted poll stops allocating', async () => {
     const firstWorkspaceId = crypto.randomUUID();
     const secondWorkspaceId = crypto.randomUUID();
@@ -765,15 +1417,25 @@ describe('pollDemandAndReserve', () => {
     const runner = await createIdleRunner({labels: ['linux']});
     await createPendingJobs(1, ['linux']);
 
-    const result = await pollDemandAndReserve({
+    await pollDemandAndReserve({
       workspaceId,
       provisionerId,
       maxReservations: 1,
       ttlSeconds: 60,
       templates: [template('linux', ['linux'], 1)],
     });
-    const reservationId = result.reservations[0]?.reservationId;
-    if (!reservationId) throw new Error('Expected reservation');
+    const [boundReservation] = await db()
+      .select()
+      .from(reservations)
+      .where(
+        and(
+          eq(reservations.workspaceId, workspaceId),
+          eq(reservations.provisionerId, provisionerId),
+          eq(reservations.kind, 'bound'),
+        ),
+      );
+    const reservationId = boundReservation?.id;
+    if (!reservationId) throw new Error('Expected bound reservation');
 
     const [activationToken] = await db()
       .insert(runnerActivationTokens)
@@ -867,15 +1529,25 @@ describe('pollDemandAndReserve', () => {
     const runner = await createIdleRunner({labels: ['linux']});
     await createPendingJobs(1, ['linux']);
 
-    const result = await pollDemandAndReserve({
+    await pollDemandAndReserve({
       workspaceId,
       provisionerId,
       maxReservations: 1,
       ttlSeconds: 60,
       templates: [template('linux', ['linux'], 1)],
     });
-    const reservationId = result.reservations[0]?.reservationId;
-    if (!reservationId) throw new Error('Expected reservation');
+    const [boundReservation] = await db()
+      .select()
+      .from(reservations)
+      .where(
+        and(
+          eq(reservations.workspaceId, workspaceId),
+          eq(reservations.provisionerId, provisionerId),
+          eq(reservations.kind, 'bound'),
+        ),
+      );
+    const reservationId = boundReservation?.id;
+    if (!reservationId) throw new Error('Expected bound reservation');
 
     await db()
       .update(reservations)
@@ -963,18 +1635,18 @@ describe('pollDemandAndReserve', () => {
     expect(storedSurvivingRunner?.intendedReservationId).toBe(survivingReservation.id);
 
     await createPendingJobs(1, ['linux']);
-    const result = await pollDemandAndReserve({
+    await pollDemandAndReserve({
       workspaceId,
       provisionerId,
       maxReservations: 1,
       ttlSeconds: 60,
       templates: [template('linux', ['linux'], 1)],
     });
-    const reboundReservationId = result.reservations[0]?.reservationId;
     const [reboundRunner] = await db()
       .select()
       .from(providerRunners)
       .where(eq(providerRunners.id, runner.id));
+    const reboundReservationId = reboundRunner?.reservationId;
     expect(reboundReservationId).toEqual(expect.any(String));
     expect(reboundRunner).toMatchObject({
       intendedReservationId: null,
@@ -1171,26 +1843,31 @@ describe('pollDemandAndReserve', () => {
   }
 
   async function createIdleRunner(params: {
+    id?: string;
     labels: string[];
     createdAt?: Date;
     controlSessionExpiresAt?: Date;
+    launchKind?: 'demand' | 'warm' | 'manual';
     workspaceId?: string | null;
     reservationId?: string | null;
     intendedReservationId?: string | null;
     reservationReleasedAt?: Date | null;
+    state?: RunnerInstanceState;
   }) {
     const createdAt = params.createdAt ?? new Date();
     const [runner] = await db()
       .insert(providerRunners)
       .values({
+        ...(params.id ? {id: params.id} : {}),
         provisionerId,
         workspaceId: params.workspaceId,
         reservationId: params.reservationId,
         providerRunnerId: crypto.randomUUID(),
+        launchKind: params.launchKind ?? 'manual',
         intendedReservationId: params.intendedReservationId,
         reservationReleasedAt: params.reservationReleasedAt,
         labels: params.labels,
-        state: 'running',
+        state: params.state ?? 'running',
         reportedAt: createdAt,
         createdAt,
         updatedAt: createdAt,
@@ -1236,3 +1913,37 @@ describe('pollDemandAndReserve', () => {
     return {templateKey, labels, availableSlots, starting: 0, running: 0};
   }
 });
+
+async function waitForLockWait(params: {blockingPid: number; minWaiters?: number}) {
+  const minWaiters = params.minWaiters ?? 1;
+  const deadline = Date.now() + 5_000;
+  while (Date.now() < deadline) {
+    const result = await pgClient().query<{count: number}>(
+      `
+        WITH RECURSIVE lock_waiters(waiter_pid, blocker_pid, path) AS (
+          SELECT activity.pid, blockers.blocker_pid, ARRAY[activity.pid, blockers.blocker_pid]
+          FROM pg_stat_activity AS activity
+          CROSS JOIN LATERAL unnest(pg_blocking_pids(activity.pid)) AS blockers(blocker_pid)
+          WHERE activity.datname = current_database()
+            AND activity.pid <> pg_backend_pid()
+            AND activity.state = 'active'
+            AND activity.wait_event_type = 'Lock'
+          UNION ALL
+          SELECT waiters.waiter_pid, blockers.blocker_pid, waiters.path || blockers.blocker_pid
+          FROM lock_waiters AS waiters
+          CROSS JOIN LATERAL unnest(pg_blocking_pids(waiters.blocker_pid)) AS blockers(blocker_pid)
+          WHERE NOT (blockers.blocker_pid = ANY(waiters.path))
+        )
+        SELECT count(DISTINCT waiter_pid)::int AS count
+        FROM lock_waiters
+        WHERE blocker_pid = $1::int
+      `,
+      [params.blockingPid],
+    );
+    if ((result.rows[0]?.count ?? 0) >= minWaiters) return;
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  }
+  throw new Error(
+    `Timed out waiting for ${minWaiters} backend(s) blocked by pid ${params.blockingPid}`,
+  );
+}