codex-overleaf-link 2.1.4 → 2.2.0

package/extension/src/content/contentRuntime.js

@@ -36,6 +36,7 @@
     'mirror.status',
     'codex.models',
     'codex.run',
+    'codex.steer',
     'codex.providers.list',
     'codex.providers.test',
     'codex.providers.test.cancel',
@@ -113,6 +114,10 @@
   const ContextTray = window.CodexOverleafContextTray;
   const LocalSkillsPanel = window.CodexOverleafLocalSkillsPanel;
   const runController = window.CodexOverleafRunController;
+  const RunInputQueue = window.CodexOverleafRunInputQueue;
+  const RunQueueScheduler = window.CodexOverleafRunQueueScheduler;
+  const ActiveTurnControl = window.CodexOverleafActiveTurnControl;
+  const PendingInputView = window.CodexOverleafPendingInputView;
   const mirrorHealth = window.CodexOverleafMirrorHealth;
   const otWarmMirrorController = window.CodexOverleafOtWarmMirrorController;
   const PanelRenderer = window.CodexOverleafPanelRenderer;
@@ -172,7 +177,8 @@
     tx,
     callPageBridge,
     getCurrentProjectReferenceFiles,
-    showPluginToast
+    showPluginToast,
+    recordRenderingDiagnostic: detail => appendTechnicalEvent({ type: 'rendering.diagnostic', detail })
   });
   const {
     renderMarkdownInlineText,
@@ -597,6 +603,14 @@
     updateModelDisplay
   } = modelPicker;
 
+  const projectProviderSelection = window.CodexOverleafProjectProviderSelection.create({
+    tx, tr, getRunningSessionIds, showToast: showPluginToast, showConfirm: showPluginConfirm,
+    getState: () => state, setState: next => { state = next; }, getPanel: () => panel,
+    readSelectedModel: readSelectedModelInput, readSelectedSpeed: readSelectedSpeedInput,
+    getRunSelection: providerId => providerSettingsCoordinator.getRunSelection(providerId),
+    normalizeState: normalizePanelState, applyStateToPanel
+  });
+
   const providerSettingsCoordinator = window.CodexOverleafProviderSettingsCoordinator.create({
     tx,
     sendBackgroundNative,
@@ -604,7 +618,8 @@
     window,
     getSettingsPanelInstance: () => settingsPanelInstance,
     getSelectedModel: () => state?.model || '', getSelectedProviderId: () => state?.providerId || 'builtin',
-    setSelectedProviderId: (providerId, model) => { state = updateActiveSession(state, { providerId: providerId || 'builtin', ...(model !== undefined ? { model } : {}) }); const modelSelect = panel?.querySelector('[data-model]'); if (model !== undefined && modelSelect) modelSelect.value = ''; },
+    setSelectedProviderId: projectProviderSelection.commit,
+    confirmProviderSwitch: projectProviderSelection.confirmSwitch,
     refreshModelOptions: loadModelOptions, persistInputs: persistPanelInputs
   });
   // v1.8.1 D3: the dashboard was a one-shot render — another tab finishing a
@@ -767,6 +782,9 @@
   let state = null;
   let storageKey = LEGACY_STORAGE_KEY;
   let currentRunView = null;
+  let runQueueScheduler = null;
+  let runInputCoordinator = null;
+  const activeTurnControl = ActiveTurnControl.create({ chrome });
   let saveStateTimer = null;
   // Two-phase saveState scheduling. `saveStateInFlight` flips to true while
   // an async saveState() is actually writing; `saveStateRunAfterFlight` is
@@ -787,7 +805,7 @@
   let renderedSlashCommands = new Map();
   let runCancellationRequested = false;
   let runCancellationController = null;
-  let activePluginConfirmResolve = null;
+  let pluginConfirmController = null;
   const updateIdleClient = root.CodexOverleafUpdateIdle?.create({
     document,
     getBusyState: () => ({
@@ -795,7 +813,7 @@
       cancelling: runCancellationRequested,
       storage: saveStateInFlight || Boolean(saveStateTimer),
       reviewAction: trackedChangeInFlight.size > 0,
-      dialog: Boolean(activePluginConfirmResolve)
+      dialog: Boolean(pluginConfirmController?.isOpen())
     }),
     checkSaved: () => callPageBridge('waitForSaveState', { deadlineMs: 1500, pollIntervalMs: 100, requirePositiveSignal: true, allowQuietEditorFallback: true, quietFallbackMs: 1000 }),
     onApplyingChange: applying => { if (panel) panel.dataset.updating = applying ? 'true' : 'false'; },
@@ -843,7 +861,7 @@
       return;
     }
     if (nativeChannel.shouldHandleNativeEvent(message)) {
-      appendNativeEvent(message.event);
+      appendNativeEvent(message.event, message.journalSeq);
     }
   });
 
