@lemoncat7/dsh-knowledge 1.0.10 → 1.0.11

package/web/app.js

@@ -61,6 +61,7 @@ const state = {
     editor: null,
   },
   candidates: [],
+  candidateTargets: new Map(),
   candidateStatus: 'pending',
   settings: { writebackPolicy: 'conservative', updatedAt: '' },
   settingsSaving: false,
@@ -93,6 +94,7 @@ function installHostThemeBridge() {
     }
     root.dataset.dshHostTheme = 'true'
     root.style.colorScheme = message.colorScheme
+    root.style.setProperty('--dialog-surface', message.colorScheme === 'dark' ? '#1c1c1e' : '#ffffff')
     document.querySelector('meta[name="color-scheme"]')?.setAttribute('content', message.colorScheme)
     const background = root.style.getPropertyValue('--bg')
     if (background) document.querySelector('meta[name="theme-color"]')?.setAttribute('content', background)
@@ -310,7 +312,7 @@ function renderLogin(message = '') {
 
 function signOut() {
   sessionStorage.removeItem(TOKEN_KEY)
-  Object.assign(state, { token: '', stats: null, overview: null, knowledgeBases: [], mounts: [], resolvedMounts: [], entries: [], documents: [], candidates: [], settings: { writebackPolicy: 'conservative', updatedAt: '' }, tokens: [] })
+  Object.assign(state, { token: '', stats: null, overview: null, knowledgeBases: [], mounts: [], resolvedMounts: [], entries: [], documents: [], candidates: [], candidateTargets: new Map(), settings: { writebackPolicy: 'conservative', updatedAt: '' }, tokens: [] })
   if (AUTH_MODE === 'same-origin') void boot()
   else renderLogin()
 }
@@ -543,6 +545,12 @@ async function loadCandidates() {
     ensureKnowledgeBases(),
   ])
   state.candidates = candidates
+  const targetIds = [...new Set(candidates.map(candidate => candidate.targetId).filter(Boolean))]
+  const targets = await Promise.all(targetIds.map(async id => {
+    try { return [id, await api(`entries/${encodeURIComponent(id)}`)] }
+    catch { return [id, null] }
+  }))
+  state.candidateTargets = new Map(targets)
   if (!state.stats) await refreshStats()
 }
 
@@ -756,11 +764,11 @@ function renderKnowledgeBases() {
       type: 'button', role: 'tab', class: 'tab', 'aria-selected': String(state.knowledgeBaseView === id),
       onClick: () => { state.knowledgeBaseView = id; renderShell() },
       }, element('span', {}, label), element('span', { class: 'tab-count' }, count)))),
-      renderWritebackPolicyControl(),
+      actionButton('默认回写模型', () => openGlobalWritebackModelEditor(), 'ghost small'),
     ),
-    element('p', {}, state.settings.writebackPolicy === 'conservative'
-      ? '严谨模式只保留明确或已验证的长期知识，宁可漏记也不堆积噪声。'
-      : '主动模式会更积极地沉淀可复用内容，仍会排除敏感信息和临时输出。'),
+    element('p', {}, state.settings.writebackProvider && state.settings.writebackModel
+      ? `未单独指定模型的知识库使用 ${state.settings.writebackProvider} / ${state.settings.writebackModel}。`
+      : '未单独指定模型的知识库跟随当前会话模型。'),
   )
   return element('div', { class: 'bases-page' },
     switcher,
@@ -810,41 +818,23 @@ function renderKnowledgeBases() {
   )
 }
 
