codex-overleaf-link 2.5.0 → 2.5.1

package/extension/src/content/runTimelineView.js

@@ -1,6 +1,10 @@
-(function initCodexOverleafRunTimelineView() {
+(function (root, factory) {
+  if (typeof module === 'object' && module.exports) module.exports = factory(require('./runRecoveryActions'));
+  else root.CodexOverleafModuleRegistry.define('RunTimelineView', ['RunRecoveryActions'], factory);
+})(typeof window !== 'undefined' ? window : globalThis, function (RunRecoveryActions) {
   'use strict';
 
+
   // Owns scroll, cards, reports and mature run actions. The optional activity
   // presenter projects stored events without taking ownership of settlement.
   function create(deps = {}) {
@@ -10,9 +14,14 @@
       RunActivityModel,
       SubagentActivityView,
       RunGuidanceView,
+      getPendingGuidance = () => [],
       RunResultActions,
       RunScrollLayout,
       RunFailureNotice,
+      I18n,
+      FailureReasons,
+      localizeVisibleReason = value => value,
+      localizeCompileReason = value => value,
       tr,
       tx,
       getLocale,
@@ -47,6 +56,7 @@
       trackedChangeInFlight,
       projectRunSettlement,
       getCurrentProjectId,
+      getAccountScopeId,
       getProjectName
     } = deps;
 
@@ -59,6 +69,7 @@
   // drives the floating "jump to latest" button's counter.
   let scrollLogRafId = 0;
   let scrollLogPendingForce = false;
+  let pendingGuidanceReveal = null;
   let jumpToLatestButton = null;
   let unreadSinceDetach = 0;
   // Elapsed time belongs to the run; tool rows retain their own lifecycle.
@@ -69,9 +80,21 @@
     onLayoutChange: scroller => logAutoFollow ? scrollLogToBottom() : updateJumpToLatestButton(scroller)
   });
   const failureNotice = RunFailureNotice?.create({ tr, projectRunSettlement, sanitizeText: sanitizeAssistantVisibleText });
+  const { buildRecoveryButton, appendRecoveryActionForFailure } = RunRecoveryActions.create({
+    document: typeof document === 'undefined' ? undefined : document,
+    window: typeof window === 'undefined' ? undefined : window,
+    tx, failureNotice, refillComposerForRetry, openProjectFileForFailure, showNativeSetupGuidance,
+    openStorageSettings, forceCancelStuckTaskForCurrentProject
+  });
   const presence = RunPresence?.create({ tx, getLocale, formatElapsed });
   const displayRun = run => RunFailureNotice?.projectResolvedUndo?.(run) || run;
-  const activitySummary = RunActivitySummary?.create({ RunActivityModel, SubagentActivityView, tx, findRunRecord: (...args) => displayRun(findRunRecord(...args)), getPanel, cssEscape,
+  const displayLocalizedRun = run => {
+    const displayed = displayRun(run);
+    return displayed ? { ...displayed, events: (displayed.events || []).map(sanitizeRunEventForRender) } : displayed;
+  };
+  const activitySummary = RunActivitySummary?.create({ RunActivityModel, RunGuidanceView, getPendingGuidance, SubagentActivityView, tx, findRunRecord: (...args) => displayLocalizedRun(findRunRecord(...args)), getPanel, cssEscape,
+    projectReviewResultEvent: sanitizeRunEventForRender,
+    formatReviewResultFailure,
     formatEventTime, formatElapsed, renderMarkdownBlockText, renderRunEvent, formatEventDetail,
     presence, classifyStatus: classifyRunPresence, getProjectId: () => getCurrentProjectId?.() || '',
     summarizeCommand: RunPresence?.commandSummary,
@@ -82,6 +105,7 @@
   function resetAutoFollow() {
     logAutoFollow = true;
     userScrollIntentUntil = 0;
+    pendingGuidanceReveal = null;
   }
 
   function bindLogAutoFollow() {
@@ -183,6 +207,7 @@
     if ((event?.type === 'wheel' && event.deltaY < 0) || ['ArrowUp', 'PageUp', 'Home'].includes(event?.key)) {
       logAutoFollow = false;
       scrollLogPendingForce = false;
+      pendingGuidanceReveal = null;
     }
   }
 
@@ -207,6 +232,7 @@
       userScrollIntentUntil = 0;
       unreadSinceDetach = 0;
       scrollLogPendingForce = true;
+      pendingGuidanceReveal = null;
     } else if (!logAutoFollow) {
       // The user has scrolled up: do not yank them. Just keep the jump button
       // state current.
@@ -241,7 +267,21 @@
       writeNow();
     });
   }
+  function revealGuidance(row) {
+    if (!logAutoFollow || activitySummary?.isSubagentViewOpen?.() || !getLogScrollContainer()?.contains?.(row)) return false;
+    pendingGuidanceReveal = row;
+    scrollLogToBottom();
+    return true;
+  }
   function setLogScrollPosition(scroller) {
+    const reveal = pendingGuidanceReveal;
+    pendingGuidanceReveal = null;
+    const result = reveal && scrollLayout?.revealGuidance(reveal);
+    if (result) {
+      logAutoFollow = result.following;
+      if (!logAutoFollow) scrollLayout.captureAnchor(true);
+      return;
+    }
     scroller.scrollTop = scroller.scrollHeight;
   }
   function collapseRunProcess(view, statusText) {
@@ -357,7 +397,7 @@
   }
 
   function renderRunCard(run) {
-    run = displayRun(run);
+    run = displayLocalizedRun(run);
     const root = document.createElement('section');
     root.className = 'transcript-turn run-card';
     root.dataset.status = run.status || 'completed';
@@ -418,11 +458,7 @@
       truncated.textContent = tr('eventsTruncatedNote');
       events.append(truncated);
     }
-    const guidanceTarget = guidance;
-    const renderedGuidanceIds = new Set();
-    const completedLegacyGuidance = new Set((run.events || [])
-      .filter(event => event.kind === 'guidance' && !event.guidanceId && event.status === 'completed')
-      .map(event => event.title));
+    if (!activitySummary) RunGuidanceView.reconcileGuidance?.(guidance, (run.events || []).concat(getPendingGuidance(run)), tx, { active: run.status === 'running' });
     for (const event of run.events || []) {
       if (event.kind === 'report') {
         report.hidden = false;
@@ -430,16 +466,7 @@
       } else if (activitySummary || event.kind === 'technical') {
         continue;
       } else if (RunGuidanceView.getGuidanceText(event)) {
-        if (event.guidanceId && renderedGuidanceIds.has(event.guidanceId)) {
-          continue;
-        }
-        if (!event.guidanceId && event.status === 'queued' && completedLegacyGuidance.has(event.title)) {
-          continue;
-        }
-        if (event.guidanceId) {
-          renderedGuidanceIds.add(event.guidanceId);
-        }
-        guidanceTarget.append(renderRunEvent(event));
+        continue;
       } else if (event.kind === 'stream') {
         upsertStreamEvent({ events }, event);
       } else {
@@ -458,6 +485,14 @@
 
   function getRunStatusText(run = {}) {
     if (run.retryingWriteback) return tx('Checking file sync', '正在检查文件同步');
+    if (['Stopped tracking after a page refresh', '页面刷新后已停止跟踪'].includes(run.statusText)) return tr('restoredRunStoppedStatus');
+    const knownStatus = /^(?:Done|Failed|Cancelled|Running|已处理|处理失败|已取消|处理中)(?:\s+[\d.]+(?:ms|s|m|h|秒|分钟)(?:\s+[\d.]+(?:ms|s|m|h|秒|分钟))*)?$/.test(run.statusText || '');
+    if (knownStatus) {
+      const elapsed = String(run.statusText).replace(/^(?:Done|Failed|Cancelled|Running|已处理|处理失败|已取消|处理中)\s*/, '');
+      const key = run.status === 'running' ? 'processing' : run.status === 'failed' ? 'processedFailed'
+        : ['rejected', 'cancelled'].includes(run.status) ? 'processedCancelled' : 'processed';
+      return tr(key, { elapsed }).trim();
+    }
     if (run.statusText) {
       return run.statusText;
     }
@@ -534,18 +569,61 @@
   function sanitizeRunEventForRender(event = {}) {
     const streamRole = sanitizeAssistantVisibleText(event.streamRole);
     const title = sanitizeAssistantVisibleText(event.title);
+    const activity = !streamRole && (!event.kind || event.kind === 'activity') && !event.guidanceId;
+    const localized = activity ? localizeProductActivity(title, sanitizeAssistantVisibleValue(event.detail)) : null;
     return {
       ...event,
+      ...(activity && event.activity?.kind === 'compile' ? { activity: { ...event.activity, output: localizeCompileReason(event.activity.output) } } : {}),
       title: streamRole === 'reasoning'
         ? stripEmptyHtmlCommentPlaceholders(title)
-        : title,
+        : localized?.title || title,
       status: sanitizeAssistantVisibleText(event.status),
-      detail: sanitizeAssistantVisibleValue(event.detail),
+      detail: localized?.detail ?? sanitizeAssistantVisibleValue(event.detail),
       technicalDetail: sanitizeAssistantVisibleValue(event.technicalDetail),
       streamKey: sanitizeAssistantVisibleText(event.streamKey),
       streamRole
     };
   }
+
+  function localizeProductActivity(title, detail) {
+    let known = false, nextTitle = title;
+    const keys = ['undoUnsafeFullFileTitle', 'undoNoTraceTitle', 'undoFileSelectTitle', 'undoNoTraceStarted', 'undoTrackedTitle', 'undoNativeTitle', 'undoTrackedStarted', 'undoNativeStarted', 'undoSwitchedEditing', 'undoReviewingRestoreUnverified', 'runAcceptTrackedStarted', 'runAcceptTrackedFailed', 'undoResult', 'undoTrackedResult', 'undoNativeResult', 'runAcceptTrackedResult'];
+    if (I18n?.t) outer: for (const key of keys) for (const locale of ['en', 'zh']) {
+      const template = I18n.t(locale, key, { applied: '__APPLIED__', skipped: '__SKIPPED__' });
+      const pattern = template.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace('__APPLIED__', '(\\d+)').replace('__SKIPPED__', '(\\d+)');
+      const match = new RegExp('^' + pattern + '$').exec(title);
+      if (match) { known = true; nextTitle = tr(key, { applied: match[1], skipped: match[2] }); break outer; }
+    }
+    let countedTitle;
+    const writeResult = /^(?:Write result: wrote (\d+) item\(s\), skipped (\d+)|写入结果：已写入 (\d+) 项，跳过 (\d+) 项)$/.exec(title);
+    const governance = /^(?:Project governance blocked (\d+) write\(s\) before review\.|项目治理规则在审核前阻止了 (\d+) 项写入。)$/.exec(title);
+    if (writeResult) {
+      const applied = writeResult[1] ?? writeResult[3], skipped = writeResult[2] ?? writeResult[4];
+      countedTitle = tx(`Write result: wrote ${applied} item(s), skipped ${skipped}`, `写入结果：已写入 ${applied} 项，跳过 ${skipped} 项`);
+    } else if (governance) {
+      const count = governance[1] ?? governance[2];
+      countedTitle = tx(`Project governance blocked ${count} write(s) before review.`, `项目治理规则在审核前阻止了 ${count} 项写入。`);
+    }
+    const labels = ['detailAccepted', 'detailRejected', 'detailUndone', 'detailSkipped', 'detailFile', 'detailRecord', 'detailReason'];
+    const project = (value, reason = false) => {
+      if (typeof value === 'string') return reason ? localizeVisibleReason(value) : value;
+      if (Array.isArray(value)) return value.map(item => project(item, reason));
+      if (!value || typeof value !== 'object') return value;
+      return Object.fromEntries(Object.entries(value).map(([key, child]) => {
+        const label = labels.find(id => ['en', 'zh'].some(locale => I18n?.t?.(locale, id) === key));
+        return [label ? tr(label) : key, project(child, label === 'detailReason')];
+      }));
+    };
+    return { title: countedTitle || (known ? nextTitle : localizeCompileReason(localizeVisibleReason(title))),
+      detail: typeof detail === 'string' ? localizeVisibleReason(detail) : known ? project(detail) : detail };
+  }
+  function formatReviewResultFailure(failure) {
+    if (failure?.code === 'unknown_legacy_failure' && (!failure.evidence?.originalCode || failure.evidence.originalCode === 'unknown_legacy_failure')
+      && ['Unknown reason', '未知原因'].includes(failure.userMessage)) {
+      failure = { ...failure, userMessage: tr('unknownReason') };
+    }
+    return FailureReasons?.formatFailureReasonForDisplay(failure, getLocale?.(), key => { const value = tr(key, failure?.file ? undefined : { file: tr('unknownFile'), activeFile: tr('unknownFile') }); return value && value !== key ? value : undefined; });
+  }
   function renderActivityLine(input) {
     const event = sanitizeRunEventForRender(input);
     const row = document.createElement('div');
@@ -586,7 +664,8 @@
   // The result presenter owns parsing and current lifecycle metadata.
   const splitFlatCompletionReport = text => RunResultActions.splitFlatCompletionReport(text, tx);
   const projectCompletionMeta = (meta, run) => RunResultActions.projectCompletionMeta(meta, run, {
-    tx, trackedChangeInFlight, isTrackedChangeLifecycleRun, projectRunSettlement
+    tx, getLocale, tr, trackedChangeInFlight, isTrackedChangeLifecycleRun, projectRunSettlement,
+    projectId: getCurrentProjectId?.(), accountScopeId: getAccountScopeId?.()
   });
 
   // The user's own open/closed choice per run survives card re-renders.
@@ -712,7 +791,7 @@
         mainSections.push(String(structured.conclusion));
       }
       if (structured.body) {
-        mainSections.push(structured.body);
+        mainSections.push(RunResultActions.projectCompletionBody?.(structured.body, tx) ?? structured.body);
       }
       if (mainSections.length) {
         renderMarkdownBlockText(main, mainSections.join('\n\n'));
@@ -755,132 +834,6 @@
   // the normal cancel button is hidden because currentRunView is null).
   // Recovery-action registry: failure codes whose "next step" is executable
   // from the panel get a button, not prose. One primary action per failure.
-  const RETRYABLE_FAILURE_CODES = new Set([
-    'native_request_failed', 'codex_timeout', 'codex_no_usable_result',
-    'codex_output_limit', 'stale_source_changed', 'patch_anchor_not_found',
-    'target_editor_not_ready', 'write_timeout', 'partial_write_needs_review',
-    'write_operation_failed'
-  ]);
-  const NATIVE_SETUP_FAILURE_CODES = new Set([
-    'native_bridge_unavailable', 'native_protocol_incompatible'
-  ]);
-  const OPEN_FILE_FAILURE_CODES = new Set([
-    'target_file_not_active', 'target_file_open_failed', 'target_file_not_found'
-  ]);
-  const STORAGE_FAILURE_CODES = new Set([
-    'storage_quota_exceeded', 'run_state_persist_failed'
-  ]);
-  // A missing `codex` binary is fixed in the terminal, not the panel — the
-  // action opens the README troubleshooting section (PATH / login checks).
-  const CODEX_INSTALL_FAILURE_CODES = new Set(['codex_not_found']);
-  const CODEX_CLI_TROUBLESHOOTING_URL = 'https://github.com/Ghqqqq/codex-overleaf-link#faq-and-troubleshooting';
-
-  function buildRecoveryButton(failureCode, label, title) {
-    const button = document.createElement('button');
-    button.type = 'button';
-    button.className = 'run-final-answer__recovery-action';
-    button.dataset.recoveryFor = failureCode;
-    button.textContent = label;
-    if (title) {
-      button.title = title;
-    }
-    return button;
-  }
-
-  function appendEditAndResend(report, run, actionKey) {
-    const retry = buildRecoveryButton(actionKey,
-      tx('Edit & resend', '编辑后重发'),
-      tx('Put this run\u2019s task back into the composer so you can adjust and resend it.', '把本轮任务填回输入框，修改后可直接重发。'));
-    retry.addEventListener('click', clickEvent => {
-      clickEvent.stopPropagation();
-      refillComposerForRetry(run || null);
-    });
-    report.append(retry);
-  }
-
-  function appendRecoveryActionForFailure(report, event, run) {
-    const recovery = failureNotice?.prepareRecovery(report, { openFile: openProjectFileForFailure });
-    const failureCode = event?.failure?.code || '';
-    if (recovery?.handled) return;
-    report = recovery?.target || report;
-    if (RETRYABLE_FAILURE_CODES.has(failureCode) && typeof refillComposerForRetry === 'function') {
-      appendEditAndResend(report, run, failureCode);
-      return;
-    }
-    if (NATIVE_SETUP_FAILURE_CODES.has(failureCode) && typeof showNativeSetupGuidance === 'function') {
-      const fix = buildRecoveryButton(failureCode,
-        tx('Fix the native host', '修复 native host'),
-        tx('Opens the install/update guidance with the copyable command.', '打开安装/更新指引（含可复制命令）。'));
-      fix.addEventListener('click', clickEvent => {
-        clickEvent.stopPropagation();
-        showNativeSetupGuidance();
-      });
-      report.append(fix);
-      return;
-    }
-    if (OPEN_FILE_FAILURE_CODES.has(failureCode) && event?.failure?.file && typeof openProjectFileForFailure === 'function') {
-      const open = buildRecoveryButton(failureCode,
-        tx(`Open ${event.failure.file} in Overleaf`, `在 Overleaf 打开 ${event.failure.file}`), '');
-      open.addEventListener('click', clickEvent => {
-        clickEvent.stopPropagation();
-        openProjectFileForFailure(event.failure.file);
-      });
-      report.append(open);
-      return;
-    }
-    if (STORAGE_FAILURE_CODES.has(failureCode) && typeof openStorageSettings === 'function') {
-      const clean = buildRecoveryButton(failureCode,
-        tx('Open history & storage cleanup', '打开历史与存储清理'), '');
-      clean.addEventListener('click', clickEvent => {
-        clickEvent.stopPropagation();
-        openStorageSettings();
-      });
-      report.append(clean);
-      return;
-    }
-    if (CODEX_INSTALL_FAILURE_CODES.has(failureCode)) {
-      const guide = buildRecoveryButton(failureCode,
-        tx('Codex CLI troubleshooting guide', '查看 Codex CLI 排查指引'),
-        tx('Opens the README section on fixing a missing `codex` command (PATH / login).', '打开 README 中「找不到 codex 命令」的排查说明（PATH／登录）。'));
-      guide.addEventListener('click', clickEvent => {
-        clickEvent.stopPropagation();
-        window.open(CODEX_CLI_TROUBLESHOOTING_URL, '_blank', 'noopener');
-      });
-      report.append(guide);
-      return;
-    }
-    if (failureCode !== 'codex_project_locked') return;
-    const button = document.createElement('button');
-    button.type = 'button';
-    button.className = 'run-final-answer__recovery-action';
-    button.dataset.recoveryFor = failureCode;
-    button.textContent = tx('Force-release the stuck task', '强制释放卡住的任务');
-    button.title = tx(
-      'Sends a force-cancel to the native host that drops the project lock so a new run can start. Use this when refreshing the tab did not free the project.',
-      '向 native host 发送强制取消请求，释放当前 Overleaf 项目的占用，让新的任务可以启动。刷新页面没用时使用。'
-    );
-    button.addEventListener('click', event => {
-      event.stopPropagation();
-      button.disabled = true;
-      button.textContent = tx('Releasing…', '正在释放…');
-      forceCancelStuckTaskForCurrentProject().then(result => {
-        if (result?.ok) {
-          button.textContent = tx('Force-released — you can retry the run.', '已释放，可以重试本轮任务。');
-          return;
-        }
-        // The helper resolves (never throws) with a non-ok result when the
-        // request was not delivered. Report the real outcome instead of a
-        // blanket success, and re-enable the button so the user can retry.
-        button.disabled = false;
-        button.textContent = tx('Release failed — refresh the tab, then try again.', '释放失败，请刷新页面后重试。');
-      }).catch(() => {
-        button.disabled = false;
-        button.textContent = tx('Release failed — refresh the tab, then try again.', '释放失败，请刷新页面后重试。');
-      });
-    });
-    report.append(button);
-  }
-
   // A run belongs to the tracked-change lifecycle iff trackedChangeStatus is set
   // or it still has tracked-change refs. Every other run is a legacy-undo run.
   function isTrackedChangeLifecycleRun(run) {
@@ -956,13 +909,16 @@
     }
 
     button.hidden = false;
-    button.disabled = run.undoStatus === 'running' || run.undoStatus === 'applied';
-    button.textContent = run.undoStatus === 'applied'
+    const inFlight = trackedChangeInFlight?.get(run.id) === 'reject';
+    const applied = run.undoStatus === 'applied' && !inFlight;
+    button.disabled = inFlight || (run.undoStatus === 'running' && !run.undoRecoveryCheckRequired) || run.undoStatus === 'applied';
+    button.textContent = applied
       ? tr('undoApplied')
       : (run.partialWriteback ? tr('undoPartialRun') : tr('undoRun'));
-    button.title = run.undoStatus === 'applied'
+    button.title = applied
       ? tr('undoAppliedTitle')
       : (run.partialWriteback ? tr('undoPartialRunTitle') : tr('undoRunTitle'));
+    if (run.undoRecoveryUnavailable) button.title = tx('Undo recovery checks are unavailable. Reload this page after the connection recovers.', '撤销恢复检查暂不可用，请在连接恢复后重新加载此页面。');
     button.addEventListener('click', event => {
       event.stopPropagation();
       undoRun(run.id);
@@ -1158,7 +1114,43 @@
     return true;
   }
 
+  function refreshLocale() {
+    const log = getPanel()?.querySelector('[data-log]');
+    if (!log) return;
+    if (!getState().runs?.length) { renderRunHistory({ preserveScroll: true }); return; }
+    const reading = scrollLayout?.snapshot() || { scrollTop: log.scrollTop };
+    for (const run of getState().runs) {
+      const existing = log.querySelector(`[data-run-id="${cssEscape(run.id)}"]`);
+      if (!existing) continue;
+      const current = getCurrentRunView();
+      if (current?.root === existing) {
+        // Streaming owners retain their DOM references and buffered model text.
+        const status = existing.querySelector('[data-run-status]');
+        if (status) status.textContent = getRunStatusText(run);
+        configureAcceptButton(existing, run); configureUndoButton(existing, run);
+        configureEditButton(existing, run); configureWritebackButton(existing, run);
+        RunResultActions.configureResultActions(existing, run);
+        const reportEvent = (run.events || []).filter(event => event.kind === 'report').at(-1);
+        const report = current.report || existing.querySelector('[data-run-report]');
+        if (reportEvent && report) report.replaceChildren(renderCompletionReport(reportEvent, displayLocalizedRun(run)));
+        activitySummary?.update(current);
+        if (!activitySummary) RunGuidanceView.reconcileGuidance?.(existing.querySelector('[data-run-guidance]'),
+          (run.events || []).concat(getPendingGuidance(run)), tx, { active: run.status === 'running' });
+        continue;
+      }
+      const open = existing.querySelector('[data-run-process]')?.open;
+      const next = renderRunCard(run);
+      const process = next.querySelector('[data-run-process]');
+      if (process && typeof open === 'boolean') process.open = open;
+      existing.replaceWith(next);
+    }
+    log.scrollTop = reading.scrollTop;
+    scrollLayout?.restore(reading);
+    updateJumpToLatestButton(log);
+  }
+
     return {
+      refreshLocale,
       refreshResolvedUndo: refreshRunCard,
       refreshActivitySummary: activitySummary?.update,
       appendActivityDetail,
@@ -1166,6 +1158,7 @@
       bindLogAutoFollow,
       bumpUnreadIfDetached,
       scrollLogToBottom,
+      revealGuidance,
       collapseRunProcess,
       startRunElapsedTick,
       stopRunElapsedTick,
@@ -1184,5 +1177,5 @@
     };
   }
 
-  window.CodexOverleafRunTimelineView = { create };
-})();
+  return { create };
+});

package/extension/src/content/scopedPersistencePanelState.js

@@ -15,11 +15,13 @@
     return JSON.parse(JSON.stringify(value));
   }
 
-  async function applyReviewTransition({ getState, runId, transition, persist }) {
+  async function applyReviewTransition({ getState, runId, transition, persist, legacyUndo = false, assertCurrent }) {
     const targets = () => Array.from(new Set([
       ...(getState().runs || []),
       ...(getState().sessions || []).flatMap(session => session.runs || [])
     ])).filter(run => run.id === runId);
+    assertCurrent?.();
+    const capturedState = getState(), capturedSessionId = capturedState.activeSessionId;
     const records = targets();
     const sessions = (getState().sessions || []).filter(session =>
       (session.runs || []).some(run => run.id === runId));
@@ -31,12 +33,19 @@
         (Date.parse(session.lastActivityAt) || 0) + 1)).toISOString();
       session.lastActivityAt = session.updatedAt;
     }
+    const staged = records.map(record => JSON.stringify(record));
     try {
-      await persist({ preserveRunActionPayload: true, reviewRunIds: [runId] });
+      await persist({ preserveRunActionPayload: true, reviewRunIds: [runId], requireDurable: true });
+      assertCurrent?.();
+      if (getState() !== capturedState || getState().activeSessionId !== capturedSessionId
+        || records.some(record => !targets().includes(record))) throw reviewPersistenceError();
     } catch (error) {
+      try { assertCurrent?.(); } catch (_stale) { throw error; }
       // The remote action may have succeeded. Keep its recovery data and expose uncertainty.
-      for (const record of targets()) {
-        Object.assign(record, cloneSnapshot(previous), { trackedChangeStatus: 'needs_review' });
+      for (const record of records) {
+        if (getState() !== capturedState || !targets().includes(record)
+          || JSON.stringify(record) !== staged[records.indexOf(record)]) continue;
+        Object.assign(record, cloneSnapshot(previous), legacyUndo ? { undoStatus: 'partial' } : { trackedChangeStatus: 'needs_review' });
         for (const field of ['settlement', 'settlementFacts']) {
           if (!Object.prototype.hasOwnProperty.call(previous, field)) delete record[field];
         }
@@ -51,6 +60,28 @@
     });
   }
 
+  function verifyRecoveredRuns(recoveredRuns, proposed, written) {
+    for (var target of recoveredRuns || []) {
+      var expectedSession = proposed.find(session => session.id === target.sessionId);
+      var storedSession = (written || []).find(session => session.id === target.sessionId
+        && session.projectId === expectedSession?.projectId
+        && session.accountScopeId === expectedSession?.accountScopeId);
+      var expected = expectedSession?.runs?.find(run => run.id === target.runId);
+      var stored = storedSession?.runs?.find(run => run.id === target.runId);
+      var retained = expected && stored
+        && expected.runProjectId === target.projectId && stored.runProjectId === target.projectId
+        && Number(stored.nativeEventSeq || 0) >= Number(expected.nativeEventSeq || 0)
+        && stored.codexThreadId === expected.codexThreadId
+        && stored.codexTurnId === expected.codexTurnId
+        && JSON.stringify(stored.interruptedDraft) === JSON.stringify(expected.interruptedDraft)
+        && (expected.events || []).every(event => (stored.events || [])
+          .some(saved => JSON.stringify(saved) === JSON.stringify(event)));
+      if (!retained) throw Object.assign(new Error('Recovered run was not durably saved; its replay journal is retained.'), {
+        code: 'recovery_state_not_persisted'
+      });
+    }
+  }
+
   async function persistPanelState(input) {
     var state = cloneSnapshot(input.state || {});
     var compactState = cloneSnapshot(input.compactState || {});
@@ -71,6 +102,12 @@
         code: 'stale_view'
       });
     }
