@zhushanwen/pi-subagent-workflow 8.4.0 → 8.6.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/package.json +22 -7
- package/relay/relay.mjs +390 -0
- package/skills/subagent-ext-config/SKILL.md +80 -0
- package/src/execution/__tests__/agent-registry.test.ts +110 -0
- package/src/execution/__tests__/bg-notify-render.test.ts +73 -0
- package/src/execution/__tests__/chat-engine-routing.test.ts +601 -0
- package/src/execution/__tests__/delivery-methods.test.ts +38 -1
- package/src/execution/__tests__/execute-options-mapper.test.ts +11 -0
- package/src/execution/__tests__/execution-record.test.ts +237 -1
- package/src/execution/__tests__/explicit-agent-ref-guard.test.ts +171 -0
- package/src/execution/__tests__/format-schema-instruction.test.ts +63 -32
- package/src/execution/__tests__/helpers/spawn-mock.ts +4 -0
- package/src/execution/__tests__/index-session-start.test.ts +86 -7
- package/src/execution/__tests__/lifecycle-manager.test.ts +46 -0
- package/src/execution/__tests__/list-fields.test.ts +45 -14
- package/src/execution/__tests__/model-resolver.test.ts +57 -5
- package/src/execution/__tests__/notifier-flush.test.ts +64 -26
- package/src/execution/__tests__/notify-ledger.test.ts +826 -0
- package/src/execution/__tests__/output-collector.test.ts +299 -2
- package/src/execution/__tests__/pi-invocation.test.ts +62 -1
- package/src/execution/__tests__/relay-agent.test.ts +448 -0
- package/src/execution/__tests__/relay-env.test.ts +42 -0
- package/src/execution/__tests__/rpc-mode.test.ts +1 -1
- package/src/execution/__tests__/run-spawn-edges.test.ts +44 -1
- package/src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts +199 -0
- package/src/execution/__tests__/session-runner-schema-env.test.ts +39 -0
- package/src/execution/__tests__/spawn-args.test.ts +37 -26
- package/src/execution/__tests__/start-sync-model-guard.test.ts +150 -0
- package/src/execution/__tests__/startup-config-declaration.test.ts +35 -0
- package/src/execution/__tests__/stream-sink-retirement.test.ts +261 -0
- package/src/execution/__tests__/subprocess-agent-runner-routing.test.ts +310 -0
- package/src/execution/__tests__/subprocess-agent-runner.test.ts +147 -6
- package/src/execution/__tests__/timeout-integration.test.ts +220 -2
- package/src/execution/__tests__/tool-action.test.ts +92 -1
- package/src/execution/agent-registry.ts +16 -0
- package/src/execution/argv-mirror.ts +5 -1
- package/src/execution/concurrency-pool.ts +1 -1
- package/src/execution/config.ts +25 -2
- package/src/execution/engine/__tests__/common/data-dir.test.ts +53 -0
- package/src/execution/engine/__tests__/common/errors.test.ts +132 -0
- package/src/execution/engine/__tests__/common/event-journal.test.ts +177 -0
- package/src/execution/engine/__tests__/common/kill-chain.test.ts +192 -0
- package/src/execution/engine/__tests__/common/nesting-guard.test.ts +81 -0
- package/src/execution/engine/__tests__/common/persona-router.test.ts +123 -0
- package/src/execution/engine/__tests__/common/pool-manager.test.ts +154 -0
- package/src/execution/engine/__tests__/common/schema-emulation.test.ts +128 -0
- package/src/execution/engine/__tests__/conformance/__fixtures__/pi-golden-events.json +28 -0
- package/src/execution/engine/__tests__/conformance/agent-event-invariants.ts +141 -0
- package/src/execution/engine/__tests__/conformance/contract.abort.test.ts +109 -0
- package/src/execution/engine/__tests__/conformance/contract.agent-events.test.ts +101 -0
- package/src/execution/engine/__tests__/conformance/contract.probe.test.ts +77 -0
- package/src/execution/engine/__tests__/conformance/contract.read-degradation.test.ts +104 -0
- package/src/execution/engine/__tests__/conformance/contract.relay.test.ts +342 -0
- package/src/execution/engine/__tests__/conformance/engine-conformance.live.test.ts +201 -0
- package/src/execution/engine/__tests__/conformance/golden-replay.pi.test.ts +76 -0
- package/src/execution/engine/__tests__/conformance/golden-replay.zcode.test.ts +79 -0
- package/src/execution/engine/__tests__/engine-discovery.test.ts +87 -0
- package/src/execution/engine/__tests__/engines-declaration.test.ts +36 -0
- package/src/execution/engine/__tests__/model-prompt.test.ts +85 -0
- package/src/execution/engine/__tests__/paths.test.ts +39 -0
- package/src/execution/engine/__tests__/registry.test.ts +120 -0
- package/src/execution/engine/__tests__/routing.test.ts +231 -0
- package/src/execution/engine/common/data-dir.ts +62 -0
- package/src/execution/engine/common/errors.ts +183 -0
- package/src/execution/engine/common/event-journal.ts +254 -0
- package/src/execution/engine/common/journal-replay.ts +62 -0
- package/src/execution/engine/common/kill-chain.ts +221 -0
- package/src/execution/engine/common/nesting-guard.ts +50 -0
- package/src/execution/engine/common/persona-router.ts +108 -0
- package/src/execution/engine/common/pool-manager.ts +226 -0
- package/src/execution/engine/common/schema-emulation.ts +189 -0
- package/src/execution/engine/common/session-view-projection.ts +51 -0
- package/src/execution/engine/engine-discovery.ts +65 -0
- package/src/execution/engine/engines/pi/__tests__/pi-engine.test.ts +469 -0
- package/src/execution/engine/engines/pi/__tests__/reader.test.ts +155 -0
- package/src/execution/engine/engines/pi/__tests__/task-spec-mapper.test.ts +164 -0
- package/src/execution/engine/engines/pi/pi-engine.ts +415 -0
- package/src/execution/engine/engines/pi/reader.ts +48 -0
- package/src/execution/engine/engines/pi/registration.ts +35 -0
- package/src/execution/engine/engines/pi/task-spec-mapper.ts +100 -0
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/zcode-golden-spawn.json +39 -0
- package/src/execution/engine/engines/zcode/__tests__/launcher.test.ts +150 -0
- package/src/execution/engine/engines/zcode/__tests__/parser.test.ts +246 -0
- package/src/execution/engine/engines/zcode/__tests__/preparer.test.ts +228 -0
- package/src/execution/engine/engines/zcode/__tests__/reader.test.ts +210 -0
- package/src/execution/engine/engines/zcode/__tests__/registration.test.ts +64 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.live.test.ts +127 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.test.ts +580 -0
- package/src/execution/engine/engines/zcode/constants.ts +43 -0
- package/src/execution/engine/engines/zcode/golden-sample.ts +39 -0
- package/src/execution/engine/engines/zcode/launcher.ts +161 -0
- package/src/execution/engine/engines/zcode/parser.ts +436 -0
- package/src/execution/engine/engines/zcode/preparer.ts +363 -0
- package/src/execution/engine/engines/zcode/reader.ts +381 -0
- package/src/execution/engine/engines/zcode/registration.ts +37 -0
- package/src/execution/engine/engines/zcode/zcode-engine.ts +658 -0
- package/src/execution/engine/host-task-spec.ts +47 -0
- package/src/execution/engine/model-prompt.ts +59 -0
- package/src/execution/engine/paths.ts +42 -0
- package/src/execution/engine/port.ts +153 -0
- package/src/execution/engine/registry.ts +123 -0
- package/src/execution/engine/routing.ts +218 -0
- package/src/execution/engine/types.ts +309 -0
- package/src/execution/execute-options-mapper.ts +13 -8
- package/src/execution/execution-record.ts +66 -1
- package/src/execution/lifecycle-manager.ts +23 -1
- package/src/execution/model-config-service.ts +16 -1
- package/src/execution/model-resolver.ts +37 -59
- package/src/execution/notifier.ts +105 -35
- package/src/execution/notify-ledger.ts +580 -0
- package/src/execution/output-collector.ts +143 -3
- package/src/execution/pi-invocation.ts +32 -2
- package/src/execution/record-entry.ts +14 -0
- package/src/execution/record-store.ts +34 -0
- package/src/execution/relay-env.ts +37 -0
- package/src/execution/session-runner.ts +328 -71
- package/src/execution/stream-sink.ts +26 -0
- package/src/execution/subagent-service.ts +273 -13
- package/src/execution/subprocess-agent-runner.ts +210 -14
- package/src/execution/types.ts +124 -5
- package/src/execution/ui-request-queue.ts +14 -4
- package/src/index.ts +99 -1
- package/src/interface/__tests__/subagent-tool-path-guard.test.ts +157 -0
- package/src/interface/__tests__/subagent-tool-prompt.test.ts +12 -0
- package/src/interface/bg-notify-render.ts +33 -12
- package/src/interface/helpers.ts +2 -2
- package/src/interface/subagent-actions.ts +29 -9
- package/src/interface/subagent-tool-schema.ts +156 -0
- package/src/interface/subagent-tool.ts +56 -119
- package/src/interface/subagents.ts +2 -2
- package/src/orchestration/__tests__/__fixtures__/worker-template.snapshot.txt +19 -3
- package/src/orchestration/__tests__/agent-call-catch-fallback.test.ts +0 -6
- package/src/orchestration/__tests__/agent-call-stream.test.ts +0 -5
- package/src/orchestration/__tests__/error-recovery-handlers.test.ts +89 -4
- package/src/orchestration/__tests__/execute-agent-call.test.ts +137 -0
- package/src/orchestration/__tests__/jsonl-run-store-corrupt-entry.test.ts +150 -0
- package/src/orchestration/__tests__/jsonl-run-store-retention.test.ts +202 -0
- package/src/orchestration/__tests__/launcher-nested-workflow.test.ts +326 -3
- package/src/orchestration/__tests__/lifecycle.test.ts +41 -7
- package/src/orchestration/__tests__/non-cloneable-return-e2e.test.ts +95 -0
- package/src/orchestration/__tests__/review-fix-loop-e2e.test.ts +57 -3
- package/src/orchestration/__tests__/skill-discovery.test.ts +44 -0
- package/src/orchestration/__tests__/worker-exit-without-result.test.ts +368 -0
- package/src/orchestration/__tests__/worker-script-builder-runtime.test.ts +43 -0
- package/src/orchestration/__tests__/worker-script-template-snapshot.test.ts +22 -3
- package/src/orchestration/agent-opts-resolver.ts +104 -23
- package/src/orchestration/error-recovery.ts +189 -33
- package/src/orchestration/execute-agent-call.ts +39 -0
- package/src/orchestration/jsonl-run-store.ts +121 -7
- package/src/orchestration/launcher.ts +60 -15
- package/src/orchestration/lifecycle.ts +10 -7
- package/src/orchestration/models/__tests__/budget.test.ts +1 -61
- package/src/orchestration/models/budget.ts +5 -35
- package/src/orchestration/models/run-runtime.ts +24 -9
- package/src/orchestration/models/types.ts +16 -0
- package/src/orchestration/script-lint.ts +1 -1
- package/src/orchestration/skill-discovery.ts +31 -8
- package/src/orchestration/worker-script-builder.ts +19 -3
- package/src/shared/__tests__/model-ref.test.ts +306 -0
- package/src/shared/__tests__/schema-jsonify.test.ts +1 -1
- package/src/shared/__tests__/timer-delay.test.ts +61 -0
- package/src/shared/meta-parser.ts +5 -1
- package/src/shared/model-ref.ts +286 -0
- package/src/shared/resource-meta.ts +5 -0
- package/src/shared/schema-env.ts +44 -0
- package/src/shared/schema-jsonify.ts +6 -4
- package/src/shared/timer-delay.ts +54 -0
- package/workflows/review-fix-loop-utils.cjs +9 -7
- package/workflows/review-fix-loop.js +20 -12
- package/src/orchestration/__tests__/concurrency-gate.test.ts +0 -125
- package/src/orchestration/concurrency-gate.ts +0 -69
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
// golden-replay.zcode.test.ts —— zcode 引擎 golden 回放层(conformance 免 LLM 默认 CI
|
|
2
|
+
// 层)。数据源 = P3 验收前置门的真机实录(engines/zcode/__tests__/__fixtures__/
|
|
3
|
+
// zcode-golden-spawn.json 的 stdoutRaw)——parser 对实录样本回归 + coarse 事件合成
|
|
4
|
+
// 不变量断言 + 双副本 diff 校验(fixture 与 golden-sample.ts 内嵌副本一致,防漂移:
|
|
5
|
+
// 更新样本必须同步两处,探针的干跑校验消费内嵌副本,两处不一致 = 探针在测旧契约)。
|
|
6
|
+
|
|
7
|
+
import { readFileSync } from "node:fs";
|
|
8
|
+
import { dirname, join } from "node:path";
|
|
9
|
+
import { fileURLToPath } from "node:url";
|
|
10
|
+
|
|
11
|
+
import { describe, expect, it } from "vitest";
|
|
12
|
+
|
|
13
|
+
import { ZCODE_GOLDEN_STDOUT } from "../../engines/zcode/golden-sample.ts";
|
|
14
|
+
import {
|
|
15
|
+
mapZcodeOutcomeUsage,
|
|
16
|
+
parseZcodeTerminal,
|
|
17
|
+
synthesizeCoarseEvents,
|
|
18
|
+
} from "../../engines/zcode/parser.ts";
|
|
19
|
+
import { assertAgentEventInvariants } from "./agent-event-invariants.ts";
|
|
20
|
+
|
|
21
|
+
// conformance 目录(engine/__tests__/conformance)→ engine 根的相对定位
|
|
22
|
+
const fixturePath = join(
|
|
23
|
+
dirname(fileURLToPath(import.meta.url)),
|
|
24
|
+
"..", "..", // conformance → __tests__ → engine
|
|
25
|
+
"engines", "zcode", "__tests__", "__fixtures__", "zcode-golden-spawn.json",
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
interface ZcodeGoldenFile {
|
|
29
|
+
_meta: { engineVersion: string; exitCode: number };
|
|
30
|
+
stdoutRaw: string;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
const fixture = JSON.parse(readFileSync(fixturePath, "utf8")) as ZcodeGoldenFile;
|
|
34
|
+
|
|
35
|
+
describe("zcode golden 回放(conformance C3,免 LLM/免二进制)", () => {
|
|
36
|
+
it("双副本 diff:golden-sample.ts 内嵌副本 === fixture stdoutRaw(防漂移,A12)", () => {
|
|
37
|
+
expect(ZCODE_GOLDEN_STDOUT).toBe(fixture.stdoutRaw);
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
it("parser 对实录样本回归:sessionId/response/usage 形状完整(探针干跑同源断言)", () => {
|
|
41
|
+
const terminal = parseZcodeTerminal(fixture.stdoutRaw);
|
|
42
|
+
expect(terminal.ok).toBe(true);
|
|
43
|
+
if (!terminal.ok) return;
|
|
44
|
+
expect(terminal.payload.sessionId).toMatch(/^sess_/);
|
|
45
|
+
expect(terminal.payload.response).toBe("ok");
|
|
46
|
+
expect(terminal.payload.usage).toEqual({ input: 12599, output: 17, cacheRead: 512, cacheWrite: 0 });
|
|
47
|
+
// 终态层 usage(orchestration 版):cost 显式 0(无来源不给残缺)、contextTokens 取 projection
|
|
48
|
+
expect(terminal.payload.outcomeUsage).toEqual({
|
|
49
|
+
input: 12599,
|
|
50
|
+
output: 17,
|
|
51
|
+
cacheRead: 512,
|
|
52
|
+
cacheWrite: 0,
|
|
53
|
+
cost: 0,
|
|
54
|
+
contextTokens: 12616,
|
|
55
|
+
turns: 1,
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
it("coarse 事件合成满足产出不变量(turn_end 最后、其前必有 message_end、usage 完整)", () => {
|
|
60
|
+
const terminal = parseZcodeTerminal(fixture.stdoutRaw);
|
|
61
|
+
if (!terminal.ok) throw new Error("golden 样本解析失败(上一用例应已转红)");
|
|
62
|
+
const events = synthesizeCoarseEvents(terminal.payload.response, terminal.payload.usage);
|
|
63
|
+
assertAgentEventInvariants(events, { granularity: "coarse" });
|
|
64
|
+
expect(events.map((e) => e.type)).toEqual(["message_end", "turn_end"]);
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
it("usage 无来源样本:mapZcodeOutcomeUsage 显式缺省(不给残缺对象,不变量 2 的输入面)", () => {
|
|
68
|
+
expect(mapZcodeOutcomeUsage(undefined, undefined)).toBeUndefined();
|
|
69
|
+
expect(mapZcodeOutcomeUsage({ inputTokens: 1 }, undefined)).toEqual({
|
|
70
|
+
input: 1,
|
|
71
|
+
output: 0,
|
|
72
|
+
cacheRead: 0,
|
|
73
|
+
cacheWrite: 0,
|
|
74
|
+
cost: 0,
|
|
75
|
+
contextTokens: 0,
|
|
76
|
+
turns: 1,
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
});
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
// engine-discovery.test.ts —— [U7] registry → engines.json 同步(幂等/原子/兜底)。
|
|
2
|
+
|
|
3
|
+
import * as fs from "node:fs";
|
|
4
|
+
import * as os from "node:os";
|
|
5
|
+
import * as path from "node:path";
|
|
6
|
+
|
|
7
|
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
8
|
+
|
|
9
|
+
import type { SubagentEnginesFile } from "@xyz-agent/extension-protocol";
|
|
10
|
+
|
|
11
|
+
import { getEnginesFilePath, syncEnginesFile } from "../engine-discovery.ts";
|
|
12
|
+
import type { EnginePort } from "../port.ts";
|
|
13
|
+
import { clearEngines, registerEngine } from "../registry.ts";
|
|
14
|
+
|
|
15
|
+
function stubEngine(id: string): EnginePort {
|
|
16
|
+
return {
|
|
17
|
+
id,
|
|
18
|
+
capabilities: () => ({ conversation: "unsupported", steer: "unsupported", sandbox: "none" }),
|
|
19
|
+
probe: async () => ({ ok: true, engineVersion: "test" }),
|
|
20
|
+
run: async () => {
|
|
21
|
+
throw new Error("unused");
|
|
22
|
+
},
|
|
23
|
+
interact: async () => {
|
|
24
|
+
throw new Error("unused");
|
|
25
|
+
},
|
|
26
|
+
read: async () => ({ engineId: id, turns: [], source: "outcome-only" }),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
let tmpRoot: string;
|
|
31
|
+
let agentDir: string;
|
|
32
|
+
|
|
33
|
+
beforeEach(() => {
|
|
34
|
+
tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "engine-discovery-"));
|
|
35
|
+
agentDir = path.join(tmpRoot, "agent");
|
|
36
|
+
clearEngines();
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
afterEach(() => {
|
|
40
|
+
clearEngines();
|
|
41
|
+
fs.rmSync(tmpRoot, { recursive: true, force: true });
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
describe("syncEnginesFile", () => {
|
|
45
|
+
it("注册表引擎列表落盘(v=1 + 注册序)", () => {
|
|
46
|
+
registerEngine("pi", () => stubEngine("pi"));
|
|
47
|
+
registerEngine("zcode", () => stubEngine("zcode"));
|
|
48
|
+
syncEnginesFile(agentDir);
|
|
49
|
+
const file = JSON.parse(fs.readFileSync(getEnginesFilePath(agentDir), "utf8")) as SubagentEnginesFile;
|
|
50
|
+
expect(file.v).toBe(1);
|
|
51
|
+
expect(file.engines).toEqual(["pi", "zcode"]);
|
|
52
|
+
expect(typeof file.updatedAt).toBe("number");
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
it("幂等:引擎清单未变时第二次零写(mtime 不动)", () => {
|
|
56
|
+
registerEngine("pi", () => stubEngine("pi"));
|
|
57
|
+
syncEnginesFile(agentDir);
|
|
58
|
+
const p = getEnginesFilePath(agentDir);
|
|
59
|
+
const statAfterFirst = fs.statSync(p);
|
|
60
|
+
syncEnginesFile(agentDir);
|
|
61
|
+
expect(fs.statSync(p).mtimeMs).toBe(statAfterFirst.mtimeMs);
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
it("新增引擎注册后内容变化触发重写", () => {
|
|
65
|
+
registerEngine("pi", () => stubEngine("pi"));
|
|
66
|
+
syncEnginesFile(agentDir);
|
|
67
|
+
registerEngine("acp", () => stubEngine("acp"));
|
|
68
|
+
syncEnginesFile(agentDir);
|
|
69
|
+
const file = JSON.parse(fs.readFileSync(getEnginesFilePath(agentDir), "utf8")) as SubagentEnginesFile;
|
|
70
|
+
expect(file.engines).toEqual(["pi", "acp"]);
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it("现文件损坏(torn write 形态)时重建", () => {
|
|
74
|
+
registerEngine("pi", () => stubEngine("pi"));
|
|
75
|
+
const p = getEnginesFilePath(agentDir);
|
|
76
|
+
fs.mkdirSync(path.dirname(p), { recursive: true });
|
|
77
|
+
fs.writeFileSync(p, "{ torn", "utf8");
|
|
78
|
+
syncEnginesFile(agentDir);
|
|
79
|
+
expect(() => JSON.parse(fs.readFileSync(p, "utf8"))).not.toThrow();
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it("agentDir 不存在时建目录写入;IO 异常吞掉不抛(fail-safe)", () => {
|
|
83
|
+
registerEngine("pi", () => stubEngine("pi"));
|
|
84
|
+
expect(() => syncEnginesFile(agentDir)).not.toThrow();
|
|
85
|
+
expect(fs.existsSync(getEnginesFilePath(agentDir))).toBe(true);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
// engines-declaration.test.ts —— [U7b] 双源一致性守护:package.json 的
|
|
2
|
+
// xyz-agent.subagentEngines 静态声明(runtime 冷启动回退源)必须与代码注册表一致。
|
|
3
|
+
// 新增引擎时改注册点 + 声明两处;漏改声明会被本测试拦截(冷启动 GUI 将少列引擎)。
|
|
4
|
+
|
|
5
|
+
import * as fs from "node:fs";
|
|
6
|
+
import * as path from "node:path";
|
|
7
|
+
import { fileURLToPath } from "node:url";
|
|
8
|
+
|
|
9
|
+
import { describe, expect, it } from "vitest";
|
|
10
|
+
|
|
11
|
+
// package.json 与 src/ 的相对位置(本文件在 src/execution/engine/__tests__/ 下,四级上溯)
|
|
12
|
+
const pkgPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../../../package.json");
|
|
13
|
+
|
|
14
|
+
describe("package.json xyz-agent.subagentEngines 静态声明一致性(U7b 冷启动回退源)", () => {
|
|
15
|
+
it("声明存在、非空、全为字符串", () => {
|
|
16
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8")) as {
|
|
17
|
+
"xyz-agent"?: { subagentEngines?: unknown };
|
|
18
|
+
};
|
|
19
|
+
const declared = pkg["xyz-agent"]?.subagentEngines;
|
|
20
|
+
expect(Array.isArray(declared)).toBe(true);
|
|
21
|
+
expect((declared as string[]).length).toBeGreaterThan(0);
|
|
22
|
+
expect((declared as unknown[]).every((e) => typeof e === "string")).toBe(true);
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
it("与组合根注册的引擎一致(registerPiEngine/registerZcodeEngine 后 listEngines 等值)", async () => {
|
|
26
|
+
// 直接 import 组合根注册模块(工厂体同款调用),再对 listEngines——不 import index.ts
|
|
27
|
+
// 全量工厂(避免拉起 ExtensionAPI 依赖面),注册点即一致性的代码侧事实源。
|
|
28
|
+
await import("../engines/pi/registration.ts").then((m) => m.registerPiEngine());
|
|
29
|
+
await import("../engines/zcode/registration.ts").then((m) => m.registerZcodeEngine());
|
|
30
|
+
const { listEngines } = await import("../registry.ts");
|
|
31
|
+
|
|
32
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8")) as { "xyz-agent"?: { subagentEngines?: string[] } };
|
|
33
|
+
const declared = pkg["xyz-agent"]?.subagentEngines ?? [];
|
|
34
|
+
expect([...declared].sort()).toEqual([...listEngines()].sort());
|
|
35
|
+
});
|
|
36
|
+
});
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
// model-prompt.test.ts —— [U7] 引擎模型段注入的开关语义(defaultEngine)与段格式。
|
|
2
|
+
|
|
3
|
+
import * as fs from "node:fs";
|
|
4
|
+
import * as os from "node:os";
|
|
5
|
+
import * as path from "node:path";
|
|
6
|
+
|
|
7
|
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
8
|
+
|
|
9
|
+
import type { EnginePort } from "../port.ts";
|
|
10
|
+
import { clearEngines, registerEngine } from "../registry.ts";
|
|
11
|
+
import { buildEngineModelsPromptAppend } from "../model-prompt.ts";
|
|
12
|
+
|
|
13
|
+
/** 最小 fake 引擎:仅 id + 可选 listModels(其余面 run/read 走不到,测试只触碰注入链)。 */
|
|
14
|
+
function fakeEngine(id: string, models: Array<{ id: string; name?: string }> | null): EnginePort {
|
|
15
|
+
return {
|
|
16
|
+
id,
|
|
17
|
+
capabilities: () => ({ conversation: "unsupported", steer: "unsupported", sandbox: "none" }),
|
|
18
|
+
probe: async () => ({ ok: true, engineVersion: "test" }),
|
|
19
|
+
run: async () => {
|
|
20
|
+
throw new Error("not used in this test");
|
|
21
|
+
},
|
|
22
|
+
interact: async () => {
|
|
23
|
+
throw new Error("not used in this test");
|
|
24
|
+
},
|
|
25
|
+
read: async () => ({ engineId: id, turns: [], source: "outcome-only" }),
|
|
26
|
+
...(models !== null ? { listModels: () => models } : {}),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
let tmpRoot: string;
|
|
31
|
+
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "model-prompt-"));
|
|
34
|
+
clearEngines();
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
afterEach(() => {
|
|
38
|
+
clearEngines();
|
|
39
|
+
fs.rmSync(tmpRoot, { recursive: true, force: true });
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
describe("buildEngineModelsPromptAppend(defaultEngine 开关语义)", () => {
|
|
43
|
+
it("defaultEngine 缺省 / 'pi' → 不注入(pi 段由核心提供)", () => {
|
|
44
|
+
registerEngine("zcode", () => fakeEngine("zcode", [{ id: "p/m1" }]));
|
|
45
|
+
expect(buildEngineModelsPromptAppend(undefined)).toBe("");
|
|
46
|
+
expect(buildEngineModelsPromptAppend("pi")).toBe("");
|
|
47
|
+
expect(buildEngineModelsPromptAppend(" ")).toBe("");
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it("defaultEngine=zcode 且引擎实现 listModels → 注入段(含分界说明与模型 id)", () => {
|
|
51
|
+
registerEngine("zcode", () =>
|
|
52
|
+
fakeEngine("zcode", [
|
|
53
|
+
{ id: "builtin:bigmodel-coding-plan/GLM-5.3", name: "Z.ai - Coding Plan · GLM-5.3" },
|
|
54
|
+
{ id: "e512/mimo-v2.5-pro" },
|
|
55
|
+
]),
|
|
56
|
+
);
|
|
57
|
+
const append = buildEngineModelsPromptAppend("zcode");
|
|
58
|
+
expect(append).toContain("<available_zcode_models>");
|
|
59
|
+
expect(append).toContain("</available_zcode_models>");
|
|
60
|
+
expect(append).toContain("<id>builtin:bigmodel-coding-plan/GLM-5.3</id>");
|
|
61
|
+
expect(append).toContain("<name>Z.ai - Coding Plan · GLM-5.3</name>");
|
|
62
|
+
expect(append).toContain("<id>e512/mimo-v2.5-pro</id>");
|
|
63
|
+
// 分界语义:pi 段的 id 不适用于本引擎
|
|
64
|
+
expect(append).toContain("do NOT apply to engine 'zcode'");
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
it("引擎未实现 listModels / 清单为空 / 未注册引擎 → 不注入(可发现性降级)", () => {
|
|
68
|
+
registerEngine("bare", () => fakeEngine("bare", null));
|
|
69
|
+
expect(buildEngineModelsPromptAppend("bare")).toBe("");
|
|
70
|
+
registerEngine("empty", () => fakeEngine("empty", []));
|
|
71
|
+
expect(buildEngineModelsPromptAppend("empty")).toBe("");
|
|
72
|
+
expect(buildEngineModelsPromptAppend("ghost")).toBe("");
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("listModels 抛异常 → fail-safe 不注入", () => {
|
|
76
|
+
const throwing: EnginePort = {
|
|
77
|
+
...fakeEngine("boom", null),
|
|
78
|
+
listModels: () => {
|
|
79
|
+
throw new Error("v2 config broken");
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
registerEngine("boom", () => throwing);
|
|
83
|
+
expect(buildEngineModelsPromptAppend("boom")).toBe("");
|
|
84
|
+
});
|
|
85
|
+
});
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
resolveEngineDir,
|
|
5
|
+
resolveEnginesRoot,
|
|
6
|
+
resolveJournalPath,
|
|
7
|
+
resolvePoolDir,
|
|
8
|
+
sanitizeSeg,
|
|
9
|
+
} from '../paths.js';
|
|
10
|
+
|
|
11
|
+
describe('engine paths SSOT', () => {
|
|
12
|
+
it('engines 根锚定 dataDir 顶层', () => {
|
|
13
|
+
expect(resolveEnginesRoot('/data')).toBe('/data/engines');
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it('池目录 = engines/<engineId>/<poolKey>', () => {
|
|
17
|
+
expect(resolvePoolDir('/data', 'zcode', 'home-reviewer')).toBe('/data/engines/zcode/home-reviewer');
|
|
18
|
+
expect(resolveEngineDir('/data', 'zcode')).toBe('/data/engines/zcode');
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it('journal 路径带 taskId 文件名', () => {
|
|
22
|
+
expect(resolveJournalPath('/data', 'zcode', 'pool1', 'sa-123')).toBe(
|
|
23
|
+
'/data/engines/zcode/pool1/journal-sa-123.jsonl',
|
|
24
|
+
);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('路径段安全编码:穿越/分隔符/空白折叠为连字符', () => {
|
|
28
|
+
expect(sanitizeSeg('a/b\\c')).toBe('a-b-c');
|
|
29
|
+
expect(sanitizeSeg('..')).toBe('default');
|
|
30
|
+
expect(sanitizeSeg(' ')).toBe('default');
|
|
31
|
+
expect(sanitizeSeg('home-reviewer')).toBe('home-reviewer');
|
|
32
|
+
expect(sanitizeSeg('中文名')).toBe('default');
|
|
33
|
+
expect(sanitizeSeg('x'.repeat(200))).toHaveLength(80);
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
it('engineId 也走安全编码,防注入路径段', () => {
|
|
37
|
+
expect(resolvePoolDir('/data', '../../etc', 'p')).toBe('/data/engines/etc/p');
|
|
38
|
+
});
|
|
39
|
+
});
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
// src/execution/engine/__tests__/registry.test.ts
|
|
2
|
+
//
|
|
3
|
+
// registry 专属测试(P1 验收 4):注册/获取/listEngines/hasEngine/
|
|
4
|
+
// 未注册 id 报 engine_not_found(错误文案含已注册清单——错误规格表第 1 行契约)。
|
|
5
|
+
|
|
6
|
+
import { beforeEach, describe, expect, it } from "vitest";
|
|
7
|
+
|
|
8
|
+
import type { EnginePort, RunContext } from "../port.ts";
|
|
9
|
+
import {
|
|
10
|
+
clearEngines,
|
|
11
|
+
DEFAULT_ENGINE_ID,
|
|
12
|
+
EngineNotFoundError,
|
|
13
|
+
getEngine,
|
|
14
|
+
hasEngine,
|
|
15
|
+
listEngines,
|
|
16
|
+
registerEngine,
|
|
17
|
+
} from "../registry.ts";
|
|
18
|
+
import type { AgentTaskSpec, SessionView } from "../types.ts";
|
|
19
|
+
|
|
20
|
+
/** 最小可运行假引擎(完整实现 EnginePort 五面——不 cast,防接口漂移失检)。 */
|
|
21
|
+
function makeFakeEngine(id: string): EnginePort {
|
|
22
|
+
return {
|
|
23
|
+
id,
|
|
24
|
+
capabilities: () => ({
|
|
25
|
+
schemaEnforcement: "native",
|
|
26
|
+
steer: "unsupported",
|
|
27
|
+
conversation: "unsupported",
|
|
28
|
+
personaInjection: "prompt",
|
|
29
|
+
eventGranularity: "coarse",
|
|
30
|
+
sandbox: "none",
|
|
31
|
+
sessionRead: "outcome-only",
|
|
32
|
+
resume: "unsupported",
|
|
33
|
+
interrupt: "kill-only",
|
|
34
|
+
permissionMode: "fixed",
|
|
35
|
+
}),
|
|
36
|
+
probe: () =>
|
|
37
|
+
Promise.resolve({ ok: true, engineVersion: "0.0.0-test", checks: [{ name: "stub", ok: true }] }),
|
|
38
|
+
run: (_task: AgentTaskSpec, _ctx: RunContext) =>
|
|
39
|
+
Promise.reject(new Error("fake engine: run not implemented")),
|
|
40
|
+
interact: () => Promise.resolve({ ok: false, code: "engine_capability_unsupported", message: "stub" }),
|
|
41
|
+
read: (_handle: Parameters<EnginePort["read"]>[0]): Promise<SessionView> =>
|
|
42
|
+
Promise.resolve({ engineId: id, turns: [], source: "outcome-only" }),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
describe("engine registry", () => {
|
|
47
|
+
beforeEach(() => {
|
|
48
|
+
// 测试隔离:registry 是进程级全局状态,防用例间工厂/单例泄漏串扰
|
|
49
|
+
clearEngines();
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
it("registerEngine + getEngine:按 id 取回引擎实例", () => {
|
|
53
|
+
registerEngine("fake", () => makeFakeEngine("fake"));
|
|
54
|
+
const engine = getEngine("fake");
|
|
55
|
+
expect(engine.id).toBe("fake");
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it("getEngine 惰性单例:同一 id 重复获取返回同一实例(§3.3.1 registry 持 per-engine 单例)", () => {
|
|
59
|
+
let created = 0;
|
|
60
|
+
registerEngine("fake", () => {
|
|
61
|
+
created++;
|
|
62
|
+
return makeFakeEngine("fake");
|
|
63
|
+
});
|
|
64
|
+
const a = getEngine("fake");
|
|
65
|
+
const b = getEngine("fake");
|
|
66
|
+
expect(a).toBe(b);
|
|
67
|
+
expect(created).toBe(1);
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("registerEngine 覆盖同 id:丢弃旧单例,下次 getEngine 用新工厂重建(幂等重注册)", () => {
|
|
71
|
+
registerEngine("fake", () => makeFakeEngine("fake"));
|
|
72
|
+
const first = getEngine("fake");
|
|
73
|
+
registerEngine("fake", () => makeFakeEngine("fake-v2"));
|
|
74
|
+
const second = getEngine("fake");
|
|
75
|
+
expect(second).not.toBe(first);
|
|
76
|
+
expect(second.id).toBe("fake-v2");
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
it("listEngines 返回注册序清单,hasEngine 判注册态(不触发工厂副作用)", () => {
|
|
80
|
+
let created = 0;
|
|
81
|
+
registerEngine("alpha", () => {
|
|
82
|
+
created++;
|
|
83
|
+
return makeFakeEngine("alpha");
|
|
84
|
+
});
|
|
85
|
+
registerEngine("beta", () => makeFakeEngine("beta"));
|
|
86
|
+
expect(listEngines()).toEqual(["alpha", "beta"]);
|
|
87
|
+
expect(hasEngine("alpha")).toBe(true);
|
|
88
|
+
expect(hasEngine("gamma")).toBe(false);
|
|
89
|
+
// hasEngine 不取实例——工厂未执行
|
|
90
|
+
expect(created).toBe(0);
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
it("未注册 id → EngineNotFoundError(code=engine_not_found,文案含已注册清单)", () => {
|
|
94
|
+
registerEngine("pi", () => makeFakeEngine("pi"));
|
|
95
|
+
let caught: unknown;
|
|
96
|
+
try {
|
|
97
|
+
getEngine("zcode");
|
|
98
|
+
} catch (err) {
|
|
99
|
+
caught = err;
|
|
100
|
+
}
|
|
101
|
+
expect(caught).toBeInstanceOf(EngineNotFoundError);
|
|
102
|
+
if (!(caught instanceof EngineNotFoundError)) throw new Error("unreachable");
|
|
103
|
+
expect(caught.code).toBe("engine_not_found");
|
|
104
|
+
expect(caught.engineId).toBe("zcode");
|
|
105
|
+
// 错误规格表第 1 行契约:指向注册表清单 + 配置文件路径
|
|
106
|
+
expect(caught.message).toContain("engine_not_found");
|
|
107
|
+
expect(caught.message).toContain("'zcode'");
|
|
108
|
+
expect(caught.message).toContain("pi");
|
|
109
|
+
expect(caught.message).toContain("frontmatter");
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it("空注册表时未注册 id 错误不崩(清单为 none)", () => {
|
|
113
|
+
expect(() => getEngine("anything")).toThrow(EngineNotFoundError);
|
|
114
|
+
expect(() => getEngine("anything")).toThrow(/\(none\)/);
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it("DEFAULT_ENGINE_ID 缺省为 'pi'(D9:回填期零风险默认)", () => {
|
|
118
|
+
expect(DEFAULT_ENGINE_ID).toBe("pi");
|
|
119
|
+
});
|
|
120
|
+
});
|