codex-overleaf-link 2.5.0 → 2.5.1

package/extension/src/shared/runInputQueue.js

@@ -11,6 +11,7 @@
   const MAX_TEXT_CHARS = 12000;
   const MAX_QUEUE_BYTES = 128 * 1024;
   const MAX_PERSISTED_QUEUE_BYTES = 512 * 1024;
+  const MAX_CUSTOM_INSTRUCTIONS_CHARS = 12000;
   const ACTIVE_STATUSES = new Set(['claimed', 'executing', 'steering']);
   const VALID_STATUSES = new Set(['queued', 'paused', ...ACTIVE_STATUSES]);
 
@@ -41,7 +42,7 @@
         claimToken: status === 'claimed' || status === 'executing' ? String(raw.claimToken || '') : '',
         pauseReason: status === 'paused' ? String(raw.pauseReason || '') : '',
         executionSnapshot: RunExecutionSnapshot.cloneSnapshot(executionSnapshot),
-        payload: RunExecutionSnapshot.toQueuePayload(executionSnapshot)
+        payload: buildPayload(executionSnapshot, raw.payload?.submissionContext)
       });
       if (normalized.length >= MAX_ITEMS) {
         break;
@@ -79,7 +80,7 @@
       claimToken: '',
       pauseReason: input.status === 'paused' ? String(input.pauseReason || '') : '',
       executionSnapshot: RunExecutionSnapshot.cloneSnapshot(executionSnapshot),
-      payload: RunExecutionSnapshot.toQueuePayload(executionSnapshot)
+      payload: buildPayload(executionSnapshot, input.payload?.submissionContext)
     };
     const next = [...queue, item];
     if (estimateLegacyBytes(next) > MAX_QUEUE_BYTES || estimateBytes(next) > MAX_PERSISTED_QUEUE_BYTES) {
@@ -137,7 +138,7 @@
       item = {
         ...item,
         executionSnapshot: RunExecutionSnapshot.cloneSnapshot(snapshot),
-        payload: RunExecutionSnapshot.toQueuePayload(snapshot)
+        payload: buildPayload(snapshot, item.payload?.submissionContext)
       };
     } catch (error) {
       return {
@@ -199,6 +200,46 @@
     );
   }
 
+  // Queue inputs persist only these submitted extras. Attachments stay unsupported,
+  // and older items must not acquire a later draft's one-turn context on promotion.
+  function normalizeSubmissionContext(value = {}, helpers = {}) {
+    const input = value && typeof value === 'object' ? value : {};
+    const normalizeText = (value, maxChars) => {
+      const text = typeof value === 'string' ? value : '';
+      return String(helpers.normalizeDisplay ? helpers.normalizeDisplay(text, maxChars) : text).slice(0, maxChars);
+    };
+    const safeId = value => typeof value === 'string'
+      && /^[a-zA-Z0-9][a-zA-Z0-9._-]{0,79}$/.test(value) && !value.includes('..')
+      && !['__proto__', 'prototype', 'constructor'].includes(value);
+    const rawSkill = input.skillInvocation;
+    const installer = rawSkill?.id === 'skill-installer' && (rawSkill.scope == null || rawSkill.scope === 'builtin');
+    const skillInvocation = safeId(rawSkill?.id)
+      && (installer || ['codex-overleaf', 'codex-local'].includes(rawSkill.scope))
+      ? { id: rawSkill.id, title: normalizeText(rawSkill.title || rawSkill.id, 80),
+          ...(installer ? {} : { scope: rawSkill.scope }) }
+      : null;
+    return {
+      customInstructions: normalizeText(input.customInstructions, MAX_CUSTOM_INSTRUCTIONS_CHARS),
+      skillLoadingSettings: {
+        loadCodexLocalSkills: input.skillLoadingSettings?.loadCodexLocalSkills === true,
+        loadCodexOverleafSkills: input.skillLoadingSettings?.loadCodexOverleafSkills === true
+      },
+      skillInvocation,
+      ...(Array.isArray(input.enabledCodexLocalSkillIds) ? {
+        enabledCodexLocalSkillIds: [...new Set(input.enabledCodexLocalSkillIds.filter(safeId))]
+      } : {}),
+      enabledCodexOverleafSkillIds: [...new Set((Array.isArray(input.enabledCodexOverleafSkillIds)
+        ? input.enabledCodexOverleafSkillIds : []).filter(safeId))]
+    };
+  }
+
+  function buildPayload(snapshot, submissionContext, helpers) {
+    const payload = RunExecutionSnapshot.toQueuePayload(snapshot);
+    // Keep legacy absence compact; safe defaults are applied only at execution.
+    if (submissionContext == null) return payload;
+    return { ...payload, submissionContext: normalizeSubmissionContext(submissionContext, helpers) };
+  }
+
   function normalizeTimestamp(value) {
     return typeof value === 'string' && value ? value : new Date().toISOString();
   }
