dsh-doc-assistant 0.1.14 → 0.1.18

package/lib/client.js

@@ -12,7 +12,7 @@
  *   ./shelf        <- src/client/70-shelf.js
  *   ./boot         <- src/client/90-boot.js
  *
- * Source digest: 6fb0aa631aa6c2ca
+ * Source digest: d5cb4638b3c119ba
  *
  * This is the hand-written lazy-CJS bundle the DSH client module system
  * expects: it calls `window.__ModuleLoader__.load({ id, factory })` with the
@@ -656,6 +656,7 @@ window.__ModuleLoader__.load({
 
         /** GET /doc/ir?projectId=&path= -> { doc } */
         docIR: (first, second) => call('/doc/ir', { query: pairObject(first, second) }),
+        convertWord: (first, second) => call('/doc/convert-word', { body: pairObject(first, second) }),
 
         /** GET /covers?projectId= -> { covers } —— 批量，书架一次拿全（CONTRACT §15.3）。 */
         getCovers: (projectId) => call('/covers', { query: asObject(projectId, 'projectId') }),
@@ -698,6 +699,7 @@ window.__ModuleLoader__.load({
         /** POST /chat/clear { projectId, path } -> { messages: [] }（§13.3） */
         chatClear: (first, second) => call('/chat/clear', { body: pairObject(first, second) }),
         chatModels: () => call('/chat/models'),
+        contextStatus: (first, second) => call('/doc/context-status', { query: pairObject(first, second) }),
         docVersion: (first, second) => call('/doc/version', { query: pairObject(first, second) }),
         openOffice: (first, second) => call('/doc/open-office', { body: pairObject(first, second) }),
 
@@ -1290,7 +1292,9 @@ window.__ModuleLoader__.load({
             throw new Error(`宿主返回的不是 JSON：${path}`);
           }
           if (!data || data.ok !== true) {
-            throw new Error((data && data.error) || `请求失败：${path}`);
+            const error = new Error((data && data.error) || `请求失败：${path}`);
+            error.body = data;
+            throw error;
           }
           return data;
         }
@@ -1376,6 +1380,16 @@ window.__ModuleLoader__.load({
           async chatModels() {
             return typeof api.chatModels === 'function' ? invokeApi(api.chatModels, [[]]) : getJSON('/chat/models');
           },
+          async contextStatus(projectId, path) {
+            const data = typeof api.contextStatus === 'function' ? await invokeApi(api.contextStatus, [[{ projectId, path }]])
+              : await getJSON('/doc/context-status', { projectId, path });
+            return data.progress || { stage: 'idle' };
+          },
+          async convertWord(projectId, path) {
+            const data = typeof api.convertWord === 'function' ? await invokeApi(api.convertWord, [[{ projectId, path }]])
+              : await postJSON('/doc/convert-word', { projectId, path });
+            return bodyOf(data, ['entry']);
+          },
           async openOffice(projectId, path) {
             return typeof api.openOffice === 'function' ? invokeApi(api.openOffice, [[{ projectId, path }]]) : postJSON('/doc/open-office', { projectId, path });
           },
@@ -1408,12 +1422,13 @@ window.__ModuleLoader__.load({
             return bodyOf(await postJSON('/revise/iterate', input), ['revision']);
           },
 
-          async acceptRevision(revisionId) {
+          async acceptRevision(revisionId, options = {}) {
+            const input = { revisionId, ...(options.layoutRiskToken ? { layoutRiskToken: options.layoutRiskToken } : {}) };
             if (typeof api.acceptRevision === 'function') {
-              const out = await invokeApi(api.acceptRevision, [[revisionId], [{ revisionId }]]);
+              const out = await invokeApi(api.acceptRevision, options.layoutRiskToken ? [[input]] : [[revisionId], [input]]);
               return { revision: bodyOf(out, ['revision']), written: out && out.written ? out.written : null };
             }
-            const data = await postJSON('/revision/accept', { revisionId });
+            const data = await postJSON('/revision/accept', input);
             return { revision: data.revision || null, written: data.written || null };
           },
 
@@ -1559,6 +1574,8 @@ window.__ModuleLoader__.load({
           this.listeners = [];
           this.lastWrite = null;
           this.seq = 0;
+          this.changeSeq = 0;
+          this.itemChanges = new Map();
         }
 
         subscribe(listener) {
@@ -1618,6 +1635,7 @@ window.__ModuleLoader__.load({
           if (!changed) return this.all();
           this.seq += 1;
           this.items = [];
+          this.itemChanges = new Map();
           this.error = '';
           this.loading = false;
           this.emit();
@@ -1634,11 +1652,13 @@ window.__ModuleLoader__.load({
           this.loading = true;
           this.error = '';
           this.emit();
-          const seq = ++this.seq;
+          const seq = ++this.seq, changeSeq = this.changeSeq;
           try {
             const list = await this.transport.listRevisions(this.projectId, this.docPath);
             if (seq !== this.seq) return this.all();
-            this.items = Array.isArray(list) ? list.slice() : [];
+            const recent = this.items.filter(item => item?.id && (this.itemChanges.get(item.id) || 0) > changeSeq);
+            const recentIds = new Set(recent.map(item => item.id));
+            this.items = recent.concat((Array.isArray(list) ? list : []).filter(item => !recentIds.has(item?.id)));
             this.loading = false;
             this.emit();
             return this.all();
@@ -1653,11 +1673,14 @@ window.__ModuleLoader__.load({
 
         _upsert(revision) {
           if (!revision || typeof revision !== 'object') return null;
+          if ((revision.projectId && revision.projectId !== this.projectId)
+            || (revision.docPath && revision.docPath !== this.docPath)) return null;
           if (!revision.id) {
             this.items = [revision].concat(this.items);
             this.emit();
             return revision;
           }
+          this.itemChanges.set(revision.id, ++this.changeSeq);
           const index = this.items.findIndex((item) => item && item.id === revision.id);
           if (index >= 0) {
             this.items[index] = Object.assign({}, this.items[index], revision);
@@ -1691,10 +1714,12 @@ window.__ModuleLoader__.load({
           return revision;
         }
 
-        async accept(revisionId) {
+        async accept(revisionId, options) {
+          const projectId = this.projectId, docPath = this.docPath;
           this.setBusy(`rev:${revisionId}`, true);
           try {
-            const out = await this.transport.acceptRevision(revisionId);
+            const out = await this.transport.acceptRevision(revisionId, options);
+            if (this.projectId !== projectId || this.docPath !== docPath) return out;
             if (out && out.revision && typeof out.revision === 'object') this._upsert(out.revision);
             else {
               const target = this.items.find((item) => item && item.id === revisionId);
@@ -1703,15 +1728,20 @@ window.__ModuleLoader__.load({
             }
             if (out && out.written) this.lastWrite = out.written;
             return out;
+          } catch (error) {
+            if (this.projectId === projectId && this.docPath === docPath && error?.body?.revision) this._upsert(error.body.revision);
+            throw error;
           } finally {
             this.setBusy(`rev:${revisionId}`, false);
           }
         }
 
         async reject(revisionId) {
+          const projectId = this.projectId, docPath = this.docPath;
           this.setBusy(`rev:${revisionId}`, true);
           try {
             const out = await this.transport.rejectRevision(revisionId);
+            if (this.projectId !== projectId || this.docPath !== docPath) return out;
             if (out && out.revision && typeof out.revision === 'object') this._upsert(out.revision);
             else {
               const target = this.items.find((item) => item && item.id === revisionId);
@@ -1725,9 +1755,11 @@ window.__ModuleLoader__.load({
         }
 
         async restore(revisionId) {
+          const projectId = this.projectId, docPath = this.docPath;
           this.setBusy(`rev:${revisionId}`, true);
           try {
             const out = await this.transport.restoreRevision(revisionId);
+            if (this.projectId !== projectId || this.docPath !== docPath) return out;
             if (out && out.revision && typeof out.revision === 'object') this._upsert(out.revision);
             return out;
           } finally {
@@ -1760,15 +1792,17 @@ window.__ModuleLoader__.load({
          * （单条撤回会破坏共用快照的语义）。accept / reject 仍可逐条兜底。
          */
         async bulk(ids, action) {
+          const projectId = this.projectId, docPath = this.docPath;
+          const isCurrent = () => this.projectId === projectId && this.docPath === docPath;
           const list = (Array.isArray(ids) ? ids : []).filter(Boolean);
           if (list.length === 0) return [];
           try {
             const results = await this.transport.bulkRevisions(list, action);
-            await this.load();
+            if (isCurrent()) await this.load();
             return results;
           } catch (error) {
             if (action === 'restore') {
-              await this.load().catch(() => {});
+              if (isCurrent()) await this.load().catch(() => {});
               throw error;
             }
             const results = [];
@@ -1782,7 +1816,7 @@ window.__ModuleLoader__.load({
                 results.push({ revisionId: id, ok: false, error: normalizeError(inner) });
               }
             }
-            await this.load();
+            if (isCurrent()) await this.load();
             return results;
           }
         }
@@ -1875,8 +1909,13 @@ window.__ModuleLoader__.load({
         const ops = opsFor(revision);
         const busy = p.busy === true || (p.busyIds || []).indexOf(revision.id) >= 0;
         const canDecide = status === 'pending';
+        const canAcceptLayoutRisk = canDecide && typeof revision.layoutWarning?.token === 'string';
+        const savedError = p.acceptError || revision.error || '';
+        // Older saved cards may still recommend the removed copy feature.
+        const acceptError = /流式(?:编辑)?副本/.test(savedError)
+          ? '此修订可能造成文字重叠或版式异常。修订尚未写入。请点击文档标题右侧的 Office 图标，手动打开文档调整排版。' : savedError;
+        const layoutWarning = canDecide && /手动打开文档调整排版/.test(acceptError);
         const unsafe = /\.docx$/i.test(revision.docPath || '') && revision.selectionVersion !== 'word-selection-v2' && status !== 'accepted';
-        const outdated = status === 'pending' && p.currentHash && revision.docHash && p.currentHash !== revision.docHash;
         const group = typeof p.writeGroup === 'function' ? p.writeGroup(revision) : writeGroupOf([revision], revision);
         const groupSize = Array.isArray(group) ? group.length : 1;
 
@@ -1906,18 +1945,22 @@ window.__ModuleLoader__.load({
             collapsed ? h('span', { key: 'status', className: P + 'RevCollapseStatus' }, STATUS_TEXT[status] || status) : null,
           ]),
           unsafe ? h('div', { key: 'unsafe', className: P + 'Err' }, '旧版选区可能漏字，请重新选择文字后生成修订。') : null,
-          revision.error
-            ? h('div', { key: 'err', className: P + 'Err' }, `错误：${revision.error}`)
+          acceptError
+            ? h('div', { key: 'err', className: P + 'Err', 'data-revision-layout-warning': layoutWarning ? '1' : undefined }, `${layoutWarning ? '提示' : '错误'}：${acceptError}`)
             : null,
+          status === 'accepted' && revision.written?.layoutRiskAccepted
+            ? h('div', { key: 'layout-reminder', className: P + 'Hint', role: 'status', 'data-revision-layout-warning': '1' },
+              '已写入修订，可能存在文字重叠或版式异常。请点击文档标题右侧的 Office 图标，手动打开文档调整排版。')
+            : null,
+          p.progress ? h('div', { key: 'progress', 'data-revision-write-progress': '1' }, p.progress) : null,
           !collapsed ? h('div', { key: 'diff', className: P + 'RevDiffBox', 'aria-label': '词级差异' }, h(InlineDiff, { ops })) : null,
           !collapsed ? h('div', { key: 'actions', className: P + 'RevActions' }, [
-            canDecide ? button('accept', '接受', p.onAccept, P + 'BtnPrimary', unsafe || outdated,
-              outdated ? '文档已更新，请重新选择文字后生成修订' : undefined) : null,
+            canDecide ? button('accept', canAcceptLayoutRisk ? '仍然接受并写入' : '接受', p.onAccept, P + 'BtnPrimary', unsafe || p.writeBusy) : null,
             status === 'rejected'
-              ? button('restore', '恢复为待处理', p.onRestore, null, false)
+              ? button('restore', '恢复为待处理', p.onRestore, null, p.writeBusy)
               : null,
             status === 'accepted' && groupSize <= 1
-              ? button('restore', '撤回', p.onRestore, null, false, '撤回这次写入并还原文件')
+              ? button('restore', '撤回', p.onRestore, null, p.writeBusy, '撤回这次写入并还原文件')
               : null,
             status === 'accepted' && groupSize > 1
               ? h('button', {
@@ -1925,11 +1968,11 @@ window.__ModuleLoader__.load({
                 type: 'button',
                 className: P + 'Btn',
                 title: '这几条修订共用一次写回快照，必须整组还原',
-                disabled: busy || typeof p.onRestoreGroup !== 'function',
+                disabled: busy || p.writeBusy || typeof p.onRestoreGroup !== 'function',
                 onClick: typeof p.onRestoreGroup === 'function' ? () => p.onRestoreGroup(group) : undefined,
               }, `撤回本次批量写入（${groupSize} 条）`)
               : null,
-            status !== 'accepted' ? button('regen', '重新生成', p.onRegenerate, null, unsafe || outdated) : null,
+            status !== 'accepted' ? button('regen', '重新生成', p.onRegenerate, null, unsafe) : null,
             button('delete', '删除', p.onDelete, null, false, '删除这张修订卡片，不撤销已写入文档的修改'),
           ]) : null,
         ]);
@@ -2081,10 +2124,12 @@ window.__ModuleLoader__.load({
       border-radius:var(--dsw-radius-sm,5px);cursor:pointer}
     .${P}Btn:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.12))}
     .${P}Btn:disabled{opacity:.5;cursor:default}
-    .${P}BtnPrimary{background:var(--dsw-alias-brand-primary);border-color:var(--dsw-alias-brand-primary);
-      color:#fff}
-    .${P}BtnPrimary:hover:not(:disabled){background:var(--dsw-alias-brand-primary);color:#fff;
-      filter:brightness(.92)}
+    .${P}BtnPrimary{background:var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary));
+      border-color:var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary));
+      color:var(--dsw-alias-label-primary-foreground,#fff)}
+    .${P}BtnPrimary:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover,var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary)));
+      border-color:var(--dsw-alias-button-primary-hover,var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary)));
+      color:var(--dsw-alias-label-primary-foreground,#fff)}
     .${P}BtnGhost{border-color:transparent;background:transparent;color:var(--dsw-alias-label-secondary)}
     .${P}Err{color:var(--dsw-alias-state-error-primary);font-size:12px;margin-top:4px}
     `;
@@ -2142,7 +2187,7 @@ window.__ModuleLoader__.load({
       const DISPLAY_NAME = '企业文档助手';
 
       /** 客户端版本号，与 package.json 的 version 同步维护（`/state` 不回传版本时用它）。 */
-      const CLIENT_VERSION = '0.1.14';
+      const CLIENT_VERSION = '0.1.18';
 
       /** 设置窗口的分区。 */
       const SECTIONS = [
@@ -3626,7 +3671,8 @@ window.__ModuleLoader__.load({
         for (const item of items) {
           const expand = item.action === 'expand' || /^扩写/.test(item.instruction || '');
           const key = expand ? JSON.stringify([item.docHash, item.original, item.anchor?.kind,
-            item.anchor?.blockId, item.anchor?.srcStart, item.anchor?.srcEnd, item.anchor?.sheet, item.anchor?.cell]) : item.id;
+            item.anchor?.blockId, item.anchor?.srcStart, item.anchor?.srcEnd, item.anchor?.sheet, item.anchor?.cell,
+            item.anchor?.segments?.map(segment => [segment.blockId, segment.srcStart, segment.srcEnd])]) : item.id;
           let group = byKey.get(key);
           if (!group) { group = { key, items: [] }; byKey.set(key, group); groups.push(group); }
           group.items.push(item);
@@ -3637,14 +3683,19 @@ window.__ModuleLoader__.load({
 
       function comparisonChoices(group, currentHash) {
         if (group.items.some(item => item.status === 'accepted')) return [];
-        return group.items.filter(item => item.status === 'pending' && !item.deletedAt
-          && (!currentHash || !item.docHash || item.docHash === currentHash));
+        return group.items.filter(item => item.status === 'pending' && !item.deletedAt);
       }
 
       function captureRequest(value) {
         const request = JSON.parse(JSON.stringify(value));
-        if (request.anchor) Object.freeze(request.anchor);
-        return Object.freeze(request);
+        const freeze = item => {
+          if (item && typeof item === 'object') {
+            Object.values(item).forEach(freeze);
+            Object.freeze(item);
+          }
+          return item;
+        };
+        return freeze(request);
       }
 
       // =========================================================================
@@ -4224,7 +4275,7 @@ window.__ModuleLoader__.load({
       }
 
       const LAYOUT_FORMATS = { docx: true, pptx: true, xlsx: true, pdf: true };
-      const LAYOUT_ONLY_FORMATS = { docx: true, pptx: true, pdf: true };
+      const LAYOUT_ONLY_FORMATS = { doc: true, docx: true, pptx: true, pdf: true };
 
       function mediaUrl(route, projectId, path, extra) {
         const q = new URLSearchParams();
@@ -4343,13 +4394,39 @@ window.__ModuleLoader__.load({
         return { picked, matched, srcStart: matched[0], srcEnd: matched[matched.length - 1] + 1 };
       }
 
+      function wordLineGeometry(line) {
+        const box = line && line.layoutBox;
+        return box && box.w > 0 ? { x: (line.x - box.x) / box.w, w: line.w / box.w }
+          : { x: Number(line && line.x), w: Number(line && line.w) };
+      }
+
+      /** Column membership supplies layout context only; source matching stays exact. */
+      function sameWordColumn(a, b) {
+        const first = wordLineGeometry(a), next = wordLineGeometry(b);
+        if (![first.x, first.w, next.x, next.w].every(Number.isFinite) || first.w <= 0 || next.w <= 0) return false;
+        const overlap = Math.min(first.x + first.w, next.x + next.w) - Math.max(first.x, next.x);
+        return Math.abs(first.x - next.x) <= .065 && overlap > Math.min(first.w, next.w) * .45;
+      }
+
+      function exactWordGlyphs(line) {
+        if (!line || line.ocr || line.precise !== true || !Array.isArray(line.glyphs) || !line.glyphs.length) return false;
+        let cursor = 0;
+        for (const glyph of line.glyphs) {
+          if (glyph.precise === false || !Number.isInteger(glyph.from) || !Number.isInteger(glyph.to)
+            || glyph.from !== cursor || glyph.to <= cursor || !Number.isFinite(glyph.x) || !Number.isFinite(glyph.w) || glyph.w < 0) return false;
+          cursor = glyph.to;
+        }
+        return cursor === String(line.text || '').length;
+      }
+
       function bindWordLayoutLines(blocks, lines) {
         const parts = sourceParts({ blocks });
         const source = parts.map((part) => part.text).join('\n');
         const index = wordTextIndex(source);
         const beginnings = parts.map(part => wordTextIndex(part.text).compact);
         const list = Array.isArray(lines) ? lines : [];
-        const entries = list.map((line, order) => {
+        const entries = list.map((rawLine, order) => {
+          const { srcStart, srcEnd, srcMap, blockId, wordCell, wordParagraphs, wordPrefix, wordLayout, ...line } = rawLine || {};
           const text = String(line && line.text || '');
           let prefix = 0;
           let picked = wordTextIndex(text);
@@ -4394,16 +4471,56 @@ window.__ModuleLoader__.load({
               window.forEach((entry, i) => { entry.at = placements[i]; });
             }
           }
+          // Multi-column reports interleave author details with body lines in PDF
+          // reading order. Match a unique, exact continuation in its own column,
+          // and require any already mapped neighbour to agree with the placement.
+          for (const entry of ordered) {
+            if (entry.at >= 0 || !exactWordGlyphs(entry.line)) continue;
+            const column = ordered.filter(other => exactWordGlyphs(other.line)
+              && Number(other.line.page || 1) === Number(entry.line.page || 1) && sameWordColumn(entry.line, other.line));
+            const center = column.indexOf(entry), placements = new Set();
+            for (let size = 2; size <= Math.min(8, column.length); size += 1) {
+              for (let from = Math.max(0, center - size + 1); from <= center && from + size <= column.length; from += 1) {
+                const window = column.slice(from, from + size);
+                if (!window.some(other => other !== entry && other.at >= 0)) continue;
+                const needle = window.map(other => other.picked.compact).join('');
+                if (needle.length > 2048) continue;
+                let offset = 0;
+                const anchored = new Set();
+                for (const other of window) {
+                  if (other.at >= 0) anchored.add(other.at - offset);
+                  offset += other.picked.compact.length;
+                }
+                if (anchored.size !== 1) continue;
+                const at = anchored.values().next().value;
+                if (at < 0 || index.compact.slice(at, at + needle.length) !== needle) continue;
+                let cursor = at, wanted = -1, consistent = true;
+                for (const other of window) {
+                  if (other.at >= 0 && other.at !== cursor) consistent = false;
+                  if (other === entry) wanted = cursor;
+                  cursor += other.picked.compact.length;
+                }
+                if (consistent && !ordered.some(other => other !== entry && other.at >= 0
+                  && other.at < wanted + entry.picked.compact.length && other.at + other.picked.compact.length > wanted)) placements.add(wanted);
+              }
+            }
+            if (placements.size === 1) entry.at = placements.values().next().value;
+          }
         }
         return entries.map(entry => {
           const { line, text, picked, prefix, at } = entry;
-          if (at < 0) return { ...line, text };
+          if (at < 0) return { ...line, text, wordLayout: true };
           const matched = index.positions.slice(at, at + picked.compact.length);
           const srcStart = matched[0];
           const srcEnd = matched[matched.length - 1] + 1;
           const part = parts.find(item => srcStart >= item.start && srcStart < item.start + item.text.length);
-          if (!part || srcEnd > part.start + part.text.length) return { ...line, text };
-          const bound = { ...line, text, blockId: part.block.id, srcStart, srcEnd };
+          // PDF-to-Word documents can put a bullet and its text in two separate
+          // paragraphs while painting them as one PDF line. Native glyphs prove
+          // that exact combined span; OCR and table-cell crossings stay refused.
+          const crossed = parts.filter(item => item.start < srcEnd && item.start + item.text.length > srcStart);
+          if (!part || (srcEnd > part.start + part.text.length
+            && (!exactWordGlyphs(line) || crossed.some(item => item.block.type === 'table')))) return { ...line, text, wordLayout: true };
+          const bound = { ...line, text, wordLayout: true, blockId: part.block.id, srcStart, srcEnd };
           if (part.block.type === 'table') {
             for (let row = 0; row < (part.block.rows || []).length; row++) {
               const cells = part.block.rows[row].cells || [];
@@ -4502,6 +4619,45 @@ window.__ModuleLoader__.load({
         return ranges;
       }
 
+      function wordListMarker(text) {
+        return /^[\s⚫•●▪◦‣⁃∙○◉◎■□◆◇◼◾⬤*\-]+$/u.test(String(text || ''))
+          && /[⚫•●▪◦‣⁃∙○◉◎■□◆◇◼◾⬤*\-]/u.test(String(text || ''));
+      }
+
+      /** Separate Word paragraphs remain exact source segments of one selection. */
+      function wordCompoundAnchor(doc, parts) {
+        const source = sourceParts(doc).map(part => part.text).join('\n');
+        if (!Array.isArray(parts) || !parts.length || parts.some(part => !part?.anchor
+          || !Number.isInteger(part.anchor.srcStart) || !Number.isInteger(part.anchor.srcEnd)
+          || part.anchor.srcStart < 0 || part.anchor.srcEnd <= part.anchor.srcStart || part.anchor.srcEnd > source.length
+          || source.slice(part.anchor.srcStart, part.anchor.srcEnd) !== part.text)) return null;
+        if (parts.length === 1) return { ...parts[0].anchor };
+        const segments = parts.map(part => ({ blockId: part.anchor.blockId, srcStart: part.anchor.srcStart,
+          srcEnd: part.anchor.srcEnd, selectionProof: part.anchor.selectionProof || 'pdf-glyphs-v1' }));
+        if (segments.some((segment, i) => i > 0 && segment.srcStart < segments[i - 1].srcEnd)) return null;
+        const anchor = { kind: 'range', blockId: segments[0].blockId, segments };
+        const from = segments[0].srcStart, to = segments.at(-1).srcEnd;
+        if (segments.every((segment, i) => !i || /^\s*$/.test(source.slice(segments[i - 1].srcEnd, segment.srcStart)))) {
+          anchor.srcStart = from; anchor.srcEnd = to;
+        }
+        return anchor;
+      }
+
+      function wordAnchorText(doc, anchor) {
+        const source = sourceParts(doc).map(part => part.text).join('\n');
+        const segments = Array.isArray(anchor?.segments) ? anchor.segments : [anchor];
+        if (!segments.length || segments.some(segment => !Number.isInteger(segment?.srcStart) || !Number.isInteger(segment?.srcEnd)
+          || segment.srcStart < 0 || segment.srcEnd <= segment.srcStart || segment.srcEnd > source.length)) return undefined;
+        return segments.map(segment => source.slice(segment.srcStart, segment.srcEnd)).join('\n');
+      }
+
+      function continuousWordAnchor(doc, anchor) {
+        const source = sourceParts(doc).map(part => part.text).join('\n');
+        const segments = Array.isArray(anchor?.segments) ? anchor.segments : [anchor];
+        return wordAnchorText(doc, anchor) !== undefined && segments.every((segment, i) => !i
+          || (segment.srcStart >= segments[i - 1].srcEnd && /^\s*$/.test(source.slice(segments[i - 1].srcEnd, segment.srcStart))));
+      }
+
       /** The physical highlight, quote and rewrite all use this same exact source. */
       function wordNativeSelection(doc, lines) {
         const selected = sortReadingOrder(lines);
@@ -4515,8 +4671,9 @@ window.__ModuleLoader__.load({
         if (!original.trim() || wordTextIndex(original).compact !== wordTextIndex(picked).compact) return fallback;
         const parts = wordRanges(doc, from, to);
         if (!parts.length) return fallback;
-        return { anchor: parts.length === 1 ? parts[0].anchor : { kind: 'range', blockId: parts[0].blockId },
-          text: original, blockId: parts[0].blockId, parts, verified: true };
+        const anchor = wordCompoundAnchor(doc, parts);
+        if (!anchor) return fallback;
+        return { anchor, text: wordAnchorText(doc, anchor), blockId: parts[0].blockId, parts, verified: true };
       }
 
       /** A rectangle can select separate source slices; verify each before merging only whitespace gaps. */
@@ -4537,8 +4694,9 @@ window.__ModuleLoader__.load({
         }
         if (!groups.length) return null;
         const parts = groups.flatMap(group => wordRanges(doc, group.from, group.to));
-        return { anchor: parts.length === 1 ? parts[0].anchor : { kind: 'range', blockId: parts[0].blockId },
-          text: groups.map(group => source.slice(group.from, group.to)).join('\n'), parts, blockId: parts[0].blockId, verified: true };
+        const anchor = wordCompoundAnchor(doc, parts);
+        if (!anchor) return { anchor: { kind: 'range' }, text: joinOcrText(lines), wordUnmapped: true };
+        return { anchor, text: wordAnchorText(doc, anchor), parts, blockId: parts[0].blockId, verified: true };
       }
 
       function uniqueAt(haystack, needle) {
@@ -5008,12 +5166,26 @@ window.__ModuleLoader__.load({
        * @param {{ x: number, y: number }} b
        */
       function selectionSpans(lines, a, b) {
-        const list = sortReadingOrder((Array.isArray(lines) ? lines : []).filter((line) => (
+        let list = sortReadingOrder((Array.isArray(lines) ? lines : []).filter((line) => (
           line && (line.ocr === true || line.nativeSelection) && String(line.text || '').trim()
         )));
         if (!a || !b || list.length === 0) return [];
-        const ia = indexAtPoint(list, Number(a.x) || 0, Number(a.y) || 0);
-        const ib = indexAtPoint(list, Number(b.x) || 0, Number(b.y) || 0);
+        let ia = indexAtPoint(list, Number(a.x) || 0, Number(a.y) || 0);
+        let ib = indexAtPoint(list, Number(b.x) || 0, Number(b.y) || 0);
+        const first = list[ia >= 0 ? ia : ib], last = list[ib >= 0 ? ib : ia];
+        if (first && first.wordLayout && !first.wordCell && (!last || sameWordColumn(first, last))) {
+          const edge = wordLineGeometry(first);
+          // Restrict an ordinary drag inside a clearly separate Word column. A
+          // rectangle remains available for an intentional multi-column selection.
+          const hasOtherColumn = list.some(line => line.wordLayout && Number(line.page || 1) === Number(first.page || 1)
+            && Math.abs(wordLineGeometry(line).x - edge.x) > .18
+            && (wordLineGeometry(line).x >= edge.x + edge.w || wordLineGeometry(line).x + wordLineGeometry(line).w <= edge.x));
+          if (hasOtherColumn) {
+            list = list.filter(line => sameWordColumn(first, line));
+            ia = indexAtPoint(list, Number(a.x) || 0, Number(a.y) || 0);
+            ib = indexAtPoint(list, Number(b.x) || 0, Number(b.y) || 0);
+          }
+        }
         if (ia < 0 && ib < 0) {
           // 指针停在行外时，仍按拖过的矩形把跨到的行切开，避免一松手选区被清掉。
           const hits = hitsInRect(list, { x0: a.x, y0: a.y, x1: b.x, y1: b.y });
@@ -5512,7 +5684,7 @@ window.__ModuleLoader__.load({
       function revisionAllowed(doc) {
         if (!doc || typeof doc !== 'object') return true;
         const format = typeof doc.format === 'string' ? doc.format : '';
-        if (format === 'pdf' || format === 'image') return false;
+        if (format === 'pdf' || format === 'image' || format === 'doc') return false;
         return !(doc.meta && doc.meta.writable === false);
       }
 
@@ -5574,6 +5746,18 @@ window.__ModuleLoader__.load({
         return `dshDoc:scroll:${projectId}:${path}`;
       }
 
+      function slideStorageKey(projectId, path) {
+        return `dshDoc:slide:${projectId}:${path}`;
+      }
+
+      function storedSlide(projectId, path) {
+        try {
+          const value = Number(currentWindow()?.localStorage?.getItem(slideStorageKey(projectId, path)));
+          if (Number.isSafeInteger(value) && value >= 1) return value;
+        } catch { /* A private browser still opens the first page. */ }
+        return 1;
+      }
+
       function isTypingTarget(target) {
         if (!target || typeof target.tagName !== 'string') return false;
         const tag = target.tagName;
@@ -5590,7 +5774,9 @@ window.__ModuleLoader__.load({
         const [findOpen, setFindOpen] = React.useState(false);
         const [findQ, setFindQ] = React.useState('');
         const [findAt, setFindAt] = React.useState(0);
-        const [slide, setSlide] = React.useState(1);
+        const [slide, setSlide] = React.useState(() => storedSlide(p.projectId, p.path));
+        const [slideInput, setSlideInput] = React.useState(() => String(storedSlide(p.projectId, p.path)));
+        const [slideJumpError, setSlideJumpError] = React.useState('');
         const [slideCount, setSlideCount] = React.useState(0);
         const [slideReady, setSlideReady] = React.useState(false);
         const [slideError, setSlideError] = React.useState('');
@@ -5599,6 +5785,7 @@ window.__ModuleLoader__.load({
         const [pageFailed, setPageFailed] = React.useState(false);
         const [readyPages, setReadyPages] = React.useState({});
         const [ocrByPage, setOcrByPage] = React.useState({});
+        const [pageTextNotice, setPageTextNotice] = React.useState(null);
         const [rasterPages, setRasterPages] = React.useState(0);
         const [rasterAspect, setRasterAspect] = React.useState(0);
         const [ocrOn, setOcrOn] = React.useState(null);
@@ -5610,6 +5797,7 @@ window.__ModuleLoader__.load({
         const bodyRef = React.useRef(null);
         const wrapRef = React.useRef(null);
         const slideCountRef = React.useRef(0);
+        const slideStorageRef = React.useRef({ target: '', ready: false });
         const missTick = React.useRef(0);
         const gestureRef = React.useRef(null);
         const selectionScrollRef = React.useRef(null);
@@ -5628,7 +5816,9 @@ window.__ModuleLoader__.load({
         const actions = React.useMemo(() => (
           canRevise ? baseActions : baseActions.filter((action) => !action || action.kind !== 'revise')
         ), [baseActions, canRevise]);
-        const format = doc && typeof doc.format === 'string' ? doc.format : '';
+        const sourceFormat = doc && typeof doc.format === 'string' ? doc.format : '';
+        const format = sourceFormat === 'doc' ? 'docx' : sourceFormat;
+        const visionModelKey = JSON.stringify(p.visionRoute || {});
         const canLayout = Boolean(p.projectId && p.path && LAYOUT_FORMATS[format]);
         // Word / PPT / PDF 只显示版式，旧的文本偏好也不能把它们带回抽取正文。
         const view = (LAYOUT_ONLY_FORMATS[format] && canLayout) || (p.view === 'layout' && canLayout) ? 'layout' : 'text';
@@ -5641,9 +5831,8 @@ window.__ModuleLoader__.load({
               kind: 'pick',
               title: '列出这一页的文本框，选一段润色、扩写，或自己改字',
             }])
-            : actions).map(action => action.kind === 'revise' && (p.busyAction === 'polish' || p.busyAction === 'expand')
-              ? { ...action, disabled: true } : action)
-        ), [actions, format, canRevise, showLayout, p.busyAction]);
+            : actions)
+        ), [actions, format, canRevise, showLayout]);
         const showImage = format === 'image' && !showLayout;
         const reason = doc && doc.meta && typeof doc.meta.reason === 'string' ? doc.meta.reason : '';
         const previewRev = Number(p.previewEpoch) || 0;
@@ -5666,6 +5855,9 @@ window.__ModuleLoader__.load({
         }
         function docMedia(route, extra) {
           const query = extra ? { ...extra } : {};
+          if (route === 'page-text' && query.page && p.visionRoute?.provider && p.visionRoute?.model) {
+            query.provider = p.visionRoute.provider; query.model = p.visionRoute.model;
+          }
           // 旧地址没有 v，浏览器会把改写前的页图缓存五分钟。每次接受都换一个 v。
           query.v = previewRev;
           return mediaUrl(route, p.projectId, p.path, query);
@@ -5678,10 +5870,15 @@ window.__ModuleLoader__.load({
           setFindOpen(false);
           setFindQ('');
           setFindAt(0);
-          setSlide(1);
+          const restoredSlide = storedSlide(p.projectId, p.path);
+          slideStorageRef.current = { target: `${p.projectId}\u0000${p.path}`, ready: false };
+          setSlide(restoredSlide);
+          setSlideInput(String(restoredSlide));
+          setSlideJumpError('');
           setSlideCount(0);
           setSlideReady(false);
           setSlideError('');
+          setPageTextNotice(null);
           setSlideRatio(16 / 9);
           setPageModel(null);
           setPageFailed(false);
@@ -5733,23 +5930,30 @@ window.__ModuleLoader__.load({
           fetch(docMedia('pages'), { signal: ac.signal })
             .then((res) => res.json())
             .then((body) => {
+              if (ac.signal.aborted) return;
               if (!body || body.ok === false) {
                 setSlideError((body && body.error) || '无法读取幻灯片页数');
                 return;
               }
               const pages = Number(body.pages);
+              const count = Number.isInteger(pages) && pages > 0 ? pages : 1;
               setSlideError('');
-              setSlideCount(Number.isInteger(pages) && pages > 0 ? pages : 1);
+              slideStorageRef.current = { target: `${p.projectId}\u0000${p.path}`, ready: true };
+              setSlideCount(count);
+              setSlide(value => Math.min(count, Math.max(1, value)));
             })
             .catch((error) => {
-              if (error && error.name === 'AbortError') return;
+              if (ac.signal.aborted || error && error.name === 'AbortError') return;
               setSlideError('无法读取幻灯片页数');
             });
           return () => ac.abort();
-        }, [format, showLayout, p.projectId, p.path]);
+        }, [format, showLayout, p.projectId, p.path, previewRev]);
 
         React.useEffect(() => {
+          setSlideInput(String(slide));
+          setSlideJumpError('');
           setSlideReady(false);
+          setSlideError('');
           setSelection(null);
           setOcrOn(null);
           setBoxPick(null);
@@ -5758,8 +5962,16 @@ window.__ModuleLoader__.load({
         }, [slide, p.projectId, p.path]);
 
         React.useEffect(() => {
-          // 版式预览（含幻灯片）一直靠这段文字。PDF 切到文本页时也要，正文块是空的。
-          const want = Boolean(p.projectId && p.path && (showLayout || format === 'pdf'));
+          if (format !== 'pptx' || !slideCount || slide < 1 || slide > slideCount
+            || !slideStorageRef.current.ready || slideStorageRef.current.target !== `${p.projectId}\u0000${p.path}`) return;
+          try { currentWindow()?.localStorage?.setItem(slideStorageKey(p.projectId, p.path), String(slide)); }
+          catch { /* Navigation does not depend on local persistence. */ }
+          if (typeof p.onLayoutPage === 'function') p.onLayoutPage(slide);
+        }, [format, p.projectId, p.path, slide, slideCount]);
+
+        React.useEffect(() => {
+          // 幻灯片逐页读取；打开图片型 PPTX 不预先转换整册。
+          const want = Boolean(format !== 'pptx' && p.projectId && p.path && (showLayout || format === 'pdf'));
           if (!want) return undefined;
           const ac = new AbortController();
           fetch(docMedia('page-text'), { signal: ac.signal })
@@ -5808,7 +6020,7 @@ window.__ModuleLoader__.load({
               if (!nativePages.has(i)) queue.push(i);
             }
           }
-          const tokens = queue.map((page) => `${p.projectId}:${p.path}:${page}:${previewRev}`);
+          const tokens = queue.map((page) => `${p.projectId}:${p.path}:${page}:${previewRev}:${visionModelKey}`);
           (async () => {
             for (let i = 0; i < queue.length; i += 1) {
               if (cancelled) return;
@@ -5816,23 +6028,32 @@ window.__ModuleLoader__.load({
               const token = tokens[i];
               if (ocrTried.current[token]) continue;
               ocrTried.current[token] = 'pending';
+              if (format === 'pptx') setPageTextNotice({ page, pending: true, text: '正在识别本页文字，完成后即可选中…' });
               try {
                 const res = await fetch(docMedia('page-text', { page }), { signal: ac.signal });
                 const body = await res.json();
                 if (cancelled) return;
                 ocrTried.current[token] = 'done';
-                if (!body || body.ok === false) continue;
+                if (!body || body.ok === false) {
+                  if (format === 'pptx') setPageTextNotice({ page, text: body?.error || '本页文字读取失败，请刷新后重试。' });
+                  continue;
+                }
+                if (format === 'pptx') setPageTextNotice(body.lines?.length
+                  ? (body.ocr?.warning ? { page, text: body.ocr.warning + (body.ocr.visionError ? ` ${body.ocr.visionError}` : '') } : null)
+                  : { page, text: body.ocr?.visionError || body.ocr?.error || '本页未识别到文字；可选用支持图片的模型进行文档提问。' });
                 const pages = Number(body.pages);
                 const aspect = Number(body.aspect);
                 // 第一页可能全是图片；页数仍用于继续读取后面的文字页。
                 if (pages > 0) setRasterPages((prev) => (pages > prev ? pages : prev));
                 if (aspect > 0) setRasterAspect((prev) => (prev > 0 ? prev : aspect));
                 if (!Array.isArray(body.lines) || body.lines.length === 0) continue;
-                if (format === 'docx' && body.source === 'pdf') {
+                if (body.source === 'pdf' || body.source === 'mixed') {
                   setPageModel((prev) => ({
                     pages: Math.max(pages || 1, prev && prev.pages || 1),
                     aspect: aspect > 0 ? aspect : (prev && prev.aspect || 0.772),
-                    lines: (prev ? prev.lines.filter((line) => Number(line.page) !== page) : []).concat(body.lines),
+                    lines: (prev ? prev.lines.filter((line) => Number(line.page) !== page) : []).concat(body.lines.map(line => ({ ...line, page,
+                      ...(line.ocr !== true && line.precise && Array.isArray(line.glyphs) ? { nativeSelection: true } : {}),
+                    }))),
                   }));
                   continue;
                 }
@@ -5843,7 +6064,10 @@ window.__ModuleLoader__.load({
                 }));
               } catch (error) {
                 if (error && error.name === 'AbortError') return;
-                if (!cancelled) ocrTried.current[token] = 'done';
+                if (!cancelled) {
+                  ocrTried.current[token] = 'done';
+                  if (format === 'pptx') setPageTextNotice({ page, text: normalizeError(error) });
+                }
               }
             }
           })();
@@ -5854,7 +6078,7 @@ window.__ModuleLoader__.load({
               if (ocrTried.current[tokens[i]] === 'pending') delete ocrTried.current[tokens[i]];
             }
           };
-        }, [format, showLayout, slide, pageModel, pageFailed, rasterPages, p.projectId, p.path, previewRev]);
+        }, [format, showLayout, slide, pageModel, pageFailed, rasterPages, p.projectId, p.path, previewRev, visionModelKey]);
 
         const boundLines = React.useMemo(
           () => (format === 'docx' ? bindWordLayoutLines : bindLayoutLines)(blocks, pageModel && pageModel.lines),
@@ -6298,14 +6522,15 @@ window.__ModuleLoader__.load({
           if (target && typeof target.closest === 'function' && target.closest('button')) return;
           if (startPageGesture(event, event.currentTarget.closest?.('[data-reader-pages]'))) return;
           const native = format === 'docx' && (lines || []).some(line => line.precise && Array.isArray(line.glyphs));
-          if (!native && target && typeof target.closest === 'function') {
+          const mixedSlide = format === 'pptx' && (lines || []).some(line => line.nativeSelection);
+          if (!native && !mixedSlide && target && typeof target.closest === 'function') {
             const layer = target.closest('[data-text-layer]');
             if (layer && layer.getAttribute('data-ocr') !== '1') {
               ocrHold.current = false;
               return;
             }
           }
-          let ocrLines = (lines || []).filter(line => line && (native ? line.precise && Array.isArray(line.glyphs) : line.ocr === true))
+          let ocrLines = (lines || []).filter(line => line && (native ? line.precise && Array.isArray(line.glyphs) : (line.ocr === true || line.nativeSelection)))
             .map(line => native ? { ...line, nativeSelection: true } : line);
           if (ocrLines.length === 0) return;
           const plane = event.currentTarget;
@@ -6550,6 +6775,18 @@ window.__ModuleLoader__.load({
           });
         };
 
+        const jumpSlide = () => {
+          const value = slideInput.trim(), number = Number(value), max = slideCountRef.current;
+          if (!max) { setSlideJumpError('页数尚未读取完成，请稍后重试。'); return; }
+          if (!/^\d+$/.test(value) || !Number.isSafeInteger(number) || number < 1 || number > max) {
+            setSlideJumpError(`请输入 1–${max} 之间的整数页码。`);
+            return;
+          }
+          setSlideJumpError('');
+          setSlideInput(String(number));
+          setSlide(number);
+        };
+
         const slideMode = showLayout && format === 'pptx';
         const pdfLineCount = pageModel && Array.isArray(pageModel.lines) ? pageModel.lines.length : 0;
         const ocrLineCount = Object.keys(ocrBound).reduce((sum, key) => sum + (Array.isArray(ocrBound[key]) ? ocrBound[key].length : 0), 0);
@@ -6588,7 +6825,7 @@ window.__ModuleLoader__.load({
               return;
             }
             const target = event.target;
-            if (target && typeof target.closest === 'function' && (target.closest('button') || target.closest('[data-text-layer]'))) return;
+            if (target && typeof target.closest === 'function' && (target.closest('button,input,select,textarea') || target.closest('[data-text-layer]'))) return;
             const selected = currentWindow();
             const live = selected && typeof selected.getSelection === 'function' ? selected.getSelection() : null;
             if (live && !live.isCollapsed) return;
@@ -6673,7 +6910,25 @@ window.__ModuleLoader__.load({
             disabled: slideCount === 0 || slide >= slideCount,
             onClick: () => turnSlide(1),
           }, '›'),
-          h('div', { key: 'count', className: P + 'SlideCount' }, slideCount ? `${slide} / ${slideCount}` : '…'),
+          h('div', { key: 'count', className: P + 'SlideCount', 'data-slide-navigation': '1' }, [
+            h('div', { key: 'controls', className: P + 'SlideCountControls' }, [
+              h('input', {
+                key: 'page', type: 'number', inputMode: 'numeric', min: 1, max: slideCount || undefined, step: 1,
+                value: slideInput, disabled: !slideCount, className: P + 'SlidePageInput',
+                'aria-label': '跳转页码', 'aria-invalid': slideJumpError ? 'true' : undefined, 'data-slide-page-input': '1',
+                onChange: event => { setSlideInput(event.target.value); setSlideJumpError(''); },
+                onKeyDown: event => {
+                  if (event.key === 'Enter') { event.preventDefault(); event.stopPropagation(); jumpSlide(); }
+                  else if (event.key === 'Escape') { setSlideInput(String(slide)); setSlideJumpError(''); }
+                },
+              }),
+              h('span', { key: 'total', 'data-slide-total': '1' }, slideCount ? `/ ${slideCount}` : '/ …'),
+              h('button', { key: 'jump', type: 'button', className: P + 'SlideJumpButton', disabled: !slideCount,
+                'aria-label': '跳转到指定页', 'data-slide-jump': '1', onClick: jumpSlide }, '跳转'),
+            ]),
+            slideJumpError ? h('div', { key: 'error', className: P + 'SlideJumpError', role: 'alert',
+              'data-slide-jump-error': '1' }, slideJumpError) : null,
+          ]),
         ]) : null;
 
         const shownPages = usePages ? Math.min(pageCount, 80) : 0;
@@ -6731,6 +6986,12 @@ window.__ModuleLoader__.load({
 
         return h('div', { className: P + 'Wrap', ref: wrapRef, 'data-reader-wrap': '1', 'data-reader-view': view }, [
           viewBar,
+          sourceFormat === 'doc' ? h('div', { key: 'legacy-word', className: P + 'SelectionNotice', role: 'status', 'data-legacy-word-notice': '1' }, [
+            p.convertingWord ? h(Processing, { key: 'progress', text: '正在转换为可修订的 Word 文档…' })
+              : h('span', { key: 'text' }, '旧版 DOC 可以阅读和提问；转换为 DOCX 副本后即可润色、扩写和接受修订。'),
+            h('button', { key: 'convert', type: 'button', className: P + 'Btn', 'data-convert-word': '1',
+              disabled: p.convertingWord || p.conversionDisabled, onClick: p.onConvertWord }, '转换并编辑'),
+          ]) : null,
           p.officeNotice ? h('div', { key: 'office', className: P + 'SelectionNotice', role: 'alert', 'data-office-notice': '1' }, [
             h('span', { key: 'message' }, p.officeNotice.message),
             p.officeNotice.helpUrl ? h('a', { key: 'help', href: '/doc-assistant/office/help', target: '_blank', rel: 'noopener noreferrer' }, ' 查看安装指引') : null,
@@ -6741,6 +7002,9 @@ window.__ModuleLoader__.load({
           showLayout && p.selectionNotice
             ? h('div', { key: 'selection-notice', className: P + 'SelectionNotice', role: 'status', 'data-layout-selection-notice': '1' }, p.selectionNotice)
             : null,
+          showLayout && format === 'pptx' && pageTextNotice?.page === slide
+            ? h('div', { key: 'page-text-notice', className: P + 'SelectionNotice', role: 'status', 'data-page-text-status': '1' },
+              pageTextNotice.pending ? h(Processing, { text: pageTextNotice.text }) : pageTextNotice.text) : null,
           findBar,
           h('main', {
             key: 'main',
@@ -7017,6 +7281,7 @@ window.__ModuleLoader__.load({
         const [rightOpen, setRightOpen] = React.useState(true);
         const [status, setStatus] = React.useState('');
         const [busyAction, setBusyAction] = React.useState('');
+        const [acceptingRevisionId, setAcceptingRevisionId] = React.useState('');
         const [revisionTick, setRevisionTick] = React.useState(0);
         // 接受写回后幻灯片图的地址要变，否则浏览器会继续显示缓存的旧页。
         const [previewEpoch, setPreviewEpoch] = React.useState(0);
@@ -7029,6 +7294,8 @@ window.__ModuleLoader__.load({
         const readerStateRef = React.useRef(null);
         const reloadDocumentRef = React.useRef(null);
         const [officeBusy, setOfficeBusy] = React.useState(false);
+        const [legacyConverting, setLegacyConverting] = React.useState(false);
+        const legacyConvertRef = React.useRef(null);
         const officeLaunchRef = React.useRef('');
         const [officeNotice, setOfficeNotice] = React.useState(null);
         const [booted, setBooted] = React.useState(false);
@@ -7050,16 +7317,26 @@ window.__ModuleLoader__.load({
         const [readerView, setReaderView] = React.useState('text');
         const [selectionNotice, setSelectionNotice] = React.useState('');
         const [noChangeNotice, setNoChangeNotice] = React.useState('');
-        const [generationError, setGenerationError] = React.useState(null);
-        const generationRef = React.useRef(null);
+        // Every request owns its immutable selection/model snapshot. Updating a job
+        // replaces the Map so independent completions cannot overwrite each other.
+        const [generationJobs, setGenerationJobs] = React.useState(() => new Map());
+        const generationJobsRef = React.useRef(new Map());
+        const generationSequenceRef = React.useRef(0);
+        const generationAliveRef = React.useRef(true);
+        const writeBusyRef = React.useRef(false);
+        const [revisionErrors, setRevisionErrors] = React.useState(() => new Map());
         const generationTargetRef = React.useRef('');
         generationTargetRef.current = `${projectId}\u0000${docPath}`;
-        React.useEffect(() => () => { generationRef.current = null; }, []);
+        const updateGenerationJobs = React.useCallback(update => {
+          const next = update(generationJobsRef.current);
+          generationJobsRef.current = next;
+          if (generationAliveRef.current) setGenerationJobs(next);
+        }, []);
         React.useEffect(() => {
-          setGenerationError(null);
-          setNoChangeNotice('');
-          if (generationRef.current && generationRef.current.target !== generationTargetRef.current) setBusyAction('');
-        }, [projectId, docPath]);
+          generationAliveRef.current = true;
+          return () => { generationAliveRef.current = false; };
+        }, []);
+        React.useEffect(() => { setNoChangeNotice(''); }, [projectId, docPath]);
         const [layoutPage, setLayoutPage] = React.useState(0);
         const [layoutFocus, setLayoutFocus] = React.useState(null);
         const [readPct, setReadPct] = React.useState(0);
@@ -7080,6 +7357,8 @@ window.__ModuleLoader__.load({
         const [messages, setMessages] = React.useState([]);
         const [chatBusy, setChatBusy] = React.useState(false);
         const [chatKind, setChatKind] = React.useState('chat');
+        const [chatProgress, setChatProgress] = React.useState('');
+        const chatStartedRef = React.useRef(0);
         const [chatError, setChatError] = React.useState('');
         const [chatModels, setChatModels] = React.useState([]);
         const [chatDefaultModel, setChatDefaultModel] = React.useState(null);
@@ -7122,7 +7401,7 @@ window.__ModuleLoader__.load({
         // Word / PPT / PDF 打开即版式；Excel 打开即表格文本，版式按需再转。
         React.useEffect(() => {
           const fmt = doc && doc.format;
-          if (fmt === 'docx' || fmt === 'pptx' || fmt === 'pdf') setReaderView('layout');
+          if (fmt === 'doc' || fmt === 'docx' || fmt === 'pptx' || fmt === 'pdf') setReaderView('layout');
           else setReaderView('text');
           setLayoutPage(0);
           setLayoutFocus(null);
@@ -7255,7 +7534,7 @@ window.__ModuleLoader__.load({
           uploadBusyRef.current = true;
           setUploadOutcome(null);
           setStatus(`正在导入 ${list.length} 个文件…`);
-          let done = 0;
+          let done = 0, converted = 0;
           let currentFile = '';
           try {
             for (const file of list) {
@@ -7264,11 +7543,12 @@ window.__ModuleLoader__.load({
               setUploadProgress({ ...progress, stage: '正在读取文件…' });
               const dataBase64 = await shelfModule.readFileBase64(file);
               // The response also waits for best-effort cover preparation.
-              setUploadProgress({ ...progress, stage: '正在保存文档并准备封面，请稍候…' });
-              await transport.uploadDocs(targetProject, '', [{ name: file.name, dataBase64 }]);
+              setUploadProgress({ ...progress, stage: /\.doc$/i.test(file.name) ? '正在转换为可修订的 Word 文档并准备封面…' : '正在保存文档并准备封面，请稍候…' });
+              const imported = await transport.uploadDocs(targetProject, '', [{ name: file.name, dataBase64 }]);
+              converted += (Array.isArray(imported) ? imported : imported?.entries || []).filter(entry => entry.convertedFrom === 'doc').length;
               done += 1;
             }
-            const message = `已导入 ${done} 个文件`;
+            const message = `已导入 ${done} 个文件${converted ? `，其中 ${converted} 个 DOC 已转换为可修订的 DOCX` : ''}`;
             setStatus(message);
             setUploadOutcome({ message, error: false });
           } catch (error) {
@@ -7364,6 +7644,21 @@ window.__ModuleLoader__.load({
           if (draftReference && rightOpen && rightTab === 'chat' && !chatBusy && chatInputRef.current) chatInputRef.current.focus();
         }, [draftReference, rightOpen, rightTab, chatBusy]);
 
+        React.useEffect(() => {
+          if (!chatBusy || !projectId || !docPath || typeof transport.contextStatus !== 'function' || !chatStartedRef.current) return undefined;
+          let alive = true, timer;
+          const started = chatStartedRef.current;
+          const poll = async () => {
+            try {
+              const state = await transport.contextStatus(projectId, docPath);
+              if (alive && Number(state?.at) >= started && ['reading', 'vision', 'ocr', 'ready'].includes(state.stage)) setChatProgress(state.message || '');
+            } catch { /* The original chat request reports any real failure. */ }
+            if (alive) timer = setTimeout(poll, 1000);
+          };
+          poll();
+          return () => { alive = false; clearTimeout(timer); };
+        }, [chatBusy, projectId, docPath, transport]);
+
         // ---- 新消息滚到底
         React.useEffect(() => {
           const el = chatListRef.current;
@@ -7397,6 +7692,8 @@ window.__ModuleLoader__.load({
             setDraft('');
             setDraftReference(null);
           }
+          chatStartedRef.current = Date.now();
+          setChatProgress('');
           setChatBusy(true);
           setChatKind(kind);
           setChatError('');
@@ -7435,6 +7732,7 @@ window.__ModuleLoader__.load({
           if (chatInFlightRef.current && chatInFlightRef.current.target === target) return;
           const request = ++chatRequestRef.current;
           chatInFlightRef.current = { target, request };
+          chatStartedRef.current = 0; setChatProgress('');
           setChatBusy(true);
           setChatError('');
           try {
@@ -7499,57 +7797,66 @@ window.__ModuleLoader__.load({
           const payload = extra?.request ? { ...extra.request } : { projectId, path: docPath, anchor, instruction, action: actionId };
           if (!extra?.request && typeof extra?.revised !== 'string') Object.assign(payload, chosenModel(chatModel));
           if (!extra?.request && doc && doc.format === 'docx') {
-            const source = sourceParts(doc).map(part => part.text).join('\n');
-            payload.expectedOriginal = source.slice(anchor.srcStart, anchor.srcEnd);
+            payload.expectedOriginal = wordAnchorText(doc, anchor);
             if (doc.meta?.documentHash) payload.expectedDocumentHash = doc.meta.documentHash;
           }
           if (extra && typeof extra.revised === 'string') payload.revised = extra.revised;
           const snapshot = captureRequest(payload);
           const target = `${snapshot.projectId}\u0000${snapshot.path}`;
-          if (generationRef.current?.target === target) return;
-          const operation = { target, snapshot };
-          generationRef.current = operation;
-          const isCurrent = () => generationRef.current === operation && generationTargetRef.current === target;
+          const range = snapshot.anchor || {};
+          const ranges = Array.isArray(range.segments) ? range.segments : [range];
+          const key = JSON.stringify([target, snapshot.action || actionId,
+            snapshot.expectedDocumentHash || doc?.meta?.documentHash, snapshot.expectedOriginal ?? wordAnchorText(doc, snapshot.anchor), ranges.map(part => [part.kind,
+            part.srcStart, part.srcEnd, part.blockId, part.sheet, part.cell, part.row, part.col])]);
+          if (Array.from(generationJobsRef.current.values()).some(job => job.key === key && job.state === 'running')) return;
+          const id = extra?.jobId || `generation-${++generationSequenceRef.current}`;
+          const operation = Object.freeze({ id, key, target, snapshot, state: 'running', replaceId: extra?.replaceId,
+            original: snapshot.expectedOriginal ?? wordAnchorText(doc, snapshot.anchor),
+            documentHash: snapshot.expectedDocumentHash || doc?.meta?.documentHash,
+            label: actionId === 'expand' ? '扩写' : actionId === 'manual' ? '修改' : '润色' });
+          updateGenerationJobs(previous => { const next = new Map(previous); next.set(id, operation); return next; });
+          const isCurrent = () => generationAliveRef.current && generationTargetRef.current === target
+            && store.projectId === snapshot.projectId && store.docPath === snapshot.path;
+          const finishJob = changes => updateGenerationJobs(previous => {
+            if (previous.get(id) !== operation) return previous;
+            const next = new Map(previous);
+            if (changes) next.set(id, Object.freeze({ ...operation, ...changes }));
+            else next.delete(id);
+            return next;
+          });
           let replaced = false;
-          setBusyAction(actionId || 'generate');
-          setStatus(extra?.replaceId ? '正在重新生成…' : '正在生成修订…');
-          setSelectionNotice('');
-          setNoChangeNotice('');
-          setGenerationError(null);
-          // 生成后让用户直接看到结果：展开右栏并切到「修订」标签。
-          setRightOpen(true);
-          setRightTab('revise');
+          if (isCurrent()) {
+            setStatus(extra?.replaceId ? '正在重新生成…' : '正在生成修订…');
+            setSelectionNotice(''); setNoChangeNotice('');
+            setRightOpen(true); setRightTab('revise');
+          }
           try {
             if (extra?.replaceId) {
               await store.delete(extra.replaceId, { optimistic: true });
               replaced = true;
             }
             const revision = await store.generate(snapshot);
-            if (!isCurrent()) return revision;
             if (revision?.unchanged) {
-              const message = `${actionId === 'expand' ? '扩写' : '润色'}结果与原文一致，内容无变化。`;
-              if (!extra?.batch) {
-                setNoChangeNotice(message);
-                setStatus(message);
-              }
+              const message = `${operation.label}结果与原文一致，内容无变化。`;
+              finishJob({ state: 'unchanged', message, replaceId: undefined });
+              if (isCurrent() && !extra?.batch) setStatus(message);
               return revision;
             }
-            const note = extra && extra.note ? `${extra.note} ` : '';
-            setStatus(`${note}${revision && revision.id ? `已生成修订 ${revision.id}` : '已生成修订'}`);
+            finishJob(null);
+            if (isCurrent()) {
+              const note = extra && extra.note ? `${extra.note} ` : '';
+              setStatus(`${note}${revision && revision.id ? `已生成修订 ${revision.id}` : '已生成修订'}`);
+            }
             return revision;
           } catch (error) {
-            if (!isCurrent()) return;
-            const message = `${extra?.replaceId ? '重新生成' : actionId === 'expand' ? '扩写' : '润色'}失败：${normalizeError(error)}`;
-            setStatus(message);
-            setGenerationError({ message, request: snapshot, replaceId: !replaced ? extra?.replaceId : undefined });
-          } finally {
-            if (isCurrent()) setBusyAction('');
-            if (generationRef.current === operation) generationRef.current = null;
+            const message = `${extra?.replaceId ? '重新生成' : operation.label}失败：${normalizeError(error)}`;
+            finishJob({ state: 'failed', message, replaceId: !replaced ? extra?.replaceId : undefined });
+            if (isCurrent()) setStatus(message);
           }
-        }, [store, projectId, docPath, doc, chatModel]);
+        }, [store, projectId, docPath, doc, chatModel, updateGenerationJobs]);
 
         const refreshDoc = React.useCallback(() => {
-          if (docPath) openDoc(docPath, { keepStatus: true });
+          if (docPath) return openDoc(docPath, { keepStatus: true });
         }, [docPath, openDoc]);
 
         const reloadDocument = async (automatic = false) => {
@@ -7598,83 +7905,86 @@ window.__ModuleLoader__.load({
         };
 
         const acceptRevision = React.useCallback(async (revision) => {
-          if (!revision) return;
-          setBusyAction(`rev:${revision.id}`);
+          if (!revision || writeBusyRef.current) return;
+          const target = `${store.projectId}\u0000${store.docPath}`;
+          const isCurrent = () => generationTargetRef.current === target && `${store.projectId}\u0000${store.docPath}` === target;
+          writeBusyRef.current = true; setBusyAction(`rev:${revision.id}`); setAcceptingRevisionId(revision.id);
+          setStatus(/\.docx$/i.test(revision.docPath || '') ? '正在核对版式并写回…' : '正在写回修订…');
+          setRevisionErrors(previous => { const next = new Map(previous); next.delete(revision.id); return next; });
           try {
-            const out = await store.accept(revision.id);
+            const out = await store.accept(revision.id, revision.layoutWarning?.token
+              ? { layoutRiskToken: revision.layoutWarning.token } : undefined);
+            if (!isCurrent()) return;
             const written = out && out.written;
-            setStatus(written && written.backup
-              ? `已接受并写回（${written.bytes || 0} 字节，备份：${written.backup}）`
-              : '已接受修订');
-            setPreviewEpoch((value) => value + 1);
-            refreshDoc();
+            setStatus(written?.layoutRiskAccepted
+              ? '已接受并写入修订，请点击文档标题右侧的 Office 图标，手动打开文档调整排版。'
+              : written && written.backup ? `已接受并写回（${written.bytes || 0} 字节，备份：${written.backup}）` : '已接受修订');
+            setPreviewEpoch(value => value + 1);
+            await Promise.all([refreshDoc(), store.load()]);
           } catch (error) {
-            setStatus(`接受失败：${normalizeError(error)}`);
+            if (!isCurrent()) return;
+            const message = normalizeError(error);
+            setStatus(`${error?.body?.revision?.layoutWarning ? '排版提示' : '接受失败'}：${message}`);
+            setRevisionErrors(previous => { const next = new Map(previous); next.set(revision.id, message); return next; });
           } finally {
-            setBusyAction('');
+            writeBusyRef.current = false; setBusyAction(''); setAcceptingRevisionId('');
           }
         }, [store, refreshDoc]);
 
         const rejectRevision = React.useCallback(async (revision) => {
           if (!revision) return;
-          setBusyAction(`rev:${revision.id}`);
+          const target = `${store.projectId}\u0000${store.docPath}`;
           try {
             await store.reject(revision.id);
-            setStatus('已撤回修订');
+            if (generationTargetRef.current === target) setStatus('已撤回修订');
           } catch (error) {
-            setStatus(`撤回失败：${normalizeError(error)}`);
-          } finally {
-            setBusyAction('');
+            if (generationTargetRef.current === target) setStatus(`撤回失败：${normalizeError(error)}`);
           }
         }, [store]);
 
         const deleteRevision = React.useCallback(async (revision) => {
           if (!revision) return;
-          setBusyAction(`rev:${revision.id}`);
+          const target = `${store.projectId}\u0000${store.docPath}`;
           try {
-            await store.delete(revision.id);
-            setStatus(revision.status === 'accepted' ? '已删除修订卡片，文档中已写入的修改保留。' : '已删除修订卡片');
+            await store.delete(revision.id, { optimistic: true });
+            if (generationTargetRef.current === target) setStatus(revision.status === 'accepted'
+              ? '已删除修订卡片，文档中已写入的修改保留。' : '已删除修订卡片');
           } catch (error) {
-            setStatus(`删除修订失败：${normalizeError(error)}`);
-          } finally { setBusyAction(''); }
+            if (generationTargetRef.current === target) setStatus(`删除修订失败：${normalizeError(error)}`);
+          }
         }, [store]);
 
         const restoreRevision = React.useCallback(async (revision) => {
-          if (!revision) return;
-          setBusyAction(`rev:${revision.id}`);
+          if (!revision || writeBusyRef.current) return;
+          const target = `${store.projectId}\u0000${store.docPath}`;
+          writeBusyRef.current = true; setBusyAction(`rev:${revision.id}`);
           try {
             await store.restore(revision.id);
+            if (generationTargetRef.current !== target) return;
             setStatus(revision.status === 'accepted' ? '已撤销写入并还原文件' : '已恢复为待处理');
-            setPreviewEpoch((value) => value + 1);
-            refreshDoc();
-            await store.load();
+            setPreviewEpoch(value => value + 1);
+            await Promise.all([refreshDoc(), store.load()]);
           } catch (error) {
-            setStatus(`恢复失败：${normalizeError(error)}`);
-          } finally {
-            setBusyAction('');
-          }
+            if (generationTargetRef.current === target) setStatus(`恢复失败：${normalizeError(error)}`);
+          } finally { writeBusyRef.current = false; setBusyAction(''); }
         }, [store, refreshDoc]);
 
         const restoreWriteGroup = React.useCallback(async (group) => {
-          const list = Array.isArray(group) ? group.filter((item) => item && item.id) : [];
-          if (list.length === 0) return;
-          setBusyAction(`rev:${list[0].id}`);
+          const list = Array.isArray(group) ? group.filter(item => item && item.id) : [];
+          if (!list.length || writeBusyRef.current) return;
+          const target = `${store.projectId}\u0000${store.docPath}`;
+          writeBusyRef.current = true; setBusyAction(`rev:${list[0].id}`);
           try {
-            const results = await store.bulk(list.map((item) => item.id), 'restore');
-            const failed = (results || []).filter((item) => item && item.ok === false);
-            if (failed.length > 0) {
-              setStatus(`整组撤回失败：${failed[0].error || ''}`);
-              return;
-            }
+            const results = await store.bulk(list.map(item => item.id), 'restore');
+            if (generationTargetRef.current !== target) return;
+            const failed = (results || []).filter(item => item && item.ok === false);
+            if (failed.length) { setStatus(`整组撤回失败：${failed[0].error || ''}`); return; }
             setStatus(`已撤回本次批量写入（${list.length} 条）`);
-            setPreviewEpoch((value) => value + 1);
-            refreshDoc();
-            await store.load();
+            setPreviewEpoch(value => value + 1);
+            await Promise.all([refreshDoc(), store.load()]);
           } catch (error) {
-            setStatus(`整组撤回失败：${normalizeError(error)}`);
-          } finally {
-            setBusyAction('');
-          }
+            if (generationTargetRef.current === target) setStatus(`整组撤回失败：${normalizeError(error)}`);
+          } finally { writeBusyRef.current = false; setBusyAction(''); }
         }, [store, refreshDoc]);
 
         const regenerate = React.useCallback(async (revision) => {
@@ -7693,15 +8003,21 @@ window.__ModuleLoader__.load({
         }, [generate, projectId, docPath, chatModel]);
 
         const acceptAll = React.useCallback(async () => {
+          if (writeBusyRef.current) return;
           if (groupRevisionVariants(store.all()).some(group => group.items.filter(item => item.status === 'pending').length > 1)) {
             setStatus('同一选区有多份扩写，请选择其中一份接受。');
             return;
           }
+          const target = `${store.projectId}\u0000${store.docPath}`;
+          writeBusyRef.current = true;
           setBusyAction('accept-all');
           setStatus('正在批量接受…');
           try {
             const results = await store.acceptAll();
+            if (generationTargetRef.current !== target) return;
             const failed = (results || []).filter((item) => item && item.ok === false);
+            if (failed.length) setRevisionErrors(previous => { const next = new Map(previous);
+              failed.forEach(item => next.set(item.revisionId, item.error || '接受失败')); return next; });
             const wrote = (results || []).some((item) => item && item.ok !== false);
             setStatus(failed.length > 0
               ? `接受完成，${failed.length} 条失败：${failed[0].error || ''}`
@@ -7709,9 +8025,9 @@ window.__ModuleLoader__.load({
             if (wrote) setPreviewEpoch((value) => value + 1);
             refreshDoc();
           } catch (error) {
-            setStatus(`批量接受失败：${normalizeError(error)}`);
+            if (generationTargetRef.current === target) setStatus(`批量接受失败：${normalizeError(error)}`);
           } finally {
-            setBusyAction('');
+            writeBusyRef.current = false; setBusyAction('');
           }
         }, [store, refreshDoc]);
 
@@ -7779,18 +8095,48 @@ window.__ModuleLoader__.load({
           if (!instruction) return;
           // 只读格式即使工具条漏了按钮，也不再打出「改写失败」。
           if (!revisionAllowed(doc)) return;
+          const isWordEdit = doc?.format === 'docx' && (actionId === 'polish' || actionId === 'expand');
+          if (isWordEdit && wordListMarker(hit.text)) {
+            setNoChangeNotice('选区只有列表标记，没有需要修改的正文。');
+            setStatus('已保留原列表标记，内容无变化。');
+            return;
+          }
           const anchor = hit.anchor || {};
           const hasRange = Number.isInteger(anchor.srcStart) && Number.isInteger(anchor.srcEnd);
           const parts = Array.isArray(hit.parts) ? hit.parts : [];
           const shapeNote = hit.matched === 'shape' ? '识别和原文不一致，已按整个文本框改写。' : '';
+          if (isWordEdit && (parts.length > 1 || Array.isArray(anchor.segments))) {
+            const allParts = parts.length ? parts : (anchor.segments || []).map(segment => ({ anchor: segment,
+              text: wordAnchorText(doc, segment) }));
+            if (!wordCompoundAnchor(doc, allParts)) {
+              cannotLocate(); return;
+            }
+            let firstBody = 0;
+            while (firstBody < allParts.length && wordListMarker(allParts[firstBody].text)) firstBody += 1;
+            const body = allParts.slice(firstBody), combined = wordCompoundAnchor(doc, body);
+            if (!combined || body.some(part => wordListMarker(part.text)) || !continuousWordAnchor(doc, combined)) {
+              const message = '选区中间有未选中的文字或列表标记，请连续选择一段正文后再修改。';
+              setSelectionNotice(message); setStatus(message); return;
+            }
+            // One model request sees the complete selected paragraph. Per-line
+            // rewriting could skip an unchanged first line and fragment the result.
+            generate(combined, instruction, actionId);
+            return;
+          }
           if (!hasRange && anchor.kind !== 'cell' && parts.length > 1) {
-            const ready = parts.filter((part) => (
+            const located = parts.filter((part) => (
               part && part.anchor && Number.isInteger(part.anchor.srcStart) && Number.isInteger(part.anchor.srcEnd)
             ));
-            if (ready.length === 0 || (doc && doc.format === 'docx' && ready.length < parts.length)) {
+            if (located.length === 0 || (doc && doc.format === 'docx' && located.length < parts.length)) {
               cannotLocate();
               return;
             }
+            const ready = located;
+            if (!ready.length) {
+              setNoChangeNotice('选区只有列表标记，没有需要修改的正文。');
+              setStatus('已保留原列表标记，内容无变化。');
+              return;
+            }
             (async () => {
               let unchanged = 0, changed = 0, failed = 0;
               for (let i = 0; i < ready.length; i += 1) {
@@ -7804,7 +8150,7 @@ window.__ModuleLoader__.load({
               if (unchanged) setNoChangeNotice(unchanged === ready.length
                 ? '所选内容与原文一致，内容无变化。' : `${unchanged} 段内容无变化，已跳过。`);
               setStatus([changed ? `已生成 ${changed} 段修订` : '', unchanged ? `${unchanged} 段内容无变化` : '',
-                failed ? `${failed} 段处理失败` : '', ready.length < parts.length ? `${parts.length - ready.length} 段对不上原文` : ''].filter(Boolean).join('；'));
+                failed ? `${failed} 段处理失败` : '', located.length < parts.length ? `${parts.length - located.length} 段对不上原文` : ''].filter(Boolean).join('；'));
             })();
             return;
           }
@@ -7940,6 +8286,28 @@ window.__ModuleLoader__.load({
               : treeNodes('', 0, treeCtx)),
         ]);
 
+        const convertLegacyWord = async () => {
+          if (legacyConvertRef.current || docBusy || busyAction || !projectId || !docPath) return;
+          const target = `${projectId}\u0000${docPath}`, operation = { target };
+          legacyConvertRef.current = operation; setLegacyConverting(true); setOfficeNotice(null);
+          setStatus('正在转换为可修订的 Word 文档…');
+          try {
+            const entry = await transport.convertWord(projectId, docPath);
+            if (!entry?.relPath) throw new Error('转换未返回可编辑的 Word 文件');
+            setShelfReloadKey(value => value + 1);
+            if (chatTargetRef.current === target) {
+              await openDoc(entry.relPath, { projectId });
+              setStatus(`已打开可修订副本 ${entry.name || entry.relPath}`);
+            }
+          } catch (error) {
+            if (chatTargetRef.current === target) {
+              setOfficeNotice({ message: normalizeError(error) }); setStatus(`转换失败：${normalizeError(error)}`);
+            }
+          } finally {
+            if (legacyConvertRef.current === operation) { legacyConvertRef.current = null; setLegacyConverting(false); }
+          }
+        };
+
         // ---- 渲染：中栏正文
         const center = h(DocReader, {
           key: 'center',
@@ -7947,6 +8315,7 @@ window.__ModuleLoader__.load({
           docBusy,
           docError,
           pendingByBlock,
+          visionRoute: chosenModel(chatModel),
           busyAction: busyAction || (chatBusy && chatKind === 'translate' ? 'translate' : ''),
           actions: SELECTION_ACTIONS,
           projectId,
@@ -7966,6 +8335,9 @@ window.__ModuleLoader__.load({
           onAction: runAction,
           previewEpoch,
           officeNotice,
+          onConvertWord: convertLegacyWord,
+          convertingWord: legacyConverting,
+          conversionDisabled: docBusy || Boolean(busyAction),
           onRefresh: reloadDocument,
           refreshDisabled: docBusy || Boolean(busyAction),
           onAccept: acceptRevision,
@@ -8045,7 +8417,7 @@ window.__ModuleLoader__.load({
               messageFooter(message),
             ])),
             chatBusy ? h('div', { key: 'thinking', className: P + 'Thinking', 'data-chat-thinking': '1' },
-              h(Processing, { kind: chatKind, text: chatKind === 'translate' ? '正在翻译…' : '思考中…' })) : null,
+              h(Processing, { kind: chatKind, text: chatProgress || (chatKind === 'translate' ? '正在翻译…' : '思考中…') })) : null,
           ),
           chatError ? h('div', { key: 'chatErr', className: P + 'Err', 'data-chat-error': '1' }, chatError) : null,
           h('div', { key: 'composer', className: P + 'Composer' }, [
@@ -8107,7 +8479,7 @@ window.__ModuleLoader__.load({
                 h('option', { key: 'default', value: '' }, chatModelsBusy ? '加载模型…' : `跟随 DSH${chatDefaultModel ? ` · ${chatDefaultModel.model}` : ''}`),
                 chatModel && !chatModels.some(item => JSON.stringify([item.provider, item.model]) === chatModel)
                   ? h('option', { key: 'unavailable', value: chatModel }, '所选模型暂不可用') : null,
-                ...chatModels.map(item => h('option', { key: JSON.stringify([item.provider, item.model]), value: JSON.stringify([item.provider, item.model]) }, `${item.label} · ${item.providerLabel}`)),
+                ...chatModels.map(item => h('option', { key: JSON.stringify([item.provider, item.model]), value: JSON.stringify([item.provider, item.model]) }, `${item.label} · ${item.providerLabel}${item.inputModalities?.includes('image') ? ' · 图片' : ''}`)),
               ]),
             ]),
             h('div', { key: 'hint', className: P + 'Hint' },
@@ -8123,7 +8495,11 @@ window.__ModuleLoader__.load({
           collapsed: collapsedRevisions.includes(item.id),
           onToggleCollapsed: id => setCollapsedRevisions(previous => previous.includes(id)
             ? previous.filter(value => value !== id) : previous.concat(id).slice(-500)),
-          busy: busyAction === 'polish' || busyAction === 'expand' || busyAction === `rev:${item.id}`,
+          busy: store.isBusy(`rev:${item.id}`),
+          writeBusy: Boolean(busyAction),
+          acceptError: revisionErrors.get(item.id),
+          progress: acceptingRevisionId === item.id ? h(Processing, { kind: 'accept',
+            text: /\.docx$/i.test(item.docPath || '') ? '正在核对版式并写回…' : '正在写回修订…' }) : null,
           writeGroup: (revision) => store.writeGroup(revision),
           onAccept: acceptRevision,
           onReject: rejectRevision,
@@ -8141,16 +8517,26 @@ window.__ModuleLoader__.load({
           store.loading ? h('div', { className: P + 'Hint' }, '加载修订中…') : null,
           store.error ? h('div', { className: P + 'Err' }, store.error) : null,
           noChangeNotice ? h('div', { className: P + 'NoChange', role: 'status', 'data-revision-unchanged': '1' }, noChangeNotice) : null,
-          generationError ? h('div', { className: P + 'GenerationError', role: 'alert', 'data-generation-error': '1' }, [
-            h('div', { key: 'message', className: P + 'Err' }, generationError.message),
-            h('button', { key: 'retry', type: 'button', className: P + 'Btn',
-              onClick: () => generate(generationError.request.anchor, generationError.request.instruction, generationError.request.action, {
-                request: generationError.request, replaceId: generationError.replaceId,
-              }) }, '重试'),
-          ]) : null,
-          busyAction === 'polish' || busyAction === 'expand'
-            ? h(Processing, { kind: busyAction, text: busyAction === 'expand' ? '正在扩写…' : '正在润色…' }) : null,
-          items.length === 0 && !store.loading && !noChangeNotice && !generationError && busyAction !== 'polish' && busyAction !== 'expand'
+          Array.from(generationJobs.values()).filter(job => job.target === generationTargetRef.current).reverse().map(job =>
+            h('div', { key: job.id, className: P + 'RevCard', 'data-generation-id': job.id,
+              'data-generation-state': job.state, 'data-generation-action': job.snapshot.action,
+              'data-generation-error': job.state === 'failed' ? '1' : undefined,
+              role: job.state === 'failed' ? 'alert' : 'status' }, [
+              h('div', { key: 'label', className: P + 'RevCollapse' }, `${job.label} · ${anchorLabel(job.snapshot.anchor)}`),
+              typeof job.original === 'string' ? h('div', { key: 'original', className: P + 'GenerationOriginal',
+                title: job.original }, job.original) : null,
+              job.state === 'running' ? h(Processing, { key: 'progress', kind: job.snapshot.action,
+                text: `正在${job.label}…` }) : null,
+              job.message ? h('div', { key: 'message', className: job.state === 'failed' ? P + 'Err' : P + 'NoChange',
+                'data-revision-unchanged': job.state === 'unchanged' ? '1' : undefined }, job.message) : null,
+              job.state === 'failed' ? h('button', { key: 'retry', type: 'button', className: P + 'Btn',
+                onClick: () => generate(job.snapshot.anchor, job.snapshot.instruction, job.snapshot.action,
+                  { request: job.snapshot, replaceId: job.replaceId, jobId: job.id }) }, '重试') : null,
+              job.state !== 'running' ? h('button', { key: 'dismiss', type: 'button', className: P + 'Btn',
+                onClick: () => updateGenerationJobs(previous => { const next = new Map(previous); next.delete(job.id); return next; }) }, '删除') : null,
+            ])),
+          items.length === 0 && !store.loading && !noChangeNotice
+            && !Array.from(generationJobs.values()).some(job => job.target === generationTargetRef.current)
             ? h('div', { className: P + 'Hint' }, revisionAllowed(doc)
               ? '选中正文后点「润色 / 扩写」生成修订；接受才会写回文件。'
               : '这份文档只能阅读，不能生成写回修订。')
@@ -8482,6 +8868,8 @@ window.__ModuleLoader__.load({
     .${P}NoChange{padding:12px;border:1px solid var(--dsw-alias-border-l1);border-radius:var(--dsw-radius-md,8px);
       background:var(--dsw-alias-bg-base);color:var(--dsw-alias-label-primary);font-size:13px;line-height:20px;margin-bottom:10px}
     .${P}GenerationError{padding:8px 10px;margin-bottom:10px}
+    .${P}GenerationOriginal{max-height:90px;overflow:auto;white-space:pre-wrap;word-break:break-word;font-size:12px;line-height:1.6;
+      color:var(--dsw-alias-label-secondary);padding:6px 10px}
     .${P}Processing{display:flex;align-items:center;gap:8px;padding:8px 10px;color:var(--dsw-alias-label-secondary);font-size:12px;flex:none}
     .${P}WhaleTail{width:20px;height:20px;contain:strict;flex:none;display:inline-flex;position:relative;overflow:hidden}
     .${P}WhaleAnimated{display:none;position:absolute;inset:0}
@@ -8691,8 +9079,18 @@ window.__ModuleLoader__.load({
     .${P}SlidePrev{left:12px}
     .${P}SlideNext{right:12px}
     .${P}SlideCount{position:absolute;left:50%;bottom:14px;transform:translateX(-50%);z-index:2;
-      color:#fff;background:rgba(0,0,0,.5);border-radius:999px;padding:2px 12px;font-size:12px;
+      color:#fff;background:rgba(0,0,0,.65);border-radius:12px;padding:5px 8px;font-size:12px;max-width:calc(100% - 24px);
       font-variant-numeric:tabular-nums}
+    .${P}SlideCountControls{display:flex;align-items:center;justify-content:center;gap:6px;white-space:nowrap}
+    .${P}SlidePageInput{box-sizing:border-box;width:54px;min-width:0;padding:3px 4px;border:1px solid rgba(255,255,255,.4);
+      border-radius:5px;background:rgba(255,255,255,.12);color:#fff;font:inherit;line-height:18px;text-align:center}
+    .${P}SlidePageInput:focus-visible{outline:2px solid #fff;outline-offset:1px}
+    .${P}SlidePageInput[aria-invalid="true"]{border-color:#ffaeae}
+    .${P}SlideJumpButton{padding:3px 7px;border:0;border-radius:5px;background:rgba(255,255,255,.18);color:#fff;
+      font:inherit;line-height:20px;cursor:pointer}
+    .${P}SlideJumpButton:hover:not(:disabled){background:rgba(255,255,255,.3)}
+    .${P}SlidePageInput:disabled,.${P}SlideJumpButton:disabled{opacity:.5;cursor:default}
+    .${P}SlideJumpError{margin-top:4px;max-width:240px;white-space:normal;line-height:18px;color:#ffcdcd;text-align:center}
     .${P}ViewBar .${P}Hint{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0}
     .${P}SelectionNotice{flex:none;padding:10px 12px;font-size:13px;line-height:1.6;
       color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-2);border-bottom:1px solid var(--dsw-alias-border-l1)}
@@ -8762,6 +9160,12 @@ window.__ModuleLoader__.load({
       exports.bindWordLayoutLines = bindWordLayoutLines;
       exports.wordNativeSelection = wordNativeSelection;
       exports.wordBoxSelection = wordBoxSelection;
+      exports.wordCompoundAnchor = wordCompoundAnchor;
+      exports.wordAnchorText = wordAnchorText;
+      exports.continuousWordAnchor = continuousWordAnchor;
+      exports.wordListMarker = wordListMarker;
+      exports.captureRequest = captureRequest;
+      exports.groupRevisionVariants = groupRevisionVariants;
       exports.rectangleSpans = rectangleSpans;
       exports.placeByShapes = placeByShapes;
       exports.mapOffsetToSrc = mapOffsetToSrc;
@@ -9155,7 +9559,13 @@ window.__ModuleLoader__.load({
         const p = props || {};
         const cover = normalizeCover(p.cover, p.relPath, p.format);
         const [failed, setFailed] = React.useState(false);
+        const [loaded, setLoaded] = React.useState(false);
         const [naturalShape, setNaturalShape] = React.useState(null);
+        React.useEffect(() => {
+          setFailed(false);
+          setLoaded(false);
+          setNaturalShape(null);
+        }, [cover.imageUrl, cover.relPath]);
         // 形状优先级：父级/显式给的 > 图片实际尺寸测出来的 > 按 cover.width/height 推断 > 竖版。
         // 即使图片失败回落生成封面也保持同一卡片形状，避免书架在 <img> 出错时跳版（§17.3.1）。
         const controlled = p.shape && p.shape.key ? p.shape : null;
@@ -9173,6 +9583,7 @@ window.__ModuleLoader__.load({
             setFailed(true);
             return;
           }
+          setLoaded(true);
           const next = shapeFor({ width: w, height: hgt });
           if (next.key === shape.key) return;
           if (controlled) {
@@ -9190,10 +9601,13 @@ window.__ModuleLoader__.load({
             'data-cover-kind': 'page',
             'data-cover-shape': shape.key,
             'data-cover-src': cover.imageUrl,
+            'aria-busy': !loaded,
           }, [
+            !loaded ? h(CoverArt, { key: 'placeholder', cover, shape, size: width,
+              className: P + 'CoverPlaceholder', relPath: cover.relPath, format: cover.format }) : null,
             h('img', {
               key: 'img',
-              className: P + 'CoverImg',
+              className: cx(P + 'CoverImg', !loaded && P + 'CoverImgLoading'),
               src: cover.imageUrl,
               alt: cover.title,
               loading: 'lazy',
@@ -9856,8 +10270,10 @@ window.__ModuleLoader__.load({
     .${P}Book_landscape .${P}Cover{box-shadow:0 6px 18px rgba(0,0,0,.28)}
     .${P}Book_square .${P}Cover{border-radius:8px}
     .${P}CoverPage{background:var(--dsw-alias-bg-layer-2)}
-    .${P}CoverImg{display:block;width:100%;height:100%;object-fit:cover;object-position:top center;
+    .${P}CoverPlaceholder{position:absolute;inset:0;box-shadow:none}
+    .${P}CoverImg{position:absolute;inset:0;display:block;width:100%;height:100%;object-fit:cover;object-position:top center;
       background:var(--dsw-alias-bg-layer-2)}
+    .${P}CoverImgLoading{opacity:0}
     .${P}PageFade{position:absolute;left:0;right:0;bottom:0;height:26%;pointer-events:none;
       background:linear-gradient(to top,rgba(0,0,0,.28),rgba(0,0,0,0))}
     .${P}PageBadge{position:absolute;left:8px;bottom:8px;background:rgba(0,0,0,.42);color:#fff;