fix: avoid dev-hook false positives in non-dev commands

scripts/hooks/pre-bash-dev-server-block.js

@@ -4,6 +4,140 @@
 const MAX_STDIN = 1024 * 1024;
 const { splitShellSegments } = require('../lib/shell-split');
 
+const DEV_COMMAND_WORDS = new Set([
+  'npm',
+  'pnpm',
+  'yarn',
+  'bun',
+  'npx',
+  'bash',
+  'sh',
+  'zsh',
+  'fish',
+  'tmux'
+]);
+const SKIPPABLE_PREFIX_WORDS = new Set(['env', 'command', 'builtin', 'exec', 'noglob', 'sudo']);
+const PREFIX_OPTION_VALUE_WORDS = {
+  env: new Set(['-u', '-C', '-S', '--unset', '--chdir', '--split-string']),
+  sudo: new Set([
+    '-u',
+    '-g',
+    '-h',
+    '-p',
+    '-r',
+    '-t',
+    '-C',
+    '--user',
+    '--group',
+    '--host',
+    '--prompt',
+    '--role',
+    '--type',
+    '--close-from'
+  ])
+};
+
+function readToken(input, startIndex) {
+  let index = startIndex;
+  while (index < input.length && /\s/.test(input[index])) index += 1;
+  if (index >= input.length) return null;
+
+  let token = '';
+  let quote = null;
+
+  while (index < input.length) {
+    const ch = input[index];
+    if (quote) {
+      if (ch === quote) {
+        quote = null;
+        index += 1;
+        continue;
+      }
+      if (ch === '\\' && quote === '"' && index + 1 < input.length) {
+        token += input[index + 1];
+        index += 2;
+        continue;
+      }
+      token += ch;
+      index += 1;
+      continue;
+    }
+
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      index += 1;
+      continue;
+    }
+
+    if (/\s/.test(ch)) break;
+
+    if (ch === '\\' && index + 1 < input.length) {
+      token += input[index + 1];
+      index += 2;
+      continue;
+    }
+
+    token += ch;
+    index += 1;
+  }
+
+  return { token, end: index };
+}
+
+function shouldSkipOptionValue(wrapper, optionToken) {
+  if (!wrapper || !optionToken || optionToken.includes('=')) return false;
+  const optionSet = PREFIX_OPTION_VALUE_WORDS[wrapper];
+  if (!optionSet) return false;
+  return optionSet.has(optionToken);
+}
+
+function isOptionToken(token) {
+  return token.startsWith('-') && token.length > 1;
+}
+
+function getLeadingCommandWord(segment) {
+  let index = 0;
+  let activeWrapper = null;
+  let skipNextValue = false;
+
+  while (index < segment.length) {
+    const parsed = readToken(segment, index);
+    if (!parsed) return null;
+    index = parsed.end;
+
+    const token = parsed.token;
+    if (!token) continue;
+
+    if (skipNextValue) {
+      skipNextValue = false;
+      continue;
+    }
+
+    if (token === '--') {
+      activeWrapper = null;
+      continue;
+    }
+
+    if (/^[A-Za-z_][A-Za-z0-9_]*=.*/.test(token)) continue;
+
+    if (SKIPPABLE_PREFIX_WORDS.has(token)) {
+      activeWrapper = token;
+      continue;
+    }
+
+    if (activeWrapper && isOptionToken(token)) {
+      if (shouldSkipOptionValue(activeWrapper, token)) {
+        skipNextValue = true;
+      }
+      continue;
+    }
+
+    return token;
+  }
+
+  return null;
+}
+
 let raw = '';
 process.stdin.setEncoding('utf8');
 process.stdin.on('data', chunk => {
@@ -23,7 +157,13 @@ process.stdin.on('end', () => {
       const tmuxLauncher = /^\s*tmux\s+(new|new-session|new-window|split-window)\b/;
       const devPattern = /\b(npm\s+run\s+dev|pnpm(?:\s+run)?\s+dev|yarn\s+dev|bun\s+run\s+dev)\b/;
 
-      const hasBlockedDev = segments.some(segment => devPattern.test(segment) && !tmuxLauncher.test(segment));
+      const hasBlockedDev = segments.some(segment => {
+        const commandWord = getLeadingCommandWord(segment);
+        if (!commandWord || !DEV_COMMAND_WORDS.has(commandWord)) {
+          return false;
+        }
+        return devPattern.test(segment) && !tmuxLauncher.test(segment);
+      });
 
       if (hasBlockedDev) {
         console.error('[Hook] BLOCKED: Dev server must run in tmux for log access');

tests/integration/hooks.test.js

@@ -181,6 +181,7 @@ async function runTests() {
   const scriptsDir = path.join(__dirname, '..', '..', 'scripts', 'hooks');
   const hooksJsonPath = path.join(__dirname, '..', '..', 'hooks', 'hooks.json');
   const hooks = JSON.parse(fs.readFileSync(hooksJsonPath, 'utf8'));
+  const devServerBlockerPath = path.join(scriptsDir, 'pre-bash-dev-server-block.js');
 
   // ==========================================
   // Input Format Tests
@@ -253,8 +254,7 @@ async function runTests() {
 
   if (await asyncTest('blocking hooks output BLOCKED message', async () => {
     // Test the dev server blocking hook — must send a matching command
-    const blockingCommand = hooks.hooks.PreToolUse[0].hooks[0].command;
-    const result = await runHookCommand(blockingCommand, {
+    const result = await runHookWithInput(devServerBlockerPath, {
       tool_input: { command: 'npm run dev' }
     });
 
@@ -279,8 +279,7 @@ async function runTests() {
 
   if (await asyncTest('blocking hooks exit with code 2', async () => {
     // The dev server blocker blocks when a dev server command is detected
-    const blockingCommand = hooks.hooks.PreToolUse[0].hooks[0].command;
-    const result = await runHookCommand(blockingCommand, {
+    const result = await runHookWithInput(devServerBlockerPath, {
       tool_input: { command: 'yarn dev' }
     });
 
@@ -292,6 +291,41 @@ async function runTests() {
     }
   })) passed++; else failed++;
 
+  if (await asyncTest('dev server blocker ignores heredoc prose in non-dev commands', async () => {
+    const heredocCommand = [
+      'gh pr create --title "test" --body "$(cat <<\'EOF\'',
+      '## Test plan',
+      '',
+      '- [ ] Run npm run dev to verify the site starts',
+      '',
+      'EOF',
+      ')"'
+    ].join('\n');
+    const result = await runHookWithInput(devServerBlockerPath, {
+      tool_input: { command: heredocCommand }
+    });
+
+    assert.strictEqual(result.code, 0, 'Non-dev commands with heredoc prose should pass');
+    assert.ok(!result.stderr.includes('BLOCKED'), 'Should not emit a BLOCKED message');
+  })) passed++; else failed++;
+
+  if (await asyncTest('dev server blocker handles env/sudo prefixed dev commands', async () => {
+    const envResult = await runHookWithInput(devServerBlockerPath, {
+      tool_input: { command: 'env -i npm run dev' }
+    });
+    const sudoResult = await runHookWithInput(devServerBlockerPath, {
+      tool_input: { command: 'sudo -u root npm run dev' }
+    });
+
+    if (process.platform === 'win32') {
+      assert.strictEqual(envResult.code, 0, 'On Windows, hook should not block (exit 0)');
+      assert.strictEqual(sudoResult.code, 0, 'On Windows, hook should not block (exit 0)');
+    } else {
+      assert.strictEqual(envResult.code, 2, 'Env-prefixed dev command should be blocked');
+      assert.strictEqual(sudoResult.code, 2, 'Sudo-prefixed dev command should be blocked');
+    }
+  })) passed++; else failed++;
+
   if (await asyncTest('hooks handle missing files gracefully', async () => {
     const testDir = createTestDir();
     const transcriptPath = path.join(testDir, 'nonexistent.jsonl');