mirror of
https://bitbucket.org/siakitem/my-pi.git
synced 2026-10-26 10:45:22 +00:00
AutoReview: - 审查器回到 Codex Guardian 风格的对话式审查,默认跟随会话当前主模型 (每次审查实时读取 ctx.model);provider/model 必须同时设置才固定审查 模型,只设其一视为配置错误并转人工。 - 结论只通过 approve / reject 两个工具给出,参数仅 reason;不强制 toolChoice,正文文本(即使是合法 JSON)一律忽略。 - approve 自动放行;reject 转人工并在弹窗显示理由(标注模型生成)。 超时、Provider 错误、截断、未调用工具、多次调用、参数无效等异常同样 转人工,并附固定的系统说明;用户按 Esc 中止时直接拒绝。 - 模型调用改为 modelRegistry.streamSimple(...).result():Pi 1.3.0 面向 扩展的 ModelRegistry 没有 completeSimple,原写法在真实环境中每次都会 转人工。 - 对话记录保留可信度标注;工具结果在有更短的 pi-compaction 摘要时替换 为摘要;token 估算改为非 ASCII 字符按 1 token 计;预算可配置。 - 同一条用户消息内完全相同的请求只缓存 approve 结论。 - 默认 reasoning low、总超时 30 秒、最多 2 次尝试、maxOutputTokens 4000。 删除: - 未发布过的 TypeSafe Jev 分类器实现、DenialCircuitBreaker。 - 整个 annotator 机制(model-explanation、注册表、registerAnnotator、 provider-timeout);annotators 配置键保留为已弃用并忽略,避免旧配置 被拒绝。 测试: - 新增 reviewer / transcript / 弹窗说明 / 默认配置测试;清理重复、恒真 或只测实现细节的旧测试。 - 使用 deepseek-v4.1-flash 实测 5 个场景各 5 次,25 次结论全部符合预期。 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
264 lines
8.0 KiB
TypeScript
264 lines
8.0 KiB
TypeScript
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import { afterEach, describe, expect, test, vi } from "vitest";
|
|
import {
|
|
createPermissionForwardingLocation,
|
|
isForwardedPermissionRequestForSession,
|
|
resolvePermissionForwardingTarget,
|
|
} from "#src/authority/permission-forwarding";
|
|
import { makeSubagentRegistry } from "#test/helpers/forwarding-fixtures";
|
|
|
|
afterEach(() => {
|
|
vi.unstubAllEnvs();
|
|
});
|
|
|
|
describe("resolvePermissionForwardingTarget", () => {
|
|
test("hasUI=true returns the current session ID as its own target", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: true,
|
|
isSubagent: false,
|
|
currentSessionId: "parent-session-abc",
|
|
env: {},
|
|
}),
|
|
).toEqual({ sessionId: "parent-session-abc", source: "self" });
|
|
});
|
|
|
|
test("hasUI=true with isSubagent=true still returns current session ID", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: true,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "other" },
|
|
}),
|
|
).toEqual({ sessionId: "session-xyz", source: "self" });
|
|
});
|
|
|
|
test("hasUI=false, isSubagent=false returns null", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: false,
|
|
currentSessionId: "session-xyz",
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-session-abc" },
|
|
}),
|
|
).toBeNull();
|
|
});
|
|
|
|
test("isSubagent=true, no candidates set returns null", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: {},
|
|
}),
|
|
).toBeNull();
|
|
});
|
|
|
|
test("isSubagent=true, PI_AGENT_ROUTER_PARENT_SESSION_ID set returns its value", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-session-abc" },
|
|
}),
|
|
).toEqual({ sessionId: "parent-session-abc", source: "env" });
|
|
});
|
|
|
|
test("isSubagent=true, PI_SUBAGENT_PARENT_SESSION resolves when PI_AGENT_ROUTER_PARENT_SESSION_ID is absent", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: {
|
|
PI_SUBAGENT_PARENT_SESSION: "parent-from-convention",
|
|
},
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-convention", source: "env" });
|
|
});
|
|
|
|
test("isSubagent=true, PI_AGENT_ROUTER_PARENT_SESSION_ID takes precedence over PI_SUBAGENT_PARENT_SESSION", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: {
|
|
PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-from-router",
|
|
PI_SUBAGENT_PARENT_SESSION: "parent-from-convention",
|
|
},
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-router", source: "env" });
|
|
});
|
|
|
|
test("isSubagent=true, candidate value is empty string returns null", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "" },
|
|
}),
|
|
).toBeNull();
|
|
});
|
|
|
|
test("isSubagent=true, candidate value is 'unknown' returns null", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
currentSessionId: "session-xyz",
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "unknown" },
|
|
}),
|
|
).toBeNull();
|
|
});
|
|
|
|
test("env defaults to process.env when omitted", () => {
|
|
vi.stubEnv("PI_AGENT_ROUTER_PARENT_SESSION_ID", "env-session-abc");
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
}),
|
|
).toEqual({ sessionId: "env-session-abc", source: "env" });
|
|
});
|
|
});
|
|
|
|
describe("resolvePermissionForwardingTarget — registry resolution", () => {
|
|
const childSessionId = "child-session-abc";
|
|
|
|
test("returns parentSessionId from registry when env vars are absent", () => {
|
|
const registry = makeSubagentRegistry(childSessionId, {
|
|
parentSessionId: "parent-from-registry",
|
|
});
|
|
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
sessionId: childSessionId,
|
|
registry,
|
|
env: {},
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-registry", source: "registry" });
|
|
});
|
|
|
|
test("registry takes priority over env vars", () => {
|
|
const registry = makeSubagentRegistry(childSessionId, {
|
|
parentSessionId: "parent-from-registry",
|
|
});
|
|
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
sessionId: childSessionId,
|
|
registry,
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-from-env" },
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-registry", source: "registry" });
|
|
});
|
|
|
|
test("falls through to env vars when registry entry has no parentSessionId", () => {
|
|
const registry = makeSubagentRegistry(childSessionId, {}); // no parentSessionId
|
|
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
sessionId: childSessionId,
|
|
registry,
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-from-env" },
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-env", source: "env" });
|
|
});
|
|
|
|
test("falls through to env vars when sessionId is not in registry", () => {
|
|
const registry = makeSubagentRegistry(childSessionId); // empty
|
|
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
sessionId: childSessionId,
|
|
registry,
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-from-env" },
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-env", source: "env" });
|
|
});
|
|
|
|
test("returns null when registry entry has no parentSessionId and no env vars set", () => {
|
|
const registry = makeSubagentRegistry(childSessionId, {}); // no parentSessionId
|
|
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
sessionId: childSessionId,
|
|
registry,
|
|
env: {},
|
|
}),
|
|
).toBeNull();
|
|
});
|
|
|
|
test("omitting registry preserves existing behaviour", () => {
|
|
expect(
|
|
resolvePermissionForwardingTarget({
|
|
hasUI: false,
|
|
isSubagent: true,
|
|
sessionId: childSessionId,
|
|
env: { PI_AGENT_ROUTER_PARENT_SESSION_ID: "parent-from-env" },
|
|
}),
|
|
).toEqual({ sessionId: "parent-from-env", source: "env" });
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Moved from permission-system.test.ts catch-all (#342)
|
|
// ---------------------------------------------------------------------------
|
|
|
|
test("Permission forwarding uses session-scoped directories per interactive session", () => {
|
|
const forwardingRoot = join(tmpdir(), "pi-permission-system-forwarding-root");
|
|
const sessionA = createPermissionForwardingLocation(
|
|
forwardingRoot,
|
|
"session-a",
|
|
);
|
|
const sessionB = createPermissionForwardingLocation(
|
|
forwardingRoot,
|
|
"session-b",
|
|
);
|
|
|
|
expect(sessionA.sessionRootDir).not.toBe(sessionB.sessionRootDir);
|
|
expect(sessionA.requestsDir).not.toBe(sessionB.requestsDir);
|
|
expect(sessionA.responsesDir).not.toBe(sessionB.responsesDir);
|
|
});
|
|
|
|
test("Permission forwarding request routing only matches the intended UI session", () => {
|
|
expect(
|
|
isForwardedPermissionRequestForSession(
|
|
{ targetSessionId: "session-a" },
|
|
"session-a",
|
|
),
|
|
).toBe(true);
|
|
expect(
|
|
isForwardedPermissionRequestForSession(
|
|
{ targetSessionId: "session-a" },
|
|
"session-b",
|
|
),
|
|
).toBe(false);
|
|
});
|
|
|
|
test("Permission forwarding rejects unresolved sentinel session ids", () => {
|
|
const target = resolvePermissionForwardingTarget({
|
|
hasUI: true,
|
|
isSubagent: false,
|
|
currentSessionId: "unknown",
|
|
});
|
|
|
|
expect(target).toBe(null);
|
|
});
|