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

package/lib/generation-orchestrator.js

@@ -474,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 })
@@ -488,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
           })
@@ -505,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')
@@ -518,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)
@@ -532,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,

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.6",
+  "version": "0.1.7",
   "description": "DSH 多对话思维导图与静态知识图谱",
   "keywords": [
     "dsh",