fix(hook-kit): resolve RAG receiver from workspace config instead of mandating --rag

.githooks/pre-push

@@ -44,8 +44,11 @@ while IFS= read -r line; do
   fi
 
   # Commit count limit guard — prevent pushing massive commits from wrong base branch
+  # Exclude commits that already exist on remote tracking branches (--remotes=origin)
+  # so that merged upstream/remote branches (e.g. origin/main, origin/next-fix) do not
+  # inflate the count of genuinely new outgoing commits.
   if [ "$remote_sha" != "0000000000000000000000000000000000000000" ] && [ -n "$remote_sha" ]; then
-    COMMIT_COUNT=$(git rev-list --count "$remote_sha..$local_sha" 2>/dev/null || echo 0)
+    COMMIT_COUNT=$(git rev-list --count "$local_sha" --not "$remote_sha" --remotes=origin 2>/dev/null || echo 0)
   else
     DEFAULT_BASE="origin/main"
     case "$local_ref" in
@@ -65,15 +68,15 @@ while IFS= read -r line; do
       MIN_COUNT=999999
       for cand in origin/next-feat origin/next-fix origin/main origin/master; do
         if git rev-parse --verify "$cand" >/dev/null 2>&1; then
-          cnt=$(git rev-list --count "$cand..$local_sha" 2>/dev/null || echo 999999)
+          cnt=$(git rev-list --count "$local_sha" --not "$cand" --remotes=origin 2>/dev/null || echo 999999)
           if [ "$cnt" -lt "$MIN_COUNT" ]; then
             MIN_COUNT="$cnt"
             DEFAULT_BASE="$cand"
           fi
         fi
       done
     fi
-    COMMIT_COUNT=$(git rev-list --count "$DEFAULT_BASE..$local_sha" 2>/dev/null || echo 0)
+    COMMIT_COUNT=$(git rev-list --count "$local_sha" --not "$DEFAULT_BASE" --remotes=origin 2>/dev/null || echo 0)
   fi
 
   BASE_REF="${DEFAULT_BASE:-origin/main}"

hooks/hooks.json

