@shipfox/api-runners 5.0.0 → 6.0.0

package/dist/core/runner-instances.js

@@ -0,0 +1,168 @@
+import { attachProviderRunnerId as attachProviderRunnerIdDb, createPlannedProvisionedCapacity as createPlannedProvisionedCapacityDb, isTerminalState, listActiveRunnerInstances, listActiveRunningJobExecutions, reconcileRunnerInstances as reconcileRunnerInstancesDb, reportRunnerInstances as reportRunnerInstancesDb } from '#db/index.js';
+import { providerRunnerAbsentTerminatedCount, providerRunnerReconcileCallCount, providerRunnerReportCount, providerRunnerTerminateIntentHonoredCount, providerRunnerTerminateIntentIssuedCount, reservationReleasedCount } from '#metrics/instance.js';
+import { config } from '../config.js';
+export function createPlannedProvisionedCapacity(params) {
+    return createPlannedProvisionedCapacityDb(params);
+}
+export function attachProviderRunnerId(params) {
+    return attachProviderRunnerIdDb(params);
+}
+export async function reportRunnerInstances(params) {
+    const result = await reportRunnerInstancesDb(params);
+    for (const event of params.events){
+        providerRunnerReportCount.add(1, {
+            state: event.state
+        });
+    }
+    for (const intent of result.terminateIntentsHonored){
+        providerRunnerTerminateIntentHonoredCount.add(1, {
+            reason: intent.reason
+        });
+    }
+    if (result.reservationsReleased > 0) reservationReleasedCount.add(result.reservationsReleased);
+    return result;
+}
+export async function reconcileRunnerInstances(params) {
+    const result = await reconcileRunnerInstancesDb({
+        ...params,
+        terminateGraceSeconds: config.RUNNER_RECONCILE_TERMINATE_GRACE_SECONDS
+    });
+    if (result.reservationsReleased > 0) reservationReleasedCount.add(result.reservationsReleased);
+    providerRunnerReconcileCallCount.add(1);
+    if (result.absentIds.length > 0) providerRunnerAbsentTerminatedCount.add(result.absentIds.length);
+    const runners = reconcileRunnerInstancesFromDbResult({
+        observedRunnerInstanceIds: params.observedRunnerInstanceIds,
+        observedRows: result.observedRows,
+        boundJobExecutionsByRunnerInstanceId: result.boundJobExecutionsByRunnerInstanceId
+    });
+    for (const runner of runners){
+        if (runner.desiredIntentReason) {
+            providerRunnerTerminateIntentIssuedCount.add(1, {
+                surface: 'reconcile',
+                reason: runner.desiredIntentReason
+            });
+        }
+    }
+    return {
+        runners,
+        terminatedAbsentRunnerInstanceIds: result.absentIds
+    };
+}
+export function reconcileRunnerInstancesFromDbResult(params) {
+    const rowsByRunnerInstanceId = new Map(params.observedRows.map((row)=>[
+            row.providerRunnerId,
+            row
+        ]));
+    return params.observedRunnerInstanceIds.map((providerRunnerId)=>{
+        const row = rowsByRunnerInstanceId.get(providerRunnerId);
+        const boundJobExecution = params.boundJobExecutionsByRunnerInstanceId.get(providerRunnerId);
+        const desiredIntentReason = getDesiredIntentReason(row, boundJobExecution);
+        return {
+            providerRunnerId,
+            state: row?.state ?? null,
+            reservationId: row?.reservationId ?? null,
+            runnerSessionId: row?.runnerSessionId ?? null,
+            boundJobExecution: boundJobExecution ? toReconciledBoundJobExecution(boundJobExecution) : null,
+            desiredIntent: desiredIntentReason ? 'terminate' : 'keep',
+            desiredIntentReason
+        };
+    });
+}
+export async function listActiveRunners(params) {
+    const [providerRunnerRows, jobExecutionRows] = await Promise.all([
+        listActiveRunnerInstances({
+            workspaceId: params.workspaceId,
+            windowSeconds: config.RUNNER_ACTIVE_WINDOW_SECONDS
+        }),
+        listActiveRunningJobExecutions({
+            workspaceId: params.workspaceId,
+            windowSeconds: config.RUNNER_ACTIVE_WINDOW_SECONDS
+        })
+    ]);
+    return mergeActiveRunners(providerRunnerRows, jobExecutionRows);
+}
+function toReconciledBoundJobExecution(jobExecution) {
+    return {
+        jobId: jobExecution.jobId,
+        jobExecutionId: jobExecution.jobExecutionId,
+        workflowRunAttemptId: jobExecution.workflowRunAttemptId,
+        lastHeartbeatAt: jobExecution.lastHeartbeatAt,
+        cancellationRequestedAt: jobExecution.cancellationRequestedAt
+    };
+}
+export function desiredIntent(row, boundJobExecution) {
+    return getDesiredIntentReason(row, boundJobExecution) ? 'terminate' : 'keep';
+}
+function getDesiredIntentReason(row, boundJobExecution) {
+    if (!row) return null;
+    if (isTerminalState(row.state)) return 'terminal-state';
+    if (boundJobExecution?.cancellationRequestedAt) return 'job-cancelled';
+    return null;
+}
+function mergeActiveRunners(providerRunners, jobExecutions) {
+    const jobExecutionsByRunnerSessionId = new Map();
+    const jobExecutionsByRunnerInstanceId = new Map();
+    for (const jobExecution of jobExecutions){
+        const runnerJobExecutions = jobExecutionsByRunnerSessionId.get(jobExecution.runnerSessionId) ?? [];
+        runnerJobExecutions.push(jobExecution);
+        jobExecutionsByRunnerSessionId.set(jobExecution.runnerSessionId, runnerJobExecutions);
+        if (jobExecution.provisionerId && jobExecution.providerRunnerId) {
+            const key = providerRunnerKey(jobExecution.provisionerId, jobExecution.providerRunnerId);
+            const providerRunnerJobExecutions = jobExecutionsByRunnerInstanceId.get(key) ?? [];
+            providerRunnerJobExecutions.push(jobExecution);
+            jobExecutionsByRunnerInstanceId.set(key, providerRunnerJobExecutions);
+        }
+    }
+    const merged = [];
+    const usedJobExecutionIds = new Set();
+    for (const providerRunner of providerRunners){
+        const providerRunnerJobExecutions = jobExecutionsByRunnerInstanceId.get(providerRunnerKey(providerRunner.provisionerId, providerRunner.providerRunnerId)) ?? (providerRunner.runnerSessionId ? jobExecutionsByRunnerSessionId.get(providerRunner.runnerSessionId) : undefined);
+        if (!providerRunnerJobExecutions || providerRunnerJobExecutions.length === 0) {
+            merged.push(toActiveRunner(providerRunner, undefined));
+            continue;
+        }
+        let emitted = false;
+        for (const jobExecution of providerRunnerJobExecutions){
+            if (usedJobExecutionIds.has(jobExecution.jobExecutionId)) continue;
+            usedJobExecutionIds.add(jobExecution.jobExecutionId);
+            merged.push(toActiveRunner(providerRunner, jobExecution));
+            emitted = true;
+        }
+        if (!emitted) merged.push(toActiveRunner(providerRunner, undefined));
+    }
+    for (const jobExecution of jobExecutions){
+        if (usedJobExecutionIds.has(jobExecution.jobExecutionId)) continue;
+        merged.push(toActiveRunner(undefined, jobExecution));
+    }
+    return merged.sort(compareActiveRunners);
+}
+function providerRunnerKey(provisionerId, providerRunnerId) {
+    return `${provisionerId}:${providerRunnerId}`;
+}
+function toActiveRunner(providerRunner, jobExecution) {
+    return {
+        runnerSessionId: providerRunner?.runnerSessionId ?? jobExecution?.runnerSessionId ?? null,
+        providerRunnerId: providerRunner?.providerRunnerId ?? jobExecution?.providerRunnerId ?? null,
+        provisionerId: providerRunner?.provisionerId ?? jobExecution?.provisionerId ?? null,
+        state: jobExecution ? 'busy' : toActiveRunnerState(providerRunner?.state ?? 'running'),
+        labels: providerRunner?.labels ?? jobExecution?.runnerLabels ?? [],
+        templateKey: providerRunner?.templateKey ?? null,
+        providerKind: providerRunner?.providerKind ?? null,
+        jobId: jobExecution?.jobId ?? null,
+        workflowRunAttemptId: jobExecution?.workflowRunAttemptId ?? null,
+        projectId: jobExecution?.projectId ?? null,
+        reportedAt: providerRunner?.reportedAt ?? null,
+        lastHeartbeatAt: jobExecution?.lastHeartbeatAt ?? null
+    };
+}
+function toActiveRunnerState(state) {
+    if (state === 'starting' || state === 'stopping') return state;
+    return 'running';
+}
+function compareActiveRunners(a, b) {
+    const aTime = Math.max(a.lastHeartbeatAt?.getTime() ?? 0, a.reportedAt?.getTime() ?? 0);
+    const bTime = Math.max(b.lastHeartbeatAt?.getTime() ?? 0, b.reportedAt?.getTime() ?? 0);
+    return bTime - aTime;
+}
+
+//# sourceMappingURL=runner-instances.js.map

