Resolve merge conflicts + review fixes for PR #2009

.claude/hooks/issues-surface.sh

@@ -32,10 +32,11 @@ source_val="$(printf '%s' "$payload" \
 rows="$(awk '
  /^## Open items/ { inopen=1; next }
  /^## / { if (inopen) inopen=0 }
- inopen && /^\| #[0-9]/ {
+ inopen && /^\| #[0-9A-HJKMNP-TV-Z]/ {
  n=split($0, c, "|")
  id=c[2]; pri=c[3]; typ=c[4]; sum=c[5]
  gsub(/^[ \t]+|[ \t]+$/, "", id)
+ sub(/[ \t]+<!--[ \t]*issue-ulid:[^>]+-->[ \t]*$/, "", id)
  gsub(/^[ \t]+|[ \t]+$/, "", pri)
  gsub(/^[ \t]+|[ \t]+$/, "", typ)
  gsub(/^[ \t]+|[ \t]+$/, "", sum)
@@ -63,10 +64,11 @@ queue_rows="$(awk '
  NR==FNR {
  if ($0 ~ /^## Open items/) { inopen=1; next }
  if ($0 ~ /^## /) { inopen=0 }
- if (inopen && $0 ~ /^\| #[0-9]/) {
+ if (inopen && $0 ~ /^\| #[0-9A-HJKMNP-TV-Z]/) {
  split($0, oc, "|")
  oid=oc[2]; odetail=oc[6]
  gsub(/^[ \t]+|[ \t]+$/, "", oid)
+ sub(/[ \t]+<!--[ \t]*issue-ulid:[^>]+-->[ \t]*$/, "", oid)
  gsub(/^[ \t]+|[ \t]+$/, "", odetail)
  detail[oid]=odetail
  }
@@ -114,7 +116,7 @@ fi
 
 # Keep the priority summary complementary to the queue instead of repeating
 # the same recommended IDs in both sections.
-queued_ids=" $(printf '%s\n' "$queue_rows" | grep -oE '#[0-9]+' | tr '\n' ' ' || true)"
+queued_ids=" $(printf '%s\n' "$queue_rows" | grep -oE '#([0-9A-HJKMNP-TV-Z]{6,16}|[0-9]{3,})' | tr '\n' ' ' || true)"
 unqueued_rows="$(printf '%s\n' "$rows" | awk -F'\t' -v queued="$queued_ids" '
  index(queued, " " $2 " ") == 0
 ' || true)"

.claude/skills/handoff/SKILL.md

@@ -63,6 +63,14 @@ force-push, or discard work.
  `head`, or another command that can mask its status. Confirm the remote tip equals local HEAD
  with `git ls-remote` before reporting success. The pre-push guards run
  (auto-merge sentinel, format, drift) — heed a block rather than overriding blindly.
+
+ **Restarting a branch whose PR already merged:** GitHub deletes the remote branch on merge,
+ so the local `origin/<branch>` ref is stale and `--force-with-lease` fails with `stale info`
+ before it ever reaches the remote. That is not a lease violation to override — run
+ `git remote prune origin` and push normally. There is nothing to force: the branch no longer
+ exists remotely, so the push creates it fresh. Observed 2026-08-14 restarting this branch
+ after PR #1944 merged.
+
 6. **Open a PR** with `gh pr create --base main`, body ending with the Claude Code
  attribution line. Write the body from `.github/pull_request_template.md` in full normal
  prose — exact `## Summary` / `## Verification` / `## Risk and rollout` / (when clinical-risk

.claude/skills/issues/SKILL.md

@@ -118,6 +118,12 @@ report that the Markdown source is current and the visual artifact is stale. Sti
 reconciliation handoff — a stale visual artifact must not invalidate a successful canonical
 transaction.
 
+**This step is unavailable off the operator's Windows machine.** The script and the artifact are
+both absolute Windows paths, so a Linux, container, or cloud session cannot run it and cannot
+verify it — the artifact drifts silently from the moment such a session reconciles. Do not
+improvise a substitute renderer or write the HTML by hand; report the register as stale, name the
+reconciliation commit that made it so, and leave the refresh to the operator.
+
 ## Persist the memory (commit)
 
 When the user explicitly asks for a commit, commit only the newly created request file(s), never

.claude/skills/newtask/SKILL.md

@@ -33,6 +33,14 @@ than opening a second branch. This is one GitHub read (`mcp__github__list_pull_r
 boundary. If GitHub is unreachable, treat it as a warning and continue — an offline session
 must still be able to start work. Recorded as `#292`.
 
+**If the PR-handoff stop hook has already armed in this session, that read is denied** — a
+session that opened its own PR and then picks up another queued item cannot call
+`list_pull_requests` or `gh pr list` at all (see `docs/pr-handoff-stop-cross-agent-gap.md`).
+Do not unlock the hook for this; fall back to `git ls-remote --heads origin`, which needs no
+provider tool and still answers the question, because a session building the same surface
+almost always has a pushed branch named after it. Report which check you used. Observed
+2026-08-14 on PR #1956.
+
 ## Steps
 
 1. **Sync main.** `git fetch --quiet origin main`.

.env.example

@@ -145,6 +145,9 @@ SENTRY_ENVIRONMENT=production
 # on the answer stream. Server emission flag; client rendering ships separately. Keep false
 # until the offline contract proof has landed and enablement is deliberately staged.
 RAG_INCREMENTAL_EVIDENCE_PREVIEW=false
+# #100 Phase 1 client rendering gate. This NEXT_PUBLIC value is inlined at build time;
+# keep it off until focused browser, accessibility, and clinical-governance proof is accepted.
+#NEXT_PUBLIC_RAG_INCREMENTAL_EVIDENCE_PREVIEW_RENDER=false
 # Ambiguity-only structured semantic reranking. Keep false until the retrieval canary is approved.
 RAG_SEMANTIC_RERANK_ENABLED=false
 # Append OR-relaxed recall behind weak-but-nonzero strict text matches (P8b extension).

.github/workflows/ci.yml

@@ -188,6 +188,14 @@ jobs:
  if: needs.changes.outputs.static_heavy_changed == 'true'
  run: npm run check:upload-limit-parity
 
+ # The generated lexicon review is a clinical-facing artefact. It was in the
+ # local verify:pr-local chain but in no CI job, so it rotted on main and
+ # failed every local preflight while every required check stayed green
+ # (#333). Same static-heavy condition verify-pr-local.mjs already uses.
+ - name: Medication lexicon report freshness
+ if: needs.changes.outputs.static_heavy_changed == 'true'
+ run: npm run check:medication-lexicon-report
+
  - name: GitHub Actions pin check
  if: needs.changes.outputs.workflow_changed == 'true'
  run: npm run check:github-actions

docs/README.md

@@ -93,6 +93,9 @@ npm run docs:check-links
 ## Plans and workstreams (living)
 
 - [maturity-backlog-workorders.md](maturity-backlog-workorders.md) — actionable work orders tracking the repository-maturity audit backlog
+- [no-unchecked-indexed-access-migration-plan.md](no-unchecked-indexed-access-migration-plan.md) — staged multi-PR rollout for the `noUncheckedIndexedAccess` TypeScript flag (ledger `#211`)
+- [ledger-id-scheme-proposal.md](ledger-id-scheme-proposal.md) — design for collision-free outstanding-issue ids so concurrent sessions stop contending on `issues:next-id` (ledger `#168`)
+- [pr-handoff-stop-cross-agent-gap.md](pr-handoff-stop-cross-agent-gap.md) — why the PR-handoff stop rule is hook-enforced for Claude Code but prose-only for Codex and Cursor, and what parity would require (ledger `#258`)
 - [framework-dependency-modernization-checklist.md](framework-dependency-modernization-checklist.md) — ordered Next.js 16, runtime, dependency, Turbopack, and verification migration program
 - [search-rag-master-plan.md](search-rag-master-plan.md) / [search-rag-master-context.md](search-rag-master-context.md) — search/RAG roadmap and shared context
 - [rag-improvement/README.md](rag-improvement/README.md) — reviewed/updated RAG improvement programme: answer-quality track (intent-aware related information, length) + corrected eval/safety infra track