Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Fix PID publication readiness in process tests (#5183)

Nick Gomeza44736ecfc81
diff --git a/.github/scripts/retry-transient.test.mjs b/.github/scripts/retry-transient.test.mjs
index c6b3624d3..5a237a8a4 100644
--- a/.github/scripts/retry-transient.test.mjs
+++ b/.github/scripts/retry-transient.test.mjs
@@ -779,7 +779,7 @@ describe('deadlines and cancellation', () => {
) => {
rmSync(pidFile, { force: true });
const [executable, ...args] = nodeCmd(
- `require('fs').writeFileSync(${JSON.stringify(pidFile)},String(process.pid));setTimeout(() => {},${childSelfExitMs})`,
+ `const fs=require('fs');const pidFile=${JSON.stringify(pidFile)};fs.writeFileSync(pidFile+'.pending',String(process.pid));fs.renameSync(pidFile+'.pending',pidFile);setTimeout(() => {},${childSelfExitMs})`,
);
const spawnOptions = {
stdio: ['inherit', 'pipe', 'pipe'],
@@ -1041,7 +1041,7 @@ describe('deadlines and cancellation', () => {
const pidFile = join(scratch, 'cancelled-child-pid');
const promise = run({
command: nodeCmd(
- `require('fs').writeFileSync(${JSON.stringify(pidFile)},String(process.pid));console.log('ready');setTimeout(() => {},${childSelfExitMs})`,
+ `const fs=require('fs');const pidFile=${JSON.stringify(pidFile)};fs.writeFileSync(pidFile+'.pending',String(process.pid));fs.renameSync(pidFile+'.pending',pidFile);console.log('ready');setTimeout(() => {},${childSelfExitMs})`,
),
signalSource: signals,
});
diff --git a/packages/server/src/acp/launch.test.ts b/packages/server/src/acp/launch.test.ts
index bff04c7a5..f6bb0bd5a 100644
--- a/packages/server/src/acp/launch.test.ts
+++ b/packages/server/src/acp/launch.test.ts
@@ -1321,13 +1321,15 @@ describe('terminateAgentTree', () => {
script,
[
"import { spawn } from 'node:child_process';",
- "import { writeFileSync } from 'node:fs';",
+ "import { renameSync, writeFileSync } from 'node:fs';",
"process.on('SIGTERM', () => {});",
'const kid = spawn(process.execPath, [',
" '-e',",
` "process.on('SIGTERM', () => {}); setTimeout(() => process.exit(0), ${GRANDCHILD_SELF_EXIT_MS});",`,
"], { stdio: 'ignore' });",
- 'writeFileSync(process.env.KID_PID_FILE, String(kid.pid));',
+ "const pendingPidFile = process.env.KID_PID_FILE + '.pending';",
+ 'writeFileSync(pendingPidFile, String(kid.pid));',
+ 'renameSync(pendingPidFile, process.env.KID_PID_FILE);',
'setInterval(() => {}, 1000);',
'',
].join('\n'),
diff --git a/packages/server/src/acp/thread-manager.integration.test.ts b/packages/server/src/acp/thread-manager.integration.test.ts
index b7d5c1c42..7502725df 100644
--- a/packages/server/src/acp/thread-manager.integration.test.ts
+++ b/packages/server/src/acp/thread-manager.integration.test.ts
@@ -539,13 +539,15 @@ describe('AcpThreadManager (real subprocess)', () => {
agentPath,
[
"import { spawn } from 'node:child_process';",
- "import { writeFileSync } from 'node:fs';",
+ "import { renameSync, writeFileSync } from 'node:fs';",
"process.on('SIGTERM', () => {});",
'const kid = spawn(process.execPath, [',
" '-e',",
' "process.on(\'SIGTERM\', () => {}); setInterval(() => {}, 1000);",',
"], { stdio: 'ignore' });",
- 'writeFileSync(process.env.KID_PID_FILE, String(kid.pid));',
+ "const pendingPidFile = process.env.KID_PID_FILE + '.pending';",
+ 'writeFileSync(pendingPidFile, String(kid.pid));',
+ 'renameSync(pendingPidFile, process.env.KID_PID_FILE);',
'setInterval(() => {}, 1000);',
'',
].join('\n'),
@@ -571,6 +573,7 @@ describe('AcpThreadManager (real subprocess)', () => {
await new Promise((r) => setTimeout(r, 25));
}
const kidPid = Number(readFileSync(kidPidFile, 'utf8'));
+ expect(kidPid).toBeGreaterThan(0);
const rootPid = (
manager as unknown as { threads: Map<string, { child: { pid?: number } | null }> }
).threads.get(info.threadId)?.child?.pid;