@opengsd/gsd-pi 1.8.1 → 1.9.0-dev.5c1a3ff2

package/src/resources/extensions/gsd/migrate/plan.ts

@@ -0,0 +1,101 @@
+// gsd-pi - /gsd migrate planning service.
+// File Purpose: Resolve, validate, parse, transform, preview, and guard a migration before UI confirmation.
+
+import { existsSync } from "node:fs";
+
+import {
+  assertMigrationHasSlices,
+  assertMigrationTargetAvailable,
+  resolveMigrationPaths,
+  type MigrationPaths,
+} from "./safety.js";
+import { parsePlanningDirectory } from "./parser.js";
+import { generatePreview } from "./preview.js";
+import { transformToGSD } from "./transformer.js";
+import { validatePlanningDirectory } from "./validator.js";
+import type { GSDProject, ValidationIssue, ValidationResult } from "./types.js";
+import type { MigrationPreview } from "./writer.js";
+
+export interface SplitValidationIssues {
+  warnings: ValidationIssue[];
+  fatals: ValidationIssue[];
+}
+
+interface MigrationPlanBase extends MigrationPaths {
+  warnings: ValidationIssue[];
+  fatals: ValidationIssue[];
+}
+
+export interface MissingMigrationSourceResult extends MigrationPaths {
+  status: "missing-source";
+}
+
+export interface InvalidMigrationPlanResult extends MigrationPlanBase {
+  status: "invalid";
+  validation: ValidationResult;
+}
+
+export interface BlockedMigrationPlanResult extends MigrationPlanBase {
+  status: "blocked";
+  validation: ValidationResult;
+  message: string;
+}
+
+export interface ReadyMigrationPlanResult extends MigrationPlanBase {
+  status: "ready";
+  validation: ValidationResult;
+  project: GSDProject;
+  preview: MigrationPreview;
+}
+
+export type MigrationPlanResult =
+  | MissingMigrationSourceResult
+  | InvalidMigrationPlanResult
+  | BlockedMigrationPlanResult
+  | ReadyMigrationPlanResult;
+
+export function splitValidationIssues(validation: ValidationResult): SplitValidationIssues {
+  return {
+    warnings: validation.issues.filter((issue) => issue.severity === "warning"),
+    fatals: validation.issues.filter((issue) => issue.severity === "fatal"),
+  };
+}
+
+export async function createMigrationPlan(args: string, cwd: string = process.cwd()): Promise<MigrationPlanResult> {
+  const paths = resolveMigrationPaths(args, cwd);
+  if (!existsSync(paths.sourcePath)) {
+    return { status: "missing-source", ...paths };
+  }
+
+  const validation = await validatePlanningDirectory(paths.sourcePath);
+  const issues = splitValidationIssues(validation);
+  if (!validation.valid) {
+    return { status: "invalid", ...paths, validation, ...issues };
+  }
+
+  const parsed = await parsePlanningDirectory(paths.sourcePath);
+  const project = transformToGSD(parsed);
+  const preview = generatePreview(project);
+
+  try {
+    assertMigrationHasSlices(preview);
+    await assertMigrationTargetAvailable(paths.targetRoot);
+  } catch (error) {
+    return {
+      status: "blocked",
+      ...paths,
+      validation,
+      ...issues,
+      message: error instanceof Error ? error.message : String(error),
+    };
+  }
+
+  return {
+    status: "ready",
+    ...paths,
+    validation,
+    ...issues,
+    project,
+    preview,
+  };
+}

package/src/resources/extensions/gsd/migrate/planning-writer.ts

