refactor(kb): 文件主表 + 文档关联改用雪花ID（弃用按名关联）
把 sundynix_doc 明确为"文件主表"，补齐文件基础信息字段； 文档间 [[双链]] 改为以 Doc.ID 关联，查询/渲染一律按文件 ID。 store: - Doc 增 Ext(后缀)/MD5(内容指纹) 字段；ObjectKey 即"存放链接" - DocLink 由 (FromName,ToName) 改为 (FromID,ToID,ToName) · FromID/ToID 关联 Doc.ID；ToName 保留用于悬空链接展示与回填 - SaveDoc 返回新建/更新文件的雪花 ID（供建链） - 新增 GetDocByID（按 ID + owner 取正文，防越权） - ReplaceDocLinks 以 fromID 重建出链，按 [[名称]] 解析目标 ID - 新增 ResolveInboundLinks：目标入库后回填指向它的悬空链接 - ListLinks 只返回已解析(to_id 非空)的 ID→ID 边 - migrateDocLinkToID：旧按名双链表无 from_id 列则重建为按 ID 关联 gateway/handler: - runIngest 计算 ext/md5，SaveDoc 取回 ID 后建链 + 回填悬空 - KbDoc 改为 GET ?id=（按文件 ID 取全文） - KbVault 返回 id+ext；KbLinks 返回 from/to 为 ID desktop: - VaultDoc 增 id/ext；getDoc(docId) 按 ID 取正文 - VaultPanel 选中态/正文/反链/关系图改用 ID，名↔ID 双向映射 渲染；保存笔记后按名定位回其新 ID 验证（gateway+PG+MinIO 实测）：vault 带 id+ext；双链 ID→ID 且 A→B 悬空链接在 B 入库后成功回填；按 ID 取大文档(15006字)从 MinIO 完整取回；跨 owner 按 ID 取文档 404（隔离生效）。桌面端 文库 Tab 按 ID 选中/载入/反链渲染正常，无控制台报错。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blizzard
@@ -122,13 +122,15 @@ export async function createKb(id: Identity, name: string, kind: string): Promis
|
||||
}
|
||||
|
||||
export interface VaultDoc {
|
||||
id: string; // 文件主表雪花 ID —— 选中/取正文/关联一律用它
|
||||
name: string;
|
||||
ext?: string; // 文件后缀（.md/.pdf…；笔记为空）
|
||||
size?: number;
|
||||
preview?: string;
|
||||
}
|
||||
export interface DocLink {
|
||||
from: string;
|
||||
to: string;
|
||||
from: string; // 源文件 ID
|
||||
to: string; // 目标文件 ID
|
||||
}
|
||||
|
||||
// ---- 我的 Agent 编排（服务端保存，owner 隔离）----
|
||||
@@ -182,9 +184,9 @@ export async function listVault(id: Identity, kb: string): Promise<VaultDoc[]> {
|
||||
return data.docs ?? [];
|
||||
}
|
||||
|
||||
// getDoc: GET /api/v1/kb/doc —— 取单篇文档全文（按需加载，避免列表拉全量）。
|
||||
export async function getDoc(id: Identity, kb: string, name: string): Promise<string> {
|
||||
const res = await fetch(`${GATEWAY}/api/v1/kb/doc?kb=${encodeURIComponent(kb)}&name=${encodeURIComponent(name)}`, { headers: idHeaders(id) });
|
||||
// getDoc: GET /api/v1/kb/doc?id= —— 按文件 ID 取单篇全文（按需加载，避免列表拉全量）。
|
||||
export async function getDoc(id: Identity, docId: string): Promise<string> {
|
||||
const res = await fetch(`${GATEWAY}/api/v1/kb/doc?id=${encodeURIComponent(docId)}`, { headers: idHeaders(id) });
|
||||
const data = (await res.json()) as { content?: string; error?: string };
|
||||
if (!res.ok) throw new Error(data.error ?? `doc failed: ${res.status}`);
|
||||
return data.content ?? "";
|
||||
|
||||
@@ -451,13 +451,21 @@ function VaultPanel({ identity, kb }: { identity: Identity; kb: string }) {
|
||||
const [draftName, setDraftName] = useState("");
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
const load = useCallback(async () => {
|
||||
// sel 为文件主表雪花 ID（不再是文件名）—— 取正文/反链/关系图一律用 ID 关联。
|
||||
// preferName 给定时（如保存笔记后）按名定位到其新 ID。
|
||||
const load = useCallback(async (preferName?: string) => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const [d, lk] = await Promise.all([listVault(identity, kb), listLinks(identity, kb)]);
|
||||
setDocs(d);
|
||||
setLinks(lk);
|
||||
setSel((s) => (d.some((x) => x.name === s) ? s : d[0]?.name ?? null));
|
||||
setSel((s) => {
|
||||
if (preferName) {
|
||||
const hit = d.find((x) => x.name === preferName);
|
||||
if (hit) return hit.id;
|
||||
}
|
||||
return d.some((x) => x.id === s) ? s : d[0]?.id ?? null;
|
||||
});
|
||||
} catch {
|
||||
setDocs([]);
|
||||
setLinks([]);
|
||||
@@ -471,32 +479,40 @@ function VaultPanel({ identity, kb }: { identity: Identity; kb: string }) {
|
||||
setMode("read");
|
||||
}, [load]);
|
||||
|
||||
// 选中文档时按需取全文（不随列表一起拉）。
|
||||
// 选中文档时按 ID 取全文（不随列表一起拉）。
|
||||
useEffect(() => {
|
||||
if (!sel || editing) return;
|
||||
let alive = true;
|
||||
setLoadingDoc(true);
|
||||
getDoc(identity, kb, sel)
|
||||
getDoc(identity, sel)
|
||||
.then((c) => alive && setContent(c))
|
||||
.catch(() => alive && setContent(""))
|
||||
.finally(() => alive && setLoadingDoc(false));
|
||||
return () => {
|
||||
alive = false;
|
||||
};
|
||||
}, [sel, kb, identity, editing]);
|
||||
}, [sel, identity, editing]);
|
||||
|
||||
const names = new Set(docs.map((d) => d.name));
|
||||
const current = docs.find((d) => d.name === sel);
|
||||
// 名称↔ID 映射：[[双链]]按名书写、关系图按名展示，但选中/关联走 ID。
|
||||
const idToName = new Map(docs.map((d) => [d.id, d.name] as const));
|
||||
const nameToId = new Map(docs.map((d) => [d.name, d.id] as const));
|
||||
const current = docs.find((d) => d.id === sel);
|
||||
const open = (name: string) => {
|
||||
if (names.has(name)) {
|
||||
setSel(name);
|
||||
const id = nameToId.get(name);
|
||||
if (id) {
|
||||
setSel(id);
|
||||
setMode("read");
|
||||
setEditing(false);
|
||||
}
|
||||
};
|
||||
// 反链/笔记关系图来自服务端 [[双链]]索引，不扫全文。
|
||||
const backlinks = sel ? [...new Set(links.filter((l) => l.to === sel).map((l) => l.from))] : [];
|
||||
const noteTriples: Triple[] = links.filter((l) => names.has(l.from) && names.has(l.to)).map((l) => ({ s: l.from, p: "链接", o: l.to }));
|
||||
// 反链/笔记关系图来自服务端 [[双链]]索引（FromID→ToID），ID 关联、按名渲染，不扫全文。
|
||||
const backlinks = sel
|
||||
? [...new Set(links.filter((l) => l.to === sel).map((l) => idToName.get(l.from)).filter((n): n is string => !!n))]
|
||||
: [];
|
||||
const noteTriples: Triple[] = links
|
||||
.map((l) => ({ s: idToName.get(l.from), o: idToName.get(l.to) }))
|
||||
.filter((e): e is { s: string; o: string } => !!e.s && !!e.o)
|
||||
.map((e) => ({ s: e.s, p: "链接", o: e.o }));
|
||||
|
||||
const startNew = () => {
|
||||
setCreatingNew(true);
|
||||
@@ -524,8 +540,7 @@ function VaultPanel({ identity, kb }: { identity: Identity; kb: string }) {
|
||||
setEditing(false);
|
||||
setCreatingNew(false);
|
||||
setContent(draft);
|
||||
setSel(name);
|
||||
setTimeout(() => void load(), 400);
|
||||
setTimeout(() => void load(name), 400);
|
||||
} catch (e) {
|
||||
toast.push("error", (e as Error).message);
|
||||
} finally {
|
||||
@@ -543,19 +558,24 @@ function VaultPanel({ identity, kb }: { identity: Identity; kb: string }) {
|
||||
<button onClick={startNew} className="ml-auto text-slate-500 hover:text-brand-400" title="新建笔记">
|
||||
<Plus className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
<button onClick={load} className="text-slate-600 hover:text-slate-300" title="刷新">
|
||||
<button onClick={() => void load()} className="text-slate-600 hover:text-slate-300" title="刷新">
|
||||
<RefreshCw className={cn("h-3.5 w-3.5", loading && "animate-spin")} />
|
||||
</button>
|
||||
</div>
|
||||
<ul className="space-y-0.5">
|
||||
{docs.map((d) => (
|
||||
<li key={d.name}>
|
||||
<li key={d.id}>
|
||||
<button
|
||||
onClick={() => open(d.name)}
|
||||
className={cn("flex w-full items-center gap-1.5 rounded px-2 py-1.5 text-left text-xs", d.name === sel ? "bg-brand/15 text-brand-400" : "text-slate-300 hover:bg-ink-800")}
|
||||
onClick={() => {
|
||||
setSel(d.id);
|
||||
setMode("read");
|
||||
setEditing(false);
|
||||
}}
|
||||
className={cn("flex w-full items-center gap-1.5 rounded px-2 py-1.5 text-left text-xs", d.id === sel ? "bg-brand/15 text-brand-400" : "text-slate-300 hover:bg-ink-800")}
|
||||
>
|
||||
<FileText className="h-3.5 w-3.5 shrink-0" />
|
||||
<span className="truncate" title={d.name}>{d.name}</span>
|
||||
{d.ext && <span className="ml-auto shrink-0 text-[9px] uppercase text-slate-600">{d.ext.replace(/^\./, "")}</span>}
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user