@qlever-llc/trellis 0.8.4 → 0.9.0-rc.10

package/esm/npm/src/contract_support/protocol.d.ts

@@ -1,4 +1,4 @@
-import Type, { type Static } from "typebox";
+import Type, { type Static, type TSchema } from "typebox";
 export declare const ContractSchemaRefSchema: Type.TObject<{
     schema: Type.TString;
 }>;
@@ -248,12 +248,27 @@ export declare const EventHeaderSchema: Type.TObject<{
     }>;
 }>;
 export type EventHeader = Static<typeof EventHeaderSchema>;
-export declare const PaginatedSchema: Type.TObject<{
+/** Schema for a bounded pagination request. */
+export declare const PageRequestSchema: Type.TObject<{
+    offset: Type.TOptional<Type.TInteger>;
+    limit: Type.TInteger;
+}>;
+/** Bounded pagination request. */
+export type PageRequest = Static<typeof PageRequestSchema>;
+/** Create a schema for a bounded page response with typed entries. */
+export declare function PageResponseSchema<TEntry extends TSchema>(entry: TEntry): Type.TObject<{
+    entries: Type.TArray<TEntry>;
     count: Type.TInteger;
     offset: Type.TInteger;
     limit: Type.TInteger;
-    next: Type.TOptional<Type.TInteger>;
-    prev: Type.TOptional<Type.TInteger>;
+    nextOffset: Type.TOptional<Type.TInteger>;
 }>;
-export type Paginated = Static<typeof PaginatedSchema>;
+/** Bounded pagination response with typed entries. */
+export type PageResponse<TEntry> = {
+    entries: TEntry[];
+    count: number;
+    offset: number;
+    limit: number;
+    nextOffset?: number;
+};
 //# sourceMappingURL=protocol.d.ts.map

package/esm/npm/src/contract_support/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../src/contract_support/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAmB5C,eAAO,MAAM,uBAAuB;;EAED,CAAC;AAEpC,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEvE,eAAO,MAAM,wBAAwB;;;;;;;;;EAOF,CAAC;AAEpC,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAEzE,eAAO,MAAM,2BAA2B;;;;;;EAML,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAE/E,eAAO,MAAM,wBAAwB;;;;;;;;;EAWF,CAAC;AAEpC,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAEzE,eAAO,MAAM,mBAAmB;;;;;;;;;GAG/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAE/D,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;EAWA,CAAC;AAEpC,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAErE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;GAG9B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE7D,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAOD,CAAC;AAEpC,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEvE,eAAO,MAAM,uBAAuB;;;;;EAKlC,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEvE,eAAO,MAAM,0BAA0B;;;;;EAKrC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE7E,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;EAejC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAErE,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;EAIpC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE3E,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIzC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,aAAa,iCAIsB,CAAC;AAEjD,eAAO,MAAM,iBAAiB;;;;;EAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE3D,eAAO,MAAM,eAAe;;;;;;EAM1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../../src/contract_support/protocol.ts"],"names":[],"mappings":"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"}

package/esm/npm/src/contract_support/protocol.js

@@ -14,7 +14,7 @@ function formatIsoDate(value) {
 }
 export const ContractSchemaRefSchema = Type.Object({
     schema: Type.String({ minLength: 1 }),
-}, { additionalProperties: false });
+});
 export const ContractKvResourceSchema = Type.Object({
     purpose: Type.String({ minLength: 1 }),
     schema: ContractSchemaRefSchema,
@@ -22,14 +22,14 @@ export const ContractKvResourceSchema = Type.Object({
     history: Type.Optional(Type.Integer({ minimum: 1, default: 1 })),
     ttlMs: Type.Optional(Type.Integer({ minimum: 0, default: 0 })),
     maxValueBytes: Type.Optional(Type.Integer({ minimum: 1 })),
-}, { additionalProperties: false });
+});
 export const ContractStoreResourceSchema = Type.Object({
     purpose: Type.String({ minLength: 1 }),
     required: Type.Optional(Type.Boolean({ default: true })),
     ttlMs: Type.Optional(Type.Integer({ minimum: 0, default: 0 })),
     maxObjectBytes: Type.Optional(Type.Integer({ minimum: 1 })),
     maxTotalBytes: Type.Optional(Type.Integer({ minimum: 1 })),
-}, { additionalProperties: false });
+});
 export const ContractStateStoreSchema = Type.Object({
     kind: Type.Union([
         Type.Literal("value"),
@@ -38,7 +38,7 @@ export const ContractStateStoreSchema = Type.Object({
     schema: ContractSchemaRefSchema,
     stateVersion: Type.Optional(Type.String({ minLength: 1 })),
     acceptedVersions: Type.Optional(Type.Record(Type.String({ minLength: 1 }), ContractSchemaRefSchema)),
-}, { additionalProperties: false });
+});
 export const ContractStateSchema = Type.Record(Type.String({ minLength: 1 }), ContractStateStoreSchema);
 export const ContractJobQueueSchema = Type.Object({
     payload: ContractSchemaRefSchema,
@@ -51,7 +51,7 @@ export const ContractJobQueueSchema = Type.Object({
     logs: Type.Optional(Type.Boolean()),
     dlq: Type.Optional(Type.Boolean()),
     concurrency: Type.Optional(Type.Integer({ minimum: 1 })),
-}, { additionalProperties: false });
+});
 export const ContractJobsSchema = Type.Record(Type.String({ minLength: 1 }), ContractJobQueueSchema);
 export const ContractResourcesSchema = Type.Object({
     kv: Type.Optional(Type.Record(Type.String({ minLength: 1 }), ContractKvResourceSchema)),
@@ -109,10 +109,18 @@ export const EventHeaderSchema = Type.Object({
         time: IsoDateSchema,
     }),
 });
-export const PaginatedSchema = Type.Object({
-    count: Type.Integer({ minimum: 0 }),
-    offset: Type.Integer({ minimum: 0 }),
+/** Schema for a bounded pagination request. */
+export const PageRequestSchema = Type.Object({
+    offset: Type.Optional(Type.Integer({ minimum: 0 })),
     limit: Type.Integer({ minimum: 0 }),
-    next: Type.Optional(Type.Integer({ minimum: 0 })),
-    prev: Type.Optional(Type.Integer({ minimum: 0 })),
 });
+/** Create a schema for a bounded page response with typed entries. */
+export function PageResponseSchema(entry) {
+    return Type.Object({
+        entries: Type.Array(entry, { default: [] }),
+        count: Type.Integer({ minimum: 0 }),
+        offset: Type.Integer({ minimum: 0 }),
+        limit: Type.Integer({ minimum: 0 }),
+        nextOffset: Type.Optional(Type.Integer({ minimum: 0 })),
+    });
+}

package/esm/npm/src/contract_support/runtime.d.ts

@@ -45,6 +45,12 @@ export type EventDesc<S extends SchemaLike = SchemaLike> = {
     publishCapabilities: readonly string[];
     subscribeCapabilities: readonly string[];
 };
+export type FeedDesc<I extends SchemaLike = SchemaLike, E extends SchemaLike = SchemaLike> = {
+    subject: string;
+    input: I;
+    event: E;
+    subscribeCapabilities: readonly string[];
+};
 export type OperationDesc<I extends SchemaLike = SchemaLike, P extends SchemaLike | undefined = SchemaLike | undefined, O extends SchemaLike | undefined = SchemaLike | undefined> = {
     subject: string;
     input: I;
@@ -59,15 +65,20 @@ export type OperationDesc<I extends SchemaLike = SchemaLike, P extends SchemaLik
         expiresInMs?: number;
         maxBytes?: number;
     };
+    signals?: Record<string, {
+        input: SchemaLike;
+    }>;
     callerCapabilities: readonly string[];
     readCapabilities: readonly string[];
     cancelCapabilities: readonly string[];
+    controlCapabilities: readonly string[];
     cancel?: boolean;
 };
 export type TrellisAPI = {
     rpc: Record<string, RPCDesc>;
     operations: Record<string, OperationDesc>;
     events: Record<string, EventDesc>;
+    feeds?: Record<string, FeedDesc>;
     subjects: Record<string, unknown>;
 };
 //# sourceMappingURL=runtime.d.ts.map

package/esm/npm/src/contract_support/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/contract_support/runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../src/contract_support/runtime.ts"],"names":[],"mappings":"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"}

package/esm/npm/src/contract_support/schema_pointers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema_pointers.d.ts","sourceRoot":"","sources":["../../../../src/contract_support/schema_pointers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema_pointers.d.ts","sourceRoot":"","sources":["../../../../src/contract_support/schema_pointers.ts"],"names":[],"mappings":"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"}

package/esm/npm/src/contract_support/schema_pointers.js

@@ -1,4 +1,31 @@
-import { compileSchema } from "json-schema-library";
+function isJsonObject(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function decodeJsonPointerSegment(segment) {
+    return segment.replaceAll("~1", "/").replaceAll("~0", "~");
+}
+function resolveSubschema(schema, segments) {
+    if (segments.length === 0)
+        return schema;
+    if (!isJsonObject(schema))
+        return undefined;
+    for (const key of ["allOf", "anyOf", "oneOf"]) {
+        const variants = schema[key];
+        if (!Array.isArray(variants))
+            continue;
+        for (const variant of variants) {
+            const resolved = resolveSubschema(variant, segments);
+            if (resolved !== undefined)
+                return resolved;
+        }
+    }
+    const properties = schema.properties;
+    const [segment, ...rest] = segments;
+    if (!isJsonObject(properties) || !Object.hasOwn(properties, segment)) {
+        return undefined;
+    }
+    return resolveSubschema(properties[segment], rest);
+}
 function isTokenableSchema(schema) {
     if (schema === true || schema === false)
         return false;
@@ -35,24 +62,15 @@ function isTokenableSchema(schema) {
     return false;
 }
 export function getSubschemaAtDataPointer(schema, pointer) {
-    const root = compileSchema(schema);
-    const { node, error } = root.getNode(pointer, undefined, {
-        withSchemaWarning: true,
-    });
-    if (error || !node)
-        return undefined;
-    return node.schema;
+    return resolveSubschema(schema, pointer.slice(1).split("/").map(decodeJsonPointerSegment));
 }
 export function assertDataPointersExistAndAreTokenable(name, schema, pointers) {
-    const root = compileSchema(schema);
     for (const pointer of pointers) {
-        const { node, error } = root.getNode(pointer, undefined, {
-            withSchemaWarning: true,
-        });
-        if (error || !node) {
+        const node = getSubschemaAtDataPointer(schema, pointer);
+        if (node === undefined) {
             throw new Error(`Invalid event subject param pointer '${pointer}' for event '${name}' (path not found in schema)`);
         }
-        if (!isTokenableSchema(node.schema)) {
+        if (!isTokenableSchema(node)) {
             throw new Error(`Invalid event subject param pointer '${pointer}' for event '${name}' (must resolve to string/number schema)`);
         }
     }

package/esm/npm/src/device/deno.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deno.d.ts","sourceRoot":"","sources":["../../../../src/device/deno.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAQ9B,OAAO,KAAK,EAEV,2BAA2B,EAG5B,MAAM,cAAc,CAAC;AAMtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAmIlD;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,SAAS,SAAS;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;CACxB,GAAG;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;CACxB,IACC,2BAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,qBAAqB,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CACnB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAC9B,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC7E,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,6BAA6B,GACrC,4BAA4B,GAC5B,2BAA2B,GAC3B,qCAAqC,CAAC;AA4oB1C;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,SAAS,UAAU,EACvB,SAAS,SAAS;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;CACxB,EAED,IAAI,EAAE,yBAAyB,CAAC,IAAI,EAAE,SAAS,CAAC,GAC/C,OAAO,CAAC,6BAA6B,CAAC,CAgExC"}
+{"version":3,"file":"deno.d.ts","sourceRoot":"","sources":["../../../../src/device/deno.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAQ9B,OAAO,KAAK,EAEV,2BAA2B,EAG5B,MAAM,cAAc,CAAC;AAMtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAqIlD;;GAEG;AACH,MAAM,MAAM,yBAAyB,CACnC,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,SAAS,SAAS;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;CACxB,GAAG;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;CACxB,IACC,2BAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,qBAAqB,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CACnB,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAC9B,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACzC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;CAC7E,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,6BAA6B,GACrC,4BAA4B,GAC5B,2BAA2B,GAC3B,qCAAqC,CAAC;AAipB1C;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,SAAS,UAAU,EACvB,SAAS,SAAS;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnC,GAAG,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC;CACxB,EAED,IAAI,EAAE,yBAAyB,CAAC,IAAI,EAAE,SAAS,CAAC,GAC/C,OAAO,CAAC,6BAA6B,CAAC,CAgExC"}

package/esm/npm/src/device/deno.js

@@ -13,6 +13,7 @@ const PendingActivationStateSchema = Type.Object({
     publicIdentityKey: Type.String({ minLength: 1 }),
     instanceId: Type.String({ minLength: 1 }),
     deploymentId: Type.String({ minLength: 1 }),
+    flowId: Type.String({ minLength: 1 }),
     nonce: Type.String({ minLength: 1 }),
     activationUrl: Type.String({ minLength: 1 }),
 });
@@ -22,6 +23,7 @@ const ActivatedActivationStateSchema = Type.Object({
     publicIdentityKey: Type.String({ minLength: 1 }),
     instanceId: Type.String({ minLength: 1 }),
     deploymentId: Type.String({ minLength: 1 }),
+    flowId: Type.String({ minLength: 1 }),
     nonce: Type.String({ minLength: 1 }),
     activationUrl: Type.String({ minLength: 1 }),
 });
@@ -291,6 +293,7 @@ async function fetchDeviceBootstrap(args) {
     let iat = args.iat;
     for (let attempt = 0; attempt < 2; attempt += 1) {
         const request = await signDeviceWaitRequest({
+            flowId: "connect-info",
             publicIdentityKey: args.publicIdentityKey,
             nonce: "connect-info",
             identitySeed: args.identitySeed,
@@ -348,6 +351,7 @@ async function fetchDeviceActivationWaitStatus(args) {
     let iat = args.iat;
     for (let attempt = 0; attempt < 2; attempt += 1) {
         const request = await signDeviceWaitRequest({
+            flowId: args.flowId,
             publicIdentityKey: args.publicIdentityKey,
             nonce: args.nonce,
             identitySeed: args.identitySeed,
@@ -452,6 +456,7 @@ async function waitForActivationCompletion(args) {
             publicIdentityKey: identity.publicIdentityKey,
             identitySeed: identity.identitySeed,
             contractDigest: args.contractDigest,
+            flowId: args.localState.flowId,
             nonce: args.localState.nonce,
             signal: args.signal,
         });
@@ -535,6 +540,7 @@ async function resolvePendingActivation(args) {
         publicIdentityKey: args.publicIdentityKey,
         identitySeed: args.identitySeed,
         contractDigest: args.contractDigest,
+        flowId: args.localState.flowId,
         nonce: args.localState.nonce,
     });
     if (waitStatus.status === "activated") {

package/esm/npm/src/device.d.ts

@@ -71,6 +71,7 @@ export type TrellisDevicePendingActivationState = {
     publicIdentityKey: string;
     instanceId: string;
     deploymentId: string;
+    flowId: string;
     nonce: string;
     activationUrl: string;
 };
@@ -80,6 +81,7 @@ export type TrellisDeviceActivatedActivationState = {
     publicIdentityKey: string;
     instanceId: string;
     deploymentId: string;
+    flowId: string;
     nonce: string;
     activationUrl: string;
 };

package/esm/npm/src/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/device.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/device.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,WAAW,EAGX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,2BAA2B,CAAC;AAwBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAMjD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,6BAA6B,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAwB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAiB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,cAAc,CACjB,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,SAAS,SAAS;IAChB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,GAAG;IACF,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,IACC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,SAAS,GAAG;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,GAAG,EAAE;QACH,OAAO,EAAE,IAAI,CAAC;KACf,CAAC;IACF,QAAQ,CAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,qBAAqB,CAAC;CAC5D,CAAC;AAEF,KAAK,iBAAiB,CAAC,SAAS,SAAS,cAAc,IACrD,SAAS,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;AAE9B,KAAK,aAAa,CAChB,IAAI,SAAS,UAAU,EACvB,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,IACtE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAkCpC,MAAM,MAAM,uBAAuB,CACjC,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,EAAE,IAC3E;IACF,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;IACzD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC;IAC7D,QAAQ,CAAC,QAAQ,EAAE;QACjB,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,CAAC;QAC/C,CAAC,KAAK,EAAE,oBAAoB,GAAG,qBAAqB,CAAC;KACtD,CAAC;IACF,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IACnB,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;CAChC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,OAAO,CAAC,OAAO,EAAE;QACf,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;KAC/B,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CAC7B,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,aAAa,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACjD,GAAG,IAAI,MAAM,CAAC;CACf,CAAC;AAWF,MAAM,MAAM,mCAAmC,GAAG;IAChD,MAAM,EAAE,SAAS,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAAG;IAClD,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GACzC,mCAAmC,GACnC,qCAAqC,CAAC;AAE1C,MAAM,MAAM,8BAA8B,CACxC,MAAM,SAAS,iCAAiC,GAC9C,iCAAiC,IACjC;IACF,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;KACtB,GAAG,OAAO,CAAC,qCAAqC,CAAC,CAAC;IACnD,sBAAsB,CACpB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,qCAAqC,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,2BAA2B,CACrC,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,SAAS,SAAS,cAAc,CAAC,IAAI,EAAE;IACrC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,GAAG,cAAc,CAAC,IAAI,EAAE;IACxB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,IACA;IACF,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iCAAiC,CAC3C,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,SAAS,SAAS,cAAc,CAAC,IAAI,EAAE;IACrC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,GAAG,cAAc,CAAC,IAAI,EAAE;IACxB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,IACA,2BAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG;IACjD,UAAU,EAAE,iCAAiC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,IAAI,SAAS,UAAU,GAAG,UAAU,EACpC,SAAS,SAAS,cAAc,CAAC,IAAI,EAAE;IACrC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,GAAG,cAAc,CAAC,IAAI,EAAE;IACxB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,IACA;IACF,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC;IAChC,GAAG,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC;CAC1B,CAAC;AAmdF,wBAAsB,6BAA6B,CACjD,SAAS,SAAS,cAAc,CAAC,UAAU,EAAE;IAC3C,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,EAEF,IAAI,EAAE,2BAA2B,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,EAC1E,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,GACpC,OAAO,CACR,8BAA8B,CAAC,mCAAmC,CAAC,CACpE,CA6BA;AAED,wBAAsB,8BAA8B,CAClD,WAAW,SAAS,iCAAiC,EACrD,SAAS,SAAS,cAAc,CAAC,UAAU,EAAE;IAC3C,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,EAEF,IAAI,EACA,iCAAiC,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,GAC1E;IACA,UAAU,EAAE,WAAW,CAAC;CACzB,EACH,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,GACpC,OAAO,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC,CAUtD;AAED,wBAAsB,qBAAqB,CACzC,SAAS,SAAS,cAAc,CAAC,UAAU,EAAE;IAC3C,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC7C,CAAC,EAEF,IAAI,EAAE,wBAAwB,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,EACvE,IAAI,EAAE,iBAAiB,GACtB,OAAO,CACR,uBAAuB,CACrB,iBAAiB,CAAC,SAAS,CAAC,EAC5B,6BAA6B,CAAC,SAAS,CAAC,CACzC,CACF,CA4KA;AAED,eAAO,MAAM,aAAa;YAEtB,SAAS,SAAS,cAAc,CAAC,UAAU,EAAE;QAC3C,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1C,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KAC7C,CAAC,QAEI,wBAAwB,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,GACtE,WAAW,CACZ,uBAAuB,CACrB,iBAAiB,CAAC,SAAS,CAAC,EAC5B,6BAA6B,CAAC,SAAS,CAAC,CACzC,EACD,cAAc,GAAG,eAAe,CACjC;CAGF,CAAC"}

package/esm/npm/src/device.js

@@ -236,6 +236,7 @@ async function createActivationSession(args) {
             }
             await waitForDeviceActivation({
                 trellisUrl: args.trellisUrl,
+                flowId: args.localState.flowId,
                 publicIdentityKey: args.identity.publicIdentityKey,
                 nonce: args.localState.nonce,
                 identitySeed: args.identity.identitySeed,
@@ -269,6 +270,7 @@ async function fetchDeviceBootstrap(args) {
     for (let attempt = 0; attempt < 2; attempt += 1) {
         const requestStartedAtMs = args.now();
         const request = await signDeviceWaitRequest({
+            flowId: "connect-info",
             publicIdentityKey: args.publicIdentityKey,
             nonce: "connect-info",
             identitySeed: args.identitySeed,
@@ -380,6 +382,7 @@ export async function startDeviceActivationWithDeps(args, _deps) {
             publicIdentityKey: identity.publicIdentityKey,
             instanceId: activation.instanceId,
             deploymentId: activation.deploymentId,
+            flowId: activation.flowId,
             nonce,
             activationUrl: activation.activationUrl,
         },

package/esm/npm/src/errors/AuthError.d.ts

@@ -4,7 +4,7 @@ export declare const AuthErrorDataSchema: Type.TObject<{
     id: Type.TString;
     type: Type.TLiteral<"AuthError">;
     message: Type.TString;
-    reason: Type.TUnion<[Type.TLiteral<"invalid_request">, Type.TLiteral<"missing_session_key">, Type.TLiteral<"missing_proof">, Type.TLiteral<"session_not_found">, Type.TLiteral<"session_expired">, Type.TLiteral<"invalid_signature">, Type.TLiteral<"user_not_found">, Type.TLiteral<"user_inactive">, Type.TLiteral<"unknown_device">, Type.TLiteral<"device_deployment_not_found">, Type.TLiteral<"device_deployment_disabled">, Type.TLiteral<"device_activation_revoked">, Type.TLiteral<"unknown_service">, Type.TLiteral<"service_disabled">, Type.TLiteral<"iat_out_of_range">, Type.TLiteral<"invalid_binding_token">, Type.TLiteral<"session_corrupted">, Type.TLiteral<"session_already_bound">, Type.TLiteral<"authtoken_already_used">, Type.TLiteral<"oauth_session_key_mismatch">, Type.TLiteral<"service_role_on_user">, Type.TLiteral<"reply_subject_mismatch">, Type.TLiteral<"insufficient_permissions">, Type.TLiteral<"forbidden">, Type.TLiteral<"missing_flow_id">, Type.TLiteral<"device_activation_flow_not_found">, Type.TLiteral<"device_activation_flow_expired">, Type.TLiteral<"device_activation_rejected">, Type.TLiteral<"device_identity_key_mismatch">, Type.TLiteral<"invalid_device_qr_mac">]>;
+    reason: Type.TUnion<[Type.TLiteral<"invalid_request">, Type.TLiteral<"missing_session_key">, Type.TLiteral<"missing_proof">, Type.TLiteral<"session_not_found">, Type.TLiteral<"session_expired">, Type.TLiteral<"invalid_signature">, Type.TLiteral<"user_not_found">, Type.TLiteral<"user_already_exists">, Type.TLiteral<"username_taken">, Type.TLiteral<"identity_already_exists">, Type.TLiteral<"identity_not_found">, Type.TLiteral<"user_inactive">, Type.TLiteral<"unknown_device">, Type.TLiteral<"device_deployment_not_found">, Type.TLiteral<"device_deployment_disabled">, Type.TLiteral<"device_activation_revoked">, Type.TLiteral<"unknown_service">, Type.TLiteral<"service_disabled">, Type.TLiteral<"iat_out_of_range">, Type.TLiteral<"invalid_binding_token">, Type.TLiteral<"session_corrupted">, Type.TLiteral<"session_already_bound">, Type.TLiteral<"authtoken_already_used">, Type.TLiteral<"oauth_session_key_mismatch">, Type.TLiteral<"reply_subject_mismatch">, Type.TLiteral<"insufficient_permissions">, Type.TLiteral<"reauth_required">, Type.TLiteral<"forbidden">, Type.TLiteral<"last_admin_required">, Type.TLiteral<"missing_flow_id">, Type.TLiteral<"device_activation_flow_not_found">, Type.TLiteral<"device_activation_flow_expired">, Type.TLiteral<"device_activation_rejected">, Type.TLiteral<"device_identity_key_mismatch">, Type.TLiteral<"invalid_device_qr_mac">]>;
     context: Type.TOptional<Type.TRecord<"^.*$", Type.TUnknown>>;
     traceId: Type.TOptional<Type.TString>;
 }>;
@@ -17,6 +17,7 @@ export declare class AuthError extends TrellisError<AuthErrorData> {
     readonly reason: AuthErrorData["reason"];
     constructor(options: ErrorOptions & {
         reason: AuthErrorData["reason"];
+        message?: string;
         context?: Record<string, unknown>;
         id?: string;
     });

package/esm/npm/src/errors/AuthError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthError.d.ts","sourceRoot":"","sources":["../../../../src/errors/AuthError.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,mBAAmB;;;;;;;EAsC9B,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAE/D;;GAEG;AACH,qBAAa,SAAU,SAAQ,YAAY,CAAC,aAAa,CAAC;IACxD,SAAkB,IAAI,EAAG,WAAW,CAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;gBAGvC,OAAO,EAAE,YAAY,GAAG;QACtB,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClC,EAAE,CAAC,EAAE,MAAM,CAAC;KACb;IAOH;;;;OAIG;IACM,cAAc,IAAI,aAAa;CAOzC"}
+{"version":3,"file":"AuthError.d.ts","sourceRoot":"","sources":["../../../../src/errors/AuthError.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,mBAAmB;;;;;;;EA2C9B,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAE/D;;GAEG;AACH,qBAAa,SAAU,SAAQ,YAAY,CAAC,aAAa,CAAC;IACxD,SAAkB,IAAI,EAAG,WAAW,CAAU;IAC9C,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;gBAGvC,OAAO,EAAE,YAAY,GAAG;QACtB,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClC,EAAE,CAAC,EAAE,MAAM,CAAC;KACb;IAOH;;;;OAIG;IACM,cAAc,IAAI,aAAa;CAOzC"}

package/esm/npm/src/errors/AuthError.js

@@ -12,6 +12,10 @@ export const AuthErrorDataSchema = Type.Object({
         Type.Literal("session_expired"),
         Type.Literal("invalid_signature"),
         Type.Literal("user_not_found"),
+        Type.Literal("user_already_exists"),
+        Type.Literal("username_taken"),
+        Type.Literal("identity_already_exists"),
+        Type.Literal("identity_not_found"),
         Type.Literal("user_inactive"),
         Type.Literal("unknown_device"),
         Type.Literal("device_deployment_not_found"),
@@ -25,10 +29,11 @@ export const AuthErrorDataSchema = Type.Object({
         Type.Literal("session_already_bound"),
         Type.Literal("authtoken_already_used"),
         Type.Literal("oauth_session_key_mismatch"),
-        Type.Literal("service_role_on_user"),
         Type.Literal("reply_subject_mismatch"),
         Type.Literal("insufficient_permissions"),
+        Type.Literal("reauth_required"),
         Type.Literal("forbidden"),
+        Type.Literal("last_admin_required"),
         Type.Literal("missing_flow_id"),
         Type.Literal("device_activation_flow_not_found"),
         Type.Literal("device_activation_flow_expired"),
@@ -44,8 +49,8 @@ export const AuthErrorDataSchema = Type.Object({
  */
 export class AuthError extends TrellisError {
     constructor(options) {
-        const { reason, ...baseOptions } = options;
-        super(`Auth failed: ${reason}`, baseOptions);
+        const { reason, message, ...baseOptions } = options;
+        super(message ?? `Auth failed: ${reason}`, baseOptions);
         Object.defineProperty(this, "name", {
             enumerable: true,
             configurable: true,

package/esm/npm/src/errors/index.d.ts

@@ -85,7 +85,7 @@ export declare const BUILTIN_RPC_ERRORS: {
             traceId?: string | undefined;
             type: "AuthError";
             id: string;
-            reason: "invalid_request" | "missing_session_key" | "missing_proof" | "session_not_found" | "session_expired" | "invalid_signature" | "user_not_found" | "user_inactive" | "unknown_device" | "device_deployment_not_found" | "device_deployment_disabled" | "device_activation_revoked" | "unknown_service" | "service_disabled" | "iat_out_of_range" | "invalid_binding_token" | "session_corrupted" | "session_already_bound" | "authtoken_already_used" | "oauth_session_key_mismatch" | "service_role_on_user" | "reply_subject_mismatch" | "insufficient_permissions" | "forbidden" | "missing_flow_id" | "device_activation_flow_not_found" | "device_activation_flow_expired" | "device_activation_rejected" | "device_identity_key_mismatch" | "invalid_device_qr_mac";
+            reason: "invalid_request" | "missing_session_key" | "missing_proof" | "session_not_found" | "session_expired" | "invalid_signature" | "user_not_found" | "user_already_exists" | "username_taken" | "identity_already_exists" | "identity_not_found" | "user_inactive" | "unknown_device" | "device_deployment_not_found" | "device_deployment_disabled" | "device_activation_revoked" | "unknown_service" | "service_disabled" | "iat_out_of_range" | "invalid_binding_token" | "session_corrupted" | "session_already_bound" | "authtoken_already_used" | "oauth_session_key_mismatch" | "reply_subject_mismatch" | "insufficient_permissions" | "reauth_required" | "forbidden" | "last_admin_required" | "missing_flow_id" | "device_activation_flow_not_found" | "device_activation_flow_expired" | "device_activation_rejected" | "device_identity_key_mismatch" | "invalid_device_qr_mac";
             message: string;
         }>;
         readonly fromSerializable: (data: AuthErrorData) => AuthError;
@@ -122,8 +122,8 @@ export declare const BUILTIN_RPC_ERRORS: {
         readonly type: "KVError";
         readonly schema: import("../contracts.js").Schema<{
             context?: Record<string, unknown> | undefined;
-            traceId?: string | undefined;
             operation?: string | undefined;
+            traceId?: string | undefined;
             type: "KVError";
             id: string;
             message: string;
@@ -134,8 +134,8 @@ export declare const BUILTIN_RPC_ERRORS: {
         readonly type: "StoreError";
         readonly schema: import("../contracts.js").Schema<{
             context?: Record<string, unknown> | undefined;
-            traceId?: string | undefined;
             operation?: string | undefined;
+            traceId?: string | undefined;
             type: "StoreError";
             id: string;
             message: string;
@@ -146,8 +146,8 @@ export declare const BUILTIN_RPC_ERRORS: {
         readonly type: "TransferError";
         readonly schema: import("../contracts.js").Schema<{
             context?: Record<string, unknown> | undefined;
-            traceId?: string | undefined;
             operation?: string | undefined;
+            traceId?: string | undefined;
             type: "TransferError";
             id: string;
             message: string;

package/esm/npm/src/errors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/errors/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/errors/index.ts"],"names":[],"mappings":"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"}

package/esm/npm/src/errors/index.js

@@ -65,6 +65,7 @@ export const BUILTIN_RPC_ERRORS = {
         fromSerializable(data) {
             return new AuthError({
                 reason: data.reason,
+                message: data.message,
                 id: data.id,
                 context: data.context,
             });