@shipfox/api-runners 5.0.0 → 7.0.1

package/dist/presentation/auth/runner-registration-token-auth.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presentation/auth/runner-registration-token-auth.ts"],"sourcesContent":["import {AUTH_RUNNER_REGISTRATION_TOKEN} from '@shipfox/api-auth-context';\nimport {type AuthMethod, ClientError, extractBearerToken} from '@shipfox/node-fastify';\nimport {getTokenType, hashOpaqueToken} from '@shipfox/node-tokens';\nimport type {FastifyRequest} from 'fastify';\nimport {resolveEphemeralRegistrationTokenByHash} from '#db/ephemeral-registration-tokens.js';\nimport {resolveManualRegistrationTokenByHash} from '#db/manual-registration-tokens.js';\n\nconst RUNNER_CONTEXT_KEY = 'runner';\n\nexport type RunnerRegistrationContext =\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 function getRunnerContext(request: FastifyRequest): RunnerRegistrationContext {\n  const context = (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] as\n    | RunnerRegistrationContext\n    | undefined;\n  if (!context) {\n    throw new Error('Runner context is not available on this request');\n  }\n  return context;\n}\n\nexport function createRunnerRegistrationTokenAuthMethod(): AuthMethod {\n  return {\n    name: AUTH_RUNNER_REGISTRATION_TOKEN,\n    authenticate: async (request) => {\n      const rawToken = extractBearerToken(request.headers.authorization);\n      if (!rawToken) {\n        throw new ClientError('Missing or invalid Authorization header', 'unauthorized', {\n          status: 401,\n        });\n      }\n\n      const tokenType = getTokenType(rawToken);\n\n      if (tokenType === 'ephemeralRegistrationToken') {\n        const ephemeralToken = await resolveEphemeralRegistrationTokenByHash(\n          hashOpaqueToken(rawToken),\n        );\n        if (!ephemeralToken) {\n          throw new ClientError('Invalid runner registration token', 'unauthorized', {\n            status: 401,\n          });\n        }\n        if (ephemeralToken.expiresAt < new Date()) {\n          throw new ClientError(\n            'Ephemeral registration token has expired',\n            'registration-token-expired',\n            {status: 401},\n          );\n        }\n\n        (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] = {\n          kind: 'ephemeral',\n          ephemeralTokenId: ephemeralToken.id,\n          workspaceId: ephemeralToken.workspaceId,\n          provisionerId: ephemeralToken.provisionerId,\n          reservationId: ephemeralToken.reservationId,\n          provisionedRunnerId: ephemeralToken.provisionedRunnerId,\n        } satisfies RunnerRegistrationContext;\n        return;\n      }\n\n      if (tokenType !== 'manualRegistrationToken') {\n        throw new ClientError('Invalid runner registration token', 'unauthorized', {status: 401});\n      }\n\n      const token = await resolveManualRegistrationTokenByHash(hashOpaqueToken(rawToken));\n      if (!token) {\n        throw new ClientError('Invalid runner registration token', 'unauthorized', {status: 401});\n      }\n\n      if (token.expiresAt && token.expiresAt < new Date()) {\n        throw new ClientError('Registration token has expired', 'registration-token-expired', {\n          status: 401,\n        });\n      }\n      if (token.revokedAt) {\n        throw new ClientError(\n          'Manual registration token has been revoked',\n          'manual-registration-token-revoked',\n          {status: 401},\n        );\n      }\n\n      (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] = {\n        kind: 'manual',\n        registrationTokenId: token.id,\n        workspaceId: token.workspaceId,\n      } satisfies RunnerRegistrationContext;\n    },\n  };\n}\n"],"names":["AUTH_RUNNER_REGISTRATION_TOKEN","ClientError","extractBearerToken","getTokenType","hashOpaqueToken","resolveEphemeralRegistrationTokenByHash","resolveManualRegistrationTokenByHash","RUNNER_CONTEXT_KEY","getRunnerContext","request","context","Error","createRunnerRegistrationTokenAuthMethod","name","authenticate","rawToken","headers","authorization","status","tokenType","ephemeralToken","expiresAt","Date","kind","ephemeralTokenId","id","workspaceId","provisionerId","reservationId","provisionedRunnerId","token","revokedAt","registrationTokenId"],"mappings":"AAAA,SAAQA,8BAA8B,QAAO,4BAA4B;AACzE,SAAyBC,WAAW,EAAEC,kBAAkB,QAAO,wBAAwB;AACvF,SAAQC,YAAY,EAAEC,eAAe,QAAO,uBAAuB;AAEnE,SAAQC,uCAAuC,QAAO,uCAAuC;AAC7F,SAAQC,oCAAoC,QAAO,oCAAoC;AAEvF,MAAMC,qBAAqB;AAiB3B,OAAO,SAASC,iBAAiBC,OAAuB;IACtD,MAAMC,UAAU,AAACD,OAA8C,CAACF,mBAAmB;IAGnF,IAAI,CAACG,SAAS;QACZ,MAAM,IAAIC,MAAM;IAClB;IACA,OAAOD;AACT;AAEA,OAAO,SAASE;IACd,OAAO;QACLC,MAAMb;QACNc,cAAc,OAAOL;YACnB,MAAMM,WAAWb,mBAAmBO,QAAQO,OAAO,CAACC,aAAa;YACjE,IAAI,CAACF,UAAU;gBACb,MAAM,IAAId,YAAY,2CAA2C,gBAAgB;oBAC/EiB,QAAQ;gBACV;YACF;YAEA,MAAMC,YAAYhB,aAAaY;YAE/B,IAAII,cAAc,8BAA8B;gBAC9C,MAAMC,iBAAiB,MAAMf,wCAC3BD,gBAAgBW;gBAElB,IAAI,CAACK,gBAAgB;oBACnB,MAAM,IAAInB,YAAY,qCAAqC,gBAAgB;wBACzEiB,QAAQ;oBACV;gBACF;gBACA,IAAIE,eAAeC,SAAS,GAAG,IAAIC,QAAQ;oBACzC,MAAM,IAAIrB,YACR,4CACA,8BACA;wBAACiB,QAAQ;oBAAG;gBAEhB;gBAECT,OAA8C,CAACF,mBAAmB,GAAG;oBACpEgB,MAAM;oBACNC,kBAAkBJ,eAAeK,EAAE;oBACnCC,aAAaN,eAAeM,WAAW;oBACvCC,eAAeP,eAAeO,aAAa;oBAC3CC,eAAeR,eAAeQ,aAAa;oBAC3CC,qBAAqBT,eAAeS,mBAAmB;gBACzD;gBACA;YACF;YAEA,IAAIV,cAAc,2BAA2B;gBAC3C,MAAM,IAAIlB,YAAY,qCAAqC,gBAAgB;oBAACiB,QAAQ;gBAAG;YACzF;YAEA,MAAMY,QAAQ,MAAMxB,qCAAqCF,gBAAgBW;YACzE,IAAI,CAACe,OAAO;gBACV,MAAM,IAAI7B,YAAY,qCAAqC,gBAAgB;oBAACiB,QAAQ;gBAAG;YACzF;YAEA,IAAIY,MAAMT,SAAS,IAAIS,MAAMT,SAAS,GAAG,IAAIC,QAAQ;gBACnD,MAAM,IAAIrB,YAAY,kCAAkC,8BAA8B;oBACpFiB,QAAQ;gBACV;YACF;YACA,IAAIY,MAAMC,SAAS,EAAE;gBACnB,MAAM,IAAI9B,YACR,8CACA,qCACA;oBAACiB,QAAQ;gBAAG;YAEhB;YAECT,OAA8C,CAACF,mBAAmB,GAAG;gBACpEgB,MAAM;gBACNS,qBAAqBF,MAAML,EAAE;gBAC7BC,aAAaI,MAAMJ,WAAW;YAChC;QACF;IACF;AACF"}
+{"version":3,"sources":["../../../src/presentation/auth/runner-registration-token-auth.ts"],"sourcesContent":["import {AUTH_RUNNER_REGISTRATION_TOKEN} from '@shipfox/api-auth-context';\nimport {type AuthMethod, ClientError, extractBearerToken} from '@shipfox/node-fastify';\nimport {getTokenType, hashOpaqueToken} from '@shipfox/node-tokens';\nimport {and, eq, gt, isNull, or, sql} from 'drizzle-orm';\nimport type {FastifyRequest} from 'fastify';\nimport {db} from '#db/db.js';\nimport {resolveEphemeralRegistrationTokenByHash} from '#db/ephemeral-registration-tokens.js';\nimport {resolveManualRegistrationTokenByHash} from '#db/manual-registration-tokens.js';\nimport {provisionerTokens} from '#db/schema/provisioner-tokens.js';\nimport {runnerActivationTokens} from '#db/schema/runner-activation-tokens.js';\nimport {providerRunners} from '#db/schema/runner-instances.js';\n\nconst RUNNER_CONTEXT_KEY = 'runner';\n\nexport type RunnerRegistrationContext =\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 function getRunnerContext(request: FastifyRequest): RunnerRegistrationContext {\n  const context = (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] as\n    | RunnerRegistrationContext\n    | undefined;\n  if (!context) {\n    throw new Error('Runner context is not available on this request');\n  }\n  return context;\n}\n\nexport function createRunnerRegistrationTokenAuthMethod(): AuthMethod {\n  return {\n    name: AUTH_RUNNER_REGISTRATION_TOKEN,\n    authenticate: async (request) => {\n      const rawToken = extractBearerToken(request.headers.authorization);\n      if (!rawToken) {\n        throw new ClientError('Missing or invalid Authorization header', 'unauthorized', {\n          status: 401,\n        });\n      }\n\n      const tokenType = getTokenType(rawToken);\n\n      if (tokenType === 'runnerActivationToken') {\n        const [activation] = await db()\n          .select({id: runnerActivationTokens.id, workspaceId: providerRunners.workspaceId})\n          .from(runnerActivationTokens)\n          .innerJoin(\n            providerRunners,\n            eq(providerRunners.id, runnerActivationTokens.runnerInstanceId),\n          )\n          .leftJoin(provisionerTokens, eq(provisionerTokens.id, providerRunners.provisionerId))\n          .where(\n            and(\n              eq(runnerActivationTokens.hashedToken, hashOpaqueToken(rawToken)),\n              isNull(runnerActivationTokens.consumedAt),\n              isNull(runnerActivationTokens.revokedAt),\n              gt(runnerActivationTokens.expiresAt, sql`now()`),\n              or(isNull(provisionerTokens.id), isNull(provisionerTokens.revokedAt)),\n              isNull(providerRunners.runnerSessionId),\n            ),\n          )\n          .limit(1);\n        if (!activation?.workspaceId)\n          throw new ClientError('Invalid runner registration token', 'unauthorized', {status: 401});\n        (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] = {\n          kind: 'activation',\n          activationTokenId: activation.id,\n          workspaceId: activation.workspaceId,\n        } satisfies RunnerRegistrationContext;\n        return;\n      }\n\n      if (tokenType === 'ephemeralRegistrationToken') {\n        const ephemeralToken = await resolveEphemeralRegistrationTokenByHash(\n          hashOpaqueToken(rawToken),\n        );\n        if (!ephemeralToken) {\n          throw new ClientError('Invalid runner registration token', 'unauthorized', {\n            status: 401,\n          });\n        }\n        if (ephemeralToken.expiresAt < new Date()) {\n          throw new ClientError(\n            'Ephemeral registration token has expired',\n            'registration-token-expired',\n            {status: 401},\n          );\n        }\n\n        (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] = {\n          kind: 'ephemeral',\n          ephemeralTokenId: ephemeralToken.id,\n          workspaceId: ephemeralToken.workspaceId,\n          provisionerId: ephemeralToken.provisionerId,\n          reservationId: ephemeralToken.reservationId,\n          providerRunnerId: ephemeralToken.providerRunnerId,\n        } satisfies RunnerRegistrationContext;\n        return;\n      }\n\n      if (tokenType !== 'manualRegistrationToken') {\n        throw new ClientError('Invalid runner registration token', 'unauthorized', {status: 401});\n      }\n\n      const token = await resolveManualRegistrationTokenByHash(hashOpaqueToken(rawToken));\n      if (!token) {\n        throw new ClientError('Invalid runner registration token', 'unauthorized', {status: 401});\n      }\n\n      if (token.expiresAt && token.expiresAt < new Date()) {\n        throw new ClientError('Registration token has expired', 'registration-token-expired', {\n          status: 401,\n        });\n      }\n      if (token.revokedAt) {\n        throw new ClientError(\n          'Manual registration token has been revoked',\n          'manual-registration-token-revoked',\n          {status: 401},\n        );\n      }\n\n      (request as unknown as Record<string, unknown>)[RUNNER_CONTEXT_KEY] = {\n        kind: 'manual',\n        registrationTokenId: token.id,\n        workspaceId: token.workspaceId,\n      } satisfies RunnerRegistrationContext;\n    },\n  };\n}\n"],"names":["AUTH_RUNNER_REGISTRATION_TOKEN","ClientError","extractBearerToken","getTokenType","hashOpaqueToken","and","eq","gt","isNull","or","sql","db","resolveEphemeralRegistrationTokenByHash","resolveManualRegistrationTokenByHash","provisionerTokens","runnerActivationTokens","providerRunners","RUNNER_CONTEXT_KEY","getRunnerContext","request","context","Error","createRunnerRegistrationTokenAuthMethod","name","authenticate","rawToken","headers","authorization","status","tokenType","activation","select","id","workspaceId","from","innerJoin","runnerInstanceId","leftJoin","provisionerId","where","hashedToken","consumedAt","revokedAt","expiresAt","runnerSessionId","limit","kind","activationTokenId","ephemeralToken","Date","ephemeralTokenId","reservationId","providerRunnerId","token","registrationTokenId"],"mappings":"AAAA,SAAQA,8BAA8B,QAAO,4BAA4B;AACzE,SAAyBC,WAAW,EAAEC,kBAAkB,QAAO,wBAAwB;AACvF,SAAQC,YAAY,EAAEC,eAAe,QAAO,uBAAuB;AACnE,SAAQC,GAAG,EAAEC,EAAE,EAAEC,EAAE,EAAEC,MAAM,EAAEC,EAAE,EAAEC,GAAG,QAAO,cAAc;AAEzD,SAAQC,EAAE,QAAO,YAAY;AAC7B,SAAQC,uCAAuC,QAAO,uCAAuC;AAC7F,SAAQC,oCAAoC,QAAO,oCAAoC;AACvF,SAAQC,iBAAiB,QAAO,mCAAmC;AACnE,SAAQC,sBAAsB,QAAO,yCAAyC;AAC9E,SAAQC,eAAe,QAAO,iCAAiC;AAE/D,MAAMC,qBAAqB;AAkB3B,OAAO,SAASC,iBAAiBC,OAAuB;IACtD,MAAMC,UAAU,AAACD,OAA8C,CAACF,mBAAmB;IAGnF,IAAI,CAACG,SAAS;QACZ,MAAM,IAAIC,MAAM;IAClB;IACA,OAAOD;AACT;AAEA,OAAO,SAASE;IACd,OAAO;QACLC,MAAMvB;QACNwB,cAAc,OAAOL;YACnB,MAAMM,WAAWvB,mBAAmBiB,QAAQO,OAAO,CAACC,aAAa;YACjE,IAAI,CAACF,UAAU;gBACb,MAAM,IAAIxB,YAAY,2CAA2C,gBAAgB;oBAC/E2B,QAAQ;gBACV;YACF;YAEA,MAAMC,YAAY1B,aAAasB;YAE/B,IAAII,cAAc,yBAAyB;gBACzC,MAAM,CAACC,WAAW,GAAG,MAAMnB,KACxBoB,MAAM,CAAC;oBAACC,IAAIjB,uBAAuBiB,EAAE;oBAAEC,aAAajB,gBAAgBiB,WAAW;gBAAA,GAC/EC,IAAI,CAACnB,wBACLoB,SAAS,CACRnB,iBACAV,GAAGU,gBAAgBgB,EAAE,EAAEjB,uBAAuBqB,gBAAgB,GAE/DC,QAAQ,CAACvB,mBAAmBR,GAAGQ,kBAAkBkB,EAAE,EAAEhB,gBAAgBsB,aAAa,GAClFC,KAAK,CACJlC,IACEC,GAAGS,uBAAuByB,WAAW,EAAEpC,gBAAgBqB,YACvDjB,OAAOO,uBAAuB0B,UAAU,GACxCjC,OAAOO,uBAAuB2B,SAAS,GACvCnC,GAAGQ,uBAAuB4B,SAAS,EAAEjC,GAAG,CAAC,KAAK,CAAC,GAC/CD,GAAGD,OAAOM,kBAAkBkB,EAAE,GAAGxB,OAAOM,kBAAkB4B,SAAS,IACnElC,OAAOQ,gBAAgB4B,eAAe,IAGzCC,KAAK,CAAC;gBACT,IAAI,CAACf,YAAYG,aACf,MAAM,IAAIhC,YAAY,qCAAqC,gBAAgB;oBAAC2B,QAAQ;gBAAG;gBACxFT,OAA8C,CAACF,mBAAmB,GAAG;oBACpE6B,MAAM;oBACNC,mBAAmBjB,WAAWE,EAAE;oBAChCC,aAAaH,WAAWG,WAAW;gBACrC;gBACA;YACF;YAEA,IAAIJ,cAAc,8BAA8B;gBAC9C,MAAMmB,iBAAiB,MAAMpC,wCAC3BR,gBAAgBqB;gBAElB,IAAI,CAACuB,gBAAgB;oBACnB,MAAM,IAAI/C,YAAY,qCAAqC,gBAAgB;wBACzE2B,QAAQ;oBACV;gBACF;gBACA,IAAIoB,eAAeL,SAAS,GAAG,IAAIM,QAAQ;oBACzC,MAAM,IAAIhD,YACR,4CACA,8BACA;wBAAC2B,QAAQ;oBAAG;gBAEhB;gBAECT,OAA8C,CAACF,mBAAmB,GAAG;oBACpE6B,MAAM;oBACNI,kBAAkBF,eAAehB,EAAE;oBACnCC,aAAae,eAAef,WAAW;oBACvCK,eAAeU,eAAeV,aAAa;oBAC3Ca,eAAeH,eAAeG,aAAa;oBAC3CC,kBAAkBJ,eAAeI,gBAAgB;gBACnD;gBACA;YACF;YAEA,IAAIvB,cAAc,2BAA2B;gBAC3C,MAAM,IAAI5B,YAAY,qCAAqC,gBAAgB;oBAAC2B,QAAQ;gBAAG;YACzF;YAEA,MAAMyB,QAAQ,MAAMxC,qCAAqCT,gBAAgBqB;YACzE,IAAI,CAAC4B,OAAO;gBACV,MAAM,IAAIpD,YAAY,qCAAqC,gBAAgB;oBAAC2B,QAAQ;gBAAG;YACzF;YAEA,IAAIyB,MAAMV,SAAS,IAAIU,MAAMV,SAAS,GAAG,IAAIM,QAAQ;gBACnD,MAAM,IAAIhD,YAAY,kCAAkC,8BAA8B;oBACpF2B,QAAQ;gBACV;YACF;YACA,IAAIyB,MAAMX,SAAS,EAAE;gBACnB,MAAM,IAAIzC,YACR,8CACA,qCACA;oBAAC2B,QAAQ;gBAAG;YAEhB;YAECT,OAA8C,CAACF,mBAAmB,GAAG;gBACpE6B,MAAM;gBACNQ,qBAAqBD,MAAMrB,EAAE;gBAC7BC,aAAaoB,MAAMpB,WAAW;YAChC;QACF;IACF;AACF"}