@@ -237,7 +278,8 @@
               speedTier: item.payload.speedTier,
               autoRecompile: item.payload.autoRecompile,
               requireReviewing: item.payload.requireReviewing,
-              focusFiles: item.payload.focusFiles
+              focusFiles: item.payload.focusFiles,
+              submissionContext: item.payload.submissionContext
             }
           : {}
       };
@@ -269,7 +311,7 @@
           claimToken: normalizeField(item?.claimToken, 160),
           pauseReason: normalizeField(item?.pauseReason, 160),
           executionSnapshot: compactSnapshot,
-          payload: RunExecutionSnapshot.toQueuePayload(compactSnapshot)
+          payload: buildPayload(compactSnapshot, payload.submissionContext, { normalizeDisplay })
         };
       })
       .filter(item => item.id && item.text);
@@ -292,6 +334,7 @@
     markExecuting,
     markSteering,
     normalizeQueue,
+    normalizeSubmissionContext,
     pauseAll,
     remove,
     resumeAll,

package/extension/src/shared/selectionContext.js

@@ -6,20 +6,29 @@
   const MAX_TEXT = 20000;
   function normalize(value) {
     if (!value || typeof value !== 'object') return null;
-    const path = typeof value.path === 'string' ? value.path.replace(/\\/g, '/') : '';
-    if (!path || path.startsWith('/') || /^[A-Za-z]:/.test(path)
+    const path = typeof value.path === 'string' ? value.path : '';
+    if (!path || path.length > 2048 || path.trim() !== path || path.includes('\\')
+      || /[\u0000-\u001f\u007f]/.test(path) || path.startsWith('/') || /^[A-Za-z]:/.test(path)
       || path.split('/').some(part => !part || part === '.' || part === '..')) return null;
     if (typeof value.projectId !== 'string' || !value.projectId
       || typeof value.text !== 'string' || !value.text.length || value.text.length > MAX_TEXT
+      || /[\uD800-\uDFFF]/u.test(value.text)
       || !Number.isSafeInteger(value.from) || !Number.isSafeInteger(value.to)
       || value.from < 0 || value.to <= value.from || value.to - value.from !== value.text.length
       || !/^[a-f0-9]{64}$/i.test(value.documentHash || '')) return null;
+    const proof = value.rebaseEvidence;
+    const rebaseEvidence = proof?.v === 1 && Number.isSafeInteger(proof.documentLength)
+      && proof.documentLength >= value.to && /^[a-f0-9]{64}$/i.test(proof.prefixHash || '')
+      && /^[a-f0-9]{64}$/i.test(proof.suffixHash || '')
+      ? Object.freeze({ v: 1, documentLength: proof.documentLength,
+          prefixHash: proof.prefixHash.toLowerCase(), suffixHash: proof.suffixHash.toLowerCase() }) : null;
     return Object.freeze({
-      projectId: value.projectId.slice(0, 160), path: path.slice(0, 320),
+      projectId: value.projectId.slice(0, 160), path,
       from: value.from, to: value.to, text: value.text,
       lineStart: Number.isSafeInteger(value.lineStart) && value.lineStart > 0 ? value.lineStart : 1,
       lineEnd: Number.isSafeInteger(value.lineEnd) && value.lineEnd > 0 ? value.lineEnd : 1,
       documentHash: value.documentHash.toLowerCase(),
+      ...(rebaseEvidence ? { rebaseEvidence } : {}),
       mode: value.mode === 'edit' ? 'edit' : 'reference',
       capturedAt: typeof value.capturedAt === 'string' ? value.capturedAt.slice(0, 64) : ''
     });

package/extension/src/shared/sessionState.js

@@ -10,12 +10,14 @@
       require('./sessionTitle'),
       require('./runActivityModel'),
       require('./subagentActivityModel'),
-      require('./writebackIntent')
+      require('./writebackIntent'),
+      require('./directoryCleanupProof'),
+      require('./undoOperations')
     );
   } else {
     root.CodexOverleafModuleRegistry.define(
       'SessionState',
-      ['I18n', 'SettlementFacts', 'RunInputQueue', 'SelectionContext', 'LineReferences', 'PathRedaction', 'SessionTitle', 'RunActivityModel', 'SubagentActivityModel', 'WritebackIntent'],
+      ['I18n', 'SettlementFacts', 'RunInputQueue', 'SelectionContext', 'LineReferences', 'PathRedaction', 'SessionTitle', 'RunActivityModel', 'SubagentActivityModel', 'WritebackIntent', 'DirectoryCleanupProof', 'UndoOperations'],
       factory
     );
   }
