Restore CI coverage for hook argv expansion and preflight blocking

The hook escaping regression came from asserting a literal `node` prefix even
though installed hooks may be patched to an absolute node binary. The test now
captures argv after shell expansion instead of accidentally invoking the real
runner, and the pre-tool enforcer now sanitizes malformed threshold env input so
agent-heavy exhausted-context preflight keeps blocking deterministically. The
remaining CI flakes came from ambient test-process state leaking into the
pre-tool harness (env kill-switches, cwd/config, and child_process mocks) plus a
tmux-availability assumption in the duplicate-worker dispatch test, so those
assertions are now hermetic and environment-agnostic.

Constraint: Installed hooks may start with an absolute quoted node path after plugin setup
Constraint: Pre-tool tests must not inherit hook kill-switches, Claude config, or child_process mocks from the surrounding test runner
Constraint: Duplicate-worker dispatch coverage must not require tmux to be available
Rejected: Keep assuming a literal `node` prefix in hook tests | no longer matches shipped hook shape
Rejected: Leave malformed threshold env unchecked | comparison against NaN silently disables blocking
Rejected: Assert immediate `notified` dispatch state in the duplicate-pane test | depends on tmux availability outside the test contract
Confidence: high
Scope-risk: narrow
Directive: Keep hook argv assertions focused on post-shell tokenization, not a specific node binary spelling
Directive: Keep shell-spawned hook tests pinned to isolated HOME/CLAUDE_CONFIG_DIR values, cleared skip flags, isolated child cwd, and unmocked child_process access so ambient state cannot leak in
Tested: npm test -- --run src/__tests__/pre-tool-enforcer.test.ts
Tested: npm test -- --run src/__tests__/pre-tool-enforcer.test.ts src/team/__tests__/api-interop.dispatch.test.ts src/__tests__/hooks-command-escaping.test.ts
Tested: npm test -- --run
Tested: npm run build
Tested: npm run lint
Not-tested: PR CI rerun on GitHub after push

Author: Yeachan-Heo

scripts/pre-tool-enforcer.mjs

@@ -91,9 +91,16 @@ const MODE_STATE_FILES = [
   'omc-teams-state.json',
 ];
 const AGENT_HEAVY_TOOLS = new Set(['Task', 'TaskCreate', 'TaskUpdate']);
-const PREFLIGHT_CONTEXT_THRESHOLD = parseInt(process.env.OMC_AGENT_PREFLIGHT_CONTEXT_THRESHOLD || '72', 10);
 const QUIET_LEVEL = getQuietLevel();
 
