feat(overlay): session context header, 300s hook timeout

Author: nnemirovsky

hooks/handlers/pre-tool-use.sh

@@ -608,6 +608,7 @@ fi
 export PASSTHRU_OVERLAY_RESULT_FILE="$OVERLAY_RESULT"
 export PASSTHRU_OVERLAY_TOOL_NAME="$TOOL_NAME"
 export PASSTHRU_OVERLAY_TOOL_INPUT_JSON="$TOOL_INPUT"
+export PASSTHRU_OVERLAY_CWD="$CC_CWD"
 
 # Invoke the overlay and capture its exit code. We have an ERR trap in place
 # (converts unexpected errors to fail-open passthrough), so we cannot rely on

hooks/hooks.json

@@ -8,7 +8,7 @@
           {
             "type": "command",
             "command": "${CLAUDE_PLUGIN_ROOT}/hooks/handlers/pre-tool-use.sh",
-            "timeout": 75
+            "timeout": 300
           }
         ]
       }

scripts/overlay-dialog.sh

@@ -54,6 +54,7 @@ TOOL_NAME="${PASSTHRU_OVERLAY_TOOL_NAME:-}"
 TOOL_INPUT_JSON="${PASSTHRU_OVERLAY_TOOL_INPUT_JSON:-}"
 RESULT_FILE="${PASSTHRU_OVERLAY_RESULT_FILE:-}"
 TIMEOUT="${PASSTHRU_OVERLAY_TIMEOUT:-60}"
+OVERLAY_CWD="${PASSTHRU_OVERLAY_CWD:-${PWD}}"
 TEST_ANSWER="${PASSTHRU_OVERLAY_TEST_ANSWER:-}"
 
 # Without a result file path we have nowhere to write. Bail silently (caller
@@ -272,9 +273,34 @@ if [ "${#preview_lines[@]}" -eq 0 ]; then
   preview_lines+=("$(_truncate "$TOOL_INPUT_JSON" 120)")
 fi
 
+# Session context for the header (helps distinguish multiple CC sessions).
+_display_cwd="$OVERLAY_CWD"
+case "$_display_cwd" in
+  "$HOME"/*) _display_cwd="~${_display_cwd#"$HOME"}" ;;
+  "$HOME")   _display_cwd="~" ;;
+esac
+# Session label: prefer CC session name (CLAUDE_SESSION_NAME) if set,
+# fall back to tmux window name, then omit.
+_session_label=""
+if [ -n "${CLAUDE_SESSION_NAME:-}" ]; then
+  _session_label="$CLAUDE_SESSION_NAME"
+elif [ -n "${TMUX:-}" ]; then
+  _w="$(tmux display-message -p '#W' 2>/dev/null || true)"
+  [ -n "$_w" ] && _session_label="$_w"
+fi
+
+_render_header() {
+  printf "${BOLD}Passthru Permission Prompt${RESET}\n"
+  printf "\033[2mcwd: %s\033[0m\n" "$_display_cwd"
+  if [ -n "$_session_label" ]; then
+    printf "\033[2msession: %s\033[0m\n" "$_session_label"
+  fi
+  printf '\n'
+}
+
 render_main_menu() {
   printf '\033[H\033[2J'
-  printf "${BOLD}Passthru Permission Prompt${RESET}\n\n"
+  _render_header
   printf "Tool:  ${CYAN}%s${RESET}\n" "${TOOL_NAME:-(unknown)}"
   # Render preview lines.
   local first=1
@@ -375,7 +401,7 @@ prop_match_val="$(jq -r '.match // empty | to_entries[0].value // empty' <<<"$pr
 
 render_rule_editor() {
   printf '\033[H\033[2J'
-  printf "${BOLD}Passthru Permission Prompt${RESET}\n\n"
+  _render_header "$_display_cwd"
   printf "Tool:  ${CYAN}%s${RESET}\n" "${TOOL_NAME:-(unknown)}"
   local _first=1
   for _pl in "${preview_lines[@]}"; do

scripts/overlay.sh

@@ -131,6 +131,7 @@ _write_env_file() {
   printf 'export PASSTHRU_OVERLAY_TOOL_NAME=%q\n' "${PASSTHRU_OVERLAY_TOOL_NAME:-}" >> "$_ENV_FILE"
   printf 'export PASSTHRU_OVERLAY_TOOL_INPUT_JSON=%q\n' "${PASSTHRU_OVERLAY_TOOL_INPUT_JSON:-}" >> "$_ENV_FILE"
   printf 'export PASSTHRU_OVERLAY_TIMEOUT=%q\n' "$TIMEOUT" >> "$_ENV_FILE"
+  printf 'export PASSTHRU_OVERLAY_CWD=%q\n' "${PASSTHRU_OVERLAY_CWD:-${PWD}}" >> "$_ENV_FILE"
   if [ -n "${PASSTHRU_OVERLAY_TEST_ANSWER:-}" ]; then
     printf 'export PASSTHRU_OVERLAY_TEST_ANSWER=%q\n' "$PASSTHRU_OVERLAY_TEST_ANSWER" >> "$_ENV_FILE"
   fi
@@ -156,7 +157,8 @@ case "$_tool" in
     [ "$_jlines" -gt 10 ] && _jlines=10
     _extra=$((_jlines)) ;;
 esac
-_popup_height=$((13 + _extra))
+# +2 for cwd line + optional window/session line in header
+_popup_height=$((15 + _extra))
 [ "$_popup_height" -gt 30 ] && _popup_height=30
 
 launch_tmux() {

tests/plugin_loads.bats

@@ -99,15 +99,14 @@ setup() {
   [[ "$output" == *'pre-tool-use.sh' ]]
 }
 
-@test "hooks/hooks.json PreToolUse timeout is 75 (overlay + margin)" {
-  # Task 8 bumped the PreToolUse timeout from 10s to 75s because the hook
-  # may block synchronously while the overlay dialog waits for user input.
-  # The overlay's own timeout is 60s, so 75s leaves 15s of margin for
-  # overlay.sh startup + post-dialog rule write. CC's hook timeout is
-  # wall-clock, so anything < 60s would kill the hook mid-dialog.
+@test "hooks/hooks.json PreToolUse timeout is 300 (overlay interactive budget)" {
+  # The hook blocks while the overlay dialog waits for user input. The user
+  # may navigate menus, review rules, and edit regex fields. 300s (5 min)
+  # gives generous interactive time. The overlay's per-read timeout (60s)
+  # provides the inner limit.
   run jq -r '.hooks.PreToolUse[0].hooks[0].timeout' "$REPO_ROOT/hooks/hooks.json"
   [ "$status" -eq 0 ]
-  [ "$output" = "75" ]
+  [ "$output" = "300" ]
 }
 
 @test "hooks/hooks.json has exactly one PostToolUse entry" {