@@ -862,6 +880,15 @@
   async function init() {
     storageKey = getProjectStorageKey(LEGACY_STORAGE_KEY, window.location.href);
     state = normalizePanelState(await loadStoredState(), { restoreRunningRuns: true });
+    initializeRunQueueScheduler();
+    recoverInterruptedRunJournals()
+      .then(() => applyStateToPanel())
+      .catch(() => {});
+    setTimeout(() => {
+      recoverInterruptedRunJournals()
+        .then(() => applyStateToPanel())
+        .catch(() => {});
+    }, 900);
     ensurePanelOpen();
     root.CodexOverleafUpdateNotice?.mount?.(panel?.panelEl || panel, {
       getLocale: () => state?.locale || 'en'
@@ -1338,7 +1365,8 @@
     setElementTitleAndAria('[data-context-refresh]', tr('refreshFileList'), tr('refreshFileList'));
     setElementTitleAndAria('[data-reasoning]', tr('reasoningLabel'), tr('reasoningLabel'));
     setElementTitleAndAria('[data-speed]', tr('speedLabel'), tr('speedLabel'));
-    setElementTitleAndAria('[data-run]', currentRunView ? tr('cancelRun') : tr('send'), currentRunView ? tr('cancelRun') : tr('send'));
+    setElementTitleAndAria('[data-run]', currentRunView ? tr('queueNextInput') : tr('send'), currentRunView ? tr('queueNextInput') : tr('send'));
+    setElementTitleAndAria('[data-stop-run]', tr('cancelRun'), tr('cancelRun'));
 
     const actions = panel.querySelector('.codex-vscode-head-actions');
     if (actions) {
@@ -1422,27 +1450,15 @@
     return '';
   }
 
-  function installDiagnosticsDismiss() {
-    // DiagnosticsPanel installs its outside-click dismiss listener during create().
-  }
+  function installDiagnosticsDismiss() {}
 
-  function closeDiagnosticsResult() {
-    DiagnosticsPanel.closeResult(diagnosticsPanelInstance);
-  }
+  function closeDiagnosticsResult() { DiagnosticsPanel.closeResult(diagnosticsPanelInstance); }
 
-  function showDiagnosticsLoading(title, subtitle = tr('diagnosticsLoading')) {
-    DiagnosticsPanel.showLoading(diagnosticsPanelInstance, title, subtitle);
-  }
+  function showDiagnosticsLoading(title, subtitle = tr('diagnosticsLoading')) { DiagnosticsPanel.showLoading(diagnosticsPanelInstance, title, subtitle); }
 
-  function showDiagnosticsResult(result = {}) {
-    DiagnosticsPanel.showResult(diagnosticsPanelInstance, result);
-  }
+  function showDiagnosticsResult(result = {}) { DiagnosticsPanel.showResult(diagnosticsPanelInstance, result); }
 
-  // Push an overall health bucket (ok / warn / fail / unknown) to the
-  // diagnostics trigger's status dot.
-  function setDiagnosticsHealth(health) {
-    DiagnosticsPanel.updateStatus(diagnosticsPanelInstance, { health });
-  }
+  function setDiagnosticsHealth(health) { DiagnosticsPanel.updateStatus(diagnosticsPanelInstance, { health }); }
 
   function installContextDismiss() {
     return contextTrayController.installContextDismiss();
@@ -1646,7 +1662,7 @@
     return contextTrayController.resetContextProject();
   }
 
-  async function runTask() {
+  async function runTask(options = {}) {
     // Barrier on a still-flying background mirror refresh from the previous
     // turn (v1.7.5) BEFORE startRunView creates the new run view: the mirror's
     // wrap-up events must land in the run that produced them, not the new
@@ -1665,7 +1681,8 @@
     const submittedAttachments = getComposerAttachmentsForRun();
     const submittedSkillInvocation = getComposerSkillInvocationForRun();
 
-    const task = state.task.trim();
+    const queuedInput = options.queuedInput || null;
+    const task = String(queuedInput?.text || state.task || '').trim();
     if (!task) {
       appendLog(tx('Enter a task first.', '请先输入任务。'));
       return;
@@ -1681,9 +1698,13 @@
       reasoningEffort: state.reasoningEffort,
       speedTier: state.speedTier,
       attachments: submittedAttachments,
-      skillInvocation: submittedSkillInvocation
+      skillInvocation: submittedSkillInvocation,
+      queueItemId: queuedInput?.id || ''
     });
     const runSessionId = currentRunView.sessionId;
+    if (queuedInput?.id) {
+      await runQueueScheduler?.markExecuting(runSessionId, queuedInput.id, currentRunView.recordId);
+    }
     let runAuditDraft = null;
     try {
       runAuditDraft = await awaitRunStep(createAuditDraftForRun({
@@ -1693,10 +1714,11 @@
         focusFiles: getActiveFocusFiles()
       }));
       announceCrossTabRunStart();
-      // Keep attachments across turns (v1.7.5): screenshots and files usually
-      // anchor several follow-up questions. The tray keeps them visible and
-      // hand-removable; only the task text resets after submit.
-      clearTaskComposer({ keepAttachments: true });
+      // Binary attachments belong to this submitted turn. The run record has
+      // already captured their snapshots, so clear them from the composer
+      // together with the submitted text. Persistent @context remains intact.
+      clearTaskComposer({ keepAttachments: false });
+      syncComposerSendAvailability(true);
       appendRunEvent({
         title: submittedSkillInvocation?.id === 'skill-installer'
           ? tx('I will use the Codex skill installer for this request.', '我会用 Codex skill installer 处理这个请求。')
@@ -1727,13 +1749,10 @@
         return;
       }
       appendRunEvent({
-        // Wording must match behavior: a non-empty focus selection RESTRICTS
-        // reads and writes to these files (shouldRestrictWritebackToFocus),
-        // it does not merely "prioritize" them. The selection persists across
-        // turns until cleared via the ＋ tray.
+        // @context prioritizes these files; complete project runs may still update related files.
         title: tx(
-          `This run reads and writes ONLY: ${formatContextItems(getActiveFocusFiles())} (persists across turns; clear via ＋)`,
-          `本轮仅读写：${formatContextItems(getActiveFocusFiles())}（跨轮保留，可在 ＋ 中清除）`
+          `This run will prioritize: ${formatContextItems(getActiveFocusFiles())} (persists across turns; clear via ＋)`,
+          `本轮将优先处理：${formatContextItems(getActiveFocusFiles())}（跨轮保留，可在 ＋ 中清除）`
         ),
         status: 'completed'
       });
@@ -1785,7 +1804,7 @@
         focusFiles,
         isUsableProjectFileContent: window.CodexOverleafProjectFiles.isUsableProjectFileContent
       });
-      let restrictToFocusFiles = runController.shouldRestrictWritebackToFocus({ focusFiles });
+      let restrictToFocusFiles = runController.shouldRestrictWritebackToFocus({ focusFiles, focusedPartialSnapshot });
       if (snapshotWarnings.blocking.length && !warmMirrorReuse.useExistingMirror && !focusedPartialSnapshot) {
         for (const warning of snapshotWarnings.blocking) {
           appendLog(tx(`Cannot continue: ${formatProjectSnapshotWarning(warning)}`, `无法继续：${formatProjectSnapshotWarning(warning)}`));
@@ -1827,8 +1846,8 @@
           if (Array.isArray(warmMirrorReuse.focusFiles) && warmMirrorReuse.focusFiles.length) {
             focusFiles = warmMirrorReuse.focusFiles;
           }
-          restrictToFocusFiles = true;
         }
+        restrictToFocusFiles = runController.shouldRestrictWritebackToFocus({ focusFiles, focusedPartialSnapshot: warmMirrorReuse.partialSnapshot, otWarmStart });
         appendRunEvent({
           title: warmMirrorReuse.warmStart
             ? tr('warmMirrorReuseTitle')
@@ -1912,9 +1931,7 @@
       await awaitRunStep(settleMirrorPrefetchBeforeRun());
       await awaitRunStep(providerSettingsCoordinator.ensureLoaded());
       appendRunEvent({ title: tx('Local Codex session is starting.', '本地 Codex session 开始运行。'), status: 'running' });
-      let response = await awaitRunStep(sendNative({
-        method: 'codex.run',
-        params: buildCodexRunParams({
+      let response = await awaitRunStep(sendTrackedCodexRun(buildCodexRunParams({
           task,
           project,
           useExistingMirror,
@@ -1929,8 +1946,7 @@
           attachments: submittedAttachments,
           skillInvocation: submittedSkillInvocation,
           submittedMode
-        })
-      }));
+        })));
 
       // Handle mirror_stale error by retrying with full sync
       if (!response.ok && response.error?.code === 'mirror_stale' && useExistingMirror) {
@@ -1948,9 +1964,7 @@
         fileOverlays = null;
         otWarmStart = false;
         restrictToFocusFiles = staleRetry.restrictToFocusFiles;
-        response = await awaitRunStep(sendNative({
-          method: 'codex.run',
-          params: buildCodexRunParams({
+        response = await awaitRunStep(sendTrackedCodexRun(buildCodexRunParams({
             task,
             project,
             useExistingMirror: false,
@@ -1965,8 +1979,7 @@
             attachments: submittedAttachments,
             skillInvocation: submittedSkillInvocation,
             submittedMode
-          })
-        }));
+          })));
       }
 
       if (!response.ok && response.error?.code === 'thread_resume_failed') {
@@ -1982,9 +1995,7 @@
             }
           }
           appendRunEvent({ title: tx('Creating a new Codex conversation thread.', '正在新建 Codex 会话线程。'), status: 'running' });
-          response = await sendNative({
-            method: 'codex.run',
-            params: buildCodexRunParams({
+          response = await sendTrackedCodexRun(buildCodexRunParams({
               task,
               project,
               useExistingMirror,
@@ -1999,8 +2010,7 @@
               attachments: submittedAttachments,
               skillInvocation: submittedSkillInvocation,
               submittedMode
-            })
-          });
+            }));
         } else {
           appendRunEvent({ title: tx('Cancelled: user chose not to create a new thread.', '已取消：用户选择不新建线程。'), status: 'rejected' });
           await finalizeAuditRecord(runAuditDraft, { resultStatus: 'rejected' });
@@ -2161,6 +2171,9 @@
         mode: submittedMode,
         requireReviewing: submittedRequireReviewing
       });
+      if (runCancellationRequested) {
+        throw createRunCancellationError();
+      }
       await finalizeAuditRecord(runAuditDraft, {
         ...(syncOutcome.audit || {}),
         sensitiveFindings: sensitiveFindings.findings,
@@ -2309,6 +2322,15 @@
       });
       finishRunView(tx('Task failed', '任务失败'), 'failed');
     } finally {
+      const settledView = currentRunView;
+      const settledRecord = settledView ? findRunRecord(settledView.recordId, settledView.sessionId) : null;
+      const settlement = {
+        sessionId: settledView?.sessionId || '',
+        status: settledView?.terminalStatus || settledRecord?.status || 'failed',
+        queueItemId: settledView?.queueItemId || '',
+        requestId: settledView?.nativeRequestId || '',
+        continueQueue: runCancellationRequested
+      };
       setRunning(false);
       nativeChannel.clearActiveRequest();
       stopRunElapsedTick();
@@ -2318,7 +2340,12 @@
       if (isExperimentalOtEnabled()) {
         await resumeOtWarmMirror('run-settled');
       }
-      saveStateSoon();
+      await saveState().catch(() => {});
+      activeTurnControl.release(settlement.requestId);
+      if (settlement.requestId) {
+        activeTurnControl.acknowledge(settlement.requestId).catch(() => {});
+      }
+      runQueueScheduler?.afterSettlement(settlement).catch(() => {});
     }
   }
 
@@ -2557,7 +2584,7 @@
       return;
     }
     if (currentRunView) {
-      return;
+      return queueComposerInput();
     }
     runTask().catch(error => {
       setRunning(false);
@@ -2570,13 +2597,73 @@
     });
   }
 
