codex-overleaf-link 2.5.0 → 2.6.0

package/extension/src/content/sharedSessionViewSync.js

@@ -4,11 +4,39 @@
 })(typeof globalThis !== 'undefined' ? globalThis : this, function () {
   'use strict';
 
+  const sameScope = (a, b) => a.accountScopeId === b.accountScopeId
+    && a.projectId === b.projectId && a.generation === b.generation;
+
+  function applySnapshot(options, sessions) {
+    const previous = options.getState(), scope = options.getScope();
+    const next = options.normalize({ ...previous, sessions }, { restoreRunningRuns: false });
+    const unchangedSnapshot = JSON.stringify(next);
+    options.setState(next);
+    try {
+      options.render();
+    } catch (error) {
+      // A callback may replace state, edit it in place or navigate. Restore only
+      // the unchanged view owned by this failed passive application.
+      let unchanged = false;
+      try {
+        unchanged = options.getState() === next && sameScope(scope, options.getScope())
+          && JSON.stringify(options.getState()) === unchangedSnapshot;
+      } catch (_error) { /* Unknown state must not overwrite a newer edit. */ }
+      if (unchanged) {
+        options.setState(previous);
+        // A second render can also fail. The old merge base still protects
+        // subsequent saves, including values from partially restored controls.
+        try { options.render(); } catch (_error) { /* Report the first failure. */ }
+      }
+      throw error;
+    }
+  }
+
   function install(options) {
-    const { Bridge, StorageDb, getScope, getState, isBusy, apply, notice } = options;
+    const { Bridge, StorageDb, getScope, getState, isBusy, notice } = options;
+    const apply = options.apply || (sessions => applySnapshot(options, sessions));
     let saving = 0, version = 0, pending = false, timer = null, refreshing = false, stopped = false;
-    const sameScope = (a, b) => a.accountScopeId === b.accountScopeId
-      && a.projectId === b.projectId && a.generation === b.generation;
+    let retryCount = 0;
     const signature = state => JSON.stringify([state.activeSessionId,
       (state.sessions || []).map(session => [session.id, session.updatedAt, session.task])]);
     function schedule(delay = 250) {
@@ -21,9 +49,10 @@
       if (!scope.projectId || !scope.accountScopeId) { pending = false; return; }
       if (saving || isBusy()) { schedule(1000); return; }
       const local = getState();
-      // A draft or a not-yet-persisted edit always takes priority over passive
-      // history refresh. It remains on screen until the user saves/sends it.
-      if (local.task || (local.sessions || []).some(session => StorageDb.hasUnpersistedSharedSession(session))) {
+      // A locally edited draft or a not-yet-persisted edit takes priority over
+      // passive history refresh. Callers may distinguish imported shared drafts.
+      if ((options.hasLocalDraft ? options.hasLocalDraft(local) : Boolean(local.task))
+        || (local.sessions || []).some(session => StorageDb.hasUnpersistedSharedSession(session))) {
         schedule(1500); return;
       }
       const capturedVersion = version, capturedSignature = signature(local);
@@ -37,12 +66,21 @@
         const ids = new Set(records.map(record => record.id));
         const newLocal = (local.sessions || []).filter(session =>
           !ids.has(session.id) && !StorageDb.wasSharedSessionStored(session.id));
-        // The data has now been adopted by this view; future writes may use it
-        // as a merge baseline. Snapshot reads alone never advance the baseline.
-        StorageDb.adoptSharedSessionBaseline(records);
+        // Rendering may fail after only part of the composer was updated.
+        // Keep the prior merge base until the complete view accepts the data.
         apply([...records, ...newLocal]);
+        if (stopped || !sameScope(scope, getScope())) return;
+        if (saving || version !== capturedVersion) { pending = true; return; }
+        StorageDb.adoptSharedSessionBaseline(records);
+        retryCount = 0;
       } catch (error) {
         notice?.(error);
+        // One retry can recover transient DOM failures. Local edits, navigation
+        // and persistent failures stop it; another notification starts afresh.
+        if (!stopped && sameScope(scope, getScope()) && version === capturedVersion
+          && signature(getState()) === capturedSignature && retryCount < 1) {
+          retryCount++; pending = true;
+        }
       } finally {
         refreshing = false;
         schedule(1000);
@@ -51,7 +89,7 @@
     const unsubscribe = Bridge.subscribe(change => {
       const scope = getScope();
       if (!change.projectId || change.projectId === scope.projectId) {
-        pending = true; schedule();
+        retryCount = 0; pending = true; schedule();
       }
     });
     return {
@@ -68,5 +106,5 @@
       }
     };
   }
-  return { install };
+  return { install, applySnapshot };
 });

package/extension/src/content/subagentActivityView.js

@@ -3,18 +3,31 @@
 })(typeof globalThis !== 'undefined' ? globalThis : window, function subagentActivityViewFactory(Agents, Activity) {
   'use strict';
   function create(deps) {
-    const { tx, getPanel, plain, make, icon, formatElapsed, renderBlocks } = deps;
+    const { tx, getPanel, plain, plainThought, make, icon, formatElapsed, renderBlocks, glyph = () => '' } = deps;
+    const withGlyph = (node, name, label) => {
+      node.insertAdjacentHTML('beforeend', glyph(name));
+      const text = make('span', ''); text.textContent = label; node.append(text);
+      return node;
+    };
     let viewer = null;
     function statusLabel(status) {
       return ({ pending: tx('Starting', '启动中'), running: tx('Running', '运行中'),
         completed: tx('Completed', '已完成'), failed: tx('Failed', '失败'),
         cancelled: tx('Stopped', '已停止'), unknown: tx('Status unconfirmed', '状态未确认') })[status] || '';
     }
+    // A row preview is one plain line: a final message keeps its words, not its
+    // Markdown ("- `main.tex` is …" reads "main.tex is …").
+    function plainMessage(value) {
+      return value.replace(/^\s*(?:#{1,6}\s+|>\s?|[-*+]\s+|\d+[.)]\s+)/gm, '')
+        .replace(/!?\[([^\]]*)\]\([^)\s]*\)/g, '$1').replace(/`([^`\n]+)`/g, '$1')
+        .replace(/(\*\*|__)(?=\S)([\s\S]*?\S)\1/g, '$2').replace(/\s+/g, ' ').trim();
+    }
     function latest(agent) {
       const blocks = Activity.project({ status: agent.status, events: agent.events || [] }).blocks;
       const last = blocks.at(-1);
       const item = last?.kind === 'exploreGroup' ? last.items.at(-1) : last;
-      return plain(item?.meta?.target || item?.meta?.command || item?.event?.title || agent.task).slice(0, 180);
+      const text = plain(item?.meta?.target || item?.meta?.command || item?.event?.title || agent.task);
+      return (item?.kind === 'message' ? plainMessage(text) : text).slice(0, 180);
     }
     function elapsed(agent, run) {
       const duration = Agents.elapsedMs(agent, run, Date.now());
@@ -42,9 +55,9 @@
       shell.setAttribute('aria-label', tx('Subagent conversation', '子代理对话'));
       const header = make('header', 'codex-subagent-view-head');
       const back = make('button', 'codex-subagent-back');
-      back.type = 'button'; back.textContent = tx('Back to main task', '返回主任务');
+      back.type = 'button'; withGlyph(back, 'chevronLeft', tx('Back to main task', '返回主任务'));
       back.addEventListener('click', close);
-      const readonly = make('span', 'codex-subagent-readonly'); readonly.textContent = tx('Read only', '只读');
+      const readonly = withGlyph(make('span', 'codex-subagent-readonly'), 'lock', tx('Read only', '只读'));
       header.append(back, readonly);
       const parent = make('div', 'codex-subagent-parent');
       const parentLabel = make('span', 'codex-subagent-parent-label');
@@ -112,7 +125,7 @@
           const mark = icon('agent'), copy = make('span', 'run-subagent-copy');
           const name = make('span', 'run-subagent-name'), activity = make('span', 'run-subagent-activity');
           copy.append(name, activity);
-          const tail = make('span', 'run-subagent-tail'), status = make('span', ''), time = make('span', 'run-subagent-time');
+          const tail = make('span', 'run-subagent-tail'), status = make('span', 'run-subagent-status'), time = make('span', 'run-subagent-time');
           tail.append(status, time);
           el.append(mark, copy, tail);
           el.addEventListener('click', () => open(card, agent.key, el));
@@ -154,15 +167,17 @@
       const childStatus = Agents.effectiveStatus(agent, card.run);
       viewer.title.textContent = plain(agent.title || agent.jobId || agent.threadId);
       viewer.meta.textContent = [statusLabel(childStatus), elapsed(agent, card.run), agent.model, agent.reasoningEffort].filter(Boolean).join(' · ');
+      viewer.meta.dataset.state = childStatus;
       viewer.prompt.textContent = plain(agent.task);
       viewer.assignment.hidden = !viewer.prompt.textContent;
       const parent = Activity.project(card.run), last = parent.blocks.at(-1);
       const lastItem = last?.kind === 'exploreGroup' ? last.items.at(-1) : last;
-      const parentWork = plain(lastItem?.meta?.target || lastItem?.meta?.command || lastItem?.event?.title).slice(0, 150);
+      const parentWork = plainThought(plain(lastItem?.meta?.target || lastItem?.meta?.command || lastItem?.event?.title)).slice(0, 150);
       viewer.parentLabel.textContent = tx('Main agent · ', '主 agent · ') + (card.run.status === 'running'
         ? parentWork || tx('Working', '处理中') : tx('Run ended', '本轮已结束'));
       const running = (card.run.subagents || []).filter(item => ['pending', 'running'].includes(Agents.effectiveStatus(item, card.run))).length;
       viewer.parentCount.textContent = tx(running + ' subagents active', running + ' 个子任务进行中');
+      viewer.parentCount.hidden = running === 0;
       for (const sibling of card.run.subagents || []) {
         let button = viewer.siblingRows.get(sibling.key);
         if (!button) {
@@ -172,7 +187,8 @@
         }
         button.textContent = plain(sibling.title || sibling.jobId || sibling.threadId);
         button.setAttribute('aria-pressed', String(sibling.key === agent.key));
-        button.title = statusLabel(Agents.effectiveStatus(sibling, card.run));
+        button.dataset.state = Agents.effectiveStatus(sibling, card.run);
+        button.title = statusLabel(button.dataset.state);
       }
       const childRun = { id: card.id + ':' + agent.key, status: ['pending', 'running'].includes(childStatus) ? 'running' : childStatus,
         events: agent.events || [], mode: 'ask' };

package/extension/src/content/updateIdle.js

@@ -5,9 +5,10 @@
     let lastUserActivityAt = Date.now();
     let stableSavedSince = 0;
     let applying = false;
+    let saveIdentity;
     const documentRef = options.document || root.document;
     const noteActivity = event => {
-      if (event?.target?.closest?.('#codex-overleaf-panel')) return;
+      if (!options.includePanelActivity && event?.target?.closest?.('#codex-overleaf-panel')) return;
       lastUserActivityAt = Date.now();
       stableSavedSince = 0;
     };
@@ -42,6 +43,7 @@
         saveResult = { ok: false, state: 'unavailable' };
       }
       const saved = saveResult?.ok === true && ['verified_saved', 'verified_quiet'].includes(saveResult?.state);
+      if (saveResult?.identity !== saveIdentity) { stableSavedSince = 0; saveIdentity = saveResult?.identity; }
       if (saved) {
         stableSavedSince = stableSavedSince || Date.now();
       } else {
@@ -62,6 +64,7 @@
 
     return {
       buildIdleProbe,
+      noteActivity,
       handleMessage,
       isApplying: () => applying
     };

package/extension/src/content/updateNotice.js

@@ -85,9 +85,20 @@
       } catch (_) { manualCommandCopied = false; }
       return;
     }
+    if (action === 'restore-previous' && !window.confirm(restorePreviousConfirmText())) return;
     return runUpdateAction(action);
   }
 
+  function restorePreviousLabel() {
+    const version = currentView?.restorePrevious?.version || '';
+    return version ? tx(`Restore v${version}`, `恢复到 v${version}`) : tx('Restore previous version', '恢复到上一版本');
+  }
+
+  function restorePreviousConfirmText() {
+    return tx('Restore the previous version? The extension reloads, and saved, idle Overleaf tabs are refreshed. Sessions, settings and provider keys are kept.',
+      '恢复到上一版本？扩展会重新加载，已保存且空闲的 Overleaf 标签页会被刷新。会话、设置和模型服务的密钥都会保留。');
+  }
+
   async function runUpdateAction(action) {
     const cancelling = action === 'cancel' || action === 'later';
     if (cancellationInFlight || ((actionInFlight || settingsActionInFlight) && !cancelling)) return;
@@ -105,7 +116,8 @@
         cancel: 'codex-overleaf/consent-update-cancel',
         recover: 'codex-overleaf/consent-update-recover',
         dismiss: 'codex-overleaf/consent-update-dismiss',
-        reload: 'codex-overleaf/consent-update-reload'
+        reload: 'codex-overleaf/consent-update-reload',
+        'restore-previous': 'codex-overleaf/consent-update-rollback'
       }[action]);
       if (sequence === actionSequence) currentView = view;
     } catch (error) {
@@ -226,6 +238,13 @@
       button.dataset.updateSettingsBound = 'true';
       button.addEventListener('click', handleSettingsAction);
     }
+    const restore = panel.querySelector?.('[data-restore-previous-version]');
+    if (restore && restore.dataset.updateSettingsBound !== 'true') {
+      restore.dataset.updateSettingsBound = 'true';
+      restore.addEventListener('click', () => {
+        if (window.confirm(restorePreviousConfirmText())) void runUpdateAction('restore-previous');
+      });
+    }
     renderSettings();
   }
 
@@ -245,6 +264,7 @@
     if (!currentView) return;
     renderSettings();
     if (!notice) return;
+    notice.setAttribute('aria-label', tx('Stable update', '稳定版更新'));
     if (!currentView.showPanel) {
       notice.hidden = true;
       notice.replaceChildren();
@@ -355,7 +375,24 @@
     let statusText = '';
     let buttonText = tx('Check for updates', '检查更新');
 
-    if (['reload_required', 'reload_tabs_required'].includes(stateName)) {
+    if (stateName === 'idle' && state.code === 'update_skipped_after_rollback') {
+      statusText = tx(
+        `v${latestVersion} is skipped because you restored the previous version. Check for updates to install it again.`,
+        `你已恢复到上一版本，自动更新会跳过 v${latestVersion}。点“检查更新”可以重新安装。`
+      );
+    } else if (stateName === 'idle' && state.code === 'update_cooldown') {
+      const until = Number(state.cooldownUntil || 0);
+      const time = until > 0 && Number.isFinite(until) ? new Date(until).toLocaleString(getLocale() || undefined) : '';
+      statusText = tx(
+        `Update v${latestVersion} is paused after a failed installation. ${time ? `Check again after ${time}.` : 'Check again after its cooldown ends.'}`,
+        `v${latestVersion} 安装失败后已暂停更新。${time ? `请在 ${time} 后再次检查。` : '请在冷却期结束后再次检查。'}`
+      );
+    } else if (stateName === 'idle' && !state.code && state.lastCheckedAt > 0
+      && (!latestVersion || !isNewerStableVersion(latestVersion, currentVersion))) {
+      // A finished check with nothing newer still answers the user's question.
+      const time = new Date(state.lastCheckedAt).toLocaleTimeString(getLocale() || undefined, { hour: 'numeric', minute: '2-digit' });
+      statusText = tx(`You have the latest stable version. Checked at ${time}.`, `已是最新稳定版本。检查时间 ${time}。`);
+    } else if (['reload_required', 'reload_tabs_required'].includes(stateName)) {
       summaryText = tx(`Installed v${latestVersion}; running extension v${currentVersion}.`, `已安装 v${latestVersion}；扩展当前运行 v${currentVersion}。`);
       statusText = getCopy(state).detail;
       buttonText = stateName === 'reload_required' ? tx('Reload extension', '重新加载扩展') : tx('Refresh Overleaf tabs', '刷新 Overleaf 标签页');
@@ -373,7 +410,7 @@
       statusText = getCopy(state).detail;
       buttonText = tx('Update in progress', '更新进行中');
     } else if (stateName === 'failed' || stateName === 'rolled_back') {
-      statusText = state.message || getCopy(state).detail;
+      statusText = formatUpdateMessage(state) || getCopy(state).detail;
       buttonText = tx('Retry', '重试');
     } else if (stateName === 'committed') {
       summaryText = tx(`Current v${currentVersion}. Update completed successfully.`, `当前版本 v${currentVersion}。更新已成功完成。`);
@@ -396,11 +433,19 @@
     } else {
       button.disabled = actionInFlight || settingsActionInFlight || ACTIVE_UPDATE_STATES.has(stateName);
     }
+    const restore = settingsRoot.querySelector?.('[data-restore-previous-version]');
+    if (restore) {
+      restore.hidden = !currentView?.actions?.restorePrevious;
+      restore.textContent = restorePreviousLabel();
+      restore.disabled = actionInFlight || settingsActionInFlight;
+    }
   }
 
   function visibleActions(state) {
     const value = currentView?.state || {};
-    if (value.recoveryPending) return [{ id: 'recover', label: tx('Check recovery', '检查恢复状态'), primary: true }];
+    const restore = currentView?.actions?.restorePrevious
+      ? [{ id: 'restore-previous', label: restorePreviousLabel(), primary: false }] : [];
+    if (value.recoveryPending) return [...restore, { id: 'recover', label: tx('Check recovery', '检查恢复状态'), primary: true }];
     if (value.cancelRequested || ['checking', 'downloading'].includes(state)) {
       return [{ id: 'cancel', label: value.cancelRequested
         ? value.code ? tx('Retry cancellation', '重试取消') : tx('Cancelling…', '正在取消…')
@@ -434,7 +479,7 @@
       ];
     }
     if (state === 'committed') {
-      return [{ id: 'dismiss', label: tx('Done', '完成'), primary: true }];
+      return [...restore, { id: 'dismiss', label: tx('Done', '完成'), primary: true }];
     }
     return [];
   }
@@ -443,11 +488,11 @@
     const target = state.latestVersion ? 'v' + state.latestVersion : '';
     if (state.cancelRequested) return {
       eyebrow: tx('Cancelling update', '正在取消更新'), title: target,
-      detail: state.message || tx('Stopping this update and clearing its authorization.', '正在停止本次更新并清理更新授权。')
+      detail: formatUpdateMessage(state) || tx('Stopping this update and clearing its authorization.', '正在停止本次更新并清理更新授权。')
     };
     if (state.recoveryPending) return {
       eyebrow: tx('Checking update recovery', '正在确认更新恢复状态'), title: target,
-      detail: state.message || tx('Waiting for the installed version to be confirmed.', '正在确认实际安装的版本。')
+      detail: formatUpdateMessage(state) || tx('Waiting for the installed version to be confirmed.', '正在确认实际安装的版本。')
     };
     const blocker = blockersCopy(state.blockers?.length ? state.blockers : [state.blocker]);
     return {
@@ -455,11 +500,11 @@
         detail: tx('Reading the latest signed release.', '正在读取最新签名版本。') },
       reload_required: {
         eyebrow: tx('Installed, awaiting reload', '已安装，等待加载'), title: target,
-        detail: state.message || tx('The new files are installed. Reload the extension when Overleaf is saved and idle.', '新版文件已安装，请在 Overleaf 保存并空闲后重新加载扩展。')
+        detail: formatUpdateMessage(state) || tx('The new files are installed. Reload the extension when Overleaf is saved and idle.', '新版文件已安装，请在 Overleaf 保存并空闲后重新加载扩展。')
       },
       reload_tabs_required: {
         eyebrow: tx('Updated runtime is ready', '新版运行组件已就绪'), title: target,
-        detail: state.message || tx('Refresh the saved, idle Overleaf tabs to load the updated panel.', '刷新已保存且空闲的 Overleaf 标签页以加载新版面板。')
+        detail: formatUpdateMessage(state) || tx('Refresh the saved, idle Overleaf tabs to load the updated panel.', '刷新已保存且空闲的 Overleaf 标签页以加载新版面板。')
       },
       manual_install_required: {
         eyebrow: tx('Reinstall needed for this update', '这次更新需要重新安装'),
@@ -504,12 +549,14 @@
       rolled_back: {
         eyebrow: tx('Previous version restored', '已恢复上一版本'),
         title: state.currentVersion ? 'v' + state.currentVersion : '',
-        detail: tx('The replacement failed its health check.', '替换版本未通过健康检查。')
+        detail: state.code === 'update_user_rollback'
+          ? tx('You restored the previous version. Automatic reminders for this version are paused for 24 hours. Check for updates to install it again.', '已恢复到上一版本，刚才退出的版本将暂停自动提醒 24 小时。点“检查更新”可以重新安装。')
+          : tx('The replacement failed its health check.', '替换版本未通过健康检查。')
       },
       failed: {
         eyebrow: tx('Update could not continue', '更新无法继续'),
         title: target,
-        detail: state.message || tx('Review the update details and retry.', '请查看更新详情后重试。')
+        detail: formatUpdateMessage(state) || tx('Review the update details and retry.', '请查看更新详情后重试。')
       }
     }[state.state] || { eyebrow: '', title: '', detail: '' };
   }
@@ -521,6 +568,46 @@
     return `npm exec --yes codex-overleaf-link@${version} -- install-managed`;
   }
 
+  function formatUpdateMessage(state = {}) {
+    const code = state.code || '';
+    const messages = {
+      update_phase_timeout: ['The update timed out and its download was stopped. Retry when the connection is available.', '更新超时，下载已停止。连接恢复后请重试。'],
+      update_not_applied: ['The update was stopped before installation. Retry when ready.', '更新已在安装前停止，可准备就绪后重试。'],
+      update_recovery_pending: ['The update result is being checked. Recovery has not been confirmed.', '正在确认更新结果，恢复状态尚未确认。'],
+      update_rolled_back: ['The previous version has been restored.', '已恢复上一版本。'],
+      update_user_rollback: ['You restored the previous version.', '你已恢复到上一版本。'],
+      update_not_managed: ['Run install-managed once to enable coordinated automatic updates.', '请先运行一次 install-managed，以启用扩展与本机服务的协调更新。'],
+      update_native_busy: ['Native Host is still processing a Codex task.', 'Native Host 仍在处理 Codex 任务。'],
+      update_revoke_too_late: ['The update is already being installed. Wait for its result.', '更新已进入安装，请等待结果。'],
+      update_cancel_unconfirmed: ['Update cancellation is unconfirmed. Check recovery before retrying.', '尚未确认更新已取消，请先检查恢复状态。'],
+      update_apply_unconfirmed: ['Update installation is unconfirmed. Check recovery before retrying.', '尚未确认更新安装结果，请先检查恢复状态。'],
+      update_rollback_unconfirmed: ['Restoring the previous version is unconfirmed. Check recovery before retrying.', '尚未确认旧版本已恢复，请先检查恢复状态。'],
+      update_reload_unavailable: ['No verified installed update is awaiting reload.', '当前没有已验证且等待重载的更新。'],
+      update_network_cancelled: ['The update download was cancelled.', '更新下载已取消。'],
+      update_apply_failed: ['The update could not be installed. Check recovery and retry.', '无法安装更新，请检查恢复状态后重试。']
+    };
+    if (messages[code]) return tx(...messages[code]);
+    if (['update_health_failed', 'update_request_failed', 'update_failed'].includes(code)) return tx('The updated components could not be confirmed. Check recovery before retrying.', '尚未确认更新后的组件正常，请先检查恢复状态。');
+    if (['update_bootstrap_health_timeout', 'update_bootstrap_reload_failed'].includes(code)) return tx('The updated startup components did not finish restarting and confirming. Check recovery before retrying.', '更新后的启动组件未能完成重启和确认，请先检查恢复状态。');
+    if (['update_bootstrap_source_mismatch', 'update_bootstrap_source_version_mismatch'].includes(code)) return tx('The installed startup files do not match a supported update source. Restore the previous version in Settings, or reinstall once.', '已安装的启动文件与支持的升级来源不一致。请在设置中恢复到上一版本，或重新安装一次。');
+    if (['update_bootstrap_record_missing', 'update_bootstrap_record_invalid', 'update_bootstrap_backup_mismatch', 'update_bootstrap_already_restoring'].includes(code)) return tx('The startup recovery material could not be confirmed. The update result remains unconfirmed.', '尚未确认启动组件的恢复材料有效，更新结果仍待确认。');
+    if (['update_bootstrap_confirmation_pending', 'update_bootstrap_native_restart_required'].includes(code)) return tx('Waiting for the updated startup components and Native Host to finish restarting and confirming.', '正在等待更新后的启动组件和本机服务完成重启及确认。');
+    if (code === 'update_bootstrap_monitor_unavailable') return tx('The update recovery monitor could not start. Check recovery before retrying.', '更新恢复监护程序未能启动，请先检查恢复状态。');
+    if (['update_bootstrap_transaction_mismatch', 'update_bootstrap_transaction_invalid'].includes(code)) return tx('The startup update transaction could not be matched. Check recovery before retrying.', '未能匹配启动组件的更新事务，请先检查恢复状态。');
+    if (code.startsWith('update_bootstrap_')) return tx('The startup update package or installed files could not be verified. Check recovery before retrying.', '无法验证启动组件更新包或已安装文件，请先检查恢复状态。');
+    if (['update_reload_required', 'update_reload_busy'].includes(code)) {
+      const match = /^Reload is waiting for Overleaf to be saved and idle \(([^)]+)\)\.$/.exec(state.message || '');
+      if (match) return blockersCopy(match[1].split(', '));
+    }
+    if (['update_check_timeout', 'update_activation_timeout', 'update_status_timeout'].includes(code)) return tx('The update operation timed out. Check recovery or retry when the connection is available.', '更新操作超时，请检查恢复状态，或在连接恢复后重试。');
+    if (['update_candidate_missing', 'update_candidate_stale', 'update_not_staged', 'update_staged_archive_invalid', 'update_recovery_superseded'].includes(code)) return tx('No current verified update is ready. Check for updates again.', '当前没有已验证且可安装的更新，请重新检查更新。');
+    if (['update_authorization_in_progress', 'update_transaction_in_progress', 'update_transaction_locked'].includes(code)) return tx('Another update operation is in progress. Wait for it to finish.', '另一项更新操作正在进行，请等待其完成。');
+    if (['update_authorization_invalid', 'update_consent_required', 'update_consent_mismatch', 'update_transaction_mismatch', 'update_transaction_state_changed'].includes(code)) return tx('The update authorization or transaction changed. Check for updates and authorize the current candidate again.', '更新授权或事务已变化，请重新检查更新并确认当前候选版本。');
+    if (['update_archive_checksum_invalid', 'update_archive_compressed_limit', 'update_archive_duplicate_path', 'update_archive_file_count_limit', 'update_archive_file_limit', 'update_archive_invalid', 'update_archive_path_forbidden', 'update_archive_path_too_long', 'update_archive_required_file_missing', 'update_archive_total_limit', 'update_archive_truncated', 'update_archive_type_forbidden', 'update_staging_not_empty', 'update_operation_invalid', 'update_bundle_hash_invalid', 'update_bundle_name_invalid', 'update_bundle_size_invalid', 'update_manifest_artifacts_invalid', 'update_manifest_commit_invalid', 'update_manifest_invalid', 'update_manifest_manual_install_invalid', 'update_manifest_origin_mismatch', 'update_manifest_protocol_invalid', 'update_manifest_schema_unsupported', 'update_manifest_timestamp_invalid', 'update_manifest_too_large', 'update_manifest_version_invalid', 'update_signature_algorithm_unsupported', 'update_signature_invalid', 'update_signature_key_invalid', 'update_signature_key_unknown', 'update_signature_too_large', 'update_version_invalid'].includes(code)) return tx('The signed update or archive could not be verified. Check the release details and retry.', '无法验证更新签名或压缩包，请检查发布详情后重试。');
+    if (['update_github_http_error', 'update_github_response_invalid', 'update_asset_missing', 'update_asset_url_forbidden', 'update_release_asset_invalid', 'update_release_manifest_mismatch', 'update_bundle_size_mismatch', 'update_bundle_hash_mismatch', 'update_native_version_mismatch', 'update_extension_version_mismatch', 'update_runtime_manifest_invalid', 'update_runtime_asset_missing', 'update_bootstrap_manifest_invalid', 'update_managed_layout_invalid', 'update_marker_invalid', 'update_current_version_invalid', 'update_health_version_mismatch', 'update_confirmation_unexpected', 'update_rollback_unavailable'].includes(code)) return tx('The update or installed files could not be verified. Check the update details and repair or retry.', '无法验证更新或已安装文件，请检查更新详情后修复或重试。');
+    return state.message || '';
+  }
+
   function blockerCopy(value) {
     return {
       unsaved: tx('Overleaf has not confirmed that this document is saved.', 'Overleaf 尚未确认当前文档已保存。'),
@@ -541,6 +628,7 @@
       tab_unavailable: tx('An Overleaf tab is unavailable for the safety check.', '某个 Overleaf 标签页当前无法完成安全检查。'),
       idle_probe_failed: tx('The Overleaf safety check failed. Reload the affected tab and retry.', 'Overleaf 安全检查失败；请刷新受影响的标签页后重试。'),
       native_project_locked: tx('Native Host still holds a project lock.', 'Native Host 仍持有项目锁。'),
+      native_process_stop_unconfirmed: tx('A previous Codex process has not yet confirmed its exit.', '前一次 Codex 进程尚未确认退出。'),
       native_run_active: tx('Native Host is still processing a task.', 'Native Host 仍在处理任务。'),
       busy: tx('A component is still busy.', '某个组件仍处于忙碌状态。')
     }[value] || tx('Waiting until every Overleaf tab is saved and idle.', '正在等待所有 Overleaf 标签页完成保存并进入空闲状态。');
@@ -555,14 +643,32 @@
   }
 
   function manualReasonText(state = {}) {
+    if (state.code === 'prerelease_promotion_requires_manual_update') {
+      return tx('The installed release candidate has the same version number as the stable release. Reinstall to use the stable release.',
+        '已安装的候选版与稳定版使用相同版本号。请重新安装以使用稳定版。');
+    }
+    if (state.code === 'update_bootstrap_source_mismatch') {
+      return tx('The installed startup files differ from the published release this update starts from, for example after a release candidate or local build. Reinstall once to continue.',
+        '已安装的启动文件与这次更新所基于的正式版不一致（例如装过候选版或本地构建）。重新安装一次即可继续。');
+    }
     const reason = state.manualReason || {};
     return tx(reason.en || reason.zh || '', reason.zh || reason.en || '');
   }
 
+  // Compares the numeric x.y.z core only; a local build ahead of the release is not behind.
+  function isNewerStableVersion(candidate, current) {
+    const parts = value => String(value || '').replace(/^v/i, '').split('-')[0].split('.').map(part => Number(part) || 0);
+    const [left, right] = [parts(candidate), parts(current)];
+    for (let index = 0; index < 3; index++) {
+      if ((left[index] || 0) !== (right[index] || 0)) return (left[index] || 0) > (right[index] || 0);
+    }
+    return false;
+  }
+
   function tx(english, chinese) {
     const locale = String(getLocale() || document.documentElement?.lang || 'en');
     return /^zh\b/i.test(locale) ? chinese : english;
   }
 
-  return Object.freeze({ mount });
+  return Object.freeze({ mount, refreshLocale: render });
 });

package/extension/src/content/updateSafetyReceiver.js

@@ -0,0 +1,58 @@
+(function installUpdateSafetyReceiver(root) {
+  'use strict';
+  if (root.__codexOverleafUpdateSafetyReceiverInstalled) return;
+  let binding, idle, inFlight = false;
+  const blocked = () => ({ idle: false, saved: false, blockers: ['tab_probe_unavailable'] });
+  function install(next, dependencies) {
+    if (!next?.transactionId || !next.token || next.url !== location.href) return { ok: false };
+    if (binding) {
+      if (binding.transactionId !== next.transactionId || binding.targetVersion !== next.targetVersion
+        || binding.documentId !== next.documentId || binding.url !== next.url || inFlight) return { ok: false };
+      binding = Object.freeze({ ...next });
+      return { ok: true, url: location.href };
+    }
+    binding = Object.freeze({ ...next });
+    const pageWrites = new Set();
+    const visible = node => !node.hidden && node.getAttribute('aria-hidden') !== 'true' && node.getClientRects().length > 0;
+    const { UpdateIdle, PageRpcContract } = dependencies;
+    idle = UpdateIdle.create({ document, includePanelActivity: true,
+      getBusyState: () => ({ reviewAction: pageWrites.size > 0
+          || [...document.querySelectorAll('#codex-overleaf-panel [data-run-accept-confirm], #codex-overleaf-panel button:disabled')]
+            .some(node => visible(node) && (node.hasAttribute('data-run-accept-confirm') || /Accepting|接受中/.test(node.textContent)
+              || (node.hasAttribute('data-run-undo') && !/Undone|已撤销/.test(node.textContent)
+                && !/Accepted|已接受/.test(node.closest('[data-run-id]')?.querySelector('[data-run-accept]')?.textContent || '')))),
+        run: document.querySelector('#codex-overleaf-panel')?.dataset.running === 'true',
+        cancelling: document.querySelector('#codex-overleaf-panel')?.dataset.cancelling === 'true',
+        dialog: [...document.querySelectorAll('[role="dialog"], dialog[open]')].some(visible) }),
+      checkSaved: async () => {
+        const response = await chrome.runtime.sendMessage({ type: 'codex-overleaf/migration-save-probe', ...binding,
+          nonce: activeNonce });
+        return response?.ok && response.nonce === activeNonce ? response.result : { ok: false, state: 'unavailable' };
+      } });
+    root.addEventListener('message', event => {
+      if (event.source !== root || event.origin !== location.origin || typeof event.data?.id !== 'string') return;
+      const data = event.data;
+      const mutation = PageRpcContract.getMethod(data.method)?.mutation;
+      if (data.source === 'codex-overleaf/content' && ['document', 'page_state', 'navigation'].includes(mutation)) {
+        pageWrites.add(data.id); idle.noteActivity();
+      } else if (data.source === 'codex-overleaf/page' && pageWrites.delete(data.id)) idle.noteActivity();
+    });
+    chrome.runtime.onMessage.addListener((message, sender, respond) => {
+      if (message?.type !== 'codex-overleaf/migration-idle-probe') return undefined;
+      if (sender?.id !== chrome.runtime.id || sender.tab || message.token !== binding.token
+        || message.transactionId !== binding.transactionId || typeof message.nonce !== 'string'
+        || !message.nonce || location.href !== binding.url || inFlight) { respond(blocked()); return false; }
+      inFlight = true;
+      activeNonce = message.nonce;
+      idle.buildIdleProbe().then(result => respond(location.href === binding.url ? {
+        ...result, transactionId: binding.transactionId, token: binding.token, nonce: message.nonce,
+        url: location.href, targetVersion: binding.targetVersion, safetyOnly: true
+      } : blocked())).catch(() => respond(blocked())).finally(() => { inFlight = false; activeNonce = ''; });
+      return true;
+    });
+    return { ok: true, url: location.href };
+  }
+  let activeNonce = '';
+  root.CodexOverleafUpdateSafetyReceiver = Object.freeze({ install });
+  root.__codexOverleafUpdateSafetyReceiverInstalled = true;
+})(globalThis);

package/extension/src/content/writebackController.js

@@ -10,6 +10,13 @@
   function buildSyncApplyOperations(syncChanges = [], project = {}) {
     const existingPaths = new Set((project.files || []).map(file => file.path));
     return (syncChanges || []).map(change => {
+      // Keep an old Native move distinct so preflight can reject it safely.
+      // Falling through would turn a move into an empty create operation.
+      if (change.type === 'move') {
+        return { type: 'move', path: change.path, to: change.to,
+          moveProof: change.moveProof && typeof change.moveProof === 'object' ? { ...change.moveProof } : undefined,
+          reason: 'Move the existing Overleaf file while preserving its identity.' };
+      }
       if (change.type === 'binary-create' || change.type === 'overwrite-binary') {
         return {
           type: change.type,
@@ -22,6 +29,7 @@
           previousExists: change.previousExists === true,
           previousKind: change.previousKind || '',
           previousSize: Number.isFinite(Number(change.previousSize)) ? Number(change.previousSize) : undefined,
+          ...(typeof change.previousSha256 === 'string' ? { previousSha256: change.previousSha256 } : {}),
           reasonKey: change.type === 'overwrite-binary' ? 'localWorkspaceBinaryOverwrite' : 'localWorkspaceBinaryCreate',
           reason: change.type === 'overwrite-binary'
             ? 'Synced a binary asset replacement from the local Codex workspace.'
@@ -158,14 +166,18 @@
 
       if ((operation.type === 'rename' || operation.type === 'move') && operation.to) {
         const previous = filesByPath.get(operation.path) || originalByPath.get(operation.path);
+        const destination = filesByPath.get(operation.to);
+        const binary = operation.moveProof?.kind === 'binary' || previous?.kind === 'binary';
         filesByPath.delete(operation.path);
         filesByPath.set(operation.to, {
           ...(previous || {}),
+          ...(destination || {}),
           path: operation.to,
-          kind: 'text',
-          content: result.verifiedContent || previous?.content || '',
+          kind: binary ? 'binary' : 'text',
+          ...(!binary ? { content: result.verifiedContent ?? destination?.content ?? previous?.content ?? '' } : {}),
           source: 'verified-writeback'
         });
+        if (binary) delete filesByPath.get(operation.to).content;
         continue;
       }
 
@@ -227,10 +239,15 @@
       ? changeOrReason
       : { reason: changeOrReason };
     const reason = change.reason;
+    if (reason === 'snapshot_content_unavailable') {
+      return isEnglish
+        ? 'Current Overleaf content was not read; local changes were withheld until the file can be refreshed.'
+        : '未读取该文件当前的 Overleaf 内容；刷新取得内容前，本地改动不会写回。';
+    }
     if (reason === 'selection_scope_violation') {
       return isEnglish
-        ? 'The local changes exceeded the captured selection. No changes from this task were written back.'
-        : '本地改动超出了已附加的选区，本轮改动未写回。';
+        ? 'This local change exceeded the captured selection and was withheld. Independently valid selection changes may still be written.'
+        : '该项本地改动超出了已附加的选区，已阻止写回；独立且合法的选区内改动仍可写入。';
     }
     if (reason === 'generated_artifact') {
       return isEnglish
@@ -314,6 +331,13 @@
       if (!path || result.ok === false) { unsupported.push(path || 'unknown'); continue; }
       if (operation.type === 'delete') { expected.set(path, { absent: true }); continue; }
       if (operation.type === 'rename' || operation.type === 'move') {
+        const moveProof = result.moveProof || operation.moveProof;
+        if (moveProof?.v === 1 && moveProof.kind === 'binary' && /^[a-f0-9]{64}$/i.test(moveProof.sha256 || '')) {
+          if (!operation.to || (operation.moveProof?.sha256 && operation.moveProof.sha256 !== moveProof.sha256)) { unsupported.push(path); continue; }
+          if (operation.to !== path) expected.set(path, { absent: true });
+          expected.set(operation.to, { sha256: moveProof.sha256.toLowerCase() });
+          continue;
+        }
         const content = typeof result.verifiedContent === 'string'
           ? result.verifiedContent : original.get(path)?.content;
         if (!operation.to || typeof content !== 'string') { unsupported.push(path); continue; }
@@ -448,6 +472,30 @@
     } };
   }
 
+  async function buildMirrorWritebackConfirmation(applied = {}) {
+    const entries = Array.isArray(applied.applied) ? applied.applied : [];
+    if (!entries.length) return null;
+    const postImages = new Map();
+    for (const entry of entries) {
+      const operation = entry?.operation, result = entry?.result;
+      if (operation?.type !== 'edit' || typeof operation.path !== 'string' || !operation.path || result?.ok !== true
+        || result.verified !== true || typeof result.verifiedContent !== 'string') return null;
+      // Several edits can target one file; the last verified readback is its post-image.
+      postImages.set(operation.path, result.verifiedContent);
+    }
+    try {
+      const expectedFiles = [];
+      for (const [path, content] of postImages) {
+        const sha256 = await textDigest(content);
+        if (!/^[a-f0-9]{64}$/.test(sha256)) return null;
+        expectedFiles.push({ path, sha256 });
+      }
+      return { paths: expectedFiles.map(file => file.path), expectedFiles };
+    } catch (_error) {
+      return null; // No digest evidence: use the authoritative snapshot fallback.
+    }
+  }
+
   async function bytesDigest(bytes) {
     if (!globalThis.crypto?.subtle) return '';
     const digest = await globalThis.crypto.subtle.digest('SHA-256', bytes);
@@ -543,6 +591,7 @@
 
   return {
     confirmPostWriteSave,
+    buildMirrorWritebackConfirmation,
     buildSaveCheck,
     confirmSaveCheck,
     buildSavedWritebackExpectations,