gsd-pi 2.51.0 → 2.52.0-dev.655ad8a

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

@@ -408,8 +408,9 @@ export async function showDiscuss(ctx, pi, basePath) {
     // Invalidate caches to pick up artifacts written by a just-completed discuss/plan
     invalidateAllCaches();
     const state = await deriveState(basePath);
-    // No active milestone — check for pending milestones to discuss instead
-    if (!state.activeMilestone) {
+    // No active milestone (or corrupted milestone with undefined id) —
+    // check for pending milestones to discuss instead
+    if (!state.activeMilestone?.id) {
         const pendingMilestones = state.registry.filter(m => m.status === "pending");
         if (pendingMilestones.length === 0) {
             ctx.ui.notify("No active milestone. Run /gsd to create one first.", "warning");
@@ -864,7 +865,7 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
         }
     }
     const state = await deriveState(basePath);
-    if (!state.activeMilestone) {
+    if (!state.activeMilestone?.id) {
         // Guard: if a discuss session is already in flight, don't re-inject the prompt.
         // Both /gsd and /gsd auto reach this branch when no milestone exists yet.
         // Without this guard, every subsequent /gsd call overwrites pendingAutoStart

package/dist/resources/extensions/gsd/init-wizard.js

@@ -336,9 +336,9 @@ function bootstrapGsdDirectory(basePath, prefs, signals) {
     assertSafeDirectory(basePath);
     const gsd = gsdRoot(basePath);
     mkdirSync(join(gsd, "milestones"), { recursive: true });
-    // Write preferences.md from wizard answers
+    // Write PREFERENCES.md from wizard answers
     const preferencesContent = buildPreferencesFile(prefs);
-    writeFileSync(join(gsd, "preferences.md"), preferencesContent, "utf-8");
+    writeFileSync(join(gsd, "PREFERENCES.md"), preferencesContent, "utf-8");
     // Seed CONTEXT.md with detected project signals
     const contextContent = buildContextSeed(signals);
     if (contextContent) {

package/dist/resources/extensions/gsd/key-manager.js

@@ -110,21 +110,12 @@ export function findProvider(idOrLabel) {
  */
 export function getAllKeyStatuses(auth) {
     return PROVIDER_REGISTRY.map((provider) => {
-        const creds = auth.getCredentialsForProvider(provider.id);
+        const rawCreds = auth.getCredentialsForProvider(provider.id);
+        // Filter out empty-key entries (left by legacy removeProviderToken or skipped onboarding)
+        const creds = rawCreds.filter((c) => !(c.type === "api_key" && !c.key));
         const envKey = provider.envVar ? process.env[provider.envVar] : undefined;
         if (creds.length > 0) {
             const firstCred = creds[0];
-            // Skip empty keys (from skipped onboarding)
-            if (firstCred.type === "api_key" && !firstCred.key) {
-                return {
-                    provider,
-                    configured: false,
-                    source: "none",
-                    credentialCount: 0,
-                    description: "empty key (skipped setup)",
-                    backedOff: false,
-                };
-            }
             const desc = creds.length > 1
                 ? `${creds.length} keys (round-robin)`
                 : describeCredential(firstCred);
@@ -222,7 +213,7 @@ export async function handleAddKey(providerArg, ctx, auth) {
     else {
         // Interactive provider picker
         const options = PROVIDER_REGISTRY.map((p) => {
-            const creds = auth.getCredentialsForProvider(p.id);
+            const creds = auth.getCredentialsForProvider(p.id).filter((c) => !(c.type === "api_key" && !c.key));
             const existing = creds.length > 0 ? " (configured)" : "";
             return `[${p.category}] ${p.label}${existing}`;
         });
@@ -285,7 +276,7 @@ export async function handleRemoveKey(providerArg, ctx, auth) {
     else {
         // Show only configured providers
         const configured = PROVIDER_REGISTRY.filter((p) => {
-            const creds = auth.getCredentialsForProvider(p.id);
+            const creds = auth.getCredentialsForProvider(p.id).filter((c) => !(c.type === "api_key" && !c.key));
             return creds.length > 0;
         });
         if (configured.length === 0) {
@@ -508,7 +499,7 @@ export async function handleRotateKey(providerArg, ctx, auth) {
         // Show only configured API key providers
         const configured = PROVIDER_REGISTRY.filter((p) => {
             const creds = auth.getCredentialsForProvider(p.id);
-            return creds.some((c) => c.type === "api_key");
+            return creds.some((c) => c.type === "api_key" && c.key);
         });
         if (configured.length === 0) {
             ctx.ui.notify("No API keys configured to rotate.", "info");
@@ -646,7 +637,7 @@ export function runKeyDoctor(auth) {
         if (!envValue)
             continue;
         const creds = auth.getCredentialsForProvider(provider.id);
-        const apiKey = creds.find((c) => c.type === "api_key");
+        const apiKey = creds.find((c) => c.type === "api_key" && c.key);
         if (apiKey?.key && apiKey.key !== envValue) {
             findings.push({
                 severity: "warning",

package/dist/resources/extensions/gsd/markdown-renderer.js

@@ -8,6 +8,7 @@
 // Critical invariant: rendered markdown must round-trip through
 // parseRoadmap(), parsePlan(), parseSummary() in files.ts.
 import { readFileSync, existsSync, mkdirSync } from "node:fs";
+import { isClosedStatus } from "./status-guards.js";
 import { join, relative } from "node:path";
 import { createRequire } from "node:module";
 import { getAllMilestones, getMilestone, getMilestoneSlices, getSliceTasks, getTask, getSlice, getArtifact, insertArtifact, getGateResults, } from "./gsd-db.js";
@@ -262,7 +263,7 @@ function renderSlicePlanMarkdown(slice, tasks, gates = []) {
     lines.push("## Tasks");
     lines.push("");
     for (const task of tasks) {
-        const done = task.status === "done" || task.status === "complete" ? "x" : " ";
+        const done = isClosedStatus(task.status) ? "x" : " ";
         const estimate = task.estimate.trim() ? ` \`est:${task.estimate.trim()}\`` : "";
         lines.push(`- [${done}] **${task.id}: ${task.title || task.id}**${estimate}`);
         if (task.description.trim()) {
@@ -435,7 +436,7 @@ export async function renderPlanCheckboxes(basePath, milestoneId, sliceId) {
     // Apply checkbox patches for each task
     let updated = content;
     for (const task of tasks) {
-        const isDone = task.status === "done" || task.status === "complete";
+        const isDone = isClosedStatus(task.status);
         const tid = task.id;
         if (isDone) {
             // Set [x]
@@ -660,7 +661,7 @@ export function detectStaleRenders(basePath) {
                     const content = readFileSync(planPath, "utf-8");
                     const parsed = parsePlan(content);
                     for (const task of tasks) {
-                        const isDoneInDb = task.status === "done" || task.status === "complete";
+                        const isDoneInDb = isClosedStatus(task.status);
                         const planTask = parsed.tasks.find((t) => t.id === task.id);
                         if (!planTask)
                             continue;
@@ -684,7 +685,7 @@ export function detectStaleRenders(basePath) {
             }
             // Check missing task summary files
             for (const task of tasks) {
-                if ((task.status === "done" || task.status === "complete") && task.full_summary_md) {
+                if (isClosedStatus(task.status) && task.full_summary_md) {
                     const slicePath = resolveSlicePath(basePath, milestone.id, slice.id);
                     if (slicePath) {
                         const tasksDir = join(slicePath, "tasks");

package/dist/resources/extensions/gsd/memory-store.js

@@ -71,6 +71,9 @@ export function getActiveMemoriesRanked(limit = 30) {
 /**
  * Generate the next memory ID: MEM + zero-padded 3-digit from MAX(seq).
  * Returns MEM001 if no memories exist.
+ *
+ * NOTE: For race-safe creation, prefer createMemory() which inserts with a
+ * placeholder ID then updates to the seq-derived ID atomically.
  */
 export function nextMemoryId() {
     if (!isDbAvailable())
@@ -94,7 +97,9 @@ export function nextMemoryId() {
 }
 // ─── Mutation Functions ─────────────────────────────────────────────────────
 /**
- * Insert a new memory with auto-assigned ID.
+ * Insert a new memory with a race-safe auto-assigned ID.
+ * Uses AUTOINCREMENT seq to derive the ID after insert, avoiding
+ * the read-then-write race in concurrent scenarios (e.g. worktrees).
  * Returns the assigned ID, or null on failure.
  */
 export function createMemory(fields) {
@@ -104,11 +109,12 @@ export function createMemory(fields) {
     if (!adapter)
         return null;
     try {
-        const id = nextMemoryId();
         const now = new Date().toISOString();
+        // Insert with a temporary placeholder ID — seq is auto-assigned
+        const placeholder = `_TMP_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
         adapter.prepare(`INSERT INTO memories (id, category, content, confidence, source_unit_type, source_unit_id, created_at, updated_at)
        VALUES (:id, :category, :content, :confidence, :source_unit_type, :source_unit_id, :created_at, :updated_at)`).run({
-            ':id': id,
+            ':id': placeholder,
             ':category': fields.category,
             ':content': fields.content,
             ':confidence': fields.confidence ?? 0.8,
@@ -117,7 +123,17 @@ export function createMemory(fields) {
             ':created_at': now,
             ':updated_at': now,
         });
-        return id;
+        // Derive the real ID from the assigned seq
+        const row = adapter.prepare('SELECT seq FROM memories WHERE id = :id').get({ ':id': placeholder });
+        if (!row)
+            return placeholder; // fallback — should not happen
+        const seq = row['seq'];
+        const realId = `MEM${String(seq).padStart(3, '0')}`;
+        adapter.prepare('UPDATE memories SET id = :real_id WHERE id = :placeholder').run({
+            ':real_id': realId,
+            ':placeholder': placeholder,
+        });
+        return realId;
     }
     catch {
         return null;
@@ -258,15 +274,14 @@ export function enforceMemoryCap(max = 50) {
         if (count <= max)
             return;
         const excess = count - max;
-        // Find the IDs of the lowest-ranked active memories
-        const rows = adapter.prepare(`SELECT id FROM memories
-       WHERE superseded_by IS NULL
-       ORDER BY (confidence * (1.0 + hit_count * 0.1)) ASC
-       LIMIT :limit`).all({ ':limit': excess });
-        const now = new Date().toISOString();
-        for (const row of rows) {
-            adapter.prepare('UPDATE memories SET superseded_by = :reason, updated_at = :now WHERE id = :id').run({ ':reason': 'CAP_EXCEEDED', ':now': now, ':id': row['id'] });
-        }
+        // Batch update: supersede lowest-ranked active memories in a single statement
+        adapter.prepare(`UPDATE memories SET superseded_by = 'CAP_EXCEEDED', updated_at = :now
+       WHERE id IN (
+         SELECT id FROM memories
+         WHERE superseded_by IS NULL
+         ORDER BY (confidence * (1.0 + hit_count * 0.1)) ASC
+         LIMIT :limit
+       )`).run({ ':now': new Date().toISOString(), ':limit': excess });
     }
     catch {
         // non-fatal

package/dist/resources/extensions/gsd/milestone-actions.js

@@ -15,6 +15,7 @@ import { join } from "node:path";
 import { resolveMilestonePath, resolveMilestoneFile, buildMilestoneFileName, } from "./paths.js";
 import { invalidateAllCaches } from "./cache.js";
 import { loadQueueOrder, saveQueueOrder } from "./queue-order.js";
+import { isDbAvailable, updateMilestoneStatus } from "./gsd-db.js";
 // ─── Park ──────────────────────────────────────────────────────────────────
 /**
  * Park a milestone — creates a PARKED.md marker file with reason and timestamp.
@@ -44,6 +45,15 @@ export function parkMilestone(basePath, milestoneId, reason) {
         "",
     ].join("\n");
     writeFileSync(parkedPath, content, "utf-8");
+    // Sync DB status so deriveStateFromDb also skips this milestone (#2694)
+    if (isDbAvailable()) {
+        try {
+            updateMilestoneStatus(milestoneId, "parked");
+        }
+        catch (err) {
+            process.stderr.write(`gsd: parkMilestone DB sync failed for ${milestoneId}: ${err.message}\n`);
+        }
+    }
     invalidateAllCaches();
     return true;
 }
@@ -60,6 +70,15 @@ export function unparkMilestone(basePath, milestoneId) {
     if (!existsSync(parkedPath))
         return false; // not parked
     unlinkSync(parkedPath);
+    // Sync DB status so deriveStateFromDb picks up the unparked milestone (#2694)
+    if (isDbAvailable()) {
+        try {
+            updateMilestoneStatus(milestoneId, "active");
+        }
+        catch (err) {
+            process.stderr.write(`gsd: unparkMilestone DB sync failed for ${milestoneId}: ${err.message}\n`);
+        }
+    }
     invalidateAllCaches();
     return true;
 }

package/dist/resources/extensions/gsd/parallel-orchestrator.js

@@ -131,8 +131,15 @@ function appendWorkerLog(basePath, milestoneId, chunk) {
     }
 }
 function restoreRuntimeState(basePath) {
-    if (state?.active)
-        return true;
+    if (state?.active) {
+        // Verify at least one worker is alive — if all are in terminal states,
+        // the cached state is stale and we should fall through to cleanup.
+        const hasLiveWorker = [...state.workers.values()].some((w) => w.state !== "error" && w.state !== "stopped");
+        if (hasLiveWorker)
+            return true;
+        // All workers dead — clear stale state so restoreState() can clean up.
+        state = null;
+    }
     const restored = restoreState(basePath);
     if (restored && restored.workers.length > 0) {
         const config = resolveParallelConfig(undefined);
@@ -778,6 +785,15 @@ export function refreshWorkerStatuses(basePath, options = {}) {
     for (const worker of state.workers.values()) {
         state.totalCost += worker.cost;
     }
+    // If all workers are in a terminal state (error/stopped), the orchestration
+    // is finished — deactivate and clean up so zombie workers don't persist.
+    const allDead = [...state.workers.values()].every((w) => w.state === "error" || w.state === "stopped");
+    if (allDead) {
+        state.active = false;
+        removeStateFile(basePath);
+        state = null;
+        return;
+    }
     // Persist updated state for crash recovery
     persistState(basePath);
 }

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

@@ -98,18 +98,6 @@ export function getNextFallbackModel(currentModelId, modelConfig) {
         return modelsToTry[0];
     }
 }
-/**
- * Detect whether an error message indicates a transient network error
- * (worth retrying the same model) vs a permanent provider error
- * (auth failure, quota exceeded, etc. -- should fall back immediately).
- */
-export function isTransientNetworkError(errorMsg) {
-    if (!errorMsg)
-        return false;
-    const hasNetworkSignal = /network|ECONNRESET|ETIMEDOUT|ECONNREFUSED|socket hang up|fetch failed|connection.*reset|dns/i.test(errorMsg);
-    const hasPermanentSignal = /auth|unauthorized|forbidden|invalid.*key|quota|billing/i.test(errorMsg);
-    return hasNetworkSignal && !hasPermanentSignal;
-}
 /**
  * Validate a model ID string.
  * Returns true if the ID looks like a valid model identifier.
@@ -273,7 +261,7 @@ export function resolveContextSelection() {
     return profile === "budget" ? "smart" : "full";
 }
 /**
- * Resolve the search provider preference from preferences.md.
+ * Resolve the search provider preference from PREFERENCES.md.
  * Returns undefined if not configured (caller falls back to existing behavior).
  */
 export function resolveSearchProviderFromPreferences() {

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

@@ -11,7 +11,7 @@ export const MODE_DEFAULTS = {
         git: {
             auto_push: true,
             push_branches: false,
-            pre_merge_check: false,
+            pre_merge_check: "auto",
             merge_strategy: "squash",
             isolation: "none",
         },

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

@@ -24,27 +24,27 @@ export { validatePreferences } from "./preferences-validation.js";
 // ─── Re-exports: skills ─────────────────────────────────────────────────────
 export { resolveAllSkillReferences, resolveSkillDiscoveryMode, resolveSkillStalenessDays, } from "./preferences-skills.js";
 // ─── Re-exports: models ─────────────────────────────────────────────────────
-export { resolveModelForUnit, resolveModelWithFallbacksForUnit, getNextFallbackModel, isTransientNetworkError, validateModelId, updatePreferencesModels, resolveDynamicRoutingConfig, resolveAutoSupervisorConfig, resolveProfileDefaults, resolveEffectiveProfile, resolveInlineLevel, resolveContextSelection, resolveSearchProviderFromPreferences, } from "./preferences-models.js";
+export { resolveModelForUnit, resolveModelWithFallbacksForUnit, getNextFallbackModel, validateModelId, updatePreferencesModels, resolveDynamicRoutingConfig, resolveAutoSupervisorConfig, resolveProfileDefaults, resolveEffectiveProfile, resolveInlineLevel, resolveContextSelection, resolveSearchProviderFromPreferences, } from "./preferences-models.js";
 // ─── Path Constants & Getters ───────────────────────────────────────────────
 function gsdHome() {
     return process.env.GSD_HOME || join(homedir(), ".gsd");
 }
 function globalPreferencesPath() {
-    return join(gsdHome(), "preferences.md");
+    return join(gsdHome(), "PREFERENCES.md");
 }
 function legacyGlobalPreferencesPath() {
     return join(homedir(), ".pi", "agent", "gsd-preferences.md");
 }
 function projectPreferencesPath() {
-    return join(gsdRoot(process.cwd()), "preferences.md");
+    return join(gsdRoot(process.cwd()), "PREFERENCES.md");
 }
-// Bootstrap in gitignore.ts historically created PREFERENCES.md (uppercase) by mistake.
-// Check uppercase as a fallback so those files aren't silently ignored.
-function globalPreferencesPathUppercase() {
-    return join(gsdHome(), "PREFERENCES.md");
+// Legacy: older versions used lowercase preferences.md.
+// Check lowercase as a fallback so those files aren't silently ignored.
+function globalPreferencesPathLegacy() {
+    return join(gsdHome(), "preferences.md");
 }
-function projectPreferencesPathUppercase() {
-    return join(gsdRoot(process.cwd()), "PREFERENCES.md");
+function projectPreferencesPathLegacy() {
+    return join(gsdRoot(process.cwd()), "preferences.md");
 }
 export function getGlobalGSDPreferencesPath() {
     return globalPreferencesPath();
@@ -58,12 +58,12 @@ export function getProjectGSDPreferencesPath() {
 // ─── Loading ────────────────────────────────────────────────────────────────
 export function loadGlobalGSDPreferences() {
     return loadPreferencesFile(globalPreferencesPath(), "global")
-        ?? loadPreferencesFile(globalPreferencesPathUppercase(), "global")
+        ?? loadPreferencesFile(globalPreferencesPathLegacy(), "global")
         ?? loadPreferencesFile(legacyGlobalPreferencesPath(), "global");
 }
 export function loadProjectGSDPreferences() {
     return loadPreferencesFile(projectPreferencesPath(), "project")
-        ?? loadPreferencesFile(projectPreferencesPathUppercase(), "project");
+        ?? loadPreferencesFile(projectPreferencesPathLegacy(), "project");
 }
 export function loadEffectiveGSDPreferences() {
     const globalPreferences = loadGlobalGSDPreferences();
@@ -149,7 +149,7 @@ export function parsePreferencesMarkdown(content) {
     }
     if (!_warnedUnrecognizedFormat) {
         _warnedUnrecognizedFormat = true;
-        console.warn("[parsePreferencesMarkdown] preferences.md exists but uses an unrecognized format — skipping.");
+        console.warn("[parsePreferencesMarkdown] PREFERENCES.md exists but uses an unrecognized format — skipping.");
     }
     return null;
 }
@@ -398,7 +398,7 @@ export function resolvePreDispatchHooks() {
  * Resolve the effective git isolation mode from preferences.
  * Returns "none" (default), "worktree", or "branch".
  *
- * Default is "none" so GSD works out of the box without preferences.md.
+ * Default is "none" so GSD works out of the box without PREFERENCES.md.
  * Worktree isolation requires explicit opt-in because it depends on git
  * branch infrastructure that must be set up before use.
  */

package/dist/resources/extensions/gsd/prompts/system.md

@@ -92,7 +92,7 @@ Titles live inside file content (headings, frontmatter), not in file or director
 
 ### Isolation Model
 
-Auto-mode supports three isolation modes (configured in `.gsd/preferences.md` under `taskIsolation.mode`):
+Auto-mode supports three isolation modes (configured in `.gsd/PREFERENCES.md` under `taskIsolation.mode`):
 
 - **worktree** (default): Work happens in `.gsd/worktrees/<MID>/`, a full git worktree on the `milestone/<MID>` branch. Each worktree has its own working copy and `.gsd/` directory. Squash-merged back to the integration branch on milestone completion.
 - **branch**: Work happens in the project root on a `milestone/<MID>` branch. No worktree directory — files are checked out in-place.

package/dist/resources/extensions/gsd/provider-error-pause.js

@@ -1,47 +1,3 @@
-/**
- * Classify a provider error as transient (auto-resume) or permanent (manual resume).
- *
- * Transient: rate limits, server errors (500/502/503), overloaded, internal errors.
- * These are expected to self-resolve and should auto-resume after a delay.
- *
- * Permanent: auth errors, invalid API key, billing issues.
- * These require user intervention and should pause indefinitely.
- */
-export function classifyProviderError(errorMsg) {
-    const isRateLimit = /rate.?limit|too many requests|429/i.test(errorMsg);
-    const isServerError = /internal server error|500|502|503|overloaded|server_error|api_error|service.?unavailable/i.test(errorMsg);
-    // Connection/process errors — transient, auto-resume after brief backoff (#2309).
-    // These indicate the process was killed, the connection was reset, or a network
-    // blip occurred. They are NOT permanent failures.
-    const isConnectionError = /terminated|connection.?reset|connection.?refused|other side closed|fetch failed|network.?(?:is\s+)?unavailable|ECONNREFUSED|ECONNRESET|EPIPE/i.test(errorMsg);
-    // Permanent errors — never auto-resume
-    const isPermanent = /auth|unauthorized|forbidden|invalid.*key|invalid.*api|billing|quota exceeded|account/i.test(errorMsg);
-    if (isPermanent && !isRateLimit) {
-        return { isTransient: false, isRateLimit: false, suggestedDelayMs: 0 };
-    }
-    if (isRateLimit) {
-        // Try to extract retry-after from the message
-        const resetMatch = errorMsg.match(/reset in (\d+)s/i);
-        const delayMs = resetMatch ? Number(resetMatch[1]) * 1000 : 60_000; // default 60s for rate limits
-        return { isTransient: true, isRateLimit: true, suggestedDelayMs: delayMs };
-    }
-    if (isServerError) {
-        return { isTransient: true, isRateLimit: false, suggestedDelayMs: 30_000 }; // 30s for server errors
-    }
-    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 };
-}
 /**
  * Pause auto-mode due to a provider error.
  *

package/dist/resources/extensions/gsd/rule-registry.js

@@ -426,7 +426,7 @@ export class RuleRegistry {
     formatHookStatus() {
         const entries = this.getHookStatus();
         if (entries.length === 0) {
-            return "No hooks configured. Add post_unit_hooks or pre_dispatch_hooks to .gsd/preferences.md";
+            return "No hooks configured. Add post_unit_hooks or pre_dispatch_hooks to .gsd/PREFERENCES.md";
         }
         const lines = ["Configured Hooks:", ""];
         const postHooks = entries.filter(e => e.type === "post");

package/dist/resources/extensions/gsd/service-tier.js

@@ -13,16 +13,27 @@ import { getGlobalGSDPreferencesPath, loadEffectiveGSDPreferences, loadGlobalGSD
 import { ensurePreferencesFile, serializePreferencesToFrontmatter } from "./commands-prefs-wizard.js";
 const SERVICE_TIER_SCOPE_NOTE = "Only affects gpt-5.4 models, regardless of provider.";
 // ─── Gating ──────────────────────────────────────────────────────────────────
+/**
+ * Model ID prefixes (bare, without provider) that support OpenAI service tiers.
+ *
+ * This list is the fallback for callers that only have a model ID string.
+ * The authoritative source of truth is `model.capabilities.supportsServiceTier`
+ * (set via CAPABILITY_PATCHES in packages/pi-ai/src/models.ts). When callers
+ * have access to the full Model object, prefer reading capabilities directly.
+ *
+ * See: https://github.com/gsd-build/gsd-2/issues/2546
+ */
+const SERVICE_TIER_MODEL_PREFIXES = ["gpt-5.4"];
 /**
  * Returns true when the given model ID supports OpenAI service tiers.
- * Currently only gpt-5.4 variants qualify.
+ * Reads from SERVICE_TIER_MODEL_PREFIXES — update that list, not this function.
  */
 export function supportsServiceTier(modelId) {
     if (!modelId)
         return false;
     // Strip provider prefix if present (e.g. "openai/gpt-5.4" → "gpt-5.4")
     const bare = modelId.includes("/") ? modelId.split("/").pop() : modelId;
-    return bare.startsWith("gpt-5.4");
+    return SERVICE_TIER_MODEL_PREFIXES.some((prefix) => bare.startsWith(prefix));
 }
 // ─── Status Formatting ───────────────────────────────────────────────────────
 /**