@synkro-sh/cli 1.3.30 → 1.3.32

package/dist/bootstrap.js

@@ -602,9 +602,34 @@ fi
 if [ "$USE_LOCAL" = "true" ]; then
   # \u2500\u2500\u2500 FREE TIER: grade via the persistent claude daemon (mode=bash). \u2500\u2500\u2500
 
-  # Fetch org guardrail rules relevant to this command (skip in local_only \u2014 no content leaves device).
+  # Refresh primer if older than 24h (server-side IP, fetched on demand).
+  PRIMER_FILE="$HOME/.synkro/grader-primer-bash.txt"
+  if [ ! -f "$PRIMER_FILE" ] || ! find "$PRIMER_FILE" -mmin -1440 2>/dev/null | grep -q .; then
+    NEW_PRIMER=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/judge-prompts" \\
+      -H "Authorization: Bearer $JWT" --max-time 3 2>/dev/null \\
+      | jq -r '.grader_primer_bash // empty' 2>/dev/null || echo "")
+    if [ -n "$NEW_PRIMER" ]; then
+      printf '%s' "$NEW_PRIMER" > "$PRIMER_FILE" 2>/dev/null || true
+      # Kill the daemon so it restarts with the fresh primer.
+      DAEMON_PID_FILE="$HOME/.synkro/daemon/bash/daemon.pid"
+      [ -f "$DAEMON_PID_FILE" ] && kill -TERM "$(cat "$DAEMON_PID_FILE" 2>/dev/null)" 2>/dev/null || true
+    fi
+  fi
+
+  # Fetch org guardrail rules. In local_only mode use GET (no command leaks);
+  # in other modes use POST with content for embedding-based top_k matching.
+  RULES_CACHE="$HOME/.synkro/.rules-cache-bash"
   ORG_RULES="[]"
-  if [ "$SYNKRO_CAPTURE_DEPTH" != "local_only" ]; then
+  if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ]; then
+    if find "$RULES_CACHE" -mmin -60 2>/dev/null | grep -q .; then
+      ORG_RULES=$(cat "$RULES_CACHE" 2>/dev/null || echo "[]")
+    else
+      ORG_RULES=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules" \\
+        -H "Authorization: Bearer $JWT" --max-time 2 2>/dev/null \\
+        | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
+      [ -n "$ORG_RULES" ] && [ "$ORG_RULES" != "null" ] && printf '%s' "$ORG_RULES" > "$RULES_CACHE" 2>/dev/null || true
+    fi
+  else
     ORG_RULES=$(printf '%s' "$COMMAND" | head -c 4000 \\
       | jq -Rs '{content: .}' \\
       | curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules?top_k=15" \\
@@ -612,8 +637,8 @@ if [ "$USE_LOCAL" = "true" ]; then
       -H "Authorization: Bearer $JWT" \\
       -d @- --max-time 2 2>/dev/null \\
       | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
-    if [ -z "$ORG_RULES" ] || [ "$ORG_RULES" = "null" ]; then ORG_RULES="[]"; fi
   fi
+  if [ -z "$ORG_RULES" ] || [ "$ORG_RULES" = "null" ]; then ORG_RULES="[]"; fi
 
   GRADER_PROMPT_FILE=$(mktemp -t synkro-bash-prompt.XXXXXX)
   trap "rm -f \\"$GRADER_PROMPT_FILE\\"" EXIT
@@ -1029,8 +1054,31 @@ fi
 
 if [ "$USE_LOCAL" = "true" ]; then
   # \u2500\u2500\u2500 LOCAL GRADING: grade via the persistent claude daemon (Python helper).
+
+  # Refresh primer if older than 24h (server-side IP, fetched on demand).
+  PRIMER_FILE="$HOME/.synkro/grader-primer-edit.txt"
+  if [ ! -f "$PRIMER_FILE" ] || ! find "$PRIMER_FILE" -mmin -1440 2>/dev/null | grep -q .; then
+    NEW_PRIMER=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/judge-prompts" \\
+      -H "Authorization: Bearer $JWT" --max-time 3 2>/dev/null \\
+      | jq -r '.grader_primer_edit // empty' 2>/dev/null || echo "")
+    if [ -n "$NEW_PRIMER" ]; then
+      printf '%s' "$NEW_PRIMER" > "$PRIMER_FILE" 2>/dev/null || true
+      DAEMON_PID_FILE="$HOME/.synkro/daemon/edit/daemon.pid"
+      [ -f "$DAEMON_PID_FILE" ] && kill -TERM "$(cat "$DAEMON_PID_FILE" 2>/dev/null)" 2>/dev/null || true
+    fi
+  fi
+  RULES_CACHE="$HOME/.synkro/.rules-cache-edit"
   ORG_RULES="[]"