@@ -29,7 +31,9 @@
   SessionTitle,
   RunActivityModel,
   SubagentActivityModel,
-  WritebackIntent
+  WritebackIntent,
+  DirectoryCleanupProof,
+  UndoOperations
 ) {
   'use strict';
 
@@ -46,6 +50,7 @@
     loadCodexLocalSkills: true,
     loadCodexOverleafSkills: true,
     codexOverleafSkillEnabled: {},
+    codexLocalSkillEnabled: {},
     theme: 'dark',
     panelWidth: 380,
     task: '',
@@ -120,7 +125,6 @@
     statusTextChars: 400,
     attachmentPreviewChars: 160 * 1024
   };
-  const REDACTED_SECRET = '[REDACTED_SECRET]';
   const SECRET_REDACTION_PATTERNS = [
     /-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z0-9 ]*PRIVATE KEY-----/g,
     /\bBearer\s+[A-Za-z0-9._~+/=-]{12,}/gi,
@@ -153,6 +157,7 @@
     state.loadCodexLocalSkills = state.loadCodexLocalSkills !== false;
     state.loadCodexOverleafSkills = state.loadCodexOverleafSkills !== false;
     state.codexOverleafSkillEnabled = normalizeCodexOverleafSkillEnabled(state.codexOverleafSkillEnabled);
+    state.codexLocalSkillEnabled = normalizeCodexLocalSkillEnabled(state.codexLocalSkillEnabled);
     state.theme = ['dark', 'light', 'auto'].includes(state.theme) ? state.theme : 'dark';
     state.panelWidth = normalizePanelWidth(state.panelWidth);
     state.task = typeof state.task === 'string' ? state.task : '';
@@ -213,6 +218,8 @@
     const history = normalizeHistoryEntries(session.history);
     const normalizedRuns = normalizeRuns(session.runs, options);
     const runs = normalizedRuns.length ? normalizedRuns : recoverRunsFromHistory(session, history);
+    for (const run of runs) pruneRunRecoveryScope(run, session);
+
     const rawTitle = typeof session.title === 'string' ? session.title.trim() : '';
     const derivedTitle = deriveSessionTitle(runs, session.task);
     const titleSource = normalizeTitleSource(session.titleSource, rawTitle, derivedTitle);
@@ -642,6 +649,22 @@
       finishedAt: Number.isFinite(Date.parse(run.finishedAt)) ? run.finishedAt : event.timestamp };
   }
 
