@jenga-ai/agent 3.5.0 → 4.0.0

package/skills/j-gitignore/scripts/repair-gitignore.sh

@@ -0,0 +1,226 @@
+#!/usr/bin/env bash
+# -----------------------------------------------------------------------------
+# skills/j-gitignore/scripts/repair-gitignore.sh
+#
+# Repairs an already-scaffolded project's .gitignore. Two jobs, in order:
+#
+#   1. Strips stray heredoc terminator lines (a bare `EOF`) left behind by the
+#      botched `cat > .gitignore <<EOF` in pre-fix /init scaffolds. The upstream
+#      fix (E31_S07_T02/T03, E42_S06_T01) repaired the TEMPLATE, which only helps
+#      projects scaffolded afterwards; this repairs one already on disk.
+#
+#   2. Adds (mode `ignored`) or removes (mode `visible`) the Jenga path entries,
+#      inside a managed block so the operation is exactly reversible.
+#
+# The managed block also ABSORBS loose duplicates: /init's
+# apply-project-visibility.sh and apply-scaffold-visibility.sh append bare lines
+# with no markers, so a previously-initialised project has loose `project/`,
+# `.claude/` and `.agents/` entries. Any loose line exactly matching a selected
+# catalog path is pulled out of the file and re-emitted inside the block, rather
+# than left to sit alongside it as a duplicate.
+#
+# Everything outside the managed block is preserved byte for byte. The file is
+# written atomically (temp + mv), so an interrupted run cannot truncate it.
+#
+# This does NOT untrack anything. .gitignore has no effect on a file git already
+# tracks — that is untrack-jenga-files.sh's job, and it must run after this.
+#
+# Invoked via `bash`, not executed directly.
+#
+# Usage:
+#   repair-gitignore.sh <ignored|visible> [project_root]
+#                       [--tiers scaffold,hybrid,board,optional]
+#                       [--dry-run] [--keep-eof]
+#
+# Options:
+#   --tiers <csv>  Which catalog tiers to act on. Default: scaffold
+#   --dry-run      Print a unified diff of the intended change; write nothing.
+#   --keep-eof     Leave stray `EOF` lines alone. Use only if this project
+#                  genuinely means to ignore a file literally named EOF.
+#
+# Exit codes:
+#   0  Success (including "already correct — nothing to do")
+#   1  Bad usage or missing prerequisite
+#   2  Invalid mode or tier
+#   3  Filesystem write failure
+# -----------------------------------------------------------------------------
+
+set -uo pipefail
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/_catalog.sh"
+
+info() { echo "[gitignore-repair] $*"; }
+err()  { echo "[gitignore-repair] ERROR: $*" >&2; }
+
+MODE=""
+PROJECT_ROOT=""
+TIERS="scaffold"
+DRY_RUN=0
+KEEP_EOF=0
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --tiers)   TIERS="${2:-}"; shift 2 ;;
+    --tiers=*) TIERS="${1#*=}"; shift ;;
+    --dry-run) DRY_RUN=1; shift ;;
+    --keep-eof) KEEP_EOF=1; shift ;;
+    -h|--help)
+      echo "Usage: $(basename "$0") <ignored|visible> [project_root] [--tiers <csv>] [--dry-run] [--keep-eof]"
+      exit 0 ;;
+    -*) err "Unknown option: $1"; exit 1 ;;
+    *)
+      if [ -z "$MODE" ]; then MODE="$1"
+      elif [ -z "$PROJECT_ROOT" ]; then PROJECT_ROOT="$1"
+      else err "Unexpected argument: $1"; exit 1
+      fi
+      shift ;;
+  esac
+done
+
+case "$MODE" in
+  ignored|visible) ;;
+  "") err "Missing mode. Usage: $(basename "$0") <ignored|visible> [project_root]"; exit 1 ;;
+  *)  err "Invalid mode '${MODE}'. Allowed: ignored, visible"; exit 2 ;;
+esac
+
+PROJECT_ROOT="${PROJECT_ROOT:-$PWD}"
+validate_tiers "$TIERS" || exit 2
+resolve_root "$PROJECT_ROOT" || exit 1
+load_catalog "$TIERS" || exit 1
+
+GITIGNORE=".gitignore"
+TMP="${GITIGNORE}.jenga-repair.$$"
+cleanup() { rm -f "$TMP"; }
+trap cleanup EXIT
+
+# Fast membership test for "is this line one of our selected catalog paths".
+is_catalog_path() {
+  local line="$1" p
+  for p in "${CATALOG_PATHS[@]}"; do
+    [ "$line" = "$p" ] && return 0
+  done
+  return 1
+}
+
+# ─── Read the existing file ─────────────────────────────────────────────────
+ORIGINAL=()
+if [ -f "$GITIGNORE" ]; then
+  while IFS= read -r line || [ -n "$line" ]; do
+    ORIGINAL+=("$line")
+  done < "$GITIGNORE"
+elif [ "$MODE" = "visible" ]; then
+  info "No .gitignore at this root and mode is 'visible' — nothing to do."
+  exit 0
+else
+  info "No .gitignore at this root — creating one."
+fi
+
+# ─── Filter: drop stray terminators, the old managed block, loose dupes ─────
+FILTERED=()
+in_block=0
+removed_eof=0
+removed_loose=0
+had_block=0
+
+for line in "${ORIGINAL[@]+"${ORIGINAL[@]}"}"; do
+  if [ "$in_block" -eq 1 ]; then
+    [ "$line" = "$MANAGED_END" ] && in_block=0
+    continue
+  fi
+  if [ "$line" = "$MANAGED_BEGIN" ]; then
+    in_block=1; had_block=1; continue
+  fi
+  if [ "$KEEP_EOF" -eq 0 ] && [[ "$line" =~ ^[[:space:]]*EOF[[:space:]]*$ ]]; then
+    removed_eof=$((removed_eof + 1)); continue
+  fi
+  if is_catalog_path "$line"; then
+    removed_loose=$((removed_loose + 1)); continue
+  fi
+  FILTERED+=("$line")
+done
+
+if [ "$in_block" -eq 1 ]; then
+  err "Unterminated managed block — found '${MANAGED_BEGIN}' with no matching end marker."
+  err "Refusing to write. Fix ${GITIGNORE} by hand, then re-run."
+  exit 3
+fi
+
+# Trim trailing blank lines so repeated runs cannot accumulate whitespace.
+# Indexed from the end by arithmetic, NOT via ${arr[-1]}: macOS still ships
+# bash 3.2, which has no negative array subscripts — there the subscript
+# silently evaluates empty, the loop condition stays true, and nothing is ever
+# unset, so the script spins forever.
+_last=$(( ${#FILTERED[@]} - 1 ))
+while [ "$_last" -ge 0 ] && [ -z "${FILTERED[$_last]// /}" ]; do
+  unset "FILTERED[$_last]"
+  _last=$(( _last - 1 ))
+done
+
+# ─── Build the new file ─────────────────────────────────────────────────────
+: > "$TMP" || { err "Cannot write temp file: $TMP"; exit 3; }
+
+for line in "${FILTERED[@]+"${FILTERED[@]}"}"; do
+  printf '%s\n' "$line" >> "$TMP" || { err "Write failed: $TMP"; exit 3; }
+done
+
+if [ "$MODE" = "ignored" ]; then
+  [ "${#FILTERED[@]}" -gt 0 ] && printf '\n' >> "$TMP"
+  {
+    printf '%s\n' "$MANAGED_BEGIN"
+    printf '%s\n' "# Managed by j.gitignore — regenerate with:"
+    printf '%s\n' "#   bash <skill>/scripts/repair-gitignore.sh ignored . --tiers ${TIERS}"
+    printf '%s\n' "# Remove with the same script in 'visible' mode. Edits inside this block"
+    printf '%s\n' "# are overwritten; put your own patterns outside it."
+    for i in "${!CATALOG_PATHS[@]}"; do
+      printf '%s\n' "${CATALOG_PATHS[$i]}"
+    done
+    printf '%s\n' "$MANAGED_END"
+  } >> "$TMP" || { err "Write failed: $TMP"; exit 3; }
+fi
+
+# ─── Report / apply ─────────────────────────────────────────────────────────
+if [ -f "$GITIGNORE" ] && cmp -s "$GITIGNORE" "$TMP"; then
+  info "Already correct — ${GITIGNORE} needs no change."
+  exit 0
+fi
+
+echo
+echo "── Proposed change to ${GITIGNORE} ────────────────────────────────────"
+if [ -f "$GITIGNORE" ]; then
+  diff -u "$GITIGNORE" "$TMP" | sed 's/^/  /' || true
+else
+  sed 's/^/  + /' "$TMP"
+fi
+echo
+
+info "Stray 'EOF' terminators removed : ${removed_eof}"
+info "Loose duplicate entries folded in: ${removed_loose}"
+info "Pre-existing managed block       : $([ "$had_block" -eq 1 ] && echo replaced || echo none)"
+info "Mode                             : ${MODE} (tiers: ${TIERS})"
+
+if [ "$DRY_RUN" -eq 1 ]; then
+  info "--dry-run — nothing written."
+  exit 0
+fi
+
+if ! mv "$TMP" "$GITIGNORE"; then
+  err "Failed to move ${TMP} into place."
+  exit 3
+fi
+trap - EXIT
+
+# Never report success without re-verifying the result on disk.
+if [ "$MODE" = "ignored" ]; then
+  for p in "${CATALOG_PATHS[@]}"; do
+    if ! grep -qxF -- "$p" "$GITIGNORE"; then
+      err "Post-write verification failed: '${p}' is not in ${GITIGNORE}."
+      exit 3
+    fi
+  done
+fi
+if [ "$KEEP_EOF" -eq 0 ] && grep -qE '^[[:space:]]*EOF[[:space:]]*$' "$GITIGNORE"; then
+  err "Post-write verification failed: a stray EOF line survived."
+  exit 3
+fi
+
+info "Wrote ${GITIGNORE} (verified)."
+exit 0

package/skills/j-gitignore/scripts/untrack-jenga-files.sh

@@ -0,0 +1,210 @@
+#!/usr/bin/env bash
+# -----------------------------------------------------------------------------
+# skills/j-gitignore/scripts/untrack-jenga-files.sh
+#
+# Removes Jenga-owned paths from git WITHOUT removing them from disk —
+# `git rm -r --cached`, never a plain `git rm`. The files stay exactly where
+# they are; git simply stops tracking them, and the .gitignore entries written
+# by repair-gitignore.sh then keep them from coming back.
+#
+# Run repair-gitignore.sh FIRST. .gitignore has no effect on an already-tracked
+# file, so untracking without the entries in place just means the next
+# `git add -A` re-adds everything.
+#
+# ─── What "removed from origin" does and does not mean ──────────────────────
+# With --commit --push, these paths disappear from the branch TIP on the
+# remote: clone it fresh and they are gone. Earlier commits are UNTOUCHED —
+# the blobs remain reachable in history, so this is not a secret-scrubbing
+# tool. If something sensitive was committed, treat it as compromised, rotate
+# it, and use a history-rewriting tool (git-filter-repo) separately.
+#
+# Invoked via `bash`, not executed directly.
+#
+# Usage:
+#   untrack-jenga-files.sh [project_root]
+#                          [--tiers scaffold,hybrid,board,optional]
+#                          [--dry-run] [--commit] [--push]
+#                          [--allow-dirty-index]
+#
+# Options:
+#   --dry-run             List what would be untracked; touch nothing.
+#   --commit              Commit the removals. Without it, changes are left
+#                         staged for you to inspect and commit yourself.
+#   --push                Push to the branch's upstream. Requires --commit.
+#                         Never implied — this is the only outward-facing step.
+#   --allow-dirty-index   Proceed even if unrelated changes are already staged.
+#                         Off by default so this can never sweep your staged
+#                         work into its commit.
+#
+# Exit codes:
+#   0  Success (including "nothing tracked — nothing to do")
+#   1  Bad usage or missing prerequisite
+#   2  Invalid tier
+#   3  git operation failed
+#   4  Refused: index already dirty, or --push without --commit
+# -----------------------------------------------------------------------------
+
+set -uo pipefail
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/_catalog.sh"
+
+info() { echo "[untrack] $*"; }
+warn() { echo "[untrack] WARNING: $*"; }
+err()  { echo "[untrack] ERROR: $*" >&2; }
+
+PROJECT_ROOT=""
+TIERS="scaffold"
+DRY_RUN=0
+DO_COMMIT=0
+DO_PUSH=0
+ALLOW_DIRTY=0
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --tiers)   TIERS="${2:-}"; shift 2 ;;
+    --tiers=*) TIERS="${1#*=}"; shift ;;
+    --dry-run) DRY_RUN=1; shift ;;
+    --commit)  DO_COMMIT=1; shift ;;
+    --push)    DO_PUSH=1; shift ;;
+    --allow-dirty-index) ALLOW_DIRTY=1; shift ;;
+    -h|--help)
+      echo "Usage: $(basename "$0") [project_root] [--tiers <csv>] [--dry-run] [--commit] [--push] [--allow-dirty-index]"
+      exit 0 ;;
+    -*) err "Unknown option: $1"; exit 1 ;;
+    *)
+      if [ -n "$PROJECT_ROOT" ]; then err "More than one project root given."; exit 1; fi
+      PROJECT_ROOT="$1"; shift ;;
+  esac
+done
+
+if [ "$DO_PUSH" -eq 1 ] && [ "$DO_COMMIT" -eq 0 ]; then
+  err "--push requires --commit. There would be nothing to push."
+  exit 4
+fi
+
+PROJECT_ROOT="${PROJECT_ROOT:-$PWD}"
+validate_tiers "$TIERS" || exit 2
+resolve_root "$PROJECT_ROOT" || exit 1
+load_catalog "$TIERS" || exit 1
+
+# ─── Refuse to run on a dirty index ─────────────────────────────────────────
+# .gitignore is the one staged path that is never "unrelated": it is the
+# companion change repair-gitignore.sh just made, and untracking without it is
+# pointless. Staged alone, it is allowed through and folded into this commit.
+# Anything else staged is refused.
+if [ "$ALLOW_DIRTY" -eq 0 ] && [ "$DRY_RUN" -eq 0 ]; then
+  if ! git diff --cached --quiet 2>/dev/null; then
+    staged="$(git diff --cached --name-only)"
+    if [ "$staged" = ".gitignore" ]; then
+      info "Staged .gitignore detected — folding the ignore-rule change into this commit."
+    else
+      err "The index already has staged changes:"
+      printf '%s\n' "$staged" | sed 's/^/        /' >&2
+      err "Refusing to run — a --commit here would sweep them into this commit."
+      err "Commit or unstage them first, or pass --allow-dirty-index if you"
+      err "genuinely want them included."
+      exit 4
+    fi
+  fi
+fi
+
+# ─── Find what is actually tracked ──────────────────────────────────────────
+TRACKED_PATHS=()
+TOTAL_FILES=0
+for i in "${!CATALOG_PATHS[@]}"; do
+  path="${CATALOG_PATHS[$i]}"
+  count="$(git ls-files -- "$path" 2>/dev/null | wc -l | tr -d ' ')"
+  if [ "${count:-0}" -gt 0 ]; then
+    TRACKED_PATHS+=("$path")
+    TOTAL_FILES=$((TOTAL_FILES + count))
+    printf '  %-36s %s tracked file(s)\n' "$path" "$count"
+  fi
+done
+
+if [ "${#TRACKED_PATHS[@]}" -eq 0 ]; then
+  info "No catalog path (tiers: ${TIERS}) is tracked — nothing to untrack."
+  exit 0
+fi
+
+echo
+info "${#TRACKED_PATHS[@]} path(s), ${TOTAL_FILES} file(s) would stop being tracked."
+info "All of them remain on disk — this uses 'git rm -r --cached'."
+
+if [ "$DRY_RUN" -eq 1 ]; then
+  info "--dry-run — nothing changed."
+  exit 0
+fi
+
+# ─── Untrack ────────────────────────────────────────────────────────────────
+for path in "${TRACKED_PATHS[@]}"; do
+  if ! git rm -r --cached --quiet -- "$path"; then
+    err "git rm --cached failed for '${path}'. The index may be partially staged;"
+    err "inspect with 'git status' and 'git reset' to back out."
+    exit 3
+  fi
+  info "Untracked: ${path}"
+done
+
+# Verify nothing was deleted from disk before reporting success.
+MISSING=0
+for path in "${TRACKED_PATHS[@]}"; do
+  probe="${path%/}"
+  if [ ! -e "$probe" ]; then
+    warn "'${probe}' is not on disk. It was already absent before this ran"
+    warn "(git tracked it, the working tree did not), so nothing was lost here."
+    MISSING=$((MISSING + 1))
+  fi
+done
+[ "$MISSING" -eq 0 ] && info "Verified: every untracked path is still present on disk."
+
+if [ "$DO_COMMIT" -eq 0 ]; then
+  echo
+  info "Changes are STAGED but not committed. Review with:"
+  info "    git status"
+  info "    git diff --cached --stat"
+  info "Then commit yourself, or re-run with --commit."
+  exit 0
+fi
+
+# ─── Commit ─────────────────────────────────────────────────────────────────
+COMMIT_MSG="chore(jenga): untrack Jenga-owned files, keep them on disk
+
+Removes the Jenga scaffold from version control via 'git rm --cached' and
+relies on the j.gitignore managed block to keep it out. Files are untouched
+on disk. Tiers: ${TIERS}.
+
+Note: this changes the branch tip only — earlier commits still contain these
+paths."
+
+if ! git commit -q -m "$COMMIT_MSG"; then
+  err "git commit failed. Your removals are still staged."
+  exit 3
+fi
+info "Committed: $(git rev-parse --short HEAD)"
+
+if [ "$DO_PUSH" -eq 0 ]; then
+  echo
+  info "Not pushed. The remote still has these files until you push."
+  exit 0
+fi
+
+# ─── Push ───────────────────────────────────────────────────────────────────
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+UPSTREAM="$(git rev-parse --abbrev-ref --symbolic-full-name '@{u}' 2>/dev/null)"
+
+if [ -z "$UPSTREAM" ]; then
+  err "Branch '${BRANCH}' has no upstream — refusing to guess a remote."
+  err "Set one, then push yourself:  git push -u origin ${BRANCH}"
+  err "The commit itself succeeded and is safe on your local branch."
+  exit 3
+fi
+
+info "Pushing ${BRANCH} → ${UPSTREAM} ..."
+if ! git push; then
+  err "Push failed — most likely the branch is behind its upstream."
+  err "Reconcile (git pull --rebase) and push yourself. The commit is safe locally."
+  exit 3
+fi
+
+info "Pushed. These paths are gone from ${UPSTREAM}'s tip."
+info "They REMAIN in earlier commits — this did not rewrite history."
+exit 0