-  if [ "$SYNKRO_CAPTURE_DEPTH" != "local_only" ]; then
+  if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ]; then
+    if find "$RULES_CACHE" -mmin -60 2>/dev/null | grep -q .; then
+      ORG_RULES=$(cat "$RULES_CACHE" 2>/dev/null || echo "[]")
+    else
+      ORG_RULES=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules" \\
+        -H "Authorization: Bearer $JWT" --max-time 2 2>/dev/null \\
+        | jq -c '[.rules[]? | {rule_id, text, severity, category, mode}]' 2>/dev/null || echo "[]")
+      [ -n "$ORG_RULES" ] && [ "$ORG_RULES" != "null" ] && printf '%s' "$ORG_RULES" > "$RULES_CACHE" 2>/dev/null || true
+    fi
+  else
     ORG_RULES=$(printf '%s' "$PROPOSED" | head -c 8000 \\
       | jq -Rs '{content: .}' \\
       | curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules?top_k=20" \\
@@ -1038,8 +1086,8 @@ if [ "$USE_LOCAL" = "true" ]; then
       -H "Authorization: Bearer $JWT" \\
       -d @- --max-time 2 2>/dev/null \\
       | jq -c '[.rules[]? | {rule_id, text, severity, category, mode}]' 2>/dev/null || echo "[]")
-    if [ -z "$ORG_RULES" ] || [ "$ORG_RULES" = "null" ]; then ORG_RULES="[]"; fi
   fi
+  if [ -z "$ORG_RULES" ] || [ "$ORG_RULES" = "null" ]; then ORG_RULES="[]"; fi
 
   GRADER_PROMPT_FILE=$(mktemp -t synkro-grade.XXXXXX)
   trap "rm -f \\"$GRADER_PROMPT_FILE\\"" EXIT
@@ -1070,51 +1118,68 @@ if [ "$USE_LOCAL" = "true" ]; then
     VERDICT_JSON='{"ok":true,"violations":[]}'
   fi
 
