@lemoncat7/dsh-knowledge 2.5.1 → 2.6.1

package/lib/writeback/status-client.js

@@ -0,0 +1,97 @@
+/** One cancellable request stream per visible turn; stale GETs cannot undo retries. */
+export class WritebackStatusClient {
+    url;
+    change;
+    fetcher;
+    request;
+    timer;
+    disposed = false;
+    visible = true;
+    retrying = false;
+    failures = 0;
+    value;
+    readError;
+    // Browser fetch checks its Window receiver. Never store it as an unbound
+    // instance method: this.fetcher() would supply the client as its receiver.
+    constructor(url, change, fetcher = (...args) => globalThis.fetch(...args)) {
+        this.url = url;
+        this.change = change;
+        this.fetcher = fetcher;
+    }
+    setVisible(visible) {
+        this.visible = visible;
+        if (visible)
+            this.refresh();
+        else {
+            clearTimeout(this.timer);
+            if (!this.retrying)
+                this.request?.abort();
+        }
+    }
+    refresh() {
+        if (this.disposed || !this.visible || this.retrying || this.request && !this.request.signal.aborted)
+            return;
+        void this.load(false);
+    }
+    retry() {
+        if (this.disposed || this.retrying || !this.value?.retryable)
+            return;
+        this.retrying = true;
+        this.request?.abort();
+        this.change(this.value, true);
+        void this.load(true);
+    }
+    async load(retry) {
+        clearTimeout(this.timer);
+        const controller = new AbortController();
+        this.request = controller;
+        const timeout = setTimeout(() => controller.abort(new Error('状态请求超时')), 15_000);
+        let delay = 15_000;
+        try {
+            const response = await this.fetcher(this.url, {
+                method: retry ? 'POST' : 'GET', signal: controller.signal,
+                headers: { accept: 'application/json', 'x-dsh-knowledge-client': 'conversation-web' },
+            });
+            const body = await response.json();
+            if (this.request !== controller || this.disposed)
+                return;
+            if (!response.ok && (retry || response.status !== 404))
+                throw new Error(body.error ?? `状态请求失败（HTTP ${response.status}）`);
+            this.readError = undefined;
+            if (response.ok && body.summary) {
+                this.value = body;
+                this.failures = 0;
+                delay = body.status === 'completed' ? 0 : body.status === 'failed' ? 15_000 : 1_500;
+            }
+            else {
+                delay = ++this.failures <= 3 ? 1_500 : 60_000;
+            }
+        }
+        catch (error) {
+            if (this.request !== controller || this.disposed)
+                return;
+            delay = Math.min(60_000, 2_000 * 2 ** Math.min(5, this.failures++));
+            if (retry && this.value)
+                this.value = { ...this.value, error: error instanceof Error ? error.message : String(error) };
+            else if (this.visible)
+                this.readError = '暂时无法读取回写状态，正在自动重试；这不代表回写失败。';
+        }
+        finally {
+            clearTimeout(timeout);
+            if (this.request === controller && !this.disposed) {
+                this.request = undefined;
+                if (retry)
+                    this.retrying = false;
+                this.change(this.value, this.retrying, this.readError);
+                if (delay && this.visible)
+                    this.timer = setTimeout(() => this.refresh(), delay);
+            }
+        }
+    }
+    dispose() {
+        this.disposed = true;
+        clearTimeout(this.timer);
+        this.request?.abort();
+    }
+}
+//# sourceMappingURL=status-client.js.map

package/lib/writeback/status-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status-client.js","sourceRoot":"","sources":["../../src/writeback/status-client.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemoncat7/dsh-knowledge",
-  "version": "2.5.1",
+  "version": "2.6.1",
   "description": "Local and remote knowledge bases for DeepSeek Harness, with scoped recall, controlled write-back, and a Web management console",
   "keywords": [
     "deepseek-harness",

package/web/api-client.js

@@ -30,6 +30,8 @@ export function createApiClient({ apiBase, authMode, getToken }) {
     if (!response.ok) {
       const error = new Error(payload?.error || `请求失败（HTTP ${response.status}）`)
       error.status = response.status
+      error.code = payload?.code
+      error.origin = payload?.origin
       throw error
     }
     return payload
@@ -91,4 +93,3 @@ export function createApiClient({ apiBase, authMode, getToken }) {
 
   return { api, binaryRequest, binaryUploadRequest }
 }
-

package/web/app.js

@@ -2181,8 +2181,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 +2192,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 +2218,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 +2289,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 +2771,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 +3582,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; }

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',