gsd-pi 2.78.1-dev.e9d88a536 → 2.78.1-dev.eccf86e27

package/dist/resources/extensions/gsd/auto/session.js

@@ -16,6 +16,7 @@
  * `let` or `var` declarations.
  */
 import { resolveWorktreeProjectRoot } from "../worktree-root.js";
+import { normalizeRealPath } from "../paths.js";
 // ─── Constants ───────────────────────────────────────────────────────────────
 export const STUB_RECOVERY_THRESHOLD = 2;
 export const NEW_SESSION_TIMEOUT_MS = 120_000;
@@ -32,6 +33,22 @@ export class AutoSession {
     // ── Paths ────────────────────────────────────────────────────────────────
     basePath = "";
     originalBasePath = "";
+    // TODO(C8): remove basePath/originalBasePath once all readers use s.scope
+    scope = null;
+    // ── Coordination identity (Phase B — DB-backed coordination) ────────────
+    /**
+     * Worker registry ID set by registerAutoWorker() at session start. Used by
+     * heartbeatAutoWorker() each loop iteration and by recordDispatchClaim()
+     * to fence dispatch ledger writes against stale workers.
+     */
+    workerId = null;
+    /**
+     * Active milestone lease fencing token, set by claimMilestoneLease() inside
+     * worktree-resolver.enterMilestone(). Threaded into recordDispatchClaim()
+     * as milestone_lease_token so out-of-band dispatches by a stale worker
+     * are detectable.
+     */
+    milestoneLeaseToken = null;
     previousProjectRootEnv = null;
     hadProjectRootEnv = false;
     projectRootEnvCaptured = false;
@@ -160,6 +177,22 @@ export class AutoSession {
     get lockBasePath() {
         return resolveWorktreeProjectRoot(this.basePath, this.originalBasePath);
     }
+    /**
+     * Canonical project root for state-derivation reads AND writer paths.
+     *
+     * Prefers the realpath-normalized projectRoot from the MilestoneScope
+     * (introduced by PR #5236), falling back to resolveWorktreeProjectRoot
+     * during early lifecycle / engine-bypass paths where scope may be null.
+     *
+     * Always realpath-normalized so cache keys (e.g. deriveState's _stateCache)
+     * cannot drift across worktree↔project-root path-string variants for the
+     * same filesystem location.
+     */
+    get canonicalProjectRoot() {
+        const root = this.scope?.workspace.projectRoot
+            ?? resolveWorktreeProjectRoot(this.basePath, this.originalBasePath);
+        return normalizeRealPath(root);
+    }
     reset() {
         this.clearTimers();
         // Lifecycle
@@ -173,6 +206,9 @@ export class AutoSession {
         // Paths
         this.basePath = "";
         this.originalBasePath = "";
+        this.scope = null;
+        this.workerId = null;
+        this.milestoneLeaseToken = null;
         this.previousProjectRootEnv = null;
         this.hadProjectRootEnv = false;
         this.projectRootEnvCaptured = false;

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

@@ -9,7 +9,7 @@
  * without modifying orchestration code.
  */
 import { loadFile, extractUatType, loadActiveOverrides } from "./files.js";
-import { isDbAvailable, getMilestoneSlices, getPendingGates, markAllGatesOmitted, getMilestone } from "./gsd-db.js";
+import { isDbAvailable, getMilestoneSlices, getPendingGates, markAllGatesOmitted, getMilestone, insertAssessment, transaction } from "./gsd-db.js";
 import { isClosedStatus } from "./status-guards.js";
 import { extractVerdict, isAcceptableUatVerdict } from "./verdict-parser.js";
 import { gsdRoot, resolveMilestoneFile, resolveMilestonePath, resolveSliceFile, resolveTaskFile, relSliceFile, buildMilestoneFileName, } from "./paths.js";
@@ -31,6 +31,9 @@ import { ensureWorkflowPreferencesCaptured } from "./planning-depth.js";
 import { MILESTONE_ID_RE } from "./milestone-ids.js";
 import { PROJECT_RESEARCH_INFLIGHT_MARKER, } from "./project-research-policy.js";
 import { isWorkflowPrefsCaptured, resolveDeepProjectSetupState, } from "./deep-project-setup-policy.js";
+import { annotateBackgroundable } from "./delegation-policy.js";
+import { invalidateAllCaches } from "./cache.js";
+import { insertMilestoneValidationGates } from "./milestone-validation-gates.js";
 let reassessmentChecker = checkNeedsReassessment;
 let researchProjectPromptBuilder = buildResearchProjectPrompt;
 function shouldBypassMilestoneDepthGateInAuto(prefs) {
@@ -995,9 +998,12 @@ export const DISPATCH_RULES = [
                     const skipSource = trivialVariant
                         ? "trivial-scope pipeline variant (#4781)"
                         : "`skip_milestone_validation` preference";
+                    const skipValidationReason = trivialVariant ? "trivial-scope" : "preference";
                     const content = [
                         "---",
                         "verdict: pass",
+                        "skip_validation: true",
+                        `skip_validation_reason: ${skipValidationReason}`,
                         "remediation_round: 0",
                         "---",
                         "",
@@ -1006,6 +1012,39 @@ export const DISPATCH_RULES = [
                         `Milestone validation was skipped via ${skipSource}.`,
                     ].join("\n");
                     writeFileSync(validationPath, content, "utf-8");
+                    try {
+                        // DB-backed state derivation keys off assessments, not only the file
+                        // projection. Persist the skipped validation there too so the next
+                        // loop iteration advances to completing-milestone instead of
+                        // re-entering validating-milestone.
+                        if (isDbAvailable()) {
+                            transaction(() => {
+                                insertAssessment({
+                                    path: validationPath,
+                                    milestoneId: mid,
+                                    sliceId: null,
+                                    taskId: null,
+                                    status: "pass",
+                                    scope: "milestone-validation",
+                                    fullContent: content,
+                                });
+                                const gateSliceId = getMilestoneSlices(mid)[0]?.id;
+                                if (gateSliceId) {
+                                    insertMilestoneValidationGates(mid, gateSliceId, "pass", new Date().toISOString());
+                                }
+                            });
+                        }
+                    }
+                    catch (err) {
+                        try {
+                            unlinkSync(validationPath);
+                        }
+                        catch (unlinkErr) {
+                            logWarning("dispatch", `failed to remove skipped validation file after DB write failure for ${mid}: ${unlinkErr instanceof Error ? unlinkErr.message : String(unlinkErr)}`);
+                        }
+                        throw err;
+                    }
+                    invalidateAllCaches();
                 }
                 return { action: "skip" };
             }
@@ -1086,13 +1125,19 @@ export const DISPATCH_RULES = [
                             if (validationContent) {
                                 // Allow completion when validation was intentionally skipped by
                                 // preference/budget profile (#3399, #3344).
+                                const skippedByMarker = /^skip_validation:\s*true$/im.test(validationContent);
                                 const skippedByPreference = /skip(?:ped)?[\s\-]+(?:by|per|due to)\s+(?:preference|budget|profile)/i.test(validationContent);
+                                const skippedByTrivialVariant = /trivial-scope pipeline variant/i.test(validationContent);
                                 // Accept either the structured template format (table with MET/N/A/SATISFIED)
                                 // or prose evidence patterns the validation agent may emit.
                                 const structuredMatch = validationContent.includes("Operational") &&
                                     (validationContent.includes("MET") || validationContent.includes("N/A") || validationContent.includes("SATISFIED"));
                                 const proseMatch = /[Oo]perational[\s\S]{0,500}?(?:✅|pass|verified|confirmed|met|complete|true|yes|addressed|covered|satisfied|partially|n\/a|not[\s-]+applicable)/i.test(validationContent);
-                                const hasOperationalCheck = skippedByPreference || structuredMatch || proseMatch;
+                                const hasOperationalCheck = skippedByMarker ||
+                                    skippedByPreference ||
+                                    skippedByTrivialVariant ||
+                                    structuredMatch ||
+                                    proseMatch;
                                 if (!hasOperationalCheck) {
                                     return {
                                         action: "stop",
@@ -1152,7 +1197,7 @@ export async function resolveDispatch(ctx) {
     // Delegate to registry when available
     try {
         const registry = getRegistry();
-        return await registry.evaluateDispatch(ctx);
+        return annotateBackgroundable(await registry.evaluateDispatch(ctx));
     }
     catch (err) {
         // Registry not initialized — fall back to inline loop
@@ -1163,7 +1208,7 @@ export async function resolveDispatch(ctx) {
         if (result) {
             if (result.action !== "skip")
                 result.matchedRule = rule.name;
-            return result;
+            return annotateBackgroundable(result);
         }
     }
     // No rule matched — unhandled phase.

package/dist/resources/extensions/gsd/auto-post-unit.js

@@ -24,6 +24,7 @@ import { runTurnGitAction, } from "./git-service.js";
 import { verifyExpectedArtifact, resolveExpectedArtifactPath, writeBlockerPlaceholder, diagnoseExpectedArtifact, } from "./auto-recovery.js";
 import { regenerateIfMissing } from "./workflow-projections.js";
 import { syncStateToProjectRoot } from "./auto-worktree.js";
+import { normalizeWorktreePathForCompare } from "./worktree-root.js";
 import { isDbAvailable, getTask, getSlice, getMilestone, updateTaskStatus, _getAdapter } from "./gsd-db.js";
 import { renderPlanCheckboxes } from "./markdown-renderer.js";
 import { consumeSignal } from "./session-status-io.js";
@@ -51,6 +52,11 @@ import { detectAbandonMilestone } from "./abandon-detect.js";
 import { isDeterministicPolicyError } from "./auto-tool-tracking.js";
 import { clearProjectResearchInflightMarker, finalizeProjectResearchTimeout, } from "./project-research-policy.js";
 import { validateArtifact } from "./schemas/validate.js";
+// ─── Path Comparison Helper ───────────────────────────────────────────────
+/** Compare two paths for physical identity, tolerating trailing slashes and symlinks. */
+function isSamePathLocal(a, b) {
+    return normalizeWorktreePathForCompare(a) === normalizeWorktreePathForCompare(b);
+}
 /** Maximum verification retry attempts before escalating to blocker placeholder (#2653). */
 const MAX_VERIFICATION_RETRIES = 3;
 /** Keep failure toasts short while still showing concrete examples. */
@@ -510,7 +516,7 @@ export async function postUnitPreVerification(pctx, opts) {
             await rebuildState(s.basePath);
         });
         // Sync worktree state back to project root (skipped for lightweight sidecars)
-        if (!opts?.skipWorktreeSync && s.originalBasePath && s.originalBasePath !== s.basePath) {
+        if (!opts?.skipWorktreeSync && s.originalBasePath && !isSamePathLocal(s.originalBasePath, s.basePath)) {
             await runSafely("postUnit", "worktree-sync", () => {
                 syncStateToProjectRoot(s.basePath, s.originalBasePath, s.currentMilestoneId);
             });
@@ -650,13 +656,15 @@ export async function postUnitPreVerification(pctx, opts) {
         if (s.currentUnit.type === "triage-captures") {
             try {
                 const { executeTriageResolutions } = await import("./triage-resolution.js");
-                const state = await deriveState(s.basePath);
+                const state = await deriveState(s.canonicalProjectRoot);
                 const mid = state.activeMilestone?.id ?? "";
                 const sid = state.activeSlice?.id ?? "";
                 // executeTriageResolutions handles defer milestone creation even
                 // without an active milestone/slice (the "all milestones complete"
                 // scenario from #1562). inject/replan/quick-task still require mid+sid.
-                const triageResult = executeTriageResolutions(s.basePath, mid, sid);
+                // Phase C: write to canonical project root. copyPlanningArtifacts
+                // has been deleted, so triage writes land where readers consult.
+                const triageResult = executeTriageResolutions(s.canonicalProjectRoot, mid, sid);
                 if (triageResult.injected > 0) {
                     ctx.ui.notify(`Triage: injected ${triageResult.injected} task${triageResult.injected === 1 ? "" : "s"} into ${sid} plan.`, "info");
                 }
@@ -799,10 +807,14 @@ export async function postUnitPreVerification(pctx, opts) {
                 try {
                     const { milestone: mid, slice: sid } = parseUnitId(s.currentUnit.id);
                     if (mid && sid) {
-                        const regenerated = await regenerateIfMissing(s.basePath, mid, sid, "PLAN");
+                        // Phase C: write to the canonical project root (#5236 scope)
+                        // so non-symlinked worktrees no longer maintain a separate
+                        // local .gsd/ projection. copyPlanningArtifacts has been
+                        // deleted; reads + writes converge at projectRoot.
+                        const regenerated = await regenerateIfMissing(s.canonicalProjectRoot, mid, sid, "PLAN");
                         if (regenerated) {
                             // Re-check after regeneration
-                            triggerArtifactVerified = verifyExpectedArtifact(s.currentUnit.type, s.currentUnit.id, s.basePath);
+                            triggerArtifactVerified = verifyExpectedArtifact(s.currentUnit.type, s.currentUnit.id, s.canonicalProjectRoot);
                             if (triggerArtifactVerified) {
                                 invalidateAllCaches();
                             }
@@ -993,7 +1005,7 @@ export async function postUnitPostVerification(pctx) {
                     if (mid && sid && tid) {
                         try {
                             updateTaskStatus(mid, sid, tid, "pending");
-                            await renderPlanCheckboxes(s.basePath, mid, sid);
+                            await renderPlanCheckboxes(s.canonicalProjectRoot, mid, sid);
                         }
                         catch (dbErr) {
                             // DB unavailable — fail explicitly rather than silently reverting to markdown mutation.
@@ -1003,7 +1015,8 @@ export async function postUnitPostVerification(pctx) {
                     }
                     // 2. Delete SUMMARY.md for the task
                     if (mid && sid && tid) {
-                        const tasksDir = resolveTasksDir(s.basePath, mid, sid);
+                        // Phase C: read+delete via canonical project root.
+                        const tasksDir = resolveTasksDir(s.canonicalProjectRoot, mid, sid);
                         if (tasksDir) {
                             const summaryFile = join(tasksDir, buildTaskFileName(tid, "SUMMARY"));
                             if (existsSync(summaryFile)) {
@@ -1013,7 +1026,7 @@ export async function postUnitPostVerification(pctx) {
                     }
                     // 3. Delete the retry_on artifact (e.g. NEEDS-REWORK.md)
                     if (trigger.retryArtifact) {
-                        const retryArtifactPath = resolveHookArtifactPath(s.basePath, trigger.unitId, trigger.retryArtifact);
+                        const retryArtifactPath = resolveHookArtifactPath(s.canonicalProjectRoot, trigger.unitId, trigger.retryArtifact);
                         if (existsSync(retryArtifactPath)) {
                             unlinkSync(retryArtifactPath);
                         }
@@ -1249,16 +1262,17 @@ export async function postUnitPostVerification(pctx) {
             if (hasPendingCaptures(s.basePath)) {
                 const pending = loadPendingCaptures(s.basePath);
                 if (pending.length > 0) {
-                    const state = await deriveState(s.basePath);
+                    const readRoot = s.canonicalProjectRoot;
+                    const state = await deriveState(readRoot);
                     const mid = state.activeMilestone?.id;
                     const sid = state.activeSlice?.id;
                     if (mid && sid) {
                         let currentPlan = "";
                         let roadmapContext = "";
-                        const planFile = resolveSliceFile(s.basePath, mid, sid, "PLAN");
+                        const planFile = resolveSliceFile(readRoot, mid, sid, "PLAN");
                         if (planFile)
                             currentPlan = (await loadFile(planFile)) ?? "";
-                        const roadmapFile = resolveMilestoneFile(s.basePath, mid, "ROADMAP");
+                        const roadmapFile = resolveMilestoneFile(readRoot, mid, "ROADMAP");
                         if (roadmapFile)
                             roadmapContext = (await loadFile(roadmapFile)) ?? "";
                         const capturesList = pending.map(c => `- **${c.id}**: "${c.text}" (captured: ${c.timestamp})`).join("\n");
@@ -1306,7 +1320,7 @@ export async function postUnitPostVerification(pctx) {
     // exits the loop, leaving the user with no hint to /clear and /gsd again.
     if (s.stepMode) {
         try {
-            const nextState = await deriveState(s.basePath);
+            const nextState = await deriveState(s.canonicalProjectRoot);
             ctx.ui.notify(buildStepCompleteMessage(nextState), "info");
         }
         catch (e) {