package/skills/j-help/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: j.help
-description: Polyfill alias of the help skill under a collision-safe directory name. Identical behavior to /help — List all available skills with a short description of what each one does. Also use this skill when the user wants to know what commands or skills are available in the project. Use when the bare /help form is shadowed by another tool's own built-in command of the same name.
+description: List all available skills with a short description of what each one does. Also use this skill when the user wants to know what commands or skills are available in the project.
 keywords:
   - help
   - skills
@@ -8,7 +8,6 @@ keywords:
   - what can you do
   - list skills
   - j-help
-  - polyfill
 examples:
   - "what skills are available?"
   - "show me all commands"
@@ -17,9 +16,9 @@ examples:
 
 # Help — List Available Skills
 
-This skill is a literal-directory-name duplicate of `skills/help/`. It exists so that `/j-help` (and `j.j-help`) give a guaranteed-unshadowed way to reach the same flow as `/help`, even if a host tool's own built-in command of the same name would otherwise shadow or override the bare `/help` alias (Claude Code's native skill resolution is a literal-string, directory-name-based match — see `docs/skill-authoring.md`'s "Invocation Convention").
+`skills/j-help/` is the **canonical, hand-edited** directory for this skill, per CLAUDE.md's "The Canonical Naming Contract" (the `E50` reopening of 2026-09-09, which promoted `skills/j-help/` from generated twin to sole canonical form). The `j-` prefix is there for collision safety — a real directory under a distinct name, so a host tool shipping its own same-named built-in command cannot shadow it (Claude Code's native skill resolution is a literal-string, directory-name-based match; see `docs/skill-authoring.md`'s "Invocation Convention").
 
