agent-relay 2.0.19 → 2.0.20

package/packages/cli-tester/scripts/test-spawn.sh

@@ -0,0 +1,140 @@
+#!/bin/bash
+# Test CLI spawn flow - simulates real spawner behavior
+# This is a more realistic test that mimics what AgentSpawner does
+#
+# Usage: ./test-spawn.sh <cli> [--interactive]
+# Example: ./test-spawn.sh cursor
+#          ./test-spawn.sh cursor --interactive
+#          DEBUG_SPAWN=1 ./test-spawn.sh cursor
+
+set -e
+
+CLI=${1:-cursor}
+INTERACTIVE=""
+if [ "$2" = "--interactive" ]; then
+    INTERACTIVE="1"
+fi
+
+# Map CLI name to actual command (cursor installs as 'agent')
+CLI_CMD="$CLI"
+if [ "$CLI" = "cursor" ]; then
+    CLI_CMD="agent"
+fi
+
+NAME="spawn-test-${CLI}"
+SOCKET="/tmp/relay-pty-${NAME}.sock"
+RELAY_DATA_DIR="/tmp/relay-test-data"
+
+# Create test data directories
+mkdir -p "$RELAY_DATA_DIR"
+
+# Cleanup function
+cleanup() {
+    echo ""
+    echo "Cleaning up..."
+    rm -f "$SOCKET"
+    pkill -f "relay-pty.*${NAME}" 2>/dev/null || true
+}
+trap cleanup EXIT
+
+# Remove stale socket if exists
+rm -f "$SOCKET"
+
+echo "========================================"
+echo "  Spawn Flow Test: $CLI"
+echo "========================================"
+echo ""
+echo "This test simulates what AgentSpawner.spawn() does:"
+echo "  1. Builds command with appropriate flags"
+echo "  2. Starts relay-pty with the CLI"
+echo "  3. Monitors for daemon registration"
+echo ""
+echo "Session name: $NAME"
+echo "Socket path:  $SOCKET"
+echo "Data dir:     $RELAY_DATA_DIR"
+echo ""
+
+# Build CLI arguments exactly like spawner does
+CLI_ARGS=()
+
+# Add args based on CLI type
+case $CLI in
+    claude)
+        # Claude: add --dangerously-skip-permissions in non-interactive mode
+        if [ -z "$INTERACTIVE" ]; then
+            CLI_ARGS+=(--dangerously-skip-permissions)
+            echo "[spawn] Adding --dangerously-skip-permissions (non-interactive mode)"
+        fi
+        ;;
+    cursor)
+        # Cursor: add --force in non-interactive mode
+        if [ -z "$INTERACTIVE" ]; then
+            CLI_ARGS+=(--force)
+            echo "[spawn] Adding --force (non-interactive mode)"
+        fi
+        ;;
+    codex)
+        # Codex: supports device flow for headless
+        if [ -z "$INTERACTIVE" ]; then
+            CLI_ARGS+=(login --device-auth)
+            echo "[spawn] Adding login --device-auth (non-interactive mode)"
+        fi
+        ;;
+    copilot)
+        # Copilot: needs auth login command, device flow for headless
+        if [ -z "$INTERACTIVE" ]; then
+            CLI_ARGS+=(auth login --device)
+            echo "[spawn] Adding auth login --device (non-interactive mode)"
+        else
+            CLI_ARGS+=(auth login)
+            echo "[spawn] Adding auth login (interactive mode)"
+        fi
+        ;;
+    opencode)
+        # OpenCode: needs auth login command
+        CLI_ARGS+=(auth login)
+        echo "[spawn] Adding auth login"
+        ;;
+    droid)
+        # Droid: needs --login flag
+        CLI_ARGS+=(--login)
+        echo "[spawn] Adding --login"
+        ;;
+esac
+
+echo ""
+echo "Command: $CLI_CMD ${CLI_ARGS[*]}"
+echo ""
+
+# Build relay-pty args
+RELAY_ARGS=(
+    --name "$NAME"
+    --socket "$SOCKET"
+    --idle-timeout 300
+)
+
+# Enable JSON output for debugging
+if [ -n "$DEBUG_SPAWN" ] || [ -n "$DEBUG" ]; then
+    RELAY_ARGS+=(--json-output)
+    echo "[debug] JSON output enabled"
+fi
+
+echo "========================================"
+echo "  Starting CLI with relay-pty"
+echo "========================================"
+echo ""
+echo "Press Ctrl+C to stop."
+echo ""
+echo "In another terminal, you can:"
+echo "  - Check socket status: echo '{\"type\":\"status\"}' | nc -U $SOCKET"
+echo "  - Inject message: echo '{\"type\":\"inject\",\"body\":\"test\"}' | nc -U $SOCKET"
+echo "  - Monitor registration: watch -n1 'cat $RELAY_DATA_DIR/*.json 2>/dev/null || echo no files'"
+echo ""
+
+# Start the CLI with relay-pty
+# In a real spawn, this would be done via AgentSpawner which handles registration waiting
+if [ ${#CLI_ARGS[@]} -gt 0 ]; then
+    exec relay-pty "${RELAY_ARGS[@]}" -- "$CLI_CMD" "${CLI_ARGS[@]}"
+else
+    exec relay-pty "${RELAY_ARGS[@]}" -- "$CLI_CMD"
+fi

package/packages/cli-tester/scripts/test-with-daemon.sh

@@ -0,0 +1,247 @@
+#!/bin/bash
+# Full integration test with daemon
+# This starts a local daemon and tests the complete spawn flow
+#
+# Usage: ./test-with-daemon.sh <cli>
+# Example: ./test-with-daemon.sh cursor
+#          DEBUG=1 ./test-with-daemon.sh cursor
+
+set -e
+
+CLI=${1:-cursor}
+
+# Map CLI name to actual command
+CLI_CMD="$CLI"
+if [ "$CLI" = "cursor" ]; then
+    CLI_CMD="agent"
+fi
+
+NAME="daemon-test-${CLI}"
+SOCKET="/tmp/relay-pty-${NAME}.sock"
+
+# Daemon configuration
+DAEMON_PORT=${DAEMON_PORT:-3377}
+DAEMON_HOST="127.0.0.1"
+DAEMON_URL="http://${DAEMON_HOST}:${DAEMON_PORT}"
+DATA_DIR="/tmp/relay-daemon-test"
+
+# Cleanup function
+cleanup() {
+    echo ""
+    echo "========================================"
+    echo "  Cleaning up"
+    echo "========================================"
+    rm -f "$SOCKET"
+    if [ -n "$DAEMON_PID" ]; then
+        echo "Stopping daemon (PID: $DAEMON_PID)..."
+        kill $DAEMON_PID 2>/dev/null || true
+    fi
+    if [ -n "$PTY_PID" ]; then
+        echo "Stopping relay-pty (PID: $PTY_PID)..."
+        kill $PTY_PID 2>/dev/null || true
+    fi
+    echo "Done."
+}
+trap cleanup EXIT
+
+# Create data directory
+mkdir -p "$DATA_DIR"
+
+echo "========================================"
+echo "  Full Daemon Integration Test: $CLI"
+echo "========================================"
+echo ""
+echo "This test starts a real daemon and tests the complete flow:"
+echo "  1. Start relay-daemon"
+echo "  2. Start relay-pty with CLI"
+echo "  3. Wait for agent registration"
+echo "  4. Monitor the full flow"
+echo ""
+echo "Configuration:"
+echo "  CLI:         $CLI_CMD"
+echo "  Agent name:  $NAME"
+echo "  Daemon URL:  $DAEMON_URL"
+echo "  Data dir:    $DATA_DIR"
+echo ""
+
+# Check if daemon binary is available
+if ! command -v relay-daemon &> /dev/null; then
+    echo "WARNING: relay-daemon not found in PATH"
+    echo ""
+    echo "To build the daemon:"
+    echo "  cd packages/daemon && npm run build"
+    echo ""
+    echo "Or run a daemon manually:"
+    echo "  npm run daemon"
+    echo ""
+    echo "Then re-run this test."
+    exit 1
+fi
+
+echo "========================================"
+echo "  Phase 1: Starting Daemon"
+echo "========================================"
+echo ""
+
+# Check if a daemon is already running
+if curl -s "${DAEMON_URL}/health" > /dev/null 2>&1; then
+    echo "Daemon already running at $DAEMON_URL"
+    DAEMON_PID=""
+else
+    echo "Starting daemon on port $DAEMON_PORT..."
+
+    # Start daemon in background with test configuration
+    RELAY_DATA_DIR="$DATA_DIR" \
+    RELAY_PORT="$DAEMON_PORT" \
+    DEBUG="${DEBUG:-}" \
+    relay-daemon > "$DATA_DIR/daemon.log" 2>&1 &
+
+    DAEMON_PID=$!
+    echo "Daemon started (PID: $DAEMON_PID)"
+
+    # Wait for daemon to be ready
+    echo "Waiting for daemon to be ready..."
+    for i in $(seq 1 30); do
+        if curl -s "${DAEMON_URL}/health" > /dev/null 2>&1; then
+            echo "Daemon is ready!"
+            break
+        fi
+        if [ $i -eq 30 ]; then
+            echo "ERROR: Daemon failed to start within 30 seconds"
+            echo ""
+            echo "Daemon log:"
+            cat "$DATA_DIR/daemon.log" | tail -50
+            exit 1
+        fi
+        sleep 1
+    done
+fi
+
+echo ""
+
+echo "========================================"
+echo "  Phase 2: Starting CLI with relay-pty"
+echo "========================================"
+echo ""
+
+# Build CLI arguments
+CLI_ARGS=()
+case $CLI in
+    claude)
+        CLI_ARGS+=(--dangerously-skip-permissions)
+        ;;
+    cursor)
+        CLI_ARGS+=(--force)
+        ;;
+esac
+
+echo "Command: $CLI_CMD ${CLI_ARGS[*]}"
+
+# Build relay-pty args
+RELAY_ARGS=(
+    --name "$NAME"
+    --socket "$SOCKET"
+    --idle-timeout 300
+)
+
+# Enable verbose output
+if [ -n "$DEBUG" ]; then
+    RELAY_ARGS+=(--json-output)
+fi
+
+# Set daemon URL environment variable so relay-pty connects to our test daemon
+export RELAY_DAEMON_URL="$DAEMON_URL"
+
+echo "Starting relay-pty..."
+if [ ${#CLI_ARGS[@]} -gt 0 ]; then
+    relay-pty "${RELAY_ARGS[@]}" -- "$CLI_CMD" "${CLI_ARGS[@]}" 2>&1 &
+else
+    relay-pty "${RELAY_ARGS[@]}" -- "$CLI_CMD" 2>&1 &
+fi
+
+PTY_PID=$!
+echo "relay-pty started (PID: $PTY_PID)"
+echo ""
+
+echo "========================================"
+echo "  Phase 3: Monitoring Registration"
+echo "========================================"
+echo ""
+
+# Poll for registration via daemon API
+START_TIME=$(date +%s)
+TIMEOUT_SEC=60
+
+echo "Polling daemon for agent registration (timeout: ${TIMEOUT_SEC}s)..."
+echo ""
+
+while true; do
+    CURRENT_TIME=$(date +%s)
+    ELAPSED=$((CURRENT_TIME - START_TIME))
+
+    # Check if PTY process is still running
+    if ! kill -0 $PTY_PID 2>/dev/null; then
+        echo ""
+        echo "[$(date +%T)] ERROR: relay-pty exited after ${ELAPSED}s"
+        echo ""
+        echo "The CLI crashed or exited before completing registration."
+        echo ""
+        if [ -f "$DATA_DIR/daemon.log" ]; then
+            echo "Daemon log (last 20 lines):"
+            tail -20 "$DATA_DIR/daemon.log"
+        fi
+        exit 1
+    fi
+
+    # Query daemon for connected agents
+    AGENTS=$(curl -s "${DAEMON_URL}/api/agents" 2>/dev/null || echo "[]")
+
+    # Check if our agent is registered
+    if echo "$AGENTS" | grep -q "\"$NAME\""; then
+        echo ""
+        echo "========================================"
+        echo "  SUCCESS: Agent Registered!"
+        echo "========================================"
+        echo ""
+        echo "Agent '$NAME' successfully registered with daemon after ${ELAPSED}s"
+        echo ""
+        echo "Connected agents:"
+        echo "$AGENTS" | jq . 2>/dev/null || echo "$AGENTS"
+        echo ""
+        echo "Press Ctrl+C to stop the test, or leave running to interact with the CLI."
+
+        # Keep running so user can interact
+        wait $PTY_PID
+        exit 0
+    fi
+
+    echo "[$(date +%T)] +${ELAPSED}s: Waiting for registration... (agents: $(echo "$AGENTS" | grep -o '"' | wc -l | xargs))"
+
+    # Check timeout
+    if [ $ELAPSED -ge $TIMEOUT_SEC ]; then
+        echo ""
+        echo "========================================"
+        echo "  TIMEOUT: Registration Failed"
+        echo "========================================"
+        echo ""
+        echo "Agent '$NAME' did not register within ${TIMEOUT_SEC}s"
+        echo ""
+        echo "This is the same timeout the real spawner would hit."
+        echo ""
+        echo "Debugging info:"
+        echo ""
+        echo "1. Connected agents from daemon:"
+        echo "$AGENTS" | jq . 2>/dev/null || echo "$AGENTS"
+        echo ""
+        if [ -f "$DATA_DIR/daemon.log" ]; then
+            echo "2. Daemon log (last 30 lines):"
+            tail -30 "$DATA_DIR/daemon.log"
+        fi
+        echo ""
+        echo "3. Check if CLI is stuck on a prompt (auth, trust, etc.)"
+        echo ""
+        exit 1
+    fi
+
+    sleep 2
+done

package/packages/cli-tester/scripts/verify-auth.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+# Verify CLI credentials exist and show (redacted) contents
+# Usage: ./verify-auth.sh <cli>
+# Example: ./verify-auth.sh claude
+
+CLI=${1:-claude}
+
+# Map CLI to credential file path
+case $CLI in
+    claude)
+        CRED_FILE="$HOME/.claude/.credentials.json"
+        ;;
+    codex)
+        CRED_FILE="$HOME/.codex/auth.json"
+        ;;
+    gemini)
+        # Gemini stores in application_default_credentials.json
+        CRED_FILE="$HOME/.config/gcloud/application_default_credentials.json"
+        ALT_FILE="$HOME/.gemini/credentials.json"
+        ;;
+    cursor|agent)
+        # Cursor CLI installs as 'agent', credentials in ~/.cursor/
+        CRED_FILE="$HOME/.cursor/auth.json"
+        CLI="cursor"  # Normalize name
+        ;;
+    opencode)
+        CRED_FILE="$HOME/.local/share/opencode/auth.json"
+        ;;
+    droid)
+        CRED_FILE="$HOME/.droid/auth.json"
+        ;;
+    copilot)
+        # GitHub Copilot uses gh CLI auth - stored in YAML format
+        CRED_FILE="$HOME/.config/gh/hosts.yml"
+        ;;
+    *)
+        echo "Unknown CLI: $CLI"
+        echo "Supported: claude, codex, gemini, cursor, opencode, droid, copilot"
+        exit 1
+        ;;
+esac
+
+echo "========================================"
+echo "  Checking credentials for: $CLI"
+echo "========================================"
+echo ""
+
+# Check primary credential file
+if [ -f "$CRED_FILE" ]; then
+    echo "✓ Credentials found: $CRED_FILE"
+    echo ""
+    echo "Contents (tokens redacted):"
+    echo "----------------------------------------"
+    # Redact any values that look like tokens (long strings, JWTs, etc.)
+    cat "$CRED_FILE" | jq '.' 2>/dev/null | \
+        sed -E 's/"([^"]*[Tt]oken[^"]*|[Aa]ccess[^"]*|[Rr]efresh[^"]*|[Ss]ecret[^"]*)": "[^"]{20,}"/"***\1***": "[REDACTED]"/g' || \
+        cat "$CRED_FILE" | sed -E 's/"[^"]{40,}"/"[REDACTED]"/g'
+    echo "----------------------------------------"
+    echo ""
+
+    # Check for specific fields
+    if command -v jq &> /dev/null && [ -f "$CRED_FILE" ]; then
+        echo "Token check:"
+        if jq -e '.claudeAiOauth.accessToken' "$CRED_FILE" &>/dev/null; then
+            echo "  ✓ Access token present (Claude format)"
+        elif jq -e '.tokens.access_token' "$CRED_FILE" &>/dev/null; then
+            echo "  ✓ Access token present (Codex format)"
+        elif jq -e '.accessToken' "$CRED_FILE" &>/dev/null; then
+            echo "  ✓ Access token present (generic format)"
+        elif jq -e '.access_token' "$CRED_FILE" &>/dev/null; then
+            echo "  ✓ Access token present (OAuth format)"
+        else
+            echo "  ? Access token format unknown"
+        fi
+
+        if jq -e '.claudeAiOauth.refreshToken' "$CRED_FILE" &>/dev/null || \
+           jq -e '.tokens.refresh_token' "$CRED_FILE" &>/dev/null || \
+           jq -e '.refreshToken' "$CRED_FILE" &>/dev/null || \
+           jq -e '.refresh_token' "$CRED_FILE" &>/dev/null; then
+            echo "  ✓ Refresh token present"
+        else
+            echo "  ✗ No refresh token found"
+        fi
+    fi
+
+    exit 0
+else
+    echo "✗ No credentials found at: $CRED_FILE"
+
+    # Check alternate location for Gemini
+    if [ -n "$ALT_FILE" ] && [ -f "$ALT_FILE" ]; then
+        echo ""
+        echo "✓ Found alternate credentials: $ALT_FILE"
+        cat "$ALT_FILE" | jq '.' 2>/dev/null | \
+            sed -E 's/"[^"]{40,}"/"[REDACTED]"/g' || \
+            cat "$ALT_FILE"
+        exit 0
+    fi
+
+    # Show what files exist in the CLI's config directory
+    CLI_DIR=$(dirname "$CRED_FILE")
+    if [ -d "$CLI_DIR" ]; then
+        echo ""
+        echo "Files in $CLI_DIR:"
+        ls -la "$CLI_DIR" 2>/dev/null || echo "  (directory exists but is empty or unreadable)"
+    else
+        echo ""
+        echo "Config directory does not exist: $CLI_DIR"
+    fi
+
+    exit 1
+fi

