gsd-pi 2.81.0 → 2.82.0

package/src/resources/extensions/gsd/tests/worktree-telemetry.test.ts

@@ -89,14 +89,59 @@ test("emitAutoExit records reason and unmerged-work signal", () => {
       reason: "pause",
       milestoneId: "M003",
       milestoneMerged: false,
+      isolationMode: "worktree",
+      worktreeActive: true,
     });
     const entries = queryJournal(base, { eventType: "auto-exit" });
     assert.equal(entries.length, 1);
     assert.equal(entries[0].data?.reason, "pause");
     assert.equal(entries[0].data?.milestoneMerged, false);
+    assert.equal(entries[0].data?.isolationMode, "worktree");
+    assert.equal(entries[0].data?.worktreeActive, true);
   } finally { cleanup(base); }
 });
 
+test("summarizeWorktreeTelemetry only counts unmerged exits from active worktrees", (t) => {
+  const base = makeTmpBase();
+  t.after(() => cleanup(base));
+
+  emitAutoExit(base, {
+    reason: "pause",
+    milestoneId: "M003",
+    milestoneMerged: false,
+    isolationMode: "none",
+    worktreeActive: false,
+  });
+  emitAutoExit(base, {
+    reason: "stop",
+    milestoneId: "M004",
+    milestoneMerged: false,
+    isolationMode: "branch",
+    worktreeActive: false,
+  });
+  emitAutoExit(base, {
+    reason: "other",
+    milestoneId: "M005",
+    milestoneMerged: false,
+    isolationMode: "worktree",
+    worktreeActive: false,
+  });
+  emitAutoExit(base, {
+    reason: "blocked",
+    milestoneId: "M006",
+    milestoneMerged: false,
+  });
+
+  const summary = summarizeWorktreeTelemetry(base);
+  assert.equal(summary.exitsWithUnmergedWork, 0);
+  assert.deepStrictEqual(summary.exitsByReason, {
+    "pause": 1,
+    "stop": 1,
+    "other": 1,
+    "blocked": 1,
+  });
+});
+
 test("summarizeWorktreeTelemetry aggregates events correctly", () => {
   const base = makeTmpBase();
   try {
@@ -110,8 +155,20 @@ test("summarizeWorktreeTelemetry aggregates events correctly", () => {
     emitWorktreeOrphaned(base, "M002", { reason: "in-progress-unmerged", commitsAhead: 2 });
     emitWorktreeOrphaned(base, "M003", { reason: "complete-unmerged" });
 
-    emitAutoExit(base, { reason: "pause", milestoneId: "M002", milestoneMerged: false });
-    emitAutoExit(base, { reason: "stop", milestoneId: "M002", milestoneMerged: false });
+    emitAutoExit(base, {
+      reason: "pause",
+      milestoneId: "M002",
+      milestoneMerged: false,
+      isolationMode: "worktree",
+      worktreeActive: true,
+    });
+    emitAutoExit(base, {
+      reason: "stop",
+      milestoneId: "M002",
+      milestoneMerged: false,
+      isolationMode: "worktree",
+      worktreeActive: true,
+    });
     emitAutoExit(base, { reason: "all-complete", milestoneId: "M001", milestoneMerged: true });
 
     const summary = summarizeWorktreeTelemetry(base);

package/src/resources/extensions/gsd/tests/write-gate-planning-unit.test.ts

@@ -242,6 +242,24 @@ test('planning-dispatch: blocks recon agent under closeout policy', () => {
   assert.doesNotMatch(r.reason!, /read-only specialists/);
 });
 
+test('complete-slice closeout policy blocks edits to user source', () => {
+  const r = shouldBlockPlanningUnit('edit', join(BASE, 'src', 'main.ts'), BASE, 'complete-slice', PLANNING_DISPATCH_REVIEW);
+  assert.strictEqual(r.block, true);
+  assert.match(r.reason!, /complete-slice/);
+  assert.match(r.reason!, /writes are restricted to \.gsd/);
+});
+
+test('complete-slice closeout policy blocks non-allowlisted verification bash', () => {
+  const r = shouldBlockPlanningUnit('bash', 'go test ./...', BASE, 'complete-slice', PLANNING_DISPATCH_REVIEW);
+  assert.strictEqual(r.block, true);
+  assert.match(r.reason!, /bash is restricted/);
+});
+
+test('complete-slice closeout policy allows gsd_exec verification surface', () => {
+  const r = shouldBlockPlanningUnit('gsd_exec', '', BASE, 'complete-slice', PLANNING_DISPATCH_REVIEW);
+  assert.strictEqual(r.block, false);
+});
+
 test('planning-dispatch: still blocks writes to user source (write isolation preserved)', () => {
   const r = shouldBlockPlanningUnit('write', join(BASE, 'src', 'main.ts'), BASE, 'plan-slice', PLANNING_DISPATCH);
   assert.strictEqual(r.block, true);

package/src/resources/extensions/gsd/tui/render-kit.ts

@@ -0,0 +1,109 @@
+// Project/App: GSD-2
+// File Purpose: Shared terminal rendering helpers for GSD extension TUI surfaces.
+
+import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@gsd/pi-tui";
+
+export interface ThemeLike {
+  fg(color: string, text: string): string;
+  bold(text: string): string;
+}
+
+export function safeLine(text: string, width: number, ellipsis = "…"): string {
+  if (width <= 0) return "";
+  return truncateToWidth(text, width, ellipsis);
+}
+
+export function padRightVisible(text: string, width: number): string {
+  if (width <= 0) return "";
+  const truncated = safeLine(text, width);
+  const pad = Math.max(0, width - visibleWidth(truncated));
+  return truncated + " ".repeat(pad);
+}
+
+export function rightAlign(left: string, right: string, width: number): string {
+  if (width <= 0) return "";
+  if (!right) return safeLine(left, width);
+  if (!left) return safeLine(" ".repeat(Math.max(0, width - visibleWidth(right))) + right, width);
+  const gap = Math.max(1, width - visibleWidth(left) - visibleWidth(right));
+  return safeLine(left + " ".repeat(gap) + right, width);
+}
+
+export function wrapVisibleText(text: string, width: number): string[] {
+  if (width <= 0) return [text];
+  return wrapTextWithAnsi(text, width).map((line) =>
+    visibleWidth(line) > width ? truncateToWidth(line, width, "…") : line,
+  );
+}
+
+export function renderBar(theme: ThemeLike, width: number, color = "muted"): string {
+  return safeLine(theme.fg(color, "─".repeat(Math.max(0, width))), width, "");
+}
+
+export function renderKeyHints(theme: ThemeLike, hints: string[], width: number): string {
+  return safeLine(theme.fg("dim", hints.filter(Boolean).join("  │  ")), width);
+}
+
+export function renderProgressBar(
+  theme: ThemeLike,
+  done: number,
+  total: number,
+  width: number,
+  options: {
+    filledColor?: string;
+    emptyColor?: string;
+    filledChar?: string;
+    emptyChar?: string;
+  } = {},
+): string {
+  const barWidth = Math.max(0, width);
+  const pct = total > 0 ? Math.max(0, Math.min(1, done / total)) : 0;
+  const filled = Math.round(pct * barWidth);
+  const filledChar = options.filledChar ?? "█";
+  const emptyChar = options.emptyChar ?? "░";
+  return (
+    theme.fg(options.filledColor ?? "success", filledChar.repeat(filled)) +
+    theme.fg(options.emptyColor ?? "dim", emptyChar.repeat(barWidth - filled))
+  );
+}
+
+export function statusGlyph(
+  theme: ThemeLike,
+  level: "active" | "idle" | "warning" | "error" | "success",
+): string {
+  switch (level) {
+    case "active": return theme.fg("success", "●");
+    case "success": return theme.fg("success", "✓");
+    case "warning": return theme.fg("warning", "!");
+    case "error": return theme.fg("error", "x");
+    case "idle":
+    default: return theme.fg("dim", "○");
+  }
+}
+
+export function renderFrame(
+  theme: ThemeLike,
+  inner: string[],
+  width: number,
+  options: { borderColor?: string; paddingX?: number } = {},
+): string[] {
+  if (width < 4) return inner.map((line) => safeLine(line, width));
+
+  const borderColor = options.borderColor ?? "borderAccent";
+  const paddingX = Math.max(0, options.paddingX ?? 1);
+  const contentWidth = Math.max(0, width - 2 - paddingX * 2);
+  const border = (text: string) => theme.fg(borderColor, text);
+  const pad = " ".repeat(paddingX);
+
+  const lines = [border("╭" + "─".repeat(width - 2) + "╮")];
+  for (const line of inner) {
+    lines.push(
+      border("│") +
+      pad +
+      padRightVisible(line, contentWidth) +
+      pad +
+      border("│"),
+    );
+  }
+  lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
+  return lines.map((line) => safeLine(line, width, ""));
+}

package/src/resources/extensions/gsd/watch/header-renderer.ts

@@ -1,5 +1,5 @@
-// GSD Watch — Header renderer: ASCII logo, session info, MCP status, remote questions
-// Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
+// Project/App: GSD-2
+// File Purpose: Watch-mode terminal header and splash renderer for GSD project status.
 
 import { execFileSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
@@ -8,31 +8,67 @@ import { join } from "node:path";
 import { visibleWidth, truncateToWidth } from "@gsd/pi-tui";
 import { loadEffectiveGSDPreferences } from "../preferences.js";
 import { gsdHome } from "../gsd-home.js";
+import { splashPalette } from "./splash-palette.js";
 
 // ─── Constants ────────────────────────────────────────────────────────────────
 
-/**
- * GSD ASCII logo — inlined here because the canonical src/logo.ts is outside
- * the resources rootDir and cannot be imported directly.
- */
 const GSD_LOGO: readonly string[] = [
-  '   ██████╗ ███████╗██████╗ ',
-  '  ██╔════╝ ██╔════╝██╔══██╗',
-  '  ██║  ███╗███████╗██║  ██║',
-  '  ██║   ██║╚════██║██║  ██║',
-  '  ╚██████╔╝███████║██████╔╝',
-  '   ╚═════╝ ╚══════╝╚═════╝ ',
+  "   ██████╗ ███████╗██████╗ ",
+  "  ██╔════╝ ██╔════╝██╔══██╗",
+  "  ██║  ███╗███████╗██║  ██║",
+  "  ██║   ██║╚════██║██║  ██║",
+  "  ╚██████╔╝███████║██████╔╝",
+  "   ╚═════╝ ╚══════╝╚═════╝ ",
 ];
 
-/** Separator character for the horizontal divider line. */
-const SEPARATOR_CHAR = "─";
-
-/** Vertical bar between logo and info panel. */
-const PANEL_DIVIDER = "│";
-
 /** Label column width for Model/Provider/Directory/Branch rows. */
 const LABEL_COL_WIDTH = 10;
 
+const ANSI_RESET = "\x1b[0m";
+const ANSI_BOLD = "\x1b[1m";
+
+function rgb(hex: string): string {
+  const cleaned = hex.replace("#", "");
+  const r = Number.parseInt(cleaned.slice(0, 2), 16);
+  const g = Number.parseInt(cleaned.slice(2, 4), 16);
+  const b = Number.parseInt(cleaned.slice(4, 6), 16);
+  return `\x1b[38;2;${r};${g};${b}m`;
+}
+
+const colors = {
+  accent: rgb(splashPalette.accent),
+  border: rgb(splashPalette.border),
+  muted: rgb(splashPalette.muted),
+  dim: rgb(splashPalette.dim),
+  text: rgb(splashPalette.text),
+  success: rgb(splashPalette.success),
+};
+
+function color(text: string, colorCode: string): string {
+  return `${colorCode}${text}${ANSI_RESET}`;
+}
+
+function bold(text: string): string {
+  return `${ANSI_BOLD}${text}${ANSI_RESET}`;
+}
+
+function padVisible(text: string, width: number): string {
+  const clipped = truncateToWidth(text, Math.max(0, width), "");
+  return clipped + " ".repeat(Math.max(0, width - visibleWidth(clipped)));
+}
+
+function rightAlign(left: string, right: string, width: number): string {
+  if (!right) return truncateToWidth(left, width, "");
+  const gap = Math.max(1, width - visibleWidth(left) - visibleWidth(right));
+  return truncateToWidth(left + " ".repeat(gap) + right, width, "");
+}
+
+function frameLine(content: string, width: number): string {
+  if (width < 3) return truncateToWidth(content, Math.max(0, width), "");
+  const innerWidth = Math.max(0, width - 2);
+  return `${color("│", colors.border)}${padVisible(content, innerWidth)}${color("│", colors.border)}`;
+}
+
 // ─── Data Readers ─────────────────────────────────────────────────────────────
 
 /**
@@ -163,12 +199,11 @@ export function gatherHeaderData(projectRoot: string): HeaderData {
  * Returns empty string if value is empty.
  */
 function formatInfoLine(label: string, value: string, availableWidth: number): string {
-  const bold = `\x1b[1m${label}\x1b[0m`;
-  const labelVis = visibleWidth(bold);
-  const padding = " ".repeat(Math.max(1, LABEL_COL_WIDTH - labelVis));
+  const labelText = bold(color(label, colors.text));
+  const padding = " ".repeat(Math.max(1, LABEL_COL_WIDTH - label.length));
   const maxValueWidth = Math.max(1, availableWidth - LABEL_COL_WIDTH);
   const truncValue = truncateToWidth(value, maxValueWidth, "…");
-  return bold + padding + truncValue;
+  return labelText + padding + color(truncValue, colors.muted);
 }
 
 /**
@@ -181,7 +216,7 @@ export function formatMcpRow(servers: string[], width: number): string {
   // Capitalize first letter of each server name
   const items = servers.map(s => {
     const cap = s.charAt(0).toUpperCase() + s.slice(1);
-    return `${cap} ✓`;
+    return `${color(cap, colors.accent)} ${color("✓", colors.success)}`;
   });
 
   const full = items.join("  ·  ");
@@ -194,59 +229,65 @@ export function formatMcpRow(servers: string[], width: number): string {
 /**
  * Render the full header as an array of terminal-safe strings.
  *
- * Layout: GSD ASCII logo on the left, info panel on the right separated by │.
- * Below: MCP server row, remote questions row, separator line.
+ * Layout: compact GSD mark on the left with a command-center status panel on
+ * the right. This keeps the splash visual while making the actionable command
+ * and workspace state easier to scan.
  */
 export function renderHeaderLines(data: HeaderData, width: number): string[] {
-  const lines: string[] = [];
-
-  // Logo is 6 lines tall. Info panel has: title + blank + model + provider + directory + branch = 6 lines
+  if (width < 40) return renderStackedHeader(data, width);
+  const outerWidth = width;
+  const innerWidth = Math.max(0, outerWidth - 2);
   const logoLines = GSD_LOGO;
-  const logoWidth = Math.max(...logoLines.map(l => visibleWidth(l)));
+  const logoWidth = Math.max(...logoLines.map((line) => visibleWidth(line)));
+  const gap = ` ${color("│", colors.dim)} `;
+  const panelWidth = innerWidth - logoWidth - visibleWidth(gap);
 
-  // Calculate available width for the info panel
-  // Layout: logo + " " + "│" + " " = logoWidth + 3
-  const dividerOverhead = 3; // " │ "
-  const infoPanelWidth = width - logoWidth - dividerOverhead;
-
-  // If terminal is too narrow for side-by-side, fall back to stacked layout
-  if (infoPanelWidth < 20) {
+  if (panelWidth < 44) {
     return renderStackedHeader(data, width);
   }
 
-  // Build info panel lines (6 lines to match logo height)
-  const infoLines: string[] = [
-    `\x1b[1mGet Shit Done\x1b[0m`,
-    "",
-    formatInfoLine("Model", data.model, infoPanelWidth),
-    formatInfoLine("Provider", data.provider, infoPanelWidth),
-    formatInfoLine("Directory", data.directory, infoPanelWidth),
-    formatInfoLine("Branch", data.branch, infoPanelWidth),
+  const mcpRow = formatMcpRow(data.mcpServers, Math.max(1, panelWidth - 9)) || color("none configured", colors.dim);
+  const panelLines = [
+    rightAlign(
+      `${color("GSD", colors.accent)} ${bold(color("Project Console", colors.text))}`,
+      color("idle", colors.muted),
+      panelWidth,
+    ),
+    rightAlign(
+      `${color("Project", colors.muted)} ${color(data.directory, colors.text)}`,
+      `${color("Command", colors.muted)} ${color("/gsd start", colors.accent)}`,
+      panelWidth,
+    ),
+    rightAlign(
+      `${color("Branch", colors.muted)} ${color(data.branch, colors.text)}`,
+      `${color("Mode", colors.muted)} ${color("manual", colors.text)}`,
+      panelWidth,
+    ),
+    rightAlign(
+      `${color("MCP", colors.muted)} ${mcpRow}`,
+      `${color("Model", colors.muted)} ${color(data.model, colors.text)}`,
+      panelWidth,
+    ),
+    rightAlign(
+      `${color("Provider", colors.muted)} ${color(data.provider, colors.text)}`,
+      `${color("Workspace", colors.muted)} ${color(data.directory, colors.text)}`,
+      panelWidth,
+    ),
+    rightAlign(
+      color("/gsd to begin", colors.accent),
+      `${color("/gsd templates", colors.muted)}  ${color("/gsd help", colors.muted)}`,
+      panelWidth,
+    ),
   ];
 
-  // Merge logo and info panel side by side
-  const maxLines = Math.max(logoLines.length, infoLines.length);
-  for (let i = 0; i < maxLines; i++) {
-    const logoLine = i < logoLines.length ? logoLines[i] : "";
-    const infoLine = i < infoLines.length ? infoLines[i] : "";
-
-    // Pad logo line to consistent width
-    const logoPad = " ".repeat(Math.max(0, logoWidth - visibleWidth(logoLine)));
-    lines.push(`${logoLine}${logoPad} ${PANEL_DIVIDER} ${infoLine}`);
-  }
-
-  // Blank line after logo+info block
-  lines.push("");
-
-  // MCP server row
-  const mcpRow = formatMcpRow(data.mcpServers, width);
-  if (mcpRow) {
-    lines.push(` ${mcpRow}`);
+  const lines = [
+    color("╭" + "─".repeat(Math.max(0, outerWidth - 2)) + "╮", colors.border),
+  ];
+  for (let i = 0; i < logoLines.length; i++) {
+    const logo = padVisible(color(logoLines[i], colors.border), logoWidth);
+    lines.push(frameLine(`${logo}${gap}${panelLines[i] ?? ""}`, outerWidth));
   }
-
-  // Separator line
-  lines.push(SEPARATOR_CHAR.repeat(width));
-
+  lines.push(color("╰" + "─".repeat(Math.max(0, outerWidth - 2)) + "╯", colors.border));
   return lines;
 }
 
@@ -254,25 +295,26 @@ export function renderHeaderLines(data: HeaderData, width: number): string[] {
  * Fallback stacked layout for narrow terminals (< 20 cols for info panel).
  */
 function renderStackedHeader(data: HeaderData, width: number): string[] {
-  const lines: string[] = [];
+  const outerWidth = Math.max(0, width);
+  if (outerWidth < 3) {
+    return [color(truncateToWidth("GSD", outerWidth, ""), colors.accent)];
+  }
+  const lines: string[] = [color("╭" + "─".repeat(Math.max(0, outerWidth - 2)) + "╮", colors.border)];
 
   // Title
-  lines.push(`\x1b[1mGet Shit Done\x1b[0m`);
-  lines.push("");
+  lines.push(frameLine(`${color("GSD", colors.accent)} ${bold(color("Project Console", colors.text))}`, outerWidth));
 
   // Info
-  lines.push(formatInfoLine("Model", data.model, width));
-  lines.push(formatInfoLine("Provider", data.provider, width));
-  lines.push(formatInfoLine("Directory", data.directory, width));
-  lines.push(formatInfoLine("Branch", data.branch, width));
-  lines.push("");
+  lines.push(frameLine(formatInfoLine("Project", data.directory, outerWidth - 2), outerWidth));
+  lines.push(frameLine(formatInfoLine("Command", "/gsd start", outerWidth - 2), outerWidth));
+  lines.push(frameLine(formatInfoLine("Branch", data.branch, outerWidth - 2), outerWidth));
+  lines.push(frameLine(formatInfoLine("Model", data.model, outerWidth - 2), outerWidth));
 
   // MCP
-  const mcpRow = formatMcpRow(data.mcpServers, width);
-  if (mcpRow) lines.push(` ${mcpRow}`);
-
-  // Separator
-  lines.push(SEPARATOR_CHAR.repeat(width));
+  const mcpRow = formatMcpRow(data.mcpServers, Math.max(1, outerWidth - 7));
+  if (mcpRow) lines.push(frameLine(`${color("MCP", colors.muted)} ${mcpRow}`, outerWidth));
+  lines.push(frameLine(`${color("/gsd to begin", colors.accent)}  ${color("/gsd help", colors.muted)}`, outerWidth));
+  lines.push(color("╰" + "─".repeat(Math.max(0, outerWidth - 2)) + "╯", colors.border));
 
   return lines;
 }

package/src/resources/extensions/gsd/watch/splash-palette.ts

@@ -0,0 +1,11 @@
+// Project/App: GSD-2
+// File Purpose: Shared RGB palette for the pre-theme GSD watch splash.
+
+export const splashPalette = {
+  accent: "#8db7ff",
+  border: "#a7ba78",
+  muted: "#7d889f",
+  dim: "#4d5870",
+  text: "#dce4f2",
+  success: "#a8c978",
+} as const;

package/src/resources/extensions/gsd/workflow-mcp.ts

@@ -322,7 +322,7 @@ export function getRequiredWorkflowToolsForGuidedUnit(unitType: string): string[
     case "execute-task":
       return ["gsd_task_complete"];
     case "complete-slice":
-      return ["gsd_slice_complete"];
+      return ["gsd_slice_complete", "gsd_task_reopen", "gsd_replan_slice"];
     default:
       return [];
   }
@@ -351,7 +351,7 @@ export function getRequiredWorkflowToolsForAutoUnit(unitType: string): string[]
     case "reactive-execute":
       return ["gsd_task_complete"];
     case "complete-slice":
-      return ["gsd_slice_complete"];
+      return ["gsd_slice_complete", "gsd_task_reopen", "gsd_replan_slice"];
     case "replan-slice":
       return ["gsd_replan_slice"];
     case "reassess-roadmap":