xtrm-tools 0.5.10 → 0.5.13

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-cli",
-  "version": "0.5.10",
+  "version": "0.5.13",
   "description": "Claude Code tools installer (skills, hooks, MCP servers)",
   "main": "./dist/index.js",
   "type": "module",

package/config/instructions/agents-top.md

@@ -1,30 +1,94 @@
-# XTRM Agent Workflow (Short)
+# XTRM Agent Workflow
 
-This file is an **agent operating manual** (not a project overview).
+> Full reference: [XTRM-GUIDE.md](XTRM-GUIDE.md)
+> Run `bd prime` at session start (or after context reset) for live beads workflow context.
 
-1. **Start with scope**
-   - Clarify task intent if ambiguous.
-   - Prefer semantic discovery (Serena + GitNexus) over broad grep-first exploration.
+## Session Start
 
-2. **Track work in `bd`**
-   - Use `bd ready --json` / `bd update <id> --claim --json` before edits.
-   - Create discovered follow-ups with `--deps discovered-from:<id>`.
+1. `bd prime` — load workflow context and active claims
+2. `bd memories <keyword>` — retrieve memories relevant to today's task
+3. `bd recall <key>` — retrieve a specific memory by key if needed
+4. `bd ready` — find available work
+5. `bd update <id> --claim` — claim before any file edit
 
-3. **Branch per issue (strict)**
-   - Create a **new branch for each issue** from latest `main`.
-   - Do **not** continue new work on a previously used branch.
-   - Branch format: `feature/<issue-id>-<short-description>` (or `fix/...`, `chore/...`).
+## Active Gates (extensions enforce these — not optional)
 
-4. **Edit safely**
-   - Use Serena symbol tools for code changes when possible.
-   - Run GitNexus impact checks before symbol changes and detect-changes before commit.
+| Gate | Trigger | Required action |
+|------|---------|-----------------|
+| **Edit** | Write/Edit without active claim | `bd update <id> --claim` |
+| **Commit** | `git commit` while claim is open | `bd close <id>` first, then commit |
+| **Stop** | Session end with unclosed claim | `bd close <id>` |
+| **Memory** | Auto-fires at session end if issue closed | `bd remember "<insight>"` then `touch .beads/.memory-gate-done` |
 
-5. **PR merge + return to main**
-   - Always merge via PR (squash merge preferred).
-   - After merge: switch to `main` and sync (`git reset --hard origin/main`).
-   - Delete merged branch locally and remotely (`git branch -d <branch>` and `git push origin --delete <branch>`).
+> `bd close` auto-commits via `git commit -am`. Do not double-commit after closing.
 
-6. **Before finishing**
-   - Run relevant tests/linters.
-   - Close/update bead state.
-   - Ensure changes are committed and pushed.
+## bd Command Reference
+
+```bash
+# Work discovery
+bd ready                               # Unblocked open issues
+bd show <id>                           # Full detail + deps + blockers
+bd list --status=in_progress           # Your active claims
+bd query "status=in_progress AND assignee=me"  # Complex filter
+bd search <text>                       # Full-text search across issues
+
+# Claiming & updating
+bd update <id> --claim                 # Claim (sets you as owner, status→in_progress)
+bd update <id> --notes "..."           # Append notes inline
+bd update <id> --status=blocked        # Mark blocked
+bd update                              # Update last-touched issue (no ID needed)
+
+# Creating
+bd create --title="..." --description="..." --type=task --priority=2
+# --deps "discovered-from:<parent-id>"  link follow-ups to source
+# priority: 0=critical  1=high  2=medium  3=low  4=backlog
+# types: task | bug | feature | epic | chore | decision
+
+# Closing
+bd close <id>                          # Close + auto-commit
+bd close <id> --reason="Done: ..."     # Close with context
+bd close <id1> <id2> <id3>            # Batch close
+
+# Dependencies
+bd dep add <issue> <depends-on>        # issue depends on depends-on (depends-on blocks issue)
+bd dep <blocker> --blocks <blocked>    # shorthand: blocker blocks blocked
+bd dep relate <a> <b>                  # non-blocking "relates to" link
+bd dep tree <id>                       # visualise dependency tree
+bd blocked                             # show all currently blocked issues
+
+# Persistent memory
+bd remember "<insight>"                # Store across sessions (project-scoped)
+bd memories <keyword>                  # Search stored memories
+bd recall <key>                        # Retrieve full memory by key
+bd forget <key>                        # Remove a memory
+
+# Health & pre-flight
+bd stats                               # Open/closed/blocked counts
+bd preflight --check                   # Pre-PR readiness (lint, tests, beads)
+bd doctor                              # Diagnose installation issues
+```
+
+## Git Workflow (strict: one branch per issue)
+
+```bash
+git checkout -b feature/<issue-id>-<slug>   # or fix/... chore/...
+bd update <id> --claim                       # claim before any edit
+# ... write code ...
+bd close <id> --reason="..."                 # closes issue + auto-commits
+xt end                                       # push, PR, merge, worktree cleanup
+```
+
+**Never** continue new work on a previously used branch.
+
+## Quality Gates (automatic)
+
+Run on every file edit via PostToolUse extension:
+- **TypeScript/JS**: ESLint + tsc
+- **Python**: ruff + mypy
+
+Gate output appears as extension context. Fix failures before proceeding — do not commit with lint errors.
+
+## Worktree Sessions
+
+- `xt pi` — launch Pi in a sandboxed worktree
+- `xt end` — close session: commit / push / PR / cleanup