-  LOCAL_BODY=$(jq -n \\
-    --argjson verdict "$VERDICT_JSON" \\
-    --arg file_path "$FILE_PATH" \\
-    --arg tool_name "$TOOL_NAME" \\
-    --arg content "$PROPOSED" \\
-    --arg file_before "$FILE_BEFORE" \\
-    --argjson diff "$DIFF_FIELD" \\
-    --arg user_intent "$USER_INTENT" \\
-    --argjson recent_actions "$RECENT_ACTIONS" \\
-    --arg session_id "$SESSION_ID" \\
-    --arg tool_use_id "$TOOL_USE_ID" \\
-    --arg cwd "$CWD" \\
-    --arg permission_mode "$PERMISSION_MODE" \\
-    --arg headless_flag "$HEADLESS_FLAG" \\
-    --arg repo "$GIT_REPO" \\
-    '{
-      verdict: $verdict,
-      file_path: $file_path,
-      tool_name: $tool_name,
-      content: $content,
-      file_before: (if ($file_before | length) > 0 then $file_before else null end),
-      diff: $diff,
-      user_intent: (if ($user_intent | length) > 0 then $user_intent else null end),
-      recent_actions: $recent_actions,
-      session_id: (if ($session_id | length) > 0 then $session_id else null end),
-      tool_use_id: (if ($tool_use_id | length) > 0 then $tool_use_id else null end),
-      cwd: (if ($cwd | length) > 0 then $cwd else null end),
-      permission_mode: (if ($permission_mode | length) > 0 then $permission_mode else null end),
-      headless: ($headless_flag == "1"),
-      repo: (if ($repo | length) > 0 then $repo else null end)
-    }')
-
-  RESP=$(curl -sS -X POST "\${GATEWAY_URL}/api/v1/precheck-edit/local-verdict" \\
-    -H "Content-Type: application/json" \\
-    -H "Authorization: Bearer $JWT" \\
-    -d "$LOCAL_BODY" \\
-    --max-time 5 2>/dev/null || echo "")
+  if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ]; then
+    # No file content / diff / intent / actions leave the device. Synthesize
+    # the hook response from the local verdict only.
+    OK=$(echo "$VERDICT_JSON" | jq -r '.ok // true' 2>/dev/null)
+    if [ "$OK" = "false" ]; then
+      FIRST_REASON=$(echo "$VERDICT_JSON" | jq -r '.violations[0].reason // "policy violation"' 2>/dev/null)
+      RULE_ID=$(echo "$VERDICT_JSON" | jq -r '.violations[0].rule_id // "local_violation"' 2>/dev/null)
+      if [ "$IS_HEADLESS" = "1" ]; then DEC="deny"; else DEC="ask"; fi
+      RESP=$(jq -n \\
+        --arg dec "$DEC" \\
+        --arg reason "[synkro] $RULE_ID: $FIRST_REASON" \\
+        '{ hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: $dec, permissionDecisionReason: $reason, additionalContext: $reason }, reason: $reason }')
+    else
+      RESP=$(jq -n '{ hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: "allow" }, reason: "" }')
+    fi
+  else
+    LOCAL_BODY=$(jq -n \\
+      --argjson verdict "$VERDICT_JSON" \\
+      --arg file_path "$FILE_PATH" \\
+      --arg tool_name "$TOOL_NAME" \\
+      --arg content "$PROPOSED" \\
+      --arg file_before "$FILE_BEFORE" \\
+      --argjson diff "$DIFF_FIELD" \\
+      --arg user_intent "$USER_INTENT" \\
+      --argjson recent_actions "$RECENT_ACTIONS" \\
+      --arg session_id "$SESSION_ID" \\
+      --arg tool_use_id "$TOOL_USE_ID" \\
+      --arg cwd "$CWD" \\
+      --arg permission_mode "$PERMISSION_MODE" \\
+      --arg headless_flag "$HEADLESS_FLAG" \\
+      --arg repo "$GIT_REPO" \\
+      '{
+        verdict: $verdict,
+        file_path: $file_path,
+        tool_name: $tool_name,
+        content: $content,
+        file_before: (if ($file_before | length) > 0 then $file_before else null end),
+        diff: $diff,
+        user_intent: (if ($user_intent | length) > 0 then $user_intent else null end),
+        recent_actions: $recent_actions,
+        session_id: (if ($session_id | length) > 0 then $session_id else null end),
+        tool_use_id: (if ($tool_use_id | length) > 0 then $tool_use_id else null end),
+        cwd: (if ($cwd | length) > 0 then $cwd else null end),
+        permission_mode: (if ($permission_mode | length) > 0 then $permission_mode else null end),
+        headless: ($headless_flag == "1"),
+        repo: (if ($repo | length) > 0 then $repo else null end)
+      }')
 
-  if echo "$RESP" | grep -qE '"detail":"Token has expired|"detail":"Invalid or expired token'; then
-    if refresh_jwt; then
-      RESP=$(curl -sS -X POST "\${GATEWAY_URL}/api/v1/precheck-edit/local-verdict" \\
-        -H "Content-Type: application/json" \\
-        -H "Authorization: Bearer $JWT" \\
-        -d "$LOCAL_BODY" \\
-        --max-time 5 2>/dev/null || echo "")
+    RESP=$(curl -sS -X POST "\${GATEWAY_URL}/api/v1/precheck-edit/local-verdict" \\
+      -H "Content-Type: application/json" \\
+      -H "Authorization: Bearer $JWT" \\
+      -d "$LOCAL_BODY" \\
+      --max-time 5 2>/dev/null || echo "")
+
+    if echo "$RESP" | grep -qE '"detail":"Token has expired|"detail":"Invalid or expired token'; then
+      if refresh_jwt; then
+        RESP=$(curl -sS -X POST "\${GATEWAY_URL}/api/v1/precheck-edit/local-verdict" \\
+          -H "Content-Type: application/json" \\
+          -H "Authorization: Bearer $JWT" \\
+          -d "$LOCAL_BODY" \\
+          --max-time 5 2>/dev/null || echo "")
+      fi
     fi
   fi
 else
