@mdbase-dev/connect-protocol 0.1.0-beta.55 → 0.1.0-beta.57

package/dist/application-authorization.d.ts

@@ -1,9 +1,9 @@
 import type { ApplicationFileRequirement } from "./files.js";
-import type { CollectionOperation } from "./operations.js";
-import type { ConnectContractRequirements } from "./compatibility.js";
+import { type CollectionOperation } from "./operations.js";
+import type { AuthorizationBindingProtocolVersion, ConnectContractRequirements } from "./compatibility.js";
 export type ApplicationAuthorizationFlow = "authorization_code" | "device_code";
 export interface ApplicationAuthorizationBinding {
-    protocol_version: 4;
+    protocol_version: AuthorizationBindingProtocolVersion;
     authorization_id: string;
     application_id: string;
     application_declaration_id: string;

package/dist/application-authorization.js

@@ -1,5 +1,8 @@
+import { isMutatingOperation } from "./operations.js";
+import { AUTHORIZATION_BINDING_PROTOCOL_VERSION, LEGACY_AUTHORIZATION_BINDING_PROTOCOL_VERSION, OPERATION_TRANSPORT_PROTOCOL_VERSION, isSupportedAuthorizationBinding, isSupportedOperationTransport } from "./compatibility.js";
 const INSTALLATION_ID_DOMAIN = new TextEncoder().encode("mdbase-connect application installation id v2\0");
-const AUTHORIZATION_PROOF_DOMAIN = new TextEncoder().encode("mdbase-connect application authorization proof v4\0");
+const AUTHORIZATION_PROOF_V4_DOMAIN = new TextEncoder().encode("mdbase-connect application authorization proof v4\0");
+const AUTHORIZATION_PROOF_V5_DOMAIN = new TextEncoder().encode("mdbase-connect application authorization proof v5\0");
 export async function applicationInstallationIdFromPublicKey(signingPublicKey) {
     const signing = publicKey(signingPublicKey);
     const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", concat([INSTALLATION_ID_DOMAIN, field(signing)])));
@@ -26,7 +29,10 @@ export function authorizationSigningMessage(binding) {
     const nonce = canonicalBase64(binding.authorization_nonce);
     const challenge = canonicalBase64(binding.code_challenge);
     const contracts = binding.contracts;
-    if (binding.protocol_version !== 4
+    const recovery = contracts.operation_transport_recovery ?? [];
+    const requiresDurableMutation = binding.requested_operations.some((operation) => isMutatingOperation(operation, { action: "mutate" }))
+        || binding.requested_files?.actions.some((action) => !["list", "read"].includes(action)) === true;
+    if (!isSupportedAuthorizationBinding(binding.protocol_version)
         || nonce.byteLength !== 32
         || !/^[a-z][a-z0-9]*(?:[._-][a-z0-9]+)+$/u.test(binding.application_declaration_id)
         || !/^[0-9a-f]{64}$/u.test(binding.application_manifest_digest)
@@ -39,6 +45,19 @@ export function authorizationSigningMessage(binding) {
             contracts.semantic_capabilities,
             contracts.durable_mutation ?? 1
         ].every((version) => Number.isInteger(version) && version > 0)
+        || contracts.authorization_binding !== binding.protocol_version
+        || !isSupportedOperationTransport(contracts.operation_transport)
+        || (binding.protocol_version === AUTHORIZATION_BINDING_PROTOCOL_VERSION
+            && contracts.operation_transport !== OPERATION_TRANSPORT_PROTOCOL_VERSION)
+        || recovery.some((version) => !isSupportedOperationTransport(version)
+            || version === contracts.operation_transport)
+        || new Set(recovery).size !== recovery.length
+        || (binding.protocol_version === LEGACY_AUTHORIZATION_BINDING_PROTOCOL_VERSION
+            && recovery.length > 0)
+        || (recovery.length > 0 && !requiresDurableMutation)
+        || (requiresDurableMutation
+            ? contracts.durable_mutation !== 1
+            : contracts.durable_mutation !== undefined)
         || (binding.requested_operations.length === 0 && binding.requested_files === undefined)
         || new Set(binding.requested_operations).size !== binding.requested_operations.length
         || binding.requested_operations.some((operation) => !operation || operation.includes("\0"))
@@ -52,7 +71,9 @@ export function authorizationSigningMessage(binding) {
     validateRequestedFiles(binding.requested_files);
     const operationFields = binding.requested_operations.map((operation) => field(new TextEncoder().encode(operation)));
     return concat([
-        AUTHORIZATION_PROOF_DOMAIN,
+        binding.protocol_version === AUTHORIZATION_BINDING_PROTOCOL_VERSION
+            ? AUTHORIZATION_PROOF_V5_DOMAIN
+            : AUTHORIZATION_PROOF_V4_DOMAIN,
         u32(binding.protocol_version),
         field(uuidBytes(binding.application_id)),
         field(uuidBytes(binding.authorization_id)),
@@ -68,6 +89,9 @@ export function authorizationSigningMessage(binding) {
         optionalString(binding.state),
         field(new TextEncoder().encode(binding.code_challenge)),
         u32(contracts.operation_transport),
+        ...(binding.protocol_version === AUTHORIZATION_BINDING_PROTOCOL_VERSION
+            ? [u32(recovery.length), ...recovery.map(u32)]
+            : []),
         u32(contracts.authorization_binding),
         u32(contracts.semantic_capabilities),
         optionalU32(contracts.durable_mutation),

package/dist/compatibility.d.ts

@@ -1,11 +1,19 @@
 import type { ApplicationFileRequirement } from "./files.js";
 import { type CollectionOperation } from "./operations.js";
-export declare const OPERATION_TRANSPORT_PROTOCOL_VERSION: 2;
-export declare const AUTHORIZATION_BINDING_PROTOCOL_VERSION: 4;
+export declare const OPERATION_TRANSPORT_PROTOCOL_VERSION: 3;
+export declare const LEGACY_OPERATION_TRANSPORT_PROTOCOL_VERSION: 2;
+export declare const SUPPORTED_OPERATION_TRANSPORT_PROTOCOL_VERSIONS: readonly [3, 2];
+export type OperationTransportProtocolVersion = typeof SUPPORTED_OPERATION_TRANSPORT_PROTOCOL_VERSIONS[number];
+export declare const AUTHORIZATION_BINDING_PROTOCOL_VERSION: 5;
+export declare const LEGACY_AUTHORIZATION_BINDING_PROTOCOL_VERSION: 4;
+export declare const SUPPORTED_AUTHORIZATION_BINDING_PROTOCOL_VERSIONS: readonly [5, 4];
+export type AuthorizationBindingProtocolVersion = typeof SUPPORTED_AUTHORIZATION_BINDING_PROTOCOL_VERSIONS[number];
 export declare const SEMANTIC_CAPABILITY_CONTRACT_VERSION: 1;
 export declare const DURABLE_MUTATION_CONTRACT_VERSION: 1;
 export interface ConnectContractRequirements {
     operation_transport: number;
+    /** Signed, mutation-only transports retained solely for exact outcome recovery. */
+    operation_transport_recovery?: number[];
     authorization_binding: number;
     semantic_capabilities: number;
     /** Required only by operations that can durably mutate authority state. */
@@ -22,5 +30,8 @@ export declare const CONNECT_CONTRACT_SUPPORT: ConnectContractSupport;
  * Produce the exact contract ceiling signed during authorization. `sync` is
  * conservatively mutation-capable because its action is selected per request.
  */
-export declare function authorizationContractRequirements(operations: readonly CollectionOperation[], files?: ApplicationFileRequirement): ConnectContractRequirements;
+export declare function authorizationContractRequirements(operations: readonly CollectionOperation[], files?: ApplicationFileRequirement, operationTransportRecovery?: readonly OperationTransportProtocolVersion[]): ConnectContractRequirements;
 export declare function supportsContractRequirements(required: ConnectContractRequirements, supported: ConnectContractSupport, durableMutation: boolean): boolean;
+export declare function isSupportedOperationTransport(version: number): version is OperationTransportProtocolVersion;
+export declare function isSupportedAuthorizationBinding(version: number): version is AuthorizationBindingProtocolVersion;
+export declare function permitsOperationTransport(contracts: ConnectContractRequirements, version: number, recoveryOnly?: boolean): boolean;

package/dist/compatibility.js

@@ -1,11 +1,21 @@
 import { isMutatingOperation } from "./operations.js";
-export const OPERATION_TRANSPORT_PROTOCOL_VERSION = 2;
-export const AUTHORIZATION_BINDING_PROTOCOL_VERSION = 4;
+export const OPERATION_TRANSPORT_PROTOCOL_VERSION = 3;
+export const LEGACY_OPERATION_TRANSPORT_PROTOCOL_VERSION = 2;
+export const SUPPORTED_OPERATION_TRANSPORT_PROTOCOL_VERSIONS = [
+    OPERATION_TRANSPORT_PROTOCOL_VERSION,
+    LEGACY_OPERATION_TRANSPORT_PROTOCOL_VERSION
+];
+export const AUTHORIZATION_BINDING_PROTOCOL_VERSION = 5;
+export const LEGACY_AUTHORIZATION_BINDING_PROTOCOL_VERSION = 4;
+export const SUPPORTED_AUTHORIZATION_BINDING_PROTOCOL_VERSIONS = [
+    AUTHORIZATION_BINDING_PROTOCOL_VERSION,
+    LEGACY_AUTHORIZATION_BINDING_PROTOCOL_VERSION
+];
 export const SEMANTIC_CAPABILITY_CONTRACT_VERSION = 1;
 export const DURABLE_MUTATION_CONTRACT_VERSION = 1;
 export const CONNECT_CONTRACT_SUPPORT = {
-    operation_transport: [OPERATION_TRANSPORT_PROTOCOL_VERSION],
-    authorization_binding: [AUTHORIZATION_BINDING_PROTOCOL_VERSION],
+    operation_transport: [...SUPPORTED_OPERATION_TRANSPORT_PROTOCOL_VERSIONS],
+    authorization_binding: [...SUPPORTED_AUTHORIZATION_BINDING_PROTOCOL_VERSIONS],
     semantic_capabilities: [SEMANTIC_CAPABILITY_CONTRACT_VERSION],
     durable_mutation: [DURABLE_MUTATION_CONTRACT_VERSION]
 };
@@ -13,12 +23,17 @@ export const CONNECT_CONTRACT_SUPPORT = {
  * Produce the exact contract ceiling signed during authorization. `sync` is
  * conservatively mutation-capable because its action is selected per request.
  */
-export function authorizationContractRequirements(operations, files) {
+export function authorizationContractRequirements(operations, files, operationTransportRecovery = []) {
     const requirements = {
         operation_transport: OPERATION_TRANSPORT_PROTOCOL_VERSION,
         authorization_binding: AUTHORIZATION_BINDING_PROTOCOL_VERSION,
         semantic_capabilities: 1
     };
+    const recovery = [...new Set(operationTransportRecovery)]
+        .filter((version) => version !== OPERATION_TRANSPORT_PROTOCOL_VERSION)
+        .sort((left, right) => right - left);
+    if (recovery.length > 0)
+        requirements.operation_transport_recovery = recovery;
     if (operations.some((operation) => isMutatingOperation(operation, { action: "mutate" }))
         || files?.actions.some((action) => action !== "list" && action !== "read") === true) {
         requirements.durable_mutation = 1;
@@ -27,9 +42,23 @@ export function authorizationContractRequirements(operations, files) {
 }
 export function supportsContractRequirements(required, supported, durableMutation) {
     return supported.operation_transport.includes(required.operation_transport)
+        && (required.operation_transport_recovery ?? []).every((version) => supported.operation_transport.includes(version))
         && supported.authorization_binding.includes(required.authorization_binding)
         && supported.semantic_capabilities.includes(required.semantic_capabilities)
         && (!durableMutation
             || (required.durable_mutation !== undefined
                 && supported.durable_mutation.includes(required.durable_mutation)));
 }
+export function isSupportedOperationTransport(version) {
+    return SUPPORTED_OPERATION_TRANSPORT_PROTOCOL_VERSIONS
+        .includes(version);
+}
+export function isSupportedAuthorizationBinding(version) {
+    return SUPPORTED_AUTHORIZATION_BINDING_PROTOCOL_VERSIONS
+        .includes(version);
+}
+export function permitsOperationTransport(contracts, version, recoveryOnly = false) {
+    return contracts.operation_transport === version
+        || (recoveryOnly
+            && (contracts.operation_transport_recovery ?? []).includes(version));
+}

package/dist/connect-problems.generated.d.ts

@@ -104,6 +104,10 @@ export declare const CONNECT_PROBLEM_CATALOG: {
         readonly category: "conflict";
         readonly recovery: "refresh";
     };
+    readonly connector_busy: {
+        readonly category: "availability";
+        readonly recovery: "retry";
+    };
     readonly connector_identity_changed: {
         readonly category: "integrity";
         readonly recovery: "reauthorize";
@@ -172,6 +176,10 @@ export declare const CONNECT_PROBLEM_CATALOG: {
         readonly category: "conflict";
         readonly recovery: "retry";
     };
+    readonly fresh_request_required: {
+        readonly category: "availability";
+        readonly recovery: "retry";
+    };
     readonly hosted_provider_unavailable: {
         readonly category: "availability";
         readonly recovery: "retry";
@@ -496,6 +504,7 @@ export interface ConnectProblemDetailsByCode {
         "required_version": string;
     };
     "concurrent_modification": undefined;
+    "connector_busy": undefined;
     "connector_identity_changed": undefined;
     "connector_offline": {
         "connector_name"?: string;
@@ -521,6 +530,7 @@ export interface ConnectProblemDetailsByCode {
     "file_not_found": undefined;
     "file_source_mismatch": undefined;
     "file_upload_incomplete": undefined;
+    "fresh_request_required": undefined;
     "hosted_provider_unavailable": undefined;
     "insufficient_access": {
         "required_operations": Array<string>;
@@ -768,6 +778,12 @@ export interface ConnectProblemByCode {
         recovery: "refresh";
         details?: never;
     };
+    "connector_busy": ConnectProblemBase & {
+        code: "connector_busy";
+        category: "availability";
+        recovery: "retry";
+        details?: never;
+    };
     "connector_identity_changed": ConnectProblemBase & {
         code: "connector_identity_changed";
         category: "integrity";
@@ -870,6 +886,12 @@ export interface ConnectProblemByCode {
         recovery: "retry";
         details?: never;
     };
+    "fresh_request_required": ConnectProblemBase & {
+        code: "fresh_request_required";
+        category: "availability";
+        recovery: "retry";
+        details?: never;
+    };
     "hosted_provider_unavailable": ConnectProblemBase & {
         code: "hosted_provider_unavailable";
         category: "availability";

package/dist/connect-problems.generated.js

@@ -27,6 +27,7 @@ export const CONNECT_PROBLEM_CATALOG = {
     "collection_type_registry_invalid": { category: "validation", recovery: "repair_collection" },
     "collection_version_unsupported": { category: "compatibility", recovery: "upgrade_collection" },
     "concurrent_modification": { category: "conflict", recovery: "refresh" },
+    "connector_busy": { category: "availability", recovery: "retry" },
     "connector_identity_changed": { category: "integrity", recovery: "reauthorize" },
     "connector_offline": { category: "availability", recovery: "retry" },
     "connector_upgrade_required": { category: "compatibility", recovery: "upgrade_connector" },
@@ -44,6 +45,7 @@ export const CONNECT_PROBLEM_CATALOG = {
     "file_not_found": { category: "conflict", recovery: "refresh" },
     "file_source_mismatch": { category: "conflict", recovery: "refresh" },
     "file_upload_incomplete": { category: "conflict", recovery: "retry" },
+    "fresh_request_required": { category: "availability", recovery: "retry" },
     "hosted_provider_unavailable": { category: "availability", recovery: "retry" },
     "insufficient_access": { category: "authorization", recovery: "reauthorize" },
     "invalid_application_authorization": { category: "validation", recovery: "fix_request" },

package/dist/index.d.ts

@@ -23,11 +23,12 @@ export declare const GRANT_ENCRYPTION_PROTOCOL_VERSION: 1;
 export declare const SYNC_PROTOCOL_VERSION: 1;
 export declare const CONTRACT_SETUP_CAPABILITY: "contract-setup-v1";
 export declare const FILE_RELAY_CAPABILITY: "file-relay-v1";
+export declare const PROTOCOL_USAGE_REPORT_CAPABILITY: "protocol-usage-report-v1";
 export declare const RELAY_REQUIRED_CAPABILITIES: readonly ["application-authorization-v4", "authorization-activation", "encrypted-relay", "policy-ack"];
 export declare const MINIMUM_CONNECTOR_VERSION: "0.1.0-beta.33";
 export declare const HOSTED_PROVIDER_REQUIRED_CAPABILITIES: readonly ["durable-mutation-journal-v1", "durable-file-lifecycle-v1"];
 export declare const HOSTED_PROVIDER_CAPABILITIES: readonly ["durable-mutation-journal-v1", "durable-file-lifecycle-v1", "mutation-replay-after-credential-retirement-v1"];
-export declare const RELAY_CAPABILITIES: readonly ["application-authorization-v4", "authorization-activation", "encrypted-relay", "policy-ack", "contract-setup-v1", "file-relay-v1"];
+export declare const RELAY_CAPABILITIES: readonly ["application-authorization-v4", "authorization-activation", "encrypted-relay", "policy-ack", "application-authorization-v5", "contract-setup-v1", "file-relay-v1", "protocol-usage-report-v1"];
 export declare const AUTHORITY_PROOF_VERSION: 1;
 export declare const AUTHORITY_PROOF_ALGORITHM: "P256-SHA256";
 export declare const AUTHORITY_PROOF_DOMAIN: "mdbase-authority-request-proof-v1";
@@ -49,7 +50,7 @@ export declare const CONNECT_SCHEMA_IDS: {
     readonly dataContract: "https://mdbase.dev/schemas/v0.3/data-contract.schema.json";
     readonly eventActionInterop: "https://mdbase.dev/schemas/interop/v0.1/profile.schema.json";
     readonly protocol: "https://mdbase.dev/connect/schemas/connect-protocol.v1.json";
-    readonly encryptedRelay: "https://mdbase.dev/connect/schemas/encrypted-relay.v2.json";
+    readonly encryptedRelay: "https://mdbase.dev/connect/schemas/encrypted-relay.v3.json";
     readonly files: "https://mdbase.dev/connect/schemas/files.v1.json";
     readonly sync: "https://mdbase.dev/connect/schemas/sync.v1.json";
 };
@@ -182,7 +183,7 @@ export interface GrantScope {
 }
 export interface RelayOperationRequest {
     type: "operation_request";
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     request_id: string;
     grant_id: string;
     collection_id: string;
@@ -192,29 +193,29 @@ export interface RelayOperationRequest {
 }
 export type RelayOperationResponse = {
     type: "operation_response";
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     request_id: string;
     ok: true;
     result: unknown;
 } | {
     type: "operation_response";
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     request_id: string;
     ok: false;
     problem: ConnectProblem;
 };
 export interface MdbaseOperationRequest<Input = unknown> {
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     request_id: string;
     input: Input;
 }
 export type MdbaseOperationResponse<Result = unknown> = {
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     request_id: string;
     ok: true;
     result: Result;
 } | {
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     request_id: string;
     ok: false;
     problem: ConnectProblem;
@@ -261,7 +262,7 @@ export interface GrantEncryption {
     connector_agreement_public_key: string;
 }
 export interface EncryptedRelayEnvelope {
-    protocol_version: 2;
+    protocol_version: import("./compatibility.js").OperationTransportProtocolVersion;
     suite: typeof RELAY_ENCRYPTION_SUITE;
     request_id: string;
     grant_id: string;
@@ -549,6 +550,15 @@ export interface RelayPolicyApplied {
         details?: unknown;
     };
 }
+export interface ProtocolUsageReport {
+    type: "protocol_usage_report";
+    protocol_version: 1;
+    entries: Array<{
+        axis: "operation_transport";
+        version: number;
+        count: number;
+    }>;
+}
 export interface AuthorizationCollectionOffer {
     collection_id: string;
     display_name: string;

package/dist/index.js

@@ -16,6 +16,7 @@ export const GRANT_ENCRYPTION_PROTOCOL_VERSION = 1;
 export const SYNC_PROTOCOL_VERSION = 1;
 export const CONTRACT_SETUP_CAPABILITY = "contract-setup-v1";
 export const FILE_RELAY_CAPABILITY = "file-relay-v1";
+export const PROTOCOL_USAGE_REPORT_CAPABILITY = "protocol-usage-report-v1";
 export const RELAY_REQUIRED_CAPABILITIES = [
     "application-authorization-v4",
     "authorization-activation",
@@ -33,8 +34,10 @@ export const HOSTED_PROVIDER_CAPABILITIES = [
 ];
 export const RELAY_CAPABILITIES = [
     ...RELAY_REQUIRED_CAPABILITIES,
+    "application-authorization-v5",
     CONTRACT_SETUP_CAPABILITY,
-    FILE_RELAY_CAPABILITY
+    FILE_RELAY_CAPABILITY,
+    PROTOCOL_USAGE_REPORT_CAPABILITY
 ];
 export const AUTHORITY_PROOF_VERSION = 1;
 export const AUTHORITY_PROOF_ALGORITHM = "P256-SHA256";
@@ -74,7 +77,7 @@ export const CONNECT_SCHEMA_IDS = {
     dataContract: "https://mdbase.dev/schemas/v0.3/data-contract.schema.json",
     eventActionInterop: "https://mdbase.dev/schemas/interop/v0.1/profile.schema.json",
     protocol: "https://mdbase.dev/connect/schemas/connect-protocol.v1.json",
-    encryptedRelay: "https://mdbase.dev/connect/schemas/encrypted-relay.v2.json",
+    encryptedRelay: "https://mdbase.dev/connect/schemas/encrypted-relay.v3.json",
     files: "https://mdbase.dev/connect/schemas/files.v1.json",
     sync: "https://mdbase.dev/connect/schemas/sync.v1.json"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdbase-dev/connect-protocol",
-  "version": "0.1.0-beta.55",
+  "version": "0.1.0-beta.57",
   "private": false,
   "type": "module",
   "license": "MIT",

package/schemas/catalog.json

@@ -8,7 +8,8 @@
     "connect_problem": "./connect-problem.v1.schema.json",
     "connect_problem_catalog": "./connect-problems.v1.catalog.json",
     "mdbase_query_v0_3": "./mdbase-query.v0.3.schema.json",
-    "encrypted_relay": "./encrypted-relay.v2.schema.json",
+    "encrypted_relay": "./encrypted-relay.v3.schema.json",
+    "encrypted_relay_legacy_v2": "./encrypted-relay.v2.schema.json",
     "files": "./files.v1.schema.json",
     "notification_webhook": "./notification-webhook.v1.schema.json",
     "sync": "./sync.v1.schema.json"

package/schemas/connect-problem.v1.schema.json

@@ -1244,6 +1244,46 @@
         }
       }
     },
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "problem_version",
+        "code",
+        "category",
+        "recovery",
+        "message"
+      ],
+      "properties": {
+        "problem_version": {
+          "const": 1
+        },
+        "code": {
+          "const": "connector_busy"
+        },
+        "category": {
+          "const": "availability"
+        },
+        "recovery": {
+          "const": "retry"
+        },
+        "message": {
+          "type": "string",
+          "minLength": 1
+        },
+        "operation_outcome": {
+          "enum": [
+            "not_sent",
+            "rejected",
+            "unknown"
+          ]
+        },
+        "trace_id": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
     {
       "type": "object",
       "additionalProperties": false,
@@ -1968,6 +2008,46 @@
         }
       }
     },
+    {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "problem_version",
+        "code",
+        "category",
+        "recovery",
+        "message"
+      ],
+      "properties": {
+        "problem_version": {
+          "const": 1
+        },
+        "code": {
+          "const": "fresh_request_required"
+        },
+        "category": {
+          "const": "availability"
+        },
+        "recovery": {
+          "const": "retry"
+        },
+        "message": {
+          "type": "string",
+          "minLength": 1
+        },
+        "operation_outcome": {
+          "enum": [
+            "not_sent",
+            "rejected",
+            "unknown"
+          ]
+        },
+        "trace_id": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
     {
       "type": "object",
       "additionalProperties": false,

package/schemas/connect-problems.v1.catalog.json

@@ -156,6 +156,7 @@
       }
     },
     "concurrent_modification": { "category": "conflict", "recovery": "refresh" },
+    "connector_busy": { "category": "availability", "recovery": "retry" },
     "connector_identity_changed": { "category": "integrity", "recovery": "reauthorize" },
     "connector_offline": {
       "category": "availability",
@@ -195,6 +196,7 @@
     "file_not_found": { "category": "conflict", "recovery": "refresh" },
     "file_source_mismatch": { "category": "conflict", "recovery": "refresh" },
     "file_upload_incomplete": { "category": "conflict", "recovery": "retry" },
+    "fresh_request_required": { "category": "availability", "recovery": "retry" },
     "hosted_provider_unavailable": { "category": "availability", "recovery": "retry" },
     "insufficient_access": {
       "category": "authorization",

package/schemas/connect-protocol.v1.schema.json

@@ -170,7 +170,7 @@
       "required": ["type", "protocol_version", "request_id", "grant_id", "collection_id", "application_id", "operation", "input"],
       "properties": {
         "type": { "const": "operation_request" },
-        "protocol_version": { "const": 2 },
+        "protocol_version": { "const": 3 },
         "request_id": { "$ref": "#/$defs/uuid" },
         "grant_id": { "$ref": "#/$defs/uuid" },
         "collection_id": { "$ref": "#/$defs/uuid" },
@@ -184,7 +184,7 @@
       "additionalProperties": false,
       "required": ["protocol_version", "request_id", "input"],
       "properties": {
-        "protocol_version": { "const": 2 },
+        "protocol_version": { "const": 3 },
         "request_id": { "$ref": "#/$defs/uuid" },
         "input": true
       }
@@ -194,7 +194,7 @@
       "additionalProperties": false,
       "required": ["protocol_version", "request_id", "ok"],
       "properties": {
-        "protocol_version": { "const": 2 },
+        "protocol_version": { "const": 3 },
         "request_id": { "$ref": "#/$defs/uuid" },
         "ok": { "type": "boolean" },
         "result": true,
@@ -220,7 +220,7 @@
       "required": ["type", "protocol_version", "request_id", "ok"],
       "properties": {
         "type": { "const": "operation_response" },
-        "protocol_version": { "const": 2 },
+        "protocol_version": { "const": 3 },
         "request_id": { "$ref": "#/$defs/uuid" },
         "ok": { "type": "boolean" },
         "result": true,

package/schemas/encrypted-relay.v3.schema.json

@@ -0,0 +1,63 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://mdbase.dev/connect/schemas/encrypted-relay.v3.json",
+  "title": "mdbase connect encrypted operation transport 3",
+  "description": "Opaque authenticated operation envelopes routed between an application and authority.",
+  "oneOf": [
+    { "$ref": "#/$defs/request" },
+    { "$ref": "#/$defs/response" },
+    { "$ref": "#/$defs/rejected" }
+  ],
+  "$defs": {
+    "uuid": {
+      "type": "string",
+      "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-8][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+    },
+    "operation": {
+      "enum": ["describe", "changes", "read", "query", "list_views", "execute_view", "read_view_source", "create_view_source", "update_view_source", "delete_view_source", "validate", "create", "update", "delete", "rename", "read_type", "create_type", "update_type", "assess_type_pack", "apply_type_pack", "assess_collection_setup", "apply_collection_setup", "list_timers", "put_timer", "cancel_timer", "reconcile_timers", "sync", "file_control"]
+    },
+    "envelope": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["type", "protocol_version", "suite", "request_id", "grant_id", "application_id", "connector_id", "collection_id", "operation", "scope_epoch", "key_id", "counter", "ciphertext"],
+      "properties": {
+        "type": { "enum": ["encrypted_operation_request", "encrypted_operation_response"] },
+        "protocol_version": { "const": 3 },
+        "suite": { "const": "P256-HKDF-SHA256-AES256GCM" },
+        "request_id": { "$ref": "#/$defs/uuid" },
+        "grant_id": { "$ref": "#/$defs/uuid" },
+        "application_id": { "$ref": "#/$defs/uuid" },
+        "connector_id": { "$ref": "#/$defs/uuid" },
+        "collection_id": { "$ref": "#/$defs/uuid" },
+        "operation": { "$ref": "#/$defs/operation" },
+        "scope_epoch": { "type": "integer", "minimum": 1, "maximum": 9007199254740991 },
+        "key_id": { "type": "string", "minLength": 1, "maxLength": 200 },
+        "counter": { "type": "string", "pattern": "^[1-9][0-9]{0,19}$" },
+        "ciphertext": { "type": "string", "minLength": 1, "maxLength": 2800000, "pattern": "^[A-Za-z0-9_-]+$" }
+      }
+    },
+    "request": {
+      "allOf": [
+        { "$ref": "#/$defs/envelope" },
+        { "type": "object", "properties": { "type": { "const": "encrypted_operation_request" } } }
+      ]
+    },
+    "response": {
+      "allOf": [
+        { "$ref": "#/$defs/envelope" },
+        { "type": "object", "properties": { "type": { "const": "encrypted_operation_response" } } }
+      ]
+    },
+    "rejected": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["type", "protocol_version", "request_id", "problem"],
+      "properties": {
+        "type": { "const": "encrypted_operation_rejected" },
+        "protocol_version": { "const": 3 },
+        "request_id": { "$ref": "#/$defs/uuid" },
+        "problem": { "$ref": "https://schemas.mdbase.dev/connect/problem/v1" }
+      }
+    }
+  }
+}