package/config/instructions/claude-top.md

@@ -1,30 +1,108 @@
-# XTRM Agent Workflow (Short)
+# XTRM Agent Workflow
 
-This file is an **agent operating manual** (not a project overview).
+> Full reference: [XTRM-GUIDE.md](XTRM-GUIDE.md) | Session manual: `/using-xtrm` skill
+> Run `bd prime` at session start (or after `/compact`) for live beads workflow context.
 
-1. **Start with scope**
-   - Clarify task intent if ambiguous.
-   - Prefer semantic discovery (Serena + GitNexus) over broad grep-first exploration.
+## Session Start
 
-2. **Track work in `bd`**
-   - Use `bd ready --json` / `bd update <id> --claim --json` before edits.
-   - Create discovered follow-ups with `--deps discovered-from:<id>`.
+1. `bd prime` — load workflow context and active claims
+2. `bd memories <keyword>` — retrieve memories relevant to today's task
+3. `bd recall <key>` — retrieve a specific memory by key if needed
+4. `bd ready` — find available work
+5. `bd update <id> --claim` — claim before any file edit
 
-3. **Branch per issue (strict)**
-   - Create a **new branch for each issue** from latest `main`.
-   - Do **not** continue new work on a previously used branch.
-   - Branch format: `feature/<issue-id>-<short-description>` (or `fix/...`, `chore/...`).
+## Active Gates (hooks enforce these — not optional)
 
-4. **Edit safely**
-   - Use Serena symbol tools for code changes when possible.
-   - Run GitNexus impact checks before symbol changes and detect-changes before commit.
+| Gate | Trigger | Required action |
+|------|---------|-----------------|
+| **Edit** | Write/Edit without active claim | `bd update <id> --claim` |
+| **Commit** | `git commit` while claim is open | `bd close <id>` first, then commit |
+| **Stop** | Session end with unclosed claim | `bd close <id>` |
+| **Memory** | Auto-fires at Stop if issue closed this session | `bd remember "<insight>"` then `touch .beads/.memory-gate-done` |
 
-5. **PR merge + return to main**
-   - Always merge via PR (squash merge preferred).
-   - After merge: switch to `main` and sync (`git reset --hard origin/main`).
-   - Delete merged branch locally and remotely (`git branch -d <branch>` and `git push origin --delete <branch>`).
+> `bd close` auto-commits via `git commit -am`. Do not double-commit after closing.
 
