codex-overleaf-link 2.5.0 → 2.6.0

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({ conclusionKey: options.assistantMessageKey || (!assistantMessage ? 'withheld_changes' : undefined), 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({
@@ -133,7 +151,7 @@
         ),
         status: 'warning'
       });
-      appendCompletionReport({
+      appendCompletionReport({ conclusionKey: options.assistantMessageKey || (!assistantMessage ? 'ask_ignored_changes' : undefined),
         conclusion: assistantMessage || tx(
           'Codex finished in Ask mode. Any local file changes were ignored and were not synced to Overleaf.',
           'Codex 已在 Ask 模式完成；本地文件改动已忽略，未同步到 Overleaf。'
@@ -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,27 @@
       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',
+      const blockedConclusion = assistantMessage
+        ? `${assistantMessage}\n\n${tx('Sync note: no changes were written to Overleaf; every change was blocked before writing.', '同步提示：没有向 Overleaf 写入任何改动；所有改动都在写入前被拦下。')}`
+        : tx('No changes were written to Overleaf; every change was blocked before writing.', '没有向 Overleaf 写入任何改动；所有改动都在写入前被拦下。');
+      appendCompletionReport({ conclusionKey: additionalSkippedEntries.length ? undefined
+        : options.assistantMessageKey || (!assistantMessage ? 'no_sync_changes' : undefined),
+        conclusion: additionalSkippedEntries.length ? blockedConclusion
+          : assistantMessage || tx('Codex finished locally. There are no changes to sync back to Overleaf.', 'Codex 已完成本地处理，没有需要同步回 Overleaf 的改动。'),
+        conclusionSource: additionalSkippedEntries.length ? { origin: 'product', key: 'writeback',
+          outcome: 'blocked_sync', prefixLength: assistantMessage.length } : undefined,
+        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 +249,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 +292,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({
+      appendCompletionReport({ conclusionKey: options.assistantMessageKey || (!assistantMessage ? 'no_approved_changes' : undefined),
         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 +316,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 }] : [],
@@ -299,8 +333,8 @@
     if (!reviewing.ok) {
       const blocked = buildReviewingBlockedApplyResult(operations, reviewing);
       appendApplyResult(blocked);
-      appendCompletionReport({
-        conclusion: tx(
+      appendCompletionReport({ conclusionKey: 'reviewing_unavailable',
+        conclusion: reviewing.code === 'reviewing_unavailable' ? tr('failureReason_reviewing_unavailable_user') : tx(
           'No files were written: Track is enabled, but Codex could not verify Overleaf Reviewing/Track Changes.',
           '这轮没有写入：已开启“留痕”要求，但 Codex 没能确认 Overleaf 正在用 Reviewing/Track Changes。'
         ),
@@ -308,7 +342,7 @@
         operations,
         applyResults: [blocked],
         mode: runMode,
-        nextStep: tx(
+        nextStep: reviewing.code === 'reviewing_unavailable' ? tr('failureReason_reviewing_unavailable_next') : tx(
           'Switch Overleaf to Reviewing/Track Changes manually and rerun, or turn off Track before writing.',
           '请在 Overleaf 手动切到 Reviewing/Track Changes 后重新运行，或关闭“留痕”再写入。'
         )
@@ -336,7 +370,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 +385,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 +397,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);
@@ -392,7 +422,7 @@
       ? await verifyPostWriteSaveState(applied, project, saveTarget)
       : { verification: { ok: false, state: 'not_checked', reason: 'No applied writeback operations were returned.' } };
     const saveVerification = confirmation.verification;
-    await settleWritebackRecovery?.(applied, project, saveVerification, saveTarget);
+    await settleWritebackRecovery?.(applied, project, saveVerification, saveTarget, runRequireReviewing);
     if (appliedPaths.length) {
       appendPostWriteSaveVerificationWarning(saveVerification, saveTarget);
       appendRunEvent({ kind: 'technical', title: 'Post-write save confirmation', status: 'info', detail: saveVerification });
@@ -430,7 +460,7 @@
           title: tx(`Post-write compile failed: ${error.message}`, `写后编译出错：${error.message}`),
           status: 'failed'
         });
-        return buildPostWriteCompileSummary({ error });
+        return compileAdapter.buildPostWriteCompileSummary({ error });
       })
       : null;
     const hasSkippedApplyResult = skippedEntries.length > 0;
@@ -462,6 +492,10 @@
         : tx('Review the synced file in Overleaf.', '请在 Overleaf 中查看同步后的文件。');
     appendCompletionReport({
       conclusion: appendCompileSummaryToConclusion(writebackConclusion, compileSummary),
+      conclusionSource: { origin: 'product', key: 'writeback',
+        outcome: !hasConfirmedApplyResult ? 'unconfirmed_sync' : hasSkippedApplyResult ? 'partial_sync' : 'synced',
+        prefixLength: assistantMessage.length, prefixKey: options.assistantMessageKey, hasCompile: Boolean(compileSummary), compileStatus: compileSummary?.status || '',
+        compileReason: compileAdapter.localizeCompileReason(compileSummary?.reason || '', getLocale()), errors: compileSummary?.errors?.slice(0, 3) || [], errorCount: compileSummary?.errors?.length || 0, warningCount: compileSummary?.warnings?.length || 0 },
       status: writebackIncomplete ? 'failed' : 'completed',
       operations,
       applyResults: [applied],
@@ -568,37 +602,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;
     }
@@ -732,52 +758,45 @@
         let logResult = null;
         try {
           logResult = await callPageBridge('getCompileLog', {
+            captureId: result.compile?.captureId,
             triggerIfStale: false,
             maxAgeMs: 30000,
             waitForSaveMs: 0,
             runProjectId: options.runProjectId || getCurrentRunView()?.runProjectId || getCurrentProjectId()
           });
-        } catch (_error) {
-          logResult = null;
+        } catch (error) {
+          logResult = { ok: false, reason: error.message || 'compile_log_fetch_failed' };
         }
-        const compile = result.compile;
+        const compile = compileAdapter.buildPostWriteCompileSummary({ result, logResult });
+        compile.errors = compile.errors.map(value => CompileAdapter.localizeCompileReason(value, getLocale()));
         if (compile?.status === 'success') {
           appendRunEvent({ title: tx('Compile succeeded.', '编译成功。'), status: 'completed',
             activity: activity('completed', [...(logResult?.errors || []), ...(logResult?.warnings || [])].slice(0, 5).map(CompileAdapter.formatCompileDiagnosticForSummary).join('\n')) });
         } else if (compile?.status === 'triggered') {
-          appendRunEvent({ title: tx('Overleaf compile was triggered. The page will continue showing progress.', '已触发 Overleaf 编译；页面会继续显示编译进度。'), status: 'completed', activity: activity('triggered') });
+          appendRunEvent({ title: tx('Overleaf compile was triggered. The page will continue showing progress.', '已触发 Overleaf 编译；页面会继续显示编译进度。'), status: 'completed', activity: activity('triggered', compile.reason) });
         } else {
-          appendRunEvent({ title: tx(`Compile finished with status: ${compile?.status || 'unknown'}`, `编译完成，状态：${compile?.status || '未知'}`), status: 'completed', activity: activity(compile?.status === 'failed' ? 'failed' : 'unknown') });
+          appendRunEvent({ title: compile.status === 'unconfirmed' ? tr('runCompileUnconfirmed')
+            : tx(`Compile finished with status: ${compile.status}`, `编译完成，状态：${compile.status}`),
+            status: 'completed', activity: activity(compile.status === 'failed' ? 'failed' : 'unknown', compile.errors.join('\n') || compile.reason) });
         }
-        return buildPostWriteCompileSummary({ result, logResult });
+        return compile;
       } 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 });
+        return compileAdapter.buildPostWriteCompileSummary({ result });
       }
     } catch (error) {
-      appendRunEvent({ title: tx(`Post-write compile failed: ${error.message}`, `写后编译出错：${error.message}`), status: 'failed', activity: activity('failed', error.message) });
-      return buildPostWriteCompileSummary({ error });
+      const reason = CompileAdapter.localizeCompileReason(error.message, getLocale());
+      appendRunEvent({ title: tx(`Post-write compile failed: ${reason}`, `写后编译出错：${reason}`), status: 'failed', activity: activity('failed', reason) });
+      return compileAdapter.buildPostWriteCompileSummary({ error });
     }
   }
 
-  function buildPostWriteCompileSummary(input = {}) {
-    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) {
@@ -806,10 +825,13 @@
           `已触发写后编译；最新日志显示 ${warnings.length} 个警告。`
         )
         : tx('Post-write compile was triggered; Overleaf may still be updating the result.', '已触发写后编译；Overleaf 可能仍在更新结果。');
+    } else if (compileSummary.status === 'unconfirmed') {
+      summary = tr('runCompileUnconfirmed');
     } 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', '重试'), () => {