Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop

examples/acp-agent/tests/acp.e2e.ts

@@ -30,10 +30,16 @@ let spawned: LaunchedAcpTestAgent | undefined
 let workdir: string | undefined
 
 afterEach(async () => {
-  await spawned?.close('SIGKILL')
-  spawned = undefined
-  if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
-  workdir = undefined
+  try {
+    await spawned?.close('SIGKILL')
+  } finally {
+    spawned = undefined
+    try {
+      if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
+    } finally {
+      workdir = undefined
+    }
+  }
 })
 
 describe('acp-agent over real stdio (no key required)', () => {

examples/acp-agent/tests/hooks.e2e.ts

@@ -38,10 +38,16 @@ let spawned: LaunchedAcpTestAgent | undefined
 let workdir: string | undefined
 
 afterEach(async () => {
-  await spawned?.close('SIGKILL')
-  spawned = undefined
-  if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
-  workdir = undefined
+  try {
+    await spawned?.close('SIGKILL')
+  } finally {
+    spawned = undefined
+    try {
+      if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
+    } finally {
+      workdir = undefined
+    }
+  }
 })
 
 describe.skipIf(!process.env.DEEPSEEK_API_KEY)('acp-agent e2e: a PreToolUse hook blocks bash (real model)', () => {

examples/sandbox-acp-agent/tests/escalation.e2e.ts

@@ -81,10 +81,16 @@ let spawned: Spawned | undefined
 let workdir: string | undefined
 
 afterEach(async () => {
-  await spawned?.close('SIGKILL')
-  spawned = undefined
-  if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
-  workdir = undefined
+  try {
+    await spawned?.close('SIGKILL')
+  } finally {
+    spawned = undefined
+    try {
+      if (workdir !== undefined) await rm(workdir, { recursive: true, force: true })
+    } finally {
+      workdir = undefined
+    }
+  }
 })
 
 describe('sandbox-acp-agent keyless smoke (real cordis.yml via the Loader)', () => {