borgmcp 2.0.3 → 2.0.4

package/src/seats.ts

@@ -21,6 +21,7 @@ import os from 'os';
 import path from 'path';
 import { createHash } from 'node:crypto';
 import { readStoreFile, withStore } from './seat-store.js';
+import { LegacySessionCredentialCollisionError } from './server-errors.js';
 
 export const SEATS_FILE = path.join(os.homedir(), '.config', 'borgmcp', 'seats.json');
 const SEATS_VERSION = 1 as const;
@@ -47,7 +48,6 @@ export interface SeatRecord {
   // server metadata (active only)
   droneId?: string;
   sessionId?: string;
-  expiresAt?: string;
   // binding + display (set atomically at FINALIZE; absent while pending)
   worktree?: string;
   name?: string;
@@ -55,9 +55,6 @@ export interface SeatRecord {
   roleName?: string;
   roleClass?: 'queen' | 'worker';
   isHumanSeat?: boolean;
-  // One crash-safe replacement may coexist with an ACTIVE session until the
-  // server confirms the same-seat restore. It is never hydratable or bound.
-  replacement?: { credential: string };
 }
 
 interface SeatsFile {
@@ -122,8 +119,8 @@ function isValidOperation(value: unknown): value is SeatOperation {
  * checked — the ref is well-formed and self-consistent (the map key equals the
  * record's derived ref), state ∈ {pending,active}, the credential is a non-empty
  * string, the operation is well-shaped, an ACTIVE record carries ALL its required
- * server + binding fields, and a PENDING record carries NO active-only fields
- * (session id / expiry). A single invalid entry ⇒ the whole store is rejected
+ * server + binding fields, and a PENDING record carries NO active-only session
+ * id. A single invalid entry ⇒ the whole store is rejected
  * (fail closed at the caller, bytes preserved) — never a silent cast.
  */
 function isValidSeatRecord(ref: string, value: unknown): value is SeatRecord {
@@ -151,32 +148,12 @@ function isValidSeatRecord(ref: string, value: unknown): value is SeatRecord {
   if (r.worktree !== undefined && typeof r.worktree !== 'string') return false;
   if (r.droneId !== undefined && (typeof r.droneId !== 'string' || !UUID_RE.test(r.droneId))) return false;
   if (r.sessionId !== undefined && (typeof r.sessionId !== 'string' || !UUID_RE.test(r.sessionId))) return false;
-  if (
-    r.expiresAt !== undefined &&
-    (typeof r.expiresAt !== 'string' || !Number.isFinite(Date.parse(r.expiresAt)))
-  ) {
-    return false;
-  }
-  if (r.replacement !== undefined) {
-    if (
-      r.state !== 'active' ||
-      r.replacement === null ||
-      typeof r.replacement !== 'object' ||
-      Array.isArray(r.replacement) ||
-      Object.keys(r.replacement as object).length !== 1 ||
-      typeof (r.replacement as { credential?: unknown }).credential !== 'string' ||
-      !/^[A-Za-z0-9_-]{43}$/.test((r.replacement as { credential: string }).credential)
-    ) {
-      return false;
-    }
-  }
   // State-consistency invariants (no inconsistent active|pending).
   if (r.state === 'active') {
     // An ACTIVE record MUST carry its full server session + worktree binding.
     if (
       typeof r.droneId !== 'string' ||
       typeof r.sessionId !== 'string' ||
-      typeof r.expiresAt !== 'string' ||
       typeof r.worktree !== 'string' ||
       typeof r.name !== 'string' ||
       typeof r.droneLabel !== 'string'
@@ -185,7 +162,7 @@ function isValidSeatRecord(ref: string, value: unknown): value is SeatRecord {
     }
   } else {
     // A PENDING record must NOT carry active-only server session fields.
-    if (r.sessionId !== undefined || r.expiresAt !== undefined) return false;
+    if (r.sessionId !== undefined) return false;
   }
   // The map key must equal the record's derived ref (no cross-key aliasing).
   return seatRef(value as SeatRecord) === ref;
@@ -214,6 +191,37 @@ function parseStore(raw: string): SeatsFile | null {
     ) {
       const seats = candidate.seats as Record<string, unknown>;
       for (const [ref, record] of Object.entries(seats)) {
+        if (
+          record !== null &&
+          typeof record === 'object' &&
+          !Array.isArray(record) &&
+          Object.prototype.hasOwnProperty.call(record, 'replacement')
+        ) {
+          const { replacement, ...withoutReplacement } = record as Record<string, unknown>;
+          const exactReplacement =
+            replacement !== null &&
+            typeof replacement === 'object' &&
+            !Array.isArray(replacement) &&
+            Object.keys(replacement).length === 1 &&
+            typeof (replacement as { credential?: unknown }).credential === 'string' &&
+            /^[A-Za-z0-9_-]{43}$/.test((replacement as { credential: string }).credential);
+          let canonicalOrigin = false;
+          try {
+            const origin = new URL(String(withoutReplacement.origin));
+            canonicalOrigin = origin.protocol === 'https:' && origin.origin === withoutReplacement.origin;
+          } catch {
+            canonicalOrigin = false;
+          }
+          if (
+            withoutReplacement.state === 'active' &&
+            exactReplacement &&
+            canonicalOrigin &&
+            isValidSeatRecord(ref, withoutReplacement)
+          ) {
+            throw new LegacySessionCredentialCollisionError(withoutReplacement.origin as string);
+          }
+          return null;
+        }
         if (!isValidSeatRecord(ref, record)) return null;
       }
       return { version: SEATS_VERSION, seats: seats as Record<string, SeatRecord> };
@@ -297,17 +305,6 @@ export async function getActiveSeatCredential(
   return record.credential;
 }
 
-/** Exact ACTIVE record for the internal continuity coordinator. */
-export async function getActiveSeat(
-  ref: string,
-  binding: { origin: string; trustIdentity: string; cubeId: string },
-): Promise<SeatRecord | null> {
-  if (!REF_RE.test(ref)) return null;
-  const store = await readStore();
-  const record = store.seats[ref];
-  return recordMatches(record, ref, binding) && record.state === 'active' ? record : null;
-}
-
 // ─── PREPARE / mint (no worktree yet) ────────────────────────────────────────
 
 /**
@@ -471,7 +468,6 @@ export async function activateAndBindSeat(input: {
   operation: SeatOperation;
   droneId: string;
   sessionId: string;
-  expiresAt: string;
   expectedPendingDigest: string;
   worktree: string;
   name: string;
@@ -483,9 +479,6 @@ export async function activateAndBindSeat(input: {
   if (!UUID_RE.test(input.droneId) || !UUID_RE.test(input.sessionId)) {
     throw new Error('invalid Borg server session identity');
   }
-  if (typeof input.expiresAt !== 'string' || !Number.isFinite(Date.parse(input.expiresAt))) {
-    throw new Error('invalid Borg server session expiry');
-  }
   const ref = seatRef(input);
   const binding = { origin: input.origin, trustIdentity: input.trustIdentity, cubeId: input.cubeId };
   return withStore<SeatsFile, ActivateSeatOutcome>(SEATS_FILE, emptyStore, parseStore, async (txn) => {
@@ -497,7 +490,6 @@ export async function activateAndBindSeat(input: {
       state: 'active',
       droneId: input.droneId,
       sessionId: input.sessionId,
-      expiresAt: input.expiresAt,
       worktree: input.worktree,
       name: input.name,
       droneLabel: input.droneLabel,
@@ -510,149 +502,6 @@ export async function activateAndBindSeat(input: {
   });
 }
 
-export type PrepareSeatReplacementOutcome =
-  | { ok: true; credential: string; digest: string }
-  | { ok: false; reason: 'expectation-mismatch' };
-
-/**
- * Preserve the exact ACTIVE seat while preparing one durable replacement bearer.
- * A lost response or process restart reuses the stored replacement; a changed
- * authority, drone, or active bearer fails before any mutation.
- */
-export async function prepareSeatReplacement(input: {
-  ref: string;
-  binding: { origin: string; trustIdentity: string; cubeId: string };
-  expectedDroneId: string;
-  expectedActiveDigest: string;
-  replacementCredential: string;
-}): Promise<PrepareSeatReplacementOutcome> {
-  if (!REF_RE.test(input.ref) || !/^[A-Za-z0-9_-]{43}$/.test(input.replacementCredential)) {
-    return { ok: false, reason: 'expectation-mismatch' };
-  }
-  return withStore<SeatsFile, PrepareSeatReplacementOutcome>(SEATS_FILE, emptyStore, parseStore, async (txn) => {
-    const record = txn.data.seats[input.ref];
-    if (
-      !recordMatches(record, input.ref, input.binding) ||
-      record.state !== 'active' ||
-      record.droneId !== input.expectedDroneId ||
-      digestOf(record.credential) !== input.expectedActiveDigest
-    ) {
-      return { ok: false as const, reason: 'expectation-mismatch' as const };
-    }
-    if (record.replacement) {
-      return {
-        ok: true as const,
-        credential: record.replacement.credential,
-        digest: digestOf(record.replacement.credential),
-      };
-    }
-    record.replacement = { credential: input.replacementCredential };
-    await txn.commit();
-    return {
-      ok: true as const,
-      credential: input.replacementCredential,
-      digest: digestOf(input.replacementCredential),
-    };
-  });
-}
-
-export type PromoteSeatReplacementOutcome = 'promoted' | 'missing' | 'replaced';
-
-/** Update only the committed expiry for an exact same-bearer session renewal. */
-export async function refreshActiveSeatSession(input: {
-  ref: string;
-  binding: { origin: string; trustIdentity: string; cubeId: string };
-  expectedDroneId: string;
-  expectedActiveDigest: string;
-  expectedSessionId: string;
-  expiresAt: string;
-}): Promise<boolean> {
-  if (!UUID_RE.test(input.expectedDroneId) || !UUID_RE.test(input.expectedSessionId)) {
-    throw new Error('invalid Borg server session identity');
-  }
-  if (!Number.isFinite(Date.parse(input.expiresAt))) {
-    throw new Error('invalid Borg server session expiry');
-  }
-  return withStore<SeatsFile, boolean>(SEATS_FILE, emptyStore, parseStore, async (txn) => {
-    const record = txn.data.seats[input.ref];
-    if (
-      !recordMatches(record, input.ref, input.binding) ||
-      record.state !== 'active' ||
-      record.droneId !== input.expectedDroneId ||
-      record.sessionId !== input.expectedSessionId ||
-      digestOf(record.credential) !== input.expectedActiveDigest
-    ) {
-      return false;
-    }
-    record.expiresAt = input.expiresAt;
-    await txn.commit();
-    return true;
-  });
-}
-
-/** Atomically promote only the response-bound replacement onto the same ACTIVE seat. */
-export async function promoteSeatReplacement(input: {
-  ref: string;
-  binding: { origin: string; trustIdentity: string; cubeId: string };
-  expectedDroneId: string;
-  expectedActiveDigest: string;
-  expectedReplacementDigest: string;
-  sessionId: string;
-  expiresAt: string;
-}): Promise<PromoteSeatReplacementOutcome> {
-  if (!UUID_RE.test(input.expectedDroneId) || !UUID_RE.test(input.sessionId)) {
-    throw new Error('invalid Borg server session identity');
-  }
-  if (!Number.isFinite(Date.parse(input.expiresAt))) {
-    throw new Error('invalid Borg server session expiry');
-  }
-  return withStore<SeatsFile, PromoteSeatReplacementOutcome>(SEATS_FILE, emptyStore, parseStore, async (txn) => {
-    const record = txn.data.seats[input.ref];
-    if (!recordMatches(record, input.ref, input.binding) || record.state !== 'active') return 'missing';
-    if (
-      record.droneId !== input.expectedDroneId ||
-      digestOf(record.credential) !== input.expectedActiveDigest ||
-      !record.replacement ||
-      digestOf(record.replacement.credential) !== input.expectedReplacementDigest
-    ) {
-      return 'replaced';
-    }
-    const { replacement, ...active } = record;
-    txn.data.seats[input.ref] = {
-      ...active,
-      credential: replacement.credential,
-      sessionId: input.sessionId,
-      expiresAt: input.expiresAt,
-    };
-    await txn.commit();
-    return 'promoted';
-  });
-}
-
-/** Remove only the caller's exact pending replacement, never the ACTIVE seat. */
-export async function scrubSeatReplacement(input: {
-  ref: string;
-  binding: { origin: string; trustIdentity: string; cubeId: string };
-  expectedActiveDigest: string;
-  expectedReplacementDigest: string;
-}): Promise<boolean> {
-  return withStore<SeatsFile, boolean>(SEATS_FILE, emptyStore, parseStore, async (txn) => {
-    const record = txn.data.seats[input.ref];
-    if (
-      !recordMatches(record, input.ref, input.binding) ||
-      record.state !== 'active' ||
-      digestOf(record.credential) !== input.expectedActiveDigest ||
-      !record.replacement ||
-      digestOf(record.replacement.credential) !== input.expectedReplacementDigest
-    ) {
-      return false;
-    }
-    delete record.replacement;
-    await txn.commit();
-    return true;
-  });
-}
-
 // ─── CR#2: bind a PENDING record to a preserved worktree (no activation) ─────
 
 export type BindPendingSeatOutcome = 'bound' | 'missing' | 'replaced';

package/src/server-errors.ts

@@ -5,8 +5,7 @@ export type BorgServerErrorCode =
   | 'CREATE_CUBE_DENIED'
   | 'ATTACH_CONFLICT'
   | 'SESSION_REJECTED'
-  | 'SESSION_REVOKED'
-  | 'AUTH_EXPIRED';
+  | 'SESSION_REVOKED';
 
 /** Safe, non-secret state code for deterministic authority recovery copy. */
 export class BorgServerError extends Error {
@@ -92,4 +91,12 @@ export class BorgServerUnreachableError extends Error {
     this.name = 'BorgServerUnreachableError';
   }
 }
+
+/** Exact retired TTL-replacement state: two saved bearers and no safe implicit winner. */
+export class LegacySessionCredentialCollisionError extends Error {
+  constructor(public readonly origin: string) {
+    super('Local session credential collision detected');
+    this.name = 'LegacySessionCredentialCollisionError';
+  }
+}
 import type { ErrorCode } from 'borgmcp-shared/protocol';

package/src/server-facade.ts

@@ -2,7 +2,7 @@ import { spawn as spawnChild, type SpawnOptions } from 'node:child_process';
 import { constants } from 'node:os';
 import { serverHelpText } from './cli-help.js';
 
-export const SERVER_LIFECYCLE_COMMANDS = ['setup', 'start', 'status', 'update', 'invite'] as const;
+export const SERVER_LIFECYCLE_COMMANDS = ['setup', 'start', 'stop', 'status', 'update', 'invite'] as const;
 export type ServerLifecycleCommand = typeof SERVER_LIFECYCLE_COMMANDS[number];
 
 export type ParsedServerFacadeArgs =
@@ -86,7 +86,7 @@ function inertCommand(command: string): string {
 export function unknownServerCommandText(command: string): string {
   return (
     `Unknown server command: ${inertCommand(command)}.\n` +
-    `Available commands: setup, start, status, update, invite.\n` +
+    `Available commands: setup, start, stop, status, update, invite.\n` +
     `Next: run borg server --help.\n`
   );
 }

package/src/server-handshake.ts

@@ -175,7 +175,6 @@ export interface ServerAttachResult {
   session: {
     credentialRef: string;
     sessionId: string;
-    expiresAt: string;
   };
   result: 'created' | 'reused';
 }
@@ -202,7 +201,7 @@ export interface PreparedServerAttach {
   cube: ServerAttachResult['cube'];
   role: ServerAttachResult['role'];
   drone: ServerAttachResult['drone'];
-  session: { sessionId: string; expiresAt: string };
+  session: { sessionId: string };
   result: 'created' | 'reused';
   credentialRef: string;
   pendingBearerDigest: string;
@@ -304,12 +303,6 @@ export async function sendBorgServerAttach(
             'Borg server rejected the session: the seat is already bound to another session',
           );
         }
-        if (rejectedCode === ErrorCode.AUTH_EXPIRED) {
-          throw new BorgServerError(
-            'AUTH_EXPIRED',
-            'Borg server session expired',
-          );
-        }
         if (rejectedCode === ErrorCode.SESSION_REVOKED) {
           throw new BorgServerError(
             'SESSION_REVOKED',
@@ -358,7 +351,6 @@ export async function sendBorgServerAttach(
       drone: decoded.drone,
       session: {
         sessionId: decoded.session.id,
-        expiresAt: decoded.session.expires_at,
       },
       result: decoded.result,
       credentialRef,
@@ -374,7 +366,6 @@ export async function sendBorgServerAttach(
           ...seatInput,
           droneId: decoded.drone.id,
           sessionId: decoded.session.id,
-          expiresAt: decoded.session.expires_at,
           expectedPendingDigest: pendingBearerDigest,
           worktree: binding.worktree,
           name: binding.name,

package/dist/session-continuity.d.ts

@@ -1,33 +0,0 @@
-import { type ActiveCube } from './cubes.js';
-import { prepareSeatReplacement, promoteSeatReplacement, refreshActiveSeatSession, scrubSeatReplacement, type SeatRecord } from './seats.js';
-export declare const SESSION_RENEWAL_LEAD_MS: number;
-interface AttachOutcome {
-    result: 'created' | 'reused';
-    droneId: string;
-    sessionId: string;
-    expiresAt: string;
-}
-interface SessionContinuityDeps {
-    now(): number;
-    randomCredential(): string;
-    getSeat(ref: string, binding: {
-        origin: string;
-        trustIdentity: string;
-        cubeId: string;
-    }): Promise<SeatRecord | null>;
-    getActive(): Promise<ActiveCube | null>;
-    getParentCredential(origin: string, trustIdentity: string): Promise<string | null>;
-    sendAttach(record: SeatRecord, bearer: string, parentCredential: string): Promise<AttachOutcome>;
-    prepareReplacement: typeof prepareSeatReplacement;
-    refreshSession: typeof refreshActiveSeatSession;
-    promoteReplacement: typeof promoteSeatReplacement;
-    scrubReplacement: typeof scrubSeatReplacement;
-}
-export declare function ensureLocalSessionFresh(active: ActiveCube): Promise<ActiveCube>;
-export declare function recoverExpiredLocalSession(active: ActiveCube): Promise<ActiveCube>;
-/** @internal */
-export declare function __renewLocalSessionForTest(active: ActiveCube, mode: 'proactive' | 'expired', deps: SessionContinuityDeps): Promise<ActiveCube>;
-/** @internal */
-export declare function __resetSessionContinuityForTest(): void;
-export {};
-//# sourceMappingURL=session-continuity.d.ts.map

package/dist/session-continuity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"session-continuity.d.ts","sourceRoot":"","sources":["../src/session-continuity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAK5D,OAAO,EAEL,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EAEpB,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,uBAAuB,QAAa,CAAC;AAElD,UAAU,aAAa;IACrB,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,qBAAqB;IAC7B,GAAG,IAAI,MAAM,CAAC;IACd,gBAAgB,IAAI,MAAM,CAAC;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACrH,SAAS,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACxC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACnF,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACjG,kBAAkB,EAAE,OAAO,sBAAsB,CAAC;IAClD,cAAc,EAAE,OAAO,wBAAwB,CAAC;IAChD,kBAAkB,EAAE,OAAO,sBAAsB,CAAC;IAClD,gBAAgB,EAAE,OAAO,oBAAoB,CAAC;CAC/C;AA8ND,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAE/E;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAElF;AAED,gBAAgB;AAChB,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAErB;AAED,gBAAgB;AAChB,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD"}

package/dist/session-continuity.js

@@ -1,220 +0,0 @@
-import { createHash, randomBytes } from 'node:crypto';
-import { getServerCredential } from './config.js';
-import { getActiveCube } from './cubes.js';
-import { DroneEvictedError } from './drone-lifecycle.js';
-import { sendBorgServerAttach } from './server-handshake.js';
-import { BorgServerError, BorgServerTrustError } from './server-errors.js';
-import { loadBorgServerTrust } from './server-trust.js';
-import { getActiveSeat, prepareSeatReplacement, promoteSeatReplacement, refreshActiveSeatSession, scrubSeatReplacement, seatRef, } from './seats.js';
-export const SESSION_RENEWAL_LEAD_MS = 5 * 60_000;
-const defaultDeps = {
-    now: Date.now,
-    randomCredential: () => randomBytes(32).toString('base64url'),
-    getSeat: getActiveSeat,
-    getActive: getActiveCube,
-    getParentCredential: getServerCredential,
-    async sendAttach(record, bearer, parentCredential) {
-        const trust = await loadBorgServerTrust(record.origin);
-        if (trust.identity !== record.trustIdentity) {
-            throw new BorgServerTrustError('Borg server trust identity changed; refusing session renewal');
-        }
-        const attached = await sendBorgServerAttach(record.origin, record.trustIdentity, parentCredential, {
-            cubeId: record.cubeId,
-            roleId: record.roleId,
-            operation: record.operation,
-            priorDroneId: record.droneId,
-        }, bearer, { fetchImpl: trust.fetchImpl });
-        return {
-            result: attached.result,
-            droneId: attached.drone.id,
-            sessionId: attached.session.sessionId,
-            expiresAt: attached.session.expiresAt,
-        };
-    },
-    prepareReplacement: prepareSeatReplacement,
-    refreshSession: refreshActiveSeatSession,
-    promoteReplacement: promoteSeatReplacement,
-    scrubReplacement: scrubSeatReplacement,
-};
-const inflight = new Map();
-const digestOf = (value) => createHash('sha256').update(value).digest('hex');
-function sameSeat(active, candidate) {
-    return candidate !== null &&
-        candidate.apiUrl === active.apiUrl &&
-        candidate.serverTrustIdentity === active.serverTrustIdentity &&
-        candidate.cubeId === active.cubeId &&
-        candidate.droneId === active.droneId &&
-        candidate.localSessionCredentialRef === active.localSessionCredentialRef;
-}
-function seatBinding(record) {
-    return {
-        origin: record.origin,
-        trustIdentity: record.trustIdentity,
-        cubeId: record.cubeId,
-    };
-}
-function validActiveRecord(active, record) {
-    return record !== null &&
-        record.state === 'active' &&
-        record.origin === active.apiUrl &&
-        record.trustIdentity === active.serverTrustIdentity &&
-        record.cubeId === active.cubeId &&
-        record.droneId === active.droneId &&
-        seatRef(record) === active.localSessionCredentialRef;
-}
-function deterministicAttachFailure(error) {
-    return error instanceof BorgServerError ||
-        error instanceof BorgServerTrustError ||
-        error instanceof DroneEvictedError;
-}
-async function reloadSameSeat(active, deps, requireFreshCredential = false) {
-    const current = await deps.getActive();
-    if (!sameSeat(active, current) || (requireFreshCredential && current.sessionToken === active.sessionToken)) {
-        throw new Error('Session renewal no longer targets the same saved seat');
-    }
-    return current;
-}
-async function performRenewal(active, mode, deps) {
-    if (!active.serverTrustIdentity || !active.localSessionCredentialRef) {
-        throw new Error('Selected Borg server authority state is missing or unreadable');
-    }
-    const binding = {
-        origin: active.apiUrl,
-        trustIdentity: active.serverTrustIdentity,
-        cubeId: active.cubeId,
-    };
-    const record = await deps.getSeat(active.localSessionCredentialRef, binding);
-    if (!validActiveRecord(active, record)) {
-        throw new Error('Session renewal no longer targets the same saved seat');
-    }
-    const activeDigest = digestOf(active.sessionToken);
-    if (digestOf(record.credential) !== activeDigest) {
-        return reloadSameSeat(active, deps, true);
-    }
-    const expiresIn = Date.parse(record.expiresAt) - deps.now();
-    if (mode === 'proactive' && expiresIn > SESSION_RENEWAL_LEAD_MS && record.replacement === undefined) {
-        return active;
-    }
-    const parentCredential = await deps.getParentCredential(record.origin, record.trustIdentity);
-    if (!parentCredential)
-        throw new Error('Selected Borg server parent credential is missing or unreadable');
-    const recordBinding = seatBinding(record);
-    let restoreRequired = mode === 'expired' || expiresIn <= 0 || record.replacement !== undefined;
-    if (!restoreRequired) {
-        let attached = null;
-        try {
-            attached = await deps.sendAttach(record, record.credential, parentCredential);
-        }
-        catch (error) {
-            if (error instanceof BorgServerError && error.code === 'AUTH_EXPIRED') {
-                restoreRequired = true;
-            }
-            else {
-                throw error;
-            }
-        }
-        if (!restoreRequired) {
-            if (!attached)
-                throw new Error('Session renewal returned no result');
-            const renewedExpiry = Date.parse(attached.expiresAt);
-            if (attached.result !== 'reused' ||
-                attached.droneId !== record.droneId ||
-                attached.sessionId !== record.sessionId ||
-                !Number.isFinite(renewedExpiry) ||
-                renewedExpiry <= Date.parse(record.expiresAt)) {
-                throw new Error('Session renewal did not preserve the same saved seat');
-            }
-            const refreshed = await deps.refreshSession({
-                ref: active.localSessionCredentialRef,
-                binding: recordBinding,
-                expectedDroneId: record.droneId,
-                expectedActiveDigest: activeDigest,
-                expectedSessionId: record.sessionId,
-                expiresAt: attached.expiresAt,
-            });
-            if (!refreshed)
-                return reloadSameSeat(active, deps);
-            return reloadSameSeat(active, deps);
-        }
-    }
-    const replacement = await deps.prepareReplacement({
-        ref: active.localSessionCredentialRef,
-        binding: recordBinding,
-        expectedDroneId: record.droneId,
-        expectedActiveDigest: activeDigest,
-        replacementCredential: deps.randomCredential(),
-    });
-    if (!replacement.ok)
-        return reloadSameSeat(active, deps, true);
-    let attached;
-    try {
-        attached = await deps.sendAttach(record, replacement.credential, parentCredential);
-    }
-    catch (error) {
-        if (deterministicAttachFailure(error)) {
-            await deps.scrubReplacement({
-                ref: active.localSessionCredentialRef,
-                binding: recordBinding,
-                expectedActiveDigest: activeDigest,
-                expectedReplacementDigest: replacement.digest,
-            });
-        }
-        throw error;
-    }
-    const restoredExpiry = Date.parse(attached.expiresAt);
-    if ((attached.result !== 'created' && attached.result !== 'reused') ||
-        attached.droneId !== record.droneId ||
-        attached.sessionId === record.sessionId ||
-        !Number.isFinite(restoredExpiry) ||
-        restoredExpiry <= deps.now()) {
-        await deps.scrubReplacement({
-            ref: active.localSessionCredentialRef,
-            binding: recordBinding,
-            expectedActiveDigest: activeDigest,
-            expectedReplacementDigest: replacement.digest,
-        });
-        throw new Error('Session renewal did not preserve the same saved seat');
-    }
-    const promoted = await deps.promoteReplacement({
-        ref: active.localSessionCredentialRef,
-        binding: recordBinding,
-        expectedDroneId: record.droneId,
-        expectedActiveDigest: activeDigest,
-        expectedReplacementDigest: replacement.digest,
-        sessionId: attached.sessionId,
-        expiresAt: attached.expiresAt,
-    });
-    if (promoted !== 'promoted')
-        return reloadSameSeat(active, deps, true);
-    return reloadSameSeat(active, deps, true);
-}
-function renewLocalSession(active, mode, deps) {
-    const key = active.localSessionCredentialRef;
-    if (!key)
-        return Promise.reject(new Error('Selected Borg server authority state is missing or unreadable'));
-    const existing = inflight.get(key);
-    if (existing)
-        return existing;
-    const renewal = performRenewal(active, mode, deps);
-    inflight.set(key, renewal);
-    void renewal.finally(() => {
-        if (inflight.get(key) === renewal)
-            inflight.delete(key);
-    }).catch(() => { });
-    return renewal;
-}
-export function ensureLocalSessionFresh(active) {
-    return renewLocalSession(active, 'proactive', defaultDeps);
-}
-export function recoverExpiredLocalSession(active) {
-    return renewLocalSession(active, 'expired', defaultDeps);
-}
-/** @internal */
-export function __renewLocalSessionForTest(active, mode, deps) {
-    return renewLocalSession(active, mode, deps);
-}
-/** @internal */
-export function __resetSessionContinuityForTest() {
-    inflight.clear();
-}
-//# sourceMappingURL=session-continuity.js.map

package/dist/session-continuity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"session-continuity.js","sourceRoot":"","sources":["../src/session-continuity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,aAAa,EAAmB,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,oBAAoB,EACpB,OAAO,GAER,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAG,MAAM,CAAC;AAsBlD,MAAM,WAAW,GAA0B;IACzC,GAAG,EAAE,IAAI,CAAC,GAAG;IACb,gBAAgB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7D,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,aAAa;IACxB,mBAAmB,EAAE,mBAAmB;IACxC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB;QAC/C,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,CAAC,aAAa,EAAE,CAAC;YAC5C,MAAM,IAAI,oBAAoB,CAAC,8DAA8D,CAAC,CAAC;QACjG,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CACzC,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,aAAa,EACpB,gBAAgB,EAChB;YACE,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,YAAY,EAAE,MAAM,CAAC,OAAO;SAC7B,EACD,MAAM,EACN,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAC/B,CAAC;QACF,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC1B,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;YACrC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;SACtC,CAAC;IACJ,CAAC;IACD,kBAAkB,EAAE,sBAAsB;IAC1C,cAAc,EAAE,wBAAwB;IACxC,kBAAkB,EAAE,sBAAsB;IAC1C,gBAAgB,EAAE,oBAAoB;CACvC,CAAC;AAEF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;AACxD,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAErF,SAAS,QAAQ,CAAC,MAAkB,EAAE,SAA4B;IAChE,OAAO,SAAS,KAAK,IAAI;QACvB,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAClC,SAAS,CAAC,mBAAmB,KAAK,MAAM,CAAC,mBAAmB;QAC5D,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAClC,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO;QACpC,SAAS,CAAC,yBAAyB,KAAK,MAAM,CAAC,yBAAyB,CAAC;AAC7E,CAAC;AAED,SAAS,WAAW,CAAC,MAAkB;IACrC,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAkB,EAAE,MAAyB;IACtE,OAAO,MAAM,KAAK,IAAI;QACpB,MAAM,CAAC,KAAK,KAAK,QAAQ;QACzB,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAC/B,MAAM,CAAC,aAAa,KAAK,MAAM,CAAC,mBAAmB;QACnD,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAC/B,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO;QACjC,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,yBAAyB,CAAC;AACzD,CAAC;AAED,SAAS,0BAA0B,CAAC,KAAc;IAChD,OAAO,KAAK,YAAY,eAAe;QACrC,KAAK,YAAY,oBAAoB;QACrC,KAAK,YAAY,iBAAiB,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAAkB,EAClB,IAA2B,EAC3B,sBAAsB,GAAG,KAAK;IAE9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;IACvC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,sBAAsB,IAAI,OAAO,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3G,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAAkB,EAClB,IAA6B,EAC7B,IAA2B;IAE3B,IAAI,CAAC,MAAM,CAAC,mBAAmB,IAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,aAAa,EAAE,MAAM,CAAC,mBAAmB;QACzC,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACnD,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,YAAY,EAAE,CAAC;QACjD,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAU,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7D,IAAI,IAAI,KAAK,WAAW,IAAI,SAAS,GAAG,uBAAuB,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACpG,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7F,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;IAC1G,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAE1C,IAAI,eAAe,GAAG,IAAI,KAAK,SAAS,IAAI,SAAS,IAAI,CAAC,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC;IAC/F,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,IAAI,QAAQ,GAAyB,IAAI,CAAC;QAC1C,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAChF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,eAAe,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACtE,eAAe,GAAG,IAAI,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACrE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrD,IACE,QAAQ,CAAC,MAAM,KAAK,QAAQ;gBAC5B,QAAQ,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO;gBACnC,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS;gBACvC,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAC/B,aAAa,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAU,CAAC,EAC9C,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC;gBAC1C,GAAG,EAAE,MAAM,CAAC,yBAAyB;gBACrC,OAAO,EAAE,aAAa;gBACtB,eAAe,EAAE,MAAM,CAAC,OAAQ;gBAChC,oBAAoB,EAAE,YAAY;gBAClC,iBAAiB,EAAE,MAAM,CAAC,SAAU;gBACpC,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B,CAAC,CAAC;YACH,IAAI,CAAC,SAAS;gBAAE,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACpD,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAChD,GAAG,EAAE,MAAM,CAAC,yBAAyB;QACrC,OAAO,EAAE,aAAa;QACtB,eAAe,EAAE,MAAM,CAAC,OAAQ;QAChC,oBAAoB,EAAE,YAAY;QAClC,qBAAqB,EAAE,IAAI,CAAC,gBAAgB,EAAE;KAC/C,CAAC,CAAC;IACH,IAAI,CAAC,WAAW,CAAC,EAAE;QAAE,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE/D,IAAI,QAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACrF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,gBAAgB,CAAC;gBAC1B,GAAG,EAAE,MAAM,CAAC,yBAAyB;gBACrC,OAAO,EAAE,aAAa;gBACtB,oBAAoB,EAAE,YAAY;gBAClC,yBAAyB,EAAE,WAAW,CAAC,MAAM;aAC9C,CAAC,CAAC;QACL,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtD,IACE,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC;QAC/D,QAAQ,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO;QACnC,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS;QACvC,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;QAChC,cAAc,IAAI,IAAI,CAAC,GAAG,EAAE,EAC5B,CAAC;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC1B,GAAG,EAAE,MAAM,CAAC,yBAAyB;YACrC,OAAO,EAAE,aAAa;YACtB,oBAAoB,EAAE,YAAY;YAClC,yBAAyB,EAAE,WAAW,CAAC,MAAM;SAC9C,CAAC,CAAC;QACH,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC;QAC7C,GAAG,EAAE,MAAM,CAAC,yBAAyB;QACrC,OAAO,EAAE,aAAa;QACtB,eAAe,EAAE,MAAM,CAAC,OAAQ;QAChC,oBAAoB,EAAE,YAAY;QAClC,yBAAyB,EAAE,WAAW,CAAC,MAAM;QAC7C,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;KAC9B,CAAC,CAAC;IACH,IAAI,QAAQ,KAAK,UAAU;QAAE,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACvE,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,iBAAiB,CACxB,MAAkB,EAClB,IAA6B,EAC7B,IAA2B;IAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,yBAAyB,CAAC;IAC7C,IAAI,CAAC,GAAG;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC,CAAC;IAC5G,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3B,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;QACxB,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,OAAO;YAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAkB;IACxD,OAAO,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAkB;IAC3D,OAAO,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AAC3D,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,0BAA0B,CACxC,MAAkB,EAClB,IAA6B,EAC7B,IAA2B;IAE3B,OAAO,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,+BAA+B;IAC7C,QAAQ,CAAC,KAAK,EAAE,CAAC;AACnB,CAAC"}