+    if ((input.recoveryRuns || []).some(target => target.projectId !== projectId
+      || target.accountScopeId !== accountScopeId)) {
+      throw Object.assign(new Error('Journal recovery scope changed before persistence.'), {
+        code: 'recovery_scope_changed'
+      });
+    }
     var reviewRuns = (input.reviewRunIds || []).map(id =>
       (state.sessions || []).flatMap(session => session.runs || []).find(run => run.id === id));
     if (reviewRuns.some(run => !run)) throw reviewPersistenceError();
@@ -129,10 +166,11 @@
         focusFiles: Array.isArray(session.focusFiles) ? session.focusFiles : [],
         createdAt: session.createdAt,
         updatedAt: session.updatedAt,
-        pendingInputs: (Array.isArray(session.pendingInputs) ? session.pendingInputs : [])
+      pendingInputs: (Array.isArray(session.pendingInputs) ? session.pendingInputs : [])
           .filter(function (item) { return !queueTombstones[item?.id]; })
       }), { preserveRunActionPayload: true });
     });
+    sessionRecords = StorageDb.compactSessionBatchActions?.(sessionRecords, { activeSessionId: state.activeSessionId }) || sessionRecords;
     var written = await input.SessionPersistence.writeSessions({
       Migration: Migration,
       StorageDb: StorageDb,
@@ -146,8 +184,15 @@
       writerId: input.persistenceContext?.writerId || ''
     });
     if (!reviewRuns.every(reviewRun => (written || []).some(session => (session.runs || []).some(run =>
-      run.id === reviewRun.id && run.trackedChangeStatus === reviewRun.trackedChangeStatus
+      run.id === reviewRun.id
+      && (!reviewRun.trackedChangeStatus && ['applied', 'partial'].includes(reviewRun.undoStatus)
+        ? run.undoStatus === reviewRun.undoStatus && (reviewRun.undoStatus === 'applied'
+          || ['undoOperations', 'undoBaseFiles', 'undoExpectedFiles', 'undoTrackedChanges']
+            .every(field => JSON.stringify(run[field] || []) === JSON.stringify(reviewRun[field] || [])))
+        : run.trackedChangeStatus === reviewRun.trackedChangeStatus)
     )))) throw reviewPersistenceError();
+    verifyRecoveredRuns(input.recoveryRuns, sessionRecords, written);
+    return written;
   }
 
   return Object.freeze({ persistPanelState: persistPanelState, applyReviewTransition: applyReviewTransition });

package/extension/src/content/selectionContextView.js

@@ -293,7 +293,7 @@
       toolbar = null;
     }
 
-    return { attach, capture, clear, render, start, destroy };
+    return { attach, capture, clear, render, start, destroy, getRevision: () => generation };
   }
 
   return { create, buildChip, renderSent };