@@ -1354,32 +1419,57 @@ if [ -n "$SESSION_ID" ] && [ -n "$TOOL_USE_ID" ]; then
   ) &
 fi
 
-# Resolve tier (cached 60 min) \u2014 same logic as the other hooks.
+# Resolve tier + capture_depth (cached 60 min).
 TIER_CACHE_FILE="$HOME/.synkro/.tier-cache-\${SYNKRO_USER_ID:-default}"
+CD_CACHE_FILE="\${TIER_CACHE_FILE}.cd"
 SYNKRO_INFERENCE_TIER=""
+SYNKRO_CAPTURE_DEPTH=""
 if find "$TIER_CACHE_FILE" -mmin -60 2>/dev/null | grep -q .; then
   SYNKRO_INFERENCE_TIER=$(cat "$TIER_CACHE_FILE" 2>/dev/null || true)
+  SYNKRO_CAPTURE_DEPTH=$(cat "$CD_CACHE_FILE" 2>/dev/null || true)
 fi
 if [ -z "$SYNKRO_INFERENCE_TIER" ]; then
   ME_RESP=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/me" -H "Authorization: Bearer $JWT" --max-time 2 2>/dev/null || echo "")
   if [ -n "$ME_RESP" ]; then
     SYNKRO_INFERENCE_TIER=$(echo "$ME_RESP" | jq -r '.tier // empty' 2>/dev/null || true)
     [ -n "$SYNKRO_INFERENCE_TIER" ] && printf '%s' "$SYNKRO_INFERENCE_TIER" > "$TIER_CACHE_FILE" 2>/dev/null || true
+    SYNKRO_CAPTURE_DEPTH=$(echo "$ME_RESP" | jq -r '.capture_depth // empty' 2>/dev/null || true)
+    [ -n "$SYNKRO_CAPTURE_DEPTH" ] && printf '%s' "$SYNKRO_CAPTURE_DEPTH" > "$CD_CACHE_FILE" 2>/dev/null || true
   fi
 fi
 SYNKRO_INFERENCE_TIER="\${SYNKRO_INFERENCE_TIER:-fast}"
+SYNKRO_CAPTURE_DEPTH="\${SYNKRO_CAPTURE_DEPTH:-full}"
 
-if [ "$SYNKRO_INFERENCE_TIER" = "free" ] && command -v claude >/dev/null 2>&1; then
-  # \u2500\u2500\u2500 FREE TIER: grade via the persistent claude daemon (mode=edit). \u2500\u2500\u2500
+USE_LOCAL=false
+if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ] && command -v claude >/dev/null 2>&1; then
+  USE_LOCAL=true
+elif [ "$SYNKRO_INFERENCE_TIER" = "free" ] && command -v claude >/dev/null 2>&1; then
+  USE_LOCAL=true
+fi
 