-This file is generated/synced by `scripts/generate-j-alias.sh help` from `skills/help/SKILL.md` — do not hand-edit it; re-run the generator instead to pick up source changes.
+> ⚠️ **`scripts/generate-j-alias.sh` was retired by `E50_S14` and no longer exists — there is nothing to run.** This file was previously generated from a bare `skills/help/SKILL.md` source; `E50_S15` deleted that directory. This file is now the sole canonical, hand-edited source for this skill — edit it directly.
 
 ## Instructions
 

package/skills/j-idea/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: j.idea
-description: Polyfill alias of the idea skill under a collision-safe directory name. Identical behavior to /idea — Capture a loosely-defined idea to project/ideas.md — a lightweight, "maybe someday" log with no board or promotion overhead. Use when the bare /idea form is shadowed by another tool's own built-in command of the same name.
+description: Capture a loosely-defined idea to project/ideas.md — a lightweight, "maybe someday" log with no board or promotion overhead.
 keywords:
   - idea
   - capture idea
@@ -8,7 +8,6 @@ keywords:
   - brain dump
   - maybe someday
   - j-idea
-  - polyfill
 examples:
   - "capture this as an idea"
   - "log this idea for later"
@@ -20,9 +19,9 @@ metadata:
 
 # Idea — Lightweight Idea Capture
 
