@synkro-sh/cli 1.3.44 → 1.3.46

package/dist/bootstrap.js

@@ -584,14 +584,13 @@ ensure_fresh_jwt() {
 
 ensure_fresh_jwt
 
-# Resolve tier + capture_depth (cached 60 min) \u2014 server is canonical via /cli/me.
+# Resolve tier (cached 60 min) + capture_depth (cached 2 min) via /cli/me.
 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)
-  SYNKRO_CAPTURE_DEPTH=$(cat "$CD_CACHE_FILE" 2>/dev/null)
 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 "")
@@ -617,18 +616,16 @@ if [ "$USE_LOCAL" = "true" ]; then
   # The daemon fetches the primer (Synkro IP) directly from the server at
   # startup and holds it in memory \u2014 never written to disk.
 
-  # 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 find "$RULES_CACHE" -mmin -60 2>/dev/null | grep -q .; then
+    ORG_RULES=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules" \\
+      -H "Authorization: Bearer $JWT" --max-time 3 2>/dev/null \\
+      | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
+    if [ -n "$ORG_RULES" ] && [ "$ORG_RULES" != "null" ] && [ "$ORG_RULES" != "[]" ]; then
+      printf '%s' "$ORG_RULES" > "$RULES_CACHE" 2>/dev/null || true
+    elif [ -f "$RULES_CACHE" ]; 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 \\
@@ -1083,14 +1080,13 @@ ensure_fresh_jwt() {
 ensure_fresh_jwt
 
 
-# Resolve tier + capture_depth (cached 60 min) \u2014 server is canonical via /cli/me.
+# Resolve tier (cached 60 min) + capture_depth (cached 2 min) via /cli/me.
 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)
-  SYNKRO_CAPTURE_DEPTH=$(cat "$CD_CACHE_FILE" 2>/dev/null)
 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 "")
@@ -1118,13 +1114,13 @@ if [ "$USE_LOCAL" = "true" ]; then
   RULES_CACHE="$HOME/.synkro/.rules-cache-edit"
   ORG_RULES="[]"
   if [ "$SYNKRO_CAPTURE_DEPTH" = "local_only" ]; then
-    if find "$RULES_CACHE" -mmin -60 2>/dev/null | grep -q .; then
+    ORG_RULES=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules" \\
+      -H "Authorization: Bearer $JWT" --max-time 3 2>/dev/null \\
+      | jq -c '[.rules[]? | {rule_id, text, severity, category, mode}]' 2>/dev/null || echo "[]")
+    if [ -n "$ORG_RULES" ] && [ "$ORG_RULES" != "null" ] && [ "$ORG_RULES" != "[]" ]; then
+      printf '%s' "$ORG_RULES" > "$RULES_CACHE" 2>/dev/null || true
+    elif [ -f "$RULES_CACHE" ]; 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 \\
@@ -1547,16 +1543,15 @@ fi
 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=$(curl -sS "\${GATEWAY_URL}/api/v1/cli/pr-rules" \\
+      -H "Authorization: Bearer $JWT" --max-time 3 2>/dev/null \\
+      | jq -c '[.rules[]? | {rule_id, text, severity, category}]' 2>/dev/null || echo "[]")
+    if [ -n "$ORG_RULES" ] && [ "$ORG_RULES" != "null" ] && [ "$ORG_RULES" != "[]" ]; then
+      printf '%s' "$ORG_RULES" > "$RULES_CACHE" 2>/dev/null || true
+    elif [ -f "$RULES_CACHE" ]; 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 \\
@@ -2193,7 +2188,7 @@ def log(msg):
         pass
 
 
-STALL_TIMEOUT_SEC = int(os.environ.get("SYNKRO_DAEMON_STALL_TIMEOUT", "10"))
+STALL_TIMEOUT_SEC = int(os.environ.get("SYNKRO_DAEMON_STALL_TIMEOUT", "15"))
 
 def _read_response(proc, timeout=45, stop_event=None):
     """Read stream-json from proc.stdout until a 'result' message arrives.
@@ -2353,7 +2348,7 @@ class WarmGrader:
             self._kill_proc(proc)
             proc = None
 
-        wall_limit = int(os.environ.get("SYNKRO_DAEMON_WALL_TIMEOUT", "12"))
+        wall_limit = int(os.environ.get("SYNKRO_DAEMON_WALL_TIMEOUT", "20"))
         race_timeout = min(GRADE_TIMEOUT_SEC, wall_limit)
 
         # Race a warm and a fresh cold process. Whichever returns a non-empty
@@ -2367,7 +2362,7 @@ class WarmGrader:
 
         def grade_worker(p, label):
             try:
-                _send_msg(p, prompt)
+                _send_msg(p, prompt, close_stdin=True)
                 r = _read_response(p, timeout=race_timeout, stop_event=stop_event)
                 if r:
                     result_q.put((label, r))
@@ -3859,7 +3854,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.3.44")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.3.46")}`
   ];
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
   if (safeOrgId) lines.push(`SYNKRO_ORG_ID=${shellQuoteSingle(safeOrgId)}`);