devrites 2.6.1 → 3.0.1

package/scripts/validate.sh

@@ -12,9 +12,6 @@ section() { printf '\n=== %s ===\n' "$1"; }
 bad() { printf 'FAIL: %s\n' "$*"; fail=1; }
 good() { printf 'ok: %s\n' "$*"; }
 
-PUBLIC="rite rite-spec rite-adopt rite-temper rite-define rite-vet rite-plan rite-build rite-prove rite-polish rite-review rite-seal rite-ship rite-status rite-doctor rite-resolve rite-pressure-test rite-zoom-out rite-prototype rite-handoff rite-autocomplete"
-INTERNAL="devrites-interview devrites-source-driven devrites-doubt devrites-ux-shape devrites-frontend-craft devrites-browser-proof devrites-debug-recovery devrites-api-interface devrites-audit"
-AGENT_FILES="devrites-spec-reviewer devrites-code-reviewer devrites-test-analyst devrites-frontend-reviewer devrites-security-auditor devrites-performance-reviewer devrites-devex-reviewer devrites-doubt-reviewer devrites-simplifier-reviewer devrites-strategy-reviewer devrites-plan-reviewer devrites-retrospector devrites-slice-wright"
 
 # ---- 1. bash -n on every shell script ------------------------------------
 section "bash syntax (bash -n)"
@@ -36,34 +33,36 @@ else
   echo "skip: python3 not found"
 fi
 
-# ---- 2b. MCP server syntax (node --check) --------------------------------
-section "mcp server syntax (node --check)"
-if command -v node >/dev/null 2>&1; then
-  found=0
-  for f in "$ROOT"/mcp/*.mjs; do
-    [ -f "$f" ] || continue; found=1
-    if node --check "$f" 2>/tmp/dr_mjs; then good "node --check ${f#$ROOT/}"; else bad "node --check ${f#$ROOT/}: $(cat /tmp/dr_mjs)"; fi
-  done
-  [ "$found" -eq 0 ] && echo "skip: no mcp/*.mjs"
+
+# ---- 2d. shell install helper ownership ----------------------------------
+section "shell install helper ownership"
+INSTALL_LIB_HITS="$(grep -nE 'dr_(write_manifest|ver_gt|packaged_release_tag|strip_marker_block|merge_marker_block|strip_codex_|merge_codex_|codex_hooks_all_devrites)' "$ROOT/scripts/install-lib.sh" 2>/dev/null || true)"
+if [ -n "$INSTALL_LIB_HITS" ]; then
+  bad "scripts/install-lib.sh contains install/update/uninstall-era helpers:"
+  printf '%s\n' "$INSTALL_LIB_HITS" | sed "s|$ROOT/||"
 else
-  echo "skip: node not found"
+  good "scripts/install-lib.sh has no install semantics helpers; install semantics stay in devrites-engine"
 fi
 
 # ---- 3. required skills exist, each with SKILL.md ------------------------
 section "skills present + SKILL.md"
-for s in $PUBLIC $INTERNAL; do
-  if [ -f "$SKILLS/$s/SKILL.md" ]; then good "$s"; else bad "missing skill or SKILL.md: $s"; fi
-done
-# any stray skill dir without SKILL.md?
+skill_count=0
 for d in "$SKILLS"/*/; do
-  [ -f "${d}SKILL.md" ] || bad "skill dir without SKILL.md: ${d#$PACK/}"
+  [ -d "$d" ] || continue
+  skill_count=$((skill_count + 1))
+  [ -f "${d}SKILL.md" ] && good "$(basename "$d")" || bad "skill dir without SKILL.md: ${d#$PACK/}"
 done
+[ "$skill_count" -gt 0 ] || bad "no skills found in ${SKILLS#$ROOT/}"
 
 # ---- 4. agents present ---------------------------------------------------
 section "agents present"