@@ -186,17 +186,14 @@ export async function writePlanningDirectory(
       });
 
       if (tasks.length === 0) {
-        // Empty phase — write a single placeholder plan so the dir isn't empty.
-        const planPath = join(phaseDir, `${pad(phaseNum)}-01-PLAN.md`);
-        await saveFile(
-          planPath,
-          formatPlanningPlan(phaseNum, 1, slice.title || slice.id, []),
-        );
-        paths.push(planPath);
-        projectionWrites.push({
-          relPath: toPlanningRel(planPath),
-          entities: [`${milestone.id}/${slice.id}`],
-        });
+        // Sketch / undecomposed slice — zero tasks. Do NOT emit an ingestible
+        // *-PLAN.md here: the reverse transform maps one GSDTask per plan file
+        // (transformer.ts mapSlice), so a placeholder would materialize a
+        // phantom "Plan NN" task and flip the slice from "needs planning" to
+        // "has a planned task", causing auto-mode to skip planning (issue #1285).
+        // The phase dir is already created (mkdirSync above) and the slice is
+        // listed in ROADMAP.md, so it round-trips with tasks = [] — the correct
+        // sketch-slice shape.
       } else {
         for (let ti = 0; ti < tasks.length; ti++) {
           const task = tasks[ti]!;
@@ -223,19 +220,14 @@ export async function writePlanningDirectory(
     }
   }
 
-  // If no slices produced any phases, write a single empty phase so ROADMAP.md
-  // isn't blank and the layout is still discoverable.
+  // If no slices produced any phases, emit a single empty phase dir + ROADMAP
+  // entry so the layout stays discoverable. Do NOT write a placeholder
+  // *-PLAN.md — an ingestible plan file would round-trip into a phantom task
+  // (see the tasks.length === 0 branch above, issue #1285).
   if (roadmapEntries.length === 0) {
     const phaseDirName = `${pad(1)}-milestone`;
     const phaseDir = join(root, "phases", phaseDirName);
     mkdirSync(phaseDir, { recursive: true });
-    const planPath = join(phaseDir, `${pad(1)}-01-PLAN.md`);
-    await saveFile(planPath, formatPlanningPlan(1, 1, milestones[0]!.title || milestones[0]!.id, []));
-    paths.push(planPath);
-    projectionWrites.push({
-      relPath: toPlanningRel(planPath),
-      entities: [milestones[0]!.id],
-    });
     roadmapEntries.push({ number: 1, title: milestones[0]!.title || milestones[0]!.id, done: false });
   }
 

package/src/resources/extensions/gsd/migrate/presentation.ts

@@ -0,0 +1,83 @@
+// gsd-pi - /gsd migrate presentation helpers.
+// File Purpose: Pure formatting for migration previews and post-write review prompts.
+
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { gsdRoot } from "../paths.js";
+import type { MigrationPreview } from "./writer.js";
+
+export interface ReviewPromptInput {
+  sourcePath: string;
+  gsdPath: string;
+  preview: MigrationPreview;
+  templatePath?: string;
+}
+
+function formatRequirements(preview: MigrationPreview): string | null {
+  if (preview.requirements.total === 0) return null;
+  return `Requirements: ${preview.requirements.total} (${preview.requirements.validated} validated, ${preview.requirements.active} active, ${preview.requirements.deferred} deferred, ${preview.requirements.outOfScope} out of scope)`;
+}
+
+function formatLegacyInputs(preview: MigrationPreview): string | null {
+  if (!preview.migrationInputs) return null;
+  return `Legacy inputs: ${preview.migrationInputs.milestonePhaseDirs} milestone phase dir(s), ${preview.migrationInputs.decisions} decision file(s), ${preview.migrationInputs.seeds} seed file(s)`;
+}
+
+export function buildMigrationPreviewSummary(preview: MigrationPreview, targetRoot: string): string[] {
+  const lines: string[] = [
+    `Decisions: ${preview.decisions.total}`,
+    `Milestones: ${preview.milestoneCount}`,
+    `Slices: ${preview.totalSlices} (${preview.doneSlices} done — ${preview.sliceCompletionPct}%)`,
+    `Tasks: ${preview.totalTasks} (${preview.doneTasks} done — ${preview.taskCompletionPct}%)`,
+  ];
+
+  const requirements = formatRequirements(preview);
+  if (requirements) lines.push(requirements);
+
+  const legacyInputs = formatLegacyInputs(preview);
+  if (legacyInputs) lines.push(legacyInputs);
+
+  const targetGsdPath = gsdRoot(targetRoot);
+  if (existsSync(targetGsdPath)) {
+    lines.push("");
+    lines.push(`⚠ A .gsd directory already exists at ${targetGsdPath}.`);
+    lines.push("It will be backed up, deleted, and rewritten fresh before DB import.");
+  }
+
+  return lines;
+}
+
+export function formatMigrationPreviewStats(preview: MigrationPreview): string {
+  const lines = [
+    `- Decisions: ${preview.decisions.total}`,
+    `- Milestones: ${preview.milestoneCount}`,
+    `- Slices: ${preview.totalSlices} (${preview.doneSlices} done — ${preview.sliceCompletionPct}%)`,
+    `- Tasks: ${preview.totalTasks} (${preview.doneTasks} done — ${preview.taskCompletionPct}%)`,
+  ];
+
+  const requirements = formatRequirements(preview);
+  if (requirements) lines.push(`- ${requirements}`);
+
+  const legacyInputs = formatLegacyInputs(preview);
+  if (legacyInputs) lines.push(`- ${legacyInputs}`);
+
+  return lines.join("\n");
+}
+
+function defaultReviewTemplatePath(): string {
+  const promptsDir = join(dirname(fileURLToPath(import.meta.url)), "..", "prompts");
+  return join(promptsDir, "review-migration.md");
+}
+
+export function buildReviewPrompt(input: ReviewPromptInput): string {
+  const templatePath = input.templatePath ?? defaultReviewTemplatePath();
+  let content = readFileSync(templatePath, "utf-8");
+
+  content = content.replaceAll("{{sourcePath}}", input.sourcePath);
+  content = content.replaceAll("{{gsdPath}}", input.gsdPath);
+  content = content.replaceAll("{{previewStats}}", formatMigrationPreviewStats(input.preview));
+
+  return content.trim();
+}

package/src/resources/extensions/gsd/model-cost-table.ts

@@ -62,6 +62,8 @@ export const BUNDLED_COST_TABLE: ModelCostEntry[] = [
   // GPT-5.5 API list price, also used for live Codex OAuth routing.
   // Source: https://openai.com/api/pricing/
   { id: "gpt-5.5", inputPer1k: 0.005, outputPer1k: 0.03, updatedAt: "2026-04-23" },
+  // Mirrors gpt-5.5 list pricing until OpenAI publishes official gpt-5.6 pricing.
+  { id: "gpt-5.6", inputPer1k: 0.005, outputPer1k: 0.03, updatedAt: "2026-07-08" },
 
   // Google
   { id: "gemini-2.0-flash", inputPer1k: 0.0001, outputPer1k: 0.0004, updatedAt: "2025-03-15" },

package/src/resources/extensions/gsd/model-router.ts

@@ -111,10 +111,12 @@ export const MODEL_CAPABILITY_TIER: Record<string, ComplexityTier> = {
   "gpt-5.3-codex": "heavy",
   "gpt-5.4": "heavy",
   "gpt-5.5": "heavy",
+  "gpt-5.6": "heavy",
   "o1": "heavy",
   "o3": "heavy",
   "o4-mini": "heavy",
   "o4-mini-deep-research": "heavy",
+  "grok-4.5": "heavy",
 };
 
 // ─── Cost Table (per 1K input tokens, approximate USD) ───────────────────────
@@ -149,11 +151,13 @@ const MODEL_COST_PER_1K_INPUT: Record<string, number> = {
   "gpt-5.3-codex-spark": 0.0003,
   "gpt-5.4": 0.005,
   "gpt-5.5": 0.005,
+  "gpt-5.6": 0.005,
   "o4-mini": 0.005,
   "o4-mini-deep-research": 0.005,
   "gemini-2.0-flash": 0.0001,
   "gemini-2.5-pro": 0.00125,
   "deepseek-chat": 0.00014,
+  "grok-4.5": 0.002,
 };
 
 // ─── Capability Profiles Data Table ──────────────────────────────────────────
@@ -198,6 +202,9 @@ export const MODEL_CAPABILITY_PROFILES: Record<string, ModelCapabilities> = {
   // OpenAI's 2026-04-23 published eval deltas across coding, tool use, and long context.
   // Source: https://openai.com/index/introducing-gpt-5-5/
   "gpt-5.5":                      { coding: 96, debugging: 93, research: 89, reasoning: 95, speed: 42, longContext: 90, instruction: 93 },
+  // GPT-5.6 profile is provisional: a small uniform step over gpt-5.5, to be
+  // recalibrated once OpenAI publishes official eval results.
+  "gpt-5.6":                      { coding: 97, debugging: 94, research: 90, reasoning: 96, speed: 42, longContext: 91, instruction: 94 },
 
   // ── OpenAI o-series (reasoning-first) ──────────────────────────────────────
   "o1":                           { coding: 78, debugging: 82, research: 78, reasoning: 90, speed: 20, longContext: 65, instruction: 82 },
@@ -212,6 +219,11 @@ export const MODEL_CAPABILITY_PROFILES: Record<string, ModelCapabilities> = {
 
   // ── DeepSeek ───────────────────────────────────────────────────────────────
   "deepseek-chat":                { coding: 75, debugging: 65, research: 55, reasoning: 70, speed: 70, longContext: 55, instruction: 65 },
+
+  // ── xAI ────────────────────────────────────────────────────────────────────
+  // Grok 4.5 (2026-07): Opus-class frontier model tuned for coding and agentic
+  // work; notably faster and more token-efficient than peer heavy models.
+  "grok-4.5":                     { coding: 95, debugging: 90, research: 82, reasoning: 93, speed: 55, longContext: 80, instruction: 90 },
 };
 
 // ─── Base Task Requirements Data Table ───────────────────────────────────────

package/src/resources/extensions/gsd/parallel-eligibility.ts

@@ -8,7 +8,7 @@
 import { deriveState } from "./state.js";
 import { resolveMilestoneFile, resolveSliceFile } from "./paths.js";
 import { findMilestoneIds } from "./guided-flow.js";
-import { isDbAvailable, getMilestoneSlices, getSliceTasks } from "./gsd-db.js";
+import { isDbAvailable, getMilestoneSlices, getTasksBySliceIds } from "./gsd-db.js";
 import { openExistingWorkflowDatabase } from "./db-workspace.js";
 import type { MilestoneRegistryEntry } from "./types.js";
 
@@ -40,10 +40,11 @@ async function collectTouchedFiles(
   const files = new Set<string>();
 
   if (isDbAvailable()) {
-    // DB path: query slices and their tasks for file lists
+    // DB path: query slices and their tasks for file lists (one batched task
+    // query instead of one per slice; file order is irrelevant here — Set dedup)
     const slices = getMilestoneSlices(milestoneId);
-    for (const slice of slices) {
-      const tasks = getSliceTasks(milestoneId, slice.id);
+    const tasksBySlice = getTasksBySliceIds(slices.map((slice) => ({ milestoneId, sliceId: slice.id })));
+    for (const tasks of tasksBySlice.values()) {
       for (const task of tasks) {
         if (Array.isArray(task.files)) {
           for (const f of task.files) {

package/src/resources/extensions/gsd/parallel-monitor-overlay.ts

@@ -72,6 +72,7 @@ interface WorkerView {
   totalSlices: number;
   doneSlices: number;
   slices: SliceProgress[];
+  completions: string[];
   errors: string[];
 }
 
@@ -143,14 +144,21 @@ function discoverWorkers(basePath: string): string[] {
   return [...mids].sort();
 }
 
-function querySliceProgress(basePath: string, mid: string, workRoot: string = worktreePathFor(basePath, mid)): SliceProgress[] {
+// Slice progress + recent completions share one DB connection per worker per
+// tick. Opening the isolated worker DB twice per refresh (once for each) was
+// pure churn on the 5s interval.
+function queryWorkerProgress(
+  basePath: string,
+  mid: string,
+  workRoot: string = worktreePathFor(basePath, mid),
+): { slices: SliceProgress[]; completions: string[] } {
   const dbPath = resolveGsdPathContract(workRoot, basePath).projectDb;
-  if (!existsSync(dbPath)) return [];
+  if (!existsSync(dbPath)) return { slices: [], completions: [] };
 
   const db = openWorkflowDatabaseIsolated(dbPath);
-  if (!db) return [];
+  if (!db) return { slices: [], completions: [] };
   try {
-    const rows = db.prepare(
+    const sliceRows = db.prepare(
       `SELECT
          s.id AS id,
          s.status AS status,
@@ -162,14 +170,32 @@ function querySliceProgress(basePath: string, mid: string, workRoot: string = wo
        GROUP BY s.id
        ORDER BY s.id`,
     ).all({ ":mid": mid });
-    return rows.map((row) => ({
+    const slices = sliceRows.map((row) => ({
       id: String(row["id"] ?? ""),
       status: String(row["status"] ?? ""),
       total: Number(row["total"] ?? 0),
       done: Number(row["done"] ?? 0),
     }));
+
+    const completionRows = db.prepare(
+      `SELECT id, slice_id, one_liner
+       FROM tasks
+       WHERE milestone_id=:mid
+         AND status='complete'
+         AND completed_at IS NOT NULL
+       ORDER BY completed_at DESC
+       LIMIT 5`,
+    ).all({ ":mid": mid });
+    const completions = completionRows.map((row) => {
+      const taskId = String(row["id"] ?? "");
+      const sliceId = String(row["slice_id"] ?? "");
+      const oneLiner = String(row["one_liner"] ?? "");
+      return `✓ ${mid}/${sliceId}/${taskId}${oneLiner ? ": " + oneLiner : ""}`;
+    });
+
+    return { slices, completions };
   } catch {
-    return [];
+    return { slices: [], completions: [] };
   } finally {
     try { db.close(); } catch { /* ignore */ }
   }
@@ -276,36 +302,6 @@ function extractCostFromNdjson(basePath: string, mid: string): number {
   }
 }
 
-function queryRecentCompletions(basePath: string, mid: string): string[] {
-  const workRoot = worktreePathFor(basePath, mid);
-  const dbPath = resolveGsdPathContract(workRoot, basePath).projectDb;
-  if (!existsSync(dbPath)) return [];
-
-  const db = openWorkflowDatabaseIsolated(dbPath);
-  if (!db) return [];
-  try {
-    const rows = db.prepare(
-      `SELECT id, slice_id, one_liner
-       FROM tasks
-       WHERE milestone_id=:mid
-         AND status='complete'
-         AND completed_at IS NOT NULL
-       ORDER BY completed_at DESC
-       LIMIT 5`,
-    ).all({ ":mid": mid });
-    return rows.map((row) => {
-      const taskId = String(row["id"] ?? "");
-      const sliceId = String(row["slice_id"] ?? "");
-      const oneLiner = String(row["one_liner"] ?? "");
-      return `✓ ${mid}/${sliceId}/${taskId}${oneLiner ? ": " + oneLiner : ""}`;
-    });
-  } catch {
-    return [];
-  } finally {
-    try { db.close(); } catch { /* ignore */ }
-  }
-}
-
 function collectWorkerData(basePath: string): WorkerView[] {
   const mids = discoverWorkers(basePath);
   const parallelDir = join(basePath, ".gsd", "parallel");
@@ -317,7 +313,7 @@ function collectWorkerData(basePath: string): WorkerView[] {
     const workRoot = worktreePathFor(basePath, mid);
     const status = readJsonSafe<StatusJson>(join(parallelDir, `${mid}.status.json`));
     const lock = readJsonSafe<AutoLock>(join(workRoot, ".gsd", "auto.lock"));
-    const slices = querySliceProgress(basePath, mid, workRoot);
+    const { slices, completions } = queryWorkerProgress(basePath, mid, workRoot);
 
     const pid = lock?.pid || status?.pid || 0;
     const alive = pid ? isPidAlive(pid) : false;
@@ -378,6 +374,7 @@ function collectWorkerData(basePath: string): WorkerView[] {
       totalSlices: slices.length,
       doneSlices,
       slices,
+      completions,
       errors,
     });
   }
@@ -443,10 +440,10 @@ export class ParallelMonitorOverlay {
     if (this.disposed) return;
     this.workers = collectWorkerData(this.basePath);
 
-    // Collect completion events
+    // Collect completion events (already read during collectWorkerData's single
+    // DB open per worker — no second connection here).
     for (const wk of this.workers) {
-      const completions = queryRecentCompletions(this.basePath, wk.mid);
-      for (const evt of completions) {
+      for (const evt of wk.completions) {
         if (!this.events.includes(evt)) this.events.push(evt);
       }
     }

package/src/resources/extensions/gsd/paths.ts

@@ -223,6 +223,26 @@ export function buildTaskFileName(taskId: string, suffix: string): string {
   return `${taskId}-${suffix}.md`;
 }
 
+/**
+ * Build a flat-phase task artifact file name.
+ * ("S06", "T03", "SUMMARY") → "S06-T03-SUMMARY.md"
+ */
+export function buildFlatTaskFileName(sliceId: string, taskId: string, suffix: string): string {
+  return `${sliceId}-${taskId}-${suffix}.md`;
+}
+
+/**
+ * Extract the task ID from a task artifact filename.
+ * Supports flat-phase S##-T##-SUFFIX.md plus legacy T##-SUFFIX.md and
+ * T##-DESCRIPTOR-SUFFIX.md names.
+ */
+export function taskIdFromTaskFileName(fileName: string, suffix: string): string | null {
+  const flat = new RegExp(`^S\\d+-(T\\d+)-${suffix}\\.md$`, "i").exec(fileName);
+  if (flat?.[1]) return flat[1].toUpperCase();
+  const legacy = new RegExp(`^(T\\d+)(?:-.*)?-${suffix}\\.md$`, "i").exec(fileName);
+  return legacy?.[1]?.toUpperCase() ?? null;
+}
+
 // ─── Resolvers ─────────────────────────────────────────────────────────────
 
 /**
@@ -284,18 +304,15 @@ export function resolveFile(dir: string, idPrefix: string, suffix: string): stri
 }
 
 /**
- * Find all task files matching a pattern in a tasks directory.
- * Returns sorted file names matching T##-SUFFIX.md or legacy T##-*-SUFFIX.md
+ * Find all task files matching a pattern in a tasks directory or flat phase dir.
+ * Returns sorted file names matching S##-T##-SUFFIX.md, T##-SUFFIX.md,
+ * or legacy T##-*-SUFFIX.md.
  */
 export function resolveTaskFiles(tasksDir: string, suffix: string): string[] {
   if (!existsSync(tasksDir)) return [];
   try {
-    // Current convention: T01-PLAN.md
-    const currentPattern = new RegExp(`^T\\d+-${suffix}\\.md$`, "i");
-    // Legacy convention: T01-INSTALL-PACKAGES-PLAN.md
-    const legacyPattern = new RegExp(`^T\\d+-.*-${suffix}\\.md$`, "i");
     return cachedReaddir(tasksDir)
-      .filter(f => currentPattern.test(f) || legacyPattern.test(f))
+      .filter(f => taskIdFromTaskFileName(f, suffix) !== null)
       .sort();
   } catch {
     return [];
@@ -618,17 +635,20 @@ function legacyMilestonesHasSubdirs(basePath: string): boolean {
  * See the matching TODO in markdown-renderer.ts detectStaleRenders, which
  * disabled stale-render detection for the same reason.
  */
+const LEGACY_MILESTONE_RUNTIME_DIRS = new Set(["anchors"]);
+
 export function dirIsContentBearingLegacyMilestone(dir: string): boolean {
   try {
     const entries = readdirSync(dir, { withFileTypes: true });
     // 1. Any non-META regular file → real legacy content.
     if (entries.some(e => e.isFile() && !e.name.endsWith("-META.json"))) return true;
-    // 2. A non-empty subdirectory → real legacy content (e.g. slices/ with slice dirs).
+    // 2. A non-empty non-runtime subdirectory → real legacy content (e.g. slices/ with slice dirs).
     //    An *empty* subdir is treated as scaffolding (e.g. git-service.ts may create
     //    an empty slices/ alongside the integration META file) and must NOT flip the
     //    layout — that is the Bugbot finding this guard addresses.
     return entries.some(e => {
       if (!e.isDirectory()) return false;
+      if (LEGACY_MILESTONE_RUNTIME_DIRS.has(e.name)) return false;
       try { return readdirSync(join(dir, e.name)).length > 0; } catch { return false; }
     });
   } catch {
@@ -928,8 +948,10 @@ export function resolveTaskFile(
   const isLegacy = phaseDir.startsWith(legacyBase + "/") || phaseDir.startsWith(legacyBase + "\\");
 
   if (suffix !== "PLAN" && !isLegacy) {
-    const flatPath = join(phaseDir, buildTaskFileName(taskId, suffix));
-    return existsSync(flatPath) ? flatPath : null;
+    const flatPath = join(phaseDir, buildFlatTaskFileName(sliceId, taskId, suffix));
+    if (existsSync(flatPath)) return flatPath;
+    const legacyFlatPath = join(phaseDir, buildTaskFileName(taskId, suffix));
+    return existsSync(legacyFlatPath) ? legacyFlatPath : null;
   }
 
   const tDir = resolveTasksDir(basePath, milestoneId, sliceId);
@@ -1063,6 +1085,35 @@ export function targetSliceFile(
   return join(dir, fileName);
 }
 
+/**
+ * Build the canonical absolute write target for a task file.
+ * Readers that need legacy flat-phase fallback should call resolveTaskFile.
+ */
+export function targetTaskFile(
+  basePath: string, milestoneId: string, sliceId: string,
+  taskId: string, suffix: string, milestoneTitle?: string
+): string {
+  if (suffix === "PLAN") {
+    return targetSliceFile(basePath, milestoneId, sliceId, "PLAN", milestoneTitle);
+  }
+
+  const mDir = resolveMilestonePath(basePath, milestoneId);
+  const legacyBase = legacyMilestonesDir(basePath);
+  const isLegacy = mDir
+    ? mDir.startsWith(legacyBase + "/") || mDir.startsWith(legacyBase + "\\")
+    : isLegacyMilestonesLayout(basePath);
+  const milestoneDir = mDir
+    ?? dirname(targetMilestoneFile(basePath, milestoneId, "ROADMAP", milestoneTitle));
+
+  if (isLegacy) {
+    const slicesDir = join(milestoneDir, "slices");
+    const sliceDir = join(slicesDir, resolveDir(slicesDir, sliceId) ?? sliceId);
+    return join(sliceDir, "tasks", buildTaskFileName(taskId, suffix));
+  }
+
+  return join(milestoneDir, buildFlatTaskFileName(sliceId, taskId, suffix));
+}
+
 /**
  * Build relative .gsd/ path to a slice file.
  * Preserves an existing compatibility filename when present; otherwise falls
@@ -1102,5 +1153,5 @@ export function relTaskFile(
     return relSliceFile(basePath, milestoneId, sliceId, "PLAN");
   }
   const relS = relSlicePath(basePath, milestoneId, sliceId, milestoneTitle);
-  return `${relS}/${buildTaskFileName(taskId, suffix)}`;
+  return `${relS}/${buildFlatTaskFileName(sliceId, taskId, suffix)}`;
 }

package/src/resources/extensions/gsd/phase-anchor.ts

@@ -19,13 +19,17 @@ export interface PhaseAnchor {
 }
 
 function anchorsDir(basePath: string, milestoneId: string): string {
-  return join(gsdRoot(basePath), "milestones", milestoneId, "anchors");
+  return join(gsdRoot(basePath), "runtime", "anchors", milestoneId);
 }
 
 function anchorPath(basePath: string, milestoneId: string, phase: string): string {
   return join(anchorsDir(basePath, milestoneId), `${phase}.json`);
 }
 
+function legacyAnchorPath(basePath: string, milestoneId: string, phase: string): string {
+  return join(gsdRoot(basePath), "milestones", milestoneId, "anchors", `${phase}.json`);
+}
+
 export function writePhaseAnchor(basePath: string, milestoneId: string, anchor: PhaseAnchor): void {
   const dir = anchorsDir(basePath, milestoneId);
   if (!existsSync(dir)) {
@@ -35,7 +39,9 @@ export function writePhaseAnchor(basePath: string, milestoneId: string, anchor:
 }
 
 export function readPhaseAnchor(basePath: string, milestoneId: string, phase: string): PhaseAnchor | null {
-  const path = anchorPath(basePath, milestoneId, phase);
+  const path = existsSync(anchorPath(basePath, milestoneId, phase))
+    ? anchorPath(basePath, milestoneId, phase)
+    : legacyAnchorPath(basePath, milestoneId, phase);
   if (!existsSync(path)) return null;
   try {
     return JSON.parse(readFileSync(path, "utf-8")) as PhaseAnchor;

package/src/resources/extensions/gsd/planning-subagent-policy.ts

@@ -0,0 +1,58 @@
+import { CONFIGURABLE_PLANNING_SUBAGENT_UNITS, type GSDPreferences } from "./preferences-types.js";
+import { loadEffectiveGSDPreferences } from "./preferences.js";
+import type { ToolsPolicy } from "./unit-context-manifest.js";
+
+const CONFIGURABLE_UNITS = new Set<string>(CONFIGURABLE_PLANNING_SUBAGENT_UNITS);
+
+function configuredAllowedSubagents(
+  unitType: string,
+  preferences: GSDPreferences | null | undefined,
+): readonly string[] {
+  if (!CONFIGURABLE_UNITS.has(unitType)) return [];
+  return preferences?.planning_subagents?.[
+    unitType as keyof NonNullable<GSDPreferences["planning_subagents"]>
+  ]?.allowed ?? [];
+}
+
+function mergeAllowedSubagents(
+  current: readonly string[],
+  configured: readonly string[],
+): readonly string[] {
+  return Array.from(new Set([...current, ...configured]));
+}
+
+export function applyPlanningSubagentPreferences(
+  unitType: string,
+  policy: ToolsPolicy | null | undefined,
+  preferences: GSDPreferences | null | undefined,
+): ToolsPolicy | null | undefined {
+  if (!policy) return policy;
+  const configured = configuredAllowedSubagents(unitType, preferences);
+  if (configured.length === 0) return policy;
+
+  if (policy.mode === "planning") {
+    return {
+      mode: "planning-dispatch",
+      allowedSubagents: mergeAllowedSubagents([], configured),
+    };
+  }
+
+  if (policy.mode === "planning-dispatch") {
+    return {
+      ...policy,
+      allowedSubagents: mergeAllowedSubagents(policy.allowedSubagents, configured),
+    };
+  }
+
+  return policy;
+}
+
+export function resolveEffectivePlanningToolsPolicy(
+  unitType: string,
+  policy: ToolsPolicy | null | undefined,
+  basePath?: string,
+): ToolsPolicy | null | undefined {
+  if (!basePath) return policy;
+  const preferences = loadEffectiveGSDPreferences(basePath)?.preferences;
+  return applyPlanningSubagentPreferences(unitType, policy, preferences);
+}