-This skill is a literal-directory-name duplicate of `skills/idea/`. It exists so that `/j-idea` (and `j.j-idea`) give a guaranteed-unshadowed way to reach the same flow as `/idea`, even if a host tool's own built-in command of the same name would otherwise shadow or override the bare `/idea` alias (Claude Code's native skill resolution is a literal-string, directory-name-based match — see `docs/skill-authoring.md`'s "Invocation Convention").
+`skills/j-idea/` is the **canonical, hand-edited** directory for this skill, per CLAUDE.md's "The Canonical Naming Contract" (the `E50` reopening of 2026-09-09, which promoted `skills/j-idea/` from generated twin to sole canonical form). The `j-` prefix is there for collision safety — a real directory under a distinct name, so a host tool shipping its own same-named built-in command cannot shadow it (Claude Code's native skill resolution is a literal-string, directory-name-based match; see `docs/skill-authoring.md`'s "Invocation Convention").
 
-This file is generated/synced by `scripts/generate-j-alias.sh idea` from `skills/idea/SKILL.md` — do not hand-edit it; re-run the generator instead to pick up source changes.
+> ⚠️ **`scripts/generate-j-alias.sh` was retired by `E50_S14` and no longer exists — there is nothing to run.** This file was previously generated from a bare `skills/idea/SKILL.md` source; `E50_S15` deleted that directory. This file is now the sole canonical, hand-edited source for this skill — edit it directly.
 
 ## Instructions
 