+  function pruneRunRecoveryScope(run, session = {}) {
+    const wrongAccount = proof => Object.prototype.hasOwnProperty.call(session, 'accountScopeId')
+      && proof.accountScopeId !== session.accountScopeId;
+    const wrongProject = value => Boolean(session.projectId && value !== session.projectId);
+    if (run.pendingDirectoryCleanup && (run.pendingDirectoryCleanup.sessionId !== session.id
+      || wrongAccount(run.pendingDirectoryCleanup) || wrongProject(run.pendingDirectoryCleanup.projectId))) delete run.pendingDirectoryCleanup;
+    applyTrackedChangeStatus(run, run.trackedChangeStatus);
+  }
+
+  function normalizeRecoveryRetention(value) {
+    if (value?.state !== 'omitted') return undefined;
+    return { state: 'omitted', reason: ['run-budget', 'session-budget', 'fallback', 'invalid'].includes(value.reason)
+      ? value.reason : 'invalid', bytes: Number.isSafeInteger(value.bytes) && value.bytes >= 0 ? value.bytes : 0,
+      ...(value.directoryCleanup === true ? { directoryCleanup: true, ...(value.coreRetained === true ? { coreRetained: true } : {}) } : {}) };
+  }
+
   function normalizeRun(run, options = {}) {
     if (options.restoreRunningRuns === true || options.recoverSettledRuns === true) run = recoverSettledRunningRun(run);
     run = recoverRecordedRunFailure(run, options.locale);
@@ -687,7 +710,10 @@
       undoBaseFiles: normalizeRunFiles(run.undoBaseFiles),
       undoTrackedChanges: normalizeRunTrackedChanges(run.undoTrackedChanges),
       undoExpectedFiles: normalizeRunFiles(run.undoExpectedFiles),
+      ...(normalizeRecoveryRetention(run.recoveryRetention) && !run.forkSnapshot
+        ? { recoveryRetention: normalizeRecoveryRetention(run.recoveryRetention) } : {}),
       undoStatus: sanitizeAssistantVisibleText(run.undoStatus),
+      ...(run.undoOwnerProtocol === 1 ? { undoOwnerProtocol: 1 } : {}),
       nativeRequestId: sanitizeAssistantVisibleText(run.nativeRequestId),
       codexThreadId: sanitizeAssistantVisibleText(run.codexThreadId), codexTurnId: sanitizeAssistantVisibleText(run.codexTurnId),
       forkSnapshot: run.forkSnapshot === true,
@@ -712,6 +738,9 @@
     if (Array.isArray(run.trackedChangeCaptures) && run.trackedChangeCaptures.length && !run.forkSnapshot) {
       normalized.trackedChangeCaptures = sanitizeAssistantVisibleValue(run.trackedChangeCaptures);
     }
+    const directories = DirectoryCleanupProof.normalize(run.pendingDirectoryCleanup);
+    if (directories && directories.runId === normalized.id && directories.projectId === normalized.runProjectId
+      && !run.forkSnapshot) normalized.pendingDirectoryCleanup = directories;
     applyTrackedChangeStatus(normalized, run.trackedChangeStatus);
     Object.assign(normalized, pickWritebackRecovery(run));
 
@@ -724,6 +753,7 @@
   // output yields the same result.
   function applyTrackedChangeStatus(run, rawStatus) {
     const hasRefs = run.undoTrackedChanges.length > 0;
+    const hasFileUndo = (run.undoOperations || []).some(UndoOperations.isFileUndoOperation);
     const hasRawStatus = rawStatus !== undefined && rawStatus !== null && rawStatus !== '';
 
     // Step 1 — value recovery. Keep a stable value; recover any other present
@@ -740,12 +770,11 @@
     }
 
     // Step 1 — reload reconciliation. A non-terminal status (`pending`) with no
-    // refs is the post-reload state of an un-acted tracked-change run: the heavy refs are
-    // never persisted, so without them there is nothing to act on. Drop it so
-    // the run returns to the legacy-undo world. A terminal status with no refs
+    // refs can result from an old record or a storage-budget omission. Drop
+    // pending and let actual legacy Undo material decide the action. A terminal status with no refs
     // is kept — step 3 already empties terminal payloads and the label stays
     // meaningful.
-    if (!hasRefs && status === 'pending') {
+    if (!hasRefs && !hasFileUndo && status === 'pending') {
       status = undefined;
     }
 
@@ -762,7 +791,7 @@
 
     if (status !== undefined) {
       run.trackedChangeStatus = status;
-    }
+    } else delete run.trackedChangeStatus;
   }
 
   // Welcome-panel + write-guard: the run lifecycle now
