Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(pi): 追加提示词写进 configHome 文件,避免顶穿 spawn argv 上限 (#5955)

Yunjin Zhang6b4829f4b0b1
diff --git a/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts b/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts
index 556bb9a840..b020a0d990 100644
--- a/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts
@@ -219,7 +219,7 @@ describe('buildPiAgent roster prompt assembly', () => {
});
const promptIndex = state.args.indexOf('--append-system-prompt');
expect(promptIndex).toBeGreaterThan(-1);
- expect(state.args[promptIndex + 1]).toContain(
+ expect(readFileSync(state.args[promptIndex + 1]!, 'utf8')).toContain(
'<ghost-roster>\n{"id":"art"}\n</ghost-roster>',
);
expect(getGhostRosterPrompt).toHaveBeenCalledWith({ workingDir });
diff --git a/docs/dev-rules/pi-harness.md b/docs/dev-rules/pi-harness.md
index 0c3dcc8bf7..e25b05c2aa 100644
--- a/docs/dev-rules/pi-harness.md
+++ b/docs/dev-rules/pi-harness.md
@@ -16,6 +16,8 @@ Cindy 以 `pi --mode rpc` spawn pi 二进制(JSONL/stdio),`translator.ts` 把 pi
(`anthropic-compat-proxy-host.ts`)。凭证走 `$CINDY_PI_API_KEY` env 插值,不落盘。
- **system prompt**:`--append-system-prompt` 追加 host 产品段 + 用户段,**保留 pi 默认
prompt**(不用 `--system-prompt` 整体替换 —— 那会丢掉 pi 自己调好的工具用法/工程约定)。
+ 追加段的文本写在会话 `configHome/append-system-prompt.md`,命令行只传该文件路径(pi 接受
+ `<text|path>`):伙伴提示词轻易两三万字符,内联会顶穿 Windows 的 spawn 命令行预算。
- **权限执行**:pi 原生无工具审批(security.md 明确:非沙箱、不限制工具)。Cindy 用注入的
`cindy-bridge.ts` 扩展在 pi 进程内 `pi.on('tool_call')` 拦截,经 `extension_ui_request`
子协议冒泡到 `index.ts handleExtensionUiRequest`,映射成 `InteractionRequest` 交 Cindy
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts
index 24a8a4c026..97312130ed 100644
--- a/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/pi-auto-review-dispatch.test.ts
@@ -67,6 +67,12 @@ const captured = vi.hoisted(() => ({
closed: false,
}));
+/** 追加提示词走 configHome 内的文件(见 pi/index.ts 的 --append-system-prompt),argv 不再内联长文本。 */
+const readAppendedSystemPrompt = (): string => {
+ const index = captured.args.indexOf('--append-system-prompt');
+ return index >= 0 ? readFileSync(captured.args[index + 1]!, 'utf8') : '';
+};
+
vi.mock('../transport.js', () => ({
createPiStdioTransport: (opts: {
args: string[];
@@ -628,9 +634,8 @@ describe('pi auto-review dispatch & spawn config (mocked pi process)', () => {
}
await start();
expect(captured.args).not.toContain('--system-prompt');
- const idx = captured.args.indexOf('--append-system-prompt');
- expect(idx).toBeGreaterThan(-1);
- expect(captured.args[idx + 1]).toBe('You are Cindy.');
+ expect(captured.args).toContain('--append-system-prompt');
+ expect(readAppendedSystemPrompt()).toBe('You are Cindy.');
expect(captured.args).not.toContain('--tools');
expect(captured.env.PI_OFFLINE).toBe('1');
expect(captured.env.PI_CACHE_RETENTION).toBe('long');
@@ -3193,8 +3198,7 @@ describe('pi auto-review dispatch & spawn config (mocked pi process)', () => {
expect(deps.getGhostRosterPrompt).not.toHaveBeenCalled();
expect(deps.resolvePiProjectTrustInput).not.toHaveBeenCalled();
- const promptIndex = captured.args.indexOf('--append-system-prompt');
- const appendedPrompt = promptIndex >= 0 ? captured.args[promptIndex + 1] : '';
+ const appendedPrompt = readAppendedSystemPrompt();
expect(appendedPrompt).not.toContain('PRIVATE ROSTER');
expect(appendedPrompt).not.toContain('PRIVATE USER PROMPT');
@@ -3286,16 +3290,19 @@ describe('pi auto-review dispatch & spawn config (mocked pi process)', () => {
// 不从 cwd 链加载项目/全局 AGENTS.md。
expect(captured.args).toContain('--no-context-files');
expect(deps.resolvePiGlobalContextHome).not.toHaveBeenCalled();
- const promptIndex = captured.args.indexOf('--append-system-prompt');
- expect(captured.args[promptIndex + 1]).toContain('BOT SOUL');
- expect(captured.args[promptIndex + 1]).toContain('DELIVERY PROTOCOL');
- expect(captured.args[promptIndex + 1]).not.toContain('BOT ROSTER');
- expect(captured.args[promptIndex + 1]).not.toContain('You are Cindy.');
- expect(captured.args[promptIndex + 1]).not.toContain('GLOBAL USER PROMPT');
- expect(captured.args[promptIndex + 1]).toContain('frozen memory');
- expect(captured.args[promptIndex + 1]).toContain('Call the user Chris');
- expect(captured.args[promptIndex + 1].indexOf('frozen memory')).toBeLessThan(
- captured.args[promptIndex + 1].indexOf('Call the user Chris'),
+ // 本 PR 把追加提示词写进 configHome 文件而非 spawn argv(argv 有上限,
+ // 顶穿会让 pi 启动失败),所以按 readAppendedSystemPrompt() 读文件断言,
+ // 不能沿用 argv 下标口径 —— 那正是本 PR 移除的写法。
+ const botPrompt = readAppendedSystemPrompt();
+ expect(botPrompt).toContain('BOT SOUL');
+ expect(botPrompt).toContain('DELIVERY PROTOCOL');
+ expect(botPrompt).not.toContain('BOT ROSTER');
+ expect(botPrompt).not.toContain('You are Cindy.');
+ expect(botPrompt).not.toContain('GLOBAL USER PROMPT');
+ expect(botPrompt).toContain('frozen memory');
+ expect(botPrompt).toContain('Call the user Chris');
+ expect(botPrompt.indexOf('frozen memory')).toBeLessThan(
+ botPrompt.indexOf('Call the user Chris'),
);
const permissionFile = captured.env.CINDY_PI_PERMISSION_FILE;
@@ -3313,6 +3320,41 @@ describe('pi auto-review dispatch & spawn config (mocked pi process)', () => {
}
});
+ // 真实事故:伙伴的 teammate-guide + 记忆索引让 --append-system-prompt 逼近 3 万字符,
+ // 内联进 argv 就会顶穿 Windows 的 spawn 命令行上限,整个会话起不来。
+ it('把超长的伙伴提示词写进 configHome 文件,argv 只带路径', async () => {
+ const deps = buildDeps();
+ const botProfileContextPrompt = '## teammate-guide\n' + 'Todo discipline. '.repeat(3000);
+ expect(botProfileContextPrompt.length).toBeGreaterThan(30_000);
+ const handle = await new PiAgent(deps).startSession({
+ sessionId: 'bot-long-prompt-session',
+ workingDir: cwd,
+ model: 'm',
+ permissionMode: 'bypassPermissions',
+ botProfileContextPrompt,
+ botRuntimeProfile: {
+ botId: 'bot-long-prompt',
+ profileVersion: 1,
+ skillPolicy: { mode: 'allowlist', configured: [], catalog: [] },
+ mcpPolicy: { mode: 'allowlist', configured: [], catalog: [] },
+ toolsetPolicy: { mode: 'allowlist', configured: [], catalog: [] },
+ },
+ });
+ try {
+ const promptIndex = captured.args.indexOf('--append-system-prompt');
+ expect(promptIndex).toBeGreaterThan(-1);
+ const promptPath = captured.args[promptIndex + 1]!;
+ expect(promptPath.length).toBeLessThan(200);
+ expect(promptPath).toContain(path.posix.join(captured.env.PI_CODING_AGENT_DIR!, 'append-system-prompt.md'));
+ expect(readFileSync(promptPath, 'utf8')).toContain(botProfileContextPrompt.slice(0, 64));
+ // 整条命令行必须留在平台上限内(30k / 128k)。
+ expect(captured.args.reduce((total, arg) => total + arg.length + 3, 0))
+ .toBeLessThanOrEqual(process.platform === 'win32' ? 30_000 : 128_000);
+ } finally {
+ await handle.close();
+ }
+ });
+
it('把 session 花名册快照追加到 Pi system prompt', async () => {
const deps = buildDeps();
deps.getGhostRosterPrompt = vi.fn(() => 'GHOST ROSTER PROMPT');
@@ -3322,8 +3364,7 @@ describe('pi auto-review dispatch & spawn config (mocked pi process)', () => {
workingDir: cwd,
model: 'm',
});
- const idx = captured.args.indexOf('--append-system-prompt');
- expect(captured.args[idx + 1]).toContain('GHOST ROSTER PROMPT');
+ expect(readAppendedSystemPrompt()).toContain('GHOST ROSTER PROMPT');
expect(deps.getGhostRosterPrompt).toHaveBeenCalledWith({ workingDir: cwd });
await handle.close();
});
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts
index 1cfa230c2c..e54ca696d3 100644
--- a/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts
@@ -20,6 +20,13 @@ const knobs = vi.hoisted(() => ({
spawnedArgs: [] as string[][],
}));
+/** 追加提示词走 configHome 内的文件(见 pi/index.ts 的 --append-system-prompt),argv 不再内联长文本。 */
+const readAppendedSystemPrompt = (args: string[]): string => {
+ const index = args.indexOf('--append-system-prompt');
+ if (index < 0) return '';
+ return readFileSync(args[index + 1]!, 'utf8');
+};
+
vi.mock('../transport.js', () => ({
createPiStdioTransport: (opts: { args: string[]; env: Record<string, string | undefined>; onProcessSpawned?: (pid: number) => void }) => {
knobs.spawnedEnvs.push({ ...(opts.env ?? {}) });
@@ -247,7 +254,7 @@ describe('Pi device-hosted guest sessions', () => {
expect(settings.packages).toBeUndefined();
expect(env.CINDY_PI_PACKAGE_MANAGEMENT).toBeUndefined();
expect(JSON.parse(env.CINDY_PI_HOSTED!)).toMatchObject({ guest: true });
- expect(args[args.indexOf('--append-system-prompt') + 1] ?? '').not.toContain('HOST GHOST ROSTER');
+ expect(readAppendedSystemPrompt(args)).not.toContain('HOST GHOST ROSTER');
expect(spies.getGhostRosterPrompt).not.toHaveBeenCalled();
expect(spies.getManagedSkills).not.toHaveBeenCalled();
expect(spies.getDisabledSkillPaths).not.toHaveBeenCalled();
@@ -415,7 +422,7 @@ describe('Pi device-hosted guest sessions', () => {
expect(settings.packages).toEqual(['npm:host-package']);
expect(env.CINDY_PI_PACKAGE_MANAGEMENT).toBeTruthy();
expect(JSON.parse(env.CINDY_PI_HOSTED!).guest).toBeUndefined();
- expect(args[args.indexOf('--append-system-prompt') + 1]).toContain('HOST GHOST ROSTER');
+ expect(readAppendedSystemPrompt(args)).toContain('HOST GHOST ROSTER');
expect(spies.getManagedSkills).toHaveBeenCalled();
expect(spies.resolvePiNativePackagePaths).toHaveBeenCalled();
expect(args[args.indexOf('--session-dir') + 1]).toBe(path.posix.join(agentHome, 'sessions'));
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts
index 827202e8c7..6d84b03e52 100644
--- a/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/pi-provider-routing.test.ts
@@ -6902,6 +6902,69 @@ describe("Pi provider-aware model routing", () => {
expect(expected).toMatch(/^[0-9a-f]{16}$/);
});
+ // The append system prompt rides in a configHome file, so the command line no
+ // longer carries its text. Remote launch identity therefore has to hash the
+ // content itself, or a changed prompt would attach to the process that booted
+ // with the old one.
+ it("hashes the append system prompt into remote spawn env so a changed prompt restarts", async () => {
+ const remoteStub: import("../transport.js").PiTransport = {
+ writeLine: async () => {},
+ onLine: () => () => {},
+ onStderr: () => () => {},
+ onClose: () => () => {},
+ close: async () => {},
+ pid: 4321,
+ isClosed: () => false,
+ remoteBinaryPath: "/remote/pi",
+ killRemoteSession: async () => {},
+ };
+ const capturedRemoteEnvs: Array<Record<string, string | undefined>> = [];
+ let systemPrompt = 'remote product prompt v1';
+ const startRemote = async () => {
+ const base = byomDeps(async () => ({ providers: [], env: {} }));
+ const agent = new PiAgent({
+ ...base,
+ runtimeConfig: {
+ ...base.runtimeConfig,
+ remoteEndpoint: "https://gateway.example.test",
+ systemPrompt,
+ },
+ resolveRemotePiBinaryPath: async () => "/remote/pi",
+ getRemotePiTransport: async (_hostId, opts) => {
+ capturedRemoteEnvs.push({ ...(opts.env ?? {}) });
+ return remoteStub;
+ },
+ getRemotePiFileOps: () => ({
+ mkdirp: async () => {},
+ writeFile: async () => {},
+ stat: async () => ({ isFile: true }),
+ rm: async () => {},
+ listDir: async () => [],
+ readFile: async () => { throw new Error("Unexpected remote file read in empty directory fixture"); },
+ sha256File: async () => { throw new Error("Unexpected remote file hash in empty directory fixture"); },
+ }),
+ });
+ const handle = await agent.startSession({
+ sessionId: "remote-prompt-hash",
+ workingDir: cwd,
+ model: "local-model",
+ remoteHostId: "remote-host",
+ });
+ await handle.close();
+ };
+
+ await startRemote();
+ await startRemote();
+ systemPrompt = 'remote product prompt v2';
+ await startRemote();
+
+ expect(capturedRemoteEnvs).toHaveLength(3);
+ const hashes = capturedRemoteEnvs.map((env) => env.CINDY_PI_APPEND_SYSTEM_PROMPT_HASH);
+ expect(hashes[0]).toMatch(/^[0-9a-f]{16}$/);
+ expect(hashes[1]).toBe(hashes[0]);
+ expect(hashes[2]).not.toBe(hashes[0]);
+ });
+
it("isolates remote configHome by models.json hash so a later route change does not overwrite the live child", async () => {
const remoteStub: import("../transport.js").PiTransport = {
writeLine: async () => {},
diff --git a/packages/maker-core/src/agents/pi/__tests__/project-resource-cli.test.ts b/packages/maker-core/src/agents/pi/__tests__/project-resource-cli.test.ts
index 045fb400c1..37cb09cfdc 100644
--- a/packages/maker-core/src/agents/pi/__tests__/project-resource-cli.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/project-resource-cli.test.ts
@@ -138,4 +138,25 @@ describe('pi project resource path order and spawn argv budget', () => {
expect(() => assertPiSpawnArgvFitsPlatform(args, 'darwin')).toThrow(/too many Pi skills/);
expect(() => assertPiSpawnArgvFitsPlatform(args, 'linux')).toThrow(/too many Pi skills/);
});
+
+ // POSIX 侧按 UTF-8 字节:按字符数估会让一段中文提示词「看起来没超」,
+ // 实际字节已超(汉字 3 字节/字),守卫就会漏过。
+ it('measures the POSIX command line in UTF-8 bytes', () => {
+ const cjk = '技'.repeat(50_000);
+ expect(cjk.length).toBeLessThan(PI_POSIX_SPAWN_ARGV_BUDGET);
+ expect(estimateSpawnArgvLength(['--append-system-prompt', cjk], 'linux'))
+ .toBeGreaterThan(PI_POSIX_SPAWN_ARGV_BUDGET);
+ expect(() => assertPiSpawnArgvFitsPlatform(['--append-system-prompt', cjk], 'linux'))
+ .toThrow(/too many Pi skills/);
+ });
+
+ // Windows 侧必须按 UTF-16 字符:CreateProcess 的 32767 上限是字符数,不是字节。
+ // 用字节估会把中文路径放大三倍,把本来能起的会话拒了。
+ it('measures the Windows command line in characters, not UTF-8 bytes', () => {
+ const cjkPath = `C:\\Users\\用户名\\项目\\.pi\\skills\\${'技'.repeat(200)}`.repeat(100);
+ expect(cjkPath.length).toBeLessThan(PI_WINDOWS_SPAWN_ARGV_BUDGET);
+ expect(Buffer.byteLength(cjkPath, 'utf8')).toBeGreaterThan(PI_WINDOWS_SPAWN_ARGV_BUDGET);
+ expect(estimateSpawnArgvLength([cjkPath], 'win32')).toBeLessThan(PI_WINDOWS_SPAWN_ARGV_BUDGET);
+ expect(() => assertPiSpawnArgvFitsPlatform([cjkPath], 'win32')).not.toThrow();
+ });
});
diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.ts
index 19ee1d278f..78e5e51f68 100644
--- a/packages/maker-core/src/agents/pi/index.ts
+++ b/packages/maker-core/src/agents/pi/index.ts
@@ -321,8 +321,16 @@ const PI_MODELS_JSON_HASH_ENV = 'CINDY_PI_MODELS_JSON_HASH';
const PI_PERMISSION_HASH_ENV = 'CINDY_PI_PERMISSION_HASH';
/** Cindy-owned extension 源码指纹。bridge/subagent 字节变则远端必须 restart,不能 reattach 到旧进程。 */
const PI_EXTENSION_BUNDLE_HASH_ENV = 'CINDY_PI_EXTENSION_BUNDLE_HASH';
+/**
+ * 追加提示词的内容指纹(值无凭证)。追加段走 configHome 内的文件后,命令行里
+ * 只剩固定路径:提示词正文变了也不会改远端 launch 身份,daemon 会 attach 到仍持
+ * 旧提示词的旧进程。进 spawn env 后由远端 envHash 覆盖,变化即条件 restart。
+ */
+const PI_APPEND_SYSTEM_PROMPT_HASH_ENV = 'CINDY_PI_APPEND_SYSTEM_PROMPT_HASH';
/** 远端附件内联上限:超过则 fail-before-dispatch, 不静默截断。 */
const REMOTE_PI_ATTACHMENT_MAX_BYTES = 256 * 1024;
+/** 会话 configHome 内的追加提示词文件名(见 startSession 里 --append-system-prompt 的传参)。 */
+const CINDY_APPEND_SYSTEM_PROMPT_FILENAME = 'append-system-prompt.md';
/**
* Compatibility fallback for hosts that do not provide persistent derivation.
* Desktop injects its owner-scoped safeStorage-backed deriver so restart and
@@ -4012,6 +4020,15 @@ export class PiAgent extends BaseAgent {
.some((existing) => canonicalSkillPath(existing) === canonicalSkillPath(skillPath)));
managedSkillRoot = managedLaunchSkills.length ? path.join(configHome, 'cindy-managed-skills') : undefined;
+ // pi 的 --append-system-prompt 接受 <text|path>:参数在磁盘上存在即按文件读。
+ // 伙伴提示词(身份 + 能力说明 + teammate-guide + 记忆索引)轻易两三万字符,
+ // 内联进 argv 会单独顶穿 Windows 的 spawn 命令行上限并让整个会话起不来,
+ // 所以永远写进本会话的 configHome、argv 只带路径。
+ const appendSystemPromptPath = appendSystemPrompt.length > 0
+ ? joinRemotePosixPath(configHome, CINDY_APPEND_SYSTEM_PROMPT_FILENAME)
+ : undefined;
+ if (appendSystemPromptPath) await writeFile(appendSystemPromptPath, appendSystemPrompt);
+
args = [
'--mode',
'rpc',
@@ -4041,7 +4058,7 @@ export class PiAgent extends BaseAgent {
.some((existing) => canonicalSkillPath(existing) === canonicalSkillPath(skillPath)))
.flatMap((skillPath) => ['--skill', skillPath]),
...(managedSkillRoot ? ['--skill', managedSkillRoot] : []),
- ...(appendSystemPrompt.length > 0 ? ['--append-system-prompt', appendSystemPrompt] : []),
+ ...(appendSystemPromptPath ? ['--append-system-prompt', appendSystemPromptPath] : []),
// 受邀者的说明文件扩展排在 bridge 之前:托管时 bridge 会按当前选项渲染整段系统提示。
...(guestContextExtensionPath ? ['--extension', guestContextExtensionPath] : []),
'--extension',
@@ -5585,6 +5602,12 @@ export class PiAgent extends BaseAgent {
.update(CINDY_SUBAGENT_EXTENSION_SOURCE)
.digest('hex')
.slice(0, 16);
+ // 追加提示词本体在文件里,命令行不再带它;指纹进 env 才让提示词变化
+ // 触发远端 restart 而不是纯 attach。
+ spawnEnv[PI_APPEND_SYSTEM_PROMPT_HASH_ENV] = createHash('sha256')
+ .update(appendSystemPrompt)
+ .digest('hex')
+ .slice(0, 16);
}
mergeLoopbackNoProxy(spawnEnv);
durableSpawnEnv = spawnEnv;
diff --git a/packages/maker-core/src/agents/pi/project-resource-cli.ts b/packages/maker-core/src/agents/pi/project-resource-cli.ts
index 240081814f..83eb02c517 100644
--- a/packages/maker-core/src/agents/pi/project-resource-cli.ts
+++ b/packages/maker-core/src/agents/pi/project-resource-cli.ts
@@ -164,8 +164,17 @@ export const PI_WINDOWS_SPAWN_ARGV_BUDGET = 30_000;
/** Leave headroom under typical macOS/Linux ARG_MAX, which is shared with env. */
export const PI_POSIX_SPAWN_ARGV_BUDGET = 128_000;
-export function estimateSpawnArgvLength(args: readonly string[]): number {
- return args.reduce((total, arg) => total + arg.length + 3, 0);
+export function estimateSpawnArgvLength(
+ args: readonly string[],
+ platform: NodeJS.Platform = process.platform,
+): number {
+ // 两种口径不一样,不能统一:Windows CreateProcess 的命令行上限是 32767 个
+ // UTF-16 字符(lpCommandLine 是 LPCWSTR),按 UTF-8 字节算会把中文路径放大三倍、
+ // 误判成超限而拒绝本来能起的会话;POSIX 的 ARG_MAX / MAX_ARG_STRLEN 按字节算,
+ // 用字符数算会漏检中文长提示词。
+ return args.reduce((total, arg) => total
+ + (platform === 'win32' ? arg.length : Buffer.byteLength(arg, 'utf8'))
+ + 3, 0);
}
export function piSpawnArgvBudget(platform: NodeJS.Platform): number | null {
@@ -179,7 +188,7 @@ export function assertPiSpawnArgvFitsPlatform(
platform: NodeJS.Platform = process.platform,
): void {
const budget = piSpawnArgvBudget(platform);
- if (budget === null || estimateSpawnArgvLength(args) <= budget) return;
+ if (budget === null || estimateSpawnArgvLength(args, platform) <= budget) return;
throw new Error(
'This project has too many Pi skills, prompts, or extensions to start a task. Remove some and try again.',
);
diff --git a/packages/maker-pi-manager/src/__tests__/session-registry.test.ts b/packages/maker-pi-manager/src/__tests__/session-registry.test.ts
index d1c8a7e19d..f2dc2a1894 100644
--- a/packages/maker-pi-manager/src/__tests__/session-registry.test.ts
+++ b/packages/maker-pi-manager/src/__tests__/session-registry.test.ts
@@ -259,6 +259,27 @@ describe('ensure', () => {
child2.emit('close', 0, null);
});
+ // 1c-2. 同 envHash + restart=true(Host 每次 ensure 都传 restart:true)→ 仍 attach。
+ // 提示词走文件后命令行不再随内容变化,这一条就是「内容没变就别重启旧进程」的落点。
+ it('should attach (not restart) when same envHash and restart=true', async () => {
+ const { registry } = await createRegistry();
+
+ const child1 = makeChild();
+ mockSpawn.mockReturnValueOnce(child1);
+ mockCreateServer.mockReturnValueOnce(makeServer());
+
+ const r1 = await registry.ensure('s1', 'cmd', { K: 'v' }, 'hash-same', true);
+ expect(r1.isReattach).toBe(false);
+
+ const r2 = await registry.ensure('s1', 'cmd', { K: 'v' }, 'hash-same', true);
+ expect(r2.isReattach).toBe(true);
+ expect(r2.sockPath).toBe(r1.sockPath);
+ expect(mockSpawn).toHaveBeenCalledTimes(1);
+ expect(child1.kill).not.toHaveBeenCalled();
+
+ child1.emit('close', 0, null);
+ });
+
// 1d. 不同 envHash + restart=false → 纯 attach(不杀旧)
it('should pure attach when different envHash and restart=false', async () => {
const { registry } = await createRegistry();