@rubytech/create-maxy 1.0.883 → 1.0.885

package/payload/platform/scripts/logs-read.sh

@@ -1,31 +1,30 @@
 #!/usr/bin/env bash
 # logs-read.sh — Shell counterpart to the logs-read MCP tool.
 #
-# Task 532: stream logs are per-conversation, not per-day. The primary mode
-# now reads a single {prefix}-{conversationId}.log file — the reader gets a
-# continuous, conversation-scoped timeline from first [spawn] to final
-# [process-exit] without needing to filter.
-#
-# Task 671: first-turn sessions (pre 1→2-user-turn flush per Task 650) land
-# at {prefix}preflush-{sessionKey:0:12}.log. The per-conversation mode
-# resolves either shape from the same identifier — full first, preflush as
-# fallback.
+# Task 1006: stream logs are per-session, not per-day or per-conversation.
+# The primary mode reads a single {prefix}-{sessionKey}.log file — the
+# operator types a sessionKey prefix and the surface returns the bytes from
+# first [spawn] to final [process-exit] without filtering. sessionKey is
+# the single identifier on disk; the earlier full vs preflush split is gone.
 #
 # Modes:
-#   logs-read.sh <conversationId> [type]       Read {prefix}-{convId}.log
-#   logs-read.sh --tail [type] [lines]         Tail most recent file of type
-#   logs-read.sh --grep <sessionKey> [type]    Legacy grep across log files
+#   logs-read.sh <sessionKey-or-prefix> [type]  Read {prefix}-{sessionKey}.log
+#   logs-read.sh --tail [type] [lines]          Tail most recent file of type
+#   logs-read.sh --grep <sessionKey> [type]     Legacy grep across log files
 #
-# Types: agent-stream (canonical, per-conversation tool-use/tool-result archive;
+# Types: agent-stream (canonical, per-session tool-use/tool-result archive;
 #        `system` is kept as a backwards-compatible alias), session, error,
 #        heartbeat, public, server, mcp, vnc
-# For per-conversation types (agent-stream/system/session/error/public): conversationId is
-# required in the first mode. For platform-scoped types (server/vnc/heartbeat):
-# conversationId is ignored.
+# For per-session types (agent-stream/system/session/error/public): sessionKey
+# is required in the first mode. For platform-scoped types (server/vnc/
+# heartbeat): the id is ignored.
 #
 # Every invocation writes a one-line trailer describing files searched,
 # matches returned, and files rejected — empty output never leaves a reader
-# guessing why.
+# guessing why. On a miss the script appends a one-line
+# `[log-tee] missing-on-resolve sessionKey=<8> surface=logs-read-sh
+# reason=...` entry to server.log so the writer-side existence contract is
+# the authoritative signal.
 #
 # Exit codes:
 #   0  Success (output produced)
@@ -122,16 +121,16 @@ VALID_TYPES="agent-stream, system, session, error, heartbeat, public, server, mc
 usage() {
   cat >&2 <<EOF
 Usage:
-  logs-read.sh <conversationId> [type]       Read {prefix}-{convId}.log
-  logs-read.sh --tail [type] [lines]         Tail most recent log of type
-  logs-read.sh --grep <sessionKey> [type]    Legacy grep across log files
+  logs-read.sh <sessionKey-or-prefix> [type]  Read {prefix}-{sessionKey}.log
+  logs-read.sh --tail [type] [lines]          Tail most recent log of type
+  logs-read.sh --grep <sessionKey> [type]     Legacy grep across log files
 
 Types: $VALID_TYPES
 Default type: agent-stream | Default lines: 50
 
-Per-conversation types (agent-stream, system, session, error, public) require conversationId
-in the first mode — the log file is named {prefix}-{conversationId}.log.
-Platform-scoped types (server, vnc, heartbeat) ignore conversationId.
+Per-session types (agent-stream, system, session, error, public) require
+sessionKey in the first mode — the log file is named {prefix}-{sessionKey}.log.
+Platform-scoped types (server, vnc, heartbeat) ignore the id.
 EOF
   exit 2
 }
