@p-dsh-market/conversation-knowledge-map 0.1.7 → 0.1.9

package/lib/client.js

@@ -268,9 +268,17 @@ window.__ModuleLoader__.load({
 
     function GenerationStrip(props) {
       var generation = props.store.generation
+      var progress = generation.progress || { percent: 0, current: 0, total: 0, label: '' }
+      var percent = Math.max(0, Math.min(100, Number(progress.percent) || 0))
       return React.createElement('div', { className: 'ckm-generation-strip', 'data-status': generation.status }, [
-        React.createElement('strong', { key: 'status' }, generation.message || generation.status),
-        generation.error ? React.createElement('span', { key: 'error' }, generation.error) : null,
+        React.createElement('div', { key: 'body', className: 'ckm-generation-body' }, [
+          React.createElement('div', { key: 'status-row', className: 'ckm-generation-status-row' }, [
+            React.createElement('strong', { key: 'status' }, generation.message || generation.status),
+            React.createElement('span', { key: 'detail' }, progress.total ? (progress.current + '/' + progress.total + ' 个对话 · ' + progress.label) : progress.label)
+          ]),
+          React.createElement('div', { key: 'progress', className: 'ckm-progress-track', role: 'progressbar', 'aria-valuemin': 0, 'aria-valuemax': 100, 'aria-valuenow': percent, 'aria-label': '知识视图生成进度' }, React.createElement('span', { className: 'ckm-progress-value', style: { width: percent + '%' } }))
+        ]),
+        generation.error ? React.createElement('span', { key: 'error', className: 'ckm-generation-error' }, generation.error) : null,
         ['failed', 'cancelled'].includes(generation.status) ? null : Button({ key: 'cancel', className: 'ckm-danger', onClick: function () { request('/generations/' + encodeURIComponent(generation.id) + '/cancel', { method: 'POST' }).then(function (body) { applyGeneration(props.store, body.generation) }).catch(function (error) { props.store.error = error.message; notifyStore(props.store) }) } }, '取消')
       ])
     }
@@ -563,7 +571,7 @@ window.__ModuleLoader__.load({
       '.ckm-page-header h2{margin:0;font-size:16px}.ckm-page-header p{margin:3px 0 0;color:var(--dsw-alias-label-secondary);font-size:11px;word-break:break-all}' +
       '.ckm-page-actions,.ckm-modal-actions{display:flex;align-items:center;gap:8px}.ckm-tab,.ckm-secondary,.ckm-primary,.ckm-danger,.ckm-header-action{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:7px 11px;background:transparent;color:var(--dsw-alias-label-primary);cursor:pointer;font:inherit;font-size:12px}.ckm-tab[data-active=true],.ckm-primary{border-color:var(--dsw-alias-button-info-fill);background:var(--dsw-alias-button-info-fill);color:var(--dsw-alias-label-primary-foreground)}.ckm-tab:hover,.ckm-secondary:hover,.ckm-header-action:hover{background:var(--dsw-alias-interactive-bg-hover)}.ckm-primary:hover{background:var(--dsw-alias-button-info-hover)}.ckm-danger{border-color:#d36b6b;color:#ffb7b7}.ckm-danger:hover{background:#d94a4a22}.ckm-page button:disabled,.ckm-modal button:disabled{opacity:.5;cursor:not-allowed}' +
       '.ckm-empty{display:flex;flex:1;min-height:260px;flex-direction:column;align-items:center;justify-content:center;padding:28px;text-align:center}.ckm-empty-icon{display:grid;place-items:center;width:44px;height:44px;margin-bottom:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;color:var(--dsw-alias-state-business-primary);font-size:24px}.ckm-empty h2{margin:0 0 8px;font-size:17px}.ckm-empty p{max-width:520px;margin:0;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.7}' +
-      '.ckm-generation-strip{display:flex;align-items:center;gap:12px;padding:9px 20px;border-bottom:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-state-business-tertiary);font-size:12px}.ckm-generation-strip span{color:var(--dsw-alias-label-secondary)}.ckm-generation-strip .ckm-danger{margin-left:auto}' +
+      '.ckm-generation-strip{display:flex;align-items:center;gap:12px;padding:10px 20px;border-bottom:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-state-business-tertiary);font-size:12px}.ckm-generation-body{display:grid;gap:7px;flex:1;min-width:0}.ckm-generation-status-row{display:flex;justify-content:space-between;gap:12px}.ckm-generation-status-row span{color:var(--dsw-alias-label-secondary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ckm-progress-track{height:6px;overflow:hidden;border-radius:999px;background:var(--dsw-alias-bg-layer-1)}.ckm-progress-value{display:block;height:100%;border-radius:inherit;background:var(--dsw-alias-state-business-primary);transition:width .25s ease}.ckm-generation-error{color:#ff9898;max-width:38%;overflow-wrap:anywhere}.ckm-generation-strip .ckm-danger{margin-left:auto}' +
       '.ckm-workspace{display:grid;grid-template-columns:minmax(0,1fr) 330px;min-height:0;flex:1}.ckm-mind-canvas,.ckm-graph-canvas{min-width:0;min-height:0;overflow:auto;padding:20px;background:var(--dsw-alias-bg-base)}.ckm-detail{min-width:0;min-height:0;overflow:auto;padding:20px;border-left:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1)}.ckm-panel-hint{margin:0 0 14px;color:var(--dsw-alias-label-secondary);font-size:11px;line-height:1.6}.ckm-tree{display:flex;flex-direction:column;gap:8px;max-width:900px;margin:0 auto}.ckm-tree-node{display:flex;flex-direction:column;align-items:flex-start;gap:5px;width:calc(100% - 0px);padding:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);text-align:left;cursor:pointer}.ckm-tree-node[data-active=true]{border-color:var(--dsw-alias-state-business-primary);background:var(--dsw-alias-state-business-tertiary)}.ckm-tree-node:hover{background:var(--dsw-alias-interactive-bg-hover)}.ckm-tree-node strong{font-size:13px}.ckm-tree-node span:last-child{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.65}.ckm-node-type{display:inline-block;color:var(--dsw-alias-state-business-primary);font-size:10px;letter-spacing:.04em;text-transform:uppercase}.ckm-detail-head{display:flex;flex-direction:column;gap:5px}.ckm-detail h3{margin:0;font-size:16px;line-height:1.45}.ckm-narrative{font-size:13px;line-height:1.8}.ckm-source-box{margin:16px 0;padding:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:9px;background:var(--dsw-alias-bg-base);font-size:11px;line-height:1.6}.ckm-source-box strong{display:block;margin-bottom:5px}.ckm-source-box ul{margin:0;padding-left:18px;color:var(--dsw-alias-label-secondary)}.ckm-detail-empty{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.7}' +
       '.ckm-graph-layout{grid-template-columns:minmax(0,1fr) 330px}.ckm-graph-toolbar{display:flex;gap:8px}.ckm-model-selectors{display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1.4fr);gap:8px}.ckm-graph-toolbar input,.ckm-graph-toolbar select,.ckm-field textarea,.ckm-field select,.ckm-field input,.ckm-modal textarea,.ckm-modal select{box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:8px 9px;background:var(--dsw-specific-input-major);color:var(--dsw-alias-label-primary);font:inherit;font-size:12px}.ckm-graph-toolbar input{flex:1}.ckm-graph-svg{display:block;width:100%;min-height:420px;margin-top:8px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-1)}.ckm-edge{stroke:var(--dsw-alias-border-l2);stroke-width:1.5}.ckm-graph-node{cursor:pointer}.ckm-graph-node circle{fill:var(--dsw-alias-state-business-tertiary);stroke:var(--dsw-alias-state-business-primary);stroke-width:1.5}.ckm-graph-node[data-active=true] circle{fill:var(--dsw-alias-button-info-fill);stroke:var(--dsw-alias-label-primary)}.ckm-graph-node text{fill:var(--dsw-alias-label-primary);font-size:11px}' +
       '.ckm-modal-backdrop{position:fixed;inset:0;z-index:120;display:flex;align-items:center;justify-content:center;padding:20px;background:rgba(0,0,0,.46)}.ckm-modal{width:min(680px,calc(100vw - 40px));max-height:min(760px,calc(100vh - 40px));overflow:auto;padding:22px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;box-shadow:0 18px 56px #0008}.ckm-modal h3{margin:0;font-size:17px}.ckm-modal p{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.65}.ckm-modal-head{display:flex;align-items:center;justify-content:space-between}.ckm-icon-close{border:0;background:transparent;color:var(--dsw-alias-label-secondary);font-size:20px;cursor:pointer}.ckm-workspace-label{padding:9px;border-radius:8px;background:var(--dsw-alias-bg-layer-1);word-break:break-all}.ckm-field{display:flex;flex-direction:column;gap:7px;margin:14px 0;color:var(--dsw-alias-label-secondary);font-size:12px}.ckm-field textarea{resize:vertical}.ckm-session-list{display:flex;max-height:220px;flex-direction:column;gap:5px;overflow:auto}.ckm-session-option{display:flex;align-items:flex-start;gap:8px;padding:8px;border:1px solid transparent;border-radius:8px;background:var(--dsw-alias-bg-layer-1);cursor:pointer}.ckm-session-option:hover{border-color:var(--dsw-alias-border-l2)}.ckm-session-option input,.ckm-inline-field input{margin-top:3px}.ckm-session-option span{display:flex;flex-direction:column;gap:3px}.ckm-session-option small{color:var(--dsw-alias-label-secondary);font-size:10px}.ckm-inline-field{display:flex;align-items:flex-start;gap:7px;margin:10px 0;color:var(--dsw-alias-label-secondary);font-size:11px;line-height:1.5}.ckm-confirm-summary{display:grid;grid-template-columns:100px 1fr;gap:7px 12px;margin:18px 0;font-size:12px}.ckm-confirm-summary dt{color:var(--dsw-alias-label-secondary)}.ckm-confirm-summary dd{margin:0;word-break:break-all}.ckm-warning{padding:10px;border-radius:8px;background:#d29c2518;color:var(--dsw-alias-label-secondary)}.ckm-error{color:#ff9898!important}.ckm-modal-actions{justify-content:flex-end;margin-top:18px}.ckm-header-pending{border-color:var(--dsw-alias-state-business-primary);background:var(--dsw-alias-state-business-tertiary)}' +

package/lib/generation-orchestrator.js

@@ -68,7 +68,16 @@ function textFromContent(value) {
   return ''
 }
 
-function findJsonObject(text) {
+function expectedObject(value, kind = '') {
+  if (!kind) return true
+  if (kind === 'summary') return typeof value?.summary === 'string' || typeof value?.narrative === 'string' || typeof value?.text === 'string'
+  if (kind === 'mind-map') return Array.isArray(value?.nodes)
+  if (kind === 'knowledge-graph') return Array.isArray(value?.entities) && Array.isArray(value?.relations)
+  if (kind === 'follow-up') return typeof value?.question === 'string'
+  return true
+}
+
+function findJsonObject(text, kind = '') {
   const candidates = []
   const fenced = String(text || '').match(/```(?:json)?\s*([\s\S]*?)```/i)
   if (fenced) candidates.push(fenced[1])
@@ -98,7 +107,7 @@ function findJsonObject(text) {
             const fragment = candidate.slice(start, index + 1)
             try {
               const parsed = JSON.parse(fragment)
-              if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) return parsed
+              if (parsed && typeof parsed === 'object' && !Array.isArray(parsed) && expectedObject(parsed, kind)) return parsed
             } catch {
               // Try the next opening brace in case prose contained an example.
             }
@@ -111,11 +120,11 @@ function findJsonObject(text) {
   return null
 }
 
-export function parseStructuredOutput(value) {
+export function parseStructuredOutput(value, kind = '') {
   const object = asObject(value)
-  if (object) return object
+  if (object && expectedObject(object, kind)) return object
   const text = textFromContent(value).replace(/^\uFEFF/, '').trim()
-  const parsed = findJsonObject(text)
+  const parsed = findJsonObject(text, kind)
   if (parsed) return parsed
   if (!text) throw new Error('模型没有返回 JSON 对象。')
   throw new Error('模型返回了文本，但其中没有可解析的 JSON 对象。')
@@ -178,6 +187,7 @@ function outputPrompt(kind, summaries, prompt, strict) {
   if (kind === 'mind-map') {
     return [
       '请根据以下多个对话摘要生成阶段性思维导图。节点不是关键词，narrative 必须是至少一段完整说明，包含背景、当前认识和下一步/未决点。',
+      '最多生成 12 个节点；每个 narrative 控制在 300 字以内。不要输出 schema 之外的字段。确保最终内容是可被 JSON.parse 直接解析的完整 JSON。',
       'JSON 形状：{"rootId":"...","nodes":[{"id":"...","parentId":null,"type":"theme|stage|question|decision|solution|risk|conclusion","title":"...","narrative":"...","primarySourceSessionId":"...","sourceRefs":[{"sessionId":"...","eventSeqs":[1]}],"openQuestions":[]}]}。',
       ...rules,
       `额外要求：${shortText(prompt, 2000) || '没有额外要求。'}`,
@@ -197,6 +207,7 @@ function summaryPrompt(source, chunk, strict) {
   return [
     '请把一段 DSH 对话整理成带来源的结构化摘要。不要复述完整聊天，不要添加对话中没有的事实。',
     '只输出 JSON：{"summary":"完整阶段性说明","keyPoints":["..."],"sourceRefs":[{"sessionId":"...","eventSeqs":[1]}]}。',
+    'summary 控制在 1200 字以内；keyPoints 最多 8 条，每条不超过 160 字。不要增加其他字段。字符串中的双引号必须正确转义，确保整个输出可以被 JSON.parse 直接解析。',
     strict ? '严格模式：每个关键点都要能回指给定事件。' : '允许标记尚未确认的冲突，但不能编造事件序号。',
     `Session：${source.sessionId}`,
     `标题：${source.title}`,
@@ -397,6 +408,7 @@ export class KnowledgeGenerationOrchestrator {
       createdAt: task.createdAt,
       updatedAt: task.updatedAt,
       revision: task.revision || 0,
+      progress: task.progress ? clone(task.progress) : null,
       result: task.result ? clone(task.result) : null,
       events: task.events.slice(-40)
     }
@@ -437,6 +449,7 @@ export class KnowledgeGenerationOrchestrator {
       message: phaseMessage('created'),
       error: '',
       result: null,
+      progress: { percent: 0, current: 0, total: Array.isArray(request.selectedSessionIds) ? request.selectedSessionIds.length : 0, label: '准备生成' },
       revision: 0,
       createdAt: this.now(),
       updatedAt: this.now(),
@@ -470,7 +483,7 @@ export class KnowledgeGenerationOrchestrator {
 
   async run(task, request) {
     try {
-      this.update(task, 'reading-sources')
+      this.update(task, 'reading-sources', { progress: { percent: 5, current: 0, total: request.selectedSessionIds.length, label: '读取对话记录' } })
       const sources = await this.sourceReader({ sessionQuery: this.sessionQuery, sessions: this.sessions }, {
         cwd: request.cwd,
         sessionIds: request.selectedSessionIds,
@@ -480,41 +493,68 @@ export class KnowledgeGenerationOrchestrator {
       const sourceSessionIds = [...new Set(sources.map((source) => source.sessionId))]
       this.assertNotCancelled(task)
       logMessage(this.logger, 'info', 'generation sources loaded id=%s sources=%d events=%d', logId(task.id), sources.length, sources.reduce((total, source) => total + (Array.isArray(source.events) ? source.events.length : 0), 0))
-      this.update(task, 'summarizing', { sourceCount: sources.length })
+      this.update(task, 'summarizing', { sourceCount: sources.length, progress: { percent: 10, current: 0, total: sources.length, label: '准备整理对话' } })
       const summaries = []
-      for (const source of sources) {
+      for (let sourceIndex = 0; sourceIndex < sources.length; sourceIndex += 1) {
+        const source = sources[sourceIndex]
+        this.update(task, 'summarizing', {
+          sourceCount: sources.length,
+          progress: { percent: 10 + Math.floor(60 * sourceIndex / sources.length), current: sourceIndex, total: sources.length, label: source.title }
+        })
         for (const chunk of chunkSourceText(source)) {
           this.assertNotCancelled(task)
-          const value = await this.runModel({
-            kind: 'summary',
-            prompt: summaryPrompt(source, chunk, request.strict === true),
-            cwd: request.cwd,
-            strict: request.strict === true,
-            selectedSessionIds: sourceSessionIds,
-            model: request.model,
-            signal: task.controller.signal
+          const prompt = summaryPrompt(source, chunk, request.strict === true)
+          const generateSummary = async (summaryInput) => this.runModel({
+            kind: 'summary', prompt: summaryInput, cwd: request.cwd, strict: request.strict === true,
+            selectedSessionIds: sourceSessionIds, model: request.model, signal: task.controller.signal
           })
-          summaries.push(normalizeSummary(value, source, chunk))
+          try {
+            const value = await generateSummary(prompt)
+            summaries.push(normalizeSummary(value, source, chunk))
+          } catch (error) {
+            this.assertNotCancelled(task)
+            logMessage(this.logger, 'warn', 'summary first attempt invalid id=%s session=%s error=%s', logId(task.id), logId(source.sessionId), errorMessage(error))
+            this.update(task, 'summarizing', {
+              message: `对话 ${sourceIndex + 1}/${sources.length} 摘要结构无效，正在自动修复…`,
+              progress: { percent: 10 + Math.floor(60 * sourceIndex / sources.length), current: sourceIndex, total: sources.length, label: `自动修复：${source.title}` }
+            })
+            const retryPrompt = `${prompt}\n\n上一次输出未通过校验：${shortText(errorMessage(error), 500)}。请从头重新整理，缩短内容，只输出严格合法的顶层摘要 JSON。`
+            const retryValue = await generateSummary(retryPrompt)
+            summaries.push(normalizeSummary(retryValue, source, chunk))
+          }
         }
+        this.update(task, 'summarizing', {
+          sourceCount: sources.length,
+          progress: { percent: 10 + Math.floor(60 * (sourceIndex + 1) / sources.length), current: sourceIndex + 1, total: sources.length, label: source.title }
+        })
       }
       this.assertNotCancelled(task)
       let mindMap = null
       let knowledgeGraph = null
       if (request.outputMode === 'mind-map' || request.outputMode === 'both') {
-        this.update(task, 'building-mind-map')
-        const value = await this.runModel({
-          kind: 'mind-map',
-          prompt: outputPrompt('mind-map', summaries, request.prompt, request.strict === true),
-          cwd: request.cwd,
-          strict: request.strict === true,
-          selectedSessionIds: sourceSessionIds,
-          model: request.model,
-          signal: task.controller.signal
+        this.update(task, 'building-mind-map', { progress: { percent: 78, current: sources.length, total: sources.length, label: '生成思维导图' } })
+        const mindMapPrompt = outputPrompt('mind-map', summaries, request.prompt, request.strict === true)
+        const generateMindMap = async (prompt) => this.runModel({
+          kind: 'mind-map', prompt, cwd: request.cwd, strict: request.strict === true,
+          selectedSessionIds: sourceSessionIds, model: request.model, signal: task.controller.signal
         })
-        mindMap = validateMindMap(value, { selectedSessionIds: sourceSessionIds, strict: request.strict === true })
+        try {
+          const value = await generateMindMap(mindMapPrompt)
+          mindMap = validateMindMap(value, { selectedSessionIds: sourceSessionIds, strict: request.strict === true })
+        } catch (error) {
+          this.assertNotCancelled(task)
+          logMessage(this.logger, 'warn', 'mind map first attempt invalid id=%s error=%s', logId(task.id), errorMessage(error))
+          this.update(task, 'building-mind-map', {
+            message: '首次结构无效，正在自动修复思维导图…',
+            progress: { percent: 82, current: sources.length, total: sources.length, label: '自动修复结构' }
+          })
+          const retryPrompt = `${mindMapPrompt}\n\n上一次输出未通过校验：${shortText(errorMessage(error), 500)}。请从头重新生成，不要复用上一次文本；只输出完整、严格合法的 JSON。`
+          const retryValue = await generateMindMap(retryPrompt)
+          mindMap = validateMindMap(retryValue, { selectedSessionIds: sourceSessionIds, strict: request.strict === true })
+        }
       }
       if (request.outputMode === 'knowledge-graph' || request.outputMode === 'both') {
-        this.update(task, 'building-knowledge-graph')
+        this.update(task, 'building-knowledge-graph', { progress: { percent: 86, current: sources.length, total: sources.length, label: '生成知识图谱' } })
         const value = await this.runModel({
           kind: 'knowledge-graph',
           prompt: outputPrompt('knowledge-graph', summaries, request.prompt, request.strict === true),
@@ -528,8 +568,8 @@ export class KnowledgeGenerationOrchestrator {
       }
       assertOutputSourceRefs({ mindMap, knowledgeGraph }, sources)
       this.assertNotCancelled(task)
-      this.update(task, 'validating')
-      this.update(task, 'saving')
+      this.update(task, 'validating', { progress: { percent: 92, current: sources.length, total: sources.length, label: '校验结构和来源' } })
+      this.update(task, 'saving', { progress: { percent: 97, current: sources.length, total: sources.length, label: '保存知识视图' } })
       const saved = await this.storage.saveBundle({
         cwd: request.cwd,
         expectedRevision: request.expectedRevision,
@@ -545,7 +585,7 @@ export class KnowledgeGenerationOrchestrator {
       task.revision = saved.revision
       task.result = { revision: saved.revision, manifest: saved.manifest, mindMap, knowledgeGraph }
       logMessage(this.logger, 'info', 'generation completed id=%s revision=%d elapsedMs=%d', logId(task.id), saved.revision, this.now() - task.createdAt)
-      this.update(task, 'completed', { revision: saved.revision, result: task.result })
+      this.update(task, 'completed', { revision: saved.revision, result: task.result, progress: { percent: 100, current: sources.length, total: sources.length, label: '生成完成' } })
     } catch (error) {
       if (task.controller.signal.aborted || /取消|cancel/i.test(errorMessage(error))) {
         this.update(task, 'cancelled', { error: '' })
@@ -560,7 +600,7 @@ export class KnowledgeGenerationOrchestrator {
   async runModel(input) {
     const parseModelOutput = (value, source, diagnostics = {}) => {
       try {
-        const result = parseStructuredOutput(value)
+        const result = parseStructuredOutput(value, input.kind)
         logMessage(this.logger, 'info', 'agent output parsed kind=%s source=%s value=%s result=%s', input.kind, source, diagnosticSummary(value), diagnosticSummary(result))
         return result
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@p-dsh-market/conversation-knowledge-map",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "DSH 多对话思维导图与静态知识图谱",
   "keywords": [
     "dsh",