@synkro-sh/cli 1.4.23 → 1.4.25

package/dist/bootstrap.js

@@ -499,23 +499,14 @@ synkro_channel_up() {
   (exec 3<>/dev/tcp/127.0.0.1/\${SYNKRO_CHANNEL_PORT:-8929}) 2>/dev/null && exec 3<&- 3>&-
 }
 
-# Fetch hook config (cached 5min). Sets SYNKRO_CAPTURE_DEPTH, SYNKRO_TIER, SYNKRO_RULES, SYNKRO_GRADER_PRIMER_BASH, SYNKRO_GRADER_PRIMER_EDIT, SYNKRO_CLASSIFICATION_PROMPT.
+# Fetch hook config. Sets SYNKRO_CAPTURE_DEPTH, SYNKRO_TIER, SYNKRO_RULES.
 synkro_load_config() {
-  local cache="$HOME/.synkro/.hook-config-cache"
-  if [ -f "$cache" ] && find "$cache" -mmin -5 2>/dev/null | grep -q .; then
-    . "$cache" 2>/dev/null
-    return
-  fi
   local resp
   resp=$(curl -sS "\${GATEWAY_URL}/api/v1/hook/config\${1:+?$1}" -H "Authorization: Bearer $JWT" --max-time 4 2>/dev/null || echo "")
   if [ -z "$resp" ]; then return; fi
   SYNKRO_CAPTURE_DEPTH=$(echo "$resp" | jq -r '.capture_depth // "local_only"' 2>/dev/null)
   SYNKRO_TIER=$(echo "$resp" | jq -r '.tier // "standard"' 2>/dev/null)
   SYNKRO_RULES=$(echo "$resp" | jq -c '[.rules[]? | select(.hook_stage == "pre" or .hook_stage == "both" or .hook_stage == null) | {rule_id,text,severity,category,mode}]' 2>/dev/null || echo "[]")
-  # Cache the values (SYNKRO_RULES uses single quotes to avoid expansion issues with JSON)
-  { printf 'SYNKRO_CAPTURE_DEPTH="%s"\\nSYNKRO_TIER="%s"\\n' "$SYNKRO_CAPTURE_DEPTH" "$SYNKRO_TIER"
-    printf "SYNKRO_RULES='%s'\\n" "$SYNKRO_RULES"
-  } > "$cache" 2>/dev/null || true
 }
 
 # Decide routing: "local" (grade on device) or "cloud" (POST to server)
@@ -551,13 +542,19 @@ synkro_parse_local_verdict() {
   LOCAL_REASON=$(printf '%s' "$inner" | sed -nE 's|.*<reason>(.*)</reason>.*|\\1|p' | head -1)
   [ -z "$LOCAL_REASON" ] && LOCAL_REASON=$(printf '%s' "$inner" | sed -nE 's|.*<reasoning>(.*)</reasoning>.*|\\1|p' | head -1)
   if [ "$LOCAL_OK" = "false" ]; then
-    local fv
-    fv=$(printf '%s' "$inner" | awk -v RS='</violation>' '/<violation>/{print; exit}')
-    LOCAL_RULE_ID=$(printf '%s' "$fv" | sed -nE 's|.*<rule_id>(.*)</rule_id>.*|\\1|p' | head -1)
-    [ -z "$LOCAL_REASON" ] && LOCAL_REASON=$(printf '%s' "$fv" | sed -nE 's|.*<reason>(.*)</reason>.*|\\1|p' | head -1)
-    LOCAL_SEV=$(printf '%s' "$fv" | sed -nE 's|.*<severity>(.*)</severity>.*|\\1|p' | head -1)
-    LOCAL_CAT=$(printf '%s' "$fv" | sed -nE 's|.*<category>(.*)</category>.*|\\1|p' | head -1)
+    LOCAL_RULE_ID=$(printf '%s' "$inner" | sed -nE 's|.*<rule_id>(.*)</rule_id>.*|\\1|p' | head -1)
+    LOCAL_SEV=$(printf '%s' "$inner" | sed -nE 's|.*<risk_level>(.*)</risk_level>.*|\\1|p' | head -1)
+    LOCAL_CAT=$(printf '%s' "$inner" | sed -nE 's|.*<category>(.*)</category>.*|\\1|p' | head -1)
+    if [ -z "$LOCAL_RULE_ID" ]; then
+      local fv
+      fv=$(printf '%s' "$inner" | awk -v RS='</violation>' '/<violation>/{print; exit}')
+      LOCAL_RULE_ID=$(printf '%s' "$fv" | sed -nE 's|.*<rule_id>(.*)</rule_id>.*|\\1|p' | head -1)
+      [ -z "$LOCAL_REASON" ] && LOCAL_REASON=$(printf '%s' "$fv" | sed -nE 's|.*<reason>(.*)</reason>.*|\\1|p' | head -1)
+      [ -z "$LOCAL_SEV" ] && LOCAL_SEV=$(printf '%s' "$fv" | sed -nE 's|.*<severity>(.*)</severity>.*|\\1|p' | head -1)
+      [ -z "$LOCAL_CAT" ] && LOCAL_CAT=$(printf '%s' "$fv" | sed -nE 's|.*<category>(.*)</category>.*|\\1|p' | head -1)
+    fi
     LOCAL_SEV="\${LOCAL_SEV:-high}"; LOCAL_CAT="\${LOCAL_CAT:-policy_violation}"
+    [ -z "$LOCAL_RULE_ID" ] && LOCAL_RULE_ID=$(printf '%s' "$LOCAL_REASON" | grep -oE '[Rr][0-9]{3}' | head -1)
   fi
 }
 
