@steve02081504/fount-p2p 0.0.38 → 0.0.40

package/AGENTS.md

@@ -58,7 +58,7 @@ Deno / native / BT: [runtime.md](docs/runtime.md).
 - **Fanout vs targeted / timed collect:** [wire.md](docs/wire.md).
 - **Channel encryption:** per-channel `K_ch`, scheme `channel-key` (`CHANNEL_KEY_SCHEME`); decrypted payloads are untrusted outside DAG Ed25519 context.
 - **Denylist vs personal lists:** node `denylist.json` vs per-entity `personal_block.json` / `personal_hide.json`.
-- **Manifest ACL / transfer owner / servicer:** shells register matchers and `registerManifestServicer`; core does not hard-code chat/social types. Non-public manifests are served cross-node only via a registered servicer (default deny).
+- **Manifest ACL / transfer owner / servicer:** ownership is routed by `registerManifestOwner` matchers only; ACL & servicer handlers are keyed by `ownerId` (a `type` may be reused across families but never acts as a routing key). Core does not hard-code chat/social types. Non-public manifests are served cross-node only via a registered servicer; unclaimed non-public is denied (no `type` fallback).
 
 ### Node / network
 

package/docs/evfs.md

@@ -9,6 +9,17 @@ Day-to-day package rules: [AGENTS.md](../AGENTS.md). Implementation: `files/` (`
 | Ciphertext chunks (CAS) | `{nodeDir}/chunks/` |
 | Manifests | `{EntityStoreRoot}/{entityHash}/files/{path}.manifest.json` |
 
+## Chunk garbage collection
+
+Chunk store is content-addressed and **write-only**: overwriting or deleting a file only rewrites/removes the manifest, old blocks stay behind forever. Reclamation is explicit, via `files/gc.mjs`:
+
+- `mapChunkGarbage()` — read-only scan. Root set = the `parts[].hash` of **every** on-disk manifest (local writes, public cache, targeted non-public cache). Returns `{ manifests, brokenManifests, referenced, candidates: [{hash,size}], freedBytes }` plus zeroed delete counters. No side effects.
+- `cleanChunkGarbage({ targets? })` — with `targets` (hashes or `{hash}`) it removes only that set without scanning and without touching manifests; without `targets` it scans, deletes every orphan chunk, and auto-removes manifests that fail `normalizeFileManifest` (reported as `brokenDeleted`).
+- `deleteFileManifest(ownerEntityHash, logicalPath)` — explicit manifest delete (orphans its chunks for the next GC); requires the entity store to implement `deleteManifest`.
+- `deleteChunk(hash)` — standalone primitive (deleting a chunk that is still referenced by a manifest breaks the file).
+
+Concurrency: `putChunk` / `putChunkFromStream` / `deleteChunk` / the GC delete phase share one in-process mutex (`withChunkStoreLock`), so a GC never unlinks a block mid-write. Unlink is best-effort on ENOENT and skips EBUSY/EPERM (Windows open-handle = block is being streamed; retried next GC). Lock is process-local — do not run GC in a second process against the same `nodeDir`.
+
 ## Public publish / verify
 
 - `publishPublicFile` signs with the recovery key.
@@ -22,6 +33,7 @@ Day-to-day package rules: [AGENTS.md](../AGENTS.md). Implementation: `files/` (`
 | --- | --- |
 | Default options | Node-scope fanout; **only** signed public manifests accepted; no cache write |
 | Local public hit with `publicSig` | Return immediately; fanout revalidates in the background. With `cache: true`, write only when remote `publishedAt` is newer |
+| `revalidate: true` on local public hit | Block until the fanout settles; prefer the newer `publishedAt` (write back when `cache: true`), else fall back to the local copy (offline-safe) |
 | Local non-public hit | Return immediately (**targeted mode only**); no revalidation (no publish order to compare); public mode refuses non-public local |
 | `fanoutTargets` given | Fanout **only** to that node set; accepts signed public **or** normalized non-public manifests; non-public hit is cached locally by default |
 | Same key in flight | Deduped via `utils/inflight_table` (key includes `public`/`targeted` mode) |
@@ -32,10 +44,13 @@ Outer caller timeouts must **not** abort the in-flight work — background fill
 
 - `file-master-key-wrap` / `vault-wrap` / `identity-wrap` manifests carry no author signature, so the remote-acquisition trust boundary is **not** a signature — it is the **fanout target set** plus the **serving node's authorization**.
 - Client: the caller passes the authorized node set (group roster / cabinet members) as `fanoutTargets`. `fed_manifest_get` is sent only to those nodes; a response is accepted when it normalizes, its `ownerEntityHash`+`logicalPath` match the request, and its authenticated `senderNodeHash` belongs to the target set.
-- Server: `handleIncomingManifestGet` refuses non-public manifests unless a **servicer** is registered for the type. Shells call `registerManifestServicer(type, ownerId, handler)`; the handler receives `{ manifest, ownerEntityHash, logicalPath, requesterNodeHash, peerId, payload }` and returns a boolean. `requesterNodeHash` is **always** the transport-authenticated sender nodeHash (`peerId`); the client no longer self-asserts a `nodeHash` in `fed_manifest_get`, so the fanout target node can never be mistaken for the requester — authorization must still be enforced from the trust graph / group membership.
+- Server: `handleIncomingManifestGet` refuses non-public manifests unless a **servicer** is registered for the matched owner family. Shells call `registerManifestOwner(ownerId, match)` to claim ownership and `registerManifestServicer(ownerId, handler)` to serve; the handler receives `{ manifest, ownerEntityHash, logicalPath, requesterNodeHash, peerId, payload }` and returns a boolean. `requesterNodeHash` is **always** the transport-authenticated sender nodeHash (`peerId`); the client no longer self-asserts a `nodeHash` in `fed_manifest_get`, so the fanout target node can never be mistaken for the requester — authorization must still be enforced from the trust graph / group membership.
 - Non-public responses carry the **full manifest including `meta`** (public responses strip meta to `publicSig`): the reader needs `meta.dagParts` / `meta.groupId` to read DAG plaintext.
 - Confidentiality does not rely on manifest secrecy: ciphertext blocks are content-addressed, AES-GCM authenticated, and decryption requires a wrap key held by the shell. A forged manifest can at worst fail the read (DoS), never decrypt content.
 
-## ACL
+## ACL & owner routing
 
-Shells register matchers via the ACL registry. Core does not hard-code chat/social entity types.
+- Ownership is decided **only** by matchers: `registerManifestOwner(ownerId, match)` with `match(manifest, ownerEntityHash)` returning a boolean. `transferKeyDescriptor.type` is **not** a routing key — the same type (e.g. `file-master-key-wrap`) may be reused by several families (chat group, cabinet shared, vault, …).
+- Matchers must be mutually exclusive: a manifest belongs to exactly one family; resolution is first-match in registration order. A broad matcher that claims another family's entities will shadow them, so matchers should key on their own entity namespace (e.g. the `fount:chat:group:` prefix).
+- Local read/write ACL (`registerManifestAcl(ownerId, handler)`) and cross-node serve (`registerManifestServicer(ownerId, handler)`) are both keyed by `ownerId` (same `ownerId` as `registerTransferKeyDependencies`). A claimed family with no handler denies (fail-closed); an unclaimed non-public manifest is denied cross-node — there is no `type` fallback.
+- Core does not hard-code chat/social entity types.

package/files/chunk/store.mjs

@@ -7,6 +7,21 @@ import { pipeline } from 'node:stream/promises'
 import { isHex64 } from '../../core/hexIds.mjs'
 import { trackFileStream } from '../../node/handles.mjs'
 import { getNodeDir } from '../../node/instance.mjs'
+import { withAsyncMutex } from '../../utils/async_mutex.mjs'
+
+/** chunk store 互斥键：GC 删除与写入互斥。 */
+const CHUNK_STORE_LOCK_KEY = 'chunk-store'
+
+/**
+ * chunk store 全局互斥锁（进程内）。GC 删除阶段与 `putChunk`/`putChunkFromStream` 共用，
+ * 避免「GC unlink 与写入竞争」。单进程假设，不跨进程。
+ * @template T
+ * @param {() => Promise<T>} criticalSection 临界区
+ * @returns {Promise<T>} 临界区返回值
+ */
+export function withChunkStoreLock(criticalSection) {
+	return withAsyncMutex(CHUNK_STORE_LOCK_KEY, criticalSection)
+}
 
 /**
  * @returns {string} `{nodeDir}/chunks`
@@ -60,9 +75,7 @@ export function createChunkReadStream(hash) {
  * @returns {Promise<void>}
  */
 export async function putChunk(hash, data) {
-	const filePath = chunkStorePath(hash)
-	await fsp.mkdir(dirname(filePath), { recursive: true })
-	await fsp.writeFile(filePath, Buffer.from(data))
+	return withChunkStoreLock(() => writeChunkFile(hash, Buffer.from(data)))
 }
 
 /**
@@ -71,7 +84,49 @@ export async function putChunk(hash, data) {
  * @returns {Promise<void>}
  */
 export async function putChunkFromStream(hash, readable) {
+	return withChunkStoreLock(async () => {
+		const filePath = chunkStorePath(hash)
+		await fsp.mkdir(dirname(filePath), { recursive: true })
+		await pipeline(readable, trackFileStream(fs.createWriteStream(filePath)))
+	})
+}
+
+/**
+ * @param {string} hash 64 位十六进制
+ * @param {string | Buffer | Uint8Array} data 块数据
+ * @returns {Promise<void>} 直接写文件（无锁；调用方须持 `withChunkStoreLock`）
+ */
+async function writeChunkFile(hash, data) {
 	const filePath = chunkStorePath(hash)
 	await fsp.mkdir(dirname(filePath), { recursive: true })
-	await pipeline(readable, trackFileStream(fs.createWriteStream(filePath)))
+	await fsp.writeFile(filePath, data)
+}
+
+/**
+ * @param {string} hash 64 位十六进制
+ * @returns {Promise<{ deleted: boolean, size: number }>} 删除结果；`deleted:false` 表示仍在被读（Windows open-handle）
+ */
+export async function unlinkChunkFile(hash) {
+	const filePath = chunkStorePath(hash)
+	try {
+		const { size } = await fsp.stat(filePath)
+		await fsp.unlink(filePath)
+		return { deleted: true, size }
+	}
+	catch (error) {
+		const code = /** @type {NodeJS.ErrnoException} */ error.code
+		if (code === 'ENOENT') return { deleted: true, size: 0 }
+		// Windows 上文件被读流打开时 unlink 会 EBUSY/EPERM——视为仍在使用，留给下次 GC。
+		if (code === 'EBUSY' || code === 'EPERM') return { deleted: false, size: 0 }
+		throw error
+	}
+}
+
+/**
+ * 删除单个 chunk（带互斥锁）。重复删除视为成功。
+ * @param {string} hash 64 位十六进制
+ * @returns {Promise<{ deleted: boolean, size: number }>} 删除结果
+ */
+export async function deleteChunk(hash) {
+	return withChunkStoreLock(() => unlinkChunkFile(hash))
 }

package/files/evfs.mjs

@@ -67,6 +67,20 @@ export async function saveFileManifest(manifest) {
 	await getEntityStore().writeManifest(manifest.ownerEntityHash, manifest.logicalPath, manifest)
 }
 
+/**
+ * 删除本机已写盘 manifest；其引用的 chunk 孤儿化后由 `cleanChunkGarbage` 回收。
+ * @param {string} ownerEntityHash 所有者
+ * @param {string} logicalPath 路径
+ * @returns {Promise<void>} 删除成功或不存在
+ */
+export async function deleteFileManifest(ownerEntityHash, logicalPath) {
+	const entityStore = getEntityStore()
+	if (entityStore.deleteManifest)
+		await entityStore.deleteManifest(ownerEntityHash, logicalPath)
+	else
+		throw new Error('entityStore lacks deleteManifest')
+}
+
 /**
  * @param {import('./manifest/normalize.mjs').FileManifest} manifest 清单
  * @param {Array<Buffer | Uint8Array>} partBytes 密文块
@@ -218,7 +232,7 @@ export async function putFileManifestFromStream(parameters) {
  * @param {string} replicaUsername 副本用户名
  * @param {string} entityHash owner entityHash
  * @param {string} logicalPath EVFS 逻辑路径
- * @param {{ username?: string, fetchChunk?: Function }} [options] miss 拉取
+ * @param {{ username?: string, fetchChunk?: Function, revalidate?: boolean }} [options] miss 拉取；`revalidate` 强制阻塞等待 fanout 择新
  * @returns {Promise<Buffer | null>} 明文或 null
  */
 export async function readPublicFile(replicaUsername, entityHash, logicalPath, options = {}) {
@@ -228,6 +242,7 @@ export async function readPublicFile(replicaUsername, entityHash, logicalPath, o
 		ownerEntityHash: entityHash,
 		logicalPath,
 		cache: true,
+		revalidate: options.revalidate === true,
 	})
 	if (!manifest) return null
 	return readManifestPlaintext(replicaUsername, manifest, options)

package/files/gc.mjs

@@ -0,0 +1,192 @@
+import fsp from 'node:fs/promises'
+import { join } from 'node:path'
+
+import { isHex64 } from '../core/hexIds.mjs'
+import { getEntityStore, getNodeLogger } from '../node/instance.mjs'
+
+import {
+	chunkStoreRoot,
+	unlinkChunkFile,
+	withChunkStoreLock,
+} from './chunk/store.mjs'
+import { normalizeFileManifest } from './manifest/normalize.mjs'
+
+/**
+ * @typedef {{ hash: string, size: number }} GcChunkTarget
+ */
+
+/**
+ * @typedef {{
+ *   manifests: number,
+ *   brokenManifests: Array<{ ownerEntityHash: string, logicalPath: string }>,
+ *   referenced: number,
+ *   candidates: Array<GcChunkTarget>,
+ *   deleted: number,
+ *   retained: number,
+ *   freedBytes: number,
+ *   brokenDeleted: number,
+ * }} GarbageCollectionReport
+ */
+
+/**
+ * 纯读扫描：以全部写盘 manifest 的 `parts[].hash` 为根集，枚举 `chunks/` 孤儿块与坏 manifest。
+ * 无副作用（不删文件）。
+ * @returns {Promise<GarbageCollectionReport>} 扫描报告
+ */
+async function scanChunkGarbage() {
+	const entityStore = getEntityStore()
+	const referenced = new Set()
+	const brokenManifests = []
+	let manifests = 0
+
+	const entityHashes = await entityStore.listEntityHashes()
+	for (const entityHash of entityHashes) {
+		const logicalPaths = await entityStore.listEntityFiles(entityHash)
+		for (const logicalPath of logicalPaths) {
+			manifests++
+			const raw = await entityStore.readManifest(entityHash, logicalPath)
+			const normalized = normalizeFileManifest(raw)
+			if (!normalized) {
+				brokenManifests.push({ ownerEntityHash: entityHash, logicalPath })
+				continue
+			}
+			for (const part of normalized.parts)
+				referenced.add(part.hash)
+		}
+	}
+
+	/** @type {GcChunkTarget[]} */
+	const candidates = []
+	let freedBytes = 0
+	let prefixEntries
+	try {
+		prefixEntries = await fsp.readdir(chunkStoreRoot(), { withFileTypes: true })
+	}
+	catch {
+		prefixEntries = []
+	}
+	for (const prefixEntry of prefixEntries) {
+		if (!prefixEntry.isDirectory() || prefixEntry.name.length !== 2) continue
+		let files
+		try {
+			files = await fsp.readdir(join(chunkStoreRoot(), prefixEntry.name))
+		}
+		catch { continue }
+		for (const name of files) {
+			if (!name.endsWith('.bin')) continue
+			const hash = name.slice(0, -4)
+			if (!isHex64(hash) || referenced.has(hash)) continue
+			const size = await chunkFileSize(join(chunkStoreRoot(), prefixEntry.name, name))
+			candidates.push({ hash, size })
+			freedBytes += size
+		}
+	}
+
+	return {
+		manifests,
+		brokenManifests,
+		referenced: referenced.size,
+		candidates,
+		deleted: 0,
+		retained: 0,
+		freedBytes,
+		brokenDeleted: 0,
+	}
+}
+
+/**
+ * @param {string} filePath chunk 文件绝对路径
+ * @returns {Promise<number>} 文件字节数；stat 失败为 0
+ */
+async function chunkFileSize(filePath) {
+	try {
+		const { size } = await fsp.stat(filePath)
+		return size
+	}
+	catch { return 0 }
+}
+
+/**
+ * 持锁删除一批 chunk，统计删除结果并顺带清理已空前缀目录。
+ * @param {string[]} hashes 待删 64 位 hex 集合
+ * @returns {Promise<{ deleted: number, retained: number, freedBytes: number }>} 删除结果统计
+ */
+async function removeChunkHashes(hashes) {
+	let deleted = 0
+	let retained = 0
+	let freedBytes = 0
+	const emptiedPrefixes = new Set()
+	await withChunkStoreLock(async () => {
+		for (const hash of hashes) {
+			const result = await unlinkChunkFile(hash)
+			if (result.deleted) {
+				deleted++
+				freedBytes += result.size
+				emptiedPrefixes.add(hash.slice(0, 2))
+			}
+			else retained++
+		}
+		for (const prefix of emptiedPrefixes) try {
+			await fsp.rmdir(join(chunkStoreRoot(), prefix))
+		} catch { /* 目录非空或已被删，忽略 */ }
+	})
+	return { deleted, retained, freedBytes }
+}
+
+/**
+ * 扫描并报告 chunk 垃圾（只读，不删除）。
+ * 根集 = 全部写盘 manifest 的 `parts[].hash`（含公共/非 public 缓存）；`chunks/` 中不在根集的可回收。
+ * @returns {Promise<GarbageCollectionReport>} 统计报告
+ */
+export async function mapChunkGarbage() {
+	return scanChunkGarbage()
+}
+
+/**
+ * 清理 chunk 垃圾。缺省 `targets` 时先扫描再删除（并自动清除扫描到的坏 manifest）；
+ * 提供 `targets` 时只按给定集合删除，不做扫描、不碰 manifest。
+ * @param {{ targets?: Array<string | GcChunkTarget> }} [options] 可选显式目标集
+ * @returns {Promise<GarbageCollectionReport>} 执行报告
+ */
+export async function cleanChunkGarbage(options = {}) {
+	const targets = Array.isArray(options.targets)
+
+	/** @type {string[]} */
+	let hashes
+	if (targets) {
+		hashes = options.targets.map(target => {
+			const hash = typeof target === 'string' ? target : target?.hash
+			if (!isHex64(hash)) throw new Error(`cleanChunkGarbage: invalid chunk hash ${hash}`)
+			return hash
+		})
+		const { deleted, retained, freedBytes } = await removeChunkHashes(hashes)
+		return {
+			manifests: 0,
+			brokenManifests: [],
+			referenced: 0,
+			candidates: hashes.map(hash => ({ hash, size: 0 })),
+			deleted,
+			retained,
+			freedBytes,
+			brokenDeleted: 0,
+		}
+	}
+
+	const snapshot = await scanChunkGarbage()
+	const entityStore = getEntityStore()
+	const logger = getNodeLogger()
+	let brokenDeleted = 0
+	if (snapshot.brokenManifests.length) {
+		for (const broken of snapshot.brokenManifests) {
+			if (!entityStore.deleteManifest) break
+			await entityStore.deleteManifest(broken.ownerEntityHash, broken.logicalPath)
+			brokenDeleted++
+		}
+		logger?.info?.(`chunk GC: removed ${brokenDeleted} broken manifest(s)`)
+	}
+
+	const { deleted, retained, freedBytes } = await removeChunkHashes(
+		snapshot.candidates.map(candidate => candidate.hash),
+	)
+	return { ...snapshot, deleted, retained, freedBytes, brokenDeleted }
+}

package/files/manifest/acl.mjs

@@ -1,38 +1,67 @@
 import { isLogicalEntityHash } from '../../core/logical_entity.mjs'
 import { isWritableLocalEntity } from '../../node/identity.mjs'
 
-import { checkManifestAcl, resolveManifestAclType } from './acl_registry.mjs'
+import { resolveManifestOwner } from './routing.mjs'
 
 /**
+ * @typedef {{
+ *   replicaUsername: string,
+ *   ownerEntityHash: string,
+ *   manifest: import('./normalize.mjs').FileManifest | object,
+ * }} ManifestAclContext
+ */
+
+/** @type {Map<string, (context: ManifestAclContext, logicalPath?: string) => Promise<boolean>>} */
+const aclHandlers = new Map()
+
+/**
+ * 注册本族 manifest 的本地读写授权判定（ownerId 须与 registerManifestOwner 一致）。
+ * @param {string} ownerId 注册方
+ * @param {(context: ManifestAclContext, logicalPath?: string) => Promise<boolean>} handler 授权判定
+ * @returns {void}
+ */
+export function registerManifestAcl(ownerId, handler) {
+	aclHandlers.set(ownerId, handler)
+}
+
+/**
+ * @param {string} ownerId 注册方
+ * @returns {void}
+ */
+export function unregisterManifestAcl(ownerId) {
+	aclHandlers.delete(ownerId)
+}
+
+/**
+ * 本地读授权：仅认 matcher 结果——命中族须注册 ACL handler，否则 deny。
  * @param {string} replicaUsername 请求 replica
  * @param {string} ownerEntityHash 文件 owner
  * @param {import('./normalize.mjs').FileManifest} manifest 清单
  * @returns {Promise<boolean>} 是否允许读
  */
 export async function canReadManifest(replicaUsername, ownerEntityHash, manifest) {
-	const type = resolveManifestAclType(manifest, ownerEntityHash)
-	if (type)
-		return checkManifestAcl(type, { replicaUsername, ownerEntityHash, manifest })
-
-	if (isLogicalEntityHash(ownerEntityHash))
+	const ownerId = resolveManifestOwner(manifest, ownerEntityHash)
+	if (ownerId) {
+		const handler = aclHandlers.get(ownerId)
+		if (handler) return handler({ replicaUsername, ownerEntityHash, manifest })
 		return false
-
-	return true
+	}
+	return !isLogicalEntityHash(ownerEntityHash)
 }
 
 /**
+ * 本地写授权：仅认 matcher 结果（写路径无 manifest，只按 ownerEntityHash 判定）。
  * @param {string} replicaUsername 请求 replica
  * @param {string} ownerEntityHash 所有者
  * @param {string} logicalPath 路径
  * @returns {Promise<boolean>} 是否允许写
  */
 export async function canWriteManifestPath(replicaUsername, ownerEntityHash, logicalPath) {
-	const type = resolveManifestAclType(null, ownerEntityHash)
-	if (type)
-		return checkManifestAcl(type, { replicaUsername, ownerEntityHash, manifest: /** @type {any} */ {} }, logicalPath)
-
-	if (isLogicalEntityHash(ownerEntityHash))
+	const ownerId = resolveManifestOwner(null, ownerEntityHash)
+	if (ownerId) {
+		const handler = aclHandlers.get(ownerId)
+		if (handler) return handler({ replicaUsername, ownerEntityHash, manifest: {} }, logicalPath)
 		return false
-
-	return isWritableLocalEntity(ownerEntityHash)
+	}
+	return !isLogicalEntityHash(ownerEntityHash) && isWritableLocalEntity(ownerEntityHash)
 }

package/files/manifest/fetch.mjs

@@ -8,7 +8,6 @@ import { loadFileManifest, saveFileManifest } from '../evfs.mjs'
 import { beginFedFanoutFetch } from '../fed/fetch_shared.mjs'
 import { canonicalizeFanoutTargets } from '../fetch_fanout.mjs'
 
-import { resolveManifestAclType } from './acl_registry.mjs'
 import { normalizeFileManifest } from './normalize.mjs'
 import {
 	manifestFetchExpectedKey,
@@ -16,6 +15,7 @@ import {
 	registerManifestFetchWait,
 } from './pending.mjs'
 import { shouldPreferIncomingPublicManifest } from './public.mjs'
+import { resolveManifestOwner } from './routing.mjs'
 import { getManifestServicer } from './servicer_registry.mjs'
 
 const DEFAULT_MANIFEST_FETCH_TIMEOUT_MS = ms('8s')
@@ -30,9 +30,10 @@ const manifestInflight = createInflightTable({
  * 拉取 manifest。默认走 node-scope public 语义（仅接受验签公开 manifest）；
  * 传入 `fanoutTargets` 时只向目标集 fanout，并接受无签名的非 public manifest（信任边界 = 目标集 + 服务端 servicer）。
  * 非 public 命中默认写盘；public 按 `cache: true` 择新写盘。
- * 本地已验签公开缓存立即返回（`cache: true` 时后台 fanout 刷新）；非 public / 未验签 public 本地命中仅 targeted 模式返回，
- * public 模式拒绝。同 key（含规范化目标集）in-flight 去重；调用方外层超时不 abort，后台继续填缓存。
- * @param {{ username: string, ownerEntityHash: string, logicalPath: string, fanoutTargets?: string[], cache?: boolean, timeoutMs?: number }} context - 拉取上下文
+ * 本地已验签公开缓存默认立即返回（`cache: true` 时后台 fanout 刷新）；`revalidate: true` 时改为阻塞等待本次 fanout 择新，
+ * 无新则回退本地。非 public / 未验签 public 本地命中仅 targeted 模式返回，public 模式拒绝。
+ * 同 key（含规范化目标集）in-flight 去重；调用方外层超时不 abort，后台继续填缓存。
+ * @param {{ username: string, ownerEntityHash: string, logicalPath: string, fanoutTargets?: string[], cache?: boolean, revalidate?: boolean, timeoutMs?: number }} context - 拉取上下文
  * @returns {Promise<import('./normalize.mjs').FileManifest | null>} 校验后的 manifest，失败为 null
  */
 export async function fetchManifest(context) {
@@ -40,6 +41,7 @@ export async function fetchManifest(context) {
 	const logicalPath = context.logicalPath.replace(/^\/+/, '')
 	if (!ownerEntityHash || !logicalPath || !username) return null
 
+	const revalidate = context.revalidate === true
 	const timeoutMs = Number(context.timeoutMs) > 0
 		? Number(context.timeoutMs)
 		: DEFAULT_MANIFEST_FETCH_TIMEOUT_MS
@@ -78,10 +80,18 @@ export async function fetchManifest(context) {
 	})
 	const local = await localPromise
 
-	// 本地已验签公开命中：立即返回；cache: true 时后台 fanout 择新刷新。
+	// 本地已验签公开命中：默认立即返回，cache: true 时后台 fanout 择新刷新；
+	// revalidate: true 时阻塞等待本次 fanout，取新择旧并写回，fanout 无新（含超时）则回退本地。
 	const isLocalPublic = local?.transferKeyDescriptor?.type === 'public' && !!local?.meta?.publicSig
 	if (isLocalPublic) {
-		if (wantCache && shared) void shared.then(async result => {
+		if (shared && revalidate) {
+			const result = await shared
+			if (result && shouldPreferIncomingPublicManifest(local, result)) {
+				if (wantCache) await cachePublicManifest(ownerEntityHash, logicalPath, result)
+				return result
+			}
+		}
+		else if (wantCache && shared) void shared.then(async result => {
 			if (result && shouldPreferIncomingPublicManifest(local, result))
 				await cachePublicManifest(ownerEntityHash, logicalPath, result)
 		})
@@ -153,9 +163,9 @@ export async function handleIncomingManifestGet(payload, sendResponse, peerId) {
 		return
 	}
 
-	// 非 public：ACL servicer 授权后回完整 manifest（读侧解密依赖 meta.dagParts / groupId）。
-	const aclType = resolveManifestAclType(manifest, ownerEntityHash) || manifest.transferKeyDescriptor.type
-	const servicer = getManifestServicer(aclType)
+	// 非 public：仅认 matcher 命中的族 servicer（无 matcher 即 deny，不按 transferKeyDescriptor.type 兜底路由）。
+	const ownerId = resolveManifestOwner(manifest, ownerEntityHash)
+	const servicer = getManifestServicer(ownerId)
 	if (!servicer) return
 	const allowed = await servicer({
 		manifest,

package/files/manifest/routing.mjs

@@ -0,0 +1,38 @@
+/**
+ * Manifest 族路由：matcher 声明「该 manifest / 实体归哪个族（ownerId）所有」。
+ * matcher 是唯一路由依据（注册序先命中者）；`transferKeyDescriptor.type` 可被多族复用、不参与路由。
+ * 族间 matcher 必须互斥，否则按注册顺序先到先得。
+ */
+
+/** @type {Array<{ ownerId: string, match: (manifest: import('./normalize.mjs').FileManifest | null, ownerEntityHash: string) => boolean }>} */
+const owners = []
+
+/**
+ * @param {string} ownerId 注册方
+ * @param {(manifest: import('./normalize.mjs').FileManifest | null, ownerEntityHash: string) => boolean} match 归属判定
+ * @returns {void}
+ */
+export function registerManifestOwner(ownerId, match) {
+	owners.push({ ownerId, match })
+}
+
+/**
+ * @param {string} ownerId 注册方
+ * @returns {void}
+ */
+export function unregisterManifestOwner(ownerId) {
+	for (let index = owners.length - 1; index >= 0; index--)
+		if (owners[index].ownerId === ownerId) owners.splice(index, 1)
+}
+
+/**
+ * 解析 manifest 归属族；无命中为 null（非 public 跨节点即 deny）。
+ * @param {import('./normalize.mjs').FileManifest | null} manifest manifest（写路径可空）
+ * @param {string} ownerEntityHash 所有者
+ * @returns {string | null} 族 id
+ */
+export function resolveManifestOwner(manifest, ownerEntityHash) {
+	for (const { ownerId, match } of owners)
+		if (match(manifest, ownerEntityHash)) return ownerId
+	return null
+}

package/files/manifest/servicer_registry.mjs

@@ -1,51 +1,43 @@
 /**
- * Manifest servicer 注册表：按 ACL 类型路由，决定跨节点是否对外提供非 public manifest。
- * 服务端缺省 deny；未注册的类型直接不响应 fed_manifest_get。
+ * Manifest servicer 注册表：按族（ownerId）路由，决定跨节点是否对外提供非 public manifest。
+ * type 可被多族复用；路由只经 registerManifestOwner 的 matcher 唯一命中。服务端缺省 deny。
  */
 
-/** @type {Map<string, { ownerId: string, handler: (context: ManifestServicerContext) => Promise<boolean> | boolean }>} */
-const servicersByType = new Map()
+/** @type {Map<string, (context: ManifestServicerContext) => Promise<boolean> | boolean>} */
+const servicersByOwner = new Map()
 
 /**
  * @typedef {{
- *   manifest: import('./normalize.mjs').FileManifest,
- *   ownerEntityHash: string,
- *   logicalPath: string,
- *   requesterNodeHash: string,
- *   peerId: string,
- *   payload: object,
+ * 	manifest: import('./normalize.mjs').FileManifest,
+ * 	ownerEntityHash: string,
+ * 	logicalPath: string,
+ * 	requesterNodeHash: string,
+ * 	peerId: string,
+ * 	payload: object,
  * }} ManifestServicerContext
  */
 
 /**
- * @param {string} type ACL 类型（如 vault-wrap、file-master-key-wrap，或 resolveManifestAclType 匹配结果）
- * @param {string} ownerId 注册方
+ * @param {string} ownerId 注册方（族，须与 registerManifestOwner 一致）
  * @param {(context: ManifestServicerContext) => Promise<boolean> | boolean} handler 授权判定
  * @returns {void}
  */
-export function registerManifestServicer(type, ownerId, handler) {
-	const existing = servicersByType.get(type)
-	if (existing && existing.ownerId !== ownerId)
-		throw new Error(`manifest servicer for '${type}' already registered by '${existing.ownerId}'`)
-	servicersByType.set(type, { ownerId, handler })
+export function registerManifestServicer(ownerId, handler) {
+	servicersByOwner.set(ownerId, handler)
 }
 
 /**
- * @param {string} type ACL 类型
  * @param {string} ownerId 注册方
  * @returns {void}
  */
-export function unregisterManifestServicer(type, ownerId) {
-	const existing = servicersByType.get(type)
-	if (!existing) return
-	if (existing.ownerId === ownerId)
-		servicersByType.delete(type)
+export function unregisterManifestServicer(ownerId) {
+	servicersByOwner.delete(ownerId)
 }
 
 /**
- * @param {string} type ACL 类型
+ * @param {string} ownerId 族 id
  * @returns {(context: ManifestServicerContext) => Promise<boolean> | boolean | undefined} 已注册 handler
  */
-export function getManifestServicer(type) {
-	return servicersByType.get(type)?.handler
+export function getManifestServicer(ownerId) {
+	return servicersByOwner.get(ownerId)
 }

package/files/transfer_key_registry.mjs

@@ -1,3 +1,5 @@
+import { resolveManifestOwner } from './manifest/routing.mjs'
+
 /** @type {Map<string, { getGroupFileMasterKey?: (replicaUsername: string, groupId: string, keyGeneration?: number) => Promise<Buffer | string | null>, getVaultMasterKey?: (replicaUsername: string, entityHash: string) => Promise<Buffer | string | null> }>} */
 const transferDependenciesByOwner = new Map()
 
@@ -5,14 +7,13 @@ const transferDependenciesByOwner = new Map()
 const dagPlaintextReadersByOwner = new Map()
 
 /**
- * @param {string} ownerId 注册方
+ * @param {string} ownerId 注册方（族，须与 registerManifestOwner 一致）
  * @param {{ getGroupFileMasterKey?: (replicaUsername: string, groupId: string, keyGeneration?: number) => Promise<Buffer | string | null>, getVaultMasterKey?: (replicaUsername: string, entityHash: string) => Promise<Buffer | string | null> }} dependencies 密钥源
  * @returns {void}
  */
 export function registerTransferKeyDependencies(ownerId, dependencies) {
-	const key = ownerId
-	const prev = transferDependenciesByOwner.get(key) || {}
-	transferDependenciesByOwner.set(key, { ...prev, ...dependencies })
+	const prev = transferDependenciesByOwner.get(ownerId) || {}
+	transferDependenciesByOwner.set(ownerId, { ...prev, ...dependencies })
 }
 
 /**
@@ -24,48 +25,13 @@ export function registerDagManifestPlaintextReader(ownerId, reader) {
 	dagPlaintextReadersByOwner.set(ownerId, reader)
 }
 
-/** @type {Array<{ ownerId: string, match: (manifest: import('./manifest/normalize.mjs').FileManifest) => boolean }>} */
-const manifestOwnerMatchers = []
-
-/**
- * @param {string} ownerId 注册方
- * @param {(manifest: import('./manifest/normalize.mjs').FileManifest) => boolean} match manifest 匹配谓词
- * @returns {void}
- */
-export function registerManifestOwnerMatcher(ownerId, match) {
-	manifestOwnerMatchers.push({ ownerId, match })
-}
-
-/**
- * @param {string} ownerId 注册方
- * @returns {void}
- */
-export function unregisterManifestOwnerMatchers(ownerId) {
-	const id = ownerId
-	for (let i = manifestOwnerMatchers.length - 1; i >= 0; i--)
-		if (manifestOwnerMatchers[i].ownerId === id) manifestOwnerMatchers.splice(i, 1)
-}
-
 /**
  * @param {string} ownerId 注册方
  * @returns {void}
  */
 export function unregisterTransferKeyDependencies(ownerId) {
-	const key = ownerId
-	transferDependenciesByOwner.delete(key)
-	dagPlaintextReadersByOwner.delete(key)
-	unregisterManifestOwnerMatchers(key)
-}
-
-/**
- * 从 manifest 推断 transfer key 注册方 id（按 registerManifestOwnerMatcher 注册顺序匹配）。
- * @param {import('./manifest/normalize.mjs').FileManifest} manifest 清单
- * @returns {string | null} 所有者 id
- */
-export function resolveManifestTransferOwnerId(manifest) {
-	for (const { ownerId, match } of manifestOwnerMatchers)
-		if (match(manifest)) return ownerId
-	return null
+	transferDependenciesByOwner.delete(ownerId)
+	dagPlaintextReadersByOwner.delete(ownerId)
 }
 
 /**
@@ -74,7 +40,7 @@ export function resolveManifestTransferOwnerId(manifest) {
  * @returns {{ getGroupFileMasterKey?: (replicaUsername: string, groupId: string, keyGeneration?: number) => Promise<Buffer | string | null>, getVaultMasterKey?: (replicaUsername: string, entityHash: string) => Promise<Buffer | string | null> }} 依赖
  */
 export function resolveTransferKeyDependencies(ownerId, manifest) {
-	const resolved = ownerId || (manifest ? resolveManifestTransferOwnerId(manifest) : null)
+	const resolved = ownerId || (manifest ? resolveManifestOwner(manifest, manifest.ownerEntityHash) : null)
 	if (resolved) return transferDependenciesByOwner.get(resolved) || {}
 	return {}
 }
@@ -85,7 +51,7 @@ export function resolveTransferKeyDependencies(ownerId, manifest) {
  * @returns {Promise<Buffer | null>} 明文；无 reader 或未命中为 null
  */
 export async function readDagManifestPlaintext(replicaUsername, manifest) {
-	const ownerId = resolveManifestTransferOwnerId(manifest)
+	const ownerId = resolveManifestOwner(manifest, manifest.ownerEntityHash)
 	if (ownerId) {
 		const reader = dagPlaintextReadersByOwner.get(ownerId)
 		if (reader)
@@ -93,9 +59,7 @@ export async function readDagManifestPlaintext(replicaUsername, manifest) {
 				const buffer = await reader(replicaUsername, manifest)
 				if (buffer?.length) return buffer
 			}
-			catch { /* fall through */ }
-		return null
+			catch { /* 读取失败则回落到分块路径 */ }
 	}
-
 	return null
 }

package/node/entity_store.mjs

@@ -17,6 +17,7 @@ import { readJsonFile, writeJsonFile } from '../utils/json_io.mjs'
  * @property {(entityHash: string, logicalPath: string) => Promise<object | null>} readManifest
  * @property {(entityHash: string, logicalPath: string, data: object) => Promise<void>} writeManifest
  * @property {(entityHash: string, logicalPath: string) => Promise<boolean>} statManifest
+ * @property {(entityHash: string, logicalPath: string) => Promise<void>} [deleteManifest]
  * @property {() => Promise<string[]>} listEntityHashes
  */
 
@@ -210,5 +211,19 @@ export function createFsEntityStore(baseDir) {
 				return false
 			}
 		},
+
+		/**
+		 * @param {string} entityHash 128 位十六进制
+		 * @param {string} logicalPath EVFS 逻辑路径
+		 * @returns {Promise<void>} 删除 manifest（不存在视为成功）
+		 */
+		async deleteManifest(entityHash, logicalPath) {
+			try {
+				await fsp.unlink(manifestPath(entityHash, logicalPath))
+			}
+			catch (error) {
+				if (/** @type {NodeJS.ErrnoException} */ error.code !== 'ENOENT') throw error
+			}
+		},
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@steve02081504/fount-p2p",
-	"version": "0.0.38",
+	"version": "0.0.40",
 	"description": "fount federation P2P layer — link, trust graph, mailbox, DAG, EVFS.",
 	"keywords": [
 		"network",

package/files/manifest/acl_registry.mjs

@@ -1,84 +0,0 @@
-/**
- * Manifest ACL 注册表：按 transferKeyDescriptor.type 路由，不硬编码业务概念。
- */
-
-/** @type {Map<string, { ownerId: string, handler: (context: ManifestAclContext, logicalPath?: string) => Promise<boolean> }>} */
-const handlersByType = new Map()
-
-/** @type {Map<string, { ownerId: string, match: (manifest: import('./normalize.mjs').FileManifest | null | undefined, ownerEntityHash: string) => string | null }>} */
-const matchersByOwner = new Map()
-
-/**
- * @typedef {{
- *   replicaUsername: string,
- *   ownerEntityHash: string,
- *   manifest: import('./normalize.mjs').FileManifest,
- * }} ManifestAclContext
- */
-
-/**
- * @param {string} type transferKeyDescriptor.type（如 vault-wrap、file-master-key-wrap）
- * @param {string} ownerId 注册方
- * @param {(context: ManifestAclContext, logicalPath?: string) => Promise<boolean>} handler ACL 检查
- * @returns {void}
- */
-export function registerManifestAcl(type, ownerId, handler) {
-	const existing = handlersByType.get(type)
-	if (existing && existing.ownerId !== ownerId)
-		throw new Error(`manifest acl handler for '${type}' already registered by '${existing.ownerId}'`)
-	handlersByType.set(type, { ownerId, handler })
-}
-
-/**
- * @param {string} type transferKeyDescriptor.type
- * @param {string} ownerId 注册方
- * @returns {void}
- */
-export function unregisterManifestAcl(type, ownerId) {
-	const existing = handlersByType.get(type)
-	if (!existing) return
-	if (existing.ownerId === ownerId)
-		handlersByType.delete(type)
-}
-
-/**
- * @param {string} ownerId 注册方
- * @param {(manifest: import('./normalize.mjs').FileManifest | null | undefined, ownerEntityHash: string) => string | null} match ACL 类型匹配
- * @returns {void}
- */
-export function registerManifestAclMatcher(ownerId, match) {
-	matchersByOwner.set(ownerId, { ownerId, match })
-}
-
-/**
- * @param {string} ownerId 注册方
- * @returns {void}
- */
-export function unregisterManifestAclMatcher(ownerId) {
-	matchersByOwner.delete(ownerId)
-}
-
-/**
- * @param {import('./normalize.mjs').FileManifest | null | undefined} manifest manifest
- * @param {string} ownerEntityHash 所有者
- * @returns {string | null} ACL 类型
- */
-export function resolveManifestAclType(manifest, ownerEntityHash) {
-	for (const { match } of matchersByOwner.values()) {
-		const type = match(manifest, ownerEntityHash)
-		if (type) return type
-	}
-	return null
-}
-
-/**
- * @param {string} type transferKeyDescriptor.type
- * @param {ManifestAclContext} context 上下文
- * @param {string} [logicalPath] 写路径（仅写 ACL 需要）
- * @returns {Promise<boolean>} 是否允许（未注册为 false）
- */
-export async function checkManifestAcl(type, context, logicalPath) {
-	const row = handlersByType.get(type)
-	if (!row?.handler) return false
-	return row.handler(context, logicalPath)
-}