@claudian-collab/protocol 3.3.1 → 4.0.0

package/dist/CollabProjectCheckpoint.js

@@ -1,13 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COLLAB_CHECKPOINT_BACKUP_RECORD_KINDS = exports.COLLAB_CHECKPOINT_PORTABLE_RECORD_KINDS = exports.COLLAB_CHECKPOINT_ARTIFACT_LIMITS = exports.COLLAB_PROJECT_CHECKPOINT_ARTIFACTS = exports.COLLAB_CHECKPOINT_PROFILES = exports.COLLAB_PROTECTED_CLAIM_ENVELOPE_LIMITS = exports.COLLAB_PROTECTED_CLAIM_ENVELOPE_VERSION = exports.COLLAB_PROJECT_COORDINATION_FORMAT_VERSION = exports.COLLAB_PROJECT_CHECKPOINT_MANIFEST_SCHEMA_VERSION = void 0;
+exports.decodeCheckpointManifestFields = decodeCheckpointManifestFields;
 exports.decodeCollabProjectCheckpointManifest = decodeCollabProjectCheckpointManifest;
 exports.encodeCollabProjectCheckpointManifestCanonicalJson = encodeCollabProjectCheckpointManifestCanonicalJson;
 exports.encodeCollabProjectCheckpointManifestDigestInput = encodeCollabProjectCheckpointManifestDigestInput;
+exports.encodeCheckpointManifestDigestInput = encodeCheckpointManifestDigestInput;
 exports.encodeCollabProtectedClaimAssociatedData = encodeCollabProtectedClaimAssociatedData;
+exports.decodeCheckpointRecord = decodeCheckpointRecord;
+exports.validateCheckpointRecordSequence = validateCheckpointRecordSequence;
 exports.decodeCollabProjectCheckpointCoordinationNdjson = decodeCollabProjectCheckpointCoordinationNdjson;
 exports.encodeCollabProjectCheckpointCoordinationNdjson = encodeCollabProjectCheckpointCoordinationNdjson;
 exports.validateCollabProjectCheckpointConsistency = validateCollabProjectCheckpointConsistency;
+exports.validateCheckpointManifestConsistency = validateCheckpointManifestConsistency;
 const CollabAuthorityTransfer_1 = require("./CollabAuthorityTransfer");
 const CollabCloudProjectEvent_1 = require("./CollabCloudProjectEvent");
 const CollabConstants_1 = require("./CollabConstants");
@@ -237,7 +242,7 @@ function gitRefs(value, expectedMainOid) {
         throw invalidPayload('refs');
     return Object.freeze(decoded);
 }
