mirror of
https://bitbucket.org/siakitem/my-pi.git
synced 2026-10-26 10:45:22 +00:00
feat(pi-permission-system): AutoReview 改为跟随主模型的对话式工具调用审查
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>
This commit is contained in:
co-authored by
Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
parent
dec48dab6d
commit
7e6a8faae1
@@ -359,34 +359,6 @@ describe("checkPermission — source derivation and matchedPattern", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("matchedPattern for session rules across surfaces", () => {
|
||||
it("matchedPattern is the session rule pattern for a session match (bash)", () => {
|
||||
const manager = createMissingConfigManager();
|
||||
const sessionRules: Ruleset = [sessionRule("bash", "git *")];
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"bash",
|
||||
{ command: "git status" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.matchedPattern).toBe("git *");
|
||||
expect(result.source).toBe("session");
|
||||
});
|
||||
|
||||
it("matchedPattern is the session rule pattern for a session match (skill)", () => {
|
||||
const manager = createMissingConfigManager();
|
||||
const sessionRules: Ruleset = [sessionRule("skill", "librarian")];
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"skill",
|
||||
{ name: "librarian" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.matchedPattern).toBe("librarian");
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1972,146 +1944,6 @@ test("PermissionManager.getConfigIssues returns empty array for empty config", (
|
||||
}
|
||||
});
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Session-aware checkPermission() — moved from catch-all (#342)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
test("checkPermission returns source 'session' for bash when session rules match", () => {
|
||||
const { manager, cleanup } = createManager({ permission: {} });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("bash", "git *")];
|
||||
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"bash",
|
||||
{ command: "git status --short" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.source).toBe("session");
|
||||
expect(result.matchedPattern).toBe("git *");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("checkPermission returns source 'session' for bash when session rule is exact match", () => {
|
||||
const { manager, cleanup } = createManager({ permission: {} });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("bash", "ls")];
|
||||
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"bash",
|
||||
{ command: "ls" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.source).toBe("session");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("checkPermission falls back to config for bash when session rules do not match the command", () => {
|
||||
const { manager, cleanup } = createManager({ permission: { bash: "deny" } });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("bash", "git *")];
|
||||
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"bash",
|
||||
{ command: "npm run build" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.state).toBe("deny");
|
||||
expect(result.source).toBe("bash");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("checkPermission returns source 'session' for mcp when session rules match the target", () => {
|
||||
const { manager, cleanup } = createManager({ permission: {} });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("mcp", "exa:*")];
|
||||
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"mcp",
|
||||
{ tool: "exa:search" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.source).toBe("session");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("checkPermission returns source 'session' for skill when session rules match", () => {
|
||||
const { manager, cleanup } = createManager({ permission: {} });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("skill", "librarian")];
|
||||
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"skill",
|
||||
{ name: "librarian" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.source).toBe("session");
|
||||
expect(result.matchedPattern).toBe("librarian");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("checkPermission returns source 'session' for tool surface when session rules match", () => {
|
||||
const { manager, cleanup } = createManager({ permission: {} });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("read", "*")];
|
||||
|
||||
const result = checkTool(manager, "read", {}, undefined, sessionRules);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.source).toBe("session");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("bash session rules do not bleed into mcp checks", () => {
|
||||
const { manager, cleanup } = createManager({ permission: {} });
|
||||
|
||||
try {
|
||||
const sessionRules = [sessionRule("bash", "git *")];
|
||||
|
||||
const result = checkTool(
|
||||
manager,
|
||||
"mcp",
|
||||
{ tool: "exa:search" },
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.source).not.toBe("session");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// getResolvedPolicyPaths — moved from catch-all (#342)
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -2258,54 +2090,6 @@ describe("checkPathPolicy", () => {
|
||||
}
|
||||
});
|
||||
|
||||
it("chooses the most specific pattern across the provided aliases", () => {
|
||||
const { manager, cleanup } = createManagerWithConfig({
|
||||
path: { "*": "ask", [`${cwd}/*`]: "allow", "src/*": "deny" },
|
||||
});
|
||||
try {
|
||||
const result = checkPathValues(manager, [
|
||||
`${cwd}/src/App.jsx`,
|
||||
"src/App.jsx",
|
||||
]);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.matchedPattern).toBe(`${cwd}/*`);
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
it("applies session rules over config", () => {
|
||||
const { manager, cleanup } = createManagerWithConfig({
|
||||
path: { "*": "ask", "src/*": "deny" },
|
||||
});
|
||||
try {
|
||||
const sessionRules: Ruleset = [sessionRule("path", "src/*")];
|
||||
const result = checkPathValues(
|
||||
manager,
|
||||
["src/App.jsx"],
|
||||
undefined,
|
||||
sessionRules,
|
||||
);
|
||||
expect(result.state).toBe("allow");
|
||||
expect(result.source).toBe("session");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
it("falls back to the catch-all for an empty value list", () => {
|
||||
const { manager, cleanup } = createManagerWithConfig({
|
||||
path: { "*": "deny" },
|
||||
});
|
||||
try {
|
||||
const result = checkPathValues(manager, []);
|
||||
expect(result.state).toBe("deny");
|
||||
expect(result.matchedPattern).toBe("*");
|
||||
} finally {
|
||||
cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user