@opengsd/gsd-pi 1.8.1 → 1.9.0-dev.97ef11e3

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

@@ -635,6 +635,7 @@ function mergePreferences(base, override) {
             : undefined,
         post_unit_hooks: mergePostUnitHooks(base.post_unit_hooks, override.post_unit_hooks),
         pre_dispatch_hooks: mergePreDispatchHooks(base.pre_dispatch_hooks, override.pre_dispatch_hooks),
+        planning_subagents: mergePlanningSubagents(base.planning_subagents, override.planning_subagents),
         dynamic_routing: (base.dynamic_routing || override.dynamic_routing)
             ? { ...(base.dynamic_routing ?? {}), ...(override.dynamic_routing ?? {}) }
             : undefined,
@@ -752,6 +753,22 @@ function mergePreDispatchHooks(base, override) {
     }
     return merged.length > 0 ? merged : undefined;
 }
+function mergePlanningSubagents(base, override) {
+    if (!base && !override)
+        return undefined;
+    const merged = {};
+    const unitTypes = new Set([
+        ...Object.keys(base ?? {}),
+        ...Object.keys(override ?? {}),
+    ]);
+    for (const unitType of unitTypes) {
+        const allowed = mergeStringLists(base?.[unitType]?.allowed, override?.[unitType]?.allowed);
+        if (allowed?.length) {
+            merged[unitType] = { allowed };
+        }
+    }
+    return Object.keys(merged).length > 0 ? merged : undefined;
+}
 // ─── System Prompt Rendering ──────────────────────────────────────────────────
 export function renderPreferencesForSystemPrompt(preferences, resolutions, options) {
     const validated = validatePreferences(preferences);

package/dist/resources/extensions/gsd/prompts/refine-slice.md

@@ -66,12 +66,12 @@ Then:
    **Web apps:** when inlined Web App UAT guidance is present, follow it for Playwright scaffolding and browser-capable verification commands.
 4. For non-trivial slices, plan observability / proof level / integration closure, threat surface, and requirement impact. Omit entirely for simple slices.
 5. Decompose the slice into tasks that fit one context window each. Every task passed to `gsd_plan_slice` must use the exact keys `taskId`, `title`, `description`, `estimate`, `files`, `verify`, `inputs`, `expectedOutput`, and optional `observabilityImpact`. Put Why / Do / Done-when detail in `description`. `files`, `inputs`, and `expectedOutput` must be JSON arrays of strings, even for one path (for example, `"expectedOutput": ["src/index.ts"]`, never `"expectedOutput": "src/index.ts"`). `expectedOutput` is path-only: list only files the task creates or overwrites, and use `[]` for pure verification tasks. Never list GSD planning artifacts — anything under `.gsd/`, `.planning/`, or `.audits/`, or artifact names like `M001-CONTEXT.md` / `S01-PLAN.md` — in `inputs`, `files`, or `expectedOutput`: their content is preloaded as context, and they are written by workflow tools, not by tasks.
-6. **Persist planning state through `gsd_plan_slice`.** Call it with the full payload. The tool writes to the DB and renders `{{outputPath}}` and `{{slicePath}}/tasks/T##-PLAN.md` automatically. Do NOT rely on direct `PLAN.md` writes.
+6. **Persist planning state through `gsd_plan_slice`.** Call it with the full payload. The tool writes to the DB and renders `{{outputPath}}` with embedded task planning automatically. Do NOT rely on direct `PLAN.md` writes.
 7. **Self-audit the plan.** If every task were completed exactly as written, the slice goal/demo should be true. Every must-have maps to a task. Inputs and Expected Output are backtick-wrapped file paths.
 8. If refinement produced structural decisions that diverge from the sketch, call `gsd_decision_save` for each; the tool persists the decision and regenerates `.gsd/DECISIONS.md`.
 9. {{commitInstruction}}
 
-The slice directory and tasks/ subdirectory already exist. Do NOT mkdir.
+The slice plan path already exists. Do NOT mkdir.
 
 **Autonomous execution:** Do not call `ask_user_questions` or `secure_env_collect`. Document assumptions in the plan.
 

package/dist/resources/extensions/gsd/prompts/validate-milestone.md

@@ -24,18 +24,18 @@ Roadmap, slice summaries, assessments, requirements, decisions, and project cont
 
 ### Step 1 - Dispatch Parallel Reviewers
 
-The Inlined Context above already preloads the evidence reviewers need — the roadmap, per-slice SUMMARY/ASSESSMENT excerpts, requirements, and verification classes. **Embed the relevant preloaded evidence directly into each reviewer's task prompt** so reviewers work from it instead of re-reading the same artifacts from disk. Each reviewer should read a full file only when its excerpt is missing, truncated, or internally inconsistent — never as a routine first step. This avoids three reviewers independently re-surveying artifacts the orchestrator already holds.
+The Inlined Context above already preloads the evidence reviewers need — the roadmap, per-slice SUMMARY/ASSESSMENT excerpts, requirements, and verification classes. **Embed the relevant preloaded evidence directly into each reviewer's task prompt** so reviewers work from it instead of re-reading the same artifacts from disk. Each reviewer should read a full file only when its excerpt is missing, truncated, or internally inconsistent — never as a routine first step. When a reviewer needs a full artifact, use only explicit file paths from the On-demand Validation Artifacts / On-demand Milestone Context blocks or discover files with `find .gsd -type f`; never pass a phase, slice, `tasks/`, or `slices/` directory to `read` or `readFileSync`. This avoids three reviewers independently re-surveying artifacts the orchestrator already holds.
 
 Call `subagent` with `tasks: [...]` containing ALL THREE reviewers simultaneously:
 
 **Reviewer A - Requirements Coverage**
-Prompt: "Review milestone {{milestoneId}} requirements coverage. Working directory: {{workingDirectory}}. Use the preloaded requirements and slice SUMMARY evidence embedded in this task — do not re-read them from disk. For each requirement, mark COVERED, PARTIAL, or MISSING against that evidence. Read a full SUMMARY under `.gsd/milestones/{{milestoneId}}/slices/` only if its preloaded excerpt is missing, truncated, or inconsistent. Output table: Requirement | Status | Evidence. End with one-line verdict: PASS if all covered, NEEDS-ATTENTION if partials exist, FAIL if any missing."
+Prompt: "Review milestone {{milestoneId}} requirements coverage. Working directory: {{workingDirectory}}. Use the preloaded requirements and slice SUMMARY evidence embedded in this task — do not re-read them from disk. For each requirement, mark COVERED, PARTIAL, or MISSING against that evidence. Read a full SUMMARY only from an explicit file path in the On-demand Validation Artifacts list, or discover candidates with `find .gsd -type f -name '*-SUMMARY.md'`; never read a directory path. Output table: Requirement | Status | Evidence. End with one-line verdict: PASS if all covered, NEEDS-ATTENTION if partials exist, FAIL if any missing."
 
 **Reviewer B - Cross-Slice Integration**
-Prompt: "Review milestone {{milestoneId}} cross-slice integration. Working directory: {{workingDirectory}}. Use the preloaded roadmap and slice SUMMARY evidence embedded in this task — do not re-read them from disk. Find the boundary map (produces/consumes contracts) in the roadmap. For each boundary, confirm producer SUMMARY produced the artifact and consumer SUMMARY consumed it. Read `{{roadmapPath}}` or a full SUMMARY only if the preloaded evidence is missing, truncated, or inconsistent. Output table: Boundary | Producer Summary | Consumer Summary | Status. End with one-line verdict: PASS if all boundaries honored, NEEDS-ATTENTION if any gaps."
+Prompt: "Review milestone {{milestoneId}} cross-slice integration. Working directory: {{workingDirectory}}. Use the preloaded roadmap and slice SUMMARY evidence embedded in this task — do not re-read them from disk. Find the boundary map (produces/consumes contracts) in the roadmap. For each boundary, confirm producer SUMMARY produced the artifact and consumer SUMMARY consumed it. Read `{{roadmapPath}}` or a full SUMMARY from the On-demand Validation Artifacts list only if the preloaded evidence is missing, truncated, or inconsistent; never read a directory path. Output table: Boundary | Producer Summary | Consumer Summary | Status. End with one-line verdict: PASS if all boundaries honored, NEEDS-ATTENTION if any gaps."
 
 **Reviewer C - Assessment & Acceptance Criteria**
-Prompt: "Review milestone {{milestoneId}} assessment evidence and acceptance criteria. Working directory: {{workingDirectory}}. Use the preloaded milestone context, slice SUMMARY, and ASSESSMENT evidence embedded in this task — do not re-read them from disk. Read `.gsd/milestones/{{milestoneId}}/{{milestoneId}}-CONTEXT.md`, a full SUMMARY, or a full ASSESSMENT only if the preloaded excerpt is missing, truncated, or inconsistent. UAT files are specs, not evidence. Verify each criterion maps to passing evidence. Then review the inlined `Verification Classes (from planning)` table. For every planned row in that table, output a `Verification Classes` table with columns `Class | Planned Check | Evidence | Verdict`. Preserve every planned non-empty class row; do not summarize, rename, combine, or omit planned classes. The first cell of each row must be exactly `Contract`, `Integration`, `Operational`, or `UAT` when that class is present in planning. If a planned class lacks evidence, still include its canonical row and mark the verdict NEEDS-ATTENTION or FAIL. If a planned browser/UAT class has no ASSESSMENT with browser/runtime actions and assertions, return NEEDS-ATTENTION. If no verification classes were planned, say that explicitly. Output sections `Acceptance Criteria` with checklist `[ ] Criterion | Evidence`, and `Verification Classes` with the table. End with one-line verdict: PASS if all criteria and classes are covered by evidence, NEEDS-ATTENTION if gaps exist."
+Prompt: "Review milestone {{milestoneId}} assessment evidence and acceptance criteria. Working directory: {{workingDirectory}}. Use the preloaded milestone context, slice SUMMARY, and ASSESSMENT evidence embedded in this task — do not re-read them from disk. Read the milestone context from the On-demand Milestone Context file path, and read full SUMMARY or ASSESSMENT files only from explicit paths in the On-demand Validation Artifacts list, if the preloaded excerpt is missing, truncated, or inconsistent. UAT files are specs, not evidence. Verify each criterion maps to passing evidence. Then review the inlined `Verification Classes (from planning)` table. For every planned row in that table, output a `Verification Classes` table with columns `Class | Planned Check | Evidence | Verdict`. Preserve every planned non-empty class row; do not summarize, rename, combine, or omit planned classes. The first cell of each row must be exactly `Contract`, `Integration`, `Operational`, or `UAT` when that class is present in planning. If a planned class lacks evidence, still include its canonical row and mark the verdict NEEDS-ATTENTION or FAIL. If a planned browser/UAT class has no ASSESSMENT with browser/runtime actions and assertions, return NEEDS-ATTENTION. If no verification classes were planned, say that explicitly. Output sections `Acceptance Criteria` with checklist `[ ] Criterion | Evidence`, and `Verification Classes` with the table. End with one-line verdict: PASS if all criteria and classes are covered by evidence, NEEDS-ATTENTION if gaps exist."
 
 ### Step 2 - Synthesize Findings
 
@@ -85,6 +85,6 @@ If verdict is `needs-remediation`:
 
 **You MUST call `gsd_validate_milestone` before finishing. Do not manually write `{{validationPath}}`.**
 
-**File system safety:** When scanning milestone directories, use `ls` or `find` first. Never pass a directory path such as `tasks/` or `slices/` directly to `read`; it only accepts files.
+**File system safety:** When scanning milestone directories, use `find .gsd -type f` first and read only files. In flat-phase projects, `.gsd/phases/<NN>-<slug>/` is a directory, not an artifact. Never pass a directory path such as a phase directory, `tasks/`, or `slices/` directly to `read`, `readFile`, or `readFileSync`.
 
 When done, say: "Milestone {{milestoneId}} validation complete — verdict: <verdict>." Say this exactly once — if you already said it in a prior message, do not repeat it.

package/dist/resources/extensions/gsd/provider-payload-policy.js

@@ -2,12 +2,14 @@
  * Provider Payload Policy - ordered shaping of provider request payloads.
  *
  * The order is intentional:
- * 1. observation budgeting masks old tool results in auto-mode,
- * 2. display truncation caps tool-result text for every mode,
- * 3. the protected Source Context Block is appended after truncation,
- * 4. supported models receive the configured service tier.
+ * 1. superseded GSD context injections (memory/guided/forensics) are removed,
+ *    keeping only the latest, for every mode,
+ * 2. observation budgeting masks old tool results in auto-mode,
+ * 3. display truncation caps tool-result text for every mode,
+ * 4. the protected Source Context Block is appended after truncation,
+ * 5. supported models receive the configured service tier.
  */
-import { createObservationMask, createResponsesInputObservationMask, truncateContextResultMessages, truncateResponsesInputResultItems, } from "./context-masker.js";
+import { createObservationMask, createResponsesInputObservationMask, filterSupersededContextInjections, filterSupersededResponsesContextInjections, truncateContextResultMessages, truncateResponsesInputResultItems, } from "./context-masker.js";
 import { getSourceObservationStore, isAutoActive } from "./auto-runtime-state.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { getEffectiveServiceTier, supportsServiceTier } from "./service-tier.js";
@@ -42,9 +44,18 @@ export function applyProviderPayloadPolicy({ payload, modelId, deps: overrides,
 }
 function applyContextManagement(payload, deps) {
     const config = deps.loadContextManagementConfig();
+    applyContextInjectionFilter(payload);
     applyObservationBudget(payload, config, deps.isAutoActive());
     applyDisplayTruncation(payload, config);
 }
+function applyContextInjectionFilter(payload) {
+    if (Array.isArray(payload.messages)) {
+        payload.messages = filterSupersededContextInjections(payload.messages);
+    }
+    if (Array.isArray(payload.input)) {
+        payload.input = filterSupersededResponsesContextInjections(payload.input);
+    }
+}
 function applyObservationBudget(payload, config, autoActive) {
     if (!autoActive || config?.observation_masking === false)
         return;

package/dist/resources/extensions/gsd/safety/destructive-guard.js

@@ -6,7 +6,7 @@
  * Copyright (c) 2026 Jeremy McSpadden <jeremy@fluxlabs.net>
  */
 const DESTRUCTIVE_PATTERNS = [
-    { pattern: /\brm\s+(-[^\s]*[rfRF][^\s]*\s+|.*\s+-[^\s]*[rfRF])/, label: "recursive delete" },
+    { pattern: /\brm\s+((?:-(?!-)[^\s]*[rR][^\s]*|--recursive)\s+|.*\s+(?:-(?!-)[^\s]*[rR][^\s]*|--recursive)(?:\s|$))/, label: "recursive delete" },
     { pattern: /\bgit\s+push\s+.*--force/, label: "force push" },
     { pattern: /\bgit\s+push\s+-f\b/, label: "force push" },
     { pattern: /\bgit\s+reset\s+--hard/, label: "hard reset" },

package/dist/resources/extensions/gsd/safety/evidence-collector.js

@@ -173,7 +173,7 @@ export function recordToolCall(toolCallId, toolName, input) {
             toolCallId,
             // gsd_exec / gsd_uat_exec carry the script body in `script` (or `code`);
             // bash-style tools use `command`/`cmd`; gsd_exec_search uses `query`.
-            command: String(input.command ?? input.script ?? input.cmd ?? input.code ?? input.query ?? ""),
+            command: formatExecutionEvidenceCommand(toolName, input),
             exitCode: -1,
             outputSnippet: "",
             timestamp: Date.now(),
@@ -196,6 +196,31 @@ export function recordToolCall(toolCallId, toolName, input) {
         });
     }
 }
+function pickString(input, ...keys) {
+    for (const key of keys) {
+        const value = input[key];
+        if (typeof value === "string" && value.trim().length > 0)
+            return value.trim();
+    }
+    return "";
+}
+function canonicalExecutionToolLabel(toolName) {
+    const normalized = toolName.trim().toLowerCase();
+    const mcpMatch = normalized.match(/^mcp__.+__(gsd_(?:uat_)?exec(?:_search)?)$/);
+    return mcpMatch?.[1] ?? normalized;
+}
+function formatExecutionEvidenceCommand(toolName, input) {
+    const body = pickString(input, "command", "script", "cmd", "code", "query");
+    const tool = canonicalExecutionToolLabel(toolName);
+    const purpose = pickString(input, "purpose");
+    const runtime = pickString(input, "runtime").toLowerCase();
+    const label = purpose && (tool === "gsd_exec" || tool === "gsd_uat_exec")
+        ? `${tool}${runtime ? ` ${runtime}` : ""}: ${purpose}`
+        : "";
+    if (label && body)
+        return `${label}\n${body}`;
+    return body || label;
+}
 /**
  * Record a tool execution result. Matches the entry by toolCallId (assigned
  * at dispatch time) and fills in exit code + output. Prior versions matched

package/dist/resources/extensions/gsd/safety/evidence-cross-ref.js

@@ -118,16 +118,25 @@ function latestClaimBatch(claimedEvidence) {
  */
 function findMatches(claimedCommand, bashCalls) {
     const normalized = claimedCommand.trim();
-    // Exact matches first
-    const exact = bashCalls.filter(b => b.command.trim() === normalized);
+    const exact = bashCalls.filter((b) => b.command.trim() === normalized);
+    // When an exact run exists, also consider wrapper-equivalent reruns (e.g.
+    // `cd ... && <command>`) so a newer pass is not shadowed by a stale exact
+    // failure. Do not merge arbitrary containing scripts: their exit code may
+    // belong to later work, not to the claimed verification command.
+    const scriptWrapped = bashCalls.filter((b) => {
+        const command = b.command.trim();
+        if (command.length === 0 || command === normalized)
+            return false;
+        return isWrapperEquivalentCommand(command, normalized);
+    });
     if (exact.length > 0)
-        return exact;
+        return [...exact, ...scriptWrapped];
     // Substring match: claimed is contained in actual or actual in claimed.
     // A claimed verification command typically appears verbatim inside a
     // larger gsd_exec script body (cd prefix, multi-line scripts), so
     // script-containing-claim is the common direction. Blank-command entries
     // must be excluded — `"x".includes("")` is true, so they'd match anything.
-    const substring = bashCalls.filter(b => b.command.trim().length > 0 &&
+    const substring = bashCalls.filter((b) => b.command.trim().length > 0 &&
         (b.command.includes(normalized) || normalized.includes(b.command)));
     if (substring.length > 0)
         return substring;
@@ -150,5 +159,21 @@ function findMatches(claimedCommand, bashCalls) {
         .map((match) => match.call);
 }
 function latestMatch(matches) {
-    return matches.reduce((latest, match) => (match.timestamp > latest.timestamp ? match : latest));
+    return matches.reduce((latest, match) => (match.timestamp >= latest.timestamp ? match : latest));
+}
+/** True when `actual` is the same command with only shell wrapper noise. */
+function isWrapperEquivalentCommand(actual, claimed) {
+    const claimIndex = actual.lastIndexOf(claimed);
+    if (claimIndex < 0)
+        return false;
+    const prefix = actual.slice(0, claimIndex).trim();
+    if (prefix.length > 0 && !/^cd\s+.+\s+&&$/.test(prefix))
+        return false;
+    const suffix = actual.slice(claimIndex + claimed.length).trim();
+    return suffix.length === 0 || isBenignWrapperSuffix(suffix);
+}
+function isBenignWrapperSuffix(suffix) {
+    if (/^;\s*echo\s+["']?[A-Z_]*EXIT=\$\?["']?$/.test(suffix))
+        return true;
+    return /^(?:(?:\d?>>?|&>)\s*\S+|\d?>&\d)(?:\s+(?:(?:\d?>>?|&>)\s*\S+|\d?>&\d))*$/.test(suffix);
 }

package/dist/resources/extensions/gsd/skill-activation.js

@@ -104,11 +104,24 @@ function resolvePreferredSkillNames(prefs, visibleSkills, contextTokens, base) {
 /** Skill names must be lowercase alphanumeric with hyphens — reject anything else
  *  to prevent prompt injection via crafted directory names. */
 const SAFE_SKILL_NAME = /^[a-z0-9][a-z0-9-]*$/;
-function formatSkillActivationBlock(skillNames) {
+function escapeXml(str) {
+    return str
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;")
+        .replace(/'/g, "&apos;");
+}
+function formatSkillActivationBlock(skillNames, skillPaths) {
     const safe = skillNames.filter(name => SAFE_SKILL_NAME.test(name));
     if (safe.length === 0)
         return "";
-    const reads = safe.map(name => `Read the installed '${name}' skill file from <available_skills>`).join(". ");
+    const reads = safe.map(name => {
+        const path = skillPaths.get(name);
+        if (path)
+            return `Read the skill file at \`${escapeXml(path)}\``;
+        return `Find '${name}' in <available_skills>, copy its <location> value, and pass that exact path to read`;
+    }).join(". ");
     return `<skill_activation>${reads}.</skill_activation>`;
 }
 /**
@@ -149,6 +162,7 @@ export function buildSkillActivationBlock(params) {
     const visibleSkills = loaded;
     const manifestScopedSkills = filterSkillsByManifest(visibleSkills, params.unitType);
     const installedNames = new Set(visibleSkills.map(skill => normalizeSkillReference(skill.name)));
+    const installedSkillPaths = new Map(visibleSkills.map(skill => [normalizeSkillReference(skill.name), skill.filePath]));
     warnIfManifestHasMissingSkills(params.unitType, installedNames);
     const avoided = new Set(resolvePreferenceSkillNames(prefs?.avoid_skills ?? [], params.base));
     const matched = new Set();
@@ -196,7 +210,7 @@ export function buildSkillActivationBlock(params) {
     const ordered = [...matched]
         .filter(name => installedNames.has(name) && !avoided.has(name))
         .sort();
-    const activationBlock = formatSkillActivationBlock(ordered);
+    const activationBlock = formatSkillActivationBlock(ordered, installedSkillPaths);
     // Omit recommendations when the system catalog is manifest-scoped for this
     // unit — skill names are already listed in <available_skills>.
     let recommendationsBlock = "";

package/dist/resources/extensions/gsd/state-reconciliation/drift/external-markdown-edit.js

@@ -3,13 +3,86 @@
 //
 // gsd-pi's DB is canonical, but .gsd/*.md is the inter-tool contract. When
 // gsd-core edits a projection file, this handler detects the sha drift vs the
-// recorded baseline in .gsd/.compat.json and re-imports the affected entities
-// into the DB. The next renderAllFromDb pass re-projects; the write-time
-// invalidation hook then refreshes the marker entry, closing the loop.
+// recorded baseline in .gsd/.compat.json and re-imports from markdown with
+// status authority scoped to the affected milestone ids. The next
+// renderAllFromDb pass re-projects; the write-time invalidation hook then
+// refreshes the marker entry, closing the loop.
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 import { computeProjectionSha, readCompatMarker, writeCompatMarker, } from "../../compat/compat-marker.js";
+import { _getAdapter } from "../../gsd-db.js";
 import { logWarning } from "../../workflow-logger.js";
+function deepestProjectionScope(entities) {
+    let best = null;
+    for (const entity of entities) {
+        const parts = entity.split("/").filter(Boolean);
+        if (parts.length === 0)
+            continue;
+        if (!best || parts.length > best.length)
+            best = parts;
+    }
+    if (!best)
+        return null;
+    return {
+        milestoneId: best[0],
+        sliceId: best[1] ?? null,
+        taskId: best[2] ?? null,
+    };
+}
+function artifactTypeFromProjectionPath(projectionPath) {
+    const name = basename(projectionPath);
+    const match = name.match(/^(?:[A-Za-z]\d+|\d+(?:-\d+)?)-(.+)\.md$/);
+    return match?.[1]?.toUpperCase() ?? null;
+}
+function dbProjectionMatches(projectionPath, entry, actualSha) {
+    const adapter = _getAdapter();
+    if (!adapter)
+        return false;
+    try {
+        const rows = adapter
+            .prepare("SELECT full_content FROM artifacts WHERE path = :path")
+            .all({ ":path": projectionPath });
+        const scope = deepestProjectionScope(entry.entities);
+        const artifactType = artifactTypeFromProjectionPath(projectionPath);
+        if (scope?.taskId) {
+            rows.push(...adapter
+                .prepare(`SELECT full_content
+             FROM artifacts
+             WHERE milestone_id = :mid AND slice_id = :sid AND task_id = :tid
+               AND (:type IS NULL OR artifact_type = :type)`)
+                .all({
+                ":mid": scope.milestoneId,
+                ":sid": scope.sliceId,
+                ":tid": scope.taskId,
+                ":type": artifactType,
+            }));
+        }
+        else if (scope?.sliceId) {
+            rows.push(...adapter
+                .prepare(`SELECT full_content
+             FROM artifacts
+             WHERE milestone_id = :mid AND slice_id = :sid AND task_id IS NULL
+               AND (:type IS NULL OR artifact_type = :type)`)
+                .all({
+                ":mid": scope.milestoneId,
+                ":sid": scope.sliceId,
+                ":type": artifactType,
+            }));
+        }
+        else if (scope) {
+            rows.push(...adapter
+                .prepare(`SELECT full_content
+             FROM artifacts
+             WHERE milestone_id = :mid AND slice_id IS NULL AND task_id IS NULL
+               AND (:type IS NULL OR artifact_type = :type)`)
+                .all({ ":mid": scope.milestoneId, ":type": artifactType }));
+        }
+        return rows.some((row) => computeProjectionSha(row.full_content) === actualSha);
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Detect sha drift between the marker baseline and current file contents.
  *
@@ -20,11 +93,15 @@ import { logWarning } from "../../workflow-logger.js";
  * - Sha mismatch → one record per drifted file, scoped to its recorded entities.
  */
 function detectExternalMarkdownEdit(_state, ctx) {
-    const marker = readCompatMarker(ctx.basePath);
+    const marker = readCompatMarker(ctx.basePath, {
+        healInvalidKeys: !ctx.dryRun,
+        quarantineInvalid: !ctx.dryRun,
+    });
     const entries = Object.entries(marker.projections);
     if (entries.length === 0)
         return [];
     const records = [];
+    let markerChanged = false;
     for (const [projectionPath, entry] of entries) {
         const abs = join(ctx.basePath, ".gsd", projectionPath);
         if (!existsSync(abs))
@@ -32,6 +109,21 @@ function detectExternalMarkdownEdit(_state, ctx) {
         const actual = computeProjectionSha(readFileSync(abs, "utf-8"));
         if (actual === entry.sha)
             continue;
+        if (dbProjectionMatches(projectionPath, entry, actual)) {
+            if (!ctx.dryRun) {
+                marker.projections[projectionPath] = {
+                    sha: actual,
+                    entities: entry.entities,
+                };
+                markerChanged = true;
+                logWarning("reconcile", `external-markdown-edit: refreshed stale compat marker for ${projectionPath} (expectedSha=${entry.sha}, actualSha=${actual})`);
+            }
+            else {
+                logWarning("reconcile", `external-markdown-edit: stale compat marker for ${projectionPath} (expectedSha=${entry.sha}, actualSha=${actual})`);
+            }
+            continue;
+        }
+        logWarning("reconcile", `external-markdown-edit drift for ${projectionPath} (expectedSha=${entry.sha}, actualSha=${actual})`);
         records.push({
             kind: "external-markdown-edit",
             projectionPath,
@@ -40,26 +132,44 @@ function detectExternalMarkdownEdit(_state, ctx) {
             entities: entry.entities,
         });
     }
+    if (markerChanged) {
+        marker.lastWriter = "gsd-pi";
+        marker.lastProjectedAt = new Date().toISOString();
+        writeCompatMarker(ctx.basePath, marker);
+    }
     return records;
 }
 /**
- * Idempotent repair: re-import hierarchy for the affected entities from
- * markdown into the DB, then update the marker entry so the next detect pass
- * sees the file as expected. migrateHierarchyToDb is itself idempotent
- * (upsert), so re-running this repair after a successful one is a no-op.
+ * Idempotent repair: re-import the hierarchy from markdown while allowing
+ * markdown status authority only for milestones named by the drifted file's
+ * marker entities, then update the marker entry so the next detect pass sees
+ * the file as expected. migrateHierarchyToDb is itself idempotent (upsert), so
+ * re-running this repair after a successful one is a no-op.
  */
 async function repairExternalMarkdownEdit(record, ctx) {
     try {
         // Dynamic imports break a module-init cycle: this handler ← registry ←
         // state.ts ← guided-flow.ts ← md-importer.ts ← (this handler's old static
         // import). Deferring to repair time keeps module load cycle-free.
-        const { migrateHierarchyToDb } = await import("../../md-importer.js");
+        const { migrateHierarchyToDb, milestoneIdsFromEntities } = await import("../../md-importer.js");
         const { invalidateStateCache } = await import("../../state.js");
-        // Scoped re-import. migrateHierarchyToDb walks the whole tree but is a
-        // cheap upsert; per-entity scoping would require decomposing it, which is
-        // out of scope for v1. The cost is bounded by tree size and runs at most
-        // once per reconcile pass (MAX_PASSES=2).
-        migrateHierarchyToDb(ctx.basePath);
+        // #027: migrateHierarchyToDb walks the whole tree (a cheap upsert), so
+        // without scoping every projection rides along with markdown *status*
+        // authority. That lets an unrelated file that is stale from gsd-pi's own
+        // miss silently revert a reopened slice/milestone. Scope status authority to
+        // exactly the milestone(s) this drifted file projects.
+        //
+        // Step 1: the marker's `entities` are DB ids (`M001`, `M001/S01`,
+        // `M001/S01/T01`), so the milestone id is always the first `/`-segment —
+        // layout-independent (legacy `milestones/<MID>/…` and flat `phases/NN-slug/…`
+        // both resolve the same way), no projectionPath parsing needed. An empty set
+        // (no resolvable entities) preserves DB status everywhere: fail toward
+        // protecting the DB, not toward markdown authority.
+        const statusAuthoritativeMilestones = milestoneIdsFromEntities(record.entities);
+        if (statusAuthoritativeMilestones.size === 0) {
+            logWarning("reconcile", `external-markdown-edit: no milestone scope resolved for ${record.projectionPath}; preserving DB status for all milestones`);
+        }
+        migrateHierarchyToDb(ctx.basePath, { statusAuthoritativeMilestones });
         invalidateStateCache();
     }
     catch (err) {

package/dist/resources/extensions/gsd/state-reconciliation/drift/external-planning-edit.js

@@ -3,7 +3,8 @@
 // Parallel to external-markdown-edit.ts. Detects sha drift between the compat
 // marker's planning.projections/passthrough and current .planning/ files.
 //
-// Modeled files (projections): re-imported via parsePlanningDirectory → DB.
+// Modeled files (projections): re-imported via parsePlanningDirectory → DB,
+// with markdown status authority scoped to their marker entity milestone ids.
 // Passthrough files (un-modeled docs): sha refreshed, content untouched.
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
@@ -54,7 +55,10 @@ function detectUnseededPlanningFiles(ctx, projections, passthrough) {
     return records;
 }
 async function detectExternalPlanningEdit(_state, ctx) {
-    const marker = readCompatMarker(ctx.basePath);
+    const marker = readCompatMarker(ctx.basePath, {
+        healInvalidKeys: !ctx.dryRun,
+        quarantineInvalid: !ctx.dryRun,
+    });
     if (!marker.planning?.active) {
         // Not yet activated. Activation (layout parse + DB import) is owned by
         // capturePlanningCompatIfNeeded, called from reconcileBeforeDispatch when
@@ -115,12 +119,21 @@ async function repairExternalPlanningEdit(record, ctx) {
         const { parsePlanningDirectory } = await import("../../migrate/parser.js");
         const { transformToGSD } = await import("../../migrate/transformer.js");
         const { writeGSDDirectory } = await import("../../migrate/writer.js");
-        const { migrateHierarchyToDb } = await import("../../md-importer.js");
+        const { migrateHierarchyToDb, milestoneIdsFromEntities } = await import("../../md-importer.js");
         const { invalidateStateCache } = await import("../../state.js");
         const parsed = await parsePlanningDirectory(join(ctx.basePath, ".planning"));
         const gsdProject = transformToGSD(parsed);
         await writeGSDDirectory(gsdProject, ctx.basePath);
-        migrateHierarchyToDb(ctx.basePath);
+        // #027: scope status authority to the milestone(s) this drifted .planning/
+        // file projects (first `/`-segment of its DB entity ids), so a stale
+        // checkbox in an unrelated projection can't revert a reopened slice/milestone
+        // in the DB. Unseeded files carry no entities → empty set → preserve DB
+        // status everywhere (fail toward the DB, log the breadcrumb).
+        const statusAuthoritativeMilestones = milestoneIdsFromEntities(record.entities);
+        if (statusAuthoritativeMilestones.size === 0) {
+            logWarning("reconcile", `external-planning-edit: no milestone scope resolved for ${record.projectionPath}; preserving DB status for all milestones`);
+        }
+        migrateHierarchyToDb(ctx.basePath, { statusAuthoritativeMilestones });
         invalidateStateCache();
     }
     catch (err) {

package/dist/resources/extensions/gsd/state-reconciliation/drift/roadmap.js

@@ -9,7 +9,7 @@ import { renderRoadmapFromDb } from "../../markdown-renderer.js";
 import { findMilestoneIds } from "../../milestone-ids.js";
 import { parseRoadmap } from "../../parsers-legacy.js";
 import { resolveMilestoneFile } from "../../paths.js";
-import { isClosedStatus } from "../../status-guards.js";
+import { isClosedStatus, isSkippedForDispatch } from "../../status-guards.js";
 function arraysEqual(a, b) {
     if (a.length !== b.length)
         return false;
@@ -76,7 +76,10 @@ export function detectRoadmapDivergenceDrift(_state, ctx) {
     for (const milestoneId of findMilestoneIds(ctx.basePath)) {
         // Skip milestones that don't yet have a DB row — that's the
         // unregistered-milestone drift handler's responsibility.
-        if (!getMilestone(milestoneId))
+        const milestone = getMilestone(milestoneId);
+        if (!milestone)
+            continue;
+        if (isSkippedForDispatch(milestone.status))
             continue;
         if (milestoneHasDivergence(ctx.basePath, milestoneId)) {
             drifts.push({ kind: "roadmap-divergence", milestoneId });

package/dist/resources/extensions/gsd/stop-notice.js

@@ -22,6 +22,12 @@ export function formatStopNoticePrefix(reason) {
     const prefix = stopNoticeKind(reason) === "blocked" ? "Auto-mode blocked" : "Auto-mode stopped";
     return displayReason ? `${prefix} — ${displayReason}` : prefix;
 }
+export function formatVerdictRecordedNotice(message) {
+    return `Verdict recorded: ${message}`;
+}
+export function formatVerdictRejectedNotice(message) {
+    return `Verdict rejected: ${message}`;
+}
 // ─── Classification (headless host side) ────────────────────────────────
 // The canonical lowercase prefixes the headless event loop recognizes in
 // notify messages. Emitters above and ad-hoc emitters elsewhere must start
@@ -33,6 +39,8 @@ export const TERMINAL_NOTICE_PREFIXES = [
     "auto-mode complete",
     "no active milestone",
     "auto-mode idle",
+    "verdict recorded",
+    "verdict rejected",
 ];
 /** Manual-resolution notices emitted before auto-mode can formally pause/stop. */
 export function isManualResolutionNotice(message) {
@@ -50,8 +58,23 @@ export function isTerminalNotice(message) {
 export function isNonBlockingPauseNotice(message) {
     return message.includes("idempotent advance: unit already active");
 }
+/**
+ * A picker / next-action menu that could not render in a non-interactive
+ * (headless / RPC) session. Both wordings originate from the menu-unavailable
+ * helpers (`notifyCommandMenuUnavailable` and `notifyPickerCommandNeedsInteractiveMenu`
+ * in next-action-ui.ts / command-feedback.ts). Headless `auto`/`next` cannot
+ * answer such a menu, so the run has dead-ended and needs operator intervention.
+ * Classify it as blocked so the headless host exits 10 instead of idling
+ * forever waiting for a completion signal that never comes. (#1294)
+ */
+export function isInteractiveMenuUnavailableNotice(message) {
+    return (message.includes("menu could not be shown in this session") ||
+        message.includes("did not start:"));
+}
 export function isBlockedNoticeMessage(message) {
     return (message.includes("blocked:") ||
+        message.startsWith("verdict rejected") ||
         (isPauseNotice(message) && !isNonBlockingPauseNotice(message)) ||
-        isManualResolutionNotice(message));
+        isManualResolutionNotice(message) ||
+        isInteractiveMenuUnavailableNotice(message));
 }

package/dist/resources/extensions/gsd/sync-lock.js

@@ -6,8 +6,9 @@ import { closeSync, existsSync, mkdirSync, openSync, readFileSync, statSync, unl
 import { dirname, join } from "node:path";
 const STALE_THRESHOLD_MS = 60_000; // 60 seconds
 const DEFAULT_TIMEOUT_MS = 0; // fail fast; sync waits block the JS event loop
-function lockFilePath(basePath) {
-    return join(basePath, ".gsd", "sync.lock");
+const DEFAULT_LOCK_NAME = "sync.lock";
+function lockFilePath(basePath, lockName = DEFAULT_LOCK_NAME) {
+    return join(basePath, ".gsd", lockName);
 }
 /** True if the given PID is alive in the current process namespace. */
 function isPidAlive(pid) {
@@ -71,8 +72,8 @@ function tryCreateLockFile(lp, payload) {
  * I/O, and UI work on Node's single JS thread. The timeout argument remains
  * accepted for compatibility but is intentionally not used for sync waiting.
  */
-export function acquireSyncLock(basePath, _timeoutMs = DEFAULT_TIMEOUT_MS) {
-    const lp = lockFilePath(basePath);
+export function acquireSyncLock(basePath, _timeoutMs = DEFAULT_TIMEOUT_MS, lockName = DEFAULT_LOCK_NAME) {
+    const lp = lockFilePath(basePath, lockName);
     const lockData = JSON.stringify({ pid: process.pid, acquired_at: new Date().toISOString() }, null, 2);
     while (true) {
         // First try the fast path: atomic create. No check-then-write race.
@@ -82,7 +83,12 @@ export function acquireSyncLock(basePath, _timeoutMs = DEFAULT_TIMEOUT_MS) {
             }
         }
         catch {
-            /* unexpected — fall through to retry */
+            // tryCreateLockFile only throws for non-EEXIST errors — a persistently
+            // uncreatable lock path (dangling-symlink parent, ENOTDIR, read-only FS).
+            // Retrying would spin the loop forever with no progress condition,
+            // blocking the JS event loop. Fail open like a contended lock so callers
+            // proceed (racy but functional) instead of hanging.
+            return { acquired: false };
         }
         // File exists. Decide whether to steal (stale + owner dead) or skip.
         let canSteal = false;
@@ -125,8 +131,8 @@ export function acquireSyncLock(basePath, _timeoutMs = DEFAULT_TIMEOUT_MS) {
 /**
  * Release the advisory sync lock. No-op if lock file does not exist.
  */
-export function releaseSyncLock(basePath) {
-    const lp = lockFilePath(basePath);
+export function releaseSyncLock(basePath, lockName = DEFAULT_LOCK_NAME) {
+    const lp = lockFilePath(basePath, lockName);
     try {
         if (existsSync(lp)) {
             unlinkSync(lp);