@rubytech/create-maxy 1.0.692 → 1.0.693

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

@@ -6,6 +6,11 @@
 # 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.
+#
 # Modes:
 #   logs-read.sh <conversationId> [type]       Read {prefix}-{convId}.log
 #   logs-read.sh --tail [type] [lines]         Tail most recent file of type
@@ -135,7 +140,25 @@ validate_type() {
   esac
 }
 
-# --- Per-conversation mode: read {prefix}-{convId}.log ---
+# --- Per-conversation mode: read {prefix}{convId}.log, with preflush fallback ---
+#
+# Task 671: writer (Task 650) emits logs under two filename shapes —
+#   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)
+# This mode tries FULL across every account dir first; if zero FULL hits,
+# falls back to PREFLUSH across every dir. If BOTH exist in the same dir,
+# FULL wins and the preflush sibling is logged to server.log as stale
+# (promotion-race housekeeping signal).
+#
+# Identity note: for the abrupt-exit case this fallback exists to solve,
+# the operator passes the sessionKey (no conversationId was ever assigned).
+# For post-flush retrievals the operator passes the conversationId and the
+# FULL file is expected to exist.
+#
+# MIRROR: keep the two-shape contract in sync with:
+#   - platform/ui/app/lib/logs-read-resolve.ts (canonical TS helper + tests)
+#   - platform/plugins/admin/mcp/src/index.ts (conversationId branch)
 per_conversation_mode() {
   local conv_id="$1"
   local filter_type="${2:-system}"
@@ -163,29 +186,60 @@ per_conversation_mode() {
     exit 2
   fi
 
+  # Build the two filenames the two-shape contract expects.
+  local full_name="${prefix}${conv_id}.log"
+  local preflush_name="${prefix}preflush-${conv_id:0:12}.log"
+
   local found=0
   local searched=0
-  local rejected=0
+  local matched_shape=""
+
+  # Pass 1: FULL across every log dir. Records stale preflush siblings.
   for log_dir in "${ACCOUNT_LOG_DIRS[@]}"; do
-    local filepath="$log_dir/${prefix}${conv_id}.log"
+    local full_path="$log_dir/$full_name"
     searched=$((searched + 1))
-    if [[ ! -f "$filepath" ]]; then
-      rejected=$((rejected + 1))
+    if [[ ! -f "$full_path" ]]; then
       continue
     fi
     [[ $found -gt 0 ]] && echo ""
-    echo "## $(basename "$filepath") ($filter_type)$(account_suffix "$log_dir")"
-    cat "$filepath"
+    echo "## $(basename "$full_path") ($filter_type)$(account_suffix "$log_dir")"
+    cat "$full_path"
     found=$((found + 1))
+    matched_shape="full"
+    # Stale-preflush detection: if the post-flush rename left the preflush
+    # sibling on disk, emit a housekeeping signal to server.log. Best-effort
+    # — retrieval must not fail if server.log is unwritable.
+    local stale_path="$log_dir/$preflush_name"
+    if [[ -f "$stale_path" ]]; then
+      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
+    fi
   done
 
+  # Pass 2: PREFLUSH across every dir. Only runs if zero FULL hits.
+  if [[ $found -eq 0 ]]; then
+    for log_dir in "${ACCOUNT_LOG_DIRS[@]}"; do
+      local preflush_path="$log_dir/$preflush_name"
+      searched=$((searched + 1))
+      if [[ ! -f "$preflush_path" ]]; then
+        continue
+      fi
+      [[ $found -gt 0 ]] && echo ""
+      echo "## $(basename "$preflush_path") ($filter_type)$(account_suffix "$log_dir")"
+      cat "$preflush_path"
+      found=$((found + 1))
+      matched_shape="preflush"
+    done
+  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 rejected=$rejected reason=file-not-found" >&2
+    echo "-- trailer: conversationId=$conv_id type=$filter_type searched=$searched found=0 tried=[${full_name}, ${preflush_name}] 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 rejected=$rejected" >&2
+  echo "-- trailer: conversationId=$conv_id type=$filter_type searched=$searched matched=$found matched_shape=$matched_shape" >&2
   exit 0
 }
 

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

@@ -0,0 +1,212 @@
+#!/usr/bin/env bash
+# Task 671 — bash harness for logs-read.sh two-shape preflush 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
+#
+# MIRROR: see platform/ui/app/lib/logs-read-resolve.ts for the canonical
+# two-shape contract and its TS unit tests.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LOGS_READ="$SCRIPT_DIR/logs-read.sh"
+if [[ ! -x "$LOGS_READ" ]]; then
+  echo "FATAL: $LOGS_READ not executable" >&2
+  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"
+
+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"
+}
+
+cleanup_install_tree() {
+  local root="$1"
+  rm -rf "$root"
+  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
+  echo ""
+  echo "=== CASE: $name ==="
+  if "$@"; then
+    PASS=$((PASS + 1))
+    echo "PASS: $name"
+  else
+    FAIL=$((FAIL + 1))
+    echo "FAIL: $name"
+  fi
+}
+
+# --- Case 1: full only ---
+case_full_only() {
+  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"
+
+  local stdout stderr rc
+  stdout=$("$script" "$CONV_ID" 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-$$
+
+  cleanup_install_tree "$root"
+
+  if [[ $rc -ne 0 ]]; then
+    echo "  expected exit 0, got $rc"
+    return 1
+  fi
+  if [[ "$stdout" != *"full-content-sentinel"* ]]; then
+    echo "  stdout missing sentinel"
+    return 1
+  fi
+  if [[ "$stderr" != *"matched_shape=full"* ]]; then
+    echo "  stderr missing matched_shape=full: $stderr"
+    return 1
+  fi
+  return 0
+}
+
+# --- Case 2: preflush only ---
+case_preflush_only() {
+  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 stdout stderr rc
+  stdout=$("$script" "$CONV_ID" system 2>/tmp/maxy-logs-read-stderr-2-$$) || rc=$?
+  rc=${rc:-0}
+  stderr=$(cat /tmp/maxy-logs-read-stderr-2-$$)
+  rm -f /tmp/maxy-logs-read-stderr-2-$$
+
+  cleanup_install_tree "$root"
+
+  if [[ $rc -ne 0 ]]; then
+    echo "  expected exit 0, got $rc"
+    return 1
+  fi
+  if [[ "$stdout" != *"preflush-content-sentinel"* ]]; then
+    echo "  stdout missing sentinel"
+    return 1
+  fi
+  if [[ "$stderr" != *"matched_shape=preflush"* ]]; then
+    echo "  stderr missing matched_shape=preflush: $stderr"
+    return 1
+  fi
+  return 0
+}
+
+# --- Case 3: neither present → miss trailer ---
+case_neither() {
+  local root="/tmp/maxy-logs-read-test-3-$$"
+  local script
+  script=$(setup_install_tree "$root")
+
+  local stdout stderr rc=0
+  stdout=$("$script" "$CONV_ID" system 2>/tmp/maxy-logs-read-stderr-3-$$) || rc=$?
+  stderr=$(cat /tmp/maxy-logs-read-stderr-3-$$)
+  rm -f /tmp/maxy-logs-read-stderr-3-$$
+
+  cleanup_install_tree "$root"
+
+  if [[ $rc -ne 1 ]]; then
+    echo "  expected exit 1, got $rc"
+    return 1
+  fi
+  if [[ "$stderr" != *"tried=[${FULL_NAME}, ${PREFLUSH_NAME}]"* ]]; then
+    echo "  stderr missing tried=[…,…]: $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"
+    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
+
+echo ""
+echo "================================================"
+echo " Passed: $PASS / Failed: $FAIL"
+echo "================================================"
+[[ $FAIL -eq 0 ]]