gentle-pi 0.8.0 → 0.10.0

package/assets/agents/sdd-apply.md

@@ -34,11 +34,15 @@ Never claim persistence you did not perform.
 
 Before writing code, consume structured SDD status from the parent prompt. If missing, produce the same fields using this lookup order: project override `.pi/gentle-ai/support/sdd-status-contract.md`, then globally installed `~/.pi/agent/gentle-ai/support/sdd-status-contract.md`, then the embedded status contract. Do not use `assets/support/...` as a runtime path; that is only the package source path before installation.
 
+**Non-authoritative store carve-out:** when the native status JSON shows `nextRecommended: "resolve-via-engram"` (covers `artifactStore: engram`, `artifactStore: none`, and `artifactStore: both` without an `openspec/` directory), the status is non-authoritative. Do not treat `applyState`, `dependencies`, or `blockedReasons` from that status as real blockers. Resolve readiness as follows:
+- `engram` (or `both` without openspec/): search Engram for `sdd/{change}/tasks`, `sdd/{change}/spec`, and `sdd/{change}/design` using `mem_search` + `mem_get_observation`. Proceed with implementation once those artifacts are confirmed present.
+- `none`: there is no persistent backend. Return artifacts inline and ask the user to provide required inputs (tasks, spec, design) or acknowledge that no persistent artifact store is available.
+
 Stop with `blocked` before editing if:
 
 - active change selection is missing or ambiguous;
-- `applyState: blocked`;
-- required apply artifacts are missing;
+- `applyState: blocked` **and the status is authoritative** (openspec or both store);
+- required apply artifacts are missing (confirmed by artifact store);
 - `actionContext.mode: workspace-planning` and no `allowedEditRoots` are provided;
 - any target file is outside the authoritative workspace or allowed edit roots.
 

package/assets/agents/sdd-archive.md

@@ -34,6 +34,10 @@ Archive a completed SDD change. In file-backed modes, this requires canonical sp
 
 Before archive work, consume structured SDD status from the parent prompt. If missing, produce the same fields using this lookup order: project override `.pi/gentle-ai/support/sdd-status-contract.md`, then globally installed `~/.pi/agent/gentle-ai/support/sdd-status-contract.md`, then the embedded status contract. Do not use `assets/support/...` as a runtime path; that is only the package source path before installation.
 
+**Non-authoritative store carve-out:** when the native status JSON shows `nextRecommended: "resolve-via-engram"` (covers `artifactStore: engram`, `artifactStore: none`, and `artifactStore: both` without an `openspec/` directory), the status is non-authoritative. Do not treat `dependencies` or `blockedReasons` (including `not_applicable` dependency states) from that status as real blockers. Resolve readiness as follows:
+- `engram` (or `both` without openspec/): refer to the Artifact Store Modes section — resolve readiness by checking Engram for `sdd/{change}/verify-report` using `mem_search` + `mem_get_observation`, then record the archive report in Engram without filesystem sync or folder moves.
+- `none`: there is no persistent backend. Return a closure summary inline and ask the user to confirm that verification has passed before proceeding.
+
 Stop with `blocked` if:
 
 - active change selection is missing or ambiguous;

package/assets/agents/sdd-status.md

@@ -98,6 +98,8 @@ If parent context reports `workspace-planning` and no `allowedEditRoots`, mark a
 - `sync` is `ready` when verify-report exists and has no unresolved `FAIL`, `BLOCKED`, `CRITICAL`, or verification blockers; it is `not_applicable` for `engram`/`none` modes.
 - `archive` is `ready` only when verify-report is passing, sync-report exists or sync is not applicable, and no unchecked implementation tasks remain. CRITICAL verification issues have no override. Explicit recorded exceptions are limited to non-critical partial archives or stale-checkbox reconciliation when apply-progress/verify-report prove completion.
 