-function renderWritebackPolicyControl() {
-  const policies = [
-    ['conservative', '严谨'],
-    ['proactive', '主动'],
-  ]
-  return element('div', {
-    class: 'writeback-policy-control',
-    'aria-label': '全局回写策略',
-    'aria-busy': String(state.settingsSaving),
-  },
-  element('span', { class: 'writeback-policy-label' }, '回写策略'),
-  element('div', { class: 'writeback-policy-segments', role: 'radiogroup', 'aria-label': '选择全局回写策略' }, policies.map(([value, label]) => element('button', {
-    type: 'button', role: 'radio', class: 'writeback-policy-option',
-    'aria-checked': String(state.settings.writebackPolicy === value),
-    disabled: state.settingsSaving,
-    onClick: () => void updateWritebackPolicy(value),
-  }, label))))
-}
-
-async function updateWritebackPolicy(writebackPolicy) {
-  if (state.settingsSaving || state.settings.writebackPolicy === writebackPolicy) return
-  const previous = state.settings
-  state.settings = { ...state.settings, writebackPolicy }
-  state.settingsSaving = true
-  renderShell()
-  try {
-    state.settings = await api('settings', { method: 'PUT', body: { patch: { writebackPolicy } } })
-    showToast(`全局回写策略已切换为${writebackPolicy === 'conservative' ? '严谨' : '主动'}模式`)
-  } catch (error) {
-    state.settings = previous
-    showToast(friendlyError(error), 'error')
-  } finally {
-    state.settingsSaving = false
-    renderShell()
-  }
+function openGlobalWritebackModelEditor() {
+  const custom = element('input', { type: 'checkbox', checked: Boolean(state.settings.writebackProvider && state.settings.writebackModel) })
+  const provider = formField('模型提供方（Provider）', 'input', state.settings.writebackProvider || '', { maxlength: 100 })
+  const model = formField('模型名称（Model）', 'input', state.settings.writebackModel || '', { maxlength: 200 })
+  const form = element('form', { class: 'form-grid' },
+    element('label', { class: 'check-option span-2' }, custom, element('span', {}, element('strong', {}, '使用全局默认模型'), element('small', {}, '关闭后，未单独配置的知识库跟随当前会话模型。'))),
+    provider.wrapper, model.wrapper,
+  )
+  const sync = () => { provider.input.disabled = model.input.disabled = !custom.checked; provider.input.required = model.input.required = custom.checked }
+  custom.addEventListener('change', sync); sync()
+  openSheet({ title: '默认回写模型', description: '知识库自己的模型优先于这里；这里留空则跟随当前会话。', body: form, primaryLabel: '保存', onPrimary: async () => {
+    if (!form.reportValidity()) return false
+    state.settings = await api('settings', { method: 'PUT', body: { patch: custom.checked
+      ? { writebackProvider: provider.input.value.trim(), writebackModel: model.input.value.trim() }
+      : { writebackProvider: null, writebackModel: null } } })
+    showToast('默认回写模型已更新。'); renderShell(); return true
+  } })
 }
 
 function contextPill(label, value) {
@@ -869,7 +859,8 @@ function renderKnowledgeBaseCard(base) {
       : element('span', { class: 'tag is-empty' }, '无默认标签'),
     hiddenTagCount ? element('span', { class: 'tag' }, `+${hiddenTagCount}`) : null),
     element('div', { class: 'base-card-meta' },
-      element('span', {}, element('strong', {}, '回写模型'), base.writebackProvider && base.writebackModel ? `${base.writebackProvider} / ${base.writebackModel}` : '跟随当前会话'),
+      element('span', {}, element('strong', {}, '回写策略'), base.writebackPolicy === 'proactive' ? '主动' : '严谨'),
+      element('span', {}, element('strong', {}, '回写模型'), base.writebackProvider && base.writebackModel ? `${base.writebackProvider} / ${base.writebackModel}` : state.settings.writebackProvider && state.settings.writebackModel ? `默认 · ${state.settings.writebackProvider} / ${state.settings.writebackModel}` : '跟随当前会话'),
       base.extractionInstructions ? element('span', {}, element('strong', {}, '提取规则'), '已设置') : null,
     ),
     element('div', { class: 'base-card-actions' },
@@ -1283,6 +1274,9 @@ function renderCandidates() {
 
 function renderCandidateCard(candidate) {
   const pending = candidate.status === 'pending'
+  const conflictTarget = candidate.action === 'conflict' && candidate.targetId
+    ? state.candidateTargets.get(candidate.targetId)
+    : null
   const targetDocument = candidate.action === 'create'
     ? `新文档“${candidate.draft.title}”`
     : `文档“${candidate.draft.title}”`
@@ -1298,8 +1292,13 @@ function renderCandidateCard(candidate) {
       ),
       badge(STATUS_LABELS[candidate.status], candidate.status === 'approved' ? 'success' : candidate.status === 'rejected' ? 'danger' : 'warning'),
     ),
-    element('div', { class: 'candidate-body' },
-      element('p', { class: 'candidate-content' }, candidate.draft.body),
+    element('div', { class: `candidate-body${candidate.action === 'conflict' ? ' is-conflict' : ''}` },
+      candidate.action === 'conflict'
+        ? element('div', { class: 'candidate-comparison' },
+          element('section', {}, element('strong', {}, '当前知识'), element('pre', {}, conflictTarget?.body || '目标文档不可用，请刷新后重试。')),
+          element('section', {}, element('strong', {}, '候选内容'), element('pre', {}, candidate.draft.body)),
+        )
+        : element('p', { class: 'candidate-content' }, candidate.draft.body),
       element('div', { class: 'candidate-reason' },
         element('strong', {}, '文档变更'),
         element('span', { class: 'candidate-target' }, `${candidate.action === 'create' ? '创建' : '更新'}${targetDocument}`),
@@ -1310,7 +1309,9 @@ function renderCandidateCard(candidate) {
       pending ? element('div', {},
         actionButton('拒绝', () => reviewCandidate(candidate, 'reject'), 'danger small'),
         actionButton('编辑并通过', () => openEntryEditor(undefined, candidate), 'small'),
-        actionButton('通过', () => reviewCandidate(candidate, 'approve'), 'primary small'),
+        candidate.action === 'conflict'
+          ? actionButton('合并追加', () => reviewCandidate(candidate, 'approve', 'merge'), 'primary small')
+          : actionButton('通过', () => reviewCandidate(candidate, 'approve'), 'primary small'),
       ) : null,
     ),
   )
@@ -1399,12 +1400,16 @@ function parseTags(value) {
 }
 
 function openKnowledgeBaseEditor(base) {
-  const source = base || { name: '', description: '', defaultTags: [], extractionInstructions: '' }
+  const source = base || { name: '', description: '', defaultTags: [], extractionInstructions: '', writebackPolicy: 'conservative' }
   const form = element('form', { class: 'form-grid' })
   const name = formField('名称', 'input', source.name, { required: true, maxlength: 100, placeholder: '例如：项目规范' })
   const description = formField('回写匹配描述', 'textarea', source.description, { maxlength: 2000, placeholder: '描述什么样的对话才属于这个库。例如：只记录 dsh-knowledge 项目的架构决策和部署规范' })
   const tags = formField('默认标签', 'input', source.defaultTags.join(', '), { placeholder: 'project-rule, backend' })
   const instructions = formField('提取要求', 'textarea', source.extractionInstructions, { maxlength: 4000, placeholder: '例如：只收录已确认、可跨会话复用的项目约定' })
+  const policy = selectField('回写策略', [
+    { value: 'conservative', label: '严谨（高置信度直写）' },
+    { value: 'proactive', label: '主动（更积极沉淀）' },
+  ], source.writebackPolicy || 'conservative')
   const customModel = element('input', { type: 'checkbox', checked: Boolean(source.writebackProvider && source.writebackModel) })
   const provider = formField('模型提供方（Provider）', 'input', source.writebackProvider || '', { maxlength: 100, placeholder: '例如：cli' })
   const model = formField('模型名称（Model）', 'input', source.writebackModel || '', { maxlength: 200, placeholder: '例如：kimi-k2.7-code' })
@@ -1419,7 +1424,7 @@ function openKnowledgeBaseEditor(base) {
   updateModelFields()
   for (const field of [name, description, tags, instructions]) field.wrapper.classList.add('span-2')
   form.append(
-    name.wrapper, description.wrapper, tags.wrapper, instructions.wrapper,
+    name.wrapper, description.wrapper, tags.wrapper, instructions.wrapper, policy.wrapper,
     element('label', { class: 'check-option span-2' }, customModel, element('span', {},
       element('strong', {}, '为这个知识库指定回写模型'),
       element('small', {}, '关闭时自动使用当前会话正在使用的模型。'),
@@ -1438,6 +1443,7 @@ function openKnowledgeBaseEditor(base) {
         description: description.input.value.trim(),
         defaultTags: parseTags(tags.input.value),
         extractionInstructions: instructions.input.value.trim(),
+        writebackPolicy: policy.input.value,
         writebackProvider: customModel.checked ? provider.input.value.trim() : '',
         writebackModel: customModel.checked ? model.input.value.trim() : '',
       }
@@ -1710,7 +1716,9 @@ function openEntryEditor(entry, candidate) {
       confidence: Number(confidenceInput.value),
       ...(source.source ? { source: source.source } : {}),
     }
-    if (candidate) await api(`candidates/${encodeURIComponent(candidate.id)}/review`, { method: 'POST', body: { decision: 'approve', draft } })
+    if (candidate) await api(`candidates/${encodeURIComponent(candidate.id)}/review`, {
+      method: 'POST', body: { decision: 'approve', draft, ...(candidate.action === 'conflict' ? { resolution: 'merge' } : {}) },
+    })
     else if (entry) await api(`entries/${encodeURIComponent(entry.id)}`, { method: 'PUT', body: { draft } })
     else await api('entries', { method: 'POST', body: { draft } })
     showToast(candidate ? '候选已通过并写入知识库。' : '知识已保存。')
@@ -1733,14 +1741,22 @@ function selectField(label, options, value) {
   return { input, wrapper: element('div', { class: 'field' }, element('label', {}, label), input) }
 }
 
-async function reviewCandidate(candidate, decision) {
+async function reviewCandidate(candidate, decision, resolution) {
   const approve = decision === 'approve'
   openConfirm({
     title: approve ? '通过这条候选？' : '拒绝这条候选？',
     message: approve ? '通过后内容会立即写入知识库，并参与后续对话召回。' : '拒绝后会保留审核记录，但不会进入知识库。',
     confirmLabel: approve ? '确认通过' : '确认拒绝', danger: !approve,
     onConfirm: async () => {
-      await api(`candidates/${encodeURIComponent(candidate.id)}/review`, { method: 'POST', body: { decision } })
+      const reviewed = await api(`candidates/${encodeURIComponent(candidate.id)}/review`, {
+        method: 'POST', body: { decision, ...(resolution ? { resolution } : {}) },
+      })
+      if (approve && reviewed.status === 'pending' && reviewed.action === 'conflict') {
+        showToast('审核期间知识已变化，候选已转为冲突项，请比较后重新确认。')
+        state.stats = null
+        await navigate('candidates')
+        return
+      }
       showToast(approve ? '候选已通过。' : '候选已拒绝。')
       state.stats = null
       await navigate('candidates')

package/web/styles.css

@@ -7,6 +7,7 @@
   --surface-raised: #ffffff;
   --surface-soft: #f0f0f3;
   --surface-hover: #f5f5f8;
+  --dialog-surface: #ffffff;
   --text: #1d1d1f;
   --text-secondary: #4c4c50;
   --text-tertiary: #6e6e73;
@@ -34,6 +35,7 @@
     --surface-raised: #242426;
     --surface-soft: #2c2c2e;
     --surface-hover: #303033;
+    --dialog-surface: #1c1c1e;
     --text: #f5f5f7;
     --text-secondary: #c7c7cc;
     --text-tertiary: #98989d;
@@ -106,7 +108,7 @@ button:disabled { cursor: not-allowed; opacity: .56; }
   border: 1px solid var(--border);
   border-radius: 20px;
   padding: 32px;
-  background: var(--surface-raised);
+  background: var(--dialog-surface);
   box-shadow: var(--shadow);
 }
 
@@ -127,11 +129,11 @@ button:disabled { cursor: not-allowed; opacity: .56; }
 .login-card > p { margin: 0 0 24px; color: var(--text-secondary); }
 
 .field { display: grid; gap: 7px; }
-.field + .field { margin-top: 16px; }
 .field label { color: var(--text-secondary); font-size: 13px; font-weight: 600; }
 .field-hint { color: var(--text-tertiary); font-size: 12px; }
 
 .input, .select, .textarea {
+  box-sizing: border-box;
   width: 100%;
   border: 1px solid var(--border-strong);
   border-radius: 9px;
@@ -141,7 +143,7 @@ button:disabled { cursor: not-allowed; opacity: .56; }
   transition: border-color .15s ease, box-shadow .15s ease;
 }
 
-.input, .select { min-height: 40px; }
+.input, .select { height: 40px; min-height: 40px; font: inherit; line-height: 20px; }
 .textarea { min-height: 132px; resize: vertical; }
 .input::placeholder, .textarea::placeholder { color: var(--text-tertiary); }
 .input:focus, .select:focus, .textarea:focus { border-color: var(--accent); }
@@ -169,6 +171,7 @@ button:disabled { cursor: not-allowed; opacity: .56; }
 .button.ghost { border-color: transparent; background: transparent; color: var(--text-secondary); }
 .button.small { min-height: 32px; padding: 5px 10px; font-size: 12px; }
 .login-card .button { width: 100%; margin-top: 20px; }
+.login-card .field + .field { margin-top: 16px; }
 
 .app-shell { min-height: 100vh; min-height: 100dvh; display: grid; grid-template-columns: var(--sidebar-width) 6px minmax(0, 1fr); }
 
@@ -392,41 +395,6 @@ button:disabled { cursor: not-allowed; opacity: .56; }
 .workspace-switcher p { max-width: 56ch; margin: 0; color: var(--text-tertiary); font-size: 12px; text-align: right; }
 .workspace-tabs { flex: none; }
 .workspace-tabs .tab { display: inline-flex; align-items: center; gap: 7px; }
-.writeback-policy-control {
-  min-height: 36px;
-  display: inline-flex;
-  align-items: center;
-  gap: 7px;
-  border-left: 1px solid var(--border);
-  padding-left: 10px;
-}
-.writeback-policy-label { color: var(--text-tertiary); font-size: 11px; font-weight: 600; white-space: nowrap; }
-.writeback-policy-segments {
-  display: inline-flex;
-  gap: 2px;
-  border: 1px solid var(--border);
-  border-radius: 9px;
-  padding: 2px;
-  background: color-mix(in srgb, var(--surface-soft) 72%, transparent);
-}
-.writeback-policy-option {
-  min-width: 48px;
-  min-height: 30px;
-  border: 0;
-  border-radius: 7px;
-  padding: 5px 10px;
-  background: transparent;
-  color: var(--text-tertiary);
-  font-size: 11px;
-  font-weight: 620;
-  transition: background .14s ease, color .14s ease, box-shadow .14s ease;
-}
-.writeback-policy-option:hover:not(:disabled) { background: var(--surface-hover); color: var(--text); }
-.writeback-policy-option[aria-checked="true"] {
-  background: var(--surface-raised);
-  color: var(--text);
-  box-shadow: 0 1px 4px rgb(20 25 35 / 10%);
-}
 .tab-count { min-width: 20px; border-radius: 6px; padding: 1px 6px; background: color-mix(in srgb, var(--text-tertiary) 10%, transparent); color: var(--text-tertiary); font-size: 10px; font-variant-numeric: tabular-nums; }
 .tab[aria-selected="true"] .tab-count { background: var(--accent-soft); color: var(--accent); }
 .library-management, .mount-section { min-width: 0; }
@@ -678,6 +646,11 @@ button:disabled { cursor: not-allowed; opacity: .56; }
 .candidate-header h3 { margin: 8px 0 0; font-size: 15px; }
 .candidate-body { display: grid; grid-template-columns: minmax(0, 1fr) minmax(240px, .55fr); gap: 20px; padding: 0 18px 17px; }
 .candidate-content { margin: 0; color: var(--text-secondary); white-space: pre-wrap; }
+.candidate-body.is-conflict { grid-template-columns: 1fr; }
+.candidate-comparison { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; }
+.candidate-comparison section { min-width: 0; border: 1px solid var(--border); border-radius: 9px; padding: 12px; background: var(--surface-soft); }
+.candidate-comparison strong { display: block; margin-bottom: 8px; color: var(--text); font-size: 12px; }
+.candidate-comparison pre { overflow: auto; max-height: 280px; margin: 0; color: var(--text-secondary); font: inherit; line-height: 1.65; white-space: pre-wrap; overflow-wrap: anywhere; }
 .candidate-reason { border-left: 2px solid var(--border-strong); padding-left: 13px; color: var(--text-secondary); font-size: 12px; }
 .candidate-reason strong { display: block; margin-bottom: 5px; color: var(--text-tertiary); font-size: 10px; text-transform: uppercase; letter-spacing: .08em; }
 .candidate-target { display: block; margin-bottom: 13px; border-radius: 7px; padding: 7px 9px; background: var(--accent-soft); color: var(--accent); font-weight: 600; }
@@ -727,7 +700,7 @@ button:disabled { cursor: not-allowed; opacity: .56; }
   flex-direction: column;
   border: 1px solid var(--border-strong);
   border-radius: 18px;
-  background: var(--surface-raised);
+  background: var(--dialog-surface);
   box-shadow: 0 28px 80px rgb(0 0 0 / 24%);
 }
 .dialog.narrow { width: min(100%, 460px); }
@@ -752,7 +725,7 @@ button:disabled { cursor: not-allowed; opacity: .56; }
 .dialog-header p { margin: 4px 0 0; color: var(--text-tertiary); font-size: 12px; }
 .dialog-body { overflow: auto; padding: 20px; }
 .dialog-footer { display: flex; justify-content: flex-end; gap: 8px; border-top: 1px solid var(--border); padding: 13px 20px; }
-.form-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 16px; }
+.form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); align-items: start; gap: 16px; }
 .form-grid .span-2 { grid-column: 1 / -1; }
 .check-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 8px; }
 .check-option { display: flex; align-items: center; gap: 8px; border: 1px solid var(--border); border-radius: 8px; padding: 9px; }
@@ -805,6 +778,7 @@ button:disabled { cursor: not-allowed; opacity: .56; }
 }
 
 @media (max-width: 760px) {
+  .candidate-comparison { grid-template-columns: 1fr; }
   :root { --sidebar-width: 0px; }
   .app-shell { display: block; }
   .app-sidebar-resizer { display: none; }
@@ -890,7 +864,6 @@ button:disabled { cursor: not-allowed; opacity: .56; }
   .topbar-actions .button.primary::before { content: "+"; font-size: 18px; }
   .workspace-tabs { width: 100%; }
   .workspace-tabs .tab { min-width: 0; flex: 1; justify-content: center; padding-inline: 8px; }
-  .writeback-policy-control { width: 100%; justify-content: space-between; border-left: 0; padding-left: 0; }
   .document-toolbar-actions { width: 100%; }
   .document-toolbar-actions .button.primary { margin-left: auto; }
   .form-grid { grid-template-columns: 1fr; }