dsh-doc-assistant 0.1.14 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-doc-assistant",
-  "version": "0.1.14",
+  "version": "0.1.18",
   "author": "stone086",
   "private": false,
   "description": "企业文档助手 (Enterprise Document Assistant) — a DSH plugin that turns the harness into a document workbench: project-scoped document library, an e-reader style three-column page (tree | document | AI chat), selection-to-ask, and AI rewrite shown as tracked-change revisions with accept/revert.",
@@ -24,9 +24,9 @@
   "scripts": {
     "build": "node dev/build-client.mjs",
     "test": "node dev/harness.mjs && npm run test:regression",
-    "test:regression": "node --test dev/review-regression.mjs dev/review-tool-regression.mjs dev/runtime-regression.mjs dev/word-selection-regression.mjs dev/expansion-regression.mjs dev/chat-revision-regression.mjs dev/office-editor-regression.mjs dev/document-watch-regression.mjs",
+    "test:regression": "node --test dev/review-regression.mjs dev/review-tool-regression.mjs dev/runtime-regression.mjs dev/word-selection-regression.mjs dev/expansion-regression.mjs dev/chat-revision-regression.mjs dev/office-editor-regression.mjs dev/document-watch-regression.mjs dev/ocr-regression.mjs dev/cover-regression.mjs dev/visual-context-regression.mjs dev/revision-boundary-regression.mjs dev/word-multipart-regression.mjs dev/compound-word-api-regression.mjs dev/legacy-word-regression.mjs dev/revision-rebase-regression.mjs dev/parallel-generation-host-regression.mjs dev/word-layout-regression.mjs dev/layout-warning-regression.mjs",
     "test:render": "node dev/render-test.mjs",
-    "test:ui": "node dev/review-ui-regression.mjs && node dev/spike-reader-e2e.mjs && node dev/spike-reader.mjs && node dev/interaction-regression.mjs && node dev/drag-regression.mjs && node dev/spike-library-render.mjs",
+    "test:ui": "node dev/review-ui-regression.mjs && node dev/spike-reader-e2e.mjs && node dev/spike-reader.mjs && node dev/interaction-regression.mjs && node dev/drag-regression.mjs && node dev/spike-library-render.mjs && node dev/image-reader-regression.mjs && node dev/ppt-navigation-regression.mjs && node dev/word-multipart-ui-regression.mjs && node dev/legacy-word-ui-regression.mjs && node dev/parallel-generation-ui-regression.mjs",
     "spike": "node dev/spike-client-view.mjs"
   },
   "keywords": [

package/src/client/20-api.js

@@ -239,6 +239,7 @@ __define('./api', (module, exports, require) => {
 
     /** 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') }),
@@ -281,6 +282,7 @@ __define('./api', (module, exports, require) => {
     /** 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) }),
 

package/src/client/40-revisions.js

@@ -289,7 +289,9 @@ __define('./revisions', (module, exports, require) => {
         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;
     }
@@ -375,6 +377,16 @@ __define('./revisions', (module, exports, require) => {
       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 });
       },
@@ -407,12 +419,13 @@ __define('./revisions', (module, exports, require) => {
         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 };
       },
 
@@ -558,6 +571,8 @@ __define('./revisions', (module, exports, require) => {
       this.listeners = [];
       this.lastWrite = null;
       this.seq = 0;
+      this.changeSeq = 0;
+      this.itemChanges = new Map();
     }
 
     subscribe(listener) {
@@ -617,6 +632,7 @@ __define('./revisions', (module, exports, require) => {
       if (!changed) return this.all();
       this.seq += 1;
       this.items = [];
+      this.itemChanges = new Map();
       this.error = '';
       this.loading = false;
       this.emit();
@@ -633,11 +649,13 @@ __define('./revisions', (module, exports, require) => {
       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();
@@ -652,11 +670,14 @@ __define('./revisions', (module, exports, require) => {
 
     _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);
@@ -690,10 +711,12 @@ __define('./revisions', (module, exports, require) => {
       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);
@@ -702,15 +725,20 @@ __define('./revisions', (module, exports, require) => {
         }
         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);
@@ -724,9 +752,11 @@ __define('./revisions', (module, exports, require) => {
     }
 
     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 {
@@ -759,15 +789,17 @@ __define('./revisions', (module, exports, require) => {
      * （单条撤回会破坏共用快照的语义）。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 = [];
@@ -781,7 +813,7 @@ __define('./revisions', (module, exports, require) => {
             results.push({ revisionId: id, ok: false, error: normalizeError(inner) });
           }
         }
-        await this.load();
+        if (isCurrent()) await this.load();
         return results;
       }
     }
@@ -874,8 +906,13 @@ __define('./revisions', (module, exports, require) => {
     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;
 
@@ -905,18 +942,22 @@ __define('./revisions', (module, exports, require) => {
         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', {
@@ -924,11 +965,11 @@ __define('./revisions', (module, exports, require) => {
             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,
     ]);
@@ -1080,10 +1121,12 @@ __define('./revisions', (module, exports, require) => {
   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}
 `;

package/src/client/50-library.js

@@ -34,7 +34,7 @@ __define('./library', (module, exports, require) => {
   const DISPLAY_NAME = '企业文档助手';
 
   /** 客户端版本号，与 package.json 的 version 同步维护（`/state` 不回传版本时用它）。 */
-  const CLIENT_VERSION = '0.1.14';
+  const CLIENT_VERSION = '0.1.18';
 
   /** 设置窗口的分区。 */
   const SECTIONS = [