@opengsd/gsd-pi 1.3.0-dev.65546769 → 1.3.0-dev.eed73bea

package/dist/resources/extensions/gsd/unit-context-composer.js

@@ -92,13 +92,27 @@ const CONTEXT_MODE_GUIDANCE_BY_LANE = {
     orchestration: "Use `gsd_resume` before resuming orchestration, `gsd_exec_search` to reuse prior runs, and `gsd_exec` for noisy coordination checks.",
     docs: "Use `gsd_resume` for prior context, `gsd_exec_search` for saved evidence, and `gsd_exec` for noisy doc validation commands.",
 };
-// Per-unit overrides win over the lane default. run-uat's tool contract
-// forbids `gsd_exec`/`gsd_exec_search` (acceptance evidence must flow through
-// `gsd_uat_exec`) and Claude Code dispatch strips the tools entirely, so the
-// shared verification-lane guidance would steer the agent into calling an
-// unavailable tool.
-const CONTEXT_MODE_GUIDANCE_BY_UNIT = {
+// Per-unit overrides win over the lane default. Some units intentionally run
+// with narrower tool contracts than their shared Context Mode lane, so their
+// guidance must name only tools the unit can actually call.
+export const CONTEXT_MODE_GUIDANCE_BY_UNIT = {
+    "discuss-milestone": "Use `ask_user_questions` to continue the milestone interview, then persist outcomes with `gsd_summary_save`, `gsd_decision_save`, `gsd_requirement_save`, `gsd_requirement_update`, `gsd_plan_milestone`, or `gsd_milestone_generate_id` as appropriate.",
+    "discuss-slice": "Use `ask_user_questions` to continue the slice interview, then persist outcomes with `gsd_summary_save` or `gsd_decision_save` as appropriate.",
+    "discuss-project": "Use `ask_user_questions` to continue the project interview, then persist outcomes with `gsd_summary_save`, `gsd_decision_save`, or `gsd_requirement_save` as appropriate.",
+    "discuss-requirements": "Use `ask_user_questions` to continue the requirements interview, then persist outcomes with `gsd_requirement_save` or `gsd_summary_save` as appropriate.",
+    "replan-slice": "Use `gsd_replan_slice` to persist the revised slice plan, and `gsd_decision_save` for planning decisions that need durable rationale.",
+    "reassess-roadmap": "Use `gsd_milestone_status` to inspect current milestone state, then `gsd_reassess_roadmap` to persist the roadmap reassessment.",
     "run-uat": "Use `gsd_uat_exec` for acceptance checks so evidence is typed as UAT-owned, and `gsd_resume` after compaction or resume.",
+    "research-project": "Dispatch parallel scout subagents for stack, features, architecture, and pitfalls research; each writes one file under `.gsd/research/` (`STACK.md`, `FEATURES.md`, `ARCHITECTURE.md`, `PITFALLS.md`).",
+    "gate-evaluate": "Use `subagent` to dispatch tester agents, then persist each gate with `gsd_save_gate_result`; rely on testers for verification evidence.",
+};
+// Per-unit guidance for the nested render mode (renderMode: "nested"), used when this
+// unit's Context Mode line is embedded into a subagent prompt — e.g. the tester prompts
+// dispatched by gate-evaluate. Must instruct the subagent on what IT should do, not
+// re-state the parent coordinator's dispatch instructions. Falls back to
+// CONTEXT_MODE_GUIDANCE_BY_UNIT then the lane default when no nested entry exists.
+export const CONTEXT_MODE_NESTED_GUIDANCE_BY_UNIT = {
+    "gate-evaluate": "Run verification checks to answer the gate question, then persist the verdict with `gsd_save_gate_result`.",
 };
 /**
  * Render the Context Mode instruction lane for a unit type. Unknown unit
@@ -112,7 +126,9 @@ export function composeContextModeInstructions(unitType, opts) {
     if (!manifest || manifest.contextMode === "none")
         return "";
     const lane = CONTEXT_MODE_LANE_LABELS[manifest.contextMode];
-    const guidance = CONTEXT_MODE_GUIDANCE_BY_UNIT[unitType] ?? CONTEXT_MODE_GUIDANCE_BY_LANE[manifest.contextMode];
+    const guidance = (opts.renderMode === "nested" ? CONTEXT_MODE_NESTED_GUIDANCE_BY_UNIT[unitType] : undefined)
+        ?? CONTEXT_MODE_GUIDANCE_BY_UNIT[unitType]
+        ?? CONTEXT_MODE_GUIDANCE_BY_LANE[manifest.contextMode];
     if (opts.renderMode === "nested") {
         return `Context Mode (${lane} lane): ${guidance}`;
     }

package/dist/resources/extensions/gsd/unit-registry.js

@@ -51,7 +51,13 @@ export const UNIT_REGISTRY = {
         scopeClass: "standard",
         phaseChain: ["research"],
         toolContract: {
-            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            allowedGsdTools: [
+                "gsd_summary_save",
+                "gsd_decision_save",
+                "gsd_exec",
+                "gsd_exec_search",
+                "gsd_resume",
+            ],
             requiredWorkflowTools: ["gsd_summary_save"],
         },
     },
@@ -107,7 +113,15 @@ export const UNIT_REGISTRY = {
         scopeClass: "section-close",
         phaseChain: ["validation", "planning"],
         toolContract: {
-            allowedGsdTools: ["gsd_milestone_status", "gsd_validate_milestone", "gsd_reassess_roadmap", "subagent"],
+            allowedGsdTools: [
+                "gsd_milestone_status",
+                "gsd_exec",
+                "gsd_exec_search",
+                "gsd_resume",
+                "gsd_validate_milestone",
+                "gsd_reassess_roadmap",
+                "subagent",
+            ],
             requiredWorkflowTools: ["gsd_milestone_status", "gsd_validate_milestone", "gsd_reassess_roadmap"],
         },
     },
@@ -118,6 +132,9 @@ export const UNIT_REGISTRY = {
         toolContract: {
             allowedGsdTools: [
                 "gsd_milestone_status",
+                "gsd_exec",
+                "gsd_exec_search",
+                "gsd_resume",
                 "gsd_requirement_update",
                 "gsd_summary_save",
                 "gsd_complete_milestone",
@@ -197,6 +214,8 @@ export const UNIT_REGISTRY = {
             allowedGsdTools: [
                 "gsd_milestone_status",
                 "gsd_exec",
+                "gsd_exec_search",
+                "gsd_resume",
                 "gsd_slice_complete",
                 "gsd_task_reopen",
                 "gsd_replan_slice",
@@ -366,12 +385,15 @@ export const UNIT_REGISTRY = {
             requiredWorkflowTools: ["ask_user_questions"],
         },
     },
+    // research-project dispatches 4 parallel scout subagents (Task calls); each scout
+    // writes one file under .gsd/research/ directly. The parent coordinator does not
+    // call gsd_summary_save or gsd_decision_save — the scouts own their own output.
     "research-project": {
         kind: "primary",
         scopeClass: "standard",
         phaseChain: ["research"],
         toolContract: {
-            allowedGsdTools: ["gsd_summary_save", "gsd_decision_save"],
+            allowedGsdTools: [],
             requiredWorkflowTools: [],
         },
     },

package/dist/resources/extensions/gsd/unmerged-milestone-guard.js

@@ -1,12 +1,12 @@
 // Project/App: gsd-pi
 // File Purpose: Block new workflow entry when completed milestone branches are still unmerged.
+import { execFileSync } from "node:child_process";
 import { nativeBranchExists, nativeDetectMainBranch, nativeDiffNumstat, nativeIsAncestor, } from "./native-git-bridge.js";
 import { autoWorktreeBranch } from "./auto-worktree.js";
 import { ensureDbOpen } from "./bootstrap/dynamic-tools.js";
 import { getAllMilestones } from "./gsd-db.js";
 import { resolveMilestoneIntegrationBranch } from "./git-service.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
-import { captureRootDirtySnapshot } from "./root-write-leak-guard.js";
 import { isClosedStatus } from "./status-guards.js";
 const BLOCKED_COMMANDS = new Set([
     "auto",
@@ -49,6 +49,33 @@ const UNMERGED_SAFE_PARALLEL_SUBCOMMANDS = new Set([
 function isRuntimePath(path) {
     return path === ".gsd" || path.startsWith(".gsd/");
 }
+function captureDirtyPathStatusSnapshot(rootPath) {
+    const snapshot = new Map();
+    let status = "";
+    try {
+        status = execFileSync("git", ["status", "--porcelain", "--untracked-files=all"], {
+            cwd: rootPath,
+            stdio: ["ignore", "pipe", "pipe"],
+            encoding: "utf-8",
+        });
+    }
+    catch {
+        return snapshot;
+    }
+    for (const line of status.split("\n")) {
+        if (!line.trim())
+            continue;
+        const code = line.slice(0, 2);
+        const path = line.slice(3).replace(/^"|"$/g, "");
+        if (!path || isRuntimePath(path))
+            continue;
+        snapshot.set(path, {
+            path,
+            status: code.trim() || code,
+        });
+    }
+    return snapshot;
+}
 function formatCommandLabel(attemptedCommand) {
     const trimmed = attemptedCommand.trim();
     return trimmed ? `/gsd ${trimmed}` : "/gsd";
@@ -109,7 +136,7 @@ export function isUnmergedMilestoneAllowedCommand(trimmed) {
 export async function findUnmergedCompletedMilestones(base) {
     await ensureDbOpen(base);
     const blockers = [];
-    const dirtyByPath = captureRootDirtySnapshot(base);
+    let dirtyByPath = null;
     for (const milestone of getAllMilestones()) {
         if (!isClosedStatus(milestone.status))
             continue;
@@ -134,13 +161,16 @@ export async function findUnmergedCompletedMilestones(base) {
         const uniqueFiles = [...new Set(files)].sort();
         if (uniqueFiles.length === 0)
             continue;
+        if (!dirtyByPath)
+            dirtyByPath = captureDirtyPathStatusSnapshot(base);
+        const dirtySnapshot = dirtyByPath;
         blockers.push({
             milestoneId: milestone.id,
             branch,
             integrationBranch,
             files: uniqueFiles,
             dirtyOverlap: uniqueFiles
-                .map((path) => dirtyByPath.get(path))
+                .map((path) => dirtySnapshot.get(path))
                 .filter((entry) => Boolean(entry)),
         });
     }

package/dist/resources/extensions/gsd/validation-block-guard.js

@@ -5,7 +5,7 @@ import { getAutoWorktreePath, isInAutoWorktree } from "./auto-worktree.js";
 import { ensureDbOpen } from "./bootstrap/dynamic-tools.js";
 import { refreshWorkflowDatabaseFromDisk } from "./db-workspace.js";
 import { getIsolationMode } from "./preferences.js";
-import { deriveState } from "./state.js";
+import { deriveState, invalidateStateCache } from "./state.js";
 import { detectWorktreeName } from "./worktree.js";
 const VALIDATION_BLOCK_RE = /milestone validation returned needs-(?:attention|remediation)|validation verdict is needs-(?:attention|remediation)/i;
 const VALIDATION_SAFE_DISPATCH_COMMANDS = new Set([
@@ -116,9 +116,7 @@ export function formatValidationBlockedMessage(state, attemptedCommand = "") {
         ...blockers,
     ].join("\n\n");
 }
-export async function getValidationBlockMessageForBase(base, attemptedCommand = "") {
-    await ensureDbOpen(base);
-    refreshWorkflowDatabaseFromDisk();
+async function deriveValidationBlockState(base) {
     let state = await deriveState(base);
     if (state.activeMilestone &&
         getIsolationMode(base) === "worktree" &&
@@ -129,5 +127,12 @@ export async function getValidationBlockMessageForBase(base, attemptedCommand =
             state = await deriveState(wtPath);
         }
     }
+    return state;
+}
+export async function getValidationBlockMessageForBase(base, attemptedCommand = "") {
+    await ensureDbOpen(base);
+    refreshWorkflowDatabaseFromDisk();
+    invalidateStateCache();
+    const state = await deriveValidationBlockState(base);
     return formatValidationBlockedMessage(state, attemptedCommand);
 }

package/dist/resources/extensions/gsd/workspace-git-preflight.js

@@ -4,9 +4,11 @@ import { existsSync, realpathSync } from "node:fs";
 import { getAutoWorktreePath } from "./auto-worktree.js";
 import { isSafeToAutoResolve } from "./auto-worktree.js";
 import { ensureDbOpen } from "./bootstrap/dynamic-tools.js";
-import { probeGitConflictState, reconcileGitConflictsOnSignal, } from "./git-conflict-state.js";
+import { listMergeStateBlockers, probeGitConflictState, reconcileGitConflictsOnSignal, } from "./git-conflict-state.js";
 import { deriveState } from "./state.js";
 import { resolveWorktreeProjectRoot } from "./worktree-root.js";
+const CLEAN_TARGET_CACHE_TTL_MS = 10_000;
+const cleanTargetProbeCache = new Map();
 function normalizeTargetPath(path) {
     try {
         return realpathSync(path);
@@ -77,6 +79,25 @@ function formatBlockReason(severity, conflictedPaths, targets) {
 }
 async function ensureTargetGitReady(target) {
     const fixesApplied = [];
+    const cacheKey = normalizeTargetPath(target);
+    const cachedCleanAt = cleanTargetProbeCache.get(cacheKey);
+    if (cachedCleanAt !== undefined) {
+        if (Date.now() - cachedCleanAt < CLEAN_TARGET_CACHE_TTL_MS) {
+            // Merge-state markers (MERGE_HEAD, rebase-apply, rebase-merge) are the most
+            // common way a repo transitions from clean to dirty within the TTL window,
+            // including when a non-git folder is initialized as a repo mid-TTL and a
+            // merge immediately introduces conflicts. Check them here — they are pure
+            // existsSync calls with no git subprocess — and fall through to a full probe
+            // only when markers are present.
+            if (listMergeStateBlockers(cacheKey).length === 0) {
+                return { ok: true, fixesApplied };
+            }
+            cleanTargetProbeCache.delete(cacheKey);
+        }
+        else {
+            cleanTargetProbeCache.delete(cacheKey);
+        }
+    }
     let probe = probeGitConflictState(target);
     for (let attempt = 0; attempt < 3 && probe.status === "dirty"; attempt++) {
         const beforeKey = JSON.stringify({
@@ -95,6 +116,7 @@ async function ensureTargetGitReady(target) {
             break;
     }
     if (probe.status === "unknown") {
+        cleanTargetProbeCache.delete(cacheKey);
         return {
             ok: false,
             reason: formatBlockReason("unrecoverable", [], [target]),
@@ -106,6 +128,7 @@ async function ensureTargetGitReady(target) {
     }
     const conflictedPaths = productConflictPaths(probe);
     if (conflictedPaths.length > 0 || probe.checkFailures.length > 0) {
+        cleanTargetProbeCache.delete(cacheKey);
         return {
             ok: false,
             reason: formatBlockReason("product-conflicts", conflictedPaths, [target]),
@@ -115,6 +138,12 @@ async function ensureTargetGitReady(target) {
             targets: [target],
         };
     }
+    if (probe.status === "clean") {
+        cleanTargetProbeCache.set(cacheKey, Date.now());
+    }
+    else {
+        cleanTargetProbeCache.delete(cacheKey);
+    }
     return { ok: true, fixesApplied };
 }
 /** Probe and heal a single git root (tests and headless paths). */