gsd-pi 2.78.0-dev.aeeb2ca00 → 2.78.1-dev.0fdacd524

package/dist/resources/extensions/gsd/bootstrap/register-hooks.js

@@ -1,22 +1,14 @@
 import { join } from "node:path";
 import { isToolCallEventType } from "@gsd/pi-coding-agent";
 import { updateSnapshot } from "../ecosystem/gsd-extension-api.js";
-import { getEcosystemReadyPromise } from "../ecosystem/loader.js";
 import { buildMilestoneFileName, resolveMilestonePath, resolveSliceFile, resolveSlicePath } from "../paths.js";
-import { buildBeforeAgentStartResult } from "./system-context.js";
-import { handleAgentEnd } from "./agent-end-recovery.js";
-import { clearDiscussionFlowState, isDepthConfirmationAnswer, isQueuePhaseActive, markDepthVerified, resetWriteGateState, shouldBlockContextWrite, shouldBlockQueueExecution, isGateQuestionId, setPendingGate, clearPendingGate, getPendingGate, shouldBlockPendingGate, shouldBlockPendingGateBash, extractDepthVerificationMilestoneId } from "./write-gate.js";
+import { clearDiscussionFlowState, isDepthConfirmationAnswer, isQueuePhaseActive, markDepthVerified, resetWriteGateState, shouldBlockContextWrite, shouldBlockPlanningUnit, shouldBlockQueueExecution, isGateQuestionId, setPendingGate, clearPendingGate, getPendingGate, shouldBlockPendingGate, shouldBlockPendingGateBash, extractDepthVerificationMilestoneId } from "./write-gate.js";
+import { resolveManifest } from "../unit-context-manifest.js";
 import { isBlockedStateFile, isBashWriteToStateFile, BLOCKED_WRITE_ERROR } from "../write-intercept.js";
-import { cleanupQuickBranch } from "../quick.js";
-import { getDiscussionMilestoneId } from "../guided-flow.js";
-import { loadToolApiKeys } from "../commands-config.js";
 import { loadFile, saveFile, formatContinue } from "../files.js";
-import { deriveState } from "../state.js";
-import { getAutoDashboardData, isAutoActive, isAutoPaused, markToolEnd, markToolStart, recordToolInvocationError } from "../auto.js";
-import { isParallelActive, shutdownParallel } from "../parallel-orchestrator.js";
+import { getAutoRuntimeSnapshot, isAutoActive, isAutoPaused, markToolEnd, markToolStart, recordToolInvocationError } from "../auto-runtime-state.js";
 import { checkToolCallLoop, resetToolCallLoopGuard } from "./tool-call-loop-guard.js";
 import { saveActivityLog } from "../activity-log.js";
-import { resetAskUserQuestionsCache } from "../../ask-user-questions.js";
 import { recordToolCall as safetyRecordToolCall, recordToolResult as safetyRecordToolResult, saveEvidenceToDisk } from "../safety/evidence-collector.js";
 import { parseUnitId } from "../unit-id.js";
 import { classifyCommand } from "../safety/destructive-guard.js";
@@ -24,26 +16,53 @@ import { logWarning as safetyLogWarning } from "../workflow-logger.js";
 import { installNotifyInterceptor } from "./notify-interceptor.js";
 import { initNotificationStore } from "../notification-store.js";
 import { initNotificationWidget } from "../notification-widget.js";
-import { initHealthWidget } from "../health-widget.js";
+import { extractSubagentAgentClasses } from "./subagent-input.js";
 // Skip the welcome screen on the very first session_start — cli.ts already
 // printed it before the TUI launched. Only re-print on /clear (subsequent sessions).
 let isFirstSession = true;
