@windyroad/risk-scorer 0.13.1 → 0.13.2

package/.claude-plugin/plugin.json

@@ -310,5 +310,5 @@
     }
   },
   "name": "wr-risk-scorer",
-  "version": "0.13.1"
+  "version": "0.13.2"
 }

package/hooks/external-comms-gate.sh

@@ -185,28 +185,59 @@ except Exception:
         DRAFT=$(printf '%s' "$COMMAND" | python3 -c "
 import sys, re
 cmd = sys.stdin.read()
-# (pattern, flags) — first match wins.
+# P364: bash double-quote unescape. The double-quoted body capture groups
+# carry RAW shell-escaped command text — an orchestrator must backslash-escape
+# backticks (and \$, \", \\) inside \"...\" to survive bash parsing, e.g.
+# --body \"Fixed in \\\`code\\\` ...\". The PostToolUse mark hook hashes the
+# LOGICAL <draft> body (plain backticks), so the gate must undo those escapes
+# or the two marker keys diverge → permanent deny-after-PASS. Inside double
+# quotes a backslash is special ONLY before \$ \` \" \\ or a newline (line
+# continuation); single-quoted and <<'EOF' forms are literal and need none.
+# Single left-to-right pass so an escaped backslash adjacent to another escape
+# (\\\\\` -> backslash + backtick) is NOT mis-collapsed. chr() literals keep
+# this source free of the very metacharacters the surrounding shell double
+# quotes would otherwise eat.
+def unescape_dq(s):
+    out = []
+    i = 0
+    n = len(s)
+    special = set([chr(36), chr(96), chr(34), chr(92), chr(10)])
+    while i < n:
+        if s[i] == chr(92) and i + 1 < n and s[i + 1] in special:
+            if s[i + 1] != chr(10):
+                out.append(s[i + 1])
+            i += 2
+        else:
+            out.append(s[i])
+            i += 1
+    return ''.join(out)
+# (pattern, flags, unescape) — first match wins. unescape=True for the
+# double-quoted forms only (P364).
 patterns = [
     # HEREDOC body — matches a here-doc with EOF delimiter (quoted or
     # unquoted). The literal '<<' is written as the char-class pair
     # [<][<] so bash's command-substitution parser does NOT mis-parse
     # this regex as a real here-doc operator (P082 implementation note).
-    # DOTALL so the body can span newlines.
-    (r\"[<][<]\s*['\\\"]?EOF['\\\"]?\s*\n(.*?)\nEOF\", re.DOTALL),
+    # DOTALL so the body can span newlines. Left literal: the AI-canonical
+    # form is the quoted <<'EOF' heredoc, whose body bash does not unescape.
+    (r\"[<][<]\s*['\\\"]?EOF['\\\"]?\s*\n(.*?)\nEOF\", re.DOTALL, False),
     # gh issue/pr + npm publish --body 'TEXT' / --body \"TEXT\" (existing).
-    (r\"--body[= ]'([^']*)'\", 0),
-    (r'--body[= ]\"([^\"]*)\"', 0),
+    (r\"--body[= ]'([^']*)'\", 0, False),
+    (r'--body[= ]\"([^\"]*)\"', 0, True),
     # gh api --field summary='TEXT' / --field summary=\"TEXT\" (existing).
-    (r\"--field [a-zA-Z_]+='([^']*)'\", 0),
-    (r'--field [a-zA-Z_]+=\"([^\"]*)\"', 0),
+    (r\"--field [a-zA-Z_]+='([^']*)'\", 0, False),
+    (r'--field [a-zA-Z_]+=\"([^\"]*)\"', 0, True),
     # git commit -m / --message single-line literal forms (P082 Phase 1).
-    (r\"(?:-m|--message)[= ]'([^']*)'\", 0),
-    (r'(?:-m|--message)[= ]\"([^\"]*)\"', 0),
+    (r\"(?:-m|--message)[= ]'([^']*)'\", 0, False),
+    (r'(?:-m|--message)[= ]\"([^\"]*)\"', 0, True),
 ]
-for pat, flags in patterns:
+for pat, flags, unescape in patterns:
     m = re.search(pat, cmd, flags)
     if m:
-        print(m.group(1))
+        body = m.group(1)
+        if unescape:
+            body = unescape_dq(body)
+        print(body)
         break
 " 2>/dev/null || echo "")
         ;;

package/hooks/test/external-comms-gate.bats

@@ -316,3 +316,68 @@ run_hook() {
   [ "$status" -eq 0 ]
   [ -z "$output" ]
 }
+
+# ---------------------------------------------------------------------------
+# P364 — backtick-bearing double-quoted --body marker-key mismatch.
+# When an outbound body contains markdown backticks (a code span), the
+# orchestrator must backslash-escape them to survive bash double quotes:
+# `gh issue comment 42 --body "Fixed in \`foo\` ..."`. Before the fix the
+# gate extracted the RAW shell-escaped body (literal `\`` with backslash)
+# from the command text, while the PostToolUse mark hook hashed the LOGICAL
+# <draft> body (plain backticks). The two sha256 keys diverged → the PASS
+# marker landed at a key the gate never re-read → permanent deny-after-PASS.
+# After the fix the gate unescapes bash double-quote backslash-escapes on
+# the captured double-quoted body so its DRAFT is byte-equal to the logical
+# reviewed draft and the body-keyed marker permits. DISTINCT from P276 /
+# P010 (whitespace / frontmatter) — this is a shell-escaping-layer fix.
+# ---------------------------------------------------------------------------
+
+@test "P364: backtick-bearing double-quoted --body permits when marker keyed on the unescaped logical body" {
+  # Logical draft body (plain backticks) — what the agent wraps in <draft>
+  # and what the mark hook hashes via compute_external_comms_key.
+  LOGICAL='Fixed in `compute_external_comms_key` per the patch on Node 20.'
+  SURFACE="gh-issue-comment"
+  KEY=$(printf '%s\n%s' "$LOGICAL" "$SURFACE" | shasum -a 256 | cut -d' ' -f1)
+  touch "${RDIR}/external-comms-risk-reviewed-${KEY}"
+
+  # The orchestrator backslash-escapes the backticks to survive bash double
+  # quotes — this is the byte-different command text the gate actually sees.
+  CMD='gh issue comment 42 --body "Fixed in \`compute_external_comms_key\` per the patch on Node 20."'
+  INPUT=$(build_bash_input "$CMD")
+  run_hook "$INPUT"
+  [ "$status" -eq 0 ]
+  [ -z "$output" ]
+}
+
+@test "P364: escaped backslash adjacent to escaped backtick (\\\\\\\`) unescapes to literal backslash + backtick (single left-to-right pass)" {
+  # Adjacency edge case (architect note): \\\` is escaped-backslash THEN
+  # escaped-backtick and must unescape to a literal backslash followed by a
+  # literal backtick — NOT mis-collapsed. The logical body therefore carries
+  # one backslash then one backtick.
+  LOGICAL=$'edge: \\`token here'
+  SURFACE="gh-issue-comment"
+  KEY=$(printf '%s\n%s' "$LOGICAL" "$SURFACE" | shasum -a 256 | cut -d' ' -f1)
+  touch "${RDIR}/external-comms-risk-reviewed-${KEY}"
+
+  # Command text carries \\\` (escaped backslash + escaped backtick).
+  CMD='gh issue comment 42 --body "edge: \\\`token here"'
+  INPUT=$(build_bash_input "$CMD")
+  run_hook "$INPUT"
+  [ "$status" -eq 0 ]
+  [ -z "$output" ]
+}
+
+@test "P364: single-quoted --body with literal backticks stays literal (no unescaping applied)" {
+  # Inside single quotes bash does NOT process backslashes or backticks, so
+  # the orchestrator writes plain backticks and the captured body already
+  # equals the logical draft. The fix must NOT alter the single-quote path.
+  LOGICAL='Fixed in `plain_span` here.'
+  SURFACE="gh-issue-comment"
+  KEY=$(printf '%s\n%s' "$LOGICAL" "$SURFACE" | shasum -a 256 | cut -d' ' -f1)
+  touch "${RDIR}/external-comms-risk-reviewed-${KEY}"
+
+  INPUT=$(build_bash_input "gh issue comment 42 --body 'Fixed in \`plain_span\` here.'")
+  run_hook "$INPUT"
+  [ "$status" -eq 0 ]
+  [ -z "$output" ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/risk-scorer",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "Pipeline risk scoring, commit/push gates, and secret leak detection",
   "bin": {
     "windyroad-risk-scorer": "./bin/install.mjs"