package/packages/cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/cloud",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Cloud API server and services for Agent Relay",
   "type": "module",
   "main": "dist/index.js",
@@ -38,11 +38,11 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/wrapper": "2.0.19",
-    "@agent-relay/config": "2.0.19",
-    "@agent-relay/resiliency": "2.0.19",
-    "@agent-relay/storage": "2.0.19",
-    "@agent-relay/protocol": "2.0.19"
+    "@agent-relay/wrapper": "2.0.20",
+    "@agent-relay/config": "2.0.20",
+    "@agent-relay/resiliency": "2.0.20",
+    "@agent-relay/storage": "2.0.20",
+    "@agent-relay/protocol": "2.0.20"
   },
   "devDependencies": {
     "@types/node": "^22.19.3",

package/packages/config/dist/cli-auth-config.js

@@ -223,6 +223,15 @@ export const CLI_AUTH_CONFIG = {
         displayName: 'Cursor',
         waitTimeout: 30000,
         prompts: [
+            {
+                // Initial login prompt - "Press any key to log in..."
+                // This is the FIRST prompt shown by Cursor Agent and blocks all progress
+                // Must send a keystroke to proceed to the auth URL
+                pattern: /press any key to log in/i,
+                response: '\r', // Send Enter to proceed
+                delay: 500,
+                description: 'Initial login prompt',
+            },
             {
                 // Workspace Trust screen - must press 'a' to trust
                 // "Do you want to mark this workspace as trusted?"
@@ -271,6 +280,62 @@ export const CLI_AUTH_CONFIG = {
             },
         ],
     },
+    copilot: {
+        command: 'copilot',
+        args: ['auth', 'login'], // copilot auth login - triggers GitHub OAuth flow
+        deviceFlowArgs: ['auth', 'login', '--device'], // Device flow for headless environments
+        supportsDeviceFlow: true,
+        urlPattern: /(https:\/\/[^\s]+)/,
+        // Copilot uses gh CLI's auth - credentials stored via GitHub CLI config
+        credentialPath: '~/.config/gh/hosts.yml',
+        displayName: 'GitHub Copilot',
+        waitTimeout: 30000,
+        prompts: [
+            {
+                // Browser or device code selection
+                pattern: /login\s*with\s*a\s*code|one-time\s*code|device\s*code|browser|authenticate/i,
+                response: '\r', // Select first option (browser-based auth)
+                delay: 200,
+                description: 'Auth method selection',
+            },
+            {
+                // Press Enter to open browser
+                pattern: /press\s*enter\s*to\s*open|open.*browser|opening\s*browser/i,
+                response: '\r',
+                delay: 200,
+                description: 'Open browser prompt',
+            },
+            {
+                // Login success - press enter to continue
+                pattern: /login\s*successful|logged\s*in.*press\s*enter|press\s*enter\s*to\s*continue|authentication\s*complete/i,
+                response: '\r',
+                delay: 200,
+                description: 'Login success prompt',
+            },
+            {
+                // Generic enter prompt (fallback)
+                pattern: /press\s*enter|enter\s*to\s*(confirm|continue|proceed)/i,
+                response: '\r',
+                delay: 300,
+                description: 'Generic enter prompt',
+            },
+        ],
+        successPatterns: [/success/i, /authenticated/i, /logged\s*in/i, /you.*(?:are|now).*logged/i, /authentication\s*complete/i],
+        errorPatterns: [
+            {
+                pattern: /oauth\s*error|auth.*failed|authentication\s*error/i,
+                message: 'GitHub authentication failed',
+                recoverable: true,
+                hint: 'Please try logging in again. Make sure you have GitHub Copilot access.',
+            },
+            {
+                pattern: /network\s*error|ENOTFOUND|ECONNREFUSED|timeout/i,
+                message: 'Network error during authentication',
+                recoverable: true,
+                hint: 'Please check your internet connection and try again.',
+            },
+        ],
+    },
 };
 /**
  * Strip ANSI escape codes from text

package/packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/config",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Shared configuration schemas and loaders for Agent Relay",
   "type": "module",
   "main": "dist/index.js",
@@ -83,7 +83,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@agent-relay/protocol": "2.0.19",
+    "@agent-relay/protocol": "2.0.20",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.1"
   },

package/packages/continuity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-relay/continuity",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "description": "Session continuity manager for Relay (ledgers, handoffs, resume)",
   "type": "module",
   "main": "dist/index.js",

package/packages/daemon/dist/router.js

@@ -442,7 +442,7 @@ export class Router {
         }
         const to = envelope.to;
         const topic = envelope.topic;
-        routerLog.debug(`Route ${senderName} -> ${to}`, { preview: envelope.payload.body?.substring(0, 50) });
+        routerLog.debug(`Route ${senderName} -> ${to}`, { preview: typeof envelope.payload.body === 'string' ? envelope.payload.body.substring(0, 50) : JSON.stringify(envelope.payload.body)?.substring(0, 50) });
         if (to === '*') {
             // Broadcast to all (except sender)
             this.broadcast(senderName, envelope, topic);
@@ -564,7 +564,7 @@ export class Router {
                     anySent = true;
                 routerLog.debug(`Delivered ${from} -> ${to} (user connection ${userConn.id})`, {
                     success: sent,
-                    preview: envelope.payload.body?.substring(0, 40),
+                    preview: typeof envelope.payload.body === 'string' ? envelope.payload.body.substring(0, 40) : JSON.stringify(envelope.payload.body)?.substring(0, 40),
                 });
                 // Persist only once (for the first connection)
                 if (userConn === [...userConnections][0]) {
@@ -583,7 +583,7 @@ export class Router {
         const target = agentTarget;
         const deliver = this.createDeliverEnvelope(from, to, envelope, target);
         const sent = target.send(deliver);
-        routerLog.debug(`Delivered ${from} -> ${to}`, { success: sent, preview: envelope.payload.body?.substring(0, 40) });
+        routerLog.debug(`Delivered ${from} -> ${to}`, { success: sent, preview: typeof envelope.payload.body === 'string' ? envelope.payload.body.substring(0, 40) : JSON.stringify(envelope.payload.body)?.substring(0, 40) });
         this.persistDeliverEnvelope(deliver);
         if (sent) {
             this.trackDelivery(target, deliver);
@@ -772,7 +772,7 @@ export class Router {
         routerLog.info(`Persisting offline message for "${to}"`, {
             from,
             messageId: envelope.id,
-            bodyPreview: envelope.payload.body?.substring(0, 50),
+            bodyPreview: typeof envelope.payload.body === 'string' ? envelope.payload.body.substring(0, 50) : JSON.stringify(envelope.payload.body)?.substring(0, 50),
         });
         this.storage.saveMessage({
             id: envelope.id || generateId(),