@@ -52,12 +51,84 @@ This file is generated/synced by `scripts/generate-j-alias.sh idea` from `skills
 - **Promoting an idea** means re-running `/brainstorm` on it, which routes onward to `/btw` or `/todo` as normal. That routing behavior already exists and is out of scope for `/idea`.
 - **Terminal idea states** are marked directly in `project/ideas.md` using the same HTML-comment tag convention `project/todo.md` uses for `RECONCILED`:
   - `PROMOTED` — the idea was picked up via `/brainstorm` and turned into board work.
-  - `DISCARDED` — the idea was reviewed and dropped.
+  - `REJECTED` — the idea was reviewed and dropped.
 
-  Example (mirroring `project/todo.md`'s tagging style):
+### Embedded Board ID
+
+`PROMOTED`/`REJECTED` tags support an embedded board ID, so the idea→board-item link is
+machine-readable directly from the tag itself, without needing a separate lookup:
+
+- `<!-- PROMOTED: E##_S##[_T##] -->` — the `_T##` task suffix is optional; use whichever level
+  the idea was actually promoted into (an epic, a story, or a specific task).
+- `<!-- REJECTED -->` — stays bare, with no embedded ID. A rejection has no resulting board
+  item to point at.
+
+Example (mirroring `project/todo.md`'s tagging style):
+```
+Add dark mode toggle to settings page <!-- PROMOTED: E12_S03 -->
+Add a settings-page keyboard shortcut cheat sheet <!-- PROMOTED: E12_S03_T02 -->
+Rewrite onboarding copy in a more casual tone <!-- REJECTED -->
+```
+
+### Source-Rapport Link Convention
+
+Some ideas originate from a rapport rather than being manually captured via `/idea` — e.g. when
+scrum-master's `rapport_review` step (E35_S03) detects a distinct idea surfaced inside a
+problem rapport and, on user confirmation, appends it to `project/ideas.md` the same way
+`/idea` does. When that happens, the entry's source rapport is recorded with a second inline
+HTML comment on the same line:
+
+```
+<!-- rapport: <path/to/rapport.md> -->
+```
+
+Rules:
+- Written at capture time, alongside the idea text, by whichever flow is adding the entry
+  (scrum-master's rapport-derived capture path; `/idea`'s own manual capture never has a source
+  rapport and omits this comment entirely).
+- Left in place through promotion/rejection — the `rapport:` comment and the terminal
+  `PROMOTED`/`REJECTED` comment coexist on the same line, e.g.:
   ```
-  Add dark mode toggle to settings page <!-- PROMOTED -->
-  Rewrite onboarding copy in a more casual tone <!-- DISCARDED -->
+  Extract shared retry logic into a utility <!-- rapport: project/rapports/problems/E40_S02_T01-segment-remarks.md --> <!-- PROMOTED: E61_S01 -->
   ```
+- Consumed by the outcome-record mechanism at promotion/rejection time: if a `rapport:` comment
+  is present on the line, that rapport is updated with the decision (and `[SPIKE]`-prefixed in
+  its title/header if not already, per `templates/SCRUM_BOARD_SCHEMA.md`'s `[SPIKE]` section);
+  if absent (a manually-captured `/idea` entry with no source rapport), a
+  `project/documentation/plans/<slug>_PROMOTED.md` or `_REJECTED.md` file is created instead.
+- Verified compatible with `scripts/idea_manager.sh`'s `real_entries()` filtering: that function
+  only strips lines whose first non-whitespace characters are `<!--`; a trailing inline comment
+  on an otherwise real entry line is untouched and the line still counts as a real entry.
+
+No agent invoked by `/idea` applies terminal (`PROMOTED`/`REJECTED`) tags or acts on them — that
+is reserved for the promotion step (e.g. within `/brainstorm`) and, for rapport-sourced ideas,
+scrum-master's rapport-review flow.
+
+### Outcome-Record Mechanism (`idea_manager.sh`) — E35_S03_T03
+
+`scripts/idea_manager.sh` implements the tagging and outcome-record behavior described above, via
+four additional subcommands beyond `add`/`list`:
+
+- `tag "<idea-text>" <PROMOTED:E##_S##[_T##]|REJECTED>` — writes the terminal tag onto the
+  `project/ideas.md` line matching `<idea-text>` (an exact/literal match; errors if zero or more
+  than one line matches, and errors if the line is already tagged).
+- `get-id "<idea-text>"` — prints the embedded board ID from that line's `PROMOTED` tag (errors
+  if the line has no `PROMOTED` tag).
+- `get-rapport "<idea-text>"` — prints the `rapport:` path recorded on that line, or nothing
+  (exit 0) if the line has no source-rapport comment.
+- `resolve "<idea-text>" <promoted|rejected> [board_id]` — the full outcome-record mechanism in
+  one call: tags the line (as `tag` does), then either updates the idea's source rapport or, if
+  none is recorded, creates the `project/documentation/plans/` fallback file:
+  - **Source rapport present:** the rapport's `# Rapport: ...` title line is prefixed
+    `[SPIKE] ` if not already, and an `## Idea Outcome Record` section (decision, date, resulting
+    board ID if promoted, and the idea text) is appended to the rapport file.
+  - **No source rapport:** `project/documentation/plans/<slug>_PROMOTED.md` or `_REJECTED.md` is
+    created (idea text slugified, lowercased, capped at 60 characters), containing the same
+    decision/date/board-ID/idea-text content.
+
+  `board_id` is required for `promoted` (validated to start with `E<digits>`) and must be omitted
+  for `rejected` (a rejection has no resulting board item).
 
-No agent invoked by `/idea` applies these tags or acts on them — that is reserved for a future promotion step (e.g. within `/brainstorm`).
+This is the mechanism itself, not the trigger — nothing currently calls `resolve` automatically.
+A future promotion step (e.g. within `/brainstorm`'s routing, or scrum-master acting on a
+rapport-sourced idea) is expected to invoke it once that trigger exists.

package/skills/j-idea/assets/idea_template.md

@@ -1,3 +1,3 @@
 # Ideas
 
-<!-- Format: <idea text> (one line per idea; terminal tags PROMOTED / DISCARDED appended by /brainstorm, not by /idea) -->
+<!-- Format: <idea text> (one line per idea; terminal tags PROMOTED / REJECTED appended by /brainstorm, not by /idea) -->

package/skills/j-improve/SKILL.md

@@ -1,16 +1,15 @@
 ---
 name: j.improve
-description: Polyfill alias of the improve skill under a collision-safe directory name. Identical behavior to /improve — A skill for analyzing a codebase and producing a structured improvement plan toward a defined goal. Use when the bare /improve form is shadowed by another tool's own built-in command of the same name.
+description: A skill for analyzing a codebase and producing a structured improvement plan toward a defined goal.
 keywords:
   - j-improve
-  - polyfill
 ---
 
 # Improve
 
-This skill is a literal-directory-name duplicate of `skills/improve/`. It exists so that `/j-improve` (and `j.j-improve`) give a guaranteed-unshadowed way to reach the same flow as `/improve`, even if a host tool's own built-in command of the same name would otherwise shadow or override the bare `/improve` alias (Claude Code's native skill resolution is a literal-string, directory-name-based match — see `docs/skill-authoring.md`'s "Invocation Convention").
+`skills/j-improve/` is the **canonical, hand-edited** directory for this skill, per CLAUDE.md's "The Canonical Naming Contract" (the `E50` reopening of 2026-09-09, which promoted `skills/j-improve/` from generated twin to sole canonical form). The `j-` prefix is there for collision safety — a real directory under a distinct name, so a host tool shipping its own same-named built-in command cannot shadow it (Claude Code's native skill resolution is a literal-string, directory-name-based match; see `docs/skill-authoring.md`'s "Invocation Convention").
 
-This file is generated/synced by `scripts/generate-j-alias.sh improve` from `skills/improve/SKILL.md` — do not hand-edit it; re-run the generator instead to pick up source changes.
+> ⚠️ **`scripts/generate-j-alias.sh` was retired by `E50_S14` and no longer exists — there is nothing to run.** This file was previously generated from a bare `skills/improve/SKILL.md` source; `E50_S15` deleted that directory. This file is now the sole canonical, hand-edited source for this skill — edit it directly.
 
 ## Instructions
 
@@ -50,7 +49,7 @@ Assess whether you have enough context to evaluate current behavior against the
 Invoke the `/examplify` skill. Specify clearly what you want it to find out — e.g. which code paths are exercised, what inputs/outputs look like, or what edge cases exist.
 
 ### 5. Run `/evaluate`
-Copy `.agents/skills/evaluate/assets/evaluation_invokation_template.yml` and fill in:
+Copy `.agents/skills/j-evaluate/assets/evaluation_invokation_template.yml` and fill in:
 - `paths`: path(s) to the relevant example files
 - `goal`: the confirmed target goal