@lemoncat7/dsh-knowledge 2.9.6 → 2.10.0

package/lib/local-provider.js

@@ -13,13 +13,14 @@ import { enqueueDocumentProjection } from './documents/projection-queue.js';
 import { applyKnowledgeTextEdits, mergeKnowledgeBodies } from './knowledge-merge.js';
 import { normalizeFinalizationChange } from './document-lifecycle.js';
 import { NoteStore } from './notes/store.js';
+import { normalizeDocumentGroup, matchDocumentGroup } from './document-groups.js';
 const ENTRY_COLUMNS = `
   id, knowledge_base_id, title, body, type, tags_json, scope_kind, scope_id, confidence,
-  status, document_state, finalized_at, finalization_note, version, source_json, created_at, updated_at
+  status, document_group, document_state, finalized_at, finalization_note, version, source_json, created_at, updated_at
 `;
 const JOINED_ENTRY_COLUMNS = `
   e.id AS id, e.knowledge_base_id AS knowledge_base_id, e.title AS title, e.body AS body, e.type AS type,
-  e.tags_json AS tags_json, e.scope_kind AS scope_kind, e.scope_id AS scope_id,
+  e.tags_json AS tags_json, e.document_group AS document_group, e.scope_kind AS scope_kind, e.scope_id AS scope_id,
   e.confidence AS confidence, e.status AS status, e.document_state AS document_state,
   e.finalized_at AS finalized_at, e.finalization_note AS finalization_note, e.version AS version,
   e.source_json AS source_json, e.created_at AS created_at, e.updated_at AS updated_at
@@ -297,7 +298,7 @@ export class LocalKnowledgeProvider {
         const rows = this.db.prepare(`
       WITH document_index AS (
         SELECT
-          id, knowledge_base_id, rel_path, title, entry_count, content_hash,
+          id, knowledge_base_id, rel_path, title, entry_count, content_hash, document_group,
           document_state, finalized_at, finalization_note, created_at, updated_at,
           CASE WHEN rel_path='README.md' THEN 0 ELSE 1 END AS sort_rank
         FROM knowledge_documents${sourceWhere}
@@ -325,6 +326,50 @@ export class LocalKnowledgeProvider {
         const row = this.db.prepare('SELECT * FROM knowledge_documents WHERE id=?').get(id);
         return row === undefined ? undefined : rowToDocument(row);
     }
+    async listDocumentGroups(knowledgeBaseId) {
+        this.assertOpen();
+        if (!await this.getKnowledgeBase(knowledgeBaseId))
+            throw notFound('knowledge base', knowledgeBaseId);
+        return this.documentGroups(knowledgeBaseId);
+    }
+    documentGroups(knowledgeBaseId) {
+        return this.db.prepare("SELECT document_group,COUNT(*) AS count FROM knowledge_entries WHERE knowledge_base_id=? AND status='active' GROUP BY document_group ORDER BY document_group COLLATE NOCASE").all(knowledgeBaseId)
+            .map(row => ({ name: String(row.document_group), count: Number(row.count) }));
+    }
+    resolveDocumentGroup(baseId, name) {
+        return matchDocumentGroup(name, this.documentGroups(baseId).map(group => group.name));
+    }
+    async assignDocumentGroup(knowledgeBaseId, ids, group) {
+        this.assertOpen();
+        await this.documentsReady;
+        const name = normalizeDocumentGroup(group);
+        if (!Array.isArray(ids) || ids.length < 1 || ids.length > 500 || ids.some(id => typeof id !== 'string'))
+            throw inputError('请选择 1 到 500 篇文档');
+        const entries = this.transaction(() => {
+            if (!this.db.prepare("SELECT id FROM knowledge_bases WHERE id=? AND status='active'").get(knowledgeBaseId))
+                throw notFound('active knowledge base', knowledgeBaseId);
+            const canonical = this.resolveDocumentGroup(knowledgeBaseId, name);
+            const selected = [...new Set(ids)].map(id => {
+                const row = this.db.prepare(`SELECT ${ENTRY_COLUMNS} FROM knowledge_entries WHERE id=?`).get(id);
+                if (!row || row.knowledge_base_id !== knowledgeBaseId || row.status !== 'active')
+                    throw conflict('文档已移动、归档或删除，请刷新分组后重试');
+                return rowToEntry(row);
+            });
+            return selected.map(current => this.setEntryGroup(current, canonical));
+        });
+        for (const entry of entries)
+            await this.syncKnowledgeEntryQueued(entry.id);
+        return entries;
+    }
+    setEntryGroup(current, group) {
+        const canonical = this.resolveDocumentGroup(current.knowledgeBaseId, normalizeDocumentGroup(group));
+        if ((current.group ?? '') === canonical)
+            return current;
+        const updated = { ...current, group: canonical, version: current.version + 1, updatedAt: nowIso() };
+        this.db.prepare('UPDATE knowledge_entries SET document_group=?,version=?,updated_at=? WHERE id=?').run(canonical, updated.version, updated.updatedAt, updated.id);
+        this.writeVersion(updated, 'update');
+        return updated;
+    }
     async listMounts(targetKind, targetId) {
         this.assertOpen();
         const where = [];
@@ -654,7 +699,7 @@ export class LocalKnowledgeProvider {
                 result = this.updateEntry(current.id, { ...current, body: `${current.body.trimEnd()}\n\n${body}`.trim() }, 'update');
             }
             else {
-                result = this.insertEntry({ knowledgeBaseId: input.knowledgeBaseId, title: input.title?.trim() || note.name.replace(/\.md$/i, ''), body, type: 'fact', tags: [], scope: { kind: 'global' }, confidence: 0.8 });
+                result = this.insertEntry({ knowledgeBaseId: input.knowledgeBaseId, ...(input.group === undefined ? {} : { group: input.group }), title: input.title?.trim() || note.name.replace(/\.md$/i, ''), body, type: 'fact', tags: [], scope: { kind: 'global' }, confidence: 0.8 });
             }
             this.db.prepare('INSERT OR IGNORE INTO knowledge_note_references(knowledge_id,note_id,source,source_session_id,created_at) VALUES(?,?,?,NULL,?)').run(result.id, note.id, 'user', nowIso());
             this.db.prepare('INSERT INTO note_excerpt_receipts(request_id,input_hash,knowledge_id) VALUES(?,?,?)').run(input.requestId, hash, result.id);
@@ -665,6 +710,7 @@ export class LocalKnowledgeProvider {
     }
     insertEntry(input) {
         const draft = normalizeDraft(input);
+        draft.group = this.resolveDocumentGroup(draft.knowledgeBaseId, normalizeDocumentGroup(input.group, true));
         if (this.db.prepare("SELECT id FROM knowledge_bases WHERE id=? AND status='active'").get(draft.knowledgeBaseId) === undefined) {
             throw notFound('active knowledge base', draft.knowledgeBaseId);
         }
@@ -677,9 +723,9 @@ export class LocalKnowledgeProvider {
         this.db.prepare(`
       INSERT INTO knowledge_entries (
         id,knowledge_base_id,title,body,type,tags_json,scope_kind,scope_id,confidence,status,
-        document_state,finalized_at,finalization_note,version,content_hash,source_json,created_at,updated_at
-      ) VALUES (?,?,?,?,?,?,?,?,?,?,'open',NULL,NULL,?,?,?,?,?)
-    `).run(id, draft.knowledgeBaseId, draft.title, draft.body, draft.type, JSON.stringify(draft.tags), draft.scope.kind, draft.scope.kind === 'project' ? draft.scope.id : null, draft.confidence, 'active', 1, contentHash(draft), draft.source === undefined ? null : JSON.stringify(draft.source), timestamp, timestamp);
+        document_state,finalized_at,finalization_note,version,content_hash,source_json,created_at,updated_at,document_group
+      ) VALUES (?,?,?,?,?,?,?,?,?,?,'open',NULL,NULL,?,?,?,?,?,?)
+    `).run(id, draft.knowledgeBaseId, draft.title, draft.body, draft.type, JSON.stringify(draft.tags), draft.scope.kind, draft.scope.kind === 'project' ? draft.scope.id : null, draft.confidence, 'active', 1, contentHash(draft), draft.source === undefined ? null : JSON.stringify(draft.source), timestamp, timestamp, draft.group);
         this.writeVersion(entry, 'create');
         this.upsertFts(entry);
         return entry;
@@ -813,6 +859,7 @@ export class LocalKnowledgeProvider {
         if (current.documentState !== 'open')
             throw finalizedConflict(current);
         const draft = normalizeDraft(input);
+        draft.group = input.group === undefined ? current.group ?? '' : this.resolveDocumentGroup(draft.knowledgeBaseId, normalizeDocumentGroup(input.group));
         if (this.db.prepare("SELECT id FROM knowledge_bases WHERE id=? AND status='active'").get(draft.knowledgeBaseId) === undefined) {
             throw notFound('active knowledge base', draft.knowledgeBaseId);
         }
@@ -829,9 +876,9 @@ export class LocalKnowledgeProvider {
         this.db.prepare(`
       UPDATE knowledge_entries SET
         knowledge_base_id=?,title=?,body=?,type=?,tags_json=?,scope_kind=?,scope_id=?,confidence=?,status='active',
-        version=?,content_hash=?,source_json=?,updated_at=?
+        version=?,content_hash=?,source_json=?,updated_at=?,document_group=?
       WHERE id=?
-    `).run(draft.knowledgeBaseId, draft.title, draft.body, draft.type, JSON.stringify(draft.tags), draft.scope.kind, draft.scope.kind === 'project' ? draft.scope.id : null, draft.confidence, entry.version, contentHash(draft), draft.source === undefined ? null : JSON.stringify(draft.source), timestamp, id);
+    `).run(draft.knowledgeBaseId, draft.title, draft.body, draft.type, JSON.stringify(draft.tags), draft.scope.kind, draft.scope.kind === 'project' ? draft.scope.id : null, draft.confidence, entry.version, contentHash(draft), draft.source === undefined ? null : JSON.stringify(draft.source), timestamp, draft.group, id);
         this.writeVersion(entry, changeKind);
         this.upsertFts(entry);
         return entry;
@@ -1091,9 +1138,11 @@ export class LocalKnowledgeProvider {
             }
             const entry = resolution.proposal.action === 'create'
                 ? this.insertEntry(resolution.proposal.draft)
-                : resolution.proposal.change?.kind === 'finalize'
-                    ? this.finalizeEntry(resolution.proposal.targetId, resolution.proposal.change.state, resolution.proposal.change.note)
-                    : this.updateEntry(resolution.proposal.targetId, resolution.proposal.draft, 'update');
+                : resolution.proposal.change?.kind === 'group'
+                    ? this.setEntryGroup(this.activeEntry(resolution.proposal.targetId), resolution.proposal.change.group)
+                    : resolution.proposal.change?.kind === 'finalize'
+                        ? this.finalizeEntry(resolution.proposal.targetId, resolution.proposal.change.state, resolution.proposal.change.note)
+                        : this.updateEntry(resolution.proposal.targetId, resolution.proposal.draft, 'update');
             const reviewedAt = nowIso();
             this.db.prepare('UPDATE knowledge_candidates SET status=?, reviewed_at=?, review_note=? WHERE id=?')
                 .run('approved', reviewedAt, resolution.outcome === 'merged'
@@ -1145,7 +1194,7 @@ export class LocalKnowledgeProvider {
             return { outcome: 'conflict', proposal };
         if (proposal.action === 'update') {
             const target = this.activeEntry(proposal.targetId);
-            if (target.documentState !== 'open')
+            if (target.documentState !== 'open' && proposal.change?.kind !== 'group')
                 return { outcome: 'finalized', entry: target };
             if (target.knowledgeBaseId !== proposal.draft.knowledgeBaseId) {
                 throw conflict('direct-write update cannot move knowledge between knowledge bases');
@@ -1158,7 +1207,7 @@ export class LocalKnowledgeProvider {
                 return { outcome: 'conflict', proposal: { ...proposal, action: 'conflict' } };
             }
             const draft = applied.draft;
-            if (proposal.change?.kind !== 'finalize' && contentHash(draft) === contentHash(target))
+            if (proposal.change?.kind === 'group' ? (draft.group ?? '') === (target.group ?? '') : proposal.change?.kind !== 'finalize' && contentHash(draft) === contentHash(target))
                 return { outcome: 'duplicate', entry: target };
             return { outcome: 'merged', proposal: { ...proposal, action: 'update', draft } };
         }
@@ -1238,7 +1287,17 @@ export class LocalKnowledgeProvider {
                 throw conflict(`candidate ${id} was already ${candidate.status}`);
             let draft = decision.draft === undefined ? candidate.draft : normalizeDraft(decision.draft);
             if (decision.decision === 'approve') {
-                if (candidate.change?.kind === 'finalize') {
+                if (candidate.change?.kind === 'group') {
+                    if (decision.draft !== undefined)
+                        throw conflict('分组候选不能替换正文，请拒绝后重新提交');
+                    const target = this.activeEntry(candidate.targetId);
+                    assertExpectedReviewVersion(target, decision.expectedVersion);
+                    const applied = applyCandidateToTarget(target, candidate, false);
+                    if (!applied.ok)
+                        throw conflict(applied.reason);
+                    touchedEntryId = this.setEntryGroup(target, candidate.change.group).id;
+                }
+                else if (candidate.change?.kind === 'finalize') {
                     if (decision.draft !== undefined)
                         throw conflict('结束候选不能替换正文，请拒绝后重新提交');
                     const target = this.activeEntry(candidate.targetId);
@@ -1507,6 +1566,7 @@ export class LocalKnowledgeProvider {
             body: entry.body,
             type: entry.type,
             tags: entry.tags,
+            group: entry.group ?? '',
             scope: entry.scope,
             confidence: entry.confidence,
             ...entry.source === undefined ? {} : { source: entry.source },
@@ -1591,14 +1651,14 @@ export class LocalKnowledgeProvider {
         this.db.prepare(`
       INSERT INTO knowledge_documents(
         id,knowledge_base_id,rel_path,title,content,entry_count,content_hash,
-        document_state,finalized_at,finalization_note,created_at,updated_at
-      ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)
+        document_state,finalized_at,finalization_note,created_at,updated_at,document_group
+      ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
       ON CONFLICT(id) DO UPDATE SET
         knowledge_base_id=excluded.knowledge_base_id,rel_path=excluded.rel_path,
         title=excluded.title,content=excluded.content,entry_count=excluded.entry_count,
         content_hash=excluded.content_hash,document_state=excluded.document_state,
         finalized_at=excluded.finalized_at,finalization_note=excluded.finalization_note,
-        updated_at=excluded.updated_at
+        updated_at=excluded.updated_at,document_group=excluded.document_group
       WHERE knowledge_documents.knowledge_base_id<>excluded.knowledge_base_id
          OR knowledge_documents.content_hash<>excluded.content_hash
          OR knowledge_documents.rel_path<>excluded.rel_path
@@ -1607,7 +1667,8 @@ export class LocalKnowledgeProvider {
          OR knowledge_documents.document_state<>excluded.document_state
          OR knowledge_documents.finalized_at IS NOT excluded.finalized_at
          OR knowledge_documents.finalization_note IS NOT excluded.finalization_note
-    `).run(entry.id, entry.knowledgeBaseId, relPath, entry.title, renderEntryContent(entry), 1, projectedHash, entry.documentState, entry.finalizedAt ?? null, entry.finalizationNote ?? null, entry.createdAt, entry.updatedAt);
+         OR knowledge_documents.document_group<>excluded.document_group
+    `).run(entry.id, entry.knowledgeBaseId, relPath, entry.title, renderEntryContent(entry), 1, projectedHash, entry.documentState, entry.finalizedAt ?? null, entry.finalizationNote ?? null, entry.createdAt, entry.updatedAt, entry.group ?? '');
     }
     async syncKnowledgeDocuments(knowledgeBaseId) {
         const baseRow = this.db.prepare('SELECT * FROM knowledge_bases WHERE id=?').get(knowledgeBaseId);
@@ -1660,6 +1721,7 @@ function renderEntryMarkdown(entry) {
             id: entry.id,
             type: entry.type,
             tags: entry.tags,
+            group: entry.group ?? '',
             scope: entry.scope,
             confidence: entry.confidence,
             status: entry.status,
@@ -1682,6 +1744,7 @@ function rowToEntry(row) {
     return {
         id: String(row.id),
         knowledgeBaseId: row.knowledge_base_id == null ? DEFAULT_KNOWLEDGE_BASE_ID : String(row.knowledge_base_id),
+        group: String(row.document_group ?? ''),
         title: String(row.title),
         body: String(row.body),
         type: String(row.type),
@@ -1704,6 +1767,7 @@ function rowToDocument(row) {
     return {
         id: String(row.id),
         knowledgeBaseId: String(row.knowledge_base_id),
+        group: String(row.document_group ?? ''),
         relPath: String(row.rel_path),
         title: String(row.title),
         content: String(row.content),
@@ -1720,6 +1784,7 @@ function rowToDocumentSummary(row) {
     return {
         id: String(row.id),
         knowledgeBaseId: String(row.knowledge_base_id),
+        group: String(row.document_group ?? ''),
         relPath: String(row.rel_path),
         title: String(row.title),
         entryCount: Number(row.entry_count),
@@ -1791,6 +1856,11 @@ function normalizeCandidateChange(input) {
         return undefined;
     if (input.kind === 'append')
         return { kind: 'append' };
+    if (input.kind === 'group') {
+        if (!Number.isSafeInteger(input.baseVersion) || input.baseVersion < 1)
+            throw new Error('分组 baseVersion 必须为正整数');
+        return { kind: 'group', baseVersion: input.baseVersion, group: normalizeDocumentGroup(input.group, true) };
+    }
     if (input.kind === 'finalize')
         return normalizeFinalizationChange(input);
     if (input.kind !== 'revise')
@@ -1833,6 +1903,11 @@ function mergeKnowledgeDraft(current, incoming, preferIncomingTitle) {
     });
 }
 function applyCandidateToTarget(current, proposal, preferIncomingTitle) {
+    if (proposal.change?.kind === 'group') {
+        if (current.version !== proposal.change.baseVersion || current.knowledgeBaseId !== proposal.draft.knowledgeBaseId)
+            return { ok: false, reason: '分组候选已过期，请重新读取文档后提交' };
+        return { ok: true, draft: { ...current, group: proposal.change.group } };
+    }
     if (proposal.change?.kind === 'finalize') {
         if (current.documentState !== 'open' || current.version !== proposal.change.baseVersion || contentHash(current) !== proposal.change.baseHash
             || current.knowledgeBaseId !== proposal.draft.knowledgeBaseId || contentHash(current) !== contentHash(proposal.draft)) {