@rubytech/create-maxy-code 0.1.148 → 0.1.150

package/payload/platform/plugins/admin/hooks/__tests__/{post-turn-graph-pass.test.sh → pre-turn-graph-pass.test.sh}

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# Task 419 — post-turn-graph-pass Stop hook test suite.
+# Task 425 — pre-turn-graph-pass UserPromptSubmit hook test suite.
 #
-# Modeled on session-end-retrospective.test.sh. A local Python HTTP server
+# Supersedes the Task 419 Stop-hook test suite. A local Python HTTP server
 # stands in for the admin server:
 #   POST /api/admin/log-ingest        → records every line emit_log sent.
 #   GET  /api/admin/post-turn-context → returns the contents of $CTX_FILE,
@@ -10,30 +10,37 @@
 # every POST body AND whether the GET was attempted at all.
 #
 # Contract under test:
-#   - Role/specialist gates: exit 0, single trigger-skipped log line, no
-#     stderr directive.
-#   - MAXY_UI_INTERNAL_PORT unset: exit 0, no stderr directive. The hook
-#     emits its missing-env diagnostic on its own stderr channel because
-#     /api/admin/log-ingest is unreachable; that loud-fail is acceptable.
-#   - Empty stdin / missing-transcript: exit 0, single trigger-skipped log
-#     line, no stderr directive.
-#   - Dispatch path (admin + populated JSONL): exit 2, stderr begins with
-#     `[system: post-turn-graph-pass-stop-hook]` and contains
-#     `<conversation>` + `<prior-writes>` blocks, with conversationId
-#     interpolated from CONVERSATION_NODE_ID.
-#   - Prior-writes fetch fails (context endpoint 500): exit 2, dispatch
+#   - Role/specialist gates: exit 0, single trigger-skipped log line, empty
+#     stdout (no additionalContext).
+#   - MAXY_UI_INTERNAL_PORT unset: exit 0, empty stdout. The hook emits its
+#     missing-env diagnostic on its own stderr channel because
+#     /api/admin/log-ingest is unreachable; loud-fail is acceptable.
+#   - Missing-transcript: exit 0, single trigger-skipped log line, empty
+#     stdout.
+#   - Dispatch path (admin + populated JSONL): exit 0, stdout is a JSON
+#     envelope `{"hookSpecificOutput":{"hookEventName":"UserPromptSubmit",
+#     "additionalContext":"..."}}` whose additionalContext begins with
+#     `[system: pre-turn-graph-pass-hook]` and contains `<conversation>` +
+#     `<prior-writes>` blocks, with conversationId interpolated from
+#     CONVERSATION_NODE_ID.
+#   - Prior-writes fetch fails (context endpoint 500): exit 0, dispatch
 #     still fires, `<prior-writes>` block resolves to `(none)`.
-#   - CONVERSATION_NODE_ID unset: exit 2, prompt names
+#   - CONVERSATION_NODE_ID unset: exit 0, additionalContext names
 #     `conversationId: <unset>`, and no GET to /api/admin/post-turn-context
 #     is attempted.
 #   - Multi-block assistant turn: conversation walk concatenates `text`
 #     blocks; `tool_use` blocks dropped.
 #   - User turn whose only content is `tool_result` blocks: skipped in
 #     the conversation walk.
+#   - UserPromptSubmit stdin-shape regression: a synthetic UserPromptSubmit
+#     payload produces the documented stdout envelope; a stale Stop-shaped
+#     payload (no hook_event_name, no prompt) also produces the
+#     UserPromptSubmit envelope because the hook keys on
+#     session_id + transcript_path, not on input shape sniffing.
 
 set -u
 
-HOOK="$(cd "$(dirname "$0")/.." && pwd)/post-turn-graph-pass.sh"
+HOOK="$(cd "$(dirname "$0")/.." && pwd)/pre-turn-graph-pass.sh"
 if [[ ! -x "$HOOK" ]]; then
   echo "FAIL: $HOOK not executable" >&2
   exit 1
@@ -160,15 +167,32 @@ context_get_count() {
   grep -E '^GET\s+/api/admin/post-turn-context' "$REQ_LOG" 2>/dev/null | wc -l | tr -d ' '
 }
 
