@opengsd/gsd-pi 1.3.0 → 1.4.0

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

@@ -17,14 +17,14 @@ import {
   resolveMilestoneFile, resolveSliceFile, resolveSlicePath,
   resolveTasksDir, resolveTaskFiles, resolveTaskFile,
   relMilestoneFile, relSliceFile, relSlicePath, relMilestonePath,
-  resolveGsdRootFile, relGsdRootFile, resolveRuntimeFile,
+  relTaskFile, resolveGsdRootFile, relGsdRootFile, resolveRuntimeFile,
 } from "./paths.js";
 import { resolveInlineLevel, loadEffectiveGSDPreferences } from "./preferences.js";
 import { isContextModeEnabled } from "./preferences-types.js";
 import { parseRoadmap } from "./parsers-legacy.js";
 import type { GSDState, InlineLevel } from "./types.js";
 import type { GSDPreferences } from "./preferences.js";
-import { join, basename } from "node:path";
+import { join, basename, relative } from "node:path";
 import { existsSync } from "node:fs";
 import { computeBudgets, resolveExecutorContextWindow, truncateAtSectionBoundary, type MinimalModelRegistry } from "./context-budget.js";
 import { getPendingGates, getPendingGatesForTurn } from "./gsd-db.js";
@@ -48,6 +48,7 @@ import {
   type ExcerptResolver,
 } from "./unit-context-composer.js";
 import { resolveManifest, type ArtifactKey } from "./unit-context-manifest.js";
+import { resolveSliceResearchLocation } from "./auto-artifact-paths.js";
 import { compileUnitContextContract, type UnitPromptContextContract } from "./tool-contract.js";
 import { readCompactionSnapshot } from "./compaction-snapshot.js";
 import { logWarning } from "./workflow-logger.js";
@@ -323,19 +324,37 @@ function requireComposedArtifactBlock(
   return block.body;
 }
 
+interface ExecuteTaskOnDemandResult {
+  /** Rendered block for the prompt; empty string when not shown. */
+  text: string;
+  /**
+   * Telemetry skip reason when the block was suppressed; null when the block
+   * is included. Callers pass this directly to `trackPromptContext`.
+   */
+  skipReason: string | null;
+}
+
 function renderExecuteTaskOnDemandContext(
   base: string,
   mid: string,
   sid: string,
   artifacts: readonly ArtifactKey[],
-): string {
-  if (!artifacts.includes("slice-research")) return "";
-  const researchPath = relSliceFile(base, mid, sid, "RESEARCH");
-  return [
-    "## On-demand Context",
-    "",
-    `Slice research is available at \`${researchPath}\`. Read it only if the inlined task plan, slice plan excerpt, and carry-forward context do not explain a required implementation detail.`,
-  ].join("\n");
+): ExecuteTaskOnDemandResult {
+  if (!artifacts.includes("slice-research")) {
+    return { text: "", skipReason: "not declared by contract" };
+  }
+  const research = resolveSliceResearchLocation(base, mid, sid);
+  if (!research.absolutePath || !research.relativePath) {
+    return { text: "", skipReason: "missing" };
+  }
+  return {
+    text: [
+      "## On-demand Context",
+      "",
+      `Slice research is available at \`${research.relativePath}\`. Read it only if the inlined task plan, slice plan excerpt, and carry-forward context do not explain a required implementation detail.`,
+    ].join("\n"),
+    skipReason: null,
+  };
 }
 
 // ─── Executor Constraints ─────────────────────────────────────────────────────
