@jaggerxtrm/pi-extensions 0.7.20 → 0.7.22

package/README.md

@@ -47,4 +47,4 @@ After install, keep `.pi/settings.json` package wiring pointed at `npm:@jaggerxt
 Notable bundled extensions include:
 
 - `xtrm-ui` — XTRM Pi chrome, native tool summaries, selectable external tool chrome (`/xtrm-ui chrome background|box`).
-- `sp-terminal-overlay` — `/sp-feed`, `/sp-ps`, and `/xtrm-terminal` streaming overlays for specialist monitoring.
+- `sp-terminal-overlay` — `/sp-feed` streaming overlay, `/sp-ps` snapshot overlay, and `/xtrm-terminal` shell overlay for specialist monitoring.

package/extensions/README.md

@@ -11,7 +11,7 @@ Streaming terminal-style overlay for specialist/process monitoring commands.
 Commands:
 
 - `/sp-feed [args]` — opens `sp feed -f [args]` in an overlay.
-- `/sp-ps [args]` / `/xtrm-ps [args]` — opens `sp ps [args]` (defaults to `sp ps --follow`) in an overlay.
+- `/sp-ps [args]` / `/xtrm-ps [args]` — opens a one-shot `sp ps [args]` snapshot in an overlay; `--follow`/`-f` are stripped to avoid repaint loops.
 - `/xtrm-terminal <command>` — opens an arbitrary shell command in an overlay.
 
 Keys: `Esc`/`q` close, `r` restart, arrows/page keys scroll.

package/extensions/serena-pool/index.ts

@@ -0,0 +1,110 @@
+/**
+ * serena-pool — shared Serena daemon per repo root
+ *
+ * Sets SERENA_MCP_PORT to a deterministic port derived from the git root before
+ * pi-serena-tools session_start fires. If no Serena server is already listening
+ * on that port, spawns one (detached, persists after session ends).
+ *
+ * pi-serena-tools reads SERENA_MCP_PORT lazily in resolveSerenaPort(), finds the
+ * server already running, skips its own spawn, and stopServer() is a no-op since
+ * it never held serverProcess. No patches to pi-serena-tools needed.
+ */
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { spawn } from "node:child_process";
+import { connect } from "node:net";
+import { execSync } from "node:child_process";
+
+const POOL_PORT_MIN = 40000;
+const POOL_PORT_RANGE = 5000; // 40000–44999
+const STARTUP_TIMEOUT_MS = 15_000;
+const POLL_INTERVAL_MS = 300;
+
+function hashToPort(s: string): number {
+  let h = 5381;
+  for (let i = 0; i < s.length; i++) {
+    h = ((h << 5) + h) ^ s.charCodeAt(i);
+    h = h >>> 0;
+  }
+  return POOL_PORT_MIN + (h % POOL_PORT_RANGE);
+}
+
+function getRepoRoot(cwd: string): string {
+  try {
+    return execSync("git rev-parse --show-toplevel", {
+      cwd,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    }).trim();
+  } catch {
+    return cwd;
+  }
+}
+
+function isPortListening(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const socket = connect({ host: "127.0.0.1", port }, () => {
+      socket.destroy();
+      resolve(true);
+    });
+    socket.on("error", () => resolve(false));
+    socket.setTimeout(500, () => {
+      socket.destroy();
+      resolve(false);
+    });
+  });
+}
+
+async function waitForPort(port: number): Promise<boolean> {
+  const deadline = Date.now() + STARTUP_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    if (await isPortListening(port)) return true;
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+  }
+  return false;
+}
+
+async function ensureSerenaRunning(projectRoot: string, port: number): Promise<void> {
+  if (await isPortListening(port)) return;
+
+  const proc = spawn(
+    "uvx",
+    [
+      "--from", "git+https://github.com/oraios/serena",
+      "serena", "start-mcp-server",
+      "--transport", "streamable-http",
+      "--port", String(port),
+      "--project", projectRoot,
+      "--context", "agent",
+    ],
+    {
+      cwd: projectRoot,
+      env: { ...process.env },
+      stdio: "ignore",
+      detached: true,
+    },
+  );
+  proc.unref();
+
+  const ready = await waitForPort(port);
+  if (!ready) {
+    console.warn(`[serena-pool] Serena did not start on port ${port} within ${STARTUP_TIMEOUT_MS}ms`);
+  }
+}
+
+export default function registerSerenaPool(pi: ExtensionAPI) {
+  pi.on("session_start", async (_event: unknown, ctx: any) => {
+    const cwd: string = ctx?.cwd ?? process.cwd();
+    const projectRoot = getRepoRoot(cwd);
+    const port = hashToPort(projectRoot);
+
+    try {
+      await ensureSerenaRunning(projectRoot, port);
+      process.env.SERENA_MCP_PORT = String(port);
+    } catch (err) {
+      console.warn("[serena-pool] Error ensuring Serena running:", err);
+    }
+  });
+
+  // session_shutdown intentionally absent — server persists as daemon across sessions.
+  // Kill manually with: kill $(lsof -ti:PORT) or pkill -f "serena start-mcp-server"
+}

package/extensions/serena-pool/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "serena-pool",
+  "version": "1.0.0",
+  "description": "Shared Serena daemon per repo root — sets SERENA_MCP_PORT before pi-serena-tools fires",
+  "keywords": [
+    "pi",
+    "pi-extension",
+    "serena",
+    "mcp",
+    "pool"
+  ],
+  "license": "MIT",
+  "type": "module",
+  "main": "index.ts",
+  "peerDependencies": {
+    "@mariozechner/pi-coding-agent": "^0.56.0"
+  },
+  "pi": {
+    "extensions": [
+      "./index.ts"
+    ]
+  }
+}

package/extensions/sp-terminal-overlay/index.ts

@@ -26,8 +26,12 @@ function resolveSpFeedCommand(args: string): string {
 }
 
 function resolveSpPsCommand(args: string): string {
-  const trimmed = args.trim();
-  return trimmed ? `sp ps ${trimmed}` : "sp ps --follow";
+  const snapshotArgs = args
+    .trim()
+    .split(/\s+/u)
+    .filter((part) => part && part !== "--follow" && part !== "-f")
+    .join(" ");
+  return snapshotArgs ? `sp ps ${snapshotArgs}` : "sp ps";
 }
 
 function openTerminalOverlay(ctx: ExtensionCommandContext, title: string, command: string): Promise<void> {
@@ -455,7 +459,7 @@ export default function spTerminalOverlayExtension(pi: ExtensionAPI): void {
   });
 
   pi.registerCommand("sp-ps", {
-    description: "Open a streaming overlay for `sp ps --follow`",
+    description: "Open a snapshot overlay for `sp ps`",
     handler: async (args, ctx) => {
       await openTerminalOverlay(ctx, "sp ps", resolveSpPsCommand(args));
     },

package/extensions/xtrm-ui/index.ts

@@ -252,7 +252,7 @@ type PatchableToolExecutionComponent = {
 type ExternalToolFrameKind = "serena" | "gitnexus" | "structured" | "process" | "external";
 
 const PATCHED_EXTERNAL_TOOL_FRAME = "__xtrmUiExternalToolFrame";
-const EXTERNAL_TOOL_FRAME_PATCH_VERSION = 10;
+const EXTERNAL_TOOL_FRAME_PATCH_VERSION = 11;
 const ANSI_PATTERN = /\x1b\[[0-9;?]*[ -/]*[@-~]/g;
 
 function stripAnsi(text: string): string {
@@ -326,39 +326,22 @@ function trimRenderedToolLines(lines: string[]): string[] {
   return lines.slice(start, end).map((line) => line.replace(/\s+$/u, ""));
 }
 
-function externalToolBgRgb(kind: ExternalToolFrameKind): [number, number, number] {
-  const bgColors: Record<ExternalToolFrameKind, [number, number, number]> = {
-    serena: [13, 34, 49],
-    gitnexus: [31, 23, 55],
-    structured: [35, 23, 55],
-    process: [10, 42, 52],
-    external: [27, 33, 43],
-  };
-  return bgColors[kind];
-}
-
-function externalToolBgColor(kind: ExternalToolFrameKind, text: string): string {
-  const [r, g, b] = externalToolBgRgb(kind);
-  return `\x1b[48;2;${r};${g};${b}m${text}\x1b[49m`;
-}
-
 function externalToolBadgeColor(kind: ExternalToolFrameKind, text: string): string {
   const bgColors: Record<ExternalToolFrameKind, [number, number, number]> = {
-    serena: [26, 96, 132],
-    gitnexus: [82, 58, 150],
-    structured: [105, 61, 150],
-    process: [17, 118, 145],
-    external: [74, 88, 112],
+    serena: [82, 210, 255],
+    gitnexus: [178, 154, 255],
+    structured: [205, 166, 255],
+    process: [92, 226, 255],
+    external: [178, 190, 210],
   };
   const [badgeR, badgeG, badgeB] = bgColors[kind];
-  const [rowR, rowG, rowB] = externalToolBgRgb(kind);
-  return `\x1b[1m\x1b[48;2;${badgeR};${badgeG};${badgeB}m${text}\x1b[22m\x1b[48;2;${rowR};${rowG};${rowB}m`;
+  return `\x1b[38;2;3;8;12m\x1b[48;2;${badgeR};${badgeG};${badgeB}m${text}\x1b[39m\x1b[49m`;
 }
 
 function highlightExternalToolBadge(kind: ExternalToolFrameKind, line: string): string {
-  const match = line.match(/^(•\s+(?:serena\s+\S+|gitnexus(?:_\S+)?|structured_return|process|\S+))/u);
-  if (!match?.[1]) return line;
-  return externalToolBadgeColor(kind, match[1]) + line.slice(match[1].length);
+  const match = line.match(/^(•\s+)(\S+)/u);
+  if (!match?.[1] || !match[2]) return line;
+  return match[1] + externalToolBadgeColor(kind, match[2]) + line.slice(match[1].length + match[2].length);
 }
 
 function externalToolBorderColor(kind: ExternalToolFrameKind, text: string): string {
@@ -388,9 +371,8 @@ function renderExternalToolBackgroundLines(
   const visibleLines = collapsedExternalToolLines(contentLines, expanded);
 
   return visibleLines.map((rawLine) => {
-    const line = truncateToWidth(rawLine, Math.max(1, renderWidth - 2));
-    const highlighted = highlightExternalToolBadge(kind, line);
-    return externalToolBgColor(kind, ` ${padVisible(highlighted, Math.max(1, renderWidth - 2))} `);
+    const line = truncateToWidth(rawLine, Math.max(1, renderWidth));
+    return highlightExternalToolBadge(kind, line);
   });
 }
 
@@ -1421,7 +1403,10 @@ function registerXtrmUiTools(pi: ExtensionAPI, getPrefs: () => XtrmUiPrefs): voi
 
   pi.on("tool_result", async (event: ToolResultEvent, _ctx) => {
     if (event.isError) return undefined;
-    if (XTRM_BUILTIN_TOOLS.has(event.toolName)) return undefined;
+    if (XTRM_BUILTIN_TOOLS.has(event.toolName)) {
+      trackToolCallEnd(event.toolCallId);
+      return undefined;
+    }
     if (!getPrefs().compactExternalToolResults) return undefined;
 
     const text = getTextContent({ content: event.content as Array<{ type: string; text?: string }> });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaggerxtrm/pi-extensions",
-  "version": "0.7.20",
+  "version": "0.7.22",
   "description": "Unified Pi extension entrypoint for xtrm-managed extensions",
   "type": "module",
   "publishConfig": {

package/src/extensions/serena-pool.ts

@@ -0,0 +1,3 @@
+import registerExtension from "../../extensions/serena-pool/index.ts";
+
+export default registerExtension;

package/src/registry.ts

@@ -9,6 +9,7 @@ import customProviderQwenCliExtension from "./extensions/custom-provider-qwen-cl
 import gitCheckpointExtension from "./extensions/git-checkpoint.ts";
 import lspBootstrapExtension from "./extensions/lsp-bootstrap.ts";
 import piSerenaCompactExtension from "./extensions/pi-serena-compact.ts";
+import serenaPoolExtension from "./extensions/serena-pool.ts";
 import qualityGatesExtension from "./extensions/quality-gates.ts";
 import serviceSkillsExtension from "./extensions/service-skills.ts";
 import sessionFlowExtension from "./extensions/session-flow.ts";
@@ -29,6 +30,7 @@ export const managedPiExtensions: readonly ManagedPiExtension[] = [
   { id: "custom-footer", register: customFooterExtension },
   { id: "custom-provider-qwen-cli", register: customProviderQwenCliExtension },
   { id: "git-checkpoint", register: gitCheckpointExtension },
+  { id: "serena-pool", register: serenaPoolExtension },
   { id: "lsp-bootstrap", register: lspBootstrapExtension },
   { id: "pi-serena-compact", register: piSerenaCompactExtension },
   { id: "quality-gates", register: qualityGatesExtension },