gsd-pi 2.81.0 → 2.82.0-dev.2841a1e44

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

@@ -1,7 +1,7 @@
-// GSD Extension — /gsd notifications Command Handler
-// View, filter, and clear the persistent notification history.
+// Project/App: GSD-2
+// File Purpose: Handles /gsd notifications commands and opens the notification history overlay.
 import { readNotifications, clearNotifications, getUnreadCount, suppressPersistence, unsuppressPersistence, } from "../../notification-store.js";
-import { GSDNotificationOverlay } from "../../notification-overlay.js";
+import { GSDNotificationOverlay, notificationOverlayOptions } from "../../notification-overlay.js";
 const MAX_INLINE_ENTRIES = 40;
 function severityIcon(severity) {
     switch (severity) {
@@ -79,13 +79,7 @@ export async function handleNotificationsCommand(args, ctx, pi) {
             try {
                 const result = await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done(true)), {
                     overlay: true,
-                    overlayOptions: {
-                        width: "80%",
-                        minWidth: 60,
-                        maxHeight: "88%",
-                        anchor: "center",
-                        backdrop: true,
-                    },
+                    overlayOptions: notificationOverlayOptions(),
                 });
                 if (result !== undefined) {
                     return true;

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

@@ -2,6 +2,7 @@ import { getOrchestratorState, getWorkerStatuses, isParallelActive, pauseWorker,
 import { formatEligibilityReport } from "../../parallel-eligibility.js";
 import { formatMergeResults, mergeAllCompleted, mergeCompletedMilestone } from "../../parallel-merge.js";
 import { loadEffectiveGSDPreferences, resolveParallelConfig } from "../../preferences.js";
+import { reconcileBeforeSpawn } from "../../state-reconciliation.js";
 import { projectRoot } from "../context.js";
 function emitParallelMessage(pi, content) {
     pi.sendMessage({ customType: "gsd-parallel", content, display: true });
@@ -26,6 +27,14 @@ export async function handleParallelCommand(trimmed, _ctx, pi) {
             emitParallelMessage(pi, `${report}\n\nNo milestones are eligible for parallel execution.`);
             return true;
         }
+        // ADR-017 #5707: reconcile before spawning so workers don't independently
+        // race on the same drift. Failures abort the spawn with an actionable
+        // user-visible message.
+        const gate = await reconcileBeforeSpawn(root);
+        if (!gate.ok) {
+            emitParallelMessage(pi, `${report}\n\nParallel orchestration aborted before spawn — ${gate.reason}`);
+            return true;
+        }
         const result = await startParallel(root, candidates.eligible.map((candidate) => candidate.milestoneId), loaded?.preferences);
         const lines = ["Parallel orchestration started.", `Workers: ${result.started.join(", ")}`];
         if (result.errors.length > 0) {

package/dist/resources/extensions/gsd/commands-bootstrap.js

@@ -1,4 +1,5 @@
 import { importExtensionModule } from "@gsd/pi-coding-agent";
+import { VISUAL_BRIEF_MODES } from "../visual-brief/prompts.js";
 const TOP_LEVEL_SUBCOMMANDS = [
     { cmd: "help", desc: "Categorized command reference with descriptions" },
     { cmd: "next", desc: "Explicit step mode (same as /gsd)" },
@@ -7,6 +8,7 @@ const TOP_LEVEL_SUBCOMMANDS = [
     { cmd: "pause", desc: "Pause auto-mode (preserves state, /gsd auto to resume)" },
     { cmd: "status", desc: "Progress dashboard" },
     { cmd: "visualize", desc: "Open workflow visualizer" },
+    { cmd: "brief", desc: "Generate a visual HTML brief" },
     { cmd: "queue", desc: "Queue and reorder future milestones" },
     { cmd: "quick", desc: "Execute a quick task without full planning overhead" },
     { cmd: "discuss", desc: "Discuss architecture and decisions" },
@@ -75,6 +77,9 @@ function getGsdArgumentCompletions(prefix) {
             { cmd: "--dry-run", desc: "Preview next step without executing" },
         ], "next");
     }
+    if (parts[0] === "brief" && parts.length <= 2) {
+        return filterStartsWith(partial, VISUAL_BRIEF_MODES.map((mode) => ({ cmd: mode.mode, desc: mode.description })), "brief");
+    }
     if ((parts[0] === "new-project" || parts[0] === "new-milestone") && parts.length <= 2) {
         return filterStartsWith(partial, [
             { cmd: "--deep", desc: "Enable deep planning mode (staged project-level discovery)" },

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

@@ -303,8 +303,21 @@ export async function handleKnowledge(args, ctx) {
     const scope = state.activeMilestone?.id
         ? `${state.activeMilestone.id}${state.activeSlice ? `/${state.activeSlice.id}` : ""}`
         : "global";
-    await appendKnowledge(basePath, type, entryText, scope);
-    ctx.ui.notify(`Added ${type} to KNOWLEDGE.md: "${entryText}"`, "success");
+    // ADR-013 Stage 2c: Patterns and Lessons land in the memories table; the
+    // next session-start projection render emits them back into KNOWLEDGE.md.
+    // Rules stay file-canonical per ADR-013 line 39 — Rules are not migrated.
+    if (type === "rule") {
+        await appendKnowledge(basePath, type, entryText, scope);
+        ctx.ui.notify(`Added rule to KNOWLEDGE.md: "${entryText}"`, "success");
+        return;
+    }
+    const { captureKnowledgeEntry } = await import("./knowledge-capture.js");
+    const { id, written } = captureKnowledgeEntry(basePath, type, entryText, scope);
+    if (!written) {
+        ctx.ui.notify(`Could not persist ${type} — see logs for details.`, "error");
+        return;
+    }
+    ctx.ui.notify(`Captured ${type} ${id} to memories; KNOWLEDGE.md will render it on next session start.`, "success");
 }
 export async function handleRunHook(args, ctx, pi) {
     const parts = args.trim().split(/\s+/);

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

@@ -47,6 +47,118 @@ export function queryDecisions(opts) {
         return [];
     }
 }
+/**
+ * Internal: shared core for the two memory-sourced decision queries. Reads
+ * memory rows tagged with `sourceDecisionId` and reconstructs `Decision[]`
+ * from their `structured_fields` JSON.
+ *
+ * @param includeSuperseded — when false, drops rows whose
+ *   `structured_fields.superseded_by` is non-null. The supersedes-chain is
+ *   captured by the backfill (`memory-backfill.ts`) and kept in sync by
+ *   the backfill's drift auto-heal pass.
+ */
+function readDecisionsFromMemories(opts, includeSuperseded) {
+    if (!isDbAvailable())
+        return [];
+    const adapter = _getAdapter();
+    if (!adapter)
+        return [];
+    try {
+        const clauses = [
+            "category = 'architecture'",
+            "structured_fields LIKE '%\"sourceDecisionId\":\"%'",
+        ];
+        const params = {};
+        if (opts?.milestoneId) {
+            // when_context is a free-text JSON value; substring match preserves the
+            // semantics of `when_context LIKE '%milestoneId%'` on the legacy table.
+            clauses.push("json_extract(structured_fields, '$.when_context') LIKE :milestone_pattern");
+            params[':milestone_pattern'] = `%${opts.milestoneId}%`;
+        }
+        if (opts?.scope) {
+            // Stage 1 used `json_extract` in main (post-merge); preserve that
+            // style here. Exact equality on the JSON value avoids the prefix
+            // collision risk LIKE patterns had (scope=M001 vs scope=M001-S01).
+            clauses.push("json_extract(structured_fields, '$.scope') = :scope");
+            params[':scope'] = opts.scope;
+        }
+        const sql = `SELECT seq, structured_fields FROM memories WHERE ${clauses.join(' AND ')} ORDER BY seq`;
+        const rows = adapter.prepare(sql).all(params);
+        const decisions = [];
+        for (const row of rows) {
+            const seq = row['seq'];
+            const sfRaw = row['structured_fields'];
+            if (!sfRaw)
+                continue;
+            let sf;
+            try {
+                sf = JSON.parse(sfRaw);
+            }
+            catch {
+                continue;
+            }
+            const sourceId = sf['sourceDecisionId'];
+            if (typeof sourceId !== 'string' || sourceId.length === 0)
+                continue;
+            // Decision-level superseded status lives in structured_fields.superseded_by
+            // (written by mirrorDecisionToMemory / memory-backfill.ts). The top-level
+            // memories.superseded_by column is intentionally never set for decision mirrors,
+            // so active-only filtering must be done here in the JS loop.
+            const supersededBy = typeof sf['superseded_by'] === 'string' ? sf['superseded_by'] : null;
+            if (!includeSuperseded && supersededBy)
+                continue;
+            decisions.push({
+                seq,
+                id: sourceId,
+                when_context: typeof sf['when_context'] === 'string' ? sf['when_context'] : '',
+                scope: typeof sf['scope'] === 'string' ? sf['scope'] : '',
+                decision: typeof sf['decision'] === 'string' ? sf['decision'] : '',
+                choice: typeof sf['choice'] === 'string' ? sf['choice'] : '',
+                rationale: typeof sf['rationale'] === 'string' ? sf['rationale'] : '',
+                revisable: typeof sf['revisable'] === 'string' ? sf['revisable'] : '',
+                made_by: (typeof sf['made_by'] === 'string' ? sf['made_by'] : 'agent'),
+                superseded_by: supersededBy,
+            });
+        }
+        return decisions;
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * ADR-013 Phase 6 cutover (Stage 1): read **active** decisions from the
+ * `memories` table instead of the legacy `decisions` table. Returns the
+ * same `Decision[]` shape as `queryDecisions` so downstream formatters
+ * work unchanged.
+ *
+ * Filter semantics match `queryDecisions` exactly:
+ * - active only (skips rows where `structured_fields.superseded_by` is set)
+ * - `milestoneId`: substring match on `structured_fields.when_context`
+ * - `scope`: exact match on `structured_fields.scope`
+ *
+ * Used by the prompt-inline path (`inlineDecisionsFromDb` in
+ * `auto-prompts.ts`). For the projection regen (which renders superseded
+ * rows too), see `getAllDecisionsFromMemories`.
+ */
+export function queryDecisionsFromMemories(opts) {
+    return readDecisionsFromMemories(opts, /* includeSuperseded */ false);
+}
+/**
+ * ADR-013 Phase 6 cutover (Stage 2a): read **all** decisions (active +
+ * superseded) from the `memories` table. Used by the DECISIONS.md
+ * projection regen in `saveDecisionToDb`, which must render the full
+ * supersedes-chain for the canonical register format.
+ *
+ * Equivalent to `SELECT * FROM decisions ORDER BY seq` over the legacy
+ * table — but sourced from memories so the legacy table can be retired
+ * in Stage 3. Includes `superseded_by` reconstructed from
+ * `structured_fields.superseded_by` (populated by the backfill's drift
+ * auto-heal pass).
+ */
+export function getAllDecisionsFromMemories() {
+    return readDecisionsFromMemories(undefined, /* includeSuperseded */ true);
+}
 /**
  * Query active (non-superseded) requirements with optional filters.
  * - milestoneId: combined with sliceId for precise filtering (e.g. %M005/S01%)

package/dist/resources/extensions/gsd/db-writer.js

@@ -210,16 +210,62 @@ export async function nextDecisionId() {
         return 'D001';
     }
 }
-/** Synchronous variant for use inside db.transaction(). */
-function nextDecisionIdSync(adapter) {
+/**
+ * ADR-013 Stage 3: compute the next `D###` identifier across both the legacy
+ * `decisions` table AND the `memories.structured_fields.sourceDecisionId`
+ * surface. Returns the max numeric suffix from either side + 1, three-digit
+ * padded.
+ *
+ * Used by `saveDecisionToDb` once writes to the `decisions` table stop —
+ * new decisions live only in memories, but historical IDs sit in both
+ * places during the cutover bake. The cross-surface max keeps IDs
+ * monotonic and avoids collisions on the next save.
+ */
+function nextDecisionIdAcrossSurfaces(adapter) {
     if (!adapter)
         return 'D001';
-    const row = adapter
-        .prepare('SELECT MAX(CAST(SUBSTR(id, 2) AS INTEGER)) as max_num FROM decisions')
-        .get();
-    const maxNum = row ? row['max_num'] : null;
-    if (maxNum == null || isNaN(maxNum))
-        return 'D001';
+    let maxNum = 0;
+    // Legacy table — best-effort.
+    try {
+        const row = adapter
+            .prepare('SELECT MAX(CAST(SUBSTR(id, 2) AS INTEGER)) as max_num FROM decisions')
+            .get();
+        const candidate = row ? row['max_num'] : null;
+        if (typeof candidate === 'number' && Number.isFinite(candidate)) {
+            maxNum = Math.max(maxNum, candidate);
+        }
+    }
+    catch {
+        // fall through to memory-only
+    }
+    // Memory surface: scan structuredFields.sourceDecisionId for D### values.
+    // SQLite LIKE on the JSON-stringified field is sufficient — rows tagged
+    // with sourceDecisionId are bounded by the decisions count.
+    try {
+        const rows = adapter
+            .prepare("SELECT structured_fields FROM memories WHERE structured_fields LIKE '%\"sourceDecisionId\":\"D%'")
+            .all();
+        for (const row of rows) {
+            if (!row.structured_fields)
+                continue;
+            let sf;
+            try {
+                sf = JSON.parse(row.structured_fields);
+            }
+            catch {
+                continue;
+            }
+            const sourceId = sf['sourceDecisionId'];
+            if (typeof sourceId !== 'string' || !sourceId.startsWith('D'))
+                continue;
+            const num = parseInt(sourceId.slice(1), 10);
+            if (Number.isFinite(num) && num > maxNum)
+                maxNum = num;
+        }
+    }
+    catch {
+        // best-effort
+    }
     const next = maxNum + 1;
     return `D${String(next).padStart(3, '0')}`;
 }
@@ -376,38 +422,55 @@ export async function saveDecisionToDb(fields, basePath) {
     try {
         const db = await import('./gsd-db.js');
         const adapter = db._getAdapter();
-        const id = db.transaction(() => {
-            const nextId = nextDecisionIdSync(adapter);
-            db.upsertDecision({
-                id: nextId,
-                when_context: fields.when_context ?? '',
-                scope: fields.scope,
-                decision: fields.decision,
-                choice: fields.choice,
-                rationale: fields.rationale,
-                revisable: fields.revisable ?? 'Yes',
-                made_by: fields.made_by ?? 'agent',
-                source: fields.source ?? 'discussion',
-                superseded_by: null,
+        const normalized = {
+            ...fields,
+            when_context: fields.when_context ?? '',
+            revisable: fields.revisable ?? 'Yes',
+            made_by: fields.made_by ?? 'agent',
+            source: fields.source ?? 'discussion',
+        };
+        // ADR-013 Stage 3 (destructive): writes to the `decisions` table stop
+        // here. New decisions live only in the `memories` table; the projection
+        // regen below sources from memories (Stage 2a). The decisions table
+        // remains for backwards-compat reads (queryDecisions, md-importer,
+        // commands-inspect, workflow-manifest) until #5756 drops it.
+        //
+        // Reversal: a code revert of this change restores the upsertDecision
+        // call. Memory rows written between merge and revert stay durable; the
+        // legacy table simply doesn't grow during the cutover window.
+        const id = nextDecisionIdAcrossSurfaces(adapter);
+        // The mirror-to-memories write is what persists the new decision. Must
+        // run before the projection regen — the regen sources from memories
+        // (Stage 2a) and would otherwise miss the just-saved decision. Pass
+        // the normalized field set so defaults (revisable, made_by, source)
+        // are recorded on the memory row.
+        await mirrorDecisionToMemory(id, normalized);
+        // Fetch all decisions (including superseded for the full register).
+        // ADR-013 Stage 2a: source from the `memories` table. The Phase 5
+        // dual-write keeps memories in sync with each decision save; the backfill
+        // (memory-backfill.ts) absorbs the historical chain and drift-heals
+        // superseded_by on every session start.
+        const { getAllDecisionsFromMemories } = await import('./context-store.js');
+        let allDecisions = getAllDecisionsFromMemories();
+        if (!allDecisions.some(d => d.id === id)) {
+            logWarning('projection', 'just-saved decision missing from memories after mirror; injecting fallback for projection', {
+                fn: 'saveDecisionToDb',
+                decisionId: id,
             });
-            return nextId;
-        });
-        // Fetch all decisions (including superseded for the full register)
-        let allDecisions = [];
-        if (adapter) {
-            const rows = adapter.prepare('SELECT * FROM decisions ORDER BY seq').all();
-            allDecisions = rows.map(row => ({
-                seq: row['seq'],
-                id: row['id'],
-                when_context: row['when_context'],
-                scope: row['scope'],
-                decision: row['decision'],
-                choice: row['choice'],
-                rationale: row['rationale'],
-                revisable: row['revisable'],
-                made_by: row['made_by'] ?? 'agent',
-                superseded_by: row['superseded_by'] ?? null,
-            }));
+            const nextSeq = allDecisions.reduce((max, d) => Math.max(max, d.seq ?? 0), 0) + 1;
+            const fallback = {
+                seq: nextSeq,
+                id,
+                when_context: normalized.when_context,
+                scope: normalized.scope,
+                decision: normalized.decision,
+                choice: normalized.choice,
+                rationale: normalized.rationale,
+                revisable: normalized.revisable,
+                made_by: normalized.made_by,
+                superseded_by: null,
+            };
+            allDecisions = [...allDecisions, fallback];
         }
         const filePath = resolveGsdRootFile(basePath, 'DECISIONS');
         // Check if existing DECISIONS.md has freeform (non-table) content.
@@ -460,51 +523,6 @@ export async function saveDecisionToDb(fields, basePath) {
         invalidateStateCache();
         clearPathCache();
         clearParseCache();
-        // ADR-013 dual-write: keep the memory store in sync with every decision
-        // persisted via the legacy gsd_save_decision path. Without this, prompts
-        // that still call gsd_save_decision (discuss.md, plan-milestone.md,
-        // plan-slice.md, et al.) would create decisions rows invisible to
-        // memory_query and loadMemoryBlock.
-        // Best-effort — never throw, never roll back the decision on failure.
-        try {
-            const { createMemory } = await import('./memory-store.js');
-            const decisionText = (fields.decision ?? '').trim();
-            const choiceText = (fields.choice ?? '').trim();
-            const rationaleText = (fields.rationale ?? '').trim();
-            const contentParts = [];
-            if (decisionText)
-                contentParts.push(decisionText);
-            if (choiceText)
-                contentParts.push(`Chose: ${choiceText}.`);
-            if (rationaleText)
-                contentParts.push(`Rationale: ${rationaleText}.`);
-            const content = contentParts.join(' ').slice(0, 600);
-            if (content) {
-                createMemory({
-                    category: 'architecture',
-                    content,
-                    scope: fields.scope || 'project',
-                    confidence: 0.85,
-                    structuredFields: {
-                        sourceDecisionId: id,
-                        when_context: fields.when_context ?? '',
-                        scope: fields.scope,
-                        decision: fields.decision,
-                        choice: fields.choice,
-                        rationale: fields.rationale,
-                        made_by: fields.made_by ?? 'agent',
-                        revisable: fields.revisable ?? '',
-                    },
-                });
-            }
-        }
-        catch (mirrorErr) {
-            logError('manifest', 'memory-store mirror write failed (non-fatal)', {
-                fn: 'saveDecisionToDb',
-                decisionId: id,
-                error: String(mirrorErr.message),
-            });
-        }
         return { id };
     }
     catch (err) {
@@ -515,6 +533,54 @@ export async function saveDecisionToDb(fields, basePath) {
         release();
     }
 }
+/**
+ * ADR-013 dual-write — mirror a freshly-saved decision into the `memories`
+ * table so the memory store remains the single source of truth for the
+ * DECISIONS.md projection (Stage 2a) and for prompt-inline reads (Stage 1).
+ *
+ * Best-effort mirror: logs failures without throwing to avoid blocking saves.
+ * Caller invokes this AFTER the decisions-table write completes and
+ * BEFORE the projection regen — the regen sources from memories and would
+ * otherwise miss the just-saved decision.
+ */
+async function mirrorDecisionToMemory(id, normalizedFields) {
+    try {
+        const { createMemory } = await import('./memory-store.js');
+        const { synthesizeDecisionMemoryContent } = await import('./memory-backfill.js');
+        const content = synthesizeDecisionMemoryContent(normalizedFields);
+        if (!content)
+            return false;
+        createMemory({
+            category: 'architecture',
+            content,
+            scope: normalizedFields.scope || 'project',
+            confidence: 0.85,
+            structuredFields: {
+                sourceDecisionId: id,
+                when_context: normalizedFields.when_context,
+                scope: normalizedFields.scope,
+                decision: normalizedFields.decision,
+                choice: normalizedFields.choice,
+                rationale: normalizedFields.rationale,
+                made_by: normalizedFields.made_by,
+                revisable: normalizedFields.revisable,
+                // New decisions are always written as active; md-importer can later
+                // set superseded_by on the source decision row, and the backfill's
+                // drift auto-heal pass propagates that update to this memory.
+                superseded_by: null,
+            },
+        });
+        return true;
+    }
+    catch (mirrorErr) {
+        logError('manifest', 'memory-store mirror write failed', {
+            fn: 'saveDecisionToDb',
+            decisionId: id,
+            error: String(mirrorErr.message),
+        });
+        return false;
+    }
+}
 /**
  * Extract a milestone/slice reference from a deferral decision.
  *

package/dist/resources/extensions/gsd/docs/preferences-reference.md

@@ -100,7 +100,7 @@ Setting `prefer_skills: []` does **not** disable skill discovery — it just mea
 
 - `skill_rules`: situational rules with a human-readable `when` trigger and one or more of `use`, `prefer`, or `avoid`.
 
-- `custom_instructions`: extra durable instructions related to skill use. For operational project knowledge (recurring rules, gotchas, patterns), use `.gsd/KNOWLEDGE.md` instead — it's injected into every agent prompt automatically and agents can append to it during execution.
+- `custom_instructions`: extra durable instructions related to skill use. For operational project knowledge, use `.gsd/KNOWLEDGE.md` instead. Rules are file-canonical; patterns and lessons are persisted to the `memories` table and projected back into `KNOWLEDGE.md` on the next session start.
 
 - `language`: preferred response language for all GSD interactions. Accepts any language name or code — `"Chinese"`, `"zh"`, `"German"`, `"de"`, `"日本語"`, etc. When set, GSD injects "Always respond in \<language\>" into every agent's system prompt, including after `/clear`. Quickest way to set it: `/gsd language <name>`. To clear: `/gsd language off`.
 

package/dist/resources/extensions/gsd/doctor-git-checks.js

@@ -1,3 +1,5 @@
+// GSD-2 doctor git health checks
+import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync, realpathSync, rmSync, statSync } from "node:fs";
 import { join, sep } from "node:path";
 import { loadFile } from "./files.js";
@@ -48,6 +50,23 @@ function isSameOrNestedPath(candidate, container) {
     return normalizedCandidate === normalizedContainer ||
         normalizedCandidate.startsWith(`${normalizedContainer}/`);
 }
+function getSnapshotDiffCheckFailure(basePath) {
+    const failures = [];
+    for (const args of [["--cached"], []]) {
+        const result = spawnSync("git", ["diff", "--check", ...args], {
+            cwd: basePath,
+            encoding: "utf-8",
+        });
+        if (result.status === 0)
+            continue;
+        const output = [result.stdout, result.stderr, result.error?.message]
+            .filter(Boolean)
+            .join("\n")
+            .trim();
+        failures.push(output || `git diff --check ${args.join(" ")} failed`);
+    }
+    return failures.length > 0 ? failures.join("\n") : null;
+}
 async function isCompletedMilestoneTerminal(basePath, milestoneId) {
     const summaryPath = resolveMilestoneFile(basePath, milestoneId, "SUMMARY");
     if (!summaryPath)
@@ -401,16 +420,32 @@ export async function checkGitHealth(basePath, issues, fixesApplied, shouldFix,
                         message: `Uncommitted changes detected with no commit in ${mins} minute${mins === 1 ? "" : "s"} (threshold: ${thresholdMinutes}m). Snapshotting tracked files.`,
                         fixable: true,
                     });
+                    const diffCheckFailure = getSnapshotDiffCheckFailure(basePath);
+                    if (diffCheckFailure) {
+                        issues.push({
+                            severity: "error",
+                            code: "conflict_markers_in_tracked_files",
+                            scope: "project",
+                            unitId: "project",
+                            message: `Cannot create gsd snapshot: tracked changes contain conflict markers or whitespace errors. Resolve conflicts manually before auto-mode can proceed.\n${diffCheckFailure}`,
+                            fixable: false,
+                        });
+                    }
                     if (shouldFix("stale_uncommitted_changes")) {
                         try {
-                            nativeAddTracked(basePath);
-                            const commitMsg = `gsd snapshot: uncommitted changes after ${mins}m inactivity`;
-                            const result = nativeCommit(basePath, commitMsg);
-                            if (result) {
-                                fixesApplied.push(`created gsd snapshot after ${mins}m of uncommitted changes`);
+                            if (diffCheckFailure) {
+                                fixesApplied.push("gsd snapshot skipped - conflict markers detected in tracked files");
                             }
                             else {
-                                fixesApplied.push("gsd snapshot skipped — nothing to commit after staging tracked files");
+                                nativeAddTracked(basePath);
+                                const commitMsg = `gsd snapshot: uncommitted changes after ${mins}m inactivity`;
+                                const result = nativeCommit(basePath, commitMsg);
+                                if (result) {
+                                    fixesApplied.push(`created gsd snapshot after ${mins}m of uncommitted changes`);
+                                }
+                                else {
+                                    fixesApplied.push("gsd snapshot skipped — nothing to commit after staging tracked files");
+                                }
                             }
                         }
                         catch {

package/dist/resources/extensions/gsd/git-service.js

@@ -18,7 +18,7 @@ import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { logWarning } from "./workflow-logger.js";
 import { detectWorktreeName, } from "./worktree.js";
 import { SLICE_BRANCH_RE, QUICK_BRANCH_RE, WORKFLOW_BRANCH_RE } from "./branch-patterns.js";
-import { nativeGetCurrentBranch, nativeDetectMainBranch, nativeBranchExists, nativeHasChanges, nativeAddAllWithExclusions, nativeHasStagedChanges, nativeCommit, nativeRmCached, nativeUpdateRef, nativeAddPaths, nativeResetSoft, nativeCommitSubject, _resetHasChangesCache, } from "./native-git-bridge.js";
+import { nativeGetCurrentBranch, nativeDetectMainBranch, nativeBranchExists, nativeHasChanges, nativeAddAllWithExclusions, nativeHasStagedChanges, nativeCommit, nativeRmCached, nativeUpdateRef, nativeAddPaths, nativeResetSoft, nativeCommitSubject, nativeIsIgnored, _resetHasChangesCache, } from "./native-git-bridge.js";
 import { GSDError, GSD_MERGE_CONFLICT, GSD_GIT_ERROR } from "./errors.js";
 import { getErrorMessage } from "./error-utils.js";
 import { isInfrastructureError } from "./auto/infra-errors.js";
@@ -570,6 +570,7 @@ export class GitServiceImpl {
         const normalized = keyFiles
             .map(file => normalizeRepoRelativePath(this.basePath, file))
             .filter((file) => file !== null)
+            .filter(file => !nativeIsIgnored(this.basePath, file))
             .filter(file => !isExcludedScopedPath(file, allExclusions));
         // Drop entries that don't exist on disk. The LLM occasionally lists files
         // it intended to write but didn't (or names them with wrong casing/path).

package/dist/resources/extensions/gsd/gsd-db.js

@@ -977,32 +977,16 @@ export function setSliceSketchFlag(milestoneId, sliceId, isSketch) {
     currentDb.prepare(`UPDATE slices SET is_sketch = :is_sketch WHERE milestone_id = :mid AND id = :sid`).run({ ":is_sketch": isSketch ? 1 : 0, ":mid": milestoneId, ":sid": sliceId });
 }
 /**
- * ADR-011 auto-heal: reconcile stale is_sketch=1 rows whose PLAN already exists.
- *
- * Callers pass a predicate that resolves whether a plan file exists for a slice.
- * The predicate MUST use the canonical path resolver (`resolveSliceFile`, etc.)
- * to keep path logic in one place — do not hand-roll the path inside the callback.
- *
- * Recovers from two scenarios:
- *   1. Crash between `gsd_plan_slice` write and the sketch flag flip.
- *   2. Flag-OFF downgrade path: when `progressive_planning` is off, the dispatch
- *      rule routes sketch slices to plan-slice, which writes PLAN.md but leaves
- *      `is_sketch=1` — the next state derivation auto-heals it to 0 here.
- *
- * Not aggressive in practice: PLAN.md is only written via the DB-backed
- * `gsd_plan_slice` tool (which also inserts tasks), so a "stale PLAN.md with
- * is_sketch=1" is extremely unlikely to indicate anything other than the two
- * recovery scenarios above.
+ * ADR-017 raw primitive: returns slice IDs in a milestone whose is_sketch flag
+ * is still 1. The stale-sketch-flag drift handler at
+ * `state-reconciliation/drift/sketch-flag.ts` composes this with PLAN.md
+ * existence checks to detect drift, then writes via `setSliceSketchFlag`.
  */
-export function autoHealSketchFlags(milestoneId, hasPlanFile) {
+export function getSketchedSliceIds(milestoneId) {
     if (!currentDb)
-        return;
+        return [];
     const rows = currentDb.prepare(`SELECT id FROM slices WHERE milestone_id = :mid AND is_sketch = 1`).all({ ":mid": milestoneId });
-    for (const row of rows) {
-        if (hasPlanFile(row.id)) {
-            setSliceSketchFlag(milestoneId, row.id, false);
-        }
-    }
+    return rows.map((r) => r.id);
 }
 export function upsertSlicePlanning(milestoneId, sliceId, planning) {
     if (!currentDb)

package/dist/resources/extensions/gsd/health-widget-core.js

@@ -51,7 +51,7 @@ export function buildHealthLines(data, width) {
         return ["  GSD  No project loaded — run /gsd to start"];
     }
     if (data.projectState === "initialized") {
-        return ["  GSD  Project initialized — run /gsd to continue setup"];
+        return ["  GSD  Project Initialized"];
     }
     const leftParts = [];
     const totalIssues = data.environmentErrorCount + data.environmentWarningCount + (data.providerIssue ? 1 : 0);