package/dist/presentation/dto/index.d.ts

@@ -1,7 +1,6 @@
 export { toActiveProvisionerDto } from './active-provisioner.js';
 export { toManualRegistrationTokenDto } from './manual-registration-token.js';
-export { toMintRegistrationTokensProvisionedRunners, toMintRegistrationTokensResponseDto, } from './mint-registration-tokens.js';
 export { toPollDemandResponseDto } from './poll-demand.js';
-export { toActiveRunnersResponseDto, toReconcileProvisionedRunnersResponseDto, toReportProvisionedRunnersResponseDto, } from './provisioned-runners.js';
 export { toProvisionerTokenDto } from './provisioner-token.js';
+export { toActiveRunnersResponseDto, toReconcileRunnerInstancesResponseDto, toReportRunnerInstancesResponseDto, } from './runner-instances.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/presentation/dto/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,4BAA4B,EAAC,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EACL,0CAA0C,EAC1C,mCAAmC,GACpC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,uBAAuB,EAAC,MAAM,kBAAkB,CAAC;AACzD,OAAO,EACL,0BAA0B,EAC1B,wCAAwC,EACxC,qCAAqC,GACtC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAC,4BAA4B,EAAC,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAC,uBAAuB,EAAC,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,0BAA0B,EAC1B,qCAAqC,EACrC,kCAAkC,GACnC,MAAM,uBAAuB,CAAC"}

