gsd-pi 2.8.3 → 2.10.0

package/src/resources/extensions/browser-tools/core.d.ts

@@ -0,0 +1,205 @@
+/**
+ * Type declarations for core.js — runtime-neutral helper logic for browser-tools.
+ */
+
+export interface ActionTimeline {
+	limit: number;
+	nextId: number;
+	entries: ActionEntry[];
+}
+
+export interface ActionEntry {
+	id: number;
+	tool: string;
+	paramsSummary: string;
+	startedAt: number;
+	finishedAt: number | null;
+	status: string;
+	beforeUrl: string;
+	afterUrl: string;
+	verificationSummary?: string;
+	warningSummary?: string;
+	diffSummary?: string;
+	changed?: boolean;
+	error?: string;
+}
+
+export interface ActionPartial {
+	tool: string;
+	paramsSummary?: string;
+	startedAt?: number;
+	beforeUrl?: string;
+	afterUrl?: string;
+	verificationSummary?: string;
+	warningSummary?: string;
+	diffSummary?: string;
+	changed?: boolean;
+	error?: string;
+}
+
+export interface ActionUpdates {
+	finishedAt?: number;
+	status?: string;
+	afterUrl?: string;
+	verificationSummary?: string;
+	warningSummary?: string;
+	diffSummary?: string;
+	changed?: boolean;
+	error?: string;
+}
+
+export interface DiffResult {
+	changed: boolean;
+	changes: Array<{ type: string; before: unknown; after: unknown }>;
+	summary: string;
+}
+
+export interface Threshold {
+	op: string;
+	n: number;
+}
+
+export interface PageRegistry {
+	pages: PageEntry[];
+	activePageId: number | null;
+	nextId: number;
+}
+
+export interface PageEntry {
+	id: number;
+	page: any;
+	title: string;
+	url: string;
+	opener: number | null;
+}
+
+export interface PageListEntry {
+	id: number;
+	title: string;
+	url: string;
+	opener: number | null;
+	isActive: boolean;
+}
+
+export interface SnapshotModeConfig {
+	tags: string[];
+	roles: string[];
+	selectors: string[];
+	ariaAttributes: string[];
+	useInteractiveFilter: boolean;
+	visibleOnly?: boolean;
+	containerExpand?: boolean;
+}
+
+export interface AssertionCheckResult {
+	name: string;
+	passed: boolean;
+	actual: unknown;
+	expected: unknown;
+	selector?: string;
+	text?: string;
+}
+
+export interface AssertionEvaluation {
+	verified: boolean;
+	checks: AssertionCheckResult[];
+	summary: string;
+	agentHint: string;
+}
+
+export interface WaitValidationError {
+	error: string;
+}
+
+export interface BatchStepResult {
+	ok: boolean;
+	stopReason: string | null;
+	failedStepIndex: number | null;
+	stepResults: unknown[];
+	summary: string;
+}
+
+export interface FormattedTimeline {
+	entries: Array<{
+		id: number | null;
+		tool: string;
+		status: string;
+		durationMs: number | null;
+		beforeUrl: string;
+		afterUrl: string;
+		line: string;
+	}>;
+	retained: number;
+	totalRecorded: number;
+	bounded: boolean;
+	summary: string;
+}
+
+export interface FailureHypothesis {
+	hasFailures: boolean;
+	categories: string[];
+	summary: string;
+	signals: Array<{ category: string; source: string; detail: string }>;
+}
+
+export interface SessionSummary {
+	counts: {
+		pages: number;
+		actions: { total: number; retained: number; success: number; error: number; running: number };
+		waits: { total: number; success: number; error: number; running: number };
+		assertions: { total: number; passed: number; failed: number; running: number };
+		consoleErrors: number;
+		failedRequests: number;
+		dialogs: number;
+	};
+	activePage: { id: number | null; title: string; url: string } | null;
+	caveats: string[];
+	failureHypothesis: FailureHypothesis;
+	summary: string;
+}
+
+export function createActionTimeline(limit?: number): ActionTimeline;
+export function beginAction(timeline: ActionTimeline, partial: ActionPartial): ActionEntry;
+export function finishAction(timeline: ActionTimeline, actionId: number, updates?: ActionUpdates): ActionEntry | null;
+export function findAction(timeline: ActionTimeline, actionId: number): ActionEntry | null;
+export function toActionParamsSummary(params: unknown): string;
+export function diffCompactStates(before: unknown, after: unknown): DiffResult;
+export function includesNeedle(haystack: string, needle: string): boolean;
+export function parseThreshold(value: string | null | undefined): Threshold | null;
+export function meetsThreshold(count: number, threshold: Threshold): boolean;
+export function getEntriesSince(
+	entries: Array<{ timestamp?: number }>,
+	sinceActionId: number | undefined,
+	timeline: ActionTimeline,
+): unknown[];
+export function evaluateAssertionChecks(args: { checks: unknown[]; state: unknown }): AssertionEvaluation;
+export function validateWaitParams(params: { condition: string; value?: string; threshold?: string }): WaitValidationError | null;
+export function createRegionStableScript(selector: string): string;
+export function createPageRegistry(): PageRegistry;
+export function registryAddPage(
+	registry: PageRegistry,
+	info: { page: unknown; title?: string; url?: string; opener?: number | null },
+): PageEntry;
+export function registryRemovePage(registry: PageRegistry, pageId: number): { removed: PageEntry; newActiveId: number | null };
+export function registrySetActive(registry: PageRegistry, pageId: number): void;
+export function registryGetActive(registry: PageRegistry): PageEntry;
+export function registryGetPage(registry: PageRegistry, pageId: number): PageEntry | null;
+export function registryListPages(registry: PageRegistry): PageListEntry[];
+export function createBoundedLogPusher(maxSize: number): (array: unknown[], entry: unknown) => void;
+export function runBatchSteps(args: {
+	steps: unknown[];
+	executeStep: (step: unknown, index: number) => Promise<{ ok: boolean; [key: string]: unknown }>;
+	stopOnFailure?: boolean;
+}): Promise<BatchStepResult>;
+
+export declare const SNAPSHOT_MODES: Record<string, SnapshotModeConfig>;
+export function getSnapshotModeConfig(mode: string): SnapshotModeConfig | null;
+export function computeContentHash(text: string): string;
+export function computeStructuralSignature(tag: string, role: string, childTags: string[]): string;
+export function matchFingerprint(
+	stored: { contentHash?: string; structuralSignature?: string },
+	candidate: { contentHash?: string; structuralSignature?: string },
+): boolean;
+export function formatTimelineEntries(entries?: unknown[], options?: Record<string, unknown>): FormattedTimeline;
+export function buildFailureHypothesis(session?: Record<string, unknown>): FailureHypothesis;
+export function summarizeBrowserSession(session?: Record<string, unknown>): SessionSummary;

