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

package/lib/generation-orchestrator.js

@@ -6,6 +6,8 @@ import { clone, diagnosticSummary, errorMessage, logMessage, makeUserMessage, sh
 import { chunkSourceText, readSelectedSurfaces } from './session-source.js'
 
 const MAX_SUMMARY_CHARS = 2400
+const SUMMARY_MAX_TOKENS = 8000
+const VIEW_MAX_TOKENS = 12000
 
 function modelLabel(selection) {
   const provider = String(selection?.provider || '').trim()
@@ -251,6 +253,19 @@ function agentTurnError(event) {
   return error
 }
 
+function agentTurnLimit(event) {
+  if (String(event?.type || '') !== 'turn/end') return null
+  const data = event?.data && typeof event.data === 'object' ? event.data : {}
+  const reason = data.reason && typeof data.reason === 'object' ? data.reason : null
+  if (reason?.kind !== 'max-tokens') return null
+  const error = new Error('模型输出达到最大 Token 限制，JSON 尚未完成。请减少所选对话数量或内容长度后重试。')
+  error.code = 'MAX_TOKENS'
+  error.agentTurn = true
+  error.tokenLimit = true
+  error.cause = reason
+  return error
+}
+
 function findAgentTurnError(surface) {
   const events = Array.isArray(surface?.events) ? surface.events : []
   for (let index = events.length - 1; index >= 0; index -= 1) {
@@ -260,6 +275,15 @@ function findAgentTurnError(surface) {
   return null
 }
 
+function findAgentTurnLimit(surface) {
+  const events = Array.isArray(surface?.events) ? surface.events : []
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    const error = agentTurnLimit(events[index])
+    if (error) return error
+  }
+  return null
+}
+
 function wrapAgentRuntimeError(error) {
   if (error?.agentTurn || /^Agent Runtime 生成失败/.test(errorMessage(error))) return error
   const wrapped = new Error(`Agent Runtime 生成失败：${errorMessage(error)}`)
@@ -286,6 +310,13 @@ async function readAgentText(sessionQuery, sessionId, signal, { logger, diagnost
       logMessage(logger, 'error', 'agent turn failure session=%s source=surface code=%s error=%s', logId(sessionId), surfaceError.code || '', errorMessage(surfaceError))
       throw surfaceError
     }
+    const surfaceLimit = findAgentTurnLimit(surface)
+    if (surfaceLimit && !stats.agentLimit) {
+      stats.agentLimit = surfaceLimit
+      stats.agentFailureSource = 'surface'
+      stats.agentFailureCode = surfaceLimit.code
+      logMessage(logger, 'warn', 'agent token limit session=%s source=surface error=%s', logId(sessionId), errorMessage(surfaceLimit))
+    }
     if (text.trim()) return text
     if (attempt < 5) await new Promise((resolve) => setTimeout(resolve, 40 * (attempt + 1)))
   }
@@ -305,6 +336,13 @@ async function readAgentText(sessionQuery, sessionId, signal, { logger, diagnost
       logMessage(logger, 'error', 'agent turn failure session=%s source=session code=%s error=%s', logId(sessionId), sessionError.code || '', errorMessage(sessionError))
       throw sessionError
     }
+    const sessionLimit = findAgentTurnLimit(log)
+    if (sessionLimit && !stats.agentLimit) {
+      stats.agentLimit = sessionLimit
+      stats.agentFailureSource = 'session'
+      stats.agentFailureCode = sessionLimit.code
+      logMessage(logger, 'warn', 'agent token limit session=%s source=session error=%s', logId(sessionId), errorMessage(sessionLimit))
+    }
     if (text.trim()) return text
   }
   return ''
@@ -436,8 +474,10 @@ export class KnowledgeGenerationOrchestrator {
       const sources = await this.sourceReader({ sessionQuery: this.sessionQuery, sessions: this.sessions }, {
         cwd: request.cwd,
         sessionIds: request.selectedSessionIds,
+        fallbackSessionId: request.anchorSessionId,
         includeSubagents: request.includeSubagents === true
       })
+      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 })
@@ -450,7 +490,7 @@ export class KnowledgeGenerationOrchestrator {
             prompt: summaryPrompt(source, chunk, request.strict === true),
             cwd: request.cwd,
             strict: request.strict === true,
-            selectedSessionIds: request.selectedSessionIds,
+            selectedSessionIds: sourceSessionIds,
             model: request.model,
             signal: task.controller.signal
           })
@@ -467,11 +507,11 @@ export class KnowledgeGenerationOrchestrator {
           prompt: outputPrompt('mind-map', summaries, request.prompt, request.strict === true),
           cwd: request.cwd,
           strict: request.strict === true,
-          selectedSessionIds: request.selectedSessionIds,
+          selectedSessionIds: sourceSessionIds,
           model: request.model,
           signal: task.controller.signal
         })
-        mindMap = validateMindMap(value, { selectedSessionIds: request.selectedSessionIds, strict: request.strict === true })
+        mindMap = validateMindMap(value, { selectedSessionIds: sourceSessionIds, strict: request.strict === true })
       }
       if (request.outputMode === 'knowledge-graph' || request.outputMode === 'both') {
         this.update(task, 'building-knowledge-graph')
@@ -480,11 +520,11 @@ export class KnowledgeGenerationOrchestrator {
           prompt: outputPrompt('knowledge-graph', summaries, request.prompt, request.strict === true),
           cwd: request.cwd,
           strict: request.strict === true,
-          selectedSessionIds: request.selectedSessionIds,
+          selectedSessionIds: sourceSessionIds,
           model: request.model,
           signal: task.controller.signal
         })
