gsd-pi 2.50.0-dev.d210a87 → 2.50.0

package/dist/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/dist/resources/extensions/gsd/files.js

@@ -222,8 +222,6 @@ function _parseSummaryImpl(content) {
             whatHappened: nativeResult.whatHappened,
             deviations: nativeResult.deviations,
             filesModified: nativeResult.filesModified,
-            followUps: extractSection(content, 'Follow-ups') ?? '',
-            knownLimitations: extractSection(content, 'Known Limitations') ?? '',
         };
     }
     const [fmLines, body] = splitFrontmatter(content);
@@ -278,9 +276,7 @@ function _parseSummaryImpl(content) {
             }
         }
     }
-    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 ───────────────────────────────────────────────────────
 export function parseContinue(content) {

package/dist/resources/extensions/gsd/guided-flow.js

@@ -353,10 +353,7 @@ async function buildDiscussSlicePrompt(mid, sid, sTitle, base, options) {
         }
     }
     // 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();
         let normSlices = [];
         if (isDbAvailable()) {
             normSlices = getMilestoneSlices(mid).map(s => ({ id: s.id, done: s.status === "complete" }));
@@ -479,13 +476,6 @@ export async function showDiscuss(ctx, pi, basePath) {
         }
         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/dist/resources/extensions/gsd/init-wizard.js

@@ -12,7 +12,6 @@ import { nativeInit } from "./native-git-bridge.js";
 import { ensureGitignore, untrackRuntimeFiles } from "./gitignore.js";
 import { gsdRoot } from "./paths.js";
 import { assertSafeDirectory } from "./validate-directory.js";
-import { runSkillInstallStep } from "./skill-catalog.js";
 // ─── Defaults ───────────────────────────────────────────────────────────────────
 const DEFAULT_PREFS = {
     mode: "solo",
@@ -177,14 +176,7 @@ export async function showProjectInit(ctx, pi, basePath, detection) {
     if (advancedChoice === "customize") {
         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
     ensureGitignore(basePath);

package/dist/resources/extensions/gsd/model-router.js

@@ -68,20 +68,6 @@ export function resolveModelForComplexity(classification, phaseConfig, routingCo
     const configuredPrimary = phaseConfig.primary;
     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 {
@@ -155,17 +141,6 @@ function getModelTier(modelId) {
     // Unknown models are assumed heavy (safest assumption)
     return "heavy";
 }
-/** Check if a model ID has a known capability tier mapping. (#2192) */
-function isKnownModel(modelId) {
-    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, config, availableModelIds, crossProvider) {
     // 1. Check explicit tier_models config
     const explicitModel = config.tier_models?.[tier];

package/dist/resources/extensions/gsd/notifications.js

@@ -49,17 +49,6 @@ export function buildDesktopNotificationCommand(platform, title, message, level
     const normalizedTitle = normalizeNotificationText(title);
     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] };
@@ -76,15 +65,3 @@ function normalizeNotificationText(s) {
 function escapeAppleScript(s) {
     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) {
-    try {
-        return execFileSync("which", [name], { timeout: 2000, stdio: ["ignore", "pipe", "ignore"] }).toString().trim() || null;
-    }
-    catch {
-        return null;
-    }
-}

package/dist/resources/extensions/gsd/preferences-skills.js

@@ -7,25 +7,19 @@
 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 { validatePreferences } from "./preferences-validation.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 /**
  * 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) {
-    const dirs = [
-        { 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;
 }
 /**
  * Resolve a single skill reference to an absolute path.

package/dist/resources/extensions/gsd/preferences-types.js

@@ -70,7 +70,6 @@ export const KNOWN_PREFERENCE_KEYS = new Set([
     "service_tier",
     "forensics_dedup",
     "show_token_cost",
-    "experimental",
 ]);
 /** Canonical list of all dispatch unit types. */
 export const KNOWN_UNIT_TYPES = [

package/dist/resources/extensions/gsd/preferences-validation.js

@@ -823,30 +823,5 @@ export function validatePreferences(preferences) {
             errors.push("show_token_cost must be a boolean");
         }
     }
-    // ─── Experimental Features ────────────────────────────────────────
-    if (preferences.experimental !== undefined) {
-        if (typeof preferences.experimental === "object" && preferences.experimental !== null) {
-            const exp = preferences.experimental;
-            const validExp = {};
-            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/dist/resources/extensions/gsd/preferences.js

@@ -275,9 +275,6 @@ function mergePreferences(base, override) {
         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,
     };
 }
 function mergeStringLists(base, override) {

package/dist/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/dist/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/dist/resources/extensions/gsd/provider-error-pause.js

@@ -31,14 +31,6 @@ export function classifyProviderError(errorMsg) {
     if (isConnectionError) {
         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/dist/resources/extensions/gsd/rule-registry.js

@@ -8,17 +8,18 @@
 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, unitId, artifactName) {
-    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 ──────────────────────────────────────────────
 /**
@@ -162,7 +163,7 @@ export class RuleRegistry {
                 pendingRetry: false,
             };
             // 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 ?? "")
@@ -223,7 +224,7 @@ export class RuleRegistry {
         if (hooks.length === 0) {
             return { action: "proceed", prompt, firedHooks: [] };
         }
-        const { milestone: mid, slice: sid, task: tid } = parseUnitId(unitId);
+        const [mid, sid, tid] = unitId.split("/");
         const substitute = (text) => text
             .replace(/\{milestoneId\}/g, mid ?? "")
             .replace(/\{sliceId\}/g, sid ?? "")
@@ -409,7 +410,7 @@ export class RuleRegistry {
         const currentCycle = (this.cycleCounts.get(cycleKey) ?? 0) + 1;
         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/dist/resources/extensions/gsd/session-forensics.js

@@ -363,13 +363,9 @@ function formatTraceSummary(trace) {
     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");
 }
 // ─── Helpers ──────────────────────────────────────────────────────────────────

package/dist/resources/extensions/gsd/skill-discovery.js

@@ -9,9 +9,8 @@
  */
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
-/** Industry-standard skills.sh global skills directory */
-const SKILLS_DIR = join(homedir(), ".agents", "skills");
+import { getAgentDir } from "@gsd/pi-coding-agent";
+const SKILLS_DIR = join(getAgentDir(), "skills");
 /** Snapshot of skill names at auto-mode start */
 let baselineSkills = null;
 /**

package/dist/resources/extensions/gsd/skill-health.js

@@ -14,7 +14,7 @@
  */
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
+import { getAgentDir } from "@gsd/pi-coding-agent";
 import { formatCost, formatTokenCount, loadLedgerFromDisk } from "./metrics.js";
 import { detectStaleSkills } from "./skill-telemetry.js";
 // ─── Constants ────────────────────────────────────────────────────────────────
@@ -141,7 +141,7 @@ export function formatSkillDetail(basePath, skillName) {
         lines.push(`  ${date}  ${u.id.padEnd(20)}  ${formatTokenCount(u.tokens.total).padStart(8)} tokens  ${formatCost(u.cost)}`);
     }
     // 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/dist/resources/extensions/gsd/skill-telemetry.js

@@ -12,7 +12,7 @@
  */
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
-import { homedir } from "node:os";
+import { getAgentDir } from "@gsd/pi-coding-agent";
 // ─── In-memory state ──────────────────────────────────────────────────────────
 /** Skills available in the system prompt for the current unit */
 let availableSkills = [];
@@ -24,14 +24,8 @@ const activelyLoadedSkills = new Set();
  * Called before each unit starts.
  */
 export function captureAvailableSkills() {
-    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();
 }
 /**
@@ -91,12 +85,8 @@ export function detectStaleSkills(units, thresholdDays) {
     const cutoff = Date.now() - (thresholdDays * 24 * 60 * 60 * 1000);
     const stale = [];
     // 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);
         if (lastTs === undefined || lastTs < cutoff) {

package/dist/resources/extensions/gsd/state.js

@@ -4,8 +4,7 @@
 import { parseRoadmap, parsePlan, } from './parsers-legacy.js';
 import { parseSummary, loadFile, parseRequirementCounts, parseContextDependsOn, } from './files.js';
 import { resolveMilestoneFile, resolveSlicePath, resolveSliceFile, resolveTaskFile, resolveTasksDir, resolveGsdRootFile, 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 } from './native-parser-bridge.js';
 import { join, resolve } from 'path';
 import { existsSync, readdirSync } from 'node:fs';
@@ -85,14 +84,8 @@ export async function getActiveMilestoneId(basePath) {
     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;
@@ -240,13 +233,8 @@ export async function deriveStateFromDb(basePath) {
             });
         }
     }
-    // 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;
     const milestones = milestoneLock

package/dist/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/dist/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/dist/resources/extensions/gsd/tests/dist-redirect.mjs

@@ -7,28 +7,17 @@ const require = createRequire(import.meta.url);
 const ROOT = new URL("../../../../../", import.meta.url);
 
 export function resolve(specifier, context, nextResolve) {
-  // 1. Redirect all workspace package bare imports to source.
-  //    CI portability runs don't build any packages/ dist artifacts, so every
-  //    @gsd/* specifier (including transitive ones pulled in by pi-coding-agent
-  //    source itself) must resolve to the TypeScript source entrypoint.
+  // 1. Direct redirects to dist/ for specific packages
   if (specifier === "../../packages/pi-coding-agent/src/index.js") {
-    specifier = new URL("packages/pi-coding-agent/src/index.ts", ROOT).href;
-  } else if (specifier === "@gsd/pi-coding-agent") {
-    specifier = new URL("packages/pi-coding-agent/src/index.ts", ROOT).href;
+    specifier = new URL("packages/pi-coding-agent/dist/index.js", ROOT).href;
   } else if (specifier === "@gsd/pi-ai/oauth") {
-    specifier = new URL("packages/pi-ai/src/utils/oauth/index.ts", ROOT).href;
+    specifier = new URL("packages/pi-ai/dist/utils/oauth/index.js", ROOT).href;
   } else if (specifier === "@gsd/pi-ai") {
-    specifier = new URL("packages/pi-ai/src/index.ts", ROOT).href;
+    specifier = new URL("packages/pi-ai/dist/index.js", ROOT).href;
   } else if (specifier === "@gsd/pi-agent-core") {
-    specifier = new URL("packages/pi-agent-core/src/index.ts", ROOT).href;
+    specifier = new URL("packages/pi-agent-core/dist/index.js", ROOT).href;
   } else if (specifier === "@gsd/pi-tui") {
-    specifier = new URL("packages/pi-tui/src/index.ts", ROOT).href;
-  } else if (specifier === "@gsd/native") {
-    specifier = new URL("packages/native/src/index.ts", ROOT).href;
-  } else if (specifier.startsWith("@gsd/native/")) {
-    // Sub-path imports like @gsd/native/fd, @gsd/native/text, etc.
-    const subpath = specifier.slice("@gsd/native/".length);
-    specifier = new URL(`packages/native/src/${subpath}/index.ts`, ROOT).href;
+    specifier = new URL("packages/pi-tui/dist/index.js", ROOT).href;
   }
   // 2. Redirect packages/*/dist/ → packages/*/src/ with .js→.ts for strip-types
   //    Also handles local imports — skip rewrite for dist/ paths that are real compiled artifacts.
@@ -65,15 +54,9 @@ export function resolve(specifier, context, nextResolve) {
 }
 
 export function load(url, context, nextLoad) {
-  // Node's --experimental-strip-types handles plain .ts but not .tsx and not
-  // all TypeScript syntax used by workspace packages (parameter properties,
-  // decorators, etc.). Transpile all workspace package source files and .tsx
-  // files through TypeScript's transpileModule to avoid those crashes.
-  const shouldTranspileWithTypeScript =
-    url.endsWith('.tsx') ||
-    (url.endsWith('.ts') && url.includes('/packages/') && url.includes('/src/'));
-
-  if (shouldTranspileWithTypeScript) {
+  // Node's --experimental-strip-types handles .ts but not .tsx (which may contain JSX).
+  // Use TypeScript to transpile .tsx → JS with react-jsx transform, then serve as module.
+  if (url.endsWith('.tsx')) {
     const ts = require('typescript');
     const source = readFileSync(fileURLToPath(url), 'utf-8');
     const { outputText } = ts.transpileModule(source, {
@@ -83,8 +66,6 @@ export function load(url, context, nextLoad) {
         module: ts.ModuleKind.ESNext,
         target: ts.ScriptTarget.ESNext,
         esModuleInterop: true,
-        experimentalDecorators: true,
-        emitDecoratorMetadata: true,
       },
     });
     return { format: 'module', source: outputText, shortCircuit: true };