+async function deriveGsdState(basePath) {
+    const { deriveState } = await import("../state.js");
+    return deriveState(basePath);
+}
+async function getDiscussionMilestoneIdFor(basePath) {
+    const { getDiscussionMilestoneId } = await import("../guided-flow.js");
+    return getDiscussionMilestoneId(basePath);
+}
+async function loadToolApiKeysForSession() {
+    const { loadToolApiKeys } = await import("../commands-config.js");
+    loadToolApiKeys();
+}
+async function resetAskUserQuestionsTurnCache() {
+    const { resetAskUserQuestionsCache } = await import("../../ask-user-questions.js");
+    resetAskUserQuestionsCache();
+}
 async function syncServiceTierStatus(ctx) {
     const { getEffectiveServiceTier, formatServiceTierFooterStatus } = await import("../service-tier.js");
     ctx.ui.setStatus("gsd-fast", formatServiceTierFooterStatus(getEffectiveServiceTier(), ctx.model?.id));
 }
+async function applyDisabledModelProviderPolicy(ctx) {
+    try {
+        const { resolveDisabledModelProvidersFromPreferences } = await import("../preferences.js");
+        ctx.modelRegistry.setDisabledModelProviders(resolveDisabledModelProvidersFromPreferences());
+    }
+    catch {
+        // Non-fatal: keep default provider visibility if preferences cannot be loaded.
+    }
+}
 export function registerHooks(pi, ecosystemHandlers) {
     pi.on("session_start", async (_event, ctx) => {
         initNotificationStore(process.cwd());
         installNotifyInterceptor(ctx);
         initNotificationWidget(ctx);
         if (!isAutoActive()) {
+            const { initHealthWidget } = await import("../health-widget.js");
             initHealthWidget(ctx);
         }
         resetWriteGateState();
         resetToolCallLoopGuard();
-        resetAskUserQuestionsCache();
+        await resetAskUserQuestionsTurnCache();
         await syncServiceTierStatus(ctx);
+        await applyDisabledModelProviderPolicy(ctx);
         // Skip MCP auto-prep when running inside an auto-worktree (see session_switch below).
         const { isInAutoWorktree } = await import("../auto-worktree.js");
         if (!isInAutoWorktree(process.cwd())) {
@@ -79,7 +98,7 @@ export function registerHooks(pi, ecosystemHandlers) {
             }
             catch { /* non-fatal */ }
         }
-        loadToolApiKeys();
+        await loadToolApiKeysForSession();
         if (isAutoActive()) {
             ctx.ui.setWidget("gsd-health", undefined);
         }
@@ -89,9 +108,10 @@ export function registerHooks(pi, ecosystemHandlers) {
         installNotifyInterceptor(ctx);
         resetWriteGateState();
         resetToolCallLoopGuard();
-        resetAskUserQuestionsCache();
+        await resetAskUserQuestionsTurnCache();
         clearDiscussionFlowState();
         await syncServiceTierStatus(ctx);
+        await applyDisabledModelProviderPolicy(ctx);
         // Skip MCP auto-prep when running inside an auto-worktree. The worktree
         // already has .mcp.json from createAutoWorktree, and re-running the writer
         // post-chdir rewrites the file mid-run (non-idempotent due to cwd-relative
@@ -101,20 +121,26 @@ export function registerHooks(pi, ecosystemHandlers) {
             const { prepareWorkflowMcpForProject } = await import("../workflow-mcp-auto-prep.js");
             prepareWorkflowMcpForProject(ctx, process.cwd());
         }
-        loadToolApiKeys();
-        if (isAutoActive()) {
+        await loadToolApiKeysForSession();
+        if (!isAutoActive()) {
+            const { initHealthWidget } = await import("../health-widget.js");
+            initHealthWidget(ctx);
+        }
+        else {
             ctx.ui.setWidget("gsd-health", undefined);
         }
     });
     pi.on("before_agent_start", async (event, ctx) => {
         // Wait for ecosystem loader to finish (no-op after first turn).
+        const { getEcosystemReadyPromise } = await import("../ecosystem/loader.js");
         await getEcosystemReadyPromise();
         // GSD's own context injection (existing behavior — unchanged).
+        const { buildBeforeAgentStartResult } = await import("./system-context.js");
         const gsdResult = await buildBeforeAgentStartResult(event, ctx);
         // Refresh the snapshot used by ecosystem getPhase()/getActiveUnit().
         // deriveState has its own ~100ms cache so this is cheap on repeat calls.
         try {
-            const state = await deriveState(process.cwd());
+            const state = await deriveGsdState(process.cwd());
             updateSnapshot(state);
         }
         catch {
@@ -148,7 +174,8 @@ export function registerHooks(pi, ecosystemHandlers) {
     });
     pi.on("agent_end", async (event, ctx) => {
         resetToolCallLoopGuard();
-        resetAskUserQuestionsCache();
+        await resetAskUserQuestionsTurnCache();
+        const { handleAgentEnd } = await import("./agent-end-recovery.js");
         await handleAgentEnd(pi, event, ctx);
     });
     // Squash-merge quick-task branch back to the original branch after the
@@ -156,6 +183,7 @@ export function registerHooks(pi, ecosystemHandlers) {
     // quick-return state is pending, so this is safe to call on every turn.
     pi.on("turn_end", async () => {
         try {
+            const { cleanupQuickBranch } = await import("../quick.js");
             cleanupQuickBranch();
         }
         catch {
@@ -172,8 +200,8 @@ export function registerHooks(pi, ecosystemHandlers) {
         const basePath = process.cwd();
         const { ensureDbOpen } = await import("./dynamic-tools.js");
         await ensureDbOpen();
-        const state = await deriveState(basePath);
-        if (!state.activeMilestone || !state.activeSlice || !state.activeTask)
+        const state = await deriveGsdState(basePath);
+        if (!state.activeMilestone || !state.activeSlice)
             return;
         // Write checkpoint for ALL phases, not just "executing" — discuss, research,
         // and planning also carry in-memory state (user answers, gate verification)
@@ -189,21 +217,30 @@ export function registerHooks(pi, ecosystemHandlers) {
         if (await loadFile(legacyContinue))
             return;
         const continuePath = join(sliceDir, `${state.activeSlice.id}-CONTINUE.md`);
+        const taskId = state.activeTask?.id ?? "none";
+        const taskTitle = state.activeTask?.title ?? "";
+        const phaseLabel = state.phase.replace(/-/g, " ");
         await saveFile(continuePath, formatContinue({
             frontmatter: {
                 milestone: state.activeMilestone.id,
                 slice: state.activeSlice.id,
-                task: state.activeTask.id,
+                task: taskId,
                 step: 0,
                 totalSteps: 0,
                 status: "compacted",
                 savedAt: new Date().toISOString(),
             },
-            completedWork: `Task ${state.activeTask.id} (${state.activeTask.title}) was in progress when compaction occurred.`,
-            remainingWork: "Check the task plan for remaining steps.",
+            completedWork: state.activeTask
+                ? `Task ${taskId} (${taskTitle}) was in progress when compaction occurred.`
+                : `Slice ${state.activeSlice.id} was in ${phaseLabel} phase when compaction occurred.`,
+            remainingWork: state.activeTask
+                ? "Check the task plan for remaining steps."
+                : "Continue this slice from the latest planning/research/discussion artifacts.",
             decisions: "Check task summary files for prior decisions.",
             context: "Session was auto-compacted by Pi. Resume with /gsd.",
-            nextAction: `Resume task ${state.activeTask.id}: ${state.activeTask.title}.`,
+            nextAction: state.activeTask
+                ? `Resume task ${taskId}: ${taskTitle}.`
+                : `Resume ${phaseLabel} work for slice ${state.activeSlice.id}.`,
         }));
     });
     // Context-mode snapshot: write .gsd/last-snapshot.md before compaction so
@@ -225,7 +262,7 @@ export function registerHooks(pi, ecosystemHandlers) {
             const basePath = process.cwd();
             let activeContext = null;
             try {
-                const state = await deriveState(basePath);
+                const state = await deriveGsdState(basePath);
                 if (state.activeMilestone && state.activeSlice && state.activeTask) {
                     activeContext =
                         `Active: ${state.activeMilestone.id} / ${state.activeSlice.id} / ${state.activeTask.id}` +
@@ -242,6 +279,7 @@ export function registerHooks(pi, ecosystemHandlers) {
         }
     });
     pi.on("session_shutdown", async (_event, ctx) => {
+        const { isParallelActive, shutdownParallel } = await import("../parallel-orchestrator.js");
         if (isParallelActive()) {
             try {
                 await shutdownParallel(process.cwd());
@@ -252,7 +290,7 @@ export function registerHooks(pi, ecosystemHandlers) {
         }
         if (!isAutoActive() && !isAutoPaused())
             return;
-        const dash = getAutoDashboardData();
+        const dash = getAutoRuntimeSnapshot();
         if (dash.currentUnit) {
             saveActivityLog(ctx, dash.basePath, dash.currentUnit.type, dash.currentUnit.id);
         }
@@ -278,7 +316,7 @@ export function registerHooks(pi, ecosystemHandlers) {
         // If ask_user_questions was called with a gate ID but hasn't been confirmed,
         // block all non-read-only tool calls to prevent the model from skipping gates.
         if (getPendingGate()) {
-            const milestoneId = getDiscussionMilestoneId(discussionBasePath);
+            const milestoneId = await getDiscussionMilestoneIdFor(discussionBasePath);
             if (isToolCallEventType("bash", event)) {
                 const bashGuard = shouldBlockPendingGateBash(event.input.command, milestoneId, isQueuePhaseActive());
                 if (bashGuard.block)
@@ -309,6 +347,37 @@ export function registerHooks(pi, ecosystemHandlers) {
             if (queueGuard.block)
                 return queueGuard;
         }
+        // ── Planning-unit tools-policy enforcement (#4934): runtime half ─────
+        // The active auto-mode unit's manifest declares a ToolsPolicy. For
+        // planning/docs/read-only modes, deny writes outside .gsd/ (or the
+        // manifest's allowedPathGlobs), bash that isn't read-only, and
+        // subagent dispatch. Closes the b23 bug class where a discuss-milestone
+        // turn used the host Edit tool to modify user source files.
+        const dash = getAutoRuntimeSnapshot();
+        const activeUnitType = dash.currentUnit?.type;
+        if (activeUnitType) {
+            const manifest = resolveManifest(activeUnitType);
+            if (manifest) {
+                let planningInput = "";
+                let agentClasses;
+                if (isToolCallEventType("write", event)) {
+                    planningInput = event.input.path;
+                }
+                else if (isToolCallEventType("edit", event)) {
+                    planningInput = event.input.path;
+                }
+                else if (isToolCallEventType("bash", event)) {
+                    planningInput = event.input.command;
+                }
+                else if (event.toolName === "subagent" || event.toolName === "task") {
+                    // Subagent inputs use { agent }, { tasks: [{ agent }] }, or { chain: [{ agent }] }.
+                    agentClasses = extractSubagentAgentClasses(event.input);
+                }
+                const planningGuard = shouldBlockPlanningUnit(event.toolName, planningInput, dash.basePath || discussionBasePath, activeUnitType, manifest.tools, agentClasses);
+                if (planningGuard.block)
+                    return planningGuard;
+            }
+        }
         // ── Single-writer engine: block direct writes to STATE.md ──────────
         // Covers write, edit, and bash tools to prevent bypass vectors.
         if (isToolCallEventType("write", event)) {
@@ -328,7 +397,7 @@ export function registerHooks(pi, ecosystemHandlers) {
         }
         if (!isToolCallEventType("write", event))
             return;
-        const result = shouldBlockContextWrite(event.toolName, event.input.path, getDiscussionMilestoneId(discussionBasePath), isQueuePhaseActive());
+        const result = shouldBlockContextWrite(event.toolName, event.input.path, await getDiscussionMilestoneIdFor(discussionBasePath), isQueuePhaseActive());
         if (result.block)
             return result;
     });
@@ -338,6 +407,18 @@ export function registerHooks(pi, ecosystemHandlers) {
             return;
         markToolStart(event.toolCallId, event.toolName);
         safetyRecordToolCall(event.toolCallId, event.toolName, event.input);
+        // Persist immediately at dispatch so a mid-unit re-dispatch — which calls
+        // resetEvidence() + loadEvidenceFromDisk() in runUnitPhase — cannot wipe
+        // the entry between tool_call and tool_execution_end. Without this, the
+        // race window equals the tool's runtime, producing the "no bash calls"
+        // false positive when the LLM clearly ran a verification command.
+        const callDash = getAutoRuntimeSnapshot();
+        if (callDash.basePath && callDash.currentUnit?.type === "execute-task") {
+            const { milestone: cMid, slice: cSid, task: cTid } = parseUnitId(callDash.currentUnit.id);
+            if (cMid && cSid && cTid) {
+                saveEvidenceToDisk(callDash.basePath, cMid, cSid, cTid);
+            }
+        }
         // Destructive command classification (warn only, never block)
         if (isToolCallEventType("bash", event)) {
             const classification = classifyCommand(event.input.command);
@@ -368,7 +449,7 @@ export function registerHooks(pi, ecosystemHandlers) {
         }
         if (event.toolName !== "ask_user_questions")
             return;
-        const milestoneId = getDiscussionMilestoneId(process.cwd());
+        const milestoneId = await getDiscussionMilestoneIdFor(process.cwd());
         const queueActive = isQueuePhaseActive();
         const details = event.details;
         // ── Discussion gate enforcement: handle gate question responses ──
@@ -464,7 +545,7 @@ export function registerHooks(pi, ecosystemHandlers) {
             safetyRecordToolResult(event.toolCallId, event.toolName, event.result, event.isError);
             // Persist evidence to disk after each tool result so it survives a session
             // restart mid-unit (Bug #4385 — non-persisted evidence false positives).
-            const dash = getAutoDashboardData();
+            const dash = getAutoRuntimeSnapshot();
             if (dash.basePath && dash.currentUnit?.type === "execute-task") {
                 const { milestone: pMid, slice: pSid, task: pTid } = parseUnitId(dash.currentUnit.id);
                 if (pMid && pSid && pTid) {

package/dist/resources/extensions/gsd/bootstrap/register-shortcuts.js

@@ -1,12 +1,12 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { Key } from "@gsd/pi-tui";
-import { GSDDashboardOverlay } from "../dashboard-overlay.js";
-import { GSDNotificationOverlay } from "../notification-overlay.js";
-import { ParallelMonitorOverlay } from "../parallel-monitor-overlay.js";
 import { GSD_SHORTCUTS } from "../shortcut-defs.js";
-import { projectRoot } from "../commands/context.js";
 import { shortcutDesc } from "../../shared/mod.js";
+async function getProjectRoot() {
+    const { projectRoot } = await import("../commands/context.js");
+    return projectRoot();
+}
 export function registerShortcuts(pi) {
     const overlayOptions = {
         width: "90%",
@@ -15,7 +15,10 @@ export function registerShortcuts(pi) {
         anchor: "center",
     };
     const openDashboardOverlay = async (ctx) => {
-        const basePath = projectRoot();
+        const [{ GSDDashboardOverlay }, basePath] = await Promise.all([
+            import("../dashboard-overlay.js"),
+            getProjectRoot(),
+        ]);
         if (!existsSync(join(basePath, ".gsd"))) {
             ctx.ui.notify("No .gsd/ directory found. Run /gsd to start.", "info");
             return;
@@ -26,6 +29,7 @@ export function registerShortcuts(pi) {
         });
     };
     const openNotificationsOverlay = async (ctx) => {
+        const { GSDNotificationOverlay } = await import("../notification-overlay.js");
         await ctx.ui.custom((tui, theme, _kb, done) => new GSDNotificationOverlay(tui, theme, () => done(true)), {
             overlay: true,
             overlayOptions: {
@@ -38,12 +42,13 @@ export function registerShortcuts(pi) {
         });
     };
     const openParallelOverlay = async (ctx) => {
-        const basePath = projectRoot();
+        const basePath = await getProjectRoot();
         const parallelDir = join(basePath, ".gsd", "parallel");
         if (!existsSync(parallelDir)) {
             ctx.ui.notify("No parallel workers found. Run /gsd parallel start first.", "info");
             return;
         }
+        const { ParallelMonitorOverlay } = await import("../parallel-monitor-overlay.js");
         await ctx.ui.custom((tui, theme, _kb, done) => new ParallelMonitorOverlay(tui, theme, () => done(true), basePath), {
             overlay: true,
             overlayOptions,

package/dist/resources/extensions/gsd/bootstrap/subagent-input.js

@@ -0,0 +1,22 @@
+export function extractSubagentAgentClasses(input) {
+    if (!input || typeof input !== "object")
+        return [];
+    const record = input;
+    const agentClasses = [];
+    const addAgentClass = (value) => {
+        if (typeof value === "string" && value.trim().length > 0)
+            agentClasses.push(value.trim());
+    };
+    const addFromItems = (value) => {
+        if (!Array.isArray(value))
+            return;
+        for (const item of value) {
+            if (item && typeof item === "object")
+                addAgentClass(item.agent);
+        }
+    };
+    addAgentClass(record.agent);
+    addFromItems(record.tasks);
+    addFromItems(record.chain);
+    return agentClasses;
+}

package/dist/resources/extensions/gsd/bootstrap/system-context.js

@@ -12,7 +12,7 @@ import { resolveGsdRootFile, resolveSliceFile, resolveSlicePath, resolveTaskFile
 import { ensureCodebaseMapFresh, readCodebaseMap } from "../codebase-generator.js";
 import { hasSkillSnapshot, detectNewSkills, formatSkillsXml } from "../skill-discovery.js";
 import { getActiveAutoWorktreeContext } from "../auto-worktree.js";
-import { getActiveWorktreeName, getWorktreeOriginalCwd } from "../worktree-command.js";
+import { getActiveWorktreeName, getWorktreeOriginalCwd } from "../worktree-session-state.js";
 import { deriveState } from "../state.js";
 import { formatOverridesSection, formatShortcut, loadActiveOverrides, loadFile, parseContinue, parseSummary } from "../files.js";
 import { toPosixPath } from "../../shared/mod.js";
@@ -47,6 +47,17 @@ export const BUNDLED_SKILL_TRIGGERS = [
     { trigger: "HTTP/REST/GraphQL API design — verbs, status codes, pagination, errors, idempotency, versioning", skill: "api-design" },
     { trigger: "Dependency upgrades — risk-batched, verified between batches, one major per commit", skill: "dependency-upgrade" },
     { trigger: "Agent-first observability — structured logs, persisted failure state, health surfaces, explicit failure modes", skill: "observability" },
+    { trigger: "React/Next.js performance — components, data fetching, bundle optimization, rendering patterns from Vercel Engineering", skill: "react-best-practices" },
+    { trigger: "Core Web Vitals — fix LCP, CLS, INP; layout shifts; page experience optimization", skill: "core-web-vitals" },
+    { trigger: "GitHub Actions CI/CD — write, run, and debug workflow files; live syntax and run monitoring", skill: "github-workflows" },
+    { trigger: "Comprehensive web quality audit — performance, accessibility, SEO, and best-practices (Lighthouse-style)", skill: "web-quality-audit" },
+    { trigger: "Browser automation — open sites, fill forms, click, screenshot, scrape, or test web apps programmatically", skill: "agent-browser" },
+    { trigger: "Review UI code for Web Interface Guidelines compliance — UX, design, and accessibility patterns", skill: "web-design-guidelines" },
+    { trigger: "UI/UX patterns reference — animations, CSS, typography, prefetching, icons (file:line findings)", skill: "userinterface-wiki" },
+    { trigger: "Author or refine a GSD skill — SKILL.md structure, frontmatter, and best practices", skill: "create-skill" },
+    { trigger: "Create or debug a GSD extension — tools, commands, event hooks, custom TUI, providers", skill: "create-gsd-extension" },
+    { trigger: "Author a YAML workflow definition — steps, triggers, and templates", skill: "create-workflow" },
+    { trigger: "Deep code optimization audit — perf anti-patterns, memory leaks, algorithmic complexity, bundle size, I/O, caching, dead code (parallel pattern-based hunt)", skill: "code-optimizer" },
 ];
 function buildBundledSkillsTable() {
     const cwd = process.cwd();
@@ -177,24 +188,50 @@ export async function buildBeforeAgentStartResult(event, ctx) {
     const subagentModelBlock = subagentModelConfig
         ? `\n\n## Subagent Model\n\nWhen spawning subagents via the \`subagent\` tool, always pass \`model: "${subagentModelConfig.primary}"\` in the tool call parameters. Never omit this — always specify it explicitly.`
         : "";
-    const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${codebaseBlock}${memoryBlock}${newSkillsBlock}${worktreeBlock}${subagentModelBlock}`;
+    // memoryBlock is FTS-queried against the user prompt and changes per call.
+    // Removing it from `fullSystem` keeps the system-prompt cache breakpoint
+    // stable across calls — the only scoped goal of this fix. The pi-ai
+    // Anthropic adapter additionally cache-marks the last user turn, so the
+    // memoryBlock injected via the context message may itself be cached up to
+    // that boundary; that's orthogonal and unchanged from prior behavior. The
+    // load-bearing win here is preserving the system+tools cache hit. (#5019)
+    const fullSystem = `${event.systemPrompt}\n\n[SYSTEM CONTEXT — GSD]\n\n${systemContent}${preferenceBlock}${knowledgeBlock}${codebaseBlock}${newSkillsBlock}${worktreeBlock}${subagentModelBlock}`;
     stopContextTimer({
         systemPromptSize: fullSystem.length,
         injectionSize: injection?.length ?? forensicsInjection?.length ?? 0,
         hasPreferences: preferenceBlock.length > 0,
         hasNewSkills: newSkillsBlock.length > 0,
     });
-    // Determine which context message to inject (guided execute takes priority)
-    const contextMessage = injection
-        ? { customType: "gsd-guided-context", content: injection, display: false }
-        : forensicsInjection
-            ? { customType: "gsd-forensics", content: forensicsInjection, display: false }
-            : null;
+    const contextMessage = buildContextMessage({ memoryBlock, injection, forensicsInjection });
     return {
         systemPrompt: fullSystem,
         ...(contextMessage ? { message: contextMessage } : {}),
     };
 }
+/**
+ * Route the per-call dynamic blocks (memory, guided-execute, forensics) into a
+ * single user-message context payload so they ride the volatile suffix instead
+ * of the cached system prefix. Priority when both memory and an injection are
+ * present: guided > forensics > memory-only. (#5019)
+ *
+ * Exported for direct unit testing — the surrounding bootstrap has too many
+ * filesystem and DB dependencies to exercise this routing logic in-place.
+ */
+export function buildContextMessage(opts) {
+    const memoryContent = opts.memoryBlock.trim();
+    if (opts.injection) {
+        const content = memoryContent ? `${memoryContent}\n\n${opts.injection}` : opts.injection;
+        return { customType: "gsd-guided-context", content, display: false };
+    }
+    if (opts.forensicsInjection) {
+        const content = memoryContent ? `${memoryContent}\n\n${opts.forensicsInjection}` : opts.forensicsInjection;
+        return { customType: "gsd-forensics", content, display: false };
+    }
+    if (memoryContent) {
+        return { customType: "gsd-memory", content: memoryContent, display: false };
+    }
+    return null;
+}
 /**
  * ADR-013 step 4 — auto-injection parity for the memories table.
  *