-        knowledgeGraph = validateKnowledgeGraph(value, { selectedSessionIds: request.selectedSessionIds, strict: request.strict === true })
+        knowledgeGraph = validateKnowledgeGraph(value, { selectedSessionIds: sourceSessionIds, strict: request.strict === true })
       }
       assertOutputSourceRefs({ mindMap, knowledgeGraph }, sources)
       this.assertNotCancelled(task)
@@ -494,7 +534,7 @@ export class KnowledgeGenerationOrchestrator {
         cwd: request.cwd,
         expectedRevision: request.expectedRevision,
         generationId: task.id,
-        sourceSessionIds: request.selectedSessionIds,
+        sourceSessionIds,
         prompt: request.prompt,
         strict: request.strict,
         outputMode: request.outputMode,
@@ -524,8 +564,9 @@ export class KnowledgeGenerationOrchestrator {
         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) {
-        logMessage(this.logger, 'error', 'agent output parse failed kind=%s source=%s value=%s diagnostics=%s error=%s', input.kind, source, diagnosticSummary(value), JSON.stringify(diagnostics), errorMessage(error))
-        throw error
+        const surfacedError = diagnostics.agentLimit || error
+        logMessage(this.logger, 'error', 'agent output parse failed kind=%s source=%s value=%s diagnostics=%s error=%s', input.kind, source, diagnosticSummary(value), JSON.stringify(diagnostics), errorMessage(surfacedError))
+        throw surfacedError
       }
     }
     if (typeof this.modelRunner === 'function') {
@@ -562,7 +603,8 @@ export class KnowledgeGenerationOrchestrator {
       lastSessionEventCount: 0,
       agentFailureSource: '',
       agentFailureCode: '',
-      agentFailure: null
+      agentFailure: null,
+      agentLimit: null
     }
     logMessage(this.logger, 'info', 'agent call start kind=%s session=%s provider=%s model=%s promptLength=%d', input.kind, logId(sessionId), provider, model, String(input.prompt || '').length)
     let unsubscribe
@@ -584,6 +626,13 @@ export class KnowledgeGenerationOrchestrator {
             diagnostics.agentFailureCode = failure.code || ''
             logMessage(this.logger, 'error', 'agent turn failure session=%s source=live-event code=%s error=%s', logId(sessionId), failure.code || '', errorMessage(failure))
           }
+          const limit = agentTurnLimit(event)
+          if (limit && !diagnostics.agentLimit) {
+            diagnostics.agentLimit = limit
+            diagnostics.agentFailureSource = 'live-event'
+            diagnostics.agentFailureCode = limit.code
+            logMessage(this.logger, 'warn', 'agent token limit session=%s source=live-event error=%s', logId(sessionId), errorMessage(limit))
+          }
         })
         logMessage(this.logger, 'info', 'agent event subscription ready session=%s', logId(sessionId))
       } catch (error) {
@@ -596,7 +645,7 @@ export class KnowledgeGenerationOrchestrator {
       handle = await this.agents.create({
         sessionId,
         meta: { cwd: input.cwd, origin: 'subagent' },
-        agentOptions: { provider, model, maxTokens: input.kind === 'summary' ? 2500 : 6000 },
+        agentOptions: { provider, model, maxTokens: input.kind === 'summary' ? SUMMARY_MAX_TOKENS : VIEW_MAX_TOKENS },
         signal: input.signal,
         setup: async (agentCtx) => {
           agentCtx?.systemPrompt?.section?.({

package/lib/session-source.js

@@ -112,8 +112,10 @@ function sourceSeqsOf(event) {
   return Array.isArray(value) ? value.filter((item) => Number.isInteger(item) && item >= 0) : []
 }
 
-export function surfaceEventView(event) {
+export function surfaceEventView(event, { fullSession = false } = {}) {
   const role = eventRole(String(event?.type || ''))
+  const data = event?.data?.message || event?.data || {}
+  if (fullSession && role === 'user' && data?.source?.kind !== 'user') return null
   const text = shortText(eventMessageText(event), 12000)
   if (!role || !text) return null
   return {
@@ -125,42 +127,76 @@ export function surfaceEventView(event) {
   }
 }
 
-export async function readSelectedSurfaces({ sessionQuery, sessions }, { cwd, sessionIds, includeSubagents = false }) {
+export async function readSelectedSurfaces({ sessionQuery, sessions }, { cwd, sessionIds, fallbackSessionId = '', includeSubagents = false }) {
   const selected = [...new Set((sessionIds || []).map((id) => String(id || '').trim()).filter(Boolean))]
   if (selected.length === 0) throw new Error('至少选择一个对话。')
   const normalizedCwd = normalizeWorkspacePath(cwd)
   if (!normalizedCwd) throw new Error('当前工作路径无效。')
+  const fallbackId = String(fallbackSessionId || '').trim()
+  const resolvedIds = [...new Set([...selected, ...(fallbackId ? [fallbackId] : [])])]
   const records = []
   if (typeof sessionQuery?.filterSessions === 'function') {
-    records.push(...await sessionQuery.filterSessions([{ kind: 'id', values: selected }]))
+    records.push(...await sessionQuery.filterSessions([{ kind: 'id', values: resolvedIds }]))
   } else if (typeof sessionQuery?.listSessions === 'function') {
     const all = await sessionQuery.listSessions()
-    records.push(...all.filter((record) => selected.includes(String(headerOf(record)?.id || ''))))
+    records.push(...all.filter((record) => resolvedIds.includes(String(headerOf(record)?.id || ''))))
   }
   const recordMap = new Map(records.map((record) => [String(headerOf(record)?.id || record?.id || ''), record]))
-  const sources = []
-  for (const id of selected) {
+  const readSource = async (id) => {
     const record = recordMap.get(id)
     const header = headerOf(record) || sessions?.get?.(id)?.header
     if (!header?.id) throw new Error(`所选对话不存在或已不可读：${id}`)
     if (!sameWorkspacePath(header.cwd, normalizedCwd)) throw new Error(`所选对话不属于当前工作路径：${id}`)
     if (!includeSubagents && header.origin === 'subagent') throw new Error(`不能选择子 Agent 对话：${id}`)
-    if (typeof sessionQuery?.readSurface !== 'function') throw new Error('当前 DSH Runtime 未提供 sessionQuery.readSurface。')
-    let surface
+    if (typeof sessionQuery?.readSurface !== 'function' && typeof sessionQuery?.readSession !== 'function') {
+      throw new Error('当前 DSH Runtime 未提供 sessionQuery.readSurface/readSession。')
+    }
+    let snapshot
+    let events = []
+    let surfaceError = null
     try {
-      surface = await sessionQuery.readSurface(id)
+      if (typeof sessionQuery?.readSurface === 'function') {
+        snapshot = await sessionQuery.readSurface(id)
+        events = (snapshot?.events || []).map((event) => surfaceEventView(event)).filter(Boolean)
+      }
     } catch (error) {
-      throw new Error(`读取对话“${id}”失败：${errorMessage(error)}`)
+      surfaceError = error
     }
-    const events = (surface?.events || []).map(surfaceEventView).filter(Boolean)
-    sources.push({
+    if (events.length === 0 && typeof sessionQuery?.readSession === 'function') {
+      try {
+        const full = await sessionQuery.readSession(id)
+        snapshot = full || snapshot
+        events = (full?.events || []).map((event) => surfaceEventView(event, { fullSession: true })).filter(Boolean)
+      } catch (error) {
+        if (surfaceError) throw new Error(`读取对话“${id}”失败：surface=${errorMessage(surfaceError)}；session=${errorMessage(error)}`)
+        throw new Error(`读取对话“${id}”完整记录失败：${errorMessage(error)}`)
+      }
+    }
+    if (surfaceError && events.length === 0) throw new Error(`读取对话“${id}”失败：${errorMessage(surfaceError)}`)
+    return {
       sessionId: id,
       title: `对话 ${id.slice(0, 8)}`,
-      cwd: normalizeWorkspacePath(surface?.session?.cwd || header.cwd),
-      capturedThroughSeq: Number.isInteger(surface?.capturedThroughSeq) ? surface.capturedThroughSeq : null,
+      cwd: normalizeWorkspacePath(snapshot?.session?.cwd || header.cwd),
+      capturedThroughSeq: Number.isInteger(snapshot?.capturedThroughSeq) ? snapshot.capturedThroughSeq : null,
       events,
       text: events.map((event) => `${event.role === 'user' ? '用户' : '助手'}：${event.text}`).join('\n\n')
-    })
+    }
+  }
+  const sources = []
+  let needsFallback = false
+  for (const id of selected) {
+    const source = await readSource(id)
+    if (source.events.length > 0) sources.push(source)
+    else needsFallback = true
+  }
+  if (needsFallback && fallbackId && !sources.some((source) => source.sessionId === fallbackId)) {
+    const fallback = await readSource(fallbackId)
+    if (fallback.events.length > 0) sources.push(fallback)
+  }
+  if (sources.length === 0) {
+    throw new Error(fallbackId
+      ? `所选对话及当前对话都没有可读取的用户/助手消息：${selected.join(', ')}`
+      : `所选对话没有可读取的用户/助手消息：${selected.join(', ')}`)
   }
   if (typeof sessionQuery?.readTitleSnapshots === 'function' && sources.length) {
     const results = await sessionQuery.readTitleSnapshots(sources.map((source) => source.sessionId))

package/package.json

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