@opengsd/gsd-pi 1.3.0 → 1.4.0-dev.c18009cd

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

@@ -18,6 +18,7 @@ import { ensureGsdSymlink, isInheritedRepo, validateProjectId } from "./repo-ide
 import { migrateToExternalState, recoverFailedMigration } from "./migrate-external.js";
 import { collectSecretsFromManifest } from "../get-secrets-from-user.js";
 import { gsdRoot, resolveMilestoneFile } from "./paths.js";
+import { findMilestoneIds } from "./milestone-ids.js";
 import { milestoneEntryBlockedGuidance } from "./guidance.js";
 import { invalidateAllCaches } from "./cache.js";
 import { writeLock, clearLock, readCrashLock, isLockProcessAlive } from "./crash-recovery.js";
@@ -46,7 +47,7 @@ import { auditOrphanedPreflightStashes } from "./orphan-stash-audit.js";
 import { parseProject } from "./schemas/parsers.js";
 import { debugLog, enableDebug, isDebugEnabled, getDebugLogPath, } from "./debug-logger.js";
 import { logWarning, logError } from "./workflow-logger.js";
-import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, rmSync, } from "node:fs";
 import { join } from "node:path";
 import { validateDirectory } from "./validate-directory.js";
 import { isCustomProvider, resolveDefaultSessionModel, resolveDynamicRoutingConfig, } from "./preferences-models.js";
@@ -239,7 +240,7 @@ function formatStrandedWorkBlockerMessage(action, activeMilestoneId) {
         `3. Abandon it: run \`/gsd rethink\` and explicitly discard ${target}.`,
     ].join("\n");
 }
