codex-overleaf-link 2.5.0 → 2.5.1

package/extension/src/content/providerSettingsCoordinator.js

@@ -7,16 +7,23 @@
     if (!Profiles || !Dialog?.create) {
       throw new Error('Provider settings require explicit profile and dialog dependencies.');
     }
+    const statusTranslations = new Map();
+    const translate = options.tx || (english => english);
     const instance = {
       Profiles,
-      tx: options.tx || ((english) => english),
+      tx: (english, chinese) => {
+        statusTranslations.set(english, [english, chinese]); statusTranslations.set(chinese, [english, chinese]);
+        return translate(english, chinese);
+      },
       sendBackgroundNative: options.sendBackgroundNative,
       getSettingsPanelInstance: options.getSettingsPanelInstance || (() => null),
       getSelectedModel: options.getSelectedModel || (() => ''),
       getSelectedProviderId: options.getSelectedProviderId || (() => 'builtin'),
+      getSelectedProviderRevision: options.getSelectedProviderRevision || (() => undefined),
       hasCurrentProject: options.hasCurrentProject || (() => true),
       setSelectedProviderId: options.setSelectedProviderId || (() => {}),
       confirmProviderSwitch: options.confirmProviderSwitch || (() => true),
+      assertProviderSwitchAllowed: options.assertProviderSwitchAllowed || (() => {}),
       clearSelectedModel: options.clearSelectedModel || (() => {}),
       refreshModelOptions: options.refreshModelOptions || (() => {}),
       persistInputs: options.persistInputs || (() => {}),
@@ -42,6 +49,7 @@
     instance.dialog = Dialog.create({
       document: options.document || document,
       tx: instance.tx,
+      translateStatusText: text => statusTranslations.has(text) ? translate(...statusTranslations.get(text)) : text,
       ProviderProfiles: Profiles,
       callbacks: {
         hasCurrentProject: instance.hasCurrentProject,
@@ -61,6 +69,7 @@
       open: () => open(instance),
       refreshSummary: () => refreshSummary(instance),
       renderSummary: () => updateSettingsSummary(instance),
+      refreshLocale: () => instance.dialog.refreshLocale?.(),
       ensureLoaded: () => ensureLoaded(instance),
       getRunSelection: providerId => instance.loaded
         ? Profiles.buildRunSelection(instance.catalog, providerId || instance.getSelectedProviderId())
@@ -195,15 +204,20 @@
       }
     }
     const changedProviderIds = Array.isArray(change.changedProviderIds) ? change.changedProviderIds : [];
-    const providerConfigurationChanged = changedProviderIds.includes(requestedProviderId);
+    const selectedRevision = instance.getSelectedProviderRevision();
+    const providerConfigurationChanged = changedProviderIds.includes(requestedProviderId)
+      || (requestedProviderId === previousProviderId && selectedRevision !== undefined
+        && Number(selectedRevision) !== Number(instance.Profiles.getProviderById(catalog, requestedProviderId)?.revision || 0));
     if (!change.forceSessionRefresh && !projectProviderChanged && !providerConfigurationChanged) {
       return;
     }
+    if (projectProviderChanged || providerConfigurationChanged) instance.assertProviderSwitchAllowed();
     const loadResult = change.modelsPreloaded === true
       ? { stale: false, selectedModel: change.preloadedModelId || '' }
       : await instance.refreshModelOptions(
         instance.Profiles.buildRunSelection(catalog, requestedProviderId),
-        { persist: false }
+        { persist: false, ...(projectProviderChanged || providerConfigurationChanged
+          ? { assertCurrent: instance.assertProviderSwitchAllowed } : {}) }
       );
     if (loadResult?.stale || loadResult?.error) {
       const error = createClientError(
@@ -223,6 +237,7 @@
 
   async function prepareProviderActivation(instance, providerId) {
     requireCurrentProject(instance);
+    instance.assertProviderSwitchAllowed();
     const previousProviderId = instance.getSelectedProviderId() || 'builtin';
     const provider = instance.Profiles.getProviderById(instance.catalog, providerId);
     if (providerId !== previousProviderId) {
@@ -234,9 +249,10 @@
         return { cancelled: true, previousProviderId };
       }
     }
+    instance.assertProviderSwitchAllowed();
     const result = await instance.refreshModelOptions(
       instance.Profiles.buildRunSelection(instance.catalog, providerId),
-      { persist: false }
+      { persist: false, assertCurrent: instance.assertProviderSwitchAllowed }
     );
     if (result?.stale || result?.error) {
       if (providerId !== previousProviderId) {
@@ -252,6 +268,7 @@
       error.details = result?.error || {};
       throw error;
     }
+    instance.assertProviderSwitchAllowed();
     return {
       cancelled: false,
       previousProviderId,
@@ -316,7 +333,10 @@
   async function saveProvider(instance, context, action = {}) {
     instance.dialog.setBusy('saving', instance.tx('Saving provider…', '正在保存模型服务…'));
     try {
-      if (action.activate === true) requireCurrentProject(instance);
+      if (action.activate === true) {
+        requireCurrentProject(instance);
+        instance.assertProviderSwitchAllowed();
+      }
       const result = await request(instance, 'codex.providers.upsert', {
         profileId: context.profileId,
         expectedRevision: context.expectedRevision,
@@ -347,8 +367,8 @@
         tone: fellBackToBuiltin ? 'warning' : 'success',
         title: fellBackToBuiltin
           ? instance.tx(
-              'Provider saved. Its endpoint changed, so Built-in Codex is active until the new endpoint is approved.',
-              '模型服务已保存。由于端点发生变化，确认新端点前将使用内置 Codex。'
+              'Provider saved. Its endpoint changed, so the Native Host default is Built-in Codex. The project provider is unchanged; approve the new endpoint before using it.',
+              '模型服务已保存。端点变更使 Native Host 默认项回退到内置 Codex，当前项目的服务选择保持不变；使用新端点前仍需确认披露。'
             )
           : action.activate
           ? instance.tx('Provider saved and activated.', '模型服务已保存并启用。')
@@ -376,7 +396,7 @@
       instance.dialog.setStatus({
         tone: 'success',
         title: result.activeProviderId === 'builtin'
-          ? instance.tx('API key removed. Built-in Codex is now active.', 'API 密钥已删除，当前已切换到内置 Codex。')
+          ? instance.tx('API key removed. The Native Host default is Built-in Codex; the project provider is unchanged.', 'API 密钥已删除。Native Host 默认项为内置 Codex，当前项目的服务选择保持不变。')
           : instance.tx('Stored API key removed.', '已删除存储的 API 密钥。')
       });
     } catch (error) {
@@ -387,6 +407,7 @@
   async function deleteProvider(instance, context) {
     instance.dialog.setBusy('deleting', instance.tx('Deleting provider…', '正在删除模型服务…'));
     try {
+      if (context.profileId === instance.getSelectedProviderId()) instance.assertProviderSwitchAllowed();
       const result = await request(instance, 'codex.providers.delete', {
         providerId: context.profileId,
         expectedRevision: context.expectedRevision
@@ -665,6 +686,23 @@
       provider_revision_conflict: instance.tx('This provider changed in another tab. Reload it and retry.', '此模型服务已在其他标签页发生变化，请刷新后重试。'),
       provider_protocol_negotiation_required: instance.tx('The Auto protocol could not be negotiated for this model.', '无法为此模型自动协商 API 协议。')
     };
+    Object.assign(messages, {
+      provider_store_busy: instance.tx('Provider settings are being updated by another Native Host. Retry shortly.', '其他 Native Host 正在更新模型服务设置，请稍后重试。'),
+      provider_store_too_large: instance.tx('Provider settings exceed the storage limit. Reduce the configuration and retry.', '模型服务设置超过存储上限，请精简配置后重试。'),
+      provider_store_unavailable: instance.tx('Provider settings could not be read or saved. Check the local service and retry.', '无法读取或保存模型服务设置，请检查本机服务后重试。'),
+      provider_store_corrupt: instance.tx('Stored provider settings are inconsistent or invalid. Repair the local configuration before retrying.', '已存储的模型服务设置不一致或无效，请修复本机配置后重试。'),
+      provider_not_found: instance.tx('The selected provider no longer exists. Refresh the provider list.', '所选模型服务已不存在，请刷新服务列表。'),
+      provider_dns_failed: instance.tx('The provider hostname could not be resolved. Check the endpoint and network.', '无法解析模型服务域名，请检查端点和网络。'),
+      provider_tls_failed: instance.tx('A secure connection to the provider could not be established. Check the endpoint certificate.', '无法与模型服务建立安全连接，请检查端点证书。'),
+      provider_rate_limited: instance.tx('The provider is rate limiting requests. Retry later.', '模型服务已限制请求频率，请稍后重试。'),
+      provider_model_not_configured: instance.tx('The selected model is not configured for this provider.', '当前模型服务未配置所选模型。'),
+      provider_selection_unavailable: instance.tx('The selected provider or model is unavailable. Review the project selection.', '所选模型服务或模型不可用，请检查当前项目的选择。'),
+      provider_disclosure_required: instance.tx('Confirm the provider endpoint before activation.', '启用前请确认模型服务端点。'),
+      provider_secret_invalid: instance.tx('The API key change could not be accepted. Review the key settings.', '无法接受此次 API 密钥变更，请检查密钥设置。'),
+      provider_model_catalog_unavailable: instance.tx('The provider model catalog could not be loaded. Retry shortly.', '无法加载模型服务的模型目录，请稍后重试。'),
+      native_unavailable: instance.tx('The local service is unavailable. Check the Native Host connection.', '本机服务不可用，请检查 Native Host 连接。'),
+      provider_request_failed: instance.tx('The provider operation failed. Review the settings and retry.', '模型服务操作失败，请检查设置后重试。')
+    });
     return messages[code] || error?.message || instance.tx('Provider operation failed.', '模型服务操作失败。');
   }
 

package/extension/src/content/providerSettingsDialog.js

@@ -47,10 +47,16 @@
     if (!Profiles) {
       throw new Error('Provider settings dialog requires provider profiles.');
     }
+    const translations = new Map();
+    const translate = options.tx || (english => english);
     const instance = {
       Profiles,
       document: options.document || document,
-      tx: options.tx || ((english) => english),
+      tx: (english, chinese) => {
+        translations.set(english, [english, chinese]); translations.set(chinese, [english, chinese]);
+        return translate(english, chinese);
+      },
+      translateStatusText: text => translations.has(text) ? translate(...translations.get(text)) : options.translateStatusText?.(text) || text,
       callbacks: options.callbacks || {},
       catalog: Profiles.normalizeCatalog({}),
       selectedId: 'builtin',
@@ -83,6 +89,7 @@
       setVerification: verification => setVerification(instance, verification),
       setVerificationFailure: failure => setVerificationFailure(instance, failure),
       setTestProgress: progress => setTestProgress(instance, progress),
+      refreshLocale: () => refreshLocale(instance),
       hasUnsavedChanges: () => instance.dirty || Boolean(instance.modelEditor || instance.confirmation),
       isOpen: () => Boolean(instance.root && !instance.root.hidden),
       destroy: () => destroy(instance),
@@ -245,6 +252,7 @@
 
   function render(instance) {
     const tx = instance.tx;
+    instance.root.querySelector('[data-provider-action="close"]')?.setAttribute('aria-label', tx('Close', '关闭'));
     const reload = instance.root.querySelector('[data-provider-action="reload"]');
     if (reload) {
       reload.hidden = !instance.embedded;
@@ -292,6 +300,45 @@
       + escapeHtml(tx('Add provider', '添加模型服务')) + '</button>';
   }
 
+  // Render a detached reference, then change only owned copy in the live DOM.
+  // Inputs, focus, selection, modal ownership, listeners and secret values stay put.
+  function refreshLocale(instance) {
+    if (!instance.root || instance.root.hidden) return;
+    const reference = { ...instance, root: instance.root.cloneNode(true) };
+    if (instance.root.querySelector('[data-provider-field="name"]')) reference.draft = readContext(instance).draft;
+    render(reference);
+    if (instance.modelEditor) openModelEditor(reference, instance.modelEditor.id, { show: false });
+    patchLocaleCopy(instance.root, reference.root);
+    if (instance.lastStatus) setStatus(instance, instance.lastStatus);
+    const confirmation = instance.root.querySelector('[data-provider-confirmation]');
+    if (instance.confirmation && confirmation) {
+      for (const node of confirmation.querySelectorAll('h3, p, button')) node.textContent = instance.translateStatusText(node.textContent);
+    }
+    const secret = instance.root.querySelector('[data-provider-field="apiKey"]');
+    const toggle = instance.root.querySelector('[data-provider-action="toggle-secret"]');
+    if (toggle) toggle.textContent = instance.tx(secret?.type === 'text' ? 'Hide' : 'Show', secret?.type === 'text' ? '隐藏' : '显示');
+    refreshTestState(instance); updateDisclosureText(instance);
+    if (instance.modelEditor) {
+      updateModelReasoningSummary(instance);
+      const error = instance.root.querySelector('[data-model-error]');
+      if (error && instance.modelEditor.error) error.textContent = formatModelEditorError(instance, instance.modelEditor.error);
+    }
+  }
+
+  function patchLocaleCopy(current, reference) {
+    if (!current || !reference || current.nodeType !== reference.nodeType) return;
+    if (current.nodeType === 3) { if (current.nodeValue !== reference.nodeValue) current.nodeValue = reference.nodeValue; return; }
+    if (current.nodeType !== 1 || current.tagName !== reference.tagName) return;
+    for (const attr of ['title', 'aria-label', 'placeholder']) {
+      const next = reference.getAttribute(attr);
+      if (next !== null && current.getAttribute(attr) !== next) current.setAttribute(attr, next);
+    }
+    if (['INPUT', 'TEXTAREA'].includes(current.tagName)) return;
+    const actual = current.childNodes, expected = reference.childNodes;
+    if (actual.length !== expected.length) return;
+    for (let index = 0; index < actual.length; index++) patchLocaleCopy(actual[index], expected[index]);
+  }
+
   function renderDetail(instance) {
     const detail = instance.root.querySelector('[data-provider-detail]');
     if (instance.templatePicker) { renderTemplatePicker(instance, detail); return; }
@@ -303,6 +350,10 @@
     const tx = instance.tx;
     const draft = instance.draft || provider;
     const active = provider.id && provider.id === getCurrentProjectProviderId(instance);
+    const profileStatus = !provider.id
+      ? tx('Unsaved provider profile', '尚未保存的模型服务配置')
+      : active ? tx('Used by new runs in this project', '当前项目的新任务将使用此服务')
+        : tx('Saved provider profile', '已保存的模型服务配置');
     const acceptedHost = getEndpointHost(draft.baseUrl);
     const secretSavedAt = formatSecretSavedAt(instance, provider.secretUpdatedAt);
     const disclosureSatisfied = Boolean(
@@ -314,7 +365,7 @@
       <div class="codex-provider-detail-titleline">
         <div>
           <h3>${escapeHtml(draft.name || tx('Custom provider', '自定义模型服务'))}</h3>
-          <p>${escapeHtml(active ? tx('Used by new runs in this project', '当前项目的新任务将使用此服务') : tx('Saved provider profile', '已保存的模型服务配置'))}</p>
+          <p>${escapeHtml(profileStatus)}</p>
         </div>
         ${active ? `<span class="codex-provider-active-badge">${escapeHtml(tx('Current project', '当前项目'))}</span>` : ''}
       </div>
@@ -444,12 +495,12 @@
             <small>${escapeHtml(tx('Vendor-specific fields only; core model, messages, tools, and stream fields are protected.', '仅填写服务商特有字段；model、messages、tools 和 stream 等核心字段不可覆盖。'))}</small>
           </label>
           <label class="codex-provider-field">
-            <span>Anthropic version</span>
+            <span>${escapeHtml(tx('Anthropic version', 'Anthropic 版本'))}</span>
             <input type="text" data-provider-field="anthropicVersion" value="${escapeAttr(draft.anthropicVersion || '2023-06-01')}" spellcheck="false">
           </label>
           <label class="codex-provider-field">
             <span>Anthropic beta</span>
-            <input type="text" data-provider-field="anthropicBeta" value="${escapeAttr(draft.anthropicBeta || '')}" placeholder="optional" spellcheck="false">
+            <input type="text" data-provider-field="anthropicBeta" value="${escapeAttr(draft.anthropicBeta || '')}" placeholder="${escapeAttr(tx('optional', '可选'))}" spellcheck="false">
           </label>
           <label class="codex-provider-field">
             <span>${escapeHtml(tx('Anthropic thinking mode', 'Anthropic 思考模式'))}</span>
@@ -910,6 +961,7 @@
       ,anthropicPromptCaching: Boolean(get('anthropicPromptCaching')?.checked)
       ,impersonateClaudeCode: Boolean(get('impersonateClaudeCode')?.checked)
       ,maxOutputTokens: Number(get('maxOutputTokens')?.value || 65536)
+      ,outputBudgetVersion: 1
     };
     const apiKey = String(get('apiKey')?.value || '');
     const secretMutation = instance.secretAction === 'replace' && apiKey
@@ -992,9 +1044,10 @@
   }
 
   function setStatus(instance, status = {}) {
+    instance.lastStatus = status;
     const element = instance.root.querySelector('[data-provider-status]');
     element.dataset.tone = status.tone || '';
-    element.textContent = [status.title, status.detail].filter(Boolean).join(' ');
+    element.textContent = [status.title, status.detail].filter(Boolean).map(text => instance.translateStatusText?.(text) || text).join(' ');
   }
 
   function setVerification(instance, verification = {}) {
@@ -1379,7 +1432,7 @@
     }
   }
 
-  function openModelEditor(instance, id) {
+  function openModelEditor(instance, id, options = {}) {
     const provider = readContext(instance).draft;
     const existing = provider.models.find(model => model.id === id);
     if (id && !existing) return;
@@ -1450,7 +1503,7 @@
       + escapeHtml(tx('Cancel', '取消')) + '</button><button type="button" class="codex-provider-primary-button" data-provider-model-action="apply-editor">'
       + escapeHtml(id ? tx('Apply', '应用') : tx('Add model', '添加模型')) + '</button></footer>';
     updateModelReasoningSummary(instance);
-    if (modal.showModal) modal.showModal(); else modal.setAttribute('open', '');
+    if (options.show !== false) { if (modal.showModal) modal.showModal(); else modal.setAttribute('open', ''); }
   }
 
   function updateModelReasoningSummary(instance) {
@@ -1499,16 +1552,21 @@
       closeModelEditor(instance, false);
       if (!unchanged) replaceModelDraft(instance, next);
     } catch (error) {
-      const translated = {
-        id: instance.tx(error.message, '请检查模型 ID：必填、最多 200 字符、不可重复，且单个服务最多 32 个模型。'),
-        contextWindow: instance.tx(error.message, '上下文窗口必须为 8192 至 4000000 之间的整数。'),
-        maxOutputTokens: instance.tx(error.message, '输出上限须为 256 至 65536 之间的整数，并小于上下文窗口。')
-      };
-      modal.querySelector('[data-model-error]').textContent = translated[error.field] || error.message;
+      editor.error = { field: error.field, message: error.message };
+      modal.querySelector('[data-model-error]').textContent = formatModelEditorError(instance, editor.error);
       if (error.field) get(error.field)?.focus();
     }
   }
 
+  function formatModelEditorError(instance, error) {
+    const chinese = {
+      id: '请检查模型 ID：必填、最多 200 字符、不可重复，且单个服务最多 32 个模型。',
+      contextWindow: '上下文窗口必须为 8192 至 4000000 之间的整数。',
+      maxOutputTokens: '输出上限须为 256 至 65536 之间的整数，并小于上下文窗口。'
+    }[error.field];
+    return chinese ? instance.tx(error.message, chinese) : error.message;
+  }
+
   function validateConnectionForm(instance) {
     const context = readContext(instance), tx = instance.tx;
     let message = '';

package/extension/src/content/recentProjects.js

@@ -21,7 +21,8 @@
       ProjectSessionCleanup, SessionPersistence, SessionState, StorageDb, StorageKeys, StorageMigration
     } = deps;
     const projectSessionCleanup = ProjectSessionCleanup.create({
-      tr, getAccountScopeId: getCachedAccountScopeId, showPluginConfirm, showPluginToast,
+      tr, tx, getAccountScopeId: getCachedAccountScopeId, showPluginConfirm, showPluginToast,
+      getViewGeneration: () => dashboardRenderGeneration,
       sendBackgroundNative, mutateProjectPanelState, renderRecentProjectsVariant,
       SessionState, StorageDb, StorageMigration
     });
@@ -492,6 +493,7 @@
   // Kept as a compatibility entry point and as the recovery path for invalid project links.
   function renderRecentProjectRow(row) {
     var projectId = row && row.projectId;
+    var cleanupScope = { accountScopeId: getCachedAccountScopeId(), generation: dashboardRenderGeneration };
     var valid = isValidProjectId(projectId);
     var wrap = createViewElement('div', 'recent-projects-row-wrap recent-projects-unavailable-row');
     wrap.setAttribute('data-project-id', projectId || '');
@@ -501,7 +503,7 @@
     link.appendChild(textNode(projectDisplayName(projectId), 'recent-projects-row-name'));
     if (valid) link.addEventListener('click', function () { openProjectFromRow(projectId); });
     var cleanup = createViewButton(tr(valid ? 'recentProjects_clearProject' : 'recentProjects_cleanup'), function () {
-      if (valid) projectSessionCleanup.clearProjectSessions(projectId, projectDisplayName(projectId)).catch(function () {});
+      if (valid) projectSessionCleanup.clearProjectSessions(projectId, projectDisplayName(projectId), cleanupScope).catch(function () {});
       else cleanupDeadProjectEntry(projectId).catch(function () {});
     }, valid ? 'data-project-clear' : 'data-row-cleanup');
     wrap.appendChild(link);
@@ -533,6 +535,7 @@
   }
 
   function renderProjectSessionRow(sessionsEl, projectId, record, options) {
+    var cleanupScope = { accountScopeId: getCachedAccountScopeId(), generation: dashboardRenderGeneration };
     var featured = Boolean(options && options.featured);
     var running = Boolean(StorageDb)
       && settleDashboardRunStatus(StorageDb.derivePrimaryStatusBadge(record), record.updatedAt || record.lastActivityAt) === 'running';
@@ -586,7 +589,7 @@
     }, 'data-project-conversations');
     var openProject = createViewButton(tr('recentProjects_openProject'), function () { openProjectFromRow(projectId); });
     var clear = createViewButton(tr('recentProjects_clearProject'), function () {
-      projectSessionCleanup.clearProjectSessions(projectId, projectDisplayName(projectId)).catch(function () {});
+      projectSessionCleanup.clearProjectSessions(projectId, projectDisplayName(projectId), cleanupScope).catch(function () {});
     }, 'data-project-clear');
     row.appendChild(renderActionsMenu([rename, del, projectConversations, openProject, clear]));
 
@@ -697,9 +700,10 @@
   // saveState uses, so opening the project later sees a coherent state.
   // NOTE: if the project is open in another tab, that tab's in-memory state
   // wins on its next save; the IndexedDB record mutation below still holds.
-  async function mutateProjectPanelState(projectId, mutate) {
+  async function mutateProjectPanelState(projectId, mutate, options = {}) {
     var key = projectPanelStateKey(projectId);
     var stored = await chrome.storage.local.get(key);
+    options.assertCurrent?.();
     var blob = stored && stored[key];
     if (!blob || !SessionState) {
       return false;
@@ -707,7 +711,9 @@
     var nextState = mutate(SessionState.normalizePanelState(blob));
     var payload = {};
     payload[key] = SessionState.prepareStateForStorage(nextState);
+    options.assertCurrent?.();
     await chrome.storage.local.set(payload);
+    options.assertCurrent?.();
     return true;
   }
 
@@ -752,7 +758,7 @@
         }
       });
       if (!response || !response.ok) {
-        showPluginToast(tr('deleteSessionHistoryFailedToast', { message: (response && response.error && response.error.message) || 'native host did not return success' }), { status: 'warning', sticky: true });
+        showPluginToast(tr('deleteSessionHistoryFailedToast', { message: (response && response.error && response.error.message) || tr('deleteSessionNativeFailureDetail') }), { status: 'warning', sticky: true });
       } else if (response.result && response.result.skipped) {
         showPluginToast(tr('deleteSessionNoThreadToast'), { status: 'info' });
       } else {

package/extension/src/content/runActivitySummary.js

@@ -3,8 +3,8 @@
 
   function create(deps = {}) {
     if (!deps.RunActivityModel) return null;
-    const { RunActivityModel: Model, tx, findRunRecord, getPanel, cssEscape, isGuidance,
-      formatElapsed, renderMarkdownBlockText, renderRunEvent, presence, classifyStatus, getProjectId, summarizeCommand,
+    const { RunActivityModel: Model, RunGuidanceView, getPendingGuidance = () => [], tx, findRunRecord, getPanel, cssEscape, isGuidance,
+      formatElapsed, renderMarkdownBlockText, renderRunEvent, presence, classifyStatus, getProjectId, summarizeCommand, projectReviewResultEvent, formatReviewResultFailure,
       sanitizeAssistantVisibleText: sanitize = value => String(value || '') } = deps;
     const cards = new WeakMap();
     const choices = new Map();
@@ -115,6 +115,31 @@
       disclosure(el, key);
       return { el, label, target, status, diff, body, key, bodyStamp: '' };
     }
+    function reviewResultLines(item) {
+      const source = item.event || {};
+      if (item.kind !== 'notice' || source.streamRole || source.guidanceId || source.subagent || source.technicalDetail
+        || (source.kind && source.kind !== 'activity') || item.meta?.noticeSource || source.activity?.noticeSource || source.activity?.id) return [];
+      const event = projectReviewResultEvent?.(source) || source;
+      const english = /^(?:Undo result: (?:undone \d+ item\(s\), skipped \d+ item\(s\)|undone \d+ file\(s\), skipped \d+|rejected \d+ tracked change\(s\), skipped \d+)|Accept result: accepted \d+ tracked change\(s\), skipped \d+)$/;
+      const chinese = /^(?:撤销结果：(?:已撤销 \d+ 项，跳过 \d+ 项|已撤销 \d+ 个文件，跳过 \d+ 项|已拒绝 \d+ 条留痕，跳过 \d+ 条)|接受结果：已接受 \d+ 条留痕，跳过 \d+ 条)$/;
+      if (!english.test(event.title || '') && !chinese.test(event.title || '')) return [];
+      const skipped = event.detail?.Skipped || event.detail?.['跳过'];
+      if (!Array.isArray(skipped) && source.failure) {
+        const message = plain(formatReviewResultFailure?.(source.failure)?.message).slice(0, 1000);
+        return message ? [message] : [];
+      }
+      if (!Array.isArray(skipped)) return [];
+      return skipped.flatMap(entry => {
+        const fileValue = entry?.File ?? entry?.['文件'], reasonValue = entry?.Reason ?? entry?.['原因'];
+        if (typeof fileValue !== 'string' || typeof reasonValue !== 'string') return [];
+        if (source.failure?.file === fileValue && [source.failure.userMessage, fileValue + ': ' + source.failure.userMessage].includes(reasonValue)) {
+          const message = plain(formatReviewResultFailure?.(source.failure)?.message).slice(0, 1000);
+          if (message) return [message];
+        }
+        const file = plain(fileValue).slice(0, 300), reason = plain(reasonValue).slice(0, 1000);
+        return file && reason ? [reason.startsWith(file + ': ') ? reason : file + ': ' + reason] : [];
+      });
+    }
     function renderTool(row, item, card, run) {
       const meta = item.meta || {};
       const state = effectiveState(item, run);
@@ -140,7 +165,8 @@
         row.status.hidden = true;
       } else row.status.hidden = false;
       const publicText = plain(item.event?.title);
-      const stamp = [publicText, meta.output, meta.command, meta.exitCode, file?.preview, state, meta.clipped].join('\0');
+      const reviewLines = reviewResultLines(item);
+      const stamp = [publicText, meta.output, meta.command, meta.exitCode, file?.preview, state, meta.clipped, JSON.stringify(reviewLines)].join('\0');
       if (stamp !== row.bodyStamp) {
         row.bodyStamp = stamp;
         row.body.replaceChildren();
@@ -155,9 +181,11 @@
         } else {
           if (meta.command) { const command = make('pre', 'run-workflow-command'); command.textContent = plain(meta.command); row.body.append(command); }
           if (meta.output) { const output = make('pre', 'run-workflow-output'); output.textContent = plain(meta.output); row.body.append(output); }
-          const note = make('div', 'run-workflow-tool-note');
-          note.textContent = publicText;
-          row.body.append(note);
+          for (const value of reviewLines.length ? reviewLines : [publicText]) {
+            const note = make('div', 'run-workflow-tool-note');
+            note.textContent = value;
+            row.body.append(note);
+          }
         }
         if (meta.exitCode !== undefined) { const exit = make('div', 'run-workflow-tool-note'); exit.textContent = tx('Exit code: ', '退出码：') + meta.exitCode; row.body.append(exit); }
         if (meta.clipped || file?.clipped) { const more = make('div', 'run-workflow-tool-note'); more.textContent = tx('Preview only. More detail may be available in diagnostics.', '当前为摘要预览，更多信息可通过诊断查看。'); row.body.append(more); }
@@ -502,6 +530,7 @@
       busy.setAttribute('role', 'status');
       events.after(busy);
       const card = { id: String(run.id), root, process, summary, events, metrics, attention,
+        guidance: root.querySelector('[data-run-guidance]'),
         busy, rows: new Map(), run, setup: setupEl, setupSummary, setupFold, setupSteps,
         peek, peekTrack, peekMore, peekRows: new Map() };
       const expand = () => { remember(card.id + ':run', true); process.open = true; update({ root, recordId: run.id }); };
@@ -524,6 +553,11 @@
     function render(card, run, incoming) {
       card.run = run;
       const result = Model.project(run, incoming, { isGuidance });
+      const guidanceEvents = (run.events || []).concat(incoming && !(run.events || []).includes(incoming) ? [incoming] : []);
+      RunGuidanceView?.reconcileGuidance(card.guidance,
+        guidanceEvents.concat(getPendingGuidance(run)),
+        tx, { active: run.status === 'running' });
+      result.blocks = result.blocks.filter(block => block.kind !== 'guidance');
       card.projection = result;
       subagentView?.update(card);
       const active = run.status === 'running';