@@ -1034,6 +1063,17 @@
     return result;
   }
 
+  function normalizeCodexLocalSkillEnabled(value) {
+    const result = {};
+    if (!value || typeof value !== 'object' || Array.isArray(value)) return result;
+    for (const [id, enabled] of Object.entries(value)) {
+      if (/^[a-zA-Z0-9][a-zA-Z0-9._-]{0,79}$/.test(id) && !id.includes('..')
+        && !['__proto__', 'prototype', 'constructor'].includes(id) && typeof enabled === 'boolean') result[id] = enabled;
+    }
+    if (Object.keys(result).length > 200) throw new Error('Too many skill preferences.');
+    return result;
+  }
+
   function normalizeProjectPrefKey(value) {
     const key = typeof value === 'string' ? value.trim() : '';
     if (!key) {
@@ -1105,6 +1145,7 @@
       loadCodexLocalSkills: source.loadCodexLocalSkills !== false,
       loadCodexOverleafSkills: source.loadCodexOverleafSkills !== false,
       codexOverleafSkillEnabled: normalizeCodexOverleafSkillEnabled(source.codexOverleafSkillEnabled),
+      codexLocalSkillEnabled: normalizeCodexLocalSkillEnabled(source.codexLocalSkillEnabled),
       theme: ['dark', 'light', 'auto'].includes(source.theme) ? source.theme : 'dark',
       panelWidth: normalizePanelWidth(source.panelWidth),
       task: summarizeTextForStorage(active?.task || source.task || '', 'task'),
@@ -1283,7 +1324,13 @@
       undoBaseFiles: undoPayload.undoBaseFiles,
       undoTrackedChanges: undoPayload.undoTrackedChanges,
       undoExpectedFiles: undoPayload.undoExpectedFiles,
+      ...(!run.forkSnapshot && (run.pendingDirectoryCleanup || run.recoveryRetention?.directoryCleanup === true || (run.undoStatus !== 'applied' && !['accepted', 'rejected'].includes(run.trackedChangeStatus)))
+        && (run.pendingDirectoryCleanup || run.recoveryRetention?.state === 'omitted' || ['appliedOperations', 'undoOperations', 'undoTrackedChanges', 'undoExpectedFiles']
+          .some(key => Array.isArray(run[key]) && run[key].length))
+        ? { recoveryRetention: normalizeRecoveryRetention(run.recoveryRetention)
+          || { state: 'omitted', reason: 'fallback', bytes: 0, ...(run.pendingDirectoryCleanup ? { directoryCleanup: true } : {}) } } : {}),
       undoStatus: summarizeTextForStorage(run.undoStatus, 'undo status'),
+      ...(run.undoOwnerProtocol === 1 ? { undoOwnerProtocol: 1 } : {}),
       nativeRequestId: normalizeTextField(run.nativeRequestId, 160),
       codexThreadId: normalizeTextField(run.codexThreadId, 160), codexTurnId: normalizeTextField(run.codexTurnId, 160),
       forkSnapshot: run.forkSnapshot === true,
@@ -1291,6 +1338,11 @@
       nativeEventSeq: Number.isFinite(Number(run.nativeEventSeq)) ? Number(run.nativeEventSeq) : 0,
       queueItemId: normalizeTextField(run.queueItemId, 160)
     };
+    if (compact.recoveryRetention?.coreRetained === true && run.undoStatus !== 'applied'
+      && !TERMINAL_TRACKED_CHANGE_STATUS.has(run.trackedChangeStatus)
+      && ['appliedOperations', 'undoOperations', 'undoTrackedChanges', 'undoExpectedFiles'].some(key => run[key]?.length)) {
+      delete compact.recoveryRetention.coreRetained;
+    }
     if (run.executionSnapshot && typeof run.executionSnapshot === 'object') {
       compact.executionSnapshot = sanitizeAssistantVisibleValue(run.executionSnapshot);
     }
@@ -1577,21 +1629,22 @@
     if (typeof value !== 'string' || !value) {
       return '';
     }
-    const secretRedacted = redactSecretLikeText(value);
-    if (!mightContainLocalReferenceText(secretRedacted)) {
-      return secretRedacted;
+    // Conversation text is user/model content, not a credential field. Keep
+    // examples and quoted values intact; local-reference display rules remain.
+    if (!mightContainLocalReferenceText(value)) {
+      return value;
     }
     if (LineReferences?.sanitizeLocalReferences) {
       try {
-        return LineReferences.sanitizeLocalReferences(secretRedacted, {
+        return LineReferences.sanitizeLocalReferences(value, {
           projectFiles: [],
           context: 'persist'
         });
       } catch (_error) {
-        return fallbackSanitizeLocalReferences(secretRedacted);
+        return fallbackSanitizeLocalReferences(value);
       }
     }
-    return fallbackSanitizeLocalReferences(secretRedacted);
+    return fallbackSanitizeLocalReferences(value);
   }
 
   function mightContainLocalReferenceText(value) {
@@ -1619,18 +1672,6 @@
     });
   }
 
-  function redactSecretLikeText(value) {
-    if (typeof value !== 'string') {
-      return '';
-    }
-    let redacted = value;
-    for (const pattern of SECRET_REDACTION_PATTERNS) {
-      pattern.lastIndex = 0;
-      redacted = redacted.replace(pattern, REDACTED_SECRET);
-    }
-    return redacted;
-  }
-
   function containsSecretLikeText(value) {
     if (typeof value === 'string') {
       return SECRET_REDACTION_PATTERNS.some(pattern => {
@@ -1703,6 +1744,8 @@
   }
 
   return {
+    normalizeRecoveryRetention,
+    pruneRunRecoveryScope,
     pickWritebackRecovery,
     DEFAULT_PANEL_STATE,
     createSession,
@@ -1720,7 +1763,9 @@
     normalizeRunStatus,
     recoverRecordedRunFailure,
     recoverSettledRunningRun,
+    normalizeCodexLocalSkillEnabled,
     normalizeProjectReferenceFiles,
+    normalizeComposerAttachmentsForPersistence,
     normalizeSelectionContext: SelectionContext.normalize,
     prepareStateForStorage,
     estimateJsonBytes,

package/extension/src/shared/settlementFacts.js

@@ -157,6 +157,9 @@
       canAccept,
       canUndo,
       canRetry: Boolean(primaryFailure?.retryable),
+      requiresWriteReview: Boolean(facts && (facts.documentEffect === 'possibly-changed'
+        || facts.evidence?.settled === 'needs-review'
+        || facts.failures.some(failure => DefaultFailureReasons.isUnconfirmedWriteFailure?.(failure)))),
       terminalState: failureTerminalState || '',
       actions: { accept: canAccept, undo: canUndo }
     };
@@ -209,6 +212,10 @@
         file: safePath(item.file),
         operationType: text(item.operationType).slice(0, 80),
         changedDocument: item.changedDocument === true,
+        ...(item.mayHaveMutated === true ? { mayHaveMutated: true } : {}),
+        ...(item.evidence?.originalCode === 'native_untracked_undo_pending_changes'
+          && item.changedDocument !== true && item.mayHaveMutated !== true && item.evidence.writeStarted !== true
+          ? { evidence: { originalCode: 'native_untracked_undo_pending_changes' } } : {}),
         terminalState: normalizeTerminalState(item.terminalState)
       }));
   }
