codex-overleaf-link 2.5.0 → 2.5.1

package/extension/src/content/updateSafetyReceiver.js

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

package/extension/src/content/writebackController.js

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

package/extension/src/content/writebackOrchestrator.js

@@ -100,6 +100,21 @@
     return pending;
   }
 
+  function selectionViolationNextStep() {
+    return tx('Select the intended region again and request only changes within it. Valid written parts can be undone.',
+      '请重新选择目标范围，仅请求修改该范围。已写入的合法部分可撤销。');
+  }
+
+  function buildWithheldEntry(change) {
+    const reason = writebackController.formatUnsupportedLocalChangeReason(change, getLocale());
+    const nextAction = change.reason === 'selection_scope_violation' ? selectionViolationNextStep()
+      : tx('The main agent must review the withheld file before syncing it.', '主代理需核对未同步文件后再写回。');
+    return { operation: { type: 'create', path: change.path }, result: { ok: false,
+      code: change.reason, reason, changedDocument: false, failure: { code: change.reason,
+        stage: 'preflight', severity: 'blocked', retryable: false, terminalState: 'blocked', changedDocument: false,
+        userMessage: reason, nextAction } } };
+  }
+
   async function applySyncChangesToOverleaf(syncChanges = [], project = {}, options = {}) {
     const activeRun = getCurrentRunView?.();
     const saveTarget = { runProjectId: activeRun?.runProjectId || '', recordId: activeRun?.recordId || '', sessionId: activeRun?.sessionId || '' };
@@ -110,20 +125,23 @@
     const assistantMessage = cleanFinalAnswer(options.assistantMessage || getAssistantAnswerForCurrentRun());
     const unsupportedChanges = Array.isArray(options.unsupportedChanges) ? options.unsupportedChanges : [];
     appendUnsupportedLocalChanges(unsupportedChanges);
-    const withheldOnly = unsupportedChanges.filter(change => ['subagent_unfinished_output', 'subagent_unauthorized_edit'].includes(change.reason));
+    const withheldOnly = unsupportedChanges.filter(change => ['subagent_unfinished_output', 'subagent_unauthorized_edit', 'selection_scope_violation'].includes(change.reason));
     if (runMode !== 'ask' && !syncChanges.length && withheldOnly.length) {
-      const skipped = withheldOnly.map(change => ({ operation: { type: 'create', path: change.path }, result: {
-        ok: false, code: change.reason, changedDocument: false,
-        reason: writebackController.formatUnsupportedLocalChangeReason(change, getLocale())
-      } }));
+      const skipped = withheldOnly.map(buildWithheldEntry);
+      const hasSelectionViolation = withheldOnly.some(change => change.reason === 'selection_scope_violation');
       const applied = { ok: false, applied: [], skipped };
-      appendCompletionReport({ conclusion: assistantMessage || tx('Some generated files still need review.', '部分生成文件仍需核对。'),
+      appendCompletionReport({ conclusion: assistantMessage || tx('Some generated changes were blocked.', '部分生成的改动已被阻止。'),
         status: 'failed', operations: [], applyResults: [applied], mode: runMode,
-        nextStep: tx('The main agent must review and adopt the withheld files before syncing them.', '主代理需核对并接管未同步文件后再写回。') });
-      return { summaryLine: tx('Generated files are awaiting review.', '生成文件待核对。'), hasSkippedOperations: true,
+        nextStep: hasSelectionViolation
+          ? selectionViolationNextStep()
+          : tx('The main agent must review and adopt the withheld files before syncing them.', '主代理需核对并接管未同步文件后再写回。') });
+      return { summaryLine: hasSelectionViolation
+          ? tx('Changes outside the selection were blocked.', '选区外改动已被阻止。')
+          : tx('Generated files are awaiting review.', '生成文件待核对。'), hasSkippedOperations: true,
         applied, settlement: buildSettlement({ operations: [], applyResult: applied }),
         audit: buildAuditSummaryFromApply({ operations: [], applyResults: [applied], resultStatus: 'completed_with_skips' }) };
     }
+
     // Guard on the immutable submitted mode, not the mutable panel state.
     if (options.mode === 'ask' && ((syncChanges || []).length || unsupportedChanges.length)) {
       appendRunEvent({
@@ -166,7 +184,16 @@
     }
     let operations = buildSyncApplyOperations(syncChanges, project);
     let visibleSyncChanges = syncChanges || [];
-    let additionalSkippedEntries = [];
+    // A previous Native build can still report inferred metadata moves.
+    // Forward sync never promotes them to a new file or a new capability.
+    let additionalSkippedEntries = operations.filter(operation => operation.type === 'move').map(operation => ({
+      operation,
+      result: { ok: false, code: 'file_tree_controls_unavailable', changedDocument: false,
+        reason: tx('Automatic file moves are unavailable. Handle the path change in Overleaf before retrying.',
+          '暂不支持自动移动文件，请先在 Overleaf 中处理路径变化后再重试。') }
+    }));
+    operations = operations.filter(operation => operation.type !== 'move');
+    if (additionalSkippedEntries.length) visibleSyncChanges = filterSyncChangesByOperations(syncChanges, operations);
     let skippedFilesForAudit = additionalSkippedEntries;
     let appliedFilesForAudit = [];
     const pathSafety = partitionUnsafeProjectPathOperations(operations);
@@ -191,13 +218,20 @@
       visibleSyncChanges = filterSyncChangesByOperations(syncChanges, operations);
     }
     if (!operations.length) {
+      const blockedSettlement = buildSettlement({
+        operations: buildSyncApplyOperations(syncChanges, project),
+        applyResult: { ok: additionalSkippedEntries.length === 0, applied: [], skipped: additionalSkippedEntries }
+      });
+      const blockedFailure = blockedSettlement
+        ? writebackSettlement.projectRunSettlement({ settlement: blockedSettlement.facts }).primaryFailure : undefined;
       appendRunEvent({
         title: tx('Codex did not produce file changes that need to sync back to Overleaf.', 'Codex 没有产生需要同步回 Overleaf 的文件改动。'),
         status: 'completed'
       });
       appendCompletionReport({
         conclusion: assistantMessage || tx('Codex finished locally. There are no changes to sync back to Overleaf.', 'Codex 已完成本地处理，没有需要同步回 Overleaf 的改动。'),
-        status: runMode === 'ask' ? tr('modeAsk') : 'completed',
+        status: additionalSkippedEntries.length ? 'failed' : runMode === 'ask' ? tr('modeAsk') : 'completed',
+        failure: blockedFailure,
         operations: [],
         applyResults: additionalSkippedEntries.length ? [{ ok: false, applied: [], skipped: additionalSkippedEntries }] : [],
         unchangedReason: additionalSkippedEntries.find(item => item?.result?.reason)?.result.reason
@@ -208,14 +242,7 @@
       return {
         summaryLine: assistantMessage || tx('No changes to sync', '没有需要同步的改动'),
         hasSkippedOperations: additionalSkippedEntries.length > 0,
-        settlement: buildSettlement({
-          operations: buildSyncApplyOperations(syncChanges, project),
-          applyResult: {
-            ok: additionalSkippedEntries.length === 0,
-            applied: [],
-            skipped: additionalSkippedEntries
-          }
-        }),
+        settlement: blockedSettlement,
         audit: buildAuditSummaryFromApply({
           operations: buildSyncApplyOperations(syncChanges, project),
           applyResults: additionalSkippedEntries.length ? [{ ok: false, applied: [], skipped: additionalSkippedEntries }] : [],
@@ -258,13 +285,20 @@
     additionalSkippedEntries.push(...binaryDecision.skipped);
 
     if (!operations.length) {
+      const approvalSettlement = buildSettlement({
+        operations: buildSyncApplyOperations(syncChanges, project),
+        applyResult: { ok: additionalSkippedEntries.length === 0, applied: [], skipped: additionalSkippedEntries }
+      });
+      const approvalFailure = approvalSettlement
+        ? writebackSettlement.projectRunSettlement({ settlement: approvalSettlement.facts }).primaryFailure : undefined;
       appendRunEvent({
         title: tx('No approved file changes remain to sync back to Overleaf.', '没有剩余已确认的文件改动需要同步回 Overleaf。'),
         status: 'completed'
       });
       appendCompletionReport({
         conclusion: assistantMessage || tx('No approved changes were written back to Overleaf.', '没有已确认的改动写回 Overleaf。'),
-        status: runMode === 'ask' ? tr('modeAsk') : 'completed',
+        status: additionalSkippedEntries.length ? 'failed' : runMode === 'ask' ? tr('modeAsk') : 'completed',
+        failure: approvalFailure,
         operations: [],
         applyResults: additionalSkippedEntries.length ? [{ ok: false, applied: [], skipped: additionalSkippedEntries }] : [],
         unchangedReason: additionalSkippedEntries.find(item => item?.result?.reason)?.result.reason
@@ -275,14 +309,7 @@
       return {
         summaryLine: tx('No changes applied', '没有应用改动'),
         hasSkippedOperations: additionalSkippedEntries.length > 0,
-        settlement: buildSettlement({
-          operations: buildSyncApplyOperations(syncChanges, project),
-          applyResult: {
-            ok: additionalSkippedEntries.length === 0,
-            applied: [],
-            skipped: additionalSkippedEntries
-          }
-        }),
+        settlement: approvalSettlement,
         audit: buildAuditSummaryFromApply({
           operations: buildSyncApplyOperations(syncChanges, project),
           applyResults: additionalSkippedEntries.length ? [{ ok: false, applied: [], skipped: additionalSkippedEntries }] : [],
@@ -336,7 +363,7 @@
       status: 'running',
       activity: { v: 1, kind: 'sync', id: writebackActivityId, state: 'running', paths: operations.map(operation => operation.path).filter(Boolean) }
     });
-    await stageWritebackRecovery?.(operations, saveTarget, runRequireReviewing);
+    await stageWritebackRecovery?.(operations, saveTarget, runRequireReviewing, project);
     const applied = operations.length
       ? mergeApplyResultSkipped(await assetTransferBroker.applyOperations({
         operations,
@@ -351,12 +378,8 @@
       }), additionalSkippedEntries)
       : mergeApplyResultSkipped({ ok: true, applied: [], skipped: [] }, additionalSkippedEntries);
     const hasConfirmedApplyResult = hasApplyResultEntries(applied);
-    for (const change of unsupportedChanges.filter(item => ['subagent_unfinished_output', 'subagent_unauthorized_edit'].includes(item.reason))) {
-      const reason = writebackController.formatUnsupportedLocalChangeReason(change, getLocale());
-      applied.skipped.push({ operation: { type: 'create', path: change.path }, result: { ok: false,
-        code: change.reason, reason, changedDocument: false, failure: { code: change.reason,
-          stage: 'preflight', severity: 'blocked', retryable: false, terminalState: 'blocked', changedDocument: false,
-          userMessage: reason, nextAction: 'The main agent must review the withheld file before syncing it.' } } });
+    for (const change of unsupportedChanges.filter(item => ['subagent_unfinished_output', 'subagent_unauthorized_edit', 'selection_scope_violation'].includes(item.reason))) {
+      applied.skipped.push(buildWithheldEntry(change));
       applied.ok = false;
     }
     // Record the apply result + undo checkpoint IMMEDIATELY, before any
@@ -367,7 +390,7 @@
     // landed in Overleaf. The manual-confirm path already records undo right
     // after its write — match that ordering here (v1.6.2).
     appendApplyResult(applied);
-    recordUndoFromApply(project, applied);
+    await recordUndoFromApply(project, applied);
     const skippedEntries = getSkippedEntries(applied);
     if (skippedEntries.length) {
       appendPartialWritebackWarning(applied);
@@ -568,37 +591,29 @@
     return 'failed';
   }
 
-  // v1.8.0: text-only writebacks confirm the mirror in place. The written
-  // content ORIGINATED in the local workspace, so after a verified writeback
-  // the workspace already equals Overleaf; only the baseline hashes and
-  // freshness metadata are stale. mirror.confirmWriteback re-hashes the
-  // written files without re-downloading the project. Anything unusual —
-  // tree ops, binary writes, dirty mirror, an older native host without the
-  // method — falls back to the full zip resync below.
-  const MIRROR_CONFIRMABLE_OPERATION_TYPES = new Set(['edit']);
+  // Text-only confirmation requires the page's verified post-image digest.
+  // Local files can change after writeback; Native must match those digests
+  // before advancing its baseline. Missing evidence and non-text/tree writes
+  // retain the authoritative ZIP fallback below.
 
   async function tryConfirmMirrorWriteback(applied, runProjectId) {
-    const entries = Array.isArray(applied?.applied) ? applied.applied : [];
-    if (!entries.length) {
-      return false;
-    }
-    const paths = [];
-    for (const entry of entries) {
-      const operation = entry?.operation || {};
-      if (!MIRROR_CONFIRMABLE_OPERATION_TYPES.has(operation.type) || !operation.path) {
-        return false;
-      }
-      paths.push(operation.path);
-    }
     try {
+      if (!runProjectId || getCurrentProjectId() !== runProjectId) return false;
+      const proof = await writebackController.buildMirrorWritebackConfirmation?.(applied);
+      if (!proof || getCurrentProjectId() !== runProjectId) return false;
       const response = await sendBackgroundNative({
         method: 'mirror.confirmWriteback',
         params: {
           projectId: runProjectId,
-          paths: Array.from(new Set(paths))
+          ...proof
         }
       });
-      return response?.ok === true && response?.result?.ok === true;
+      const confirmations = Array.isArray(response?.result?.confirmed) ? response.result.confirmed : [];
+      const confirmed = new Map(confirmations.map(file => [file?.path, file?.hash]));
+      return getCurrentProjectId() === runProjectId && response?.ok === true && response?.result?.ok === true
+        && confirmations.length === proof.expectedFiles.length
+        && confirmed.size === proof.expectedFiles.length
+        && proof.expectedFiles.every(file => confirmed.get(file.path) === file.sha256);
     } catch (error) {
       return false;
     }
@@ -751,12 +766,13 @@
         }
         return buildPostWriteCompileSummary({ result, logResult });
       } else {
-        const reason = result?.reason || tx('unknown reason', '未知原因');
+        const reason = CompileAdapter.localizeCompileReason(result?.reason, getLocale()) || tx('unknown reason', '未知原因');
         appendRunEvent({ title: tx(`Post-write compile did not succeed: ${reason}`, `写后编译未成功：${reason}`), status: 'failed', activity: activity('failed', reason) });
         return buildPostWriteCompileSummary({ result });
       }
     } catch (error) {
-      appendRunEvent({ title: tx(`Post-write compile failed: ${error.message}`, `写后编译出错：${error.message}`), status: 'failed', activity: activity('failed', error.message) });
+      const reason = CompileAdapter.localizeCompileReason(error.message, getLocale());
+      appendRunEvent({ title: tx(`Post-write compile failed: ${reason}`, `写后编译出错：${reason}`), status: 'failed', activity: activity('failed', reason) });
       return buildPostWriteCompileSummary({ error });
     }
   }
@@ -765,19 +781,11 @@
     return compileAdapter.buildPostWriteCompileSummary(input);
   }
 
-  // First structured per-operation failure among the skipped writeback
-  // entries — the run-level failure the completion report promotes.
+  // Use the same normalized failure selection as settlement and its UI, while
+  // preserving the selected producer's full evidence on the historical report.
   function promoteWritebackSkippedFailure(applied) {
-    for (const entry of getSkippedEntries(applied)) {
-      const failure = entry?.result?.failure || entry?.failure;
-      if (failure?.code) {
-        if (!failure.file && entry?.path) {
-          return { ...failure, file: entry.path };
-        }
-        return failure;
-      }
-    }
-    return null;
+    const failures = writebackSettlement.collectFailuresFromResult(applied);
+    return writebackSettlement.selectPrimaryFailure(failures);
   }
 
   function appendCompileSummaryToConclusion(conclusion, compileSummary) {
@@ -807,9 +815,10 @@
         )
         : tx('Post-write compile was triggered; Overleaf may still be updating the result.', '已触发写后编译；Overleaf 可能仍在更新结果。');
     } else if (compileSummary.status === 'failed') {
+      const reason = compileAdapter.localizeCompileReason(compileSummary.reason, getLocale());
       summary = tx(
-        `Post-write compile check failed: ${compileSummary.reason || 'unknown reason'}`,
-        `写后编译检查失败：${compileSummary.reason || '未知原因'}`
+        `Post-write compile check failed: ${reason || 'unknown reason'}`,
+        `写后编译检查失败：${reason || '未知原因'}`
       );
     } else {
       summary = tx(

package/extension/src/content/writingStyleSettings.js

@@ -16,7 +16,18 @@
     let pickerOpen = false, query = '', filter = 'all';
     let activeGeneration = null, cancelling = false;
     let preview = null, previewBusy = false, previewFile = 'references/writing-style.md';
-    const tx = (en, zh) => deps.tx(en, zh);
+    const ownMessagePairs = new Map();
+    const tx = (en, zh) => {
+      const pair = [en, zh];
+      ownMessagePairs.set(en, pair); ownMessagePairs.set(zh, pair);
+      return deps.tx(en, zh);
+    };
+    // Cached status text keeps its diagnostic value; only known copy is
+    // projected again when sync renders under a different language.
+    const displayMessage = value => {
+      const pair = ownMessagePairs.get(value);
+      return pair ? deps.tx(...pair) : value;
+    };
     const node = (tag, className, text) => {
       const element = document.createElement(tag);
       if (className) element.className = className;
@@ -62,6 +73,12 @@
       const value = deps.getScope();
       return value?.accountScopeId && value?.projectId ? value : null;
     }
+    function errorMessage(message, code) {
+      // codex.run currently wraps style-build error codes as codex_run_failed.
+      if (code === 'writing_style_busy' || message === 'Writing-style settings are being updated by another Native Host. Retry shortly.') return tx('Writing-style settings are being updated by another Native Host. Retry shortly.', '写作风格设置正在由另一个本地进程更新，请稍后重试。');
+      if (code === 'writing_style_changed' || message === 'The saved writing skill changed. Rebuild it in General settings.' || message === 'Writing-style asset integrity changed.') return tx(message || 'The saved writing skill changed. Rebuild it in General settings.', '写作风格资产不可用，请在常规设置中重新生成。');
+      return message;
+    }
     function alignScope() {
       const next = currentScope(), key = next ? next.accountScopeId + ':' + next.projectId : '';
       if (scopeKey !== key) {
@@ -83,7 +100,7 @@
     async function request(method, params = {}) {
       const response = await deps.request({ method, params });
       if (!response?.ok) {
-        const error = new Error(response?.error?.message || tx('The request could not be completed.', '请求未能完成。'));
+        const error = new Error(errorMessage(response?.error?.message, response?.error?.code) || tx('The request could not be completed.', '请求未能完成。'));
         error.code = response?.error?.code || 'writing_style_failed'; throw error;
       }
       return response.result;
@@ -105,7 +122,7 @@
         meta = value;
         if (setupEnabled === null) desiredEnabled = value.enabled === true;
         if (!dirty && !activeGeneration) restoreSources(value);
-        if (value.error && !message) { message = value.error; messageTone = 'error'; }
+        if (value.error && !message) { message = errorMessage(value.error, value.errorCode); messageTone = 'error'; }
         clearTimeout(pollTimer); pollTimer = null;
         if (value.building) pollTimer = setTimeout(() => { void ensureLoaded(true).catch(() => {}); }, 1800);
         else if (!activeGeneration) cancelling = false;
@@ -198,7 +215,8 @@
       activeGeneration = operation; cancelling = false; pickerOpen = false; preview = null;
       message = ''; messageTone = ''; expanded = true; render();
       const stillActive = () => {
-        if (operation.cancelled || generation !== epoch) {
+        const current = currentScope();
+        if (operation.cancelled || generation !== epoch || current?.accountScopeId !== target.accountScopeId || current?.projectId !== target.projectId) {
           const error = new Error(tx('Style generation cancelled.', '已取消风格生成。'));
           error.code = 'codex_cancelled'; throw error;
         }
@@ -206,7 +224,7 @@
       try {
         const settings = await deps.getModelSettings();
         stillActive();
-        const attachments = [], selected = [];
+        const attachments = [], selected = [], projectFiles = [];
         for (const source of chosen) {
           stillActive();
           if (source.kind === 'pdf') {
@@ -218,10 +236,11 @@
             const snapshot = await deps.getReferenceSnapshot(source.projectId, operation.readId);
             operation.readId = ''; stillActive();
             if (snapshot?.projectId !== source.projectId || snapshot?.capabilities?.referenceTextComplete !== true) {
-              throw new Error(tx('The reference project could not be read completely: ', '参考项目未能完整读取：') + source.name);
+              throw new Error(tx('The reference project could not be read completely: ' + source.name, '参考项目未能完整读取：' + source.name));
             }
             const body = new Blob([JSON.stringify(snapshot)], { type: 'application/json' });
-            if (body.size > LIMITS.maxProjectBytes) throw new Error(tx('Reference project is too large: ', '参考项目过大：') + source.name);
+            if (body.size > LIMITS.maxProjectBytes) throw new Error(tx('Reference project is too large: ' + source.name, '参考项目过大：' + source.name));
+            projectFiles.push(...(snapshot.files || []).map(file => ({ ...file, path: source.projectId + '/' + file.path })));
             const id = crypto.randomUUID();
             attachments.push({ id, name: source.projectId + '.writing-reference.json', size: body.size,
               mimeType: 'application/json', kind: 'file', contentBase64: await encode(body) });
@@ -229,6 +248,11 @@
           } else selected.push({ kind: 'saved', sourceId: source.sourceId });
         }
         stillActive();
+        if (projectFiles.length) {
+          const check = await deps.preflightProjectReferences({ project: { files: projectFiles }, assertCurrent: stillActive });
+          stillActive();
+          if (check.blocked) throw new Error(tx('Blocked: sensitive content review required', '已阻止：需要处理敏感内容'));
+        }
         operation.phase = 'learning'; operation.sourceName = ''; render();
         const tracked = await deps.startBuild({ ...settings, ...target, mode: 'ask',
           task: 'Generate the selected project writing skill and its section references.',
@@ -241,7 +265,7 @@
         const response = await tracked.promise;
         if (generation !== epoch) return;
         if (!response?.ok) {
-          const error = new Error(response?.error?.message || tx('Style generation failed.', '风格生成失败。'));
+          const error = new Error(errorMessage(response?.error?.message, response?.error?.code) || tx('Style generation failed.', '风格生成失败。'));
           error.code = response?.error?.code; throw error;
         }
         const result = response.result?.writingStyle;
@@ -253,7 +277,7 @@
       } catch (error) {
         if (generation === epoch) {
           message = operation.cancelled || error.code === 'codex_cancelled'
-            ? tx('Style generation cancelled.', '已取消风格生成。') : error.message;
+            ? tx('Style generation cancelled.', '已取消风格生成。') : errorMessage(error.message, error.code);
           messageTone = operation.cancelled || error.code === 'codex_cancelled' ? '' : 'error';
         }
       } finally {
@@ -340,7 +364,7 @@
         list.append(loading);
       } else if (projectError) {
         const error = node('div', 'ws2-picker-state ws2-picker-error');
-        error.append(node('strong', '', tx('Projects could not be loaded', '项目列表未能加载')), node('p', '', projectError),
+        error.append(node('strong', '', tx('Projects could not be loaded', '项目列表未能加载')), node('p', '', displayMessage(projectError)),
           button(tx('Retry', '重试'), () => { void loadProjects(true); }, 'ws2-button', 'retry-projects'));
         list.append(error);
       } else {
@@ -540,7 +564,7 @@
         }
       }
       if (message || !meta) {
-        const status = node('div', 'ws2-status', message || tx('Loading writing-style settings…', '正在加载写作风格设置…'));
+        const status = node('div', 'ws2-status', displayMessage(message) || tx('Loading writing-style settings…', '正在加载写作风格设置…'));
         status.dataset.tone = messageTone;
         status.setAttribute('role', messageTone === 'error' ? 'alert' : 'status');
         if (!meta && message) status.append(button(tx('Retry', '重试'), () => {