-export function auditOrphanedMilestoneBranches(basePath, _isolationMode, gitDeps = {}) {
+export function auditOrphanedMilestoneBranches(basePath, isolationMode, gitDeps = {}) {
     const recovered = [];
     const warnings = [];
     const actions = [];
@@ -286,6 +287,17 @@ export function auditOrphanedMilestoneBranches(basePath, _isolationMode, gitDeps
     catch {
         mergedBranches = new Set();
     }
+    // Detect the branch currently checked out at the project root once — it
+    // does not change across loop iterations and is used below to avoid
+    // requesting a worktree creation for a branch that git already considers
+    // "in use" by the main worktree.
+    let currentRootBranch = null;
+    try {
+        currentRootBranch = nativeGetCurrentBranch(basePath) || null;
+    }
+    catch {
+        currentRootBranch = null;
+    }
     for (const branch of milestoneBranches) {
         const milestoneId = branch.replace(/^milestone\//, "");
         const milestone = getMilestone(milestoneId);
@@ -313,7 +325,26 @@ export function auditOrphanedMilestoneBranches(basePath, _isolationMode, gitDeps
             }
             if ((isMerged || commitsAhead === 0) && !worktreeEvidence.dirty)
                 continue;
-            const recoveryMode = worktreeEvidence.path
+            // #812 — the worktree directory being absent on disk does NOT mean the
+            // project is branch-mode. getAutoWorktreePath() returns null whenever the
+            // directory is merely missing (transient/permanent loss after an
+            // interrupted session), which previously collapsed to recoveryMode:
+            // "branch" — silently checking out milestone/<id> in the project root with
+            // no worktree. When the project is *configured* for worktree isolation,
+            // recover as "worktree" so adoptStrandedMilestone re-materializes the
+            // worktree from the existing branch (createAutoWorktree with
+            // reuseExistingBranch) instead of degrading to branch-mode-in-root.
+            //
+            // Exception (#812-followup): if the milestone branch is already checked
+            // out at the project root (e.g. a leftover from the pre-fix #812 recovery
+            // that ran `git checkout milestone/<id>` in the root), git considers that
+            // branch "in use by another worktree" and will refuse `git worktree add`,
+            // causing bootstrap to abort. Degrade to "branch" in that case — the
+            // session resumes on the already-checked-out branch without worktree
+            // creation, same as pre-fix behavior, and the configured isolation is
+            // restored for subsequent milestones after merge/teardown.
+            const isBranchCheckedOutAtRoot = currentRootBranch === branch;
+            const recoveryMode = worktreeEvidence.path || (isolationMode === "worktree" && !isBranchCheckedOutAtRoot)
                 ? "worktree"
                 : "branch";
             const message = strandedWorkMessage({
@@ -762,7 +793,7 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
     const profileModelIds = modelIdsForProfileResolution(ctx.modelRegistry, resolveProfileAnchorProvider(ctx.model?.provider), resolveDisabledModelProvidersFromPreferences());
     const preferredModel = sessionProviderIsCustom
         ? null
-        : resolveDefaultSessionModel(ctx.model?.provider, base, profileModelIds);
+        : resolveDefaultSessionModel(ctx.model?.provider, base, profileModelIds, ctx.model?.id);
     // Validate the preferred model against the live registry + provider auth so
     // an unconfigured PREFERENCES.md entry (no API key / OAuth) can't become the
     // start-model snapshot. Without this, every subsequent unit would try to
@@ -1125,7 +1156,7 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
                 state = await deriveState(base);
             }
         }
-        const effectivePrefs = loadEffectiveGSDPreferencesWithRegistry(ctx.modelRegistry, base, resolveProfileAnchorProvider(ctx.model?.provider, startModelSnapshot?.provider))?.preferences;
+        const effectivePrefs = loadEffectiveGSDPreferencesWithRegistry(ctx.modelRegistry, base, resolveProfileAnchorProvider(ctx.model?.provider, startModelSnapshot?.provider), startModelSnapshot ? `${startModelSnapshot.provider}/${startModelSnapshot.id}` : undefined)?.preferences;
         const { shouldRunDeepProjectSetup } = await import("./auto-dispatch.js");
         const deepProjectStagePending = shouldRunDeepProjectSetup(state, effectivePrefs, base, { hasSurvivorBranch });
         if (deepProjectStagePending && !strandedRecoveryAction) {
@@ -1404,15 +1435,16 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
             ? `${s.autoModeStartModel.provider}/${s.autoModeStartModel.id}`
             : ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : "default";
         // Flat-rate providers (e.g. GitHub Copilot, claude-code, user-declared
-        // subscription proxies, externalCli CLIs) suppress routing at dispatch
-        // time (#3453) — reflect that in the banner.  Thread the same
+        // subscription proxies, externalCli CLIs) suppress routing only when the
+        // user explicitly opts out with allow_flat_rate_providers: false. Reflect
+        // that in the banner. Thread the same
         // FlatRateContext used by selectAndApplyModel so user-declared
         // flat-rate providers and externalCli auto-detection are respected.
         const { isFlatRateProvider, buildFlatRateContext } = await import("./auto-model-selection.js");
-        const bannerPrefs = loadEffectiveGSDPreferencesWithRegistry(ctx.modelRegistry, base, resolveProfileAnchorProvider(ctx.model?.provider, s.autoModeStartModel?.provider))?.preferences;
+        const bannerPrefs = loadEffectiveGSDPreferencesWithRegistry(ctx.modelRegistry, base, resolveProfileAnchorProvider(ctx.model?.provider, s.autoModeStartModel?.provider), s.autoModeStartModel ? `${s.autoModeStartModel.provider}/${s.autoModeStartModel.id}` : undefined)?.preferences;
         const effectiveProvider = s.autoModeStartModel?.provider ?? ctx.model?.provider;
         const effectivelyEnabled = routingConfig.enabled
-            && (routingConfig.allow_flat_rate_providers
+            && (routingConfig.allow_flat_rate_providers !== false
                 || !(effectiveProvider && isFlatRateProvider(effectiveProvider, buildFlatRateContext(effectiveProvider, ctx, bannerPrefs))));
         // The actual ceiling may come from tier_models.heavy, not the start model.
         const effectiveCeiling = (routingConfig.enabled && routingConfig.tier_models?.heavy)
@@ -1450,31 +1482,26 @@ export async function bootstrapAutoSession(s, ctx, pi, base, verboseMode, reques
         }
         // Pre-flight: validate milestone queue
         try {
-            const msDir = join(base, ".gsd", "milestones");
-            if (existsSync(msDir)) {
-                const milestoneIds = readdirSync(msDir, { withFileTypes: true })
-                    .filter((d) => d.isDirectory() && /^M\d{3}/.test(d.name))
-                    .map((d) => d.name.match(/^(M\d{3})/)?.[1] ?? d.name);
-                if (milestoneIds.length > 1) {
-                    const issues = [];
-                    for (const id of milestoneIds) {
-                        // Skip completed/parked milestones — a leftover CONTEXT-DRAFT.md
-                        // on a finished milestone is harmless residue, not an actionable warning.
-                        if (isDbAvailable()) {
-                            const ms = getMilestone(id);
-                            if (ms?.status === "complete" || ms?.status === "parked")
-                                continue;
-                        }
-                        const draft = resolveMilestoneFile(base, id, "CONTEXT-DRAFT");
-                        if (draft)
-                            issues.push(`${id}: has CONTEXT-DRAFT.md (will pause for discussion)`);
-                    }
-                    if (issues.length > 0) {
-                        ctx.ui.notify(`Pre-flight: ${milestoneIds.length} milestones queued.\n${issues.map((i) => `  ⚠ ${i}`).join("\n")}`, "warning");
-                    }
-                    else {
-                        ctx.ui.notify(`Pre-flight: ${milestoneIds.length} milestones queued. All have full context.`, "info");
+            const milestoneIds = findMilestoneIds(base);
+            if (milestoneIds.length > 1) {
+                const issues = [];
+                for (const id of milestoneIds) {
+                    // Skip completed/parked milestones — a leftover CONTEXT-DRAFT.md
+                    // on a finished milestone is harmless residue, not an actionable warning.
+                    if (isDbAvailable()) {
+                        const ms = getMilestone(id);
+                        if (ms?.status === "complete" || ms?.status === "parked")
+                            continue;
                     }
+                    const draft = resolveMilestoneFile(base, id, "CONTEXT-DRAFT");
+                    if (draft)
+                        issues.push(`${id}: has CONTEXT-DRAFT.md (will pause for discussion)`);
+                }
+                if (issues.length > 0) {
+                    ctx.ui.notify(`Pre-flight: ${milestoneIds.length} milestones queued.\n${issues.map((i) => `  ⚠ ${i}`).join("\n")}`, "warning");
+                }
+                else {
+                    ctx.ui.notify(`Pre-flight: ${milestoneIds.length} milestones queued. All have full context.`, "info");
                 }
             }
         }

package/dist/resources/extensions/gsd/auto-timeout-recovery.js

@@ -4,7 +4,7 @@
  * and blocker placeholder generation.
  */
 import { readUnitRuntimeRecord, writeUnitRuntimeRecord, formatExecuteTaskRecoveryStatus, inspectExecuteTaskDurability, } from "./unit-runtime.js";
-import { resolveExpectedArtifactPath, diagnoseExpectedArtifact, writeBlockerPlaceholder, } from "./auto-recovery.js";
+import { resolveExpectedArtifactPath, diagnoseExpectedArtifact, verifyExpectedArtifact, writeBlockerPlaceholder, } from "./auto-recovery.js";
 import { existsSync } from "node:fs";
 import { bumpAndResolveSynthetic } from "./auto/resolve.js";
 import { finalizeProjectResearchTimeout } from "./project-research-policy.js";
@@ -56,6 +56,8 @@ export async function recoverTimedOutUnit(ctx, pi, unitType, unitId, reason, rct
                 lastProgressAt: Date.now(),
                 progressCount: (runtime?.progressCount ?? 0) + 1,
                 lastProgressKind: reason === "idle" ? "idle-recovery-retry" : "hard-recovery-retry",
+                // This steering retry is a fresh chance for the same unit to save a valid result.
+                harnessAbort: undefined,
             });
             const steeringLines = isEscalation
                 ? [
@@ -128,10 +130,10 @@ export async function recoverTimedOutUnit(ctx, pi, unitType, unitId, reason, rct
         bumpAndResolveSynthetic(`timeout-recovery:${reason}:${unitType}/${unitId}`);
         return "recovered";
     }
-    // Check if the artifact already exists on disk — agent may have written it
+    // Check if the artifact is already valid on disk — agent may have written it
     // without signaling completion.
     const artifactPath = resolveExpectedArtifactPath(unitType, unitId, basePath);
-    if (artifactPath && existsSync(artifactPath)) {
+    if (artifactPath && existsSync(artifactPath) && verifyExpectedArtifact(unitType, unitId, basePath)) {
         writeUnitRuntimeRecord(basePath, unitType, unitId, currentUnitStartedAt, {
             phase: "finalized",
             recoveryAttempts: recoveryAttempts + 1,
@@ -151,6 +153,8 @@ export async function recoverTimedOutUnit(ctx, pi, unitType, unitId, reason, rct
             lastProgressAt: Date.now(),
             progressCount: (runtime?.progressCount ?? 0) + 1,
             lastProgressKind: reason === "idle" ? "idle-recovery-retry" : "hard-recovery-retry",
+            // This steering retry is a fresh chance for the same unit to save a valid result.
+            harnessAbort: undefined,
         });
         const steeringLines = isEscalation
             ? [

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

@@ -1,7 +1,7 @@
 // Project/App: gsd-pi
 // File Purpose: Post-unit verification gate for GSD auto-mode units.
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
-import { gsdProjectionRoot, resolveSlicePath } from "./paths.js";
+import { relMilestoneFile, resolveSlicePath } from "./paths.js";
 import { resolveMilestoneValidationVerdict } from "./milestone-validation-verdict.js";
 import { resolveCanonicalMilestoneRoot } from "./worktree-manager.js";
 import { parseUnitId } from "./unit-id.js";
@@ -9,7 +9,7 @@ import { isDbAvailable, getTask, getSliceTasks, getMilestoneSlices } from "./gsd
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { isClosedStatus } from "./status-guards.js";
 import { loadFile } from "./files.js";
-import { runVerificationGate, runVerificationGateForTargets, formatFailureContext, captureRuntimeErrors, runDependencyAudit, } from "./verification-gate.js";
+import { runVerificationGate, runVerificationGateForTargets, formatFailureContext, formatFailureSignature, captureRuntimeErrors, runDependencyAudit, } from "./verification-gate.js";
 import { writeVerificationJSON } from "./verification-evidence.js";
 import { logWarning } from "./workflow-logger.js";
 import { runPostExecutionChecks } from "./post-execution-checks.js";
@@ -212,7 +212,10 @@ async function runValidateMilestonePostCheck(vctx, pauseAuto) {
         return incompleteSliceCount > 0 || hasAssessmentArtifact;
     };
     const validationBasePath = resolveCanonicalMilestoneRoot(s.basePath, mid);
-    const validationFile = join(gsdProjectionRoot(validationBasePath), "milestones", mid, `${mid}-VALIDATION.md`);
+    // Layout-aware: matches the writer at tools/validate-milestone.ts:167.
+    // Flat-phase resolves to phases/NN-slug/NN-VALIDATION.md; legacy resolves
+    // to milestones/MID/MID-VALIDATION.md. See open-gsd/gsd-pi#876.
+    const validationFile = join(validationBasePath, relMilestoneFile(validationBasePath, mid, "VALIDATION"));
     const validationContent = await loadFile(validationFile);
     if (validationContent !== null && validationContent.trim() === "") {
         if (await reassessmentInvalidatedValidation()) {
@@ -683,10 +686,13 @@ export async function runPostUnitVerification(vctx, pauseAuto) {
                 ctx.ui.notify(`Unit ${s.currentUnit.id} cost spike detected (${unitCostUsd.toFixed(2)} vs avg ${rollingAvgUsd.toFixed(2)}) during verification retry; keeping verification failure as the authoritative blocker.`, "warning");
             }
             const nextAttempt = attempt + 1;
+            const failureContext = verdict.failureContext || formatFailureContext(result);
+            const failureSignature = formatFailureSignature(result);
             s.verificationRetryCount.set(retryKey, nextAttempt);
             s.pendingVerificationRetry = {
                 unitId: s.currentUnit.id,
-                failureContext: verdict.failureContext || formatFailureContext(result),
+                failureContext,
+                ...(failureSignature ? { signature: failureSignature } : {}),
                 attempt: nextAttempt,
             };
             const failedCmds = result.checks