@shipfox/api-runners 5.0.0 → 7.0.1

package/src/db/ephemeral-registration-tokens.test.ts

@@ -44,7 +44,7 @@ describe('createEphemeralRegistrationTokensBatch', () => {
     });
 
     expect(result).toHaveLength(2);
-    expect(result.map((token) => token.provisionedRunnerId).sort()).toEqual([
+    expect(result.map((token) => token.providerRunnerId).sort()).toEqual([
       'provisioned-runner-a',
       'provisioned-runner-b',
     ]);
@@ -53,14 +53,14 @@ describe('createEphemeralRegistrationTokensBatch', () => {
     expect(result.every((token) => token.provisionerId === provisionerId)).toBe(true);
     expect(
       await resolveEphemeralRegistrationTokenByHash(hashOpaqueToken(rawTokens[0] ?? '')),
-    ).toEqual(expect.objectContaining({provisionedRunnerId: 'provisioned-runner-a'}));
+    ).toEqual(expect.objectContaining({providerRunnerId: 'provisioned-runner-a'}));
   });
 
   it('rejects the batch and inserts no rows when any provisioned runner already has an active token', async () => {
     await ephemeralRegistrationTokenFactory.create({
       workspaceId,
       provisionerId,
-      provisionedRunnerId: 'provisioned-runner-a',
+      providerRunnerId: 'provisioned-runner-a',
       expiresAt: new Date(Date.now() + 60_000),
     });
     const rawToken = generateOpaqueToken('ephemeralRegistrationToken');
@@ -85,7 +85,7 @@ describe('createEphemeralRegistrationTokensBatch', () => {
         ),
       );
     expect(rows).toHaveLength(1);
-    expect(rows[0]?.provisionedRunnerId).toBe('provisioned-runner-a');
+    expect(rows[0]?.providerRunnerId).toBe('provisioned-runner-a');
   });
 
   it('allows sequential batches that exactly reach the reservation count', async () => {
@@ -152,7 +152,7 @@ describe('createEphemeralRegistrationTokensBatch', () => {
       workspaceId,
       provisionerId,
       reservationId,
-      provisionedRunnerId: 'provisioned-runner-consumed',
+      providerRunnerId: 'provisioned-runner-consumed',
       expiresAt: new Date(Date.now() + 60_000),
     });
     await db()
@@ -163,7 +163,7 @@ describe('createEphemeralRegistrationTokensBatch', () => {
       workspaceId,
       provisionerId,
       reservationId,
-      provisionedRunnerId: 'provisioned-runner-expired',
+      providerRunnerId: 'provisioned-runner-expired',
       expiresAt: new Date(Date.now() - 60_000),
     });
 
@@ -209,9 +209,9 @@ describe('createEphemeralRegistrationTokensBatch', () => {
     return rows.length;
   }
 
-  function row(provisionedRunnerId: string, rawToken: string) {
+  function row(providerRunnerId: string, rawToken: string) {
     return {
-      provisionedRunnerId,
+      providerRunnerId,
       hashedToken: hashOpaqueToken(rawToken),
       prefix: extractDisplayPrefix(rawToken),
     };
@@ -303,7 +303,7 @@ describe('deleteExpiredEphemeralRegistrationTokens', () => {
         id,
         workspaceId,
         provisionerId,
-        provisionedRunnerId: `provisioned-${id}`,
+        providerRunnerId: `provisioned-${id}`,
         hashedToken: crypto.randomUUID(),
         prefix: 'sfxr_test',
         expiresAt: params.expiresAt,

package/src/db/ephemeral-registration-tokens.ts

@@ -16,22 +16,22 @@ import {
   ephemeralRegistrationTokens,
   toEphemeralRegistrationToken,
 } from './schema/ephemeral-registration-tokens.js';
-import {provisionedRunners} from './schema/provisioned-runners.js';
 import {reservations} from './schema/reservations.js';
+import {providerRunners} from './schema/runner-instances.js';
 import {runnerSessions, toRunnerSession} from './schema/runner-sessions.js';
 
 export interface CreateEphemeralRegistrationTokenParams {
   workspaceId: string;
   provisionerId: string;
   reservationId?: string | null | undefined;
-  provisionedRunnerId: string;
+  providerRunnerId: string;
   hashedToken: string;
   prefix: string;
   expiresAt: Date;
 }
 
 export interface CreateEphemeralRegistrationTokensBatchRow {
-  provisionedRunnerId: string;
+  providerRunnerId: string;
   hashedToken: string;
   prefix: string;
 }
@@ -48,13 +48,13 @@ export async function createEphemeralRegistrationToken(
   params: CreateEphemeralRegistrationTokenParams,
 ): Promise<EphemeralRegistrationToken> {
   const rows = await db().transaction(async (tx) => {
-    const provisionedRunnerLockKey = [
+    const providerRunnerLockKey = [
       'runners_ephemeral_registration_tokens',
       params.workspaceId,
       params.provisionerId,
-      params.provisionedRunnerId,
+      params.providerRunnerId,
     ].join(':');
-    await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${provisionedRunnerLockKey}))`);
+    await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${providerRunnerLockKey}))`);
 
     const [active] = await tx
       .select({id: ephemeralRegistrationTokens.id})
@@ -63,7 +63,7 @@ export async function createEphemeralRegistrationToken(
         and(
           eq(ephemeralRegistrationTokens.workspaceId, params.workspaceId),
           eq(ephemeralRegistrationTokens.provisionerId, params.provisionerId),
-          eq(ephemeralRegistrationTokens.provisionedRunnerId, params.provisionedRunnerId),
+          eq(ephemeralRegistrationTokens.providerRunnerId, params.providerRunnerId),
           isNull(ephemeralRegistrationTokens.consumedAt),
           gt(ephemeralRegistrationTokens.expiresAt, sql`now()`),
         ),
@@ -74,7 +74,7 @@ export async function createEphemeralRegistrationToken(
       throw new ActiveEphemeralRegistrationTokenExistsError(
         params.workspaceId,
         params.provisionerId,
-        params.provisionedRunnerId,
+        params.providerRunnerId,
       );
     }
 
@@ -84,7 +84,7 @@ export async function createEphemeralRegistrationToken(
         workspaceId: params.workspaceId,
         provisionerId: params.provisionerId,
         reservationId: params.reservationId ?? null,
-        provisionedRunnerId: params.provisionedRunnerId,
+        providerRunnerId: params.providerRunnerId,
         hashedToken: params.hashedToken,
         prefix: params.prefix,
         expiresAt: params.expiresAt,
@@ -107,16 +107,16 @@ export async function createEphemeralRegistrationTokensBatch(
       params.provisionerId,
     ].join(':');
     await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${provisionerLockKey}))`);
-    for (const provisionedRunnerId of [
-      ...new Set(params.rows.map((row) => row.provisionedRunnerId)),
+    for (const providerRunnerId of [
+      ...new Set(params.rows.map((row) => row.providerRunnerId)),
     ].sort()) {
-      const provisionedRunnerLockKey = [
+      const providerRunnerLockKey = [
         'runners_ephemeral_registration_tokens',
         params.workspaceId,
         params.provisionerId,
-        provisionedRunnerId,
+        providerRunnerId,
       ].join(':');
-      await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${provisionedRunnerLockKey}))`);
+      await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${providerRunnerLockKey}))`);
     }
 
     const [reservation] = await tx
@@ -162,15 +162,15 @@ export async function createEphemeralRegistrationTokensBatch(
       );
     }
 
-    const provisionedRunnerIds = params.rows.map((row) => row.provisionedRunnerId);
+    const providerRunnerIds = params.rows.map((row) => row.providerRunnerId);
     const activeRows = await tx
-      .select({provisionedRunnerId: ephemeralRegistrationTokens.provisionedRunnerId})
+      .select({providerRunnerId: ephemeralRegistrationTokens.providerRunnerId})
       .from(ephemeralRegistrationTokens)
       .where(
         and(
           eq(ephemeralRegistrationTokens.workspaceId, params.workspaceId),
           eq(ephemeralRegistrationTokens.provisionerId, params.provisionerId),
-          inArray(ephemeralRegistrationTokens.provisionedRunnerId, provisionedRunnerIds),
+          inArray(ephemeralRegistrationTokens.providerRunnerId, providerRunnerIds),
           isNull(ephemeralRegistrationTokens.consumedAt),
           gt(ephemeralRegistrationTokens.expiresAt, sql`now()`),
         ),
@@ -178,7 +178,7 @@ export async function createEphemeralRegistrationTokensBatch(
 
     if (activeRows.length > 0) {
       throw new ActiveEphemeralRegistrationTokensExistError(
-        activeRows.map((row) => row.provisionedRunnerId),
+        activeRows.map((row) => row.providerRunnerId),
       );
     }
 
@@ -189,7 +189,7 @@ export async function createEphemeralRegistrationTokensBatch(
           workspaceId: params.workspaceId,
           provisionerId: params.provisionerId,
           reservationId: params.reservationId,
-          provisionedRunnerId: row.provisionedRunnerId,
+          providerRunnerId: row.providerRunnerId,
           hashedToken: row.hashedToken,
           prefix: row.prefix,
           expiresAt: params.expiresAt,
@@ -277,7 +277,7 @@ export async function createRunnerSessionConsumingEphemeralToken(params: {
       .returning({
         id: ephemeralRegistrationTokens.id,
         provisionerId: ephemeralRegistrationTokens.provisionerId,
-        provisionedRunnerId: ephemeralRegistrationTokens.provisionedRunnerId,
+        providerRunnerId: ephemeralRegistrationTokens.providerRunnerId,
       });
 
     if (!consumed[0]) {
@@ -315,7 +315,7 @@ export async function createRunnerSessionConsumingEphemeralToken(params: {
         registrationTokenId: params.ephemeralTokenId,
         registrationTokenKind: 'ephemeral',
         provisionerId: consumed[0].provisionerId,
-        provisionedRunnerId: consumed[0].provisionedRunnerId,
+        providerRunnerId: consumed[0].providerRunnerId,
         labels: params.labels,
         toolCapabilities: params.toolCapabilities ?? null,
         toolCapabilitiesReportedAt: params.toolCapabilities ? sql`now()` : null,
@@ -332,14 +332,14 @@ export async function createRunnerSessionConsumingEphemeralToken(params: {
       .where(eq(ephemeralRegistrationTokens.id, params.ephemeralTokenId));
 
     await tx
-      .update(provisionedRunners)
+      .update(providerRunners)
       .set({runnerSessionId: session.id, updatedAt: sql`now()`})
       .where(
         and(
-          eq(provisionedRunners.workspaceId, params.workspaceId),
-          eq(provisionedRunners.provisionerId, consumed[0].provisionerId),
-          eq(provisionedRunners.provisionedRunnerId, consumed[0].provisionedRunnerId),
-          isNull(provisionedRunners.reservationReleasedAt),
+          eq(providerRunners.workspaceId, params.workspaceId),
+          eq(providerRunners.provisionerId, consumed[0].provisionerId),
+          eq(providerRunners.providerRunnerId, consumed[0].providerRunnerId),
+          isNull(providerRunners.reservationReleasedAt),
         ),
       );
 

package/src/db/index.ts

@@ -15,7 +15,7 @@ export {
 export type {
   ClaimedJobExecution,
   EnqueueJobExecutionParams,
-  ProvisionedRunnerBoundJobExecution,
+  RunnerInstanceBoundJobExecution,
 } from './job-executions.js';
 export {
   cancelRunnerJobs,
@@ -24,7 +24,7 @@ export {
   expireStuckJobExecutions,
   isJobLeaseActive,
   listActiveRunningJobExecutions,
-  listRunningJobExecutionsByProvisionedRunnerTx,
+  listRunningJobExecutionsByRunnerInstanceTx,
   recordHeartbeat,
   releaseJobExecution,
 } from './job-executions.js';
@@ -35,26 +35,12 @@ export {
   resolveManualRegistrationTokenByHash,
   revokeManualRegistrationToken,
 } from './manual-registration-tokens.js';
-export type {
-  ActiveProvisionedRunnerTemplateCount,
-  ProvisionedRunnerReportEvent,
-  ProvisionedRunnerTerminateIntent,
-  ProvisionedRunnerTerminateIntentReason,
-  ReapStaleProvisionedRunnersResult,
-  ReconcileProvisionedRunnersDbResult,
-  ReconcileProvisionedRunnersParams,
-  ReportProvisionedRunnersParams,
-} from './provisioned-runners.js';
 export {
-  isTerminalState,
-  listActiveProvisionedRunnerCountsByTemplateTx,
-  listActiveProvisionedRunners,
-  listProvisionerTerminateIntentRowsTx,
-  listProvisionerTerminateIntents,
-  reapStaleProvisionedRunners,
-  reconcileProvisionedRunners,
-  reportProvisionedRunners,
-} from './provisioned-runners.js';
+  hasActiveWorkspaceProvisionerCapability,
+  listActiveWorkspaceProvisionerCapabilitySnapshots,
+  listStaleWorkspaceProvisionerCapabilitySnapshots,
+  publishWorkspaceProvisionerCapabilitySnapshot,
+} from './provisioner-capability-snapshots.js';
 export type {CreateProvisionerTokenParams} from './provisioner-tokens.js';
 export {
   createProvisionerToken,
@@ -80,11 +66,34 @@ export {
   pollDemandAndReserve,
   releaseReservationUnits,
 } from './reservations.js';
+export {assignRunnerInstances} from './runner-assignments.js';
+export type {
+  ActiveRunnerInstanceTemplateCount,
+  ReapStaleRunnerInstancesResult,
+  ReconcileRunnerInstancesDbResult,
+  ReconcileRunnerInstancesParams,
+  ReportRunnerInstancesParams,
+  RunnerInstanceReportEvent,
+  RunnerInstanceTerminateIntent,
+  RunnerInstanceTerminateIntentReason,
+} from './runner-instances.js';
+export {
+  attachRunnerInstanceProviderId,
+  isTerminalState,
+  listActiveRunnerInstanceCountsByTemplateTx,
+  listActiveRunnerInstances,
+  listProvisionerTerminateIntentRowsTx,
+  listProvisionerTerminateIntents,
+  reapStaleRunnerInstances,
+  reconcileRunnerInstances,
+  reportRunnerInstances,
+} from './runner-instances.js';
 export type {
   CreateRunnerSessionParams,
   DeleteExpiredRunnerSessionsParams,
 } from './runner-sessions.js';
 export {createRunnerSession, deleteExpiredRunnerSessions} from './runner-sessions.js';
 export {runnersOutbox} from './schema/outbox.js';
+export {runnerBootstrapTokens, runnerControlSessions} from './schema/runner-control-sessions.js';
 
 export const migrationsPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../drizzle');

package/src/db/job-executions.test.ts

@@ -8,7 +8,7 @@ import {eq, sql} from 'drizzle-orm';
 import {EmptyRequiredLabelsError, RunnerSessionExhaustedError} from '#core/errors.js';
 import {claimJobExecution} from '#core/job-executions.js';
 import {detectAndExpireStuckJobs} from '#core/maintenance.js';
-import {pendingJobFactory, runnerSessionFactory} from '#test/index.js';
+import {pendingJobFactory, runnerSessionFactory, runnersTestAuthClient} from '#test/index.js';
 import {db} from './db.js';
 import {
   cancelRunnerJobs,
@@ -385,10 +385,10 @@ describe('claimPendingJobExecution', () => {
 
   it('enforces a non-null session claim cap from the database', async () => {
     const provisionerId = crypto.randomUUID();
-    const provisionedRunnerId = `provisioned-runner-${crypto.randomUUID()}`;
+    const providerRunnerId = `provisioned-runner-${crypto.randomUUID()}`;
     await db()
       .update(runnerSessions)
-      .set({registrationTokenKind: 'ephemeral', maxClaims: 1, provisionerId, provisionedRunnerId})
+      .set({registrationTokenKind: 'ephemeral', maxClaims: 1, provisionerId, providerRunnerId})
       .where(eq(runnerSessions.id, runnerSessionId));
     await pendingJobFactory.create({workspaceId});
     await pendingJobFactory.create({workspaceId});
@@ -403,10 +403,10 @@ describe('claimPendingJobExecution', () => {
 
   it('does not spend a claim when a capped session polls an empty queue', async () => {
     const provisionerId = crypto.randomUUID();
-    const provisionedRunnerId = `provisioned-runner-${crypto.randomUUID()}`;
+    const providerRunnerId = `provisioned-runner-${crypto.randomUUID()}`;
     await db()
       .update(runnerSessions)
-      .set({registrationTokenKind: 'ephemeral', maxClaims: 1, provisionerId, provisionedRunnerId})
+      .set({registrationTokenKind: 'ephemeral', maxClaims: 1, provisionerId, providerRunnerId})
       .where(eq(runnerSessions.id, runnerSessionId));
 
     const empty = await claimPendingJobExecution({workspaceId, runnerSessionId, maxClaims: 1});
@@ -494,15 +494,15 @@ describe('claimPendingJobExecution', () => {
     expect(running[0]?.requiredLabels).toEqual(created.requiredLabels);
     expect(running[0]?.runnerLabels).toEqual(sessionLabels);
     expect(running[0]?.provisionerId).toBeNull();
-    expect(running[0]?.provisionedRunnerId).toBeNull();
+    expect(running[0]?.providerRunnerId).toBeNull();
   });
 
   it('copies an ephemeral session provisioned-runner link onto the running job', async () => {
     const provisionerId = crypto.randomUUID();
-    const provisionedRunnerId = `provisioned-runner-${crypto.randomUUID()}`;
+    const providerRunnerId = `provisioned-runner-${crypto.randomUUID()}`;
     await db()
       .update(runnerSessions)
-      .set({registrationTokenKind: 'ephemeral', maxClaims: 1, provisionerId, provisionedRunnerId})
+      .set({registrationTokenKind: 'ephemeral', maxClaims: 1, provisionerId, providerRunnerId})
       .where(eq(runnerSessions.id, runnerSessionId));
     const created = await pendingJobFactory.create({workspaceId});
 
@@ -513,7 +513,7 @@ describe('claimPendingJobExecution', () => {
       .from(runningJobExecutions)
       .where(eq(runningJobExecutions.jobId, created.jobId));
     expect(running?.provisionerId).toBe(provisionerId);
-    expect(running?.provisionedRunnerId).toBe(provisionedRunnerId);
+    expect(running?.providerRunnerId).toBe(providerRunnerId);
   });
 
   it('rejects a running job row with a partial provisioned-runner link', async () => {
@@ -563,7 +563,7 @@ describe('claimPendingJobExecution', () => {
       labels: sessionLabels,
       toolCapabilities: {harnesses: {pi: {tools: ['read']}}},
     });
-    const underProvisionedRunner = await runnerSessionFactory.create({
+    const underRunnerInstance = await runnerSessionFactory.create({
       workspaceId,
       labels: sessionLabels,
       toolCapabilities: {harnesses: {pi: {tools: []}}},
@@ -579,7 +579,7 @@ describe('claimPendingJobExecution', () => {
 
     const firstClaim = await claimPendingJobExecution({
       workspaceId,
-      runnerSessionId: underProvisionedRunner.id,
+      runnerSessionId: underRunnerInstance.id,
     });
     const secondClaim = await claimPendingJobExecution({
       workspaceId,
@@ -758,6 +758,7 @@ describe('claimJobExecution', () => {
     const created = await pendingJobFactory.create({workspaceId});
 
     const claimed = await claimJobExecution({
+      auth: runnersTestAuthClient,
       workspaceId,
       runnerSessionId,
       sessionLabels,
@@ -781,6 +782,7 @@ describe('claimJobExecution', () => {
 
   it('returns null and mints no token when the queue is empty', async () => {
     const claimed = await claimJobExecution({
+      auth: runnersTestAuthClient,
       workspaceId,
       runnerSessionId,
       sessionLabels,

package/src/db/job-executions.ts

@@ -110,19 +110,19 @@ export interface ActiveRunningJobExecution {
   projectId: string;
   runnerSessionId: string;
   provisionerId: string | null;
-  provisionedRunnerId: string | null;
+  providerRunnerId: string | null;
   requiredLabels: string[];
   runnerLabels: string[];
   startedAt: Date;
   lastHeartbeatAt: Date;
 }
 
-export interface ProvisionedRunnerBoundJobExecution {
+export interface RunnerInstanceBoundJobExecution {
   workflowRunId: string;
   workflowRunAttemptId: string;
   jobId: string;
   jobExecutionId: string;
-  provisionedRunnerId: string;
+  providerRunnerId: string;
   startedAt: Date;
   lastHeartbeatAt: Date;
   cancellationRequestedAt: Date | null;
@@ -145,29 +145,35 @@ export async function claimPendingJobExecution(params: {
 
   return await db().transaction(async (tx) => {
     let provisionerId: string | null = null;
-    let provisionedRunnerId: string | null = null;
+    let providerRunnerId: string | null = null;
 
     if (params.maxClaims !== null) {
       const [session] = await tx
         .select({
           maxClaims: runnerSessions.maxClaims,
           claimsUsed: runnerSessions.claimsUsed,
+          revokedAt: runnerSessions.revokedAt,
           provisionerId: runnerSessions.provisionerId,
-          provisionedRunnerId: runnerSessions.provisionedRunnerId,
+          providerRunnerId: runnerSessions.providerRunnerId,
         })
         .from(runnerSessions)
         .where(eq(runnerSessions.id, params.runnerSessionId))
         .limit(1)
         .for('update');
 
-      if (!session || session.maxClaims === null || session.claimsUsed >= session.maxClaims) {
+      if (
+        !session ||
+        session.revokedAt ||
+        session.maxClaims === null ||
+        session.claimsUsed >= session.maxClaims
+      ) {
         throw new RunnerSessionExhaustedError(params.runnerSessionId);
       }
 
       // Ephemeral sessions are the only capped sessions, and the DB check keeps
       // their provisioned-runner link present as a pair.
       provisionerId = session.provisionerId;
-      provisionedRunnerId = session.provisionedRunnerId;
+      providerRunnerId = session.providerRunnerId;
     }
 
     // `id` is a uuidv7 (time-ordered), so it is a deterministic FIFO tiebreaker
@@ -206,7 +212,7 @@ export async function claimPendingJobExecution(params: {
         projectId: row.projectId,
         runnerSessionId: params.runnerSessionId,
         provisionerId,
-        provisionedRunnerId,
+        providerRunnerId,
         requiredLabels: row.requiredLabels,
         runnerLabels: params.sessionLabels,
       })
@@ -409,7 +415,7 @@ export async function listActiveRunningJobExecutions(params: {
       projectId: runningJobExecutions.projectId,
       runnerSessionId: runningJobExecutions.runnerSessionId,
       provisionerId: runningJobExecutions.provisionerId,
-      provisionedRunnerId: runningJobExecutions.provisionedRunnerId,
+      providerRunnerId: runningJobExecutions.providerRunnerId,
       requiredLabels: runningJobExecutions.requiredLabels,
       runnerLabels: runningJobExecutions.runnerLabels,
       startedAt: runningJobExecutions.startedAt,
@@ -426,19 +432,19 @@ export async function listActiveRunningJobExecutions(params: {
     .limit(params.limit ?? 1000);
 }
 
-export async function listRunningJobExecutionsByProvisionedRunnerTx(
+export async function listRunningJobExecutionsByRunnerInstanceTx(
   tx: Tx,
   params: {
     workspaceId: string;
     provisionerId: string;
-    provisionedRunnerIds: string[];
+    providerRunnerIds: string[];
   },
-): Promise<ProvisionedRunnerBoundJobExecution[]> {
-  if (params.provisionedRunnerIds.length === 0) return [];
+): Promise<RunnerInstanceBoundJobExecution[]> {
+  if (params.providerRunnerIds.length === 0) return [];
 
   const duplicateRows = await tx
     .select({
-      provisionedRunnerId: runningJobExecutions.provisionedRunnerId,
+      providerRunnerId: runningJobExecutions.providerRunnerId,
       count: count(),
     })
     .from(runningJobExecutions)
@@ -446,21 +452,21 @@ export async function listRunningJobExecutionsByProvisionedRunnerTx(
       and(
         eq(runningJobExecutions.workspaceId, params.workspaceId),
         eq(runningJobExecutions.provisionerId, params.provisionerId),
-        inArray(runningJobExecutions.provisionedRunnerId, params.provisionedRunnerIds),
+        inArray(runningJobExecutions.providerRunnerId, params.providerRunnerIds),
       ),
     )
-    .groupBy(runningJobExecutions.provisionedRunnerId)
+    .groupBy(runningJobExecutions.providerRunnerId)
     .having(sql`count(*) > 1`);
 
-  const duplicateProvisionedRunnerIds = duplicateRows.flatMap((row) =>
-    row.provisionedRunnerId ? [row.provisionedRunnerId] : [],
+  const duplicateRunnerInstanceIds = duplicateRows.flatMap((row) =>
+    row.providerRunnerId ? [row.providerRunnerId] : [],
   );
-  if (duplicateProvisionedRunnerIds.length > 0) {
+  if (duplicateRunnerInstanceIds.length > 0) {
     logger().warn(
       {
         workspaceId: params.workspaceId,
         provisionerId: params.provisionerId,
-        provisionedRunnerIds: duplicateProvisionedRunnerIds,
+        providerRunnerIds: duplicateRunnerInstanceIds,
       },
       'multiple running job executions are bound to the same provisioned runner',
     );
@@ -471,17 +477,17 @@ export async function listRunningJobExecutionsByProvisionedRunnerTx(
     workflowRunAttemptId: string;
     jobId: string;
     jobExecutionId: string;
-    provisionedRunnerId: string;
+    providerRunnerId: string;
     startedAt: Date | string;
     lastHeartbeatAt: Date | string;
     cancellationRequestedAt: Date | string | null;
   }>(sql`
-    SELECT DISTINCT ON (${runningJobExecutions.provisionedRunnerId})
+    SELECT DISTINCT ON (${runningJobExecutions.providerRunnerId})
       ${runningJobExecutions.workflowRunId} AS "workflowRunId",
       ${runningJobExecutions.workflowRunAttemptId} AS "workflowRunAttemptId",
       ${runningJobExecutions.jobId} AS "jobId",
       ${runningJobExecutions.jobExecutionId} AS "jobExecutionId",
-      ${runningJobExecutions.provisionedRunnerId} AS "provisionedRunnerId",
+      ${runningJobExecutions.providerRunnerId} AS "providerRunnerId",
       ${runningJobExecutions.startedAt} AS "startedAt",
       ${runningJobExecutions.lastHeartbeatAt} AS "lastHeartbeatAt",
       ${runningJobExecutions.cancellationRequestedAt} AS "cancellationRequestedAt"
@@ -489,11 +495,11 @@ export async function listRunningJobExecutionsByProvisionedRunnerTx(
     WHERE
       ${runningJobExecutions.workspaceId} = ${params.workspaceId}
       AND ${runningJobExecutions.provisionerId} = ${params.provisionerId}
-      AND ${runningJobExecutions.provisionedRunnerId} IN (${sql.join(
-        params.provisionedRunnerIds.map((provisionedRunnerId) => sql`${provisionedRunnerId}`),
+      AND ${runningJobExecutions.providerRunnerId} IN (${sql.join(
+        params.providerRunnerIds.map((providerRunnerId) => sql`${providerRunnerId}`),
         sql`, `,
       )})
-    ORDER BY ${runningJobExecutions.provisionedRunnerId}, ${runningJobExecutions.startedAt} DESC, ${runningJobExecutions.jobExecutionId} DESC
+    ORDER BY ${runningJobExecutions.providerRunnerId}, ${runningJobExecutions.startedAt} DESC, ${runningJobExecutions.jobExecutionId} DESC
   `);
 
   return result.rows.map((row) => ({
@@ -501,7 +507,7 @@ export async function listRunningJobExecutionsByProvisionedRunnerTx(
     workflowRunAttemptId: row.workflowRunAttemptId,
     jobId: row.jobId,
     jobExecutionId: row.jobExecutionId,
-    provisionedRunnerId: row.provisionedRunnerId,
+    providerRunnerId: row.providerRunnerId,
     startedAt: toDate(row.startedAt),
     lastHeartbeatAt: toDate(row.lastHeartbeatAt),
     cancellationRequestedAt: row.cancellationRequestedAt