@qlever-llc/trellis 0.10.17 → 0.19.0-rc.1

package/src/auth/mod.ts

@@ -82,6 +82,8 @@ export {
   AuthCapabilityGroupsListSchema,
   AuthCapabilityGroupsPutResponseSchema,
   AuthCapabilityGroupsPutSchema,
+  AuthCatalogIssuesResolveResponseSchema,
+  AuthCatalogIssuesResolveSchema,
   type AuthDeployment,
   type AuthDeploymentAuthorityAcceptMigrationInput,
   AuthDeploymentAuthorityAcceptMigrationSchema,
@@ -181,6 +183,10 @@ export {
   AuthPortalsLoginSettingsGetSchema,
   AuthPortalsLoginSettingsResponseSchema,
   AuthPortalsLoginSettingsUpdateSchema,
+  AuthPortalsPutResponseSchema,
+  AuthPortalsPutSchema,
+  AuthPortalsRemoveResponseSchema,
+  AuthPortalsRemoveSchema,
   AuthPortalsRoutesPutResponseSchema,
   AuthPortalsRoutesPutSchema,
   AuthPortalsRoutesRemoveResponseSchema,
@@ -225,7 +231,11 @@ export {
   ContractAnalysisSummarySchema,
   type DeploymentAuthority,
   type DeploymentAuthorityCapability,
+  type DeploymentAuthorityCapabilityNeed,
+  DeploymentAuthorityCapabilityNeedSchema,
   DeploymentAuthorityCapabilitySchema,
+  type DeploymentAuthorityContractNeed,
+  DeploymentAuthorityContractNeedSchema,
   type DeploymentAuthorityGrantOverride,
   DeploymentAuthorityGrantOverrideSchema,
   type DeploymentAuthorityKind,
@@ -234,8 +244,8 @@ export {
   DeploymentAuthorityMaterializationSchema,
   type DeploymentAuthorityMigration,
   DeploymentAuthorityMigrationSchema,
-  type DeploymentAuthorityNeed,
-  DeploymentAuthorityNeedSchema,
+  type DeploymentAuthorityNeeds,
+  DeploymentAuthorityNeedsSchema,
   type DeploymentAuthorityPlan,
   DeploymentAuthorityPlanSchema,
   type DeploymentAuthorityProposal,
@@ -244,16 +254,21 @@ export {
   DeploymentAuthorityReconciliationStatusSchema,
   type DeploymentAuthorityResource,
   DeploymentAuthorityResourceKindSchema,
+  type DeploymentAuthorityResourceNeed,
+  DeploymentAuthorityResourceNeedSchema,
   DeploymentAuthorityResourceSchema,
   DeploymentAuthoritySchema,
   type DeploymentAuthoritySurface,
   DeploymentAuthoritySurfaceActionSchema,
   DeploymentAuthoritySurfaceKindSchema,
+  type DeploymentAuthoritySurfaceNeed,
+  DeploymentAuthoritySurfaceNeedSchema,
   DeploymentAuthoritySurfaceSchema,
   type DeploymentAuthorityUpdate,
   DeploymentAuthorityUpdateSchema,
   DeploymentPortalRouteSchema,
   DeploymentResourceBindingSchema,
+  DeviceActivationActorSchema,
   type DeviceActivationRecord,
   DeviceActivationRecordSchema,
   DeviceActivationReviewSchema,
@@ -273,6 +288,17 @@ export {
   LoginPortalSettingsSchema,
   type LoginPortalSummary,
   LoginPortalSummarySchema,
+  type MaterializedAuthorityCapabilityGrant,
+  MaterializedAuthorityCapabilityGrantSchema,
+  type MaterializedAuthorityGrant,
+  type MaterializedAuthorityGrants,
+  MaterializedAuthorityGrantsSchema,
+  type MaterializedAuthorityNatsGrant,
+  MaterializedAuthorityNatsGrantSchema,
+  type MaterializedAuthorityNatsGrantSource,
+  MaterializedAuthorityNatsGrantSourceSchema,
+  type MaterializedAuthoritySurfaceGrant,
+  MaterializedAuthoritySurfaceGrantSchema,
   OpenObjectSchema,
   type ParticipantKind,
   ParticipantKindSchema,

package/src/auth/protocol.ts

@@ -191,30 +191,51 @@ export type DeploymentAuthorityResource = StaticDecode<
   typeof DeploymentAuthorityResourceSchema
 >;
 
-export const DeploymentAuthorityNeedSchema = Type.Union([
-  Type.Object({
-    kind: Type.Literal("contract"),
-    contractId: Type.String({ minLength: 1 }),
-    required: Type.Boolean(),
-  }),
-  Type.Object({
-    kind: Type.Literal("surface"),
-    surface: DeploymentAuthoritySurfaceSchema,
-    required: Type.Boolean(),
-  }),
-  Type.Object({
-    kind: Type.Literal("capability"),
-    capability: DeploymentAuthorityCapabilitySchema,
-    required: Type.Boolean(),
-  }),
-  Type.Object({
-    kind: Type.Literal("resource"),
-    resource: DeploymentAuthorityResourceSchema,
-    required: Type.Boolean(),
-  }),
-]);
-export type DeploymentAuthorityNeed = StaticDecode<
-  typeof DeploymentAuthorityNeedSchema
+export const DeploymentAuthorityContractNeedSchema = Type.Object({
+  contractId: Type.String({ minLength: 1 }),
+  required: Type.Boolean(),
+});
+export type DeploymentAuthorityContractNeed = StaticDecode<
+  typeof DeploymentAuthorityContractNeedSchema
+>;
+
+export const DeploymentAuthoritySurfaceNeedSchema = Type.Object({
+  contractId: Type.String({ minLength: 1 }),
+  kind: DeploymentAuthoritySurfaceKindSchema,
+  name: Type.String({ minLength: 1 }),
+  action: Type.Optional(DeploymentAuthoritySurfaceActionSchema),
+  required: Type.Boolean(),
+});
+export type DeploymentAuthoritySurfaceNeed = StaticDecode<
+  typeof DeploymentAuthoritySurfaceNeedSchema
+>;
+
+export const DeploymentAuthorityCapabilityNeedSchema = Type.Object({
+  capability: DeploymentAuthorityCapabilitySchema,
+  required: Type.Boolean(),
+});
+export type DeploymentAuthorityCapabilityNeed = StaticDecode<
+  typeof DeploymentAuthorityCapabilityNeedSchema
+>;
+
+export const DeploymentAuthorityResourceNeedSchema = Type.Object({
+  kind: DeploymentAuthorityResourceKindSchema,
+  alias: Type.String({ minLength: 1 }),
+  required: Type.Boolean(),
+  definition: Type.Optional(OpenObjectSchema),
+});
+export type DeploymentAuthorityResourceNeed = StaticDecode<
+  typeof DeploymentAuthorityResourceNeedSchema
+>;
+
+export const DeploymentAuthorityNeedsSchema = Type.Object({
+  contracts: Type.Array(DeploymentAuthorityContractNeedSchema),
+  surfaces: Type.Array(DeploymentAuthoritySurfaceNeedSchema),
+  capabilities: Type.Array(DeploymentAuthorityCapabilityNeedSchema),
+  resources: Type.Array(DeploymentAuthorityResourceNeedSchema),
+});
+export type DeploymentAuthorityNeeds = StaticDecode<
+  typeof DeploymentAuthorityNeedsSchema
 >;
 
 export const DeploymentAuthoritySchema = Type.Object({
@@ -222,7 +243,7 @@ export const DeploymentAuthoritySchema = Type.Object({
   kind: DeploymentAuthorityKindSchema,
   disabled: Type.Boolean(),
   desiredState: Type.Object({
-    needs: Type.Array(DeploymentAuthorityNeedSchema),
+    needs: DeploymentAuthorityNeedsSchema,
     capabilities: Type.Array(DeploymentAuthorityCapabilitySchema),
     resources: Type.Array(DeploymentAuthorityResourceSchema),
     surfaces: Type.Array(DeploymentAuthoritySurfaceSchema),
@@ -241,7 +262,7 @@ export const DeploymentAuthorityProposalSchema = Type.Object({
   contractId: Type.String({ minLength: 1 }),
   contractDigest: DigestSchema,
   contract: Type.Optional(OpenObjectSchema),
-  requestedNeeds: Type.Array(DeploymentAuthorityNeedSchema),
+  requestedNeeds: DeploymentAuthorityNeedsSchema,
   providedSurfaces: Type.Array(DeploymentAuthoritySurfaceSchema),
   summary: Type.Optional(OpenObjectSchema),
 });
@@ -263,17 +284,21 @@ export type DeploymentResourceBinding = StaticDecode<
 >;
 
 export const MaterializedAuthoritySurfaceGrantSchema = Type.Object({
-  kind: Type.Literal("surface"),
   contractId: Type.String({ minLength: 1 }),
   surfaceKind: DeploymentAuthoritySurfaceKindSchema,
   name: Type.String({ minLength: 1 }),
   action: Type.Optional(DeploymentAuthoritySurfaceActionSchema),
 });
+export type MaterializedAuthoritySurfaceGrant = StaticDecode<
+  typeof MaterializedAuthoritySurfaceGrantSchema
+>;
 
 export const MaterializedAuthorityCapabilityGrantSchema = Type.Object({
-  kind: Type.Literal("capability"),
   capability: DeploymentAuthorityCapabilitySchema,
 });
+export type MaterializedAuthorityCapabilityGrant = StaticDecode<
+  typeof MaterializedAuthorityCapabilityGrantSchema
+>;
 
 export const MaterializedAuthorityNatsGrantSourceSchema = Type.Union([
   Type.Literal("owned-surface"),
@@ -282,9 +307,11 @@ export const MaterializedAuthorityNatsGrantSourceSchema = Type.Union([
   Type.Literal("platform-service"),
   Type.Literal("transfer"),
 ]);
+export type MaterializedAuthorityNatsGrantSource = StaticDecode<
+  typeof MaterializedAuthorityNatsGrantSourceSchema
+>;
 
 export const MaterializedAuthorityNatsGrantSchema = Type.Object({
-  kind: Type.Literal("nats"),
   direction: Type.Union([Type.Literal("publish"), Type.Literal("subscribe")]),
   subject: Type.String({ minLength: 1 }),
   surface: Type.Optional(Type.Object({
@@ -296,16 +323,24 @@ export const MaterializedAuthorityNatsGrantSchema = Type.Object({
   requiredCapabilities: Type.Array(Type.String({ minLength: 1 })),
   grantSource: MaterializedAuthorityNatsGrantSourceSchema,
 });
+export type MaterializedAuthorityNatsGrant = StaticDecode<
+  typeof MaterializedAuthorityNatsGrantSchema
+>;
 
-export const MaterializedAuthorityGrantSchema = Type.Union([
-  MaterializedAuthorityCapabilityGrantSchema,
-  MaterializedAuthoritySurfaceGrantSchema,
-  MaterializedAuthorityNatsGrantSchema,
-]);
-export type MaterializedAuthorityGrant = StaticDecode<
-  typeof MaterializedAuthorityGrantSchema
+export const MaterializedAuthorityGrantsSchema = Type.Object({
+  capabilities: Type.Array(MaterializedAuthorityCapabilityGrantSchema),
+  surfaces: Type.Array(MaterializedAuthoritySurfaceGrantSchema),
+  nats: Type.Array(MaterializedAuthorityNatsGrantSchema),
+});
+export type MaterializedAuthorityGrants = StaticDecode<
+  typeof MaterializedAuthorityGrantsSchema
 >;
 
+export type MaterializedAuthorityGrant =
+  | MaterializedAuthorityCapabilityGrant
+  | MaterializedAuthoritySurfaceGrant
+  | MaterializedAuthorityNatsGrant;
+
 export const DeploymentAuthorityMaterializationSchema = Type.Object({
   deploymentId: Type.String({ minLength: 1 }),
   desiredVersion: Type.String({ minLength: 1 }),
@@ -315,7 +350,7 @@ export const DeploymentAuthorityMaterializationSchema = Type.Object({
     Type.Literal("failed"),
   ]),
   resourceBindings: Type.Array(DeploymentResourceBindingSchema),
-  grants: Type.Array(MaterializedAuthorityGrantSchema),
+  grants: MaterializedAuthorityGrantsSchema,
   reconciledAt: Type.Union([IsoDateStringSchema, Type.Null()]),
   error: Type.Optional(Type.String({ minLength: 1 })),
 });

package/src/codec.ts

@@ -59,6 +59,7 @@ export function parseSchema<S extends SchemaLike>(
   }
 }
 
+/** Parses unknown JSON-compatible data with an arbitrary Trellis schema. */
 export function parseUnknownSchema(
   schema: SchemaLike,
   data: JsonValue,

package/src/contract_support/canonical.ts

@@ -194,10 +194,12 @@ export function sha256Bytes(data: Uint8Array): Uint8Array {
   return out;
 }
 
+/** Computes a synchronous SHA-256 digest encoded as base64url. */
 export function sha256Base64urlSync(text: string): string {
   return base64url(sha256Bytes(new TextEncoder().encode(text)));
 }
 
+/** Computes a SHA-256 digest encoded as base64url. */
 export async function sha256Base64url(text: string): Promise<string> {
   if (typeof crypto !== "undefined" && crypto.subtle) {
     const data = new TextEncoder().encode(text);
@@ -207,6 +209,7 @@ export async function sha256Base64url(text: string): Promise<string> {
   return sha256Base64urlSync(text);
 }
 
+/** Canonicalizes JSON and computes its SHA-256 base64url digest. */
 export async function digestJson(value: JsonValue): Promise<{
   canonical: string;
   digest: string;

package/src/contract_support/mod.ts

@@ -64,6 +64,10 @@ import {
   ContractResourcesSchema,
   ContractSchemaRefSchema,
   ContractStateSchema,
+  type JobKeyConcurrency,
+  JobKeyConcurrencySchema,
+  type JobQueueDepth,
+  JobQueueDepthSchema,
 } from "./protocol.js";
 
 export {
@@ -80,6 +84,7 @@ export {
   ContractJobQueueSchema,
   ContractJobsSchema,
   ContractKvResourceSchema,
+  type ContractResourceBindings,
   ContractResourceBindingsSchema,
   ContractResourcesSchema,
   ContractSchemaRefSchema,
@@ -95,13 +100,19 @@ export {
   CursorQuerySchema,
   type EventConsumerResourceBinding,
   EventConsumerResourceBindingSchema,
-  type EventHeader,
-  EventHeaderSchema,
   type InstalledServiceContract,
   InstalledServiceContractSchema,
   IsoDateSchema,
+  type JobKeyConcurrency,
+  JobKeyConcurrencySchema,
+  type JobQueueDepth,
+  JobQueueDepthSchema,
   type JobsQueueBinding,
   JobsQueueBindingSchema,
+  type JobsQueueDepthBinding,
+  JobsQueueDepthBindingSchema,
+  type JobsQueueKeyConcurrencyBinding,
+  JobsQueueKeyConcurrencyBindingSchema,
   type JobsResourceBinding,
   JobsResourceBindingSchema,
   type KvResourceBinding,
@@ -555,6 +566,8 @@ export type ContractJobQueueResource = {
   logs?: boolean;
   dlq?: boolean;
   concurrency?: number;
+  keyConcurrency?: JobKeyConcurrency;
+  queue?: JobQueueDepth;
   docs?: ContractDocs;
 };
 
@@ -961,6 +974,17 @@ export type ContractSourceJobQueue<
   logs?: boolean;
   dlq?: boolean;
   concurrency?: number;
+  keyConcurrency?: {
+    key: readonly string[];
+    maxActive?: number;
+    heartbeatIntervalMs?: number;
+    heartbeatTtlMs?: number;
+    stalePolicy?: "fail-stale" | "block";
+  };
+  queue?: {
+    maxQueuedPerKey?: number;
+    whenFull?: "reject" | "coalesce" | "replace-oldest";
+  };
   docs?: ContractDocs;
 };
 
@@ -3119,7 +3143,110 @@ function errorDecl(error: ContractErrorDecl): ContractErrorDecl {
   };
 }
 
-function jobQueue(queue: ContractJobQueue): ContractJobQueue {
+type JobKeyConcurrencyLike = {
+  key: readonly string[];
+  maxActive?: number;
+  heartbeatIntervalMs?: number;
+  heartbeatTtlMs?: number;
+  stalePolicy?: "fail-stale" | "block";
+};
+
+type JobQueueDepthLike = {
+  maxQueuedPerKey?: number;
+  whenFull?: "reject" | "coalesce" | "replace-oldest";
+};
+
+function assertValidJsonPointerSyntax(
+  queueType: string,
+  pointer: string,
+): void {
+  if (!pointer.startsWith("/")) {
+    throw new Error(
+      `jobs queue '${queueType}' keyConcurrency.key pointer segment '${pointer}' must start with '/'`,
+    );
+  }
+  for (let index = 0; index < pointer.length; index += 1) {
+    if (pointer[index] !== "~") continue;
+    const escaped = pointer[index + 1];
+    if (escaped !== "0" && escaped !== "1") {
+      throw new Error(
+        `jobs queue '${queueType}' keyConcurrency.key pointer segment '${pointer}' has invalid JSON Pointer escape at offset ${index}; use '~0' for '~' and '~1' for '/'`,
+      );
+    }
+    index += 1;
+  }
+}
+
+function assertValidJobKeyConcurrency(
+  queueType: string,
+  keyConcurrency: JobKeyConcurrencyLike | undefined,
+): void {
+  if (!keyConcurrency) return;
+  if (keyConcurrency.key.length === 0) {
+    throw new Error(
+      `jobs queue '${queueType}' keyConcurrency.key must contain at least one segment`,
+    );
+  }
+  for (const segment of keyConcurrency.key) {
+    if (segment.length === 0) {
+      throw new Error(
+        `jobs queue '${queueType}' keyConcurrency.key segments must be non-empty strings`,
+      );
+    }
+    if (segment.startsWith("/")) {
+      assertValidJsonPointerSyntax(queueType, segment);
+    }
+  }
+  if (
+    keyConcurrency.heartbeatIntervalMs !== undefined &&
+    keyConcurrency.heartbeatTtlMs !== undefined &&
+    keyConcurrency.heartbeatTtlMs <= keyConcurrency.heartbeatIntervalMs
+  ) {
+    throw new Error(
+      `jobs queue '${queueType}' keyConcurrency.heartbeatTtlMs must exceed heartbeatIntervalMs`,
+    );
+  }
+}
+
+function jobKeyConcurrency(
+  queueType: string,
+  keyConcurrency: JobKeyConcurrencyLike | undefined,
+): JobKeyConcurrency | undefined {
+  assertValidJobKeyConcurrency(queueType, keyConcurrency);
+  if (!keyConcurrency) return undefined;
+  return {
+    key: [...keyConcurrency.key],
+    ...(keyConcurrency.maxActive !== undefined
+      ? { maxActive: keyConcurrency.maxActive }
+      : {}),
+    ...(keyConcurrency.heartbeatIntervalMs !== undefined
+      ? { heartbeatIntervalMs: keyConcurrency.heartbeatIntervalMs }
+      : {}),
+    ...(keyConcurrency.heartbeatTtlMs !== undefined
+      ? { heartbeatTtlMs: keyConcurrency.heartbeatTtlMs }
+      : {}),
+    ...(keyConcurrency.stalePolicy !== undefined
+      ? { stalePolicy: keyConcurrency.stalePolicy }
+      : {}),
+  };
+}
+
+function jobQueueDepth(
+  queue: JobQueueDepthLike | undefined,
+): JobQueueDepth | undefined {
+  if (!queue) return undefined;
+  return {
+    ...(queue.maxQueuedPerKey !== undefined
+      ? { maxQueuedPerKey: queue.maxQueuedPerKey }
+      : {}),
+    ...(queue.whenFull !== undefined ? { whenFull: queue.whenFull } : {}),
+  };
+}
+
+function jobQueue(
+  queueType: string,
+  queue: ContractJobQueue,
+): ContractJobQueue {
   return {
     payload: schemaRef(queue.payload),
     ...(queue.result ? { result: schemaRef(queue.result) } : {}),
@@ -3135,6 +3262,10 @@ function jobQueue(queue: ContractJobQueue): ContractJobQueue {
     ...(queue.concurrency !== undefined
       ? { concurrency: queue.concurrency }
       : {}),
+    ...(queue.keyConcurrency
+      ? { keyConcurrency: jobKeyConcurrency(queueType, queue.keyConcurrency) }
+      : {}),
+    ...(queue.queue ? { queue: jobQueueDepth(queue.queue) } : {}),
     ...(queue.docs ? { docs: contractDocs(queue.docs) } : {}),
   };
 }
@@ -3208,7 +3339,16 @@ export function normalizeContractManifest(
       : {}),
     ...(contract.events ? { events: mapValues(contract.events, event) } : {}),
     ...(contract.feeds ? { feeds: mapValues(contract.feeds, feed) } : {}),
-    ...(contract.jobs ? { jobs: mapValues(contract.jobs, jobQueue) } : {}),
+    ...(contract.jobs
+      ? {
+        jobs: Object.fromEntries(
+          Object.entries(contract.jobs).map(([queueType, queue]) => [
+            queueType,
+            jobQueue(queueType, queue),
+          ]),
+        ),
+      }
+      : {}),
     ...(contract.eventConsumers
       ? {
         eventConsumers: mapValues(
@@ -3411,6 +3551,12 @@ function emitJobs(
         ...(queue.concurrency !== undefined
           ? { concurrency: queue.concurrency }
           : {}),
+        ...(queue.keyConcurrency
+          ? {
+            keyConcurrency: jobKeyConcurrency(queueType, queue.keyConcurrency),
+          }
+          : {}),
+        ...(queue.queue ? { queue: jobQueueDepth(queue.queue) } : {}),
         ...(queue.docs ? { docs: contractDocs(queue.docs) } : {}),
       } satisfies ContractJobQueue,
     ]),
@@ -5459,4 +5605,11 @@ export type {
   SerializableErrorData,
   TrellisAPI,
 };
-export { canonicalizeJson, digestJson, isJsonValue, schema, unwrapSchema };
+export {
+  canonicalizeJson,
+  digestJson,
+  isJsonValue,
+  schema,
+  sha256Base64urlSync,
+  unwrapSchema,
+};

package/src/contract_support/protocol.ts

@@ -76,6 +76,30 @@ export const ContractStateSchema = Type.Record(
 
 export type ContractState = Static<typeof ContractStateSchema>;
 
+export const JobKeyConcurrencySchema = Type.Object({
+  key: Type.Array(Type.String({ minLength: 1 }), { minItems: 1 }),
+  maxActive: Type.Optional(Type.Integer({ minimum: 1 })),
+  heartbeatIntervalMs: Type.Optional(Type.Integer({ minimum: 1 })),
+  heartbeatTtlMs: Type.Optional(Type.Integer({ minimum: 1 })),
+  stalePolicy: Type.Optional(Type.Union([
+    Type.Literal("fail-stale"),
+    Type.Literal("block"),
+  ])),
+});
+
+export type JobKeyConcurrency = Static<typeof JobKeyConcurrencySchema>;
+
+export const JobQueueDepthSchema = Type.Object({
+  maxQueuedPerKey: Type.Optional(Type.Integer({ minimum: 0 })),
+  whenFull: Type.Optional(Type.Union([
+    Type.Literal("reject"),
+    Type.Literal("coalesce"),
+    Type.Literal("replace-oldest"),
+  ])),
+});
+
+export type JobQueueDepth = Static<typeof JobQueueDepthSchema>;
+
 export const ContractJobQueueSchema = Type.Object({
   payload: ContractSchemaRefSchema,
   result: Type.Optional(ContractSchemaRefSchema),
@@ -87,6 +111,8 @@ export const ContractJobQueueSchema = Type.Object({
   logs: Type.Optional(Type.Boolean()),
   dlq: Type.Optional(Type.Boolean()),
   concurrency: Type.Optional(Type.Integer({ minimum: 1 })),
+  keyConcurrency: Type.Optional(JobKeyConcurrencySchema),
+  queue: Type.Optional(JobQueueDepthSchema),
   docs: Type.Optional(ContractDocsSchema),
 });
 
@@ -173,6 +199,34 @@ export const StoreResourceBindingSchema = Type.Object({
 
 export type StoreResourceBinding = Static<typeof StoreResourceBindingSchema>;
 
+export const JobsQueueKeyConcurrencyBindingSchema = Type.Object({
+  key: Type.Array(Type.String({ minLength: 1 }), { minItems: 1 }),
+  maxActive: Type.Integer({ minimum: 1 }),
+  heartbeatIntervalMs: Type.Integer({ minimum: 1 }),
+  heartbeatTtlMs: Type.Integer({ minimum: 1 }),
+  stalePolicy: Type.Union([
+    Type.Literal("fail-stale"),
+    Type.Literal("block"),
+  ]),
+});
+
+export type JobsQueueKeyConcurrencyBinding = Static<
+  typeof JobsQueueKeyConcurrencyBindingSchema
+>;
+
+export const JobsQueueDepthBindingSchema = Type.Object({
+  maxQueuedPerKey: Type.Integer({ minimum: 0 }),
+  whenFull: Type.Union([
+    Type.Literal("reject"),
+    Type.Literal("coalesce"),
+    Type.Literal("replace-oldest"),
+  ]),
+});
+
+export type JobsQueueDepthBinding = Static<
+  typeof JobsQueueDepthBindingSchema
+>;
+
 export const JobsQueueBindingSchema = Type.Object({
   queueType: Type.String({ minLength: 1 }),
   publishPrefix: Type.String({ minLength: 1 }),
@@ -188,6 +242,8 @@ export const JobsQueueBindingSchema = Type.Object({
   logs: Type.Boolean(),
   dlq: Type.Boolean(),
   concurrency: Type.Integer({ minimum: 1 }),
+  keyConcurrency: Type.Optional(JobsQueueKeyConcurrencyBindingSchema),
+  queue: Type.Optional(JobsQueueDepthBindingSchema),
 });
 
 export type JobsQueueBinding = Static<typeof JobsQueueBindingSchema>;
@@ -252,15 +308,6 @@ export const IsoDateSchema = Type.Codec(
   .Decode((value: string) => parseIsoDate(value))
   .Encode((value: Date) => formatIsoDate(value));
 
-export const EventHeaderSchema = Type.Object({
-  header: Type.Object({
-    id: Type.String(),
-    time: IsoDateSchema,
-  }),
-});
-
-export type EventHeader = Static<typeof EventHeaderSchema>;
-
 /** Schema for a bounded pagination request. */
 export const PageRequestSchema = Type.Object({
   offset: Type.Optional(Type.Integer({ minimum: 0 })),

package/src/health.ts

@@ -19,7 +19,6 @@ export {
 } from "./server/health.js";
 export {
   HealthCheckResultSchema,
-  HealthHeartbeatHeaderSchema,
   HealthHeartbeatSchema,
   HealthHeartbeatServiceSchema,
   HealthInfoSchema,

package/src/index.ts

@@ -43,7 +43,6 @@ export type {
 export {
   createHealthHeartbeat,
   HealthCheckResultSchema,
-  HealthHeartbeatHeaderSchema,
   HealthHeartbeatSchema,
   HealthHeartbeatServiceSchema,
   HealthInfoSchema,
@@ -246,6 +245,8 @@ export type {
   RuntimeStateStoresForContract,
   RuntimeStateStoreShape,
   StateFacade,
+  TrellisEventHeader,
+  TrellisEventMessage,
   TrellisFor,
   ValueStateStoreClient,
 } from "./trellis.js";