@p-dsh-market/conversation-knowledge-map 0.1.0 → 0.1.2

package/README.md

@@ -9,6 +9,8 @@ DSH 的“知识视图”插件，把同一工作路径下用户明确选择的
 
 生成流程必须经过菜单栏配置和应用内确认。Host 会再次校验锚点 Session、`cwd`、选中 Session、revision 和固定保存目录；模型输出先通过图数据 Schema 校验，失败或取消不会替换旧结果。
 
+配置面板会列出运行时可用的 Provider / Model，并默认带入 DSH 默认模型；本次选择会绑定到确认令牌、Agent 调用和 `manifest.json`，不会因为默认模型变化而被静默替换。提交任务后配置对话框立即关闭，失败原因会显示在知识视图页的任务条中。
+
 节点“继续对话”只形成一个可编辑的后续问题。确认导航后，插件使用公开的 Session 导航入口；如果当前 Runtime 没有向该槽位暴露草稿镜像，则提供“打开并复制问题”的安全降级，不自动发送消息。
 
 ## 本地验证

package/cordis.patch.yml

@@ -1,4 +1,4 @@
 - insert:
     - id: p-dsh-market-conversation-knowledge-map
       name: '@p-dsh-market/conversation-knowledge-map'
-      inject: [agentDefaultModel, agents, sessionQuery, sessions, skills, webServer]
+      inject: [agentDefaultModel, agents, llm, sessionQuery, sessions, skills, webServer]

package/lib/client.js

