@lemoncat7/dsh-knowledge 2.6.0 → 2.7.0

package/web/app.js

@@ -17,6 +17,8 @@ const { installHostThemeBridge } = themeModule
 const { actionButton, badge, createToastPresenter, element, interfaceIcon, paneToggleButton } = uiModule
 const { renderMenu: renderDocumentMenu, closeMenus: closeDocumentMenus } = documentActionsModule.createDocumentMenuPresenter(uiModule)
 const readModelCatalog = modelCatalogModule.createModelCatalogLoader()
+const { createWritebackWorkspace } = await import(moduleUrl('writeback-workspace'))
+let writebackWorkspace
 const TOKEN_KEY = 'dsh-knowledge.session-token'
 const TYPES = ['preference', 'fact', 'decision', 'procedure', 'lesson']
 const TYPE_LABELS = { preference: '偏好', fact: '事实', decision: '决策', procedure: '流程', lesson: '经验' }
@@ -32,7 +34,7 @@ const NOTE_MAX_FILE_SIZE = 64 * 1024 * 1024
 const pageParams = new URLSearchParams(location.search)
 const initialKnowledgeBaseId = pageParams.get('knowledgeBaseId')?.trim() || ''
 const initialDocumentId = pageParams.get('documentId')?.trim() || ''