+  const runGuidanceController = window.CodexOverleafRunGuidanceController.create({
+    findRunRecord, appendRunEvent, getCurrentRunView: () => currentRunView,
+    renderRunEvent, cssEscape, bumpUnreadIfDetached
+  });
+
+  function initializeRunQueueScheduler() {
+    runInputCoordinator = RunQueueScheduler.createCoordinator({
+      getSession: sessionId => findSessionById(sessionId),
+      getActiveSession: () => getActiveSession(state),
+      setQueue: (sessionId, pendingInputs) => updateSessionById(sessionId, { pendingInputs }),
+      getCurrentRun: () => currentRunView,
+      canStart: sessionId => state?.activeSessionId === sessionId && isProjectEditorRoute(window.location),
+      readInputs: readPanelInputs,
+      getTask: () => panel?.querySelector('[data-task]')?.value || '',
+      hasAttachments: () => getComposerAttachmentsForRun().length > 0,
+      capturePayload: () => ({
+        mode: state.mode,
+        autoRecompile: state.autoRecompile !== false,
+        requireReviewing: state.requireReviewing,
+        focusFiles: getActiveFocusFiles()
+      }),
+      clearTask: () => {
+        panel.querySelector('[data-task]').value = '';
+        updateSessionById(state.activeSessionId, { task: '' });
+        autosizeTaskTextarea();
+        syncComposerSendAvailability();
+      },
+      applyQueuedInput: item => {
+        state.autoRecompile = item.payload?.autoRecompile !== false;
+        state = updateActiveSession(state, {
+          task: item.text,
+          mode: item.payload?.mode || state.mode,
+          requireReviewing: item.payload?.requireReviewing !== false,
+          focusFiles: item.payload?.focusFiles || []
+        });
+        applyStateToPanel();
+      },
+      run: item => runTask({ queuedInput: item }),
+      sendSteer: params => sendBackgroundNative({ method: 'codex.steer', params }),
+      getContainer: () => panel?.querySelector('[data-pending-inputs]'),
+      createView: options => PendingInputView.create(options),
+      appendEvent: (title, status) => appendRunEvent({ title, status }),
+      appendGuidance: runGuidanceController.upsert,
+      removeGuidance: runGuidanceController.remove,
+      toast: (message, status) => showPluginToast(message, { status }),
+      tr,
+      save: () => saveState(),
+      saveSoon: () => saveStateSoon(),
+      randomUUID: () => crypto.randomUUID()
+    });
+    runQueueScheduler = runInputCoordinator.scheduler;
+  }
+
+  function queueComposerInput() {
+    return runInputCoordinator?.queueComposerInput();
+  }
+
+  function renderPendingInputs() {
+    return runInputCoordinator?.render();
+  }
+
   async function cancelActiveRun() {
     if (!currentRunView || runCancellationRequested) {
       return;
     }
     runCancellationRequested = true;
     runCancellationController?.abort();
-    cancelActivePageBridgeRequests();
     panel.dataset.cancelling = 'true';
     setRunning(true);
     appendRunEvent({
@@ -2761,125 +2848,16 @@
     return confirmed ? 'new' : 'cancel';
   }
 
-  async function showPluginConfirm({
-    title = tr('confirmDefaultTitle'),
-    message = '',
-    confirmLabel = tr('confirmDefaultConfirm'),
-    cancelLabel = tr('confirmDefaultCancel'),
-    destructive = false
-  } = {}) {
-    if (!panel) {
-      ensurePanelOpen();
-    }
-
-    if (activePluginConfirmResolve) {
-      activePluginConfirmResolve(false);
-      activePluginConfirmResolve = null;
-    }
-
-    return new Promise(resolve => {
-      let settled = false;
-      const overlay = document.createElement('div');
-      overlay.className = 'codex-plugin-confirm';
-      overlay.setAttribute('data-plugin-confirm', 'true');
-      overlay.setAttribute('role', 'dialog');
-      overlay.setAttribute('aria-modal', 'true');
-      overlay.setAttribute('aria-label', title);
-
-      const card = document.createElement('section');
-      card.className = 'codex-plugin-confirm-card';
-
-      const head = document.createElement('div');
-      head.className = 'codex-plugin-confirm-head';
-      const icon = document.createElement('img');
-      icon.className = 'codex-plugin-confirm-icon';
-      icon.alt = '';
-      icon.setAttribute('aria-hidden', 'true');
-      icon.src = chrome.runtime.getURL('assets/icons/codex-overleaf-dialog-icon.png');
-      const titleWrap = document.createElement('div');
-      const brand = document.createElement('div');
-      brand.className = 'codex-plugin-confirm-brand';
-      brand.textContent = tr('confirmBrand');
-      const titleEl = document.createElement('div');
-      titleEl.className = 'codex-plugin-confirm-title';
-      titleEl.textContent = title;
-      titleWrap.append(brand, titleEl);
-      head.append(icon, titleWrap);
-
-      const body = document.createElement('div');
-      body.className = 'codex-plugin-confirm-body';
-      body.textContent = String(message || '');
-
-      const actions = document.createElement('div');
-      actions.className = 'codex-plugin-confirm-actions';
-      const cancel = document.createElement('button');
-      cancel.type = 'button';
-      cancel.className = 'codex-plugin-confirm-cancel';
-      cancel.textContent = cancelLabel;
-      const confirm = document.createElement('button');
-      confirm.type = 'button';
-      confirm.className = 'codex-plugin-confirm-confirm';
-      if (destructive) {
-        confirm.dataset.destructive = 'true';
-      }
-      confirm.textContent = confirmLabel;
-      actions.append(cancel, confirm);
-      card.append(head, body, actions);
-      overlay.append(card);
-      panel.append(overlay);
-
-      const cleanup = value => {
-        if (settled) {
-          return;
-        }
-        settled = true;
-        activePluginConfirmResolve = null;
-        document.removeEventListener('keydown', onKeydown, true);
-        overlay.remove();
-        resolve(value);
-      };
-      activePluginConfirmResolve = cleanup;
-      const onKeydown = event => {
-        if (event.key === 'Escape') {
-          event.preventDefault();
-          cleanup(false);
-          return;
-        }
-        if (event.key === 'Enter') {
-          event.preventDefault();
-          // Destructive dialogs never treat a bare Enter as consent — the
-          // user must deliberately reach the (red) confirm button. Enter on
-          // a focused button still activates it via the click handler.
-          if (!destructive && event.target !== cancel) {
-            cleanup(true);
-          } else if (event.target === cancel) {
-            cleanup(false);
-          } else if (event.target === confirm) {
-            cleanup(true);
-          }
-          return;
-        }
-        if (event.key === 'Tab') {
-          // aria-modal contract: keep Tab cycling inside the two-button card
-          // instead of drifting onto the Overleaf page behind the overlay.
-          event.preventDefault();
-          const next = event.target === cancel ? confirm : cancel;
-          next.focus();
-        }
-      };
-
-      overlay.addEventListener('click', event => {
-        if (event.target === overlay) {
-          cleanup(false);
-        }
+  async function showPluginConfirm(options = {}) {
+    if (!pluginConfirmController) {
+      pluginConfirmController = PanelRenderer.createConfirmController({
+        getPanel: () => panel,
+        ensurePanelOpen,
+        getIconUrl: () => chrome.runtime.getURL('assets/icons/codex-overleaf-dialog-icon.png'),
+        tr
       });
-      cancel.addEventListener('click', () => cleanup(false));
-      confirm.addEventListener('click', () => cleanup(true));
-      document.addEventListener('keydown', onKeydown, true);
-      // Destructive dialogs open on the SAFE button so a stray keystroke
-      // cannot delete anything; benign confirms keep the fast path.
-      (destructive ? cancel : confirm).focus();
-    });
+    }
+    return pluginConfirmController.show(options);
   }
 
   function getEnabledCodexOverleafSkillIds() {
@@ -2933,10 +2911,97 @@
     });
     return {
       ...params,
+      clientRunId: currentRunView?.recordId || '',
+      clientSessionId: currentRunView?.sessionId || '',
       providerSelection: providerSettingsCoordinator.getRunSelection(state?.providerId)
     };
   }
 
+  async function sendTrackedCodexRun(params) {
+    const compatibilityGate = await ensureNativeCompatibilityForMethod('codex.run');
+    if (!compatibilityGate.ok) {
+      return compatibilityGate.response;
+    }
+    throwIfCancelledBeforeNativeDispatch('codex.run');
+    const tracked = nativeChannel.sendNativeTracked(attachNativeCompatibilityEvidence({
+      method: 'codex.run',
+      params
+    }, compatibilityGate.compatibility));
+    if (currentRunView) {
+      currentRunView.nativeRequestId = tracked.id;
+      const record = findRunRecord(currentRunView.recordId, currentRunView.sessionId);
+      if (record) {
+        record.nativeRequestId = tracked.id;
+      }
+      activeTurnControl.bind({
+        requestId: tracked.id,
+        projectKey: currentRunView.runProjectId,
+        clientRunId: currentRunView.recordId,
+        sessionId: currentRunView.sessionId
+      });
+      saveStateSoon();
+    }
+    return tracked.promise.finally(() => {
+      if (currentRunView?.nativeRequestId === tracked.id) {
+        currentRunView.activeTurn = null;
+        renderPendingInputs();
+      }
+    });
+  }
+
+  async function recoverInterruptedRunJournals() {
+    const projectKey = getCurrentProjectId();
+    const recovery = await activeTurnControl.recoverJournals({
+      projectKey,
+      findSession: findSessionById,
+      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: []
+      }),
+      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 (recovery.changed) {
+      await saveState();
+      for (const requestId of recovery.acknowledgeIds) {
+        await activeTurnControl.acknowledge(requestId).catch(() => false);
+      }
+    }
+  }
+
   async function createAuditDraftForRun(input = {}) {
     const StorageDb = window.CodexOverleafStorageDb;
     if (!StorageDb || !AuditRecords) {
@@ -3126,6 +3191,8 @@
   }
 
   function appendRunCancelledReport() {
+    const hasQueuedFollowUp = (getActiveSession(state)?.pendingInputs || [])
+      .some(item => item?.status === 'queued');
     appendRunEvent({
       title: tx('Current Codex task was cancelled.', '已中断当前 Codex 任务。'),
       status: 'failed'
@@ -3135,7 +3202,9 @@
       status: 'rejected',
       operations: [],
       applyResults: [],
-      nextStep: tx('Edit the task and run again.', '可以修改任务后重新运行。')
+      nextStep: hasQueuedFollowUp
+        ? tx('The first queued follow-up will start next.', '接下来会自动启动队首的后续任务。')
+        : tx('Edit the task and run again.', '可以修改任务后重新运行。')
     });
   }
 
@@ -3148,17 +3217,27 @@
     task.style.height = `${Math.min(task.scrollHeight, 160)}px`;
   }
 
-  function syncComposerSendAvailability() {
+  function syncComposerSendAvailability(runningOverride) {
     const runButton = panel?.querySelector('[data-run]');
     if (!runButton) {
       return;
     }
-    // While a run is active the button is Cancel and must stay clickable.
-    if (currentRunView) {
-      runButton.disabled = false;
-      return;
-    }
-    runButton.disabled = !String(panel?.querySelector('[data-task]')?.value || '').trim();
+    const hasInput = Boolean(String(panel?.querySelector('[data-task]')?.value || '').trim());
+    const running = typeof runningOverride === 'boolean'
+      ? runningOverride
+      : Boolean(currentRunView);
+    const action = running && !hasInput ? 'cancel' : 'send';
+    const label = action === 'cancel'
+      ? tr('cancelRun')
+      : running
+        ? tr('queueNextInput')
+        : tr('send');
+    runButton.dataset.action = action;
+    runButton.disabled = action === 'cancel'
+      ? runCancellationRequested
+      : !hasInput;
+    runButton.title = label;
+    runButton.setAttribute('aria-label', label);
   }
 
   function handleTaskInputKeydown(event) {
@@ -3175,6 +3254,7 @@
   function handleTaskInput() {
     autosizeTaskTextarea();
     syncComposerSendAvailability();
+    renderPendingInputs();
     scheduleMirrorPrefetch({
       reason: 'composer-input',
       delayMs: mirrorHealth?.PREFETCH_DEBOUNCE_MS || 1200
@@ -5243,102 +5323,23 @@
   }
 
   function formatProjectSnapshotUserLog(project) {
-    const files = project?.files || [];
-    if (!files.length) {
-      return tx(
-        'No Overleaf project files were read yet. Make sure the project has loaded, or open a .tex file in Overleaf and retry.',
-        '还没有读到 Overleaf 项目文件。请确认项目已加载完成，或在 Overleaf 点开一个 .tex 文件后重试。'
-      );
-    }
-
-    const textCount = files.filter(isTextSnapshotFile).length;
-    const binaryCount = files.length - textCount;
-    const resourceText = binaryCount ? tx(`, ${binaryCount} asset file(s)`, `，${binaryCount} 个资源文件`) : '';
-    const activePath = project.activePath ? tx(`, current file: ${project.activePath}`, `，当前文件：${project.activePath}`) : '';
-    const focusFiles = getActiveFocusFiles();
-    const focusText = focusFiles.length ? tx(`, focus: ${focusFiles.join(', ')}`, `，优先处理：${focusFiles.join(', ')}`) : '';
-    return tx(
-      `Read Overleaf project: ${textCount} text file(s)${resourceText}${activePath}${focusText}.`,
-      `已读取 Overleaf 项目：${textCount} 个文本文件${resourceText}${activePath}${focusText}。`
-    );
+    return DiagnosticsPanel.formatProjectSnapshotUserLog(project, { tx, getFocusFiles: getActiveFocusFiles });
   }
 
   function formatProjectSnapshotFileSize(file) {
-    if (isTextSnapshotFile(file)) {
-      return `${String(file.content || '').length} chars`;
-    }
-    if (Number.isFinite(Number(file?.size))) {
-      return `${Number(file.size)} bytes`;
-    }
-    return file?.contentBase64 ? `${String(file.contentBase64).length} base64` : 'binary';
+    return DiagnosticsPanel.formatProjectSnapshotFileSize(file);
   }
 
   function formatProjectSnapshotWarning(warning) {
-    if (/No source files were captured/i.test(warning)) {
-      return tx('No project source files were read. Make sure Overleaf has loaded, or open a .tex file and retry.', '没有读取到项目源文件。请确认 Overleaf 页面加载完成，或点开一个 .tex 文件后重试。');
-    }
-    if (/Full project snapshot was not captured/i.test(warning)) {
-      return tx('The full Overleaf project was not read. To avoid refreshing the local workspace from an incomplete snapshot, reload Overleaf or retry later.', '没有读到完整的 Overleaf 项目。为了避免本地 workspace 用残缺快照覆盖项目，请刷新 Overleaf 或稍后重试。');
-    }
-    if (/empty or still loading/i.test(warning)) {
-      return tx('Some file content is still loading. Wait for Overleaf to finish loading, then retry.', '读取到的文件内容还在加载中。请等 Overleaf 加载完成后重试。');
-    }
-    if (/suspiciously short|shorter than 80 characters/i.test(warning)) {
-      return tx('Some file content is very short and may not have fully loaded. Results may be incomplete.', '部分文件内容很短，可能还没完全加载。结果可能不完整。');
-    }
-    if (/identical captured content/i.test(warning)) {
-      return tx('Several files appear to have identical captured content, so Overleaf file switching may have failed. Reload and retry.', '多个文件内容看起来相同，Overleaf 文件切换可能没有成功。请刷新页面后重试。');
-    }
-    if (/were skipped/i.test(warning)) {
-      return tx('Some project files were skipped, usually images, PDFs, or unreadable files.', '有些项目文件被跳过，通常是图片、PDF 或无法读取的文件。');
-    }
-    return warning;
+    return DiagnosticsPanel.formatProjectSnapshotWarning(warning, tx);
   }
 
   function appendEditorDiagnostics(editorDiagnostics, projectDiagnostics) {
-    if (editorDiagnostics) {
-      const active = editorDiagnostics.active;
-      appendLog(`Editor probe: active ${active?.tag || 'none'} ${active?.ariaLabel || active?.className || ''} len=${active?.valueLength || 0}; textareas=${editorDiagnostics.textareaCount || 0}; editables=${editorDiagnostics.editableCount || 0}; iframes=${editorDiagnostics.iframeCount || 0}.`);
-      if (editorDiagnostics.documentStats) {
-        const stats = editorDiagnostics.documentStats;
-        appendLog(`DOM stats: elements=${stats.elementCount || 0}; textareas=${stats.textareaCount || 0}; cm=${stats.cmCount || 0}; role textbox=${stats.roleTextboxCount || 0}.`);
-      }
-      if (editorDiagnostics.unstableStore) {
-        const store = editorDiagnostics.unstableStore;
-        const readable = (store.readable || [])
-          .map(item => `${item.path}:${item.present ? item.type : 'missing'}`)
-          .join(', ');
-        appendLog(`Overleaf store: ${store.present ? 'present' : 'missing'}${readable ? `; ${readable}` : ''}.`);
-      }
-      if (editorDiagnostics.codeMirrorView) {
-        const view = editorDiagnostics.codeMirrorView;
-        appendLog(`CodeMirror view: docLength=${view.docLength || 0}; dispatch=${Boolean(view.hasDispatch)}; source=${view.source || 'unknown'}.`);
-      }
-      if (editorDiagnostics.globals) {
-        const globals = editorDiagnostics.globals;
-        appendLog(`Overleaf globals: overleaf=${globals.overleaf || 'missing'}; Overleaf=${globals.Overleaf || 'missing'}; _ide=${globals._ide || 'missing'}.`);
-      }
-      for (const item of [...(editorDiagnostics.textareas || []), ...(editorDiagnostics.editables || [])].slice(0, 3)) {
-        appendLog(`Editor candidate: ${item.tag || 'node'} ${item.ariaLabel || item.className || item.id || ''} len=${item.valueLength || 0}.`);
-      }
-    }
-    if (projectDiagnostics) {
-      const records = projectDiagnostics.docRecords || [];
-      appendLog(`Project probe: doc records=${projectDiagnostics.docRecordCount || 0}; roots=${(projectDiagnostics.internalRootKeys || []).slice(0, 6).join(', ') || 'none'}.`);
-      for (const record of records.slice(0, 4)) {
-        appendLog(`Doc record: ${record.path} id=${record.id} source=${record.source || 'internal'}.`);
-      }
-    }
+    DiagnosticsPanel.appendEditorDiagnostics(editorDiagnostics, projectDiagnostics, appendLog);
   }
 
   function appendProjectWarnings(project) {
-    const warnings = getProjectSnapshotWarnings(project);
-    for (const warning of warnings.blocking) {
-      appendLog(`Snapshot blocked: ${warning}`);
-    }
-    for (const warning of warnings.nonBlocking) {
-      appendLog(`Snapshot warning: ${warning}`);
-    }
+    DiagnosticsPanel.appendProjectWarnings(project, { getWarnings: getProjectSnapshotWarnings, appendLog });
   }
 
   function getProjectSnapshotWarnings(project) {
@@ -5388,40 +5389,15 @@
   }
 
   function isTextSnapshotFile(file) {
-    return Boolean(file && file.kind !== 'binary' && typeof file.content === 'string');
+    return DiagnosticsPanel.isTextSnapshotFile(file);
   }
 
   function uniqueContentSignatures(files) {
-    const signatures = files.map(file => {
-      const content = String(file.content || '');
-      return `${content.length}:${content.slice(0, 120)}:${content.slice(-120)}`;
-    });
-    return Array.from(new Set(signatures));
+    return DiagnosticsPanel.uniqueContentSignatures(files);
   }
 
   function appendReviewingDiagnostics(diagnostics) {
-    if (!diagnostics) {
-      appendLog(tx('Probe diagnostics unavailable.', '诊断探针不可用。'));
-      return;
-    }
-
-    appendLog(`Probe saw ${diagnostics.controlCount || 0} controls; body Reviewing=${Boolean(diagnostics.bodyTextHasReviewing)}, text Reviewing=${Boolean(diagnostics.textContentHasReviewing)}.`);
-    const controls = diagnostics.reviewLikeControls || [];
-    if (!controls.length) {
-      appendLog('Probe did not see review/track/suggest controls in the page DOM.');
-      return;
-    }
-
-    for (const control of controls.slice(0, 4)) {
-      const label = [
-        control.text,
-        control.ariaLabel && `aria:${control.ariaLabel}`,
-        control.title && `title:${control.title}`,
-        control.dataTestId && `test:${control.dataTestId}`,
-        control.id && `id:${control.id}`
-      ].filter(Boolean).join(' | ');
-      appendLog(`Review-like ${control.tag || 'node'}: ${label || control.htmlSnippet || '(no label)'}`);
-    }
+    DiagnosticsPanel.appendReviewingDiagnostics(diagnostics, { appendLog, tx });
   }
 
   function sendNative(payload) {
@@ -5991,6 +5967,7 @@
           runs: Array.isArray(session.runs) ? session.runs : [],
           history: Array.isArray(session.history) ? session.history : [],
           task: typeof session.task === 'string' ? session.task : '',
+          pendingInputs: Array.isArray(session.pendingInputs) ? session.pendingInputs : [],
           mode: session.mode || prefs.mode || 'confirm', providerId: session.providerId || 'builtin',
           model: session.model || prefs.model || 'gpt-5.4',
           reasoningEffort: session.reasoningEffort || prefs.reasoningEffort || 'high',
@@ -6152,14 +6129,11 @@
           updatedAt: session.updatedAt
         }, { preserveRunActionPayload: true })
       ));
-      if (sessionRecords.length) {
-        await StorageDb.putRecords('sessions', sessionRecords);
-      }
-      const keepSessionIds = new Set(sessionRecords.map(record => record.id));
-      const existingSessions = await StorageDb.getAllByIndex('sessions', 'projectId', projectId);
-      await Promise.all(existingSessions
-        .filter(session => session?.id && !keepSessionIds.has(session.id))
-        .map(session => StorageDb.deleteRecord('sessions', session.id)));
+      await window.CodexOverleafSessionPersistence.writeSessions({
+        Migration, StorageDb, projectId,
+        deletedSessionIds: options?.deletedSessionIds,
+        sessionRecords
+      });
     } catch (error) {
       // Fallback: try legacy save
       try {
@@ -6313,7 +6287,7 @@
       saveStateSoon();
       return;
     }
-    if (event?.target?.matches?.('[data-speed]')) state = updateActiveSession(state, { speedTier: readSelectedSpeedInput() }); renderReasoningOptions(getRenderedModelEntries());
+    if (event?.target?.matches?.('[data-speed]')) renderReasoningOptions(getRenderedModelEntries());
     renderSpeedOptions(getRenderedModelEntries());
     readPanelInputs();
     renderModelConfigChoices();
@@ -6367,14 +6341,21 @@
       syncExperimentalOtToggleForProject(projectId);
     }
     persistComposerAttachmentsToState();
+    const model = readSelectedModelInput();
+    const reasoningEffort = panel.querySelector('[data-reasoning]').value;
+    const speedTier = readSelectedSpeedInput();
     state = updateActiveSession(state, {
-      model: readSelectedModelInput(),
-      reasoningEffort: panel.querySelector('[data-reasoning]').value,
-      speedTier: readSelectedSpeedInput(),
       mode: panel.querySelector('[data-mode]').value,
       task: panel.querySelector('[data-task]').value,
       requireReviewing: panel.querySelector('[data-require-reviewing]').checked
     });
+    state.providerId = state.providerId || 'builtin';
+    state.model = model;
+    state.reasoningEffort = reasoningEffort;
+    state.speedTier = speedTier;
+    if (state.session) {
+      state.session.providerId = state.providerId;
+    }
     state.autoRecompile = panel.querySelector('[data-auto-recompile]')?.checked !== false;
     const experimentalOtCheckbox = panel.querySelector('[data-experimental-ot]');
     if (experimentalOtCheckbox) {
@@ -6519,12 +6500,7 @@
 
 
   function setRunning(running) {
-    const runButton = panel.querySelector('[data-run]');
-    // Running -> the button is Cancel and must never be disabled; idle -> it
-    // is Send and disables on an empty composer (feedback instead of no-op).
-    runButton.disabled = running ? false : !String(panel.querySelector('[data-task]')?.value || '').trim();
-    runButton.title = running ? tr('cancelRun') : tr('send');
-    runButton.setAttribute('aria-label', running ? tr('cancelRun') : tr('send'));
+    syncComposerSendAvailability(running);
     panel.querySelector('[data-new-session]').disabled = false;
     panel.querySelector('[data-diagnostics-snapshot]').disabled = running;
     if (running) {
@@ -6532,9 +6508,10 @@
     }
     panel.dataset.running = running ? 'true' : 'false';
     panel.dataset.cancelling = running && runCancellationRequested ? 'true' : 'false';
+    renderPendingInputs();
   }
 
-  function startRunView({ task, mode, model, reasoningEffort, speedTier }) {
+  function startRunView({ task, mode, model, reasoningEffort, speedTier, queueItemId = '' }) {
     let attachments = [];
     if (Array.isArray(arguments[0]?.attachments)) {
       attachments = arguments[0].attachments;
@@ -6558,6 +6535,10 @@
       undoTrackedChanges: [],
       undoExpectedFiles: [],
       undoStatus: '',
+      queueItemId,
+      nativeRequestId: '',
+      codexTurnId: '',
+      nativeEventSeq: 0,
       // Welcome-panel + write-guard:
       // Immutable per-run capture of the project this run was submitted
       // against. Every writeback / accept / undo dispatch attaches this id
@@ -6602,7 +6583,10 @@
       report: root.querySelector('[data-run-report]'),
       status: root.querySelector('[data-run-status]'),
       projectFiles: captureProjectReferenceFiles(arguments[0]?.project),
-      startedAt: Date.now()
+      startedAt: Date.now(),
+      queueItemId,
+      nativeRequestId: '',
+      activeTurn: null
     };
   }
 
@@ -6619,6 +6603,8 @@
       record.status = status;
       record.statusText = statusText;
       record.finishedAt = new Date().toISOString();
+      currentRunView.terminalStatus = status;
+      runGuidanceController.settleView(currentRunView);
       // Welcome-panel + write-guard:
       // when the user navigated away mid-run, the URL-derived projectId now
       // belongs to a different project (or /project). Routing this finish
@@ -6649,11 +6635,16 @@
   }
 
 
-  function appendNativeEvent(event) {
+  function appendNativeEvent(event, journalSeq = 0) {
     if (!event) {
       return;
     }
 
+    if (event.type === 'codex.turn.bound') {
+      bindActiveTurn(event.detail || {}, journalSeq);
+      return;
+    }
+
     const activity = mapAgentEventToActivity(event, { locale: getLocale() });
     if (!activity?.visible || activity.kind === 'technical') {
       return;
@@ -6669,10 +6660,30 @@
       streamKey: activity.streamKey,
       streamRole: activity.streamRole,
       appendText: activity.appendText,
-      replaceText: activity.replaceText
+      replaceText: activity.replaceText,
+      nativeEventSeq: journalSeq
     });
   }
 
+  function bindActiveTurn(detail = {}, journalSeq = 0) {
+    if (!currentRunView) {
+      return;
+    }
+    const threadId = String(detail.threadId || '');
+    const turnId = String(detail.turnId || '');
+    currentRunView.activeTurn = { threadId, turnId };
+    const record = findRunRecord(currentRunView.recordId, currentRunView.sessionId);
+    if (record) {
+      record.codexTurnId = turnId;
+      record.nativeEventSeq = Math.max(Number(record.nativeEventSeq || 0), Number(journalSeq || 0));
+    }
+    if (threadId) {
+      updateSessionById(currentRunView.sessionId, { codexThreadId: threadId });
+    }
+    renderPendingInputs();
+    saveState().catch(() => {});
+  }
+
   function appendTechnicalEvent(event) {
     void event;
   }
@@ -6703,6 +6714,7 @@
       kind: input.kind || 'activity',
       subagent: input.subagent === true ? true : undefined,
       technicalDetail: sanitizeAssistantVisibleValue(input.technicalDetail),
+      guidanceId: sanitizeAssistantVisibleText(input.guidanceId),
       streamKey: sanitizeAssistantVisibleText(input.streamKey),
       streamRole: sanitizeAssistantVisibleText(input.streamRole),
       appendText: typeof input.appendText === 'string' ? sanitizeAssistantVisibleText(input.appendText) : input.appendText,
@@ -6734,6 +6746,9 @@
     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).
@@ -6807,6 +6822,7 @@
     currentRunView.root = root;
     currentRunView.runProcess = root.querySelector('[data-run-process]');
     currentRunView.processLabel = root.querySelector('[data-run-process-summary]');
+    currentRunView.guidance = root.querySelector('[data-run-guidance]');
     currentRunView.events = root.querySelector('[data-run-events]');
     currentRunView.report = root.querySelector('[data-run-report]');
     currentRunView.status = root.querySelector('[data-run-status]');
@@ -6824,6 +6840,7 @@
     if (event.kind === 'technical') {
       return;
     }
+    if (runGuidanceController.appendToView(event, view)) return;
     if (event.kind === 'stream') {
       // Stream deltas update an existing line in place — they must not inflate
       // the unread-step counter.
@@ -8092,7 +8109,8 @@
       detail: event.detail,
       timestamp: event.timestamp || new Date().toISOString(),
       kind: event.kind || 'activity',
-      technicalDetail: event.technicalDetail
+      technicalDetail: event.technicalDetail,
+      guidanceId: sanitizeAssistantVisibleText(event.guidanceId)
     };
     record.events = [...(record.events || []), normalized].slice(-MAX_RUN_EVENTS);
     saveStateSoon();