codex-overleaf-link 2.5.1 → 2.6.5

package/extension/src/content/contentRuntime.js

@@ -33,6 +33,7 @@
   const RUN_PROJECT_SYNC_MAX_AGE_MS = 30000;
   const RUN_SNAPSHOT_ZIP_TIMEOUT_MS = 30000;
   const STREAM_RENDER_FLUSH_MS = 80;
+  const REVIEWING_CONFIRM_TIMEOUT_MS = 120000;
   const STREAM_SAVE_DELAY_MS = 1000;
   const MAX_RUN_EVENTS = 300;
   const MAX_SAFE_UNDO_REPLACEALL_CHARS = 2000;
@@ -98,7 +99,8 @@
     recordSessionResult,
     selectVisibleSessionsForList,
     setActiveSession,
-    updateActiveSession
+    updateActiveSession,
+    updateActiveSessionDraft
   } = Modules.SessionState;
   const LineReferences = Modules.LineReferences;
   const { getProjectStorageKey } = Modules.StorageKeys;
@@ -403,7 +405,10 @@
     },
     getPanel: () => panel,
     getState: () => state,
-    setState: next => { state = next; },
+    setState: next => {
+      if (next.activeSessionId !== state?.activeSessionId) composerDraftEditedHere = false;
+      state = next;
+    },
     getCurrentRunView: () => currentRunView,
     getSettingsPanelInstance: () => settingsPanelInstance,
     prepareRetryReplacement: (run, task) => prepareRetryReplacement(run, task)
@@ -424,7 +429,10 @@
   const sessionForkController = Modules.SessionForkController.create({
     SessionState: Modules.SessionState,
     getState: () => state,
-    setState: next => { state = next; },
+    setState: next => {
+      if (next.activeSessionId !== state?.activeSessionId) composerDraftEditedHere = false;
+      state = next;
+    },
     getScope: () => ({ accountScopeId: cachedAccountScopeId, projectId: getCurrentProjectId(), generation: spaRouteGeneration }),
     sendBackgroundNative, saveState,
     getEnabledCodexLocalSkillIds: () => getEnabledCodexLocalSkillIds(),
@@ -440,15 +448,14 @@
   });
   const runResultActions = Modules.RunResultActions.create({
     tr,
-    getLocale,
     forkRunFromNode: sessionForkController.forkRunFromNode
   });
   const runTimelineView = Modules.RunTimelineView.create({
     RunActivitySummary: Modules.RunActivitySummary,
     RunPresence: Modules.RunPresence,
+    PanelIcons: Modules.PanelIcons,
     // recentProjects is composed below; the empty state only reads it after startup.
     getProjectName: () => { try { return recentProjects.readCurrentProjectNameFromDom(); } catch { return ''; } },
-    getCurrentProjectId: () => getCurrentProjectId(),
     RunActivityModel: Modules.RunActivityModel,
     SubagentActivityView: Modules.SubagentActivityView,
     RunGuidanceView: Modules.RunGuidanceView,
@@ -458,6 +465,7 @@
     RunFailureNotice: Modules.RunFailureNotice,
     I18n: i18n,
     FailureReasons,
+    projectContextLimitEvent: event => Modules.AgentTranscript.projectContextLimitEvent(event, getLocale()),
     localizeVisibleReason: value => localizeVisibleReason(value),
     localizeCompileReason: value => Modules.CompileAdapter.localizeCompileReason(value, getLocale()),
     tr,
@@ -477,7 +485,8 @@
     cssEscape,
     renderMarkdownInlineText,
     renderMarkdownBlockText,
-    decorateCompletionReport: Modules.MarkdownDomRenderer.decorateCompletionReport,
+    decorateCompletionReport: (container, options) => Modules.MarkdownDomRenderer.decorateCompletionReport(container,
+      { ...options, formatOperationType }),
     sanitizeAssistantVisibleText,
     sanitizeAssistantVisibleValue,
     buildMarkdownInlineNodes,
@@ -521,6 +530,7 @@
     SessionPanel: Modules.SessionPanel,
     SessionState: Modules.SessionState,
     SessionMenuView: Modules.SessionMenuView,
+    PanelIcons: Modules.PanelIcons,
     tr,
     showPluginConfirm,
     showPluginToast,
@@ -528,10 +538,29 @@
     saveState,
     saveStateSoon,
     readPanelInputs,
+    flushComposerDraft: () => flushComposerDraft({ requireDurable: true }),
+    setSessionTransition: pending => {
+      if (pending) {
+        closeSlashMenu();
+        contextUsageView?.close();
+      }
+      const ready = composerPanelInstance?.setSessionTransition(pending);
+      syncComposerSendAvailability();
+      if (!pending && deferredSessionStart) {
+        const deferred = deferredSessionStart;
+        deferredSessionStart = null;
+        if (deferred.scope === getComposerDraftScope()) runQueueScheduler?.scheduleOne(deferred.sessionId);
+      }
+      return ready;
+    },
+    getDraftScope: getComposerDraftScope,
     applyStateToPanel, syncSessionProvider: () => providerSettingsCoordinator.syncSessionProvider(),
     getPanel: () => panel,
     getState: () => state,
-    setState: next => { state = next; },
+    setState: next => {
+      if (next.activeSessionId !== state?.activeSessionId) composerDraftEditedHere = false;
+      state = next;
+    },
     getSessionPanelInstance: () => sessionPanelInstance,
     formatSessionTime
   });
@@ -595,6 +624,7 @@
         selectionContext: value,
         ...(options.edit ? { mode: 'auto' } : {})
       });
+      syncProbeStatus();
       if (options.edit && panel) {
         const modeInput = panel.querySelector('[data-mode]');
         if (modeInput) modeInput.value = 'auto';
@@ -667,6 +697,8 @@
     showPluginConfirm, formatOperationFiles, getAppliedEntries, getSkippedEntries
   });
   const writebackOrchestrator = Modules.WritebackOrchestrator.create({
+    mirrorFenceStore: root.CodexOverleafModuleRegistry.resolve('ScopedPersistenceBrowserAdapter'),
+    getAccountScopeId: () => cachedAccountScopeId,
     tr,
     tx,
     getLocale,
@@ -762,6 +794,7 @@
       || { providerId: state?.providerId || 'builtin', providerRevision: 0 },
     readSelectedSpeedInput,
     getRenderedModelEntries,
+    onSelectionRendered: renderContextUsage,
     persistPanelInputs,
     closeDiagnosticsMenu,
     closeCustomInstructionsSettings,
@@ -813,20 +846,19 @@
   });
   // v1.8.1 D3: the dashboard was a one-shot render — another tab finishing a
   // run, clearing history or creating sessions never showed up. Refresh it