-const initialView = pageParams.get('view') === 'notes' ? 'notes' : 'entries'
+const initialView = ['notes', 'writeback'].includes(pageParams.get('view')) ? pageParams.get('view') : 'entries'
 const initialNoteId = pageParams.get('noteId')?.trim() || ''
 const mountContext = {
   sessionId: pageParams.get('sessionId')?.trim() || '',
@@ -950,6 +952,8 @@ async function loadTokens(signal) {
 }
 
 function renderShell() {
+  writebackWorkspace?.dispose()
+  writebackWorkspace = undefined
   closeDocumentMenus()
   releaseNoteEditors()
   captureScrollPosition()
@@ -960,10 +964,11 @@ function renderShell() {
     notes: ['笔记文档', '像本地目录一样整理笔记和资料，并按需关联到知识文档'],
     shares: ['已分享', '管理只读分享链接，也可以导入别人分享的笔记和目录'],
     candidates: ['待审核', '确认 AI 提取结果后再写入知识文档'],
+    writeback: ['回写任务', '查看本机队列，处理失败和阻塞的回写'],
     tokens: ['访问管理', '管理其他客户端连接中央知识库的权限'],
   }
   const [title, subtitle] = titles[state.view]
-  const viewIndexes = { overview: '00', notes: '01', shares: '02', entries: '03', candidates: '04', bases: '05', tokens: '06' }
+  const viewIndexes = { overview: '00', notes: '01', shares: '02', entries: '03', candidates: '04', writeback: '05', bases: '06', tokens: '07' }
   const shell = element('div', {
     class: 'app-shell', 'data-menu-open': String(state.menuOpen),
     'data-view': state.view, 'data-loading': String(state.loading),
@@ -1146,7 +1151,7 @@ function renderSidebar() {
   const pending = state.stats?.candidates.pending
   const navGroups = [
     ['笔记工作区', [['notes', '笔记文档'], ['shares', '已分享']]],
-    ['知识工作区', [['entries', '知识文档'], ['candidates', '待审核'], ['bases', '知识库与挂载']]],
+    ['知识工作区', [['entries', '知识文档'], ['candidates', '待审核'], ['writeback', '回写任务'], ['bases', '知识库与挂载']]],
     ['连接', [['tokens', '访问管理']].filter(([id]) => id !== 'tokens' || !state.service.remote)],
   ].filter(([, items]) => items.length)
   let navIndex = 0
@@ -1172,6 +1177,10 @@ function renderSidebar() {
 function renderCurrentView() {
   if (state.loading) return loadingView(state.view, state.loadingPhase, state.loadingProgress)
   if (state.error) return errorView(state.error, () => navigate(state.view))
+  if (state.view === 'writeback') {
+    writebackWorkspace = createWritebackWorkspace({ element, actionButton, openConfirm, sessionId: mountContext.sessionId })
+    return writebackWorkspace.root
+  }
   if (state.view === 'overview') return renderOverview()
   if (state.view === 'bases') return renderKnowledgeBases()
   if (state.view === 'entries') return renderEntries()
@@ -2181,8 +2190,9 @@ function openImportNoteShare() {
   destination.input.disabled = true
   const inspectButton = actionButton('读取分享', () => { void inspect() }, 'small')
   const fieldError = element('p', { class: 'share-import-field-error', role: 'alert', hidden: true })
+  const privateConfirmation = element('div', { class: 'share-import-note', hidden: true, role: 'status' })
   const preview = element('div', { class: 'share-import-preview', 'data-state': 'empty', 'aria-live': 'polite' },
-    element('span', { class: 'share-import-preview-mark', 'aria-hidden': 'true' }),
+    element('span', { class: 'share-import-preview-mark', 'aria-hidden': 'true' }, interfaceIcon('share-import')),
     element('div', {}, element('strong', {}, '等待读取分享'), element('p', {}, '读取后会显示类型、文件数量与大小；导入前不会写入任何内容。')),
   )
   const destinationHint = element('span', { class: 'field-hint' }, '正在读取你的笔记目录…')
@@ -2191,11 +2201,13 @@ function openImportNoteShare() {
   urlField.wrapper.replaceChildren(element('label', {}, '分享链接'), inputRow, fieldError)
   const form = element('form', { class: 'share-import-form', onSubmit: event => { event.preventDefault(); void inspect() } },
     urlField.wrapper,
+    privateConfirmation,
     preview,
     destination.wrapper,
     element('p', { class: 'share-import-note' }, '导入会创建一份独立副本；之后对方更新或停止分享，都不会改动你已经导入的内容。'),
   )
   let inspectedUrl = ''
+  let confirmedPrivateUrl = ''
 
   const showFieldError = message => {
     fieldError.textContent = message
@@ -2215,33 +2227,54 @@ function openImportNoteShare() {
     )
   }
   const inspect = async () => {
+    if (inspectButton.disabled) return false
     if (!urlField.input.reportValidity()) return false
+    const requestedUrl = urlField.input.value.trim()
+    urlField.input.disabled = true
+    privateConfirmation.hidden = true
     inspectButton.disabled = true
     inspectButton.setAttribute('aria-busy', 'true')
     inspectButton.textContent = '正在读取…'
     showFieldError('')
     preview.dataset.state = 'loading'
     try {
-      const result = await api('notes/import-share/inspect', { method: 'POST', body: { url: urlField.input.value.trim() } })
-      inspectedUrl = urlField.input.value.trim()
+      const result = await api('notes/import-share/inspect', { method: 'POST', body: { url: requestedUrl, confirmPrivateShare: confirmedPrivateUrl === requestedUrl } })
+      inspectedUrl = requestedUrl
       renderPreview(result.manifest)
       return !result.manifest.truncated
     } catch (error) {
       inspectedUrl = ''
       preview.dataset.state = 'error'
       preview.replaceChildren(
-        element('span', { class: 'share-import-preview-mark', 'aria-hidden': 'true' }),
+        element('span', { class: 'share-import-preview-mark', 'aria-hidden': 'true' }, interfaceIcon('share-import')),
         element('div', {}, element('strong', {}, '无法读取这个分享'), element('p', {}, '请检查链接是否完整、分享是否仍有效。')),
       )
       showFieldError(friendlyError(error))
+      if (error.code === 'PRIVATE_SHARE_CONFIRMATION_REQUIRED' && error.origin === new URL(requestedUrl).origin) {
+        confirmedPrivateUrl = ''
+        showFieldError('')
+        preview.dataset.state = 'empty'
+        preview.replaceChildren(
+          element('span', { class: 'share-import-preview-mark', 'aria-hidden': 'true' }, interfaceIcon('share-import')),
+          element('div', {}, element('strong', {}, '等待内网访问确认'), element('p', {}, '确认后读取分享清单，不会立即导入。')),
+        )
+        privateConfirmation.replaceChildren(
+          element('p', {}, `目标 ${error.origin} 解析到内网地址。确认后，DSH 服务端将访问此链接的分享接口；请仅允许你信任的来源。授权仅用于本次读取和导入，不会保存到白名单。`),
+          actionButton('允许本次内网分享并读取', () => { confirmedPrivateUrl = requestedUrl; void inspect() }, 'small'),
+        )
+        privateConfirmation.hidden = false
+      }
       return false
     } finally {
       inspectButton.disabled = false
+      urlField.input.disabled = false
       inspectButton.removeAttribute('aria-busy')
       inspectButton.textContent = '读取分享'
     }
   }
   urlField.input.addEventListener('input', () => {
+    confirmedPrivateUrl = ''
+    privateConfirmation.hidden = true
     if (urlField.input.value.trim() !== inspectedUrl) {
       inspectedUrl = ''
       preview.dataset.state = 'empty'
@@ -2265,7 +2298,7 @@ function openImportNoteShare() {
       showFieldError('')
       try {
         const result = await api('notes/import-share', {
-          method: 'POST', body: { url: requestedUrl, parentId: destination.input.value || null },
+          method: 'POST', body: { url: requestedUrl, parentId: destination.input.value || null, confirmPrivateShare: confirmedPrivateUrl === requestedUrl },
         })
         state.notes.children.clear()
         state.notes.loadedFolders.clear()
@@ -2747,8 +2780,7 @@ function noteInfoItem(label, value, title = '', key = '') {
 }
 
 function renderNoteIcon(node, large = false) {
-  const label = node.kind === 'folder' ? '' : noteExtension(node.name)
-  return element('span', { class: `note-node-icon is-${node.kind}${large ? ' is-large' : ''}`, 'data-media-kind': noteMediaKind(node), 'aria-hidden': 'true' }, label)
+  return element('span', { class: `note-node-icon ${node.kind === 'folder' ? 'tree-folder-icon' : 'tree-document-icon'}${large ? ' is-large' : ''}`, 'data-media-kind': noteMediaKind(node), 'aria-hidden': 'true' })
 }
 
 function noteKindLabel(node) {
@@ -3559,11 +3591,6 @@ function noteMediaKind(node) {
   return 'file'
 }
 
-function noteExtension(name) {
-  const extension = name.includes('.') ? name.split('.').pop() : 'FILE'
-  return extension.slice(0, 4).toLocaleUpperCase()
-}
-
 function shortNoteId(id) {
   return `${id.slice(0, 11)}…${id.slice(-5)}`
 }

package/web/styles.css

@@ -955,12 +955,8 @@ html,
 .notes-search-row strong, .notes-search-row small { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .notes-search-row strong { font-size: 11px; }
 .notes-search-row small { margin-top: 1px; color: var(--text-tertiary); font-size: 10px; }
-.note-node-icon { position: relative; width: 18px; height: 21px; display: grid; place-items: end center; flex: none; border: 1px solid var(--border-strong); border-radius: 3px; padding-bottom: 2px; background: var(--surface-raised); color: var(--text-tertiary); font-size: 5px; font-weight: 720; letter-spacing: .02em; }
-.note-node-icon.is-folder { width: 20px; height: 15px; margin-top: 2px; border-radius: 3px; background: color-mix(in srgb, var(--text-tertiary) 11%, var(--surface-raised)); }
-.note-node-icon.is-folder::before { content: ""; position: absolute; top: -4px; left: 1px; width: 9px; height: 4px; border: 1px solid var(--border-strong); border-bottom: 0; border-radius: 3px 3px 0 0; background: inherit; }
-.note-node-icon.is-document, .note-node-icon[data-media-kind="text"] { border-color: color-mix(in srgb, var(--accent) 30%, var(--border-strong)); color: var(--accent); }
-.note-node-icon.is-large { width: 38px; height: 46px; border-radius: 6px; padding-bottom: 5px; font-size: 7px; }
-.note-node-icon.is-folder.is-large { width: 44px; height: 32px; }
+.note-node-icon.is-large { width: 38px; height: 42px; }
+.note-node-icon.tree-folder-icon.is-large { width: 40px; height: 35px; }
 .notes-content { min-width: 0; min-height: 0; overflow: auto; background: transparent; }
 .notes-content-header { position: sticky; top: 0; z-index: 2; border-bottom: 1px solid var(--separator); padding: 11px 22px 13px; background: transparent; -webkit-backdrop-filter: none; backdrop-filter: none; }
 .notes-breadcrumb { min-width: 0; display: flex; align-items: center; gap: 5px; overflow: hidden; color: var(--text-tertiary); font-size: 10px; }
@@ -1028,8 +1024,8 @@ html,
 .share-import-preview strong, .share-import-preview p { display: block; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .share-import-preview strong { color: var(--text); font-size: 12px; }
 .share-import-preview p { margin: 4px 0 0; color: var(--text-tertiary); font-size: 10px; }
-.share-import-preview-mark { position: relative; width: 42px; height: 32px; border: 1.5px solid var(--border-strong); border-radius: 8px; background: var(--surface-soft); }
-.share-import-preview-mark::after { position: absolute; inset: 8px 12px; border: solid var(--text-tertiary); border-width: 0 1.5px 1.5px 0; content: ""; transform: rotate(45deg); }
+.share-import-preview-mark { display: grid; place-items: center; width: 42px; height: 42px; border: 1px solid var(--glass-border); border-radius: 12px; background: var(--surface-soft); color: var(--text-secondary); }
+.share-import-preview-mark > .interface-icon { width: 24px; height: 24px; }
 .share-import-note { margin: -4px 0 0; border-left: 2px solid var(--border-strong); padding: 5px 0 5px 10px; color: var(--text-tertiary); font-size: 10px; line-height: 1.6; }
 .dialog.share-import-dialog { width: min(560px, calc(100vw - 32px)); }
 .notes-content.is-document, .notes-content.is-file { display: grid; grid-template-rows: auto minmax(0, 1fr) auto; overflow: hidden; }
@@ -2032,3 +2028,12 @@ html,
 @media (forced-colors: active) {
   .status-dot, .history-dot { forced-color-adjust: none; }
 }
+/* Durable outbox: reuse workspace controls and surfaces, no animated cards. */
+.writeback-workspace { display: grid; gap: 12px; min-width: 0; }
+.writeback-toolbar { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; }
+.writeback-toolbar input { flex: 1 1 220px; min-width: 0; }
+.writeback-job-list { display: grid; gap: 12px; }
+.writeback-job { padding: 12px; border: 1px solid var(--border); border-radius: 12px; min-width: 0; }
+.writeback-job p { margin: 8px 0; overflow-wrap: anywhere; }
+.writeback-job-key { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-top: 8px; }
+.writeback-job pre { white-space: pre-wrap; overflow-wrap: anywhere; }

package/web/ui-primitives.js

@@ -54,6 +54,7 @@ export function interfaceIcon(name, className = 'interface-icon') {
     outline: 'M8 6h11M8 12h11M8 18h11M4.5 6h.01M4.5 12h.01M4.5 18h.01',
     history: 'M4 4v5h5M4.8 8.2A8 8 0 1 1 4 13M12 7.5V12l3 2',
     download: 'M12 3v11M8 10l4 4 4-4M5 20h14',
+    'share-import': 'M13 3H6a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-2M13 3v5h5l-5-5M21 12H10m4-4-4 4 4 4',
     link: 'M9.5 14.5l5-5M8.5 17H6a5 5 0 0 1 0-10h3M15.5 7H18a5 5 0 0 1 0 10h-3',
     rename: 'M4 20l4.2-1 10.4-10.4a2.1 2.1 0 0 0-3-3L5.2 16zM14.5 6.5l3 3',
     move: 'M3 7h6l2 2h10v11H3zM12 4h8m-3-3 3 3-3 3',

package/web/writeback-live.d.ts

@@ -0,0 +1 @@
+export function subscribeWritebackChanges(client: 'conversation-web' | 'management-web', listener: () => void): () => void

package/web/writeback-live.js

@@ -0,0 +1,52 @@
+// Shared by visible conversation turns; the iframe owns its own single channel.
+const groups = new Map()
+export function subscribeWritebackChanges(client, listener) {
+  let group = groups.get(client)
+  if (!group) {
+    const listeners = new Set()
+    let stopped = false, request, timer, revision = '', failures = 0
+    function emit() { for (const fn of listeners) fn() }
+    async function poll() {
+      if (stopped || document.hidden) return
+      const controller = new AbortController()
+      request = controller
+      try {
+        const response = await fetch(`/knowledge-control/v1/writeback-changes?since=${encodeURIComponent(revision)}`, {
+          credentials: 'same-origin', cache: 'no-store', headers: { 'x-dsh-knowledge-client': client },
+          signal: AbortSignal.any([controller.signal, AbortSignal.timeout(25000)]),
+        })
+        if (!response.ok) throw new Error('notification transport unavailable')
+        const data = await response.json()
+        if (typeof data.revision !== 'string') throw new Error('invalid revision')
+        if (stopped || controller.signal.aborted) return
+        const changed = revision !== data.revision || failures > 0
+        revision = data.revision
+        failures = 0
+        if (changed) emit()
+      } catch { if (!controller.signal.aborted) failures++ }
+      finally {
+        if (request === controller) {
+          request = undefined
+          if (!stopped && !document.hidden) timer = setTimeout(poll, failures ? Math.min(30000, 1000 * 2 ** Math.min(failures, 5)) : 0)
+        }
+      }
+    }
+    function resume() {
+      clearTimeout(timer)
+      request?.abort()
+      request = undefined
+      if (!document.hidden && !stopped) { emit(); void poll() }
+    }
+    document.addEventListener('visibilitychange', resume)
+    window.addEventListener('online', resume)
+    group = { listeners, close() { stopped = true; clearTimeout(timer); request?.abort(); document.removeEventListener('visibilitychange', resume); window.removeEventListener('online', resume) } }
+    groups.set(client, group)
+    // Let the first caller attach before the initial revision arrives.
+    timer = setTimeout(poll, 0)
+  }
+  group.listeners.add(listener)
+  return () => {
+    group.listeners.delete(listener)
+    if (!group.listeners.size) { group.close(); groups.delete(client) }
+  }
+}

package/web/writeback-workspace.js

@@ -0,0 +1,76 @@
+import { subscribeWritebackChanges } from './writeback-live.js'
+/** Local outbox UI. Poll only this view, never reload the knowledge workspace. */
+export function createWritebackWorkspace({ element, actionButton, openConfirm, sessionId = '' }) {
+  const labels = { queued: '排队中', running: '回写中', failed: '失败', completed: '已完成', cancelled: '已取消' }
+  let disposed = false, timer, request, offset = 0, busy = false, previous = '', dirty = false
+  const message = element('p', { role: 'status' })
+  const list = element('div', { class: 'writeback-job-list' })
+  const page = element('span', {})
+  const filter = element('input', { class: 'input', value: sessionId, placeholder: '按会话编号筛选（可留空）', 'aria-label': '会话编号' })
+  const previousButton = actionButton('上一页', () => { offset = Math.max(0, offset - 50); previous = ''; void refresh() }, 'ghost small')
+  const nextButton = actionButton('下一页', () => { offset += 50; previous = ''; void refresh() }, 'ghost small')
+  const root = element('section', { class: 'writeback-workspace' },
+    element('p', {}, '本机回写队列。同一会话按顺序执行；网络中断会自动重试，连续失败可手动重试或取消。取消不会撤销已经写入的内容。'),
+    element('div', { class: 'writeback-toolbar' }, filter, actionButton('筛选', () => { sessionId = filter.value.trim(); offset = 0; previous = ''; void refresh() }, 'small'), actionButton('刷新', () => { void refresh() }, 'ghost small')),
+    message, list, element('div', { class: 'writeback-toolbar' }, previousButton, page, nextButton))
+  async function fetchJson(params, method = 'GET', signal) {
+    const response = await fetch(`/knowledge-control/v1/writeback-jobs?${params}`, { method, credentials: 'same-origin', headers: { 'x-dsh-knowledge-client': 'management-web' }, signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(15000)]) : AbortSignal.timeout(15000) })
+    const data = await response.json().catch(() => ({}))
+    if (!response.ok) throw new Error(data.error || `读取回写队列失败（${response.status}）`)
+    return data
+  }
+  async function operate(job, action) {
+    if (busy || disposed) return
+    busy = true
+    request?.abort()
+    message.textContent = action === 'cancel' ? '正在请求取消…' : '正在提交重试…'
+    try {
+      const result = await fetchJson(new URLSearchParams({ action, sourceKey: job.sourceKey }), 'POST')
+      message.textContent = result.summary
+      previous = ''
+    } catch (error) { message.textContent = error.message }
+    finally { busy = false; if (!disposed) void refresh(true) }
+  }
+  function renderJob(job) {
+    const actions = element('div', { class: 'writeback-toolbar' })
+    if (job.status === 'failed') actions.append(actionButton('重试', () => operate(job, 'retry'), 'small'))
+    if (['queued', 'running', 'failed'].includes(job.status)) actions.append(actionButton(job.cancelRequested ? '取消中…' : '取消回写', () => openConfirm({ title: '取消这条回写？', message: '取消后不再重试，并允许后续轮次继续。已经写入的内容不会撤销。', confirmLabel: '取消回写', danger: true, onConfirm: () => operate(job, 'cancel') }), 'ghost small', { disabled: job.cancelRequested }))
+    return element('article', { class: 'writeback-job' },
+      element('div', { class: 'writeback-toolbar' }, element('strong', {}, labels[job.status] || job.status), element('span', {}, `已尝试 ${job.attempts} 次`), actions),
+      element('div', { class: 'writeback-job-key', title: job.sourceKey }, job.sourceKey),
+      job.createdAt ? element('p', {}, '创建于 ', element('time', { datetime: new Date(job.createdAt).toISOString() }, new Date(job.createdAt).toLocaleString())) : element('p', {}, '历史任务 · 创建时间未记录'),
+      element('p', {}, job.summary),
+      job.blockedBy ? element('p', {}, `阻塞任务：${job.blockedBy}`) : null,
+      job.nextAttemptAt ? element('p', {}, `下次自动重试：${new Date(job.nextAttemptAt).toLocaleString()}`) : null,
+      job.error ? element('details', {}, element('summary', {}, '失败原因'), element('pre', {}, job.error)) : null,
+      ...(job.destinations || []).map(destination => element('p', {}, `${destination.knowledgeBaseName} / ${destination.documentTitle || destination.documentId || ''}`)))
+  }
+  async function refresh(preserveMessage = false) {
+    clearTimeout(timer)
+    if (disposed || document.hidden || busy) return
+    dirty = false
+    request?.abort()
+    const controller = new AbortController()
+    request = controller
+    try {
+      const data = await fetchJson(new URLSearchParams({ sessionId, offset: String(offset) }), 'GET', controller.signal)
+      if (disposed || request !== controller) return
+      const fingerprint = JSON.stringify(data)
+      if (fingerprint !== previous) {
+        list.replaceChildren(...(data.items.length ? data.items.map(renderJob) : [element('p', {}, '没有回写任务')]))
+        previous = fingerprint
+      }
+      page.textContent = `共 ${data.total} 条 · 第 ${Math.floor(offset / 50) + 1} 页`
+      previousButton.disabled = offset === 0
+      nextButton.disabled = offset + 50 >= data.total
+      if (!preserveMessage) message.textContent = '状态自动更新'
+    } catch (error) { if (!controller.signal.aborted && !disposed) message.textContent = `${error.message}；将自动重连` }
+    finally { if (request === controller) { request = undefined; if (!disposed) timer = setTimeout(() => refresh(), dirty ? 0 : 5000) } }
+  }
+  function visibility() { if (document.hidden) { clearTimeout(timer); request?.abort() } else void refresh() }
+  document.addEventListener('visibilitychange', visibility)
+  window.addEventListener('online', visibility)
+  const unsubscribeChanges = subscribeWritebackChanges('management-web', () => { if (request || busy) dirty = true; else void refresh() })
+  void refresh()
+  return { root, dispose() { disposed = true; clearTimeout(timer); request?.abort(); unsubscribeChanges(); document.removeEventListener('visibilitychange', visibility); window.removeEventListener('online', visibility) } }
+}