package/dist/core/runner-instances.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/core/runner-instances.ts"],"sourcesContent":["import type {RunnerInstance, RunnerInstanceState} from '#core/entities/runner-instance.js';\nimport {\n  attachProviderRunnerId as attachProviderRunnerIdDb,\n  createPlannedProvisionedCapacity as createPlannedProvisionedCapacityDb,\n  isTerminalState,\n  listActiveRunnerInstances,\n  listActiveRunningJobExecutions,\n  type RunnerInstanceReportEvent,\n  reconcileRunnerInstances as reconcileRunnerInstancesDb,\n  reportRunnerInstances as reportRunnerInstancesDb,\n} from '#db/index.js';\nimport type {\n  ActiveRunningJobExecution,\n  RunnerInstanceBoundJobExecution,\n} from '#db/job-executions.js';\nimport {\n  providerRunnerAbsentTerminatedCount,\n  providerRunnerReconcileCallCount,\n  providerRunnerReportCount,\n  providerRunnerTerminateIntentHonoredCount,\n  providerRunnerTerminateIntentIssuedCount,\n  reservationReleasedCount,\n} from '#metrics/instance.js';\nimport {config} from '../config.js';\n\nexport interface ReportRunnerInstancesParams {\n  workspaceId: string | null;\n  provisionerId: string;\n  events: RunnerInstanceReportEvent[];\n}\n\nexport function createPlannedProvisionedCapacity(params: {\n  provisionerId: string;\n  providerKind: string | null;\n  templateKey: string | null;\n}): Promise<{capacityId: string}> {\n  return createPlannedProvisionedCapacityDb(params);\n}\n\nexport function attachProviderRunnerId(params: {\n  capacityId: string;\n  provisionerId: string;\n  providerRunnerId: string;\n}): Promise<boolean> {\n  return attachProviderRunnerIdDb(params);\n}\n\nexport interface ReportRunnerInstancesResult {\n  accepted: number;\n  reservationsReleased: number;\n}\n\nexport interface ReconcileRunnerInstancesParams {\n  workspaceId: string | null;\n  provisionerId: string;\n  observedRunnerInstanceIds: string[];\n}\n\nexport type ReconcileDesiredIntent = 'keep' | 'terminate';\ntype ReconcileDesiredIntentReason = 'job-cancelled' | 'terminal-state';\n\nexport interface ReconciledBoundJobExecution {\n  jobId: string;\n  jobExecutionId: string;\n  workflowRunAttemptId: string;\n  lastHeartbeatAt: Date;\n  cancellationRequestedAt: Date | null;\n}\n\nexport interface ReconciledRunnerInstance {\n  providerRunnerId: string;\n  state: RunnerInstanceState | null;\n  reservationId: string | null;\n  runnerSessionId: string | null;\n  boundJobExecution: ReconciledBoundJobExecution | null;\n  desiredIntent: ReconcileDesiredIntent;\n  desiredIntentReason: ReconcileDesiredIntentReason | null;\n}\n\nexport interface ReconcileRunnerInstancesResult {\n  runners: ReconciledRunnerInstance[];\n  terminatedAbsentRunnerInstanceIds: string[];\n}\n\nexport type ActiveRunnerState = 'starting' | 'running' | 'stopping' | 'busy';\n\nexport interface ActiveRunner {\n  runnerSessionId: string | null;\n  providerRunnerId: string | null;\n  provisionerId: string | null;\n  state: ActiveRunnerState;\n  labels: string[];\n  templateKey: string | null;\n  providerKind: string | null;\n  jobId: string | null;\n  workflowRunAttemptId: string | null;\n  projectId: string | null;\n  reportedAt: Date | null;\n  lastHeartbeatAt: Date | null;\n}\n\nexport async function reportRunnerInstances(\n  params: ReportRunnerInstancesParams,\n): Promise<ReportRunnerInstancesResult> {\n  const result = await reportRunnerInstancesDb(params);\n\n  for (const event of params.events) {\n    providerRunnerReportCount.add(1, {state: event.state});\n  }\n  for (const intent of result.terminateIntentsHonored) {\n    providerRunnerTerminateIntentHonoredCount.add(1, {reason: intent.reason});\n  }\n  if (result.reservationsReleased > 0) reservationReleasedCount.add(result.reservationsReleased);\n\n  return result;\n}\n\nexport async function reconcileRunnerInstances(\n  params: ReconcileRunnerInstancesParams,\n): Promise<ReconcileRunnerInstancesResult> {\n  const result = await reconcileRunnerInstancesDb({\n    ...params,\n    terminateGraceSeconds: config.RUNNER_RECONCILE_TERMINATE_GRACE_SECONDS,\n  });\n\n  if (result.reservationsReleased > 0) reservationReleasedCount.add(result.reservationsReleased);\n  providerRunnerReconcileCallCount.add(1);\n  if (result.absentIds.length > 0) providerRunnerAbsentTerminatedCount.add(result.absentIds.length);\n\n  const runners = reconcileRunnerInstancesFromDbResult({\n    observedRunnerInstanceIds: params.observedRunnerInstanceIds,\n    observedRows: result.observedRows,\n    boundJobExecutionsByRunnerInstanceId: result.boundJobExecutionsByRunnerInstanceId,\n  });\n  for (const runner of runners) {\n    if (runner.desiredIntentReason) {\n      providerRunnerTerminateIntentIssuedCount.add(1, {\n        surface: 'reconcile',\n        reason: runner.desiredIntentReason,\n      });\n    }\n  }\n\n  return {\n    runners,\n    terminatedAbsentRunnerInstanceIds: result.absentIds,\n  };\n}\n\nexport function reconcileRunnerInstancesFromDbResult(params: {\n  observedRunnerInstanceIds: string[];\n  observedRows: RunnerInstance[];\n  boundJobExecutionsByRunnerInstanceId: Map<string, RunnerInstanceBoundJobExecution>;\n}): ReconciledRunnerInstance[] {\n  const rowsByRunnerInstanceId = new Map(\n    params.observedRows.map((row) => [row.providerRunnerId, row]),\n  );\n\n  return params.observedRunnerInstanceIds.map((providerRunnerId) => {\n    const row = rowsByRunnerInstanceId.get(providerRunnerId);\n    const boundJobExecution = params.boundJobExecutionsByRunnerInstanceId.get(providerRunnerId);\n\n    const desiredIntentReason = getDesiredIntentReason(row, boundJobExecution);\n\n    return {\n      providerRunnerId,\n      state: row?.state ?? null,\n      reservationId: row?.reservationId ?? null,\n      runnerSessionId: row?.runnerSessionId ?? null,\n      boundJobExecution: boundJobExecution\n        ? toReconciledBoundJobExecution(boundJobExecution)\n        : null,\n      desiredIntent: desiredIntentReason ? 'terminate' : 'keep',\n      desiredIntentReason,\n    };\n  });\n}\n\nexport async function listActiveRunners(params: {workspaceId: string}): Promise<ActiveRunner[]> {\n  const [providerRunnerRows, jobExecutionRows] = await Promise.all([\n    listActiveRunnerInstances({\n      workspaceId: params.workspaceId,\n      windowSeconds: config.RUNNER_ACTIVE_WINDOW_SECONDS,\n    }),\n    listActiveRunningJobExecutions({\n      workspaceId: params.workspaceId,\n      windowSeconds: config.RUNNER_ACTIVE_WINDOW_SECONDS,\n    }),\n  ]);\n\n  return mergeActiveRunners(providerRunnerRows, jobExecutionRows);\n}\n\nfunction toReconciledBoundJobExecution(\n  jobExecution: RunnerInstanceBoundJobExecution,\n): ReconciledBoundJobExecution {\n  return {\n    jobId: jobExecution.jobId,\n    jobExecutionId: jobExecution.jobExecutionId,\n    workflowRunAttemptId: jobExecution.workflowRunAttemptId,\n    lastHeartbeatAt: jobExecution.lastHeartbeatAt,\n    cancellationRequestedAt: jobExecution.cancellationRequestedAt,\n  };\n}\n\nexport function desiredIntent(\n  row: RunnerInstance | undefined,\n  boundJobExecution: RunnerInstanceBoundJobExecution | undefined,\n): ReconcileDesiredIntent {\n  return getDesiredIntentReason(row, boundJobExecution) ? 'terminate' : 'keep';\n}\n\nfunction getDesiredIntentReason(\n  row: RunnerInstance | undefined,\n  boundJobExecution: RunnerInstanceBoundJobExecution | undefined,\n): ReconcileDesiredIntentReason | null {\n  if (!row) return null;\n  if (isTerminalState(row.state)) return 'terminal-state';\n  if (boundJobExecution?.cancellationRequestedAt) return 'job-cancelled';\n  return null;\n}\n\nfunction mergeActiveRunners(\n  providerRunners: RunnerInstance[],\n  jobExecutions: ActiveRunningJobExecution[],\n): ActiveRunner[] {\n  const jobExecutionsByRunnerSessionId = new Map<string, ActiveRunningJobExecution[]>();\n  const jobExecutionsByRunnerInstanceId = new Map<string, ActiveRunningJobExecution[]>();\n  for (const jobExecution of jobExecutions) {\n    const runnerJobExecutions =\n      jobExecutionsByRunnerSessionId.get(jobExecution.runnerSessionId) ?? [];\n    runnerJobExecutions.push(jobExecution);\n    jobExecutionsByRunnerSessionId.set(jobExecution.runnerSessionId, runnerJobExecutions);\n\n    if (jobExecution.provisionerId && jobExecution.providerRunnerId) {\n      const key = providerRunnerKey(jobExecution.provisionerId, jobExecution.providerRunnerId);\n      const providerRunnerJobExecutions = jobExecutionsByRunnerInstanceId.get(key) ?? [];\n      providerRunnerJobExecutions.push(jobExecution);\n      jobExecutionsByRunnerInstanceId.set(key, providerRunnerJobExecutions);\n    }\n  }\n\n  const merged: ActiveRunner[] = [];\n  const usedJobExecutionIds = new Set<string>();\n\n  for (const providerRunner of providerRunners) {\n    const providerRunnerJobExecutions =\n      jobExecutionsByRunnerInstanceId.get(\n        providerRunnerKey(providerRunner.provisionerId, providerRunner.providerRunnerId),\n      ) ??\n      (providerRunner.runnerSessionId\n        ? jobExecutionsByRunnerSessionId.get(providerRunner.runnerSessionId)\n        : undefined);\n    if (!providerRunnerJobExecutions || providerRunnerJobExecutions.length === 0) {\n      merged.push(toActiveRunner(providerRunner, undefined));\n      continue;\n    }\n\n    let emitted = false;\n    for (const jobExecution of providerRunnerJobExecutions) {\n      if (usedJobExecutionIds.has(jobExecution.jobExecutionId)) continue;\n      usedJobExecutionIds.add(jobExecution.jobExecutionId);\n      merged.push(toActiveRunner(providerRunner, jobExecution));\n      emitted = true;\n    }\n    if (!emitted) merged.push(toActiveRunner(providerRunner, undefined));\n  }\n\n  for (const jobExecution of jobExecutions) {\n    if (usedJobExecutionIds.has(jobExecution.jobExecutionId)) continue;\n    merged.push(toActiveRunner(undefined, jobExecution));\n  }\n\n  return merged.sort(compareActiveRunners);\n}\n\nfunction providerRunnerKey(provisionerId: string, providerRunnerId: string): string {\n  return `${provisionerId}:${providerRunnerId}`;\n}\n\nfunction toActiveRunner(\n  providerRunner: RunnerInstance | undefined,\n  jobExecution: ActiveRunningJobExecution | undefined,\n): ActiveRunner {\n  return {\n    runnerSessionId: providerRunner?.runnerSessionId ?? jobExecution?.runnerSessionId ?? null,\n    providerRunnerId: providerRunner?.providerRunnerId ?? jobExecution?.providerRunnerId ?? null,\n    provisionerId: providerRunner?.provisionerId ?? jobExecution?.provisionerId ?? null,\n    state: jobExecution ? 'busy' : toActiveRunnerState(providerRunner?.state ?? 'running'),\n    labels: providerRunner?.labels ?? jobExecution?.runnerLabels ?? [],\n    templateKey: providerRunner?.templateKey ?? null,\n    providerKind: providerRunner?.providerKind ?? null,\n    jobId: jobExecution?.jobId ?? null,\n    workflowRunAttemptId: jobExecution?.workflowRunAttemptId ?? null,\n    projectId: jobExecution?.projectId ?? null,\n    reportedAt: providerRunner?.reportedAt ?? null,\n    lastHeartbeatAt: jobExecution?.lastHeartbeatAt ?? null,\n  };\n}\n\nfunction toActiveRunnerState(state: RunnerInstanceState): ActiveRunnerState {\n  if (state === 'starting' || state === 'stopping') return state;\n  return 'running';\n}\n\nfunction compareActiveRunners(a: ActiveRunner, b: ActiveRunner): number {\n  const aTime = Math.max(a.lastHeartbeatAt?.getTime() ?? 0, a.reportedAt?.getTime() ?? 0);\n  const bTime = Math.max(b.lastHeartbeatAt?.getTime() ?? 0, b.reportedAt?.getTime() ?? 0);\n  return bTime - aTime;\n}\n"],"names":["attachProviderRunnerId","attachProviderRunnerIdDb","createPlannedProvisionedCapacity","createPlannedProvisionedCapacityDb","isTerminalState","listActiveRunnerInstances","listActiveRunningJobExecutions","reconcileRunnerInstances","reconcileRunnerInstancesDb","reportRunnerInstances","reportRunnerInstancesDb","providerRunnerAbsentTerminatedCount","providerRunnerReconcileCallCount","providerRunnerReportCount","providerRunnerTerminateIntentHonoredCount","providerRunnerTerminateIntentIssuedCount","reservationReleasedCount","config","params","result","event","events","add","state","intent","terminateIntentsHonored","reason","reservationsReleased","terminateGraceSeconds","RUNNER_RECONCILE_TERMINATE_GRACE_SECONDS","absentIds","length","runners","reconcileRunnerInstancesFromDbResult","observedRunnerInstanceIds","observedRows","boundJobExecutionsByRunnerInstanceId","runner","desiredIntentReason","surface","terminatedAbsentRunnerInstanceIds","rowsByRunnerInstanceId","Map","map","row","providerRunnerId","get","boundJobExecution","getDesiredIntentReason","reservationId","runnerSessionId","toReconciledBoundJobExecution","desiredIntent","listActiveRunners","providerRunnerRows","jobExecutionRows","Promise","all","workspaceId","windowSeconds","RUNNER_ACTIVE_WINDOW_SECONDS","mergeActiveRunners","jobExecution","jobId","jobExecutionId","workflowRunAttemptId","lastHeartbeatAt","cancellationRequestedAt","providerRunners","jobExecutions","jobExecutionsByRunnerSessionId","jobExecutionsByRunnerInstanceId","runnerJobExecutions","push","set","provisionerId","key","providerRunnerKey","providerRunnerJobExecutions","merged","usedJobExecutionIds","Set","providerRunner","undefined","toActiveRunner","emitted","has","sort","compareActiveRunners","toActiveRunnerState","labels","runnerLabels","templateKey","providerKind","projectId","reportedAt","a","b","aTime","Math","max","getTime","bTime"],"mappings":"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"}

