gsd-pi 2.50.0-dev.d210a87 → 2.50.0

package/src/resources/extensions/gsd/dispatch-guard.ts

@@ -2,7 +2,6 @@
 
 import { resolveMilestoneFile } from "./paths.js";
 import { findMilestoneIds } from "./guided-flow.js";
-import { parseUnitId } from "./unit-id.js";
 import { isDbAvailable, getMilestoneSlices } from "./gsd-db.js";
 import { parseRoadmap } from "./parsers-legacy.js";
 import { readFileSync } from "node:fs";
@@ -23,7 +22,7 @@ export function getPriorSliceCompletionBlocker(
 ): string | null {
   if (!SLICE_DISPATCH_TYPES.has(unitType)) return null;
 
-  const { milestone: targetMid, slice: targetSid } = parseUnitId(unitId);
+  const [targetMid, targetSid] = unitId.split("/");
   if (!targetMid || !targetSid) return null;
 
   // Use findMilestoneIds to respect custom queue order.

package/src/resources/extensions/gsd/docs/preferences-reference.md

@@ -241,9 +241,6 @@ Setting `prefer_skills: []` does **not** disable skill discovery — it just mea
 
   **Known unit types for `before`/`after`:** `research-milestone`, `plan-milestone`, `research-slice`, `plan-slice`, `execute-task`, `complete-slice`, `replan-slice`, `reassess-roadmap`, `run-uat`.
 
-- `experimental`: opt-in experimental features. All features here are **off by default** — you must explicitly set each one to `true` to enable it. Features in this block may change or be removed without a deprecation cycle while in experimental status. Keys:
-  - `rtk`: boolean — enable RTK (Real-Time Kompression) shell-command compression. When enabled, GSD wraps shell commands through the RTK binary to reduce token usage during command execution. RTK is downloaded automatically on first use if not already installed. **Default: `false`** (opt-in required). Set `GSD_RTK_DISABLED=1` in the environment to force-disable regardless of this preference.
-
 ---
 
 ## Best Practices
@@ -655,15 +652,3 @@ verification_max_retries: 2
 ```
 
 Runs test, lint, and typecheck after each task. On failure, auto-fix is attempted up to 2 times before reporting the issue.
-
-## Experimental Features Example
-
-```yaml
----
-version: 1
-experimental:
-  rtk: true
----
-```
-
-Opts in to RTK shell-command compression. RTK is downloaded automatically on first use. Set `GSD_RTK_DISABLED=1` to force-disable at the environment level regardless of this setting.

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

@@ -269,8 +269,6 @@ function _parseSummaryImpl(content: string): Summary {
       whatHappened: nativeResult.whatHappened,
       deviations: nativeResult.deviations,
       filesModified: nativeResult.filesModified,
-      followUps: extractSection(content, 'Follow-ups') ?? '',
-      knownLimitations: extractSection(content, 'Known Limitations') ?? '',
     };
   }
 
@@ -332,10 +330,7 @@ function _parseSummaryImpl(content: string): Summary {
     }
   }
 
-  const followUps = extractSection(body, 'Follow-ups') ?? '';
-  const knownLimitations = extractSection(body, 'Known Limitations') ?? '';
-
-  return { frontmatter, title, oneLiner, whatHappened, deviations, filesModified, followUps, knownLimitations };
+  return { frontmatter, title, oneLiner, whatHappened, deviations, filesModified };
 }
 
 // ─── Continue Parser ───────────────────────────────────────────────────────

package/src/resources/extensions/gsd/guided-flow.ts

@@ -450,10 +450,7 @@ async function buildDiscussSlicePrompt(
   }
 
   // Completed slice summaries — what was already built that this slice builds on
-  // Ensure DB is open so getMilestoneSlices returns real data (#2560).
   {
-    const { ensureDbOpen } = await import("./bootstrap/dynamic-tools.js");
-    await ensureDbOpen();
     type NormSlice = { id: string; done: boolean };
     let normSlices: NormSlice[] = [];
     if (isDbAvailable()) {
@@ -591,14 +588,6 @@ export async function showDiscuss(
     return;
   }
 
-  // Ensure DB is open before querying slices (#2560).
-  // showDiscuss() is a command handler — unlike tool handlers, it has no
-  // automatic ensureDbOpen() call. Without this, isDbAvailable() returns
-  // false on cold-start sessions and normSlices falls to [] → false
-  // "All slices complete" exit.
-  const { ensureDbOpen } = await import("./bootstrap/dynamic-tools.js");
-  await ensureDbOpen();
-
   // Guard: no roadmap yet (unless DB has slices)
   const roadmapFile = resolveMilestoneFile(basePath, mid, "ROADMAP");
   const roadmapContent = roadmapFile ? await loadFile(roadmapFile) : null;

package/src/resources/extensions/gsd/init-wizard.ts

@@ -15,7 +15,6 @@ import { ensureGitignore, untrackRuntimeFiles } from "./gitignore.js";
 import { gsdRoot } from "./paths.js";
 import { assertSafeDirectory } from "./validate-directory.js";
 import type { ProjectDetection, ProjectSignals } from "./detection.js";
-import { runSkillInstallStep } from "./skill-catalog.js";
 
 // ─── Types ──────────────────────────────────────────────────────────────────────
 
@@ -224,14 +223,7 @@ export async function showProjectInit(
     await customizeAdvancedPrefs(ctx, prefs);
   }
 
-  // ── Step 8: Skill Installation ─────────────────────────────────────────────
-  try {
-    await runSkillInstallStep(ctx, signals);
-  } catch {
-    // Non-fatal — skill installation failure should never block project init
-  }
-
-  // ── Step 9: Bootstrap .gsd/ ────────────────────────────────────────────────
+  // ── Step 8: Bootstrap .gsd/ ────────────────────────────────────────────────
   bootstrapGsdDirectory(basePath, prefs, signals);
 
   // Ensure .gitignore

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

@@ -114,21 +114,6 @@ export function resolveModelForComplexity(
   const configuredTier = getModelTier(configuredPrimary);
   const requestedTier = classification.tier;
 
-  // If the configured model is unknown (not in MODEL_CAPABILITY_TIER),
-  // honor the user's explicit choice — don't downgrade based on a guess.
-  // Unknown models default to "heavy" in getModelTier, which makes every
-  // standard/light unit get downgraded to tier_models, silently ignoring
-  // the user's configuration. (#2192)
-  if (!isKnownModel(configuredPrimary)) {
-    return {
-      modelId: configuredPrimary,
-      fallbacks: phaseConfig.fallbacks,
-      tier: requestedTier,
-      wasDowngraded: false,
-      reason: `configured model "${configuredPrimary}" is not in the known tier map — honoring explicit config`,
-    };
-  }
-
   // Downgrade-only: if requested tier >= configured tier, no change
   if (tierOrdinal(requestedTier) >= tierOrdinal(configuredTier)) {
     return {
@@ -217,16 +202,6 @@ function getModelTier(modelId: string): ComplexityTier {
   return "heavy";
 }
 
-/** Check if a model ID has a known capability tier mapping. (#2192) */
-function isKnownModel(modelId: string): boolean {
-  const bareId = modelId.includes("/") ? modelId.split("/").pop()! : modelId;
-  if (MODEL_CAPABILITY_TIER[bareId]) return true;
-  for (const knownId of Object.keys(MODEL_CAPABILITY_TIER)) {
-    if (bareId.includes(knownId) || knownId.includes(bareId)) return true;
-  }
-  return false;
-}
-
 function findModelForTier(
   tier: ComplexityTier,
   config: DynamicRoutingConfig,

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

@@ -74,17 +74,6 @@ export function buildDesktopNotificationCommand(
   const normalizedMessage = normalizeNotificationText(message);
 
   if (platform === "darwin") {
-    // Prefer terminal-notifier: registers as its own Notification Center app,
-    // so it gets a proper permission entry in System Settings → Notifications.
-    // osascript notifications are silently swallowed when the calling terminal
-    // (Ghostty, iTerm2, etc.) lacks notification permissions — exits 0, no error.
-    // See: https://github.com/gsd-build/gsd-2/issues/2632
-    const tnPath = findExecutable("terminal-notifier");
-    if (tnPath) {
-      const sound = level === "error" ? "Basso" : "Glass";
-      return { file: tnPath, args: ["-title", normalizedTitle, "-message", normalizedMessage, "-sound", sound] };
-    }
-    // Fallback: osascript (works if terminal app has notification permissions)
     const sound = level === "error" ? 'sound name "Basso"' : 'sound name "Glass"';
     const script = `display notification "${escapeAppleScript(normalizedMessage)}" with title "${escapeAppleScript(normalizedTitle)}" ${sound}`;
     return { file: "osascript", args: ["-e", script] };
@@ -105,15 +94,3 @@ function normalizeNotificationText(s: string): string {
 function escapeAppleScript(s: string): string {
   return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-
-/**
- * Locate an executable on PATH. Returns absolute path or null.
- * Non-fatal — returns null on any error.
- */
-function findExecutable(name: string): string | null {
-  try {
-    return execFileSync("which", [name], { timeout: 2000, stdio: ["ignore", "pipe", "ignore"] }).toString().trim() || null;
-  } catch {
-    return null;
-  }
-}

package/src/resources/extensions/gsd/preferences-skills.ts

@@ -8,6 +8,7 @@
 import { existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join } from "node:path";
+import { getAgentDir } from "@gsd/pi-coding-agent";
 import { statSync } from "node:fs";
 
 import type {
@@ -24,20 +25,13 @@ export type { GSDSkillRule, SkillDiscoveryMode, SkillResolution, SkillResolution
 
 /**
  * Known skill directories, in priority order.
- * Global skills (~/.agents/skills/) take precedence over project skills.
- * Legacy ~/.gsd/agent/skills/ is included as a fallback for pre-migration installs.
+ * User skills (~/.gsd/agent/skills/) take precedence over project skills.
  */
 export function getSkillSearchDirs(cwd: string): Array<{ dir: string; method: SkillResolution["method"] }> {
-  const dirs: Array<{ dir: string; method: SkillResolution["method"] }> = [
-    { dir: join(homedir(), ".agents", "skills"), method: "user-skill" },
-    { dir: join(cwd, ".agents", "skills"), method: "project-skill" },
+  return [
+    { dir: join(getAgentDir(), "skills"), method: "user-skill" },
+    { dir: join(cwd, ".pi", "agent", "skills"), method: "project-skill" },
   ];
-  // Legacy fallback — read skills from old GSD directory only if migration hasn't completed
-  const legacyDir = join(homedir(), ".gsd", "agent", "skills");
-  if (existsSync(legacyDir) && !existsSync(join(legacyDir, ".migrated-to-agents"))) {
-    dirs.push({ dir: legacyDir, method: "user-skill" });
-  }
-  return dirs;
 }
 
 /**

package/src/resources/extensions/gsd/preferences-types.ts

@@ -93,7 +93,6 @@ export const KNOWN_PREFERENCE_KEYS = new Set<string>([
   "service_tier",
   "forensics_dedup",
   "show_token_cost",
-  "experimental",
 ]);
 
 /** Canonical list of all dispatch unit types. */
@@ -183,20 +182,6 @@ export interface CmuxPreferences {
   browser?: boolean;
 }
 
-/**
- * Opt-in experimental features. All features in this block are disabled by
- * default and must be explicitly enabled. They may change or be removed without
- * a deprecation cycle while in experimental status.
- */
-export interface ExperimentalPreferences {
-  /**
-   * Enable RTK (Real-Time Kompression) shell-command compression.
-   * RTK wraps shell commands to reduce token usage during command execution.
-   * Default: false (opt-in required).
-   */
-  rtk?: boolean;
-}
-
 export interface GSDPreferences {
   version?: number;
   mode?: WorkflowMode;
@@ -248,11 +233,6 @@ export interface GSDPreferences {
   forensics_dedup?: boolean;
   /** Opt-in: show per-prompt and cumulative session token cost in the footer. Default: false. */
   show_token_cost?: boolean;
-  /**
-   * Opt-in experimental features. All features here are disabled by default.
-   * See the preferences reference for details on each feature.
-   */
-  experimental?: ExperimentalPreferences;
 }
 
 export interface LoadedGSDPreferences {

package/src/resources/extensions/gsd/preferences-validation.ts

@@ -793,31 +793,5 @@ export function validatePreferences(preferences: GSDPreferences): {
     }
   }
 
-  // ─── Experimental Features ────────────────────────────────────────
-  if (preferences.experimental !== undefined) {
-    if (typeof preferences.experimental === "object" && preferences.experimental !== null) {
-      const exp = preferences.experimental as unknown as Record<string, unknown>;
-      const validExp: import("./preferences-types.js").ExperimentalPreferences = {};
-
-      if (exp.rtk !== undefined) {
-        if (typeof exp.rtk === "boolean") validExp.rtk = exp.rtk;
-        else errors.push("experimental.rtk must be a boolean");
-      }
-
-      const knownExpKeys = new Set(["rtk"]);
-      for (const key of Object.keys(exp)) {
-        if (!knownExpKeys.has(key)) {
-          warnings.push(`unknown experimental key "${key}" — ignored`);
-        }
-      }
-
-      if (Object.keys(validExp).length > 0) {
-        validated.experimental = validExp;
-      }
-    } else {
-      errors.push("experimental must be an object");
-    }
-  }
-
   return { preferences: validated, errors, warnings };
 }

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

@@ -353,9 +353,6 @@ function mergePreferences(base: GSDPreferences, override: GSDPreferences): GSDPr
     service_tier: override.service_tier ?? base.service_tier,
     forensics_dedup: override.forensics_dedup ?? base.forensics_dedup,
     show_token_cost: override.show_token_cost ?? base.show_token_cost,
-    experimental: (base.experimental || override.experimental)
-      ? { ...(base.experimental ?? {}), ...(override.experimental ?? {}) }
-      : undefined,
   };
 }
 

package/src/resources/extensions/gsd/prompts/forensics.md

@@ -142,10 +142,11 @@ Then **offer GitHub issue creation**: "Would you like me to create a GitHub issu
 If yes, create using the `bash` tool:
 
 ```bash
-# Step 1: Write issue body to a temp file to avoid escaping/truncation issues.
-# Using --body-file bypasses shell quoting entirely — backticks, quotes, and
-# content containing "EOF" all render correctly. (#2465)
-cat > /tmp/gsd-forensic-issue.md << 'GSD_ISSUE_BODY'
+# Step 1: Create issue (use labels for metadata, NOT for classification — type is set via GraphQL)
+ISSUE_URL=$(gh issue create --repo gsd-build/gsd-2 \
+  --title "..." \
+  --label "auto-generated" \
+  --body "$(cat <<'EOF'
 ## Problem
 [1-2 sentence summary]
 
@@ -168,13 +169,8 @@ cat > /tmp/gsd-forensic-issue.md << 'GSD_ISSUE_BODY'
 
 ---
 *Auto-generated by `/gsd forensics`*
-GSD_ISSUE_BODY
-
-ISSUE_URL=$(gh issue create --repo gsd-build/gsd-2 \
-  --title "..." \
-  --label "auto-generated" \
-  --body-file /tmp/gsd-forensic-issue.md)
-rm -f /tmp/gsd-forensic-issue.md
+EOF
+)")
 
 # Step 2: Set issue type via GraphQL (gh issue create has no --type flag)
 ISSUE_NUM=$(echo "$ISSUE_URL" | grep -oE '[0-9]+$')

package/src/resources/extensions/gsd/prompts/validate-milestone.md

@@ -24,12 +24,7 @@ All relevant context has been preloaded below — the roadmap, all slice summari
 2. For each **slice** in the roadmap, verify its demo/deliverable claim against its summary. Flag any slice whose summary does not substantiate its claimed output.
 3. Check **cross-slice integration points** — do boundary map entries (produces/consumes) align with what was actually built?
 4. Check **requirement coverage** — are all active requirements addressed by at least one slice?
-5. If **Verification Classes** are provided in the inlined context above, check each non-empty class:
-   - For each verification class (Contract, Integration, Operational, UAT), determine whether slice summaries, UAT results, or observable behavior provide evidence that this verification tier was addressed.
-   - Document the compliance status of each class in your verdict rationale.
-   - If `Operational` verification is non-empty and no evidence of operational verification exists, flag this explicitly — it means planned operational checks (migrations, deployments, runtime verification) were not proven.
-   - A milestone with unaddressed verification classes may still pass if the gaps are minor, but the gaps MUST be documented in the Deferred Work Inventory.
-6. Determine a verdict:
+5. Determine a verdict:
    - `pass` — all criteria met, all slices delivered, no gaps
    - `needs-attention` — minor gaps that do not block completion (document them)
    - `needs-remediation` — material gaps found; remediation slices must be added to the roadmap

package/src/resources/extensions/gsd/provider-error-pause.ts

@@ -46,15 +46,6 @@ export function classifyProviderError(errorMsg: string): {
     return { isTransient: true, isRateLimit: false, suggestedDelayMs: 15_000 }; // 15s for connection errors
   }
 
-  // Stream-truncation JSON parse errors — transient (#2572).
-  // When the API stream is cut mid-chunk, pi tries to reassemble the partial
-  // tool-call JSON and gets a SyntaxError. This is the downstream symptom of
-  // a connection drop — same root cause as ECONNRESET, one layer up.
-  const isMalformedStream = /Unexpected end of JSON|Unexpected token.*JSON|Expected double-quoted property name|SyntaxError.*JSON/i.test(errorMsg);
-  if (isMalformedStream) {
-    return { isTransient: true, isRateLimit: false, suggestedDelayMs: 15_000 }; // 15s, same as connection errors
-  }
-
   // Unknown error — treat as permanent (user reviews)
   return { isTransient: false, isRateLimit: false, suggestedDelayMs: 0 };
 }