+**Non-authoritative carve-out:** when `nextRecommended: "resolve-via-engram"` or `isNonAuthoritative: true` is set on the status object, the `dependencies`, `applyState`, and `blockedReasons` fields are non-authoritative — they must not be treated as real blockers. This condition applies when the artifact store is `engram`, `none`, or `both` without an `openspec/` directory present on disk. For `engram`/`both-without-openspec`, resolve readiness directly from Engram using `mem_search` + `mem_get_observation` on the change topic keys (`sdd/{change}/proposal`, `sdd/{change}/spec`, `sdd/{change}/design`, `sdd/{change}/tasks`, etc.). For `none`, return inline status or ask the user — do not use the engine's `not_applicable`/`blockedReasons` as real gate failures.
+
 ## Output
 
 Return the standard phase envelope with status, executive_summary, artifacts, next_recommended, risks, and skill_resolution. Include the structured status block in `artifacts` or `executive_summary`.

package/assets/agents/sdd-sync.md

@@ -37,6 +37,8 @@ Sync file-backed SDD change specs into canonical `openspec/specs/` without movin
 
 Before syncing, consume structured SDD status from the parent prompt. If missing, produce the same fields using this lookup order: project override `.pi/gentle-ai/support/sdd-status-contract.md`, then globally installed `~/.pi/agent/gentle-ai/support/sdd-status-contract.md`, then the embedded status contract. Do not use `assets/support/...` as a runtime path; that is only the package source path before installation.
 
+**Non-authoritative carve-out:** when native status JSON shows `nextRecommended: "resolve-via-engram"` (covers `artifactStore: engram`, `artifactStore: none`, and `artifactStore: both` without an `openspec/` directory), the status is non-authoritative. Do not treat `dependencies` or `blockedReasons` from that status as real blockers. For `engram` store, refer to the Artifact Store Modes section — sync is not applicable; return a report explaining that canonical spec merge is not supported in Engram-only mode.
+
 Stop with `blocked` if:
 
 - active change selection is missing or ambiguous;

package/assets/agents/sdd-verify.md

@@ -32,10 +32,14 @@ Never claim persistence you did not perform.
 
 Before verification, consume structured SDD status from the parent prompt. If missing, produce the same fields using this lookup order: project override `.pi/gentle-ai/support/sdd-status-contract.md`, then globally installed `~/.pi/agent/gentle-ai/support/sdd-status-contract.md`, then the embedded status contract. Do not use `assets/support/...` as a runtime path; that is only the package source path before installation.
 
+**Non-authoritative store carve-out:** when the native status JSON shows `nextRecommended: "resolve-via-engram"` (covers `artifactStore: engram`, `artifactStore: none`, and `artifactStore: both` without an `openspec/` directory), the status is non-authoritative. Do not treat `dependencies` or `blockedReasons` from that status as real blockers. Resolve readiness as follows:
+- `engram` (or `both` without openspec/): check Engram for `sdd/{change}/tasks` and `sdd/{change}/apply-progress` using `mem_search` + `mem_get_observation`. Proceed with verification once those artifacts are confirmed present.
+- `none`: there is no persistent backend. Return the verification report inline and ask the user to provide required inputs (tasks, apply-progress) or acknowledge that no persistent artifact store is available.
+
 Stop with `blocked` if:
 
 - active change selection is missing or ambiguous;
-- `tasks.md` / the tasks artifact is missing or empty;
+- `tasks.md` / the tasks artifact is missing or empty (confirmed by artifact store);
 - `actionContext.mode: workspace-planning` and no `allowedEditRoots` are provided;
 - implementation ownership or target files cannot be proven inside the authoritative workspace or allowed edit roots.
 

package/assets/orchestrator.md

@@ -197,7 +197,8 @@ Rules:
 - `/sdd-continue` is the native dispatcher command: resolve status, choose the next ready phase, and carry status/instructions into the subagent prompt.
 - `sdd-apply`, `sdd-verify`, `sdd-sync`, and `sdd-archive` must obey parent-provided native status; they must not reconstruct readiness from prompt inference when status JSON is present.
 - Do not launch a phase when native status marks that dependency `blocked`.
