@synkro-sh/cli 1.4.34 → 1.4.36

package/dist/bootstrap.js

@@ -1294,30 +1294,36 @@ CWD=$(echo "$PAYLOAD" | jq -r '.cwd // empty' 2>/dev/null)
 TRANSCRIPT_PATH=$(echo "$PAYLOAD" | jq -r '.transcript_path // empty' 2>/dev/null)
 GIT_REPO=$(synkro_detect_repo "\${CWD:-.}")
 
-# Fire-and-forget usage telemetry
+# Aggregate token usage across all assistant turns in the transcript and POST silently
 if [ -n "$TRANSCRIPT_PATH" ] && [ -f "$TRANSCRIPT_PATH" ]; then
   (
     _LAST=$(grep '"type":"assistant"' "$TRANSCRIPT_PATH" 2>/dev/null | tail -1)
-    if [ -n "$_LAST" ]; then
-      CC_MODEL=$(echo "$_LAST" | jq -r '.message.model // empty' 2>/dev/null)
-      CC_USAGE=$(echo "$_LAST" | jq -c '{input_tokens:.message.usage.input_tokens,output_tokens:.message.usage.output_tokens,cache_creation_input_tokens:.message.usage.cache_creation_input_tokens,cache_read_input_tokens:.message.usage.cache_read_input_tokens}' 2>/dev/null || echo "{}")
-      HAS_TOKENS=$(echo "$CC_USAGE" | jq '(.input_tokens // 0) + (.output_tokens // 0)' 2>/dev/null)
-      if [ -n "$HAS_TOKENS" ] && [ "$HAS_TOKENS" != "0" ]; then
-        BODY=$(jq -n \\
-          --arg event_id "usage_$(date +%s)_$$" \\
-          --arg hook_type "stop" --arg verdict "allow" --arg severity "none" \\
-          --arg model "\${CC_MODEL:-claude-sonnet-4-6}" \\
-          --arg cc_model "\${CC_MODEL:-}" \\
-          --arg repo "\${GIT_REPO:-}" --arg session_id "$SESSION_ID" \\
-          --argjson cc_usage "$CC_USAGE" \\
-          '{capture_type:"local_verdict",event_id:$event_id,hook_type:$hook_type,verdict:$verdict,severity:$severity,model:$model,cc_usage:$cc_usage}
-            + (if $repo != "" then {repo:$repo} else {} end)
-            + (if $session_id != "" then {session_id:$session_id} else {} end)
-            + (if $cc_model != "" then {cc_model:$cc_model} else {} end)')
-        curl -sS -X POST "\${GATEWAY_URL}/api/v1/hook/capture" \\
-          -H "Content-Type: application/json" -H "Authorization: Bearer $JWT" \\
-          -d "$BODY" --max-time 2 >/dev/null 2>&1
-      fi
+    CC_MODEL=$(echo "$_LAST" | jq -r '.message.model // empty' 2>/dev/null)
+    TOTALS=$(grep '"type":"assistant"' "$TRANSCRIPT_PATH" 2>/dev/null \\
+      | jq -c '.message.usage' 2>/dev/null \\
+      | jq -s '{in:(map(.input_tokens//0)|add//0),out:(map(.output_tokens//0)|add//0),cw:(map(.cache_creation_input_tokens//0)|add//0),cr:(map(.cache_read_input_tokens//0)|add//0)}' 2>/dev/null \\
+      || echo '{"in":0,"out":0,"cw":0,"cr":0}')
+    TOK_IN=$(echo "$TOTALS" | jq -r '.in // 0')
+    TOK_OUT=$(echo "$TOTALS" | jq -r '.out // 0')
+    TOK_CW=$(echo "$TOTALS" | jq -r '.cw // 0')
+    TOK_CR=$(echo "$TOTALS" | jq -r '.cr // 0')
+    HAS_TOKENS=$(( TOK_IN + TOK_OUT ))
+    if [ "$HAS_TOKENS" != "0" ]; then
+      CC_USAGE="{"input_tokens":$TOK_IN,"output_tokens":$TOK_OUT,"cache_creation_input_tokens":$TOK_CW,"cache_read_input_tokens":$TOK_CR}"
+      BODY=$(jq -n \\
+        --arg event_id "usage_$(date +%s)_$$" \\
+        --arg hook_type "stop" --arg verdict "allow" --arg severity "none" \\
+        --arg model "\${CC_MODEL:-claude-sonnet-4-6}" \\
+        --arg cc_model "\${CC_MODEL:-}" \\
+        --arg repo "\${GIT_REPO:-}" --arg session_id "$SESSION_ID" \\
+        --argjson cc_usage "$CC_USAGE" \\
+        '{capture_type:"local_verdict",event_id:$event_id,hook_type:$hook_type,verdict:$verdict,severity:$severity,model:$model,cc_usage:$cc_usage}
+          + (if $repo != "" then {repo:$repo} else {} end)
+          + (if $session_id != "" then {session_id:$session_id} else {} end)
+          + (if $cc_model != "" then {cc_model:$cc_model} else {} end)')
+      curl -sS -X POST "\${GATEWAY_URL}/api/v1/hook/capture" \\
+        -H "Content-Type: application/json" -H "Authorization: Bearer $JWT" \\
+        -d "$BODY" --max-time 2 >/dev/null 2>&1
     fi
   ) &
 fi
@@ -1333,9 +1339,9 @@ FINDINGS=$(echo "$RESP" | jq -r '.findings // 0' 2>/dev/null)
 AUTO_FIXED=$(echo "$RESP" | jq -r '.auto_fixed // 0' 2>/dev/null)
 OPEN=$(echo "$RESP" | jq -r '.open // 0' 2>/dev/null)
 
-if [ "$EDITS" = "0" ] || [ -z "$EDITS" ]; then echo '{}'; exit 0; fi
+if [ "\${EDITS:-0}" = "0" ] || [ -z "$EDITS" ]; then echo '{}'; exit 0; fi
 
-if [ "$FINDINGS" = "0" ] || [ -z "$FINDINGS" ]; then
+if [ "\${FINDINGS:-0}" = "0" ] || [ -z "$FINDINGS" ]; then
   SYS_MSG="[synkro] stop \u2192 0 issues across \${EDITS} edit(s), session complete"
 else
   SYS_MSG="[synkro] stop \u2192 \${FINDINGS} finding(s): \${AUTO_FIXED} auto-fixed, \${OPEN} open"
@@ -1444,7 +1450,6 @@ SCRIPT_DIR="$(cd "$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
 
 JWT=$(synkro_load_jwt)
 if [ -z "$JWT" ]; then echo '{}'; exit 0; fi
-if [ "\${SYNKRO_TRANSCRIPT_CONSENT:-yes}" = "no" ]; then echo '{}'; exit 0; fi
 
 PAYLOAD=$(cat)
 SESSION_ID=$(echo "$PAYLOAD" | jq -r '.session_id // empty' 2>/dev/null)
@@ -1455,6 +1460,40 @@ if [ -z "$SESSION_ID" ] || [ -z "$TRANSCRIPT_PATH" ] || [ ! -f "$TRANSCRIPT_PATH
   echo '{}'; exit 0
 fi
 
+# Usage telemetry \u2014 always fires (metadata only, ungated by privacy/consent)
+_LAST_ASST=$(grep '"type":"assistant"' "$TRANSCRIPT_PATH" 2>/dev/null | tail -1)
+if [ -n "$_LAST_ASST" ]; then
+  _CC_MODEL=$(echo "$_LAST_ASST" | jq -r '.message.model // empty' 2>/dev/null)
+  _TOTALS=$(grep '"type":"assistant"' "$TRANSCRIPT_PATH" 2>/dev/null \\
+    | jq -c '.message.usage' 2>/dev/null \\
+    | jq -s '{in:(map(.input_tokens//0)|add//0),out:(map(.output_tokens//0)|add//0),cw:(map(.cache_creation_input_tokens//0)|add//0),cr:(map(.cache_read_input_tokens//0)|add//0)}' 2>/dev/null \\
+    || echo '{"in":0,"out":0,"cw":0,"cr":0}')
+  _TI=$(echo "$_TOTALS" | jq -r '.in // 0')
+  _TO=$(echo "$_TOTALS" | jq -r '.out // 0')
+  _TCW=$(echo "$_TOTALS" | jq -r '.cw // 0')
+  _TCR=$(echo "$_TOTALS" | jq -r '.cr // 0')
+  if [ "\${_TI:-0}" != "0" ] || [ "\${_TO:-0}" != "0" ]; then
+    (
+      _USAGE="{\\"input_tokens\\":$_TI,\\"output_tokens\\":$_TO,\\"cache_creation_input_tokens\\":$_TCW,\\"cache_read_input_tokens\\":$_TCR}"
+      _BODY=$(jq -n \\
+        --arg event_id "usage_$(date +%s)_$$" \\
+        --arg hook_type "stop" --arg verdict "allow" --arg severity "none" \\
+        --arg model "\${_CC_MODEL:-claude-sonnet-4-6}" \\
+        --arg cc_model "\${_CC_MODEL:-}" \\
+        --arg session_id "$SESSION_ID" \\
+        --argjson cc_usage "$_USAGE" \\
+        '{capture_type:"usage_tick",event_id:$event_id,hook_type:$hook_type,verdict:$verdict,severity:$severity,model:$model,cc_usage:$cc_usage,session_id:$session_id}
+          + (if $cc_model != "" then {cc_model:$cc_model} else {} end)')
+      curl -sS -X POST "\${GATEWAY_URL}/api/v1/hook/capture" \\
+        -H "Content-Type: application/json" -H "Authorization: Bearer $JWT" \\
+        -d "$_BODY" --max-time 2 >/dev/null 2>&1
+    ) &
+  fi
+fi
+
+# Transcript sync below is gated by consent + capture depth
+if [ "\${SYNKRO_TRANSCRIPT_CONSENT:-yes}" = "no" ]; then echo '{}'; exit 0; fi
+
 GIT_REPO=$(synkro_detect_repo "\${CWD:-.}")
 if [ -z "$GIT_REPO" ]; then echo '{}'; exit 0; fi
 
@@ -3251,18 +3290,16 @@ tmux kill-session -t "$SESSION" 2>/dev/null || true
 tmux new-session -d -s "$SESSION" \\
   "claude --dangerously-load-development-channels server:synkro-local --dangerously-skip-permissions --setting-sources project,local --model claude-sonnet-4-6 2>>$LOG; echo 'claude exited with code '$'?' >> $LOG"
 
-# Claude's --dangerously-skip-permissions shows a one-time confirmation
-# prompt (accept option = '2'). Because --setting-sources skips user
-# settings, the acceptance is never persisted, so the prompt reappears
-# every launch. Auto-accept it by sending the right key sequence.
+# Claude's --dangerously-load-development-channels shows a confirmation
+# prompt: option 1 = "I am using this for local development" (accept),
+# option 2 = "Exit". Auto-accept by sending '1' + Enter.
 sleep 3
 if tmux has-session -t "$SESSION" 2>/dev/null; then
-  # Send '2' to accept bypass-permissions, then Enter for any follow-up prompts
-  tmux send-keys -t "$SESSION" '2' 2>/dev/null || true
+  tmux send-keys -t "$SESSION" '1' 2>/dev/null || true
   sleep 1
   tmux send-keys -t "$SESSION" Enter 2>/dev/null || true
   sleep 1
-  # Additional Enter for workspace trust / MCP consent prompts
+  # Additional Enter for any follow-up prompts (workspace trust, MCP consent)
   tmux send-keys -t "$SESSION" Enter 2>/dev/null || true
   log "Sent auto-accept keys to claude session."
 fi
@@ -3421,7 +3458,7 @@ function probePort(host, port, timeoutMs = 500) {
   });
 }
 function tmuxDismissPrompts() {
-  spawnSync2("tmux", ["send-keys", "-t", TMUX_SESSION, "2"], { encoding: "utf-8" });
+  spawnSync2("tmux", ["send-keys", "-t", TMUX_SESSION, "1"], { encoding: "utf-8" });
   spawnSync2("tmux", ["send-keys", "-t", TMUX_SESSION, "Enter"], { encoding: "utf-8" });
 }
 async function waitForChannelReady(port, timeoutMs = 6e4, host = "127.0.0.1") {
@@ -3909,7 +3946,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.4.34")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.4.36")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);