package/src/resources/extensions/gsd/rule-registry.ts

@@ -20,19 +20,20 @@ import type {
 import { resolvePostUnitHooks, resolvePreDispatchHooks } from "./preferences.js";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
-import { parseUnitId } from "./unit-id.js";
 
 // ─── Artifact Path Resolution ──────────────────────────────────────────────
 
 export function resolveHookArtifactPath(basePath: string, unitId: string, artifactName: string): string {
-  const { milestone, slice, task } = parseUnitId(unitId);
-  if (task !== undefined && slice !== undefined) {
-    return join(basePath, ".gsd", "milestones", milestone, "slices", slice, "tasks", `${task}-${artifactName}`);
+  const parts = unitId.split("/");
+  if (parts.length === 3) {
+    const [mid, sid, tid] = parts;
+    return join(basePath, ".gsd", "milestones", mid, "slices", sid, "tasks", `${tid}-${artifactName}`);
   }
-  if (slice !== undefined) {
-    return join(basePath, ".gsd", "milestones", milestone, "slices", slice, artifactName);
+  if (parts.length === 2) {
+    const [mid, sid] = parts;
+    return join(basePath, ".gsd", "milestones", mid, "slices", sid, artifactName);
   }
-  return join(basePath, ".gsd", "milestones", milestone, artifactName);
+  return join(basePath, ".gsd", "milestones", parts[0], artifactName);
 }
 
 // ─── Dispatch Rule Conversion ──────────────────────────────────────────────
@@ -211,7 +212,7 @@ export class RuleRegistry {
       };
 
       // Build prompt with variable substitution
-      const { milestone: mid, slice: sid, task: tid } = parseUnitId(triggerUnitId);
+      const [mid, sid, tid] = triggerUnitId.split("/");
       let prompt = config.prompt
         .replace(/\{milestoneId\}/g, mid ?? "")
         .replace(/\{sliceId\}/g, sid ?? "")
@@ -290,7 +291,7 @@ export class RuleRegistry {
       return { action: "proceed", prompt, firedHooks: [] };
     }
 
-    const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+    const [mid, sid, tid] = unitId.split("/");
     const substitute = (text: string): string =>
       text
         .replace(/\{milestoneId\}/g, mid ?? "")
@@ -505,7 +506,7 @@ export class RuleRegistry {
     this.cycleCounts.set(cycleKey, currentCycle);
     this.activeHook.cycle = currentCycle;
 
-    const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+    const [mid, sid, tid] = unitId.split("/");
     const prompt = hook.prompt
       .replace(/\{milestoneId\}/g, mid ?? "")
       .replace(/\{sliceId\}/g, sid ?? "")

package/src/resources/extensions/gsd/session-forensics.ts

@@ -472,13 +472,9 @@ function formatTraceSummary(trace: ExecutionTrace): string {
   if (trace.errors.length > 0) {
     parts.push(`Errors: ${trace.errors.slice(-3).join("; ")}`);
   }
-  // NOTE: lastReasoning is intentionally excluded from the retry diagnostic.
-  // This summary is injected into retry prompts via getDeepDiagnostic() →
-  // phases.ts. Including prior assistant free-text causes hallucination loops
-  // when the previous turn was truncated or malformed. Crash recovery has its
-  // own path (formatCrashRecoveryBriefing) that handles lastReasoning safely
-  // with explicit "Last Agent Reasoning Before Interruption" framing.
-  // See: https://github.com/gsd-build/gsd-2/issues/2195
+  if (trace.lastReasoning) {
+    parts.push(`Last reasoning: "${trace.lastReasoning}"`);
+  }
   return parts.join("\n");
 }
 

package/src/resources/extensions/gsd/skill-discovery.ts

@@ -10,10 +10,9 @@
 
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
+import { getAgentDir } from "@gsd/pi-coding-agent";
 
-/** Industry-standard skills.sh global skills directory */
-const SKILLS_DIR = join(homedir(), ".agents", "skills");
+const SKILLS_DIR = join(getAgentDir(), "skills");
 
 export interface DiscoveredSkill {
   name: string;

package/src/resources/extensions/gsd/skill-health.ts

@@ -15,7 +15,7 @@
 
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
+import { getAgentDir } from "@gsd/pi-coding-agent";
 import type { UnitMetrics, MetricsLedger } from "./metrics.js";
 import { formatCost, formatTokenCount, loadLedgerFromDisk } from "./metrics.js";
 import { getSkillLastUsed, detectStaleSkills } from "./skill-telemetry.js";
@@ -208,7 +208,7 @@ export function formatSkillDetail(basePath: string, skillName: string): string {
   }
 
   // Check for SKILL.md existence
-  const skillPath = join(homedir(), ".agents", "skills", skillName, "SKILL.md");
+  const skillPath = join(getAgentDir(), "skills", skillName, "SKILL.md");
   if (existsSync(skillPath)) {
     const stat = require("node:fs").statSync(skillPath);
     lines.push("");

package/src/resources/extensions/gsd/skill-telemetry.ts

@@ -13,7 +13,7 @@
 
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
+import { getAgentDir } from "@gsd/pi-coding-agent";
 
 // ─── In-memory state ──────────────────────────────────────────────────────────
 
@@ -30,14 +30,8 @@ const activelyLoadedSkills = new Set<string>();
  * Called before each unit starts.
  */
 export function captureAvailableSkills(): void {
-  const skillsDir = join(homedir(), ".agents", "skills");
-  const legacyDir = join(homedir(), ".gsd", "agent", "skills");
-  const names = listSkillNames(skillsDir);
-  // Include skills still in the legacy directory only if migration hasn't completed
-  const legacyMigrated = existsSync(join(legacyDir, ".migrated-to-agents"));
-  const legacyNames = legacyMigrated ? [] : listSkillNames(legacyDir);
-  const all = new Set([...names, ...legacyNames]);
-  availableSkills = [...all];
+  const skillsDir = join(getAgentDir(), "skills");
+  availableSkills = listSkillNames(skillsDir);
   activelyLoadedSkills.clear();
 }
 
@@ -105,12 +99,8 @@ export function detectStaleSkills(
   const stale: string[] = [];
 
   // Check all installed skills, not just those with usage data
-  const skillsDir = join(homedir(), ".agents", "skills");
-  const legacyDir = join(homedir(), ".gsd", "agent", "skills");
-  const legacyMigrated = existsSync(join(legacyDir, ".migrated-to-agents"));
-  const legacyNames = legacyMigrated ? [] : listSkillNames(legacyDir);
-  const installedSet = new Set([...listSkillNames(skillsDir), ...legacyNames]);
-  const installed = [...installedSet];
+  const skillsDir = join(getAgentDir(), "skills");
+  const installed = listSkillNames(skillsDir);
 
   for (const skill of installed) {
     const lastTs = lastUsed.get(skill);

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

@@ -34,8 +34,7 @@ import {
   gsdRoot,
 } from './paths.js';
 
-import { findMilestoneIds } from './milestone-ids.js';
-import { loadQueueOrder, sortByQueueOrder } from './queue-order.js';
+import { milestoneIdSort, findMilestoneIds } from './milestone-ids.js';
 import { nativeBatchParseGsdFiles, type BatchParsedFile } from './native-parser-bridge.js';
 
 import { join, resolve } from 'path';
@@ -150,14 +149,8 @@ export async function getActiveMilestoneId(basePath: string): Promise<string | n
   if (isDbAvailable()) {
     const allMilestones = getAllMilestones();
     if (allMilestones.length > 0) {
-      // Respect queue-order.json so /gsd queue reordering is honored (#2556).
-      // Without this, the DB path uses lexicographic sort while the dispatch
-      // guard uses queue order — causing a deadlock.
-      const customOrder = loadQueueOrder(basePath);
-      const sortedIds = sortByQueueOrder(allMilestones.map(m => m.id), customOrder);
-      const byId = new Map(allMilestones.map(m => [m.id, m]));
-      for (const id of sortedIds) {
-        const m = byId.get(id)!;
+      const sorted = [...allMilestones].sort((a, b) => a.id.localeCompare(b.id));
+      for (const m of sorted) {
         if (m.status === "complete" || m.status === "done" || m.status === "parked") continue;
         return m.id;
       }
@@ -311,12 +304,8 @@ export async function deriveStateFromDb(basePath: string): Promise<GSDState> {
       } as MilestoneRow);
     }
   }
-  // Re-sort so milestones follow queue order (same as dispatch guard) (#2556)
-  const customOrder = loadQueueOrder(basePath);
-  const sortedIds = sortByQueueOrder(allMilestones.map(m => m.id), customOrder);
-  const byId = new Map(allMilestones.map(m => [m.id, m]));
-  allMilestones.length = 0;
-  for (const id of sortedIds) allMilestones.push(byId.get(id)!);
+  // Re-sort so milestones are in canonical order after injection
+  allMilestones.sort((a, b) => milestoneIdSort(a.id, b.id));
 
   // Parallel worker isolation: when locked, filter to just the locked milestone
   const milestoneLock = process.env.GSD_MILESTONE_LOCK;

package/src/resources/extensions/gsd/templates/milestone-validation.md

@@ -35,18 +35,6 @@ validated_at: {{date}}
 
 - **{{requirementId}}**: {{status}} — {{disposition: covered by remediation slice / acceptable gap / needs attention}}
 
-## Verification Class Compliance
-
-<!-- If verification classes were defined during planning, document whether each
-     was addressed. Use N/A for classes that were empty or "none" in planning. -->
-
-| Class | Planned | Evidence | Status |
-|-------|---------|----------|--------|
-| Contract | {{planned_or_none}} | {{evidence_or_none}} | {{MET / NOT MET / N/A}} |
-| Integration | {{planned_or_none}} | {{evidence_or_none}} | {{MET / NOT MET / N/A}} |
-| Operational | {{planned_or_none}} | {{evidence_or_none}} | {{MET / NOT MET / N/A}} |
-| UAT | {{planned_or_none}} | {{evidence_or_none}} | {{MET / NOT MET / N/A}} |
-
 ## Remediation Slices
 
 <!-- New slices appended to the roadmap to address auto-remediable gaps.

package/src/resources/extensions/gsd/templates/preferences.md

@@ -71,8 +71,6 @@ remote_questions:
 uat_dispatch:
 post_unit_hooks: []
 pre_dispatch_hooks: []
-# experimental:
-#   rtk: false
 ---
 
 # GSD Skill Preferences

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

@@ -1,7 +1,5 @@
 import test from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 
 import {
   unitVerb,
@@ -13,9 +11,6 @@ import {
   extractUatSliceId,
 } from "../auto-dashboard.ts";
 
-const autoSource = readFileSync(join(process.cwd(), "src", "resources", "extensions", "gsd", "auto.ts"), "utf-8");
-const dashboardSource = readFileSync(join(process.cwd(), "src", "resources", "extensions", "gsd", "auto-dashboard.ts"), "utf-8");
-
 // ─── unitVerb ─────────────────────────────────────────────────────────────
 
 test("unitVerb maps known unit types to verbs", () => {
@@ -185,17 +180,6 @@ test("formatAutoElapsed returns empty string for negative autoStartTime", () =>
   assert.equal(formatAutoElapsed(NaN), "");
 });
 
-test("getAutoDashboardData returns RTK savings in the dashboard payload", () => {
-  assert.match(autoSource, /const rtkSavings = sessionId && s\.basePath/);
-  assert.match(autoSource, /rtkSavings,/);
-});
-
-test("auto progress widget renders RTK savings under the footer stats line", () => {
-  assert.match(dashboardSource, /formatRtkSavingsLabel/);
-  assert.match(dashboardSource, /getRtkSessionSavings\(accessors\.getBasePath\(\), sessionId\)/);
-  assert.match(dashboardSource, /lines\.push\(rightAlign\("", theme\.fg\("dim", cachedRtkLabel\), width\)\);/);
-});
-
 // ─── extractUatSliceId ───────────────────────────────────────────────────
 
 test("extractUatSliceId extracts slice ID from M001/S01 format", () => {