xtrm-tools 0.5.44 → 0.5.46

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "xtrm-tools",
-  "version": "0.5.44",
+  "version": "0.5.46",
   "description": "xtrm-tools: dual-runtime workflow enforcement (Claude Code + Pi) — hooks, extensions, skills, and MCP servers",
   "author": {
     "name": "jaggers"

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [0.5.45] - 2026-03-25
+
+### Changed
+- **`xt memory update`**: Replaced raw specialist stream with ora spinner + final summary output. Shows animated spinner while specialist runs; on finish prints `✓ .xtrm/memory.md written.` (or `✗`) followed by the last 10 meaningful lines dimmed.
+
+---
+
+## [0.5.44] - 2026-03-25
+
+### Added
+- **`xt help`**: `xtrm memory update` entry added to PRIMARY COMMANDS section.
+
+---
+
 ## [0.5.43] - 2026-03-25
 
 ### Fixed

package/README.md

@@ -70,6 +70,23 @@ claude plugin list
 npx -y github:Jaggerxtrm/xtrm-tools install
 ```
 
+**Typical workflow after install:**
+```bash
+# Start a sandboxed session in a worktree
+xt claude my-feature
+
+# Publish that worktree: rebase, push, open PR, optional cleanup
+xt end
+
+# Refresh project memory from bd memories + current repo state
+xt memory update
+
+# If multiple xt/* PRs are open, drain the merge queue oldest-first
+xt merge
+```
+
+`xt end` handles one worktree session at a time. `xt merge` is the follow-up queue operator: it inspects open `xt/*` PRs, processes them FIFO, waits for green CI on the oldest PR, merges it with `--rebase`, then rebases the remaining queued xt branches and repeats. `xt memory update` shells out to the `memory-processor` specialist, which condenses bd memories and current project state into `.xtrm/memory.md`; use `--dry-run` to inspect without writing.
+
 ---
 
 ## What's Included
@@ -176,6 +193,8 @@ xtrm <command> [options]
 | `pi [name]` | Launch Pi in a sandboxed `xt/<name>` worktree |
 | `attach [slug]` | Re-attach to an existing worktree and resume the Claude or Pi session |
 | `end` | Close worktree session: rebase, push, PR, cleanup |
+| `memory update` | Run `memory-processor` to synthesize bd memories + repo state into `.xtrm/memory.md` |
+| `merge` | Drain queued `xt/*` PRs via `xt-merge`: FIFO CI gate → rebase merge → rebase cascade |
 | `worktree list` | List active `xt/*` worktrees with runtime, last activity, and resume hint |
 | `worktree clean` | Remove merged worktrees |
 | `docs` | Documentation inspection and drift-check suite (`xtrm docs --help`) |

package/cli/dist/index.cjs

@@ -56240,9 +56240,12 @@ function createHelpCommand() {
       "  2) Do your work in that worktree/branch.",
       "  3) If the session closes unexpectedly, re-attach:",
       "     xt attach [slug]",
-      "  4) Finish with:",
+      "  4) Publish that worktree with:",
       "     xt end",
-      "  5) Manage old worktrees when needed:",
+      "  5) Optional follow-up operators:",
+      "     xt memory update   (refresh .xtrm/memory.md from bd memories + repo state)",
+      "     xt merge           (drain queued xt/* PRs oldest-first after CI passes)",
+      "  6) Manage old worktrees when needed:",
       "     xt worktree list | xt worktree clean"
     ]));
     blocks.push(section("PRIMARY COMMANDS", [
@@ -56271,6 +56274,10 @@ function createHelpCommand() {
       "    Run memory-processor specialist to synthesize bd memories into .xtrm/memory.md.",
       "    --dry-run: classify and report without writing memory.md or pruning.",
       "",
+      "  xtrm merge [--dry-run] [--no-beads]",
+      "    Drain the xt worktree PR merge queue via the xt-merge specialist (FIFO, --rebase).",
+      "    --dry-run: list queue and CI status without merging.",
+      "",
       "  xtrm debug [options]",
       "    Stream xtrm event log (tool calls, gates, session/bd lifecycle).",
       "    Options: --follow, --all, --session <id>, --type <domain>, --json",
@@ -56313,7 +56320,13 @@ function createHelpCommand() {
     blocks.push(section("SESSION CLOSE", [
       "  xt end [options]",
       "    Rebase to origin/main, push, open PR, link issues, and optionally clean worktree.",
-      "    Options: --draft, --keep, --yes/-y"
+      "    Options: --draft, --keep, --yes/-y",
+      "",
+      "  xt memory update [--dry-run] [--no-beads]",
+      "    Run memory-processor to synthesize .xtrm/memory.md from bd memories + repo state.",
+      "",
+      "  xt merge [--dry-run] [--no-beads]",
+      "    Run xt-merge to drain queued xt/* PRs FIFO: CI gate \u2192 rebase merge \u2192 rebase cascade."
     ]));
     blocks.push(section("NOTES", [
       "  - Banner is shown only for xtrm install.",
@@ -57743,7 +57756,7 @@ function createMemoryCommand() {
   return new Command("memory").description("Manage project memory (.xtrm/memory.md)").addCommand(createMemoryUpdateCommand());
 }
 function createMemoryUpdateCommand() {
-  return new Command("update").description("Run memory-processor specialist to synthesize bd memories into .xtrm/memory.md").option("--dry-run", "Report only \u2014 do not modify memories or write memory.md", false).option("--no-beads", "Skip creating a tracking bead for this run", false).action((opts) => {
+  return new Command("update").description("Run memory-processor specialist to synthesize bd memories into .xtrm/memory.md").option("--dry-run", "Report only \u2014 do not modify memories or write memory.md", false).option("--no-beads", "Skip creating a tracking bead for this run", false).action(async (opts) => {
     const cwd = process.cwd();
     const check2 = (0, import_node_child_process12.spawnSync)("specialists", ["--version"], { encoding: "utf8", stdio: "pipe" });
     if (check2.status !== 0) {
@@ -57758,7 +57771,7 @@ function createMemoryUpdateCommand() {
         const specialists = JSON.parse(list.stdout);
         if (!specialists.some((s) => s.name === "memory-processor")) {
           console.error(kleur_default.red(
-            "\n  \u2717 memory-processor specialist not found.\n  Add specialists/memory-processor.specialist.yaml to this project.\n"
+            "\n  \u2717 memory-processor specialist not found.\n  Run `specialists init` to install canonical specialists.\n"
           ));
           process.exit(1);
         }
@@ -57768,22 +57781,87 @@ function createMemoryUpdateCommand() {
     const prompt = opts.dryRun ? "Dry run: classify all memories and show the full report. Do not call bd forget or write .xtrm/memory.md." : "Run the full memory processor workflow.";
     const args = ["run", "memory-processor", "--prompt", prompt];
     if (!opts.beads) args.push("--no-beads");
+    const memPath = (0, import_node_path7.join)(cwd, ".xtrm", "memory.md");
+    const spinnerText = opts.dryRun ? "Analyzing memories..." : `${(0, import_node_fs6.existsSync)(memPath) ? "Updating" : "Creating"} .xtrm/memory.md...`;
     console.log(kleur_default.bold(`
   xt memory update${opts.dryRun ? " (dry run)" : ""}
 `));
-    if (!opts.dryRun) {
-      const memPath = (0, import_node_path7.join)(cwd, ".xtrm", "memory.md");
-      const action = (0, import_node_fs6.existsSync)(memPath) ? "Updating" : "Creating";
-      console.log(kleur_default.dim(`  ${action} .xtrm/memory.md...
+    const spinner = ora({ text: spinnerText, color: "cyan" }).start();
+    const chunks = [];
+    const exitCode = await new Promise((resolve2) => {
+      const proc = (0, import_node_child_process12.spawn)("specialists", args, { cwd, stdio: ["inherit", "pipe", "pipe"] });
+      proc.stdout.on("data", (d) => chunks.push(d.toString()));
+      proc.stderr.on("data", (d) => chunks.push(d.toString()));
+      proc.on("close", (code) => resolve2(code ?? 0));
+    });
+    if (exitCode === 0) {
+      spinner.succeed(opts.dryRun ? "Analysis complete." : ".xtrm/memory.md written.");
+    } else {
+      spinner.fail("memory-processor failed.");
+    }
+    const lines = chunks.join("").split("\n").filter((l) => l.trim());
+    const tail = lines.slice(-10).map((l) => kleur_default.dim("  " + l)).join("\n");
+    if (tail) console.log("\n" + tail + "\n");
+    process.exit(exitCode);
+  });
+}
+
+// src/commands/merge.ts
+var import_node_child_process13 = require("child_process");
+function createMergeCommand() {
+  return new Command("merge").description("Drain the xt worktree PR merge queue via the xt-merge specialist").option("--dry-run", "List queue and CI status without merging", false).option("--no-beads", "Skip creating a tracking bead for this run", false).action(async (opts) => {
+    const cwd = process.cwd();
+    const check2 = (0, import_node_child_process13.spawnSync)("specialists", ["--version"], { encoding: "utf8", stdio: "pipe" });
+    if (check2.status !== 0) {
+      console.error(kleur_default.red(
+        "\n  \u2717 specialists CLI not found.\n  Install with: npm install -g @jaggerxtrm/specialists\n"
+      ));
+      process.exit(1);
+    }
+    const list = (0, import_node_child_process13.spawnSync)("specialists", ["list", "--json"], { cwd, encoding: "utf8", stdio: "pipe" });
+    if (list.status === 0) {
+      try {
+        const specialists = JSON.parse(list.stdout);
+        if (!specialists.some((s) => s.name === "xt-merge")) {
+          console.error(kleur_default.red(
+            "\n  \u2717 xt-merge specialist not found.\n  Run `specialists init` to install canonical specialists.\n"
+          ));
+          process.exit(1);
+        }
+      } catch {
+      }
+    }
+    const prompt = opts.dryRun ? "List all open xt/ PRs sorted by creation time and check CI status on each. Do not merge anything." : "Drain the xt worktree PR merge queue.";
+    const args = ["run", "xt-merge", "--prompt", prompt];
+    if (!opts.beads) args.push("--no-beads");
+    console.log(kleur_default.bold(`
+  xt merge${opts.dryRun ? " (dry run)" : ""}
 `));
+    const spinner = ora({
+      text: opts.dryRun ? "Checking PR queue..." : "Merging PR queue...",
+      color: "cyan"
+    }).start();
+    const chunks = [];
+    const exitCode = await new Promise((resolve2) => {
+      const proc = (0, import_node_child_process13.spawn)("specialists", args, { cwd, stdio: ["inherit", "pipe", "pipe"] });
+      proc.stdout.on("data", (d) => chunks.push(d.toString()));
+      proc.stderr.on("data", (d) => chunks.push(d.toString()));
+      proc.on("close", (code) => resolve2(code ?? 0));
+    });
+    if (exitCode === 0) {
+      spinner.succeed(opts.dryRun ? "Queue check complete." : "PR queue drained.");
+    } else {
+      spinner.fail("xt-merge failed.");
     }
-    const result = (0, import_node_child_process12.spawnSync)("specialists", args, { cwd, stdio: "inherit", encoding: "utf8" });
-    process.exit(result.status ?? 0);
+    const lines = chunks.join("").split("\n").filter((l) => l.trim());
+    const tail = lines.slice(-10).map((l) => kleur_default.dim("  " + l)).join("\n");
+    if (tail) console.log("\n" + tail + "\n");
+    process.exit(exitCode);
   });
 }
 
 // src/commands/debug.ts
-var import_node_child_process13 = require("child_process");
+var import_node_child_process14 = require("child_process");
 var import_node_fs7 = require("fs");
 var import_node_path8 = require("path");
 var KIND_LABELS = {
@@ -57931,7 +58009,7 @@ function buildWhere(opts, base) {
 }
 function queryEvents(dbPath, where, limit) {
   const sql = `SELECT id,ts,session_id,runtime,worktree,kind,tool_name,outcome,issue_id,duration_ms,data FROM events${where ? ` WHERE ${where}` : ""} ORDER BY id ASC LIMIT ${limit}`;
-  const result = (0, import_node_child_process13.spawnSync)("sqlite3", [dbPath, "-json", sql], {
+  const result = (0, import_node_child_process14.spawnSync)("sqlite3", [dbPath, "-json", sql], {
     stdio: ["pipe", "pipe", "pipe"],
     encoding: "utf8",
     timeout: 5e3
@@ -58184,6 +58262,7 @@ program2.addCommand(createWorktreeCommand());
 program2.addCommand(createAttachCommand());
 program2.addCommand(createDocsCommand());
 program2.addCommand(createMemoryCommand());
+program2.addCommand(createMergeCommand());
 program2.addCommand(createDebugCommand());
 program2.addCommand(createHelpCommand());
 program2.action(async () => {