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

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 ''
@@ -524,8 +562,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 +601,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 +624,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 +643,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/protocol.js

@@ -129,6 +129,11 @@ export function makeUserMessage(text, messageId = `knowledge-map-${Date.now()}`)
   return {
     id: messageId,
     role: 'user',
-    content: [{ type: 'text', text: String(text || '') }]
+    content: [{ type: 'text', text: String(text || '') }],
+    source: {
+      kind: 'plugin',
+      plugin: '@p-dsh-market/conversation-knowledge-map',
+      form: 'generation'
+    }
   }
 }

package/package.json

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