From 3b15591272522f2bb14a3f3e0ee6bc1d202cbd6f Mon Sep 17 00:00:00 2001
From: Maksim Soltan <gonzih@gmail.com>
Date: Wed, 1 Apr 2026 07:52:10 -0700
Subject: [PATCH] fix: use jq instead of sed for JSON field stripping in
 telemetry-sync
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The sed pattern [^"]*  fails on JSON field values containing escaped
quotes (\"...\") or other characters that break the regex match.
This produces silently corrupt JSON that the Supabase edge function
rejects without error — events are lost and the cursor doesn't advance.

Fix: use jq del() for proper JSON-aware field removal. Fall back to
the existing sed approach when jq is unavailable (older installs without
the dev toolchain). jq is already a required dependency (the Dockerfile
installs it, and gstack already uses it in other scripts).

Closes #710
---
 bin/gstack-telemetry-sync | 42 +++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/bin/gstack-telemetry-sync b/bin/gstack-telemetry-sync
index be767c23e..cd0645285 100755
--- a/bin/gstack-telemetry-sync
+++ b/bin/gstack-telemetry-sync
@@ -69,6 +69,37 @@ UNSENT="$(tail -n "+$SKIP" "$JSONL_FILE" 2>/dev/null || true)"
 # ─── Strip local-only fields and build batch ─────────────────
 # Edge function expects raw JSONL field names (v, ts, sessions) —
 # no column renaming needed (the function maps them internally).
+#
+# Use jq for JSON field removal — sed regex (pattern [^"]*) breaks on
+# field values containing escaped quotes (\") or other special chars,
+# producing corrupt JSON that the edge function silently rejects.
+# jq is available in the Dockerfile.ci toolchain and most dev environments.
+# Fall back to sed only if jq is unavailable (older installs).
+HAS_JQ=false
+command -v jq >/dev/null 2>&1 && HAS_JQ=true
+
+strip_fields() {
+  local line="$1"
+  if [ "$HAS_JQ" = "true" ]; then
+    if [ "$TIER" = "anonymous" ]; then
+      echo "$line" | jq -c 'del(._repo_slug, ._branch, .repo, .installation_id)' 2>/dev/null || echo "$line"
+    else
+      echo "$line" | jq -c 'del(._repo_slug, ._branch, .repo)' 2>/dev/null || echo "$line"
+    fi
+  else
+    # Legacy sed fallback — works for simple string values without escaped quotes
+    local clean="$line"
+    clean="$(echo "$clean" | sed \
+      -e 's/,"_repo_slug":"[^"]*"//g' \
+      -e 's/,"_branch":"[^"]*"//g' \
+      -e 's/,"repo":"[^"]*"//g')"
+    if [ "$TIER" = "anonymous" ]; then
+      clean="$(echo "$clean" | sed 's/,"installation_id":"[^"]*"//g; s/,"installation_id":null//g')"
+    fi
+    echo "$clean"
+  fi
+}
+
 BATCH="["
 FIRST=true
 COUNT=0
@@ -78,16 +109,7 @@ while IFS= read -r LINE; do
   [ -z "$LINE" ] && continue
   echo "$LINE" | grep -q '^{' || continue
 
-  # Strip local-only fields (keep v, ts, sessions as-is for edge function)
-  CLEAN="$(echo "$LINE" | sed \
-    -e 's/,"_repo_slug":"[^"]*"//g' \
-    -e 's/,"_branch":"[^"]*"//g' \
-    -e 's/,"repo":"[^"]*"//g')"
-
-  # If anonymous tier, strip installation_id
-  if [ "$TIER" = "anonymous" ]; then
-    CLEAN="$(echo "$CLEAN" | sed 's/,"installation_id":"[^"]*"//g; s/,"installation_id":null//g')"
-  fi
+  CLEAN="$(strip_fields "$LINE")"
 
   if [ "$FIRST" = "true" ]; then
     FIRST=false