-for a in $AGENT_FILES; do
-  if [ -f "$AGENTS/$a.md" ]; then good "$a"; else bad "missing agent: $a"; fi
+agent_count=0
+for agent_file in "$AGENTS"/*.md; do
+  [ -f "$agent_file" ] || continue
+  agent_count=$((agent_count + 1))
+  good "$(basename "$agent_file" .md)"
 done
+[ "$agent_count" -gt 0 ] || bad "no agents found in ${AGENTS#$ROOT/}"
 
 # ---- 5. frontmatter validation ------------------------------------------
 section "frontmatter"
@@ -76,6 +75,27 @@ else
   echo "skip: python3 not found"
 fi
 
+section "generated skill payload budget"
+if command -v node >/dev/null 2>&1; then
+  if node "$ROOT/scripts/check-generated-skill-budget.mjs" "$SKILLS"; then good "generated skill payload budget passed"; else bad "generated skill payload budget failed"; fi
+else
+  echo "skip: node not found"
+fi
+
+section "instruction size ratchet"
+if command -v node >/dev/null 2>&1; then
+  if node "$ROOT/scripts/check-instruction-size-baseline.mjs"; then good "instruction size baseline passed"; else bad "instruction size baseline failed"; fi
+else
+  echo "skip: node not found"
+fi
+
+section "reference reachability governance"
+if command -v node >/dev/null 2>&1; then
+  if node "$ROOT/scripts/check-reference-governance.mjs"; then good "reference reachability governance passed"; else bad "reference reachability governance failed"; fi
+else
+  echo "skip: node not found"
+fi
+
 # ---- 6. /rite-polish orchestrator references its phase reference files ---
 section "rite-polish orchestrator → reference files"
 for s in reference/code.md reference/ui.md; do
@@ -83,6 +103,49 @@ for s in reference/code.md reference/ui.md; do
   if [ -f "$SKILLS/rite-polish/$s" ]; then good "$s present"; else bad "$s missing"; fi
 done
 
+# ---- 6b. skill inventory / documentation counts --------------------------
+section "skills inventory"
+if command -v node >/dev/null 2>&1; then
+  if node "$ROOT/scripts/skills-inventory.mjs" >/tmp/dr_skills_inventory 2>&1; then
+    cat /tmp/dr_skills_inventory
+    good "skills inventory matches docs"
+  else
+    cat /tmp/dr_skills_inventory
+    bad "skills inventory drifted"
+  fi
+else
+  echo "skip: node not found"
+fi
+
+# ---- 6c. skill anatomy + routing + host parity ----------------------------
+section "skill anatomy"
+if command -v python3 >/dev/null 2>&1; then
+  if python3 "$ROOT/scripts/validate-skill-anatomy.py" >/tmp/dr_skill_anatomy 2>&1; then cat /tmp/dr_skill_anatomy; good "skill anatomy contracts passed"; else cat /tmp/dr_skill_anatomy; bad "skill anatomy validation failed"; fi
+else
+  echo "skip: python3 not found"
+fi
+
+section "deterministic routing/collision evals"
+if command -v python3 >/dev/null 2>&1; then
+  if python3 "$ROOT/scripts/run-routing-evals.py" >/tmp/dr_routing_evals 2>&1; then cat /tmp/dr_routing_evals; good "routing/collision evals passed"; else cat /tmp/dr_routing_evals; bad "routing/collision evals failed"; fi
+else
+  echo "skip: python3 not found"
+fi
+
+section "command host parity"
+if command -v python3 >/dev/null 2>&1; then
+  if python3 "$ROOT/scripts/validate-command-parity.py" >/tmp/dr_command_parity 2>&1; then cat /tmp/dr_command_parity; good "command host parity passed"; else cat /tmp/dr_command_parity; bad "command host parity failed"; fi
+else
+  echo "skip: python3 not found"
+fi
+
+section "agent composition"
+if command -v python3 >/dev/null 2>&1; then
+  if python3 "$ROOT/scripts/validate-agent-composition.py" >/tmp/dr_agent_composition 2>&1; then cat /tmp/dr_agent_composition; good "agent composition contracts passed"; else cat /tmp/dr_agent_composition; bad "agent composition validation failed"; fi
+else
+  echo "skip: python3 not found"
+fi
+
 # ---- 7. broken reference links -------------------------------------------
 section "reference links resolve"
 if command -v python3 >/dev/null 2>&1; then
@@ -116,23 +179,31 @@ else
   echo "skip: python3 not found"
 fi
 
-# ---- 8. size advisory (not a hard failure) -------------------------------
-section "SKILL.md size advisory"
-for d in "$SKILLS"/*/; do
-  n=$(wc -l < "${d}SKILL.md" | tr -d ' ')
-  [ "$n" -gt 200 ] && printf 'warn: %s is %s lines (recommended <=180 public / <=160 internal)\n' "$(basename "$d")" "$n"
-done
-echo "ok: size advisory complete"
+# ---- 8. skill pruning + step contracts ----------------------------------
+section "skill pruning + step contracts"
+if command -v node >/dev/null 2>&1 && [ -f "$ROOT/scripts/skill-pruning-audit.mjs" ]; then
+  if node "$ROOT/scripts/skill-pruning-audit.mjs"; then good "skill pruning and step contracts passed"; else bad "skill pruning step contracts failed"; fi
+else
+  echo "skip: node or skill-pruning-audit.mjs not found"
+fi
 
 # ---- 9. DevRites engineering rules present -------------------------------
 section "DevRites rules present"
