borgmcp-shared 1.1.0 → 2.0.0

package/src/conformance/adapter.ts

@@ -282,7 +282,6 @@ export const ADAPTER_CONFORMANCE_FIXTURES = [
   { id: 'cursor.explicit-expiry', area: 'cursor' },
   { id: 'acks.idempotent', area: 'acks' },
   { id: 'acks.status-query', area: 'acks' },
-  { id: 'claims.durable-noncursor', area: 'claims' },
   { id: 'decisions.topic-supersession', area: 'decisions' },
   { id: 'security.drone-management-authorization', area: 'security' },
   { id: 'security.manage-access-matrix', area: 'security' },
@@ -318,7 +317,6 @@ const FIXTURE_PREREQUISITES: Partial<Record<AdapterConformanceFixtureId, readonl
   'cursor.explicit-expiry': ['shared.enrolled-principals'],
   'acks.idempotent': ['shared.enrolled-principals'],
   'acks.status-query': ['shared.enrolled-principals'],
-  'claims.durable-noncursor': ['shared.enrolled-principals'],
   'decisions.topic-supersession': ['shared.enrolled-principals'],
   'security.manage-access-matrix': ['shared.enrolled-principals'],
   'drones.reassign-invariants': ['shared.enrolled-principals'],
@@ -814,6 +812,20 @@ export async function runAdapterConformance(
     const createdResponse = await environment.operations.createCube(ownerCredential, createProtocolEnvelope('cube-create', cubeRequest));
     expectStatus(createdResponse, 201, 'Owner cube create');
     const created = decodeCreateCubeResponseEnvelope(createdResponse.body).payload;
+    expectError(
+      await environment.operations.createCube(ownerCredential, createProtocolEnvelope('cube-case-variant-duplicate', {
+        ...cubeRequest,
+        retry_key: '00000000-0000-4000-8000-000000000214',
+        name: 'repository one',
+        repository: {
+          kind: 'origin' as const,
+          value: 'https://github.com/Byte-Ventures/repository-one-case-variant',
+        },
+      })),
+      409,
+      ErrorCode.INVALID_INPUT,
+      'Same-owner case-variant cube name',
+    );
     const createdRoleProbes = new Map<string, {
       role: unknown;
       droneId: string;
@@ -1158,26 +1170,27 @@ export async function runAdapterConformance(
       same(await resolve('repository-resolve-alternate-after-repository-conflict', alternateResolveRequest), { result: 'none' }),
       'Repository conflict created an alternate binding.',
     );
-    expectSecretFreeError(
-      await environment.operations.associateRepositoryCube(
-        credentialA,
-        createProtocolEnvelope('repository-associate-cube-conflict', {
-          cube_id: cubeA.id,
-          ...alternateResolveRequest,
-        }),
-      ),
-      409,
-      ErrorCode.CUBE_ALREADY_ASSOCIATED,
-      'Cube-to-other-repository conflict',
-      [cubeA.id, repository.value, 'https://github.com/Byte-Ventures/other-repository'],
+    const alternateAssociationResponse = await environment.operations.associateRepositoryCube(
+      credentialA,
+      createProtocolEnvelope('repository-associate-second-repository', {
+        cube_id: cubeA.id,
+        ...alternateResolveRequest,
+      }),
     );
+    expectStatus(alternateAssociationResponse, 200, 'Second repository association');
+    const alternateAuthoritative = decodeAssociateRepositoryCubeResponseEnvelope(
+      alternateAssociationResponse.body,
+    ).payload;
     invariant(
-      same(await resolve('repository-resolve-after-cube-conflict', resolveRequest), authoritative),
-      'Cube conflict changed the authoritative original binding.',
+      same(await resolve('repository-resolve-after-second-association', resolveRequest), authoritative),
+      'Second repository association changed the authoritative original binding.',
     );
     invariant(
-      same(await resolve('repository-resolve-alternate-after-cube-conflict', alternateResolveRequest), { result: 'none' }),
-      'Cube conflict created the refused alternate binding.',
+      same(
+        await resolve('repository-resolve-alternate-after-second-association', alternateResolveRequest),
+        alternateAuthoritative,
+      ),
+      'Second repository association was not observable.',
     );
     const preparedB = await environment.admin.prepareRepositoryCube(cubeB, {
       name: 'Other Client Legacy Cube',
@@ -1254,7 +1267,7 @@ export async function runAdapterConformance(
       resolved: true,
       idempotent: true,
       repository_conflict: ErrorCode.REPOSITORY_ALREADY_ASSOCIATED,
-      cube_conflict: ErrorCode.CUBE_ALREADY_ASSOCIATED,
+      multiple_repositories_per_cube: true,
       inaccessible: ErrorCode.ACCESS_DENIED,
       inaccessible_binding_hidden: true,
       cross_client_binding_hidden: true,
@@ -2259,42 +2272,6 @@ export async function runAdapterConformance(
     };
   });
 
-  await record('claims.durable-noncursor', async () => {
-    const principal = await environment.admin.createPrincipal('claim-noncursor');
-    const cube = await environment.admin.createCube('claim-noncursor');
-    await environment.admin.grantCube(principal, cube);
-    const credential = await environment.admin.issueDroneSession(principal);
-    const appended = await environment.operations.append(
-      credential,
-      cube,
-      createProtocolEnvelope('claim-fixture-entry', {
-        post_id: '00000000-0000-4000-8000-000000000314',
-        to: 'broadcast',
-        message: 'claim cursor baseline',
-      }),
-    );
-    expectStatus(appended, 201, 'Claim fixture append');
-    const entry = decodeAppendLogResultEnvelope(appended.body).payload.entry;
-    const baselineCursor = { id: entry.id, created_at: entry.created_at };
-    const claim = await environment.operations.ack(
-      credential,
-      cube,
-      createProtocolEnvelope('claim-fixture-claim', { entry_id: entry.id, kind: 'claim' }),
-    );
-    expectStatus(claim, 204, 'Claim');
-    const read = await environment.operations.read(
-      credential,
-      cube,
-      createProtocolEnvelope('claim-fixture-readback', { cursor: baselineCursor, limit: 10 }),
-    );
-    expectStatus(read, 200, 'Claim-state read');
-    const page = decodeReadLogResultEnvelope(read.body).payload;
-    invariant(page.entries.length === 0, 'Claim unexpectedly created a log entry.');
-    invariant(page.cursor !== null && compareLogCursor(page.cursor, baselineCursor) === 0, 'Claim advanced the log cursor.');
-    invariant(page.claims.some((item) => item.log_entry_id === entry.id), 'Claim was not durable in a later read.');
-    return { durable_claims: 1, entries: 0, cursor_advanced: false };
-  });
-
   await record('decisions.topic-supersession', async () => {
     const firstResponse = await environment.operations.recordDecision(
       credentialA,
@@ -3233,24 +3210,25 @@ export async function runAdapterConformance(
       name: 'Ambiguous Role',
       detailedDescription,
     });
-    await environment.admin.createRole(roleContractCube, {
-      roleClass: 'worker',
-      isHumanSeat: false,
-      name: 'AMBIGUOUS ROLE',
-      detailedDescription,
-    });
     expectError(
-      await environment.operations.roleRationale(
-        roleContractReadCredential,
+      await environment.operations.createRole(
+        roleContractCredential,
         roleContractCube,
-        createProtocolEnvelope('rationale-ambiguous-role', {
-          role: 'ambiguous role',
-          section: 'Workflow rationale',
-        }),
+        createProtocolEnvelope('role-case-variant-duplicate', { name: 'AMBIGUOUS ROLE' }),
+      ),
+      409,
+      ErrorCode.INVALID_INPUT,
+      'Case-variant duplicate role name',
+    );
+    expectError(
+      await environment.operations.createRole(
+        roleContractCredential,
+        roleContractCube,
+        createProtocolEnvelope('role-invalid-character', { name: 'Invalid/Role' }),
       ),
       400,
       ErrorCode.INVALID_INPUT,
-      'Ambiguous role rationale lookup',
+      'Invalid role name character',
     );
     expectError(
       await environment.operations.roleRationale(
@@ -3273,7 +3251,8 @@ export async function runAdapterConformance(
       unknown_role_code: ErrorCode.ROLE_NOT_FOUND,
       inaccessible_role_code: ErrorCode.ROLE_NOT_FOUND,
       unknown_section_code: ErrorCode.ROLE_SECTION_NOT_FOUND,
-      ambiguous_role_code: ErrorCode.INVALID_INPUT,
+      case_variant_duplicate_status: 409,
+      invalid_name_code: ErrorCode.INVALID_INPUT,
       invalid_selector_code: ErrorCode.INVALID_INPUT,
     };
   });
@@ -3861,6 +3840,12 @@ export async function runAdapterConformance(
       );
       expectStatus(log, 200, `${label} deletion log readback`);
       const logPayload = decodeReadLogResultEnvelope(log.body).payload;
+      const claimStatus = await environment.operations.ackStatus(
+        manager.credential,
+        cube,
+        createProtocolEnvelope(`delete-${label}-claim-readback`, { entry_id: entry.id }),
+      );
+      expectStatus(claimStatus, 200, `${label} deletion claim readback`);
       const roster = await environment.operations.listDrones(manager.credential, cube);
       expectStatus(roster, 200, `${label} deletion roster readback`);
       const roleReadback = await environment.operations.attach(
@@ -3877,7 +3862,7 @@ export async function runAdapterConformance(
       return {
         decisions: active,
         entries: logPayload.entries,
-        claims: logPayload.claims,
+        claims: decodeAckStatusResultEnvelope(claimStatus.body).payload.claims,
         drone: listedDrone(roster, drone.id),
         role: rolePayload,
       };

package/src/conformance/index.ts

@@ -474,7 +474,7 @@ export interface CubeTemplateAcceptanceConformanceVector {
   accepts: boolean;
 }
 
-/** Protocol v13's complete closed acceptance set for cube-creation templates. */
+/** Protocol v14's complete closed acceptance set for cube-creation templates. */
 export const CUBE_TEMPLATE_ACCEPTANCE_CONFORMANCE:
 readonly CubeTemplateAcceptanceConformanceVector[] = [
   { name: 'accepts the software-development template', template: 'software-dev', accepts: true },
@@ -656,9 +656,9 @@ export interface AssociateRepositoryCubeConformanceVector {
       status: 200;
     }
     | {
-      outcome: 'repository_conflict' | 'cube_conflict';
+      outcome: 'repository_conflict';
       status: 409;
-      error: 'REPOSITORY_ALREADY_ASSOCIATED' | 'CUBE_ALREADY_ASSOCIATED';
+      error: 'REPOSITORY_ALREADY_ASSOCIATED';
       diagnostic_disclosure: 'none';
     };
 }
@@ -687,14 +687,12 @@ readonly AssociateRepositoryCubeConformanceVector[] = [
     },
   },
   {
-    name: 'cube already bound to another repository conflicts without mutation',
+    name: 'a second repository may associate with the same explicit cube',
     initial: { cube_id: REPOSITORY_CUBE_ONE, ...REPOSITORY_ONE },
     retry: { cube_id: REPOSITORY_CUBE_ONE, ...REPOSITORY_TWO },
     expected: {
-      outcome: 'cube_conflict',
-      status: 409,
-      error: 'CUBE_ALREADY_ASSOCIATED',
-      diagnostic_disclosure: 'none',
+      outcome: 'resolved',
+      status: 200,
     },
   },
 ];
@@ -949,7 +947,6 @@ export interface RoleRationaleConformanceVector {
     | 'unknown-role'
     | 'inaccessible-role'
     | 'unknown-section'
-    | 'ambiguous-role-name'
     | 'invalid-selector';
   expected:
     | { status: 200; canonical_heading: true; exact_body: true; mutation: 'none' }
@@ -984,11 +981,6 @@ export const ROLE_RATIONALE_CONFORMANCE: readonly RoleRationaleConformanceVector
     fixture: 'unknown-section',
     expected: { status: 404, error: 'ROLE_SECTION_NOT_FOUND', mutation: 'none' },
   },
-  {
-    name: 'rejects a role name with multiple case-insensitive matches',
-    fixture: 'ambiguous-role-name',
-    expected: { status: 400, error: 'INVALID_INPUT', mutation: 'none' },
-  },
   {
     name: 'rejects malformed or ambiguous selectors',
     fixture: 'invalid-selector',

package/src/protocol/contract.ts

@@ -13,7 +13,7 @@ import type {
 } from './types.js';
 
 export const SHARED_PACKAGE_NAME = 'borgmcp-shared' as const;
-export const SHARED_PACKAGE_VERSION = '1.1.0' as const;
+export const SHARED_PACKAGE_VERSION = '2.0.0' as const;
 /** Maximum UTF-8 payload for each newly recorded decision text field. */
 export const DECISION_TEXT_MAX_BYTES = 512 as const;
 /** Maximum UTF-8 size of role detailed-description text and any returned section slice. */

package/src/protocol/coordination.ts

@@ -26,15 +26,6 @@ export interface ReadLogRequest {
   limit?: number;
 }
 
-export interface ClaimRecord {
-  log_entry_id: string;
-  claimant_drone_id: string;
-  claimant_label: string | null;
-  claimant_role: string | null;
-  claimed_at: string;
-  stale: boolean;
-}
-
 export interface AppendLogResult extends Omit<AppendLogResponse, 'entry'> {
   entry: EnrichedStreamEntry;
 }
@@ -44,7 +35,6 @@ export interface ReadLogResult {
   cursor: LogCursor | null;
   behind_by: number;
   has_more: boolean;
-  claims: ClaimRecord[];
 }
 
 export interface EntryQueryRequest {
@@ -443,38 +433,6 @@ export function decodeAckStatusResultEnvelope(
   return decodeProtocolEnvelope(value, decodeAckStatusResult);
 }
 
-function decodeClaimRecord(value: unknown): ClaimRecord {
-  const input = object(value);
-  exact(
-    input,
-    [
-      'log_entry_id',
-      'claimant_drone_id',
-      'claimant_label',
-      'claimant_role',
-      'claimed_at',
-      'stale',
-    ],
-    [
-      'log_entry_id',
-      'claimant_drone_id',
-      'claimant_label',
-      'claimant_role',
-      'claimed_at',
-      'stale',
-    ],
-  );
-  if (typeof input.stale !== 'boolean') throw new ProtocolContractError('Invalid claim stale flag.');
-  return {
-    log_entry_id: decodeUuid(input.log_entry_id, ['log_entry_id']),
-    claimant_drone_id: decodeUuid(input.claimant_drone_id, ['claimant_drone_id']),
-    claimant_label: nullableString(input.claimant_label, 'claimant_label', 120),
-    claimant_role: nullableString(input.claimant_role, 'claimant_role', 120),
-    claimed_at: decodeCanonicalTimestamp(input.claimed_at, ['claimed_at']),
-    stale: input.stale,
-  };
-}
-
 function decodeRoutingEcho(value: unknown): RoutingEcho {
   const input = object(value);
   exact(
@@ -549,15 +507,12 @@ export function decodeReadLogResult(value: unknown): ReadLogResult {
   const input = object(value);
   exact(
     input,
-    ['entries', 'cursor', 'behind_by', 'has_more', 'claims'],
-    ['entries', 'cursor', 'behind_by', 'has_more', 'claims'],
+    ['entries', 'cursor', 'behind_by', 'has_more'],
+    ['entries', 'cursor', 'behind_by', 'has_more'],
   );
   if (!Array.isArray(input.entries) || input.entries.length > 500) {
     throw new ProtocolContractError('Invalid read-log entries.');
   }
-  if (!Array.isArray(input.claims) || input.claims.length > 500) {
-    throw new ProtocolContractError('Invalid read-log claims.');
-  }
   if (typeof input.has_more !== 'boolean') throw new ProtocolContractError('Invalid has_more flag.');
   const entries = input.entries.map(decodeEnrichedStreamEntry);
   const cursor = input.cursor === null ? null : decodeLogCursor(input.cursor, ['cursor']);
@@ -579,7 +534,6 @@ export function decodeReadLogResult(value: unknown): ReadLogResult {
     cursor,
     behind_by: nonNegativeInteger(input.behind_by, 'behind_by', Number.MAX_SAFE_INTEGER),
     has_more: input.has_more,
-    claims: input.claims.map(decodeClaimRecord),
   };
 }
 

package/src/protocol/types.ts

@@ -146,23 +146,12 @@ export interface RosterResponse {
   since?: string | null;
 }
 
-export interface ReadLogClaim {
-  log_entry_id: string;
-  claimant_drone_id: string;
-  claimant_label: string | null;
-  claimant_role: string | null;
-  claimed_at: string;
-  stale: boolean;
-}
-
 export interface ReadLogResponse {
   entries: ActivityLogEntry[];
   drones: Drone[];
   roles: PublicRole[];
   behind_by?: number;
   has_more?: boolean;
-  /** Added with advisory claims; optional when reading older servers. */
-  claims?: ReadLogClaim[];
 }
 
 export interface RoutingEcho {

package/src/protocol/version.ts

@@ -1,4 +1,4 @@
-/** Current Borg coordination protocol generation. Clean-slate v13. */
-export const PROTOCOL_VERSION = '13' as const;
+/** Current Borg coordination protocol generation. Clean-slate v14. */
+export const PROTOCOL_VERSION = '14' as const;
 
 export type ProtocolVersion = typeof PROTOCOL_VERSION;