devrites 2.5.1 → 2.6.0

package/scripts/pin.sh

@@ -3,7 +3,7 @@
 #
 # Adopts the same "thin wrapper SKILL.md that delegates" pattern as install.sh
 # uses for --short-aliases=all, but exposes it as a runtime verb so users can
-# add / remove arbitrary aliases against any rite-*  skill without re-running
+# add / remove arbitrary aliases against any rite-* skill without re-running
 # the installer.
 #
 # Usage:
@@ -18,11 +18,12 @@
 #   ./scripts/pin.sh remove b
 #
 # Targets:
-#   - Default: $PWD (the installed project, which holds .claude/skills/).
+#   - Default: $PWD (the installed project, which holds .claude/skills/
+#     and may also hold .agents/skills/ for Codex).
 #   - --target <dir> to operate on a project elsewhere.
 #
 # Safety:
-#   - Refuses to write inside ~/.claude (DevRites is project-local only).
+#   - Refuses to write inside global Claude/Codex homes (DevRites is project-local only).
 #   - Refuses to overwrite a non-alias skill at .claude/skills/<alias>/.
 #   - Refuses if <target> is not a known rite-* skill in the target's pack.
 #   - Manifest-managed: pinned wrappers are recorded in .claude/devrites.manifest
@@ -66,8 +67,10 @@ done
 
 TARGET="$(dr_abspath_dir "$TARGET")" || dr_die "target dir not found: $TARGET"
 dr_is_global_claude "$TARGET" && dr_die "refusing to operate on ~/.claude — DevRites is project-local only"
+dr_is_global_codex "$TARGET" && dr_die "refusing to operate on ~/.codex — DevRites is project-local only"
 
 SKILLS_DIR="$TARGET/.claude/skills"
+CODEX_SKILLS_DIR="$TARGET/.agents/skills"
 MF="$TARGET/$DR_MANIFEST_NAME"
 
 [ -d "$SKILLS_DIR" ] || dr_die "no .claude/skills at $TARGET — run install.sh first?"
@@ -97,6 +100,11 @@ is_pinned_alias() {
   grep -q 'description: Alias of DevRites /' "$SKILLS_DIR/$1/SKILL.md"
 }
 
+is_pinned_alias_file() {
+  [ -f "$1" ] || return 1
+  grep -q 'description: Alias of DevRites /' "$1"
+}
+
 # ---- subcommands ---------------------------------------------------------
 do_add() {
   valid_alias_name "$ALIAS"    || dr_die "invalid alias name '$ALIAS' (lowercase / digits / hyphens; not 'rite' or 'rite-*')"
@@ -106,6 +114,9 @@ do_add() {
   ALIAS_DIR="$SKILLS_DIR/$ALIAS"
   ALIAS_FILE="$ALIAS_DIR/SKILL.md"
   ALIAS_REL=".claude/skills/$ALIAS/SKILL.md"
+  CODEX_ALIAS_DIR="$CODEX_SKILLS_DIR/$ALIAS"
+  CODEX_ALIAS_FILE="$CODEX_ALIAS_DIR/SKILL.md"
+  CODEX_ALIAS_REL=".agents/skills/$ALIAS/SKILL.md"
 
   if [ -e "$ALIAS_FILE" ]; then
     if is_pinned_alias "$ALIAS"; then
@@ -114,15 +125,33 @@ do_add() {
       dr_die "$ALIAS_FILE exists and is NOT a pinned alias — refusing to overwrite"
     fi
   fi
+  if [ -d "$CODEX_SKILLS_DIR" ] && [ -e "$CODEX_ALIAS_FILE" ]; then
+    if is_pinned_alias_file "$CODEX_ALIAS_FILE"; then
+      dr_warn "already pinned for Codex: /$ALIAS — overwriting"
+    else
+      dr_die "$CODEX_ALIAS_FILE exists and is NOT a pinned alias — refusing to overwrite"
+    fi
+  fi
 
   mkdir -p "$ALIAS_DIR"
   dr_gen_alias_wrapper "$ALIAS" "$DEST" "$ALIAS_FILE"
+  if [ -d "$CODEX_SKILLS_DIR" ]; then
+    mkdir -p "$CODEX_ALIAS_DIR"
+    dr_gen_alias_wrapper "$ALIAS" "$DEST" "$CODEX_ALIAS_FILE"
+  fi
 
   if ! dr_manifest_contains "$MF" "$ALIAS_REL"; then
     printf '%s\n' "$ALIAS_REL" >> "$MF"
   fi
+  if [ -d "$CODEX_SKILLS_DIR" ] && ! dr_manifest_contains "$MF" "$CODEX_ALIAS_REL"; then
+    printf '%s\n' "$CODEX_ALIAS_REL" >> "$MF"
+  fi
 
-  dr_ok "pinned: /$ALIAS → /$DEST   ($ALIAS_FILE)"
+  if [ -d "$CODEX_SKILLS_DIR" ]; then
+    dr_ok "pinned: /$ALIAS → /$DEST   ($ALIAS_FILE, $CODEX_ALIAS_FILE)"
+  else
+    dr_ok "pinned: /$ALIAS → /$DEST   ($ALIAS_FILE)"
+  fi
 }
 
 do_remove() {
@@ -130,16 +159,24 @@ do_remove() {
   ALIAS_DIR="$SKILLS_DIR/$ALIAS"
   ALIAS_FILE="$ALIAS_DIR/SKILL.md"
   ALIAS_REL=".claude/skills/$ALIAS/SKILL.md"
+  CODEX_ALIAS_DIR="$CODEX_SKILLS_DIR/$ALIAS"
+  CODEX_ALIAS_FILE="$CODEX_ALIAS_DIR/SKILL.md"
+  CODEX_ALIAS_REL=".agents/skills/$ALIAS/SKILL.md"
 
   [ -f "$ALIAS_FILE" ]      || dr_die "no pinned alias at $ALIAS_FILE"
   is_pinned_alias "$ALIAS"  || dr_die "$ALIAS_FILE exists but is not a pinned alias — refusing to remove"
 
   rm -f "$ALIAS_FILE"
   rmdir "$ALIAS_DIR" 2>/dev/null || true
+  if [ -f "$CODEX_ALIAS_FILE" ]; then
+    is_pinned_alias_file "$CODEX_ALIAS_FILE" || dr_die "$CODEX_ALIAS_FILE exists but is not a pinned alias — refusing to remove"
+    rm -f "$CODEX_ALIAS_FILE"
+    rmdir "$CODEX_ALIAS_DIR" 2>/dev/null || true
+  fi
 
   # Drop the alias line from the manifest (preserve header + the rest)
   TMP="$(mktemp)"
-  grep -Fvx "$ALIAS_REL" "$MF" > "$TMP" && mv "$TMP" "$MF"
+  grep -Fvx "$ALIAS_REL" "$MF" | grep -Fvx "$CODEX_ALIAS_REL" > "$TMP" && mv "$TMP" "$MF"
 
   dr_ok "unpinned: /$ALIAS"
 }

package/uninstall.sh

@@ -86,10 +86,70 @@ 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 'DevRites hooks for Codex' "$TARGET/.codex/hooks.json" 2>/dev/null \
+      && ! grep '"command"[[:space:]]*:' "$TARGET/.codex/hooks.json" 2>/dev/null | grep -vq 'devrites-\|DEVRITES_\|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