@deepmaid/maid-curator 0.1.0-alpha.1 → 0.1.0-alpha.3

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 import { ToolDefinition } from "@deepseek-ai/dsh-tools";
 //#region ../maid-memory/src/types.d.ts
-/** maid-memory 契约:唯一事实来源,后续任务(T2-T5)与 provider 包全部 import 此处。 */
 interface ProviderCapabilities {
   readonly forget: boolean;
   readonly sharedScopes: boolean;
@@ -63,7 +62,7 @@ interface MemoryRecord {
  */
 interface WriteOpts {
   readonly scope?: 'personal' | 'global';
-  readonly provenanceKind?: string;
+  readonly provenanceKind?: 'world' | 'private' | 'curated' | 'legacy';
 }
 interface WriteReceipt {
   readonly id: string;
@@ -79,7 +78,7 @@ interface WriteReceipt {
  */
 interface UpdateOpts {
   readonly scope?: 'personal' | 'shared' | 'global';
-  readonly provenanceKind?: string;
+  readonly provenanceKind?: 'world' | 'private' | 'curated' | 'legacy';
   readonly content?: string;
 }
 interface MaidMemoryProvider {
@@ -171,7 +170,7 @@ interface CuratorMemoryFace {
  * 不是故障——策展链路在无该能力的部署上静默无事可做)。provider 内部失败照原样抛出
  * (fail-loud:空页与「无事可分拣」不可区分,SLM 扫描面同款裁定)。
  */
-declare function scanUnsortedFacts(memory: CuratorMemoryFace | undefined, ns: string): Promise<CuratorFact[]>;
+declare function scanUnsortedFacts(memory: (() => CuratorMemoryFace | undefined) | CuratorMemoryFace | undefined, ns: string): Promise<CuratorFact[]>;
 //#endregion
 //#region src/execute.d.ts
 /**
@@ -256,6 +255,83 @@ interface MslmHttpClient {
 declare function defaultMslmBaseUrl(): string;
 declare function createMslmHttpClient(options?: MslmHttpOptions): MslmHttpClient;
 //#endregion
+//#region src/approvals.d.ts
+/**
+ * M3e §6.3:主人批准语法——限定短语 + 前四字否定词检测。
+ * 批准只能由主人原话产生;模型 approved 数组只能缩小集合(intersect)。
+ * 无 pending snapshot 时,批准词不产生任何 grant(null)。
+ */
+interface ApprovalResult {
+  approvedIds: ReadonlySet<string>;
+}
+interface ApprovalContext {
+  snapshot: ProposalSnapshotLike | null;
+  approvalTurn: number;
+  masterTexts: readonly string[];
+}
+/** 最小提案快照面(真 ProposalSnapshot 结构兼容)。 */
+interface ProposalSnapshotLike {
+  proposalId: string;
+  ns: string;
+  sessionId: string;
+  proposalTurn: number;
+  factIds: readonly string[];
+}
+declare function createApprovals(): {
+  /**
+   * 解析批准:检查主人原话是否含批准语义 + 快照不过期。
+   * 通过 → 返回 { approvedIds }(全量或点名子集);不通过 → undefined。
+   */
+  parse(ctx: ApprovalContext): ApprovalResult | undefined;
+  /**
+   * 工具 approved 与主人批准的交集(工具只能缩小,不能扩大)。
+   */
+  intersect(approval: ApprovalResult, toolApproved: readonly string[]): ReadonlySet<string>;
+};
+//#endregion
+//#region src/proposal-store.d.ts
+/**
+ * M3e §6.3:提案快照存储——dry-run 后保存 {ns, sessionId, turn, 规范化 plan} 的 hash。
+ * proposalId = sha256(sorted(factIds + content + action)) 前 16 位,确定性。
+ * 快照在当轮或次轮有效(isStale);跨 session/ns 隔离。
+ */
+interface ProposalPlan {
+  facts: ReadonlyArray<{
+    id: string;
+    content: string;
+    scope: string;
+  }>;
+  proposals: ReadonlyArray<{
+    factId: string;
+    action: string;
+    reason: string;
+  }>;
+}
+interface ProposalSnapshot {
+  proposalId: string;
+  ns: string;
+  sessionId: string;
+  proposalTurn: number;
+  factIds: readonly string[];
+  /** 规范化排序后的 factIds+content+action(用于 proposalHash 校验)。 */
+  normalizedPlan: string;
+}
+declare function createProposalStore(): {
+  /** 注册提案快照(dry-run 后调用;同 ns+session 覆写旧快照)。 */
+  register(input: {
+    ns: string;
+    sessionId: string;
+    turn: number;
+    plan: ProposalPlan;
+  }): ProposalSnapshot;
+  /** 取最近快照(按 ns+sessionId)。 */
+  get(ns: string, sessionId: string): ProposalSnapshot | undefined;
+  /** 快照是否过期(当轮或次轮有效)。 */
+  isStale(snapshot: ProposalSnapshot, currentTurn: number): boolean;
+  /** 清除快照(消费后/burn)。 */
+  clear(ns: string, sessionId: string): void;
+};
+//#endregion
 //#region src/plugin.d.ts
 /**
  * maid-curator cordis 插件形态(M3b 任务 12,三闸门之策展修订的挂载面)。
@@ -296,7 +372,20 @@ interface MaidCuratorConfig {
 /** maidMemory 服务的策展消费面(鸭子收口,照 scan.ts CuratorMemoryFace 先例,不引
  *  maid-memory 运行时依赖;真 MaidMemoryService 结构兼容)。 */
 interface CuratorMemoryServiceFace extends CuratorMemoryFace {
-  resolveNamespace?(agentPreset: string | undefined): string | undefined;
+  /** M3f:统一 resolution → 命名空间(allowMaids 守卫在 maid-memory service 层)。 */
+  resolveNamespace?(resolution: {
+    maidId?: string;
+    record?: {
+      maidId: string;
+      memoryNamespace: string;
+    };
+    source: string;
+    midSessionSwitch: boolean;
+  } | undefined): string | undefined;
+  /** M3f:maidId 正向直取(固定面/后台任务用)。 */
+  namespaceForMaid?(maidId: string): string | undefined;
+  /** M3e:本会话当前主人原话快照(批准检查用;由 maid-memory lifecycle 装配)。 */
+  masterTextsOf?(sessionId: string): readonly string[];
 }
 /** 一次策展计划:待分拣事实快照 + 确定性提案(同输入必同输出,纯函数产物)。 */
 interface CuratorPlan {
@@ -318,18 +407,28 @@ interface MaidCuratorService {
    *  已离开待分拣集的 approved id 计入 skipped(重复 apply 同批第二次全 skipped)。 */
   apply(ns: string, approved: readonly string[]): Promise<ApplyReport>;
 }
-declare function createMaidCuratorService(memory: CuratorMemoryServiceFace | undefined, guide?: CurationGuide): MaidCuratorService;
+declare function createMaidCuratorService(memoryOf: () => CuratorMemoryServiceFace | undefined, guide?: CurationGuide): MaidCuratorService;
 /** 工具装配依赖:ns 解析(config.namespace 覆写 / 会话 preset 单点解析)。 */
 interface CuratorToolDeps {
   resolveNamespace(exec: unknown): string;
+  /** M3e:批准解析 + 提案快照(apply 闭包传入;缺席 → apply fail-closed)。 */
+  approvals?: ReturnType<typeof createApprovals>;
+  proposalStore?: ReturnType<typeof createProposalStore>;
+  /** M3e:主人原话快照(memory.masterTextsOf 透传;apply 闭包传入)。 */
+  masterTextsOf?: (sessionId: string) => readonly string[];
 }
 /** 恰一个 scoped 工具(照 maid-memory「恰好两个工具」纪律):三模式覆盖策展全流程。 */
 declare function buildCuratorTool(service: MaidCuratorService, deps: CuratorToolDeps): ToolDefinition[];
-declare function registerCuratorTool(ctx: {
-  tools: {
-    register(definition: ToolDefinition): () => void;
+declare function registerCuratorTool(ctx: any, service: MaidCuratorService, deps: CuratorToolDeps): () => void;
+declare const apply: (ctx: {
+  reflect: {
+    get(name: string, optional?: boolean): unknown;
+  };
+  logger?: (name: string) => {
+    warn(m: string): void;
+    info(m: string): void;
   };
-}, service: MaidCuratorService, deps: CuratorToolDeps): () => void;
-declare const apply: (ctx: any, config: MaidCuratorConfig) => (() => void);
+  provide(name: string, value: unknown): () => void;
+} & Record<string, unknown>, config: MaidCuratorConfig) => (() => void);
 //#endregion
 export { type ApplyFailure, type ApplyReport, type CurationGuide, type CuratorApplyFace, type CuratorDryRun, type CuratorFact, type CuratorMemoryFace, type CuratorMemoryServiceFace, type CuratorPlan, type CuratorToolDeps, DEFAULT_FALLBACK_ACTION, type GuideRule, type MaidCuratorConfig, type MaidCuratorService, type MslmCurateOptions, type MslmCurationPatch, type MslmHttpClient, type MslmHttpOptions, type Proposal, type ProposalAction, apply, applyProposals, buildCuratorTool, createMaidCuratorService, createMslmHttpClient, defaultCurationGuide, defaultMslmBaseUrl, inject, name, proposeDisposition, registerCuratorTool, renderDryRun, scanUnsortedFacts };

package/lib/index.js

@@ -1,4 +1,5 @@
 import { defineTool } from "@deepseek-ai/dsh-tools";
+import { createHash } from "node:crypto";
 //#region src/propose.ts
 /** 兜底缺省(M3b 任务 10 裁定):'curate'——留共享层补标注。delete 不可逆、personalize
 *  迁移有observable 后果,规则未说清的事实宁可原样升格,分拣报告里再由人/知惠复核。 */
@@ -111,7 +112,7 @@ const defaultCurationGuide = {
 * (fail-loud:空页与「无事可分拣」不可区分,SLM 扫描面同款裁定)。
 */
 async function scanUnsortedFacts(memory, ns) {
-	const provider = memory?.activeProvider();
+	const provider = (typeof memory === "function" ? memory() : memory)?.activeProvider();
 	if (provider === void 0 || provider.scanUnsorted === void 0) return [];
 	return provider.scanUnsorted(ns);
 }
@@ -233,6 +234,107 @@ function createMslmHttpClient(options = {}) {
 	} };
 }
 //#endregion
+//#region src/approvals.ts
+/** 批准语义短语(命中任一 → 候选批准;配合前四字否定词检测)。 */
+const APPROVAL_PHRASES = [
+	/批准/,
+	/同意/,
+	/可以/,
+	/执行/,
+	/就这么办/,
+	/做吧/,
+	/开始吧/,
+	/按这个来/
+];
+/** 句首肯定词(与批准短语共现时放行)。 */
+const LEAD_ASSent = /^(好的|好|行)[,，!！。]/;
+/** 否定词(命中前四字 → 拒绝)。 */
+const NEGATION = /^(不|别|先不|不要|暂不|莫|勿|無|没)/;
+/** 从主人原话提取点名的 factIds(模式:f1、f2 等)。 */
+const FACT_ID_PATTERN = /\bf(\d+)\b/g;
+function createApprovals() {
+	/** 检查单条主人文本是否含批准语义(无否定)。 */
+	const isApprovalText = (text) => {
+		const trimmed = text.trim();
+		if (trimmed.length === 0) return false;
+		const head = trimmed.slice(0, 4);
+		if (NEGATION.test(head) || NEGATION.test(trimmed.slice(0, 2))) return false;
+		const hasPhrase = APPROVAL_PHRASES.some((p) => p.test(trimmed));
+		const hasLead = LEAD_ASSent.test(trimmed) && APPROVAL_PHRASES.some((p) => p.test(trimmed.slice(4)));
+		return hasPhrase || hasLead;
+	};
+	return {
+		/**
+		* 解析批准:检查主人原话是否含批准语义 + 快照不过期。
+		* 通过 → 返回 { approvedIds }(全量或点名子集);不通过 → undefined。
+		*/
+		parse(ctx) {
+			if (ctx.snapshot === null) return void 0;
+			if (ctx.approvalTurn > ctx.snapshot.proposalTurn + 1) return void 0;
+			const approvalText = ctx.masterTexts.find(isApprovalText);
+			if (approvalText === void 0) return void 0;
+			const named = [...approvalText.matchAll(FACT_ID_PATTERN)].map((m) => `f${m[1]}`);
+			const allIds = new Set(ctx.snapshot.factIds);
+			const approvedIds = named.length > 0 ? new Set(named.filter((id) => allIds.has(id))) : allIds;
+			if (approvedIds.size === 0) return void 0;
+			return { approvedIds };
+		},
+		/**
+		* 工具 approved 与主人批准的交集(工具只能缩小,不能扩大)。
+		*/
+		intersect(approval, toolApproved) {
+			const toolSet = new Set(toolApproved);
+			return new Set([...approval.approvedIds].filter((id) => toolSet.has(id)));
+		}
+	};
+}
+//#endregion
+//#region src/proposal-store.ts
+/** 计算 proposalId(确定性:排序 factIds+content+action)。 */
+function computeProposalId(plan) {
+	const entries = plan.proposals.map((p) => {
+		const fact = plan.facts.find((f) => f.id === p.factId);
+		return `${p.factId}:${fact?.content ?? ""}:${p.action}`;
+	}).sort();
+	return createHash("sha256").update(entries.join("\n")).digest("hex").slice(0, 16);
+}
+function createProposalStore() {
+	const snapshots = /* @__PURE__ */ new Map();
+	return {
+		/** 注册提案快照(dry-run 后调用;同 ns+session 覆写旧快照)。 */
+		register(input) {
+			const proposalId = computeProposalId(input.plan);
+			const factIds = input.plan.proposals.map((p) => p.factId);
+			const entries = input.plan.proposals.map((p) => {
+				const fact = input.plan.facts.find((f) => f.id === p.factId);
+				return `${p.factId}:${fact?.content ?? ""}:${p.action}`;
+			}).sort();
+			const snapshot = {
+				proposalId,
+				ns: input.ns,
+				sessionId: input.sessionId,
+				proposalTurn: input.turn,
+				factIds,
+				normalizedPlan: entries.join("\n")
+			};
+			snapshots.set(`${input.ns}:${input.sessionId}`, snapshot);
+			return snapshot;
+		},
+		/** 取最近快照(按 ns+sessionId)。 */
+		get(ns, sessionId) {
+			return snapshots.get(`${ns}:${sessionId}`);
+		},
+		/** 快照是否过期(当轮或次轮有效)。 */
+		isStale(snapshot, currentTurn) {
+			return currentTurn > snapshot.proposalTurn + 1;
+		},
+		/** 清除快照(消费后/burn)。 */
+		clear(ns, sessionId) {
+			snapshots.delete(`${ns}:${sessionId}`);
+		}
+	};
+}
+//#endregion
 //#region src/plugin.ts
 /**
 * maid-curator cordis 插件形态(M3b 任务 12,三闸门之策展修订的挂载面)。
@@ -261,16 +363,16 @@ function createMslmHttpClient(options = {}) {
 */
 const name = "maid-curator";
 const inject = ["tools"];
-function createMaidCuratorService(memory, guide = defaultCurationGuide) {
+function createMaidCuratorService(memoryOf, guide = defaultCurationGuide) {
 	const plan = async (ns) => {
-		const facts = await scanUnsortedFacts(memory, ns);
+		const facts = await scanUnsortedFacts(memoryOf(), ns);
 		return {
 			facts,
 			proposals: facts.map((fact) => proposeDisposition(fact, guide))
 		};
 	};
 	return {
-		scan: (ns) => scanUnsortedFacts(memory, ns),
+		scan: (ns) => scanUnsortedFacts(memoryOf(), ns),
 		propose: plan,
 		dryRun: async (ns) => {
 			const p = await plan(ns);
@@ -280,7 +382,7 @@ function createMaidCuratorService(memory, guide = defaultCurationGuide) {
 			};
 		},
 		apply: async (ns, approved) => {
-			const provider = memory?.activeProvider();
+			const provider = memoryOf()?.activeProvider();
 			if (provider === void 0) throw new Error("maid-curator: 无可用记忆 provider,策展执行被拒绝");
 			const { proposals } = await plan(ns);
 			const report = await applyProposals(provider, ns, proposals, new Set(approved));
@@ -395,7 +497,22 @@ function buildCuratorTool(service, deps) {
 			if (typed.mode === "apply") {
 				const approved = typed.approved ?? [];
 				if (approved.length === 0) throw new Error("maid-curator: mode=apply 须携带非空 approved(主人批准的 fact_id 列表);主人未批准任何条目时不要调用 apply");
-				const report = await service.apply(ns, approved);
+				const sessionId = exec.agent?.id ?? "";
+				if (deps.proposalStore === void 0 || deps.approvals === void 0) throw new Error("maid-curator: approvals/proposalStore 不可用——策展执行须走完整装配(插件 apply),不能在纯工具注册态调用 apply");
+				const snapshot = deps.proposalStore.get(ns, sessionId);
+				if (snapshot === void 0) throw new Error("maid-curator: 无待批准的提案快照——请先以 mode=dry-run 产出分拣报告并呈主人过目,主人点头后才能 apply");
+				if (deps.proposalStore.isStale(snapshot, 0) && deps.proposalStore.isStale(snapshot, 1)) throw new Error("maid-curator: 提案快照已过期——请重新 dry-run 并再次获得主人批准");
+				const masterTexts = deps.masterTextsOf?.(sessionId) ?? [];
+				const parsed = deps.approvals.parse({
+					snapshot,
+					approvalTurn: snapshot.proposalTurn + 1,
+					masterTexts
+				});
+				if (parsed === void 0) throw new Error("maid-curator: 未在主人原话中找到对当前提案的批准(限定短语:批准/同意/可以/执行/就这么办/做吧/按这个来);先呈报告再等主人点头");
+				const effective = deps.approvals.intersect(parsed, approved);
+				if (effective.size === 0) throw new Error("maid-curator: 工具 approved 与主人批准的交集为空——主人只批准了部分条目,请在 approved 中只填主人点头的 fact_id");
+				deps.proposalStore.clear(ns, sessionId);
+				const report = await service.apply(ns, [...effective]);
 				return {
 					mode: "apply",
 					applied: report.applied,
@@ -405,6 +522,12 @@ function buildCuratorTool(service, deps) {
 			}
 			if (typed.mode === "dry-run") {
 				const dry = await service.dryRun(ns);
+				deps.proposalStore?.register({
+					ns,
+					sessionId: exec.agent?.id ?? "",
+					turn: 0,
+					plan: dry
+				});
 				return {
 					mode: "dry-run",
 					count: dry.facts.length,
@@ -429,40 +552,45 @@ function registerCuratorTool(ctx, service, deps) {
 		for (const dispose of disposers.reverse()) dispose();
 	};
 }
-function resolveSessionPreset(events, headerPreset) {
-	let selected;
-	let sawConversation = false;
-	let midSessionSwitch = false;
-	for (const entry of events ?? []) {
-		const event = entry;
-		if (event?.type === "turn/start" || event?.type === "turn/end" || event?.type === "user/message" || event?.type === "assistant/message") sawConversation = true;
-		if (event?.type === "agent-preset/selected" && typeof event.data?.agentPreset === "string") {
-			selected = event.data.agentPreset;
-			if (sawConversation) midSessionSwitch = true;
-		}
-	}
-	return {
-		preset: selected ?? headerPreset,
-		midSessionSwitch
-	};
-}
 const apply = (ctx, config) => {
 	const logger = ctx.logger?.("maid-curator") ?? console;
 	const guide = typeof config?.guide === "object" && config.guide !== null ? config.guide : defaultCurationGuide;
 	const fixedNs = typeof config?.namespace === "string" && config.namespace.trim() !== "" ? config.namespace : void 0;
-	const memory = ctx.reflect.get("maidMemory", false);
-	if (memory === void 0) logger.warn("maid-curator: maidMemory 未挂载——scan/dry-run 将返回空,apply 将被拒绝(maid-memory 须先于 maid-curator 装配)");
-	const service = createMaidCuratorService(memory, guide);
+	let memoryWarned = false;
+	const memoryOf = () => {
+		const found = ctx.reflect.get("maidMemory", false);
+		if (found === void 0 && !memoryWarned) {
+			memoryWarned = true;
+			logger.warn("maid-curator: maidMemory 未挂载——scan/dry-run 将返回空,apply 将被拒绝(maid-memory 须先于 maid-curator 装配)");
+		}
+		return found;
+	};
+	const service = createMaidCuratorService(memoryOf, guide);
+	const approvals = createApprovals();
+	const proposalStore = createProposalStore();
 	const disposeProvide = ctx.provide("maidCurator", service);
-	const disposeTools = registerCuratorTool(ctx, service, { resolveNamespace: (exec) => {
-		if (fixedNs !== void 0) return fixedNs;
-		const session = exec?.agent?.session;
-		const resolution = resolveSessionPreset(session?.snapshotEvents?.(), session?.header?.agentPreset);
-		if (resolution.midSessionSwitch) throw new Error(`maid-curator: 会话存在 0.1.5 遗留中途切换(头部 ${JSON.stringify(session?.header?.agentPreset)}),策展操作被拒绝;请新建会话`);
-		const ns = memory?.resolveNamespace?.(resolution.preset);
-		if (ns === void 0) throw new Error(`maid-curator: 无法为该会话解析记忆命名空间(agentPreset=${JSON.stringify(resolution.preset)}),策展操作被拒绝`);
-		return ns;
-	} });
+	const identityOf = () => ctx.reflect.get("maidIdentity", false);
+	const disposeTools = registerCuratorTool(ctx, service, {
+		approvals,
+		proposalStore,
+		...memoryOf()?.masterTextsOf !== void 0 ? { masterTextsOf: (sid) => memoryOf().masterTextsOf(sid) } : {},
+		resolveNamespace: (exec) => {
+			if (fixedNs !== void 0) return fixedNs;
+			const agent = exec?.agent;
+			const session = agent?.session;
+			if (typeof identityOf()?.resolveSession !== "function") throw new Error("maid-curator: maidIdentity 缺统一解析面(resolveSession),策展操作被拒绝;请在 maid.yml/固定 namespace 配置后再用");
+			const resolution = identityOf().resolveSession({
+				sessionId: agent?.id,
+				events: session?.snapshotEvents?.(),
+				headerPreset: session?.header?.agentPreset
+			});
+			if (resolution.midSessionSwitch && resolution.source !== "session" && resolution.source !== "route") throw new Error(`maid-curator: 会话存在 0.1.5 遗留中途切换(头部 ${JSON.stringify(session?.header?.agentPreset)} → ${JSON.stringify(resolution.presetId)}),策展操作被拒绝;请新建会话`);
+			if (resolution.maidId === void 0) throw new Error(`maid-curator: 当前会话未绑定女仆,且未配置固定 namespace(preset ${JSON.stringify(resolution.presetId)})`);
+			const ns = memoryOf()?.resolveNamespace?.(resolution);
+			if (ns === void 0) throw new Error(`maid-curator: 无法为该会话解析记忆命名空间(maid=${JSON.stringify(resolution.maidId)}),策展操作被拒绝`);
+			return ns;
+		}
+	});
 	return () => {
 		disposeTools();
 		disposeProvide();

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@deepmaid/maid-curator",
-  "version": "0.1.0-alpha.1",
-  "license": "MIT",
+  "version": "0.1.0-alpha.3",
   "type": "module",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
@@ -27,16 +30,14 @@
       "description": "策展技能包:共享层三闸门的策展执行面(策展扫描/遗产分拣技能,namespace 可覆写)。关闭=策展技能从女仆工具面消失,共享知识层治理失工具。"
     }
   },
-  "dependencies": {
-    "@deepseek-ai/dsh-tools": "0.2.1-rc.2"
+  "peerDependencies": {
+    "@deepseek-ai/dsh-tools": "0.2.2-rc.1"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.5",
+    "@deepseek-ai/cordis": "4.1.0",
     "tsdown": "0.22.14",
-    "typescript": "6.0.3"
-  },
-  "publishConfig": {
-    "access": "public"
+    "typescript": "6.0.3",
+    "@deepseek-ai/dsh-tools": "0.2.1-rc.2"
   },
   "scripts": {
     "build": "tsdown"