-if [ -f "$ROOT/pack/.claude/rules/README.md" ] && [ -f "$ROOT/pack/.claude/rules/security.md" ]; then
-  good "pack/.claude/rules present ($(find "$ROOT/pack/.claude/rules" -name '*.md' | wc -l | tr -d ' ') rule files)"
+if [ -f "$ROOT/pack/.claude/skills/devrites-lib/reference/standards/README.md" ] && [ -f "$ROOT/pack/.claude/skills/devrites-lib/reference/standards/security.md" ]; then
+  good "pack/.claude/skills/devrites-lib/reference/standards present ($(find "$ROOT/pack/.claude/skills/devrites-lib/reference/standards" -name '*.md' | wc -l | tr -d ' ') markdown files)"
 else
-  bad "DevRites rules missing (need pack/.claude/rules/*.md)"
+  bad "DevRites rules missing (need pack/.claude/skills/devrites-lib/reference/standards/*.md)"
 fi
 
 # ---- 10. no global writes ------------------------------------------------
+section "no personal paths in shipped artifacts"
+if command -v python3 >/dev/null 2>&1; then
+  if python3 "$ROOT/scripts/check-no-personal-paths.py" >/tmp/dr_personal_paths 2>&1; then cat /tmp/dr_personal_paths; good "no personal paths check passed"; else cat /tmp/dr_personal_paths; bad "personal path check failed"; fi
+else
+  echo "skip: python3 not found"
+fi
+
+# ---- 10b. no global writes ------------------------------------------------
 section "no global ~/.claude writes"
 if bash "$ROOT/scripts/check-no-global-writes.sh" >/tmp/dr_glob 2>&1; then good "no-global-writes check passed"; else bad "no-global-writes check failed"; cat /tmp/dr_glob; fi
 
@@ -146,24 +217,48 @@ else
   bad "rule-uniqueness check failed (see scripts/check-rule-uniqueness.sh)"
 fi
 
+# ---- 11b. generated workspace schema fixtures ----------------------------
+section "workspace artifact schema"
+if command -v python3 >/dev/null 2>&1; then
+  if python3 "$ROOT/scripts/validate-workspace-schema.py" "$ROOT/tests/fixtures/workspace-schema" >/tmp/dr_workspace_schema 2>&1; then
+    cat /tmp/dr_workspace_schema
+    good "workspace artifact schema fixtures valid"
+  else
+    cat /tmp/dr_workspace_schema
+    bad "workspace artifact schema fixtures failed"
+  fi
+else
+  echo "skip: python3 not found"
+fi
+
+# ---- 11c. user-facing completion reply contract --------------------------
+section "rite completion reply contract"
+if bash "$ROOT/scripts/check-reply-contract.sh" >/tmp/dr_reply_contract 2>&1; then
+  cat /tmp/dr_reply_contract
+  good "reply-contract check passed"
+else
+  cat /tmp/dr_reply_contract
+  bad "reply-contract check failed (see scripts/check-reply-contract.sh)"
+fi
+
 # ---- 12. no runtime-broken pack/.claude/ path in installed prose ---------
