gsd-pi 2.81.0 → 2.82.0-dev.2841a1e44

package/src/resources/extensions/gsd/memory-consolidation-scanner.ts

@@ -0,0 +1,277 @@
+// GSD-2 — ADR-013 Phase 6 preflight scanner.
+//
+// Read-only detection of rows in the legacy knowledge surfaces (decisions
+// table, `.gsd/KNOWLEDGE.md`) that lack a corresponding `memories` row.
+// Runs on session start (and on demand via doctor); never mutates state.
+//
+// The scanner exists so the destructive Phase 6 cutover (#5755) can prove
+// the migration is complete before any tables are dropped. Today's
+// `backfillDecisionsToMemories` writes a `structured_fields.sourceDecisionId`
+// marker on each migrated row; the scanner uses that marker for decisions
+// detection. A `sourceKnowledgeId` marker is reserved for the parallel
+// KNOWLEDGE.md backfill that Phase 6 will introduce — until that ships,
+// every KNOWLEDGE.md row is reported as unmigrated, which is the honest
+// state of the consolidation.
+
+import { existsSync, readFileSync } from "node:fs";
+
+import { _getAdapter, isDbAvailable } from "./gsd-db.js";
+import { appendNotification } from "./notification-store.js";
+import { resolveGsdRootFile } from "./paths.js";
+import { logWarning } from "./workflow-logger.js";
+
+// ─── Types ──────────────────────────────────────────────────────────────────
+
+export interface KnowledgeSurfaceReport {
+  total: number;
+  migrated: number;
+  unmigrated: number;
+  byTable: { rules: number; patterns: number; lessons: number };
+  /** Up to 5 sample row IDs/content for diagnosing what's unmigrated. */
+  samples: Array<{ table: "rules" | "patterns" | "lessons"; id: string; row: string }>;
+}
+
+export interface DecisionsSurfaceReport {
+  total: number;
+  migrated: number;
+  unmigrated: number;
+  /** Up to 5 sample decision IDs with a short content excerpt. */
+  samples: Array<{ id: string; decision: string }>;
+}
+
+export interface ConsolidationGapReport {
+  decisions: DecisionsSurfaceReport;
+  knowledge: KnowledgeSurfaceReport;
+  /** Sum of unmigrated rows across both surfaces. Zero ⇒ clean preflight. */
+  totalGaps: number;
+  /** Human-readable single-line summary suitable for notifications + logs. */
+  summary: string;
+}
+
+// ─── KNOWLEDGE.md parsing ────────────────────────────────────────────────────
+
+const KNOWLEDGE_SECTIONS = [
+  { table: "rules" as const, heading: "## Rules", idPrefix: "K" },
+  { table: "patterns" as const, heading: "## Patterns", idPrefix: "P" },
+  { table: "lessons" as const, heading: "## Lessons Learned", idPrefix: "L" },
+];
+
+interface KnowledgeRow {
+  table: "rules" | "patterns" | "lessons";
+  id: string;
+  row: string;
+}
+
+/**
+ * Parse `.gsd/KNOWLEDGE.md` into rows, one per table entry. Skips the table
+ * header and separator lines; ignores rows from unrecognized sections.
+ *
+ * The format is locked in `files.ts:appendKnowledge` — three `## ` sections
+ * (Rules, Patterns, Lessons Learned), each a Markdown table. Row IDs are
+ * `K###` / `P###` / `L###`.
+ */
+export function parseKnowledgeRows(content: string): KnowledgeRow[] {
+  const rows: KnowledgeRow[] = [];
+  if (!content.trim()) return rows;
+
+  // Slice the content into sections by heading. The leading text before the
+  // first ## heading is intro prose — ignored.
+  const lines = content.split("\n");
+  let activeSection: typeof KNOWLEDGE_SECTIONS[number] | undefined;
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed.startsWith("## ")) {
+      activeSection = KNOWLEDGE_SECTIONS.find((s) => s.heading === trimmed);
+      continue;
+    }
+    if (!activeSection) continue;
+    if (!trimmed.startsWith("|")) continue;
+
+    // Skip the table header rows: the column-titles line and the |---|---| separator.
+    // Real data rows start with `| <prefix>### |`.
+    const idMatch = new RegExp(`^\\|\\s*(${activeSection.idPrefix}\\d+)\\s*\\|`).exec(trimmed);
+    if (!idMatch) continue;
+
+    rows.push({
+      table: activeSection.table,
+      id: idMatch[1] ?? "",
+      row: trimmed,
+    });
+  }
+
+  return rows;
+}
+
+function knowledgeMdContent(basePath: string): string {
+  const path = resolveGsdRootFile(basePath, "KNOWLEDGE");
+  if (!existsSync(path)) return "";
+  try {
+    return readFileSync(path, "utf-8");
+  } catch {
+    return "";
+  }
+}
+
+// ─── DB queries ──────────────────────────────────────────────────────────────
+
+interface DecisionRow {
+  id: string;
+  decision: string;
+}
+
+function getActiveDecisions(): DecisionRow[] {
+  if (!isDbAvailable()) return [];
+  const adapter = _getAdapter();
+  if (!adapter) return [];
+  try {
+    const rows = adapter
+      .prepare(
+        "SELECT id, decision FROM decisions WHERE superseded_by IS NULL",
+      )
+      .all() as Array<Record<string, unknown>>;
+    return rows
+      .map((row): DecisionRow => ({
+        id: String(row["id"] ?? ""),
+        decision: String(row["decision"] ?? ""),
+      }))
+      .filter((row) => row.id.length > 0);
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * True when a memory row has a `structured_fields` JSON payload containing
+ * the given `markerKey: "value"` pair. Matches the LIKE pattern used by
+ * `backfillDecisionsToMemories` so the scanner is consistent with the
+ * backfill's idempotency check.
+ */
+function memoryHasSourceMarker(markerKey: string, value: string): boolean {
+  if (!isDbAvailable()) return false;
+  const adapter = _getAdapter();
+  if (!adapter) return false;
+  try {
+    const pattern = `%"${markerKey}":"${value}"%`;
+    const row = adapter
+      .prepare("SELECT 1 FROM memories WHERE structured_fields LIKE :pattern LIMIT 1")
+      .get({ ":pattern": pattern });
+    return row !== undefined;
+  } catch {
+    return false;
+  }
+}
+
+// ─── Public API ──────────────────────────────────────────────────────────────
+
+const SAMPLE_LIMIT = 5;
+
+/**
+ * Scan the legacy knowledge surfaces and return a structured report of what's
+ * already in the `memories` table vs what's still unmigrated. Pure detection
+ * — no DB writes, no file writes, no notifications.
+ */
+export function scanConsolidationGaps(basePath: string): ConsolidationGapReport {
+  // ── Decisions ────────────────────────────────────────────────────────
+  const decisions = getActiveDecisions();
+  const decisionSamples: DecisionsSurfaceReport["samples"] = [];
+  let decisionMigrated = 0;
+  for (const decision of decisions) {
+    if (memoryHasSourceMarker("sourceDecisionId", decision.id)) {
+      decisionMigrated += 1;
+      continue;
+    }
+    if (decisionSamples.length < SAMPLE_LIMIT) {
+      decisionSamples.push({
+        id: decision.id,
+        decision: decision.decision.length > 80 ? decision.decision.slice(0, 79) + "…" : decision.decision,
+      });
+    }
+  }
+
+  // ── KNOWLEDGE.md ─────────────────────────────────────────────────────
+  const knowledgeRows = parseKnowledgeRows(knowledgeMdContent(basePath));
+  const knowledgeByTable = { rules: 0, patterns: 0, lessons: 0 };
+  const knowledgeSamples: KnowledgeSurfaceReport["samples"] = [];
+  let knowledgeMigrated = 0;
+  for (const row of knowledgeRows) {
+    knowledgeByTable[row.table] += 1;
+    // Phase 6 will introduce a `sourceKnowledgeId` marker as part of the
+    // KNOWLEDGE.md backfill. Until that path ships, this check returns
+    // false for every row, which is the honest state of the consolidation.
+    if (memoryHasSourceMarker("sourceKnowledgeId", row.id)) {
+      knowledgeMigrated += 1;
+      continue;
+    }
+    if (knowledgeSamples.length < SAMPLE_LIMIT) {
+      knowledgeSamples.push({
+        table: row.table,
+        id: row.id,
+        row: row.row.length > 100 ? row.row.slice(0, 99) + "…" : row.row,
+      });
+    }
+  }
+
+  const decisionsReport: DecisionsSurfaceReport = {
+    total: decisions.length,
+    migrated: decisionMigrated,
+    unmigrated: decisions.length - decisionMigrated,
+    samples: decisionSamples,
+  };
+  const knowledgeReport: KnowledgeSurfaceReport = {
+    total: knowledgeRows.length,
+    migrated: knowledgeMigrated,
+    unmigrated: knowledgeRows.length - knowledgeMigrated,
+    byTable: knowledgeByTable,
+    samples: knowledgeSamples,
+  };
+
+  const totalGaps = decisionsReport.unmigrated + knowledgeReport.unmigrated;
+
+  // Summary line is intentionally short so it fits in a single notification
+  // (notification-store truncates messages over 500 chars). Detail is
+  // accessible via getProviderSwitchStats-style callers, not embedded here.
+  const parts: string[] = [];
+  if (decisionsReport.unmigrated > 0) {
+    parts.push(`${decisionsReport.unmigrated} of ${decisionsReport.total} active decisions`);
+  }
+  if (knowledgeReport.unmigrated > 0) {
+    parts.push(`${knowledgeReport.unmigrated} of ${knowledgeReport.total} KNOWLEDGE.md rows`);
+  }
+  const summary =
+    parts.length === 0
+      ? "Memory consolidation: all decisions and KNOWLEDGE.md rows are in memories."
+      : `Memory consolidation: ${parts.join(" and ")} not yet in memories table. Run /doctor for details.`;
+
+  return { decisions: decisionsReport, knowledge: knowledgeReport, totalGaps, summary };
+}
+
+/**
+ * Run the scanner and emit a persistent notification + workflow-logger
+ * warning when gaps exist. Best-effort: never throws; a broken scanner
+ * cannot block agent startup.
+ *
+ * Returns the full {@link ConsolidationGapReport} regardless of whether gaps
+ * exist (including when `totalGaps === 0`). Returns `null` only when
+ * `scanConsolidationGaps` itself throws. `appendNotification` and
+ * `logWarning` are called only when `report.totalGaps > 0`.
+ *
+ * Idempotent at the surface: the notification store applies its own
+ * 30-second dedup window keyed on (severity, source, message), so repeated
+ * boots with identical gaps produce one notification, not a flood.
+ */
+export function reportConsolidationGaps(basePath: string): ConsolidationGapReport | null {
+  try {
+    const report = scanConsolidationGaps(basePath);
+    if (report.totalGaps === 0) return report;
+    appendNotification(report.summary, "warning", "workflow-logger");
+    logWarning("memory-consolidation", report.summary);
+    return report;
+  } catch (e) {
+    logWarning(
+      "memory-consolidation",
+      `scanner failed: ${(e as Error).message}`,
+    );
+    return null;
+  }
+}

package/src/resources/extensions/gsd/migrate/command.ts

@@ -34,6 +34,9 @@ export type MigrationImportCounts = ReturnType<typeof migrateFromMarkdown>;
 
 function assertMigrationImportMatchesPreview(imported: MigrationImportCounts, preview: MigrationPreview): void {
   const mismatches: string[] = [];
+  if (imported.decisions !== preview.decisions.total) {
+    mismatches.push(`decisions ${imported.decisions}/${preview.decisions.total}`);
+  }
   if (imported.hierarchy.milestones !== preview.milestoneCount) {
     mismatches.push(`milestones ${imported.hierarchy.milestones}/${preview.milestoneCount}`);
   }
@@ -73,6 +76,7 @@ export async function importWrittenMigrationToDb(
 /** Format preview stats for embedding in the review prompt. */
 function formatPreviewStats(preview: MigrationPreview): string {
   const lines = [
+    `- Decisions: ${preview.decisions.total}`,
     `- Milestones: ${preview.milestoneCount}`,
     `- Slices: ${preview.totalSlices} (${preview.doneSlices} done — ${preview.sliceCompletionPct}%)`,
     `- Tasks: ${preview.totalTasks} (${preview.doneTasks} done — ${preview.taskCompletionPct}%)`,
@@ -179,6 +183,7 @@ export async function handleMigrate(
 
   // ── Build preview text ─────────────────────────────────────────────────────
   const lines: string[] = [
+    `Decisions: ${preview.decisions.total}`,
     `Milestones: ${preview.milestoneCount}`,
     `Slices: ${preview.totalSlices} (${preview.doneSlices} done — ${preview.sliceCompletionPct}%)`,
     `Tasks: ${preview.totalTasks} (${preview.doneTasks} done — ${preview.taskCompletionPct}%)`,

package/src/resources/extensions/gsd/migrate/preview.ts

@@ -4,6 +4,13 @@
 import type { GSDProject } from './types.js';
 import type { MigrationPreview } from './writer.js';
 
+function countCanonicalDecisionRows(content: string): number {
+  return content
+    .split('\n')
+    .filter((line) => /^\|\s*D\d+\s*\|/.test(line.trim()))
+    .length;
+}
+
 /**
  * Compute pre-write statistics from a GSDProject without performing I/O.
  * Used to show the user what a migration will produce before writing anything.
@@ -36,6 +43,9 @@ export function generatePreview(project: GSDProject): MigrationPreview {
   }
 
   return {
+    decisions: {
+      total: countCanonicalDecisionRows(project.decisionsContent),
+    },
     milestoneCount: project.milestones.length,
     totalSlices,
     totalTasks,

package/src/resources/extensions/gsd/migrate/transformer.ts

@@ -238,16 +238,53 @@ function normalizeStatus(status: string): 'active' | 'validated' | 'deferred' {
   return 'active';
 }
 
+function normalizeRequirementId(id: string): string | null {
+  const match = id.trim().match(/^R(\d+)$/i);
+  if (!match) return null;
+  return `R${match[1].padStart(3, '0')}`;
+}
+
 function mapRequirements(reqs: PlanningRequirement[]): GSDRequirement[] {
   let autoId = 0;
+  const reservedIds = new Set(
+    reqs
+      .map((req) => normalizeRequirementId(req.id))
+      .filter((id): id is string => id !== null),
+  );
+  const usedIds = new Set<string>();
+
+  function nextRequirementId(): string {
+    let id = '';
+    do {
+      autoId++;
+      id = padId('R', autoId, 3);
+    } while (usedIds.has(id) || reservedIds.has(id));
+    usedIds.add(id);
+    return id;
+  }
+
   return reqs.map((req) => {
-    autoId++;
+    const originalId = req.id.trim();
+    const canonicalId = normalizeRequirementId(originalId);
+    let id: string;
+    let description = req.description;
+
+    if (canonicalId && !usedIds.has(canonicalId)) {
+      id = canonicalId;
+      usedIds.add(id);
+    } else {
+      id = nextRequirementId();
+      if (originalId) {
+        description = `Legacy ID: ${originalId}\n\n${description}`;
+      }
+    }
+
     return {
-      id: req.id && req.id.trim() !== '' ? req.id : padId('R', autoId, 3),
+      id,
       title: req.title,
       class: 'core-capability',
       status: normalizeStatus(req.status),
-      description: req.description,
+      description,
       source: 'inferred',
       primarySlice: 'none yet',
     };
@@ -286,7 +323,24 @@ function deriveDecisions(parsed: PlanningProject): string {
     }
   }
   if (decisions.length === 0) return '';
-  return decisions.map((d) => `- ${d}`).join('\n');
+  const lines = [
+    '# Decisions Register',
+    '',
+    '<!-- Append-only. Never edit or remove existing rows.',
+    '     To reverse a decision, add a new row that supersedes it.',
+    '     Read this file at the start of any planning or research phase. -->',
+    '',
+    '| # | When | Scope | Decision | Choice | Rationale | Revisable? | Made By |',
+    '|---|------|-------|----------|--------|-----------|------------|---------|',
+  ];
+
+  decisions.forEach((decision, index) => {
+    const id = padId('D', index + 1, 3);
+    const escaped = decision.replace(/\|/g, '\\|');
+    lines.push(`| ${id} | migration | migrated-summary | ${escaped} | ${escaped} | Migrated from legacy summary key-decisions | Yes | agent |`);
+  });
+
+  return lines.join('\n') + '\n';
 }
 
 // ─── Main Entry Point ──────────────────────────────────────────────────────

package/src/resources/extensions/gsd/migrate/writer.ts

@@ -37,6 +37,9 @@ export interface WrittenFiles {
 
 /** Pre-write statistics computed from a GSDProject without I/O. */
 export interface MigrationPreview {
+  decisions: {
+    total: number;
+  };
   milestoneCount: number;
   totalSlices: number;
   totalTasks: number;
@@ -374,7 +377,17 @@ export function formatProject(content: string): string {
  */
 export function formatDecisions(content: string): string {
   if (!content || !content.trim()) {
-    return '# Decisions\n\n<!-- Append-only register of architectural and pattern decisions -->\n\n| ID | Decision | Rationale | Date |\n|----|----------|-----------|------|\n';
+    return [
+      '# Decisions Register',
+      '',
+      '<!-- Append-only. Never edit or remove existing rows.',
+      '     To reverse a decision, add a new row that supersedes it.',
+      '     Read this file at the start of any planning or research phase. -->',
+      '',
+      '| # | When | Scope | Decision | Choice | Rationale | Revisable? | Made By |',
+      '|---|------|-------|----------|--------|-----------|------------|---------|',
+      '',
+    ].join('\n');
   }
   return content.endsWith('\n') ? content : content + '\n';
 }

package/src/resources/extensions/gsd/native-git-bridge.ts

@@ -705,20 +705,21 @@ export function nativeAddTracked(basePath: string): void {
   gitFileExec(basePath, ["add", "-u"]);
 }
 
-function isDotGsdIgnored(basePath: string): boolean {
-  for (const path of [".gsd", ".gsd/"]) {
-    try {
-      execFileSync("git", ["check-ignore", "-q", path], {
-        cwd: basePath,
-        stdio: "pipe",
-        env: GIT_NO_PROMPT_ENV,
-      });
-      return true;
-    } catch {
-      // exit 1 means this form is not ignored; try the next variant
-    }
+export function nativeIsIgnored(basePath: string, path: string): boolean {
+  try {
+    execFileSync("git", ["check-ignore", "-q", "--", path], {
+      cwd: basePath,
+      stdio: "pipe",
+      env: GIT_NO_PROMPT_ENV,
+    });
+    return true;
+  } catch {
+    return false;
   }
-  return false;
+}
+
+function isDotGsdIgnored(basePath: string): boolean {
+  return [".gsd", ".gsd/"].some(path => nativeIsIgnored(basePath, path));
 }
 
 /**

package/src/resources/extensions/gsd/notification-overlay.ts

@@ -1,9 +1,8 @@
-// GSD Extension — Notification History Overlay
-// Scrollable panel showing all persisted notifications with severity filtering.
-// Toggled with Ctrl+Alt+N (⌃⌥N on macOS), Ctrl+Shift+N fallback, or /gsd notifications.
+// Project/App: GSD-2
+// File Purpose: Notification history overlay with severity filtering and width-safe TUI rendering.
 
 import type { Theme } from "@gsd/pi-coding-agent";
-import { truncateToWidth, visibleWidth, wrapTextWithAnsi, matchesKey, Key } from "@gsd/pi-tui";
+import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 
 import {
   readNotifications,
@@ -14,10 +13,32 @@ import {
   type NotifySeverity,
 } from "./notification-store.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
-import { padRight, joinColumns } from "../shared/mod.js";
-
-type FilterMode = "all" | "error" | "warning" | "info";
-const FILTER_CYCLE: FilterMode[] = ["all", "error", "warning", "info"];
+import {
+  padRightVisible,
+  renderFrame,
+  renderKeyHints,
+  rightAlign,
+  wrapVisibleText,
+} from "./tui/render-kit.js";
+
+type FilterMode = "all" | "error" | "warning" | "success" | "info";
+const FILTER_CYCLE: FilterMode[] = ["all", "error", "warning", "success", "info"];
+const OVERLAY_WIDTH = "58%";
+const OVERLAY_MIN_WIDTH = 68;
+const OVERLAY_MAX_HEIGHT_PERCENT = 52;
+const OVERLAY_MARGIN = { top: 2, right: 2, bottom: 6, left: 2 } as const;
+
+export function notificationOverlayOptions() {
+  return {
+    width: OVERLAY_WIDTH,
+    minWidth: OVERLAY_MIN_WIDTH,
+    maxHeight: `${OVERLAY_MAX_HEIGHT_PERCENT}%`,
+    anchor: "top-center",
+    row: "24%",
+    margin: OVERLAY_MARGIN,
+    backdrop: true,
+  } as const;
+}
 
 function severityIcon(severity: NotifySeverity): string {
   switch (severity) {
@@ -29,17 +50,6 @@ function severityIcon(severity: NotifySeverity): string {
   }
 }
 
-/** Column-aware word wrap using pi-tui's native wrapper (handles unicode/ANSI). */
-function wrapText(text: string, maxWidth: number): string[] {
-  if (maxWidth <= 0) return [text];
-  const lines = wrapTextWithAnsi(text, maxWidth);
-  // Safety clamp: if any line still exceeds maxWidth (e.g. unbreakable long token),
-  // truncate it with an ellipsis so it cannot bleed past the box border.
-  return lines.map((l) =>
-    visibleWidth(l) > maxWidth ? truncateToWidth(l, maxWidth, "…") : l,
-  );
-}
-
 function formatTimestamp(ts: string): string {
   try {
     const d = new Date(ts);
@@ -184,13 +194,19 @@ export class GSDNotificationOverlay {
     }
 
     const content = this.buildContentLines(width);
-    const maxVisibleRows = Math.max(5, process.stdout.rows ? process.stdout.rows - 8 : 24) - 2;
+    const terminalRows = process.stdout.rows || 32;
+    const availableRows = Math.max(1, terminalRows - OVERLAY_MARGIN.top - OVERLAY_MARGIN.bottom);
+    const overlayRows = Math.min(
+      availableRows,
+      Math.max(1, Math.floor((terminalRows * OVERLAY_MAX_HEIGHT_PERCENT) / 100)),
+    );
+    const maxVisibleRows = Math.max(5, overlayRows - 2);
     const visibleContentRows = Math.min(content.length, maxVisibleRows);
     const maxScroll = Math.max(0, content.length - visibleContentRows);
     this.scrollOffset = Math.min(this.scrollOffset, maxScroll);
     const visibleContent = content.slice(this.scrollOffset, this.scrollOffset + visibleContentRows);
 
-    const lines = this.wrapInBox(visibleContent, width);
+    const lines = renderFrame(this.theme, visibleContent, width);
 
     this.cachedWidth = width;
     this.cachedLines = lines;
@@ -227,33 +243,15 @@ export class GSDNotificationOverlay {
     }
   }
 
-  private wrapInBox(inner: string[], width: number): string[] {
-    const th = this.theme;
-    const border = (s: string) => th.fg("borderAccent", s);
-    const innerWidth = width - 4;
-    const lines: string[] = [];
-
-    lines.push(border("╭" + "─".repeat(width - 2) + "╮"));
-    for (const line of inner) {
-      const truncated = truncateToWidth(line, innerWidth);
-      const padWidth = Math.max(0, innerWidth - visibleWidth(truncated));
-      lines.push(border("│") + " " + truncated + " ".repeat(padWidth) + " " + border("│"));
-    }
-    lines.push(border("╰" + "─".repeat(width - 2) + "╯"));
-    return lines;
-  }
-
   private buildContentLines(width: number): string[] {
     const th = this.theme;
-    const shellWidth = width - 4;
-    const contentWidth = Math.min(shellWidth, 128);
-    const sidePad = Math.max(0, Math.floor((shellWidth - contentWidth) / 2));
-    const leftMargin = " ".repeat(sidePad);
+    const shellWidth = Math.max(1, width - 4);
+    const contentWidth = shellWidth;
     const lines: string[] = [];
 
     const row = (content = ""): string => {
       const truncated = truncateToWidth(content, contentWidth);
-      return leftMargin + padRight(truncated, contentWidth);
+      return padRightVisible(truncated, contentWidth);
     };
     const blank = () => row("");
     const hr = () => row(th.fg("dim", "─".repeat(contentWidth)));
@@ -262,9 +260,15 @@ export class GSDNotificationOverlay {
     const title = th.fg("accent", th.bold("Notifications"));
     const filterLabel = this.filter === "all"
       ? th.fg("dim", "all")
-      : th.fg(this.filter === "error" ? "error" : this.filter === "warning" ? "warning" : "dim", this.filter);
+      : th.fg(
+        this.filter === "error" ? "error"
+          : this.filter === "warning" ? "warning"
+            : this.filter === "success" ? "success"
+              : "dim",
+        this.filter,
+      );
     const count = `${this.filteredEntries.length} entries`;
-    lines.push(row(joinColumns(
+    lines.push(row(rightAlign(
       `${title}  ${th.fg("dim", "filter:")} ${filterLabel}`,
       th.fg("dim", count),
       contentWidth,
@@ -273,7 +277,7 @@ export class GSDNotificationOverlay {
 
     // Controls
     const closeShortcut = formattedShortcutPair("notifications");
-    lines.push(row(th.fg("dim", `↑/↓ scroll  f filter  c clear  Esc close  (${closeShortcut})`)));
+    lines.push(row(renderKeyHints(th, ["↑/↓ scroll", "f filter", "c clear", `Esc/${closeShortcut} close`], contentWidth)));
     lines.push(blank());
 
     // Entries
@@ -302,7 +306,7 @@ export class GSDNotificationOverlay {
       const msgMaxWidth = Math.max(10, contentWidth - prefixWidth);
 
       // Wrap long messages onto continuation lines indented to align with message start
-      const msgLines = wrapText(entry.message, msgMaxWidth);
+      const msgLines = wrapVisibleText(entry.message, msgMaxWidth);
       const indent = " ".repeat(prefixWidth);
       for (let i = 0; i < msgLines.length; i++) {
         if (i === 0) {