@rubytech/create-maxy-code 0.1.492 → 0.1.494

package/payload/platform/plugins/cloudflare/mcp/__tests__/portal-index-push.test.ts

@@ -309,13 +309,85 @@ function generationClient() {
         return []
       }
       if (/DELETE FROM directory\b/i.test(sql)) {
-        const keep = Number(params[1])
-        for (let i = rows.length - 1; i >= 0; i--) {
-          if (rows[i].generation !== keep) rows.splice(i, 1)
+        const g = Number(params[1])
+        // Two DELETE shapes reach this client: the post-flip sweep removes
+        // every OTHER generation (`generation != ?`); the pre-stage clear
+        // (Task 1923) removes exactly THIS generation (`generation = ?`).
+        if (/generation\s*!=\s*\?/i.test(sql)) {
+          for (let i = rows.length - 1; i >= 0; i--) if (rows[i].generation !== g) rows.splice(i, 1)
+        } else {
+          for (let i = rows.length - 1; i >= 0; i--) if (rows[i].generation === g) rows.splice(i, 1)
         }
         return []
       }
       if (/SELECT COUNT/i.test(sql)) {
+        // The pre-stage orphan count (Task 1923) filters `generation = ?`; the
+        // verify count joins the pointer. Only the former binds a generation.
+        if (/generation\s*=\s*\?/i.test(sql)) {
+          const g = Number(params[1])
+          return [{ n: rows.filter((r) => r.generation === g).length }]
+        }
+        return [{ n: rows.filter((r) => r.generation === pointer).length }]
+      }
+      return []
+    },
+  }
+}
+
+// The wedge Task 1923 fixes: a stage that half-completed on a D1 500 leaves
+// orphan rows at the NEXT generation while the pointer stays at current. This
+// client models the one property that turns that into a permanent freeze — the
+// D1 UNIQUE(accountId, relPath, generation) constraint — by throwing on a
+// colliding INSERT, exactly as every later cycle's first re-stage did.
+function wedgeableClient(seed: { pointer: number; current?: string[]; orphans: string[] }) {
+  const calls: { sql: string; params: unknown[] }[] = []
+  const rows: { accountId: string; relPath: string; generation: number }[] = []
+  let pointer: number | null = seed.pointer
+  const orphanGen = seed.pointer + 1
+  // The last good tree the pointer names, present in a real wedge alongside the
+  // orphans. Seeding it proves the pre-stage clear scopes to `next` and leaves
+  // the reader-visible current generation untouched.
+  for (const relPath of seed.current ?? []) rows.push({ accountId: 'acc-1', relPath, generation: seed.pointer })
+  for (const relPath of seed.orphans) rows.push({ accountId: 'acc-1', relPath, generation: orphanGen })
+  return {
+    calls,
+    rows,
+    pointerValue: () => pointer,
+    async query(sql: string, params: unknown[] = []) {
+      calls.push({ sql, params })
+      if (/SELECT\s+currentGeneration/i.test(sql)) {
+        return pointer === null ? [] : [{ currentGeneration: pointer }]
+      }
+      if (/INSERT INTO directory_state|UPDATE directory_state/i.test(sql)) {
+        pointer = Number(params[1] ?? params[0])
+        return []
+      }
+      if (/INSERT INTO directory \(/i.test(sql)) {
+        const accountId = String(params[0])
+        const relPath = String(params[1])
+        const generation = Number(params[6])
+        if (rows.some((r) => r.accountId === accountId && r.relPath === relPath && r.generation === generation)) {
+          throw new Error(
+            'd1 query failed: HTTP 500 — UNIQUE constraint failed: directory.accountId, directory.relPath, directory.generation',
+          )
+        }
+        rows.push({ accountId, relPath, generation })
+        return []
+      }
+      if (/DELETE FROM directory\b/i.test(sql)) {
+        const g = Number(params[1])
+        if (/generation\s*!=\s*\?/i.test(sql)) {
+          for (let i = rows.length - 1; i >= 0; i--) if (rows[i].generation !== g) rows.splice(i, 1)
+        } else {
+          for (let i = rows.length - 1; i >= 0; i--) if (rows[i].generation === g) rows.splice(i, 1)
+        }
+        return []
+      }
+      if (/SELECT COUNT/i.test(sql)) {
+        if (/generation\s*=\s*\?/i.test(sql)) {
+          const g = Number(params[1])
+          return [{ n: rows.filter((r) => r.generation === g).length }]
+        }
         return [{ n: rows.filter((r) => r.generation === pointer).length }]
       }
       return []
@@ -323,6 +395,42 @@ function generationClient() {
   }
 }
 
+describe('a partial stage self-heals (Task 1923)', () => {
+  it('clears orphans at the next generation, flips onto it, and logs stage-clear', async () => {
+    // Pointer at 5 naming the last good tree; three orphan rows already at
+    // generation 6 for relPaths the current walk re-stages ('output' is the
+    // walk's first row, so the current code's first INSERT is the one that
+    // collides). Without the pre-stage clear that INSERT throws on the UNIQUE
+    // constraint and the push fails, which is what froze gls-data for ~6 h on
+    // 2026-07-22.
+    const c = wedgeableClient({
+      pointer: 5,
+      current: ['output', 'output/report.pdf', 'quotes', 'quotes/CR2969'],
+      orphans: ['output', 'output/report.pdf', 'quotes'],
+    })
+    const lines: string[] = []
+    const r = await push(c, { log: (l: string) => lines.push(l) })
+
+    expect(r.rows).toBe(7)
+    expect(c.pointerValue()).toBe(6)
+    // Nothing survives at a generation the pointer does not name.
+    expect(c.rows.every((row) => row.generation === 6)).toBe(true)
+    const clear = lines.find((l) => l.includes('op=stage-clear'))!
+    expect(clear).toContain('account=acc-1')
+    expect(clear).toContain('generation=6')
+    // Exactly the 3 orphans at generation 6, not the 4 current-tree rows the
+    // pointer names: the clear scopes to `next`, never to a reader-visible row.
+    expect(clear).toContain('cleared=3')
+  })
+
+  it('emits no stage-clear line on a clean cycle with no orphans', async () => {
+    const c = wedgeableClient({ pointer: 5, orphans: [] })
+    const lines: string[] = []
+    await push(c, { log: (l: string) => lines.push(l) })
+    expect(lines.some((l) => l.includes('op=stage-clear'))).toBe(false)
+  })
+})
+
 describe('the index replace is atomic', () => {
   it('never issues a delete before the pointer flip', async () => {
     // The delete-then-insert window this replaces was Task 1842: a client

package/payload/platform/plugins/cloudflare/mcp/__tests__/portal-indexed-download.test.ts

@@ -60,6 +60,7 @@ const deadHead = async () => {
   throw new Error('ECONNREFUSED')
 }
 const errHead = async () => ({ ok: false, status: 502 })
+const missingHead = async () => ({ ok: false, status: 404 })
 
 describe('processIndexedDownload', () => {
   it('returns a signed url for an indexed file when the device answers', async () => {
@@ -87,6 +88,18 @@ describe('processIndexedDownload', () => {
     expect(r.payload.error).toBe('device-offline')
   })
 
+  // A live device that answers 404 means the indexed row is stale: the file was
+  // renamed or removed while the index was frozen. That is "refresh the list",
+  // not "the device is down", so it must not collapse into device-offline.
+  it('reports file-missing when a reachable device 404s the path', async () => {
+    const lines: string[] = []
+    const r = await processIndexedDownload('sess-a', PATH, makeEnv(), (l) => lines.push(l), 1000, missingHead as never)
+    expect(r.status).toBe(404)
+    expect(r.payload.error).toBe('file-missing')
+    expect(r.url).toBeUndefined()
+    expect(lines.some((l) => l.includes('result=file-missing'))).toBe(true)
+  })
+
   it('404s a path that is not in the index, without contacting the device', async () => {
     let touched = false
     const spy = async () => {

package/payload/platform/plugins/cloudflare/skills/data-portal/template/functions/api/download.ts

@@ -171,6 +171,18 @@ export async function processIndexedDownload(
   try {
     const head = await fetchFn(url, { method: 'HEAD' })
     if (!head.ok) {
+      if (head.status === 404) {
+        // The device answered, so it is not down: this row is stale. The file
+        // was renamed or removed while the index was frozen, and the device
+        // returns the same 404 for a path that is missing and one that is not
+        // exposed — so this cannot and must not try to tell those apart. The
+        // client's remedy is "refresh the list", not "wait for the device".
+        log(
+          `[data-portal] op=fetch-through owner=${q(session.ownerId)} path=${q(relPath)} ` +
+            `status=404 ms=${Date.now() - started} result=file-missing`,
+        )
+        return { status: 404, payload: { ok: false, error: 'file-missing' } }
+      }
       log(
         `[data-portal] op=fetch-through owner=${q(session.ownerId)} path=${q(relPath)} ` +
           `status=${head.status} ms=${Date.now() - started} result=device-error`,

package/payload/platform/plugins/cloudflare/skills/data-portal/template/portal.js

@@ -292,6 +292,14 @@
           say('That file is on the device, which is not reachable right now. Try again shortly.');
           return;
         }
+        /* A reachable device that 404s a stale row sends error:'file-missing'.
+           The message says refresh, not wait. Keyed on the string, so the
+           edge's own not-found 404s (not-granted, absent, is-directory) carry
+           error:'not found' and keep the generic message below. */
+        if (res.d && res.d.error === 'file-missing') {
+          say('That file is no longer available under this name. Refresh the list and try again.');
+          return;
+        }
         if (!res.d.ok || !res.d.url) {
           say('That file could not be opened.');
           return;

package/payload/platform/plugins/docs/references/internals.md

@@ -408,6 +408,8 @@ Standing rules the operator gives over a channel are `Preference` nodes. Two mec
 
 **Observability.** `[preference-write] op=reconcile … mode=<reinforce|update|contradict|new> similarity=…` — a stream of `mode=new` for subjects that already exist is the duplicate-minting signature. `[preference-inject] op=inject channel=<wa|tg|web> injected=<N> owner=<8> source=<owner|no-owner|owner-error|fetch-error>` — injection selects only the account owner's admin preferences, so `source=owner injected=0` is a genuinely empty owner, `source=no-owner` is an account with no seeded owner (injects nothing, a missed owner seeding), and `injected=0 source=owner` on an account whose owner holds rules is the write-only regression re-appearing. `[preference-audit] op=drift accountId=… storedActive=… injectedActive=… duplicateClusters=…` — the standing reconciliation audit (claude-session-manager, 5-minute tick) flags any account whose store holds more active rows than injection would surface, the no-event detector for drift.
 
+**Consult-before-send gate.** Injection (above) puts the owner's active rules in front of every channel turn, but the growing layer-2 `Preference` set is read on demand with `profile-read`, a per-turn judgement the agent can skip, the miss that dropped a customer signature on a delivered document. `hooks/preference-consult-gate.sh` (admin plugin) is the deliverable-boundary enforcement: a PreToolUse gate on customer-facing document deliverables (`browser-pdf-save`/`SendUserFile` to `memory/users/<phone>/documents/`, and email/Outlook sends carrying attachments) that blocks (exit 2) when no `profile-read` ran after the last user message in the transcript. It fires on documents only, never on casual replies. **Observability:** `[preference-gate] op=allow tool=<name> consulted=true` on an allowed document deliverable, `op=bypass tool=<name> detail=no profile-read this turn` on a block; a stream of `op=bypass` is the un-consulted-send signature. The advisory companion `hooks/preference-consult-directive.sh` injects the two-layer architecture reminder every turn (`[pref-wrapper] op=inject`). The placement half, promoting finished deliverables out of `output/` scratch, is counted by the `data-manager` reconcile audit (`scratch-refs`, `stranded`); making that audit run on a standing periodic cadence is a filed follow-up.
+
 ---
 
 ## Output Formatting and Budget

package/payload/platform/scripts/__tests__/preference-hooks-registered.test.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -uo pipefail
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIB="$DIR/../lib/provision-account-dir.sh"
+PASS=0; FAIL=0; FAILED=()
+c(){ if grep -qF "$1" "$LIB"; then PASS=$((PASS+1)); else FAIL=$((FAIL+1)); FAILED+=("$2"); fi; }
+c 'preference-consult-gate.sh' "gate registered"
+c 'preference-consult-directive.sh' "directive registered"
+c 'mcp__plugin_email_email__email-send' "email matcher present"
+c 'mcp__plugin_outlook_outlook__outlook-mail-send' "outlook matcher present"
+echo "----- $PASS passed, $FAIL failed -----"
+for f in "${FAILED[@]:-}"; do [ -n "$f" ] && echo "  $f"; done
+[ "$FAIL" -eq 0 ]

package/payload/platform/scripts/lib/__tests__/account-settings-pdf-conformance.test.sh

@@ -0,0 +1,151 @@
+#!/usr/bin/env bash
+# Regression test for account-settings-pdf-conformance.sh (Task 1929).
+#
+# The lib retrofits the quote-render PDF-conformance PostToolUse matcher onto
+# existing accounts' .claude/settings.json on every install/upgrade. Task 1922
+# added the matcher to provision-account-dir.sh, but that writer only runs at
+# account-provision time and the upgrade path re-provisions only the house
+# account -- so an account provisioned before 1922 keeps a settings.json without
+# the browser-pdf-save PostToolUse matcher and never runs the PDF gate (live
+# glsmith is such an account).
+#
+# Covers:
+#   1. Stale matcher (browser-pdf-save present, conformance cmd absent) -> updated, appended, idempotent
+#   2. Correct matcher (conformance cmd present)                        -> already-set, byte-identical
+#   3. browser-pdf-save matcher absent (broad mcp__.* present)          -> updated, matcher added, wildcard untouched
+#   4. No .hooks.PostToolUse                                            -> no-hooks, untouched
+#   5. File absent                                                      -> absent
+#   6. Malformed JSON                                                   -> rewrite-failed, untouched, no temp
+#   7. reconcile_all_accounts_pdf_conformance                          -> patches every account.json dir, skips others
+#
+# All cases assert the [backfill-1929] status token and the post-state of the file.
+
+set -u
+
+LIB="$(cd "$(dirname "$0")/.." && pwd)/account-settings-pdf-conformance.sh"
+if [ ! -f "$LIB" ]; then
+  echo "FAIL: $LIB not found" >&2
+  exit 1
+fi
+# shellcheck source=/dev/null
+. "$LIB"
+
+MATCHER='mcp__plugin_browser_browser__browser-pdf-save'
+CONFORMANCE='bash $PLATFORM_ROOT/plugins/admin/hooks/quote-render-pdf-conformance.sh'
+
+PASS=0
+FAIL=0
+TMP="$(mktemp -d)"
+trap 'rm -rf "$TMP"' EXIT
+
+ok()   { PASS=$((PASS+1)); }
+bad()  { FAIL=$((FAIL+1)); echo "FAIL: $1" >&2; }
+
+# settings.json with a PostToolUse browser-pdf-save matcher carrying the given
+# command list. Args after $1 are command strings for that matcher.
+write_settings() {
+  local file="$1"; shift
+  local cmds="" c
+  for c in "$@"; do
+    [ -n "$cmds" ] && cmds="$cmds,"
+    cmds="$cmds{\"type\":\"command\",\"command\":\"$c\"}"
+  done
+  mkdir -p "$(dirname "$file")"
+  cat > "$file" <<EOF
+{
+  "permissions": { "defaultMode": "bypassPermissions", "allow": [], "deny": [] },
+  "hooks": {
+    "PostToolUse": [
+      { "matcher": "Bash", "hooks": [ { "type": "command", "command": "bash \$P/b.sh" } ] },
+      { "matcher": "$MATCHER", "hooks": [ $cmds ] },
+      { "matcher": "mcp__.*", "hooks": [ { "type": "command", "command": "bash \$P/missing.sh" } ] }
+    ]
+  }
+}
+EOF
+}
+
+conformance_count() { grep -cF 'quote-render-pdf-conformance.sh' "$1" 2>/dev/null || true; }
+pdfmatcher_present() {
+  jq -e --arg m "$MATCHER" '.hooks.PostToolUse | any(.[]; .matcher == $m)' "$1" >/dev/null 2>&1
+}
+wildcard_present() {
+  jq -e '.hooks.PostToolUse | any(.[]; .matcher == "mcp__.*")' "$1" >/dev/null 2>&1
+}
+
+# --- 1. stale matcher -> updated, then idempotent ---------------------------
+F="$TMP/stale/.claude/settings.json"
+write_settings "$F"
+OUT="$(ensure_pdf_conformance_matcher "$F")"
+case "$OUT" in *status=updated*) ok;; *) bad "1a stale should be updated, got: $OUT";; esac
+[ "$(conformance_count "$F")" -eq 1 ] && ok || bad "1b conformance not appended (count=$(conformance_count "$F"))"
+OUT2="$(ensure_pdf_conformance_matcher "$F")"
+case "$OUT2" in *status=already-set*) ok;; *) bad "1c re-run should be already-set, got: $OUT2";; esac
+[ "$(conformance_count "$F")" -eq 1 ] && ok || bad "1d conformance duplicated on re-run (count=$(conformance_count "$F"))"
+
+# --- 2. correct matcher -> already-set, byte-identical ----------------------
+F="$TMP/good/.claude/settings.json"
+write_settings "$F" "$CONFORMANCE"
+BEFORE="$(cat "$F")"
+OUT="$(ensure_pdf_conformance_matcher "$F")"
+case "$OUT" in *status=already-set*) ok;; *) bad "2a good should be already-set, got: $OUT";; esac
+[ "$BEFORE" = "$(cat "$F")" ] && ok || bad "2b already-set file was rewritten"
+
+# --- 3. browser-pdf-save matcher absent (wildcard present) -> updated, added --
+F="$TMP/nomatcher/.claude/settings.json"
+mkdir -p "$(dirname "$F")"
+cat > "$F" <<'EOF'
+{ "permissions": {}, "hooks": { "PostToolUse": [
+  { "matcher": "Bash", "hooks": [] },
+  { "matcher": "mcp__.*", "hooks": [ { "type": "command", "command": "bash $P/missing.sh" } ] }
+] } }
+EOF
+OUT="$(ensure_pdf_conformance_matcher "$F")"
+case "$OUT" in *status=updated*) ok;; *) bad "3a nomatcher should be updated, got: $OUT";; esac
+pdfmatcher_present "$F" && ok || bad "3b browser-pdf-save matcher not added"
+[ "$(conformance_count "$F")" -eq 1 ] && ok || bad "3c conformance missing after add"
+wildcard_present "$F" && ok || bad "3d wildcard matcher was disturbed"
+# added matcher carries exactly the one conformance command
+if jq -e --arg m "$MATCHER" '.hooks.PostToolUse[] | select(.matcher==$m) | .hooks | length == 1' "$F" >/dev/null 2>&1; then ok; else bad "3e added matcher should carry exactly one command"; fi
+
+# --- 4. no PostToolUse -> no-hooks, untouched -------------------------------
+F="$TMP/nohooks/.claude/settings.json"
+mkdir -p "$(dirname "$F")"
+echo '{ "permissions": {}, "hooks": {} }' > "$F"
+BEFORE="$(cat "$F")"
+OUT="$(ensure_pdf_conformance_matcher "$F")"
+case "$OUT" in *status=no-hooks*) ok;; *) bad "4a should be no-hooks, got: $OUT";; esac
+[ "$BEFORE" = "$(cat "$F")" ] && ok || bad "4b no-hooks file was rewritten"
+
+# --- 5. file absent -> absent ------------------------------------------------
+OUT="$(ensure_pdf_conformance_matcher "$TMP/does-not-exist/.claude/settings.json")"
+case "$OUT" in *status=absent*) ok;; *) bad "5 should be absent, got: $OUT";; esac
+
+# --- 6. malformed JSON -> rewrite-failed, untouched -------------------------
+F="$TMP/bad/.claude/settings.json"
+mkdir -p "$(dirname "$F")"
+printf '{ this is not json ' > "$F"
+BEFORE="$(cat "$F")"
+OUT="$(ensure_pdf_conformance_matcher "$F")"
+case "$OUT" in *status=rewrite-failed*) ok;; *) bad "6a malformed should be rewrite-failed, got: $OUT";; esac
+[ "$BEFORE" = "$(cat "$F")" ] && ok || bad "6b malformed file was mutated"
+[ ! -e "$F.1929.tmp" ] && ok || bad "6c temp file left behind"
+
+# --- 7. reconcile_all_accounts_pdf_conformance ------------------------------
+ROOT="$TMP/accts"
+mkdir -p "$ROOT/acctA/.claude" "$ROOT/acctB/.claude" "$ROOT/notanaccount/.claude"
+echo '{"role":"house"}'  > "$ROOT/acctA/account.json"
+echo '{"role":"client"}' > "$ROOT/acctB/account.json"
+# notanaccount has no account.json -> must be skipped
+write_settings "$ROOT/acctA/.claude/settings.json"
+write_settings "$ROOT/acctB/.claude/settings.json" "$CONFORMANCE"
+write_settings "$ROOT/notanaccount/.claude/settings.json"
+RECOUT="$(reconcile_all_accounts_pdf_conformance "$ROOT")"
+[ "$(conformance_count "$ROOT/acctA/.claude/settings.json")" -eq 1 ] && ok || bad "7a acctA not patched"
+[ "$(conformance_count "$ROOT/acctB/.claude/settings.json")" -eq 1 ] && ok || bad "7b acctB disturbed"
+[ "$(conformance_count "$ROOT/notanaccount/.claude/settings.json")" -eq 0 ] && ok || bad "7c non-account dir was patched"
+case "$RECOUT" in *acctA*status=updated*) ok;; *) bad "7d reconcile did not log acctA updated";; esac
+
+echo "----------------------------------------"
+echo "PASS=$PASS FAIL=$FAIL"
+[ "$FAIL" -eq 0 ]

package/payload/platform/scripts/lib/account-settings-pdf-conformance.sh

@@ -0,0 +1,98 @@
+# account-settings-pdf-conformance.sh — retrofit the quote-render PDF-conformance
+# PostToolUse matcher onto existing accounts' .claude/settings.json. Task 1929.
+#
+# Task 1922 added a PostToolUse matcher on the browser-pdf-save tool running
+# quote-render-pdf-conformance.sh to provision-account-dir.sh. That writer only
+# runs at account-provision time; the upgrade path re-provisions the house
+# account but NOT existing client sub-accounts, so any account provisioned before
+# 1922 keeps a settings.json without the matcher and never runs the PDF gate
+# (live glsmith is such an account). This lib is the standing backfill:
+# setup-account.sh reconciles every account on every install so the gate reaches
+# pre-1922 accounts. Mirrors account-settings-askgate.sh (Task 1683).
+#
+# Requires jq. Idempotent. Never echoes file contents. Fail-open (nudge, not
+# brick): any unusable file logs a status and is left untouched.
+#
+# Sourced by setup-account.sh; also runnable standalone for a manual repair.
+
+# The exact command string provision-account-dir.sh writes. $PLATFORM_ROOT is a
+# literal in the settings file, resolved by Claude Code at hook-run time.
+_PDF_CONFORMANCE_MATCHER='mcp__plugin_browser_browser__browser-pdf-save'
+_PDF_CONFORMANCE_CMD='bash $PLATFORM_ROOT/plugins/admin/hooks/quote-render-pdf-conformance.sh'
+
+# ensure_pdf_conformance_matcher <settings_file>
+# Guarantees the PostToolUse browser-pdf-save matcher carries the conformance
+# command: appends it if the matcher exists without it, or adds the whole matcher
+# (single conformance command) if the matcher is absent. Logs exactly one
+# `[backfill-1929] file=<f> status=<absent|no-hooks|already-set|updated|rewrite-failed>`
+# to stdout. Always returns 0.
+ensure_pdf_conformance_matcher() {
+  local f="$1"
+  if [ ! -f "$f" ]; then
+    echo "[backfill-1929] file=$f status=absent"
+    return 0
+  fi
+  # Patchable only when the file is valid JSON with a PostToolUse array.
+  if ! jq -e '.hooks.PostToolUse | type == "array"' "$f" >/dev/null 2>&1; then
+    if jq -e . "$f" >/dev/null 2>&1; then
+      echo "[backfill-1929] file=$f status=no-hooks"
+    else
+      echo "[backfill-1929] file=$f status=rewrite-failed"
+    fi
+    return 0
+  fi
+  local tmp="$f.1929.tmp"
+  if ! jq \
+      --arg matcher "$_PDF_CONFORMANCE_MATCHER" \
+      --arg cmd "$_PDF_CONFORMANCE_CMD" '
+      .hooks.PostToolUse |= (
+        if any(.[]; .matcher == $matcher)
+        then map(
+          if .matcher == $matcher
+          then .hooks = (
+                 if any(.hooks[]; .command == $cmd)
+                 then .hooks
+                 else .hooks + [{type: "command", command: $cmd}]
+                 end)
+          else . end)
+        else . + [{matcher: $matcher, hooks: [{type: "command", command: $cmd}]}]
+        end)
+    ' "$f" > "$tmp" 2>/dev/null; then
+    rm -f "$tmp"
+    echo "[backfill-1929] file=$f status=rewrite-failed"
+    return 0
+  fi
+  # Semantic no-op? Compare canonical forms; leave the file byte-identical if so.
+  # `|| true` keeps a jq failure here (e.g. $f truncated by a concurrent writer
+  # between the type-check above and this read) from tripping a caller's `set -e`
+  # and aborting the whole install. This lib is fail-open by contract.
+  local before after
+  before="$(jq -S . "$f" 2>/dev/null || true)"
+  after="$(jq -S . "$tmp" 2>/dev/null || true)"
+  if [ "$before" = "$after" ]; then
+    rm -f "$tmp"
+    echo "[backfill-1929] file=$f status=already-set"
+    return 0
+  fi
+  if mv "$tmp" "$f"; then
+    echo "[backfill-1929] file=$f status=updated"
+  else
+    rm -f "$tmp"
+    echo "[backfill-1929] file=$f status=rewrite-failed"
+  fi
+  return 0
+}
+
+# reconcile_all_accounts_pdf_conformance <accounts_dir>
+# Standing check + backfill: every account dir with an account.json gets its
+# PostToolUse browser-pdf-save matcher's conformance command ensured. Mirrors
+# reconcile_all_accounts_askgate.
+reconcile_all_accounts_pdf_conformance() {
+  local accts="$1"
+  [ -d "$accts" ] || return 0
+  local acct
+  for acct in "$accts"/*/; do
+    [ -f "$acct/account.json" ] || continue
+    ensure_pdf_conformance_matcher "$acct/.claude/settings.json"
+  done
+}

package/payload/platform/scripts/lib/provision-account-dir.sh

@@ -113,6 +113,18 @@ provision_account_dir() {
         "hooks": [
           { "type": "command", "command": "bash $HOOKS_PATH/quote-render-gate.sh" }
         ]
+      },
+      {
+        "matcher": "mcp__plugin_browser_browser__browser-pdf-save",
+        "hooks": [
+          { "type": "command", "command": "bash $HOOKS_PATH/preference-consult-gate.sh" }
+        ]
+      },
+      {
+        "matcher": "mcp__plugin_email_email__email-send|mcp__plugin_email_email__email-reply|mcp__plugin_email_email__email-draft-send|mcp__plugin_outlook_outlook__outlook-mail-send|mcp__plugin_outlook_outlook__outlook-mail-reply|mcp__plugin_outlook_outlook__outlook-draft-send|SendUserFile",
+        "hooks": [
+          { "type": "command", "command": "bash $HOOKS_PATH/preference-consult-gate.sh" }
+        ]
       }
     ],
     "PostToolUse": [
@@ -128,6 +140,12 @@ provision_account_dir() {
           { "type": "command", "command": "bash $HOOKS_PATH/post-tool-use-agent.sh" }
         ]
       },
+      {
+        "matcher": "mcp__plugin_browser_browser__browser-pdf-save",
+        "hooks": [
+          { "type": "command", "command": "bash $HOOKS_PATH/quote-render-pdf-conformance.sh" }
+        ]
+      },
       {
         "matcher": "mcp__.*__.*-(export|import)-parse$",
         "hooks": [
@@ -158,7 +176,8 @@ provision_account_dir() {
         "hooks": [
           { "type": "command", "command": "bash $HOOKS_PATH/archive-ingest-surface-gate.sh" },
           { "type": "command", "command": "bash $HOOKS_PATH/prompt-optimiser-directive.sh" },
-          { "type": "command", "command": "bash $HOOKS_PATH/datetime-inject.sh" }
+          { "type": "command", "command": "bash $HOOKS_PATH/datetime-inject.sh" },
+          { "type": "command", "command": "bash $HOOKS_PATH/preference-consult-directive.sh" }
         ]
       }
     ],

package/payload/platform/scripts/setup-account.sh

@@ -36,6 +36,8 @@ ACCOUNTS_DIR="$INSTALL_DIR/data/accounts"
 . "$SCRIPT_DIR/lib/provision-account-dir.sh"
 # shellcheck source=lib/account-settings-askgate.sh
 . "$SCRIPT_DIR/lib/account-settings-askgate.sh"
+# shellcheck source=lib/account-settings-pdf-conformance.sh
+. "$SCRIPT_DIR/lib/account-settings-pdf-conformance.sh"
 # shellcheck source=lib/read-brand-json.sh
 . "$SCRIPT_DIR/lib/read-brand-json.sh"
 # Resolve brand-aware persistent users.json path before the resolver runs.
@@ -77,3 +79,14 @@ reconcile_all_accounts_owned_dirs "$ACCOUNTS_DIR"
 # so the gate reaches pre-1552 accounts. Idempotent; logs one [backfill-1683] line
 # per account.
 reconcile_all_accounts_askgate "$ACCOUNTS_DIR"
+
+# ------------------------------------------------------------------
+# 5. Retrofit the quote-render PDF-conformance matcher onto every account
+# ------------------------------------------------------------------
+# Standing check + durable backfill (Task 1929): provision_account_dir writes the
+# PostToolUse browser-pdf-save matcher (quote-render-pdf-conformance.sh) only at
+# provision time, and this script re-provisions only the house account. An
+# account created before Task 1922 keeps a settings.json without the matcher and
+# never runs the PDF gate. Reconcile every account on every install so the gate
+# reaches pre-1922 accounts. Idempotent; logs one [backfill-1929] line per account.
+reconcile_all_accounts_pdf_conformance "$ACCOUNTS_DIR"

package/payload/platform/services/claude-session-manager/dist/http-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../src/http-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../src/http-server.ts"],"names":[],"mappings":"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"}

package/payload/platform/services/claude-session-manager/dist/http-server.js

@@ -2071,6 +2071,10 @@ export function buildHttpApp(deps) {
         }
         const byte = body.byte;
         const trigger = typeof body.trigger === 'string' ? body.trigger : 'manual';
+        // Task 1920 — the stop button sets escalate:true so that when ESC proves
+        // ineffective (turn blocked in a tool/subagent call) the manager escalates
+        // once to Ctrl-C. Absent/false keeps the ESC-only re-send path.
+        const escalate = body.escalate === true;
         const intId = `${sessionId.slice(0, 8)}-${start}`;
         deps.logger(`[webchat-interrupt] op=interrupt-requested intId=${intId} sessionId=${sessionId.slice(0, 8)} trigger=${trigger}`);
         const result = writeInterruptToPty(sessionId, byte, deps.logger);
@@ -2115,6 +2119,11 @@ export function buildHttpApp(deps) {
         let lastSendAt = sentAt;
         let escSends = 1; // the initial ESC already written above
         let canResend = true;
+        // Task 1920 — the one-shot escalation guard. Seed it from the initial byte:
+        // if the pre-loop write above already sent Ctrl-C (byte='ctrl-c'), the loop
+        // must not send a second one. The invariant is "exactly one Ctrl-C ever per
+        // call" because a second SIGINT can exit the CLI and kill the session.
+        let ctrlCSent = byte === 'ctrl-c';
         while (Date.now() - sentAt < stopMs) {
             const st = deps.watcher.getBySessionId(sessionId)?.status;
             if (st !== 'busy') {
@@ -2122,14 +2131,34 @@ export function buildHttpApp(deps) {
                 break;
             }
             if (canResend && Date.now() - lastSendAt >= reescalateMs) {
-                const re = writeInterruptToPty(sessionId, byte, deps.logger);
-                lastSendAt = Date.now();
-                if (re.ok) {
-                    escSends += 1;
-                    deps.logger(`[webchat-interrupt] op=interrupt-reescalated intId=${intId} sends=${escSends}`);
+                if (escalate) {
+                    // Task 1920 — ESC ran for a full sub-window while still busy, so it is
+                    // ineffective (turn blocked in a tool/subagent call). Escalate once to
+                    // Ctrl-C (SIGINT reaches the harness mid-tool-call); never a second
+                    // time — a second SIGINT can exit the CLI and kill the session. After
+                    // the one Ctrl-C, stop sending and just poll for busy-clear.
+                    if (!ctrlCSent) {
+                        const esc = writeInterruptToPty(sessionId, 'ctrl-c', deps.logger);
+                        lastSendAt = Date.now();
+                        if (esc.ok) {
+                            ctrlCSent = true;
+                            deps.logger(`[webchat-interrupt] op=interrupt-escalated intId=${intId} mechanism=ctrl-c sends=${escSends + 1}`);
+                        }
+                        else {
+                            canResend = false; // child vanished mid-interrupt; the next status read exits the loop
+                        }
+                    }
                 }
                 else {
-                    canResend = false; // child vanished mid-interrupt; the next status read exits the loop
+                    const re = writeInterruptToPty(sessionId, byte, deps.logger);
+                    lastSendAt = Date.now();
+                    if (re.ok) {
+                        escSends += 1;
+                        deps.logger(`[webchat-interrupt] op=interrupt-reescalated intId=${intId} sends=${escSends}`);
+                    }
+                    else {
+                        canResend = false; // child vanished mid-interrupt; the next status read exits the loop
+                    }
                 }
             }
             await new Promise((r) => setTimeout(r, 120));