-# After install the leading pack/ is stripped, so any literal pack/.claude/rules/
+# After install the leading pack/ is stripped, so any literal pack/.claude/skills/devrites-lib/reference/standards/
 # or pack/.claude/skills/ in shipped SKILL.md / reference prose is a dead path
 # at runtime. (Repo README/docs links are out of scope — they're GitHub links.)
 section "no literal pack/.claude/ paths in shipped skill prose"
 # Exclude the intentional resolution-snippet fallback (`... || P=pack/.claude/...`): the
 # preamble snippet tries the installed `.claude/` path first, then `${CLAUDE_SKILL_DIR}`
 # (plugin, best-effort), then the repo `pack/.claude/...` for DevRites self-development.
-PACKPATH_HITS="$(grep -rnI -e 'pack/\.claude/rules/' -e 'pack/\.claude/skills/' "$SKILLS" 2>/dev/null | grep -vE '\|\| [A-Z]+=pack/\.claude/skills/' || true)"
+PACKPATH_HITS="$(grep -rnI -e 'pack/\.claude/skills/devrites-lib/reference/standards/' -e 'pack/\.claude/skills/' "$SKILLS" 2>/dev/null | grep -vE '\|\| [A-Z]+=pack/\.claude/skills/' || true)"
 if [ -n "$PACKPATH_HITS" ]; then
   bad "literal pack/.claude/ path in shipped skill prose (strips to .claude/ on install):"
   printf '%s\n' "$PACKPATH_HITS" | sed "s|$ROOT/||"
 else
-  good "no literal pack/.claude/rules/ or pack/.claude/skills/ in shipped skill prose"
+  good "no literal pack/.claude/skills/devrites-lib/reference/standards/ or pack/.claude/skills/ in shipped skill prose"
 fi
 
 # ---- 14. no false session-start autoload claim ---------------------------
-# DevRites ships no autoload wiring; skills Read .claude/rules/core.md at step 0.
+# DevRites ships no autoload wiring; skills Read .claude/skills/devrites-lib/reference/standards/core.md at step 0.
 # Fail if any shipped skill or doc asserts native/session-start autoload.
 section "no false session-start autoload claim"
 AUTOLOAD_HITS="$(grep -rl 'autoloaded by Claude Code' "$ROOT/pack" "$ROOT/docs" "$ROOT/README.md" 2>/dev/null || true)"
@@ -174,6 +269,51 @@ else
   good "no false session-start autoload claim in pack/ docs/ README.md"
 fi
 
+# ---- 14b. no deleted shell-helper guidance -------------------------------
+# The workflow control plane moved from devrites-lib/*.sh helpers to the
+# installed `devrites-engine` binary. Public docs and generated installer
+# guidance must not direct users or agents back to deleted helper files.
+section "no deleted shell-helper guidance"
+DELETED_HELPER_HITS="$(grep -rnI \
+  -e 'analyze\.sh' \
+  -e 'preamble\.sh' \
+  -e 'readiness\.sh' \
+  -e 'evidence-fresh\.sh' \
+  -e 'check-acceptance\.sh' \
+  -e 'coverage\.sh' \
+  -e 'doubt-coverage\.sh' \
+  -e 'footprint\.sh' \
+  -e 'learnings\.sh' \
+  -e 'mutation-gate\.sh' \
+  -e 'package-existence\.sh' \
+  -e 'progress\.sh' \
+  -e 'reconcile\.sh' \
+  -e 'tick-afk\.sh' \
+  -e 'test-integrity\.sh' \
+  -e 'resolve\.sh' \
+  -e 'close-out\.sh' \
+  -e 'stuck\.sh' \
+  -e 'spec-validate\.sh' \
+  -e 'devrites\.sh' \
+  -e 'devrites-a1-guard\.sh' \
+  -e 'devrites-allow\.sh' \
+  -e 'devrites-cursor\.sh' \
+  -e 'devrites-orient\.sh' \
+  -e 'devrites-redwatch\.sh' \
+  -e 'devrites-refresh-indexes\.sh' \
+  -e 'devrites-reviewer-readonly\.sh' \
+  -e 'devrites-statusline\.sh' \
+  -e 'devrites-stop-gate\.sh' \
+  -e 'devrites-wright-scope\.sh' \
+  -e '\.codex/hooks/' \
+  "$ROOT/README.md" "$ROOT/SECURITY.md" "$ROOT/docs" "$ROOT/evals" "$ROOT/install.sh" "$ROOT/b"*"in" 2>/dev/null || true)"
+if [ -n "$DELETED_HELPER_HITS" ]; then
+  bad "deleted helper/control-plane guidance found:"
+  printf '%s\n' "$DELETED_HELPER_HITS" | sed "s|$ROOT/||"
+else
+  good "public/generated guidance points at the devrites-engine binary, not deleted shell helpers"
+fi
+
 # ---- 15. shellcheck (error = blocking, warning = advisory) ---------------
 # CI runners ship shellcheck, so the error-level gate is enforced on every PR.
 # Locally it self-skips when shellcheck is absent (the gate is non-blocking only

