oh-my-codex 0.21.33 → 0.21.35

package/Cargo.lock

@@ -32,7 +32,7 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "omx-api"
-version = "0.21.33"
+version = "0.21.35"
 dependencies = [
  "serde",
  "serde_json",
@@ -40,14 +40,14 @@ dependencies = [
 
 [[package]]
 name = "omx-explore-harness"
-version = "0.21.33"
+version = "0.21.35"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "omx-mux"
-version = "0.21.33"
+version = "0.21.35"
 dependencies = [
  "serde",
  "serde_json",
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "omx-runtime"
-version = "0.21.33"
+version = "0.21.35"
 dependencies = [
  "fs2",
  "libc",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "omx-runtime-core"
-version = "0.21.33"
+version = "0.21.35"
 dependencies = [
  "fs2",
  "serde",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "omx-sparkshell"
-version = "0.21.33"
+version = "0.21.35"
 dependencies = [
  "omx-mux",
 ]

package/Cargo.toml

@@ -11,7 +11,7 @@ resolver = "2"
 
 [workspace.package]
 
-version = "0.21.33"
+version = "0.21.35"
 
 edition = "2021"
 rust-version = "1.73"

package/dist/team/__tests__/runtime.test.js

@@ -5813,6 +5813,44 @@ process.on('SIGTERM', () => {});
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('shutdownTeam clears terminated prompt-worker PIDs before aborting on a partial teardown failure', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-prompt-partial-'));
+        const binDir = join(cwd, 'bin');
+        const fakeCodexPath = join(binDir, 'codex');
+        const originalProcessKill = process.kill;
+        let runtime = null;
+        await mkdir(binDir, { recursive: true });
+        await writeFakePromptWorkerBinary(fakeCodexPath, `
+process.stdin.resume();
+setInterval(() => {}, 1000);
+`);
+        try {
+            runtime = await withPromptModeCodexEnv(binDir, {}, () => withoutTeamWorkerEnv(() => startTeam('team-prompt-partial', 'partial prompt teardown test', 'executor', 2, [{ subject: 's', description: 'd', owner: 'worker-1' }], cwd)));
+            const stuckPid = runtime.config.workers[0]?.pid ?? 0;
+            const stoppedPid = runtime.config.workers[1]?.pid ?? 0;
+            assert.ok(stuckPid > 0 && stoppedPid > 0);
+            process.kill = ((pid, signal) => {
+                if ((pid === -stuckPid || pid === stuckPid) && signal === 0) {
+                    const error = new Error('permission denied');
+                    error.code = 'EPERM';
+                    throw error;
+                }
+                return originalProcessKill(pid, signal);
+            });
+            await assert.rejects(() => shutdownTeam(runtime.teamName, cwd, { force: true }), /^Error: shutdown_prompt_teardown_failed:worker-1:still_alive_after_sigkill$/);
+            process.kill = originalProcessKill;
+            const retained = await readTeamConfig(runtime.teamName, cwd);
+            assert.ok(retained);
+            assert.equal(retained?.workers[0]?.pid, stuckPid, 'the worker that survived stays recorded for retry');
+            assert.equal(retained?.workers[1]?.pid, undefined, 'a terminated worker PID is never signalled again on retry');
+        }
+        finally {
+            process.kill = originalProcessKill;
+            if (runtime)
+                await shutdownTeam(runtime.teamName, cwd, { force: true }).catch(() => { });
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it('shutdownTeam reaps detached prompt-worker descendants', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-prompt-descendants-'));
         const binDir = join(cwd, 'bin');
@@ -8695,6 +8733,87 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('shutdownTeam persists killed worker panes before aborting on a partial pane-kill failure', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-partial-kill-'));
+        const teamName = 'team-shutdown-partial-kill';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-partial-kill-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    ;;
+  list-panes)
+    case "$*" in
+      *"-t leader:0"*)
+        printf '%%10\\tzsh\\tzsh\\n'
+        if [ ! -f "${tmuxLogPath}.killed13" ]; then printf '%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-partial-kill/worker-1 codex\\n'; fi
+        printf '%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-partial-kill/worker-2 codex\\n%%15\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-partial-kill/worker-3 codex\\n'
+        ;;
+      *"-a -F #{pane_id}"*)
+        printf '%%10\t0\t2000000010\n'
+        if [ ! -f "${tmuxLogPath}.killed13" ]; then printf '%%13\t0\t2000000013\n'; fi
+        printf '%%14\t0\t2000000014\n%%15\t0\t2000000015\n'
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  show-option)
+    printf 'owner-1\\n'
+    ;;
+  kill-pane)
+    case "$*" in
+      *"-t %13"*) : > "${tmuxLogPath}.killed13" ;;
+      *) echo "kill pane failed" >&2; exit 1 ;;
+    esac
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown partial kill test', 'executor', 3, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%10';
+                config.leader_pane_pid = 2000000010;
+                config.hud_pane_id = null;
+                config.tmux_pane_owner_id = 'owner-1';
+                config.workers[0].pane_id = '%13';
+                config.workers[0].pid = 2000000013;
+                config.workers[1].pane_id = '%14';
+                config.workers[1].pid = 2000000014;
+                config.workers[2].pane_id = '%15';
+                config.workers[2].pid = 2000000015;
+                await saveTeamConfig(config, cwd);
+                await assert.rejects(() => shutdownTeam(teamName, cwd, { force: true }), /shutdown_pane_teardown_failed:%14/);
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.match(tmuxLog, /kill-pane -t %14/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %15/, 'teardown stops at the first failed kill');
+                const retained = await readTeamConfig(teamName, cwd);
+                assert.ok(retained);
+                assert.equal(retained?.workers[0]?.pane_id, undefined, 'the killed pane is not re-authorized on retry');
+                assert.equal(retained?.workers[0]?.pid, undefined);
+                assert.equal(retained?.workers[1]?.pane_id, '%14', 'the pane whose kill failed stays authorized for retry');
+                assert.equal(retained?.workers[1]?.pid, 2000000014);
+                assert.equal(retained?.workers[2]?.pane_id, '%15', 'a pane never attempted stays authorized for retry');
+                assert.equal(retained?.workers[2]?.pid, 2000000015);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it('shutdownTeam preserves unrelated non-worker panes during shared-session shutdown', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-unrelated-pane-'));
         const teamName = 'team-shutdown-unrelated-pane';