@rubytech/create-maxy 1.0.884 → 1.0.886

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/platform/scripts/seed-neo4j.sh

@@ -490,6 +490,52 @@ fi
 
 echo "$SCHEMA_CYPHER" | "$CYPHER_SHELL" -u "$NEO4J_USER" -p "$NEO4J_PASSWORD" -a "$NEO4J_URI"
 
+# ------------------------------------------------------------------
+# Task 1007 — sessionKey backfill (idempotent, runs every seed pass).
+#
+# Conversation and Message rows minted before Task 985 carry only
+# `conversationId`. The new canonical identifier is `sessionKey` (same
+# UUID shape). This block copies conversationId → sessionKey on every
+# row where sessionKey is still null, leaving rows that already carry
+# sessionKey untouched. Re-runs are no-ops. The legacy
+# `conversation_id_unique` constraint and `m.conversationId` index
+# stay until the full code-rename slice lands and no path reads the
+# legacy field; the drop happens in Task 1007's open completion scope.
+# ------------------------------------------------------------------
+echo "==> Backfilling sessionKey on :Conversation and :Message..."
+BACKFILL_RESULT=$("$CYPHER_SHELL" -u "$NEO4J_USER" -p "$NEO4J_PASSWORD" -a "$NEO4J_URI" --format plain << 'BACKFILL_EOF'
+MATCH (c:Conversation)
+WHERE c.sessionKey IS NULL AND c.conversationId IS NOT NULL
+SET c.sessionKey = c.conversationId
+RETURN count(c) AS conversations_backfilled;
+MATCH (m:Message)
+WHERE m.sessionKey IS NULL AND m.conversationId IS NOT NULL
+SET m.sessionKey = m.conversationId
+RETURN count(m) AS messages_backfilled;
+MATCH (c:Conversation) WHERE c.sessionKey IS NULL RETURN count(c) AS conversations_null_after;
+MATCH (m:Message) WHERE m.sessionKey IS NULL RETURN count(m) AS messages_null_after;
+BACKFILL_EOF
+)
+# Emit the migration-1007 adherence lines on stderr so they land in server.log
+# the same as every other log line. Non-zero null counts after backfill are P0:
+# they indicate orphan rows that carry neither identifier and need operator
+# attention before the constraint flip in Task 1011.
+echo "$BACKFILL_RESULT" | python3 -c "
+import sys, re
+rows = [r.strip() for r in sys.stdin.read().splitlines() if r.strip() and not r.strip().startswith(('conversations_', 'messages_'))]
+nums = [int(r) for r in rows if re.fullmatch(r'\d+', r)]
+if len(nums) >= 4:
+    conv_bf, msg_bf, conv_null, msg_null = nums[0], nums[1], nums[2], nums[3]
+    print(f'[migration-1007] conversation-row-backfill rows={conv_bf} outcome=ok', file=sys.stderr)
+    print(f'[migration-1007] message-row-backfill rows={msg_bf} outcome=ok', file=sys.stderr)
+    print(f'[migration-1007] adherence-check label=Conversation rows-with-null-sessionkey={conv_null}', file=sys.stderr)
+    print(f'[migration-1007] adherence-check label=Message rows-with-null-sessionkey={msg_null}', file=sys.stderr)
+    if conv_null > 0 or msg_null > 0:
+        print(f'[migration-1007] adherence-check P0=true reason=null-sessionkey-after-backfill', file=sys.stderr)
+else:
+    print(f'[migration-1007] backfill output unparseable rows={len(nums)}', file=sys.stderr)
+"
+
 # ------------------------------------------------------------------
 # 3. Create AdminUser node + ADMIN_OF relationship
 # ------------------------------------------------------------------

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