-6. **Before finishing**
-   - Run relevant tests/linters.
-   - Close/update bead state.
-   - Ensure changes are committed and pushed.
+## bd Command Reference
+
+```bash
+# Work discovery
+bd ready                               # Unblocked open issues
+bd show <id>                           # Full detail + deps + blockers
+bd list --status=in_progress           # Your active claims
+bd query "status=in_progress AND assignee=me"  # Complex filter
+bd search <text>                       # Full-text search across issues
+
+# Claiming & updating
+bd update <id> --claim                 # Claim (sets you as owner, status→in_progress)
+bd update <id> --notes "..."           # Append notes inline
+bd update <id> --status=blocked        # Mark blocked
+bd update                              # Update last-touched issue (no ID needed)
+
+# Creating
+bd create --title="..." --description="..." --type=task --priority=2
+# --deps "discovered-from:<parent-id>"  link follow-ups to source
+# priority: 0=critical  1=high  2=medium  3=low  4=backlog
+# types: task | bug | feature | epic | chore | decision
+
+# Closing
+bd close <id>                          # Close + auto-commit
+bd close <id> --reason="Done: ..."     # Close with context
+bd close <id1> <id2> <id3>            # Batch close
+
+# Dependencies
+bd dep add <issue> <depends-on>        # issue depends on depends-on (depends-on blocks issue)
+bd dep <blocker> --blocks <blocked>    # shorthand: blocker blocks blocked
+bd dep relate <a> <b>                  # non-blocking "relates to" link
+bd dep tree <id>                       # visualise dependency tree
+bd blocked                             # show all currently blocked issues
+
+# Persistent memory
+bd remember "<insight>"                # Store across sessions (project-scoped)
+bd memories <keyword>                  # Search stored memories
+bd recall <key>                        # Retrieve full memory by key
+bd forget <key>                        # Remove a memory
+
+# Health & pre-flight
+bd stats                               # Open/closed/blocked counts
+bd preflight --check                   # Pre-PR readiness (lint, tests, beads)
+bd doctor                              # Diagnose installation issues
+```
+
+## Git Workflow (strict: one branch per issue)
+
+```bash
+git checkout -b feature/<issue-id>-<slug>   # or fix/... chore/...
+bd update <id> --claim                       # claim before any edit
+# ... write code ...
+bd close <id> --reason="..."                 # closes issue + auto-commits
+xt end                                       # push, PR, merge, worktree cleanup
+```
+
+**Never** continue new work on a previously used branch.
+
+## Code Intelligence (mandatory before edits)
+
+Use **Serena** (`using-serena-lsp` skill) for all code reads and edits:
+- `find_symbol` → `get_symbols_overview` → `replace_symbol_body`
+- Never grep-read-sed when symbolic tools are available
+
+Use **GitNexus** MCP tools before touching any symbol:
+- `gitnexus_impact({target: "symbolName", direction: "upstream"})` — blast radius
+- `gitnexus_context({name: "symbolName"})` — callers, callees, execution flows
+- `gitnexus_detect_changes()` — verify scope before every commit
+- `gitnexus_query({query: "concept"})` — explore unfamiliar areas
+
+Stop and warn the user if impact returns HIGH or CRITICAL risk.
+
+## Quality Gates (automatic)
+
+Run on every file edit via PostToolUse hooks:
+- **TypeScript/JS**: ESLint + tsc
+- **Python**: ruff + mypy
+
+Gate output appears as hook context. Fix failures before proceeding — do not commit with lint errors.
+
+## Worktree Sessions
+
+- `xt claude` — launch Claude Code in a sandboxed worktree
+- `xt end` — close session: commit / push / PR / cleanup

package/config/pi/extensions/beads/index.ts

@@ -149,7 +149,9 @@ export default function (pi: ExtensionAPI) {
 		pi.sendUserMessage(
 			`🧠 Memory gate: claim \`${claimId}\` was closed this session.\n` +
 			`For each closed issue, worth persisting?\n` +
-			`  YES → \`bd remember "<insight>"\`   NO → note "nothing to persist"`,
+			`  YES → \`bd remember "<insight>"\`\n` +
+			`  NO  → note "nothing to persist"\n` +
+			`  Then acknowledge: \`touch .beads/.memory-gate-done\``,
 		);
 	};
 

package/config/pi/extensions/session-flow/index.ts

