gsd-pi 2.71.0 → 2.72.0-dev.3118184

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/milestone-validation-gates.js

@@ -6,17 +6,12 @@
  * records in the DB. This module inserts milestone-level validation gates
  * that correspond to the validation checks performed.
  *
- * Gate IDs for milestone validation:
- *   MV01 — Success criteria checklist
- *   MV02 — Slice delivery audit
- *   MV03 — Cross-slice integration
- *   MV04 — Requirement coverage
- *
- * These use the existing quality_gates table with scope "milestone".
+ * Gate IDs for milestone validation (MV01–MV04) are sourced from the
+ * gate registry so the definitions stay in lockstep with prompt builders,
+ * dispatch rules, and state derivation. See gate-registry.ts.
  */
 import { _getAdapter } from "./gsd-db.js";
-/** Milestone validation gate IDs. */
-const MILESTONE_GATE_IDS = ["MV01", "MV02", "MV03", "MV04"];
+import { getGatesForTurn } from "./gate-registry.js";
 /**
  * Insert milestone-level quality_gates records for a validation run.
  *
@@ -24,21 +19,25 @@ const MILESTONE_GATE_IDS = ["MV01", "MV02", "MV03", "MV04"];
  * from the overall milestone validation verdict. Individual gate-level
  * verdicts are not available (the handler receives a single verdict),
  * so all gates share the overall verdict.
+ *
+ * Gate IDs come from the registry — adding/removing an MV-scoped gate
+ * in gate-registry.ts automatically flows through here.
  */
 export function insertMilestoneValidationGates(milestoneId, sliceId, verdict, evaluatedAt) {
     const db = _getAdapter();
     if (!db)
         return;
     const gateVerdict = verdict === "pass" ? "pass" : "flag";
-    for (const gateId of MILESTONE_GATE_IDS) {
+    const milestoneGates = getGatesForTurn("validate-milestone");
+    for (const def of milestoneGates) {
         db.prepare(`INSERT OR REPLACE INTO quality_gates
        (milestone_id, slice_id, gate_id, scope, task_id, status, verdict, rationale, findings, evaluated_at)
        VALUES (:mid, :sid, :gid, 'milestone', '', 'complete', :verdict, :rationale, '', :evaluated_at)`).run({
             ":mid": milestoneId,
             ":sid": sliceId,
-            ":gid": gateId,
+            ":gid": def.id,
             ":verdict": gateVerdict,
-            ":rationale": `Milestone validation verdict: ${verdict}`,
+            ":rationale": `${def.promptSection} — milestone validation verdict: ${verdict}`,
             ":evaluated_at": evaluatedAt,
         });
     }

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;

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

@@ -9,16 +9,23 @@ import { randomUUID } from "node:crypto";
 const MAX_ENTRIES = 500;
 const FILENAME = "notifications.jsonl";
 const LOCKFILE = "notifications.lock";
+const DEDUP_WINDOW_MS = 30_000;
+const DEDUP_PRUNE_THRESHOLD = 200;
 // ─── Module State ───────────────────────────────────────────────────────
 let _basePath = null;
 let _lineCount = 0; // Hint for rotation — not authoritative for public API
 let _suppressCount = 0;
+let _recentMessageTimestamps = new Map();
+const _changeListeners = new Set();
 // ─── Public API ─────────────────────────────────────────────────────────
 /**
  * Initialize the notification store. Call once at session start with the
  * project root. Seeds in-memory counters from the existing file on disk.
  */
 export function initNotificationStore(basePath) {
+    if (_basePath !== basePath) {
+        _recentMessageTimestamps.clear();
+    }
     _basePath = basePath;
     // Seed line count hint for rotation — public counters read from disk
     _lineCount = _readEntriesFromDisk(basePath).length;
@@ -32,11 +39,24 @@ export function appendNotification(message, severity, source = "notify") {
         return;
     if (_suppressCount > 0)
         return;
+    const persistedMessage = message.length > 500 ? message.slice(0, 500) + "…" : message;
+    const dedupKey = `${_basePath}:${severity}:${source}:${persistedMessage}`;
+    const now = Date.now();
+    const lastSeen = _recentMessageTimestamps.get(dedupKey);
+    if (lastSeen !== undefined && now - lastSeen < DEDUP_WINDOW_MS)
+        return;
+    _recentMessageTimestamps.set(dedupKey, now);
+    if (_recentMessageTimestamps.size > DEDUP_PRUNE_THRESHOLD) {
+        for (const [key, ts] of _recentMessageTimestamps) {
+            if (now - ts > DEDUP_WINDOW_MS)
+                _recentMessageTimestamps.delete(key);
+        }
+    }
     const entry = {
         id: randomUUID(),
         ts: new Date().toISOString(),
         severity,
-        message: message.length > 500 ? message.slice(0, 500) + "…" : message,
+        message: persistedMessage,
         source,
         read: false,
     };
@@ -49,6 +69,7 @@ export function appendNotification(message, severity, source = "notify") {
         if (_lineCount > MAX_ENTRIES) {
             _rotate();
         }
+        _emitChange();
     }
     catch {
         // Non-fatal — never let persistence break the caller
@@ -77,6 +98,7 @@ export function markAllRead(basePath) {
     const hasUnread = entries.some((e) => !e.read);
     if (!hasUnread)
         return;
+    let changed = false;
     try {
         _withLock(bp, () => {
             // Re-read inside lock to get freshest state
@@ -85,11 +107,14 @@ export function markAllRead(basePath) {
                 return;
             const lines = fresh.map((e) => JSON.stringify({ ...e, read: true }));
             _atomicWrite(bp, lines.join("\n") + "\n");
+            changed = true;
         });
     }
     catch {
         // Non-fatal
     }
+    if (changed)
+        _emitChange();
 }
 /**
  * Clear all notifications. Atomic write of empty content under lock.
@@ -102,6 +127,8 @@ export function clearNotifications(basePath) {
         _withLock(bp, () => {
             _atomicWrite(bp, "");
         });
+        _lineCount = 0;
+        _emitChange();
     }
     catch {
         // Non-fatal
@@ -146,6 +173,16 @@ export function suppressPersistence() {
 export function unsuppressPersistence() {
     _suppressCount = Math.max(0, _suppressCount - 1);
 }
+/**
+ * Subscribe to notification-store mutations (append, mark-read, clear).
+ * Returns an unsubscribe function.
+ */
+export function onNotificationStoreChange(listener) {
+    _changeListeners.add(listener);
+    return () => {
+        _changeListeners.delete(listener);
+    };
+}
 // ─── Test Helpers ───────────────────────────────────────────────────────
 /**
  * Reset module state. Only for use in tests.
@@ -154,6 +191,8 @@ export function _resetNotificationStore() {
     _basePath = null;
     _lineCount = 0;
     _suppressCount = 0;
+    _recentMessageTimestamps = new Map();
+    _changeListeners.clear();
 }
 // ─── Internal ───────────────────────────────────────────────────────────
 function _readEntriesFromDisk(basePath) {
@@ -191,12 +230,23 @@ function _rotate() {
             const trimmed = entries.slice(entries.length - MAX_ENTRIES);
             const lines = trimmed.map((e) => JSON.stringify(e));
             _atomicWrite(_basePath, lines.join("\n") + "\n");
+            _lineCount = trimmed.length;
         });
     }
     catch {
         // Non-fatal
     }
 }
+function _emitChange() {
+    for (const listener of _changeListeners) {
+        try {
+            listener();
+        }
+        catch {
+            // Non-fatal
+        }
+    }
+}
 /**
  * Atomic file rewrite via temp-file + rename. Prevents partial reads
  * by other processes (web API subprocess, parallel workers).
@@ -251,10 +301,11 @@ function _withLock(basePath, fn) {
             break;
         }
     }
-    // Only run the mutation if we actually own the lock
-    const ownsLock = fd !== null;
+    // Best-effort: mutation runs regardless of lock status (idempotent overwrites).
+    // createdLock gates cleanup only — never skip fn() on lock failure.
+    const createdLock = fd !== null;
     try {
-        if (ownsLock && fd !== null) {
+        if (createdLock && fd !== null) {
             // Write our PID timestamp into the lock for stale detection
             writeFileSync(lockPath, String(Date.now()), "utf-8");
             closeSync(fd);
@@ -263,7 +314,7 @@ function _withLock(basePath, fn) {
     }
     finally {
         // Only delete the lock if we created it — never remove another process's lock
-        if (ownsLock) {
+        if (createdLock) {
             try {
                 unlinkSync(lockPath);
             }

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

@@ -2,24 +2,14 @@
 // Always-on ambient widget rendered belowEditor showing unread count and
 // the most recent notification message. Refreshes every 5 seconds.
 // Widget key: "gsd-notifications", placement: "belowEditor"
-import { getUnreadCount, readNotifications } from "./notification-store.js";
-import { formatShortcut } from "./files.js";
+import { getUnreadCount, onNotificationStoreChange } from "./notification-store.js";
+import { formattedShortcutPair } from "./shortcut-defs.js";
 // ─── Pure rendering ──���────────────────────────���─────────────────────────
 export function buildNotificationWidgetLines() {
     const unread = getUnreadCount();
     if (unread === 0)
         return [];
-    const entries = readNotifications();
-    const latest = entries[0]; // newest-first
-    if (!latest)
-        return [];
-    const icon = latest.severity === "error" ? "✗" : latest.severity === "warning" ? "⚠" : "●";
-    const badge = `${unread} unread`;
-    const msgMax = 80;
-    const truncated = latest.message.length > msgMax
-        ? latest.message.slice(0, msgMax - 1) + "…"
-        : latest.message;
-    return [`  ${icon} [${badge}]  ${truncated}  (${formatShortcut("Ctrl+Alt+N")} to view)`];
+    return [`  🔔 Notifications: ${unread} unread  (${formattedShortcutPair("notifications")})`];
 }
 // ─── Widget init ────────────────────────────────────────────────────────
 const REFRESH_INTERVAL_MS = 5_000;
@@ -39,6 +29,7 @@ export function initNotificationWidget(ctx) {
             cachedLines = undefined;
             _tui.requestRender();
         };
+        const unsubscribe = onNotificationStoreChange(refresh);
         const refreshTimer = setInterval(refresh, REFRESH_INTERVAL_MS);
         return {
             render(_width) {
@@ -50,6 +41,7 @@ export function initNotificationWidget(ctx) {
                 cachedLines = undefined;
             },
             dispose() {
+                unsubscribe();
                 clearInterval(refreshTimer);
             },
         };

package/dist/resources/extensions/gsd/parallel-monitor-overlay.js

@@ -2,7 +2,8 @@
  * GSD Parallel Monitor Overlay
  *
  * Full-screen TUI overlay showing real-time parallel worker progress.
- * Opened via `/gsd parallel watch` or Ctrl+Alt+P (⌃⌥P on macOS).
+ * Opened via `/gsd parallel watch`, Ctrl+Alt+P (⌃⌥P on macOS),
+ * or Ctrl+Shift+P fallback.
  * Reads the same data sources as `scripts/parallel-monitor.mjs` but
  * renders as a native pi-tui overlay with theme integration.
  */
@@ -11,6 +12,7 @@ import { join } from "node:path";
 import { spawnSync } from "node:child_process";
 import { matchesKey, Key } from "@gsd/pi-tui";
 import { formatDuration } from "../shared/mod.js";
+import { formattedShortcutPair } from "./shortcut-defs.js";
 // ─── Data Helpers ─────────────────────────────────────────────────────────
 function readJsonSafe(filePath) {
     try {
@@ -285,7 +287,10 @@ export class ParallelMonitorOverlay {
         }
     }
     handleInput(data) {
-        if (matchesKey(data, Key.escape) || data === "q") {
+        if (matchesKey(data, Key.escape) ||
+            matchesKey(data, Key.ctrlAlt("p")) ||
+            matchesKey(data, Key.ctrlShift("p")) ||
+            data === "q") {
             this.dispose();
             this.onClose();
             return;
@@ -403,7 +408,7 @@ export class ParallelMonitorOverlay {
             }
             lines.push(`  ${t.bold("Total: $" + this.workers.reduce((s, wk) => s + wk.cost, 0).toFixed(2))}`);
         }
-        lines.push(t.fg("muted", "  ESC/q to close  │  ↑↓ scroll"));
+        lines.push(t.fg("muted", `  ESC/q/${formattedShortcutPair("parallel")} close  │  ↑↓ scroll`));
         // Apply scroll — use terminal rows as height estimate
         const termHeight = process.stdout.rows || 40;
         const maxScroll = Math.max(0, lines.length - termHeight);

package/dist/resources/extensions/gsd/pre-execution-checks.js

@@ -229,6 +229,33 @@ function extractPathFromAnnotation(raw) {
     // Fall back to the original behavior for already-plain paths.
     return trimmed.replace(/`/g, "");
 }
+/**
+ * Planning units sometimes use task.inputs for prose like "Current enum shape"
+ * instead of concrete file paths. Those entries should not fail path checks.
+ * Keep validation for anything that still looks like a real file reference:
+ * explicit backticks, globs, separators, dot-paths, or single-token basenames
+ * like Dockerfile.
+ */
+function shouldValidateInputAsPath(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return false;
+    if (/^`+[^`]+`+/.test(trimmed)) {
+        return true;
+    }
+    const candidate = extractPathFromAnnotation(trimmed);
+    if (!candidate)
+        return false;
+    if (!/\s/.test(candidate)) {
+        return true;
+    }
+    return (candidate.startsWith("/") ||
+        candidate.startsWith("./") ||
+        candidate.startsWith("../") ||
+        candidate.startsWith("~/") ||
+        /[\\/]/.test(candidate) ||
+        /[*?[\]{}]/.test(candidate));
+}
 /**
  * Build a set of files that will be created by tasks up to (but not including) taskIndex.
  * All paths are normalized for consistent comparison.
@@ -262,6 +289,8 @@ export function checkFilePathConsistency(tasks, basePath) {
             // Skip empty strings
             if (!file.trim())
                 continue;
+            if (!shouldValidateInputAsPath(file))
+                continue;
             // Normalize path for consistent comparison
             const normalizedFile = normalizeFilePath(file);
             // Check if file exists on disk
@@ -289,7 +318,7 @@ export function checkFilePathConsistency(tasks, basePath) {
  *
  * All paths are normalized before comparison to ensure ./src/a.ts matches src/a.ts.
  */
-export function checkTaskOrdering(tasks, _basePath) {
+export function checkTaskOrdering(tasks, basePath) {
     const results = [];
     // Build map: normalized file → task index that creates it
     const fileCreators = new Map();
@@ -309,9 +338,13 @@ export function checkTaskOrdering(tasks, _basePath) {
         const task = tasks[i];
         const filesToCheck = [...task.inputs];
         for (const file of filesToCheck) {
+            if (!shouldValidateInputAsPath(file))
+                continue;
             const normalizedFile = normalizeFilePath(file);
             const creator = fileCreators.get(normalizedFile);
-            if (creator && creator.index > i) {
+            const absolutePath = resolve(basePath, normalizedFile);
+            const existsOnDisk = existsSync(absolutePath);
+            if (creator && creator.index > i && !existsOnDisk) {
                 // Task reads file that is created later — impossible ordering
                 results.push({
                     category: "file",

package/dist/resources/extensions/gsd/preferences-skills.js

@@ -9,7 +9,6 @@ import { homedir } from "node:os";
 import { isAbsolute, join } from "node:path";
 import { statSync } from "node:fs";
 import { validatePreferences } from "./preferences-validation.js";
-import { loadEffectiveGSDPreferences } from "./preferences.js";
 /**
  * Known skill directories, in priority order.
  * Searches both the skills.sh ecosystem directory (~/.agents/skills/) and
@@ -130,36 +129,5 @@ export function resolveAllSkillReferences(preferences, cwd) {
     }
     return { resolutions, warnings };
 }
-/**
- * Format a skill reference for the system prompt.
- * If resolved, shows the path so the agent knows exactly where to read.
- * If unresolved, marks it clearly.
- */
-export function formatSkillRef(ref, resolutions) {
-    const resolution = resolutions.get(ref);
-    if (!resolution || resolution.method === "unresolved") {
-        return `${ref} (⚠ not found — check skill name or path)`;
-    }
-    // For absolute paths where SKILL.md is just appended, don't clutter the output
-    if (resolution.method === "absolute-path" || resolution.method === "absolute-dir") {
-        return ref;
-    }
-    // For bare names resolved from skill directories, show the resolved path
-    return `${ref} → \`${resolution.resolvedPath}\``;
-}
-/**
- * Resolve the skill discovery mode from effective preferences.
- * Defaults to "suggest" -- skills are identified during research but not installed automatically.
- */
-export function resolveSkillDiscoveryMode() {
-    const prefs = loadEffectiveGSDPreferences();
-    return prefs?.preferences.skill_discovery ?? "suggest";
-}
-/**
- * Resolve the skill staleness threshold in days.
- * Returns 0 if disabled, default 60 if not configured.
- */
-export function resolveSkillStalenessDays() {
-    const prefs = loadEffectiveGSDPreferences();
-    return prefs?.preferences.skill_staleness_days ?? 60;
-}
+// resolveSkillDiscoveryMode and resolveSkillStalenessDays moved to
+// preferences.ts to break circular dependency (they need loadEffectiveGSDPreferences).

package/dist/resources/extensions/gsd/preferences-types.js

@@ -92,3 +92,18 @@ export const KNOWN_UNIT_TYPES = [
     "discuss-milestone", "discuss-slice", "worktree-merge",
 ];
 export const SKILL_ACTIONS = new Set(["use", "prefer", "avoid"]);
+/**
+ * Format a skill reference for the system prompt.
+ * If resolved, shows the path so the agent knows exactly where to read.
+ * If unresolved, marks it clearly.
+ */
+export function formatSkillRef(ref, resolutions) {
+    const resolution = resolutions.get(ref);
+    if (!resolution || resolution.method === "unresolved") {
+        return `${ref} (⚠ not found — check skill name or path)`;
+    }
+    if (resolution.method === "absolute-path" || resolution.method === "absolute-dir") {
+        return ref;
+    }
+    return `${ref} → \`${resolution.resolvedPath}\``;
+}

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

@@ -17,13 +17,23 @@ import { parse as parseYaml } from "yaml";
 import { normalizeStringArray } from "../shared/format-utils.js";
 import { logWarning } from "./workflow-logger.js";
 import { resolveProfileDefaults as _resolveProfileDefaults } from "./preferences-models.js";
-import { KNOWN_PREFERENCE_KEYS, MODE_DEFAULTS, } from "./preferences-types.js";
+import { KNOWN_PREFERENCE_KEYS, MODE_DEFAULTS, formatSkillRef, } from "./preferences-types.js";
 import { validatePreferences } from "./preferences-validation.js";
-import { formatSkillRef } from "./preferences-skills.js";
 // ─── Re-exports: validation ─────────────────────────────────────────────────
 export { validatePreferences } from "./preferences-validation.js";
 // ─── Re-exports: skills ─────────────────────────────────────────────────────
-export { resolveAllSkillReferences, resolveSkillDiscoveryMode, resolveSkillStalenessDays, } from "./preferences-skills.js";
+export { resolveAllSkillReferences } from "./preferences-skills.js";
+// These lived in preferences-skills.ts but imported loadEffectiveGSDPreferences
+// back from this file, creating a circular dependency. Moved here since they
+// are trivial wrappers over loadEffectiveGSDPreferences.
+export function resolveSkillDiscoveryMode() {
+    const prefs = loadEffectiveGSDPreferences();
+    return prefs?.preferences.skill_discovery ?? "suggest";
+}
+export function resolveSkillStalenessDays() {
+    const prefs = loadEffectiveGSDPreferences();
+    return prefs?.preferences.skill_staleness_days ?? 60;
+}
 // ─── Re-exports: models ─────────────────────────────────────────────────────
 export { resolveModelForUnit, resolveModelWithFallbacksForUnit, getNextFallbackModel, isTransientNetworkError, validateModelId, updatePreferencesModels, resolveDynamicRoutingConfig, resolveAutoSupervisorConfig, resolveProfileDefaults, resolveEffectiveProfile, resolveInlineLevel, resolveContextSelection, resolveSearchProviderFromPreferences, } from "./preferences-models.js";
 // ─── Path Constants & Getters ───────────────────────────────────────────────
@@ -304,6 +314,9 @@ function mergePreferences(base, override) {
         github: (base.github || override.github)
             ? { ...(base.github ?? {}), ...(override.github ?? {}) }
             : undefined,
+        experimental: (base.experimental || override.experimental)
+            ? { ...(base.experimental ?? {}), ...(override.experimental ?? {}) }
+            : undefined,
         service_tier: override.service_tier ?? base.service_tier,
         forensics_dedup: override.forensics_dedup ?? base.forensics_dedup,
         show_token_cost: override.show_token_cost ?? base.show_token_cost,

package/dist/resources/extensions/gsd/prompt-loader.js

@@ -132,10 +132,13 @@ export function loadPrompt(name, vars = {}) {
         }
     }
     for (const [key, value] of Object.entries(effectiveVars)) {
+        const safeValue = key === "workingDirectory" && typeof value === "string"
+            ? value.replaceAll("\\", "/")
+            : value;
         // Use split/join instead of replaceAll to avoid JavaScript's special
         // replacement patterns ($', $`, $&) being interpreted in the value.
         // See: https://github.com/gsd-build/gsd-2/issues/2968
-        content = content.split(`{{${key}}}`).join(value);
+        content = content.split(`{{${key}}}`).join(safeValue);
     }
     return content.trim();
 }