@njuptlzf/agent-chat-server 0.6.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/memory-providers.d.ts +16 -9
- package/dist/memory-providers.js +54 -49
- package/dist/server.js +5 -0
- package/dist/session.d.ts +16 -1
- package/dist/session.js +71 -4
- package/package.json +2 -3
- package/scripts/agentchat-integrate.mjs +5 -5
- package/src/memory-providers.ts +54 -50
- package/src/server.ts +5 -0
- package/src/session.ts +88 -5
|
@@ -4,23 +4,29 @@
|
|
|
4
4
|
* 服务器只认 id,不认实现:换记忆引擎 = 换 manifest 里的 `agent.memory.provider`,
|
|
5
5
|
* 本文件之外的服务器代码一行不动。
|
|
6
6
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
7
|
+
* 默认实现是 `hermes-scoped`(`@njuptlzf/pi-hermes-memory`),与其他提供方走**同一条**
|
|
8
|
+
* 动态加载路径——静态 import 会把外部包的源码/类型拉进本仓的 tsc program与 tsx 入口,
|
|
9
|
+
* 跨仓源码进他人编译单元是最难收拾的一类耦合。默认模块说明符内建在下面,
|
|
10
|
+
* 由 `ensureDefaultMemoryProvider()` 在会话创建前惰性加载并注册。
|
|
11
|
+
*
|
|
12
|
+
* 产品也可以在 manifest 里声明 `agent.memoryProviders: [...]`,条目可以是产品目录内的
|
|
13
|
+
* 相对路径,也可以是包名(走 Node 解析)。外部模块与 `agent.extensions` 同一信任模型:
|
|
14
|
+
* 仓库内代码、过准入扫描、进程内运行。
|
|
13
15
|
*
|
|
14
16
|
* 两条刻意选择:
|
|
15
17
|
* - **不可用即报错,不静默降级**。选了没装的 provider 就抛,并列出已注册 id。
|
|
16
18
|
* 静默回落默认实现,会让"我换了引擎"和"我忘了装"看起来一模一样。
|
|
17
|
-
* - **模块用动态 import
|
|
18
|
-
* 本仓的 tsc program,跨仓源码进他人编译单元是最难收拾的一类耦合。
|
|
19
|
+
* - **模块用动态 import**(理由见上)。
|
|
19
20
|
*/
|
|
20
21
|
import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
|
|
21
22
|
import type { MemoryProvider } from "@njuptlzf/agent-chat-protocol";
|
|
22
23
|
/** 不指定时的实现。与 protocol 的 `agent.memory === true` 对齐。 */
|
|
23
|
-
export declare const DEFAULT_MEMORY_PROVIDER_ID = "scoped
|
|
24
|
+
export declare const DEFAULT_MEMORY_PROVIDER_ID = "hermes-scoped";
|
|
25
|
+
/**
|
|
26
|
+
* 默认实现的模块说明符。作为 server 的直接依赖随包安装;用裸说明符走动态 import,
|
|
27
|
+
* 由 Node 按 exports 条件解析(编译产物走 dist,内部 source 条件走 src)。
|
|
28
|
+
*/
|
|
29
|
+
export declare const DEFAULT_MEMORY_PROVIDER_MODULE = "@njuptlzf/pi-hermes-memory/scoped-provider";
|
|
24
30
|
/** provider 是否声明支持跨会话用户画像(C6)。缺省 = 不支持。 */
|
|
25
31
|
export declare function providerSupportsSharedProfile(provider: MemoryProvider<ExtensionAPI>): boolean;
|
|
26
32
|
/**
|
|
@@ -42,6 +48,7 @@ export declare function resolveProviderModuleEntry(entry: string, productDir: st
|
|
|
42
48
|
* 读 env / 拉子进程在这里同样是跨层能力。
|
|
43
49
|
*/
|
|
44
50
|
export declare function loadMemoryProviderModule(entry: string, productDir: string): Promise<MemoryProvider<ExtensionAPI>>;
|
|
51
|
+
export declare function ensureDefaultMemoryProvider(): Promise<MemoryProvider<ExtensionAPI>>;
|
|
45
52
|
export declare function listMemoryProviders(): Array<{
|
|
46
53
|
id: string;
|
|
47
54
|
version: string;
|
package/dist/memory-providers.js
CHANGED
|
@@ -4,18 +4,19 @@
|
|
|
4
4
|
* 服务器只认 id,不认实现:换记忆引擎 = 换 manifest 里的 `agent.memory.provider`,
|
|
5
5
|
* 本文件之外的服务器代码一行不动。
|
|
6
6
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
7
|
+
* 默认实现是 `hermes-scoped`(`@njuptlzf/pi-hermes-memory`),与其他提供方走**同一条**
|
|
8
|
+
* 动态加载路径——静态 import 会把外部包的源码/类型拉进本仓的 tsc program与 tsx 入口,
|
|
9
|
+
* 跨仓源码进他人编译单元是最难收拾的一类耦合。默认模块说明符内建在下面,
|
|
10
|
+
* 由 `ensureDefaultMemoryProvider()` 在会话创建前惰性加载并注册。
|
|
11
|
+
*
|
|
12
|
+
* 产品也可以在 manifest 里声明 `agent.memoryProviders: [...]`,条目可以是产品目录内的
|
|
13
|
+
* 相对路径,也可以是包名(走 Node 解析)。外部模块与 `agent.extensions` 同一信任模型:
|
|
14
|
+
* 仓库内代码、过准入扫描、进程内运行。
|
|
13
15
|
*
|
|
14
16
|
* 两条刻意选择:
|
|
15
17
|
* - **不可用即报错,不静默降级**。选了没装的 provider 就抛,并列出已注册 id。
|
|
16
18
|
* 静默回落默认实现,会让"我换了引擎"和"我忘了装"看起来一模一样。
|
|
17
|
-
* - **模块用动态 import
|
|
18
|
-
* 本仓的 tsc program,跨仓源码进他人编译单元是最难收拾的一类耦合。
|
|
19
|
+
* - **模块用动态 import**(理由见上)。
|
|
19
20
|
*/
|
|
20
21
|
var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
|
|
21
22
|
if (typeof path === "string" && /^\.\.?\//.test(path)) {
|
|
@@ -29,50 +30,17 @@ import { existsSync, readFileSync } from "node:fs";
|
|
|
29
30
|
import { createRequire } from "node:module";
|
|
30
31
|
import * as path from "node:path";
|
|
31
32
|
import { pathToFileURL } from "node:url";
|
|
32
|
-
import { scopedMemory } from "pi-scoped-memory";
|
|
33
33
|
import { auditExtensionSource } from "./extension-admission.js";
|
|
34
34
|
/** 不指定时的实现。与 protocol 的 `agent.memory === true` 对齐。 */
|
|
35
|
-
export const DEFAULT_MEMORY_PROVIDER_ID = "scoped
|
|
35
|
+
export const DEFAULT_MEMORY_PROVIDER_ID = "hermes-scoped";
|
|
36
|
+
/**
|
|
37
|
+
* 默认实现的模块说明符。作为 server 的直接依赖随包安装;用裸说明符走动态 import,
|
|
38
|
+
* 由 Node 按 exports 条件解析(编译产物走 dist,内部 source 条件走 src)。
|
|
39
|
+
*/
|
|
40
|
+
export const DEFAULT_MEMORY_PROVIDER_MODULE = "@njuptlzf/pi-hermes-memory/scoped-provider";
|
|
36
41
|
const requireFromRoot = createRequire(import.meta.url);
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
const parsed = requireFromRoot(`${pkg}/package.json`);
|
|
40
|
-
return typeof parsed.version === "string" ? parsed.version : "unknown";
|
|
41
|
-
}
|
|
42
|
-
catch {
|
|
43
|
-
// Version is for logs, not behaviour: a missing package.json must not break open().
|
|
44
|
-
return "unknown";
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
const scopedMemoryProvider = {
|
|
48
|
-
id: DEFAULT_MEMORY_PROVIDER_ID,
|
|
49
|
-
version: installedVersion("pi-scoped-memory"),
|
|
50
|
-
// 历史实现只读 storageRoot、不读 sharedRoot,没有任何跨 scope 画像能力。
|
|
51
|
-
// 显式声明 false,让宿主能在产品依赖该能力时告警(C6)。
|
|
52
|
-
capabilities: { sharedProfile: false },
|
|
53
|
-
async open(ctx) {
|
|
54
|
-
const dir = ctx.storageRoot;
|
|
55
|
-
const { rm } = await import("node:fs/promises");
|
|
56
|
-
return {
|
|
57
|
-
providerId: DEFAULT_MEMORY_PROVIDER_ID,
|
|
58
|
-
// scopedMemory appends its own snapshot in before_agent_start.
|
|
59
|
-
selfInjects: true,
|
|
60
|
-
factory: scopedMemory({ dir, autoCapture: true }),
|
|
61
|
-
async promptSection() {
|
|
62
|
-
return "";
|
|
63
|
-
},
|
|
64
|
-
async erase() {
|
|
65
|
-
// Its own file is <dir>/entries.jsonl; the directory is host-allocated,
|
|
66
|
-
// so removing it is exactly one tenant's worth of data.
|
|
67
|
-
await rm(dir, { recursive: true, force: true });
|
|
68
|
-
},
|
|
69
|
-
async dispose() { },
|
|
70
|
-
};
|
|
71
|
-
},
|
|
72
|
-
};
|
|
73
|
-
const registry = new Map([
|
|
74
|
-
[scopedMemoryProvider.id, scopedMemoryProvider],
|
|
75
|
-
]);
|
|
42
|
+
/** 注册表。默认实现首次会话时惰性注册,其余由 manifest 声明的模块加载进来。 */
|
|
43
|
+
const registry = new Map();
|
|
76
44
|
/** 已加载的外部模块,按解析后的绝对路径去重:同一文件 import 两次不该注册两次。 */
|
|
77
45
|
const loadedModules = new Map();
|
|
78
46
|
function assertProviderShape(candidate, source) {
|
|
@@ -177,6 +145,43 @@ export async function loadMemoryProviderModule(entry, productDir) {
|
|
|
177
145
|
throw error;
|
|
178
146
|
}
|
|
179
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
* 惰性加载并注册默认实现。
|
|
150
|
+
*
|
|
151
|
+
* 默认 provider 与其他实现走同一条动态 import 路径,外部包的源码/类型不进本仓 tsc program。
|
|
152
|
+
* 但**不能**用裸说明符 import:在 `node --import tsx` 的入口下,包的 `types` 条件会被优先
|
|
153
|
+
* 解析成 `dist/scoped/provider.d.ts` 当代码执行,报 `ReferenceError: provider is not defined`
|
|
154
|
+
* (live:fixture 实测)。所以这里解析包根后按**确定的 dist 文件路径** import,绕开所有条件。
|
|
155
|
+
* 第一次创建会话时加载、过形状校验、注册;缓存一次,多次调用复用。
|
|
156
|
+
*/
|
|
157
|
+
let defaultProviderLoad;
|
|
158
|
+
export async function ensureDefaultMemoryProvider() {
|
|
159
|
+
// A product may have declared the same provider explicitly via its own adapter
|
|
160
|
+
// module. In that case the id is already registered — reuse it instead of
|
|
161
|
+
// importing a second module instance and colliding on the id.
|
|
162
|
+
const existing = registry.get(DEFAULT_MEMORY_PROVIDER_ID);
|
|
163
|
+
if (existing)
|
|
164
|
+
return existing;
|
|
165
|
+
if (defaultProviderLoad)
|
|
166
|
+
return defaultProviderLoad;
|
|
167
|
+
defaultProviderLoad = (async () => {
|
|
168
|
+
const pkgJson = requireFromRoot.resolve("@njuptlzf/pi-hermes-memory/package.json");
|
|
169
|
+
const entry = path.join(path.dirname(pkgJson), "dist", "scoped", "provider.js");
|
|
170
|
+
const mod = (await import(__rewriteRelativeImportExtension(pathToFileURL(entry).href)));
|
|
171
|
+
const provider = assertProviderShape(mod.default, `default memory provider "${DEFAULT_MEMORY_PROVIDER_MODULE}"`);
|
|
172
|
+
registerMemoryProvider(provider);
|
|
173
|
+
return provider;
|
|
174
|
+
})();
|
|
175
|
+
try {
|
|
176
|
+
return await defaultProviderLoad;
|
|
177
|
+
}
|
|
178
|
+
catch (error) {
|
|
179
|
+
// A failed default load must not poison the cache: fixing the install and
|
|
180
|
+
// retrying is the normal recovery path.
|
|
181
|
+
defaultProviderLoad = undefined;
|
|
182
|
+
throw error;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
180
185
|
export function listMemoryProviders() {
|
|
181
186
|
return [...registry.values()].map((provider) => ({
|
|
182
187
|
id: provider.id,
|
package/dist/server.js
CHANGED
|
@@ -1793,6 +1793,11 @@ export function createChatServer(deps) {
|
|
|
1793
1793
|
dataDir: deps.dataDir,
|
|
1794
1794
|
tier,
|
|
1795
1795
|
qual: scope,
|
|
1796
|
+
// Each member is an independent concurrent worker; give its memory a
|
|
1797
|
+
// distinct root so two live hermes handles never claim the same scope
|
|
1798
|
+
// (the provider enforces one handle per root). Prompt/history/tools
|
|
1799
|
+
// stay scoped by `qual` above.
|
|
1800
|
+
memoryScopeKey: `${scope}__${ctx.jobId.replace(/[^A-Za-z0-9_-]/g, "_")}`,
|
|
1796
1801
|
persona: job.persona,
|
|
1797
1802
|
history,
|
|
1798
1803
|
mcpConfig: deps.mcpConfig,
|
package/dist/session.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ModelRuntime, type AgentSession, type FileEntry, type McpServerConfig, type Skill } from "@earendil-works/pi-coding-agent";
|
|
2
|
-
import type { McpServerDecl } from "@njuptlzf/agent-chat-protocol";
|
|
2
|
+
import type { McpServerDecl, MemoryCompletion } from "@njuptlzf/agent-chat-protocol";
|
|
3
3
|
import { type McpConfigStore } from "./mcp-config.ts";
|
|
4
4
|
import type { LoadedProduct, ResolvedTier, ToolContext } from "./manifest.ts";
|
|
5
5
|
import { type PersonaConfigStore, type PersonaOverride } from "./persona-config.ts";
|
|
@@ -94,6 +94,12 @@ export interface CreateProductSessionOptions {
|
|
|
94
94
|
* syllabus. Omit or "" for products without qualifications.
|
|
95
95
|
*/
|
|
96
96
|
qual?: string;
|
|
97
|
+
/**
|
|
98
|
+
* 仅用于记忆 storageRoot 的作用域键。默认等于 `qual`;编排层的并发成员会话传入各自的
|
|
99
|
+
* job/phase 键,避免多个 hermes handle 同时开在同一个根上(provider 按根独占句柄)。
|
|
100
|
+
* 不影响提示词、历史或工具的作用域——那些仍由 `qual` 决定。
|
|
101
|
+
*/
|
|
102
|
+
memoryScopeKey?: string;
|
|
97
103
|
/**
|
|
98
104
|
* Which assistant persona this session is (). Omit for the product
|
|
99
105
|
* product default. It only swaps prompt/skills here; the tool whitelist is
|
|
@@ -197,6 +203,15 @@ export declare function compileSystemPrompt(product: LoadedProduct, qual: string
|
|
|
197
203
|
allowTools?: string[];
|
|
198
204
|
disabledTools: string[];
|
|
199
205
|
};
|
|
206
|
+
/**
|
|
207
|
+
* 把宿主的 `modelRuntime` 适配成注入 provider 的 `MemoryCompletion`。
|
|
208
|
+
*
|
|
209
|
+
* 复用当前会话已解析的 model(与聊天同一物理模型),但**不进用户会话**:
|
|
210
|
+
* 一次 `completeSimple` 调用,独立历史,失败以 `ok:false` 结构化返回,
|
|
211
|
+
* 不参与聊天主链的 failover,也不向 provider 抛异常。超时双保险:signal
|
|
212
|
+
* 传给 provider 请求,Promise.race 兜底不遵守 signal 的底层实现。
|
|
213
|
+
*/
|
|
214
|
+
export declare function createMemoryCompletion(modelRuntime: ModelRuntime, model: NonNullable<ReturnType<ModelRuntime["getModel"]>>): MemoryCompletion;
|
|
200
215
|
/**
|
|
201
216
|
* 产品依赖跨会话画像,但选中的 provider 没声明该能力时给宿主的可读告警(C6)。
|
|
202
217
|
* 导出为纯函数,便于契约测试钉住文案;返回 null 表示无需告警。
|
package/dist/session.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { readFileSync } from "node:fs";
|
|
2
|
+
import { mkdirSync, readFileSync } from "node:fs";
|
|
3
3
|
import * as path from "node:path";
|
|
4
4
|
import { Type } from "typebox";
|
|
5
5
|
import { createAgentSession, createMcpExtension, DefaultResourceLoader, defineTool, initTheme, loadSkillsFromDir, stripFrontmatter, ModelRuntime, SessionManager, SettingsManager, } from "@earendil-works/pi-coding-agent";
|
|
6
6
|
import { toProxySpawn } from "./mcp-config.js";
|
|
7
|
-
import { loadMemoryProviderModule, providerSupportsSharedProfile, resolveMemoryProvider } from "./memory-providers.js";
|
|
7
|
+
import { ensureDefaultMemoryProvider, loadMemoryProviderModule, providerSupportsSharedProfile, resolveMemoryProvider } from "./memory-providers.js";
|
|
8
8
|
import { agentFor, resolveTier } from "./manifest.js";
|
|
9
9
|
import { applyPersonaOverride } from "./persona-config.js";
|
|
10
10
|
import { validateModelsCost } from "./cost-model.js";
|
|
@@ -358,6 +358,56 @@ export function compileSystemPrompt(product, qual, persona, override) {
|
|
|
358
358
|
* session also means a crashed session cannot leak a handle into the next one.
|
|
359
359
|
*/
|
|
360
360
|
const memorySessionsByAgent = new WeakMap();
|
|
361
|
+
/** 后台记忆补全的硬边界:超时与 token 都由宿主定,provider 只能通过请求收紧、不能放宽。 */
|
|
362
|
+
const MEMORY_COMPLETION_TIMEOUT_MS = 15_000;
|
|
363
|
+
const MEMORY_COMPLETION_MAX_TOKENS = 512;
|
|
364
|
+
/**
|
|
365
|
+
* 把宿主的 `modelRuntime` 适配成注入 provider 的 `MemoryCompletion`。
|
|
366
|
+
*
|
|
367
|
+
* 复用当前会话已解析的 model(与聊天同一物理模型),但**不进用户会话**:
|
|
368
|
+
* 一次 `completeSimple` 调用,独立历史,失败以 `ok:false` 结构化返回,
|
|
369
|
+
* 不参与聊天主链的 failover,也不向 provider 抛异常。超时双保险:signal
|
|
370
|
+
* 传给 provider 请求,Promise.race 兜底不遵守 signal 的底层实现。
|
|
371
|
+
*/
|
|
372
|
+
export function createMemoryCompletion(modelRuntime, model) {
|
|
373
|
+
return async (req) => {
|
|
374
|
+
const controller = new AbortController();
|
|
375
|
+
// 调用方 signal(例如会话销毁)要能取消这次后台补全。
|
|
376
|
+
const onAbort = () => controller.abort();
|
|
377
|
+
req.signal?.addEventListener("abort", onAbort, { once: true });
|
|
378
|
+
let timer;
|
|
379
|
+
try {
|
|
380
|
+
const timeout = new Promise((_, reject) => {
|
|
381
|
+
timer = setTimeout(() => {
|
|
382
|
+
controller.abort();
|
|
383
|
+
reject(new Error("memory completion timeout"));
|
|
384
|
+
}, MEMORY_COMPLETION_TIMEOUT_MS);
|
|
385
|
+
});
|
|
386
|
+
const reply = await Promise.race([
|
|
387
|
+
modelRuntime.completeSimple(model, { systemPrompt: req.systemPrompt, messages: [{ role: "user", content: req.userPrompt, timestamp: Date.now() }] }, {
|
|
388
|
+
signal: controller.signal,
|
|
389
|
+
maxTokens: Math.min(req.maxTokens ?? MEMORY_COMPLETION_MAX_TOKENS, MEMORY_COMPLETION_MAX_TOKENS),
|
|
390
|
+
}),
|
|
391
|
+
timeout,
|
|
392
|
+
]);
|
|
393
|
+
if (req.signal?.aborted)
|
|
394
|
+
return { text: "", ok: false, error: "aborted" };
|
|
395
|
+
const text = reply.content
|
|
396
|
+
.filter((c) => c.type === "text")
|
|
397
|
+
.map((c) => c.text)
|
|
398
|
+
.join("\n");
|
|
399
|
+
return { text, ok: true };
|
|
400
|
+
}
|
|
401
|
+
catch (err) {
|
|
402
|
+
return { text: "", ok: false, error: err instanceof Error ? err.message : String(err) };
|
|
403
|
+
}
|
|
404
|
+
finally {
|
|
405
|
+
if (timer !== undefined)
|
|
406
|
+
clearTimeout(timer);
|
|
407
|
+
req.signal?.removeEventListener("abort", onAbort);
|
|
408
|
+
}
|
|
409
|
+
};
|
|
410
|
+
}
|
|
361
411
|
/**
|
|
362
412
|
* 产品依赖跨会话画像,但选中的 provider 没声明该能力时给宿主的可读告警(C6)。
|
|
363
413
|
* 导出为纯函数,便于契约测试钉住文案;返回 null 表示无需告警。
|
|
@@ -480,9 +530,14 @@ export async function createProductSession(opts) {
|
|
|
480
530
|
// `hermes-scoped` exists until the product declares the module that provides
|
|
481
531
|
// it. Loading is per-file memoised, so this is one dynamic import per process.
|
|
482
532
|
if (product.memoryEnabled) {
|
|
533
|
+
// Product-declared modules first: if one of them already provides the default
|
|
534
|
+
// id, ensureDefaultMemoryProvider() reuses it instead of importing a second
|
|
535
|
+
// instance. The default itself is a lazy dynamic import so the external
|
|
536
|
+
// package's source/types stay out of our tsc program and tsx entrypoints.
|
|
483
537
|
for (const entry of product.memoryProviderModules) {
|
|
484
538
|
await loadMemoryProviderModule(entry, product.dir);
|
|
485
539
|
}
|
|
540
|
+
await ensureDefaultMemoryProvider();
|
|
486
541
|
}
|
|
487
542
|
// Two disjoint roots per session: the scope (user × product × qual) and the
|
|
488
543
|
// user's cross-scope profile. Siblings, not nested — erasing one qualification
|
|
@@ -498,12 +553,24 @@ export async function createProductSession(opts) {
|
|
|
498
553
|
if (warning)
|
|
499
554
|
opts.onUINotify?.(warning, "warning");
|
|
500
555
|
}
|
|
556
|
+
// The host owns the roots, so it must materialise them before open(). The
|
|
557
|
+
// old built-in created parents lazily on write; hermes uses mkdtemp under
|
|
558
|
+
// storageRoot and expects the host-allocated directory to already exist.
|
|
559
|
+
const storageRoot = path.join(opts.dataDir, "memory", opts.userId, opts.memoryScopeKey || opts.qual || "default");
|
|
560
|
+
const sharedRoot = path.join(opts.dataDir, "memory", opts.userId, "profile");
|
|
561
|
+
if (memoryProvider) {
|
|
562
|
+
mkdirSync(storageRoot, { recursive: true });
|
|
563
|
+
mkdirSync(sharedRoot, { recursive: true });
|
|
564
|
+
}
|
|
501
565
|
const memorySession = memoryProvider
|
|
502
566
|
? await memoryProvider.open({
|
|
503
|
-
storageRoot
|
|
504
|
-
sharedRoot
|
|
567
|
+
storageRoot,
|
|
568
|
+
sharedRoot,
|
|
505
569
|
agentDir: opts.dataDir,
|
|
506
570
|
scope: { userId: opts.userId, productId: product.manifest.id, qual: opts.qual || "" },
|
|
571
|
+
// 后台整理(巩固/review/flush)用的补全能力。复用本会话已解析的 model,
|
|
572
|
+
// 不进用户会话历史;provider 拿不到凭据,超时/预算由这里统一控。
|
|
573
|
+
complete: createMemoryCompletion(modelRuntime, model),
|
|
507
574
|
})
|
|
508
575
|
: null;
|
|
509
576
|
const memoryExtensions = memorySession ? [memorySession.factory] : [];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@njuptlzf/agent-chat-server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "agentChat platform kernel: sessions, authz, billing, audit, model/MCP/persona config planes, and the product-directory loader.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -55,10 +55,9 @@
|
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@earendil-works/pi-coding-agent": "1.5.2",
|
|
58
|
-
"@njuptlzf/agent-chat-protocol": "^0.
|
|
58
|
+
"@njuptlzf/agent-chat-protocol": "^0.8.0",
|
|
59
59
|
"@njuptlzf/pi-hermes-memory": "0.11.0-scoped.5",
|
|
60
60
|
"casbin": "^5.51.1",
|
|
61
|
-
"pi-scoped-memory": "^0.3.0",
|
|
62
61
|
"taskflow-core": "1.0.0",
|
|
63
62
|
"typebox": "^1.3.27",
|
|
64
63
|
"yaml": "^2.8.0"
|
|
@@ -20,7 +20,7 @@ import { createRequire } from "node:module";
|
|
|
20
20
|
import { spawnSync } from "node:child_process";
|
|
21
21
|
import process from "node:process";
|
|
22
22
|
|
|
23
|
-
const CLI_VERSION = "0.
|
|
23
|
+
const CLI_VERSION = "0.8.0";
|
|
24
24
|
const MIN_SERVER = "0.2.0";
|
|
25
25
|
const PKG = {
|
|
26
26
|
protocol: "@njuptlzf/agent-chat-protocol",
|
|
@@ -215,9 +215,9 @@ function packageTemplate(o) {
|
|
|
215
215
|
private: true,
|
|
216
216
|
type: "module",
|
|
217
217
|
dependencies: {
|
|
218
|
-
[PKG.protocol]: "^0.
|
|
219
|
-
[PKG.server]: "^0.
|
|
220
|
-
[PKG.web]: "^0.
|
|
218
|
+
[PKG.protocol]: "^0.8.0",
|
|
219
|
+
[PKG.server]: "^0.8.0",
|
|
220
|
+
[PKG.web]: "^0.8.0",
|
|
221
221
|
},
|
|
222
222
|
devDependencies: {
|
|
223
223
|
tsx: "^4.20.0",
|
|
@@ -408,7 +408,7 @@ function checkDeps(add, dir) {
|
|
|
408
408
|
const all = { ...(pj.dependencies ?? {}), ...(pj.devDependencies ?? {}) };
|
|
409
409
|
const missing = Object.values(PKG).filter((n) => !(n in all));
|
|
410
410
|
if (missing.length) add("FAIL", "deps", `未声明平台依赖:${missing.join("、")}`,
|
|
411
|
-
`npm i ${PKG.protocol}@^0.
|
|
411
|
+
`npm i ${PKG.protocol}@^0.8.0 ${PKG.server}@^0.8.0 ${PKG.web}@^0.8.0`);
|
|
412
412
|
else add("OK", "deps", "三个平台包依赖已声明");
|
|
413
413
|
|
|
414
414
|
try {
|
package/src/memory-providers.ts
CHANGED
|
@@ -4,18 +4,19 @@
|
|
|
4
4
|
* 服务器只认 id,不认实现:换记忆引擎 = 换 manifest 里的 `agent.memory.provider`,
|
|
5
5
|
* 本文件之外的服务器代码一行不动。
|
|
6
6
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
7
|
+
* 默认实现是 `hermes-scoped`(`@njuptlzf/pi-hermes-memory`),与其他提供方走**同一条**
|
|
8
|
+
* 动态加载路径——静态 import 会把外部包的源码/类型拉进本仓的 tsc program与 tsx 入口,
|
|
9
|
+
* 跨仓源码进他人编译单元是最难收拾的一类耦合。默认模块说明符内建在下面,
|
|
10
|
+
* 由 `ensureDefaultMemoryProvider()` 在会话创建前惰性加载并注册。
|
|
11
|
+
*
|
|
12
|
+
* 产品也可以在 manifest 里声明 `agent.memoryProviders: [...]`,条目可以是产品目录内的
|
|
13
|
+
* 相对路径,也可以是包名(走 Node 解析)。外部模块与 `agent.extensions` 同一信任模型:
|
|
14
|
+
* 仓库内代码、过准入扫描、进程内运行。
|
|
13
15
|
*
|
|
14
16
|
* 两条刻意选择:
|
|
15
17
|
* - **不可用即报错,不静默降级**。选了没装的 provider 就抛,并列出已注册 id。
|
|
16
18
|
* 静默回落默认实现,会让"我换了引擎"和"我忘了装"看起来一模一样。
|
|
17
|
-
* - **模块用动态 import
|
|
18
|
-
* 本仓的 tsc program,跨仓源码进他人编译单元是最难收拾的一类耦合。
|
|
19
|
+
* - **模块用动态 import**(理由见上)。
|
|
19
20
|
*/
|
|
20
21
|
|
|
21
22
|
import { existsSync, readFileSync } from "node:fs";
|
|
@@ -23,55 +24,22 @@ import { createRequire } from "node:module";
|
|
|
23
24
|
import * as path from "node:path";
|
|
24
25
|
import { pathToFileURL } from "node:url";
|
|
25
26
|
import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
|
|
26
|
-
import { scopedMemory } from "pi-scoped-memory";
|
|
27
27
|
import type { MemoryProvider, MemoryProviderModule } from "@njuptlzf/agent-chat-protocol";
|
|
28
28
|
import { auditExtensionSource } from "./extension-admission.ts";
|
|
29
29
|
|
|
30
30
|
/** 不指定时的实现。与 protocol 的 `agent.memory === true` 对齐。 */
|
|
31
|
-
export const DEFAULT_MEMORY_PROVIDER_ID = "scoped
|
|
31
|
+
export const DEFAULT_MEMORY_PROVIDER_ID = "hermes-scoped";
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
/**
|
|
34
|
+
* 默认实现的模块说明符。作为 server 的直接依赖随包安装;用裸说明符走动态 import,
|
|
35
|
+
* 由 Node 按 exports 条件解析(编译产物走 dist,内部 source 条件走 src)。
|
|
36
|
+
*/
|
|
37
|
+
export const DEFAULT_MEMORY_PROVIDER_MODULE = "@njuptlzf/pi-hermes-memory/scoped-provider";
|
|
34
38
|
|
|
35
|
-
|
|
36
|
-
try {
|
|
37
|
-
const parsed = requireFromRoot(`${pkg}/package.json`) as { version?: unknown };
|
|
38
|
-
return typeof parsed.version === "string" ? parsed.version : "unknown";
|
|
39
|
-
} catch {
|
|
40
|
-
// Version is for logs, not behaviour: a missing package.json must not break open().
|
|
41
|
-
return "unknown";
|
|
42
|
-
}
|
|
43
|
-
}
|
|
39
|
+
const requireFromRoot = createRequire(import.meta.url);
|
|
44
40
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
version: installedVersion("pi-scoped-memory"),
|
|
48
|
-
// 历史实现只读 storageRoot、不读 sharedRoot,没有任何跨 scope 画像能力。
|
|
49
|
-
// 显式声明 false,让宿主能在产品依赖该能力时告警(C6)。
|
|
50
|
-
capabilities: { sharedProfile: false },
|
|
51
|
-
async open(ctx) {
|
|
52
|
-
const dir = ctx.storageRoot;
|
|
53
|
-
const { rm } = await import("node:fs/promises");
|
|
54
|
-
return {
|
|
55
|
-
providerId: DEFAULT_MEMORY_PROVIDER_ID,
|
|
56
|
-
// scopedMemory appends its own snapshot in before_agent_start.
|
|
57
|
-
selfInjects: true,
|
|
58
|
-
factory: scopedMemory({ dir, autoCapture: true }),
|
|
59
|
-
async promptSection() {
|
|
60
|
-
return "";
|
|
61
|
-
},
|
|
62
|
-
async erase() {
|
|
63
|
-
// Its own file is <dir>/entries.jsonl; the directory is host-allocated,
|
|
64
|
-
// so removing it is exactly one tenant's worth of data.
|
|
65
|
-
await rm(dir, { recursive: true, force: true });
|
|
66
|
-
},
|
|
67
|
-
async dispose() {},
|
|
68
|
-
};
|
|
69
|
-
},
|
|
70
|
-
};
|
|
71
|
-
|
|
72
|
-
const registry = new Map<string, MemoryProvider<ExtensionAPI>>([
|
|
73
|
-
[scopedMemoryProvider.id, scopedMemoryProvider],
|
|
74
|
-
]);
|
|
41
|
+
/** 注册表。默认实现首次会话时惰性注册,其余由 manifest 声明的模块加载进来。 */
|
|
42
|
+
const registry = new Map<string, MemoryProvider<ExtensionAPI>>();
|
|
75
43
|
|
|
76
44
|
/** 已加载的外部模块,按解析后的绝对路径去重:同一文件 import 两次不该注册两次。 */
|
|
77
45
|
const loadedModules = new Map<string, Promise<MemoryProvider<ExtensionAPI>>>();
|
|
@@ -186,6 +154,42 @@ export async function loadMemoryProviderModule(
|
|
|
186
154
|
}
|
|
187
155
|
}
|
|
188
156
|
|
|
157
|
+
/**
|
|
158
|
+
* 惰性加载并注册默认实现。
|
|
159
|
+
*
|
|
160
|
+
* 默认 provider 与其他实现走同一条动态 import 路径,外部包的源码/类型不进本仓 tsc program。
|
|
161
|
+
* 但**不能**用裸说明符 import:在 `node --import tsx` 的入口下,包的 `types` 条件会被优先
|
|
162
|
+
* 解析成 `dist/scoped/provider.d.ts` 当代码执行,报 `ReferenceError: provider is not defined`
|
|
163
|
+
* (live:fixture 实测)。所以这里解析包根后按**确定的 dist 文件路径** import,绕开所有条件。
|
|
164
|
+
* 第一次创建会话时加载、过形状校验、注册;缓存一次,多次调用复用。
|
|
165
|
+
*/
|
|
166
|
+
let defaultProviderLoad: Promise<MemoryProvider<ExtensionAPI>> | undefined;
|
|
167
|
+
|
|
168
|
+
export async function ensureDefaultMemoryProvider(): Promise<MemoryProvider<ExtensionAPI>> {
|
|
169
|
+
// A product may have declared the same provider explicitly via its own adapter
|
|
170
|
+
// module. In that case the id is already registered — reuse it instead of
|
|
171
|
+
// importing a second module instance and colliding on the id.
|
|
172
|
+
const existing = registry.get(DEFAULT_MEMORY_PROVIDER_ID);
|
|
173
|
+
if (existing) return existing;
|
|
174
|
+
if (defaultProviderLoad) return defaultProviderLoad;
|
|
175
|
+
defaultProviderLoad = (async () => {
|
|
176
|
+
const pkgJson = requireFromRoot.resolve("@njuptlzf/pi-hermes-memory/package.json");
|
|
177
|
+
const entry = path.join(path.dirname(pkgJson), "dist", "scoped", "provider.js");
|
|
178
|
+
const mod = (await import(pathToFileURL(entry).href)) as MemoryProviderModule<ExtensionAPI>;
|
|
179
|
+
const provider = assertProviderShape(mod.default, `default memory provider "${DEFAULT_MEMORY_PROVIDER_MODULE}"`);
|
|
180
|
+
registerMemoryProvider(provider);
|
|
181
|
+
return provider;
|
|
182
|
+
})();
|
|
183
|
+
try {
|
|
184
|
+
return await defaultProviderLoad;
|
|
185
|
+
} catch (error) {
|
|
186
|
+
// A failed default load must not poison the cache: fixing the install and
|
|
187
|
+
// retrying is the normal recovery path.
|
|
188
|
+
defaultProviderLoad = undefined;
|
|
189
|
+
throw error;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
|
|
189
193
|
export function listMemoryProviders(): Array<{ id: string; version: string; default: boolean }> {
|
|
190
194
|
return [...registry.values()].map((provider) => ({
|
|
191
195
|
id: provider.id,
|
package/src/server.ts
CHANGED
|
@@ -1992,6 +1992,11 @@ export function createChatServer(deps: ServerDeps): Server {
|
|
|
1992
1992
|
dataDir: deps.dataDir,
|
|
1993
1993
|
tier,
|
|
1994
1994
|
qual: scope,
|
|
1995
|
+
// Each member is an independent concurrent worker; give its memory a
|
|
1996
|
+
// distinct root so two live hermes handles never claim the same scope
|
|
1997
|
+
// (the provider enforces one handle per root). Prompt/history/tools
|
|
1998
|
+
// stay scoped by `qual` above.
|
|
1999
|
+
memoryScopeKey: `${scope}__${ctx.jobId.replace(/[^A-Za-z0-9_-]/g, "_")}`,
|
|
1995
2000
|
persona: job.persona,
|
|
1996
2001
|
history,
|
|
1997
2002
|
mcpConfig: deps.mcpConfig,
|
package/src/session.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { readFileSync } from "node:fs";
|
|
2
|
+
import { mkdirSync, readFileSync } from "node:fs";
|
|
3
3
|
import * as path from "node:path";
|
|
4
4
|
import { Type } from "typebox";
|
|
5
5
|
import {
|
|
@@ -23,9 +23,14 @@ import {
|
|
|
23
23
|
type Theme,
|
|
24
24
|
type ToolDefinition,
|
|
25
25
|
} from "@earendil-works/pi-coding-agent";
|
|
26
|
-
import type {
|
|
26
|
+
import type {
|
|
27
|
+
McpServerDecl,
|
|
28
|
+
MemoryCompletion,
|
|
29
|
+
MemoryCompletionResult,
|
|
30
|
+
MemoryProviderSession,
|
|
31
|
+
} from "@njuptlzf/agent-chat-protocol";
|
|
27
32
|
import { toProxySpawn, type McpConfigStore } from "./mcp-config.ts";
|
|
28
|
-
import { loadMemoryProviderModule, providerSupportsSharedProfile, resolveMemoryProvider } from "./memory-providers.ts";
|
|
33
|
+
import { ensureDefaultMemoryProvider, loadMemoryProviderModule, providerSupportsSharedProfile, resolveMemoryProvider } from "./memory-providers.ts";
|
|
29
34
|
import type { LoadedProduct, ResolvedTier, ToolContext } from "./manifest.ts";
|
|
30
35
|
import { agentFor, resolveTier } from "./manifest.ts";
|
|
31
36
|
import { applyPersonaOverride, type PersonaConfigStore, type PersonaOverride } from "./persona-config.ts";
|
|
@@ -191,6 +196,12 @@ export interface CreateProductSessionOptions {
|
|
|
191
196
|
* syllabus. Omit or "" for products without qualifications.
|
|
192
197
|
*/
|
|
193
198
|
qual?: string;
|
|
199
|
+
/**
|
|
200
|
+
* 仅用于记忆 storageRoot 的作用域键。默认等于 `qual`;编排层的并发成员会话传入各自的
|
|
201
|
+
* job/phase 键,避免多个 hermes handle 同时开在同一个根上(provider 按根独占句柄)。
|
|
202
|
+
* 不影响提示词、历史或工具的作用域——那些仍由 `qual` 决定。
|
|
203
|
+
*/
|
|
204
|
+
memoryScopeKey?: string;
|
|
194
205
|
/**
|
|
195
206
|
* Which assistant persona this session is (). Omit for the product
|
|
196
207
|
* product default. It only swaps prompt/skills here; the tool whitelist is
|
|
@@ -491,6 +502,61 @@ export function compileSystemPrompt(
|
|
|
491
502
|
*/
|
|
492
503
|
const memorySessionsByAgent = new WeakMap<AgentSession, MemoryProviderSession<ExtensionAPI>>();
|
|
493
504
|
|
|
505
|
+
/** 后台记忆补全的硬边界:超时与 token 都由宿主定,provider 只能通过请求收紧、不能放宽。 */
|
|
506
|
+
const MEMORY_COMPLETION_TIMEOUT_MS = 15_000;
|
|
507
|
+
const MEMORY_COMPLETION_MAX_TOKENS = 512;
|
|
508
|
+
|
|
509
|
+
/**
|
|
510
|
+
* 把宿主的 `modelRuntime` 适配成注入 provider 的 `MemoryCompletion`。
|
|
511
|
+
*
|
|
512
|
+
* 复用当前会话已解析的 model(与聊天同一物理模型),但**不进用户会话**:
|
|
513
|
+
* 一次 `completeSimple` 调用,独立历史,失败以 `ok:false` 结构化返回,
|
|
514
|
+
* 不参与聊天主链的 failover,也不向 provider 抛异常。超时双保险:signal
|
|
515
|
+
* 传给 provider 请求,Promise.race 兜底不遵守 signal 的底层实现。
|
|
516
|
+
*/
|
|
517
|
+
export function createMemoryCompletion(
|
|
518
|
+
modelRuntime: ModelRuntime,
|
|
519
|
+
model: NonNullable<ReturnType<ModelRuntime["getModel"]>>,
|
|
520
|
+
): MemoryCompletion {
|
|
521
|
+
return async (req): Promise<MemoryCompletionResult> => {
|
|
522
|
+
const controller = new AbortController();
|
|
523
|
+
// 调用方 signal(例如会话销毁)要能取消这次后台补全。
|
|
524
|
+
const onAbort = () => controller.abort();
|
|
525
|
+
req.signal?.addEventListener("abort", onAbort, { once: true });
|
|
526
|
+
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
527
|
+
try {
|
|
528
|
+
const timeout = new Promise<never>((_, reject) => {
|
|
529
|
+
timer = setTimeout(() => {
|
|
530
|
+
controller.abort();
|
|
531
|
+
reject(new Error("memory completion timeout"));
|
|
532
|
+
}, MEMORY_COMPLETION_TIMEOUT_MS);
|
|
533
|
+
});
|
|
534
|
+
const reply = await Promise.race([
|
|
535
|
+
modelRuntime.completeSimple(
|
|
536
|
+
model,
|
|
537
|
+
{ systemPrompt: req.systemPrompt, messages: [{ role: "user", content: req.userPrompt, timestamp: Date.now() }] },
|
|
538
|
+
{
|
|
539
|
+
signal: controller.signal,
|
|
540
|
+
maxTokens: Math.min(req.maxTokens ?? MEMORY_COMPLETION_MAX_TOKENS, MEMORY_COMPLETION_MAX_TOKENS),
|
|
541
|
+
},
|
|
542
|
+
),
|
|
543
|
+
timeout,
|
|
544
|
+
]);
|
|
545
|
+
if (req.signal?.aborted) return { text: "", ok: false, error: "aborted" };
|
|
546
|
+
const text = reply.content
|
|
547
|
+
.filter((c) => c.type === "text")
|
|
548
|
+
.map((c) => (c as { type: "text"; text: string }).text)
|
|
549
|
+
.join("\n");
|
|
550
|
+
return { text, ok: true };
|
|
551
|
+
} catch (err) {
|
|
552
|
+
return { text: "", ok: false, error: err instanceof Error ? err.message : String(err) };
|
|
553
|
+
} finally {
|
|
554
|
+
if (timer !== undefined) clearTimeout(timer);
|
|
555
|
+
req.signal?.removeEventListener("abort", onAbort);
|
|
556
|
+
}
|
|
557
|
+
};
|
|
558
|
+
}
|
|
559
|
+
|
|
494
560
|
/**
|
|
495
561
|
* 产品依赖跨会话画像,但选中的 provider 没声明该能力时给宿主的可读告警(C6)。
|
|
496
562
|
* 导出为纯函数,便于契约测试钉住文案;返回 null 表示无需告警。
|
|
@@ -622,9 +688,14 @@ export async function createProductSession(opts: CreateProductSessionOptions): P
|
|
|
622
688
|
// `hermes-scoped` exists until the product declares the module that provides
|
|
623
689
|
// it. Loading is per-file memoised, so this is one dynamic import per process.
|
|
624
690
|
if (product.memoryEnabled) {
|
|
691
|
+
// Product-declared modules first: if one of them already provides the default
|
|
692
|
+
// id, ensureDefaultMemoryProvider() reuses it instead of importing a second
|
|
693
|
+
// instance. The default itself is a lazy dynamic import so the external
|
|
694
|
+
// package's source/types stay out of our tsc program and tsx entrypoints.
|
|
625
695
|
for (const entry of product.memoryProviderModules) {
|
|
626
696
|
await loadMemoryProviderModule(entry, product.dir);
|
|
627
697
|
}
|
|
698
|
+
await ensureDefaultMemoryProvider();
|
|
628
699
|
}
|
|
629
700
|
// Two disjoint roots per session: the scope (user × product × qual) and the
|
|
630
701
|
// user's cross-scope profile. Siblings, not nested — erasing one qualification
|
|
@@ -642,12 +713,24 @@ export async function createProductSession(opts: CreateProductSessionOptions): P
|
|
|
642
713
|
);
|
|
643
714
|
if (warning) opts.onUINotify?.(warning, "warning");
|
|
644
715
|
}
|
|
716
|
+
// The host owns the roots, so it must materialise them before open(). The
|
|
717
|
+
// old built-in created parents lazily on write; hermes uses mkdtemp under
|
|
718
|
+
// storageRoot and expects the host-allocated directory to already exist.
|
|
719
|
+
const storageRoot = path.join(opts.dataDir, "memory", opts.userId, opts.memoryScopeKey || opts.qual || "default");
|
|
720
|
+
const sharedRoot = path.join(opts.dataDir, "memory", opts.userId, "profile");
|
|
721
|
+
if (memoryProvider) {
|
|
722
|
+
mkdirSync(storageRoot, { recursive: true });
|
|
723
|
+
mkdirSync(sharedRoot, { recursive: true });
|
|
724
|
+
}
|
|
645
725
|
const memorySession = memoryProvider
|
|
646
726
|
? await memoryProvider.open({
|
|
647
|
-
storageRoot
|
|
648
|
-
sharedRoot
|
|
727
|
+
storageRoot,
|
|
728
|
+
sharedRoot,
|
|
649
729
|
agentDir: opts.dataDir,
|
|
650
730
|
scope: { userId: opts.userId, productId: product.manifest.id, qual: opts.qual || "" },
|
|
731
|
+
// 后台整理(巩固/review/flush)用的补全能力。复用本会话已解析的 model,
|
|
732
|
+
// 不进用户会话历史;provider 拿不到凭据,超时/预算由这里统一控。
|
|
733
|
+
complete: createMemoryCompletion(modelRuntime, model),
|
|
651
734
|
})
|
|
652
735
|
: null;
|
|
653
736
|
const memoryExtensions = memorySession ? [memorySession.factory] : [];
|