@@ -1,9 +1,6 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { isBashToolResult } from "@mariozechner/pi-coding-agent";
-import fs from "node:fs";
-import path from "node:path";
 import { SubprocessRunner, EventAdapter } from "../core/lib";
-import { readSessionState } from "../core/session-state";
 
 function isClaimCommand(command: string): { isClaim: boolean; issueId: string | null } {
 	if (!/\bbd\s+update\b/.test(command) || !/--claim\b/.test(command)) {
@@ -13,66 +10,14 @@ function isClaimCommand(command: string): { isClaim: boolean; issueId: string |
 	return { isClaim: true, issueId: match?.[1] ?? null };
 }
 
-function statePathFrom(startCwd: string): string {
-	let current = path.resolve(startCwd || process.cwd());
-	for (;;) {
-		const candidate = path.join(current, ".xtrm-session-state.json");
-		if (fs.existsSync(candidate)) return candidate;
-		const parent = path.dirname(current);
-		if (parent === current) return path.join(startCwd, ".xtrm-session-state.json");
-		current = parent;
-	}
-}
-
-async function ensureWorktreeSessionState(cwd: string, issueId: string): Promise<{ ok: boolean; message?: string }> {
-	const repoRootResult = await SubprocessRunner.run("git", ["rev-parse", "--show-toplevel"], { cwd });
-	if (repoRootResult.code !== 0 || !repoRootResult.stdout) return { ok: false, message: "not a git repo" };
-	const repoRoot = repoRootResult.stdout.trim();
-
-	const gitDir = await SubprocessRunner.run("git", ["rev-parse", "--git-dir"], { cwd });
-	const commonDir = await SubprocessRunner.run("git", ["rev-parse", "--git-common-dir"], { cwd });
-	if (gitDir.code === 0 && commonDir.code === 0 && gitDir.stdout.trim() !== commonDir.stdout.trim()) {
-		return { ok: false, message: "already in linked worktree" };
-	}
-
-	const overstoryDir = path.join(repoRoot, ".overstory");
-	const worktreesBase = fs.existsSync(overstoryDir)
-		? path.join(overstoryDir, "worktrees")
-		: path.join(repoRoot, ".worktrees");
-	fs.mkdirSync(worktreesBase, { recursive: true });
-
-	const branch = `feature/${issueId}`;
-	const worktreePath = path.join(worktreesBase, issueId);
-	if (!fs.existsSync(worktreePath)) {
-		const branchExists = (await SubprocessRunner.run("git", ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], { cwd: repoRoot })).code === 0;
-		const addArgs = branchExists
-			? ["worktree", "add", worktreePath, branch]
-			: ["worktree", "add", worktreePath, "-b", branch];
-		const add = await SubprocessRunner.run("git", addArgs, { cwd: repoRoot, timeoutMs: 20000 });
-		if (add.code !== 0) {
-			return { ok: false, message: add.stderr || add.stdout || "worktree creation failed" };
-		}
-	}
-
-	const statePath = statePathFrom(repoRoot);
-	const payload = {
-		issueId,
-		branch,
-		worktreePath,
-		prNumber: null,
-		prUrl: null,
-		phase: "claimed",
-		conflictFiles: [],
-		startedAt: new Date().toISOString(),
-		lastChecked: new Date().toISOString(),
-	};
-	fs.writeFileSync(statePath, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
-	return { ok: true, message: `Worktree created: ${worktreePath} Branch: ${branch}` };
+function isWorktree(cwd: string): boolean {
+	return cwd.includes("/.xtrm/worktrees/") || cwd.includes("/.claude/worktrees/");
 }
 
 export default function (pi: ExtensionAPI) {
 	const getCwd = (ctx: any) => ctx.cwd || process.cwd();
 
+	// Claim sync: notify when a bd update --claim command is run.
 	pi.on("tool_result", async (event, ctx) => {
 		if (!isBashToolResult(event)) return undefined;
 		const cwd = getCwd(ctx);
@@ -82,50 +27,41 @@ export default function (pi: ExtensionAPI) {
 		const { isClaim, issueId } = isClaimCommand(command);
 		if (!isClaim || !issueId) return undefined;
 
-		const ensured = await ensureWorktreeSessionState(cwd, issueId);
-		if (ensured.ok) {
-			const state = readSessionState(cwd);
-			const worktreePath = state?.worktreePath;
-			const nextStep = worktreePath
-				? `\nNext: cd ${worktreePath} && pi  (sandboxed session)`
-				: "";
-			const text = `\n\n🧭 Session Flow: ${ensured.message}${nextStep}`;
-			return { content: [...event.content, { type: "text", text }] };
-		}
-		return undefined;
+		const text = `\n\nSession Flow: claimed ${issueId}. Work in this session is tracked.`;
+		return { content: [...event.content, { type: "text", text }] };
 	});
 
+	// Stop gate: block agent end if there is an in_progress claimed issue.
+	// Also remind to run `xt end` when session ends inside a worktree.
 	pi.on("agent_end", async (_event, ctx) => {
 		const cwd = getCwd(ctx);
 		if (!EventAdapter.isBeadsProject(cwd)) return undefined;
-		const state = readSessionState(cwd);
-		if (!state) return undefined;
 
-		if (state.phase === "waiting-merge" || state.phase === "pending-cleanup") {
-			const pr = state.prNumber != null ? `#${state.prNumber}` : "(pending PR)";
-			const url = state.prUrl ? ` ${state.prUrl}` : "";
-			pi.sendUserMessage(
-				`⚠ PR ${pr}${url} is still pending. xtrm finish is deprecated for Pi workflow. ` +
-				"Use xtpi publish (when available) and external merge/cleanup steps.",
-			);
-			return undefined;
+		const inProgressResult = await SubprocessRunner.run(
+			"bd",
+			["list", "--status=in_progress"],
+			{ cwd },
+		);
+		if (inProgressResult.code === 0 && inProgressResult.stdout) {
+			const output = inProgressResult.stdout;
+			const m = output.match(/Total:\s*\d+\s+issues?\s*\((\d+)\s+open,\s*(\d+)\s+in progress\)/);
+			const inProgressCount = m ? parseInt(m[2], 10) : 0;
+			if (inProgressCount > 0) {
+				const idMatch = output.match(/^\s*([a-zA-Z0-9._-]+)\s+in_progress/m);
+				const issueId = idMatch ? idMatch[1] : "<id>";
+				pi.sendUserMessage(
+					`Stop blocked: close your issue first: bd close ${issueId}`,
+				);
+				return undefined;
+			}
 		}
 
-		if (state.phase === "conflicting") {
-			const files = state.conflictFiles?.length ? state.conflictFiles.join(", ") : "unknown files";
+		if (isWorktree(cwd)) {
 			pi.sendUserMessage(
-				`⚠ Conflicts in: ${files}. xtrm finish is deprecated for Pi workflow. ` +
-				"Resolve conflicts, then continue with publish-only flow.",
+				"Run `xt end` to create a PR and clean up this worktree.",
 			);
-			return undefined;
 		}
 
-		if (state.phase === "claimed" || state.phase === "phase1-done") {
-			pi.sendUserMessage(
-				`⚠ Session has an active worktree at ${state.worktreePath}. ` +
-				"Use publish-only workflow (no automatic push/PR/merge).",
-			);
-		}
 		return undefined;
 	});
 }

package/config/pi/extensions/xtrm-loader/index.ts

@@ -1,6 +1,7 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { homedir } from "node:os";
 import { Logger } from "../core/lib";
 
 const logger = new Logger({ namespace: "xtrm-loader" });
@@ -24,13 +25,37 @@ function findMarkdownFiles(dir: string, basePath: string = ""): string[] {
 	return results;
 }
 
+// Path to global xtrm skills
+const GLOBAL_SKILLS_DIR = path.join(homedir(), ".agents", "skills");
+
+/**
+ * Load a skill file, stripping YAML frontmatter.
+ */
+function loadSkillContent(skillPath: string): string | null {
+	try {
+		const content = fs.readFileSync(skillPath, "utf8");
+		// Strip YAML frontmatter (--- ... ---)
+		return content.replace(/^---\n[\s\S]*?\n---\n/, "").trim();
+	} catch {
+		return null;
+	}
+}
+
 export default function (pi: ExtensionAPI) {
 	let projectContext: string = "";
+	let usingXtrmContent: string | null = null;
 
 	pi.on("session_start", async (_event, ctx) => {
 		const cwd = ctx.cwd;
 		const contextParts: string[] = [];
 
+		// 0. Load using-xtrm skill (global)
+		const usingXtrmPath = path.join(GLOBAL_SKILLS_DIR, "using-xtrm", "SKILL.md");
+		usingXtrmContent = loadSkillContent(usingXtrmPath);
+		if (usingXtrmContent && ctx.hasUI) {
+			logger.info("Loaded using-xtrm skill from global skills directory");
+		}
+
 		// 1. Architecture & Roadmap
 		const roadmapPaths = [
 			path.join(cwd, "architecture", "project_roadmap.md"),
@@ -80,10 +105,22 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.on("before_agent_start", async (event) => {
-		if (!projectContext) return undefined;
+		const parts: string[] = [];
+		
+		// Prepend using-xtrm skill (session operating manual)
+		if (usingXtrmContent) {
+			parts.push("# XTRM Session Operating Manual\n\n" + usingXtrmContent);
+		}
+		
+		// Append project context
+		if (projectContext) {
+			parts.push("# Project Intelligence Context\n\n" + projectContext);
+		}
+		
+		if (parts.length === 0) return undefined;
 
 		return {
-			systemPrompt: event.systemPrompt + "\n\n# Project Intelligence Context\n\n" + projectContext
+			systemPrompt: event.systemPrompt + "\n\n" + parts.join("\n\n---\n\n")
 		};
 	});
 }

package/hooks/README.md

@@ -10,20 +10,6 @@ Hooks intercept specific events in the Claude Code lifecycle. Following architec
 
 ## Project Hooks
 
-### main-guard.mjs
-
-**Purpose**: Enforces PR-only merge workflow with full git protection. Blocks direct commits and dangerous `git checkout`, `git reset`, and file writes via Bash on protected branches (`main`/`master`).
-
-**Trigger**: PreToolUse (Write|Edit|MultiEdit|Serena edit tools|Bash)
-
-**Configuration**: Installed automatically to protect the main branch from unreviewed changes.
-
-### main-guard-post-push.mjs
-
-**Purpose**: Workflow enforcement. After pushing a feature branch, reminds to open a PR, merge using `gh pr merge --squash`, and sync local via `git reset --hard origin/main`.
-
-**Trigger**: PostToolUse (Bash: git push)
-
 ### gitnexus-hook.cjs
 
 **Purpose**: Enriches tool calls with knowledge graph context via `gitnexus augment`. Now supports Serena tools and uses a deduplication cache for efficiency.

package/hooks/beads-gate-messages.mjs

@@ -7,27 +7,13 @@
 
 // ── Shared workflow steps ────────────────────────────────────────────
 
-export const WORKFLOW_STEPS =
-  '  1. git checkout -b feature/<name>\n' +
-  '  2. bd update <id> --claim\n' +
-  '  3. Edit / write code\n' +
-  '  4. bd close <id>\n' +
-  '  5. git add -p && git commit -m "<message>"\n' +
-  '  6. git push -u origin feature/<name>\n' +
-  '  7. gh pr create --fill && gh pr merge --squash\n' +
-  '  8. git checkout master && git reset --hard origin/master\n';
-
 export const SESSION_CLOSE_PROTOCOL =
-  '  bd close <id>\n' +
-  '  git add -p && git commit -m "<message>"\n' +
-  '  git push -u origin <feature-branch>\n' +
-  '  gh pr create --fill && gh pr merge --squash\n';
+  '  bd close <id> --reason="..."\n' +
+  '  xt end\n';
 
 export const COMMIT_NEXT_STEPS =
-  '  bd close <id>\n' +
-  '  git add -p && git commit -m "<message>"\n' +
-  '  git push -u origin <feature-branch>\n' +
-  '  gh pr create --fill && gh pr merge --squash\n';
+  '  bd close <id> --reason="..."   ← closes issue + auto-commits\n' +
+  '  xt end                          ← push, PR, merge, worktree cleanup\n';
 
 // ── Edit gate messages ───────────────────────────────────────────
 
@@ -71,12 +57,12 @@ export function stopBlockMessage(summary, claimed) {
 // ── Memory gate messages ─────────────────────────────────────────
 
 export function memoryPromptMessage(claimId) {
-  const claimLine = claimId ? `claim \`${claimId}\` was closed this session.\n` : '';
+  const claimLine = claimId ? `claim \`${claimId}\` was closed.\n` : '';
   return (
-    `🧠 Memory gate: ${claimLine}` +
-    'For each closed issue, worth persisting?\n' +
+    `\u25cf Memory gate: ${claimLine}` +
+    'Ask: "Would this be useful in 14 days on a fresh session?"\n' +
     '  YES → `bd remember "<insight>"`\n' +
     '  NO  → note "nothing to persist"\n' +
-    '  Then acknowledge: `touch .beads/.memory-gate-done`\n'
+    '  Then: `touch .beads/.memory-gate-done`\n'
   );
 }

package/hooks/gitnexus/gitnexus-hook.cjs

@@ -2,7 +2,7 @@
 /**
  * GitNexus Claude Code Hook — PostToolUse enrichment
  *
- * Fires AFTER Read/Grep/Glob/Bash/Serena tools complete.
+ * Fires AFTER Bash/Grep/Read/Glob/Serena tools complete.
  * Extracts patterns from both tool input AND output, runs
  * `gitnexus augment <pattern>`, and injects a [GitNexus: ...]
  * block into Claude's context — mirroring pi-gitnexus behavior.

package/hooks/hooks.json

@@ -1,5 +1,29 @@
 {
   "hooks": {
+    "SessionStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node ${CLAUDE_PLUGIN_ROOT}/hooks/using-xtrm-reminder.mjs"
+          },
+          {
+            "type": "command",
+            "command": "node ${CLAUDE_PLUGIN_ROOT}/hooks/beads-compact-restore.mjs",
+            "timeout": 5000
+          },
+          {
+            "type": "command",
+            "command": "node ${CLAUDE_PLUGIN_ROOT}/hooks/quality-check-env.mjs",
+            "timeout": 5000
+          },
+          {
+            "type": "command",
+            "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/serena-workflow-reminder.py"
+          }
+        ]
+      }
+    ],
     "PostToolUse": [
       {
         "matcher": "Bash|execute_shell_command|bash",
@@ -27,7 +51,7 @@
         ]
       },
       {
-        "matcher": "Bash|mcp__serena__find_symbol|mcp__serena__get_symbols_overview|mcp__serena__search_for_pattern|mcp__serena__find_referencing_symbols|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol|mcp__serena__rename_symbol",
+        "matcher": "Bash|Grep|Read|Glob|mcp__serena__find_symbol|mcp__serena__get_symbols_overview|mcp__serena__search_for_pattern|mcp__serena__find_referencing_symbols|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol|mcp__serena__rename_symbol",
         "hooks": [
           {
             "type": "command",
@@ -53,21 +77,6 @@
         ]
       }
     ],
-    "SessionStart": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/hooks/beads-compact-restore.mjs",
-            "timeout": 5000
-          },
-          {
-            "type": "command",
-            "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/serena-workflow-reminder.py"
-          }
-        ]
-      }
-    ],
     "PreToolUse": [
       {
         "matcher": "Edit|Write|MultiEdit|NotebookEdit|mcp__serena__rename_symbol|mcp__serena__replace_symbol_body|mcp__serena__insert_after_symbol|mcp__serena__insert_before_symbol",
@@ -100,17 +109,6 @@
           }
         ]
       }
-    ],
-    "UserPromptSubmit": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "node ${CLAUDE_PLUGIN_ROOT}/hooks/branch-state.mjs",
-            "timeout": 3000
-          }
-        ]
-      }
     ]
   }
 }