oh-my-codex 0.11.12 → 0.11.13

package/dist/hooks/__tests__/notify-hook-tmux-heal.test.js

@@ -1,9 +1,11 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
-import { spawnSync } from 'node:child_process';
 import { chmod, mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { buildTmuxSessionName } from '../../cli/index.js';
+import { handleTmuxInjection } from '../../scripts/notify-hook/tmux-injection.js';
 const NOTIFY_HOOK_SCRIPT = new URL('../../../dist/scripts/notify-hook.js', import.meta.url);
 async function withTempWorkingDir(run) {
     const cwd = await mkdtemp(join(tmpdir(), 'omx-notify-tmux-heal-'));
@@ -20,6 +22,44 @@ async function writeJson(path, value) {
 async function readJson(path) {
     return JSON.parse(await readFile(path, 'utf-8'));
 }
+function readLinuxStartTicks(pid) {
+    try {
+        const stat = readFileSync(`/proc/${pid}/stat`, 'utf-8');
+        const commandEnd = stat.lastIndexOf(')');
+        if (commandEnd === -1)
+            return null;
+        const remainder = stat.slice(commandEnd + 1).trim();
+        const fields = remainder.split(/\s+/);
+        if (fields.length <= 19)
+            return null;
+        const startTicks = Number(fields[19]);
+        return Number.isFinite(startTicks) ? startTicks : null;
+    }
+    catch {
+        return null;
+    }
+}
+function readLinuxCmdline(pid) {
+    try {
+        const raw = readFileSync(`/proc/${pid}/cmdline`);
+        const text = raw.toString('utf-8').replace(/\0+/g, ' ').trim();
+        return text.length > 0 ? text : null;
+    }
+    catch {
+        return null;
+    }
+}
+async function writeManagedSessionState(stateDir, cwd, sessionId) {
+    await writeJson(join(stateDir, 'session.json'), {
+        session_id: sessionId,
+        started_at: new Date().toISOString(),
+        cwd,
+        pid: process.pid,
+        platform: process.platform,
+        pid_start_ticks: readLinuxStartTicks(process.pid),
+        pid_cmdline: readLinuxCmdline(process.pid),
+    });
+}
 describe('notify-hook tmux target healing', () => {
     it('falls back to global mode state when scoped session has no allowed active mode', async () => {
         await withTempWorkingDir(async (cwd) => {
@@ -30,12 +70,13 @@ describe('notify-hook tmux target healing', () => {
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'team-state.json'), { active: true, current_phase: 'team-exec' });
             await writeJson(join(stateDir, 'ralph-state.json'), { active: true, iteration: 0 });
             await writeJson(configPath, {
@@ -71,6 +112,10 @@ if [[ "$cmd" == "display-message" ]]; then
     echo "codex"
     exit 0
   fi
+  if [[ "$format" == "#S" && "$target" == "%42" ]]; then
+    echo "${managedSessionName}"
+    exit 0
+  fi
   if [[ "$format" == "#{pane_in_mode}" && "$target" == "%42" ]]; then
     echo "0"
     exit 0
@@ -95,15 +140,24 @@ exit 1
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                delete process.env.TMUX_PANE;
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'injection_sent');
             assert.equal(hookState.total_injections, 1);
@@ -118,12 +172,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), { active: true, iteration: 0 });
             await writeJson(configPath, {
                 enabled: true,
@@ -148,7 +203,7 @@ if [[ "$cmd" == "list-panes" ]]; then
       *) shift ;;
     esac
   done
-  if [[ "$target" == "devsess" ]]; then
+  if [[ "$target" == "${managedSessionName}" ]]; then
     echo "%42 1"
     exit 0
   fi
@@ -190,7 +245,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%42" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   echo "bad display target: $target / $format" >&2
@@ -207,21 +262,35 @@ exit 1
             const payload = {
                 cwd,
                 type: 'agent-turn-complete',
+                session_id: sessionId,
                 'thread-id': 'thread-test',
                 'turn-id': 'turn-test',
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                    TMUX_PANE: '%42',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            const previousTmuxPane = process.env.TMUX_PANE;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                process.env.TMUX_PANE = '%42';
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+                if (typeof previousTmuxPane === 'string')
+                    process.env.TMUX_PANE = previousTmuxPane;
+                else
+                    delete process.env.TMUX_PANE;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'injection_sent');
             assert.equal(hookState.total_injections, 1);
@@ -239,12 +308,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), { active: true, iteration: 0 });
             await writeJson(configPath, {
                 enabled: true,
@@ -269,7 +339,7 @@ if [[ "$cmd" == "list-panes" ]]; then
       *) shift ;;
     esac
   done
-  if [[ "$target" == "devsess" ]]; then
+  if [[ "$target" == "${managedSessionName}" ]]; then
     echo "%42 1"
     exit 0
   fi
@@ -311,7 +381,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%42" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   echo "bad display target: $target / $format" >&2
@@ -328,27 +398,41 @@ exit 1
             const payload = {
                 cwd,
                 type: 'agent-turn-complete',
+                session_id: sessionId,
                 'thread-id': 'thread-test-2',
                 'turn-id': 'turn-test-2',
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                    TMUX_PANE: '%42',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            const previousTmuxPane = process.env.TMUX_PANE;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                process.env.TMUX_PANE = '%42';
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+                if (typeof previousTmuxPane === 'string')
+                    process.env.TMUX_PANE = previousTmuxPane;
+                else
+                    delete process.env.TMUX_PANE;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'pane_cwd_mismatch');
             assert.equal(hookState.total_injections, 0);
         });
     });
-    it('does not guess a pane by shared cwd when canonical codex pane is unavailable', async () => {
+    it('resolves the explicit managed session target without shared-cwd guessing', async () => {
         await withTempWorkingDir(async (cwd) => {
             const omxDir = join(cwd, '.omx');
             const stateDir = join(omxDir, 'state');
@@ -357,12 +441,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), { active: true, iteration: 0 });
             await writeJson(configPath, {
                 enabled: true,
@@ -394,7 +479,7 @@ if [[ "$cmd" == "list-panes" ]]; then
     echo "%42\t${cwd}\t1\tdevsess"
     exit 0
   fi
-  if [[ "$target" == "devsess" ]]; then
+  if [[ "$target" == "${managedSessionName}" ]]; then
     echo "%42 1"
     exit 0
   fi
@@ -416,7 +501,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%42" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   if [[ "$format" == "#{pane_current_path}" && "$target" == "%42" ]]; then
@@ -437,23 +522,33 @@ exit 1
             const payload = {
                 cwd,
                 type: 'agent-turn-complete',
+                session_id: sessionId,
                 'thread-id': 'thread-test-3',
                 'turn-id': 'turn-test-3',
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                delete process.env.TMUX_PANE;
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+            }
             const hookState = await readJson(hookStatePath);
-            assert.equal(hookState.last_reason, 'target_not_found');
-            assert.equal(hookState.total_injections ?? 0, 0);
+            assert.equal(hookState.last_reason, 'injection_sent');
+            assert.equal(hookState.total_injections, 1);
         });
     });
     it('heals a stale HUD pane target back to the canonical codex pane', async () => {
@@ -465,12 +560,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), { active: true, iteration: 0 });
             await writeJson(configPath, {
                 enabled: true,
@@ -510,7 +606,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%77" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   if [[ "$format" == "#{pane_current_path}" && "$target" == "%99" ]]; then
@@ -522,7 +618,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%99" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   if [[ "$format" == "#{pane_in_mode}" && "$target" == "%99" ]]; then
@@ -531,6 +627,20 @@ if [[ "$cmd" == "display-message" ]]; then
   fi
   exit 1
 fi
+if [[ "$cmd" == "list-panes" ]]; then
+  target=""
+  while (($#)); do
+    case "$1" in
+      -t) target="$2"; shift 2 ;;
+      *) shift ;;
+    esac
+  done
+  if [[ "$target" == "${managedSessionName}" ]]; then
+    printf "%%77\t1\tnode\tnode dist/cli/omx.js hud --watch\n%%99\t0\tcodex\tcodex\n"
+    exit 0
+  fi
+  exit 1
+fi
 if [[ "$cmd" == "send-keys" ]]; then
   exit 0
 fi
@@ -547,16 +657,29 @@ exit 1
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                    TMUX_PANE: '%99',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            const previousTmuxPane = process.env.TMUX_PANE;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                process.env.TMUX_PANE = '%99';
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+                if (typeof previousTmuxPane === 'string')
+                    process.env.TMUX_PANE = previousTmuxPane;
+                else
+                    delete process.env.TMUX_PANE;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'injection_sent');
             assert.equal(hookState.last_target, '%99');
@@ -574,12 +697,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), {
                 active: true,
                 iteration: 0,
@@ -619,7 +743,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%99" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   echo "bad display target: $target / $format" >&2
@@ -640,20 +764,30 @@ exit 1
             const payload = {
                 cwd,
                 type: 'agent-turn-complete',
+                session_id: sessionId,
                 'thread-id': 'thread-test-4',
                 'turn-id': 'turn-test-4',
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                delete process.env.TMUX_PANE;
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'injection_sent');
             assert.equal(hookState.total_injections, 1);
@@ -671,12 +805,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), {
                 active: true,
                 iteration: 0,
@@ -721,7 +856,7 @@ if [[ "$cmd" == "display-message" ]]; then
     exit 0
   fi
   if [[ "$format" == "#S" && "$target" == "%99" ]]; then
-    echo "devsess"
+    echo "${managedSessionName}"
     exit 0
   fi
   if [[ "$format" == "#{pane_current_command}" && "$target" == "%99" ]]; then
@@ -756,15 +891,24 @@ exit 1
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                delete process.env.TMUX_PANE;
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'injection_sent');
             assert.equal(hookState.total_injections, 1);
@@ -782,12 +926,13 @@ exit 1
             const sessionStateDir = join(stateDir, 'sessions', sessionId);
             const fakeBinDir = join(cwd, 'fake-bin');
             const fakeTmuxPath = join(fakeBinDir, 'tmux');
+            const managedSessionName = buildTmuxSessionName(cwd, sessionId);
             const configPath = join(omxDir, 'tmux-hook.json');
             const hookStatePath = join(stateDir, 'tmux-hook-state.json');
             await mkdir(sessionStateDir, { recursive: true });
             await mkdir(logsDir, { recursive: true });
             await mkdir(fakeBinDir, { recursive: true });
-            await writeJson(join(stateDir, 'session.json'), { session_id: sessionId });
+            await writeManagedSessionState(stateDir, cwd, sessionId);
             await writeJson(join(sessionStateDir, 'ralph-state.json'), { active: true, iteration: 0, tmux_pane_id: '%42' });
             await writeJson(configPath, {
                 enabled: true,
@@ -822,6 +967,10 @@ if [[ "$cmd" == "display-message" ]]; then
     echo "codex"
     exit 0
   fi
+  if [[ "$format" == "#S" && "$target" == "%42" ]]; then
+    echo "${managedSessionName}"
+    exit 0
+  fi
   if [[ "$format" == "#{pane_in_mode}" && "$target" == "%42" ]]; then
     echo "0"
     exit 0
@@ -854,15 +1003,24 @@ exit 1
                 'input-messages': ['no marker here'],
                 'last-assistant-message': 'output',
             };
-            const result = spawnSync(process.execPath, [NOTIFY_HOOK_SCRIPT.pathname, JSON.stringify(payload)], {
-                encoding: 'utf8',
-                env: {
-                    ...process.env,
-                    PATH: `${fakeBinDir}:${process.env.PATH || ''}`,
-                    OMX_TEAM_WORKER: '',
-                },
-            });
-            assert.equal(result.status, 0, `notify-hook failed: ${result.stderr || result.stdout}`);
+            const previousPath = process.env.PATH;
+            const previousTeamWorker = process.env.OMX_TEAM_WORKER;
+            try {
+                process.env.PATH = `${fakeBinDir}:${process.env.PATH || ''}`;
+                process.env.OMX_TEAM_WORKER = '';
+                delete process.env.TMUX_PANE;
+                await handleTmuxInjection({ payload, cwd, stateDir, logsDir });
+            }
+            finally {
+                if (typeof previousPath === 'string')
+                    process.env.PATH = previousPath;
+                else
+                    delete process.env.PATH;
+                if (typeof previousTeamWorker === 'string')
+                    process.env.OMX_TEAM_WORKER = previousTeamWorker;
+                else
+                    delete process.env.OMX_TEAM_WORKER;
+            }
             const hookState = await readJson(hookStatePath);
             assert.equal(hookState.last_reason, 'pane_has_active_task');
             assert.equal(hookState.total_injections ?? 0, 0);