@stamprally/core 0.14.0 → 0.16.0

package/dist/index.js

@@ -615,7 +615,13 @@ function cloneState(state) {
   return {
     ...state,
     records: state.records.map(cloneRecord),
-    ...state.rewards === void 0 ? {} : { rewards: state.rewards.map(cloneRewardState) }
+    ...state.rewards === void 0 ? {} : { rewards: state.rewards.map(cloneRewardState) },
+    ...state.inventory === void 0 ? {} : {
+      inventory: {
+        ...state.inventory,
+        ...state.inventory.rewardRemaining === void 0 ? {} : { rewardRemaining: { ...state.inventory.rewardRemaining } }
+      }
+    }
   };
 }
 function isRecord(value) {
@@ -635,7 +641,7 @@ function isRewardState(value) {
 function isStampRallyState(value) {
   if (typeof value !== "object" || value === null) return false;
   const state = value;
-  return typeof state.rallyId === "string" && (typeof state.userId === "string" || state.userId === null) && typeof state.updatedAt === "string" && Array.isArray(state.records) && state.records.every(isRecord) && (state.rewards === void 0 || Array.isArray(state.rewards) && state.rewards.every(isRewardState));
+  return typeof state.rallyId === "string" && (typeof state.userId === "string" || state.userId === null) && typeof state.updatedAt === "string" && Array.isArray(state.records) && state.records.every(isRecord) && (state.rewards === void 0 || Array.isArray(state.rewards) && state.rewards.every(isRewardState)) && (state.inventory === void 0 || typeof state.inventory === "object" && state.inventory !== null && !Array.isArray(state.inventory) && (state.inventory.sharedRemaining === void 0 || typeof state.inventory.sharedRemaining === "number" && Number.isInteger(state.inventory.sharedRemaining) && state.inventory.sharedRemaining >= 0) && (state.inventory.rewardRemaining === void 0 || typeof state.inventory.rewardRemaining === "object" && state.inventory.rewardRemaining !== null && !Array.isArray(state.inventory.rewardRemaining)));
 }
 function isValidDate(value) {
   return typeof value === "string" && !Number.isNaN(Date.parse(value));
@@ -680,6 +686,35 @@ var InMemoryStorage = class {
 function storageKey(rallyId, userId) {
   return `stamprally:${rallyId}:${userId ?? "anonymous"}`;
 }
+function createAnonymousSessionId(storage) {
+  const key = "stamprally:anonymous-session-id";
+  try {
+    const browserStorage = typeof window === "undefined" ? null : window.localStorage;
+    const value = storage?.getItem(key) ?? browserStorage?.getItem(key);
+    if (value !== null && value !== void 0 && isUuidV4(value)) return value;
+    const generated = randomUuidV4();
+    (storage ?? browserStorage)?.setItem(key, generated);
+    return generated;
+  } catch {
+    return randomUuidV4();
+  }
+}
+function isUuidV4(value) {
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
+}
+function randomUuidV4() {
+  const cryptoApi3 = globalThis.crypto;
+  if (cryptoApi3?.randomUUID !== void 0) return cryptoApi3.randomUUID();
+  if (cryptoApi3?.getRandomValues !== void 0) {
+    const bytes2 = cryptoApi3.getRandomValues(new Uint8Array(16));
+    bytes2[6] = (bytes2[6] ?? 0) & 15 | 64;
+    bytes2[8] = (bytes2[8] ?? 0) & 63 | 128;
+    const hex = Array.from(bytes2, (byte) => byte.toString(16).padStart(2, "0")).join("");
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+  }
+  const random = `${Date.now().toString(16)}${Math.random().toString(16).slice(2)}`.padEnd(32, "0").slice(0, 32);
+  return `${random.slice(0, 8)}-${random.slice(8, 12)}-4${random.slice(13, 16)}-8${random.slice(17, 20)}-${random.slice(20)}`;
+}
 var defaultStorageWarningHandler = (error) => {
   console.warn(`[@stamprally/core] ${error.message}`, error);
 };
@@ -1069,6 +1104,7 @@ var StampRallyClient = class {
   #config;
   #offlineQueue;
   #userId;
+  #anonymousSessionId;
   #state = null;
   #initialization = null;
   #queue = Promise.resolve();
@@ -1076,7 +1112,8 @@ var StampRallyClient = class {
     this.#config = config;
     this.#options = isStorage(storageOrOptions) ? { storage: storageOrOptions } : storageOrOptions;
     this.#storage = this.#options.storage ?? new InMemoryStorage();
-    this.#userId = this.#options.userId ?? null;
+    this.#anonymousSessionId = this.#options.anonymousSessionId ?? createAnonymousSessionId();
+    this.#userId = this.#options.userId ?? this.#anonymousSessionId;
     this.#offlineQueue = this.#options.offlineQueue;
     this.#offlineQueue?.setSyncResultListener((event) => this.#handleOfflineSyncResult(event));
   }
@@ -1089,12 +1126,27 @@ var StampRallyClient = class {
   getUserId() {
     return this.#userId;
   }
+  getAnonymousSessionId() {
+    return this.#anonymousSessionId;
+  }
   get syncState() {
     return this.#offlineQueue?.syncState ?? "idle";
   }
   get pendingCount() {
     return this.#offlineQueue?.pendingCount ?? 0;
   }
+  get rejectedHistory() {
+    return this.#offlineQueue?.rejectedHistory ?? [];
+  }
+  get queueCapability() {
+    return this.#offlineQueue?.queueCapability ?? "custom";
+  }
+  discardRejected(operationId) {
+    return this.#offlineQueue?.discardRejected(operationId) ?? Promise.resolve(false);
+  }
+  retryRejected(operationId) {
+    return this.#offlineQueue?.retryRejected(operationId) ?? Promise.resolve(false);
+  }
   subscribe(listener) {
     this.#listeners.add(listener);
     return () => this.#listeners.delete(listener);
@@ -1126,11 +1178,12 @@ var StampRallyClient = class {
   }
   switchUser(newUserId) {
     return this.#enqueue(async () => {
-      if (this.#userId === newUserId && this.#state !== null) return this.#state;
-      this.#userId = newUserId;
+      const nextUserId = newUserId ?? this.#anonymousSessionId;
+      if (this.#userId === nextUserId && this.#state !== null) return this.#state;
+      this.#userId = nextUserId;
       this.#state = null;
       this.#initialization = null;
-      await this.#offlineQueue?.switchUser(newUserId);
+      await this.#offlineQueue?.switchUser(nextUserId);
       return this.initialize();
     });
   }
@@ -1198,7 +1251,8 @@ var StampRallyClient = class {
         proofData,
         idempotencyKey: options.idempotencyKey ?? id("check-in"),
         now,
-        state: current
+        state: current,
+        ...this.#userId === this.#anonymousSessionId ? { anonymousSessionId: this.#anonymousSessionId } : {}
       };
       const remote = this.#options.syncAdapter?.checkIn;
       if (options.sync !== false && remote !== void 0) {
@@ -1254,7 +1308,8 @@ var StampRallyClient = class {
         idempotencyKey: options.idempotencyKey ?? id("claim"),
         now,
         options,
-        state: current
+        state: current,
+        ...this.#userId === this.#anonymousSessionId ? { anonymousSessionId: this.#anonymousSessionId } : {}
       };
       const remote = this.#options.syncAdapter?.claimReward;
       if (options.sync !== false && remote !== void 0) {
@@ -1306,13 +1361,10 @@ var StampRallyClient = class {
       const serverState = await adapter.sync({
         rallyId: this.#config.id,
         userId: this.#userId,
-        state: this.#state ?? current
+        state: this.#state ?? current,
+        ...this.#userId === this.#anonymousSessionId ? { anonymousSessionId: this.#anonymousSessionId } : {}
       });
-      const localState = this.#state ?? current;
-      const merged = this.#offlineQueue === void 0 ? serverState : resolveRallyStateConflict(serverState, localState, {
-        policy: this.#offlineQueue.conflictPolicy
-      });
-      const next = this.#reconcile(merged);
+      const next = this.#reconcile(serverState);
       await this.#storage.save(next);
       this.#state = next;
       this.#emit(next);
@@ -1417,12 +1469,19 @@ var StampRallyClient = class {
 // src/client/offlineQueue.ts
 var MemoryQueueStorage = class {
   #values = /* @__PURE__ */ new Map();
+  #rejected = /* @__PURE__ */ new Map();
   async load(key) {
     return this.#values.get(key) ?? [];
   }
   async save(key, operations) {
     this.#values.set(key, structuredClone(operations));
   }
+  async loadRejectedHistory(key) {
+    return this.#rejected.get(key) ?? [];
+  }
+  async saveRejectedHistory(key, history) {
+    this.#rejected.set(key, structuredClone(history));
+  }
 };
 var LocalStorageQueueStorage = class {
   constructor(storage) {
@@ -1442,6 +1501,19 @@ var LocalStorageQueueStorage = class {
   async save(key, operations) {
     this.storage.setItem(key, JSON.stringify(operations));
   }
+  async loadRejectedHistory(key) {
+    const value = this.storage.getItem(`${key}:rejected-history`);
+    if (value === null) return [];
+    try {
+      const parsed = JSON.parse(value);
+      return Array.isArray(parsed) ? parsed : [];
+    } catch {
+      return [];
+    }
+  }
+  async saveRejectedHistory(key, history) {
+    this.storage.setItem(`${key}:rejected-history`, JSON.stringify(history));
+  }
 };
 var IndexedDBOfflineQueueStorage = class {
   #providedFactory;
@@ -1469,6 +1541,26 @@ var IndexedDBOfflineQueueStorage = class {
       transaction.onabort = () => reject(transaction.error ?? new Error("Offline queue write aborted."));
     });
   }
+  async loadRejectedHistory(key) {
+    const database = await this.#open();
+    return new Promise((resolve, reject) => {
+      const request = database.transaction("operations", "readonly").objectStore("operations").get(`${key}:rejected-history`);
+      request.onsuccess = () => resolve(
+        Array.isArray(request.result) ? request.result : []
+      );
+      request.onerror = () => reject(request.error ?? new Error("Failed to read rejected operation history."));
+    });
+  }
+  async saveRejectedHistory(key, history) {
+    const database = await this.#open();
+    return new Promise((resolve, reject) => {
+      const transaction = database.transaction("operations", "readwrite");
+      transaction.objectStore("operations").put(structuredClone(history), `${key}:rejected-history`);
+      transaction.oncomplete = () => resolve();
+      transaction.onerror = () => reject(transaction.error ?? new Error("Failed to save rejected operation history."));
+      transaction.onabort = () => reject(transaction.error ?? new Error("Rejected operation history write aborted."));
+    });
+  }
   #open() {
     if (this.#databasePromise !== null) return this.#databasePromise;
     let factory = this.#providedFactory;
@@ -1491,22 +1583,35 @@ var IndexedDBOfflineQueueStorage = class {
     return this.#databasePromise;
   }
 };
+function availableLocalStorage() {
+  try {
+    const storage = globalThis.localStorage;
+    return storage ?? null;
+  } catch {
+    return null;
+  }
+}
 function defaultStorage(databaseName) {
   try {
     const indexedDB = globalThis.indexedDB;
     if (indexedDB !== void 0)
-      return new IndexedDBOfflineQueueStorage({
-        indexedDB,
-        ...databaseName === void 0 ? {} : { databaseName }
-      });
-    const storage = globalThis.localStorage;
-    if (storage !== void 0 && storage !== null) return new LocalStorageQueueStorage(storage);
+      return {
+        storage: new IndexedDBOfflineQueueStorage({
+          indexedDB,
+          ...databaseName === void 0 ? {} : { databaseName }
+        }),
+        capability: "indexeddb"
+      };
+    const storage = availableLocalStorage();
+    if (storage !== void 0 && storage !== null)
+      return { storage: new LocalStorageQueueStorage(storage), capability: "localstorage" };
   } catch {
   }
-  return new MemoryQueueStorage();
+  return { storage: new MemoryQueueStorage(), capability: "memory" };
 }
-function operationId(operation) {
-  return operation.kind === "checkIn" ? `checkIn:${operation.request.rallyId}:${operation.request.userId ?? "anonymous"}:${operation.request.idempotencyKey}` : `claimReward:${operation.request.rallyId}:${operation.request.userId ?? "anonymous"}:${operation.request.idempotencyKey}`;
+function offlineOperationId(operation) {
+  const identity = operation.request.userId ?? operation.request.anonymousSessionId ?? "anonymous";
+  return operation.kind === "checkIn" ? `checkIn:${operation.request.rallyId}:${identity}:${operation.request.idempotencyKey}` : `claimReward:${operation.request.rallyId}:${identity}:${operation.request.idempotencyKey}`;
 }
 function requestScope(operation) {
   return {
@@ -1526,17 +1631,24 @@ function errorValue(value, fallbackCode) {
 }
 var syncLocks = /* @__PURE__ */ new Map();
 var SYNC_LOCK_TTL_MS = 3e4;
+var DEFAULT_RETRY_OPTIONS = {
+  maxRetries: 0,
+  initialIntervalMs: 250,
+  backoffMultiplier: 2
+};
 function randomId() {
   return globalThis.crypto?.randomUUID?.() ?? `${Date.now()}-${Math.random().toString(36).slice(2)}`;
 }
 var OfflineQueue = class {
   #storage;
+  #queueCapability;
   #configuredKey;
   #rallyId;
   #userId;
   #conflictPolicy;
   #onSyncConflict;
   #operations = [];
+  #rejectedHistory = [];
   #loaded = false;
   #state = "idle";
   #error = null;
@@ -1544,22 +1656,41 @@ var OfflineQueue = class {
   #syncPromise = null;
   #syncResultListener;
   #synchronizeInstances;
+  #retryOptions;
   #instanceId = randomId();
   #lockStorage;
+  #observedLocks = /* @__PURE__ */ new Map();
+  #warnedMemoryLock = false;
   #storageListener;
   #channel = null;
   constructor(options = {}) {
-    if (options.storage !== void 0) this.#storage = options.storage;
-    else if (options.storageLike !== void 0 && options.storageLike !== null)
+    if (options.storage !== void 0) {
+      this.#storage = options.storage;
+      this.#queueCapability = "custom";
+    } else if (options.storageLike !== void 0 && options.storageLike !== null) {
       this.#storage = new LocalStorageQueueStorage(options.storageLike);
-    else this.#storage = defaultStorage(options.databaseName);
+      this.#queueCapability = "localstorage";
+    } else {
+      const selected = defaultStorage(options.databaseName);
+      this.#storage = selected.storage;
+      this.#queueCapability = selected.capability;
+    }
     this.#configuredKey = options.key;
     this.#rallyId = options.rallyId;
     this.#userId = options.userId ?? null;
     this.#conflictPolicy = options.conflictPolicy ?? "server_wins";
     this.#onSyncConflict = options.onSyncConflict;
     this.#synchronizeInstances = options.synchronizeInstances ?? true;
-    this.#lockStorage = options.storageLike ?? globalThis.localStorage ?? null;
+    const retryOptions = {
+      ...DEFAULT_RETRY_OPTIONS,
+      ...options.retryOptions ?? options.syncRetryOptions ?? options.retry ?? {}
+    };
+    this.#retryOptions = {
+      maxRetries: Math.max(0, Math.floor(retryOptions.maxRetries)),
+      initialIntervalMs: Math.max(0, retryOptions.initialIntervalMs),
+      backoffMultiplier: Math.max(1, retryOptions.backoffMultiplier)
+    };
+    this.#lockStorage = options.storageLike ?? availableLocalStorage();
     if (this.#synchronizeInstances) this.#subscribeToExternalChanges();
   }
   get syncState() {
@@ -1568,6 +1699,12 @@ var OfflineQueue = class {
   get pendingCount() {
     return this.#operations.length;
   }
+  get queueCapability() {
+    return this.#queueCapability;
+  }
+  get rejectedHistory() {
+    return this.#rejectedHistory;
+  }
   get error() {
     return this.#error;
   }
@@ -1591,7 +1728,20 @@ var OfflineQueue = class {
   }
   async initialize() {
     if (this.#loaded) return;
-    this.#operations = [...await this.#storage.load(this.#storageKey())];
+    try {
+      const key = this.#storageKey();
+      this.#operations = (await this.#storage.load(key)).map(normalizeOperation);
+      this.#rejectedHistory = (await this.#storage.loadRejectedHistory?.(key))?.map(normalizeRejectedHistory) ?? [];
+    } catch (error) {
+      if (this.#queueCapability === "memory") throw error;
+      this.#storage = new MemoryQueueStorage();
+      this.#queueCapability = "memory";
+      this.#operations = [];
+      this.#rejectedHistory = [];
+      this.#warnMemoryLock(
+        `Offline queue persistence is unavailable; queued data can be lost after reload (${String(error)}).`
+      );
+    }
     this.#loaded = true;
   }
   /** Releases browser listeners when the queue is no longer used. */
@@ -1634,9 +1784,9 @@ var OfflineQueue = class {
         throw new Error("Offline operation belongs to another rally or user queue.");
     }
     await this.initialize();
-    const id2 = operationId(operation);
-    if (this.#operations.some((item) => operationId(item) === id2)) return;
-    this.#operations = [...this.#operations, operation];
+    const id2 = offlineOperationId(operation);
+    if (this.#operations.some((item) => offlineOperationId(item) === id2)) return;
+    this.#operations = [...this.#operations, { ...operation, status: "PENDING", attempts: 0 }];
     await this.#storage.save(this.#storageKey(), this.#operations);
     this.#announceChange();
   }
@@ -1652,6 +1802,47 @@ var OfflineQueue = class {
     await this.#storage.save(this.#storageKey(), this.#operations);
     this.#announceChange();
   }
+  async discardRejected(operationId) {
+    await this.initialize();
+    const next = this.#rejectedHistory.filter(
+      (entry) => offlineOperationId(entry.operation) !== operationId
+    );
+    if (next.length === this.#rejectedHistory.length) return false;
+    this.#rejectedHistory = next;
+    await this.#saveRejectedHistory();
+    this.#announceChange();
+    return true;
+  }
+  async retryRejected(operationId) {
+    await this.initialize();
+    const entry = this.#rejectedHistory.find(
+      (candidate) => offlineOperationId(candidate.operation) === operationId
+    );
+    if (entry === void 0) return false;
+    if (!this.#operations.some((operation) => offlineOperationId(operation) === operationId))
+      this.#operations = [
+        ...this.#operations,
+        { ...entry.operation, status: "PENDING", attempts: 0 }
+      ];
+    this.#rejectedHistory = this.#rejectedHistory.filter((candidate) => candidate !== entry);
+    await this.#storage.save(this.#storageKey(), this.#operations);
+    await this.#saveRejectedHistory();
+    this.#announceChange();
+    return true;
+  }
+  async discardRejectedOperation(operationId) {
+    return this.discardRejected(operationId);
+  }
+  async retryRejectedOperation(operationId) {
+    return this.retryRejected(operationId);
+  }
+  async clearRejectedHistory() {
+    await this.initialize();
+    if (this.#rejectedHistory.length === 0) return;
+    this.#rejectedHistory = [];
+    await this.#saveRejectedHistory();
+    this.#announceChange();
+  }
   async sync(sender = this.#sender) {
     await this.initialize();
     if (sender === void 0) throw new Error("OfflineQueue.sync requires a sender.");
@@ -1666,6 +1857,37 @@ var OfflineQueue = class {
     return this.sync(sender);
   }
   async #run(sender) {
+    const locks = globalThis.navigator?.locks;
+    if (locks !== void 0 && typeof locks.request === "function") {
+      let callbackStarted = false;
+      try {
+        const acquired = await locks.request(
+          `stamprally:${this.#storageKey()}:sync`,
+          { ifAvailable: true },
+          async (lock) => {
+            if (lock === null) {
+              await this.#reloadFromStorage();
+              this.#state = "idle";
+              return false;
+            }
+            callbackStarted = true;
+            await this.#runWithStorageLock(sender);
+            return true;
+          }
+        );
+        if (!acquired) return;
+        return;
+      } catch (error) {
+        if (callbackStarted) throw error;
+      }
+    }
+    if (this.#lockStorage === null)
+      this.#warnMemoryLock(
+        "No cross-tab storage lock is available; offline sync is single-tab only."
+      );
+    await this.#runWithStorageLock(sender);
+  }
+  async #runWithStorageLock(sender) {
     this.#state = "syncing";
     this.#error = null;
     if (!this.#acquireSyncLock()) {
@@ -1677,21 +1899,54 @@ var OfflineQueue = class {
       while (this.#operations.length > 0) {
         const operation = this.#operations[0];
         if (operation === void 0) break;
-        let rawResult;
-        try {
-          rawResult = await sender(operation);
-        } catch (cause) {
-          throw new Error(errorValue(cause, "RETRYABLE_ERROR").message);
-        }
-        const response = this.#normalizeResponse(rawResult);
-        if (response.status === "RETRYABLE_ERROR") {
+        let attempt = 0;
+        let response;
+        while (true) {
+          await this.#updateOperationStatus("IN_FLIGHT", attempt);
+          try {
+            response = this.#normalizeResponse(await sender(operation));
+          } catch (cause) {
+            response = {
+              status: "RETRYABLE_ERROR",
+              error: errorValue(cause, "RETRYABLE_ERROR")
+            };
+          }
+          if (response.status !== "RETRYABLE_ERROR") break;
           const error2 = errorValue(response.error ?? response.reason, "RETRYABLE_ERROR");
+          await this.#updateOperationStatus("PENDING", attempt + 1);
           await this.#syncResultListener?.({ operation, status: response.status, error: error2 });
-          throw new Error(error2.message);
+          if (attempt >= this.#retryOptions.maxRetries) {
+            await this.#updateOperationStatus("FAILED_RETRYABLE", attempt + 1);
+            throw new Error(error2.message);
+          }
+          const interval = this.#retryOptions.initialIntervalMs * this.#retryOptions.backoffMultiplier ** attempt;
+          await new Promise((resolve) => setTimeout(resolve, Math.max(0, interval)));
+          attempt += 1;
         }
         const result = response.result;
-        const state = response.state ?? (result !== void 0 && "conflict" in result && result.conflict === true ? await this.resolveConflict(operation, result.localState, result.serverState) : result !== void 0 && "ok" in result && result.ok ? result.value.state : void 0);
-        const error = response.status === "REJECTED_PERMANENT" ? errorValue(response.error ?? response.reason, "REJECTED_PERMANENT") : void 0;
+        const state = response.state ?? (result !== void 0 && "conflict" in result && result.conflict === true ? result.serverState : result !== void 0 && "ok" in result && result.ok ? result.value.state : void 0);
+        const error = response.status === "REJECTED_PERMANENT" ? errorValue(
+          response.error ?? response.reason ?? (result !== void 0 && "ok" in result && !result.ok ? result.error : void 0),
+          "REJECTED_PERMANENT"
+        ) : void 0;
+        await this.#updateOperationStatus(
+          response.status === "ACCEPTED" ? "ACCEPTED" : "REJECTED_PERMANENT",
+          attempt + 1
+        );
+        const eventState = state;
+        if (response.status === "REJECTED_PERMANENT" && error !== void 0) {
+          this.#rejectedHistory = [
+            ...this.#rejectedHistory,
+            {
+              operation: { ...operation, status: "REJECTED_PERMANENT", attempts: attempt + 1 },
+              reason: error,
+              errorCode: error.code,
+              rejectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+              attempts: attempt + 1
+            }
+          ];
+          await this.#saveRejectedHistory();
+        }
         this.#operations = this.#operations.slice(1);
         await this.#storage.save(this.#storageKey(), this.#operations);
         this.#announceChange();
@@ -1700,7 +1955,7 @@ var OfflineQueue = class {
           ...result === void 0 ? {} : { result },
           status: response.status,
           ...error === void 0 ? {} : { error },
-          ...state === void 0 ? {} : { state }
+          ...eventState === void 0 ? {} : { state: eventState }
         });
       }
       this.#state = "idle";
@@ -1712,11 +1967,19 @@ var OfflineQueue = class {
       this.#releaseSyncLock();
     }
   }
+  async #updateOperationStatus(status, attempts) {
+    const operation = this.#operations[0];
+    if (operation === void 0) return;
+    this.#operations = [{ ...operation, status, attempts }, ...this.#operations.slice(1)];
+    await this.#storage.save(this.#storageKey(), this.#operations);
+    this.#announceChange();
+  }
   #subscribeToExternalChanges() {
     const windowLike = globalThis.window;
     if (windowLike !== void 0) {
       this.#storageListener = (event) => {
-        if (event.key === this.#storageKey()) void this.#reloadFromStorage();
+        if (event.key === this.#storageKey() || event.key === `${this.#storageKey()}:rejected-history`)
+          void this.#reloadFromStorage();
       };
       windowLike.addEventListener("storage", this.#storageListener);
     }
@@ -1725,6 +1988,20 @@ var OfflineQueue = class {
       try {
         this.#channel = new Channel("stamprally:queue-sync");
         this.#channel.addEventListener("message", (event) => {
+          if (typeof event.data === "object" && event.data !== null) {
+            const data = event.data;
+            if (data.type === "lock" && data.lockKey === this.#lockKey()) {
+              this.#observedLocks.set(data.lockKey, {
+                owner: typeof data.owner === "string" ? data.owner : "unknown",
+                expiresAt: typeof data.expiresAt === "number" ? data.expiresAt : 0
+              });
+              return;
+            }
+            if (data.type === "unlock" && data.lockKey === this.#lockKey()) {
+              this.#observedLocks.delete(data.lockKey);
+              return;
+            }
+          }
           if (typeof event.data === "object" && event.data !== null && "key" in event.data && event.data.key === this.#storageKey())
             void this.#reloadFromStorage();
         });
@@ -1734,12 +2011,18 @@ var OfflineQueue = class {
     }
   }
   #announceChange() {
-    this.#channel?.postMessage({ key: this.#storageKey(), owner: this.#instanceId });
+    this.#channel?.postMessage({
+      type: "change",
+      key: this.#storageKey(),
+      owner: this.#instanceId
+    });
   }
   async #reloadFromStorage() {
     if (this.#state === "syncing") return;
     try {
-      this.#operations = [...await this.#storage.load(this.#storageKey())];
+      const key = this.#storageKey();
+      this.#operations = (await this.#storage.load(key)).map(normalizeOperation);
+      this.#rejectedHistory = (await this.#storage.loadRejectedHistory?.(key))?.map(normalizeRejectedHistory) ?? this.#rejectedHistory;
       this.#loaded = true;
     } catch {
     }
@@ -1753,6 +2036,9 @@ var OfflineQueue = class {
     const local = syncLocks.get(key);
     if (local !== void 0 && local.expiresAt > now && local.owner !== this.#instanceId)
       return false;
+    const observed = this.#observedLocks.get(key);
+    if (observed !== void 0 && observed.expiresAt > now && observed.owner !== this.#instanceId)
+      return false;
     if (this.#lockStorage !== null) {
       try {
         const existing = this.#lockStorage.getItem(key);
@@ -1765,7 +2051,14 @@ var OfflineQueue = class {
           key,
           JSON.stringify({ owner: this.#instanceId, expiresAt: now + SYNC_LOCK_TTL_MS })
         );
+        this.#channel?.postMessage({
+          type: "lock",
+          lockKey: key,
+          owner: this.#instanceId,
+          expiresAt: now + SYNC_LOCK_TTL_MS
+        });
       } catch {
+        this.#warnMemoryLock("Persistent lock access failed; offline sync is single-tab only.");
       }
     }
     syncLocks.set(key, { owner: this.#instanceId, expiresAt: now + SYNC_LOCK_TTL_MS });
@@ -1780,6 +2073,7 @@ var OfflineQueue = class {
         const value = this.#lockStorage.getItem(key);
         if (value !== null && JSON.parse(value).owner === this.#instanceId)
           this.#lockStorage.removeItem?.(key);
+        this.#channel?.postMessage({ type: "unlock", lockKey: key, owner: this.#instanceId });
       } catch {
       }
     }
@@ -1808,7 +2102,33 @@ var OfflineQueue = class {
     const policy = (typeof configured === "function" ? await configured({ operation, localState, serverState }) : configured) ?? this.#conflictPolicy;
     return resolveRallyStateConflict(serverState, localState, { policy });
   }
+  async #saveRejectedHistory() {
+    await this.#storage.saveRejectedHistory?.(this.#storageKey(), this.#rejectedHistory);
+  }
+  #warnMemoryLock(message) {
+    if (this.#warnedMemoryLock) return;
+    this.#warnedMemoryLock = true;
+    console.warn(`[@stamprally/core] ${message}`);
+  }
 };
+function normalizeOperation(operation) {
+  const status = operation.status;
+  return {
+    ...operation,
+    status: status === "IN_FLIGHT" || status === "REJECTED" ? "PENDING" : status === "RETRYABLE_ERROR" ? "FAILED_RETRYABLE" : operation.status ?? "PENDING",
+    attempts: operation.attempts ?? 0
+  };
+}
+function normalizeRejectedHistory(entry) {
+  return {
+    ...entry,
+    operation: normalizeOperation(entry.operation),
+    reason: errorValue(entry.reason, "REJECTED_PERMANENT"),
+    errorCode: entry.errorCode || entry.reason.code,
+    rejectedAt: entry.rejectedAt || (/* @__PURE__ */ new Date(0)).toISOString(),
+    attempts: entry.attempts ?? entry.operation.attempts ?? 0
+  };
+}
 
 // src/crypto/token.ts
 var encoder = new TextEncoder();
@@ -2377,6 +2697,8 @@ function condition(value, path, errors, isPublic) {
     finiteNumber(value, "latitude", path, errors);
     finiteNumber(value, "longitude", path, errors);
     finiteNumber(value, "radiusMeters", path, errors, 0);
+    if (typeof value.radiusMeters === "number" && value.radiusMeters <= 0)
+      add(errors, `${path}.radiusMeters`, "Expected a radius greater than 0.", "out_of_range");
     if (typeof value.latitude === "number" && (value.latitude < -90 || value.latitude > 90))
       add(errors, `${path}.latitude`, "Expected a latitude between -90 and 90.", "out_of_range");
     if (typeof value.longitude === "number" && (value.longitude < -180 || value.longitude > 180))
@@ -2787,6 +3109,6 @@ async function verifySnapshotToken(token, secretKey, now = Date.now()) {
   }
 }
 
-export { ConfigValidationError, DEFAULT_SHEET_THEME, MemoryQueueStorage as InMemoryOfflineQueueStorage, InMemoryStorage, IndexedDBAdapter, IndexedDBOfflineQueueStorage, LocalStorageAdapter, OfflineQueue, StampRallyClient, StorageAdapterError, THEME_PRESETS, assertPublicConfig, calculateDistanceMeters, calculateProgress, consumeReward, createClaimTicketNumber, createSecureToken, createSignedSnapshotToken, createUniqueClaimTicketNumber, evaluateCondition, evaluateConditionDetailed, evaluateSpotStatus, exportProgressToken, getCurrentGeoContext, getOrderedSpots, getSpotStatus, importProgressToken, isGeolocationSupported, isNfcSupported, isPublicConfig, isQrSupported, isRewardState, isStampRallyState, issueClaimTicketNumber, normalizePasscode, parseAdminConfig, parsePublicConfig, processStamp, readNfcContext, readQrContext, reconcileRewardStates, resolveLocalizedText, resolveRallyStateConflict, safeParseAdminConfig, safeParsePublicConfig, sanitizeAdminConfig, storageKey, toLocalizedString, toPublicConfig, updateLocalizedField, validatePublicConfigSafety, validateRallyConfigRelations, verifyPasscode, verifySecureToken, verifySnapshotToken };
+export { ConfigValidationError, DEFAULT_SHEET_THEME, MemoryQueueStorage as InMemoryOfflineQueueStorage, InMemoryStorage, IndexedDBAdapter, IndexedDBOfflineQueueStorage, LocalStorageAdapter, OfflineQueue, StampRallyClient, StorageAdapterError, THEME_PRESETS, assertPublicConfig, calculateDistanceMeters, calculateProgress, consumeReward, createAnonymousSessionId, createClaimTicketNumber, createSecureToken, createSignedSnapshotToken, createUniqueClaimTicketNumber, evaluateCondition, evaluateConditionDetailed, evaluateSpotStatus, exportProgressToken, getCurrentGeoContext, getOrderedSpots, getSpotStatus, importProgressToken, isGeolocationSupported, isNfcSupported, isPublicConfig, isQrSupported, isRewardState, isStampRallyState, issueClaimTicketNumber, normalizePasscode, offlineOperationId, parseAdminConfig, parsePublicConfig, processStamp, readNfcContext, readQrContext, reconcileRewardStates, resolveLocalizedText, resolveRallyStateConflict, safeParseAdminConfig, safeParsePublicConfig, sanitizeAdminConfig, storageKey, toLocalizedString, toPublicConfig, updateLocalizedField, validatePublicConfigSafety, validateRallyConfigRelations, verifyPasscode, verifySecureToken, verifySnapshotToken };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map