From 382390de9781717cd8ec827fe9fd93ff77cc3382 Mon Sep 17 00:00:00 2001
From: PR Babysitter <jeremy@fluxlabs.net>
Date: Fri, 15 May 2026 19:54:48 -0500
Subject: [PATCH] fix(issue): auto-mode: session_start hook wipes
 markDepthVerified, causing discuss-milestone infinite loop (regression of
 #4973)

---
 .../extensions/gsd/bootstrap/register-hooks.ts   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/resources/extensions/gsd/bootstrap/register-hooks.ts b/src/resources/extensions/gsd/bootstrap/register-hooks.ts
index 716725da5f..528a9122c1 100644
--- a/src/resources/extensions/gsd/bootstrap/register-hooks.ts
+++ b/src/resources/extensions/gsd/bootstrap/register-hooks.ts
@@ -467,12 +467,15 @@ export function registerHooks(
 
   pi.on("session_start", async (_event, ctx) => {
     const basePath = contextBasePath(ctx);
+    const autoActive = isAutoActive();
     initSessionNotifications(ctx);
-    if (!isAutoActive()) {
+    if (!autoActive) {
       const { initHealthWidget } = await import("../health-widget.js");
       initHealthWidget(ctx);
     }
-    resetWriteGateState(basePath);
+    // #5945: preserve auto-dispatch pre-marked depth verification across
+    // spawned session startup so discuss-milestone can write CONTEXT.
+    if (!autoActive) resetWriteGateState(basePath);
     resetToolCallLoopGuard();
     approvalQuestionAbortInFlight = false;
     clearDeferredApprovalGate();
@@ -495,19 +498,20 @@ export function registerHooks(
     } catch { /* non-fatal */ }
     await installWelcomeHeader(ctx);
     await loadToolApiKeysForSession();
-    if (isAutoActive()) {
+    if (autoActive) {
       ctx.ui.setWidget("gsd-health", undefined);
     }
   });
 
   pi.on("session_switch", async (_event, ctx) => {
     const basePath = contextBasePath(ctx);
+    const autoActive = isAutoActive();
     initSessionNotifications(ctx);
-    resetWriteGateState(basePath);
+    if (!autoActive) resetWriteGateState(basePath);
     resetToolCallLoopGuard();
     clearDeferredApprovalGate();
     await resetAskUserQuestionsTurnCache();
-    clearDiscussionFlowState(basePath);
+    if (!autoActive) clearDiscussionFlowState(basePath);
     await syncServiceTierStatus(ctx);
     await applyDisabledModelProviderPolicy(ctx);
     await applyCompactionThresholdOverride(ctx);
@@ -521,7 +525,7 @@ export function registerHooks(
       prepareWorkflowMcpForProject(ctx, basePath);
     }
     await loadToolApiKeysForSession();
-    if (!isAutoActive()) {
+    if (!autoActive) {
       ctx.ui.setWidget("gsd-progress", undefined);
       ctx.ui.setWidget("gsd-outcome", undefined);
       const { initHealthWidget } = await import("../health-widget.js");