package/uninstall.sh

@@ -1,197 +1,36 @@
 #!/usr/bin/env bash
-# uninstall.sh — remove DevRites from a project. Removes ONLY the files listed in
-# .claude/devrites.manifest (plus the manifest itself) and prunes dirs left empty.
-# Never touches your feature data in .devrites/work/.
-#
-#   ./uninstall.sh                 uninstall from the current directory
-#   ./uninstall.sh --target DIR    uninstall from DIR
-#   ./uninstall.sh --dry-run       show what would be removed, change nothing
-#
-# Network uninstall (no git clone needed):
-#   curl -fsSL https://raw.githubusercontent.com/ViktorsBaikers/DevRites/main/uninstall.sh | bash
-#   curl -fsSL https://raw.githubusercontent.com/ViktorsBaikers/DevRites/main/uninstall.sh | bash -s -- --target /path
-
+# uninstall.sh - bootstrap shim for the engine-owned DevRites uninstaller.
 set -u
-SELF_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" 2>/dev/null && pwd -P)" || SELF_DIR=""
 
-# ---- bootstrap (curl | bash) --------------------------------------------
-# Same pattern as install.sh: when piped from curl there are no sibling files,
-# so download a tarball and re-exec.
+SELF_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" 2>/dev/null && pwd -P)" || SELF_DIR=""
 DEVRITES_REPO="${DEVRITES_REPO:-ViktorsBaikers/DevRites}"
 DEVRITES_REF="${DEVRITES_REF:-}"
-if [ -z "$SELF_DIR" ] || [ ! -r "$SELF_DIR/scripts/install-lib.sh" ]; then
+
+if [ -z "$SELF_DIR" ] || [ ! -d "$SELF_DIR/pack" ]; then
   if [ "${DEVRITES_BOOTSTRAPPED:-0}" = "1" ]; then
-    echo "error: bootstrap re-exec did not find scripts/install-lib.sh — aborting." >&2
+    echo "error: bootstrap re-exec did not find pack/ - aborting." >&2
     exit 1
   fi
   command -v curl >/dev/null 2>&1 || { echo "error: curl is required for the network uninstaller." >&2; exit 1; }
-  command -v tar  >/dev/null 2>&1 || { echo "error: tar is required for the network uninstaller."  >&2; exit 1; }
-
-  BOOT_TMP="$(mktemp -d 2>/dev/null || echo "${TMPDIR:-/tmp}/devrites-bootstrap.$$")"
   if [ -n "$DEVRITES_REF" ]; then
-    BOOT_TAG="$DEVRITES_REF"
+    ref="$DEVRITES_REF"
   else