@@ -1343,22 +1362,33 @@ export function extractSliceExecutionExcerpt(content: string | null, relPath: st
 
 // ─── Prior Task Summaries ──────────────────────────────────────────────────
 
+/** Resolve where task SUMMARY files live (legacy tasks/ subdir or flat-phase phase dir). */
+function resolveTaskSummariesLocation(
+  base: string, mid: string, sid: string,
+): { dir: string; relPrefix: string } | null {
+  const slicePath = resolveSlicePath(base, mid, sid);
+  if (!slicePath) return null;
+  const tDir = resolveTasksDir(base, mid, sid);
+  const sRel = relSlicePath(base, mid, sid);
+  if (tDir) return { dir: tDir, relPrefix: `${sRel}/tasks` };
+  return { dir: slicePath, relPrefix: sRel };
+}
+
 export async function getPriorTaskSummaryPaths(
   mid: string, sid: string, currentTid: string, base: string,
 ): Promise<string[]> {
-  const tDir = resolveTasksDir(base, mid, sid);
-  if (!tDir) return [];
+  const loc = resolveTaskSummariesLocation(base, mid, sid);
+  if (!loc) return [];
 
-  const summaryFiles = resolveTaskFiles(tDir, "SUMMARY");
+  const summaryFiles = resolveTaskFiles(loc.dir, "SUMMARY");
   const currentNum = parseInt(currentTid.replace(/^T/, ""), 10);
-  const sRel = relSlicePath(base, mid, sid);
 
   return summaryFiles
     .filter(f => {
       const num = parseInt(f.replace(/^T/, ""), 10);
       return num < currentNum;
     })
-    .map(f => `${sRel}/tasks/${f}`);
+    .map(f => `${loc.relPrefix}/${f}`);
 }
 
 /**
@@ -1380,11 +1410,10 @@ export async function getDependencyTaskSummaryPaths(
     return getPriorTaskSummaryPaths(mid, sid, currentTid, base);
   }
 
-  const tDir = resolveTasksDir(base, mid, sid);
-  if (!tDir) return [];
+  const loc = resolveTaskSummariesLocation(base, mid, sid);
+  if (!loc) return [];
 
-  const summaryFiles = resolveTaskFiles(tDir, "SUMMARY");
-  const sRel = relSlicePath(base, mid, sid);
+  const summaryFiles = resolveTaskFiles(loc.dir, "SUMMARY");
   const depSet = new Set(dependsOn.map((d) => d.toUpperCase()));
 
   return summaryFiles
@@ -1393,7 +1422,7 @@ export async function getDependencyTaskSummaryPaths(
       const tid = f.replace(/-SUMMARY\.md$/i, "").toUpperCase();
       return depSet.has(tid);
     })
-    .map((f) => `${sRel}/tasks/${f}`);
+    .map((f) => `${loc.relPrefix}/${f}`);
 }
 
 // ─── Adaptive Replanning Checks ────────────────────────────────────────────
@@ -1681,7 +1710,13 @@ export async function buildDiscussMilestonePrompt(
   const draftContent = draftPath ? await loadFile(draftPath) : null;
 
   if (includeDraftSeed && draftContent) {
-    return `${promptWithContextMode}\n\n## Prior Discussion (Draft Seed)\n\nThe following draft was captured from a prior multi-milestone discussion. Use it as seed material — the user has already provided this context. Start with a brief reflection on what the draft covers, then probe for any gaps or open questions before writing the full CONTEXT.md.\n\n${draftContent}`;
+    const draftRelPath = relMilestoneFile(base, mid, "CONTEXT-DRAFT");
+    const draftSeed = `### Prior Discussion Draft\nSource: \`${draftRelPath}\`\n\n${draftContent.trim()}`;
+    const cappedDraftSeed = capPreamble(draftSeed);
+    const truncationNote = cappedDraftSeed !== draftSeed
+      ? `\n\n_(Draft seed truncated; read the full draft at \`${draftRelPath}\` if needed.)_`
+      : "";
+    return `${promptWithContextMode}\n\n## Prior Discussion (Draft Seed)\n\nThe following draft was captured from a prior multi-milestone discussion. Use it as seed material — the user has already provided this context. Start with a brief reflection on what the draft covers, then probe for any gaps or open questions before writing the full CONTEXT.md.\n\n${cappedDraftSeed}${truncationNote}`;
   }
 
   return promptWithContextMode;
@@ -1960,7 +1995,7 @@ export async function buildResearchMilestonePrompt(mid: string, midTitle: string
   return loadPrompt("research-milestone", {
     workingDirectory: base,
     milestoneId: mid, milestoneTitle: midTitle,
-    milestonePath: relMilestonePath(base, mid),
+    milestonePath: relMilestonePath(base, mid, midTitle),
     contextPath: relMilestoneFile(base, mid, "CONTEXT"),
     outputPath: join(base, outputRelPath),
     inlinedContext,
@@ -2117,7 +2152,7 @@ export async function buildPlanMilestonePrompt(mid: string, midTitle: string, ba
   return loadPrompt("plan-milestone", {
     workingDirectory: base,
     milestoneId: mid, milestoneTitle: midTitle,
-    milestonePath: relMilestonePath(base, mid),
+    milestonePath: relMilestonePath(base, mid, midTitle),
     contextPath: contextRel,
     researchPath: researchRel,
     researchOutputPath,
@@ -2627,7 +2662,7 @@ export async function buildExecuteTaskPrompt(
 
   const taskPlanPath = resolveTaskFile(base, mid, sid, tid, "PLAN");
   const taskPlanContent = taskPlanPath ? await loadFile(taskPlanPath) : null;
-  const taskPlanRelPath = relSlicePath(base, mid, sid) + `/tasks/${tid}-PLAN.md`;
+  const taskPlanRelPath = relTaskFile(base, mid, sid, tid, "PLAN");
   const taskPlanContext = taskPlanContent
     ? [
       "## Inlined Task Plan (authoritative local execution contract)",
@@ -2797,13 +2832,14 @@ export async function buildExecuteTaskPrompt(
   const slicePlanExcerpt = requireComposedArtifactBlock(contractedContext.blocks, "execute-task", "slice-plan");
   const contractedCarryForward = requireComposedArtifactBlock(contractedContext.blocks, "execute-task", "prior-task-summaries");
   const contractedTemplates = requireComposedArtifactBlock(contractedContext.blocks, "execute-task", "templates");
-  const onDemandContext = renderExecuteTaskOnDemandContext(base, mid, sid, contractedContext.onDemand);
+  const onDemandResult = renderExecuteTaskOnDemandContext(base, mid, sid, contractedContext.onDemand);
+  const onDemandContext = onDemandResult.text;
   trackPromptContext(
     contextTelemetry,
     "slice-research",
     onDemandContext ? "on-demand" : "skipped",
     onDemandContext,
-    onDemandContext ? undefined : "not declared by contract",
+    onDemandContext ? undefined : onDemandResult.skipReason ?? undefined,
   );
 
   const prompt = loadPrompt("execute-task", {
@@ -2886,17 +2922,16 @@ export async function buildCompleteSlicePrompt(
           return body;
         }
       case "prior-task-summaries": {
-        const tDir = resolveTasksDir(base, mid, sid);
-        if (!tDir) {
+        const loc = resolveTaskSummariesLocation(base, mid, sid);
+        if (!loc) {
           trackPromptContext(contextTelemetry, "prior-task-summaries", "skipped", null, "missing tasks dir");
           return null;
         }
-        const summaryFiles = resolveTaskFiles(tDir, "SUMMARY").sort();
-        const sRel = relSlicePath(base, mid, sid);
+        const summaryFiles = resolveTaskFiles(loc.dir, "SUMMARY").sort();
         const blocks: string[] = [];
         for (const file of summaryFiles) {
-          const absPath = join(tDir, file);
-          const relPath = `${sRel}/tasks/${file}`;
+          const absPath = join(loc.dir, file);
+          const relPath = `${loc.relPrefix}/${file}`;
           const taskId = file.replace(/-SUMMARY\.md$/i, "");
           blocks.push(await buildTaskSummaryExcerpt(absPath, relPath, taskId));
         }
@@ -3178,9 +3213,11 @@ export async function buildCompleteMilestonePrompt(
   );
   emitPromptContextTelemetry("complete-milestone", contextTelemetry, inlinedContext);
 
-  const milestoneSummaryPath = join(base, `${relMilestonePath(base, mid)}/${mid}-SUMMARY.md`);
+  // Use relMilestoneFile to get the layout-aware filename (NN-SUFFIX.md for flat-phase,
+  // M001-SUFFIX.md for legacy) rather than manually appending the raw milestone id.
+  const milestoneSummaryPath = join(base, relMilestoneFile(base, mid, "SUMMARY"));
 
-  const learningsRelPath = join(relMilestonePath(base, mid), `${mid}-LEARNINGS.md`);
+  const learningsRelPath = relMilestoneFile(base, mid, "LEARNINGS");
   const learningsAbsPath = join(base, learningsRelPath);
   const extractLearningsSteps = buildExtractionStepsBlock({
     milestoneId: mid,
@@ -3417,8 +3454,9 @@ export async function buildValidateMilestonePrompt(
   );
   emitPromptContextTelemetry("validate-milestone", contextTelemetry, inlinedContext);
 
-  const validationOutputPath = join(base, `${relMilestonePath(base, mid)}/${mid}-VALIDATION.md`);
-  const roadmapOutputPath = `${relMilestonePath(base, mid)}/${mid}-ROADMAP.md`;
+  // Use relMilestoneFile for layout-aware filenames (NN-SUFFIX.md flat-phase, M001-SUFFIX.md legacy).
+  const validationOutputPath = join(base, relMilestoneFile(base, mid, "VALIDATION"));
+  const roadmapOutputPath = relMilestoneFile(base, mid, "ROADMAP");
 
   // Every milestone validation turn owns MV01–MV04 unconditionally: the
   // registry is the source of truth for which gates the validator must
@@ -3467,16 +3505,15 @@ export async function buildReplanSlicePrompt(
 
   // Find the blocker task summary — the completed task with blocker_discovered: true
   let blockerTaskId = "";
-  const tDir = resolveTasksDir(base, mid, sid);
-  if (tDir) {
-    const summaryFiles = resolveTaskFiles(tDir, "SUMMARY").sort();
+  const summaryLoc = resolveTaskSummariesLocation(base, mid, sid);
+  if (summaryLoc) {
+    const summaryFiles = resolveTaskFiles(summaryLoc.dir, "SUMMARY").sort();
     for (const file of summaryFiles) {
-      const absPath = join(tDir, file);
+      const absPath = join(summaryLoc.dir, file);
       const content = await loadFile(absPath);
       if (!content) continue;
       const summary = parseSummary(content);
-      const sRel = relSlicePath(base, mid, sid);
-      const relPath = `${sRel}/tasks/${file}`;
+      const relPath = `${summaryLoc.relPrefix}/${file}`;
       if (summary.frontmatter.blocker_discovered) {
         blockerTaskId = summary.frontmatter.id || file.replace(/-SUMMARY\.md$/i, "");
         inlined.push(await buildTaskSummaryExcerpt(absPath, relPath, blockerTaskId, { blocker: true }));
@@ -3497,7 +3534,7 @@ export async function buildReplanSlicePrompt(
     capPreamble(`## Inlined Context (preloaded — do not re-read these files)\n\n${inlined.join("\n\n---\n\n")}`),
   );
 
-  const replanPath = join(base, `${relSlicePath(base, mid, sid)}/${sid}-REPLAN.md`);
+  const replanPath = join(base, relSliceFile(base, mid, sid, "REPLAN"));
 
   // Build capture context for replan prompt (captures that triggered this replan)
   let captureContext = "(none)";
@@ -3864,7 +3901,7 @@ export async function buildReactiveExecutePrompt(
 
     const taskPlanPath = resolveTaskFile(base, mid, sid, tid, "PLAN");
     const taskPlanContent = taskPlanPath ? await loadFile(taskPlanPath) : null;
-    const taskPlanRelPath = `${relSlicePath(base, mid, sid)}/tasks/${tid}-PLAN.md`;
+    const taskPlanRelPath = relTaskFile(base, mid, sid, tid, "PLAN");
     const taskPlanInline = taskPlanContent
       ? [
           "## Inlined Task Plan (authoritative local execution contract)",