@@ -273,10 +273,6 @@
       {
         "matcher": "Skill",
         "hooks": [
-          {
-            "type": "command",
-            "command": "${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/remind-rag-flag-on-skill.sh"
-          },
           {
             "type": "command",
             "command": "bash ${CLAUDE_PLUGIN_ROOT}/skills/hook-kit/resources/block-supervisor-loop-work.sh"

skills/cleanup/fa-prune.md

@@ -163,24 +163,32 @@ When the section is found in archive:
 | 2 | Add a new entry to HOT without restoring, even when the same keyword exists in archive | Restore → add recurrence marker → append new entry body |
 | 3 | Assume "archive is a permanent cleanup" | Archive = COLD cache. Can return to HOT immediately on recurrence |
 
-### 8. RAG dispatch (`--rag=<skill>:<topic>`, vendor-agnostic)
+### 8. RAG dispatch (workspace-config resolved, vendor-agnostic)
 
 Same abstract contract as the `/archive` skill. Simultaneously store COLD-demoted sections to a RAG receiver to strengthen semantic search / recurrence detection (Section 7-1).
 
-**Invocation format**:
+**Receiver resolution**: read the workspace bindings config through
+`bash <hook-kit-skill>/resources/workspace-config.sh --export` and use the
+`WSCFG_RAG_*` values it exports. The binding lives in the config, so swapping
+vendors stays a one-line config edit and **no caller flag is required**.
 
-```
-/cleanup fa-prune --rag=<skill>:<topic>
-```
+| Resolved state | Behavior |
+|---|---|
+| `WSCFG_RAG_KIND` unset / `none` / resolver unavailable | **Skip quietly** — no dispatch, no warning, no block |
+| `WSCFG_RAG_KIND` set to a receiver kind | Dispatch per section using `WSCFG_RAG_ENDPOINT` + the matching `WSCFG_RAG_COLLECTION_*` |
+| `--no-rag` passed | Skip regardless of the resolved binding |
+| `--rag=<skill>:<topic>` passed | Optional override, takes precedence over the resolved binding |
 
-Or when invoking `Skill("cleanup", "fa-prune")`, include `--rag=<skill>:<topic>` in args. The caller (Claude) specifies the receiver available in the environment — the vendor name is the caller's domain; the callee (fa-prune) only receives the receiver identifier and dispatches.
+`kind: none` means the role is unconfigured, and the config's own contract states
+consumers must **skip rather than block**. Never warn, fail, or deny a call merely
+because a receiver is absent or a flag was omitted.
 
 #### Applicable matrix
 
 | Task | Dispatch target | Default behavior |
 |------|-------------|------------|
-| COLD-demoted sections (after Section 4 execution) | Store 1 per section to the receiver | `--rag` not specified = no dispatch |
-| Backfill (bulk-store existing archive to the receiver) | All archive sections | Explicit `--rag` + `--backfill` flag |
+| COLD-demoted sections (after Section 4 execution) | Store 1 per section to the receiver | Resolved receiver; `kind: none` = no dispatch |
+| Backfill (bulk-store existing archive to the receiver) | All archive sections | Explicit `--backfill` flag |
 
 #### Receiver protocol (vendor-agnostic)
 
@@ -200,24 +208,29 @@ The receiver uses an idempotent id (e.g., sha1(`fa-archive:<file>:<title>`)) for
 
 | # | Don't | Do |
 |---|-------------|-----------------|
-| 1 | Hardcode a specific vendor (vector DB / embedding model / MCP tool name directly in fa-prune.md) | Let the caller specify the receiver via `--rag=<skill>:<topic>`. Keep the callee vendor-agnostic |
+| 1 | Hardcode a specific vendor (vector DB / embedding model / MCP tool name directly in fa-prune.md) | Resolve the receiver from the workspace config. Keep the callee vendor-agnostic |
 | 2 | Ignore section-level granularity and store an entire archive file as 1 chunk | Store per-section — Section 7-1 semantic search depends on section-level matching |
 | 3 | Omit metadata | 4 metadata keys required (type/project/date/category) + source_file/section_title |
-| 4 | Auto-dispatch when `--rag` is not specified | If not specified = no dispatch. Auto-supply is the caller's (Claude's) responsibility (`skill-usage.md` "Auto-supply available vendor dispatch when invoking a shared skill") |
+| 4 | Block, warn, or demand a flag when no receiver is configured | `kind: none` = skip quietly and continue. An absent receiver is a valid state, not an error |
 | 5 | Also delete from the receiver on restore (Section 7-2) | Restore only brings back to HOT. Receiver data is kept (archive history also helps semantic search) |
 
 **HTTP fallback script (when receiver MCP is down)**: `scripts/fa-batch-store.py` — consumes `--cut-dir` output or `--backfill <archive.md>` + `--skip-existing` (idempotent). Do not write ad-hoc inline store scripts.
 
 #### Self-check (right before running fa-prune)
 
-1. Is the `--rag=<skill>:<topic>` flag included in the invocation?
-2. If not included + a RAG receiver is available (a RAG store tool exists in the caller's environment) → the caller must auto-supply (skill-usage.md HARD STOP)
-3. On COLD demote, call the receiver for each section, then write to the archive file
-4. Backfill mode: bulk-store existing archive files to the receiver via `--backfill --rag=<skill>:<topic>`
+1. Resolve the receiver via `workspace-config.sh --export` (or `--json`) — do not require a caller flag
+2. If `WSCFG_RAG_KIND` is unset or `none` (and no `--rag` override):
+   - Archive COLD-demoted sections to disk
+   - Skip receiver call and skip count-equality requirements
+   - Report 0 chunks stored (`receiver: none (unconfigured)`)
+3. When a receiver is resolved or explicitly overridden:
+   - Call the receiver for each COLD section
+   - Stored chunk count must equal demoted section count
+4. Backfill mode: bulk-store existing archive files to the receiver via `--backfill`
 
 #### RAG store quantity reporting obligation (HARD STOP)
 
-After fa-prune completes, **state the number of chunks added quantitatively at the end of the response**. If N sections were demoted to COLD + N were stored to the RAG receiver, state that number exactly.
+After fa-prune completes, **state the number of chunks added quantitatively at the end of the response**. When a receiver is active, if N sections were demoted to COLD + N were stored to the RAG receiver, state that number exactly. When no receiver is configured (`kind: none`), state 0 chunks stored with N sections demoted.
 
 ```
 RAG store summary: N chunks added (receiver: <skill>:<topic>)
@@ -231,7 +244,7 @@ COLD demoted sections: N
 |---|-------|----|
 | 1 | Status-only "RAG store per section complete" | Quantitative "RAG store summary: 3 chunks added (receiver: <skill>:<topic>)" |
 | 2 | Report only mid-response, omit from the end | Show the RAG summary block **again** at the end of the response |
-| 3 | Mismatch between demote count and store count (e.g., 3 demoted but only 2 stored) | demote count = store count = reported count to the user. Verify all 3 match |
+| 3 | Mismatch between demote count and store count when a receiver is active (e.g., 3 demoted but only 2 stored) | demote count = store count = reported count to the user (when receiver is active). Verify all 3 match |
 
 Detailed format rule: see `~/.agents/rules/skill-usage.md` "RAG store report format obligation" section.
 

skills/cleanup/retrospect.md

@@ -165,7 +165,7 @@ Add a section to `~/.claude/skills/cleanup/data/failed-attempts.md` (HOT). This
 
 **A HOT entry must also reach the RAG receiver at write time, not only when `fa-prune` later demotes it to COLD.** `fa-prune.md` Section 8 only dispatches archive-bound (COLD) sections — a freshly-written HOT entry stays invisible to semantic search until it goes stale enough to be archived (often weeks/months later). This defeats the "Recurrence pre-check" Stage 0 RAG search that `fix.md`/this file's own Step 1.5 mandate: it can only ever find *old* patterns, never a paraphrased recurrence of something recorded last week.
 
-Immediately after 4-2's file write, store a structured chunk to the same abstract RAG receiver contract fa-prune.md Section 8 uses (`--rag=<skill>:<topic>`, or whichever RAG-store tool is registered in the environment):
+Immediately after 4-2's file write, store a structured chunk to the same abstract RAG receiver contract fa-prune.md Section 8 uses (receiver resolved from the workspace bindings config; skip quietly when none is configured):
 
 | Field | Value |
 |-------|-------|

skills/cleanup/run.md

@@ -54,7 +54,7 @@ Each step clearly distinguishes between **automatic skill calls** and **user-dec
 | Step | Invocation obligation (automatic) | Ask (user decision) | Auto-invocation condition |
 |------|------------------|------------------|---------------|
 | Step 0 | Call `TaskList` | — | Clean up when TaskList has completed tasks |
-| Step 0.5 (4.5 Resume import) | RAG receiver import dispatch (`--rag=<skill>:<topic>`) for each discovered file | — | RAG receiver readyz response + research-*/plan-* discovered |
+| Step 0.5 (4.5 Resume import) | RAG receiver import dispatch (receiver resolved from the workspace config) for each discovered file | — | RAG receiver readyz response + research-*/plan-* discovered |
 | Step 1 | `Skill("commit-tidy")` or `/commit-tidy` | Decide split strategy (internal ask inside the skill) | When there is 1+ uncommitted change |
 | Step 2 (Self-Improve) | **`Skill("claudify", "improve")` call mandatory** — retrospect + automation review + pattern detect | How to handle findings (internal Phase 2 ask inside the skill) | **Always** (regardless of whether the conversation had mistakes/patterns — the skill judges) |
 | Step 3 (Knowledge Persist) | **`Skill("claudify", "persist")` call mandatory** + RAG receiver import dispatch 3-C.1 | Storage location (internal ask inside the skill) | **Always** + auto-import when the RAG receiver readyz responds |