@@ -144,65 +143,48 @@ validate_type() {
   esac
 }
 
-# --- Per-conversation mode: prefix-match {prefix}{convId-prefix}*.log ---
+# --- Per-session mode: prefix-match {prefix}{sessionKey-prefix}*.log ---
 #
-# Task 671 — two filename shapes the writer emits:
-#   FULL:     {prefix}{conversationId}.log      (post 1→2-user-turn flush)
-#   PREFLUSH: {prefix}preflush-{id:0:12}.log    (pre-flush, first turn; the
-#                                                 slice is of the sessionKey)
+# Task 1006 — one filename shape per session: {prefix}{sessionKey}.log.
+# The operator types an 8-char-or-greater sessionKey prefix; we glob
+# `${prefix}${session_key}*.log` across every account log dir. The earlier
+# full vs preflush two-shape contract is gone: sessionKey is the single
+# identifier on disk, mounted from turn 1.
 #
-# Task 998 — operator surface accepts any unambiguous prefix of the id.
-# The writer's filename is canonical (full 36-char UUID) but every agent
-# line surfaces the 8-char id (`conversationId=3483269d…`). Pass 1 and
-# Pass 2 each glob `${prefix}${conv_id}*.log` so an 8-char operator input
-# resolves a full-UUID file. Three trailer outcomes:
-#   single hit  → exit 0 + matched_shape=full|preflush  (existing success)
-#   zero hits   → exit 1 + reason=file-not-found-in-either-shape (existing miss)
+# Three trailer outcomes:
+#   single hit  → exit 0   (success)
+#   zero hits   → exit 1 + appends `[log-tee] missing-on-resolve sessionKey=<8>
+#                          surface=logs-read-sh reason=...` to server.log so
+#                          the writer-side existence contract is the
+#                          authoritative signal.
 #   2+ hits     → exit 1 + reason=ambiguous-prefix candidates=[...]; never picks
 #
-# Stale-preflush housekeeping (Task 671): on a single FULL hit, glob the
-# preflush pattern in the same dir and emit `[logs-read] stale-preflush-detected`
-# to server.log for each sibling. Best-effort — retrieval doesn't fail if
-# server.log is unwritable.
-#
-# Identity note: the preflush fallback exists for the abrupt-exit case where
-# the operator passes the sessionKey (no conversationId was ever assigned).
-# For post-flush retrievals the operator passes the conversationId (or any
-# unambiguous prefix of it) and the FULL file is expected to exist.
-#
-# MIRROR — intentional divergence (Task 998):
-#   - platform/ui/app/lib/logs-read-resolve.ts (canonical TS helper) —
-#     EXACT-MATCH on `${prefix}${conversationId}.log`.
-#   - platform/plugins/admin/mcp/src/index.ts (conversationId branch) —
-#     EXACT-MATCH, same shape.
-# Both serve agents that always hold the full conversationId. This shell
-# counterpart is the operator surface; operators read 8-char ids from agent
-# lines and type them at the SSH prompt. Do not "fix" the divergence by
-# adding prefix-match to TS/MCP — it would mask agent bugs that pass
-# partial ids.
+# MIRROR — keep these three sites in lockstep:
+#   - platform/ui/app/lib/logs-read-resolve.ts (TS helper, exact-match)
+#   - platform/plugins/admin/mcp/src/index.ts  (MCP tool, exact-match)
 per_conversation_mode() {
-  local conv_id="$1"
+  local session_key="$1"
   local filter_type="${2:-agent-stream}"
 
-  if [[ -z "$conv_id" ]]; then
-    echo "Error: conversationId cannot be empty" >&2
+  if [[ -z "$session_key" ]]; then
+    echo "Error: sessionKey cannot be empty" >&2
     exit 2
   fi
 
-  # Reject shell metacharacters in conv_id — the prefix-match glob below
-  # would otherwise turn user input into a shell pattern. UUIDs and
-  # sessionKeys only contain [a-zA-Z0-9-].
-  if [[ ! "$conv_id" =~ ^[a-zA-Z0-9-]+$ ]]; then
-    echo "Error: conversationId contains invalid characters (allowed: a-z, A-Z, 0-9, -)" >&2
+  # Reject shell metacharacters in session_key — the prefix-match glob below
+  # would otherwise turn user input into a shell pattern. SessionKeys only
+  # contain [a-zA-Z0-9-].
+  if [[ ! "$session_key" =~ ^[a-zA-Z0-9-]+$ ]]; then
+    echo "Error: sessionKey contains invalid characters (allowed: a-z, A-Z, 0-9, -)" >&2
     exit 2
   fi
 
   validate_type "$filter_type"
 
-  # Platform-scoped types shortcut to their fixed files regardless of convId.
+  # Platform-scoped types shortcut to their fixed files regardless of id.
   case "$filter_type" in
     server|vnc|heartbeat|mcp)