-- `sdd-archive` cannot proceed unless native status says archive is ready.
+- `sdd-archive` cannot proceed unless native status says `dependencies.archive` is `ready` or `all_done` — UNLESS the store carve-out is active (`nextRecommended: "resolve-via-engram"`), in which case resolve archive readiness from Engram instead of treating `not_applicable` as a gate failure.
+- **Non-authoritative store carve-out:** when `nextRecommended: "resolve-via-engram"` is set, native status is **not authoritative**. This applies to `artifactStore: engram`, `artifactStore: none`, and `artifactStore: both` when the `openspec/` directory does not exist. For non-authoritative stores: resolve readiness from Engram using `mem_search` + `mem_get_observation` on the change topic keys (`sdd/{change-name}/proposal`, `sdd/{change-name}/spec`, `sdd/{change-name}/design`, `sdd/{change-name}/tasks`, etc.). Do **not** treat `blockedReasons` or `not_applicable` dependency states from the native engine as real blockers when the store carve-out is active.
 
 ## SDD Status Contract
 

package/assets/support/sdd-status-contract.md

@@ -54,18 +54,19 @@ taskProgress:
   complete: 0
   remaining: 0
   unchecked: []
-applyState: blocked | all_done | ready
+applyState: blocked | all_done | ready | not_applicable
 dependencies:
-  apply: blocked | ready | all_done
-  verify: blocked | ready | all_done
+  apply: blocked | ready | all_done | not_applicable
+  verify: blocked | ready | all_done | not_applicable
   sync: blocked | ready | all_done | not_applicable
-  archive: blocked | ready | all_done
+  archive: blocked | ready | all_done | not_applicable
 actionContext:
   mode: repo-local | workspace-planning
   workspaceRoot: <absolute path>
   allowedEditRoots: [<absolute paths>]
   warnings: []
 nextRecommended: <command-or-action>