-  // (debounced) when the tab regains visibility or a cross-tab run signal
-  // arrives while the dashboard view is active.
+  // (debounced) on visibility, cross-tab run signals, and shared-history changes.
   let dashboardRefreshTimer = null;
   function refreshDashboardSoon() {
-    if (panel?.dataset.view !== 'recent-projects') {
+    if (panel?.dataset.view !== 'recent-projects' || document.visibilityState !== 'visible') {
       return;
     }
     clearTimeout(dashboardRefreshTimer);
     dashboardRefreshTimer = setTimeout(() => {
-      if (panel?.dataset.view !== 'recent-projects') {
+      if (panel?.dataset.view !== 'recent-projects' || document.visibilityState !== 'visible') {
         return;
       }
       // Never clobber an in-progress inline rename (fleet P2) — retry later.
-      if (panel.querySelector('.recent-projects-sessions input')) {
+      if (panel.querySelector('.recent-projects-session-rename-input')) {
         refreshDashboardSoon();
         return;
       }
@@ -834,18 +866,17 @@
       const expanded = Array.from(panel.querySelectorAll('[data-project-row-wrap][data-expanded="true"]'))
         .map(wrap => wrap.getAttribute('data-project-row-wrap'))
         .filter(Boolean);
-      const rootEl = panel.querySelector('[data-recent-projects-root]');
-      recentProjects.renderRecentProjectsVariant({
-        restoreExpanded: expanded,
-        restoreScrollTop: rootEl ? rootEl.scrollTop : undefined
-      }).catch(() => { /* keep last render */ });
+      recentProjects.refreshDashboardView({ restoreExpanded: expanded }).catch(() => { /* keep last render */ });
     }, 400);
   }
   document.addEventListener('visibilitychange', () => {
     if (document.visibilityState === 'visible') {
       refreshDashboardSoon();
+    } else {
+      flushComposerDraftOnLeave();
     }
   });
+  window.addEventListener('pagehide', flushComposerDraftOnLeave);
 
   const recentProjects = Modules.RecentProjects.create({
     ProjectSessionCleanup: Modules.ProjectSessionCleanup,
@@ -887,6 +918,7 @@
   const MAX_ATTACHMENT_PREVIEW_DATA_URL_CHARS = 768 * 1024;
   const composerAttachmentController = Modules.ComposerAttachments.createComposerAttachmentController({
     getPanel: () => panel,
+    icons: Modules.PanelIcons,
     tr,
     tx,
     appendPlainLog,
@@ -917,11 +949,14 @@
   });
   const contextTrayController = ContextTray.createContextTrayController({
     root: window,
+    icons: Modules.PanelIcons,
     document,
     getPanel: () => panel,
     getState: () => state,
     setState: nextState => {
       state = nextState;
+      // Paint focus changes before ContextTray waits for durable persistence.
+      syncProbeStatus();
     },
     saveState,
     saveStateSoon,
@@ -985,6 +1020,7 @@
   let settingsPanelInstance = null;
   let diagnosticsPanelInstance = null;
   let composerPanelInstance = null;
+  let contextUsageView = null;
   let state = null;
   let storageKey = LEGACY_STORAGE_KEY;
   let globalPreferencesController = null;
@@ -992,9 +1028,14 @@
   let runSubmissionPending = false;
   let pendingRetryReplacement = null;
   let runQueueScheduler = null;
+  let deferredSessionStart = null;
   let runInputCoordinator = null;
   const activeTurnControl = ActiveTurnControl.create({ chrome });
   let saveStateTimer = null;
+  const DRAFT_SAVE_DELAY_MS = 800;
+  const DRAFT_SAVE_MAX_WAIT_MS = 4000;
+  let draftSaveTimer = null;
+  let pendingDraftSave = null;
   // Two-phase saveState scheduling. `saveStateInFlight` flips to true while
   // an async saveState() is actually writing; `saveStateRunAfterFlight` is
   // set when a fresh saveStateSoon() fires during the in-flight phase. When
@@ -1011,6 +1052,8 @@
   let storageNoticeKeys = new Set();
   let composerSkillInvocation = null;
   let composerDraftRevision = 0;
+  // Page-local provenance only; the draft itself stays shared per conversation.
+  let composerDraftEditedHere = false;
   let slashCodexOverleafSkills = [];
   let slashCodexOverleafSkillsLoaded = false;
   let slashCodexOverleafSkillsLoading = false;
@@ -1033,6 +1076,7 @@
     showPluginToast,
     getPanel: () => panel,
     ensurePanelOpen,
+    getIconUrl: () => chrome.runtime.getURL('assets/icons/codex-overleaf-dialog-icon.png'),
     getPanelRendererInstance: () => panelRendererInstance,
     setBadge: (...args) => PanelRenderer.setBadge(...args),
     setDiagnosticsHealth,
@@ -1051,7 +1095,7 @@
     getBusyState: () => ({
       run: Boolean(currentRunView),
       cancelling: runCancellationRequested,
-      storage: saveStateInFlight || Boolean(saveStateTimer),
+      storage: saveStateInFlight || Boolean(saveStateTimer) || Boolean(pendingDraftSave),
       reviewAction: trackedChangeInFlight.size > 0,
       dialog: Boolean(pluginConfirmController?.isOpen())
     }),
@@ -1081,7 +1125,7 @@
   chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
     if (message?.type === 'codex-overleaf/runtime-health-probe') {
       sendResponse?.({
-        ok: true,
+        ok: true, runOwnerProtocol: 2, runOwners: [activeTurnControl.getOwner()].filter(Boolean),
         version: CodexOverleafCompatibility?.BUILD_TARGET_VERSION || chrome.runtime.getManifest().version
       });
       return false;
@@ -1146,6 +1190,7 @@
     await refreshAccountScopeId();
     storageKey = getProjectStorageKey(LEGACY_STORAGE_KEY, window.location.href);
     state = normalizeLoadedPanelState(await loadStoredState());
+    composerDraftEditedHere = false;
     await getRunReviewController().recoverInterruptedUndoStatuses();
     initializeRunQueueScheduler();
     recoverInterruptedRunJournals()
@@ -1251,7 +1296,6 @@
         callbacks: {
           onLauncherToggle: () => ensurePanelOpen(),
           onClosePanel: () => closePanel(),
-          onRefresh: () => refreshProbe({ userInitiated: true }),
           onNewSession: () => startNewSession(),
           onChangeHistory: () => openChangeHistory(),
           onSettingsClick: () => toggleCustomInstructionsSettings(),
@@ -1273,7 +1317,9 @@
       diagnosticsPanelInstance = DiagnosticsPanel.create({
         container: panelRendererInstance.diagnosticsSlot,
         i18n: { tr },
+        icons: Modules.PanelIcons,
         callbacks: {
+          onRefresh: () => refreshProbe({ userInitiated: true }),
           onBeforeOpen: () => {
             closeModelConfigPopover();
             closeContextTray();
@@ -1311,6 +1357,7 @@
         projectId: getCurrentProjectId(),
         i18n: { tr },
         button: panel.querySelector('[data-custom-instructions-settings]'),
+        getProjectName: () => { try { return recentProjects.readCurrentProjectNameFromDom(); } catch { return ''; } },
         callbacks: {
           onBack: () => closeCustomInstructionsSettings(),
           onInputChange: event => persistPanelInputs(event),
@@ -1351,9 +1398,12 @@
       composerPanelInstance = ComposerPanel.create({
         container: panelRendererInstance.composerSlot,
         i18n: { tr },
+        icons: Modules.PanelIcons,
         attachmentController: composerAttachmentController,
         callbacks: {
           onSubmit: () => safeRunTask(),
+          getTaskScope: getComposerDraftScope,
+          getTaskValue: () => state.task,
           isRunning: () => Boolean(currentRunView),
           onCancel: () => cancelActiveRun(),
           onPaste: handleComposerPaste,
@@ -1369,7 +1419,7 @@
           onAttachClick: () => panel.querySelector('[data-attach-input]')?.click(),
           onAttachInput: handleAttachInputChange,
           onContextRefresh: () => loadContextFiles({ force: true }),
-          onModelConfigToggle: () => toggleModelConfigPopover(),
+          onModelConfigToggle: () => { contextUsageView?.close(); toggleModelConfigPopover(); },
           onModelConfigChoiceClick: event => {
             handleModelConfigChoiceClick(event).catch(error => {
               appendPlainLog(tx(`Failed to update model settings: ${error.message}`, `更新模型设置失败：${error.message}`));
@@ -1382,6 +1432,18 @@
         }
       });
 
+      contextUsageView = Modules.ContextUsageView.create({
+        getPanel: () => panel, getLocale, tr,
+        onOpen: () => {
+          closeModelConfigPopover();
+          closeContextTray();
+          closeSlashMenu();
+        },
+        getCompactAvailability,
+        level: Modules.ContextUsage.level,
+        onCompact: () => safeRunTask({ operation: 'compact' })
+      });
+      renderContextUsage();
       installContextDismiss();
       installModelConfigDismiss();
       bindLogAutoFollow();
@@ -1393,7 +1455,7 @@
       primeCodexLocalSkillsCatalog().catch(() => { /* retry through settings, slash, or submission */ });
     }
 
-    PanelRenderer.setVisible(panel, true);
+    PanelRenderer.setVisible(panelRendererInstance, true);
   }
 
   // Panel prefetch and first submission share the same official catalog read.
@@ -1559,7 +1621,7 @@
     panelRendererInstance?.setLocale?.({ launcher: tx('Show or hide Codex panel', '显示或隐藏 Codex 边栏'), close: tx('Close Codex panel', '关闭 Codex 边栏') });
 
     setElementTitleAndAria('[data-panel-resize-handle]', tr('resizePanel'), tr('resizePanel'));
-    setElementTitleAndAria('[data-refresh]', tr('refreshProbe'), tr('refreshProbe'));
+    setRefreshProbeLoading(panel?.querySelector('[data-refresh]')?.dataset.loading === 'true');
     // State-dependent tooltip: re-derive from the dot's current health so a
     // locale/session refresh doesn't clobber it back to the generic label.
     setDiagnosticsHealth(panel.querySelector('[data-diagnostics-health-dot]')?.dataset.health || 'unknown');
@@ -1610,7 +1672,7 @@
     }
     const reviewToggle = panel.querySelector('.codex-review-toggle');
     if (reviewToggle) {
-      reviewToggle.title = tr('requireReviewingTitle');
+      syncReviewingTooltip();
     }
     const recompileToggle = panel.querySelector('.codex-recompile-toggle');
     if (recompileToggle) {
@@ -1633,7 +1695,11 @@
     updateExperimentalOtMenuStatus();
     renderModelConfigChoices();
     updateModelDisplay();
+    // The header switcher's title and accessible name carry localized text too.
+    applySessionLabel();
     renderSessionList();
+    renderContextUsage();
+    if (panel.querySelector('[data-slash-menu]')?.hidden === false) updateSlashMenuForTaskInput();
     renderContextSelection();
     renderContextSummary();
     renderPendingInputs();
@@ -1810,7 +1876,8 @@
     // Capture the click before any preparation can yield to another draft/session.
     readPanelInputs();
     const queuedInput = options.queuedInput || null;
-    const task = String(queuedInput?.text || state.task || '').trim();
+    const compact = !queuedInput && options.operation === 'compact';
+    const task = compact ? '/compact' : String(queuedInput?.text || state.task || '').trim();
     if (!task) {
       appendLog(tx('Enter a task first.', '请先输入任务。'));
       return;
@@ -1818,32 +1885,38 @@
     const submittedSessionId = state.activeSessionId;
     const submittedSession = runController.captureSessionContext(state);
     const submittedThreadId = getActiveSession(state)?.codexThreadId || '';
+    if (compact && !submittedThreadId) {
+      showPluginToast(tr('compactNoThread'), { status: 'info' });
+      return;
+    }
     const submittedDraft = state.task;
     const submittedRetryReplacement = pendingRetryReplacement;
     const submittedWritingStyleScope = { accountScopeId: cachedAccountScopeId, projectId: getCurrentProjectId() };
     const submittedPanelState = {
-      mode: state.mode,
+      mode: compact ? 'ask' : state.mode,
       providerId: state.providerId,
       model: state.model,
       reasoningEffort: state.reasoningEffort,
       speedTier: state.speedTier,
       autoRecompile: state.autoRecompile !== false,
       requireReviewing: state.requireReviewing === true,
-      focusFiles: getActiveFocusFiles(),
-      selectionContext: selectionContextView.capture()
+      focusFiles: compact ? [] : getActiveFocusFiles(),
+      selectionContext: compact ? null : selectionContextView.capture()
     };
     const queuedContext = queuedInput
       ? RunInputQueue.normalizeSubmissionContext(queuedInput.payload?.submissionContext) : null;
     const submittedCustomInstructions = queuedContext ? queuedContext.customInstructions : getCustomInstructionsForCurrentProject();
     const submittedSkillLoadingSettings = queuedContext ? queuedContext.skillLoadingSettings : getSkillLoadingSettings();
-    const submittedAttachments = queuedInput ? [] : getComposerAttachmentsForRun();
-    const submittedSkillInvocation = queuedContext ? queuedContext.skillInvocation : getComposerSkillInvocationForRun();
+    const submittedAttachments = queuedInput || compact ? [] : getComposerAttachmentsForRun();
+    const submittedSkillInvocation = compact ? null : queuedContext ? queuedContext.skillInvocation : getComposerSkillInvocationForRun();
     let submittedEnabledSkillIds = queuedContext ? queuedContext.enabledCodexOverleafSkillIds : getEnabledCodexOverleafSkillIds();
     const submittedSkillEnabled = { ...state.codexOverleafSkillEnabled };
     const submittedLocalSkillEnabled = { ...state.codexLocalSkillEnabled };
     const submittedSelectionRevision = selectionContextView.getRevision?.();
-    let submittedEnabledLocalSkillIds = queuedContext ? queuedContext.enabledCodexLocalSkillIds : [];
-    if (!queuedInput && submittedSkillLoadingSettings.loadCodexLocalSkills !== false) {
+    let submittedEnabledLocalSkillIds = queuedContext ? queuedContext.enabledCodexLocalSkillIds : compact ? getEnabledCodexLocalSkillIds() : [];
+    // Capture submission first; a save must not adopt text typed while it waits.
+    if (!queuedInput) await flushComposerDraft({ requireDurable: true });
+    if (!compact && !queuedInput && submittedSkillLoadingSettings.loadCodexLocalSkills !== false) {
       const localSkills = await primeCodexLocalSkillsCatalog({ required: true, force: submittedSkillInvocation?.scope === 'codex-local' });
       submittedEnabledLocalSkillIds = localSkills.filter(skill => Object.hasOwn(submittedLocalSkillEnabled, skill.id)
         ? submittedLocalSkillEnabled[skill.id] !== false : skill.enabled !== false).map(skill => skill.id);
@@ -1853,7 +1926,7 @@
       throw new Error(tx('The selected local Codex skill is unavailable or disabled. Select an enabled skill and try again.',
         '所选 Codex 本地技能不可用或已关闭，请选择已启用的技能后重试。'));
     }
-    if (!queuedInput && submittedSkillLoadingSettings.loadCodexOverleafSkills !== false) {
+    if (!compact && !queuedInput && submittedSkillLoadingSettings.loadCodexOverleafSkills !== false) {
       const skills = await primeCodexOverleafSkillsCatalog({ required: true });
       submittedEnabledSkillIds = skills.map(skill => String(skill?.id || '').trim())
         .filter(id => id && submittedSkillEnabled[id] !== false);
@@ -1862,18 +1935,19 @@
     const pendingMirror = getPendingMirrorRefresh?.();
     if (pendingMirror) await pendingMirror.catch(() => {});
     await providerSettingsCoordinator.ensureLoaded();
-    if (!queuedInput) await writingStyleSettings.ensureLoaded(true);
+    if (!queuedInput && !compact) await writingStyleSettings.ensureLoaded(true);
     if (submittedWritingStyleScope.accountScopeId !== cachedAccountScopeId
       || submittedWritingStyleScope.projectId !== getCurrentProjectId()) {
       throw new Error(tx('The active project changed before submission. Submit the task again.',
         '提交前活动项目已改变，请重新提交任务。'));
     }
-    if (!findSessionById(submittedSessionId) || currentRunView) {
+    if (!findSessionById(submittedSessionId) || currentRunView
+      || (compact && findSessionById(submittedSessionId)?.codexThreadId !== submittedThreadId)) {
       throw new Error(tx('The submitted session changed before submission. Submit the task again.',
         '提交所属会话已改变，请重新提交任务。'));
     }
-    submittedPanelState.writingStyle = queuedInput ? null : writingStyleSettings.capture();
-    const executionSnapshot = queuedInput
+    submittedPanelState.writingStyle = queuedInput || compact ? null : writingStyleSettings.capture();
+    let executionSnapshot = queuedInput
       ? RunExecutionSnapshot.resolveForExecution(
         RunExecutionSnapshot.fromQueuePayload(queuedInput.payload),
         { catalog: providerSettingsCoordinator.getCatalog() }
@@ -1881,8 +1955,8 @@
       : captureCurrentExecutionSnapshot(submittedPanelState);
     // Freeze submitted run identity before the panel can change during the run.
     const submittedMode = executionSnapshot.mode;
-    const submittedRequireReviewing = executionSnapshot.requireReviewing === true;
-    const replaceRunId = queuedInput ? '' : runController.resolveRetryReplacement({
+    let submittedRequireReviewing = executionSnapshot.requireReviewing === true;
+    const replaceRunId = queuedInput || compact ? '' : runController.resolveRetryReplacement({
       candidate: submittedRetryReplacement,
       activeSessionId: submittedSessionId,
       runs: findSessionById(submittedSessionId)?.runs,
@@ -1892,26 +1966,78 @@
     runCancellationRequested = false;
     runCancellationController = new AbortController();
     setRunning(true);
-    currentRunView = startRunView({
-      sessionId: submittedSessionId,
-      sessionContext: submittedSession,
-      codexThreadId: submittedThreadId,
-      task,
-      mode: submittedMode,
-      model: executionSnapshot.model,
-      reasoningEffort: executionSnapshot.reasoningEffort,
-      speedTier: executionSnapshot.speedTier,
-      executionSnapshot,
-      attachments: submittedAttachments,
-      skillInvocation: submittedSkillInvocation,
-      queueItemId: queuedInput?.id || '',
-      replaceRunId
-    });
-    if (!queuedInput && pendingRetryReplacement === submittedRetryReplacement) pendingRetryReplacement = null;
-    const runSessionId = currentRunView.sessionId;
+    const runSessionId = submittedSessionId;
     let runAuditDraft = null;
     let localSkillRestorePoint = null;
     try {
+      currentRunView = startRunView({
+        sessionId: submittedSessionId,
+        sessionContext: submittedSession,
+        codexThreadId: submittedThreadId,
+        operation: compact ? 'compact' : undefined,
+        task,
+        mode: submittedMode,
+        model: executionSnapshot.model,
+        reasoningEffort: executionSnapshot.reasoningEffort,
+        speedTier: executionSnapshot.speedTier,
+        executionSnapshot,
+        attachments: submittedAttachments,
+        skillInvocation: submittedSkillInvocation,
+        queueItemId: queuedInput?.id || '',
+        replaceRunId
+      });
+      // Preparation can await project/audit work before a Native request exists.
+      // Give other pages a live owner to check throughout that interval.
+      const bound = await awaitRunStep(activeTurnControl.bindBrowserRun({
+        requestId: ActiveTurnControl.getStartupRequestId(runSessionId, currentRunView.recordId),
+        projectKey: currentRunView.runProjectId, clientRunId: currentRunView.recordId,
+        sessionId: runSessionId, ownerToken: crypto.randomUUID()
+      }));
+      throwIfRunCancellationRequested();
+      if (!bound) throw new Error(tx('Could not start the task. Reload the page and try again.',
+        '无法启动任务，请刷新页面后重试。'));
+      renderContextUsage();
+      if (!queuedInput && !compact && pendingRetryReplacement === submittedRetryReplacement) pendingRetryReplacement = null;
+      if (compact) {
+        announceCrossTabRunStart();
+        // Only the slash-command text is consumed; a draft kept while compacting from the popover stays.
+        if (options.consumeCompactDraft === true && state.activeSessionId === submittedSessionId
+          && /^\/[^\s/]*$/.test(String(submittedDraft || '').trim())
+          && panel?.querySelector('[data-task]')?.value === submittedDraft) {
+          panel.querySelector('[data-task]').value = '';
+          updateSessionById(submittedSessionId, { task: '' });
+          recordSubmittedDraftConsumption(submittedSessionId, submittedDraft);
+          composerDraftEditedHere = false;
+          composerDraftRevision += 1;
+          autosizeTaskTextarea();
+          closeSlashMenu();
+          syncComposerSendAvailability(true);
+        }
+        appendRunEvent({ title: tr('contextUsageCompacting'), status: 'running',
+          activity: { v: 1, kind: 'lifecycle', state: 'running', target: 'context_compaction' } });
+        renderContextUsage();
+        const response = await awaitRunStep(sendTrackedCodexRun({
+          operation: 'compact', task: '/compact', mode: 'ask',
+          projectId: currentRunView.runProjectId, accountScopeId: currentRunView.runAccountScopeId,
+          clientRunId: currentRunView.recordId, clientSessionId: runSessionId,
+          threadId: submittedThreadId, model: executionSnapshot.model,
+          reasoningEffort: executionSnapshot.reasoningEffort, speedTier: executionSnapshot.speedTier,
+          providerSelection: RunExecutionSnapshot.toProviderSelection(executionSnapshot),
+          locale: getLocale(), ...submittedSkillLoadingSettings,
+          enabledCodexOverleafSkillIds: submittedEnabledSkillIds,
+          enabledCodexLocalSkillIds: submittedEnabledLocalSkillIds
+        }));
+        if (!response?.ok) throw Object.assign(new Error(response?.error?.message || 'Compaction failed'), response?.error);
+        if (response.result?.operation !== 'compact' || response.result?.status !== 'completed'
+          || response.result?.threadId !== submittedThreadId) {
+          throw Object.assign(new Error('Compaction completion was not confirmed'), { code: 'codex_compact_unconfirmed' });
+        }
+        throwIfRunCancellationRequested();
+        appendCompletionReport({ conclusion: tr('compactCompleted'), conclusionKey: 'context_compacted',
+          status: 'completed', mode: 'ask', operations: [], applyResults: [] });
+        await finishRunView(tr('compactCompleted'), 'completed');
+        return;
+      }
       if (queuedInput?.id) {
         await runQueueScheduler?.markExecuting(runSessionId, queuedInput.id, currentRunView.recordId);
       }
@@ -1990,7 +2116,30 @@
       await awaitRunStep(pauseOtWarmMirror('run-start'));
       const writeSafety = await awaitRunStep(preflightWriteSafety({
         mode: submittedMode,
-        requireReviewing: submittedRequireReviewing
+        requireReviewing: submittedRequireReviewing,
+        onUntracked: async choice => {
+          submittedRequireReviewing = false;
+          // Keep the effective policy identical in dispatch, recovery and Undo consumers.
+          const view = currentRunView;
+          const record = findRunRecord(view.recordId, view.sessionId);
+          executionSnapshot = RunExecutionSnapshot.applyUntrackedDecision(view, record, choice);
+          if (choice === 'disable') {
+            updateSessionById(view.sessionId, { requireReviewing: false });
+            if (state.activeSessionId === view.sessionId) {
+              state.requireReviewing = false;
+              panel.querySelector('[data-require-reviewing]').checked = false;
+            }
+          }
+          appendRunEvent({ title: tr('reviewingUnavailableRunUntracked'), status: 'completed',
+            technicalDetail: { code: 'reviewing_unavailable', submittedRequireReviewing: true,
+              effectiveRequireReviewing: false, choice } });
+          saveStateSoon(0);
+          syncProbeStatus();
+          runAuditDraft = await finalizeAuditDraftPartial(runAuditDraft, {
+            requireReviewing: false, trackingDecision: choice
+          });
+          await flushQueuedSaveState({ requireDurable: true });
+        }
       }));
       if (!writeSafety.ok) {
         await finalizeAuditRecord(runAuditDraft, {
@@ -2001,9 +2150,11 @@
       }
 
       let focusFiles = [...executionSnapshot.focusFiles];
+      const mirrorOwner = currentRunView, mirrorRouteGeneration = spaRouteGeneration;
       const warmStart = await awaitRunStep(resolveWarmRunStart({ focusFiles, mode: submittedMode }));
+      const mirrorFence = await awaitRunStep(writebackOrchestrator.refreshMirrorReuseFence(mirrorOwner.runProjectId, mirrorOwner.runAccountScopeId));
       let project = warmStart.project || null;
-      let useExistingMirror = warmStart.useExistingMirror;
+      let useExistingMirror = warmStart.useExistingMirror && !mirrorFence;
       let fileOverlays = warmStart.fileOverlays || null;
       let otWarmStart = warmStart.otWarmStart === true;
       if (!useExistingMirror) {
@@ -2012,6 +2163,18 @@
           status: 'running'
         });
         project = await awaitRunStep(getRunProjectSnapshot());
+        if (mirrorFence) {
+          const assertCurrent = () => {
+            throwIfRunCancellationRequested();
+            if (mirrorOwner !== currentRunView || mirrorRouteGeneration !== spaRouteGeneration
+              || mirrorOwner.runProjectId !== getCurrentProjectId()
+              || mirrorOwner.runAccountScopeId !== cachedAccountScopeId) throw createRunCancellationError();
+          };
+          await awaitRunStep(writebackOrchestrator.syncFencedMirror(mirrorOwner.runProjectId, project, {
+            fence: mirrorFence, assertCurrent,
+            sendNative: payload => nativeCompatibilityController.sendBackgroundNative(payload, { assertCurrent })
+          }));
+        }
       }
       throwIfRunCancellationRequested();
       if (!useExistingMirror) {
@@ -2052,7 +2215,7 @@
             fileCount: (project?.files || []).length
           }
         });
-        appendCompletionReport({
+        appendCompletionReport({ conclusionKey: 'full_project_unread',
           conclusion: tx('This run did not continue: the full Overleaf project was not read.', '这轮没有继续：没有读到完整的 Overleaf 项目内容。'),
           status: 'blocked',
           operations: [],
@@ -2180,8 +2343,8 @@
           submittedMode
         })));
 
-      // Handle mirror_stale error by retrying with full sync
-      if (!response.ok && response.error?.code === 'mirror_stale' && useExistingMirror) {
+      // A stale mirror or contradictory editor overlay requires a fresh read.
+      if (!response.ok && ['mirror_stale', 'document_identity_mismatch'].includes(response.error?.code) && useExistingMirror) {
         appendRunEvent({ title: tr('warmMirrorStaleRetryTitle'), status: 'running' });
         const staleRetry = await awaitRunStep(prepareMirrorStaleRetry({
           project: await awaitRunStep(getRunProjectSnapshot()),
@@ -2239,12 +2402,17 @@
         const userChoice = await showThreadResumeFailedPrompt();
         if (userChoice === 'new') {
           updateSessionById(runSessionId, { codexThreadId: '' });
+          renderContextUsage();
           const StorageDb = Modules.StorageDb;
-          if (StorageDb) {
-            const record = await StorageDb.getRecord('sessions', runSessionId);
+          // A live session goes through the ordinary writer. An envelope
+          // conflict there must not abort the run that is choosing a new thread.
+          if (findSessionById(runSessionId)) {
+            saveStateSoon();
+          } else if (StorageDb) {
+            const record = await StorageDb.getRecord('sessions', runSessionId, { adopt: false });
             if (record) {
               record.codexThreadId = '';
-              await StorageDb.putRecord('sessions', record);
+              await StorageDb.putRecord('sessions', record, { adopt: false });
             }
           }
           appendRunEvent({ title: tx('Creating a new Codex conversation thread.', '正在新建 Codex 会话线程。'), status: 'running' });
@@ -2291,15 +2459,20 @@
         // Structured FailureReason (§9.7): split bridge-availability from
         // Codex-side errors. `native_connection_failed` / `native_unavailable`
         // / `native_update_required` indicate the bridge itself is missing,
-        // so emit `native_bridge_unavailable` (blocked, retryable). All other
-        // native errors are treated as a Codex-side surface error and emit
-        // `codex_no_usable_result` (error, retryable).
+        // so emit `native_bridge_unavailable` (blocked, retryable). Recognized
+        // Codex failures retain their specific cause; only unmatched errors
+        // fall back to `codex_no_usable_result` (error, retryable).
         // Map native/codex failures onto their SPECIFIC catalog codes — the
         // timeout/not-found/output-limit entries (and their bilingual next
         // steps) existed but were never emitted, so everything collapsed into
         // "no usable result" and pointed users at the wrong recovery.
         const runErrorMessage = String(response.error?.message || '');
-        const codexRunFailure = response.error?.code === 'codex_local_skill_unavailable'
+        const codexRunFailure = translated.failureCode === 'codex_context_limit'
+          ? buildContentFailure('codex_context_limit', { path: 'codex.run' }, {
+            technicalMessage: runErrorMessage,
+            evidence: { errorCode: response.error?.code || '' }
+          })
+          : response.error?.code === 'codex_local_skill_unavailable'
           ? buildContentFailure('codex_local_skill_unavailable', { path: 'codex.run' }, { technicalMessage: runErrorMessage })
           : translated.failureCode === 'codex_local_skills_failed'
             ? buildContentFailure('codex_local_skills_failed', { path: 'codex.run' }, { technicalMessage: runErrorMessage })
@@ -2360,7 +2533,7 @@
           detail: response.error
         });
         appendCompletionReport({
-          conclusion: translated.conclusion,
+          conclusion: translated.conclusion, conclusionKey: translated.conclusionKey,
           status: response.error?.code === 'project_locked' ? 'blocked' : 'failed',
           operations: [],
           applyResults: [],
@@ -2410,7 +2583,7 @@
           status: 'failed',
           failure: emptyFailure
         });
-        appendCompletionReport({
+        appendCompletionReport({ conclusionKey: 'empty_result',
           conclusion: emptyResultConclusion,
           status: 'failed',
           operations: [],
@@ -2439,7 +2612,7 @@
       });
       runSettlementPersistence.applyToCurrentRun(syncOutcome.settlement);
       if (runCancellationRequested) {
-        throw createRunCancellationError();
+        throw Object.assign(createRunCancellationError(), { writebackOutcome: syncOutcome });
       }
       await finalizeAuditRecord(runAuditDraft, {
         ...(syncOutcome.audit || {}),
@@ -2514,12 +2687,14 @@
         if (returnedThreadId && returnedThreadId !== codexThreadId) {
           updateSessionById(runSessionId, { codexThreadId: returnedThreadId });
           const StorageDb = Modules.StorageDb;
-          if (StorageDb) {
-            const record = await StorageDb.getRecord('sessions', runSessionId);
+          // The live session is saved below with its latest draft. Writing an
+          // older DB snapshot here can give stale text a newer timestamp.
+          if (StorageDb && !findSessionById(runSessionId)) {
+            const record = await StorageDb.getRecord('sessions', runSessionId, { adopt: false });
             if (record) {
               record.codexThreadId = returnedThreadId;
               record.updatedAt = new Date().toISOString();
-              await StorageDb.putRecord('sessions', record);
+              await StorageDb.putRecord('sessions', record, { adopt: false });
             }
           }
         }
@@ -2540,17 +2715,46 @@
       }
     } catch (error) {
       if (runCancellationRequested || isRunCancellationError(error)) {
-        appendRunCancelledReport();
+        if (currentRunView?.reviewingUnavailablePreflight) {
+          appendCompletionReport({ conclusionKey: 'launch_not_started',
+            conclusion: tx('This task did not start: Codex did not run and no files were written.', '这轮任务没有开始：Codex 没有运行，也没有写入文件。'),
+            status: 'blocked', operations: [], applyResults: [],
+            failure: buildContentFailure('reviewing_unavailable', {}, {
+              changedDocument: false, evidence: { declinedChoice: true }
+            }),
+            nextStep: tr('failureReason_reviewing_unavailable_cancelled_next') });
+        } else {
+          runSettlementPersistence.applyToCurrentRun(error.writebackOutcome?.settlement);
+          appendRunCancelledReport(error.writebackOutcome);
+        }
         await finishRunView(tx('Cancelled', '已取消'), 'cancelled');
         void finalizeAuditRecord(runAuditDraft, { resultStatus: 'cancelled' });
         return;
       }
+      if (compact) {
+        const key = error.code === 'codex_compact_unsupported' ? 'compactUnsupported'
+          : ['project_locked', 'codex_compact_thread_busy'].includes(error.code) ? 'compactBusy' : 'compactFailed';
+        const contextLimit = FailureReasons.isContextLimitError(error.message, error.code)
+          ? translateRawError(error.message, { locale: getLocale(), code: error.code }) : null;
+        const failure = contextLimit ? buildContentFailure('codex_context_limit', { path: 'codex.run' }, {
+          technicalMessage: error.message, evidence: { errorCode: error.code || '' }
+        }) : undefined;
+        const conclusion = contextLimit?.conclusion || tr(key);
+        appendRunEvent({ title: conclusion, status: 'failed', failure,
+          technicalDetail: { code: error.code || '', message: error.message } });
+        appendCompletionReport({ conclusion, conclusionKey: contextLimit?.conclusionKey || (key === 'compactUnsupported'
+          ? 'compact_unsupported' : key === 'compactBusy' ? 'compact_busy' : 'compact_failed'),
+          nextStep: contextLimit?.nextStep, failure,
+          status: 'failed', mode: 'ask', operations: [], applyResults: [] });
+        await finishRunView(conclusion, 'failed');
+        return;
+      }
       // codexReturned: assistantMessage arrived on the stream before the
       // exception escaped, so Codex's answer is preserved in the conversation
       // — the fallback conclusion must reflect that instead of saying
       // 'local Codex returned no usable result'.
       const codexReturned = Boolean(getAssistantAnswerForCurrentRun());
-      const translated = translateRawError(error.message, { mode: submittedMode, locale: getLocale(), codexReturned });
+      const translated = translateRawError(error.message, { mode: submittedMode, locale: getLocale(), code: error.code, codexReturned });
       // When translateRawError maps the raw error to a FailureReason code,
       // attach the structured failure to the run-event and completion-report
       // so the run record carries machine-readable failure data alongside
@@ -2578,7 +2782,7 @@
         }
       });
       appendCompletionReport({
-        conclusion: translated.conclusion,
+        conclusion: translated.conclusion, conclusionKey: translated.conclusionKey,
         status: 'failed',
         operations: [],
         applyResults: [],
@@ -2592,6 +2796,10 @@
         blockedFiles: [{ path: 'task', reason: error.message }]
       });
       await finishRunView(tx('Task failed', '任务失败'), 'failed');
+      // A failed initial card render must still leave a visible terminal record.
+      if (currentRunView?.sessionId === state.activeSessionId && !getCurrentRunViewForRender()) {
+        renderRunHistory({ preserveScroll: true });
+      }
     } finally {
       const settledView = currentRunView;
       const settledRecord = settledView ? findRunRecord(settledView.recordId, settledView.sessionId) : null;
@@ -2606,9 +2814,15 @@
       nativeChannel.clearActiveRequest();
       stopRunElapsedTick();
       await flushQueuedSaveState().catch(() => {});
+      // The card is already settled. Retain the owner while Native stops so
+      // neither ordinary promotion nor a deferred session start races its lock.
+      if (settlement.continueQueue) {
+        settlement.continueQueue = await waitForCancelledNativeRun(settledView);
+      }
       currentRunView = null;
       runCancellationRequested = false;
       runCancellationController = null;
+      syncComposerSendAvailability();
       activeTurnControl.release(settlement.requestId);
       if (isExperimentalOtEnabled()) {
         try { await resumeOtWarmMirror('run-settled'); }
@@ -2647,6 +2861,7 @@
       reasoningEffort: executionSnapshot.reasoningEffort,
       speedTier: executionSnapshot.speedTier,
       session: currentRunView?.sessionContext,
+      locale: getLocale(),
       clientRunId: currentRunView?.recordId || '',
       clientSessionId: runSessionId,
       accountScopeId: currentRunView?.runAccountScopeId || '',
@@ -2688,7 +2903,7 @@
         failure: translatedFailure
       });
       appendCompletionReport({
-        conclusion: translated.conclusion,
+        conclusion: translated.conclusion, conclusionKey: translated.conclusionKey,
         status: 'failed',
         operations: [],
         applyResults: [],
@@ -2706,7 +2921,7 @@
     }
 
     const assistantMessage = response.result?.assistantMessage || getAssistantAnswerForCurrentRun();
-    appendCompletionReport({
+    appendCompletionReport({ conclusionKey: !assistantMessage ? 'skill_installer_completed' : undefined,
       conclusion: assistantMessage || tx('Skill installer completed.', 'Skill installer 已完成。'),
       status: 'completed',
       operations: [],
@@ -2740,11 +2955,14 @@
     if (returnedThreadId && returnedThreadId !== codexThreadId) {
       updateSessionById(runSessionId, { codexThreadId: returnedThreadId });
       const StorageDb = Modules.StorageDb;
-      if (StorageDb) {
-        const record = await StorageDb.getRecord('sessions', runSessionId);
+      // The installer already finished; a later envelope conflict only delays this save.
+      if (findSessionById(runSessionId)) {
+        saveStateSoon();
+      } else if (StorageDb) {
+        const record = await StorageDb.getRecord('sessions', runSessionId, { adopt: false });
         if (record) {
           record.codexThreadId = returnedThreadId;
-          await StorageDb.putRecord('sessions', record);
+          await StorageDb.putRecord('sessions', record, { adopt: false });
         }
       }
     }
@@ -2758,8 +2976,6 @@
     if (mode === 'ask') {
       return { ok: true, skipped: true };
     }
-    const method = requireReviewing ? 'ensureReviewing' : 'ensureEditing';
-
     appendRunEvent({
       title: requireReviewing
         ? tx('Checking Overleaf Reviewing/Track Changes before starting.', '正在确认 Overleaf 留痕状态。')
@@ -2767,30 +2983,67 @@
       status: 'running'
     });
 
-    let result = null;
-    try {
-      // Thread runProjectId through so the page-bridge dispatcher applies the
-      // writeGuard. Without it, a mid-flight SPA navigation could leave the
-      // pre-flight ensureReviewing/Editing toggle landing in the wrong
-      // project — Track Changes flipped on/off in a project the user did
-      // not intend to write to.
-      result = await callPageBridge(method, {
-        waitMs: 1800,
-        runProjectId: currentRunView?.runProjectId || ''
-      });
-    } catch (error) {
-      result = {
-        ok: false,
-        reason: error?.message || (requireReviewing
-          ? tx('Overleaf did not return track changes status', 'Overleaf 没有返回留痕状态')
-          : tx('Overleaf did not return Editing mode status', 'Overleaf 没有返回 Editing 模式状态')),
-        reviewing: null
-      };
+    const owner = currentRunView;
+    const signal = runCancellationController?.signal;
+    const isCurrent = () => owner === currentRunView && !signal?.aborted && !runCancellationRequested
+      && owner?.runProjectId === getCurrentProjectId() && owner?.runAccountScopeId === cachedAccountScopeId;
+    const assertCurrent = () => { if (!isCurrent()) throw createRunCancellationError(); };
+    assertCurrent();
+    if (requireReviewing) {
+      // Another tab may have observed this project's capability since hydration.
+      const prefs = await Modules.StorageMigration.loadPrefs(owner.runAccountScopeId, owner.runProjectId);
+      assertCurrent();
+      const incoming = prefs?.reviewingAvailabilityByProject?.[owner.runProjectId];
+      const current = projectSettingsCoordinator.getReviewingAvailability();
+      if (incoming && (!current || incoming.observedAt > current.observedAt
+        || (incoming.observedAt === current.observedAt && incoming.status === 'available'))) {
+        state = { ...state, reviewingAvailabilityByProject: {
+          ...state.reviewingAvailabilityByProject, [owner.runProjectId]: incoming
+        } };
+        syncProbeStatus();
+      }
     }
+    let result = await Modules.Reviewing.resolveWritePolicy({ requireReviewing,
+      knownUnavailable: isReviewingKnownUnavailable() }, {
+      assertCurrent,
+      ensureMode: async required => {
+        try {
+          return await callPageBridge(required ? 'ensureReviewing' : 'ensureEditing', {
+            waitMs: 1800, runProjectId: owner.runProjectId
+          });
+        } catch (error) {
+          assertCurrent();
+          return { ok: false, code: error?.code, reason: error?.message, reviewing: null };
+        }
+      },
+      observe: async (status, evidence) => {
+        projectSettingsCoordinator.observeReviewingAvailability(status, evidence);
+        syncProbeStatus();
+        // Publish a detected paywall before waiting for the user's decision.
+        if (status === 'unavailable') await flushQueuedSaveState({ requireDurable: true });
+        assertCurrent();
+      },
+      choose: () => {
+        owner.reviewingUnavailablePreflight = true;
+        return showPluginConfirm({
+          title: tr('reviewingUnavailableTitle'),
+          message: tr('reviewingUnavailableChoiceMessage'),
+          choices: [
+            { value: 'continue', label: tr('reviewingUnavailableContinue') },
+            { value: 'disable', label: tr('reviewingUnavailableDisable'), secondary: true },
+            { value: 'cancel', label: tr('confirmDefaultCancel') }
+          ],
+          signal, isCurrent, timeoutMs: REVIEWING_CONFIRM_TIMEOUT_MS
+        });
+      },
+      applyUntracked: choice => { assertCurrent(); return options.onUntracked(choice); }
+    });
+    if (result.ok) owner.reviewingUnavailablePreflight = false;
+    const effectiveRequireReviewing = result.requireReviewing ?? requireReviewing;
 
     if (result?.ok) {
       appendRunEvent({
-        title: requireReviewing
+        title: effectiveRequireReviewing
           ? (result.activated
             ? tx('Overleaf Reviewing/Track Changes is now on. Starting the task.', '已开启 Overleaf 留痕，开始处理任务。')
             : tx('Overleaf Reviewing/Track Changes is already on. Starting the task.', 'Overleaf 留痕已经开启，开始处理任务。'))
@@ -2802,10 +3055,23 @@
       return result;
     }
 
-    const reason = localizeVisibleReason(result?.reason || (requireReviewing
+    const unavailable = result?.code === 'reviewing_unavailable';
+    if (unavailable && !result.failure) result.failure = buildContentFailure('reviewing_unavailable', {}, {
+      changedDocument: false, evidence: result.evidence
+    });
+    const reason = unavailable ? tr('failureReason_reviewing_unavailable_user') : localizeVisibleReason(result?.reason || (effectiveRequireReviewing
       ? tx('Overleaf did not return track changes status', 'Overleaf 没有返回留痕状态')
       : tx('Overleaf did not return Editing mode status', 'Overleaf 没有返回 Editing 模式状态')));
-    const nextStep = requireReviewing
+    // Affirmative choices retain trackingDecision even if the Editing check fails.
+    const declinedReviewingChoice = owner.reviewingUnavailablePreflight === true && !result.trackingDecision;
+    const reportFailure = unavailable && declinedReviewingChoice
+      ? buildContentFailure('reviewing_unavailable', {}, {
+        ...result.failure, changedDocument: false,
+        evidence: { ...result.failure?.evidence, declinedChoice: true }
+      }) : result?.failure;
+    const nextStep = unavailable ? tr(declinedReviewingChoice
+      ? 'failureReason_reviewing_unavailable_cancelled_next'
+      : 'failureReason_reviewing_unavailable_next') : effectiveRequireReviewing
       ? tx(
         'You may not have permission, or this Overleaf page did not expose the Reviewing switch. Switch to Reviewing manually and retry, or turn off Track before writing.',
         '你可能没有权限，或 Overleaf 当前页面没有暴露切换入口。可以手动切到 Reviewing 后重试，或关闭“留痕”再运行。'
@@ -2815,7 +3081,7 @@
         '你可能没有权限，或 Overleaf 当前页面没有暴露切换入口。请在 Overleaf 手动切到 Editing 后重试。'
       );
     appendRunEvent({
-      title: requireReviewing
+      title: effectiveRequireReviewing
         ? tx('Task not started: could not enable Overleaf Reviewing/Track Changes.', '任务未开始：无法开启 Overleaf 留痕。')
         : tx('Task not started: could not switch to Overleaf Editing.', '任务未开始：无法切换到 Overleaf Editing。'),
       status: 'failed',
@@ -2824,24 +3090,25 @@
         [tr('detailNext')]: nextStep
       },
       technicalDetail: {
-        reason,
+        reason, code: result?.code, evidence: result?.evidence, failure: result?.failure,
         reviewing: result?.reviewing || null
       }
     });
-    appendCompletionReport({
+    appendCompletionReport({ conclusionKey: 'launch_not_started',
       conclusion: tx('This task did not start: Codex did not run and no files were written.', '这轮任务没有开始：Codex 没有运行，也没有写入文件。'),
       status: 'blocked',
       operations: [],
       applyResults: [],
-      nextStep
+      nextStep,
+      reason: result?.code, failure: reportFailure
     });
-    const finishTitle = requireReviewing
+    const finishTitle = effectiveRequireReviewing
       ? tx('Not started: could not enable Track Changes', '未开始：无法开启留痕')
       : tx('Not started: could not switch to Editing', '未开始：无法切换到 Editing');
     await finishRunView(finishTitle, 'failed');
     return {
-      ok: false,
-      reason,
+      ...result, ok: false,
+      reason: result?.code || reason,
       reviewing: result?.reviewing || null
     };
   }
@@ -2854,17 +3121,25 @@
     return runController.truncateSessionHistoryText(value, maxLength);
   }
 
-  function safeRunTask() {
+  function safeRunTask(options = {}) {
+    if (sessionManager.isTransitioning()) return;
     if (updateIdleClient?.isApplying()) {
       showPluginToast(tx('An update is being applied. Codex will be available again after reload.', '正在应用更新，重新加载后即可继续使用 Codex。'), { status: 'info' });
       return;
     }
+    const submittedCompactCommand = options.operation !== 'compact'
+      && panel?.querySelector('[data-task]')?.value.trim() === '/compact';
+    const compact = options.operation === 'compact' || submittedCompactCommand;
+    if (compact && (currentRunView || runSubmissionPending)) {
+      showPluginToast(tr('compactBusy'), { status: 'info' });
+      return;
+    }
     if (currentRunView) {
       return queueComposerInput();
     }
     if (runSubmissionPending) return;
     runSubmissionPending = true;
-    runTask().catch(error => {
+    runTask(compact ? { operation: 'compact', consumeCompactDraft: options.consumeCompactDraft === true || submittedCompactCommand } : {}).catch(error => {
       if (!currentRunView) {
         setRunning(false);
         nativeChannel.clearActiveRequest();
@@ -2896,7 +3171,7 @@
       getActiveSession: () => getActiveSession(state),
       setQueue: (sessionId, pendingInputs) => updateSessionById(sessionId, { pendingInputs }),
       getCurrentRun: () => currentRunView,
-      canStart: sessionId => state?.activeSessionId === sessionId && isProjectEditorRoute(window.location),
+      canStart: canStartQueuedSession,
       readInputs: readPanelInputs,
       getTask: () => panel?.querySelector('[data-task]')?.value || '',
       hasAttachments: () => getComposerAttachmentsForRun().length > 0,
@@ -2916,6 +3191,7 @@
       }),
       clearTask: () => {
         panel.querySelector('[data-task]').value = '';
+        composerDraftEditedHere = false;
         selectionContextView.clear();
         updateSessionById(state.activeSessionId, { task: '' });
         autosizeTaskTextarea();
@@ -2926,6 +3202,8 @@
           RunExecutionSnapshot.fromQueuePayload(item.payload),
           { catalog: providerSettingsCoordinator.getCatalog() }
         );
+        // Promotion uses its captured snapshot; this line still describes the current draft.
+        syncProbeStatus();
       },
       run: item => runTask({ queuedInput: item }),
       getGuideScope: () => ({ projectId: getCurrentProjectId(), accountScopeId: cachedAccountScopeId, generation: spaRouteGeneration }),
@@ -2978,7 +3256,17 @@
     });
   }
 
+  function canStartQueuedSession(sessionId) {
+    if (state?.activeSessionId !== sessionId || !isProjectEditorRoute(window.location)) return false;
+    if (sessionManager.isTransitioning()) {
+      deferredSessionStart = { sessionId, scope: getComposerDraftScope() };
+      return 'session_transition';
+    }
+    return true;
+  }
+
   function queueComposerInput() {
+    if (sessionManager.isTransitioning()) return;
     if (getSkillLoadingSettings().loadCodexLocalSkills !== false && !Array.isArray(getCodexLocalSkillsCatalog())) {
       primeCodexLocalSkillsCatalog({ required: true }).catch(() => {});
       showPluginToast(tx('Local Codex skills are still loading. Try submitting again when loading finishes.',
@@ -3018,18 +3306,21 @@
     //     codex_cancelled instead of grinding through the rest of the queue.
     // Without the page-side signal, a cancel during writeback waits up to
     // the applyOperations content-side timeout (30s) before the run settles.
-    const activeRequestId = nativeChannel.getActiveRequestId();
+    const activeRequestId = currentRunView.nativeRequestId;
     const projectKey = currentRunView?.runProjectId || getCurrentProjectId() || '';
 
     const cancelTargets = [];
-    if (activeRequestId || projectKey) {
+    if (activeRequestId != null && activeRequestId !== '') {
       cancelTargets.push(sendBackgroundNative({
         method: 'codex.cancel',
         params: {
-          requestId: activeRequestId || undefined,
+          requestId: activeRequestId,
           projectKey: projectKey || undefined
         }
       }));
+    } else {
+      // Preparation has no Native run to cancel; the local signal prevents dispatch.
+      cancelTargets.push(Promise.resolve(null));
     }
     // The page-side cancel is best-effort — it only matters if a writeback
     // is currently in flight. Swallow errors / unavailable bridge so the
@@ -3116,6 +3407,23 @@
     });
   }
 
+  async function waitForCancelledNativeRun(runView) {
+    const pending = runView?.pendingNativeRun;
+    if (!pending) return true;
+    const CANCELLED_NATIVE_SETTLEMENT_TIMEOUT_MS = 20000;
+    let timer;
+    try {
+      return await Promise.race([
+        pending.then(() => true, () => true),
+        new Promise(resolve => {
+          timer = setTimeout(() => resolve(false), CANCELLED_NATIVE_SETTLEMENT_TIMEOUT_MS);
+        })
+      ]);
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
   function isRunCancellationError(error = {}) {
     return error.code === 'codex_cancelled' || /cancelled by the user|was cancelled/i.test(error.message || '');
   }
@@ -3218,6 +3526,7 @@
     const params = runController.buildCodexRunParams({
       currentProjectId: getCurrentProjectId(),
       state: submittedState,
+      locale: getLocale(),
       task,
       project,
       useExistingMirror,
@@ -3271,25 +3580,33 @@
     if (!compatibilityGate.ok) {
       return compatibilityGate.response;
     }
+    if (params.operation === 'compact' && compatibilityGate.compatibility?.native?.capabilities?.threadCompact !== true) {
+      return { ok: false, error: { code: 'codex_compact_unsupported', message: 'This Native host does not support context compaction.' } };
+    }
     const tracked = nativeChannel.sendNativeTracked(nativeCompatibilityController.attachEvidence({
       method: 'codex.run',
       params
     }, compatibilityGate.compatibility));
-    if (currentRunView) {
-      currentRunView.nativeRequestId = tracked.id;
-      const record = findRunRecord(currentRunView.recordId, currentRunView.sessionId);
+    if (owner) {
+      owner.nativeRequestId = tracked.id;
+      // Keep the actual response separate from awaitRunStep's local abort race.
+      owner.pendingNativeRun = tracked.promise;
+      const record = findRunRecord(owner.recordId, owner.sessionId);
       if (record) {
         record.nativeRequestId = tracked.id;
       }
       activeTurnControl.bind({
         requestId: tracked.id,
-        projectKey: currentRunView.runProjectId,
-        clientRunId: currentRunView.recordId,
-        sessionId: currentRunView.sessionId
+        projectKey: owner.runProjectId,
+        clientRunId: owner.recordId,
+        sessionId: owner.sessionId
       });
       saveStateSoon();
     }
     return tracked.promise.finally(() => {
+      if (owner?.pendingNativeRun === tracked.promise) {
+        owner.pendingNativeRun = null;
+      }
       if (currentRunView?.nativeRequestId === tracked.id) {
         currentRunView.activeTurn = null;
         renderPendingInputs();
@@ -3298,58 +3615,44 @@
   }
 
   async function recoverInterruptedRunJournals() {
-    const projectKey = getCurrentProjectId();
+    const projectKey = getCurrentProjectId(), accountScopeId = cachedAccountScopeId;
+    const generation = spaRouteGeneration;
+    const isCurrent = () => generation === spaRouteGeneration
+      && projectKey === getCurrentProjectId() && accountScopeId === cachedAccountScopeId;
     const recovery = await activeTurnControl.recoverJournals({
       projectKey,
-      accountScopeId: cachedAccountScopeId,
+      accountScopeId,
+      isCurrent,
+      onRecheck: async () => {
+        if (!isCurrent()) return;
+        await recoverInterruptedRunJournals();
+        if (isCurrent()) applyStateToPanel();
+      },
       requireOwnerLost: Modules.StorageDb.sharedSessionsEnabled?.() === true,
       normalizeInterruptedRun: record => Object.assign(record, Modules.SessionState.normalizeRuns([record], {
         restoreRunningRuns: true,
         locale: getLocale()
       })[0]),
       findSession: findSessionById,
+      listSessions: () => state?.sessions || [],
+      isLiveRun: (record, session) => currentRunView?.recordId === record.id
+        && currentRunView.sessionId === session.id && currentRunView.runProjectId === projectKey,
       getActiveSession: () => getActiveSession(state),
-      createInterruptedRun: journal => ({
-          id: journal.clientRunId,
-          task: journal.task || 'interrupted task',
-          mode: journal.mode || 'ask',
-          model: journal.model || '',
-          status: 'interrupted',
-          statusText: tr('restoredRunStoppedStatus'),
-          runProjectId: projectKey,
-          startedAt: journal.createdAt || new Date().toISOString(),
-          finishedAt: journal.updatedAt || new Date().toISOString(),
-          events: [],
-          attachments: [],
-          undoOperations: [],
-          undoTrackedChanges: [],
-          undoExpectedFiles: []
+      createInterruptedRun: journal => ActiveTurnControl.createInterruptedRun(journal, projectKey, tr('restoredRunStoppedStatus')),
+      onRawEvent: (raw, { record, session, sequence }) => storeContextUsage(raw, record, session, sequence),
+      mapEvent: (raw, journal) => ActiveTurnControl.mapRecoveredEvent(raw, journal, {
+        mapActivity: value => mapAgentEventToActivity(value, { locale: getLocale() }),
+        sanitizeText: sanitizeAssistantVisibleText, sanitizeValue: sanitizeAssistantVisibleValue
       }),
-      mapEvent: (raw, journal) => {
-        const activity = mapAgentEventToActivity(raw, { locale: getLocale() });
-        if (!activity?.visible || activity.kind === 'technical') {
-          return null;
-        }
-        return {
-          kind: activity.kind || 'activity',
-          title: sanitizeAssistantVisibleText(activity.title) || 'Event',
-          status: activity.status || 'running',
-          detail: sanitizeAssistantVisibleValue(activity.detail),
-          timestamp: raw.timestamp || journal.updatedAt || new Date().toISOString(),
-          streamKey: sanitizeAssistantVisibleText(activity.streamKey),
-          streamRole: sanitizeAssistantVisibleText(activity.streamRole),
-          appendText: sanitizeAssistantVisibleText(activity.appendText),
-          replaceText: activity.replaceText
-        };
-      },
       upsertStream: upsertRunStreamRecordEvent,
       pauseSessionQueue: (session, reason) => {
         session.pendingInputs = RunInputQueue.pauseAll(session.pendingInputs || [], reason);
       },
       maxEvents: MAX_RUN_EVENTS
     });
+    if (!isCurrent()) return;
     if (recovery.changed) {
-      if (await saveState({ recoveryRuns: recovery.recoveredRuns }) !== true) return;
+      if (await saveState({ recoveryRuns: recovery.recoveredRuns }) !== true || !isCurrent()) return;
       for (const requestId of recovery.acknowledgeIds) {
         await activeTurnControl.acknowledge(requestId).catch(() => false);
       }
@@ -3375,6 +3678,7 @@
       sessionId: input.sessionId || '',
       turnId: currentRunView?.recordId || '',
       mode: input.mode || executionSnapshot.mode,
+      requireReviewing: executionSnapshot.requireReviewing,
       ...providerSettingsCoordinator.getProviderSnapshot(executionSnapshot.providerId),
       providerRevision: executionSnapshot.providerRevision,
       model: executionSnapshot.model,
@@ -3445,19 +3749,20 @@
     }).run(options);
   }
 
-  function appendRunCancelledReport() {
-    const hasQueuedFollowUp = (getActiveSession(state)?.pendingInputs || [])
+  function appendRunCancelledReport(writebackOutcome = {}, continueQueue = true) {
+    const hasQueuedFollowUp = continueQueue && (getActiveSession(state)?.pendingInputs || [])
       .some(item => item?.status === 'queued');
     appendRunEvent({
       title: tx('Current Codex task was cancelled.', '已中断当前 Codex 任务。'),
       status: 'info',
       activity: { v: 1, kind: 'lifecycle', state: 'cancelled', target: 'cancelled' }
     });
-    appendCompletionReport({
+    appendCompletionReport({ conclusionKey: 'cancelled',
       conclusion: tx('This run was cancelled. It did not continue syncing or writing to Overleaf.', '这轮已中断，没有继续同步或写入 Overleaf。'),
       status: 'cancelled',
-      operations: [],
-      applyResults: [],
+      operations: writebackOutcome.operations || [],
+      applyResults: writebackOutcome.applied ? [writebackOutcome.applied] : [],
+      saveVerification: writebackOutcome.saveVerification,
       nextStep: hasQueuedFollowUp
         ? tx('The first queued follow-up will start next.', '接下来会自动启动队首的后续任务。')
         : tx('Edit the task and run again.', '可以修改任务后重新运行。')
@@ -3482,22 +3787,36 @@
     const running = typeof runningOverride === 'boolean'
       ? runningOverride
       : Boolean(currentRunView);
-    const action = running && !hasInput ? 'cancel' : 'send';
+    const runningInActiveSession = running && (!currentRunView || currentRunView.sessionId === state?.activeSessionId);
+    const transitioning = sessionManager.isTransitioning();
+    const action = runningInActiveSession && (!hasInput || transitioning) ? 'cancel' : 'send';
+    const attachmentsLoading = composerAttachmentController.hasPendingReads();
     const label = action === 'cancel'
       ? tr('cancelRun')
-      : running
-        ? tr('queueNextInput')
-        : tr('send');
+      : attachmentsLoading
+        ? tr('attachmentsLoading')
+        : running && hasInput
+          ? tr('queueNextInput')
+          : tr('send');
     runButton.dataset.action = action;
     runButton.disabled = action === 'cancel'
       ? runCancellationRequested
-      : !hasInput;
+      : !hasInput || transitioning || attachmentsLoading;
     runButton.title = label;
     runButton.setAttribute('aria-label', label);
-    if (currentRunView?.writebackRetry && hasInput) runButton.disabled = true;
+    if (currentRunView?.writebackRetry && hasInput && action !== 'cancel') runButton.disabled = true;
   }
 
   function handleTaskInputKeydown(event) {
+    if (sessionManager.isTransitioning()) {
+      if (event.key === 'Enter' && !event.isComposing && event.keyCode !== 229) event.preventDefault();
+      return;
+    }
+    if (composerAttachmentController.hasPendingReads() && event.key === 'Enter'
+      && !event.shiftKey && !event.isComposing && event.keyCode !== 229) {
+      event.preventDefault();
+      return;
+    }
     if (handleSlashMenuKeydown(event)) {
       return;
     }
@@ -3525,9 +3844,12 @@
 
   function getSlashCommands() {
     const commands = [
+      { id: 'compact', kind: 'compact', group: 'commands', title: tr('slashCompactTitle'), slug: '/compact',
+        subtitle: tr('slashCompactSubtitle') },
       {
         id: 'install-skill',
         kind: 'installer',
+        group: 'commands',
         title: tr('slashInstallSkillTitle'),
         subtitle: tr('slashInstallSkillSubtitle')
       }
@@ -3542,10 +3864,12 @@
       if (!isCodexOverleafSkillEnabled(id)) {
         continue;
       }
-      const title = String(skill?.title || skill?.name || id).trim().slice(0, 80) || id;
+      const title = id === 'reviewer-response' ? tx('Reviewer response', '审稿回复')
+        : String(skill?.title || skill?.name || id).trim().slice(0, 80) || id;
       commands.push({
         id: `skill:${id}`,
         kind: 'codex-overleaf-skill',
+        group: 'overleaf',
         scope: 'codex-overleaf',
         skillId: id,
         title,
@@ -3556,11 +3880,13 @@
     for (const skill of localSkills) {
       if (!isSafeSkillId(skill.id) || !isCodexLocalSkillEnabled(skill.id, skill)) continue;
       const sameName = localSkills.filter(other => String(other.title || other.name || other.id) === String(skill.title || skill.name || skill.id)).length > 1;
-      commands.push({ id: `local-skill:${skill.id}`, kind: 'codex-local-skill', scope: 'codex-local', skillId: skill.id,
+      // Source and duplicate hints lead so a truncated preview cannot hide them.
+      commands.push({ id: `local-skill:${skill.id}`, kind: 'codex-local-skill', group: 'local', scope: 'codex-local', skillId: skill.id,
         title: String(skill.title || skill.name || skill.id).trim().slice(0, 80),
         searchName: String(skill.name || ''),
-        subtitle: tr('slashUseLocalSkillSubtitle') + (skill.sourceKind === 'plugin' && skill.sourceLabel ? ' · ' + skill.sourceLabel : '')
-          + (sameName ? ' · ' + (skill.sourceHint || skill.id.slice(-8)) : '') });
+        subtitle: [skill.sourceKind === 'plugin' && skill.sourceLabel ? skill.sourceLabel : '',
+          sameName ? skill.sourceHint || skill.id.slice(-8) : '',
+          String(skill.preview || '').trim() || tr('slashUseLocalSkillSubtitle')].filter(Boolean).join(' · ') });
     }
     return commands;
   }
@@ -3607,7 +3933,7 @@
           || command.id.toLowerCase().includes(query)
           || String(command.searchName || '').toLowerCase().includes(query);
       });
-      renderSlashMenu(commands);
+      renderSlashMenu(commands, { query });
       return;
     }
     const atTrigger = getAtFileTrigger();
@@ -3705,7 +4031,7 @@
       closeSlashMenu();
       return;
     }
-    renderSlashMenu(entries);
+    renderSlashMenu(entries, { query });
   }
 
   // Lazy one-shot load: the tray's file list is usually warm (panel open
@@ -3788,7 +4114,22 @@
     };
   }
 
-  function renderSlashMenu(commands = []) {
+  const SLASH_MENU_GROUPS = { commands: 'slashGroupCommands', overleaf: 'slashGroupOverleafSkills', local: 'slashGroupLocalSkills' };
+  const SLASH_MENU_ICONS = { compact: 'compact', installer: 'install', 'codex-overleaf-skill': 'book', 'codex-local-skill': 'terminal' };
+
+  function appendHighlightedText(node, value, query) {
+    const text = String(value || '');
+    const at = query ? text.toLowerCase().indexOf(query) : -1;
+    if (at < 0) {
+      node.append(text);
+      return;
+    }
+    const mark = document.createElement('mark');
+    mark.textContent = text.slice(at, at + query.length);
+    node.append(text.slice(0, at), mark, text.slice(at + query.length));
+  }
+
+  function renderSlashMenu(commands = [], { query = '' } = {}) {
     const menu = panel?.querySelector('[data-slash-menu]');
     if (!menu) {
       return;
@@ -3798,7 +4139,17 @@
       menu.hidden = true;
       return;
     }
+    const usage = commands.some(command => command.kind === 'compact') ? getContextUsageDisplay().usage : null;
+    const percent = usage?.contextWindow > 0 ? usage.usedTokens / usage.contextWindow * 100 : null;
+    let group = '';
     commands.forEach((command, index) => {
+      if (command.group && command.group !== group) {
+        group = command.group;
+        const label = document.createElement('div');
+        label.className = 'codex-slash-menu-group';
+        label.textContent = tr(SLASH_MENU_GROUPS[group]);
+        menu.append(label);
+      }
       const button = document.createElement('button');
       button.type = 'button';
       button.dataset.slashCommand = command.id;
@@ -3810,13 +4161,44 @@
         button.dataset.slashSkillScope = command.scope;
       }
       button.dataset.active = index === 0 ? 'true' : 'false';
+      const icon = document.createElement('span');
+      icon.className = 'codex-slash-menu-icon';
+      icon.innerHTML = Modules.PanelIcons.svg(SLASH_MENU_ICONS[command.kind] || 'file');
+      const text = document.createElement('span');
+      text.className = 'codex-slash-menu-text';
       const title = document.createElement('span');
-      title.textContent = command.title;
+      title.className = 'codex-slash-menu-title';
+      appendHighlightedText(title, command.title, query);
+      if (command.slug) {
+        const slug = document.createElement('code');
+        appendHighlightedText(slug, command.slug, query);
+        title.append(slug);
+      }
       const subtitle = document.createElement('small');
       subtitle.textContent = command.subtitle;
-      button.append(title, subtitle);
+      subtitle.title = command.subtitle;
+      text.append(title, subtitle);
+      button.append(icon, text);
+      if (command.kind === 'compact' && percent !== null) {
+        const meta = document.createElement('span');
+        meta.className = 'codex-slash-menu-meta';
+        meta.dataset.level = Modules.ContextUsage.level(percent);
+        meta.title = tr('contextUsageTitle');
+        meta.textContent = new Intl.NumberFormat(getLocale() === 'zh' ? 'zh-CN' : 'en-US', { maximumFractionDigits: 0 }).format(percent) + '%';
+        button.append(meta);
+      }
       menu.append(button);
     });
+    const foot = document.createElement('div');
+    foot.className = 'codex-slash-menu-foot';
+    foot.dataset.slashMenuFoot = '';
+    for (const [keys, label] of [[['↑', '↓'], 'slashKeyMove'], [['Enter'], 'slashKeyRun'], [['Esc'], 'slashKeyClose']]) {
+      const hint = document.createElement('span');
+      for (const key of keys) hint.append(Object.assign(document.createElement('kbd'), { textContent: key }));
+      hint.append(tr(label));
+      foot.append(hint);
+    }
+    menu.append(foot);
     renderedSlashCommands = new Map(commands.map(command => [command.id, command]));
     menu.dataset.activeIndex = '0';
     menu.hidden = false;
@@ -3891,10 +4273,16 @@
     });
     const active = buttons[index];
     if (!active || !menu.clientHeight) return;
+    // Wrapping to the first item also reveals its group label.
+    if (index === 0) {
+      menu.scrollTop = 0;
+      return;
+    }
     const viewport = menu.getBoundingClientRect();
     const item = active.getBoundingClientRect();
     const top = viewport.top + menu.clientTop;
-    const bottom = top + menu.clientHeight;
+    // The sticky key-hint footer covers the bottom of the scroll area.
+    const bottom = top + menu.clientHeight - (menu.querySelector('[data-slash-menu-foot]')?.offsetHeight || 0);
     // Scroll only this popup; scrollIntoView may move the chat or editor too.
     if (item.height > menu.clientHeight || item.top < top) {
       menu.scrollTop += item.top - top;
@@ -3904,6 +4292,7 @@
   }
 
   function selectSlashCommand(commandId) {
+    if (sessionManager.isTransitioning()) return;
     const command = renderedSlashCommands.get(commandId);
     if (!command) {
       closeSlashMenu();
@@ -3916,6 +4305,11 @@
       applyAtFileSelection(command);
       return;
     }
+    if (command.kind === 'compact') {
+      closeSlashMenu();
+      safeRunTask({ operation: 'compact', consumeCompactDraft: true });
+      return;
+    }
     clearSlashTriggerFromTaskInput();
     closeSlashMenu();
     if (command.kind === 'installer') {
@@ -4191,8 +4585,17 @@
     Bridge: Modules.SharedSessionBridge, StorageDb: Modules.StorageDb,
     getScope: () => ({ accountScopeId: cachedAccountScopeId, projectId: getCurrentProjectId(), generation: spaRouteGeneration }),
     getState: () => state, setState: next => { state = next; },
-    isBusy: () => Boolean(readLiveRunViewForSaveStateGuard() || document.querySelector('dialog[open]')),
-    normalize: normalizePanelState, render: applyStateToPanel,
+    isDashboard: () => panel?.dataset.view === 'recent-projects',
+    refreshDashboard: refreshDashboardSoon,
+    // An in-flight Accept/Undo keeps its view until it settles; refresh applies afterwards.
+    isBusy: () => Boolean(pendingDraftSave || readLiveRunViewForSaveStateGuard() || trackedChangeInFlight.size
+      || runReviewController?.hasActiveReview?.() || document.querySelector('dialog[open]')),
+    hasLocalDraft: current => Boolean(current.task) && composerDraftEditedHere,
+    normalize: normalizePanelState,
+    render: () => {
+      applyStateToPanel();
+      composerDraftEditedHere = false;
+    },
     notice: error => appendStorageNoticeOnce('shared-history-refresh', tx(
       `Could not refresh shared history: ${error.message}`,
       `共享会话历史刷新失败：${error.message}`
@@ -4292,6 +4695,7 @@
       storageKey = getProjectStorageKey(LEGACY_STORAGE_KEY, window.location.href);
       const reloaded = await loadStoredState();
       state = normalizeLoadedPanelState(reloaded);
+      composerDraftEditedHere = false;
       await getRunReviewController().recoverInterruptedUndoStatuses();
       applyStateToPanel();
     } catch (_error) {
@@ -4354,6 +4758,7 @@
   function leaveActiveProject(newId) {
     const prevId = activeProjectId;
     activeProjectId = newId; // null for non-project URLs (spec §5.7.1)
+    if (prevId !== newId) composerDraftEditedHere = false;
     getComposerDraftPersistence().syncScope();
     if (!prevId || prevId === newId) {
       return;
@@ -4380,7 +4785,15 @@
   }
 
   async function onSpaRouteChange() {
+    // Snapshot the departing draft before hydration replaces state. The detached
+    // writer retains its original account/project and never reads the new view's attachments.
+    if (pendingDraftSave?.projectId === activeProjectId
+      && pendingDraftSave?.accountScopeId === cachedAccountScopeId) {
+      void saveState({ draftScope: pendingDraftSave });
+    }
+    resetDraftSave();
     const generation = ++spaRouteGeneration;
+    activeTurnControl.cancelRecovery();
     const url = new URL(window.location.href);
     const pathname = url.pathname;
     const previousProjectId = activeProjectId;
@@ -4604,7 +5017,7 @@
         operations: [],
         status: tr('modeAsk')
       });
-      appendCompletionReport({
+      appendCompletionReport({ conclusionKey: !notes ? 'ask_inspected' : undefined,
         conclusion: notes || tx('This run only inspected and explained; no files were written.', '这轮只做了检查和说明，没有写入文件。'),
         status: tr('modeAsk'),
         notes,
@@ -4646,7 +5059,7 @@
           applyResults,
           status: 'applied with delete plan'
         });
-        appendCompletionReport({
+        appendCompletionReport({ conclusionKey: !notes ? 'delete_handled' : undefined,
           conclusion: notes || tx('Changes were written, and delete items were handled after your confirmation.', '已写入修改，并按你的确认处理删除项。'),
           status: 'applied with delete plan',
           notes,
@@ -4669,7 +5082,7 @@
         status: 'applied without deletes',
         deletePlanRejected: true
       });
-      appendCompletionReport({
+      appendCompletionReport({ conclusionKey: 'delete_rejected',
         conclusion: tx('Non-delete changes were kept; delete items were not written.', '已保留非删除修改；删除项没有写入。'),
         status: 'applied without deletes',
         notes,
@@ -4699,7 +5112,7 @@
       applyResults: [applied],
       status: result.status || 'completed'
     });
-    appendCompletionReport({
+    appendCompletionReport({ conclusionKey: !notes ? 'run_complete' : undefined,
       conclusion: notes || tx('This run is complete.', '这轮任务已完成。'),
       status: result.status || 'completed',
       notes,
@@ -4781,10 +5194,19 @@
     // Thread runProjectId so the page-side dispatcher gates the toggle. Same
     // intent as the pre-flight check above: do not flip Track Changes /
     // Editing in a different project than the run is bound to.
+    const owner = currentRunView;
     const result = await callPageBridge(method, {
       waitMs: 1800,
       runProjectId: currentRunView?.runProjectId || ''
     });
+    throwIfRunCancellationRequested();
+    if (owner && (owner !== currentRunView || owner.runProjectId !== getCurrentProjectId()
+      || owner.runAccountScopeId !== cachedAccountScopeId)) throw createRunCancellationError();
+    if (requireReviewing && (result?.ok || result?.code === 'reviewing_unavailable')) {
+      projectSettingsCoordinator.observeReviewingAvailability(result.ok ? 'available' : 'unavailable',
+        result.ok ? 'reviewing_confirmed' : 'upgrade_modal');
+      syncProbeStatus();
+    }
     if (result?.ok) {
       appendRunEvent({
         title: requireReviewing
@@ -4816,6 +5238,7 @@
       code: result?.code || (requireReviewing ? 'reviewing_not_enabled' : 'editing_not_confirmed'),
       reason: result?.reason || (requireReviewing ? 'Reviewing/Track Changes was not enabled' : 'Editing mode was not confirmed'),
       reviewing: result?.reviewing || null,
+      evidence: result?.evidence, failure: result?.failure,
       requireReviewing
     };
   }
@@ -4830,8 +5253,9 @@
           operation,
           result: {
             ok: false,
-            code: blockedByEditing ? 'editing_not_confirmed' : 'reviewing_not_enabled',
-            reason: blockedByEditing
+            code: reviewing?.code || (blockedByEditing ? 'editing_not_confirmed' : 'reviewing_not_enabled'),
+            evidence: reviewing?.evidence, failure: reviewing?.failure,
+            reason: reviewing?.code === 'reviewing_unavailable' ? tr('failureReason_reviewing_unavailable_user') : blockedByEditing
               ? tx(
                 'Track is off, but Overleaf Editing mode was not verified before writing. Codex did not write this file.',
                 '已关闭“留痕”，但写入前没有确认 Overleaf 正在用 Editing 模式。Codex 没有写入这个文件。'
@@ -4885,13 +5309,13 @@
 
   async function refreshProbe(options = {}) {
     const projectId = getCurrentProjectId();
+    const accountScopeId = cachedAccountScopeId;
     const userInitiated = options.userInitiated === true;
     if (userInitiated) {
       setRefreshProbeLoading(true);
       const status = panel?.querySelector('[data-probe-status]');
       if (status) {
-        status.textContent = tr('refreshProbeLoading');
-        status.dataset.ok = 'false';
+        renderProbeStatusMessage(status, tr('refreshProbeLoading'));
         status.dataset.refreshing = 'true';
       }
     }
@@ -4901,13 +5325,14 @@
         manualOverride: state?.requireReviewing === false
       });
       if (projectId !== getCurrentProjectId()) return null;
+      if (accountScopeId !== cachedAccountScopeId) return null;
+      if (probe.capabilities?.reviewing?.confirmed === true) {
+        projectSettingsCoordinator.observeReviewingAvailability('available', 'reviewing_confirmed');
+      }
       probeStatusSnapshot = { projectId, probe, userInitiated };
       const status = panel?.querySelector('[data-probe-status]');
       if (status) {
-        status.textContent = userInitiated
-          ? tr('refreshProbeDone', { status: formatProbeStatusBar(probe) })
-          : formatProbeStatusBar(probe);
-        status.dataset.ok = isProbeReadyForCurrentMode(probe) ? 'true' : 'false';
+        renderProbeStatusLine(status, probe, { refreshed: userInitiated });
         status.dataset.refreshing = 'false';
       }
       if (!options.quiet && !userInitiated) {
@@ -4924,8 +5349,7 @@
       probeStatusSnapshot = { projectId, failed: true };
       const status = panel?.querySelector('[data-probe-status]');
       if (status) {
-        status.textContent = tr('refreshProbeFailed');
-        status.dataset.ok = 'false';
+        renderProbeStatusMessage(status, tr('refreshProbeFailed'), 'warn');
         status.dataset.refreshing = 'false';
       }
       console.warn('[codex-overleaf] refresh probe failed', error);
@@ -4945,23 +5369,81 @@
     button.dataset.loading = loading ? 'true' : 'false';
     button.disabled = Boolean(loading);
     button.setAttribute('aria-busy', loading ? 'true' : 'false');
+    setElementTitleAndAria('[data-refresh]', tr(loading ? 'refreshProbeLoading' : 'refreshProbe'),
+      tr(loading ? 'refreshProbeLoading' : 'refreshProbeTitle'));
   }
 
   function syncProbeStatus(mode = state?.mode) {
     const status = panel?.querySelector('[data-probe-status]');
     if (!status) return;
     if (status.dataset.refreshing === 'true') {
-      status.textContent = tr('refreshProbeLoading');
+      renderProbeStatusMessage(status, tr('refreshProbeLoading'));
       return;
     }
     if (probeStatusSnapshot?.projectId !== getCurrentProjectId()) return;
     const { failed, probe, userInitiated } = probeStatusSnapshot;
-    const text = failed ? tr('refreshProbeFailed') : formatProbeStatusBar(probe, mode);
-    status.textContent = userInitiated && !failed ? tr('refreshProbeDone', { status: text }) : text;
-    status.dataset.ok = !failed && isProbeReadyForCurrentMode(probe, mode) ? 'true' : 'false';
+    if (failed) renderProbeStatusMessage(status, tr('refreshProbeFailed'), 'warn');
+    else renderProbeStatusLine(status, probe, { refreshed: userInitiated });
     if (!failed) updateExistingProbeNotice(probe, mode);
   }
 
+  // Keep the read scope visible; a known Track limitation adds its own warning segment.
+  function getProbeScope(probe) {
+    const selection = selectionContextView.capture();
+    const focusFiles = getActiveFocusFiles();
+    // Match submission priority: an edit selection, then explicit focus files,
+    // then reference context, ahead of the editor's implicit current-file hint.
+    if (selection?.mode === 'edit') return { icon: 'file', key: 'probeScopeSelection' };
+    if (focusFiles.some(file => /\.tex$/i.test(file))) return { icon: 'file', key: 'probeScopeFiles' };
+    if (focusFiles.length || selection) return { icon: 'attach', key: 'probeScopeContext' };
+    if (getProbeRunReadiness(probe).editorOk) return { icon: 'file', key: 'probeScopeCurrentFile' };
+    return { icon: 'folder', key: 'probeScopeProject' };
+  }
+
+  function isReviewingKnownUnavailable() {
+    return Modules.Reviewing.knownUnavailable(projectSettingsCoordinator.getReviewingAvailability());
+  }
+
+  function syncReviewingTooltip() {
+    const toggle = panel?.querySelector('[data-require-reviewing]');
+    const title = tr(isReviewingKnownUnavailable() ? 'reviewingUnavailableTooltip' : 'requireReviewingTitle');
+    if (toggle) toggle.title = title;
+    const label = toggle?.closest('.codex-review-toggle');
+    if (label) label.title = title;
+  }
+
+  function renderProbeStatusLine(status, probe, options = {}) {
+    const scope = getProbeScope(probe);
+    const parts = [];
+    if (options.refreshed) parts.push(tr('refreshProbeDone', { status: '' }).trim());
+    const label = document.createElement('span');
+    label.className = 'codex-probe-scope';
+    label.innerHTML = Modules.PanelIcons?.svg?.(scope.icon) || ''; // Static, repository-owned icon path.
+    label.append(tr(scope.key));
+    parts.push(label);
+    if (isExperimentalOtEnabled()) {
+      const separator = document.createElement('span');
+      separator.className = 'codex-probe-sep';
+      separator.textContent = '·';
+      parts.push(separator, 'OT ' + formatOtStatusLabel(getCurrentOtStatus()));
+    }
+    if (state.requireReviewing && isReviewingKnownUnavailable()) {
+      const warning = document.createElement('span');
+      warning.dataset.tone = 'warn';
+      warning.textContent = ' · ' + tr('reviewingUnavailableStatus');
+      parts.push(warning);
+    }
+    syncReviewingTooltip();
+    status.replaceChildren(...parts);
+    delete status.dataset.tone;
+  }
+
+  function renderProbeStatusMessage(status, text, tone = '') {
+    status.replaceChildren(text);
+    if (tone) status.dataset.tone = tone;
+    else delete status.dataset.tone;
+  }
+
   function formatProbeStatusBar(probe, mode = state?.mode) {
     const readiness = getProbeRunReadiness(probe);
     const reviewingOk = readiness.reviewingOk;
@@ -4995,17 +5477,7 @@
     if (!status || status.dataset.refreshing === 'true') {
       return;
     }
-    const text = String(status.textContent || '');
-    if (!text) {
-      return;
-    }
-    const base = text.split(' · OT ')[0];
-    status.textContent = appendOtStatusToProbeStatus(base);
-  }
-
-  function isProbeReadyForCurrentMode(probe, mode = state?.mode) {
-    const readiness = getProbeRunReadiness(probe);
-    return mode === 'ask' || readiness.reviewingOk;
+    syncProbeStatus();
   }
 
   function getProbeRunReadiness(probe) {
@@ -5110,8 +5582,8 @@
         ready: true,
         message: manualOverride
           ? tx(
-            `Ready: you confirmed Overleaf Track Changes is on. Codex ${readiness.contextLabel}.`,
-            `可以运行：你已确认 Overleaf 已开启留痕，Codex ${readiness.contextLabel}。`
+            `Ready: Codex writes without tracked changes and ${readiness.contextLabel}.`,
+            `可以运行：Codex 写入时不使用留痕，并且${readiness.contextLabel}。`
           )
           : tx(
             `Ready: Codex verified Overleaf Reviewing/Track Changes is on and ${readiness.contextLabel}.`,
@@ -5120,27 +5592,20 @@
       };
     }
 
-    if (readiness.contextReady) {
-      return {
-        ready: false,
-        message: tx(
-          `Not safe to write yet: Codex ${readiness.contextLabel}, but Overleaf Reviewing/Track Changes was not verified. Turn on Reviewing first, or disable Track below.`,
-          `还不能安全写入：Codex ${readiness.contextLabel}，但没有确认 Overleaf 已开启 Reviewing/Track Changes。请先打开 Reviewing，或关闭下方的安全检查。`
-        )
-      };
-    }
-
+    // ensureReviewingBeforeWrite switches Overleaf to Reviewing before the first
+    // write and blocks the write only if that cannot be confirmed.
     return {
-      ready: false,
+      ready: true,
       message: tx(
-        'Not safe to write yet: turn on Overleaf Reviewing/Track Changes first. Codex will read the whole project at run time; you can also use @file to focus on specific files.',
-        '还不能安全写入：请先在 Overleaf 打开 Reviewing/Track Changes；Codex 会在运行时读取整个项目，也可以用 @file 指定重点文件。'
+        `Ready: Codex ${readiness.contextLabel} and will switch Overleaf to Reviewing/Track Changes before writing.`,
+        `可以运行：Codex ${readiness.contextLabel}，写入前会把 Overleaf 切到 Reviewing/Track Changes。`
       )
     };
   }
 
-  async function getRunProjectSnapshot() {
+  async function getRunProjectSnapshot(expectedProjectId = getCurrentProjectId()) {
     const project = await callPageBridge('getProjectSnapshot', {
+      projectId: expectedProjectId,
       force: true,
       maxAgeMs: 0,
       preferLightweight: true,
@@ -5152,11 +5617,12 @@
       zipTimeoutMs: RUN_SNAPSHOT_ZIP_TIMEOUT_MS,
       focusFiles: getActiveFocusFiles()
     });
-    const sanitizedProject = sanitizeRunProjectSnapshot(project);
+    const sanitizedProject = sanitizeRunProjectSnapshot(project, expectedProjectId);
     if (sanitizedProject?.capabilities?.fullProjectSnapshot || sanitizedProject?.capabilities?.pathIdentityComplete === false) {
       return sanitizedProject;
     }
     const pageStateProject = await callPageBridge('getProjectSnapshot', {
+      projectId: expectedProjectId,
       force: true,
       maxAgeMs: 0,
       preferLightweight: true,
@@ -5166,17 +5632,21 @@
       includeBinaryFiles: false,
       focusFiles: getActiveFocusFiles()
     });
-    const sanitizedPageStateProject = sanitizeRunProjectSnapshot(pageStateProject);
+    const sanitizedPageStateProject = sanitizeRunProjectSnapshot(pageStateProject, expectedProjectId);
     if (sanitizedPageStateProject?.capabilities?.fullProjectSnapshot) {
       return sanitizedPageStateProject;
     }
     return sanitizedProject;
   }
 
-  function sanitizeRunProjectSnapshot(project) {
+  function sanitizeRunProjectSnapshot(project, expectedProjectId = project?.id) {
     if (!project || typeof project !== 'object') return project;
+    if (project.id !== expectedProjectId) return { ...project, files: [], capabilities: { ...project.capabilities,
+      fullProjectSnapshot: false, skipped: [{ path: '', reason: 'document_identity_mismatch' }] } };
     const normalize = Modules.ProjectFiles.normalizeSafeProjectPath;
-    const files = Array.isArray(project.files) ? project.files : [];
+    const files = Array.isArray(project.files) ? project.files.map(file => file?.documentIdentity === undefined ? file
+      : { ...file, documentIdentity: snapshotDocumentIdentity(file.documentIdentity, file.path, project.id) }) : [];
+    project = { ...project, files };
     const counts = new Map();
     for (const file of files) {
       const path = normalize(file?.path);
@@ -5213,12 +5683,16 @@
   // --- Warm Mirror Controller ---
 
   async function getMirrorFreshness() {
+    const projectId = getCurrentProjectId(), accountScopeId = cachedAccountScopeId;
+    if (await writebackOrchestrator.refreshMirrorReuseFence(projectId, accountScopeId)) return null;
+    if (getCurrentProjectId() !== projectId || cachedAccountScopeId !== accountScopeId) return null;
     try {
       const response = await sendBackgroundNative({
         method: 'mirror.status',
-        params: { projectId: getCurrentProjectId() }
+        params: { projectId }
       });
-      if (response?.ok) {
+      const fence = await writebackOrchestrator.refreshMirrorReuseFence(projectId, accountScopeId);
+      if (response?.ok && !fence && getCurrentProjectId() === projectId && cachedAccountScopeId === accountScopeId) {
         return response.result;
       }
     } catch (error) { /* fall through */ }
@@ -5249,7 +5723,7 @@
     }
 
     const mirrorStatus = await getMirrorFreshness();
-    const mirrorHealth = Modules.MirrorHealth.classifyMirrorHealth(mirrorStatus);
+    const mirrorHealth = Modules.MirrorHealth.classifyMirrorHealth(mirrorStatus || {});
     if (!mirrorStatus?.exists || !mirrorHealth.reusable) {
       return { useExistingMirror: false, reason: 'mirror_not_fresh', mirrorStatus };
     }
@@ -5278,17 +5752,33 @@
     return candidates
       .filter(file =>
         typeof file.content === 'string' &&
-        Modules.ProjectFiles.isUsableProjectFileContent(file.content) &&
+        (Modules.ProjectFiles.isUsableProjectFileContent(file.content) || file.content === '') &&
         file.path &&
         !seen.has(file.path) &&
         seen.add(file.path)
       )
       .map(file => ({
         path: file.path,
-        content: file.content
+        content: file.content,
+        kind: 'text',
+        source: file.source,
+        ...(file.documentIdentity !== undefined
+          ? { documentIdentity: snapshotDocumentIdentity(file.documentIdentity, file.path, project.id) } : {})
       }));
   }
 
+  function snapshotDocumentIdentity(identity, path, projectId) {
+    // Preserve invalid evidence as invalid, never silently downgrade to the
+    // missing-evidence fallback. Native independently hashes the content.
+    if (!identity || identity.version !== 1 || identity.source !== 'cm-ranges-v1'
+      || identity.path !== path || identity.projectId !== projectId
+      || typeof identity.documentId !== 'string' || !/^[a-f0-9]{24}$/.test(identity.documentId)
+      || typeof identity.targetDocumentId !== 'string' || !/^[a-f0-9]{24}$/.test(identity.targetDocumentId)
+      || typeof identity.contentSha256 !== 'string' || !/^[a-f0-9]{64}$/.test(identity.contentSha256)) return null;
+    return { version: 1, source: 'cm-ranges-v1', projectId, path,
+      documentId: identity.documentId, targetDocumentId: identity.targetDocumentId, contentSha256: identity.contentSha256 };
+  }
+
   function normalizeSnapshotPath(path) {
     // Snapshot/overlay/focus arrays already carry canonical names from file chips.
     return Modules.ProjectFiles.normalizeSafeProjectPath(path);
@@ -5521,6 +6011,7 @@
         codexLocalSkillEnabled: prefs.codexLocalSkillEnabled || {},
         experimentalOtByProject: prefs.experimentalOtByProject || {},
         customInstructionsByProject: prefs.customInstructionsByProject || {},
+        reviewingAvailabilityByProject: prefs.reviewingAvailabilityByProject || {},
         governanceRulesByProject: normalizeGovernanceRulesByProject(prefs.governanceRulesByProject),
         panelWidth: prefs.panelWidth || PANEL_DEFAULT_WIDTH,
         sessions: sessions.map(session => ({
@@ -5531,6 +6022,7 @@
           focusFiles: session.focusFiles || [], selectionContext: session.selectionContext?.projectId === projectId ? session.selectionContext : null,
           projectReferenceFiles: session.projectReferenceFiles || [],
           codexThreadId: session.codexThreadId || '',
+          contextUsage: session.contextUsage || null,
           forkedFromSessionId: session.forkedFromSessionId || '',
           forkedFromRunId: session.forkedFromRunId || '',
           createdAt: session.createdAt,
@@ -5554,6 +6046,8 @@
       if (!accountScopeId || isScopedPersistenceIdentityFailure(error)) {
         throw error;
       }
+      const fallbackProjectId = getCurrentProjectId();
+      const fallbackGeneration = spaRouteGeneration;
       const fallbackKey = buildScopedFallbackStorageKey(storageKey, accountScopeId);
       const stored = await chrome.storage.local.get([fallbackKey]);
       const fallback = stored[fallbackKey] || {};
@@ -5561,6 +6055,10 @@
         fallback?.__codexOverleafCompactFallback === true
         && fallback.__codexOverleafFallbackAccountScopeId === accountScopeId
       ) {
+        if (accountScopeId === cachedAccountScopeId && fallbackProjectId === getCurrentProjectId()
+          && fallbackGeneration === spaRouteGeneration) {
+          Modules.StorageMigration.adoptProjectPreferenceBaseline(fallback, accountScopeId, fallbackProjectId);
+        }
         return {
           mode: fallback.mode || '', providerId: fallback.providerId || 'builtin',
           model: fallback.model || '',
@@ -5576,6 +6074,7 @@
           codexLocalSkillEnabled: fallback.codexLocalSkillEnabled || {},
           experimentalOtByProject: fallback.experimentalOtByProject || {},
           customInstructionsByProject: fallback.customInstructionsByProject || {},
+          reviewingAvailabilityByProject: fallback.reviewingAvailabilityByProject || {},
           governanceRulesByProject: normalizeGovernanceRulesByProject(fallback.governanceRulesByProject),
           panelWidth: fallback.panelWidth || PANEL_DEFAULT_WIDTH,
           sessions: [],
@@ -5610,9 +6109,8 @@
       // Settlement owns a run after navigation away from its project. Ordinary
       // view saves must not write that run into the current route's project.
       // An explicit override is reserved for callers that own a detached scope.
-      const projectIdOverride = options && typeof options.projectIdOverride === 'string'
-        ? options.projectIdOverride
-        : '';
+      const projectIdOverride = options?.draftScope?.projectId || (options && typeof options.projectIdOverride === 'string'
+        ? options.projectIdOverride : '');
       const urlProjectId = getCurrentProjectId();
       const projectId = projectIdOverride || urlProjectId;
       if (!projectId) {
@@ -5630,6 +6128,8 @@
         ));
         if (options?.requireDurable || options?.reviewRunIds?.length) throw new Error('Persistence project changed.'); return;
       }
+      const savedDraft = !projectIdOverride && pendingDraftSave?.scope === getComposerDraftScope()
+        ? pendingDraftSave : null;
       const compactState = prepareStateForStorage(state, { onAggressive: notifyAggressiveCompactionOnce });
       compactState.autoRecompile = state.autoRecompile;
       compactState.loadCodexLocalSkills = state.loadCodexLocalSkills !== false;
@@ -5638,10 +6138,24 @@
       compactState.codexLocalSkillEnabled = getCodexLocalSkillEnabled();
       compactState.experimentalOtByProject = state.experimentalOtByProject;
       compactState.customInstructionsByProject = state.customInstructionsByProject;
+      compactState.reviewingAvailabilityByProject = state.reviewingAvailabilityByProject;
       compactState.governanceRulesByProject = state.governanceRulesByProject;
+      const projectPreferenceBaseline = Migration.getProjectPreferenceBaseline(
+        options?.draftScope?.accountScopeId || cachedAccountScopeId, projectId);
       const stateSnapshot = typeof structuredClone === 'function'
         ? structuredClone(state)
         : JSON.parse(JSON.stringify(state));
+      const projectPreferenceWrite = Migration.captureProjectPreferenceWrite({
+        state: stateSnapshot, baseline: projectPreferenceBaseline,
+        accountScopeId: options?.draftScope?.accountScopeId || cachedAccountScopeId, projectId,
+        normalizeExperimentalOtByProject, normalizeGovernanceRulesByProject, normalizeCustomInstructionsByProject
+      });
+      // Keep consumption provenance on the live run owner across ordinary
+      // session normalization; it is not a composer edit or a queued input.
+      const consumedSession = liveRunView?.draftConsumption && liveRunView.runProjectId === projectId
+        && liveRunView.runAccountScopeId === cachedAccountScopeId
+        ? stateSnapshot.sessions?.find(session => session.id === liveRunView.sessionId) : null;
+      if (consumedSession?.task === '') consumedSession.draftConsumption = { ...liveRunView.draftConsumption };
       const compactStateSnapshot = typeof structuredClone === 'function'
         ? structuredClone(compactState)
         : JSON.parse(JSON.stringify(compactState));
@@ -5660,9 +6174,33 @@
         normalizeExperimentalOtByProject,
         normalizeGovernanceRulesByProject,
         normalizeCustomInstructionsByProject,
+        projectPreferenceBaseline,
+        projectPreferenceWrite,
+        applyProjectPreferences: (prefs, captured, fields) => {
+          if (retentionScope.accountScopeId !== cachedAccountScopeId || retentionScope.projectId !== getCurrentProjectId()
+            || retentionScope.generation !== spaRouteGeneration) return false;
+          const adopted = [];
+          for (const field of fields) {
+            if (JSON.stringify(state[field]?.[projectId]) !== JSON.stringify(captured[field]?.[projectId])) continue;
+            if (JSON.stringify(state[field]?.[projectId]) === JSON.stringify(prefs[field]?.[projectId])) continue;
+            state[field] = { ...state[field], ...prefs[field] };
+            if (!Object.hasOwn(prefs[field] || {}, projectId)) delete state[field][projectId];
+            adopted.push(field);
+          }
+          if (adopted.includes('customInstructionsByProject')) syncCustomInstructionsEditorForProject(projectId);
+          if (adopted.includes('governanceRulesByProject')) syncProjectSettingsEditorForProject();
+          if (adopted.includes('experimentalOtByProject')) syncExperimentalOtToggleForProject(projectId);
+          if (adopted.includes('reviewingAvailabilityByProject')) {
+            syncReviewingTooltip();
+            syncProbeStatus();
+          }
+          return true;
+        },
         persistenceContext
         });
-        await getComposerDraftPersistence().save({ accountScopeId: persistenceContext.scope.accountScopeId, projectId });
+        if (!options?.draftScope) {
+          await getComposerDraftPersistence().save({ accountScopeId: persistenceContext.scope.accountScopeId, projectId });
+        }
       };
 
       const persistenceCoordinator = getScopedPersistenceCoordinator();
@@ -5671,17 +6209,16 @@
           code: 'scoped_persistence_unavailable'
         });
       } else {
-        const committed = await persistenceCoordinator.commit(
-          projectId,
-          {
+        const commitOptions = {
             detached: Boolean(projectIdOverride),
             rebase: true,
             queueMutation: options?.queueMutation,
             queueMutations: options?.queueMutations,
             sessionTombstones: options?.deletedSessionIds
-          },
-          persistScopedState
-        );
+        };
+        const committed = options?.draftScope
+          ? await persistenceCoordinator.commitDetached(projectId, options.draftScope.accountScopeId, commitOptions, persistScopedState)
+          : await persistenceCoordinator.commit(projectId, commitOptions, persistScopedState);
         if (!committed.ok && (
           options?.requireDurable || options?.reviewRunIds?.length || options?.recoveryRuns?.length || options?.queueMutation
           || options?.queueMutations?.length
@@ -5692,6 +6229,16 @@
           });
         }
         if (committed.ok) {
+          if (savedDraft && pendingDraftSave === savedDraft) {
+            const capturedTask = stateSnapshot.sessions.find(item => item.id === stateSnapshot.activeSessionId)?.task;
+            const storedTask = StorageDb.buildSessionRecord({ task: capturedTask }).task;
+            if (!(written || []).some(session => session.id === stateSnapshot.activeSessionId && session.task === storedTask)) {
+              throw Object.assign(new Error(tx('The latest draft could not be saved. It is still available in this page.',
+                '最新草稿未能保存，内容仍保留在当前页面。')), { code: 'draft_state_not_persisted' });
+            }
+            // A newer input revision keeps its own timer, even if this save finishes later.
+            resetDraftSave();
+          }
           const retentionUpdates = StorageDb.projectRetentionUpdates?.({ liveState: state, capturedState: stateSnapshot, written,
             capturedScope: retentionScope, currentScope: { accountScopeId: typeof cachedAccountScopeId === 'string' ? cachedAccountScopeId : '',
               projectId: getCurrentProjectId(), generation: typeof spaRouteGeneration === 'number' ? spaRouteGeneration : null } }) || [];
@@ -5707,6 +6254,8 @@
       }
     } catch (error) {
       if (options?.requireDurable) throw error;
+      // A departing draft must never fall back using the destination page's state/scope.
+      if (options?.draftScope) return;
       if (error?.code === 'recovery_scope_changed') return;
       if (
         error?.code === 'account_scope_unavailable' &&
@@ -5824,6 +6373,65 @@
     }, delayMs);
   }
 
+  function getComposerDraftScope() {
+    return JSON.stringify([cachedAccountScopeId, getCurrentProjectId(), spaRouteGeneration, state.activeSessionId]);
+  }
+
+  function resetDraftSave() {
+    if (draftSaveTimer) clearTimeout(draftSaveTimer);
+    draftSaveTimer = null;
+    pendingDraftSave = null;
+  }
+
+  function captureComposerDraft() {
+    const input = panel?.querySelector('[data-task]');
+    if (!input || !state.activeSessionId) return;
+    const next = updateActiveSessionDraft(state, input.value);
+    if (next === state) return;
+    if (next.task !== state.task) {
+      composerDraftEditedHere = true;
+      if (currentRunView?.sessionId === state.activeSessionId) delete currentRunView.draftConsumption;
+    }
+    state = next;
+    const now = Date.now(), scope = getComposerDraftScope();
+    pendingDraftSave = {
+      scope,
+      projectId: getCurrentProjectId(),
+      accountScopeId: cachedAccountScopeId,
+      firstAt: pendingDraftSave?.scope === scope ? pendingDraftSave.firstAt : now
+    };
+    if (draftSaveTimer) clearTimeout(draftSaveTimer);
+    const delay = Math.max(0, Math.min(DRAFT_SAVE_DELAY_MS, pendingDraftSave.firstAt + DRAFT_SAVE_MAX_WAIT_MS - now));
+    draftSaveTimer = setTimeout(() => {
+      draftSaveTimer = null;
+      if (pendingDraftSave?.scope !== getComposerDraftScope()) { resetDraftSave(); return; }
+      pendingDraftSave.firstAt = Date.now();
+      // Join the existing writer immediately; never reset its timer on every key.
+      saveStateSoon(0);
+    }, delay);
+  }
+
+  async function flushComposerDraft({ requireDurable = false } = {}) {
+    if (!pendingDraftSave) return;
+    const scope = getComposerDraftScope();
+    if (pendingDraftSave.scope !== scope) { resetDraftSave(); return; }
+    if (draftSaveTimer) clearTimeout(draftSaveTimer);
+    draftSaveTimer = null;
+    pendingDraftSave.firstAt = Date.now();
+    await flushQueuedSaveState(requireDurable ? { requireDurable: true } : null);
+    if (requireDurable && scope !== getComposerDraftScope()) {
+      throw new Error(tx('The active session changed while saving the draft. Try again.',
+        '保存草稿时活动会话已改变，请重试。'));
+    }
+  }
+
+  function flushComposerDraftOnLeave() {
+    // Lifecycle events cannot await completion; periodic saves remain the primary protection.
+    flushComposerDraft().catch(error => appendStorageNoticeOnce('save-failed', tx(
+      `Failed to save session state: ${localizeVisibleReason(error.message)}`,
+      `保存会话状态失败：${localizeVisibleReason(error.message)}`)));
+  }
+
   function runQueuedSaveState() {
     if (saveStateInFlightPromise) {
       saveStateRunAfterFlight = true;
@@ -5924,13 +6532,11 @@
   async function persistPanelInputs(event) {
     const globalWrite = getGlobalPreferences().handleInput(event);
     if (globalWrite) return globalWrite;
-    // Typing in the task box is the hottest write path: a full saveState per
-    // keystroke serializes every session/run/event and rewrites IndexedDB, so
-    // panels get slower as history grows. Drafts take the debounced saver;
-    // committed control changes keep the immediate full save below.
-    if (event?.type === 'input' && event?.target?.matches?.('[data-task]')) {
-      readPanelInputs();
-      saveStateSoon();
+    // Draft edits retain run/event identity. Composition updates also capture the
+    // current text; compositionend captures its committed value if no final input fires.
+    if (event?.target?.matches?.('[data-task]')) {
+      captureComposerDraft();
+      if (event.type === 'change') await flushComposerDraft();
       return;
     }
     if (event?.target?.matches?.('[data-speed]')) {
@@ -5942,8 +6548,18 @@
     }
     renderSpeedOptions(getRenderedModelEntries());
     readPanelInputs();
+    // Only a user re-enabling Track requests another capability check. The
+    // preceding input event and programmatic session renders must not reset it.
+    if (event?.type === 'change' && event.isTrusted === true
+      && event.target?.matches?.('[data-require-reviewing]') && event.target.checked
+      && isReviewingKnownUnavailable()) {
+      projectSettingsCoordinator.observeReviewingAvailability('unknown', 'user_retry');
+      syncReviewingTooltip();
+      syncProbeStatus();
+    }
     renderModelConfigChoices();
     updateModelDisplay();
+    renderContextUsage();
     // Save feedback is per-card now (settingsPanel flashSaved); the global
     // header chip and its Saving/Saved lifecycle are gone.
     await saveState();
@@ -6037,9 +6653,17 @@
     if (!composerDraftPersistence) composerDraftPersistence = Modules.ComposerAttachmentDraft.createController({
       getScope: () => ({ accountScopeId: cachedAccountScopeId, projectId: getCurrentProjectId() }),
       getAttachments: () => composerAttachmentController.serializePersistableAttachments(),
-      setAttachments: value => { state.composerAttachments = value; },
+      getOmittedAttachmentNames: () => composerAttachmentController.getOmittedAttachmentNames(),
+      setAttachments: value => {
+        state.composerAttachments = value;
+        syncComposerSendAvailability();
+      },
       clear: () => composerAttachmentController.clear({ notify: false }),
       restore: value => composerAttachmentController.restorePersistedAttachments(value),
+      onRestoreOmittedAttachments: ({ count, names }) => appendPlainLog(tx(
+        `${count} attachment${count === 1 ? '' : 's'} could not be saved in the draft. Reattach before sending: ${names.join(', ')}.`,
+        `${count} 个附件未能保存到草稿中，请在发送前重新添加：${names.join('、')}。`
+      )),
       read: scope => Modules.StorageDb.readComposerAttachmentDraft(scope),
       write: (scope, value) => Modules.StorageDb.writeComposerAttachmentDraft(scope, value),
       scheduleSave: () => saveStateSoon()
@@ -6073,6 +6697,7 @@
       if (findSessionById(submission.sessionId)?.task !== submission.task) return false;
       if (state.activeSessionId !== submission.sessionId) {
         updateSessionById(submission.sessionId, { task: '' });
+        recordSubmittedDraftConsumption(submission.sessionId, submission.task);
         saveStateSoon();
         return false;
       }
@@ -6086,6 +6711,7 @@
     if (taskInput) {
       taskInput.value = '';
     }
+    composerDraftEditedHere = false;
     autosizeTaskTextarea();
     if (!keepAttachments) {
       composerAttachmentController.clear();
@@ -6094,10 +6720,20 @@
     renderComposerSkillInvocation();
     selectionContextView.clear();
     state = updateActiveSession(state, { task: '' });
+    if (submission) recordSubmittedDraftConsumption(submission.sessionId, submission.task);
+    else if (currentRunView?.sessionId === state.activeSessionId) delete currentRunView.draftConsumption;
     saveStateSoon();
     return true;
   }
 
+  function recordSubmittedDraftConsumption(sessionId, task) {
+    if (task && currentRunView?.sessionId === sessionId
+      && currentRunView.runProjectId === getCurrentProjectId()
+      && currentRunView.runAccountScopeId === cachedAccountScopeId) {
+      currentRunView.draftConsumption = { runId: currentRunView.recordId, task };
+    }
+  }
+
   function restoreRejectedLocalSkillSubmission(submission, checkpoint) {
     const input = panel?.querySelector('[data-task]');
     if (!checkpoint || !input || submission.accountScopeId !== cachedAccountScopeId
@@ -6115,6 +6751,7 @@
     state = updateActiveSession(state, { task: submission.task, selectionContext: submission.selectionContext });
     renderComposerSkillInvocation();
     selectionContextView.render();
+    syncProbeStatus();
     autosizeTaskTextarea();
     syncComposerSendAvailability();
     saveStateSoon();
@@ -6122,11 +6759,15 @@
   }
 
   function applyStateToPanel(options = {}) {
+    if (pendingDraftSave && pendingDraftSave.scope !== getComposerDraftScope()) resetDraftSave();
+    contextUsageView?.close();
     selectionContextView.render();
     writingStyleSettings.sync();
     applyPanelTheme(getThemePreference());
     if ((state.providerId || 'builtin') === 'builtin' && !modelSelectHasOption(state.model)) {
-      renderModelOptions(getModelCatalog().FALLBACK_MODELS, state.model);
+      renderModelOptions(getModelCatalog().FALLBACK_MODELS, state.model, {
+        provisionalSelected: getModelDiscovery().provisional === true
+      });
     }
     panel.querySelector('[data-model]').value = state.model;
     const renderedModels = getRenderedModelEntries();
@@ -6144,6 +6785,7 @@
     autosizeTaskTextarea();
     syncComposerSendAvailability();
     panel.querySelector('[data-require-reviewing]').checked = state.requireReviewing;
+    syncReviewingTooltip();
     const recompileCheckbox = panel?.querySelector('[data-auto-recompile]');
     if (recompileCheckbox) {
       recompileCheckbox.checked = state.autoRecompile !== false;
@@ -6198,6 +6840,47 @@
       if (record) configureWritebackButton(root, record, { running });
     });
     renderPendingInputs();
+    renderContextUsage();
+  }
+
+  function renderContextUsage() {
+    if (!contextUsageView || !state) return;
+    contextUsageView.setState(getContextUsageDisplay());
+  }
+
+  function getContextUsageDisplay() {
+    const session = getActiveSession(state);
+    const run = currentRunView?.sessionId === session?.id
+      ? findRunRecord(currentRunView.recordId, currentRunView.sessionId) : null;
+    const selection = providerSettingsCoordinator.getRunSelection(state.providerId);
+    const runningSelection = run?.status === 'running' && run.model === state.model
+      && (run.providerId || 'builtin') === (state.providerId || 'builtin');
+    const scope = {
+      threadId: session?.codexThreadId || '',
+      providerId: state.providerId || 'builtin',
+      providerRevision: runningSelection ? Number(run.providerRevision || 0)
+        : selection?.providerRevision ?? ((state.providerId || 'builtin') === 'builtin' ? 0 : null),
+      model: state.model || ''
+    };
+    // The composer can select the next turn's model while this turn runs.
+    // Only show statistics produced by the selected model and provider.
+    const matchesRun = run && run.model === scope.model
+      && (run.providerId || 'builtin') === scope.providerId
+      && Number(run.providerRevision || 0) === scope.providerRevision;
+    // Starting another turn must not revive statistics from before an automatic
+    // compaction. Retain the watermark across this thread's saved normal runs.
+    const compactedAt = (session?.runs || []).reduce((latest, candidate) => candidate && !candidate.forkSnapshot
+      && candidate.operation !== 'compact' && scope.threadId && candidate.codexThreadId === scope.threadId
+      ? Math.max(latest, Modules.RunActivityModel.getCompactedAt(candidate)) : latest, 0);
+    const { usage, pending, compacted } = Modules.ContextUsage.status(session, { ...scope, compactedAt });
+    const compacting = Boolean(matchesRun && Modules.RunActivityModel.project(run).compacting);
+    return { usage, pending, compacted, compacting, compactingKind: compacting ? (run.operation === 'compact' ? 'manual' : 'auto') : '' };
+  }
+
+  function getCompactAvailability() {
+    if (sessionManager.isTransitioning() || updateIdleClient?.isApplying() || currentRunView || runSubmissionPending) return { ok: false, reason: 'compactBusy' };
+    if (!getActiveSession(state)?.codexThreadId) return { ok: false, reason: 'compactNoThread' };
+    return { ok: true };
   }
 
   function prepareRetryReplacement(run, task) {
@@ -6231,6 +6914,7 @@
     sessionId = state.activeSessionId,
     sessionContext = runController.captureSessionContext(state),
     codexThreadId = '',
+    operation,
     task,
     mode,
     model,
@@ -6247,6 +6931,7 @@
     resetAutoFollow();
     const record = {
       id: createRunId(),
+      ...(operation === 'compact' ? { operation } : {}),
       task,
       mode,
       ...providerSettingsCoordinator.getProviderSnapshot(executionSnapshot?.providerId || state?.providerId),
@@ -6276,12 +6961,20 @@
       runAccountScopeId: cachedAccountScopeId || ''
     };
     const active = findSessionById(sessionId);
-    const titlePatch = active?.titleSource !== 'manual'
+    const titlePatch = operation !== 'compact' && active?.titleSource !== 'manual'
       ? {
         title: deriveSessionTitle([], task),
         titleSource: 'auto'
       }
       : {};
+    // Establish the in-memory owner before publishing or rendering the record.
+    // If presentation throws, runTask still has the identity needed to settle it.
+    const view = currentRunView = {
+      operation, sessionId, sessionContext, codexThreadId, recordId: record.id,
+      runProjectId: record.runProjectId, runAccountScopeId: record.runAccountScopeId,
+      executionSnapshot: record.executionSnapshot, startedAt: Date.now(), queueItemId,
+      nativeRequestId: '', activeTurn: null
+    };
     updateSessionById(sessionId, {
       runs: runController.replaceRunForRetry(active?.runs, replaceRunId, record),
       ...titlePatch
@@ -6290,6 +6983,16 @@
 
     const log = panel.querySelector('[data-log]');
     const root = renderRunCard(record);
+    Object.assign(view, {
+      root,
+      runProcess: root.querySelector('[data-run-process]'),
+      processLabel: root.querySelector('[data-run-process-summary]'),
+      events: root.querySelector('[data-run-events]'),
+      report: root.querySelector('[data-run-report]'),
+      status: root.querySelector('[data-run-status]'),
+      // Seed references before warm-mirror resolution produces its snapshot.
+      projectFiles: getCurrentProjectReferenceFiles()
+    });
     if (state.activeSessionId === sessionId) {
       removeEmptyRunsMessage(log);
       if (replaceRunId) log.querySelector(`[data-run-id="${cssEscape(replaceRunId)}"]`)?.remove();
@@ -6300,32 +7003,7 @@
     renderSessionList();
     applySessionLabel();
 
-    return {
-      sessionId,
-      sessionContext,
-      codexThreadId,
-      recordId: record.id,
-      // Mirror the immutable runProjectId on the view so writeback /
-      // accept / undo dispatches don't need to re-look up the record.
-      runProjectId: record.runProjectId,
-      runAccountScopeId: record.runAccountScopeId,
-      executionSnapshot: record.executionSnapshot,
-      root,
-      runProcess: root.querySelector('[data-run-process]'),
-      processLabel: root.querySelector('[data-run-process-summary]'),
-      events: root.querySelector('[data-run-events]'),
-      report: root.querySelector('[data-run-report]'),
-      status: root.querySelector('[data-run-status]'),
-      // A run starts before warm-mirror resolution has produced its lightweight
-      // project snapshot. Seed references from the already-prefetched project
-      // inventory so early stream events and fast Ask responses can still
-      // resolve project-relative locations.
-      projectFiles: getCurrentProjectReferenceFiles(),
-      startedAt: Date.now(),
-      queueItemId,
-      nativeRequestId: '',
-      activeTurn: null
-    };
+    return view;
   }
 
   function touchSessionForTerminalRun(sessionId, finishedAt) {
@@ -6388,6 +7066,7 @@
       ].filter(Boolean).join(' · ');
       collapseRunProcess(visibleView, statusText);
     }
+    renderContextUsage();
   }
 
 
@@ -6402,6 +7081,11 @@
     }
 
     const owner = currentRunView && findRunRecord(currentRunView.recordId, currentRunView.sessionId);
+    if (storeContextUsage(event, owner, findSessionById(currentRunView?.sessionId), journalSeq)) {
+      scheduleRunStateSave('stream');
+      renderContextUsage();
+      return;
+    }
     if (owner && Modules.SubagentActivityModel.ingest(owner, event, {
       locale: getLocale(), sanitize: sanitizeAssistantVisibleText, nativeEventSeq: journalSeq
     })) {
@@ -6430,6 +7114,20 @@
       replaceText: activity.replaceText,
       nativeEventSeq: journalSeq
     });
+    if (activity.kind !== 'stream') renderContextUsage();
+  }
+
+  function storeContextUsage(event, record, session, sequence) {
+    if (!record) return false;
+    const usage = Modules.ContextUsage.fromEvent(event, {
+      ...record, providerRevision: Number(record.providerRevision || 0), eventSeq: sequence
+    });
+    if (!usage || !Modules.ContextUsage.isNewer(usage, record.contextUsage)) return false;
+    record.contextUsage = usage;
+    record.nativeEventSeq = Math.max(Number(record.nativeEventSeq || 0), Number(sequence || 0));
+    if (session?.codexThreadId === usage.threadId
+      && Modules.ContextUsage.isNewer(usage, session.contextUsage)) session.contextUsage = usage;
+    return true;
   }
 
   function bindActiveTurn(detail = {}, journalSeq = 0) {
@@ -6438,16 +7136,24 @@
     }
     const threadId = String(detail.threadId || '');
     const turnId = String(detail.turnId || '');
-    currentRunView.activeTurn = { threadId, turnId };
+    currentRunView.activeTurn = currentRunView.operation === 'compact' ? null : { threadId, turnId };
     const record = findRunRecord(currentRunView.recordId, currentRunView.sessionId);
     if (record) {
       record.codexThreadId = threadId; record.codexTurnId = turnId;
+      if (record.operation === 'compact') {
+        const session = findSessionById(currentRunView.sessionId);
+        if (session?.contextUsage?.threadId === threadId
+          && Date.parse(session.contextUsage.observedAt) < Date.parse(record.startedAt)) {
+          session.contextUsage = null;
+        }
+      }
       record.nativeEventSeq = Math.max(Number(record.nativeEventSeq || 0), Number(journalSeq || 0));
     }
     if (threadId) {
       updateSessionById(currentRunView.sessionId, { codexThreadId: threadId });
     }
     renderPendingInputs();
+    renderContextUsage();
     saveState().catch(() => {});
   }
 
@@ -6468,7 +7174,7 @@
   function appendRunEvent(input = {}) {
     const { title, status = 'info', detail, timestamp } = input;
     const safeTitle = sanitizeAssistantVisibleText(title) || 'Event';
-    if (!currentRunView?.events) {
+    if (!currentRunView) {
       appendPlainLog(safeTitle);
       return;
     }
@@ -6512,21 +7218,20 @@
           })).filter(item => item.path)
         : undefined
     };
+    // Keep the activity timestamp current without retaining a run reference
+    // across session normalization, which replaces run and event objects.
+    const nowMs = Date.now();
+    if (nowMs - lastRunActivityBumpMs > 60000
+      && findRunRecord(currentRunView.recordId, currentRunView.sessionId)) {
+      lastRunActivityBumpMs = nowMs;
+      state = updateActiveSession(state, {});
+    }
     const record = findRunRecord(currentRunView.recordId, currentRunView.sessionId);
     let renderedEvent = event;
     if (record) {
       if (Number.isFinite(Number(input.nativeEventSeq))) {
         record.nativeEventSeq = Math.max(Number(record.nativeEventSeq || 0), Number(input.nativeEventSeq || 0));
       }
-      // v1.8.1: keep the session's activity timestamp honest DURING a run —
-      // it was pinned to run start, so the dashboard's 30-minute zombie
-      // heuristic mislabeled any long live run as interrupted (fleet P1).
-      // Throttled to once a minute; updateActiveSession stamps updatedAt.
-      const nowMs = Date.now();
-      if (nowMs - lastRunActivityBumpMs > 60000) {
-        lastRunActivityBumpMs = nowMs;
-        state = updateActiveSession(state, {});
-      }
       renderedEvent = event.kind === 'stream'
         ? upsertRunStreamRecordEvent(record, event)
         : event;
@@ -6922,7 +7627,7 @@
     }
     await Modules.ScopedPersistenceCoordinator.applyReviewTransition({
       getState: () => state, runId, transition: WritebackSettlement.applySettlementTransition(run, settlement),
-      persist: flushQueuedSaveState, assertCurrent: options.assertCurrent
+      persist: flushQueuedSaveState, assertCurrent: options.assertCurrent, SessionState: Modules.SessionState
     });
   }
 
@@ -6939,6 +7644,7 @@
     if (!run) {
       return 0;
     }
+    run = Modules.UndoOperations.withAvailableUndo(run);
     const trackedEditorUndoCount = hasTrackedEditorUndo(run) ? 1 : 0;
     if (trackedEditorUndoCount) {
       return trackedEditorUndoCount + Modules.UndoOperations.getFileUndoOperations(run).length;
@@ -6990,16 +7696,20 @@
     assertCurrent();
   }
 
-  async function settleWritebackRecovery(applied, project, verification, target) {
+  async function settleWritebackRecovery(applied, project, verification, target, requireReviewing) {
     const record = findRunRecord(target.recordId, target.sessionId);
     if (!record) return;
+    // retryRequireReviewing is in-memory only; a renormalized run copy loses it.
+    const retryReviewing = typeof requireReviewing === 'boolean' ? requireReviewing
+      : typeof record.retryRequireReviewing === 'boolean' ? record.retryRequireReviewing
+        : record.executionSnapshot?.requireReviewing === true;
     const owner = recoveryOwner(target);
     const skippedPaths = new Set((applied.skipped || []).map(entry => entry.operation?.path));
     const creates = (record.retryWriteback?.operations || []).filter(op => skippedPaths.has(op.path));
     // Untouched edits (never opened / rejected) and deletes whose server check failed are safe to replay.
     const edits = (applied.skipped || []).filter(({ operation: op, result }) => result?.failure?.changedDocument === false && ((op?.type === 'edit'
       && (result.failure.stage === 'navigation' || result.failure.code === 'write_operation_failed')) || (op?.type === 'delete' && result.failure.code === 'source_zip_unavailable'))).map(entry => entry.operation);
-    const base = { ...(record.retryWriteback || { ...owner, id: crypto.randomUUID(), requireReviewing: record.retryRequireReviewing === true }),
+    const base = { ...(record.retryWriteback || { ...owner, id: crypto.randomUUID() }), requireReviewing: retryReviewing,
       baseFiles: project?.files || [], requestId: applied.receiptUnconfirmed ? applied.requestId || '' : '' };
     // An oversized edit pre-image must not cost the create retries (the intent has a 300 KiB ceiling).
     const safeRetry = [[...creates, ...edits], creates].filter(ops => ops.length).map(ops => Modules.SessionState
@@ -7033,31 +7743,46 @@
     const originalStatus = record.status;
     const retryAutoRecompile = typeof record.executionSnapshot?.autoRecompile === 'boolean'
       ? record.executionSnapshot.autoRecompile : undefined;
+    const generation = spaRouteGeneration;
+    const isOwnerScope = () => generation === spaRouteGeneration
+      && owner.projectId === getCurrentProjectId() && owner.accountScopeId === cachedAccountScopeId;
     // State is renormalized during the awaits below (probes, session sync), which
     // replaces run objects; always write through the current copy.
-    const live = () => findRunRecord(runId, session.id) || record;
+    const live = () => (isOwnerScope() && findRunRecord(runId, session.id)) || record;
     let finished = false;
+    let retryOutcome = null;
     runCancellationRequested = false;
     runCancellationController = new AbortController();
-    record.status = 'running';
-    record.retryingWriteback = true;
-    renderRunHistory({ preserveScroll: true });
-    const root = panel.querySelector(`[data-run-id="${cssEscape(runId)}"]`);
-    currentRunView = { root, recordId: runId, sessionId: session.id, runProjectId: owner.projectId,
+    const requestId = record.nativeRequestId || `writeback:${owner.sessionId}:${runId}`;
+    const ownerToken = crypto.randomUUID();
+    const retryView = { recordId: runId, sessionId: session.id, runProjectId: owner.projectId,
       runAccountScopeId: owner.accountScopeId, executionSnapshot: record.executionSnapshot,
-      startedAt: Date.now(), writebackRetry: true, events: root?.querySelector('[data-run-events]'),
-      report: root?.querySelector('[data-run-report]'), status: root?.querySelector('[data-run-status]'),
-      runProcess: root?.querySelector('[data-run-process]'), processLabel: root?.querySelector('[data-run-process-summary]') };
+      startedAt: Date.now(), writebackRetry: true };
+    currentRunView = retryView;
     setRunning(true);
     const assertOwner = () => {
-      if (runCancellationRequested || currentRunView?.recordId !== runId) {
+      if (runCancellationRequested || currentRunView !== retryView) {
         throw Object.assign(new Error('Save checking was cancelled.'), { code: 'codex_cancelled' });
       }
-      if (owner.projectId !== getCurrentProjectId() || owner.accountScopeId !== cachedAccountScopeId) {
+      if (!isOwnerScope()) {
         throw Object.assign(new Error('The project or account changed.'), { code: 'aborted_project_changed' });
       }
     };
     try {
+      const bound = await activeTurnControl.bindBrowserRun({ requestId, projectKey: owner.projectId,
+        clientRunId: runId, sessionId: session.id, ownerToken });
+      assertOwner();
+      if (!bound) throw new Error(tx('Could not start sync. Reload the page and try again.', '无法开始同步，请刷新页面后重试。'));
+      // Publish running only after another page can observe this browser owner.
+      live().status = 'running';
+      live().retryingWriteback = true;
+      renderRunHistory({ preserveScroll: true });
+      const root = panel.querySelector(`[data-run-id="${cssEscape(runId)}"]`);
+      Object.assign(retryView, { root, events: root?.querySelector('[data-run-events]'),
+        report: root?.querySelector('[data-run-report]'), status: root?.querySelector('[data-run-status]'),
+        runProcess: root?.querySelector('[data-run-process]'), processLabel: root?.querySelector('[data-run-process-summary]') });
+      const pendingMirror = getPendingMirrorRefresh?.();
+      if (pendingMirror) await awaitRunStep(pendingMirror.catch(() => {}));
       assertOwner();
       if (intent?.requestId) {
         const receipt = await callPageBridge('getWritebackReceipt', { requestId: intent.requestId, runProjectId: owner.projectId });
@@ -7067,9 +7792,12 @@
         // Edits replay against the run's original base files, so the stale guard still refuses changed documents.
         const result = await applySyncChangesToOverleaf(intent.operations.map(op => op.type === 'edit'
           ? { type: 'write', path: op.path, patches: op.patches, content: op.replaceAll } : op.type === 'delete' ? { type: 'delete', path: op.path } : { ...op, type: 'create' }),
-          { id: owner.projectId, files: intent.baseFiles }, { mode: 'auto', requireReviewing: intent.requireReviewing,
+          // The submitted snapshot owns the write mode; older intents may carry a lost value.
+          { id: owner.projectId, files: intent.baseFiles }, { mode: 'auto', requireReviewing: typeof record.executionSnapshot?.requireReviewing === 'boolean'
+            ? record.executionSnapshot.requireReviewing : intent.requireReviewing,
             autoRecompile: retryAutoRecompile,
-            retryCreates: true, assistantMessage: tx('Retried the remaining file transfers for this task.', '已重试本轮未完成的文件同步。') });
+            retryCreates: true, assistantMessageKey: 'retry_sync', assistantMessage: tx('Retried the remaining file transfers for this task.', '已重试本轮未完成的文件同步。') });
+        retryOutcome = result;
         assertOwner();
         if (result.settlement?.facts) live().settlement = WritebackSettlement.mergeRetrySettlement(live().settlement, result.settlement.facts); // Keep files outside the retry.
         await finishRunView(result.hasSkippedOperations ? tx('Sync incomplete', '同步未完成') : tx('Synced', '已同步'),
@@ -7090,15 +7818,36 @@
       }
       await flushQueuedSaveState();
     } catch (error) {
+      const outcome = error.writebackOutcome || retryOutcome;
+      const current = findRunRecord(runId, session.id);
+      if (outcome && (runCancellationRequested || isRunCancellationError(error))
+        && currentRunView === retryView && isOwnerScope()
+        && current && !current.forkSnapshot && current.runProjectId === owner.projectId) {
+        // Stop cannot erase writes returned by Retry sync, including a saved
+        // reply that arrived after cancellation. Keep earlier files' facts too.
+        if (outcome.settlement?.facts) current.settlement = WritebackSettlement.mergeRetrySettlement(
+          current.settlement, outcome.settlement.facts);
+        appendRunCancelledReport(outcome, false);
+        await finishRunView(tx('Cancelled', '已取消'), 'cancelled');
+        finished = true;
+      }
       showPluginToast(error.message || String(error));
     } finally {
       // Only finishRunView settles a new terminal status; every other exit
       // returns the card to the status it had before the retry.
+      if (currentRunView !== retryView) {
+        activeTurnControl.release(requestId, ownerToken);
+        return;
+      }
       for (const copy of new Set([record, live()])) {
         delete copy.retryingWriteback;
         if (!finished && copy.status === 'running') copy.status = originalStatus;
       }
-      if (currentRunView?.recordId === runId) currentRunView = null;
+      saveStateSoon();
+      await flushQueuedSaveState().catch(() => {});
+      activeTurnControl.release(requestId, ownerToken);
+      if (currentRunView !== retryView) return;
+      currentRunView = null;
       runCancellationRequested = false;
       runCancellationController = null;
       setRunning(false);
@@ -7206,11 +7955,18 @@
       return;
     }
 
-    const combinedAppliedOperations = [
+    let combinedAppliedOperations = [
       ...(Array.isArray(record.appliedOperations) ? record.appliedOperations : []),
       ...appliedOperations
     ];
+    const checkpoint = buildUndoCheckpoint(project, combinedAppliedOperations);
+    combinedAppliedOperations = checkpoint.appliedOperations;
     record.appliedOperations = combinedAppliedOperations;
+    if (checkpoint.undoUnavailable.length) {
+      appendRunEvent({ title: tr('failureReason_snapshot_undo_unavailable_user'), status: 'warning',
+        detail: checkpoint.undoUnavailable.map(item => ({ [tr('detailFile')]: item.path,
+          [tr('detailReason')]: item.code, [tr('detailNext')]: tr('failureReason_snapshot_undo_unavailable_next') })) });
+    }
     const createdCheckpoint = buildCreatedFileUndoCheckpoint(project, combinedAppliedOperations, record);
 
     if ((currentRunView?.executionSnapshot?.requireReviewing ?? state.requireReviewing) === true) {
@@ -7273,7 +8029,6 @@
       return;
     }
 
-    const checkpoint = buildUndoCheckpoint(project, combinedAppliedOperations);
     const createdPaths = new Set(createdCheckpoint.undoOperations.map(operation => operation.path));
     checkpoint.undoOperations = [
       ...checkpoint.undoOperations.filter(operation => !createdPaths.has(operation.path)),
@@ -7283,10 +8038,7 @@
       ...checkpoint.undoBaseFiles.filter(file => !createdPaths.has(file.path)),
       ...createdCheckpoint.undoBaseFiles
     ];
-    if (!checkpoint.undoOperations.length) {
-      return;
-    }
-
+    if (!checkpoint.undoOperations.length && !checkpoint.undoUnavailable.length) return;
     record.undoOperations = checkpoint.undoOperations;
     record.undoBaseFiles = checkpoint.undoBaseFiles;
     record.undoTrackedChanges = [];
@@ -7299,6 +8051,7 @@
     record.undoStatus = '';
     record.partialWriteback = skippedEntries.length > 0;
     refreshRunCardControls(record.id);
+    if (!checkpoint.undoOperations.length) return;
     appendRunEvent({
       title: tr('undoCheckpointPlain', { count: record.undoOperations.length }),
       status: 'completed',
@@ -7361,6 +8114,7 @@
       guidanceId: sanitizeAssistantVisibleText(event.guidanceId)
     };
     if (event.failure) normalized.failure = sanitizeAssistantVisibleValue(event.failure);
+    if (event.detailStructured) normalized.detailStructured = sanitizeAssistantVisibleValue(event.detailStructured);
     record.events = [...(record.events || []), normalized].slice(-MAX_RUN_EVENTS);
     saveStateSoon();
 
@@ -7810,8 +8564,14 @@
       return;
     }
 
+    const groupKey = String(options.groupKey || '');
+    const grouped = groupKey && Array.from(region.children).find(item => item.dataset.groupKey === groupKey);
+    if (grouped) {
+      updateToastGroup(grouped);
+      return;
+    }
     const last = region.lastElementChild;
-    if (last?.classList?.contains('codex-toast') && last.dataset.baseText === value) {
+    if (!groupKey && !last?.dataset.groupKey && last?.classList?.contains('codex-toast') && last.dataset.baseText === value) {
       const repeatCount = Number(last.dataset.repeatCount || '1') + 1;
       last.dataset.repeatCount = String(repeatCount);
       const textNode = last.querySelector('[data-toast-text]');
@@ -7829,15 +8589,34 @@
 
     const body = document.createElement('div');
     body.className = 'codex-toast-body';
-    body.dataset.toastText = 'true';
-    body.textContent = value;
+    if (options.title) {
+      const title = document.createElement('div');
+      title.className = 'codex-toast-title';
+      title.textContent = options.title;
+      body.append(title);
+    }
+    const textNode = document.createElement('div');
+    textNode.dataset.toastText = 'true';
+    textNode.textContent = value;
+    body.append(textNode);
+    if (groupKey) {
+      item.dataset.groupKey = groupKey;
+      const details = document.createElement('details');
+      details.className = 'codex-toast-group';
+      const summary = document.createElement('summary');
+      const list = document.createElement('ul');
+      list.dataset.toastGroupItems = 'true';
+      details.append(summary, list);
+      body.append(details);
+    }
     item.append(body);
+    if (groupKey) updateToastGroup(item);
 
     const close = document.createElement('button');
     close.type = 'button';
     close.className = 'codex-toast-close';
     close.setAttribute('aria-label', tr('dismissNotification'));
-    close.textContent = '×';
+    close.innerHTML = Modules.PanelIcons.svg('close', 'codex-close-glyph');
     close.addEventListener('click', () => item.remove());
     item.append(close);
 
@@ -7851,6 +8630,20 @@
         item.remove();
       }, 5200);
     }
+
+    function updateToastGroup(toast) {
+      const list = toast.querySelector('[data-toast-group-items]');
+      const value = String(options.groupItem || '').trim();
+      if (value && !Array.from(list.children).some(item => item.textContent === value)) {
+        const item = document.createElement('li');
+        const code = document.createElement('code');
+        code.textContent = value;
+        item.append(code);
+        list.append(item);
+      }
+      toast.querySelector('.codex-toast-group summary').textContent =
+        options.groupSummary?.(list.children.length) || String(list.children.length);
+    }
   }
 
   function updateProbeNotice(text) {