-function manifestObject(source, includeManifestSha256) {
+function manifestObject(source, coordinationFormatVersion) {
     const profile = literal(source, 'profile', exports.COLLAB_CHECKPOINT_PROFILES);
     const expectedMainOid = token(source, 'expectedMainOid', CollabValidation_1.isCollabGitOid);
     const gitObjectFormat = literal(source, 'gitObjectFormat', ['sha1', 'sha256']);
@@ -273,15 +278,13 @@ function manifestObject(source, includeManifestSha256) {
         sourceAuthority,
         targetAuthority,
     };
-    if (common.coordinationFormatVersion !== exports.COLLAB_PROJECT_COORDINATION_FORMAT_VERSION
+    if (common.coordinationFormatVersion !== coordinationFormatVersion
         || common.manifestSchemaVersion !== exports.COLLAB_PROJECT_CHECKPOINT_MANIFEST_SCHEMA_VERSION
         || common.protocolVersion !== CollabConstants_1.COLLAB_PROTOCOL_VERSION)
         throw invalidPayload('manifest');
-    if (!includeManifestSha256)
-        return common;
     return {
         artifacts: common.artifacts,
-        coordinationFormatVersion: exports.COLLAB_PROJECT_COORDINATION_FORMAT_VERSION,
+        coordinationFormatVersion,
         createdAt: common.createdAt,
         expectedMainOid: common.expectedMainOid,
         gitObjectFormat: common.gitObjectFormat,
@@ -296,7 +299,8 @@ function manifestObject(source, includeManifestSha256) {
         targetAuthority: common.targetAuthority,
     };
 }
-function decodeCollabProjectCheckpointManifest(value) {
+/** @internal Shared field validation; public entry points select their own format. */
+function decodeCheckpointManifestFields(value, coordinationFormatVersion) {
     const source = exactRecord(value, 'manifest', [
         'artifacts',
         'coordinationFormatVersion',
@@ -313,18 +317,24 @@ function decodeCollabProjectCheckpointManifest(value) {
         'sourceAuthority',
         'targetAuthority',
     ]);
-    const decoded = manifestObject(source, true);
+    const decoded = manifestObject(source, coordinationFormatVersion);
     const encoded = JSON.stringify(decoded);
     if (!(0, CollabValidation_1.hasUtf8ByteLengthAtMost)(encoded, exports.COLLAB_CHECKPOINT_ARTIFACT_LIMITS.maxManifestBytes)) {
         throw invalidPayload('manifest');
     }
     return decoded;
 }
+function decodeCollabProjectCheckpointManifest(value) {
+    return decodeCheckpointManifestFields(value, exports.COLLAB_PROJECT_COORDINATION_FORMAT_VERSION);
+}
 function encodeCollabProjectCheckpointManifestCanonicalJson(manifest) {
     return JSON.stringify(decodeCollabProjectCheckpointManifest(manifest));
 }
 function encodeCollabProjectCheckpointManifestDigestInput(manifest) {
-    const decoded = decodeCollabProjectCheckpointManifest(manifest);
+    return encodeCheckpointManifestDigestInput(decodeCollabProjectCheckpointManifest(manifest));
+}
+/** @internal Encode already validated fields without changing their format. */
+function encodeCheckpointManifestDigestInput(decoded) {
     const source = {
         artifacts: decoded.artifacts,
         coordinationFormatVersion: decoded.coordinationFormatVersion,
@@ -707,13 +717,13 @@ function idempotencyResultRecord(source, recordId, revision) {
         },
     };
 }
-function principalBindingRecord(source, recordId, revision) {
-    const value = exactRecord(source.value, 'value', [
+function principalBindingRecord(source, recordId, revision, deferPrincipals) {
+    const value = principalRecord(source.value, 'value', [
         'boundAt',
         'memberId',
         'principalId',
         'projectId',
-    ]);
+    ], deferPrincipals);
     const memberId = token(value, 'memberId', CollabValidation_1.isCollabMemberId);
     if (recordId !== memberId)
         throw invalidPayload('recordId');
@@ -724,7 +734,7 @@ function principalBindingRecord(source, recordId, revision) {
         value: {
             boundAt: timestamp(value, 'boundAt'),
             memberId,
-            principalId: token(value, 'principalId'),
+            principalId: deferPrincipals ? value.principalId : token(value, 'principalId'),
             projectId: token(value, 'projectId', CollabValidation_1.isCollabProjectId),
         },
     };
@@ -858,7 +868,13 @@ function lifecycleStateRecord(source, recordId, revision) {
         value: internalState,
     };
 }
-function terminalResponderRecord(source, recordId, revision) {
+function principalRecord(value, field, keys, deferPrincipals) {
+    const source = record(value, field);
+    return exactRecord(source, field, deferPrincipals && !Object.hasOwn(source, 'principalId')
+        ? keys.filter(key => key !== 'principalId')
+        : keys);
+}
+function terminalResponderRecord(source, recordId, revision, deferPrincipals) {
     const value = exactRecord(source.value, 'value', [
         'acknowledgements',
         'eligibleMemberIds',
@@ -910,22 +926,24 @@ function terminalResponderRecord(source, recordId, revision) {
     if (!Array.isArray(value.acknowledgements))
         throw invalidPayload('acknowledgements');
     const acknowledgements = value.acknowledgements.map((item) => {
-        const acknowledgement = exactRecord(item, 'acknowledgement', [
+        const acknowledgement = principalRecord(item, 'acknowledgement', [
             'acknowledgedAt',
             'memberId',
             'principalId',
-        ]);
+        ], deferPrincipals);
         return {
             acknowledgedAt: timestamp(acknowledgement, 'acknowledgedAt'),
             memberId: token(acknowledgement, 'memberId', CollabValidation_1.isCollabMemberId),
-            principalId: token(acknowledgement, 'principalId'),
+            principalId: deferPrincipals
+                ? acknowledgement.principalId
+                : token(acknowledgement, 'principalId'),
         };
     });
     const acknowledgementPrincipals = new Set();
     acknowledgements.forEach((item, index) => {
         if (!eligibleMemberIds.includes(item.memberId)
             || (index > 0 && acknowledgements[index - 1].memberId.localeCompare(item.memberId, 'en-US') >= 0)
-            || acknowledgementPrincipals.has(item.principalId))
+            || (!deferPrincipals && acknowledgementPrincipals.has(item.principalId)))
             throw invalidPayload('acknowledgements');
         acknowledgementPrincipals.add(item.principalId);
     });
@@ -934,7 +952,7 @@ function terminalResponderRecord(source, recordId, revision) {
         recordId,
         revision,
         value: {
-            acknowledgements: Object.freeze(acknowledgements),
+            acknowledgements,
             eligibleMemberIds: Object.freeze(eligibleMemberIds),
             expiresAt,
             operation,
@@ -1107,8 +1125,9 @@ function authorityVolumePairRecord(source, recordId, revision) {
         },
     };
 }
-function decodeCheckpointRecord(value) {
+function decodeCheckpointRecord(value, principalPhase) {
     const { kind, recordId, revision, source } = recordEnvelope(value);
+    const deferPrincipals = principalPhase === 'deferred';
     switch (kind) {
         case 'project': return projectRecord(source, recordId, revision);
         case 'member': return memberRecord(source, recordId, revision);
@@ -1121,10 +1140,12 @@ function decodeCheckpointRecord(value) {
         case 'cloud-event': return cloudEventRecord(source, recordId, revision);
         case 'cloud-event-cursor': return cloudEventCursorRecord(source, recordId, revision);
         case 'idempotency-result': return idempotencyResultRecord(source, recordId, revision);
-        case 'principal-binding': return principalBindingRecord(source, recordId, revision);
+        case 'principal-binding':
+            return principalBindingRecord(source, recordId, revision, deferPrincipals);
         case 'repository-placement': return repositoryPlacementRecord(source, recordId, revision);
         case 'lifecycle-state': return lifecycleStateRecord(source, recordId, revision);
-        case 'terminal-responder': return terminalResponderRecord(source, recordId, revision);
+        case 'terminal-responder':
+            return terminalResponderRecord(source, recordId, revision, deferPrincipals);
         case 'protected-claim-envelope':
             return protectedClaimEnvelopeRecord(source, recordId, revision);
         case 'tombstone': return tombstoneRecord(source, recordId, revision);
@@ -1140,7 +1161,8 @@ function compareRecords(left, right) {
     const kindOrder = recordKindOrder(left.kind) - recordKindOrder(right.kind);
     return kindOrder !== 0 ? kindOrder : left.recordId.localeCompare(right.recordId, 'en-US');
 }
-function validateRecordSequence(records, profile) {
+/** @internal V3 decoding checks terminal principals separately; consistency binds current principals. */
+function validateCheckpointRecordSequence(records, profile, acknowledgementBinding = 'current-principal') {
     if (records.length === 0 || records[0].kind !== 'project')
         throw invalidPayload('records');
     const projectId = records[0].recordId;
@@ -1243,7 +1265,9 @@ function validateRecordSequence(records, profile) {
             throw invalidPayload('records');
         }
         if (item.kind === 'terminal-responder' && (item.value.eligibleMemberIds.some(memberId => !members.has(memberId))
-            || item.value.acknowledgements.some(acknowledgement => (principalBindings.get(acknowledgement.memberId) !== acknowledgement.principalId))))
+            || item.value.acknowledgements.some(acknowledgement => (acknowledgementBinding === 'current-principal'
+                ? principalBindings.get(acknowledgement.memberId) !== acknowledgement.principalId
+                : !principalBindings.has(acknowledgement.memberId)))))
             throw invalidPayload('records');
     }
     if (profile === 'backup') {
@@ -1270,11 +1294,13 @@ function decodeCollabProjectCheckpointCoordinationNdjson(value, profile) {
             throw invalidPayload('coordination');
         }
         const result = decodeCheckpointRecord(parsed);
+        if (result.kind === 'terminal-responder')
+            Object.freeze(result.value.acknowledgements);
         if (JSON.stringify(result) !== line)
             throw invalidPayload('coordination');
         return result;
     });
-    validateRecordSequence(decoded, profile);
+    validateCheckpointRecordSequence(decoded, profile);
     return Object.freeze(decoded);
 }
 function encodeCollabProjectCheckpointCoordinationNdjson(records, profile) {
@@ -1306,7 +1332,11 @@ function checkpointRecordGitOids(checkpointRecord) {
 }
 function validateCollabProjectCheckpointConsistency(manifest, records) {
     const decodedManifest = decodeCollabProjectCheckpointManifest(manifest);
-    validateRecordSequence(records, decodedManifest.profile);
+    validateCheckpointRecordSequence(records, decodedManifest.profile);
+    return validateCheckpointManifestConsistency(decodedManifest, records);
+}
+/** @internal Cross-artifact checks operate on validated fields, not another format. */
+function validateCheckpointManifestConsistency(decodedManifest, records) {
     const project = records[0];
     if (project.kind !== 'project'
         || project.value.projectId !== decodedManifest.projectId

package/dist/CollabProjectMembership.d.ts

@@ -1,3 +1,4 @@
+import type { CollabTransferredMembershipClaim } from './CollabAuthorityTransfer';
 import type { CollabDecodeResult } from './CollabProtocol';
 import type { CollabGitOid, CollabIdempotencyKey, CollabIsoTimestamp, CollabMemberId, CollabProjectId, CollabRequestId, CollabRole } from './types';
 export declare const COLLAB_PROJECT_MEMBERSHIP_LIMITS: Readonly<{
@@ -95,6 +96,7 @@ export interface JoinCloudProjectResponse {
 export interface CollabProjectMemberSummary {
     readonly bindingState: CollabProjectMemberBindingState;
     readonly displayName: string;
+    readonly importedClaimGeneration: number | null;
     readonly importedClaimState: CollabImportedClaimState;
     readonly memberId: CollabMemberId;
     readonly membershipRevision: number;
@@ -112,13 +114,9 @@ export interface ReissueTransferredMembershipClaimRequest extends CollabProjectM
     readonly expectedMembershipRevision: number;
     readonly memberId: CollabMemberId;
 }
-export interface ReissueTransferredMembershipClaimResponse {
-    readonly claim: string;
+export interface ReissueTransferredMembershipClaimResponse extends CollabTransferredMembershipClaim {
     readonly claimGeneration: number;
     readonly createdAt: CollabIsoTimestamp;
-    readonly expiresAt: CollabIsoTimestamp;
-    readonly memberId: CollabMemberId;
-    readonly projectId: CollabProjectId;
     readonly secretReplayExpiresAt: CollabIsoTimestamp;
 }
 export type RevokeTransferredMembershipClaimRequest = ReissueTransferredMembershipClaimRequest;

package/dist/CollabProjectMembership.js

@@ -338,23 +338,37 @@ function decodeMemberSummary(value) {
     const source = exactRecord(value, 'member', [
         'bindingState',
         'displayName',
+        'importedClaimGeneration',
         'importedClaimState',
         'memberId',
         'membershipRevision',
         'role',
     ]);
+    const importedClaimState = literal(source, 'importedClaimState', [
+        'not-applicable',
+        'original-active',
+        'override-active',
+        'revoked',
+        'expired',
+        'redeemed',
+        'hidden',
+    ]);
+    const importedClaimGeneration = source.importedClaimGeneration === null
+        ? null
+        : nonNegativeInteger(source, 'importedClaimGeneration');
+    if (importedClaimState === 'hidden' || importedClaimState === 'not-applicable') {
+        if (importedClaimGeneration !== null)
+            throw invalidPayload('importedClaimGeneration');
+    }
+    else if (importedClaimGeneration === null
+        || (importedClaimState === 'original-active' && importedClaimGeneration !== 0)
+        || (importedClaimState === 'override-active' && importedClaimGeneration === 0))
+        throw invalidPayload('importedClaimGeneration');
     return {
         bindingState: literal(source, 'bindingState', ['bound', 'unbound', 'hidden']),
         displayName: boundedText(source, 'displayName', exports.COLLAB_PROJECT_MEMBERSHIP_LIMITS.maxDisplayNameUtf8Bytes),
-        importedClaimState: literal(source, 'importedClaimState', [
-            'not-applicable',
-            'original-active',
-            'override-active',
-            'revoked',
-            'expired',
-            'redeemed',
-            'hidden',
-        ]),
+        importedClaimGeneration,
+        importedClaimState,
         memberId: token(source, 'memberId', CollabValidation_1.isCollabMemberId),
         membershipRevision: positiveInteger(source, 'membershipRevision'),
         role: literal(source, 'role', ['manager', 'member']),
@@ -401,6 +415,8 @@ function decodeReissueClaimResponse(value) {
         'memberId',
         'projectId',
         'secretReplayExpiresAt',
+        'targetAuthorityGeneration',
+        'transferId',
     ]);
     const createdAt = timestamp(source, 'createdAt');
     const expiresAt = timestamp(source, 'expiresAt');
@@ -416,6 +432,8 @@ function decodeReissueClaimResponse(value) {
         memberId: token(source, 'memberId', CollabValidation_1.isCollabMemberId),
         projectId: token(source, 'projectId', CollabValidation_1.isCollabProjectId),
         secretReplayExpiresAt,
+        targetAuthorityGeneration: positiveInteger(source, 'targetAuthorityGeneration'),
+        transferId: token(source, 'transferId'),
     };
 }
 function decodeRevokeClaimResponse(value) {

package/dist/esm/CollabCloudBinding.mjs

@@ -3,7 +3,7 @@ import { COLLAB_CONTROL_OPERATION_CODECS, } from './CollabControlOperationCodecs
 import { COLLAB_ERROR_CODES, CollabError, sanitizeCollabDiagnosticContext, } from './CollabError.mjs';
 import { isCollabOpaqueId, isCollabProjectId, } from './CollabValidation.mjs';
 import { COLLAB_CHECKPOINT_ARTIFACT_LIMITS, COLLAB_PROJECT_CHECKPOINT_ARTIFACTS, } from './CollabProjectCheckpoint.mjs';
-export const COLLAB_CLOUD_BINDING_VERSION = 2;
+export const COLLAB_CLOUD_BINDING_VERSION = 3;
 export const COLLAB_CLOUD_CAPABILITY_DOCUMENT_SCHEMA_VERSION = 2;
 export const COLLAB_CLOUD_CAPABILITIES = Object.freeze([
     'accept',
@@ -168,7 +168,7 @@ export function collabCloudProjectOperationRoute(projectId, operation) {
     assertProjectId(projectId);
     if (!isCloudJsonOperation(operation))
         invalidRoute();
-    return route('POST', `/v2/projects/${projectId}/operations/${operation}`, {
+    return route('POST', `/v3/projects/${projectId}/operations/${operation}`, {
         kind: 'project-operation',
         operation,
         projectId,
@@ -178,7 +178,7 @@ export function collabCloudProjectEventsRoute(projectId, afterSequence) {
     assertProjectId(projectId);
     if (!Number.isSafeInteger(afterSequence) || afterSequence < 0)
         invalidRoute();
-    return route('GET', `/v2/projects/${projectId}/events?afterSequence=${afterSequence}`, {
+    return route('GET', `/v3/projects/${projectId}/events?afterSequence=${afterSequence}`, {
         afterSequence,
         kind: 'project-events',
         projectId,
@@ -189,11 +189,11 @@ export function collabCloudGitRoute(projectId, routeKind, service) {
     if (routeKind === 'info-refs') {
         if (service !== 'git-upload-pack' && service !== 'git-receive-pack')
             invalidRoute();
-        return route('GET', `/v2/projects/${projectId}/repository.git/info/refs?service=${service}`, { kind: 'git-info-refs', projectId, service });
+        return route('GET', `/v3/projects/${projectId}/repository.git/info/refs?service=${service}`, { kind: 'git-info-refs', projectId, service });
     }
     if (service !== undefined)
         invalidRoute();
-    return route('POST', `/v2/projects/${projectId}/repository.git/${routeKind}`, {
+    return route('POST', `/v3/projects/${projectId}/repository.git/${routeKind}`, {
         kind: routeKind,
         projectId,
     });
@@ -204,7 +204,7 @@ export function collabCloudAuthorityTransferArtifactRoute(projectId, transferId,
     if (direction !== 'download' && direction !== 'upload'
         || !COLLAB_PROJECT_CHECKPOINT_ARTIFACTS_SET.has(artifact))
         invalidRoute();
-    return route(direction === 'upload' ? 'PUT' : 'GET', `/v2/projects/${projectId}/authority-transfers/${transferId}/checkpoint/${artifact}`, {
+    return route(direction === 'upload' ? 'PUT' : 'GET', `/v3/projects/${projectId}/authority-transfers/${transferId}/checkpoint/${artifact}`, {
         artifact,
         direction,
         kind: 'authority-transfer-artifact',
@@ -217,7 +217,7 @@ export function collabCloudProjectCheckpointExportArtifactRoute(projectId, expor
     assertAttemptId(exportId);
     if (!COLLAB_PROJECT_CHECKPOINT_ARTIFACTS_SET.has(artifact))
         invalidRoute();
-    return route('GET', `/v2/projects/${projectId}/checkpoint-exports/${exportId}/checkpoint/${artifact}`, {
+    return route('GET', `/v3/projects/${projectId}/checkpoint-exports/${exportId}/checkpoint/${artifact}`, {
         artifact,
         exportId,
         kind: 'project-checkpoint-export-artifact',
@@ -229,7 +229,7 @@ export function collabCloudProjectCheckpointExportRoute(projectId, exportId, ope
     assertAttemptId(exportId);
     if (operation !== 'begin' && operation !== 'status')
         invalidRoute();
-    return route(operation === 'begin' ? 'POST' : 'GET', `/v2/projects/${projectId}/checkpoint-exports/${exportId}`, { exportId, kind: 'project-checkpoint-export', operation, projectId });
+    return route(operation === 'begin' ? 'POST' : 'GET', `/v3/projects/${projectId}/checkpoint-exports/${exportId}`, { exportId, kind: 'project-checkpoint-export', operation, projectId });
 }
 export function decodeCollabCloudProjectCheckpointExportStatus(value) {
     const source = exactRecord(value, 'checkpointExport', [
@@ -267,7 +267,7 @@ export function decodeCollabCloudProjectCheckpointExportStatus(value) {
     });
 }
 export function collabDevelopmentBootstrapRoute(operation, attemptId) {
-    const base = '/v2/development/bootstrap/attempts';
+    const base = '/v3/development/bootstrap/attempts';
     if (operation === 'beginDevelopmentBootstrap') {
         if (attemptId !== undefined)
             invalidRoute();
@@ -326,7 +326,7 @@ export function matchCollabCloudRoute(method, target) {
         && url.pathname === '/collab/capabilities'
         && exactQuery(url, []))
         return { kind: 'capabilities' };
-    if (segments[0] === 'v2'
+    if (segments[0] === 'v3'
         && segments[1] === 'projects'
         && isCollabProjectId(segments[2])) {
         const projectId = segments[2];
@@ -405,7 +405,7 @@ export function matchCollabCloudRoute(method, target) {
             && exactQuery(url, []))
             return { kind: segments[4], projectId };
     }
-    if (segments[0] !== 'v2'
+    if (segments[0] !== 'v3'
         || segments[1] !== 'development'
         || segments[2] !== 'bootstrap'
         || segments[3] !== 'attempts'

package/dist/esm/CollabCloudProjectSnapshot.mjs

@@ -63,6 +63,7 @@ function positiveInteger(source, field) {
 }
 function decodeProject(value) {
     const source = exactRecord(value, 'project', [
+        'authorityGeneration',
         'createdAt',
         'expectedMainOid',
         'id',
@@ -72,6 +73,7 @@ function decodeProject(value) {
     if (source.mainRef !== COLLAB_MAIN_REF)
         throw invalidPayload('mainRef');
     return {
+        authorityGeneration: positiveInteger(source, 'authorityGeneration'),
         createdAt: timestamp(source, 'createdAt'),
         expectedMainOid: stringField(source, 'expectedMainOid', 64, isCollabGitOid),
         id: stringField(source, 'id', 64, isCollabProjectId),

package/dist/esm/CollabConstants.mjs

@@ -1,4 +1,4 @@
-export const COLLAB_PROTOCOL_VERSION = 6;
+export const COLLAB_PROTOCOL_VERSION = 7;
 export const COLLAB_MAIN_REF = 'refs/heads/main';
 export const COLLAB_MEMBER_REF_PREFIX = 'refs/heads/members/';
 export const COLLAB_LIMITS = Object.freeze({

package/dist/esm/CollabProjectBackupCheckpoint.mjs

@@ -2,7 +2,7 @@ import { COLLAB_AUTHORITY_TRANSFER_CANCELLATION_PHASES, COLLAB_CLOUD_TO_LAN_TRAN
 import { COLLAB_MAIN_REF, COLLAB_MEMBER_REF_PREFIX, } from './CollabConstants.mjs';
 import { collabControlOperationCodec, } from './CollabControlOperationCodecs.mjs';
 import { CollabError } from './CollabError.mjs';
-import { COLLAB_CHECKPOINT_ARTIFACT_LIMITS, COLLAB_CHECKPOINT_PORTABLE_RECORD_KINDS, COLLAB_PROJECT_COORDINATION_FORMAT_VERSION, decodeCollabProjectCheckpointCoordinationNdjson, decodeCollabProjectCheckpointManifest, validateCollabProjectCheckpointConsistency, } from './CollabProjectCheckpoint.mjs';
+import { COLLAB_CHECKPOINT_ARTIFACT_LIMITS, COLLAB_CHECKPOINT_PORTABLE_RECORD_KINDS, decodeCheckpointManifestFields, decodeCheckpointRecord, encodeCheckpointManifestDigestInput, validateCheckpointManifestConsistency, validateCheckpointRecordSequence, } from './CollabProjectCheckpoint.mjs';
 import { COLLAB_PROJECT_MEMBERSHIP_LIMITS, } from './CollabProjectMembership.mjs';
 import { hasUtf8ByteLengthAtMost, isCollabGitOid, isCollabMemberId, isCollabOpaqueId, isCollabProjectId, } from './CollabValidation.mjs';
 export const COLLAB_PROJECT_BACKUP_COMPATIBILITY_STAGE = 'pre-production-replaceable';
@@ -198,65 +198,19 @@ function absoluteTargetUrl(source) {
 function principal(source, field) {
     return token(source, field, value => (typeof value === 'string' && PRINCIPAL_PATTERN.test(value)));
 }
-function sanitizeBackupBasePrincipalRecord(item) {
-    const source = record(item, 'record');
-    const value = record(source.value, 'value');
-    if (source.kind === 'principal-binding') {
-        return {
-            ...source,
-            value: { ...value, principalId: `principal_${String(value.memberId)}` },
-        };
-    }
-    if (source.kind === 'terminal-responder' && Array.isArray(value.acknowledgements)) {
-        return {
-            ...source,
-            value: {
-                ...value,
-                acknowledgements: value.acknowledgements.map(item => ({
-                    ...record(item, 'acknowledgement'),
-                    principalId: `principal_${String(record(item, 'acknowledgement').memberId)}`,
-                })),
-            },
-        };
-    }
-    return item;
-}
-function restoreBackupBasePrincipals(source, base) {
-    if (base.kind === 'principal-binding') {
-        const value = exactRecord(source.value, 'value', [
-            'boundAt', 'memberId', 'principalId', 'projectId',
-        ]);
-        return {
-            ...base,
-            value: { ...base.value, principalId: principal(value, 'principalId') },
-        };
-    }
+function validateBackupBasePrincipals(base) {
+    if (base.kind === 'principal-binding')
+        principal(base.value, 'principalId');
     if (base.kind === 'terminal-responder') {
-        const value = exactRecord(source.value, 'value', [
-            'acknowledgements',
-            'eligibleMemberIds',
-            'expiresAt',
-            'operation',
-            'operationId',
-            'projectId',
-            'responseJson',
-        ]);
-        const sourceAcknowledgements = value.acknowledgements;
-        if (!Array.isArray(sourceAcknowledgements)
-            || sourceAcknowledgements.length !== base.value.acknowledgements.length)
-            throw invalidPayload('acknowledgements');
-        const acknowledgements = base.value.acknowledgements.map((item, index) => {
-            const original = exactRecord(sourceAcknowledgements[index], 'acknowledgement', [
-                'acknowledgedAt', 'memberId', 'principalId',
-            ]);
-            return { ...item, principalId: principal(original, 'principalId') };
-        });
-        if (new Set(acknowledgements.map(item => item.principalId)).size !== acknowledgements.length) {
-            throw invalidPayload('acknowledgements');
+        for (const acknowledgement of base.value.acknowledgements) {
+            if (acknowledgement.principalId === undefined)
+                throw invalidPayload('acknowledgement');
+            principal(acknowledgement, 'principalId');
         }
-        return { ...base, value: { ...base.value, acknowledgements } };
+        if (new Set(base.value.acknowledgements.map(item => item.principalId)).size
+            !== base.value.acknowledgements.length)
+            throw invalidPayload('acknowledgements');
     }
-    return base;
 }
 function repositoryPublicationRef(value) {
     const source = exactRecord(value, 'ref', ['name', 'oid']);
@@ -2000,55 +1954,18 @@ function validateContinuity(records) {
         }
     }
 }
-function manifestWithFormatOne(value) {
+export function decodeCollabProjectBackupCheckpointManifest(value) {
     const source = record(value, 'manifest');
     if (source.profile !== 'backup'
         || source.coordinationFormatVersion !== COLLAB_PROJECT_BACKUP_COORDINATION_FORMAT_VERSION)
         throw invalidPayload('manifest');
-    return decodeCollabProjectCheckpointManifest({
-        ...source,
-        coordinationFormatVersion: COLLAB_PROJECT_COORDINATION_FORMAT_VERSION,
-    });
-}
-export function decodeCollabProjectBackupCheckpointManifest(value) {
-    const decoded = manifestWithFormatOne(value);
-    return {
-        artifacts: decoded.artifacts,
-        coordinationFormatVersion: COLLAB_PROJECT_BACKUP_COORDINATION_FORMAT_VERSION,
-        createdAt: decoded.createdAt,
-        expectedMainOid: decoded.expectedMainOid,
-        gitObjectFormat: decoded.gitObjectFormat,
-        manifestSchemaVersion: decoded.manifestSchemaVersion,
-        manifestSha256: decoded.manifestSha256,
-        operationId: decoded.operationId,
-        profile: 'backup',
-        projectId: decoded.projectId,
-        protocolVersion: decoded.protocolVersion,
-        refs: decoded.refs,
-        sourceAuthority: decoded.sourceAuthority,
-        targetAuthority: decoded.targetAuthority,
-    };
+    return decodeCheckpointManifestFields(source, COLLAB_PROJECT_BACKUP_COORDINATION_FORMAT_VERSION);
 }
 export function encodeCollabProjectBackupCheckpointManifestCanonicalJson(manifest) {
     return JSON.stringify(decodeCollabProjectBackupCheckpointManifest(manifest));
 }
 export function encodeCollabProjectBackupCheckpointManifestDigestInput(manifest) {
-    const decoded = decodeCollabProjectBackupCheckpointManifest(manifest);
-    return JSON.stringify({
-        artifacts: decoded.artifacts,
-        coordinationFormatVersion: decoded.coordinationFormatVersion,
-        createdAt: decoded.createdAt,
-        expectedMainOid: decoded.expectedMainOid,
-        gitObjectFormat: decoded.gitObjectFormat,
-        manifestSchemaVersion: decoded.manifestSchemaVersion,
-        operationId: decoded.operationId,
-        profile: decoded.profile,
-        projectId: decoded.projectId,
-        protocolVersion: decoded.protocolVersion,
-        refs: decoded.refs,
-        sourceAuthority: decoded.sourceAuthority,
-        targetAuthority: decoded.targetAuthority,
-    });
+    return encodeCheckpointManifestDigestInput(decodeCollabProjectBackupCheckpointManifest(manifest));
 }
 export function decodeCollabProjectBackupCheckpointCoordinationNdjson(value) {
     if (typeof value !== 'string'
@@ -2068,22 +1985,43 @@ export function decodeCollabProjectBackupCheckpointCoordinationNdjson(value) {
         }
         if (JSON.stringify(item) !== line)
             throw invalidPayload('coordination');
-        return { envelope: recordEnvelope(item), item };
+        return {
+            envelope: recordEnvelope(item),
+            item,
+            base: undefined,
+        };
     });
     const baseItems = parsed.filter(({ envelope }) => (!CONTINUITY_KIND_SET.has(envelope.kind) && envelope.kind !== 'idempotency-result'));
-    const baseDecoded = decodeCollabProjectCheckpointCoordinationNdjson(baseItems.map(({ item }) => JSON.stringify(sanitizeBackupBasePrincipalRecord(item))).join('\n') + '\n', 'backup');
-    const baseByIdentity = new Map(baseDecoded.map(item => [`${item.kind}\0${item.recordId}`, item]));
-    const decoded = parsed.map(({ envelope }) => {
+    for (const { envelope } of baseItems) {
+        const value = record(envelope.source.value, 'value');
+        if (envelope.kind === 'terminal-responder' && Array.isArray(value.acknowledgements)) {
+            for (const acknowledgement of value.acknowledgements)
+                record(acknowledgement, 'acknowledgement');
+        }
+    }
+    const baseRecords = [];
+    for (const entry of baseItems) {
+        entry.base = decodeCheckpointRecord(entry.item, 'deferred');
+        if (JSON.stringify(entry.base) !== JSON.stringify(entry.item)
+            || (entry.base.kind === 'principal-binding' && entry.base.value.principalId === undefined)) {
+            throw invalidPayload('coordination');
+        }
+        baseRecords.push(entry.base);
+    }
+    if (baseRecords.length === 0)
+        throw invalidPayload('coordination');
+    validateCheckpointRecordSequence(baseRecords, 'backup', 'member');
+    const decoded = parsed.map(({ envelope, base }) => {
         if (envelope.kind === 'idempotency-result') {
             return idempotencyResultRecord(envelope.source, envelope.recordId, envelope.revision);
         }
         if (CONTINUITY_KIND_SET.has(envelope.kind)) {
             return decodeContinuityRecord(envelope.kind, envelope.source, envelope.recordId, envelope.revision);
         }
-        const base = baseByIdentity.get(`${envelope.kind}\0${envelope.recordId}`);
         if (base === undefined)
             throw invalidPayload('records');
-        return restoreBackupBasePrincipals(envelope.source, base);
+        validateBackupBasePrincipals(base);
+        return base;
     });
     if (decoded.some((item, index) => JSON.stringify(item) !== lines[index])) {
         throw invalidPayload('coordination');
@@ -2147,9 +2085,7 @@ export function validateCollabProjectBackupCheckpointConsistency(manifest, recor
     }))
         throw invalidPayload('records');
     const baseRecords = decodedRecords.filter(item => (!CONTINUITY_KIND_SET.has(item.kind) && item.kind !== 'idempotency-result'));
-    validateCollabProjectCheckpointConsistency(decodeCollabProjectCheckpointManifest({
-        ...decodedManifest,
-        coordinationFormatVersion: COLLAB_PROJECT_COORDINATION_FORMAT_VERSION,
-    }), baseRecords);
+    validateCheckpointRecordSequence(baseRecords, 'backup');
+    validateCheckpointManifestConsistency(decodedManifest, baseRecords);
     return records;
 }