From 587a3b5a8c2aea6cadd7591dcdb177e3f55b698d Mon Sep 17 00:00:00 2001
From: Garry Tan <garrytan@gmail.com>
Date: Mon, 31 Aug 2026 14:57:07 +0000
Subject: [PATCH] fix: startup-grace probes clear CI for local semantics; new
 probe pins the floor clamp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The two shim probes pass explicit 2s/4s graces, but in CI the runner clamps
any explicit grace up to the 300s floor (deliberate adversarial-review fix),
so 'silent API killed at the grace' died at the 30s work cap instead of 2s —
a deterministic red on every CI run, green locally. The probes now pin LOCAL
semantics with CI cleared (same save/restore pattern as their PATH shim),
and a fourth probe pins the clamp itself: CI=1 + 2s grace + 6s timeout must
kill at the 6s cap, still in the startup phase — proof an explicit low grace
cannot bypass the floor.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 test/session-runner-startup-grace.test.ts | 54 +++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/test/session-runner-startup-grace.test.ts b/test/session-runner-startup-grace.test.ts
index 0a00c16d0..9b06cf2c8 100644
--- a/test/session-runner-startup-grace.test.ts
+++ b/test/session-runner-startup-grace.test.ts
@@ -46,7 +46,13 @@ describe('session-runner two-phase timeout', () => {
     ].join('\n') + '\n', { mode: 0o755 });
 
     const realPath = process.env.PATH;
+    const realCI = process.env.CI;
     process.env.PATH = `${shimDir}:${realPath}`;
+    // This probe pins LOCAL grace semantics (caller honored verbatim). In CI
+    // the runner clamps explicit graces up to the 300s floor by design, so
+    // the small shim grace would never take effect — clear CI for the call
+    // and pin the floor itself in its own probe below.
+    delete process.env.CI;
     try {
       const started = Date.now();
       const result = await runSkillTest({
@@ -65,6 +71,7 @@ describe('session-runner two-phase timeout', () => {
       expect(wall).toBeLessThan(20_000);
     } finally {
       process.env.PATH = realPath;
+      if (realCI !== undefined) process.env.CI = realCI;
       Bun.spawnSync(['pkill', '-f', `sleep 6071\\.${process.pid}`], { timeout: 5_000 });
       fs.rmSync(dir, { recursive: true, force: true });
     }
@@ -77,7 +84,12 @@ describe('session-runner two-phase timeout', () => {
     fs.writeFileSync(path.join(shimDir, 'claude'), `#!/bin/bash\nexec sleep 6072.${process.pid}\n`, { mode: 0o755 });
 
     const realPath = process.env.PATH;
+    const realCI = process.env.CI;
     process.env.PATH = `${shimDir}:${realPath}`;
+    // LOCAL semantics again: in CI the floor clamps this 2s grace to 300s
+    // (capped by timeout → 30s), which is exactly the false red this test
+    // shipped with. The floor's own behavior is pinned in the next probe.
+    delete process.env.CI;
     try {
       const started = Date.now();
       const result = await runSkillTest({
@@ -95,8 +107,50 @@ describe('session-runner two-phase timeout', () => {
       expect(result.costEstimate.turnsUsed).toBe(0);
     } finally {
       process.env.PATH = realPath;
+      if (realCI !== undefined) process.env.CI = realCI;
       Bun.spawnSync(['pkill', '-f', `sleep 6072\\.${process.pid}`], { timeout: 5_000 });
       fs.rmSync(dir, { recursive: true, force: true });
     }
   }, 60_000);
+
+  test('in CI the floor clamps an explicit low grace (adversarial pin — the clamp is real)', async () => {
+    // The floor exists because CI queueing converts a low grace into false
+    // reds; an explicit startupGraceMs must NOT bypass it (review finding:
+    // "the name promised a clamp the code lacked"). With CI set, a 2s grace
+    // request against a 6s timeout floors to min(300s, timeout) = 6s — the
+    // silent shim survives PAST the requested 2s and dies at the cap, still
+    // in the startup phase.
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'grace-'));
+    const shimDir = path.join(dir, 'bin');
+    fs.mkdirSync(shimDir);
+    fs.writeFileSync(path.join(shimDir, 'claude'), `#!/bin/bash\nexec sleep 6073.${process.pid}\n`, { mode: 0o755 });
+
+    const realPath = process.env.PATH;
+    const realCI = process.env.CI;
+    process.env.PATH = `${shimDir}:${realPath}`;
+    process.env.CI = '1';
+    try {
+      const started = Date.now();
+      const result = await runSkillTest({
+        prompt: 'ignored',
+        workingDirectory: dir,
+        maxTurns: 1,
+        timeout: 6_000,
+        startupGraceMs: 2_000, // must be clamped up, not honored
+        testName: 'grace-probe-ci-floor',
+      });
+      const wall = Date.now() - started;
+      expect(result.exitReason).toBe('timeout_startup');
+      // Proof the clamp fired: the kill lands at the 6s timeout cap, not the
+      // requested 2s (drain grace can only extend, never shorten).
+      expect(wall).toBeGreaterThanOrEqual(5_500);
+      expect(wall).toBeLessThan(20_000);
+    } finally {
+      process.env.PATH = realPath;
+      if (realCI !== undefined) process.env.CI = realCI;
+      else delete process.env.CI;
+      Bun.spawnSync(['pkill', '-f', `sleep 6073\\.${process.pid}`], { timeout: 5_000 });
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+  }, 60_000);
 });