+function getPreflightContextThreshold() {
+  const parsed = Number.parseInt(process.env.OMC_AGENT_PREFLIGHT_CONTEXT_THRESHOLD || '72', 10);
+  if (Number.isNaN(parsed)) return 72;
+  return Math.max(1, Math.min(100, parsed));
+}
+
+const PREFLIGHT_CONTEXT_THRESHOLD = getPreflightContextThreshold();
+
 function getQuietLevel() {
   const parsed = Number.parseInt(process.env.OMC_QUIET || '0', 10);
   if (Number.isNaN(parsed)) return 0;

src/__tests__/hooks-command-escaping.test.ts

@@ -9,6 +9,23 @@ interface HooksConfig {
 
 const hooksJsonPath = join(__dirname, '..', '..', 'hooks', 'hooks.json');
 
+function expandHookCommandArgv(command: string, pluginRoot: string): string[] {
+  const shellScript =
+    `eval "set -- $HOOK_COMMAND"; ` +
+    `node -e 'console.log(JSON.stringify(process.argv.slice(1)))' -- "$@"`;
+
+  return JSON.parse(
+    execFileSync('bash', ['-lc', shellScript], {
+      encoding: 'utf-8',
+      env: {
+        ...process.env,
+        HOOK_COMMAND: command,
+        CLAUDE_PLUGIN_ROOT: pluginRoot,
+      },
+    }).trim()
+  ) as string[];
+}
+
 function getHookCommands(): string[] {
   const raw = JSON.parse(readFileSync(hooksJsonPath, 'utf-8')) as HooksConfig;
   return Object.values(raw.hooks ?? {})
@@ -31,24 +48,13 @@ describe('hooks.json command escaping', () => {
     const pluginRoot = '/c/Users/First Last/.claude/plugins/cache/omc/oh-my-claudecode/4.7.10';
 
     for (const command of getHookCommands()) {
-      const argv = JSON.parse(
-        execFileSync(
-          'bash',
-          ['-lc', command.replace(/^node\b/, `node -e "console.log(JSON.stringify(process.argv.slice(1)))"`)],
-          {
-            encoding: 'utf-8',
-            env: {
-              ...process.env,
-              CLAUDE_PLUGIN_ROOT: pluginRoot,
-            },
-          }
-        ).trim()
-      ) as string[];
-
-      expect(argv[0]).toBe(`${pluginRoot}/scripts/run.cjs`);
-      expect(argv[1]).toContain(`${pluginRoot}/scripts/`);
-      expect(argv[0]).toContain('First Last');
+      const argv = expandHookCommandArgv(command, pluginRoot);
+
+      expect(argv[0]).toMatch(/(^|[/\\])node(?:\.exe)?$/);
+      expect(argv[1]).toBe(`${pluginRoot}/scripts/run.cjs`);
+      expect(argv[2]).toContain(`${pluginRoot}/scripts/`);
       expect(argv[1]).toContain('First Last');
+      expect(argv[2]).toContain('First Last');
       expect(argv).not.toContain('/c/Users/First');
       expect(argv).not.toContain('Last/.claude/plugins/cache/omc/oh-my-claudecode/4.7.10/scripts/run.cjs');
     }

src/__tests__/pre-tool-enforcer.test.ts

@@ -1,8 +1,12 @@
-import { execSync } from 'child_process';
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { dirname, join } from 'path';
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.unmock('child_process');
+vi.unmock('node:child_process');
+
+import { execSync } from 'child_process';
 
 const SCRIPT_PATH = join(process.cwd(), 'scripts', 'pre-tool-enforcer.mjs');
 
@@ -14,15 +18,23 @@ function runPreToolEnforcerWithEnv(
   input: Record<string, unknown>,
   env: Record<string, string> = {},
 ): Record<string, unknown> {
+  const cwd = typeof input.cwd === 'string' ? input.cwd : process.cwd();
+  const homeDir = join(cwd, '.test-home');
   const stdout = execSync(`node "${SCRIPT_PATH}"`, {
+    cwd,
     input: JSON.stringify(input),
     encoding: 'utf-8',
     timeout: 5000,
     env: {
       ...process.env,
+      HOME: homeDir,
+      CLAUDE_CONFIG_DIR: join(homeDir, '.claude'),
       NODE_ENV: 'test',
+      DISABLE_OMC: '',
+      OMC_SKIP_HOOKS: '',
       // Reset Bedrock/routing env vars so tests are isolated from the host environment.
       // Tests that exercise Bedrock model-routing behaviour set these explicitly via `env`.
+      OMC_AGENT_PREFLIGHT_CONTEXT_THRESHOLD: '',
       OMC_ROUTING_FORCE_INHERIT: '',
       OMC_SUBAGENT_MODEL: '',
       CLAUDE_MODEL: '',
@@ -377,6 +389,65 @@ describe('pre-tool-enforcer fallback gating (issue #970)', () => {
     expect(String(output.reason)).toContain('Safe recovery');
   });
 
+  it('falls back to the default preflight threshold when the env value is invalid', () => {
+    const transcriptPath = join(tempDir, 'transcript.jsonl');
+    writeTranscriptWithContext(transcriptPath, 1000, 800); // 80%
+
+    const output = runPreToolEnforcerWithEnv(
+      {
+        tool_name: 'Task',
+        toolInput: {
+          subagent_type: 'oh-my-claudecode:executor',
+          description: 'High fan-out execution',
+        },
+        cwd: tempDir,
+        transcript_path: transcriptPath,
+        session_id: 'session-1373-invalid-threshold',
+      },
+      { OMC_AGENT_PREFLIGHT_CONTEXT_THRESHOLD: 'abc' },
+    );
+
+    expect(output.decision).toBe('block');
+    expect(String(output.reason)).toContain('threshold: 72%');
+  });
+
+  it('ignores parent-process hook skip env when exercising preflight blocking', () => {
+    const previousDisableOmc = process.env.DISABLE_OMC;
+    const previousSkipHooks = process.env.OMC_SKIP_HOOKS;
+    const transcriptPath = join(tempDir, 'transcript.jsonl');
+    writeTranscriptWithContext(transcriptPath, 1000, 800); // 80%
+
+    process.env.DISABLE_OMC = '1';
+    process.env.OMC_SKIP_HOOKS = 'pre-tool-use';
+
+    try {
+      const output = runPreToolEnforcer({
+        tool_name: 'Task',
+        toolInput: {
+          subagent_type: 'oh-my-claudecode:executor',
+          description: 'High fan-out execution',
+        },
+        cwd: tempDir,
+        transcript_path: transcriptPath,
+        session_id: 'session-1373-parent-env',
+      });
+
+      expect(output.decision).toBe('block');
+    } finally {
+      if (previousDisableOmc === undefined) {
+        delete process.env.DISABLE_OMC;
+      } else {
+        process.env.DISABLE_OMC = previousDisableOmc;
+      }
+
+      if (previousSkipHooks === undefined) {
+        delete process.env.OMC_SKIP_HOOKS;
+      } else {
+        process.env.OMC_SKIP_HOOKS = previousSkipHooks;
+      }
+    }
+  });
+
   it('allows non-agent-heavy tools even when transcript context is high', () => {
     const transcriptPath = join(tempDir, 'transcript.jsonl');
     writeTranscriptWithContext(transcriptPath, 1000, 900); // 90%
@@ -392,7 +463,6 @@ describe('pre-tool-enforcer fallback gating (issue #970)', () => {
     expect(output.decision).toBeUndefined();
   });
 
-
   it('clears awaiting confirmation from session-scoped mode state when a skill is invoked', () => {
     const sessionId = 'session-confirm';
     const sessionStateDir = join(tempDir, '.omc', 'state', 'sessions', sessionId);

src/team/__tests__/api-interop.dispatch.test.ts

@@ -206,6 +206,7 @@ describe('team api dispatch-aware messaging', () => {
     const requests = await listDispatchRequests(teamName, cwd, { kind: 'mailbox', to_worker: 'worker-1' });
     expect(requests).toHaveLength(1);
     expect(requests[0]?.message_id).toBe(messageId);
-    expect(requests[0]?.status).toBe('pending');
+    expect(requests[0]?.pane_id).toBe('%9');
+    expect(['pending', 'notified']).toContain(requests[0]?.status);
   });
 });