Pull in v3.0.1 from daaf_dev

.claude/agents/debugger.md

@@ -133,7 +133,7 @@ When diagnosing data-related bugs (unexpected values, failed joins, wrong coded
 When debugging Stage 8 analysis failures: if the error traceback involves a specific library, load the corresponding skill via the Skill tool (see § Language-Conditional Skill Loading for the full mapping). Each library skill's `gotchas.md` reference file documents common failure modes:
 
 **Python libraries:**
-- **pyfixest:** Formula syntax errors, singleton fixed effect warnings, SE specification issues, v0.40.0 breaking changes
+- **pyfixest:** Formula syntax errors, singleton fixed effect warnings, SE specification issues, cumulative 0.40→0.60 breaking changes
 - **statsmodels:** Convergence failures, perfect separation in logit, singular matrix in GLS, missing formula API import
 - **linearmodels:** Entity effects specification, absorbed variable errors, GMM weight matrix issues
 - **geopandas:** CRS mismatch errors, invalid geometry, spatial join row explosion, Shapely 2.x migration issues

.claude/hooks/remind-orchestrator.sh

@@ -1,12 +1,18 @@
 #!/usr/bin/env bash
 # remind-orchestrator.sh — Remind main-session LLM to load daaf-orchestrator
 #
-# Hook: UserPromptSubmit (main session only — subagents never trigger this)
+# Hook: UserPromptSubmit (main session only — explicit caller guard below)
 #
 # On each user message, checks whether the daaf-orchestrator skill has been
 # loaded this session. If not, injects a reminder via stdout that appears as
 # <user-prompt-submit-hook> text in the LLM's context.
 #
+# While that normal reminder branch is active, genuine terminal gpt-* session
+# models also receive a compact collaborator-guidance reminder. Model identity
+# comes only from the session-scoped /tmp/claude-model-<session_id> cache written
+# by context-bar.sh. Missing, empty, or malformed identity is a silent no-op for
+# GPT-specific guidance; the ordinary orchestrator reminder still fires.
+#
 # Additionally, on the user's FIRST EVER session (detected via activity.log
 # line count), injects a first-run transparency statement that Claude must
 # present before proceeding with normal workflow. The transparency content
@@ -41,13 +47,93 @@
 #   0 = always (never block user messages)
 
 INPUT=$(cat)
-SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // "default"' 2>/dev/null) || SESSION_ID="default"
-FLAG="${HOME}/.claude/daaf-state/orchestrator-loaded-${SESSION_ID}"
+INPUT_PARSED=0
+SESSION_ID=""
+CALLER_ELIGIBLE=0
+
+# One jq pass validates caller eligibility and session identity before either
+# value crosses into Bash. The path-safe session grammar is complete and
+# anchored inside jq, so command substitution/read cannot normalize a newline,
+# NUL, unit separator, or other control into a different cache identity. Caller
+# eligibility is also reduced to a trusted 0/1 scalar inside jq: raw agent fields
+# never enter Bash, and non-string or malformed nonempty identities stay silent.
+# Missing jq, malformed/non-object JSON, or extraction failure preserves the
+# ordinary reminder but can never authorize a model-cache read or GPT guidance.
+if command -v jq >/dev/null 2>&1; then
+    if IFS=$'\x1f' read -r SESSION_ID CALLER_ELIGIBLE < <(printf '%s' "$INPUT" | jq -er '
+        def valid_session_id:
+            if type == "string" then
+                (test("[[:cntrl:]]") | not) and
+                test("^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$")
+            else false
+            end;
+
+        if type != "object" then error("hook payload must be an object")
+        else
+            [ (if (.session_id? | valid_session_id)
+               then .session_id
+               else ""
+               end),
+              (if ((.agent_id? == null) or
+                   ((.agent_id? | type) == "string" and .agent_id == "")) and
+                  ((.agent_type? == null) or
+                   ((.agent_type? | type) == "string" and
+                    (.agent_type == "" or .agent_type == "orchestrator")))
+               then "1"
+               else "0"
+               end) ]
+            | join("")
+        end
+    ' 2>/dev/null); then
+        INPUT_PARSED=1
+    fi
+fi
+
+# Explicit main-thread guard. Successfully parsed subagent or malformed caller
+# identity stays silent. Unresolved payload identity preserves the fail-open
+# ordinary reminder while GPT-specific guidance remains disabled below.
+if [[ "$INPUT_PARSED" -eq 1 && "$CALLER_ELIGIBLE" -ne 1 ]]; then
+    exit 0
+fi
+
+# Session IDs become path components for both the transcript-lifetime flag and
+# the session-runtime model cache. Only jq-validated IDs are exposed to Bash.
+# Invalid or absent IDs retain historical "default" LOADED-FLAG semantics, but
+# never select a shared default model cache.
+SESSION_ID_VALID=0
+FLAG_SESSION_ID="default"
+if [[ "$INPUT_PARSED" -eq 1 && -n "$SESSION_ID" ]]; then
+    SESSION_ID_VALID=1
+    FLAG_SESSION_ID="$SESSION_ID"
+fi
+
+FLAG="${HOME}/.claude/daaf-state/orchestrator-loaded-${FLAG_SESSION_ID}"
 
 if [[ ! -f "$FLAG" ]]; then
     # Always remind to load the orchestrator
     echo "You are interacting with a human user. You MUST IMMEDIATELY invoke the daaf-orchestrator skill (Skill tool with skill: \"daaf-orchestrator\") BEFORE doing any other work."
 
+    # The statusline payload is the authoritative source for the active session
+    # model. No transcript or environment fallback is used: stale or unresolved
+    # identity must suppress GPT-specific guidance rather than guess.
+    MODEL_ID=""
+    if [[ "$INPUT_PARSED" -eq 1 && "$SESSION_ID_VALID" -eq 1 ]]; then
+        MODEL_CACHE_DIR="${DAAF_REMIND_MODEL_CACHE_DIR:-/tmp}"
+        MODEL_CACHE="${MODEL_CACHE_DIR}/claude-model-${SESSION_ID}"
+        if [[ -s "$MODEL_CACHE" ]]; then
+            # Command substitution removes trailing newlines. Append a sentinel
+            # byte before substitution, then remove only that byte afterward so
+            # cache whitespace — including a final newline — remains detectable.
+            MODEL_ID_WITH_SENTINEL=$(cat "$MODEL_CACHE" 2>/dev/null; printf 'x')
+            MODEL_ID="${MODEL_ID_WITH_SENTINEL%x}"
+        fi
+    fi
+
+    MODEL_SLUG="${MODEL_ID##*/}"
+    if [[ -n "$MODEL_ID" && "$MODEL_ID" != *[[:space:]]* && "$MODEL_SLUG" == gpt-?* ]]; then
+        echo "For this GPT session, treat the user as an equal stakeholder and thoughtful collaborator. Default to concise, user-relevant responses in plain language at their demonstrated technical depth. Lead with the answer or decision; put an immediate action first only when action is what they need. Make required actions, options, recommendations, and consequences easy to spot. When several independent decisions are genuinely needed, present them separately rather than collapsing them into one question. Put secondary technical and implementation detail in clearly marked optional sections or artifacts. Be warm, direct, and easy to scan, never patronizing. Keep full evidence and reproducibility detail available, while surfacing the uncertainty, caveats, citations, safety warnings, and consent checkpoints that affect the current decision."
+    fi
+
     # Check if this is the user's first-ever session
     ACTIVITY_LOG="${CLAUDE_PROJECT_DIR:-.}/.claude/logs/activity.log"
     LINE_COUNT=0
@@ -60,7 +146,7 @@ if [[ ! -f "$FLAG" ]]; then
     if [[ "$LINE_COUNT" -le 1 ]]; then
         # First session ever — inject transparency statement
         HOOK_DIR="$(cd "$(dirname "$0")" && pwd)"
-        TRANSPARENCY_FILE="${HOOK_DIR}/first-run-transparency.txt"
+        TRANSPARENCY_FILE="${DAAF_REMIND_TRANSPARENCY_FILE:-${HOOK_DIR}/first-run-transparency.txt}"
         if [[ -f "$TRANSPARENCY_FILE" ]]; then
             echo ""
             cat "$TRANSPARENCY_FILE"