+additional_context() {
+  printf '%s' "$HOOK_STDOUT" | python3 -c '
+import sys, json
+try:
+  d = json.load(sys.stdin)
+  out = (d.get("hookSpecificOutput") or {}).get("additionalContext", "")
+  sys.stdout.write(out)
+except Exception:
+  pass
+'
+}
+
 envelope_for() {
   python3 -c '
 import json, sys
-print(json.dumps({"session_id": sys.argv[1], "transcript_path": sys.argv[2]}))
+print(json.dumps({
+    "session_id": sys.argv[1],
+    "transcript_path": sys.argv[2],
+    "cwd": "/tmp",
+    "hook_event_name": "UserPromptSubmit",
+    "prompt": "test prompt body",
+}))
 ' "$1" "$2"
 }
 
 write_simple_transcript() {
-  # write_simple_transcript <outfile> <user_text> <assistant_text>
   local out="$1"; shift
   python3 - "$out" "$@" <<'PY'
 import sys, json
@@ -179,12 +203,12 @@ while i + 1 < len(sys.argv):
     u, a = sys.argv[i], sys.argv[i+1]
     records.append({
         "type": "user",
-        "timestamp": "2026-05-24T10:00:00.000Z",
+        "timestamp": "2026-05-26T10:00:00.000Z",
         "message": {"role": "user", "content": u},
     })
     records.append({
         "type": "assistant",
-        "timestamp": "2026-05-24T10:00:01.000Z",
+        "timestamp": "2026-05-26T10:00:01.000Z",
         "message": {
             "id": "msg_a",
             "role": "assistant",
@@ -198,8 +222,10 @@ with open(out, "w", encoding="utf-8") as f:
 PY
 }
 
+DIRECTIVE_TOKEN='[system: pre-turn-graph-pass-hook]'
+
 # ---------------------------------------------------------------------------
-# Case 1: role != admin → trigger-skipped reason=role-not-admin, no directive
+# Case 1: role != admin → trigger-skipped reason=role-not-admin
 # ---------------------------------------------------------------------------
 start_listener
 TRANSCRIPT_BASIC=$(mktemp); TMPFILES+=("$TRANSCRIPT_BASIC")
@@ -208,8 +234,8 @@ ENV_BASIC=$(envelope_for "$OP_ID" "$TRANSCRIPT_BASIC")
 : > "$REQ_LOG"
 run_hook "public" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_BASIC"
 [[ "$HOOK_RC" -eq 0 ]] || fail "case-1 rc=$HOOK_RC"
-if printf '%s' "$HOOK_STDERR" | grep -q '\[system: post-turn-graph-pass-stop-hook\]'; then
-  fail "case-1 stderr must not contain dispatch directive"
+if [[ -n "$HOOK_STDOUT" ]]; then
+  fail "case-1 stdout must be empty on role-not-admin, got: $HOOK_STDOUT"
 fi
 if ingest_lines | grep -qE "^trigger-skipped sessionId=${OP_ID} reason=role-not-admin$"; then
   pass "case-1 role=public → trigger-skipped reason=role-not-admin"
@@ -223,8 +249,8 @@ fi
 : > "$REQ_LOG"
 run_hook "admin" "database-operator" "$LISTENER_PORT" "$CONV_ID" "$ENV_BASIC"
 [[ "$HOOK_RC" -eq 0 ]] || fail "case-2 rc=$HOOK_RC"
-if printf '%s' "$HOOK_STDERR" | grep -q '\[system: post-turn-graph-pass-stop-hook\]'; then
-  fail "case-2 stderr must not contain dispatch directive"
+if [[ -n "$HOOK_STDOUT" ]]; then
+  fail "case-2 stdout must be empty on is-specialist, got: $HOOK_STDOUT"
 fi
 if ingest_lines | grep -qE "^trigger-skipped sessionId=${OP_ID} reason=is-specialist specialist=database-operator$"; then
   pass "case-2 specialist=database-operator → trigger-skipped reason=is-specialist"
@@ -233,15 +259,13 @@ else
 fi
 
 # ---------------------------------------------------------------------------
-# Case 3: MAXY_UI_INTERNAL_PORT unset → exit 0, no dispatch directive.
-#         The hook prints a missing-env line on its own stderr (loud-fail);
-#         that's expected — /log-ingest is unreachable without the port.
+# Case 3: MAXY_UI_INTERNAL_PORT unset → exit 0, empty stdout, loud stderr.
 # ---------------------------------------------------------------------------
 : > "$REQ_LOG"
 run_hook "admin" "" "" "$CONV_ID" "$ENV_BASIC"
 [[ "$HOOK_RC" -eq 0 ]] || fail "case-3 rc=$HOOK_RC"
-if printf '%s' "$HOOK_STDERR" | grep -q '\[system: post-turn-graph-pass-stop-hook\]'; then
-  fail "case-3 stderr must not contain dispatch directive"
+if [[ -n "$HOOK_STDOUT" ]]; then
+  fail "case-3 stdout must be empty when MAXY_UI_INTERNAL_PORT unset"
 fi
 if [[ "$(ingest_lines | wc -l | tr -d ' ')" == "0" ]]; then
   pass "case-3 missing MAXY_UI_INTERNAL_PORT → exit 0, no dispatch"
@@ -250,117 +274,112 @@ else
 fi
 
 # ---------------------------------------------------------------------------
-# Case 4: empty stdin → trigger-skipped reason=empty-stdin
-# ---------------------------------------------------------------------------
-: > "$REQ_LOG"
-run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" ""
-[[ "$HOOK_RC" -eq 0 ]] || fail "case-4 rc=$HOOK_RC"
-if printf '%s' "$HOOK_STDERR" | grep -q '\[system: post-turn-graph-pass-stop-hook\]'; then
-  fail "case-4 stderr must not contain dispatch directive"
-fi
-if ingest_lines | grep -qE '^trigger-skipped sessionId=unknown reason=empty-stdin$'; then
-  pass "case-4 empty stdin → trigger-skipped reason=empty-stdin"
-else
-  fail "case-4 expected empty-stdin, got: $(ingest_lines)"
-fi
-
-# ---------------------------------------------------------------------------
-# Case 5: transcript_path missing on disk → trigger-skipped reason=missing-transcript
+# Case 4: transcript_path missing on disk → trigger-skipped reason=missing-transcript
 # ---------------------------------------------------------------------------
-MISSING_PATH="/tmp/post-turn-graph-pass-does-not-exist-$$.jsonl"
+MISSING_PATH="/tmp/pre-turn-graph-pass-does-not-exist-$$.jsonl"
 rm -f "$MISSING_PATH"
 ENV_MISSING=$(envelope_for "$OP_ID" "$MISSING_PATH")
 : > "$REQ_LOG"
 run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_MISSING"
-[[ "$HOOK_RC" -eq 0 ]] || fail "case-5 rc=$HOOK_RC"
-if printf '%s' "$HOOK_STDERR" | grep -q '\[system: post-turn-graph-pass-stop-hook\]'; then
-  fail "case-5 stderr must not contain dispatch directive"
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-4 rc=$HOOK_RC"
+if [[ -n "$HOOK_STDOUT" ]]; then
+  fail "case-4 stdout must be empty on missing-transcript"
 fi
 if ingest_lines | grep -qE "^trigger-skipped sessionId=${OP_ID} reason=missing-transcript$"; then
-  pass "case-5 missing transcript_path → trigger-skipped reason=missing-transcript"
+  pass "case-4 missing transcript_path → trigger-skipped reason=missing-transcript"
 else
-  fail "case-5 expected missing-transcript, got: $(ingest_lines)"
+  fail "case-4 expected missing-transcript, got: $(ingest_lines)"
 fi
 
 # ---------------------------------------------------------------------------
-# Case 6: Dispatch path — admin + populated JSONL → exit 2, dispatch directive
-#         on stderr with <conversation> + <prior-writes>, conversationId interpolated.
+# Case 5: Dispatch path → exit 0, UserPromptSubmit JSON envelope, blocks
+#         interpolated, dispatch log emitted.
 # ---------------------------------------------------------------------------
 cat > "$CTX_FILE" <<'JSON'
 {"writes":[{"elementId":"4:abc:1","labels":["KnowledgeDocument"],"properties":{"title":"prior note"}}]}
 JSON
 : > "$REQ_LOG"
 run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_BASIC"
-[[ "$HOOK_RC" -eq 2 ]] || fail "case-6 expected rc=2, got $HOOK_RC"
-if ! printf '%s' "$HOOK_STDERR" | head -n 1 | grep -q '^\[system: post-turn-graph-pass-stop-hook\]'; then
-  fail "case-6 stderr must begin with [system: post-turn-graph-pass-stop-hook]"
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-5 expected rc=0, got $HOOK_RC"
+STDOUT_OK=$(printf '%s' "$HOOK_STDOUT" | python3 -c '
+import sys, json
+try:
+  d = json.load(sys.stdin)
+  out = d["hookSpecificOutput"]
+  assert out["hookEventName"] == "UserPromptSubmit"
+  assert isinstance(out["additionalContext"], str)
+  print("OK")
+except Exception as e:
+  print(f"BAD: {e}")
+')
+if [[ "$STDOUT_OK" != "OK" ]]; then
+  fail "case-5 stdout envelope malformed: $STDOUT_OK"
 fi
-if ! printf '%s' "$HOOK_STDERR" | grep -q '<conversation>'; then
-  fail "case-6 stderr missing <conversation> block"
+CTX_BODY=$(additional_context)
+if ! printf '%s' "$CTX_BODY" | head -n 1 | grep -qF "$DIRECTIVE_TOKEN"; then
+  fail "case-5 additionalContext must begin with $DIRECTIVE_TOKEN"
 fi
-if ! printf '%s' "$HOOK_STDERR" | grep -q '<prior-writes>'; then
-  fail "case-6 stderr missing <prior-writes> block"
+if ! printf '%s' "$CTX_BODY" | grep -q '<conversation>'; then
+  fail "case-5 additionalContext missing <conversation> block"
 fi
-if ! printf '%s' "$HOOK_STDERR" | grep -q "conversationId: ${CONV_ID}"; then
-  fail "case-6 stderr must interpolate conversationId=${CONV_ID}"
+if ! printf '%s' "$CTX_BODY" | grep -q '<prior-writes>'; then
+  fail "case-5 additionalContext missing <prior-writes> block"
 fi
-if ! printf '%s' "$HOOK_STDERR" | grep -q '\[user: hello\]'; then
-  fail "case-6 stderr must carry the user turn '[user: hello]'"
+if ! printf '%s' "$CTX_BODY" | grep -q "conversationId: ${CONV_ID}"; then
+  fail "case-5 additionalContext must interpolate conversationId=${CONV_ID}"
 fi
-if ! printf '%s' "$HOOK_STDERR" | grep -q '\[assistant: hi there\]'; then
-  fail "case-6 stderr must carry the assistant turn '[assistant: hi there]'"
+if ! printf '%s' "$CTX_BODY" | grep -q '\[user: hello\]'; then
+  fail "case-5 additionalContext must carry user turn '[user: hello]'"
 fi
-if ! printf '%s' "$HOOK_STDERR" | grep -q 'KnowledgeDocument'; then
-  fail "case-6 stderr <prior-writes> must include fetched labels (KnowledgeDocument)"
+if ! printf '%s' "$CTX_BODY" | grep -q '\[assistant: hi there\]'; then
+  fail "case-5 additionalContext must carry assistant turn '[assistant: hi there]'"
+fi
+if ! printf '%s' "$CTX_BODY" | grep -q 'KnowledgeDocument'; then
+  fail "case-5 additionalContext <prior-writes> must include fetched labels"
 fi
 if ingest_lines | grep -qE "^dispatch sessionId=${OP_ID} conversationId=${CONV_ID} "; then
-  pass "case-6 dispatch path → exit 2 + directive with conversation, prior-writes, conversationId"
+  pass "case-5 dispatch path → exit 0 + JSON envelope with conversation, prior-writes, conversationId"
 else
-  fail "case-6 expected dispatch log line, got: $(ingest_lines)"
+  fail "case-5 expected dispatch log line, got: $(ingest_lines)"
 fi
 
 # ---------------------------------------------------------------------------
-# Case 7: Prior-writes fetch fails (context endpoint 500) → exit 2, dispatch
-#         still fires, <prior-writes> resolves to `(none)`.
+# Case 6: Prior-writes fetch fails (500) → exit 0, prior-writes=(none).
 # ---------------------------------------------------------------------------
 : > "$CTX_FILE"
 : > "$REQ_LOG"
 run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_BASIC"
-[[ "$HOOK_RC" -eq 2 ]] || fail "case-7 expected rc=2, got $HOOK_RC"
-if ! printf '%s' "$HOOK_STDERR" | grep -q '<prior-writes>'; then
-  fail "case-7 stderr missing <prior-writes> block"
-fi
-# Extract the prior-writes block and check it contains only `(none)`.
-PRIOR_BODY=$(printf '%s' "$HOOK_STDERR" | awk '/<prior-writes>/{flag=1;next}/<\/prior-writes>/{flag=0}flag' | tr -d '[:space:]')
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-6 expected rc=0, got $HOOK_RC"
+CTX_BODY=$(additional_context)
+PRIOR_BODY=$(printf '%s' "$CTX_BODY" | awk '/<prior-writes>/{flag=1;next}/<\/prior-writes>/{flag=0}flag' | tr -d '[:space:]')
 if [[ "$PRIOR_BODY" == "(none)" ]]; then
-  pass "case-7 context endpoint 500 → dispatch still fires, prior-writes = (none)"
+  pass "case-6 context endpoint 500 → dispatch still fires, prior-writes = (none)"
 else
-  fail "case-7 expected prior-writes=(none), got [$PRIOR_BODY]"
+  fail "case-6 expected prior-writes=(none), got [$PRIOR_BODY]"
 fi
 
 # ---------------------------------------------------------------------------
-# Case 8: CONVERSATION_NODE_ID unset → exit 2, prompt names
-#         `conversationId: <unset>`, no GET to /api/admin/post-turn-context.
+# Case 7: CONVERSATION_NODE_ID unset → conversationId:<unset>, no context GET.
 # ---------------------------------------------------------------------------
 cat > "$CTX_FILE" <<'JSON'
 {"writes":[]}
 JSON
 : > "$REQ_LOG"
 run_hook "admin" "" "$LISTENER_PORT" "" "$ENV_BASIC"
-[[ "$HOOK_RC" -eq 2 ]] || fail "case-8 expected rc=2, got $HOOK_RC"
-if ! printf '%s' "$HOOK_STDERR" | grep -q 'conversationId: <unset>'; then
-  fail "case-8 stderr must contain 'conversationId: <unset>'"
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-7 expected rc=0, got $HOOK_RC"
+CTX_BODY=$(additional_context)
+if ! printf '%s' "$CTX_BODY" | grep -q 'conversationId: <unset>'; then
+  fail "case-7 additionalContext must contain 'conversationId: <unset>'"
 fi
 GET_COUNT=$(context_get_count)
 if [[ "$GET_COUNT" == "0" ]]; then
-  pass "case-8 CONVERSATION_NODE_ID unset → no GET /api/admin/post-turn-context attempted"
+  pass "case-7 CONVERSATION_NODE_ID unset → no GET /api/admin/post-turn-context attempted"
 else
-  fail "case-8 expected zero context GETs, got: $GET_COUNT"
+  fail "case-7 expected zero context GETs, got: $GET_COUNT"
 fi
 
 # ---------------------------------------------------------------------------
-# Case 9: Multi-block assistant turn → conversation walk concatenates text
-#         blocks; tool_use blocks dropped.
+# Case 8: Multi-block assistant turn → text concatenated, tool_use dropped.
 # ---------------------------------------------------------------------------
 T_MULTI=$(mktemp); TMPFILES+=("$T_MULTI")
 python3 - "$T_MULTI" <<'PY'
@@ -369,12 +388,12 @@ out = sys.argv[1]
 records = [
     {
         "type": "user",
-        "timestamp": "2026-05-24T10:00:00.000Z",
+        "timestamp": "2026-05-26T10:00:00.000Z",
         "message": {"role": "user", "content": "go"},
     },
     {
         "type": "assistant",
-        "timestamp": "2026-05-24T10:00:01.000Z",
+        "timestamp": "2026-05-26T10:00:01.000Z",
         "message": {
             "id": "msg_a",
             "role": "assistant",
@@ -396,20 +415,20 @@ cat > "$CTX_FILE" <<'JSON'
 JSON
 : > "$REQ_LOG"
 run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_MULTI"
-[[ "$HOOK_RC" -eq 2 ]] || fail "case-9 expected rc=2, got $HOOK_RC"
-if ! printf '%s' "$HOOK_STDERR" | grep -q '\[assistant: part-one part-two\]'; then
-  fail "case-9 expected concatenated assistant text '[assistant: part-one part-two]'"
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-8 expected rc=0, got $HOOK_RC"
+CTX_BODY=$(additional_context)
+if ! printf '%s' "$CTX_BODY" | grep -q '\[assistant: part-one part-two\]'; then
+  fail "case-8 expected concatenated assistant text '[assistant: part-one part-two]'"
 fi
-if printf '%s' "$HOOK_STDERR" | grep -q '"tool_use"'; then
-  fail "case-9 tool_use block must not appear in dispatch stderr"
+if printf '%s' "$CTX_BODY" | grep -q '"tool_use"'; then
+  fail "case-8 tool_use block must not appear in additionalContext"
 fi
-if printf '%s' "$HOOK_STDERR" | grep -q '\[assistant: part-one part-two\]'; then
-  pass "case-9 multi-block assistant turn → text concatenated, tool_use dropped"
+if printf '%s' "$CTX_BODY" | grep -q '\[assistant: part-one part-two\]'; then
+  pass "case-8 multi-block assistant turn → text concatenated, tool_use dropped"
 fi
 
 # ---------------------------------------------------------------------------
-# Case 10: User turn whose only content is tool_result blocks → skipped in
-#          the conversation walk (no `[user: ...]` line for that record).
+# Case 9: User turn with only tool_result blocks → skipped in conversation walk.
 # ---------------------------------------------------------------------------
 T_TRONLY=$(mktemp); TMPFILES+=("$T_TRONLY")
 python3 - "$T_TRONLY" <<'PY'
@@ -418,12 +437,12 @@ out = sys.argv[1]
 records = [
     {
         "type": "user",
-        "timestamp": "2026-05-24T10:00:00.000Z",
+        "timestamp": "2026-05-26T10:00:00.000Z",
         "message": {"role": "user", "content": "real user turn"},
     },
     {
         "type": "assistant",
-        "timestamp": "2026-05-24T10:00:01.000Z",
+        "timestamp": "2026-05-26T10:00:01.000Z",
         "message": {
             "id": "msg_a",
             "role": "assistant",
@@ -432,7 +451,7 @@ records = [
     },
     {
         "type": "user",
-        "timestamp": "2026-05-24T10:00:02.000Z",
+        "timestamp": "2026-05-26T10:00:02.000Z",
         "message": {
             "role": "user",
             "content": [
@@ -448,25 +467,78 @@ PY
 ENV_TRONLY=$(envelope_for "$OP_ID" "$T_TRONLY")
 : > "$REQ_LOG"
 run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_TRONLY"
-[[ "$HOOK_RC" -eq 2 ]] || fail "case-10 expected rc=2, got $HOOK_RC"
-CONV_BLOCK=$(printf '%s' "$HOOK_STDERR" | awk '/<conversation>/{flag=1;next}/<\/conversation>/{flag=0}flag')
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-9 expected rc=0, got $HOOK_RC"
+CTX_BODY=$(additional_context)
+CONV_BLOCK=$(printf '%s' "$CTX_BODY" | awk '/<conversation>/{flag=1;next}/<\/conversation>/{flag=0}flag')
 if ! printf '%s' "$CONV_BLOCK" | grep -q '\[user: real user turn\]'; then
-  fail "case-10 conversation block must include real user turn"
+  fail "case-9 conversation block must include real user turn"
 fi
 if printf '%s' "$CONV_BLOCK" | grep -q 'tool plumbing payload'; then
-  fail "case-10 tool_result-only user record must not appear in conversation walk"
+  fail "case-9 tool_result-only user record must not appear in conversation walk"
 fi
-# The heredoc indents the conversation block; match leading whitespace.
 TR_LINES=$(printf '%s\n' "$CONV_BLOCK" | grep -cE '\[user:' || true)
 if [[ "$TR_LINES" == "1" ]]; then
-  pass "case-10 tool_result-only user record skipped in conversation walk"
+  pass "case-9 tool_result-only user record skipped in conversation walk"
+else
+  fail "case-9 expected exactly one [user: ...] line, got $TR_LINES"
+fi
+
+# ---------------------------------------------------------------------------
+# Case 10: UserPromptSubmit shape — directive on stdout only, never stderr;
+#          stdout envelope has hookEventName="UserPromptSubmit".
+# ---------------------------------------------------------------------------
+cat > "$CTX_FILE" <<'JSON'
+{"writes":[]}
+JSON
+: > "$REQ_LOG"
+run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_BASIC"
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-10 expected rc=0, got $HOOK_RC"
+if printf '%s' "$HOOK_STDERR" | grep -qF "$DIRECTIVE_TOKEN"; then
+  fail "case-10 directive must not appear on stderr (UserPromptSubmit contract is stdout JSON)"
+fi
+HEN=$(printf '%s' "$HOOK_STDOUT" | python3 -c '
+import sys, json
+try:
+  d = json.load(sys.stdin)
+  sys.stdout.write(d["hookSpecificOutput"]["hookEventName"])
+except Exception:
+  pass
+')
+if [[ "$HEN" == "UserPromptSubmit" ]]; then
+  pass "case-10 stdout envelope is well-formed JSON with hookEventName=UserPromptSubmit"
+else
+  fail "case-10 expected hookEventName=UserPromptSubmit, got [$HEN]"
+fi
+
+# ---------------------------------------------------------------------------
+# Case 11: Stop-shaped stdin regression — a CC Stop-hook payload carries
+#          hook_event_name="Stop". The hook must not silently emit a
+#          UserPromptSubmit envelope on a Stop fire. Expect exit 0 with
+#          empty stdout and a `wrong-hook-event` skip line.
+# ---------------------------------------------------------------------------
+ENV_STOP_SHAPED=$(python3 -c '
+import json, sys
+print(json.dumps({
+    "session_id": sys.argv[1],
+    "transcript_path": sys.argv[2],
+    "hook_event_name": "Stop",
+}))
+' "$OP_ID" "$TRANSCRIPT_BASIC")
+: > "$REQ_LOG"
+run_hook "admin" "" "$LISTENER_PORT" "$CONV_ID" "$ENV_STOP_SHAPED"
+[[ "$HOOK_RC" -eq 0 ]] || fail "case-11 expected rc=0, got $HOOK_RC"
+if [[ -n "$HOOK_STDOUT" ]]; then
+  fail "case-11 stdout must be empty on wrong-hook-event Stop, got: $HOOK_STDOUT"
+fi
+if ingest_lines | grep -qE "^trigger-skipped sessionId=${OP_ID} reason=wrong-hook-event event=Stop$"; then
+  pass "case-11 Stop-shaped stdin rejected with wrong-hook-event skip"
 else
-  fail "case-10 expected exactly one [user: ...] line, got $TR_LINES"
+  fail "case-11 expected wrong-hook-event skip, got: $(ingest_lines)"
 fi
 
 # ---------------------------------------------------------------------------
 # Summary
 # ---------------------------------------------------------------------------
 echo
-echo "post-turn-graph-pass tests: $PASS passed, $FAIL failed"
+echo "pre-turn-graph-pass tests: $PASS passed, $FAIL failed"
 [[ "$FAIL" -eq 0 ]]

package/payload/platform/plugins/admin/hooks/archive-ingest-surface-gate.sh

@@ -8,7 +8,7 @@
 # blocking the legacy MCP deviation tools mechanically. The retired
 # `whatsapp-export-insight-pass` tool is replaced by Phase 2:
 # `mcp__memory__conversation-archive-derive-insights` — a read-only tool that
-# walks :Section chunks of one named conversation-document :KnowledgeDocument in
+# walks :Section chunks of one named :ConversationArchive in
 # pages and emits per-row proposals. The new tool is NOT in any BLOCK list
 # (the gate is allow-by-default for unrecognised tools) — its writes go
 # through the existing graph-cypher-write surface, gated by the operator per
@@ -154,7 +154,7 @@ fi
 case "$TOOL_NAME" in
   mcp__memory__whatsapp-export-parse|mcp__memory__whatsapp-export-insight-write|mcp__memory__whatsapp-export-insight-pass|mcp__memory__whatsapp-export-preview)
     emit_decision "block" "denied-mcp-legacy" \
-      "Blocked: ${TOOL_NAME} is a retired path. generalised conversation-archive ingest — invoke 'bash platform/plugins/memory/bin/conversation-archive-ingest.sh <archive> --source whatsapp --owner-element-id <id> --participant-person-ids <csv> --scope <admin|public>' once. Normalise, sessionize, classify (mode=chat), and memory-ingest (writes :KnowledgeDocument keyed on conversationIdentity, source=<enum>) all run in-process."
+      "Blocked: ${TOOL_NAME} is a retired path. generalised conversation-archive ingest — invoke 'bash platform/plugins/memory/bin/conversation-archive-ingest.sh <archive> --source whatsapp --owner-element-id <id> --participant-person-ids <csv> --scope <admin|public>' once. Normalise, sessionize, classify (mode=chat), and memory-ingest (writes :ConversationArchive keyed on conversationIdentity, source=<enum>) all run in-process."
     ;;
 esac