Assisted-by: Claude Sonnet 5 via Claude Code

diff --git a/ai/skills/jj/SKILL.md b/ai/skills/jj/SKILL.md
index 6bbfaa1e..a4aadf18 100644
--- a/ai/skills/jj/SKILL.md
+++ b/ai/skills/jj/SKILL.md
@@ -147,6 +147,21 @@ jj diff -- 'glob:"bin/*" ~ glob:"bin/,special"'
 **Put `-m` before `--` or fileset args.** jj parses everything after `--` as
 fileset, so `-m` placed after `--` becomes a parse error.
 
+**`jj squash` opens `$EDITOR` to merge descriptions and hangs in
+non-interactive shells.** When source and destination both have
+descriptions, jj launches the editor to combine them — Claude Code's
+Bash tool has no TTY, so the command appears to hang silently and
+nothing changes. Always pass one of:
+
+```bash
+jj squash --use-destination-message   # discard source description
+jj squash -u                          # short form
+jj squash -m 'new message'            # inline replacement
+```
+
+The same applies to `jj squash --from X --into Y`. If you actually want
+to merge the two descriptions, do it from a real terminal.
+
 ## When to Use jj --help
 
 Never rely on this skill as authoritative. Always run `jj <command> --help`
diff --git a/ai/skills/pr/SKILL.md b/ai/skills/pr/SKILL.md
index 0bb665bf..b25698bd 100644
--- a/ai/skills/pr/SKILL.md
+++ b/ai/skills/pr/SKILL.md
@@ -80,11 +80,14 @@ Revision must be provided (bookmark, change ID, revset, or commit hash). The rev
    - Follow repository conventions
 9. **Code review**: Dispatch the `superpowers:code-reviewer` subagent to review
     the changes. Tell the reviewer to run
-    `jj diff --from main@origin --to <revision>` to get the actual commit diff—do
-    not let it grep or read the working directory, which may be on a different
-    revision. Provide a brief description of what was implemented. Address
-    Critical and Important issues before proceeding; Minor issues can be noted
-    for later.
+    `jj diff --git --from main@origin --to <revision>` to get the actual commit
+    diff—do not let it grep or read the working directory, which may be on a
+    different revision. Pass `--git` so the reviewer gets a standard unified diff
+    with `@@` hunk headers; the default color-words format prints two
+    line-number columns (old, then new) and shows `..` in the old column for
+    added lines, which subagents misread when anchoring `file:line`. Provide a
+    brief description of what was implemented. Address Critical and Important
+    issues before proceeding; Minor issues can be noted for later.
 10. Create the PR: `gh pr create --head <bookmark-name> --title "<title>"` using
     a HEREDOC to pass the body.
     - If `web` was specified: add `--web` flag (without `--draft` — they're