Merge remote-tracking branch 'origin/main' into garrytan/codex-review-default-on

bin/dev-setup

@@ -72,7 +72,48 @@ fi
 # no-op skip (no install, no decline marker). A dev workspace must never mutate
 # global settings.json. To install the hooks, run `./setup --plan-tune-hooks`
 # directly (outside dev-setup). Saved prefix/other config preferences still apply.
-"$GSTACK_LINK/setup" --plan-tune-hooks=prompt </dev/null
+#
+# GSTACK_SKIP_GBRAIN_REGEN=1 is passed INLINE (not exported) so it scopes to
+# exactly this nested setup call and can't leak into any other setup path. It
+# tells setup NOT to regenerate the gbrain :user variant into the tracked
+# worktree (that would dirty checked-in source). We render it into an untracked
+# per-workspace dir below instead.
+GSTACK_SKIP_GBRAIN_REGEN=1 "$GSTACK_LINK/setup" --plan-tune-hooks=prompt </dev/null
+
+# 7. Brain-aware (gbrain) blocks — render into an untracked workspace dir.
+#
+# The worktree's SKILL.md files stay canonical (the guard above). If gbrain is
+# installed, render the :user variant (with GBRAIN_CONTEXT_LOAD +
+# GBRAIN_SAVE_RESULTS) into .claude/gstack-rendered (gitignored, per-workspace)
+# and repoint the workspace's SKILL.md symlinks at it. gen-skill-docs --out-dir
+# also rewrites the section-base path so section reads resolve to the render, not
+# the global install. Result: this workspace gets the full gbrain experience
+# while git stays clean. Other projects pick up blocks via `gstack-config
+# gbrain-refresh` (printed below).
+GBRAIN_DETECT="$REPO_ROOT/bin/gstack-gbrain-detect"
+RENDER_DIR="$REPO_ROOT/.claude/gstack-rendered"
+if [ -x "$GBRAIN_DETECT" ] && "$GBRAIN_DETECT" --is-ok 2>/dev/null; then
+  echo ""
+  echo "gbrain detected — rendering brain-aware skills into .claude/gstack-rendered (workspace-only, untracked)..."
+  rm -rf "$RENDER_DIR"
+  if ( cd "$REPO_ROOT" && bun run gen:skill-docs:user --host claude --out-dir "$RENDER_DIR" >/dev/null 2>&1 ); then
+    # Repoint each project-local SKILL.md symlink whose worktree target has a
+    # rendered counterpart. The skill DIRECTORY name (basename of the symlink
+    # target's dir) maps to RENDER_DIR/<dir>/SKILL.md, which is robust to
+    # frontmatter renames and the gstack- prefix on the link name.
+    repointed=0
+    for skill_link in "$REPO_ROOT"/.claude/skills/*/SKILL.md; do
+      [ -L "$skill_link" ] || continue
+      target="$(readlink "$skill_link")"
+      skilldir="$(basename "$(dirname "$target")")"
+      rendered="$RENDER_DIR/$skilldir/SKILL.md"
+      if [ -f "$rendered" ]; then ln -snf "$rendered" "$skill_link"; repointed=$((repointed + 1)); fi
+    done
+    echo "  $repointed workspace skills now serve brain-aware blocks (worktree stays canonical)."
+  else
+    echo "  warning: brain-aware render failed — workspace uses canonical skills."
+  fi
+fi
 
 echo ""
 echo "Dev mode active. Skills resolve from this working tree."
@@ -80,4 +121,7 @@ echo "  .claude/skills/gstack → $REPO_ROOT"
 echo "  .agents/skills/gstack → $REPO_ROOT"
 echo "Edit any SKILL.md and test immediately — no copy/deploy needed."
 echo ""
+echo "To make brain-aware blocks live across your OTHER projects too, run:"
+echo "  gstack-config gbrain-refresh"
+echo ""
 echo "To tear down: bin/dev-teardown"

bin/dev-teardown

@@ -24,9 +24,16 @@ if [ -d "$CLAUDE_SKILLS" ]; then
   fi
 
   rmdir "$CLAUDE_SKILLS" 2>/dev/null || true
-  rmdir "$REPO_ROOT/.claude" 2>/dev/null || true
 fi
 
+# ─── Clean up the untracked brain-aware render (bin/dev-setup step 7) ──
+RENDER_DIR="$REPO_ROOT/.claude/gstack-rendered"
+if [ -d "$RENDER_DIR" ]; then
+  rm -rf "$RENDER_DIR"
+  removed+=("claude/gstack-rendered")
+fi
+rmdir "$REPO_ROOT/.claude" 2>/dev/null || true
+
 # ─── Clean up .agents/skills/ ────────────────────────────────
 AGENTS_SKILLS="$REPO_ROOT/.agents/skills"
 if [ -d "$AGENTS_SKILLS" ]; then

bin/gstack-config

@@ -412,8 +412,29 @@ case "${1:-}" in
 
     case "$STATUS" in
       ok)
-        echo "Detected gbrain v$VERSION → brain-aware blocks will render in planning-skill SKILL.md files."
-        echo "Run 'bun run gen:skill-docs' in the gstack repo (or re-run ./setup) to regenerate now."
+        echo "Detected gbrain v$VERSION."
+        # Render brain-aware blocks INTO the global install so EVERY project's
+        # Claude sessions get them (other projects read SKILL.md + sections from
+        # ~/.claude/skills/gstack via absolute paths baked at gen time). Guards
+        # (never mutate an arbitrary directory): the target must exist, not be a
+        # symlink (a symlinked install points at a dev worktree — rendering there
+        # would dirty tracked source), and look like a real gstack clone.
+        INSTALL_DIR="$HOME/.claude/skills/gstack"
+        if [ ! -d "$INSTALL_DIR" ]; then
+          echo "No global install at $INSTALL_DIR — nothing to render. (Dev workspaces get blocks via bin/dev-setup.)"
+        elif [ -L "$INSTALL_DIR" ]; then
+          echo "Skip: $INSTALL_DIR is a symlink (likely a dev worktree). Rendering there would dirty tracked source — run bin/dev-setup in that worktree instead."
+        elif [ ! -f "$INSTALL_DIR/VERSION" ] || [ ! -f "$INSTALL_DIR/package.json" ]; then
+          echo "Skip: $INSTALL_DIR doesn't look like a gstack clone (missing VERSION/package.json) — refusing to modify it."
+        elif ! command -v bun >/dev/null 2>&1; then
+          echo "Skip: bun not on PATH — can't render. Install bun, then re-run 'gstack-config gbrain-refresh'."
+        elif ( cd "$INSTALL_DIR" && bun run gen:skill-docs:user --host claude >/dev/null 2>&1 ); then
+          echo "Rendered brain-aware blocks into $INSTALL_DIR — now live across all your projects' Claude sessions."
+          echo "Note: this dirties the install's git tree (generated blocks differ from main, by design)."
+          echo "      A 'git reset --hard origin/main' there reverts them; re-run 'gstack-config gbrain-refresh' to restore."
+        else
+          echo "Warning: render failed. Run 'cd $INSTALL_DIR && bun run gen:skill-docs:user --host claude' manually to see the error."
+        fi
         ;;
       *)
         echo "gbrain not detected (local-status: $STATUS) → brain-aware blocks will be suppressed in planning-skill SKILL.md files."

bin/gstack-gbrain-detect

@@ -234,4 +234,14 @@ function main(): void {
   process.stdout.write(JSON.stringify(out, null, 2) + "\n");
 }
 
+// --is-ok: live engine-status gate. Exits 0 iff gbrain is usable ("ok"), 1
+// otherwise. Runs detection live (never reads the possibly-stale
+// gbrain-detection.json), so callers — setup, bin/dev-setup, and
+// `gstack-config gbrain-refresh` — can decide whether to render the gbrain
+// :user variant without duplicating the JSON grep. Prints nothing on stdout.
+if (process.argv.includes("--is-ok")) {
+  const noCache = process.env.GSTACK_DETECT_NO_CACHE === "1";
+  process.exit(localEngineStatus({ noCache }) === "ok" ? 0 : 1);
+}
+
 main();