mirror of
https://bitbucket.org/siakitem/my-pi.git
synced 2026-10-26 10:45:22 +00:00
feat: 组合包配置以包内 config/ 为唯一来源,并新增受保护写入人工审批
配置统一:权限策略、硬防御、Tool Search、提示词封面以及新迁入的 RTK、pi-compaction、pi-worktree、pi-hermes-memory 配置全部由扩展 直接读取已安装组合包内的 config/,pi install / pi update 即完成部署; 删除 rebuild-bundle-config.mjs 与 bundle-manifest.json,my-pi/ 只保留 日志与缓存。update.sh 成功升级后将默认 git 来源的已安装副本 reset 回发布版本。AGENTS.md 新增「组合包配置原则」。 脚本整合:search_config.sh / ssh_config.sh 合并为 configure.sh search|ssh;install.sh / update.sh 共享函数抽到 scripts/lib.sh,远程 安装器改为先下载到临时文件再执行,下载失败可被检测。 权限:hard-guards 新增 protectedWrites,写入 Pi 凭据/设置、已安装 组合包与扩展目录、pi-ssh 凭据库时一律人工确认(跳过 AutoReview、 yolo 与 Session grant,无 UI 时拒绝);放行 ls、LSP 查询、ctx 只读、 web_search、Chrome 只读与 git 只读命令,skill_manage 改为 ask。 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
a0ee9389c7
commit
2aa1be0b54
@@ -122,6 +122,7 @@ function makeStore(overrides: Partial<ConfigStoreDeps> = {}): {
|
||||
agentDir: "/test/agent",
|
||||
policyPaths: makePolicyPathProvider(),
|
||||
logger,
|
||||
configPath: "/test/bundle-config/pi-permission-policy.jsonc",
|
||||
...overrides,
|
||||
};
|
||||
return { store: new ConfigStore(deps), logger };
|
||||
@@ -159,34 +160,26 @@ describe("ConfigStore", () => {
|
||||
// ── refresh() ─────────────────────────────────────────────────────────
|
||||
|
||||
describe("refresh()", () => {
|
||||
it("uses the passed ctx cwd for global-only config loading", () => {
|
||||
it("loads the configured global policy path", () => {
|
||||
const { store } = makeStore();
|
||||
store.refresh(makeCtx({ cwd: "/my/project" }), true);
|
||||
expect(mockLoadAndMergeConfigs).toHaveBeenCalledWith(
|
||||
"/test/agent",
|
||||
"/my/project",
|
||||
expect.any(String),
|
||||
"/test/bundle-config/pi-permission-policy.jsonc",
|
||||
);
|
||||
});
|
||||
|
||||
it("does not add a project config scope when the project is untrusted", () => {
|
||||
it("loads the same global policy regardless of project trust", () => {
|
||||
const { store } = makeStore();
|
||||
store.refresh(makeCtx({ cwd: "/my/project" }), false);
|
||||
expect(mockLoadAndMergeConfigs).toHaveBeenCalledWith(
|
||||
"/test/agent",
|
||||
"/my/project",
|
||||
expect.any(String),
|
||||
"/test/bundle-config/pi-permission-policy.jsonc",
|
||||
);
|
||||
});
|
||||
|
||||
it("uses empty string cwd when no ctx is provided", () => {
|
||||
const { store } = makeStore();
|
||||
it("falls back to the bundle policy path when no override is configured", () => {
|
||||
const { store } = makeStore({ configPath: undefined });
|
||||
store.refresh(undefined, true);
|
||||
expect(mockLoadAndMergeConfigs).toHaveBeenCalledWith(
|
||||
"/test/agent",
|
||||
"",
|
||||
expect.any(String),
|
||||
);
|
||||
expect(mockLoadAndMergeConfigs).toHaveBeenCalledWith(undefined);
|
||||
});
|
||||
|
||||
it("updates current() with normalized merged result", () => {
|
||||
@@ -433,30 +426,14 @@ describe("ConfigStore", () => {
|
||||
expect(mockProvider.getResolvedPolicyPaths).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("passes legacy detection results to buildResolvedConfigLogEntry", () => {
|
||||
it("passes the resolved policy paths to buildResolvedConfigLogEntry", () => {
|
||||
const { store } = makeStore();
|
||||
// Make one legacy path exist
|
||||
mockExistsSync.mockImplementation((p: string) =>
|
||||
p.includes("policies.json"),
|
||||
);
|
||||
store.logResolvedPaths("/some/project");
|
||||
expect(mockBuildResolvedConfigLogEntry).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
legacyGlobalPolicyDetected: expect.any(Boolean),
|
||||
legacyExtensionConfigDetected: expect.any(Boolean),
|
||||
expect(mockBuildResolvedConfigLogEntry).toHaveBeenCalledWith({
|
||||
policyPaths: expect.objectContaining({
|
||||
globalConfigPath: "/agent/config.json",
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it("checks only supported global legacy paths", () => {
|
||||
const { store } = makeStore();
|
||||
store.logResolvedPaths(); // no cwd
|
||||
// existsSync called for global and ext-config legacy paths only (not project)
|
||||
const calls = mockExistsSync.mock.calls.map(([p]: [string]) => p);
|
||||
const projectCalls = calls.filter(
|
||||
(p) => p.includes("/null/") || p.includes("null"),
|
||||
);
|
||||
expect(projectCalls).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user