package/src/resources/extensions/browser-tools/index.ts

@@ -28,11 +28,11 @@ export default function (pi: ExtensionAPI) {
 		parseRef: u.parseRef, formatVersionedRef: u.formatVersionedRef, staleRefGuidance: u.staleRefGuidance,
 		beginTrackedAction: u.beginTrackedAction, finishTrackedAction: u.finishTrackedAction,
 		truncateText: u.truncateText, verificationFromChecks: u.verificationFromChecks,
-		verificationLine: u.verificationLine, collectAssertionState: u.collectAssertionState,
+		verificationLine: u.verificationLine, collectAssertionState: (p, checks, target?) => u.collectAssertionState(p, checks, captureCompactPageState, target),
 		formatAssertionText: u.formatAssertionText, formatDiffText: u.formatDiffText,
 		getUrlHash: u.getUrlHash,
 		captureClickTargetState: u.captureClickTargetState, readInputLikeValue: u.readInputLikeValue,
-		firstErrorLine: u.firstErrorLine, captureAccessibilityMarkdown: u.captureAccessibilityMarkdown,
+		firstErrorLine: u.firstErrorLine, captureAccessibilityMarkdown: (selector?) => u.captureAccessibilityMarkdown(getActiveTarget(), selector),
 		resolveAccessibilityScope: u.resolveAccessibilityScope,
 		getLivePagesSnapshot: u.createGetLivePagesSnapshot(ensureBrowser),
 		getSinceTimestamp: u.getSinceTimestamp, getConsoleEntriesSince: u.getConsoleEntriesSince,

package/src/resources/extensions/browser-tools/refs.ts

@@ -124,7 +124,7 @@ export async function buildRefSnapshot(
 					sib = sib.previousElementSibling;
 				}
 				// Check if the parent itself is a heading (unlikely but possible)
-				const parent = current.parentElement;
+				const parent: Element | null = current.parentElement;
 				if (parent && (headingTags.has(parent.tagName) || parent.getAttribute("role") === "heading")) {
 					return (parent.textContent || "").trim().replace(/\s+/g, " ").slice(0, 80);
 				}

package/src/resources/extensions/browser-tools/tools/session.ts

@@ -379,7 +379,7 @@ export function registerSessionTools(pi: ExtensionAPI, deps: ToolDeps): void {
 							console: consoleLogs.length,
 							network: networkLogs.length,
 							dialog: dialogLogs.length,
-							actions: timeline.count,
+							actions: timeline.retained,
 							pages: pages.length,
 						},
 						elapsedMs: Date.now() - startedAt,

package/src/resources/extensions/context7/index.ts

@@ -233,7 +233,7 @@ export default function (pi: ExtensionAPI) {
 		renderResult(result, { isPartial }, theme) {
 			const d = result.details as ResolveDetails | undefined;
 			if (isPartial) return new Text(theme.fg("warning", "Searching Context7..."), 0, 0);
-			if (result.isError || d?.error) {
+			if ((result as any).isError || d?.error) {
 				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
 			}
 			let text = theme.fg("success", `${d?.resultCount ?? 0} ${d?.resultCount === 1 ? "library" : "libraries"} found`);
@@ -388,7 +388,7 @@ export default function (pi: ExtensionAPI) {
 			const d = result.details as DocsDetails | undefined;
 
 			if (isPartial) return new Text(theme.fg("warning", "Fetching documentation..."), 0, 0);
-			if (result.isError || d?.error) {
+			if ((result as any).isError || d?.error) {
 				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
 			}
 

package/src/resources/extensions/get-secrets-from-user.ts

@@ -160,7 +160,7 @@ async function collectOneSecret(
 ): Promise<string | null> {
 	if (!ctx.hasUI) return null;
 
-	return ctx.ui.custom<string | null>((tui: any, theme: any, _kb: any, done: (r: string | null) => void) => {
+	return ctx.ui.custom((tui: any, theme: any, _kb: any, done: (r: string | null) => void) => {
 		let value = "";
 		let cachedLines: string[] | undefined;
 
@@ -286,7 +286,7 @@ export async function showSecretsSummary(
 
 	const existingSet = new Set(existingKeys);
 
-	await ctx.ui.custom<void>((tui: any, theme: Theme, _kb: any, done: () => void) => {
+	await (ctx.ui.custom as Function)((tui: any, theme: Theme, _kb: any, done: () => void) => {
 		let cachedLines: string[] | undefined;
 
 		function handleInput(_data: string) {
@@ -549,6 +549,7 @@ export default function secureEnv(pi: ExtensionAPI) {
 				return {
 					content: [{ type: "text", text: "Error: UI not available (interactive mode required for secure env collection)." }],
 					isError: true,
+					details: undefined as unknown,
 				};
 			}
 

package/src/resources/extensions/google-search/index.ts

@@ -261,7 +261,7 @@ export default function (pi: ExtensionAPI) {
 			const d = result.details as SearchDetails | undefined;
 
 			if (isPartial) return new Text(theme.fg("warning", "Searching Google..."), 0, 0);
-			if (result.isError || d?.error) {
+			if ((result as any).isError || d?.error) {
 				return new Text(theme.fg("error", `Error: ${d?.error ?? "unknown"}`), 0, 0);
 			}
 

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

@@ -60,10 +60,12 @@ import { readdirSync, readFileSync, existsSync, mkdirSync, writeFileSync } from
 import { execSync, execFileSync } from "node:child_process";
 import {
   autoCommitCurrentBranch,
+  captureIntegrationBranch,
   ensureSliceBranch,
   getCurrentBranch,
   getMainBranch,
   parseSliceBranch,
+  setActiveMilestoneId,
   switchToMain,
   mergeSliceToMain,
 } from "./worktree.ts";
@@ -361,6 +363,8 @@ export async function startAuto(
     unitDispatchCount.clear();
     // Re-initialize metrics in case ledger was lost during pause
     if (!getLedger()) initMetrics(base);
+    // Ensure milestone ID is set on git service for integration branch resolution
+    if (currentMilestoneId) setActiveMilestoneId(base, currentMilestoneId);
     ctx.ui.setStatus("gsd-auto", stepMode ? "next" : "auto");
     ctx.ui.setFooter(hideFooter);
     ctx.ui.notify(stepMode ? "Step-mode resumed." : "Auto-mode resumed.", "info");
@@ -468,6 +472,15 @@ export async function startAuto(
   originalModelId = ctx.model?.id ?? null;
   originalModelProvider = ctx.model?.provider ?? null;
 
+  // Capture the integration branch — records the branch the user was on when
+  // auto-mode started. Slice branches will merge back to this branch instead
+  // of the repo's default (main/master). Idempotent: only writes if not
+  // already recorded, so restarts/resumes don't overwrite.
+  if (currentMilestoneId) {
+    captureIntegrationBranch(base, currentMilestoneId);
+    setActiveMilestoneId(base, currentMilestoneId);
+  }
+
   // Initialize metrics — loads existing ledger from disk
   initMetrics(base);
 
@@ -1002,8 +1015,13 @@ async function dispatchNextUnit(
     // Reset stuck detection for new milestone
     unitDispatchCount.clear();
     unitRecoveryCount.clear();
+    // Capture integration branch for the new milestone and update git service
+    captureIntegrationBranch(basePath, mid);
+  }
+  if (mid) {
+    currentMilestoneId = mid;
+    setActiveMilestoneId(basePath, mid);
   }
-  if (mid) currentMilestoneId = mid;
 
   if (!mid) {
     // Save final session before stopping
@@ -1016,6 +1034,14 @@ async function dispatchNextUnit(
     return;
   }
 
+  // Guard: mid/midTitle must be defined strings from this point onward.
+  // The !mid check above returns early if mid is falsy; midTitle comes from
+  // the same object so it should always be present when mid is.
+  if (!midTitle) {
+    await stopAuto(ctx, pi);
+    return;
+  }
+
   // ── General merge guard: merge completed slice branches before advancing ──
   // If we're on a gsd/MID/SID branch and that slice is done (roadmap [x]),
   // merge to main before dispatching the next unit. This handles:
@@ -1088,6 +1114,17 @@ async function dispatchNextUnit(
     }
   }
 
+  // After merge, mid/midTitle may have been re-derived and could be undefined
+  if (!mid || !midTitle) {
+    if (currentUnit) {
+      const modelId = ctx.model?.id ?? "unknown";
+      snapshotUnitMetrics(ctx, currentUnit.type, currentUnit.id, currentUnit.startedAt, modelId);
+      saveActivityLog(ctx, basePath, currentUnit.type, currentUnit.id);
+    }
+    await stopAuto(ctx, pi);
+    return;
+  }
+
   // Determine next unit
   let unitType: string;
   let unitId: string;
@@ -1522,9 +1559,9 @@ async function dispatchNextUnit(
   // soft timeout; only idle/stalled tasks pause early.
   clearUnitTimeout();
   const supervisor = resolveAutoSupervisorConfig();
-  const softTimeoutMs = supervisor.soft_timeout_minutes * 60 * 1000;
-  const idleTimeoutMs = supervisor.idle_timeout_minutes * 60 * 1000;
-  const hardTimeoutMs = supervisor.hard_timeout_minutes * 60 * 1000;
+  const softTimeoutMs = (supervisor.soft_timeout_minutes ?? 0) * 60 * 1000;
+  const idleTimeoutMs = (supervisor.idle_timeout_minutes ?? 0) * 60 * 1000;
+  const hardTimeoutMs = (supervisor.hard_timeout_minutes ?? 0) * 60 * 1000;
 
   wrapupWarningHandle = setTimeout(() => {
     wrapupWarningHandle = null;

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

@@ -74,7 +74,7 @@ export function registerGSDCommand(pi: ExtensionAPI): void {
 
       if (parts[0] === "prefs" && parts.length <= 2) {
         const subPrefix = parts[1] ?? "";
-        return ["global", "project", "status"]
+        return ["global", "project", "status", "wizard", "setup"]
           .filter((cmd) => cmd.startsWith(subPrefix))
           .map((cmd) => ({ value: `prefs ${cmd}`, label: cmd }));
       }
@@ -168,7 +168,7 @@ export function registerGSDCommand(pi: ExtensionAPI): void {
       }
 
       ctx.ui.notify(
-        `Unknown: /gsd ${trimmed}. Use /gsd, /gsd next, /gsd auto, /gsd stop, /gsd status, /gsd queue, /gsd discuss, /gsd prefs [global|project|status], /gsd doctor [audit|fix|heal] [M###/S##], /gsd migrate <path>, or /gsd remote [slack|discord|status|disconnect].`,
+        `Unknown: /gsd ${trimmed}. Use /gsd, /gsd next, /gsd auto, /gsd stop, /gsd status, /gsd queue, /gsd discuss, /gsd prefs [global|project|status|wizard|setup], /gsd doctor [audit|fix|heal] [M###/S##], /gsd migrate <path>, or /gsd remote [slack|discord|status|disconnect].`,
         "warning",
       );
     },
@@ -219,6 +219,13 @@ async function handlePrefs(args: string, ctx: ExtensionCommandContext): Promise<
     return;
   }
 
+  if (trimmed === "wizard" || trimmed === "setup" || trimmed === "wizard global" || trimmed === "setup global"
+    || trimmed === "wizard project" || trimmed === "setup project") {
+    const scope = trimmed.includes("project") ? "project" : "global";
+    await handlePrefsWizard(ctx, scope);
+    return;
+  }
+
   if (trimmed === "status") {
     const globalPrefs = loadGlobalGSDPreferences();
     const projectPrefs = loadProjectGSDPreferences();
@@ -249,7 +256,7 @@ async function handlePrefs(args: string, ctx: ExtensionCommandContext): Promise<
     return;
   }
 
-  ctx.ui.notify("Usage: /gsd prefs [global|project|status]", "info");
+  ctx.ui.notify("Usage: /gsd prefs [global|project|status|wizard|setup]", "info");
 }
 
 async function handleDoctor(args: string, ctx: ExtensionCommandContext, pi: ExtensionAPI): Promise<void> {
@@ -290,6 +297,214 @@ async function handleDoctor(args: string, ctx: ExtensionCommandContext, pi: Exte
   }
 }
 
+// ─── Preferences Wizard ───────────────────────────────────────────────────────
+
+async function handlePrefsWizard(
+  ctx: ExtensionCommandContext,
+  scope: "global" | "project",
+): Promise<void> {
+  const path = scope === "project" ? getProjectGSDPreferencesPath() : getGlobalGSDPreferencesPath();
+  const existing = scope === "project" ? loadProjectGSDPreferences() : loadGlobalGSDPreferences();
+  const prefs: Record<string, unknown> = existing?.preferences ? { ...existing.preferences } : {};
+
+  ctx.ui.notify(`GSD preferences wizard (${scope}) — press Escape at any prompt to skip it.`, "info");
+
+  // ─── Models ──────────────────────────────────────────────────────────────
+  const modelPhases = ["research", "planning", "execution", "completion"] as const;
+  const models: Record<string, string> = (prefs.models as Record<string, string>) ?? {};
+
+  for (const phase of modelPhases) {
+    const current = models[phase] ?? "";
+    const input = await ctx.ui.input(
+      `Model for ${phase} phase${current ? ` (current: ${current})` : ""}:`,
+      current || "e.g. claude-sonnet-4-20250514",
+    );
+    if (input !== null && input !== undefined) {
+      const val = input.trim();
+      if (val) {
+        models[phase] = val;
+      } else if (current) {
+        // User cleared it — remove
+        delete models[phase];
+      }
+    }
+    // null/undefined = Escape/skip — keep existing value
+  }
+  if (Object.keys(models).length > 0) {
+    prefs.models = models;
+  }
+
+  // ─── Auto-supervisor timeouts ────────────────────────────────────────────
+  const autoSup: Record<string, unknown> = (prefs.auto_supervisor as Record<string, unknown>) ?? {};
+  const timeoutFields = [
+    { key: "soft_timeout_minutes", label: "Soft timeout (minutes)", defaultVal: "20" },
+    { key: "idle_timeout_minutes", label: "Idle timeout (minutes)", defaultVal: "10" },
+    { key: "hard_timeout_minutes", label: "Hard timeout (minutes)", defaultVal: "30" },
+  ] as const;
+
+  for (const field of timeoutFields) {
+    const current = autoSup[field.key];
+    const currentStr = current !== undefined && current !== null ? String(current) : "";
+    const input = await ctx.ui.input(
+      `${field.label}${currentStr ? ` (current: ${currentStr})` : ` (default: ${field.defaultVal})`}:`,
+      currentStr || field.defaultVal,
+    );
+    if (input !== null && input !== undefined) {
+      const val = input.trim();
+      if (val && /^\d+$/.test(val)) {
+        autoSup[field.key] = Number(val);
+      } else if (val && !/^\d+$/.test(val)) {
+        ctx.ui.notify(`Invalid value "${val}" for ${field.label} — must be a whole number. Keeping previous value.`, "warning");
+      } else if (!val && currentStr) {
+        delete autoSup[field.key];
+      }
+    }
+  }
+  if (Object.keys(autoSup).length > 0) {
+    prefs.auto_supervisor = autoSup;
+  }
+
+  // ─── Git main branch ────────────────────────────────────────────────────
+  const git: Record<string, unknown> = (prefs.git as Record<string, unknown>) ?? {};
+  const currentBranch = git.main_branch ? String(git.main_branch) : "";
+  const branchInput = await ctx.ui.input(
+    `Git main branch${currentBranch ? ` (current: ${currentBranch})` : ""}:`,
+    currentBranch || "main",
+  );
+  if (branchInput !== null && branchInput !== undefined) {
+    const val = branchInput.trim();
+    if (val) {
+      git.main_branch = val;
+    } else if (currentBranch) {
+      delete git.main_branch;
+    }
+  }
+  if (Object.keys(git).length > 0) {
+    prefs.git = git;
+  }
+
+  // ─── Skill discovery mode ───────────────────────────────────────────────
+  const currentDiscovery = (prefs.skill_discovery as string) ?? "";
+  const discoveryChoice = await ctx.ui.select(
+    `Skill discovery mode${currentDiscovery ? ` (current: ${currentDiscovery})` : ""}:`,
+    ["auto", "suggest", "off", "(keep current)"],
+  );
+  if (discoveryChoice && discoveryChoice !== "(keep current)") {
+    prefs.skill_discovery = discoveryChoice;
+  }
+
+  // ─── Serialize to frontmatter ───────────────────────────────────────────
+  prefs.version = prefs.version || 1;
+  const frontmatter = serializePreferencesToFrontmatter(prefs);
+
+  // Preserve existing body content (everything after closing ---)
+  let body = "\n# GSD Skill Preferences\n\nSee `~/.gsd/agent/extensions/gsd/docs/preferences-reference.md` for full field documentation and examples.\n";
+  if (existsSync(path)) {
+    const existingContent = readFileSync(path, "utf-8");
+    const closingIdx = existingContent.indexOf("\n---", existingContent.indexOf("---"));
+    if (closingIdx !== -1) {
+      const afterFrontmatter = existingContent.slice(closingIdx + 4); // skip past "\n---"
+      if (afterFrontmatter.trim()) {
+        body = afterFrontmatter;
+      }
+    }
+  }
+
+  const content = `---\n${frontmatter}---${body}`;
+
+  await saveFile(path, content);
+  await ctx.waitForIdle();
+  await ctx.reload();
+  ctx.ui.notify(`Saved ${scope} preferences to ${path}`, "info");
+}
+
+/** Wrap a YAML value in double quotes if it contains special characters. */
+function yamlSafeString(val: unknown): string {
+  if (typeof val !== "string") return String(val);
+  if (/[:#{\[\]'"`,|>&*!?@%]/.test(val) || val.trim() !== val || val === "") {
+    return `"${val.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+  }
+  return val;
+}
+
+function serializePreferencesToFrontmatter(prefs: Record<string, unknown>): string {
+  const lines: string[] = [];
+
+  function serializeValue(key: string, value: unknown, indent: number): void {
+    const prefix = "  ".repeat(indent);
+    if (value === null || value === undefined) return;
+
+    if (Array.isArray(value)) {
+      if (value.length === 0) {
+        lines.push(`${prefix}${key}: []`);
+        return;
+      }
+      lines.push(`${prefix}${key}:`);
+      for (const item of value) {
+        if (typeof item === "object" && item !== null) {
+          const entries = Object.entries(item as Record<string, unknown>);
+          if (entries.length > 0) {
+            const [firstKey, firstVal] = entries[0];
+            lines.push(`${prefix}  - ${firstKey}: ${yamlSafeString(firstVal)}`);
+            for (let i = 1; i < entries.length; i++) {
+              const [k, v] = entries[i];
+              if (Array.isArray(v)) {
+                lines.push(`${prefix}    ${k}:`);
+                for (const arrItem of v) {
+                  lines.push(`${prefix}      - ${yamlSafeString(arrItem)}`);
+                }
+              } else {
+                lines.push(`${prefix}    ${k}: ${yamlSafeString(v)}`);
+              }
+            }
+          }
+        } else {
+          lines.push(`${prefix}  - ${yamlSafeString(item)}`);
+        }
+      }
+      return;
+    }
+
+    if (typeof value === "object") {
+      const entries = Object.entries(value as Record<string, unknown>);
+      if (entries.length === 0) {
+        lines.push(`${prefix}${key}: {}`);
+        return;
+      }
+      lines.push(`${prefix}${key}:`);
+      for (const [k, v] of entries) {
+        serializeValue(k, v, indent + 1);
+      }
+      return;
+    }
+
+    lines.push(`${prefix}${key}: ${yamlSafeString(value)}`);
+  }
+
+  // Ordered keys for consistent output
+  const orderedKeys = [
+    "version", "always_use_skills", "prefer_skills", "avoid_skills",
+    "skill_rules", "custom_instructions", "models", "skill_discovery",
+    "auto_supervisor", "uat_dispatch", "budget_ceiling", "remote_questions", "git",
+  ];
+
+  const seen = new Set<string>();
+  for (const key of orderedKeys) {
+    if (key in prefs) {
+      serializeValue(key, prefs[key], 0);
+      seen.add(key);
+    }
+  }
+  // Any remaining keys not in the ordered list
+  for (const [key, value] of Object.entries(prefs)) {
+    if (!seen.has(key)) {
+      serializeValue(key, value, 0);
+    }
+  }
+
+  return lines.join("\n") + "\n";
+}
+
 async function ensurePreferencesFile(
   path: string,
   ctx: ExtensionCommandContext,

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

@@ -79,7 +79,7 @@ function validatePreferenceShape(preferences: GSDPreferences): string[] {
           issues.push(`skill_rules[${index}].when must be a string`);
         }
         for (const key of ["use", "prefer", "avoid"] as const) {
-          const value = (rule as Record<string, unknown>)[key];
+          const value = (rule as unknown as Record<string, unknown>)[key];
           if (value !== undefined && !Array.isArray(value)) {
             issues.push(`skill_rules[${index}].${key} must be a list`);
           }