@@ -287,8 +294,9 @@
   }
 
   function selectPrimaryFailure(failures) {
-    return DefaultFailureReasons?.selectPrimaryFailure instanceof Function
-      ? DefaultFailureReasons.selectPrimaryFailure(failures)
+    const select = DefaultFailureReasons?.selectPrimaryWritebackFailure || DefaultFailureReasons?.selectPrimaryFailure;
+    return select instanceof Function
+      ? select(failures)
       : failures[0] || null;
   }
 

package/extension/src/shared/sharedSessionBridge.js

@@ -1,7 +1,7 @@
 (function (root, factory) {
-  if (typeof module === 'object' && module.exports) module.exports = factory();
-  else root.CodexOverleafModuleRegistry.define('SharedSessionBridge', [], factory);
-})(typeof globalThis !== 'undefined' ? globalThis : this, function () {
+  if (typeof module === 'object' && module.exports) module.exports = factory(require('./sharedSessionTransfer'));
+  else root.CodexOverleafModuleRegistry.define('SharedSessionBridge', ['SharedSessionTransfer'], factory);
+})(typeof globalThis !== 'undefined' ? globalThis : this, function (Transfer) {
   'use strict';
   const MESSAGE = 'codex-overleaf/shared-sessions-v1';
   const LOCK_PORT = 'codex-overleaf/shared-session-lock-v1';
@@ -34,7 +34,7 @@
     }
     function assertScope(value) { capture(value.projectId, value.accountScopeId); }
     const cacheKey = (value, id) => value.accountScopeId + ':' + id;
-    const lockKey = (kind, value) => kind === 'preferences' ? 'preferences' : 'state:' + value.accountScopeId;
+    const lockKey = (kind, value) => kind === 'review' ? 'review:' + JSON.stringify([value.accountScopeId, value.projectId, value.runId]) : kind === 'preferences' ? 'preferences' : 'state:' + value.accountScopeId;
     async function request(method, value, args = {}) {
       assertScope(value);
       const lock = heldLocks.get(lockKey('state', value));
@@ -51,23 +51,24 @@
 
     // Live ports own the locks. Worker/page termination releases them without
     // allowing a stale client to silently fall back to an origin-local lock.
-    async function acquire(kind, value, work) {
+    async function acquire(kind, value, work, onLost) {
       assertScope(value);
       const key = lockKey(kind, value), port = chromeApi.runtime.connect({ name: LOCK_PORT });
       let timer, heartbeat, released = false, lock = null, rejectGrant;
       const granted = new Promise((resolve, reject) => {
         rejectGrant = reject;
         port.onMessage.addListener(message => {
+          if (message?.type === 'busy') { reject(failure('review_busy', 'Another page is reviewing this run. Wait for it to finish.')); return; }
           if (message?.type !== 'granted' || lock || released) return;
           clearTimeout(timer);
-          lock = { token: message.token, lost: false };
+          lock = { token: message.token, deadlineAt: message.deadlineAt, lost: false };
           heldLocks.set(key, lock);
           resolve();
         });
         port.onDisconnect.addListener(() => {
           // Read lastError to consume the runtime's disconnected-port warning.
           void chromeApi.runtime.lastError;
-          if (lock) lock.lost = true;
+          if (lock) { lock.lost = true; if (!released) onLost?.(lock.token); }
           if (!released) reject(failure('storage_lock_lost', 'The shared history lock disconnected.'));
         });
         timer = environment.setTimeout(() => reject(failure('storage_lock_timeout',
@@ -84,12 +85,27 @@
         port.postMessage({ type: 'acquire', kind, scope: value });
         await granted;
         assertScope(value);
-        const result = await work();
+        const assertOwner = () => { assertScope(value); if (lock.lost) throw failure('storage_lock_lost', 'The shared review owner disconnected.'); };
+        assertOwner.token = lock.token;
+        assertOwner.markDispatched = async () => {
+          assertOwner();
+          const lease = await request('review-dispatched', value, { runId: value.runId, reviewToken: lock.token });
+          assertOwner(); assertOwner.deadlineAt = lease.deadlineAt; return lease.deadlineAt;
+        };
+        const result = await work(assertOwner);
         assertScope(value);
         if (lock.lost) throw failure('storage_lock_lost', 'The shared history lock was lost before completion.');
         return result;
       } finally {
         released = true;
+        if (kind === 'review' && lock && !lock.lost) {
+          await new Promise(resolve => {
+            const done = message => { if (message?.type === 'released') { port.onMessage.removeListener(done); environment.clearTimeout(releaseTimer); resolve(); } };
+            const releaseTimer = environment.setTimeout(resolve, 2000);
+            port.onMessage.addListener(done);
+            try { port.postMessage({ type: 'release-review', token: lock.token }); } catch (_) { resolve(); }
+          });
+        }
         environment.clearTimeout(timer);
         environment.clearInterval(heartbeat);
         if (heldLocks.get(key) === lock) heldLocks.delete(key);
@@ -179,7 +195,8 @@
           record: clean(record),
           base: record[BASE] || baselines.get(cacheKey(value, record.id)) || null
         }));
-        const written = await request('put', value, { entries, reviewRunIds: options.reviewRunIds || [] });
+        const transfer = await Transfer.encode(entries);
+        const written = await request(transfer.method, value, { ...transfer.payload, reviewRunIds: options.reviewRunIds || [] });
         // Keep the caller's submitted view as its merge baseline. A merged
         // remote change has not necessarily been applied to the visible UI.
         for (const entry of entries) baselines.set(cacheKey(value, entry.record.id), clean(entry.record));
@@ -192,8 +209,8 @@
       const record = await request('get', value, { id });
       return tag(record, value, !heldLocks.has(lockKey('state', value)));
     }
-    async function erase(method, projectId = '', id) {
-      const value = capture(projectId);
+    async function erase(method, projectId = '', id, accountScopeId) {
+      const value = capture(projectId, accountScopeId);
       return withWrite(value, () => request(method, value, { id }));
     }
     function decorate(api) {
@@ -225,8 +242,9 @@
         store === 'sessions' ? (await put([record]))[0] : api.putRecord(store, record));
       route('putRecords', (store, records, options) =>
         store === 'sessions' ? put(records, options) : api.putRecords(store, records));
-      route('deleteRecord', (store, id) =>
-        store === 'sessions' ? erase('delete', '', id) : api.deleteRecord(store, id));
+      route('deleteRecord', (store, id, expectedScope) =>
+        store === 'sessions' ? erase('delete', expectedScope?.projectId || '', id, expectedScope?.accountScopeId)
+          : api.deleteRecord(store, id));
       route('deleteByIndex', async (store, index, value) => {
         if (store !== 'sessions') return api.deleteByIndex(store, index, value);
         if (index === 'projectId') return erase('clear-project', value);
@@ -243,7 +261,7 @@
         for (const record of await api.getAllSessions()) {
           if (record.accountScopeId === value.accountScopeId) await api.deleteRecord('sessions', record.id);
         }
-        for (const store of Object.keys(api.STORES)) if (store !== 'sessions') await api.clearStore(store);
+        await api.clearAuxiliaryStores();
         baselines.clear();
       });
       route('listRecentProjectsAcrossAccount', async options => {
@@ -253,6 +271,11 @@
       });
       Object.assign(wrapped, {
         sharedSessionsEnabled: enabled,
+        withSharedReviewLock: async (input, work) => {
+          const value = { ...capture(input.projectId, input.accountScopeId), runId: input.runId };
+          return acquire('review', value, work, input.onLost);
+        },
+        hasSharedReviewOwner: input => request('review-owner', capture(input.projectId, input.accountScopeId), { runId: input.runId }),
         withSharedLock: withLock,
         readSharedProjectSnapshot: projectId => list(projectId, false),
         adoptSharedSessionBaseline: adopt,