package/dist/presentation/dto/index.js

@@ -1,8 +1,7 @@
 export { toActiveProvisionerDto } from './active-provisioner.js';
 export { toManualRegistrationTokenDto } from './manual-registration-token.js';
-export { toMintRegistrationTokensProvisionedRunners, toMintRegistrationTokensResponseDto } from './mint-registration-tokens.js';
 export { toPollDemandResponseDto } from './poll-demand.js';
-export { toActiveRunnersResponseDto, toReconcileProvisionedRunnersResponseDto, toReportProvisionedRunnersResponseDto } from './provisioned-runners.js';
 export { toProvisionerTokenDto } from './provisioner-token.js';
+export { toActiveRunnersResponseDto, toReconcileRunnerInstancesResponseDto, toReportRunnerInstancesResponseDto } from './runner-instances.js';
 
 //# sourceMappingURL=index.js.map

package/dist/presentation/dto/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presentation/dto/index.ts"],"sourcesContent":["export {toActiveProvisionerDto} from './active-provisioner.js';\nexport {toManualRegistrationTokenDto} from './manual-registration-token.js';\nexport {\n  toMintRegistrationTokensProvisionedRunners,\n  toMintRegistrationTokensResponseDto,\n} from './mint-registration-tokens.js';\nexport {toPollDemandResponseDto} from './poll-demand.js';\nexport {\n  toActiveRunnersResponseDto,\n  toReconcileProvisionedRunnersResponseDto,\n  toReportProvisionedRunnersResponseDto,\n} from './provisioned-runners.js';\nexport {toProvisionerTokenDto} from './provisioner-token.js';\n"],"names":["toActiveProvisionerDto","toManualRegistrationTokenDto","toMintRegistrationTokensProvisionedRunners","toMintRegistrationTokensResponseDto","toPollDemandResponseDto","toActiveRunnersResponseDto","toReconcileProvisionedRunnersResponseDto","toReportProvisionedRunnersResponseDto","toProvisionerTokenDto"],"mappings":"AAAA,SAAQA,sBAAsB,QAAO,0BAA0B;AAC/D,SAAQC,4BAA4B,QAAO,iCAAiC;AAC5E,SACEC,0CAA0C,EAC1CC,mCAAmC,QAC9B,gCAAgC;AACvC,SAAQC,uBAAuB,QAAO,mBAAmB;AACzD,SACEC,0BAA0B,EAC1BC,wCAAwC,EACxCC,qCAAqC,QAChC,2BAA2B;AAClC,SAAQC,qBAAqB,QAAO,yBAAyB"}
+{"version":3,"sources":["../../../src/presentation/dto/index.ts"],"sourcesContent":["export {toActiveProvisionerDto} from './active-provisioner.js';\nexport {toManualRegistrationTokenDto} from './manual-registration-token.js';\nexport {toPollDemandResponseDto} from './poll-demand.js';\nexport {toProvisionerTokenDto} from './provisioner-token.js';\nexport {\n  toActiveRunnersResponseDto,\n  toReconcileRunnerInstancesResponseDto,\n  toReportRunnerInstancesResponseDto,\n} from './runner-instances.js';\n"],"names":["toActiveProvisionerDto","toManualRegistrationTokenDto","toPollDemandResponseDto","toProvisionerTokenDto","toActiveRunnersResponseDto","toReconcileRunnerInstancesResponseDto","toReportRunnerInstancesResponseDto"],"mappings":"AAAA,SAAQA,sBAAsB,QAAO,0BAA0B;AAC/D,SAAQC,4BAA4B,QAAO,iCAAiC;AAC5E,SAAQC,uBAAuB,QAAO,mBAAmB;AACzD,SAAQC,qBAAqB,QAAO,yBAAyB;AAC7D,SACEC,0BAA0B,EAC1BC,qCAAqC,EACrCC,kCAAkC,QAC7B,wBAAwB"}

package/dist/presentation/dto/poll-demand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"poll-demand.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/poll-demand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEtD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,qBAAqB,CAgBvF"}
+{"version":3,"file":"poll-demand.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/poll-demand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEtD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,qBAAqB,CAkBvF"}

package/dist/presentation/dto/poll-demand.js