package/dist/core/runner-sessions.d.ts

@@ -1,9 +1,10 @@
+import type { AuthInterModuleClient } from '@shipfox/api-auth-dto/inter-module';
 import type { RunnerToolCapabilitiesDto } from '@shipfox/api-runners-dto';
 import type { RunnerSession } from './entities/runner-session.js';
 export interface RegisterRunnerSessionResult {
     session: RunnerSession;
     sessionToken: string;
-    mode: 'manual' | 'ephemeral';
+    mode: 'manual' | 'ephemeral' | 'activation';
     maxClaims: number | null;
 }
 export type RunnerRegistrationCredential = {
@@ -16,9 +17,14 @@ export type RunnerRegistrationCredential = {
     workspaceId: string;
     provisionerId: string;
     reservationId: string | null;
-    provisionedRunnerId: string;
+    providerRunnerId: string;
+} | {
+    kind: 'activation';
+    activationTokenId: string;
+    workspaceId: string;
 };
 export declare function registerRunnerSession(params: {
+    auth: AuthInterModuleClient;
     credential: RunnerRegistrationCredential;
     labels: string[];
     toolCapabilities?: RunnerToolCapabilitiesDto | null;

package/dist/core/runner-sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner-sessions.d.ts","sourceRoot":"","sources":["../../src/core/runner-sessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AAIxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAGhE,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,aAAa,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,MAAM,4BAA4B,GACpC;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEN,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,UAAU,EAAE,4BAA4B,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,gBAAgB,CAAC,EAAE,yBAAyB,GAAG,IAAI,CAAC;CACrD,GAAG,OAAO,CAAC,2BAA2B,CAAC,CA+BvC"}
+{"version":3,"file":"runner-sessions.d.ts","sourceRoot":"","sources":["../../src/core/runner-sessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;AAC9E,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AAOxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAGhE,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,aAAa,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,YAAY,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,MAAM,4BAA4B,GACpC;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,WAAW,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GACD;IAAC,IAAI,EAAE,YAAY,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,CAAC;AAEzE,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,EAAE,4BAA4B,CAAC;IACzC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,gBAAgB,CAAC,EAAE,yBAAyB,GAAG,IAAI,CAAC;CACrD,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAqCvC"}

package/dist/core/runner-sessions.js

@@ -1,7 +1,6 @@
-import { issueRunnerSessionToken } from '@shipfox/api-auth';
 import { canonicalizeLabels } from '@shipfox/runner-labels';
 import { createRunnerSessionConsumingEphemeralToken } from '#db/ephemeral-registration-tokens.js';
-import { createRunnerSession } from '#db/runner-sessions.js';
+import { createRunnerSession, createRunnerSessionConsumingActivationToken } from '#db/runner-sessions.js';
 import { EmptyRunnerLabelsError } from './errors.js';
 export async function registerRunnerSession(params) {
     const labels = [
@@ -9,21 +8,25 @@ export async function registerRunnerSession(params) {
     ];
     if (labels.length === 0) throw new EmptyRunnerLabelsError();
     const mode = params.credential.kind;
-    const maxClaims = params.credential.kind === 'ephemeral' ? 1 : null;
+    const maxClaims = params.credential.kind === 'manual' ? null : 1;
     const session = params.credential.kind === 'manual' ? await createRunnerSession({
         workspaceId: params.credential.workspaceId,
         scope: 'workspace',
         registrationTokenId: params.credential.registrationTokenId,
         labels,
         toolCapabilities: params.toolCapabilities ?? null
-    }) : await createRunnerSessionConsumingEphemeralToken({
+    }) : params.credential.kind === 'ephemeral' ? await createRunnerSessionConsumingEphemeralToken({
         ephemeralTokenId: params.credential.ephemeralTokenId,
         workspaceId: params.credential.workspaceId,
         labels,
         toolCapabilities: params.toolCapabilities ?? null,
         maxClaims: 1
+    }) : await createRunnerSessionConsumingActivationToken({
+        activationTokenId: params.credential.activationTokenId,
+        labels,
+        toolCapabilities: params.toolCapabilities ?? null
     });
-    const sessionToken = await issueRunnerSessionToken({
+    const { token: sessionToken } = await params.auth.mintRunnerSessionToken({
         runnerSessionId: session.id,
         workspaceId: session.workspaceId,
         scope: session.scope,

package/dist/core/runner-sessions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/core/runner-sessions.ts"],"sourcesContent":["import {issueRunnerSessionToken} from '@shipfox/api-auth';\nimport type {RunnerToolCapabilitiesDto} from '@shipfox/api-runners-dto';\nimport {canonicalizeLabels} from '@shipfox/runner-labels';\nimport {createRunnerSessionConsumingEphemeralToken} from '#db/ephemeral-registration-tokens.js';\nimport {createRunnerSession} from '#db/runner-sessions.js';\nimport type {RunnerSession} from './entities/runner-session.js';\nimport {EmptyRunnerLabelsError} from './errors.js';\n\nexport interface RegisterRunnerSessionResult {\n  session: RunnerSession;\n  sessionToken: string;\n  mode: 'manual' | 'ephemeral';\n  maxClaims: number | null;\n}\n\nexport type RunnerRegistrationCredential =\n  | {\n      kind: 'manual';\n      registrationTokenId: string;\n      workspaceId: string;\n    }\n  | {\n      kind: 'ephemeral';\n      ephemeralTokenId: string;\n      workspaceId: string;\n      provisionerId: string;\n      reservationId: string | null;\n      provisionedRunnerId: string;\n    };\n\nexport async function registerRunnerSession(params: {\n  credential: RunnerRegistrationCredential;\n  labels: string[];\n  toolCapabilities?: RunnerToolCapabilitiesDto | null;\n}): Promise<RegisterRunnerSessionResult> {\n  const labels = [...canonicalizeLabels(params.labels)];\n  if (labels.length === 0) throw new EmptyRunnerLabelsError();\n\n  const mode = params.credential.kind;\n  const maxClaims = params.credential.kind === 'ephemeral' ? 1 : null;\n  const session =\n    params.credential.kind === 'manual'\n      ? await createRunnerSession({\n          workspaceId: params.credential.workspaceId,\n          scope: 'workspace',\n          registrationTokenId: params.credential.registrationTokenId,\n          labels,\n          toolCapabilities: params.toolCapabilities ?? null,\n        })\n      : await createRunnerSessionConsumingEphemeralToken({\n          ephemeralTokenId: params.credential.ephemeralTokenId,\n          workspaceId: params.credential.workspaceId,\n          labels,\n          toolCapabilities: params.toolCapabilities ?? null,\n          maxClaims: 1,\n        });\n  const sessionToken = await issueRunnerSessionToken({\n    runnerSessionId: session.id,\n    workspaceId: session.workspaceId,\n    scope: session.scope,\n    labels: session.labels,\n    maxClaims,\n  });\n\n  return {session, sessionToken, mode, maxClaims};\n}\n"],"names":["issueRunnerSessionToken","canonicalizeLabels","createRunnerSessionConsumingEphemeralToken","createRunnerSession","EmptyRunnerLabelsError","registerRunnerSession","params","labels","length","mode","credential","kind","maxClaims","session","workspaceId","scope","registrationTokenId","toolCapabilities","ephemeralTokenId","sessionToken","runnerSessionId","id"],"mappings":"AAAA,SAAQA,uBAAuB,QAAO,oBAAoB;AAE1D,SAAQC,kBAAkB,QAAO,yBAAyB;AAC1D,SAAQC,0CAA0C,QAAO,uCAAuC;AAChG,SAAQC,mBAAmB,QAAO,yBAAyB;AAE3D,SAAQC,sBAAsB,QAAO,cAAc;AAwBnD,OAAO,eAAeC,sBAAsBC,MAI3C;IACC,MAAMC,SAAS;WAAIN,mBAAmBK,OAAOC,MAAM;KAAE;IACrD,IAAIA,OAAOC,MAAM,KAAK,GAAG,MAAM,IAAIJ;IAEnC,MAAMK,OAAOH,OAAOI,UAAU,CAACC,IAAI;IACnC,MAAMC,YAAYN,OAAOI,UAAU,CAACC,IAAI,KAAK,cAAc,IAAI;IAC/D,MAAME,UACJP,OAAOI,UAAU,CAACC,IAAI,KAAK,WACvB,MAAMR,oBAAoB;QACxBW,aAAaR,OAAOI,UAAU,CAACI,WAAW;QAC1CC,OAAO;QACPC,qBAAqBV,OAAOI,UAAU,CAACM,mBAAmB;QAC1DT;QACAU,kBAAkBX,OAAOW,gBAAgB,IAAI;IAC/C,KACA,MAAMf,2CAA2C;QAC/CgB,kBAAkBZ,OAAOI,UAAU,CAACQ,gBAAgB;QACpDJ,aAAaR,OAAOI,UAAU,CAACI,WAAW;QAC1CP;QACAU,kBAAkBX,OAAOW,gBAAgB,IAAI;QAC7CL,WAAW;IACb;IACN,MAAMO,eAAe,MAAMnB,wBAAwB;QACjDoB,iBAAiBP,QAAQQ,EAAE;QAC3BP,aAAaD,QAAQC,WAAW;QAChCC,OAAOF,QAAQE,KAAK;QACpBR,QAAQM,QAAQN,MAAM;QACtBK;IACF;IAEA,OAAO;QAACC;QAASM;QAAcV;QAAMG;IAAS;AAChD"}
+{"version":3,"sources":["../../src/core/runner-sessions.ts"],"sourcesContent":["import type {AuthInterModuleClient} from '@shipfox/api-auth-dto/inter-module';\nimport type {RunnerToolCapabilitiesDto} from '@shipfox/api-runners-dto';\nimport {canonicalizeLabels} from '@shipfox/runner-labels';\nimport {createRunnerSessionConsumingEphemeralToken} from '#db/ephemeral-registration-tokens.js';\nimport {\n  createRunnerSession,\n  createRunnerSessionConsumingActivationToken,\n} from '#db/runner-sessions.js';\nimport type {RunnerSession} from './entities/runner-session.js';\nimport {EmptyRunnerLabelsError} from './errors.js';\n\nexport interface RegisterRunnerSessionResult {\n  session: RunnerSession;\n  sessionToken: string;\n  mode: 'manual' | 'ephemeral' | 'activation';\n  maxClaims: number | null;\n}\n\nexport type RunnerRegistrationCredential =\n  | {\n      kind: 'manual';\n      registrationTokenId: string;\n      workspaceId: string;\n    }\n  | {\n      kind: 'ephemeral';\n      ephemeralTokenId: string;\n      workspaceId: string;\n      provisionerId: string;\n      reservationId: string | null;\n      providerRunnerId: string;\n    }\n  | {kind: 'activation'; activationTokenId: string; workspaceId: string};\n\nexport async function registerRunnerSession(params: {\n  auth: AuthInterModuleClient;\n  credential: RunnerRegistrationCredential;\n  labels: string[];\n  toolCapabilities?: RunnerToolCapabilitiesDto | null;\n}): Promise<RegisterRunnerSessionResult> {\n  const labels = [...canonicalizeLabels(params.labels)];\n  if (labels.length === 0) throw new EmptyRunnerLabelsError();\n\n  const mode = params.credential.kind;\n  const maxClaims = params.credential.kind === 'manual' ? null : 1;\n  const session =\n    params.credential.kind === 'manual'\n      ? await createRunnerSession({\n          workspaceId: params.credential.workspaceId,\n          scope: 'workspace',\n          registrationTokenId: params.credential.registrationTokenId,\n          labels,\n          toolCapabilities: params.toolCapabilities ?? null,\n        })\n      : params.credential.kind === 'ephemeral'\n        ? await createRunnerSessionConsumingEphemeralToken({\n            ephemeralTokenId: params.credential.ephemeralTokenId,\n            workspaceId: params.credential.workspaceId,\n            labels,\n            toolCapabilities: params.toolCapabilities ?? null,\n            maxClaims: 1,\n          })\n        : await createRunnerSessionConsumingActivationToken({\n            activationTokenId: params.credential.activationTokenId,\n            labels,\n            toolCapabilities: params.toolCapabilities ?? null,\n          });\n  const {token: sessionToken} = await params.auth.mintRunnerSessionToken({\n    runnerSessionId: session.id,\n    workspaceId: session.workspaceId,\n    scope: session.scope,\n    labels: session.labels,\n    maxClaims,\n  });\n\n  return {session, sessionToken, mode, maxClaims};\n}\n"],"names":["canonicalizeLabels","createRunnerSessionConsumingEphemeralToken","createRunnerSession","createRunnerSessionConsumingActivationToken","EmptyRunnerLabelsError","registerRunnerSession","params","labels","length","mode","credential","kind","maxClaims","session","workspaceId","scope","registrationTokenId","toolCapabilities","ephemeralTokenId","activationTokenId","token","sessionToken","auth","mintRunnerSessionToken","runnerSessionId","id"],"mappings":"AAEA,SAAQA,kBAAkB,QAAO,yBAAyB;AAC1D,SAAQC,0CAA0C,QAAO,uCAAuC;AAChG,SACEC,mBAAmB,EACnBC,2CAA2C,QACtC,yBAAyB;AAEhC,SAAQC,sBAAsB,QAAO,cAAc;AAyBnD,OAAO,eAAeC,sBAAsBC,MAK3C;IACC,MAAMC,SAAS;WAAIP,mBAAmBM,OAAOC,MAAM;KAAE;IACrD,IAAIA,OAAOC,MAAM,KAAK,GAAG,MAAM,IAAIJ;IAEnC,MAAMK,OAAOH,OAAOI,UAAU,CAACC,IAAI;IACnC,MAAMC,YAAYN,OAAOI,UAAU,CAACC,IAAI,KAAK,WAAW,OAAO;IAC/D,MAAME,UACJP,OAAOI,UAAU,CAACC,IAAI,KAAK,WACvB,MAAMT,oBAAoB;QACxBY,aAAaR,OAAOI,UAAU,CAACI,WAAW;QAC1CC,OAAO;QACPC,qBAAqBV,OAAOI,UAAU,CAACM,mBAAmB;QAC1DT;QACAU,kBAAkBX,OAAOW,gBAAgB,IAAI;IAC/C,KACAX,OAAOI,UAAU,CAACC,IAAI,KAAK,cACzB,MAAMV,2CAA2C;QAC/CiB,kBAAkBZ,OAAOI,UAAU,CAACQ,gBAAgB;QACpDJ,aAAaR,OAAOI,UAAU,CAACI,WAAW;QAC1CP;QACAU,kBAAkBX,OAAOW,gBAAgB,IAAI;QAC7CL,WAAW;IACb,KACA,MAAMT,4CAA4C;QAChDgB,mBAAmBb,OAAOI,UAAU,CAACS,iBAAiB;QACtDZ;QACAU,kBAAkBX,OAAOW,gBAAgB,IAAI;IAC/C;IACR,MAAM,EAACG,OAAOC,YAAY,EAAC,GAAG,MAAMf,OAAOgB,IAAI,CAACC,sBAAsB,CAAC;QACrEC,iBAAiBX,QAAQY,EAAE;QAC3BX,aAAaD,QAAQC,WAAW;QAChCC,OAAOF,QAAQE,KAAK;QACpBR,QAAQM,QAAQN,MAAM;QACtBK;IACF;IAEA,OAAO;QAACC;QAASQ;QAAcZ;QAAMG;IAAS;AAChD"}

package/dist/db/capacity-assignments.d.ts

@@ -0,0 +1,7 @@
+import type { CapacityAssignment } from '#core/entities/capacity-assignment.js';
+export declare function assignCapacityBatch(params: {
+    provisionerId: string;
+    reservationId: string;
+    capacityIds: string[];
+}): Promise<CapacityAssignment[]>;
+//# sourceMappingURL=capacity-assignments.d.ts.map

package/dist/db/capacity-assignments.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"capacity-assignments.d.ts","sourceRoot":"","sources":["../../src/db/capacity-assignments.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,uCAAuC,CAAC;AAY9E,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAkGhC"}

package/dist/db/capacity-assignments.js

@@ -0,0 +1,72 @@
+import { and, eq, inArray, sql } from 'drizzle-orm';
+import { CapacityAlreadyAssignedError, CapacityNotAssignableError, ReservationExpiredError, ReservationNotFoundError } from '#core/errors.js';
+import { db } from './db.js';
+import { capacityAssignments, toCapacityAssignment } from './schema/capacity-assignments.js';
+import { reservations } from './schema/reservations.js';
+import { providerRunners } from './schema/runner-instances.js';
+export async function assignCapacityBatch(params) {
+    return await db().transaction(async (tx)=>{
+        const lockKey = [
+            'runners_capacity_assignments',
+            params.provisionerId,
+            params.reservationId
+        ].join(':');
+        await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${lockKey}))`);
+        for (const capacityId of [
+            ...params.capacityIds
+        ].sort()){
+            await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${[
+                'runners_capacity_assignments',
+                capacityId
+            ].join(':')}))`);
+        }
+        const [reservation] = await tx.select().from(reservations).where(and(eq(reservations.id, params.reservationId), eq(reservations.provisionerId, params.provisionerId))).limit(1);
+        if (!reservation) throw new ReservationNotFoundError(params.reservationId);
+        if (reservation.expiresAt <= new Date()) throw new ReservationExpiredError(params.reservationId);
+        const existing = await tx.select().from(capacityAssignments).where(eq(capacityAssignments.reservationId, reservation.id));
+        const existingByCapacityId = new Map(existing.map((assignment)=>[
+                assignment.capacityId,
+                assignment
+            ]));
+        const newCapacityIds = params.capacityIds.filter((capacityId)=>!existingByCapacityId.has(capacityId));
+        if (existing.length + newCapacityIds.length > reservation.count) throw new CapacityNotAssignableError(params.capacityIds[0] ?? '');
+        if (newCapacityIds.length === 0) {
+            return params.capacityIds.flatMap((capacityId)=>{
+                const assignment = existingByCapacityId.get(capacityId);
+                return assignment ? [
+                    toCapacityAssignment(assignment)
+                ] : [];
+            });
+        }
+        const capacities = await tx.select().from(providerRunners).where(and(eq(providerRunners.provisionerId, params.provisionerId), inArray(providerRunners.id, newCapacityIds)));
+        if (capacities.length !== newCapacityIds.length) throw new CapacityNotAssignableError(params.capacityIds[0] ?? '');
+        for (const capacity of capacities){
+            if (capacity.state !== 'starting' && capacity.state !== 'running') throw new CapacityNotAssignableError(capacity.id);
+            if (!capacity.providerRunnerId || capacity.labels.length === 0 || !reservation.requiredLabels.every((label)=>capacity.labels.includes(label))) {
+                throw new CapacityNotAssignableError(capacity.id);
+            }
+        }
+        const assignedCapacity = await tx.select({
+            capacityId: capacityAssignments.capacityId
+        }).from(capacityAssignments).where(inArray(capacityAssignments.capacityId, newCapacityIds));
+        if (assignedCapacity.length > 0) throw new CapacityAlreadyAssignedError(assignedCapacity[0]?.capacityId ?? '');
+        const inserted = await tx.insert(capacityAssignments).values(newCapacityIds.map((capacityId)=>({
+                capacityId,
+                reservationId: reservation.id,
+                workspaceId: reservation.workspaceId,
+                provisionerId: params.provisionerId
+            }))).returning();
+        const insertedByCapacityId = new Map(inserted.map((assignment)=>[
+                assignment.capacityId,
+                assignment
+            ]));
+        return params.capacityIds.flatMap((capacityId)=>{
+            const assignment = existingByCapacityId.get(capacityId) ?? insertedByCapacityId.get(capacityId);
+            return assignment ? [
+                toCapacityAssignment(assignment)
+            ] : [];
+        });
+    });
+}
+
+//# sourceMappingURL=capacity-assignments.js.map

package/dist/db/capacity-assignments.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/db/capacity-assignments.ts"],"sourcesContent":["import {and, eq, inArray, sql} from 'drizzle-orm';\nimport type {CapacityAssignment} from '#core/entities/capacity-assignment.js';\nimport {\n  CapacityAlreadyAssignedError,\n  CapacityNotAssignableError,\n  ReservationExpiredError,\n  ReservationNotFoundError,\n} from '#core/errors.js';\nimport {db} from './db.js';\nimport {capacityAssignments, toCapacityAssignment} from './schema/capacity-assignments.js';\nimport {reservations} from './schema/reservations.js';\nimport {providerRunners} from './schema/runner-instances.js';\n\nexport async function assignCapacityBatch(params: {\n  provisionerId: string;\n  reservationId: string;\n  capacityIds: string[];\n}): Promise<CapacityAssignment[]> {\n  return await db().transaction(async (tx) => {\n    const lockKey = [\n      'runners_capacity_assignments',\n      params.provisionerId,\n      params.reservationId,\n    ].join(':');\n    await tx.execute(sql`select pg_advisory_xact_lock(hashtext(${lockKey}))`);\n    for (const capacityId of [...params.capacityIds].sort()) {\n      await tx.execute(\n        sql`select pg_advisory_xact_lock(hashtext(${['runners_capacity_assignments', capacityId].join(':')}))`,\n      );\n    }\n\n    const [reservation] = await tx\n      .select()\n      .from(reservations)\n      .where(\n        and(\n          eq(reservations.id, params.reservationId),\n          eq(reservations.provisionerId, params.provisionerId),\n        ),\n      )\n      .limit(1);\n    if (!reservation) throw new ReservationNotFoundError(params.reservationId);\n    if (reservation.expiresAt <= new Date())\n      throw new ReservationExpiredError(params.reservationId);\n\n    const existing = await tx\n      .select()\n      .from(capacityAssignments)\n      .where(eq(capacityAssignments.reservationId, reservation.id));\n    const existingByCapacityId = new Map(\n      existing.map((assignment) => [assignment.capacityId, assignment]),\n    );\n    const newCapacityIds = params.capacityIds.filter(\n      (capacityId) => !existingByCapacityId.has(capacityId),\n    );\n    if (existing.length + newCapacityIds.length > reservation.count)\n      throw new CapacityNotAssignableError(params.capacityIds[0] ?? '');\n\n    if (newCapacityIds.length === 0) {\n      return params.capacityIds.flatMap((capacityId) => {\n        const assignment = existingByCapacityId.get(capacityId);\n        return assignment ? [toCapacityAssignment(assignment)] : [];\n      });\n    }\n\n    const capacities = await tx\n      .select()\n      .from(providerRunners)\n      .where(\n        and(\n          eq(providerRunners.provisionerId, params.provisionerId),\n          inArray(providerRunners.id, newCapacityIds),\n        ),\n      );\n    if (capacities.length !== newCapacityIds.length)\n      throw new CapacityNotAssignableError(params.capacityIds[0] ?? '');\n    for (const capacity of capacities) {\n      if (capacity.state !== 'starting' && capacity.state !== 'running')\n        throw new CapacityNotAssignableError(capacity.id);\n      if (\n        !capacity.providerRunnerId ||\n        capacity.labels.length === 0 ||\n        !reservation.requiredLabels.every((label) => capacity.labels.includes(label))\n      ) {\n        throw new CapacityNotAssignableError(capacity.id);\n      }\n    }\n\n    const assignedCapacity = await tx\n      .select({capacityId: capacityAssignments.capacityId})\n      .from(capacityAssignments)\n      .where(inArray(capacityAssignments.capacityId, newCapacityIds));\n    if (assignedCapacity.length > 0)\n      throw new CapacityAlreadyAssignedError(assignedCapacity[0]?.capacityId ?? '');\n\n    const inserted = await tx\n      .insert(capacityAssignments)\n      .values(\n        newCapacityIds.map((capacityId) => ({\n          capacityId,\n          reservationId: reservation.id,\n          workspaceId: reservation.workspaceId,\n          provisionerId: params.provisionerId,\n        })),\n      )\n      .returning();\n    const insertedByCapacityId = new Map(\n      inserted.map((assignment) => [assignment.capacityId, assignment]),\n    );\n    return params.capacityIds.flatMap((capacityId) => {\n      const assignment =\n        existingByCapacityId.get(capacityId) ?? insertedByCapacityId.get(capacityId);\n      return assignment ? [toCapacityAssignment(assignment)] : [];\n    });\n  });\n}\n"],"names":["and","eq","inArray","sql","CapacityAlreadyAssignedError","CapacityNotAssignableError","ReservationExpiredError","ReservationNotFoundError","db","capacityAssignments","toCapacityAssignment","reservations","providerRunners","assignCapacityBatch","params","transaction","tx","lockKey","provisionerId","reservationId","join","execute","capacityId","capacityIds","sort","reservation","select","from","where","id","limit","expiresAt","Date","existing","existingByCapacityId","Map","map","assignment","newCapacityIds","filter","has","length","count","flatMap","get","capacities","capacity","state","providerRunnerId","labels","requiredLabels","every","label","includes","assignedCapacity","inserted","insert","values","workspaceId","returning","insertedByCapacityId"],"mappings":"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"}