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

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 对象。')
@@ -198,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}`,
@@ -493,16 +503,25 @@ export class KnowledgeGenerationOrchestrator {
         })
         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,
@@ -581,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.8",
+  "version": "0.1.9",
   "description": "DSH 多对话思维导图与静态知识图谱",
   "keywords": [
     "dsh",