gsd-pi 2.71.0-dev.977c553 → 2.71.0-dev.d4d916a

package/dist/resources/extensions/gsd/commands/handlers/core.js

@@ -4,10 +4,43 @@ import { ensurePreferencesFile, handlePrefs, handlePrefsMode, handlePrefsWizard
 import { runEnvironmentChecks } from "../../doctor-environment.js";
 import { deriveState } from "../../state.js";
 import { handleCmux } from "../../commands-cmux.js";
+import { setSessionModelOverride } from "../../session-model-override.js";
 import { projectRoot } from "../context.js";
-import { formatShortcut } from "../../files.js";
-export function showHelp(ctx) {
-    const lines = [
+import { formattedShortcutPair } from "../../shortcut-defs.js";
+export function showHelp(ctx, args = "") {
+    const summaryLines = [
+        "GSD — Get Shit Done\n",
+        "QUICK START",
+        "  /gsd start <tpl>   Start a workflow template",
+        "  /gsd               Run next unit (same as /gsd next)",
+        "  /gsd auto          Run all queued units continuously",
+        "  /gsd pause         Pause auto-mode",
+        "  /gsd stop          Stop auto-mode gracefully",
+        "",
+        "VISIBILITY",
+        `  /gsd status         Dashboard  (${formattedShortcutPair("dashboard")})`,
+        `  /gsd parallel watch Parallel monitor  (${formattedShortcutPair("parallel")})`,
+        `  /gsd notifications  Notification history  (${formattedShortcutPair("notifications")})`,
+        "  /gsd visualize      Interactive 10-tab TUI",
+        "  /gsd queue          Show queued/dispatched units",
+        "",
+        "COURSE CORRECTION",
+        "  /gsd steer <desc>   Apply user override to active work",
+        "  /gsd capture <text> Quick-capture a thought to CAPTURES.md",
+        "  /gsd triage         Classify and route pending captures",
+        "  /gsd undo           Revert last completed unit  [--force]",
+        "  /gsd rethink        Conversational project reorganization",
+        "",
+        "SETUP",
+        "  /gsd init           Project init wizard",
+        "  /gsd setup          Global setup status  [llm|search|remote|keys|prefs]",
+        "  /gsd model          Switch active session model",
+        "  /gsd prefs          Manage preferences",
+        "  /gsd doctor         Diagnose and repair .gsd/ state",
+        "",
+        "Use /gsd help full for the complete command reference.",
+    ];
+    const fullLines = [
         "GSD — Get Shit Done\n",
         "WORKFLOW",
         "  /gsd start <tpl>   Start a workflow template (bugfix, spike, feature, hotfix, etc.)",
@@ -21,12 +54,13 @@ export function showHelp(ctx) {
         "  /gsd new-milestone  Create milestone from headless context (used by gsd headless)",
         "",
         "VISIBILITY",
-        `  /gsd status         Show progress dashboard  (${formatShortcut("Ctrl+Alt+G")})`,
+        `  /gsd status         Show progress dashboard  (${formattedShortcutPair("dashboard")})`,
+        `  /gsd parallel watch Open parallel worker monitor  (${formattedShortcutPair("parallel")})`,
         "  /gsd visualize      Interactive 10-tab TUI (progress, timeline, deps, metrics, health, agent, changes, knowledge, captures, export)",
         "  /gsd queue          Show queued/dispatched units and execution order",
         "  /gsd history        View execution history  [--cost] [--phase] [--model] [N]",
         "  /gsd changelog      Show categorized release notes  [version]",
-        `  /gsd notifications  View persistent notification history  [clear|tail|filter]  (${formatShortcut("Ctrl+Alt+N")})`,
+        `  /gsd notifications  View persistent notification history  [clear|tail|filter]  (${formattedShortcutPair("notifications")})`,
         "",
         "COURSE CORRECTION",
         "  /gsd steer <desc>   Apply user override to active work",
@@ -66,7 +100,8 @@ export function showHelp(ctx) {
         "  /gsd inspect        Show SQLite DB diagnostics (schema, row counts, recent entries)",
         "  /gsd update         Update GSD to the latest version via npm",
     ];
-    ctx.ui.notify(lines.join("\n"), "info");
+    const full = ["full", "--full", "all"].includes(args.trim().toLowerCase());
+    ctx.ui.notify((full ? fullLines : summaryLines).join("\n"), "info");
 }
 export async function handleStatus(ctx) {
     const basePath = projectRoot();
@@ -82,9 +117,9 @@ export async function handleStatus(ctx) {
     const result = await ctx.ui.custom((tui, theme, _kb, done) => new GSDDashboardOverlay(tui, theme, () => done(true)), {
         overlay: true,
         overlayOptions: {
-            width: "70%",
-            minWidth: 60,
-            maxHeight: "90%",
+            width: "90%",
+            minWidth: 80,
+            maxHeight: "92%",
             anchor: "center",
         },
     });
@@ -251,11 +286,21 @@ async function handleModel(trimmedArgs, ctx, pi) {
         ctx.ui.notify(`No API key for ${targetModel.provider}/${targetModel.id}`, "warning");
         return;
     }
+    // /gsd model is an explicit per-session pin for GSD dispatches.
+    // This is captured at auto bootstrap so it survives internal session
+    // switches during /gsd auto and /gsd next runs.
+    const sessionId = ctx.sessionManager?.getSessionId?.();
+    if (sessionId) {
+        setSessionModelOverride(sessionId, {
+            provider: targetModel.provider,
+            id: targetModel.id,
+        });
+    }
     ctx.ui.notify(`Model: ${targetModel.provider}/${targetModel.id}`, "info");
 }
 export async function handleCoreCommand(trimmed, ctx, pi) {
-    if (trimmed === "help" || trimmed === "h" || trimmed === "?") {
-        showHelp(ctx);
+    if (trimmed === "help" || trimmed === "h" || trimmed === "?" || trimmed.startsWith("help ")) {
+        showHelp(ctx, trimmed.startsWith("help ") ? trimmed.slice(5).trim() : "");
         return true;
     }
     if (trimmed === "status") {

package/dist/resources/extensions/gsd/commands/handlers/notifications-handler.js

@@ -2,6 +2,7 @@
 // View, filter, and clear the persistent notification history.
 import { readNotifications, clearNotifications, getUnreadCount, suppressPersistence, unsuppressPersistence, } from "../../notification-store.js";
 import { GSDNotificationOverlay } from "../../notification-overlay.js";
+const MAX_INLINE_ENTRIES = 40;
 function severityIcon(severity) {
     switch (severity) {
         case "error": return "✗";
@@ -38,14 +39,18 @@ export async function handleNotificationsCommand(args, ctx, pi) {
     if (args === "tail" || args.startsWith("tail ")) {
         const countStr = args.replace(/^tail\s*/, "").trim();
         const count = countStr ? parseInt(countStr, 10) : 20;
-        const n = isNaN(count) || count < 1 ? 20 : Math.min(count, 100);
-        const entries = readNotifications().slice(0, n);
+        const all = readNotifications();
+        const n = isNaN(count) || count < 1 ? 20 : Math.min(count, MAX_INLINE_ENTRIES);
+        const entries = all.slice(0, n);
         if (entries.length === 0) {
             ctx.ui.notify("No notifications.", "info");
             return true;
         }
         const lines = entries.map((e) => `${severityIcon(e.severity)} [${formatTimestamp(e.ts)}] ${e.message}`);
-        ctx.ui.notify(`Last ${entries.length} notification(s):\n${lines.join("\n")}`, "info");
+        const suffix = all.length > entries.length
+            ? `\n... and ${all.length - entries.length} more (open /gsd notifications to browse all)`
+            : "";
+        ctx.ui.notify(`Last ${entries.length} notification(s):\n${lines.join("\n")}${suffix}`, "info");
         return true;
     }
     // /gsd notifications filter <severity>
@@ -61,7 +66,9 @@ export async function handleNotificationsCommand(args, ctx, pi) {
             return true;
         }
         const lines = entries.slice(0, 20).map((e) => `${severityIcon(e.severity)} [${formatTimestamp(e.ts)}] ${e.message}`);
-        const suffix = entries.length > 20 ? `\n... and ${entries.length - 20} more` : "";
+        const suffix = entries.length > 20
+            ? `\n... and ${entries.length - 20} more (open /gsd notifications to browse all)`
+            : "";
         ctx.ui.notify(`${severity} notifications (${entries.length}):\n${lines.join("\n")}${suffix}`, "info");
         return true;
     }
@@ -70,7 +77,7 @@ export async function handleNotificationsCommand(args, ctx, pi) {
         // Try overlay first (TUI mode)
         if (ctx.hasUI) {
             try {
-                await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done()), {
+                const result = await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done(true)), {
                     overlay: true,
                     overlayOptions: {
                         width: "80%",
@@ -80,7 +87,9 @@ export async function handleNotificationsCommand(args, ctx, pi) {
                         backdrop: true,
                     },
                 });
-                return true;
+                if (result !== undefined) {
+                    return true;
+                }
             }
             catch {
                 // Fall through to text output if overlay fails

package/dist/resources/extensions/gsd/commands/handlers/workflow.js

@@ -12,7 +12,7 @@ import { nextMilestoneId } from "../../milestone-ids.js";
 import { findMilestoneIds } from "../../guided-flow.js";
 import { projectRoot } from "../context.js";
 import { createRun, listRuns } from "../../run-manager.js";
-import { setActiveEngineId, setActiveRunDir, startAuto, pauseAuto, isAutoActive, getActiveEngineId, } from "../../auto.js";
+import { setActiveEngineId, setActiveRunDir, startAutoDetached, pauseAuto, isAutoActive, getActiveEngineId, } from "../../auto.js";
 import { validateDefinition } from "../../definition-loader.js";
 // ─── Custom Workflow Subcommands ─────────────────────────────────────────
 const WORKFLOW_USAGE = [
@@ -58,7 +58,7 @@ async function handleCustomWorkflow(sub, ctx, pi) {
             setActiveEngineId("custom");
             setActiveRunDir(runDir);
             ctx.ui.notify(`Created workflow run: ${defName}\nRun dir: ${runDir}`, "info");
-            await startAuto(ctx, pi, base, false);
+            startAutoDetached(ctx, pi, base, false);
         }
         catch (err) {
             // Clean up engine state so a failed workflow run doesn't pollute the next /gsd auto
@@ -137,14 +137,8 @@ async function handleCustomWorkflow(sub, ctx, pi) {
             ctx.ui.notify("No custom workflow to resume. Use /gsd auto for dev workflow.", "warning");
             return true;
         }
-        try {
-            await startAuto(ctx, pi, projectRoot(), false);
-            ctx.ui.notify("Custom workflow resumed.", "info");
-        }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            ctx.ui.notify(`Failed to resume workflow: ${msg}`, "error");
-        }
+        startAutoDetached(ctx, pi, projectRoot(), false);
+        ctx.ui.notify("Custom workflow resumed.", "info");
         return true;
     }
     // Unknown subcommand — show usage

package/dist/resources/extensions/gsd/dashboard-overlay.js

@@ -3,7 +3,8 @@
  *
  * Full-screen overlay showing auto-mode progress: milestone/slice/task
  * breakdown, current unit, completed units, timing, and activity log.
- * Toggled with Ctrl+Alt+G (⌃⌥G on macOS) or opened from /gsd status.
+ * Toggled with Ctrl+Alt+G (⌃⌥G on macOS), Ctrl+Shift+G fallback,
+ * or opened from /gsd status.
  */
 import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
 import { deriveState } from "./state.js";
@@ -19,6 +20,7 @@ import { formatDuration, padRight, joinColumns, centerLine, fitColumns, STATUS_G
 import { estimateTimeRemaining } from "./auto-dashboard.js";
 import { computeProgressScore } from "./progress-score.js";
 import { runEnvironmentChecks } from "./doctor-environment.js";
+import { formattedShortcutPair } from "./shortcut-defs.js";
 function unitLabel(type) {
     switch (type) {
         case "discuss-milestone":
@@ -174,7 +176,10 @@ export class GSDDashboardOverlay {
         }
     }
     handleInput(data) {
-        if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c")) || matchesKey(data, Key.ctrlAlt("g"))) {
+        if (matchesKey(data, Key.escape) ||
+            matchesKey(data, Key.ctrl("c")) ||
+            matchesKey(data, Key.ctrlAlt("g")) ||
+            matchesKey(data, Key.ctrlShift("g"))) {
             this.dispose();
             this.onClose();
             return;
@@ -507,7 +512,7 @@ export class GSDDashboardOverlay {
         }
         lines.push(blank());
         lines.push(hr());
-        lines.push(centered(th.fg("dim", "↑↓ scroll · g/G top/end · esc close")));
+        lines.push(centered(th.fg("dim", `↑↓ scroll · g/G top/end · Esc/${formattedShortcutPair("dashboard")} close`)));
         return lines;
     }
     renderProgressRow(label, done, total, color, width) {

package/dist/resources/extensions/gsd/dispatch-guard.js

@@ -102,10 +102,27 @@ export function getPriorSliceCompletionBlocker(base, _mainBranch, unitType, unit
             }
         }
         else {
+            // Positional fallback is only a heuristic for legacy slices with no
+            // declared dependencies. Skip any earlier slice that depends on the
+            // target, directly or transitively, or we can deadlock a valid zero-dep
+            // slice behind its own downstream dependents (#3720).
+            const reverseDependents = new Set();
+            let changed = true;
+            while (changed) {
+                changed = false;
+                for (const slice of slices) {
+                    if (reverseDependents.has(slice.id))
+                        continue;
+                    if (slice.depends.some((depId) => depId === targetSid || reverseDependents.has(depId))) {
+                        reverseDependents.add(slice.id);
+                        changed = true;
+                    }
+                }
+            }
             const targetIndex = slices.findIndex((slice) => slice.id === targetSid);
             const incomplete = slices
                 .slice(0, targetIndex)
-                .find((slice) => !slice.done);
+                .find((slice) => !slice.done && !reverseDependents.has(slice.id));
             if (incomplete) {
                 return `Cannot dispatch ${unitType} ${unitId}: earlier slice ${targetMid}/${incomplete.id} is not complete.`;
             }

package/dist/resources/extensions/gsd/error-classifier.js

@@ -23,7 +23,7 @@ const RATE_LIMIT_RE = /rate.?limit|too many requests|429/i;
 const NETWORK_RE = /network|ECONNRESET|ETIMEDOUT|ECONNREFUSED|socket hang up|fetch failed|connection.*reset|dns/i;
 const SERVER_RE = /internal server error|500|502|503|overloaded|server_error|api_error|service.?unavailable/i;
 // ECONNRESET/ECONNREFUSED are in NETWORK_RE (same-model retry first).
-const CONNECTION_RE = /terminated|connection.?refused|other side closed|EPIPE|network.?(?:is\s+)?unavailable|stream_exhausted(?:_without_result)?/i;
+const CONNECTION_RE = /terminated|connection.?(?:refused|error)|other side closed|EPIPE|network.?(?:is\s+)?unavailable|stream_exhausted(?:_without_result)?/i;
 // Catch-all for V8 JSON.parse errors: all modern variants end with "in JSON at position \d+".
 // This eliminates the need to enumerate every error message variant individually.
 const STREAM_RE = /in JSON at position \d+|Unexpected end of JSON|SyntaxError.*JSON/i;

package/dist/resources/extensions/gsd/forensics.js

@@ -508,19 +508,30 @@ function getDbCompletionCounts() {
  * Exported for testability.
  */
 export function detectStuckLoops(units, anomalies) {
-    // First, collect unique startedAt values per type/id key
+    // First, collect unique startedAt values per type/id key, bucketed by
+    // autoSessionKey when available so cross-session recovery does not look
+    // like a within-session stuck loop.
     const dispatchMap = new Map();
     for (const u of units) {
         const key = `${u.type}/${u.id}`;
-        let starts = dispatchMap.get(key);
+        let sessionBuckets = dispatchMap.get(key);
+        if (!sessionBuckets) {
+            sessionBuckets = new Map();
+            dispatchMap.set(key, sessionBuckets);
+        }
+        const sessionKey = u.autoSessionKey ?? "__legacy__";
+        let starts = sessionBuckets.get(sessionKey);
         if (!starts) {
             starts = new Set();
-            dispatchMap.set(key, starts);
+            sessionBuckets.set(sessionKey, starts);
         }
         starts.add(u.startedAt);
     }
-    for (const [key, starts] of dispatchMap) {
-        const count = starts.size;
+    for (const [key, sessionBuckets] of dispatchMap) {
+        const hasSessionAwareData = Array.from(sessionBuckets.keys()).some((sessionKey) => sessionKey !== "__legacy__");
+        const count = hasSessionAwareData
+            ? Math.max(...Array.from(sessionBuckets.values(), (starts) => starts.size))
+            : (sessionBuckets.get("__legacy__")?.size ?? 0);
         if (count > 1) {
             const [unitType, ...idParts] = key.split("/");
             anomalies.push({
@@ -529,7 +540,9 @@ export function detectStuckLoops(units, anomalies) {
                 unitType,
                 unitId: idParts.join("/"),
                 summary: `Unit ${key} was dispatched ${count} times`,
-                details: `Repeated dispatch suggests the unit completed but its artifacts weren't verified, or the state machine kept returning it.`,
+                details: hasSessionAwareData
+                    ? `Repeated dispatch within the same auto session suggests the unit completed but its artifacts were not verified, or the state machine kept returning it. Cross-session recovery runs are ignored.`
+                    : `Repeated dispatch suggests the unit completed but its artifacts weren't verified, or the state machine kept returning it.`,
             });
         }
     }

package/dist/resources/extensions/gsd/guided-flow.js

@@ -13,7 +13,7 @@ import { loadPrompt, inlineTemplate } from "./prompt-loader.js";
 import { buildSkillActivationBlock } from "./auto-prompts.js";
 import { deriveState } from "./state.js";
 import { invalidateAllCaches } from "./cache.js";
-import { startAuto } from "./auto.js";
+import { startAutoDetached } from "./auto.js";
 import { clearLock } from "./crash-recovery.js";
 import { assessInterruptedSession, formatInterruptedSessionRunningMessage, formatInterruptedSessionSummary, } from "./interrupted-session.js";
 import { listUnitRuntimeRecords, clearUnitRuntimeRecord } from "./unit-runtime.js";
@@ -40,7 +40,6 @@ import { runPreparation, formatCodebaseBrief, formatPriorContextBrief, } from ".
 // ─── Re-exports (preserve public API for existing importers) ────────────────
 export { MILESTONE_ID_RE, generateMilestoneSuffix, nextMilestoneId, extractMilestoneSeq, parseMilestoneId, milestoneIdSort, maxMilestoneNum, findMilestoneIds, reserveMilestoneId, claimReservedId, getReservedMilestoneIds, clearReservedMilestoneIds, } from "./milestone-ids.js";
 export { showQueue, handleQueueReorder, showQueueAdd, buildExistingMilestonesContext, } from "./guided-flow-queue.js";
-import { getErrorMessage } from "./error-utils.js";
 import { logWarning } from "./workflow-logger.js";
 // ─── ID Generation with Reservation ─────────────────────────────────────────
 /**
@@ -200,11 +199,7 @@ export function checkAutoStartAfterDiscuss() {
     }
     pendingAutoStartMap.delete(basePath);
     ctx.ui.notify(`Milestone ${milestoneId} ready.`, "info");
-    startAuto(ctx, pi, basePath, false, { step }).catch((err) => {
-        ctx.ui.notify(`Auto-start failed: ${getErrorMessage(err)}`, "error");
-        logWarning("guided", `auto start error: ${getErrorMessage(err)}`);
-        debugLog("auto-start-failed", { error: getErrorMessage(err) });
-    });
+    startAutoDetached(ctx, pi, basePath, false, { step });
     return true;
 }
 /**
@@ -1097,7 +1092,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             ],
         });
         if (resume === "resume") {
-            await startAuto(ctx, pi, basePath, false, {
+            startAutoDetached(ctx, pi, basePath, false, {
                 interrupted,
                 step: interrupted.pausedSession?.stepMode ?? false,
             });
@@ -1409,7 +1404,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
                 notYetMessage: "Run /gsd status for details.",
             });
             if (choice === "auto") {
-                await startAuto(ctx, pi, basePath, false);
+                startAutoDetached(ctx, pi, basePath, false);
             }
             else if (choice === "status") {
                 const { fireStatusViaCommand } = await import("./commands.js");
@@ -1622,7 +1617,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
             notYetMessage: "Run /gsd when ready.",
         });
         if (choice === "auto") {
-            await startAuto(ctx, pi, basePath, false);
+            startAutoDetached(ctx, pi, basePath, false);
             return;
         }
         if (choice === "execute") {

package/dist/resources/extensions/gsd/metrics.js

@@ -113,6 +113,7 @@ export function snapshotUnitMetrics(ctx, unitType, unitId, startedAt, model, opt
         model,
         startedAt,
         finishedAt: Date.now(),
+        ...(opts?.autoSessionKey ? { autoSessionKey: opts.autoSessionKey } : {}),
         tokens,
         cost,
         toolCalls,

package/dist/resources/extensions/gsd/milestone-actions.js

@@ -15,7 +15,7 @@ import { join } from "node:path";
 import { resolveMilestonePath, resolveMilestoneFile, buildMilestoneFileName, } from "./paths.js";
 import { invalidateAllCaches } from "./cache.js";
 import { loadQueueOrder, saveQueueOrder } from "./queue-order.js";
-import { isDbAvailable, updateMilestoneStatus } from "./gsd-db.js";
+import { getMilestone, isDbAvailable, updateMilestoneStatus } from "./gsd-db.js";
 import { logWarning } from "./workflow-logger.js";
 // ─── Park ──────────────────────────────────────────────────────────────────
 /**
@@ -68,9 +68,15 @@ export function unparkMilestone(basePath, milestoneId) {
     if (!mDir || !existsSync(mDir))
         return false;
     const parkedPath = join(mDir, buildMilestoneFileName(milestoneId, "PARKED"));
-    if (!existsSync(parkedPath))
-        return false; // not parked
-    unlinkSync(parkedPath);
+    const hadParkedFile = existsSync(parkedPath);
+    const dbThinksParked = isDbAvailable() && getMilestone(milestoneId)?.status === "parked";
+    // Recover the reverse desync too: DB can still say "parked" even when the
+    // PARKED marker was lost on disk, and /gsd unpark should repair that state.
+    if (!hadParkedFile && !dbThinksParked)
+        return false;
+    if (hadParkedFile) {
+        unlinkSync(parkedPath);
+    }
     // Sync DB status so deriveStateFromDb picks up the unparked milestone (#2694)
     if (isDbAvailable()) {
         try {

package/dist/resources/extensions/gsd/notification-overlay.js

@@ -1,8 +1,9 @@
 // GSD Extension — Notification History Overlay
 // Scrollable panel showing all persisted notifications with severity filtering.
-// Toggled with Ctrl+Alt+N (⌃⌥N on macOS) or opened from /gsd notifications.
+// Toggled with Ctrl+Alt+N (⌃⌥N on macOS), Ctrl+Shift+N fallback, or /gsd notifications.
 import { truncateToWidth, visibleWidth, matchesKey, Key } from "@gsd/pi-tui";
-import { readNotifications, markAllRead, clearNotifications, } from "./notification-store.js";
+import { readNotifications, markAllRead, clearNotifications, onNotificationStoreChange, } from "./notification-store.js";
+import { formattedShortcutPair } from "./shortcut-defs.js";
 import { padRight, joinColumns } from "../shared/mod.js";
 const FILTER_CYCLE = ["all", "error", "warning", "info"];
 function severityIcon(severity) {
@@ -55,6 +56,11 @@ function formatTimestamp(ts) {
         return ts.slice(11, 19); // fallback: HH:MM:SS
     }
 }
+function notificationSignature(entries) {
+    return entries
+        .map((entry) => `${entry.ts}|${entry.severity}|${entry.read ? 1 : 0}|${entry.message}`)
+        .join("\n");
+}
 export class GSDNotificationOverlay {
     tui;
     theme;
@@ -64,9 +70,11 @@ export class GSDNotificationOverlay {
     scrollOffset = 0;
     filterIndex = 0;
     entries = [];
+    entriesSignature = "";
     refreshTimer;
     disposed = false;
     resizeHandler = null;
+    unsubscribeStore = null;
     constructor(tui, theme, onClose) {
         this.tui = tui;
         this.theme = theme;
@@ -74,6 +82,7 @@ export class GSDNotificationOverlay {
         // Mark all as read on open
         markAllRead();
         this.entries = readNotifications();
+        this.entriesSignature = notificationSignature(this.entries);
         // Resize handler
         this.resizeHandler = () => {
             if (this.disposed)
@@ -82,18 +91,18 @@ export class GSDNotificationOverlay {
             this.tui.requestRender();
         };
         process.stdout.on("resize", this.resizeHandler);
-        // Refresh every 3s for new notifications
+        // Subscribe to store mutations for immediate updates
+        this.unsubscribeStore = onNotificationStoreChange(() => {
+            if (this.disposed)
+                return;
+            this._refreshFromDisk();
+        });
+        // 30s safety-net for cross-process edits (web subprocess, parallel workers)
         this.refreshTimer = setInterval(() => {
             if (this.disposed)
                 return;
-            const fresh = readNotifications();
-            if (fresh.length !== this.entries.length) {
-                this.entries = fresh;
-                markAllRead();
-                this.invalidate();
-                this.tui.requestRender();
-            }
-        }, 3000);
+            this._refreshFromDisk();
+        }, 30_000);
     }
     get filter() {
         return FILTER_CYCLE[this.filterIndex];
@@ -104,7 +113,10 @@ export class GSDNotificationOverlay {
         return this.entries.filter((e) => e.severity === this.filter);
     }
     handleInput(data) {
-        if (matchesKey(data, Key.escape) || matchesKey(data, Key.ctrl("c")) || matchesKey(data, Key.ctrlAlt("n"))) {
+        if (matchesKey(data, Key.escape) ||
+            matchesKey(data, Key.ctrl("c")) ||
+            matchesKey(data, Key.ctrlAlt("n")) ||
+            matchesKey(data, Key.ctrlShift("n"))) {
             this.dispose();
             this.onClose();
             return;
@@ -146,6 +158,7 @@ export class GSDNotificationOverlay {
         if (data === "c") {
             clearNotifications();
             this.entries = [];
+            this.entriesSignature = notificationSignature(this.entries);
             this.scrollOffset = 0;
             this.invalidate();
             this.tui.requestRender();
@@ -174,11 +187,26 @@ export class GSDNotificationOverlay {
     dispose() {
         this.disposed = true;
         clearInterval(this.refreshTimer);
+        if (this.unsubscribeStore) {
+            this.unsubscribeStore();
+            this.unsubscribeStore = null;
+        }
         if (this.resizeHandler) {
             process.stdout.removeListener("resize", this.resizeHandler);
             this.resizeHandler = null;
         }
     }
+    _refreshFromDisk() {
+        const fresh = readNotifications();
+        const signature = notificationSignature(fresh);
+        if (signature !== this.entriesSignature) {
+            markAllRead();
+            this.entries = readNotifications();
+            this.entriesSignature = notificationSignature(this.entries);
+            this.invalidate();
+            this.tui.requestRender();
+        }
+    }
     wrapInBox(inner, width) {
         const th = this.theme;
         const border = (s) => th.fg("borderAccent", s);
@@ -215,7 +243,8 @@ export class GSDNotificationOverlay {
         lines.push(row(joinColumns(`${title}  ${th.fg("dim", "filter:")} ${filterLabel}`, th.fg("dim", count), contentWidth)));
         lines.push(hr());
         // Controls
-        lines.push(row(th.fg("dim", "↑/↓ scroll  f filter  c clear  Esc close")));
+        const closeShortcut = formattedShortcutPair("notifications");
+        lines.push(row(th.fg("dim", `↑/↓ scroll  f filter  c clear  Esc close  (${closeShortcut})`)));
         lines.push(blank());
         // Entries
         const filtered = this.filteredEntries;