mirror of
https://bitbucket.org/siakitem/my-pi.git
synced 2026-10-26 10:45:22 +00:00
系统提示词封面(新增能力):
- extensions/system-prompt-cover.ts:读取 ~/.pi/agent/SYSTEM_COVER.md,
在 before_agent_start 返回 { systemPrompt },用文本拼接替换 Pi 默认
系统提示词的开头,同时保留 tools / rules / docs / skills /
project_context / cwd 全部分区及其原始顺序。
- 必须走 forceSystemPrompt 投影路径。customPrompt 选项会连带抑制
tools / rules / docs 三个分区,而回填只能追加到末尾,无法恢复原顺序;
且 forceSystemPrompt 优先级更高,二者同时存在时 customPrompt 会被
静默忽略,因此 handler 不得写 customPrompt。
- 分割边界要求独占一行的裸标签:<project_instructions path="..."> 嵌套在
<project_context> 内,只有裸标签才是分区边界。
- 注册在 tool-routing 之前,否则提示词已被压平,改 systemPromptOptions
不再影响本轮请求。
- scripts/deploy-system-prompt-cover.mjs:同目录临时文件 + rename 原子
覆盖,不保留备份;install.sh 从脚本目录、update.sh 从升级后组合包
定位 helper,禁止回退到可能陈旧的脚本目录。
- 封面缺失、不可读或空白时静默 no-op,Pi 行为保持不变;封面每轮重新
读取,修改后在下一轮生效,不影响已结束的历史对话。
pi-compaction 投影修正:
- 仅在「摘要 + Source 行」严格短于原文时才替换工具结果。此前命中即
无条件替换,小结果反而被包壳放大;未替换的结果完整保留原始 content
parts(含非文本部分)。
- deterministic.maxStubTokens 由 256 提升到 1024。
pi-tool-search 常驻工具:
- alwaysEnabled 增加 context_tree_query:恢复被投影的工具证据不应依赖
一次 tool_search 激活,常驻同时保持请求前缀稳定。
- BUNDLE_TOOL_SEARCH_DEFAULTS_VERSION 由 3 提升到 4;
scripts/migrate-tool-search-settings.mjs 新增 version-3 快照常量,
使其与 version-2 一样可被完整精确匹配并迁移。
- 权限策略为 context_tree_query 显式 allow:它只读扩展自己的 segment
索引、不触碰工作区,常驻后不应每轮触发 AutoReview 往返。该种子仅在
全新安装时部署,已存在的用户 policy.jsonc 不会被覆盖。
文档与测试同步:
- AGENTS.md:新增 system-prompt-cover 开发约定,修正加载顺序、
bundleDefaultsVersion、可迁移旧快照集合与常驻工具范围的描述。
- pi-tool-search 的 README / CHANGELOG 同步 version 4 与新增常驻工具。
- tests/system-prompt-cover.test.ts:覆盖顺序保持、尾部逐字节不变、
嵌套 project_instructions 不误判、部署幂等与覆盖、缺源时非零退出。
- 修正 pi-tool-search/test/config.test.ts 与
tests/tool-search-settings-migration.test.ts 中写死的 version 3 与
工具列表断言。
- update-git-clean-recovery / tool-search-settings-migration 的 mock
组合包补拷 scripts/,与真实发布包结构一致,避免 helper 定位失败。
测试:根 61/61、pi-compaction 36/36 + tsc、pi-tool-search 16/16 + tsc、
pi-permission-system 2577/2577;sh -n 与 git diff --check 通过。
153 lines
5.1 KiB
TypeScript
153 lines
5.1 KiB
TypeScript
import {
|
|
chmodSync,
|
|
closeSync,
|
|
fsyncSync,
|
|
mkdirSync,
|
|
openSync,
|
|
readFileSync,
|
|
renameSync,
|
|
rmSync,
|
|
writeFileSync,
|
|
} from "node:fs";
|
|
import { dirname, join } from "node:path";
|
|
|
|
export type ToolSearchDefaultResult = "updated" | "unchanged" | "skipped-invalid";
|
|
|
|
export const BUNDLE_TOOL_SEARCH_DEFAULTS = {
|
|
alwaysEnabled: [
|
|
"codegraph_explore",
|
|
"lsp_diagnostics",
|
|
"ctx_execute",
|
|
"ctx_execute_file",
|
|
"ctx_batch_execute",
|
|
"memory_search",
|
|
"session_search",
|
|
"memory_add",
|
|
"memory_replace",
|
|
"memory_remove",
|
|
"skill_manage",
|
|
"context_tree_query",
|
|
],
|
|
showToolSearchFooterStatus: false,
|
|
maxActiveGroups: 5,
|
|
maxToolsPerGroup: 8,
|
|
maxDynamicTools: 28,
|
|
groupOverrides: {},
|
|
} as const;
|
|
|
|
export const BUNDLE_TOOL_SEARCH_DEFAULTS_VERSION = 4;
|
|
|
|
export interface ToolSearchConfig {
|
|
alwaysEnabled: string[];
|
|
showToolSearchFooterStatus: boolean;
|
|
maxActiveGroups: number;
|
|
maxToolsPerGroup: number;
|
|
maxDynamicTools: number;
|
|
groupOverrides: Record<string, string[]>;
|
|
}
|
|
|
|
function isObject(value: unknown): value is Record<string, unknown> {
|
|
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
}
|
|
|
|
function positiveInteger(value: unknown, fallback: number): number {
|
|
return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : fallback;
|
|
}
|
|
|
|
function stringList(value: unknown): string[] {
|
|
if (!Array.isArray(value)) return [];
|
|
return [...new Set(value.filter((item): item is string => typeof item === "string" && item.length > 0))];
|
|
}
|
|
|
|
function readGroupOverrides(value: unknown): Record<string, string[]> {
|
|
if (!isObject(value)) return {};
|
|
const overrides: Record<string, string[]> = {};
|
|
for (const [groupId, names] of Object.entries(value)) {
|
|
const tools = stringList(names);
|
|
if (groupId.trim() && tools.length > 0) overrides[groupId] = tools;
|
|
}
|
|
return overrides;
|
|
}
|
|
|
|
export function bundleFallbackConfig(): ToolSearchConfig {
|
|
return {
|
|
alwaysEnabled: [...BUNDLE_TOOL_SEARCH_DEFAULTS.alwaysEnabled],
|
|
showToolSearchFooterStatus: BUNDLE_TOOL_SEARCH_DEFAULTS.showToolSearchFooterStatus,
|
|
maxActiveGroups: BUNDLE_TOOL_SEARCH_DEFAULTS.maxActiveGroups,
|
|
maxToolsPerGroup: BUNDLE_TOOL_SEARCH_DEFAULTS.maxToolsPerGroup,
|
|
maxDynamicTools: BUNDLE_TOOL_SEARCH_DEFAULTS.maxDynamicTools,
|
|
groupOverrides: {},
|
|
};
|
|
}
|
|
|
|
export function readToolSearchConfig(agentDir: string): ToolSearchConfig {
|
|
const fallback = bundleFallbackConfig();
|
|
try {
|
|
const parsed: unknown = JSON.parse(readFileSync(join(agentDir, "settings.json"), "utf8"));
|
|
if (!isObject(parsed) || !isObject(parsed.toolSearch)) return fallback;
|
|
const config = parsed.toolSearch;
|
|
return {
|
|
alwaysEnabled: Array.isArray(config.alwaysEnabled) ? stringList(config.alwaysEnabled) : fallback.alwaysEnabled,
|
|
showToolSearchFooterStatus:
|
|
typeof config.showToolSearchFooterStatus === "boolean"
|
|
? config.showToolSearchFooterStatus
|
|
: fallback.showToolSearchFooterStatus,
|
|
maxActiveGroups: positiveInteger(config.maxActiveGroups, fallback.maxActiveGroups),
|
|
maxToolsPerGroup: positiveInteger(config.maxToolsPerGroup, fallback.maxToolsPerGroup),
|
|
maxDynamicTools: positiveInteger(config.maxDynamicTools, fallback.maxDynamicTools),
|
|
groupOverrides: readGroupOverrides(config.groupOverrides),
|
|
};
|
|
} catch {
|
|
return fallback;
|
|
}
|
|
}
|
|
|
|
/** Add bundle defaults without replacing explicit user choices. */
|
|
export function ensureToolSearchDefaults(agentDir: string): ToolSearchDefaultResult {
|
|
const targetPath = join(agentDir, "settings.json");
|
|
let settings: Record<string, unknown> = {};
|
|
|
|
try {
|
|
const parsed: unknown = JSON.parse(readFileSync(targetPath, "utf8"));
|
|
if (!isObject(parsed)) return "skipped-invalid";
|
|
settings = parsed;
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "ENOENT") return "skipped-invalid";
|
|
}
|
|
|
|
const existing = settings.toolSearch;
|
|
if (existing !== undefined && !isObject(existing)) return "skipped-invalid";
|
|
|
|
const toolSearch = { ...(existing ?? {}) };
|
|
let changed = false;
|
|
for (const [key, value] of Object.entries(BUNDLE_TOOL_SEARCH_DEFAULTS)) {
|
|
if (Object.hasOwn(toolSearch, key)) continue;
|
|
toolSearch[key] = Array.isArray(value) ? [...value] : isObject(value) ? { ...value } : value;
|
|
changed = true;
|
|
}
|
|
if (existing === undefined) {
|
|
toolSearch.bundleDefaultsVersion = BUNDLE_TOOL_SEARCH_DEFAULTS_VERSION;
|
|
changed = true;
|
|
}
|
|
if (!changed) return "unchanged";
|
|
|
|
settings.toolSearch = toolSearch;
|
|
mkdirSync(dirname(targetPath), { recursive: true });
|
|
const temporaryPath = `${targetPath}.my-pi-${process.pid}-${Math.random().toString(16).slice(2)}.tmp`;
|
|
let descriptor: number | undefined;
|
|
try {
|
|
descriptor = openSync(temporaryPath, "wx", 0o600);
|
|
writeFileSync(descriptor, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
|
|
fsyncSync(descriptor);
|
|
closeSync(descriptor);
|
|
descriptor = undefined;
|
|
renameSync(temporaryPath, targetPath);
|
|
chmodSync(targetPath, 0o600);
|
|
} catch (error) {
|
|
if (descriptor !== undefined) closeSync(descriptor);
|
|
rmSync(temporaryPath, { force: true });
|
|
throw error;
|
|
}
|
|
return "updated";
|
|
}
|