@@ -92,6 +92,7 @@ window.__ModuleLoader__.load({
           context: null,
           state: null,
           sessions: [],
+          modelCatalog: null,
           generation: null,
           loading: false,
           loaded: false,
@@ -450,6 +451,15 @@ window.__ModuleLoader__.load({
       var includePair = React.useState(false)
       var includeSubagents = includePair[0]
       var setIncludeSubagents = includePair[1]
+      var modelCatalogPair = React.useState(null)
+      var modelCatalog = modelCatalogPair[0]
+      var setModelCatalog = modelCatalogPair[1]
+      var providerPair = React.useState('')
+      var modelProvider = providerPair[0]
+      var setModelProvider = providerPair[1]
+      var modelIdPair = React.useState('')
+      var modelId = modelIdPair[0]
+      var setModelId = modelIdPair[1]
       var confirmationPair = React.useState(null)
       var confirmation = confirmationPair[0]
       var setConfirmation = confirmationPair[1]
@@ -466,17 +476,30 @@ window.__ModuleLoader__.load({
           setSelected(function (old) { return old.length ? old.filter(function (id) { return (body.sessions || []).some(function (item) { return item.id === id }) }) : [store.sessionId] })
         }).catch(function (error) { setMessage(error.message || String(error)) })
       }, [store.context && store.context.cwd, includeSubagents])
+      React.useEffect(function () {
+        if (!store.context || !store.context.ready) return
+        request('/models').then(function (body) {
+          var catalog = body.catalog || { default: null, groups: [] }
+          setModelCatalog(catalog)
+          var defaultModel = catalog.default || {}
+          var firstGroup = catalog.groups && catalog.groups[0] ? catalog.groups[0] : {}
+          var firstModel = firstGroup.models && firstGroup.models[0] ? firstGroup.models[0].id : ''
+          setModelProvider(function (old) { return old || defaultModel.provider || firstGroup.id || '' })
+          setModelId(function (old) { return old || defaultModel.model || firstModel || '' })
+        }).catch(function (error) { setMessage(error.message || String(error)) })
+      }, [store.context && store.context.cwd])
       function toggle(id) { setSelected(function (old) { return old.indexOf(id) >= 0 ? old.filter(function (item) { return item !== id }) : old.concat([id]) }) }
       function confirm() {
         if (!selected.length) { setMessage('至少选择一个对话。'); return }
         setBusy(true)
-        request('/confirm', { method: 'POST', body: { anchorSessionId: store.sessionId, selectedSessionIds: selected, outputMode: mode, prompt: prompt, strict: strict, includeSubagents: includeSubagents, expectedRevision: store.state ? store.state.revision : 0 } }).then(function (body) { setConfirmation(body.confirmation); setMessage(''); setBusy(false) }).catch(function (error) { setMessage(error.message || String(error)); setBusy(false) })
+        request('/confirm', { method: 'POST', body: { anchorSessionId: store.sessionId, selectedSessionIds: selected, outputMode: mode, prompt: prompt, strict: strict, includeSubagents: includeSubagents, model: { provider: modelProvider, model: modelId }, expectedRevision: store.state ? store.state.revision : 0 } }).then(function (body) { setConfirmation(body.confirmation); setMessage(''); setBusy(false) }).catch(function (error) { setMessage(error.message || String(error)); setBusy(false) })
       }
       function start() {
         setBusy(true)
-        request('/generations', { method: 'POST', body: { token: confirmation.token, anchorSessionId: store.sessionId, selectedSessionIds: selected, outputMode: mode, prompt: prompt, strict: strict, includeSubagents: includeSubagents, expectedRevision: confirmation.revision } }).then(function (body) {
+        request('/generations', { method: 'POST', body: { token: confirmation.token, anchorSessionId: store.sessionId, selectedSessionIds: selected, outputMode: mode, prompt: prompt, strict: strict, includeSubagents: includeSubagents, model: confirmation.model, expectedRevision: confirmation.revision } }).then(function (body) {
           setConfirmation(null)
           setBusy(false)
+          setOverlayOpen(false)
           applyGeneration(store, body.generation)
           openGenerationStream(store, body.generation.id)
         }).catch(function (error) { setMessage(error.message || String(error)); setBusy(false) })
@@ -484,7 +507,7 @@ window.__ModuleLoader__.load({
       if (!store.context || !store.context.ready) return React.createElement('div', { className: 'ckm-modal-backdrop' }, React.createElement('div', { className: 'ckm-modal' }, [React.createElement('h3', { key: 'title' }, '知识视图'), React.createElement('p', { key: 'copy' }, '请先打开一个有明确工作路径的已有对话。'), Button({ key: 'close', className: 'ckm-primary', onClick: function () { setOverlayOpen(false) } }, '关闭')]))
       return React.createElement('div', { className: 'ckm-modal-backdrop' }, React.createElement('div', { className: 'ckm-modal ckm-config-modal', role: 'dialog', 'aria-modal': 'true' }, confirmation ? [
         React.createElement('h3', { key: 'title' }, '确认生成知识视图？'),
-        React.createElement('dl', { key: 'summary', className: 'ckm-confirm-summary' }, [React.createElement('dt', { key: 'cwd-label' }, '工作路径'), React.createElement('dd', { key: 'cwd' }, store.context.cwd), React.createElement('dt', { key: 'source-label' }, '来源'), React.createElement('dd', { key: 'sources' }, confirmation.selectedSessions.length + ' 个已选择对话'), React.createElement('dt', { key: 'output-label' }, '生成'), React.createElement('dd', { key: 'output' }, mode === 'both' ? '思维导图 + 知识图谱' : mode), React.createElement('dt', { key: 'strict-label' }, '约束'), React.createElement('dd', { key: 'strict' }, strict ? '严格约束已开启' : '普通约束'), React.createElement('dt', { key: 'save-label' }, '保存'), React.createElement('dd', { key: 'save' }, '.g-dsh-market-knowledge' + (confirmation.overwrite ? '（将替换已有结果）' : ''))]),
+        React.createElement('dl', { key: 'summary', className: 'ckm-confirm-summary' }, [React.createElement('dt', { key: 'cwd-label' }, '工作路径'), React.createElement('dd', { key: 'cwd' }, store.context.cwd), React.createElement('dt', { key: 'source-label' }, '来源'), React.createElement('dd', { key: 'sources' }, confirmation.selectedSessions.length + ' 个已选择对话'), React.createElement('dt', { key: 'output-label' }, '生成'), React.createElement('dd', { key: 'output' }, mode === 'both' ? '思维导图 + 知识图谱' : mode), React.createElement('dt', { key: 'model-label' }, '模型'), React.createElement('dd', { key: 'model' }, confirmation.model.provider + ' / ' + confirmation.model.model), React.createElement('dt', { key: 'strict-label' }, '约束'), React.createElement('dd', { key: 'strict' }, strict ? '严格约束已开启' : '普通约束'), React.createElement('dt', { key: 'save-label' }, '保存'), React.createElement('dd', { key: 'save' }, '.g-dsh-market-knowledge' + (confirmation.overwrite ? '（将替换已有结果）' : ''))]),
         React.createElement('p', { key: 'note', className: 'ckm-warning' }, '确认后才会读取所选对话正文、调用模型并写入工作区；不会自动发送消息。'),
         React.createElement('div', { key: 'actions', className: 'ckm-modal-actions' }, [Button({ key: 'back', className: 'ckm-secondary', onClick: function () { setConfirmation(null) }, disabled: busy }, '返回修改'), Button({ key: 'ok', className: 'ckm-primary', onClick: start, disabled: busy }, busy ? '生成中…' : '确认并生成')])
       ] : [
@@ -507,6 +530,17 @@ window.__ModuleLoader__.load({
           ])
         ]),
         React.createElement('label', { key: 'mode', className: 'ckm-field' }, ['生成内容', React.createElement('select', { key: 'select', value: mode, onChange: function (event) { setMode(event.target.value) } }, [React.createElement('option', { key: 'both', value: 'both' }, '思维导图 + 知识图谱'), React.createElement('option', { key: 'mind', value: 'mind-map' }, '仅思维导图'), React.createElement('option', { key: 'graph', value: 'knowledge-graph' }, '仅知识图谱')])]),
+        React.createElement('label', { key: 'model', className: 'ckm-field' }, [
+          '生成模型',
+          React.createElement('span', { key: 'hint', className: 'ckm-panel-hint' }, '默认带入 DSH 默认模型；可以为本次知识视图单独选择 Provider / Model。'),
+          modelCatalog && modelCatalog.groups && modelCatalog.groups.length ? React.createElement('div', { key: 'selectors', className: 'ckm-model-selectors' }, [
+            React.createElement('select', { key: 'provider', value: modelProvider, onChange: function (event) { var next = event.target.value; var group = modelCatalog.groups.filter(function (item) { return item.id === next })[0]; setModelProvider(next); setModelId(group && group.models && group.models[0] ? group.models[0].id : '') } }, modelCatalog.groups.map(function (group) { return React.createElement('option', { key: group.id, value: group.id }, group.name + '（' + group.id + '）') })),
+            React.createElement('select', { key: 'model', value: modelId, onChange: function (event) { setModelId(event.target.value) } }, ((modelCatalog.groups.filter(function (item) { return item.id === modelProvider })[0] || {}).models || []).map(function (item) { return React.createElement('option', { key: item.id, value: item.id }, item.name + '（' + item.id + '）') }))
+          ]) : React.createElement('div', { key: 'inputs', className: 'ckm-model-selectors' }, [
+            React.createElement('input', { key: 'provider', value: modelProvider, placeholder: 'Provider', onChange: function (event) { setModelProvider(event.target.value) } }),
+            React.createElement('input', { key: 'model', value: modelId, placeholder: 'Model', onChange: function (event) { setModelId(event.target.value) } })
+          ])
+        ]),
         React.createElement('label', { key: 'prompt', className: 'ckm-field' }, ['额外要求', React.createElement('textarea', { key: 'textarea', rows: 4, maxLength: 4000, value: prompt, placeholder: '请输入形成思维导图或知识图谱时需要遵守的 Prompt…', onChange: function (event) { setPrompt(event.target.value) } })]),
         React.createElement('label', { key: 'strict', className: 'ckm-inline-field' }, [React.createElement('input', { key: 'check', type: 'checkbox', checked: strict, onChange: function (event) { setStrict(event.target.checked) } }), '严格约束模式（来源、路径、工具和写入均由 Host 校验）']),
         message ? React.createElement('p', { key: 'message', className: 'ckm-error' }, message) : null,
@@ -531,7 +565,7 @@ window.__ModuleLoader__.load({
       '.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-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-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-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)}' +
       '@media(max-width:800px){.ckm-workspace,.ckm-graph-layout{display:flex;flex-direction:column}.ckm-detail{border-top:1px solid var(--dsw-alias-border-l2);border-left:0}.ckm-page-header{align-items:flex-start;flex-direction:column}.ckm-page-actions{width:100%;flex-wrap:wrap}}'
 

package/lib/generation-orchestrator.js

@@ -23,26 +23,89 @@ function phaseMessage(status) {
 }
 
 function asObject(value) {
-  if (value && typeof value === 'object') {
-    if (value.result && typeof value.result === 'object') return value.result
-    if (value.value && typeof value.value === 'object') return value.value
+  if (value && typeof value === 'object' && !Array.isArray(value)) {
+    const wrapperKeys = ['result', 'value', 'output', 'data', 'message', 'content', 'text']
+    for (const key of wrapperKeys) {
+      if (value[key] && typeof value[key] === 'object' && !Array.isArray(value[key])) return asObject(value[key])
+    }
+    if (wrapperKeys.some((key) => typeof value[key] === 'string')) return null
     return value
   }
   return null
 }
 
+function textFromContent(value) {
+  if (typeof value === 'string') return value
+  if (Array.isArray(value)) {
+    return value.map((block) => {
+      if (!block || typeof block !== 'object' || block.type === 'reasoning') return ''
+      if (typeof block.text === 'string') return block.text
+      if (typeof block.value === 'string') return block.value
+      if (block.type === 'tool-result') return textFromContent(block.content)
+      return ''
+    }).filter(Boolean).join('\n\n')
+  }
+  if (value && typeof value === 'object') {
+    if (typeof value.text === 'string') return value.text
+    if (typeof value.value === 'string') return value.value
+    for (const key of ['content', 'result', 'output', 'data', 'message']) {
+      if (value[key] !== undefined) return textFromContent(value[key])
+    }
+  }
+  return ''
+}
+
+function findJsonObject(text) {
+  const candidates = []
+  const fenced = String(text || '').match(/```(?:json)?\s*([\s\S]*?)```/i)
+  if (fenced) candidates.push(fenced[1])
+  candidates.push(String(text || ''))
+  for (const candidate of candidates) {
+    for (let start = 0; start < candidate.length; start += 1) {
+      if (candidate[start] !== '{') continue
+      let depth = 0
+      let inString = false
+      let escaped = false
+      for (let index = start; index < candidate.length; index += 1) {
+        const char = candidate[index]
+        if (inString) {
+          if (escaped) escaped = false
+          else if (char === '\\') escaped = true
+          else if (char === '"') inString = false
+          continue
+        }
+        if (char === '"') {
+          inString = true
+          continue
+        }
+        if (char === '{') depth += 1
+        else if (char === '}') {
+          depth -= 1
+          if (depth === 0) {
+            const fragment = candidate.slice(start, index + 1)
+            try {
+              const parsed = JSON.parse(fragment)
+              if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) return parsed
+            } catch {
+              // Try the next opening brace in case prose contained an example.
+            }
+            break
+          }
+        }
+      }
+    }
+  }
+  return null
+}
+
 export function parseStructuredOutput(value) {
   const object = asObject(value)
   if (object) return object
-  const text = String(value || '').trim().replace(/^```(?:json)?\s*/i, '').replace(/\s*```$/, '')
-  const start = text.indexOf('{')
-  const end = text.lastIndexOf('}')
-  if (start < 0 || end <= start) throw new Error('模型没有返回 JSON 对象。')
-  try {
-    return JSON.parse(text.slice(start, end + 1))
-  } catch (error) {
-    throw new Error(`模型 JSON 无法解析：${error.message}`)
-  }
+  const text = textFromContent(value).replace(/^\uFEFF/, '').trim()
+  const parsed = findJsonObject(text)
+  if (parsed) return parsed
+  if (!text) throw new Error('模型没有返回 JSON 对象。')
+  throw new Error('模型返回了文本，但其中没有可解析的 JSON 对象。')
 }
 
 function sourceRefsFromChunk(source, chunk) {
@@ -139,20 +202,54 @@ function followUpPrompt(node, source, targetSessionId, strict) {
   ].join('\n\n')
 }
 
+function messageText(message) {
+  if (!message || typeof message !== 'object') return ''
+  return textFromContent(message.content) || textFromContent(message.text) || textFromContent(message.value) || textFromContent(message.message)
+}
+
 function extractAgentText(surface) {
   const events = Array.isArray(surface?.events) ? surface.events : []
   for (let index = events.length - 1; index >= 0; index -= 1) {
     const event = events[index]
     if (event?.type === 'assistant/message') {
-      const message = event.data?.message || event.data || {}
-      const content = message.content
-      if (Array.isArray(content)) return content.filter((block) => block?.type !== 'reasoning').map((block) => block?.text || block?.value || '').join('')
-      if (typeof content === 'string') return content
+      const data = event.data && typeof event.data === 'object' ? event.data : {}
+      const text = messageText(data.message || data) || messageText(data)
+      if (text) return text
     }
   }
+  const chunks = events.filter((event) => event?.type === 'assistant/chunk').map((event) => {
+    const data = event.data && typeof event.data === 'object' ? event.data : {}
+    return textFromContent(data.chunk || data.text || data.content)
+  }).filter(Boolean)
+  return chunks.join('')
+}
+
+async function readAgentText(sessionQuery, sessionId, signal) {
+  for (let attempt = 0; attempt < 6; attempt += 1) {
+    if (signal?.aborted) throw signal.reason || new Error('生成已取消。')
+    const surface = await sessionQuery?.readSurface?.(sessionId)
+    const text = extractAgentText(surface)
+    if (text.trim()) return text
+    if (attempt < 5) await new Promise((resolve) => setTimeout(resolve, 40 * (attempt + 1)))
+  }
+  if (typeof sessionQuery?.readSession === 'function') {
+    const log = await sessionQuery.readSession(sessionId)
+    const text = extractAgentText(log)
+    if (text.trim()) return text
+  }
   return ''
 }
 
+function normalizeModelSelection(value) {
+  if (value === undefined || value === null || value === '') return null
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('模型选择必须是包含 Provider 和 Model 的对象。')
+  const provider = String(value.provider || '').trim()
+  const model = String(value.model || '').trim()
+  if (!provider && !model) return null
+  if (!provider || !model) throw new Error('Provider 和 Model 必须同时填写。')
+  return { provider, model }
+}
+
 export class KnowledgeGenerationOrchestrator {
   constructor({
     sessionQuery,
@@ -161,6 +258,7 @@ export class KnowledgeGenerationOrchestrator {
     agentDefaultModel,
     storage,
     modelRunner,
+    sessionEventSource,
     sourceReader = readSelectedSurfaces,
     now = () => Date.now(),
     idFactory = () => randomUUID()
@@ -171,6 +269,7 @@ export class KnowledgeGenerationOrchestrator {
     this.agentDefaultModel = agentDefaultModel
     this.storage = storage
     this.modelRunner = modelRunner
+    this.sessionEventSource = sessionEventSource
     this.sourceReader = sourceReader
     this.now = now
     this.idFactory = idFactory
@@ -278,6 +377,7 @@ export class KnowledgeGenerationOrchestrator {
             cwd: request.cwd,
             strict: request.strict === true,
             selectedSessionIds: request.selectedSessionIds,
+            model: request.model,
             signal: task.controller.signal
           })
           summaries.push(normalizeSummary(value, source, chunk))
@@ -294,6 +394,7 @@ export class KnowledgeGenerationOrchestrator {
           cwd: request.cwd,
           strict: request.strict === true,
           selectedSessionIds: request.selectedSessionIds,
+          model: request.model,
           signal: task.controller.signal
         })
         mindMap = validateMindMap(value, { selectedSessionIds: request.selectedSessionIds, strict: request.strict === true })
@@ -306,6 +407,7 @@ export class KnowledgeGenerationOrchestrator {
           cwd: request.cwd,
           strict: request.strict === true,
           selectedSessionIds: request.selectedSessionIds,
+          model: request.model,
           signal: task.controller.signal
         })
         knowledgeGraph = validateKnowledgeGraph(value, { selectedSessionIds: request.selectedSessionIds, strict: request.strict === true })
@@ -342,39 +444,54 @@ export class KnowledgeGenerationOrchestrator {
   async runModel(input) {
     if (typeof this.modelRunner === 'function') return parseStructuredOutput(await this.modelRunner(input))
     if (!this.agents?.create) throw new Error('当前 DSH Runtime 未提供 agents.create，无法生成知识视图。')
-    let selection = {}
-    try { selection = this.agentDefaultModel?.currentSelection?.() || {} } catch { selection = {} }
-    const provider = String(selection.provider || '').trim()
-    const model = String(selection.model || '').trim()
+    let selection = normalizeModelSelection(input.model)
+    if (!selection) {
+      try { selection = normalizeModelSelection(this.agentDefaultModel?.currentSelection?.()) } catch { selection = null }
+    }
+    const provider = String(selection?.provider || '').trim()
+    const model = String(selection?.model || '').trim()
     if (!provider || !model) throw new Error('当前没有可用的默认 Provider/Model。')
     const sessionId = `knowledge-map-${this.idFactory()}`
-    const handle = await this.agents.create({
-      sessionId,
-      meta: { cwd: input.cwd, origin: 'subagent' },
-      agentOptions: { provider, model, maxTokens: input.kind === 'summary' ? 2500 : 6000 },
-      signal: input.signal,
-      setup: async (agentCtx) => {
-        agentCtx?.systemPrompt?.section?.({
-          name: 'knowledge-map:protocol',
-          order: 0,
-          text: '你是 DSH 知识视图生成器。只输出调用方要求的 JSON；不要调用外部网络、文件写入或其他 Agent 工具。'
+    const liveEvents = []
+    let unsubscribe
+    if (typeof this.sessionEventSource === 'function') {
+      try {
+        unsubscribe = this.sessionEventSource((session, event) => {
+          const eventSessionId = String(session?.id || session?.header?.id || '')
+          if (eventSessionId === sessionId && event) liveEvents.push(event)
         })
-        try {
-          agentCtx?.tools?.restrict?.({ deny: ['multi_agent_discuss', 'shell', 'filesystem', 'web_search', 'browser'] })
-        } catch { /* older runtimes may not expose tool restriction */ }
-      }
-    })
+      } catch { /* event subscription is an optimization; surface reads remain the fallback */ }
+    }
+    let handle
     try {
+      handle = await this.agents.create({
+        sessionId,
+        meta: { cwd: input.cwd, origin: 'subagent' },
+        agentOptions: { provider, model, maxTokens: input.kind === 'summary' ? 2500 : 6000 },
+        signal: input.signal,
+        setup: async (agentCtx) => {
+          agentCtx?.systemPrompt?.section?.({
+            name: 'knowledge-map:protocol',
+            order: 0,
+            text: '你是 DSH 知识视图生成器。只输出调用方要求的 JSON；不要调用外部网络、文件写入或其他 Agent 工具。'
+          })
+          try {
+            agentCtx?.tools?.restrict?.({ deny: ['multi_agent_discuss', 'shell', 'filesystem', 'web_search', 'browser'] })
+          } catch { /* older runtimes may not expose tool restriction */ }
+        }
+      })
       handle.agent.followup(makeUserMessage(input.prompt, `${sessionId}-${input.kind}`))
       await handle.agent.whenIdle()
-      const surface = await this.sessionQuery?.readSurface?.(sessionId)
-      return parseStructuredOutput(extractAgentText(surface))
+      const liveText = extractAgentText({ events: liveEvents })
+      if (liveText.trim()) return parseStructuredOutput(liveText)
+      return parseStructuredOutput(await readAgentText(this.sessionQuery, sessionId, input.signal))
     } finally {
-      await handle.dispose?.()
+      await unsubscribe?.()
+      await handle?.dispose?.()
     }
   }
 
-  async formFollowUp({ cwd, node, targetSessionId, strict = true, signal }) {
+  async formFollowUp({ cwd, node, targetSessionId, strict = true, model, signal }) {
     const sources = await this.sourceReader({ sessionQuery: this.sessionQuery, sessions: this.sessions }, {
       cwd,
       sessionIds: [targetSessionId],
@@ -386,6 +503,7 @@ export class KnowledgeGenerationOrchestrator {
       cwd,
       strict,
       selectedSessionIds: [targetSessionId],
+      model,
       signal
     })
     const result = parseStructuredOutput(value)

package/lib/index.js

@@ -41,6 +41,25 @@ function normalizeOutputMode(value) {
   return mode
 }
 
+function normalizeModelSelection(value) {
+  if (value === undefined || value === null || value === '') return null
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error('模型选择必须是包含 Provider 和 Model 的对象。')
+  const provider = String(value.provider || '').trim()
+  const model = String(value.model || '').trim()
+  if (!provider && !model) return null
+  if (!provider || !model) throw new Error('Provider 和 Model 必须同时填写。')
+  if (provider.length > 160 || model.length > 240) throw new Error('Provider 或 Model 名称过长。')
+  return { provider, model }
+}
+
+function currentModelSelection(service) {
+  try {
+    return normalizeModelSelection(service?.currentSelection?.())
+  } catch {
+    return null
+  }
+}
+
 function normalizeGenerationInput(body = {}) {
   const selectedSessionIds = [...new Set((Array.isArray(body.selectedSessionIds) ? body.selectedSessionIds : []).map((id) => String(id || '').trim()).filter(Boolean))]
   if (!selectedSessionIds.length) throw new Error('至少选择一个对话。')
@@ -54,6 +73,7 @@ function normalizeGenerationInput(body = {}) {
     prompt,
     strict: body.strict !== false,
     includeSubagents: body.includeSubagents === true,
+    model: normalizeModelSelection(body.model),
     expectedRevision: Number.isInteger(expectedRevision) && expectedRevision >= 0 ? expectedRevision : 0
   }
 }
@@ -67,6 +87,7 @@ function canonicalPayload(value) {
     prompt: value.prompt,
     strict: value.strict === true,
     includeSubagents: value.includeSubagents === true,
+    model: value.model ? { provider: value.model.provider, model: value.model.model } : null,
     expectedRevision: Number(value.expectedRevision || 0)
   })
 }
@@ -79,23 +100,26 @@ function statusForError(error) {
 
 export function createHost(options = {}) {
   const host = {
-    inject: ['agentDefaultModel', 'agents', 'sessionQuery', 'sessions', 'skills', 'webServer'],
+    inject: ['agentDefaultModel', 'agents', 'llm', 'sessionQuery', 'sessions', 'skills', 'webServer'],
 
     apply(ctx) {
       const sessionQuery = options.sessionQuery || getService(ctx, 'sessionQuery')
       const sessions = options.sessions || getService(ctx, 'sessions')
       const agents = options.agents || getService(ctx, 'agents')
       const agentDefaultModel = options.agentDefaultModel || getService(ctx, 'agentDefaultModel')
+      const llm = options.llm || getService(ctx, 'llm')
       const skills = options.skills || getService(ctx, 'skills')
       const webServer = options.webServer || getService(ctx, 'webServer')
       const storage = options.storage || new WorkspaceStorage(options.storageOptions)
+      const sessionEventSource = options.sessionEventSource || (typeof ctx?.on === 'function' ? (listener) => ctx.on('session/event', listener) : null)
       const orchestrator = options.orchestrator || new KnowledgeGenerationOrchestrator({
         sessionQuery,
         sessions,
         agents,
         agentDefaultModel,
         storage,
-        modelRunner: options.modelRunner
+        modelRunner: options.modelRunner,
+        sessionEventSource
       })
       const confirmations = new Map()
       const sseClients = new Set()
@@ -109,6 +133,35 @@ export function createHost(options = {}) {
         return { ready: true, state: 'ready', sessionId: String(header.id), cwd, origin: String(header.origin || '') }
       }
 
+      async function modelCatalog() {
+        const defaultModel = currentModelSelection(agentDefaultModel)
+        const providers = typeof llm?.listProviders === 'function' ? llm.listProviders() : []
+        const groups = (await Promise.all(providers.map(async (provider) => {
+          const providerId = String(provider?.id || '').trim()
+          if (!providerId || typeof llm?.listModels !== 'function') return null
+          try {
+            const models = await llm.listModels(providerId)
+            const entries = (Array.isArray(models) ? models : []).map((item) => ({
+              id: String(item?.id || '').trim(),
+              name: String(item?.name || item?.id || '').trim()
+            })).filter((item) => item.id)
+            return entries.length ? {
+              id: providerId,
+              name: String(provider?.name || providerId).trim(),
+              models: entries
+            } : null
+          } catch {
+            return null
+          }
+        }))).filter(Boolean)
+        if (defaultModel) {
+          const group = groups.find((item) => item.id === defaultModel.provider)
+          if (!group) groups.unshift({ id: defaultModel.provider, name: defaultModel.provider, models: [{ id: defaultModel.model, name: defaultModel.model }] })
+          else if (!group.models.some((item) => item.id === defaultModel.model)) group.models.unshift({ id: defaultModel.model, name: defaultModel.model })
+        }
+        return { default: defaultModel, groups }
+      }
+
       async function sessionsFor(body) {
         const context = await contextFor(body.anchorSessionId)
         if (!context.ready) throw new Error('请先打开一个有明确工作路径的已有对话。')
@@ -122,7 +175,9 @@ export function createHost(options = {}) {
         for (const id of input.selectedSessionIds) if (!allowed.has(id)) throw new Error(`所选对话不属于当前工作路径或已不可用：${id}`)
         const state = await storage.readState(context.cwd)
         if (input.expectedRevision !== state.revision) throw new WorkspaceRevisionError(input.expectedRevision, state.revision)
-        const payload = { ...input, anchorSessionId: context.sessionId, cwd: context.cwd, expectedRevision: state.revision }
+        const model = input.model || currentModelSelection(agentDefaultModel)
+        if (!model) throw new Error('当前没有可用的 Provider/Model，请先在模型设置中配置默认模型。')
+        const payload = { ...input, model, anchorSessionId: context.sessionId, cwd: context.cwd, expectedRevision: state.revision }
         const token = randomUUID()
         confirmations.set(token, { payload, expiresAt: Date.now() + CONFIRMATION_TTL, used: false })
         return {
@@ -133,6 +188,7 @@ export function createHost(options = {}) {
           selectedSessions: available.filter((item) => input.selectedSessionIds.includes(item.id)),
           outputMode: input.outputMode,
           strict: input.strict,
+          model,
           promptSummary: shortText(input.prompt, 300),
           overwrite: state.exists
         }
@@ -141,7 +197,7 @@ export function createHost(options = {}) {
       function consumeConfirmation(token, body) {
         const value = confirmations.get(String(token || ''))
         if (!value || value.used || value.expiresAt < Date.now()) throw new Error('生成确认已过期，请返回配置重新确认。')
-        const supplied = normalizeGenerationInput({ ...body, anchorSessionId: body.anchorSessionId || value.payload.anchorSessionId, selectedSessionIds: body.selectedSessionIds || value.payload.selectedSessionIds, outputMode: body.outputMode || value.payload.outputMode, prompt: body.prompt ?? value.payload.prompt, strict: body.strict ?? value.payload.strict, includeSubagents: body.includeSubagents ?? value.payload.includeSubagents, expectedRevision: body.expectedRevision ?? value.payload.expectedRevision })
+        const supplied = normalizeGenerationInput({ ...body, anchorSessionId: body.anchorSessionId || value.payload.anchorSessionId, selectedSessionIds: body.selectedSessionIds || value.payload.selectedSessionIds, outputMode: body.outputMode || value.payload.outputMode, prompt: body.prompt ?? value.payload.prompt, strict: body.strict ?? value.payload.strict, includeSubagents: body.includeSubagents ?? value.payload.includeSubagents, model: body.model ?? value.payload.model, expectedRevision: body.expectedRevision ?? value.payload.expectedRevision })
         const expected = canonicalPayload(value.payload)
         const actual = canonicalPayload({ ...supplied, cwd: value.payload.cwd })
         if (expected !== actual) throw new Error('确认内容已变化，请返回配置重新确认。')
@@ -164,6 +220,9 @@ export function createHost(options = {}) {
             const sessionId = parseUrl(req).searchParams.get('sessionId') || ''
             return jsonResponse(res, 200, { ok: true, context: await contextFor(sessionId) })
           }
+          if (path[0] === 'models' && method === 'GET') {
+            return jsonResponse(res, 200, { ok: true, catalog: await modelCatalog() })
+          }
           if (path[0] === 'sessions' && method === 'GET') {
             const anchorSessionId = parseUrl(req).searchParams.get('anchorSessionId') || ''
             const includeSubagents = parseUrl(req).searchParams.get('includeSubagents') === 'true'
@@ -204,7 +263,7 @@ export function createHost(options = {}) {
             if (!node) throw new Error('思维导图节点不存在。')
             const targetSessionId = safeId(body.targetSessionId || node.primarySourceSessionId || node.sourceRefs?.[0]?.sessionId, '目标 Session ID')
             if (!state.manifest?.sourceSessionIds?.includes(targetSessionId)) throw new Error('目标对话不是本次生成的来源对话。')
-            const result = await orchestrator.formFollowUp({ cwd: context.cwd, node, targetSessionId, strict: state.manifest.strict !== false })
+            const result = await orchestrator.formFollowUp({ cwd: context.cwd, node, targetSessionId, strict: state.manifest.strict !== false, model: state.manifest.model })
             return jsonResponse(res, 200, { ok: true, followUp: result, context, revision: state.revision })
           }
           if (path[0] === 'navigation' && path[1] === 'confirm' && method === 'POST') {

package/package.json

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

package/skills/conversation-knowledge-map/SKILL.md

@@ -8,6 +8,7 @@ description: 在用户明确要求整理多个同工作路径对话、生成思
 - 只有用户明确点击确认后，才能读取所选对话正文、调用模型或写入 `.g-dsh-market-knowledge`。
 - 只使用锚点 Session 的 `header.cwd` 和用户从同一 `cwd` 选择的 Session；默认排除 `origin: subagent`。
 - 默认读取 `sessionQuery.readSurface()`，不要读取或复制完整原始 JSONL。
+- 生成模型由用户在配置面板中选择；确认时固定 Provider / Model，并将其传给每一次摘要、图谱和追问调用。
 - 思维导图节点必须包含标题、阶段性说明和来源引用；知识图谱关系必须包含证据和置信度。
 - 知识图谱是静态结果，不自动更新、不在图上编辑、不从节点发散。
 - 思维导图节点只生成后续问题；导航确认后不自动发送。