+isNonAuthoritative: false  # boolean; true when the native engine is not authoritative for the store
 ```
 
 ## Apply State
@@ -73,6 +74,7 @@ nextRecommended: <command-or-action>
 - `blocked`: required apply artifacts are missing, task selection is ambiguous, or action context makes edits unsafe.
 - `all_done`: tasks artifact exists and every implementation task is checked `[x]`.
 - `ready`: tasks artifact exists, at least one implementation task remains unchecked, and edit scope is safe.
+- `not_applicable`: emitted for non-authoritative stores (see Engine Authority by Store). This is NOT a blocker.
 
 ## Dependency States
 
@@ -80,6 +82,7 @@ nextRecommended: <command-or-action>
 - `verify` is `ready` when tasks exist and either apply-progress exists or the tasks artifact shows all intended implementation work complete. Unchecked implementation tasks remain CRITICAL blockers for full archive readiness.
 - `sync` is `ready` only when verify-report exists and has no unresolved `FAIL`, `BLOCKED`, `CRITICAL`, or verification blockers. `engram`/`none` modes may mark sync `not_applicable`.
 - `archive` is `ready` only when verify-report exists, sync is complete or not applicable, and tasks are complete. CRITICAL verification issues have no override. Explicit recorded exceptions are limited to non-critical partial archives or stale-checkbox reconciliation when apply-progress/verify-report prove completion.
+- `not_applicable`: emitted for non-authoritative stores (engram, none, and both when no `openspec/` directory exists) when `nextRecommended: "resolve-via-engram"` is active. `not_applicable` is NOT a gate failure — readiness must be resolved from Engram instead of from these fields.
 
 ## Action Context Guard
 
@@ -89,6 +92,11 @@ The orchestrator MUST carry `actionContext` into any phase launch.
 - If `allowedEditRoots` is present, only edit or move files within those roots.
 - If a phase cannot prove a file is inside the authoritative workspace or allowed edit roots, stop and ask for clarification.
 
+## Engine Authority by Store
+
+- `openspec` and `both` (when `openspec/` directory exists): the native status engine resolves artifact state from disk and is authoritative. Phase executors must obey it.
+- `engram`, `none`, and `both` (when `openspec/` directory does NOT exist): the native status engine cannot read Engram artifacts. It returns `nextRecommended: "resolve-via-engram"` and empty `blockedReasons`. This output is **non-authoritative**. The orchestrator must resolve readiness directly from Engram using `mem_search` + `mem_get_observation` on the change topic keys (`sdd/{change-name}/proposal`, `sdd/{change-name}/spec`, etc.) instead of relying on the engine's dependency states. The `artifactStore` field still reflects the real chosen store value (e.g. `"both"`) and must not be rewritten.
+
 ## Status Output
 
 Every command or agent that acts on a change MUST show or consume status before doing phase work:

package/extensions/gentle-ai.ts

@@ -19,6 +19,8 @@ import { fileURLToPath } from "node:url";
 import type {
 	ExtensionAPI,
 	ExtensionContext,
+	Theme,
+	ThemeColor,
 	ToolCallEventResult,
 } from "@earendil-works/pi-coding-agent";
 import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
@@ -45,6 +47,7 @@ import {
 	type ChangedDiff,
 	type TriggerEvent,
 } from "../lib/review-triggers.ts";
+import { sanitizeTerminalText, stripAnsi } from "../lib/terminal-theme.ts";
 
 const PACKAGE_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
 const ASSETS_DIR = join(PACKAGE_ROOT, "assets");
@@ -713,17 +716,8 @@ function isThinkingLevel(value: unknown): value is ThinkingLevel {
 	);
 }
 
-const ANSI_ESCAPE_PATTERN =
-	/[\u001b\u009b][[\]()#;?]*(?:(?:(?:[a-zA-Z\d]*(?:;[a-zA-Z\d]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PR-TZcf-nq-uy=><~]))/g;
-const CONTROL_CHAR_PATTERN = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/g;
 const SAFE_MODEL_ID_PATTERN = /^[A-Za-z0-9._~:@/+%-]+$/;
 
-function sanitizeTerminalText(value: string): string {
-	return value
-		.replace(ANSI_ESCAPE_PATTERN, "")
-		.replace(CONTROL_CHAR_PATTERN, "");
-}
-
 function normalizeModelId(value: unknown): string | undefined {
 	if (typeof value !== "string") return undefined;
 	const model = value.trim();
@@ -1236,6 +1230,26 @@ type ModelPanelResult =
 
 const SET_ALL_AGENTS = "Set all agents";
 
+const PANEL_TONE = {
+	BORDER: "border",
+	MUTED: "muted",
+	TEXT: "text",
+	TITLE: "title",
+	ACCENT: "accent",
+	STATUS: "status",
+} as const;
+
+type PanelTone = (typeof PANEL_TONE)[keyof typeof PANEL_TONE];
+
+const PANEL_TONE_COLOR: Record<PanelTone, ThemeColor> = {
+	border: "border",
+	muted: "muted",
+	text: "text",
+	title: "accent",
+	accent: "accent",
+	status: "thinkingHigh",
+};
+
 class SddModelPanel implements OverlayComponent {
 	private cursor = 0;
 	private mode: "agents" | "models" | "effort" = "agents";
@@ -1247,17 +1261,20 @@ class SddModelPanel implements OverlayComponent {
 	private readonly rows: string[];
 	private readonly modelOptions: string[];
 	private readonly done: (result: ModelPanelResult) => void;
+	private readonly theme: Theme | undefined;
 
 	constructor(
 		initialConfig: AgentModelConfig,
 		modelOptions: string[],
 		agents: string[],
 		done: (result: ModelPanelResult) => void,
+		theme?: Theme,
 	) {
 		this.draft = cloneModelConfig(initialConfig);
 		this.rows = [SET_ALL_AGENTS, ...agents];
 		this.modelOptions = modelOptions;
 		this.done = done;
+		this.theme = theme;
 	}
 
 	invalidate(): void {}
@@ -1287,15 +1304,46 @@ class SddModelPanel implements OverlayComponent {
 
 	private renderCard(lines: string[], width: number): string[] {
 		const innerWidth = Math.max(1, width - 4);
-		const fit = (text = "") =>
-			truncateToWidth(sanitizeTerminalText(text), innerWidth, "…", true).padEnd(innerWidth);
+		const horizontal = "─".repeat(innerWidth + 2);
+		const border = (text: string) => this.renderText(text, "border");
 		return [
-			`╭${"─".repeat(innerWidth + 2)}╮`,
-			...lines.map((line) => `│ ${fit(line)} │`),
-			`╰${"─".repeat(innerWidth + 2)}╯`,
+			border(`╭${horizontal}╮`),
+			...lines.map(
+				(line) =>
+					`${border("│")} ${this.fitStyledLine(line, innerWidth)} ${border("│")}`,
+			),
+			border(`╰${horizontal}╯`),
 		];
 	}
 
+	private fitStyledLine(line: string, width: number): string {
+		const visible = stripAnsi(line);
+		if (visible.length > width) {
+			return truncateToWidth(visible, Math.max(1, width), "…", true);
+		}
+		return `${line}${" ".repeat(Math.max(0, width - visible.length))}`;
+	}
+
+	private renderLine(text = "", width: number, tone?: PanelTone): string {
+		const safe = truncateToWidth(
+			sanitizeTerminalText(text),
+			Math.max(1, width),
+			"…",
+			true,
+		);
+		return tone ? this.renderText(safe, tone) : safe;
+	}
+
+	private renderText(text: string, tone: PanelTone): string {
+		const safe = sanitizeTerminalText(text);
+		if (!this.theme) return safe;
+		return this.theme.fg(PANEL_TONE_COLOR[tone], safe);
+	}
+
+	private renderCursor(focused: boolean): string {
+		return focused ? this.renderText("▸", "accent") : " ";
+	}
+
 	private handleAgentInput(data: string): void {
 		const maxCursor = this.rows.length + 1;
 		if (matchesKey(data, "ctrl+c") || matchesKey(data, "escape")) {
@@ -1478,11 +1526,11 @@ class SddModelPanel implements OverlayComponent {
 
 	private renderAgentList(width: number): string[] {
 		const lines: string[] = [];
-		const line = (text = "") =>
-			truncateToWidth(text, Math.max(1, width), "…", true);
-		lines.push(line("Assign Models and Effort to Agents"));
+		const line = (text = "", tone?: PanelTone) =>
+			this.renderLine(text, width, tone);
+		lines.push(line("Assign Models and Effort to Agents", "title"));
 		lines.push("");
-		lines.push(line("Current assignments:"));
+		lines.push(line("Current assignments:", "muted"));
 		lines.push("");
 		const visibleRows = Math.min(AGENT_LIST_MAX_VISIBLE_ROWS, this.rows.length);
 		const listCursor = Math.min(this.cursor, this.rows.length - 1);
@@ -1494,7 +1542,7 @@ class SddModelPanel implements OverlayComponent {
 			),
 		);
 		const end = Math.min(this.rows.length, start + visibleRows);
-		if (start > 0) lines.push(line(`  ↑ ${start} more agent(s)`));
+		if (start > 0) lines.push(line(`  ↑ ${start} more agent(s)`, "muted"));
 		for (let i = start; i < end; i++) {
 			const row = this.rows[i] ?? SET_ALL_AGENTS;
 			const focused = i === this.cursor;
@@ -1502,21 +1550,28 @@ class SddModelPanel implements OverlayComponent {
 				row === SET_ALL_AGENTS
 					? this.renderSetAllLabel(row)
 					: this.renderAgentLabel(row);
-			lines.push(line(`${focused ? "▸" : " "} ${label}`));
+			lines.push(`${this.renderCursor(focused)} ${label}`);
 		}
 		if (end < this.rows.length)
-			lines.push(line(`  ↓ ${this.rows.length - end} more agent(s)`));
+			lines.push(line(`  ↓ ${this.rows.length - end} more agent(s)`, "muted"));
 		lines.push("");
 		lines.push(
-			line(`${this.cursor === this.rows.length ? "▸" : " "} Continue`),
+			`${this.renderCursor(this.cursor === this.rows.length)} ${this.renderText(
+				"Continue",
+				this.cursor === this.rows.length ? "accent" : "text",
+			)}`,
 		);
 		lines.push(
-			line(`${this.cursor === this.rows.length + 1 ? "▸" : " "} ← Back`),
+			`${this.renderCursor(this.cursor === this.rows.length + 1)} ${this.renderText(
+				"← Back",
+				this.cursor === this.rows.length + 1 ? "accent" : "text",
+			)}`,
 		);
 		lines.push("");
 		lines.push(
 			line(
 				"j/k scroll • enter model/save • e effort • i inherit • c custom • x export • r restore • ctrl+s save • esc back",
+				"muted",
 			),
 		);
 		return lines;
@@ -1525,11 +1580,15 @@ class SddModelPanel implements OverlayComponent {
 	private renderModelPicker(width: number): string[] {
 		const lines: string[] = [];
 		const options = this.filteredModelOptions();
-		const line = (text = "") =>
-			truncateToWidth(text, Math.max(1, width), "…", true);
-		lines.push(line(`Select model for ${sanitizeTerminalText(this.selectedRow)}`));
+		const line = (text = "", tone?: PanelTone) =>
+			this.renderLine(text, width, tone);
+		lines.push(
+			line(`Select model for ${sanitizeTerminalText(this.selectedRow)}`, "title"),
+		);
 		lines.push("");
-		lines.push(line(`◎ ${this.query || "search..."}`));
+		lines.push(
+			`${this.renderText("◎", "accent")} ${this.renderText(this.query || "search...", "muted")}`,
+		);
 		lines.push("");
 		const start = Math.max(
 			0,
@@ -1541,12 +1600,17 @@ class SddModelPanel implements OverlayComponent {
 		const end = Math.min(options.length, start + MODEL_LIST_MAX_VISIBLE_ROWS);
 		for (let i = start; i < end; i++) {
 			const focused = i === this.modelCursor;
-			lines.push(line(`${focused ? "▸" : " "} ${sanitizeTerminalText(options[i] ?? "")}`));
+			lines.push(
+				`${this.renderCursor(focused)} ${this.renderText(
+					options[i] ?? "",
+					focused ? "status" : "text",
+				)}`,
+			);
 		}
-		if (options.length === 0) lines.push(line("  No matching models"));
+		if (options.length === 0) lines.push(line("  No matching models", "muted"));
 		lines.push("");
 		lines.push(
-			line("j/k: navigate • type: search • enter: select • esc: back"),
+			line("j/k: navigate • type: search • enter: select • esc: back", "muted"),
 		);
 		return lines;
 	}
@@ -1580,16 +1644,23 @@ class SddModelPanel implements OverlayComponent {
 
 	private renderEffortPicker(width: number): string[] {
 		const lines: string[] = [];
-		const line = (text = "") =>
-			truncateToWidth(text, Math.max(1, width), "…", true);
-		lines.push(line(`Select effort for ${sanitizeTerminalText(this.selectedRow)}`));
+		const line = (text = "", tone?: PanelTone) =>
+			this.renderLine(text, width, tone);
+		lines.push(
+			line(`Select effort for ${sanitizeTerminalText(this.selectedRow)}`, "title"),
+		);
 		lines.push("");
 		for (let i = 0; i < THINKING_OPTIONS.length; i++) {
 			const focused = i === this.effortCursor;
-			lines.push(line(`${focused ? "▸" : " "} ${THINKING_OPTIONS[i]}`));
+			lines.push(
+				`${this.renderCursor(focused)} ${this.renderText(
+					THINKING_OPTIONS[i] ?? "",
+					focused ? "status" : "text",
+				)}`,
+			);
 		}
 		lines.push("");
-		lines.push(line("j/k: navigate • enter: select • esc: back"));
+		lines.push(line("j/k: navigate • enter: select • esc: back", "muted"));
 		return lines;
 	}
 
@@ -1608,16 +1679,34 @@ class SddModelPanel implements OverlayComponent {
 		const effortLabel = efforts.every((value) => value === firstEffort)
 			? firstEffort
 			: "mixed";
-		return `${sanitizeTerminalText(row).padEnd(20)} model=${sanitizeTerminalText(modelLabel)}, effort=${sanitizeTerminalText(effortLabel)}`;
+		return `${this.renderText(sanitizeTerminalText(row).padEnd(20), "text")} ${this.renderText("model=", "muted")}${this.renderText(modelLabel, "status")}${this.renderText(
+			", effort=",
+			"muted",
+		)}${this.renderText(effortLabel, "status")}`;
 	}
 
 	private renderAgentLabel(row: string): string {
 		const model = this.draft[row]?.model ?? "inherit";
 		const effort = this.draft[row]?.thinking ?? "inherit";
-		return `${sanitizeTerminalText(row).padEnd(20)} model=${sanitizeTerminalText(model)}, effort=${sanitizeTerminalText(effort)}`;
+		return `${this.renderText(sanitizeTerminalText(row).padEnd(20), "text")} ${this.renderText("model=", "muted")}${this.renderText(model, "status")}${this.renderText(
+			", effort=",
+			"muted",
+		)}${this.renderText(effort, "status")}`;
 	}
 }
 
+function renderSddModelPanelForTesting(
+	initialConfig: AgentModelConfig,
+	modelOptions: string[],
+	agents: string[],
+	width: number,
+	theme?: Theme,
+): string[] {
+	return new SddModelPanel(initialConfig, modelOptions, agents, () => {}, theme).render(
+		width,
+	);
+}
+
 async function showSddModelPanel(
 	ctx: ExtensionContext,
 	config: AgentModelConfig,
@@ -1625,8 +1714,8 @@ async function showSddModelPanel(
 	const modelOptions = await getPiModelOptions(ctx);
 	const agents = listDiscoverableAgents(ctx.cwd).map((agent) => agent.name);
 	return ctx.ui.custom<ModelPanelResult>(
-		(_tui, _theme, _keybindings, done) =>
-			new SddModelPanel(config, modelOptions, agents, done),
+		(_tui, theme, _keybindings, done) =>
+			new SddModelPanel(config, modelOptions, agents, done, theme),
 		{
 			overlay: true,
 			overlayOptions: {
@@ -1918,6 +2007,7 @@ export const __testing = {
 	buildGentlePrompt,
 	classifyReviewEvent,
 	parseNumstat,
+	renderSddModelPanel: renderSddModelPanelForTesting,
 };
 
 export default function gentleAi(pi: ExtensionAPI): void {
@@ -1982,6 +2072,7 @@ export default function gentleAi(pi: ExtensionAPI): void {
 			? `\n\n${renderNativeSddPhasePrompt(resolveSddStatus({
 				cwd: ctx.cwd,
 				includeInstructions: true,
+				artifactStore: prefs?.artifactStore,
 			}), phase)}`
 			: "";
 		const gentlePrompt = isNamedAgent || isSddAgent
@@ -2040,6 +2131,7 @@ export default function gentleAi(pi: ExtensionAPI): void {
 			cwd: ctx.cwd,
 			changeName: parsed.changeName,
 			includeInstructions: true,
+			artifactStore: getSddPreflightPreferences(ctx)?.artifactStore,
 		});
 		ctx.ui.notify(
 			parsed.json ? JSON.stringify(status, null, 2) : renderSddStatusMarkdown(status),
@@ -2067,6 +2159,7 @@ export default function gentleAi(pi: ExtensionAPI): void {
 			cwd: ctx.cwd,
 			changeName: parsed.changeName,
 			includeInstructions: true,
+			artifactStore: getSddPreflightPreferences(ctx)?.artifactStore,
 		});
 		ctx.ui.notify(
 			parsed.json ? JSON.stringify(status, null, 2) : renderSddDispatcherMarkdown(status),

package/lib/sdd-preflight.ts

@@ -3,6 +3,9 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { SddArtifactStore } from "./sdd-status.ts";
+
+export type { SddArtifactStore };
 
 const PACKAGE_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
 const ASSETS_DIR = join(PACKAGE_ROOT, "assets");
@@ -12,7 +15,6 @@ function gentlePiAgentHome(): string {
 }
 
 export type SddExecutionMode = "interactive" | "auto";
-export type SddArtifactStore = "openspec" | "engram" | "both";
 export type SddChainedPrStrategy =
 	| "auto-forecast"
 	| "ask-always"
@@ -66,6 +68,60 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// ---------------------------------------------------------------------------
+// Durable store — survives restarts, resumed sessions, and non-SDD agent starts
+// ---------------------------------------------------------------------------
+
+export function sddPreflightDiskPath(cwd: string): string {
+	return join(cwd, ".pi", "gentle-ai", "sdd-preflight.json");
+}
+
+export function readSddPreflightFromDisk(cwd: string): SddPreflightPreferences | undefined {
+	const path = sddPreflightDiskPath(cwd);
+	if (!existsSync(path)) return undefined;
+	try {
+		const parsed: unknown = JSON.parse(readFileSync(path, "utf8"));
+		if (!isRecord(parsed)) return undefined;
+		// Validate required fields to guard against stale/corrupt writes
+		const { executionMode, artifactStore, chainedPrStrategy, reviewBudgetLines, engramAvailable, prompted } = parsed;
+		if (
+			(executionMode !== "interactive" && executionMode !== "auto") ||
+			(artifactStore !== "openspec" && artifactStore !== "engram" && artifactStore !== "both" && artifactStore !== "none") ||
+			typeof reviewBudgetLines !== "number" ||
+			typeof engramAvailable !== "boolean" ||
+			typeof prompted !== "boolean"
+		) {
+			return undefined;
+		}
+		const normalizedChain: SddChainedPrStrategy =
+			chainedPrStrategy === "ask-always" ||
+			chainedPrStrategy === "single-pr-default" ||
+			chainedPrStrategy === "force-chained"
+				? (chainedPrStrategy as SddChainedPrStrategy)
+				: "auto-forecast";
+		return {
+			executionMode,
+			artifactStore,
+			chainedPrStrategy: normalizedChain,
+			reviewBudgetLines,
+			engramAvailable,
+			prompted,
+		};
+	} catch {
+		return undefined;
+	}
+}
+
+export function writeSddPreflightToDisk(cwd: string, prefs: SddPreflightPreferences): void {
+	try {
+		const path = sddPreflightDiskPath(cwd);
+		mkdirSync(dirname(path), { recursive: true });
+		writeFileSync(path, JSON.stringify(prefs, null, 2));
+	} catch {
+		// Disk write failures are non-fatal; in-memory cache is the primary store
+	}
+}
+
 function copyDirectoryFiles(
 	sourceDir: string,
 	targetDir: string,
@@ -295,6 +351,7 @@ export async function ensureSddPreflight(
 			);
 		}
 		sddPreflightBySession.set(sessionKey, prefs);
+		writeSddPreflightToDisk(ctx.cwd, prefs);
 		return prefs;
 	})();
 	sddPreflightInFlight.set(sessionKey, promise);
@@ -308,5 +365,14 @@ export async function ensureSddPreflight(
 export function getSddPreflightPreferences(
 	ctx: ExtensionContext,
 ): SddPreflightPreferences | undefined {
-	return sddPreflightBySession.get(sddPreflightSessionKey(ctx));
+	const sessionKey = sddPreflightSessionKey(ctx);
+	const cached = sddPreflightBySession.get(sessionKey);
+	if (cached) return cached;
+	// Cache miss: check the durable disk store (survives restarts and non-SDD agent starts)
+	const persisted = readSddPreflightFromDisk(ctx.cwd);
+	if (persisted) {
+		sddPreflightBySession.set(sessionKey, persisted);
+		return persisted;
+	}
+	return undefined;
 }