@clipboard-health/ai-rules 2.15.10 → 2.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clipboard-health/ai-rules",
-  "version": "2.15.10",
+  "version": "2.16.1",
   "description": "Pre-built AI agent rules for consistent coding standards.",
   "keywords": [
     "ai",

package/skills/commit-push-pr/SKILL.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: Bash(git checkout --branch:*), Bash(git add:*), Bash(git status:*), Bash(git push:*), Bash(git commit:*), Bash(gh pr view:*), Bash(gh pr create:*), Bash(git diff:*), Bash(git merge-base:*)
+allowed-tools: Bash(git checkout --branch:*), Bash(git add:*), Bash(git status:*), Bash(git push:*), Bash(git commit:*), Bash(gh pr view:*), Bash(gh pr create:*), Bash(gh pr edit:*), Bash(git diff:*), Bash(git merge-base:*), Bash(bash scripts/find-session-id.sh:*)
 description: Commit, push, and open a PR. Use when the user wants to ship changes, create a pull request, or says things like 'commit and push', 'open a PR', 'ship it', 'send it', 'create a PR for this', or 'push this up'.
 ---
 
@@ -17,10 +17,11 @@ description: Commit, push, and open a PR. Use when the user wants to ship change
 If `Commits ahead of default branch` is `(unknown)`, `origin/HEAD` couldn't be resolved — stop and tell the user to run `git remote set-head origin -a` (or otherwise set the default branch) before retrying, since the simplify step also depends on it. Otherwise, if `Git status`, `Commits ahead of default branch`, and `Existing PR` are all empty/none, stop and reply `nothing to ship.`. Otherwise:
 
 1. Create a new branch if on main (e.g., `feat/add-user-validation`, `fix/null-check-in-parser`).
-2. Run the `simplify` skill on the full PR diff — `git diff $(git merge-base HEAD origin/HEAD)..HEAD` plus any uncommitted changes. Wait for it to finish, then include any resulting fixes in the commit.
+2. Run the `simplify` skill on the full PR diff — `git diff $(git merge-base HEAD origin/HEAD)..HEAD` plus any uncommitted changes. When it returns, continue to step 3 in the same turn; do not stop.
 3. If `git status --short` shows changes, create a single conventional commit.
 4. Push the branch to origin.
-5. Check for an existing PR with `gh pr view`.
-   - No PR: create with `gh pr create`. Title = commit subject. Description = brief explanation of **why**, not what. Append `<!-- commit-push-pr:created v1 -->` on its own line at the end so skill-created PRs can be identified later.
-   - PR exists: report the URL and move on.
-6. End with one short text response: branch name and the full PR URL (e.g., `https://github.com/clipboardhealth/core-utils/pull/123`). Never use shorthand like `repo#123` — always output the complete URL.
+5. Look up the current agent session ID with `bash scripts/find-session-id.sh '<phrase>'`. Pass a distinctive verbatim chunk (≥10 words) from the most recent user message; see the script header for quoting constraints. On success the script prints `<agent> <id>`; otherwise nothing — if empty, omit the session ID line below.
+6. Check for an existing PR with `gh pr view`.
+   - No PR: create with `gh pr create`. Title = commit subject. Description = brief explanation of **why**, not what. Append `Agent session ID: <output of step 5>` (omit if step 5 produced no output) and `<!-- commit-push-pr:created v1 -->` on their own lines at the end.
+   - PR exists: refresh the body via `gh pr edit --body` so (a) the new commit's changes are reflected in the prose and (b) `Agent session ID: <output of step 5>` appears in the body — append if missing, never remove or rewrite existing session ID lines so each contributing session is preserved. Then report the URL.
+7. End with one short text response: branch name and the full PR URL (e.g., `https://github.com/clipboardhealth/core-utils/pull/123`). Never use shorthand like `repo#123` — always output the complete URL.

package/skills/commit-push-pr/scripts/find-session-id.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# find-session-id.sh — print the current agent session ID, or nothing.
+# Output format on success: "<agent> <id>" (e.g. "codex 0193..." or "claude-code c8fb7000-...").
+# Exits 0 either way; callers should treat empty output as "unknown, skip the line".
+#
+# Codex: reads $CODEX_THREAD_ID directly.
+# Claude Code: greps the project's JSONL transcripts for a phrase the caller
+#   passes as $1. The phrase MUST come from a recent user message in the
+#   current session and MUST avoid: " ' \ tab newline (those are JSON-escaped
+#   on disk or break shell quoting). Non-ASCII is fine — Claude Code stores
+#   user messages verbatim, not as \uXXXX escapes.
+#
+# Usage: find-session-id.sh "<distinctive phrase>"
+
+set -euo pipefail
+
+if [ -n "${CODEX_THREAD_ID:-}" ]; then
+  echo "codex $CODEX_THREAD_ID"
+  exit 0
+fi
+
+phrase="${1:-}"
+[ -n "$phrase" ] || exit 0
+
+# Claude Code encodes both / and . as - in the project-dir name
+# (e.g. /Users/x/.claude → -Users-x--claude).
+project_dir="$HOME/.claude/projects/$(pwd | sed -e 's|/|-|g' -e 's|\.|-|g')"
+[ -d "$project_dir" ] || exit 0
+
+# -- guards against a phrase that starts with -. -m 1 stops scanning each
+# transcript at the first hit (transcripts can be hundreds of MB).
+matches=$(grep -lFm 1 -- "$phrase" "$project_dir"/*.jsonl 2>/dev/null || true)
+[ -n "$matches" ] || exit 0
+
+# Require exactly one match. Falling back to recency under multi-match would
+# risk a wrong ID when concurrent sessions exist in the same project.
+[ "$(printf '%s\n' "$matches" | wc -l)" -eq 1 ] || exit 0
+
+echo "claude-code $(basename "$matches" .jsonl)"