@@ -1,6 +1,9 @@
 export function toPollDemandResponseDto(result) {
     return {
         stats: result.stats.map((stat)=>({
+                ...stat.workspaceId ? {
+                    workspace_id: stat.workspaceId
+                } : {},
                 labels: stat.labels,
                 queued: stat.queued,
                 reserved: stat.reserved,
@@ -8,11 +11,14 @@ export function toPollDemandResponseDto(result) {
             })),
         reservations: result.reservations.map((reservation)=>({
                 reservation_id: reservation.reservationId,
+                ...reservation.workspaceId ? {
+                    workspace_id: reservation.workspaceId
+                } : {},
                 labels: reservation.labels,
                 count: reservation.count,
                 expires_at: reservation.expiresAt.toISOString()
             })),
-        terminate_provisioned_runner_ids: result.terminateProvisionedRunnerIds
+        terminate_provider_runner_ids: result.terminateRunnerInstanceIds
     };
 }
 

package/dist/presentation/dto/poll-demand.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presentation/dto/poll-demand.ts"],"sourcesContent":["import type {PollDemandResponseDto} from '@shipfox/api-runners-dto';\nimport type {PollDemandResult} from '#core/demand.js';\n\nexport function toPollDemandResponseDto(result: PollDemandResult): PollDemandResponseDto {\n  return {\n    stats: result.stats.map((stat) => ({\n      labels: stat.labels,\n      queued: stat.queued,\n      reserved: stat.reserved,\n      oldest_queued_at: stat.oldestQueuedAt.toISOString(),\n    })),\n    reservations: result.reservations.map((reservation) => ({\n      reservation_id: reservation.reservationId,\n      labels: reservation.labels,\n      count: reservation.count,\n      expires_at: reservation.expiresAt.toISOString(),\n    })),\n    terminate_provisioned_runner_ids: result.terminateProvisionedRunnerIds,\n  };\n}\n"],"names":["toPollDemandResponseDto","result","stats","map","stat","labels","queued","reserved","oldest_queued_at","oldestQueuedAt","toISOString","reservations","reservation","reservation_id","reservationId","count","expires_at","expiresAt","terminate_provisioned_runner_ids","terminateProvisionedRunnerIds"],"mappings":"AAGA,OAAO,SAASA,wBAAwBC,MAAwB;IAC9D,OAAO;QACLC,OAAOD,OAAOC,KAAK,CAACC,GAAG,CAAC,CAACC,OAAU,CAAA;gBACjCC,QAAQD,KAAKC,MAAM;gBACnBC,QAAQF,KAAKE,MAAM;gBACnBC,UAAUH,KAAKG,QAAQ;gBACvBC,kBAAkBJ,KAAKK,cAAc,CAACC,WAAW;YACnD,CAAA;QACAC,cAAcV,OAAOU,YAAY,CAACR,GAAG,CAAC,CAACS,cAAiB,CAAA;gBACtDC,gBAAgBD,YAAYE,aAAa;gBACzCT,QAAQO,YAAYP,MAAM;gBAC1BU,OAAOH,YAAYG,KAAK;gBACxBC,YAAYJ,YAAYK,SAAS,CAACP,WAAW;YAC/C,CAAA;QACAQ,kCAAkCjB,OAAOkB,6BAA6B;IACxE;AACF"}
+{"version":3,"sources":["../../../src/presentation/dto/poll-demand.ts"],"sourcesContent":["import type {PollDemandResponseDto} from '@shipfox/api-runners-dto';\nimport type {PollDemandResult} from '#core/demand.js';\n\nexport function toPollDemandResponseDto(result: PollDemandResult): PollDemandResponseDto {\n  return {\n    stats: result.stats.map((stat) => ({\n      ...(stat.workspaceId ? {workspace_id: stat.workspaceId} : {}),\n      labels: stat.labels,\n      queued: stat.queued,\n      reserved: stat.reserved,\n      oldest_queued_at: stat.oldestQueuedAt.toISOString(),\n    })),\n    reservations: result.reservations.map((reservation) => ({\n      reservation_id: reservation.reservationId,\n      ...(reservation.workspaceId ? {workspace_id: reservation.workspaceId} : {}),\n      labels: reservation.labels,\n      count: reservation.count,\n      expires_at: reservation.expiresAt.toISOString(),\n    })),\n    terminate_provider_runner_ids: result.terminateRunnerInstanceIds,\n  };\n}\n"],"names":["toPollDemandResponseDto","result","stats","map","stat","workspaceId","workspace_id","labels","queued","reserved","oldest_queued_at","oldestQueuedAt","toISOString","reservations","reservation","reservation_id","reservationId","count","expires_at","expiresAt","terminate_provider_runner_ids","terminateRunnerInstanceIds"],"mappings":"AAGA,OAAO,SAASA,wBAAwBC,MAAwB;IAC9D,OAAO;QACLC,OAAOD,OAAOC,KAAK,CAACC,GAAG,CAAC,CAACC,OAAU,CAAA;gBACjC,GAAIA,KAAKC,WAAW,GAAG;oBAACC,cAAcF,KAAKC,WAAW;gBAAA,IAAI,CAAC,CAAC;gBAC5DE,QAAQH,KAAKG,MAAM;gBACnBC,QAAQJ,KAAKI,MAAM;gBACnBC,UAAUL,KAAKK,QAAQ;gBACvBC,kBAAkBN,KAAKO,cAAc,CAACC,WAAW;YACnD,CAAA;QACAC,cAAcZ,OAAOY,YAAY,CAACV,GAAG,CAAC,CAACW,cAAiB,CAAA;gBACtDC,gBAAgBD,YAAYE,aAAa;gBACzC,GAAIF,YAAYT,WAAW,GAAG;oBAACC,cAAcQ,YAAYT,WAAW;gBAAA,IAAI,CAAC,CAAC;gBAC1EE,QAAQO,YAAYP,MAAM;gBAC1BU,OAAOH,YAAYG,KAAK;gBACxBC,YAAYJ,YAAYK,SAAS,CAACP,WAAW;YAC/C,CAAA;QACAQ,+BAA+BnB,OAAOoB,0BAA0B;IAClE;AACF"}

package/dist/presentation/dto/provisioner-token.d.ts

@@ -2,6 +2,7 @@ import type { ProvisionerToken } from '#core/entities/provisioner-token.js';
 export declare function toProvisionerTokenDto(token: ProvisionerToken): {
     id: string;
     workspace_id: string;
+    scope: 'workspace';
     prefix: string;
     name: string | null;
     created_by_user_id: string;

package/dist/presentation/dto/provisioner-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisioner-token.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/provisioner-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAE1E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG;IAC9D,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAcA"}
+{"version":3,"file":"provisioner-token.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/provisioner-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAE1E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG;IAC9D,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAkBA"}

package/dist/presentation/dto/provisioner-token.js

@@ -1,4 +1,7 @@
 export function toProvisionerTokenDto(token) {
+    if (token.scope !== 'workspace') {
+        throw new Error('Installation provisioner tokens cannot be returned from workspace routes');
+    }
     return {
         id: token.id,
         workspace_id: token.workspaceId,
@@ -10,7 +13,8 @@ export function toProvisionerTokenDto(token) {
         revoked_at: token.revokedAt?.toISOString() ?? null,
         last_seen_at: token.lastSeenAt?.toISOString() ?? null,
         created_at: token.createdAt.toISOString(),
-        updated_at: token.updatedAt.toISOString()
+        updated_at: token.updatedAt.toISOString(),
+        scope: 'workspace'
     };
 }
 

package/dist/presentation/dto/provisioner-token.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presentation/dto/provisioner-token.ts"],"sourcesContent":["import type {ProvisionerToken} from '#core/entities/provisioner-token.js';\n\nexport function toProvisionerTokenDto(token: ProvisionerToken): {\n  id: string;\n  workspace_id: string;\n  prefix: string;\n  name: string | null;\n  created_by_user_id: string;\n  revoked_by_user_id: string | null;\n  expires_at: string | null;\n  revoked_at: string | null;\n  last_seen_at: string | null;\n  created_at: string;\n  updated_at: string;\n} {\n  return {\n    id: token.id,\n    workspace_id: token.workspaceId,\n    prefix: token.prefix,\n    name: token.name,\n    created_by_user_id: token.createdByUserId,\n    revoked_by_user_id: token.revokedByUserId,\n    expires_at: token.expiresAt?.toISOString() ?? null,\n    revoked_at: token.revokedAt?.toISOString() ?? null,\n    last_seen_at: token.lastSeenAt?.toISOString() ?? null,\n    created_at: token.createdAt.toISOString(),\n    updated_at: token.updatedAt.toISOString(),\n  };\n}\n"],"names":["toProvisionerTokenDto","token","id","workspace_id","workspaceId","prefix","name","created_by_user_id","createdByUserId","revoked_by_user_id","revokedByUserId","expires_at","expiresAt","toISOString","revoked_at","revokedAt","last_seen_at","lastSeenAt","created_at","createdAt","updated_at","updatedAt"],"mappings":"AAEA,OAAO,SAASA,sBAAsBC,KAAuB;IAa3D,OAAO;QACLC,IAAID,MAAMC,EAAE;QACZC,cAAcF,MAAMG,WAAW;QAC/BC,QAAQJ,MAAMI,MAAM;QACpBC,MAAML,MAAMK,IAAI;QAChBC,oBAAoBN,MAAMO,eAAe;QACzCC,oBAAoBR,MAAMS,eAAe;QACzCC,YAAYV,MAAMW,SAAS,EAAEC,iBAAiB;QAC9CC,YAAYb,MAAMc,SAAS,EAAEF,iBAAiB;QAC9CG,cAAcf,MAAMgB,UAAU,EAAEJ,iBAAiB;QACjDK,YAAYjB,MAAMkB,SAAS,CAACN,WAAW;QACvCO,YAAYnB,MAAMoB,SAAS,CAACR,WAAW;IACzC;AACF"}
+{"version":3,"sources":["../../../src/presentation/dto/provisioner-token.ts"],"sourcesContent":["import type {ProvisionerToken} from '#core/entities/provisioner-token.js';\n\nexport function toProvisionerTokenDto(token: ProvisionerToken): {\n  id: string;\n  workspace_id: string;\n  scope: 'workspace';\n  prefix: string;\n  name: string | null;\n  created_by_user_id: string;\n  revoked_by_user_id: string | null;\n  expires_at: string | null;\n  revoked_at: string | null;\n  last_seen_at: string | null;\n  created_at: string;\n  updated_at: string;\n} {\n  if (token.scope !== 'workspace') {\n    throw new Error('Installation provisioner tokens cannot be returned from workspace routes');\n  }\n  return {\n    id: token.id,\n    workspace_id: token.workspaceId,\n    prefix: token.prefix,\n    name: token.name,\n    created_by_user_id: token.createdByUserId,\n    revoked_by_user_id: token.revokedByUserId,\n    expires_at: token.expiresAt?.toISOString() ?? null,\n    revoked_at: token.revokedAt?.toISOString() ?? null,\n    last_seen_at: token.lastSeenAt?.toISOString() ?? null,\n    created_at: token.createdAt.toISOString(),\n    updated_at: token.updatedAt.toISOString(),\n    scope: 'workspace',\n  };\n}\n"],"names":["toProvisionerTokenDto","token","scope","Error","id","workspace_id","workspaceId","prefix","name","created_by_user_id","createdByUserId","revoked_by_user_id","revokedByUserId","expires_at","expiresAt","toISOString","revoked_at","revokedAt","last_seen_at","lastSeenAt","created_at","createdAt","updated_at","updatedAt"],"mappings":"AAEA,OAAO,SAASA,sBAAsBC,KAAuB;IAc3D,IAAIA,MAAMC,KAAK,KAAK,aAAa;QAC/B,MAAM,IAAIC,MAAM;IAClB;IACA,OAAO;QACLC,IAAIH,MAAMG,EAAE;QACZC,cAAcJ,MAAMK,WAAW;QAC/BC,QAAQN,MAAMM,MAAM;QACpBC,MAAMP,MAAMO,IAAI;QAChBC,oBAAoBR,MAAMS,eAAe;QACzCC,oBAAoBV,MAAMW,eAAe;QACzCC,YAAYZ,MAAMa,SAAS,EAAEC,iBAAiB;QAC9CC,YAAYf,MAAMgB,SAAS,EAAEF,iBAAiB;QAC9CG,cAAcjB,MAAMkB,UAAU,EAAEJ,iBAAiB;QACjDK,YAAYnB,MAAMoB,SAAS,CAACN,WAAW;QACvCO,YAAYrB,MAAMsB,SAAS,CAACR,WAAW;QACvCb,OAAO;IACT;AACF"}

package/dist/presentation/dto/{provisioned-runners.d.ts → runner-instances.d.ts}

@@ -1,12 +1,12 @@
-import type { ActiveRunner, ReconcileProvisionedRunnersResult, ReportProvisionedRunnersResult } from '#core/provisioned-runners.js';
-export declare function toReportProvisionedRunnersResponseDto(result: ReportProvisionedRunnersResult): {
+import type { ActiveRunner, ReconcileRunnerInstancesResult, ReportRunnerInstancesResult } from '#core/runner-instances.js';
+export declare function toReportRunnerInstancesResponseDto(result: ReportRunnerInstancesResult): {
     accepted: number;
     reservations_released: number;
 };
-export declare function toReconcileProvisionedRunnersResponseDto(result: ReconcileProvisionedRunnersResult): {
+export declare function toReconcileRunnerInstancesResponseDto(result: ReconcileRunnerInstancesResult): {
     runners: Array<{
-        provisioned_runner_id: string;
-        state: ReconcileProvisionedRunnersResult['runners'][number]['state'];
+        provider_runner_id: string;
+        state: ReconcileRunnerInstancesResult['runners'][number]['state'];
         reservation_id: string | null;
         runner_session_id: string | null;
         bound_job: {
@@ -15,14 +15,14 @@ export declare function toReconcileProvisionedRunnersResponseDto(result: Reconci
             last_heartbeat_at: string;
             cancellation_requested_at: string | null;
         } | null;
-        desired_intent: ReconcileProvisionedRunnersResult['runners'][number]['desiredIntent'];
+        desired_intent: ReconcileRunnerInstancesResult['runners'][number]['desiredIntent'];
     }>;
-    terminated_absent_provisioned_runner_ids: string[];
+    terminated_absent_provider_runner_ids: string[];
 };
 export declare function toActiveRunnersResponseDto(runners: ActiveRunner[]): {
     runners: Array<{
         runner_session_id: string | null;
-        provisioned_runner_id: string | null;
+        provider_runner_id: string | null;
         provisioner_id: string | null;
         state: ActiveRunner['state'];
         labels: string[];
@@ -35,4 +35,4 @@ export declare function toActiveRunnersResponseDto(runners: ActiveRunner[]): {
         last_heartbeat_at: string | null;
     }>;
 };
-//# sourceMappingURL=provisioned-runners.d.ts.map
+//# sourceMappingURL=runner-instances.d.ts.map

package/dist/presentation/dto/runner-instances.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner-instances.d.ts","sourceRoot":"","sources":["../../../src/presentation/dto/runner-instances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,8BAA8B,EAC9B,2BAA2B,EAC5B,MAAM,2BAA2B,CAAC;AAEnC,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,2BAA2B,GAAG;IACvF,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAKA;AAED,wBAAgB,qCAAqC,CAAC,MAAM,EAAE,8BAA8B,GAAG;IAC7F,OAAO,EAAE,KAAK,CAAC;QACb,kBAAkB,EAAE,MAAM,CAAC;QAC3B,KAAK,EAAE,8BAA8B,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;QAClE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,SAAS,EAAE;YACT,MAAM,EAAE,MAAM,CAAC;YACf,uBAAuB,EAAE,MAAM,CAAC;YAChC,iBAAiB,EAAE,MAAM,CAAC;YAC1B,yBAAyB,EAAE,MAAM,GAAG,IAAI,CAAC;SAC1C,GAAG,IAAI,CAAC;QACT,cAAc,EAAE,8BAA8B,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;KACpF,CAAC,CAAC;IACH,qCAAqC,EAAE,MAAM,EAAE,CAAC;CACjD,CAoBA;AAED,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG;IACnE,OAAO,EAAE,KAAK,CAAC;QACb,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;QAClC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,uBAAuB,EAAE,MAAM,GAAG,IAAI,CAAC;QACvC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CAAC,CAAC;CACJ,CAiBA"}

package/dist/presentation/dto/{provisioned-runners.js → runner-instances.js}

@@ -1,13 +1,13 @@
-export function toReportProvisionedRunnersResponseDto(result) {
+export function toReportRunnerInstancesResponseDto(result) {
     return {
         accepted: result.accepted,
         reservations_released: result.reservationsReleased
     };
 }
-export function toReconcileProvisionedRunnersResponseDto(result) {
+export function toReconcileRunnerInstancesResponseDto(result) {
     return {
         runners: result.runners.map((runner)=>({
-                provisioned_runner_id: runner.provisionedRunnerId,
+                provider_runner_id: runner.providerRunnerId,
                 state: runner.state,
                 reservation_id: runner.reservationId,
                 runner_session_id: runner.runnerSessionId,
@@ -19,14 +19,14 @@ export function toReconcileProvisionedRunnersResponseDto(result) {
                 } : null,
                 desired_intent: runner.desiredIntent
             })),
-        terminated_absent_provisioned_runner_ids: result.terminatedAbsentProvisionedRunnerIds
+        terminated_absent_provider_runner_ids: result.terminatedAbsentRunnerInstanceIds
     };
 }
 export function toActiveRunnersResponseDto(runners) {
     return {
         runners: runners.map((runner)=>({
                 runner_session_id: runner.runnerSessionId,
-                provisioned_runner_id: runner.provisionedRunnerId,
+                provider_runner_id: runner.providerRunnerId,
                 provisioner_id: runner.provisionerId,
                 state: runner.state,
                 labels: runner.labels,
@@ -41,4 +41,4 @@ export function toActiveRunnersResponseDto(runners) {
     };
 }
 
-//# sourceMappingURL=provisioned-runners.js.map
+//# sourceMappingURL=runner-instances.js.map

package/dist/presentation/dto/runner-instances.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/presentation/dto/runner-instances.ts"],"sourcesContent":["import type {\n  ActiveRunner,\n  ReconcileRunnerInstancesResult,\n  ReportRunnerInstancesResult,\n} from '#core/runner-instances.js';\n\nexport function toReportRunnerInstancesResponseDto(result: ReportRunnerInstancesResult): {\n  accepted: number;\n  reservations_released: number;\n} {\n  return {\n    accepted: result.accepted,\n    reservations_released: result.reservationsReleased,\n  };\n}\n\nexport function toReconcileRunnerInstancesResponseDto(result: ReconcileRunnerInstancesResult): {\n  runners: Array<{\n    provider_runner_id: string;\n    state: ReconcileRunnerInstancesResult['runners'][number]['state'];\n    reservation_id: string | null;\n    runner_session_id: string | null;\n    bound_job: {\n      job_id: string;\n      workflow_run_attempt_id: string;\n      last_heartbeat_at: string;\n      cancellation_requested_at: string | null;\n    } | null;\n    desired_intent: ReconcileRunnerInstancesResult['runners'][number]['desiredIntent'];\n  }>;\n  terminated_absent_provider_runner_ids: string[];\n} {\n  return {\n    runners: result.runners.map((runner) => ({\n      provider_runner_id: runner.providerRunnerId,\n      state: runner.state,\n      reservation_id: runner.reservationId,\n      runner_session_id: runner.runnerSessionId,\n      bound_job: runner.boundJobExecution\n        ? {\n            job_id: runner.boundJobExecution.jobId,\n            workflow_run_attempt_id: runner.boundJobExecution.workflowRunAttemptId,\n            last_heartbeat_at: runner.boundJobExecution.lastHeartbeatAt.toISOString(),\n            cancellation_requested_at:\n              runner.boundJobExecution.cancellationRequestedAt?.toISOString() ?? null,\n          }\n        : null,\n      desired_intent: runner.desiredIntent,\n    })),\n    terminated_absent_provider_runner_ids: result.terminatedAbsentRunnerInstanceIds,\n  };\n}\n\nexport function toActiveRunnersResponseDto(runners: ActiveRunner[]): {\n  runners: Array<{\n    runner_session_id: string | null;\n    provider_runner_id: string | null;\n    provisioner_id: string | null;\n    state: ActiveRunner['state'];\n    labels: string[];\n    template_key: string | null;\n    provider_kind: string | null;\n    job_id: string | null;\n    workflow_run_attempt_id: string | null;\n    project_id: string | null;\n    reported_at: string | null;\n    last_heartbeat_at: string | null;\n  }>;\n} {\n  return {\n    runners: runners.map((runner) => ({\n      runner_session_id: runner.runnerSessionId,\n      provider_runner_id: runner.providerRunnerId,\n      provisioner_id: runner.provisionerId,\n      state: runner.state,\n      labels: runner.labels,\n      template_key: runner.templateKey,\n      provider_kind: runner.providerKind,\n      job_id: runner.jobId,\n      workflow_run_attempt_id: runner.workflowRunAttemptId,\n      project_id: runner.projectId,\n      reported_at: runner.reportedAt?.toISOString() ?? null,\n      last_heartbeat_at: runner.lastHeartbeatAt?.toISOString() ?? null,\n    })),\n  };\n}\n"],"names":["toReportRunnerInstancesResponseDto","result","accepted","reservations_released","reservationsReleased","toReconcileRunnerInstancesResponseDto","runners","map","runner","provider_runner_id","providerRunnerId","state","reservation_id","reservationId","runner_session_id","runnerSessionId","bound_job","boundJobExecution","job_id","jobId","workflow_run_attempt_id","workflowRunAttemptId","last_heartbeat_at","lastHeartbeatAt","toISOString","cancellation_requested_at","cancellationRequestedAt","desired_intent","desiredIntent","terminated_absent_provider_runner_ids","terminatedAbsentRunnerInstanceIds","toActiveRunnersResponseDto","provisioner_id","provisionerId","labels","template_key","templateKey","provider_kind","providerKind","project_id","projectId","reported_at","reportedAt"],"mappings":"AAMA,OAAO,SAASA,mCAAmCC,MAAmC;IAIpF,OAAO;QACLC,UAAUD,OAAOC,QAAQ;QACzBC,uBAAuBF,OAAOG,oBAAoB;IACpD;AACF;AAEA,OAAO,SAASC,sCAAsCJ,MAAsC;IAgB1F,OAAO;QACLK,SAASL,OAAOK,OAAO,CAACC,GAAG,CAAC,CAACC,SAAY,CAAA;gBACvCC,oBAAoBD,OAAOE,gBAAgB;gBAC3CC,OAAOH,OAAOG,KAAK;gBACnBC,gBAAgBJ,OAAOK,aAAa;gBACpCC,mBAAmBN,OAAOO,eAAe;gBACzCC,WAAWR,OAAOS,iBAAiB,GAC/B;oBACEC,QAAQV,OAAOS,iBAAiB,CAACE,KAAK;oBACtCC,yBAAyBZ,OAAOS,iBAAiB,CAACI,oBAAoB;oBACtEC,mBAAmBd,OAAOS,iBAAiB,CAACM,eAAe,CAACC,WAAW;oBACvEC,2BACEjB,OAAOS,iBAAiB,CAACS,uBAAuB,EAAEF,iBAAiB;gBACvE,IACA;gBACJG,gBAAgBnB,OAAOoB,aAAa;YACtC,CAAA;QACAC,uCAAuC5B,OAAO6B,iCAAiC;IACjF;AACF;AAEA,OAAO,SAASC,2BAA2BzB,OAAuB;IAgBhE,OAAO;QACLA,SAASA,QAAQC,GAAG,CAAC,CAACC,SAAY,CAAA;gBAChCM,mBAAmBN,OAAOO,eAAe;gBACzCN,oBAAoBD,OAAOE,gBAAgB;gBAC3CsB,gBAAgBxB,OAAOyB,aAAa;gBACpCtB,OAAOH,OAAOG,KAAK;gBACnBuB,QAAQ1B,OAAO0B,MAAM;gBACrBC,cAAc3B,OAAO4B,WAAW;gBAChCC,eAAe7B,OAAO8B,YAAY;gBAClCpB,QAAQV,OAAOW,KAAK;gBACpBC,yBAAyBZ,OAAOa,oBAAoB;gBACpDkB,YAAY/B,OAAOgC,SAAS;gBAC5BC,aAAajC,OAAOkC,UAAU,EAAElB,iBAAiB;gBACjDF,mBAAmBd,OAAOe,eAAe,EAAEC,iBAAiB;YAC9D,CAAA;IACF;AACF"}

package/dist/presentation/index.d.ts

@@ -1,4 +1,4 @@
-export { createProvisionerTokenAuthMethod, createRunnerRegistrationTokenAuthMethod, } from './auth/index.js';
-export { runnerRoutes as routes } from './routes/index.js';
+export { createProvisionerTokenAuthMethod, createRunnerControlSessionAuthMethod, createRunnerRegistrationTokenAuthMethod, } from './auth/index.js';
+export { createRunnerRoutes, createRunnerRoutes as routes } from './routes/index.js';
 export { onWorkflowsJobExecutionTimedOut } from './subscribers/on-workflows-job-execution-timed-out.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/presentation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/presentation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,uCAAuC,GACxC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,YAAY,IAAI,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAC,+BAA+B,EAAC,MAAM,uDAAuD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/presentation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,oCAAoC,EACpC,uCAAuC,GACxC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,IAAI,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAC,+BAA+B,EAAC,MAAM,uDAAuD,CAAC"}

package/dist/presentation/index.js

@@ -1,5 +1,5 @@
-export { createProvisionerTokenAuthMethod, createRunnerRegistrationTokenAuthMethod } from './auth/index.js';
-export { runnerRoutes as routes } from './routes/index.js';
+export { createProvisionerTokenAuthMethod, createRunnerControlSessionAuthMethod, createRunnerRegistrationTokenAuthMethod } from './auth/index.js';
+export { createRunnerRoutes, createRunnerRoutes as routes } from './routes/index.js';
 export { onWorkflowsJobExecutionTimedOut } from './subscribers/on-workflows-job-execution-timed-out.js';
 
 //# sourceMappingURL=index.js.map

package/dist/presentation/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/presentation/index.ts"],"sourcesContent":["export {\n  createProvisionerTokenAuthMethod,\n  createRunnerRegistrationTokenAuthMethod,\n} from './auth/index.js';\nexport {runnerRoutes as routes} from './routes/index.js';\nexport {onWorkflowsJobExecutionTimedOut} from './subscribers/on-workflows-job-execution-timed-out.js';\n"],"names":["createProvisionerTokenAuthMethod","createRunnerRegistrationTokenAuthMethod","runnerRoutes","routes","onWorkflowsJobExecutionTimedOut"],"mappings":"AAAA,SACEA,gCAAgC,EAChCC,uCAAuC,QAClC,kBAAkB;AACzB,SAAQC,gBAAgBC,MAAM,QAAO,oBAAoB;AACzD,SAAQC,+BAA+B,QAAO,wDAAwD"}
+{"version":3,"sources":["../../src/presentation/index.ts"],"sourcesContent":["export {\n  createProvisionerTokenAuthMethod,\n  createRunnerControlSessionAuthMethod,\n  createRunnerRegistrationTokenAuthMethod,\n} from './auth/index.js';\nexport {createRunnerRoutes, createRunnerRoutes as routes} from './routes/index.js';\nexport {onWorkflowsJobExecutionTimedOut} from './subscribers/on-workflows-job-execution-timed-out.js';\n"],"names":["createProvisionerTokenAuthMethod","createRunnerControlSessionAuthMethod","createRunnerRegistrationTokenAuthMethod","createRunnerRoutes","routes","onWorkflowsJobExecutionTimedOut"],"mappings":"AAAA,SACEA,gCAAgC,EAChCC,oCAAoC,EACpCC,uCAAuC,QAClC,kBAAkB;AACzB,SAAQC,kBAAkB,EAAEA,sBAAsBC,MAAM,QAAO,oBAAoB;AACnF,SAAQC,+BAA+B,QAAO,wDAAwD"}

package/dist/presentation/inter-module.d.ts

@@ -0,0 +1,5 @@
+import { runnersInterModuleContract } from '@shipfox/api-runners-dto/inter-module';
+import { type InterModulePresentation } from '@shipfox/inter-module';
+export declare function createRunnersInterModulePresentation(): InterModulePresentation<typeof runnersInterModuleContract>;
+export declare function toEnqueueJobExecutionKnownError(error: unknown): unknown;
+//# sourceMappingURL=inter-module.d.ts.map

package/dist/presentation/inter-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inter-module.d.ts","sourceRoot":"","sources":["../../src/presentation/inter-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAC,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,uBAAuB,CAAC;AAU/B,wBAAgB,oCAAoC,IAAI,uBAAuB,CAC7E,OAAO,0BAA0B,CAClC,CAwBA;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CASvE"}

package/dist/presentation/inter-module.js

@@ -0,0 +1,43 @@
+import { runnersInterModuleContract } from '@shipfox/api-runners-dto/inter-module';
+import { createInterModuleKnownError, defineInterModulePresentation } from '@shipfox/inter-module';
+import { EmptyRequiredLabelsError } from '#core/errors.js';
+import { getEffectiveRunnerToolCapabilities } from '#core/runner-tool-capabilities.js';
+import { cancelRunnerJobs, enqueueJobExecution, isJobLeaseActive, releaseJobExecution } from '#db/job-executions.js';
+export function createRunnersInterModulePresentation() {
+    return defineInterModulePresentation(runnersInterModuleContract, {
+        enqueueJobExecution: async (input)=>{
+            try {
+                await enqueueJobExecution(input);
+                return {};
+            } catch (error) {
+                throw toEnqueueJobExecutionKnownError(error);
+            }
+        },
+        releaseJobExecution: async (input)=>{
+            await releaseJobExecution(input);
+            return {};
+        },
+        cancelJobs: async (input)=>{
+            await cancelRunnerJobs(input);
+            return {};
+        },
+        getLeaseState: async (input)=>({
+                active: await isJobLeaseActive(input)
+            }),
+        getEffectiveRunnerToolCapabilities: async (input)=>{
+            const result = await getEffectiveRunnerToolCapabilities(input);
+            return {
+                capabilities: result.capabilities,
+                reportFresh: result.reportFresh
+            };
+        }
+    });
+}
+export function toEnqueueJobExecutionKnownError(error) {
+    if (error instanceof EmptyRequiredLabelsError) {
+        return createInterModuleKnownError(runnersInterModuleContract.methods.enqueueJobExecution, 'empty-required-labels', {});
+    }
+    return error;
+}
+
+//# sourceMappingURL=inter-module.js.map

package/dist/presentation/inter-module.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/presentation/inter-module.ts"],"sourcesContent":["import {runnersInterModuleContract} from '@shipfox/api-runners-dto/inter-module';\nimport {\n  createInterModuleKnownError,\n  defineInterModulePresentation,\n  type InterModulePresentation,\n} from '@shipfox/inter-module';\nimport {EmptyRequiredLabelsError} from '#core/errors.js';\nimport {getEffectiveRunnerToolCapabilities} from '#core/runner-tool-capabilities.js';\nimport {\n  cancelRunnerJobs,\n  enqueueJobExecution,\n  isJobLeaseActive,\n  releaseJobExecution,\n} from '#db/job-executions.js';\n\nexport function createRunnersInterModulePresentation(): InterModulePresentation<\n  typeof runnersInterModuleContract\n> {\n  return defineInterModulePresentation(runnersInterModuleContract, {\n    enqueueJobExecution: async (input) => {\n      try {\n        await enqueueJobExecution(input);\n        return {};\n      } catch (error) {\n        throw toEnqueueJobExecutionKnownError(error);\n      }\n    },\n    releaseJobExecution: async (input) => {\n      await releaseJobExecution(input);\n      return {};\n    },\n    cancelJobs: async (input) => {\n      await cancelRunnerJobs(input);\n      return {};\n    },\n    getLeaseState: async (input) => ({active: await isJobLeaseActive(input)}),\n    getEffectiveRunnerToolCapabilities: async (input) => {\n      const result = await getEffectiveRunnerToolCapabilities(input);\n      return {capabilities: result.capabilities, reportFresh: result.reportFresh};\n    },\n  });\n}\n\nexport function toEnqueueJobExecutionKnownError(error: unknown): unknown {\n  if (error instanceof EmptyRequiredLabelsError) {\n    return createInterModuleKnownError(\n      runnersInterModuleContract.methods.enqueueJobExecution,\n      'empty-required-labels',\n      {},\n    );\n  }\n  return error;\n}\n"],"names":["runnersInterModuleContract","createInterModuleKnownError","defineInterModulePresentation","EmptyRequiredLabelsError","getEffectiveRunnerToolCapabilities","cancelRunnerJobs","enqueueJobExecution","isJobLeaseActive","releaseJobExecution","createRunnersInterModulePresentation","input","error","toEnqueueJobExecutionKnownError","cancelJobs","getLeaseState","active","result","capabilities","reportFresh","methods"],"mappings":"AAAA,SAAQA,0BAA0B,QAAO,wCAAwC;AACjF,SACEC,2BAA2B,EAC3BC,6BAA6B,QAExB,wBAAwB;AAC/B,SAAQC,wBAAwB,QAAO,kBAAkB;AACzD,SAAQC,kCAAkC,QAAO,oCAAoC;AACrF,SACEC,gBAAgB,EAChBC,mBAAmB,EACnBC,gBAAgB,EAChBC,mBAAmB,QACd,wBAAwB;AAE/B,OAAO,SAASC;IAGd,OAAOP,8BAA8BF,4BAA4B;QAC/DM,qBAAqB,OAAOI;YAC1B,IAAI;gBACF,MAAMJ,oBAAoBI;gBAC1B,OAAO,CAAC;YACV,EAAE,OAAOC,OAAO;gBACd,MAAMC,gCAAgCD;YACxC;QACF;QACAH,qBAAqB,OAAOE;YAC1B,MAAMF,oBAAoBE;YAC1B,OAAO,CAAC;QACV;QACAG,YAAY,OAAOH;YACjB,MAAML,iBAAiBK;YACvB,OAAO,CAAC;QACV;QACAI,eAAe,OAAOJ,QAAW,CAAA;gBAACK,QAAQ,MAAMR,iBAAiBG;YAAM,CAAA;QACvEN,oCAAoC,OAAOM;YACzC,MAAMM,SAAS,MAAMZ,mCAAmCM;YACxD,OAAO;gBAACO,cAAcD,OAAOC,YAAY;gBAAEC,aAAaF,OAAOE,WAAW;YAAA;QAC5E;IACF;AACF;AAEA,OAAO,SAASN,gCAAgCD,KAAc;IAC5D,IAAIA,iBAAiBR,0BAA0B;QAC7C,OAAOF,4BACLD,2BAA2BmB,OAAO,CAACb,mBAAmB,EACtD,yBACA,CAAC;IAEL;IACA,OAAOK;AACT"}

package/dist/presentation/routes/assign-runner-instances.d.ts

@@ -0,0 +1,2 @@
+export declare const assignRunnerInstancesRoute: import("@shipfox/node-fastify").RouteDefinition;
+//# sourceMappingURL=assign-runner-instances.d.ts.map

package/dist/presentation/routes/assign-runner-instances.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assign-runner-instances.d.ts","sourceRoot":"","sources":["../../../src/presentation/routes/assign-runner-instances.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,0BAA0B,iDAkCrC,CAAC"}

package/dist/presentation/routes/assign-runner-instances.js

@@ -0,0 +1,40 @@
+import { requireProvisionerContext } from '@shipfox/api-auth-context';
+import { assignRunnerInstancesBodySchema, assignRunnerInstancesResponseSchema } from '@shipfox/api-runners-dto';
+import { ClientError, defineRoute } from '@shipfox/node-fastify';
+import { ReservationExpiredError, ReservationNotFoundError, RunnerInstanceAlreadyAssignedError, RunnerInstanceNotAssignableError } from '#core/errors.js';
+import { assignRunnerInstances } from '#core/runner-assignments.js';
+export const assignRunnerInstancesRoute = defineRoute({
+    method: 'POST',
+    path: '/runner-instances/assignments',
+    description: 'Assign enrolled runner instances to an owned demand reservation',
+    schema: {
+        body: assignRunnerInstancesBodySchema,
+        response: {
+            200: assignRunnerInstancesResponseSchema
+        }
+    },
+    errorHandler: (error)=>{
+        if (error instanceof ReservationNotFoundError) throw new ClientError('Reservation not found', 'reservation-not-found', {
+            status: 404
+        });
+        if (error instanceof ReservationExpiredError) throw new ClientError('Reservation has expired', 'reservation-expired', {
+            status: 409
+        });
+        if (error instanceof RunnerInstanceAlreadyAssignedError || error instanceof RunnerInstanceNotAssignableError) throw new ClientError('Runner instance cannot be assigned', 'runner-instance-not-assignable', {
+            status: 409
+        });
+        throw error;
+    },
+    handler: async (request)=>{
+        const { provisionerTokenId } = requireProvisionerContext(request);
+        return {
+            runner_instance_ids: await assignRunnerInstances({
+                provisionerId: provisionerTokenId,
+                reservationId: request.body.reservation_id,
+                runnerInstanceIds: request.body.runner_instance_ids
+            })
+        };
+    }
+});
+
+//# sourceMappingURL=assign-runner-instances.js.map

package/dist/presentation/routes/assign-runner-instances.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/presentation/routes/assign-runner-instances.ts"],"sourcesContent":["import {requireProvisionerContext} from '@shipfox/api-auth-context';\nimport {\n  assignRunnerInstancesBodySchema,\n  assignRunnerInstancesResponseSchema,\n} from '@shipfox/api-runners-dto';\nimport {ClientError, defineRoute} from '@shipfox/node-fastify';\nimport {\n  ReservationExpiredError,\n  ReservationNotFoundError,\n  RunnerInstanceAlreadyAssignedError,\n  RunnerInstanceNotAssignableError,\n} from '#core/errors.js';\nimport {assignRunnerInstances} from '#core/runner-assignments.js';\n\nexport const assignRunnerInstancesRoute = defineRoute({\n  method: 'POST',\n  path: '/runner-instances/assignments',\n  description: 'Assign enrolled runner instances to an owned demand reservation',\n  schema: {\n    body: assignRunnerInstancesBodySchema,\n    response: {200: assignRunnerInstancesResponseSchema},\n  },\n  errorHandler: (error) => {\n    if (error instanceof ReservationNotFoundError)\n      throw new ClientError('Reservation not found', 'reservation-not-found', {status: 404});\n    if (error instanceof ReservationExpiredError)\n      throw new ClientError('Reservation has expired', 'reservation-expired', {status: 409});\n    if (\n      error instanceof RunnerInstanceAlreadyAssignedError ||\n      error instanceof RunnerInstanceNotAssignableError\n    )\n      throw new ClientError(\n        'Runner instance cannot be assigned',\n        'runner-instance-not-assignable',\n        {status: 409},\n      );\n    throw error;\n  },\n  handler: async (request) => {\n    const {provisionerTokenId} = requireProvisionerContext(request);\n    return {\n      runner_instance_ids: await assignRunnerInstances({\n        provisionerId: provisionerTokenId,\n        reservationId: request.body.reservation_id,\n        runnerInstanceIds: request.body.runner_instance_ids,\n      }),\n    };\n  },\n});\n"],"names":["requireProvisionerContext","assignRunnerInstancesBodySchema","assignRunnerInstancesResponseSchema","ClientError","defineRoute","ReservationExpiredError","ReservationNotFoundError","RunnerInstanceAlreadyAssignedError","RunnerInstanceNotAssignableError","assignRunnerInstances","assignRunnerInstancesRoute","method","path","description","schema","body","response","errorHandler","error","status","handler","request","provisionerTokenId","runner_instance_ids","provisionerId","reservationId","reservation_id","runnerInstanceIds"],"mappings":"AAAA,SAAQA,yBAAyB,QAAO,4BAA4B;AACpE,SACEC,+BAA+B,EAC/BC,mCAAmC,QAC9B,2BAA2B;AAClC,SAAQC,WAAW,EAAEC,WAAW,QAAO,wBAAwB;AAC/D,SACEC,uBAAuB,EACvBC,wBAAwB,EACxBC,kCAAkC,EAClCC,gCAAgC,QAC3B,kBAAkB;AACzB,SAAQC,qBAAqB,QAAO,8BAA8B;AAElE,OAAO,MAAMC,6BAA6BN,YAAY;IACpDO,QAAQ;IACRC,MAAM;IACNC,aAAa;IACbC,QAAQ;QACNC,MAAMd;QACNe,UAAU;YAAC,KAAKd;QAAmC;IACrD;IACAe,cAAc,CAACC;QACb,IAAIA,iBAAiBZ,0BACnB,MAAM,IAAIH,YAAY,yBAAyB,yBAAyB;YAACgB,QAAQ;QAAG;QACtF,IAAID,iBAAiBb,yBACnB,MAAM,IAAIF,YAAY,2BAA2B,uBAAuB;YAACgB,QAAQ;QAAG;QACtF,IACED,iBAAiBX,sCACjBW,iBAAiBV,kCAEjB,MAAM,IAAIL,YACR,sCACA,kCACA;YAACgB,QAAQ;QAAG;QAEhB,MAAMD;IACR;IACAE,SAAS,OAAOC;QACd,MAAM,EAACC,kBAAkB,EAAC,GAAGtB,0BAA0BqB;QACvD,OAAO;YACLE,qBAAqB,MAAMd,sBAAsB;gBAC/Ce,eAAeF;gBACfG,eAAeJ,QAAQN,IAAI,CAACW,cAAc;gBAC1CC,mBAAmBN,QAAQN,IAAI,CAACQ,mBAAmB;YACrD;QACF;IACF;AACF,GAAG"}

package/dist/presentation/routes/get-provisioner-me.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-provisioner-me.d.ts","sourceRoot":"","sources":["../../../src/presentation/routes/get-provisioner-me.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,iDAiBhC,CAAC"}
+{"version":3,"file":"get-provisioner-me.d.ts","sourceRoot":"","sources":["../../../src/presentation/routes/get-provisioner-me.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,iDAgBhC,CAAC"}

package/dist/presentation/routes/get-provisioner-me.js

@@ -12,9 +12,13 @@ export const getProvisionerMeRoute = defineRoute({
     },
     handler: (request)=>{
         const context = requireProvisionerContext(request);
-        return {
+        return context.scope === 'workspace' ? {
             id: context.provisionerTokenId,
+            scope: 'workspace',
             workspace_id: context.workspaceId
+        } : {
+            id: context.provisionerTokenId,
+            scope: 'installation'
         };
     }
 });

package/dist/presentation/routes/get-provisioner-me.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presentation/routes/get-provisioner-me.ts"],"sourcesContent":["import {requireProvisionerContext} from '@shipfox/api-auth-context';\nimport {provisionerIdentityResponseSchema} from '@shipfox/api-runners-dto';\nimport {defineRoute} from '@shipfox/node-fastify';\n\nexport const getProvisionerMeRoute = defineRoute({\n  method: 'GET',\n  path: '/me',\n  description: 'Return the authenticated provisioner token identity',\n  schema: {\n    response: {\n      200: provisionerIdentityResponseSchema,\n    },\n  },\n  handler: (request) => {\n    const context = requireProvisionerContext(request);\n\n    return {\n      id: context.provisionerTokenId,\n      workspace_id: context.workspaceId,\n    };\n  },\n});\n"],"names":["requireProvisionerContext","provisionerIdentityResponseSchema","defineRoute","getProvisionerMeRoute","method","path","description","schema","response","handler","request","context","id","provisionerTokenId","workspace_id","workspaceId"],"mappings":"AAAA,SAAQA,yBAAyB,QAAO,4BAA4B;AACpE,SAAQC,iCAAiC,QAAO,2BAA2B;AAC3E,SAAQC,WAAW,QAAO,wBAAwB;AAElD,OAAO,MAAMC,wBAAwBD,YAAY;IAC/CE,QAAQ;IACRC,MAAM;IACNC,aAAa;IACbC,QAAQ;QACNC,UAAU;YACR,KAAKP;QACP;IACF;IACAQ,SAAS,CAACC;QACR,MAAMC,UAAUX,0BAA0BU;QAE1C,OAAO;YACLE,IAAID,QAAQE,kBAAkB;YAC9BC,cAAcH,QAAQI,WAAW;QACnC;IACF;AACF,GAAG"}
+{"version":3,"sources":["../../../src/presentation/routes/get-provisioner-me.ts"],"sourcesContent":["import {requireProvisionerContext} from '@shipfox/api-auth-context';\nimport {provisionerIdentityResponseSchema} from '@shipfox/api-runners-dto';\nimport {defineRoute} from '@shipfox/node-fastify';\n\nexport const getProvisionerMeRoute = defineRoute({\n  method: 'GET',\n  path: '/me',\n  description: 'Return the authenticated provisioner token identity',\n  schema: {\n    response: {\n      200: provisionerIdentityResponseSchema,\n    },\n  },\n  handler: (request) => {\n    const context = requireProvisionerContext(request);\n\n    return context.scope === 'workspace'\n      ? {id: context.provisionerTokenId, scope: 'workspace', workspace_id: context.workspaceId}\n      : {id: context.provisionerTokenId, scope: 'installation'};\n  },\n});\n"],"names":["requireProvisionerContext","provisionerIdentityResponseSchema","defineRoute","getProvisionerMeRoute","method","path","description","schema","response","handler","request","context","scope","id","provisionerTokenId","workspace_id","workspaceId"],"mappings":"AAAA,SAAQA,yBAAyB,QAAO,4BAA4B;AACpE,SAAQC,iCAAiC,QAAO,2BAA2B;AAC3E,SAAQC,WAAW,QAAO,wBAAwB;AAElD,OAAO,MAAMC,wBAAwBD,YAAY;IAC/CE,QAAQ;IACRC,MAAM;IACNC,aAAa;IACbC,QAAQ;QACNC,UAAU;YACR,KAAKP;QACP;IACF;IACAQ,SAAS,CAACC;QACR,MAAMC,UAAUX,0BAA0BU;QAE1C,OAAOC,QAAQC,KAAK,KAAK,cACrB;YAACC,IAAIF,QAAQG,kBAAkB;YAAEF,OAAO;YAAaG,cAAcJ,QAAQK,WAAW;QAAA,IACtF;YAACH,IAAIF,QAAQG,kBAAkB;YAAEF,OAAO;QAAc;IAC5D;AACF,GAAG"}

package/dist/presentation/routes/heartbeat.d.ts

@@ -1,2 +1,3 @@
-export declare const heartbeatRoute: import("@shipfox/node-fastify").RouteDefinition;
+import type { AuthInterModuleClient } from '@shipfox/api-auth-dto/inter-module';
+export declare function createHeartbeatRoute(auth: AuthInterModuleClient): import("@shipfox/node-fastify").RouteDefinition;
 //# sourceMappingURL=heartbeat.d.ts.map

package/dist/presentation/routes/heartbeat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../../src/presentation/routes/heartbeat.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,iDAmEzB,CAAC"}
+{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../../src/presentation/routes/heartbeat.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;AAO9E,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,qBAAqB,mDAsE/D"}

package/dist/presentation/routes/heartbeat.js

@@ -1,62 +1,72 @@
-import { issueJobLeaseToken, jobLeaseParamsFrom } from '@shipfox/api-auth';
 import { requireLeasedJobContext } from '@shipfox/api-auth-context';
 import { heartbeatBodySchema, heartbeatResponseSchema } from '@shipfox/api-runners-dto';
 import { ClientError, defineRoute } from '@shipfox/node-fastify';
 import { z } from 'zod';
 import { RunningJobExecutionNotFoundError } from '#core/errors.js';
 import { recordHeartbeat } from '#db/job-executions.js';
-export const heartbeatRoute = defineRoute({
-    method: 'POST',
-    path: '/:jobId/heartbeat',
-    description: 'Keeps a running job execution alive while the runner is still working on it. Returns whether the server has asked the runner to cancel.',
-    schema: {
-        params: z.object({
-            jobId: z.string().uuid()
-        }),
-        body: heartbeatBodySchema.nullish(),
-        response: {
-            200: heartbeatResponseSchema
-        }
-    },
-    errorHandler: (error)=>{
-        if (error instanceof RunningJobExecutionNotFoundError) {
-            throw new ClientError(error.message, 'running-job-execution-not-found', {
-                status: 404
+export function createHeartbeatRoute(auth) {
+    return defineRoute({
+        method: 'POST',
+        path: '/:jobId/heartbeat',
+        description: 'Keeps a running job execution alive while the runner is still working on it. Returns whether the server has asked the runner to cancel.',
+        schema: {
+            params: z.object({
+                jobId: z.string().uuid()
+            }),
+            body: heartbeatBodySchema.nullish(),
+            response: {
+                200: heartbeatResponseSchema
+            }
+        },
+        errorHandler: (error)=>{
+            if (error instanceof RunningJobExecutionNotFoundError) {
+                throw new ClientError(error.message, 'running-job-execution-not-found', {
+                    status: 404
+                });
+            }
+            throw error;
+        },
+        handler: async (request)=>{
+            const { jobId } = request.params;
+            const lease = requireLeasedJobContext(request);
+            if (lease.jobId !== jobId) {
+                throw new ClientError('Lease token does not match job', 'lease-job-mismatch', {
+                    status: 404
+                });
+            }
+            const heartbeatResult = await recordHeartbeat({
+                jobExecutionId: lease.jobExecutionId,
+                runnerSessionId: lease.runnerSessionId,
+                toolCapabilities: request.body?.capabilities ?? null
             });
-        }
-        throw error;
-    },
-    handler: async (request)=>{
-        const { jobId } = request.params;
-        const lease = requireLeasedJobContext(request);
-        if (lease.jobId !== jobId) {
-            throw new ClientError('Lease token does not match job', 'lease-job-mismatch', {
-                status: 404
+            if (heartbeatResult.previousToolCapabilities && !sameToolCapabilities(heartbeatResult.previousToolCapabilities, heartbeatResult.currentToolCapabilities)) {
+                request.log.info({
+                    runnerSessionId: lease.runnerSessionId,
+                    jobExecutionId: lease.jobExecutionId,
+                    previousHarnesses: Object.keys(heartbeatResult.previousToolCapabilities.harnesses),
+                    currentHarnesses: heartbeatResult.currentToolCapabilities ? Object.keys(heartbeatResult.currentToolCapabilities.harnesses) : []
+                }, 'Runner heartbeat changed advertised tool capabilities');
+            }
+            const { token: leaseToken } = await auth.mintJobLeaseToken({
+                workflowRunId: heartbeatResult.runningJobExecution.workflowRunId,
+                workflowRunAttemptId: heartbeatResult.runningJobExecution.workflowRunAttemptId,
+                jobId: heartbeatResult.runningJobExecution.jobId,
+                jobExecutionId: heartbeatResult.runningJobExecution.jobExecutionId,
+                projectId: heartbeatResult.runningJobExecution.projectId,
+                workspaceId: heartbeatResult.runningJobExecution.workspaceId,
+                runnerSessionId: heartbeatResult.runningJobExecution.runnerSessionId,
+                ...lease.currentStepId && lease.currentStepAttempt !== undefined ? {
+                    currentStepId: lease.currentStepId,
+                    currentStepAttempt: lease.currentStepAttempt
+                } : {}
             });
+            return {
+                cancel: heartbeatResult.cancellationRequested,
+                lease_token: leaseToken
+            };
         }
-        const heartbeatResult = await recordHeartbeat({
-            jobExecutionId: lease.jobExecutionId,
-            runnerSessionId: lease.runnerSessionId,
-            toolCapabilities: request.body?.capabilities ?? null
-        });
-        if (heartbeatResult.previousToolCapabilities && !sameToolCapabilities(heartbeatResult.previousToolCapabilities, heartbeatResult.currentToolCapabilities)) {
-            request.log.info({
-                runnerSessionId: lease.runnerSessionId,
-                jobExecutionId: lease.jobExecutionId,
-                previousHarnesses: Object.keys(heartbeatResult.previousToolCapabilities.harnesses),
-                currentHarnesses: heartbeatResult.currentToolCapabilities ? Object.keys(heartbeatResult.currentToolCapabilities.harnesses) : []
-            }, 'Runner heartbeat changed advertised tool capabilities');
-        }
-        const leaseToken = await issueJobLeaseToken(jobLeaseParamsFrom(heartbeatResult.runningJobExecution, lease.currentStepId && lease.currentStepAttempt !== undefined ? {
-            currentStepId: lease.currentStepId,
-            currentStepAttempt: lease.currentStepAttempt
-        } : undefined));
-        return {
-            cancel: heartbeatResult.cancellationRequested,
-            lease_token: leaseToken
-        };
-    }
-});
+    });
+}
 function sameToolCapabilities(left, right) {
     return JSON.stringify(left) === JSON.stringify(right);
 }