gsd-pi 2.78.1-dev.82bcf6b71 → 2.78.1-dev.84c045fd2

package/src/resources/extensions/gsd/auto/phases.ts

@@ -11,7 +11,12 @@ import { importExtensionModule, type ExtensionAPI, type ExtensionContext } from
 
 import type { AutoSession, SidecarItem } from "./session.js";
 import type { LoopDeps } from "./loop-deps.js";
-import type { PostUnitContext, PreVerificationOpts } from "../auto-post-unit.js";
+import {
+  USER_DRIVEN_DEEP_UNITS,
+  isAwaitingUserInput,
+  type PostUnitContext,
+  type PreVerificationOpts,
+} from "../auto-post-unit.js";
 import type { Phase } from "../types.js";
 import {
   MAX_RECOVERY_CHARS,
@@ -52,7 +57,7 @@ import { getEligibleSlices } from "../slice-parallel-eligibility.js";
 import { startSliceParallel } from "../slice-parallel-orchestrator.js";
 import { isDbAvailable, getMilestoneSlices } from "../gsd-db.js";
 import type { MinimalModelRegistry } from "../context-budget.js";
-import { ensurePlanV2Graph, isMissingFinalizedContextResult } from "../uok/plan-v2.js";
+import { ensurePlanV2Graph, isEmptyPlanV2GraphResult, isMissingFinalizedContextResult } from "../uok/plan-v2.js";
 import { resolveUokFlags } from "../uok/flags.js";
 import { UokGateRunner } from "../uok/gate-runner.js";
 import { resetEvidence, loadEvidenceFromDisk } from "../safety/evidence-collector.js";
@@ -409,8 +414,52 @@ export async function runPreDispatch(
 
   // Derive state
   let state = await deps.deriveState(s.basePath);
-  if (prefs?.uok?.plan_v2?.enabled && shouldRunPlanV2Gate(state.phase)) {
-    const compiled = ensurePlanV2Graph(s.basePath, state);
+  const { getDeepStageGate } = await import("../auto-dispatch.js");
+  const deepStageGate = getDeepStageGate(prefs, s.basePath);
+  const canRunDeepSetupGate =
+    state.phase === "pre-planning" ||
+    state.phase === "needs-discussion" ||
+    state.phase === "planning";
+  if (
+    canRunDeepSetupGate &&
+    (deepStageGate.status === "pending" || deepStageGate.status === "blocked")
+  ) {
+    debugLog("autoLoop", {
+      phase: "deep-project-stage-gate",
+      stage: deepStageGate.stage,
+      status: deepStageGate.status,
+      reason: deepStageGate.reason,
+    });
+    return {
+      action: "next",
+      data: {
+        state: {
+          ...state,
+          phase: "pre-planning",
+          activeMilestone: null,
+          activeSlice: null,
+          activeTask: null,
+          nextAction: deepStageGate.reason,
+        },
+        mid: "PROJECT",
+        midTitle: "Project setup",
+      },
+    };
+  }
+
+  if (uokFlags.planV2 && shouldRunPlanV2Gate(state.phase)) {
+    let compiled = ensurePlanV2Graph(s.basePath, state);
+    if (isEmptyPlanV2GraphResult(compiled)) {
+      deps.invalidateAllCaches();
+      state = await deps.deriveState(s.basePath);
+      compiled = shouldRunPlanV2Gate(state.phase)
+        ? ensurePlanV2Graph(s.basePath, state)
+        : {
+            ok: true,
+            reason: "empty plan-v2 graph recovered by state rederive",
+            nodeCount: 0,
+          };
+    }
     if (!compiled.ok) {
       const reason = compiled.reason ?? "Plan v2 compilation failed";
       if (isMissingFinalizedContextResult(compiled)) {
@@ -607,7 +656,7 @@ export async function runPreDispatch(
     midTitle = state.activeMilestone?.title;
 
     if (mid) {
-      if (deps.getIsolationMode() !== "none") {
+      if (deps.getIsolationMode(s.basePath) !== "none") {
         deps.captureIntegrationBranch(s.basePath, mid);
       }
       deps.resolver.enterMilestone(mid, ctx.ui);
@@ -903,10 +952,16 @@ export async function runDispatch(
     ? ctx.modelRegistry.getProviderAuthMode(provider)
     : undefined;
   const activeTools = typeof pi.getActiveTools === "function" ? pi.getActiveTools() : [];
-  const structuredQuestionsAvailable = supportsStructuredQuestions(activeTools, {
-    authMode,
-    baseUrl: ctx.model?.baseUrl,
-  }) ? "true" : "false";
+  // Deep planning intentionally keeps human checkpoints in plain chat. In
+  // Claude Code/local MCP transports, structured question requests can be
+  // cancelled outside the normal chat flow, which made approval gates easy to
+  // skip or bury under tool output.
+  const structuredQuestionsAvailable = prefs?.planning_depth === "deep"
+    ? "false"
+    : supportsStructuredQuestions(activeTools, {
+        authMode,
+        baseUrl: ctx.model?.baseUrl,
+      }) ? "true" : "false";
 
   debugLog("autoLoop", { phase: "dispatch-resolve", iteration: ic.iteration });
   const dispatchResult = await deps.resolveDispatch({
@@ -918,6 +973,7 @@ export async function runDispatch(
     session: s,
     structuredQuestionsAvailable,
     sessionContextWindow: ctx.model?.contextWindow,
+    sessionProvider: ctx.model?.provider,
     modelRegistry: ctx.modelRegistry as MinimalModelRegistry | undefined,
   });
 
@@ -1405,6 +1461,7 @@ export async function runUnitPhase(
   s.currentUnit = { type: unitType, id: unitId, startedAt: Date.now() };
   s.lastGitActionFailure = null;
   s.lastGitActionStatus = null;
+  s.lastUnitAgentEndMessages = null;
   setCurrentPhase(unitType);
   s.lastToolInvocationError = null; // #2883: clear stale error from previous unit
   const unitStartSeq = ic.nextSeq();
@@ -1639,6 +1696,7 @@ export async function runUnitPhase(
     unitId,
     finalPrompt,
   );
+  s.lastUnitAgentEndMessages = unitResult.event?.messages ?? null;
   debugLog("autoLoop", {
     phase: "runUnit-end",
     iteration: ic.iteration,
@@ -1840,19 +1898,27 @@ export async function runUnitPhase(
         (u: { type: string; id: string; startedAt: number; toolCalls: number }) => u.type === unitType && u.id === unitId && u.startedAt === s.currentUnit?.startedAt,
       );
       if (lastUnit && lastUnit.toolCalls === 0) {
-        debugLog("runUnitPhase", {
-          phase: "zero-tool-calls",
-          unitType,
-          unitId,
-          warning: "Unit completed with 0 tool calls — likely context exhaustion, marking as failed",
-        });
-        ctx.ui.notify(
-          `${unitType} ${unitId} completed with 0 tool calls — context exhaustion, will retry`,
-          "warning",
-        );
-        // Fall through to next iteration where dispatch will re-derive
-        // and re-dispatch this unit.
-        return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt, requestDispatchedAt: unitResult.requestDispatchedAt } };
+        if (USER_DRIVEN_DEEP_UNITS.has(unitType) && isAwaitingUserInput(s.lastUnitAgentEndMessages ?? undefined)) {
+          debugLog("runUnitPhase", {
+            phase: "zero-tool-calls-awaiting-user-input",
+            unitType,
+            unitId,
+          });
+        } else {
+          debugLog("runUnitPhase", {
+            phase: "zero-tool-calls",
+            unitType,
+            unitId,
+            warning: "Unit completed with 0 tool calls — likely context exhaustion, marking as failed",
+          });
+          ctx.ui.notify(
+            `${unitType} ${unitId} completed with 0 tool calls — context exhaustion, will retry`,
+            "warning",
+          );
+          // Fall through to next iteration where dispatch will re-derive
+          // and re-dispatch this unit.
+          return { action: "next", data: { unitStartedAt: s.currentUnit?.startedAt, requestDispatchedAt: unitResult.requestDispatchedAt } };
+        }
       }
     }
   }
@@ -1960,11 +2026,11 @@ export async function runFinalize(
   // mutations are harmless — postUnitPreVerification guards all side effects
   // behind `if (s.currentUnit)`. The next iteration sets a fresh currentUnit.
   // Sidecar items use lightweight pre-verification opts
-  const preVerificationOpts: PreVerificationOpts | undefined = sidecarItem
+  const preVerificationOpts: PreVerificationOpts = sidecarItem
     ? sidecarItem.kind === "hook"
-      ? { skipSettleDelay: true, skipWorktreeSync: true }
-      : { skipSettleDelay: true }
-    : undefined;
+      ? { skipSettleDelay: true, skipWorktreeSync: true, agentEndMessages: s.lastUnitAgentEndMessages ?? undefined }
+      : { skipSettleDelay: true, agentEndMessages: s.lastUnitAgentEndMessages ?? undefined }
+    : { agentEndMessages: s.lastUnitAgentEndMessages ?? undefined };
   const preUnitSnapshot = s.currentUnit
     ? { type: s.currentUnit.type, id: s.currentUnit.id, startedAt: s.currentUnit.startedAt }
     : null;

package/src/resources/extensions/gsd/auto/session.ts

@@ -163,6 +163,8 @@ export class AutoSession {
   /** Set when a GSD tool execution ends with isError due to malformed/truncated
    *  JSON arguments. Checked by postUnitPreVerification to break retry loops. */
   lastToolInvocationError: string | null = null;
+  /** Agent-end messages from the just-finished unit, consumed during finalize. */
+  lastUnitAgentEndMessages: unknown[] | null = null;
   /** Set when turn-level git action fails during closeout. */
   lastGitActionFailure: string | null = null;
   /** Last turn-level git action status captured during finalize. */
@@ -298,6 +300,7 @@ export class AutoSession {
     this.consecutiveCompleteBootstraps = 0;
     this.lastPreExecFailure = null;
     this.lastToolInvocationError = null;
+    this.lastUnitAgentEndMessages = null;
     this.lastGitActionFailure = null;
     this.lastGitActionStatus = null;
     this.isolationDegraded = false;

package/src/resources/extensions/gsd/auto-artifact-paths.ts

@@ -5,7 +5,10 @@
 // function was removed entirely — callers now query WorkflowEngine directly.
 
 import {
+  gsdRoot,
+  resolveMilestoneFile,
   resolveMilestonePath,
+  resolveSliceFile,
   resolveSlicePath,
   relMilestoneFile,
   relSliceFile,
@@ -16,6 +19,29 @@ import {
 import { parseUnitId } from "./unit-id.js";
 import { join } from "node:path";
 
+function resolveMilestoneArtifactPath(
+  base: string,
+  mid: string,
+  suffix: string,
+): string | null {
+  const existing = resolveMilestoneFile(base, mid, suffix);
+  if (existing) return existing;
+  const dir = resolveMilestonePath(base, mid);
+  return dir ? join(dir, buildMilestoneFileName(mid, suffix)) : null;
+}
+
+function resolveSliceArtifactPath(
+  base: string,
+  mid: string,
+  sid: string,
+  suffix: string,
+): string | null {
+  const existing = resolveSliceFile(base, mid, sid, suffix);
+  if (existing) return existing;
+  const dir = resolveSlicePath(base, mid, sid);
+  return dir ? join(dir, buildSliceFileName(sid, suffix)) : null;
+}
+
 /**
  * Resolve the expected artifact for a unit to an absolute path.
  */
@@ -26,21 +52,27 @@ export function resolveExpectedArtifactPath(
 ): string | null {
   const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
   switch (unitType) {
+    case "workflow-preferences":
+      return join(gsdRoot(base), "PREFERENCES.md");
+    case "discuss-project":
+      return join(gsdRoot(base), "PROJECT.md");
+    case "discuss-requirements":
+      return join(gsdRoot(base), "REQUIREMENTS.md");
+    case "research-decision":
+      return join(gsdRoot(base), "runtime", "research-decision.json");
+    case "research-project":
+      return join(gsdRoot(base), "research", "PROJECT-RESEARCH-BLOCKER.md");
     case "discuss-milestone": {
-      const dir = resolveMilestonePath(base, mid);
-      return dir ? join(dir, buildMilestoneFileName(mid, "CONTEXT")) : null;
+      return resolveMilestoneArtifactPath(base, mid, "CONTEXT");
     }
     case "discuss-slice": {
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "CONTEXT")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "CONTEXT");
     }
     case "research-milestone": {
-      const dir = resolveMilestonePath(base, mid);
-      return dir ? join(dir, buildMilestoneFileName(mid, "RESEARCH")) : null;
+      return resolveMilestoneArtifactPath(base, mid, "RESEARCH");
     }
     case "plan-milestone": {
-      const dir = resolveMilestonePath(base, mid);
-      return dir ? join(dir, buildMilestoneFileName(mid, "ROADMAP")) : null;
+      return resolveMilestoneArtifactPath(base, mid, "ROADMAP");
     }
     case "research-slice": {
       // #4414: Sentinel unitId "{mid}/parallel-research" fans out across
@@ -48,30 +80,22 @@ export function resolveExpectedArtifactPath(
       // blocker escalation has somewhere to write. Verification for this
       // sentinel is handled directly in verifyExpectedArtifact.
       if (sid === "parallel-research") {
-        const mdir = resolveMilestonePath(base, mid);
-        return mdir
-          ? join(mdir, buildMilestoneFileName(mid, "PARALLEL-BLOCKER"))
-          : null;
+        return resolveMilestoneArtifactPath(base, mid, "PARALLEL-BLOCKER");
       }
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "RESEARCH")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "RESEARCH");
     }
     case "plan-slice": {
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "PLAN")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "PLAN");
     }
     case "refine-slice": {
       // ADR-011: refine-slice expands a sketch and writes the same PLAN.md as plan-slice.
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "PLAN")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "PLAN");
     }
     case "reassess-roadmap": {
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "ASSESSMENT")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "ASSESSMENT");
     }
     case "run-uat": {
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "ASSESSMENT")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "ASSESSMENT");
     }
     case "execute-task": {
       const dir = resolveSlicePath(base, mid, sid!);
@@ -80,20 +104,16 @@ export function resolveExpectedArtifactPath(
         : null;
     }
     case "complete-slice": {
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "SUMMARY")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "SUMMARY");
     }
     case "validate-milestone": {
-      const dir = resolveMilestonePath(base, mid);
-      return dir ? join(dir, buildMilestoneFileName(mid, "VALIDATION")) : null;
+      return resolveMilestoneArtifactPath(base, mid, "VALIDATION");
     }
     case "complete-milestone": {
-      const dir = resolveMilestonePath(base, mid);
-      return dir ? join(dir, buildMilestoneFileName(mid, "SUMMARY")) : null;
+      return resolveMilestoneArtifactPath(base, mid, "SUMMARY");
     }
     case "replan-slice": {
-      const dir = resolveSlicePath(base, mid, sid!);
-      return dir ? join(dir, buildSliceFileName(sid!, "REPLAN")) : null;
+      return resolveSliceArtifactPath(base, mid, sid!, "REPLAN");
     }
     case "rewrite-docs":
       return null;
@@ -115,6 +135,16 @@ export function diagnoseExpectedArtifact(
 ): string | null {
   const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
   switch (unitType) {
+    case "workflow-preferences":
+      return ".gsd/PREFERENCES.md with workflow_prefs_captured: true";
+    case "discuss-project":
+      return ".gsd/PROJECT.md (valid project context)";
+    case "discuss-requirements":
+      return ".gsd/REQUIREMENTS.md (valid requirements registry)";
+    case "research-decision":
+      return ".gsd/runtime/research-decision.json with decision research|skip";
+    case "research-project":
+      return ".gsd/research/{STACK,FEATURES,ARCHITECTURE,PITFALLS}.md with at least one real research file; blocker-only outputs stop";
     case "discuss-milestone":
       return `${relMilestoneFile(base, mid, "CONTEXT")} (milestone context from discussion)`;
     case "discuss-slice":

package/src/resources/extensions/gsd/auto-dashboard.ts

@@ -19,7 +19,6 @@ import { getActiveHook } from "./post-unit-hooks.js";
 import { getLedger, getProjectTotals } from "./metrics.js";
 import { getErrorMessage } from "./error-utils.js";
 import { nativeIsRepo } from "./native-git-bridge.js";
-import { getHomeDir } from "./home-dir.js";
 import {
   resolveMilestoneFile,
   resolveSliceFile,
@@ -46,6 +45,7 @@ import {
 } from "../shared/rtk-session-stats.js";
 import { logWarning } from "./workflow-logger.js";
 import { formattedShortcutPair } from "./shortcut-defs.js";
+import { homedir } from "node:os";
 
 // ─── UAT Slice Extraction ─────────────────────────────────────────────────────
 
@@ -342,6 +342,16 @@ function refreshLastCommit(basePath: string): void {
       cachedLastCommit = null;
       return;
     }
+    try {
+      execFileSync("git", ["rev-parse", "--verify", "HEAD"], {
+        cwd: basePath,
+        stdio: ["pipe", "pipe", "pipe"],
+        timeout: 3000,
+      });
+    } catch {
+      cachedLastCommit = null;
+      return;
+    }
     const raw = execFileSync("git", ["log", "-1", "--format=%cr|%s"], {
       cwd: basePath,
       encoding: "utf-8",
@@ -583,7 +593,7 @@ export function updateProgressWidget(
   let widgetPwd: string;
   {
     let fullPwd = process.cwd();
-    const widgetHome = getHomeDir();
+    const widgetHome = homedir();
     if (widgetHome && (fullPwd === widgetHome || fullPwd.startsWith(widgetHome + "/") || fullPwd.startsWith(widgetHome + "\\"))) {
       fullPwd = `~${fullPwd.slice(widgetHome.length)}`;
     }

package/src/resources/extensions/gsd/auto-direct-dispatch.ts

@@ -120,6 +120,7 @@ export async function dispatchDirectPhase(
           {
             sessionContextWindow: ctx.model?.contextWindow,
             modelRegistry: ctx.modelRegistry as MinimalModelRegistry | undefined,
+            sessionProvider: ctx.model?.provider,
           },
         );
       } else {
@@ -151,6 +152,7 @@ export async function dispatchDirectPhase(
         {
           sessionContextWindow: ctx.model?.contextWindow,
           modelRegistry: ctx.modelRegistry as MinimalModelRegistry | undefined,
+          sessionProvider: ctx.model?.provider,
         },
       );
       break;