@@ -588,6 +585,37 @@ synkro_rule_mode() {
   echo "$m"
 }
 
+SYNKRO_CONSENT_FILE="$HOME/.synkro/.local-consent"
+
+synkro_consent_grant() {
+  local sid="$1" hash="$2"
+  printf '%s\\t%s\\tactive\\n' "$sid" "$hash" >> "$SYNKRO_CONSENT_FILE" 2>/dev/null || true
+}
+
+synkro_consent_has_active() {
+  local sid="$1" hash="$2"
+  grep -q "^$sid\\\\t$hash\\\\tactive$" "$SYNKRO_CONSENT_FILE" 2>/dev/null
+}
+
+synkro_consent_consume() {
+  local sid="$1" hash="$2"
+  [ ! -f "$SYNKRO_CONSENT_FILE" ] && return
+  local tmp="\${SYNKRO_CONSENT_FILE}.tmp"
+  sed "s/^$sid\\\\t$hash\\\\tactive$/$sid\\t$hash\\tconsumed/" "$SYNKRO_CONSENT_FILE" > "$tmp" 2>/dev/null && mv "$tmp" "$SYNKRO_CONSENT_FILE" 2>/dev/null || true
+}
+
+synkro_consent_has_consumed() {
+  local sid="$1" hash="$2"
+  grep -q "^$sid\\\\t$hash\\\\tconsumed$" "$SYNKRO_CONSENT_FILE" 2>/dev/null
+}
+
+synkro_consent_clear_consumed() {
+  local sid="$1" hash="$2"
+  [ ! -f "$SYNKRO_CONSENT_FILE" ] && return
+  local tmp="\${SYNKRO_CONSENT_FILE}.tmp"
+  grep -v "^$sid\\\\t$hash\\\\tconsumed$" "$SYNKRO_CONSENT_FILE" > "$tmp" 2>/dev/null && mv "$tmp" "$SYNKRO_CONSENT_FILE" 2>/dev/null || true
+}
+
 synkro_post_with_retry() {
   local url="$1" body="$2" timeout="\${3:-8}"
   local resp
@@ -669,11 +697,21 @@ if [ "$ROUTE" = "local" ]; then
       jq -n --arg m "$REASON" '{systemMessage: $m}'
       synkro_capture_local "bash" "warning" "\${LOCAL_SEV}" "\${LOCAL_CAT}" "$TOOL_NAME" "$GIT_REPO" "$SESSION_ID"
     else
-      if [ "$IS_HEADLESS" = "1" ]; then DEC="deny"; else DEC="ask"; fi
-      REASON="[synkro:local] bashGuard \u2192 block\${LOCAL_RULE_ID:+ ($LOCAL_RULE_ID)}: \${LOCAL_REASON:-policy violation}"
-      jq -n --arg dec "$DEC" --arg reason "$REASON" --arg ctx "$REASON" \\
-        '{hookSpecificOutput:{hookEventName:"PreToolUse",permissionDecision:$dec,permissionDecisionReason:$reason,additionalContext:$ctx}}'
-      synkro_capture_local "bash" "block" "\${LOCAL_SEV}" "\${LOCAL_CAT}" "$TOOL_NAME" "$GIT_REPO" "$SESSION_ID"
+      CMD_HASH=$(printf '%s' "$COMMAND" | shasum -a 256 | cut -c1-16)
+      if [ -n "$SESSION_ID" ] && synkro_consent_has_active "$SESSION_ID" "$CMD_HASH"; then
+        REASON="[synkro:local] bashGuard \u2192 pass (consented retry): \${LOCAL_REASON:-retrying previously consented command}"
+        jq -n --arg m "$REASON" '{systemMessage: $m}'
+        synkro_capture_local "bash" "pass" "\${LOCAL_SEV}" "\${LOCAL_CAT}" "$TOOL_NAME" "$GIT_REPO" "$SESSION_ID"
+      else
+        if [ -n "$SESSION_ID" ] && synkro_consent_has_consumed "$SESSION_ID" "$CMD_HASH"; then
+          synkro_consent_clear_consumed "$SESSION_ID" "$CMD_HASH"
+        fi
+        if [ "$IS_HEADLESS" = "1" ]; then DEC="deny"; else DEC="ask"; fi
+        REASON="[synkro:local] bashGuard \u2192 block\${LOCAL_RULE_ID:+ ($LOCAL_RULE_ID)}: \${LOCAL_REASON:-policy violation}"
+        jq -n --arg dec "$DEC" --arg reason "$REASON" --arg ctx "$REASON" \\
+          '{systemMessage:$reason,hookSpecificOutput:{hookEventName:"PreToolUse",permissionDecision:$dec,permissionDecisionReason:$reason,additionalContext:$ctx}}'
+        synkro_capture_local "bash" "block" "\${LOCAL_SEV}" "\${LOCAL_CAT}" "$TOOL_NAME" "$GIT_REPO" "$SESSION_ID"
+      fi
     fi
   else
     jq -n --arg m "[synkro:local] bashGuard \u2192 pass: \${LOCAL_REASON:-no policy violations detected}" '{systemMessage: $m}'
@@ -1191,6 +1229,19 @@ BODY=$(jq -n --arg sid "$SESSION_ID" --arg tid "$TOOL_USE_ID" \\
   --argjson err "$IS_ERROR" --arg ch "$CMD_HASH" \\
   '{capture_type:"bash_followup",session_id:$sid,tool_use_id:$tid,is_error:$err,command_hash:$ch}')
 
+# Local consent tracking: command ran = user consented
+# On success \u2192 consume (next attempt blocks fresh)
+# On failure \u2192 grant active (retry allowed)
+if [ -n "$CMD_HASH" ] && [ -n "$SESSION_ID" ]; then
+  if [ "$IS_ERROR" = "false" ]; then
+    synkro_consent_consume "$SESSION_ID" "$CMD_HASH"
+  else
+    if ! synkro_consent_has_active "$SESSION_ID" "$CMD_HASH"; then
+      synkro_consent_grant "$SESSION_ID" "$CMD_HASH"
+    fi
+  fi
+fi
+
 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 || true
@@ -1448,6 +1499,16 @@ if [ -n "$CMD" ]; then
   CMD_HASH=$(printf '%s' "$CMD" | shasum -a 256 | cut -c1-16)
 fi
 
+if [ -n "$CMD_HASH" ] && [ -n "$SESSION_ID" ]; then
+  if [ "$IS_ERROR" = "false" ]; then
+    synkro_consent_consume "$SESSION_ID" "$CMD_HASH"
+  else
+    if ! synkro_consent_has_active "$SESSION_ID" "$CMD_HASH"; then
+      synkro_consent_grant "$SESSION_ID" "$CMD_HASH"
+    fi
+  fi
+fi
+
 if [ -n "$SESSION_ID" ] && [ -n "$TOOL_USE_ID" ]; then
   (
     BODY=$(jq -n --arg sid "$SESSION_ID" --arg tid "$TOOL_USE_ID" \\
@@ -3608,7 +3669,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.4.23")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.4.25")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);