-      echo "# note: type=$filter_type is platform-scoped; conversationId ignored — showing fixed file" >&2
+      echo "# note: type=$filter_type is platform-scoped; sessionKey ignored — showing fixed file" >&2
       tail_mode "$filter_type" "50"
       return
       ;;
@@ -215,103 +197,51 @@ per_conversation_mode() {
     exit 2
   fi
 
-  # Glob patterns the two-shape contract expects (Task 998: prefix match).
-  local full_glob="${prefix}${conv_id}*.log"
-  local preflush_glob="${prefix}preflush-${conv_id:0:12}*.log"
-
+  local glob="${prefix}${session_key}*.log"
   local searched=0
-  local matched_shape=""
 
-  # Pass 1: FULL prefix glob across every log dir; aggregate hits.
-  local -a full_hits=()
-  local -a full_dirs=()
+  local -a hits=()
+  local -a hit_dirs=()
   shopt -s nullglob
   for log_dir in "${ACCOUNT_LOG_DIRS[@]}"; do
     searched=$((searched + 1))
-    for f in "$log_dir"/${prefix}${conv_id}*.log; do
-      full_hits+=("$f")
-      full_dirs+=("$log_dir")
+    for f in "$log_dir"/${prefix}${session_key}*.log; do
+      hits+=("$f")
+      hit_dirs+=("$log_dir")
     done
   done
   shopt -u nullglob
 
-  # Pass 1 ambiguous → refuse, never silently pick.
-  if [[ ${#full_hits[@]} -gt 1 ]]; then
+  if [[ ${#hits[@]} -gt 1 ]]; then
     local -a candidate_names=()
     local cf
-    for cf in "${full_hits[@]}"; do
+    for cf in "${hits[@]}"; do
       candidate_names+=("$(basename "$cf")")
     done
     local joined
     joined=$(IFS=','; printf '%s' "${candidate_names[*]}")
-    echo "-- trailer: conversationId=$conv_id type=$filter_type searched=$searched matches=${#full_hits[@]} reason=ambiguous-prefix candidates=[${joined}]" >&2
+    echo "-- trailer: sessionKey=$session_key type=$filter_type searched=$searched matches=${#hits[@]} reason=ambiguous-prefix candidates=[${joined}]" >&2
     exit 1
   fi
 
-  local found=0
-
-  # Pass 1 single hit → emit body, run stale-preflush detection in matched dir.
-  if [[ ${#full_hits[@]} -eq 1 ]]; then
-    local full_path="${full_hits[0]}"
-    local match_dir="${full_dirs[0]}"
-    echo "## $(basename "$full_path") ($filter_type)$(account_suffix "$match_dir")"
-    cat "$full_path"
-    found=1
-    matched_shape="full"
-
-    shopt -s nullglob
-    local stale_path
-    for stale_path in "$match_dir"/${prefix}preflush-${conv_id:0:12}*.log; do
-      local stale_ts
-      stale_ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-      echo "${stale_ts} [logs-read] stale-preflush-detected path=${stale_path}" >> "$SERVER_LOG" 2>/dev/null || true
-    done
-    shopt -u nullglob
+  if [[ ${#hits[@]} -eq 1 ]]; then
+    local hit_path="${hits[0]}"
+    local match_dir="${hit_dirs[0]}"
+    echo "## $(basename "$hit_path") ($filter_type)$(account_suffix "$match_dir")"
+    cat "$hit_path"
+    echo "" >&2
+    echo "-- trailer: sessionKey=$session_key type=$filter_type searched=$searched matched=1" >&2
+    exit 0
   fi
 
-  # Pass 2: PREFLUSH prefix glob, only if Pass 1 had zero hits.
-  if [[ $found -eq 0 ]]; then
-    local -a preflush_hits=()
-    local -a preflush_dirs=()
-    shopt -s nullglob
-    for log_dir in "${ACCOUNT_LOG_DIRS[@]}"; do
-      searched=$((searched + 1))
-      for f in "$log_dir"/${prefix}preflush-${conv_id:0:12}*.log; do
-        preflush_hits+=("$f")
-        preflush_dirs+=("$log_dir")
-      done
-    done
-    shopt -u nullglob
-
-    if [[ ${#preflush_hits[@]} -gt 1 ]]; then
-      local -a candidate_names=()
-      local pf
-      for pf in "${preflush_hits[@]}"; do
-        candidate_names+=("$(basename "$pf")")
-      done
-      local joined
-      joined=$(IFS=','; printf '%s' "${candidate_names[*]}")
-      echo "-- trailer: conversationId=$conv_id type=$filter_type searched=$searched matches=${#preflush_hits[@]} reason=ambiguous-prefix candidates=[${joined}]" >&2
-      exit 1
-    fi
+  # Task 1006 — missing-on-resolve emission. Best-effort; never fails the
+  # invocation when server.log is unwritable.
+  local miss_ts
+  miss_ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+  echo "${miss_ts} [log-tee] missing-on-resolve sessionKey=${session_key:0:8} surface=logs-read-sh reason=\"file-not-found type=${filter_type}\"" >> "$SERVER_LOG" 2>/dev/null || true
 
-    if [[ ${#preflush_hits[@]} -eq 1 ]]; then
-      local preflush_path="${preflush_hits[0]}"
-      echo "## $(basename "$preflush_path") ($filter_type)$(account_suffix "${preflush_dirs[0]}")"
-      cat "$preflush_path"
-      found=1
-      matched_shape="preflush"
-    fi
-  fi
-
-  # Trailer: empty output never leaves the reader guessing why.
-  if [[ $found -eq 0 ]]; then
-    echo "-- trailer: conversationId=$conv_id type=$filter_type searched=$searched found=0 tried=[${full_glob}, ${preflush_glob}] reason=file-not-found-in-either-shape" >&2
-    exit 1
-  fi
-  echo "" >&2
-  echo "-- trailer: conversationId=$conv_id type=$filter_type searched=$searched matched=$found matched_shape=$matched_shape" >&2
-  exit 0
+  echo "-- trailer: sessionKey=$session_key type=$filter_type searched=$searched found=0 tried=[${glob}] reason=file-not-found" >&2
+  exit 1
 }
 
 # --- Legacy grep mode (backward compatibility with sessionKey-tagged lines) ---

package/payload/platform/scripts/logs-read.test.sh

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
-# Task 671 — bash harness for logs-read.sh two-shape preflush resolution.
+# Task 1006 — bash harness for logs-read.sh single-shape resolution.
 #
-# Covers the four cases from the task brief:
-#   1. Full-UUID file present → matched_shape=full
-#   2. Preflush file present, full absent → matched_shape=preflush
-#   3. Neither present → trailer lists both filenames, exit 1
-#   4. Both present (promotion race) → full wins + stale-preflush signal to server.log
+# Covers the three cases the new contract demands:
+#   1. sessionKey-named file present → bytes returned, exit 0.
+#   2. No file → exit 1 + missing-on-resolve appended to server.log.
+#   3. Ambiguous prefix (multiple matches) → exit 1, never picks silently.
 #
 # MIRROR: see platform/ui/app/lib/logs-read-resolve.ts for the canonical
-# two-shape contract and its TS unit tests.
+# single-shape contract and its TS unit tests.
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -18,28 +17,17 @@ if [[ ! -x "$LOGS_READ" ]]; then
   exit 1
 fi
 
-CONV_ID="8c264cfb-441f-48bf-9811-9fa3ad3b51dc"
-PREFLUSH_SLICE="8c264cfb-441"
-FULL_NAME="claude-agent-stream-${CONV_ID}.log"
-PREFLUSH_NAME="claude-agent-stream-preflush-${PREFLUSH_SLICE}.log"
-# Task 998 — miss trailer now lists glob patterns, not literal filenames,
-# because Pass 1 / Pass 2 prefix-glob `${prefix}${conv_id}*.log`.
-FULL_GLOB="claude-agent-stream-${CONV_ID}*.log"
-PREFLUSH_GLOB="claude-agent-stream-preflush-${PREFLUSH_SLICE}*.log"
+SESSION_KEY="8c264cfb-441f-48bf-9811-9fa3ad3b51dc"
+FILE_NAME="claude-agent-stream-${SESSION_KEY}.log"
 
 PASS=0
 FAIL=0
 
-# logs-read.sh resolves PLATFORM_ROOT from the script location, and uses
-# INSTALL_DIR = $PLATFORM_ROOT/..  and ACCOUNTS_DIR = $INSTALL_DIR/data/accounts.
-# The test creates a fake install tree with the real script symlinked in.
 setup_install_tree() {
   local root="$1"
   mkdir -p "$root/platform/scripts"
   mkdir -p "$root/data/accounts/acct-test/logs"
   mkdir -p "$HOME/.$(basename "$root")/logs"
-  # Symlink the script under test into the fake tree so PLATFORM_ROOT resolves
-  # to $root/platform and the account logs are discovered.
   ln -sf "$LOGS_READ" "$root/platform/scripts/logs-read.sh"
   echo "$root/platform/scripts/logs-read.sh"
 }
@@ -50,8 +38,6 @@ cleanup_install_tree() {
   rm -rf "$HOME/.$(basename "$root")"
 }
 
-# Each case uses its own ephemeral install tree. Install-tree basename is
-# unique so configDir (~/.{installDir}) does not collide.
 run_case() {
   local name="$1"
   shift
@@ -66,16 +52,16 @@ run_case() {
   fi
 }
 
-# --- Case 1: full only ---
-case_full_only() {
+# --- Case 1: sessionKey-named file present → exit 0 ---
+case_file_present() {
   local root="/tmp/maxy-logs-read-test-1-$$"
   local script
   script=$(setup_install_tree "$root")
   local logdir="$root/data/accounts/acct-test/logs"
-  echo "full-content-sentinel" > "$logdir/$FULL_NAME"
+  echo "sessionkey-content-sentinel" > "$logdir/$FILE_NAME"
 
   local stdout stderr rc
-  stdout=$("$script" "$CONV_ID" system 2>/tmp/maxy-logs-read-stderr-1-$$) || rc=$?
+  stdout=$("$script" "$SESSION_KEY" system 2>/tmp/maxy-logs-read-stderr-1-$$) || rc=$?
   rc=${rc:-0}
   stderr=$(cat /tmp/maxy-logs-read-stderr-1-$$)
   rm -f /tmp/maxy-logs-read-stderr-1-$$
@@ -86,56 +72,66 @@ case_full_only() {
     echo "  expected exit 0, got $rc"
     return 1
   fi
-  if [[ "$stdout" != *"full-content-sentinel"* ]]; then
+  if [[ "$stdout" != *"sessionkey-content-sentinel"* ]]; then
     echo "  stdout missing sentinel"
     return 1
   fi
-  if [[ "$stderr" != *"matched_shape=full"* ]]; then
-    echo "  stderr missing matched_shape=full: $stderr"
+  if [[ "$stderr" != *"matched=1"* ]]; then
+    echo "  stderr missing matched=1: $stderr"
     return 1
   fi
   return 0
 }
 
-# --- Case 2: preflush only ---
-case_preflush_only() {
+# --- Case 2: no file → exit 1 + missing-on-resolve in server.log ---
+case_missing() {
   local root="/tmp/maxy-logs-read-test-2-$$"
   local script
   script=$(setup_install_tree "$root")
-  local logdir="$root/data/accounts/acct-test/logs"
-  echo "preflush-content-sentinel" > "$logdir/$PREFLUSH_NAME"
+  local server_log="$HOME/.$(basename "$root")/logs/server.log"
+  : > "$server_log"
 
-  local stdout stderr rc
-  stdout=$("$script" "$CONV_ID" system 2>/tmp/maxy-logs-read-stderr-2-$$) || rc=$?
-  rc=${rc:-0}
+  local rc=0
+  "$script" "$SESSION_KEY" system >/dev/null 2>/tmp/maxy-logs-read-stderr-2-$$ || rc=$?
+  local stderr
   stderr=$(cat /tmp/maxy-logs-read-stderr-2-$$)
   rm -f /tmp/maxy-logs-read-stderr-2-$$
+  local server_log_contents
+  server_log_contents=$(cat "$server_log" 2>/dev/null || echo "")
 
   cleanup_install_tree "$root"
 
-  if [[ $rc -ne 0 ]]; then
-    echo "  expected exit 0, got $rc"
+  if [[ $rc -ne 1 ]]; then
+    echo "  expected exit 1, got $rc"
     return 1
   fi
-  if [[ "$stdout" != *"preflush-content-sentinel"* ]]; then
-    echo "  stdout missing sentinel"
+  if [[ "$stderr" != *"reason=file-not-found"* ]]; then
+    echo "  stderr missing reason=file-not-found: $stderr"
     return 1
   fi
-  if [[ "$stderr" != *"matched_shape=preflush"* ]]; then
-    echo "  stderr missing matched_shape=preflush: $stderr"
+  if [[ "$server_log_contents" != *"missing-on-resolve"* ]]; then
+    echo "  server.log missing missing-on-resolve emission: $server_log_contents"
+    return 1
+  fi
+  if [[ "$server_log_contents" != *"surface=logs-read-sh"* ]]; then
+    echo "  server.log emission missing surface tag"
     return 1
   fi
   return 0
 }
 
-# --- Case 3: neither present → miss trailer ---
-case_neither() {
+# --- Case 3: ambiguous prefix → exit 1 without picking ---
+case_ambiguous() {
   local root="/tmp/maxy-logs-read-test-3-$$"
   local script
   script=$(setup_install_tree "$root")
+  local logdir="$root/data/accounts/acct-test/logs"
+  echo "a" > "$logdir/claude-agent-stream-deadbeef-aaaa.log"
+  echo "b" > "$logdir/claude-agent-stream-deadbeef-bbbb.log"
 
-  local stdout stderr rc=0
-  stdout=$("$script" "$CONV_ID" system 2>/tmp/maxy-logs-read-stderr-3-$$) || rc=$?
+  local rc=0
+  "$script" "deadbeef" system >/dev/null 2>/tmp/maxy-logs-read-stderr-3-$$ || rc=$?
+  local stderr
   stderr=$(cat /tmp/maxy-logs-read-stderr-3-$$)
   rm -f /tmp/maxy-logs-read-stderr-3-$$
 
@@ -145,69 +141,16 @@ case_neither() {
     echo "  expected exit 1, got $rc"
     return 1
   fi
-  if [[ "$stderr" != *"tried=[${FULL_GLOB}, ${PREFLUSH_GLOB}]"* ]]; then
-    echo "  stderr missing tried=[…,…] glob patterns: $stderr"
-    return 1
-  fi
-  if [[ "$stderr" != *"reason=file-not-found-in-either-shape"* ]]; then
-    echo "  stderr missing reason=file-not-found-in-either-shape: $stderr"
-    return 1
-  fi
-  return 0
-}
-
-# --- Case 4: both present (promotion race) → full wins + stale signal ---
-case_both_present() {
-  local root="/tmp/maxy-logs-read-test-4-$$"
-  local script
-  script=$(setup_install_tree "$root")
-  local logdir="$root/data/accounts/acct-test/logs"
-  echo "full-content-sentinel-4" > "$logdir/$FULL_NAME"
-  echo "preflush-content-sentinel-4" > "$logdir/$PREFLUSH_NAME"
-  local server_log="$HOME/.$(basename "$root")/logs/server.log"
-  : > "$server_log"
-
-  local stdout stderr rc=0
-  stdout=$("$script" "$CONV_ID" system 2>/tmp/maxy-logs-read-stderr-4-$$) || rc=$?
-  stderr=$(cat /tmp/maxy-logs-read-stderr-4-$$)
-  rm -f /tmp/maxy-logs-read-stderr-4-$$
-
-  local server_log_contents
-  server_log_contents=$(cat "$server_log" 2>/dev/null || echo "")
-
-  cleanup_install_tree "$root"
-
-  if [[ $rc -ne 0 ]]; then
-    echo "  expected exit 0, got $rc"
-    return 1
-  fi
-  if [[ "$stdout" != *"full-content-sentinel-4"* ]]; then
-    echo "  stdout missing full sentinel (full must win): $stdout"
-    return 1
-  fi
-  if [[ "$stdout" == *"preflush-content-sentinel-4"* ]]; then
-    echo "  stdout contained preflush sentinel — preflush must be ignored when full exists"
-    return 1
-  fi
-  if [[ "$stderr" != *"matched_shape=full"* ]]; then
-    echo "  stderr missing matched_shape=full"
-    return 1
-  fi
-  if [[ "$server_log_contents" != *"stale-preflush-detected"* ]]; then
-    echo "  server.log missing stale-preflush-detected signal: $server_log_contents"
-    return 1
-  fi
-  if [[ "$server_log_contents" != *"$PREFLUSH_NAME"* ]]; then
-    echo "  server.log stale signal missing preflush path"
+  if [[ "$stderr" != *"reason=ambiguous-prefix"* ]]; then
+    echo "  stderr missing ambiguous-prefix trailer: $stderr"
     return 1
   fi
   return 0
 }
 
-run_case "full only → matched_shape=full" case_full_only
-run_case "preflush only → matched_shape=preflush" case_preflush_only
-run_case "neither → trailer enumerates both filenames" case_neither
-run_case "both present → full wins + stale signal" case_both_present
+run_case "sessionKey file present → exit 0" case_file_present
+run_case "no file → exit 1 + missing-on-resolve" case_missing
+run_case "ambiguous prefix → exit 1, refuses to pick" case_ambiguous
 
 echo ""
 echo "================================================"

package/payload/premium-plugins/real-agency/BUNDLE.md

@@ -17,7 +17,7 @@ plugins:
 
 # Real Agency
 
-Premium plugin bundle for UK estate agency professionals. Purchasing this bundle grants access to all 11 sub-plugins, each independently activatable via `enabledPlugins`. When the bundle is auto-delivered at admin session startup (or explicitly via `premium-deliver`), every sub-plugin in the `plugins:` list above is stamped into `account.json` `enabledPlugins` in one idempotent set-union — delivery implies enablement, so `mcp__loop__*` tools and the other sub-plugin surfaces are visible to the agent from the first turn after install. Disable individual sub-plugins with `plugin-toggle-enabled`. The bundle also delivers three specialist roles — negotiator, valuer, and compliance — that embed domain knowledge from the sub-plugins and operate autonomously with Loop CRM tools.
+Premium plugin bundle for UK estate agency professionals. Purchasing this bundle grants access to all 11 sub-plugins, each independently activatable via `enabledPlugins`. Every admin boot reconciles `account.json` `enabledPlugins` against on-disk presence: any sub-plugin from the `plugins:` list above whose `platform/plugins/<sub>/PLUGIN.md` exists gets stamped via an idempotent set-union, so `mcp__loop__*` tools and the other sub-plugin surfaces are visible to the admin agent from the first turn after install — and on first boot post-deploy for accounts that already had the bundle on disk from a prior install. Disable individual sub-plugins with `plugin-toggle-enabled`. The bundle also delivers three specialist roles (negotiator, valuer, and compliance) that embed domain knowledge from the sub-plugins and operate autonomously with Loop CRM tools.
 
 ## Specialist Roles