-  # Fetch org guardrail rules relevant to this file content.
-  ORG_RULES=$(printf '%s' "$FILE_CONTENT" | head -c 8000 \\
-    | jq -Rs '{content: .}' \\
-    | curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules?top_k=20" \\
-    -X POST -H "Content-Type: application/json" \\
-    -H "Authorization: Bearer $JWT" \\
-    -d @- --max-time 2 2>/dev/null \\
-    | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
+if [ "$USE_LOCAL" = "true" ]; then
+  # \u2500\u2500\u2500 LOCAL GRADING: grade via the persistent claude daemon (mode=edit). \u2500\u2500\u2500
+
+  # In local_only: GET all rules (no content sent), cache 1h. Otherwise POST with content.
+  RULES_CACHE="$HOME/.synkro/.rules-cache-edit-capture"
+  if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ]; then
+    if find "$RULES_CACHE" -mmin -60 2>/dev/null | grep -q .; then
+      ORG_RULES=$(cat "$RULES_CACHE" 2>/dev/null || echo "[]")
+    else
+      ORG_RULES=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules" \\
+        -H "Authorization: Bearer $JWT" --max-time 2 2>/dev/null \\
+        | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
+      [ -n "$ORG_RULES" ] && [ "$ORG_RULES" != "null" ] && printf '%s' "$ORG_RULES" > "$RULES_CACHE" 2>/dev/null || true
+    fi
+  else
+    ORG_RULES=$(printf '%s' "$FILE_CONTENT" | head -c 8000 \\
+      | jq -Rs '{content: .}' \\
+      | curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules?top_k=20" \\
+      -X POST -H "Content-Type: application/json" \\
+      -H "Authorization: Bearer $JWT" \\
+      -d @- --max-time 2 2>/dev/null \\
+      | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
+  fi
   if [ -z "$ORG_RULES" ] || [ "$ORG_RULES" = "null" ]; then ORG_RULES="[]"; fi
 
   GRADER_PROMPT_FILE=$(mktemp -t synkro-edit-capture.XXXXXX)
@@ -1653,6 +1743,12 @@ CREDS_PATH="\${SYNKRO_CREDENTIALS_PATH:-$HOME/.synkro/credentials.json}"
 
 if [ ! -f "$CREDS_PATH" ]; then echo '{}'; exit 0; fi
 if [ "\${SYNKRO_TRANSCRIPT_CONSENT:-yes}" = "no" ]; then echo '{}'; exit 0; fi
+
+# Hard-skip in local_only privacy mode \u2014 conversation content must never leave the device.
+CD_CACHE_FILE="$HOME/.synkro/.tier-cache-\${SYNKRO_USER_ID:-default}.cd"
+SYNKRO_CAPTURE_DEPTH=$(cat "$CD_CACHE_FILE" 2>/dev/null || echo "full")
+if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ]; then echo '{}'; exit 0; fi
+
 JWT=$(jq -r '.access_token // empty' "$CREDS_PATH" 2>/dev/null)
 if [ -z "$JWT" ]; then echo '{}'; exit 0; fi
 
@@ -3428,12 +3524,27 @@ function ensureSynkroDir() {
   mkdirSync5(BIN_DIR, { recursive: true });
   mkdirSync5(OFFSETS_DIR, { recursive: true });
 }
-function writeGraderDaemon() {
+async function fetchGraderPrimers(gatewayUrl, token) {
+  try {
+    const resp = await fetch(`${gatewayUrl}/api/v1/cli/judge-prompts`, {
+      headers: { "Authorization": `Bearer ${token}` }
+    });
+    if (!resp.ok) throw new Error(`status ${resp.status}`);
+    const data = await resp.json();
+    if (!data.grader_primer_bash || !data.grader_primer_edit) throw new Error("missing primer fields");
+    return { bash: data.grader_primer_bash, edit: data.grader_primer_edit };
+  } catch (err) {
+    console.warn(`[synkro] primer fetch failed (${err.message}); using bundled fallback`);
+    return { bash: GRADER_PRIMER_BASH, edit: GRADER_PRIMER_EDIT };
+  }
+}
+async function writeGraderDaemon(gatewayUrl, token) {
   writeFileSync5(GRADER_DAEMON_PATH, GRADER_DAEMON_PY, "utf-8");
   chmodSync(GRADER_DAEMON_PATH, 493);
-  writeFileSync5(GRADER_PRIMER_EDIT_PATH, GRADER_PRIMER_EDIT, "utf-8");
+  const primers = await fetchGraderPrimers(gatewayUrl, token);
+  writeFileSync5(GRADER_PRIMER_EDIT_PATH, primers.edit, "utf-8");
   chmodSync(GRADER_PRIMER_EDIT_PATH, 420);
-  writeFileSync5(GRADER_PRIMER_BASH_PATH, GRADER_PRIMER_BASH, "utf-8");
+  writeFileSync5(GRADER_PRIMER_BASH_PATH, primers.bash, "utf-8");
   chmodSync(GRADER_PRIMER_BASH_PATH, 420);
 }
 function writeHookScripts() {
@@ -3491,7 +3602,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.3.30")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.3.32")}`
   ];
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
   if (safeOrgId) lines.push(`SYNKRO_ORG_ID=${shellQuoteSingle(safeOrgId)}`);
@@ -3719,7 +3830,7 @@ async function installCommand(opts = {}) {
   console.log(`  ${scripts.sessionStartScript}`);
   console.log(`  ${scripts.transcriptSyncScript}
 `);
-  writeGraderDaemon();
+  await writeGraderDaemon(gatewayUrl, token);
   for (const mode of ["edit", "bash"]) {
     const pidFile = join6(SYNKRO_DIR2, "daemon", mode, "daemon.pid");
     try {