-    BOOT_TAG="$(curl -fsSL "https://api.github.com/repos/$DEVRITES_REPO/releases/latest" 2>/dev/null \
-      | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -n1)"
-  fi
-  BOOT_DOWNLOADED=0
-  if [ -n "$BOOT_TAG" ]; then
-    BOOT_URL="https://github.com/$DEVRITES_REPO/releases/download/$BOOT_TAG/devrites-$BOOT_TAG.tar.gz"
-    curl -fsSL -o "$BOOT_TMP/devrites.tar.gz" "$BOOT_URL" 2>/dev/null && BOOT_DOWNLOADED=1
-    if [ "$BOOT_DOWNLOADED" -ne 1 ]; then
-      BOOT_URL="https://github.com/$DEVRITES_REPO/archive/refs/tags/$BOOT_TAG.tar.gz"
-      curl -fsSL -o "$BOOT_TMP/devrites.tar.gz" "$BOOT_URL" 2>/dev/null && BOOT_DOWNLOADED=1
-    fi
-  fi
-  if [ "$BOOT_DOWNLOADED" -ne 1 ]; then
-    BOOT_URL="https://github.com/$DEVRITES_REPO/archive/refs/heads/main.tar.gz"
-    curl -fsSL -o "$BOOT_TMP/devrites.tar.gz" "$BOOT_URL" || { echo "error: could not download DevRites from $BOOT_URL" >&2; exit 1; }
-  fi
-  tar -C "$BOOT_TMP" -xzf "$BOOT_TMP/devrites.tar.gz" || { echo "error: could not extract DevRites tarball" >&2; exit 1; }
-  BOOT_BUNDLE="$(find "$BOOT_TMP" -mindepth 1 -maxdepth 1 -type d | head -n1)"
-  [ -n "$BOOT_BUNDLE" ] && [ -f "$BOOT_BUNDLE/uninstall.sh" ] || { echo "error: extracted bundle is missing uninstall.sh" >&2; exit 1; }
-  chmod +x "$BOOT_BUNDLE/uninstall.sh" "$BOOT_BUNDLE"/scripts/*.sh 2>/dev/null || true
-  export DEVRITES_BOOTSTRAPPED=1
-  exec bash "$BOOT_BUNDLE/uninstall.sh" "$@"
+    ref="$(curl -fsSL "https://api.github.com/repos/$DEVRITES_REPO/releases/latest" 2>/dev/null | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -n1)"
+  fi
+  ref="${ref:-main}"
+  url="https://raw.githubusercontent.com/$DEVRITES_REPO/$ref/install.sh"
+  tmp="$(mktemp 2>/dev/null || echo "${TMPDIR:-/tmp}/devrites-install.$$")"
+  curl -fsSL -o "$tmp" "$url" || { echo "error: could not download DevRites bootstrap from $url" >&2; rm -f "$tmp"; exit 1; }
+  bash "$tmp" uninstall "$@"
+  rc="$?"
+  rm -f "$tmp"
+  exit "$rc"
 fi
 
-. "$SELF_DIR/scripts/install-lib.sh"
-
-TARGET="$PWD"
-DRYRUN=0
-while [ $# -gt 0 ]; do
-  case "$1" in
-    --target) shift; [ $# -gt 0 ] || dr_die "--target needs a directory"; TARGET="$1" ;;
-    --target=*) TARGET="${1#*=}" ;;
-    --dry-run) DRYRUN=1 ;;
-    -h|--help) sed -n '2,11p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
-    *) dr_die "unknown option: $1 (try --help)" ;;
-  esac
-  shift
-done
-
-[ -d "$TARGET" ] || dr_die "target is not a directory: $TARGET"
-TARGET="$(dr_abspath_dir "$TARGET")" || dr_die "cannot resolve target: $TARGET"
-MF="$TARGET/$DR_MANIFEST_NAME"
-[ -f "$MF" ] || dr_die "no DevRites manifest at $MF — nothing to uninstall."
-
-dr_info "DevRites uninstaller"
-dr_say  "  target  : $TARGET"
-dr_say  "  manifest: $MF"
-[ "$DRYRUN" -eq 1 ] && dr_info "  (dry run — no changes)"
-dr_say ""
-
-N_REMOVED=0; N_MISSING=0
-PRUNE_TMP="$(mktemp 2>/dev/null || echo "${TMPDIR:-/tmp}/devrites-prune.$$")"
-: > "$PRUNE_TMP"
-trap 'rm -f "$PRUNE_TMP"' EXIT
-
-# If DevRites was merged into a pre-existing AGENTS.md, remove only the managed
-# marker block. Fresh AGENTS.md files created by DevRites are still removed
-# below through the ordinary manifest entry.
-if [ -f "$TARGET/.claude/devrites.agents-merge" ] && [ -f "$TARGET/AGENTS.md" ]; then
-  if [ "$DRYRUN" -eq 1 ]; then
-    dr_say "  [merge-remove] AGENTS.md DevRites block"
-  else
-    tmp_agents="$(mktemp 2>/dev/null || echo "${TMPDIR:-/tmp}/devrites-agents.$$")"
-    awk '
-      $0 == "<!-- BEGIN DEVRITES CODEX -->" { in_block = 1; next }
-      $0 == "<!-- END DEVRITES CODEX -->" { in_block = 0; next }
-      in_block { next }
-      { print }
-    ' "$TARGET/AGENTS.md" > "$tmp_agents" && cp "$tmp_agents" "$TARGET/AGENTS.md"
-    rm -f "$tmp_agents"
-    grep -q '[^[:space:]]' "$TARGET/AGENTS.md" 2>/dev/null || rm -f "$TARGET/AGENTS.md"
-  fi
-fi
-
-if [ -f "$TARGET/.claude/devrites.codex-config-merge" ] && [ -f "$TARGET/.codex/config.toml" ]; then
-  if [ "$DRYRUN" -eq 1 ]; then
-    dr_say "  [merge-remove] .codex/config.toml DevRites MCP block"
-  else
-    tmp_codex_config="$(mktemp 2>/dev/null || echo "${TMPDIR:-/tmp}/devrites-codex-config.$$")"
-    awk '
-      $0 == "# BEGIN DEVRITES CODEX MCP" { in_block = 1; next }
-      $0 == "# END DEVRITES CODEX MCP" { in_block = 0; next }
-      in_block { next }
-      { print }
-    ' "$TARGET/.codex/config.toml" > "$tmp_codex_config" && cp "$tmp_codex_config" "$TARGET/.codex/config.toml"
-    rm -f "$tmp_codex_config"
-    grep -q '[^[:space:]]' "$TARGET/.codex/config.toml" 2>/dev/null || rm -f "$TARGET/.codex/config.toml"
-  fi
-fi
-
-if [ -f "$TARGET/.claude/devrites.codex-hooks-merge" ] && [ -f "$TARGET/.codex/hooks.json" ]; then
-  if [ "$DRYRUN" -eq 1 ]; then
-    dr_say "  [merge-remove] .codex/hooks.json DevRites hooks"
-  else
-    if grep -q '"command"[[:space:]]*:.*\(devrites-\|DEVRITES_\|DevRites:\)' "$TARGET/.codex/hooks.json" 2>/dev/null \
-      && ! grep '"command"[[:space:]]*:' "$TARGET/.codex/hooks.json" 2>/dev/null | grep -vq 'devrites-\|DEVRITES_\|printf.*DevRites:'; then
-      rm -f "$TARGET/.codex/hooks.json" || dr_die "cannot remove .codex/hooks.json"
-    else
-      command -v node >/dev/null 2>&1 || dr_die "node is required to remove DevRites hooks from .codex/hooks.json"
-      tmp_codex_hooks="$(mktemp 2>/dev/null || echo "${TMPDIR:-/tmp}/devrites-codex-hooks.$$")"
-      node "$SELF_DIR/scripts/merge-codex-hooks.mjs" strip "$TARGET/.codex/hooks.json" "$tmp_codex_hooks" \
-        || dr_die "cannot remove DevRites hooks from .codex/hooks.json"
-      cp "$tmp_codex_hooks" "$TARGET/.codex/hooks.json" || dr_die "cannot write .codex/hooks.json"
-      rm -f "$tmp_codex_hooks"
-      [ "$(tr -d '[:space:]' < "$TARGET/.codex/hooks.json" 2>/dev/null)" != "{}" ] || rm -f "$TARGET/.codex/hooks.json"
-    fi
-    [ -e "$TARGET/.codex/hooks.json" ] || printf '%s\n' "$TARGET/.codex" >> "$PRUNE_TMP"
-  fi
-fi
-
-# Remove each manifest-listed file.
-while IFS= read -r rel; do
-  case "$rel" in ''|\#*) continue ;; esac          # skip blanks/comments
-  case "$rel" in /*|*..*) dr_warn "ignoring suspicious manifest entry: $rel"; continue ;; esac
-  case "$rel" in
-    AGENTS.md) [ -f "$TARGET/.claude/devrites.agents-merge" ] && continue ;;
-    .codex/config.toml) [ -f "$TARGET/.claude/devrites.codex-config-merge" ] && continue ;;
-    .codex/hooks.json) [ -f "$TARGET/.claude/devrites.codex-hooks-merge" ] && continue ;;
-  esac
-  dest="$TARGET/$rel"
-  if [ -e "$dest" ] || [ -L "$dest" ]; then
-    if [ "$DRYRUN" -eq 1 ]; then
-      dr_say "  [remove] $rel"
-    else
-      rm -f "$dest" || dr_warn "could not remove $dest"
-    fi
-    printf '%s\n' "$(dirname "$dest")" >> "$PRUNE_TMP"
-    N_REMOVED=$((N_REMOVED+1))
-  else
-    N_MISSING=$((N_MISSING+1))
-  fi
-done < "$MF"
-
-# Remove the manifest itself.
-if [ "$DRYRUN" -eq 1 ]; then
-  dr_say "  [remove] $DR_MANIFEST_NAME"
-else
-  rm -f "$MF"
-  printf '%s\n' "$(dirname "$MF")" >> "$PRUNE_TMP"
-fi
-
-# Prune directories left empty (rmdir only removes empty dirs — safe). Two passes
-# walk up to catch parents. Never removes .devrites/work or any non-empty dir.
-if [ "$DRYRUN" -eq 0 ]; then
-  pass=0
-  while [ "$pass" -lt 6 ]; do
-    sort -u "$PRUNE_TMP" | awk '{ print length, $0 }' | sort -rn | cut -d' ' -f2- \
-    | while IFS= read -r d; do
-        case "$d" in "$TARGET"|"$TARGET"/) continue ;; esac
-        [ -d "$d" ] && rmdir "$d" 2>/dev/null && printf '%s\n' "$(dirname "$d")" >> "$PRUNE_TMP.next"
-      done
-    [ -f "$PRUNE_TMP.next" ] || break
-    cat "$PRUNE_TMP.next" >> "$PRUNE_TMP"; rm -f "$PRUNE_TMP.next"
-    pass=$((pass+1))
-  done
-fi
+INSTALL_LIB="$SELF_DIR/scripts/install-lib.sh"
+[ -f "$INSTALL_LIB" ] || { echo "error: extracted bundle is missing scripts/install-lib.sh" >&2; exit 1; }
+. "$INSTALL_LIB"
 
-dr_say ""
-dr_ok "DevRites $([ "$DRYRUN" -eq 1 ] && echo 'uninstall plan complete (dry run)' || echo uninstalled)"
-dr_say "  removed: $N_REMOVED   already-absent: $N_MISSING"
-[ -d "$TARGET/.devrites/work" ] && dr_say "  ${DR_Y}kept${DR_R} .devrites/work/ (your feature data) — delete it manually if you want it gone."
-[ -f "$TARGET/.devrites/ACTIVE" ] && dr_say "  ${DR_Y}kept${DR_R} .devrites/ACTIVE (active-feature cursor) — runtime state."
-[ -f "$TARGET/.devrites/AFK" ] && dr_say "  ${DR_Y}kept${DR_R} .devrites/AFK (per-developer AFK sentinel) — runtime state."
-exit 0
+ENGINE="$(dr_acquire_engine "$SELF_DIR" uninstall "$DEVRITES_REPO")" || { echo "error: could not acquire devrites-engine." >&2; exit 1; }
+export DEVRITES_ENGINE_CLI="$ENGINE"
+exec "$ENGINE" uninstall --source-dir "$SELF_DIR" "$@"