@zihanw/pi-forge 0.3.1 → 0.4.0-beta.1

package/src/index.ts

@@ -1,430 +0,0 @@
-import type { BuildSystemPromptOptions, ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { registerLifecycleHandlers } from "./lifecycle.ts";
-import { chooseDefaultStack, isDisabledPromptStackId, loadPromptStacks } from "./loader.ts";
-import { registerPayloadCommands, registerPayloadRequestHandler, armPayloadIntercept, clearPayloadCapture, webPayloadSnapshot } from "./payload-command.ts";
-import { applyResourcePolicy, hasResourcePolicy } from "./policy.ts";
-import { buildPreview, showText } from "./preview.ts";
-import { registerPresetCommand, selectedActiveId as selectedActiveIdForState } from "./preset-command.ts";
-import { createRuntimeState, STATE_ENTRY_TYPE } from "./runtime-state.ts";
-import type { PromptStack, PromptStackDiagnostic } from "./types.ts";
-import { createWebEditorHost, loadWebEditorSettings, type WebHostRuntime } from "./web-host.ts";
-import { startWebEditorServer, type WebEditorPolicyResource, type WebEditorPolicyResources, type WebEditorServer } from "./web-editor/index.ts";
-
-export {
-	getRegisteredMacros,
-	registerMacro,
-	type PromptMacroDefinition,
-	type PromptMacroRenderContext,
-	type PromptMacroRenderer,
-} from "./macro-engine.ts";
-export {
-	getRegisteredSlots,
-	registerSlot,
-	type PromptSlotDefinition,
-	type PromptSlotRenderContext,
-	type PromptSlotRenderer,
-} from "./slot-renderers.ts";
-export {
-	type PromptExtensionArgumentDefinition,
-	type PromptExtensionOptionDefinition,
-	type PromptExtensionOptionsSchema,
-	type PromptExtensionOptionType,
-	type PromptRegistryEntry,
-} from "./extension-registry.ts";
-export {
-	createVariableAccess,
-	promptRenderHelpers,
-	type PromptRenderHelpers,
-	type PromptVariableAccess,
-	type PromptVariableScope,
-	type PromptWritableVariableScope,
-} from "./render-helpers.ts";
-
-const WEB_EDITOR_GLOBAL_KEY = "__piForgeWebEditor";
-
-interface SharedWebEditorState {
-	server?: WebEditorServer;
-	cwd?: string;
-	preferredPort?: number;
-}
-
-interface SharedWebEditorRegistry {
-	byCwd: Record<string, SharedWebEditorState | undefined>;
-}
-
-type PiForgeGlobal = typeof globalThis & {
-	__piForgeWebEditor?: SharedWebEditorRegistry;
-};
-
-function getSharedWebEditorRegistry(): SharedWebEditorRegistry {
-	const globalScope = globalThis as PiForgeGlobal;
-	globalScope[WEB_EDITOR_GLOBAL_KEY] ??= { byCwd: {} };
-	return globalScope[WEB_EDITOR_GLOBAL_KEY];
-}
-
-export default function piForge(pi: ExtensionAPI) {
-	const sharedWebEditors = getSharedWebEditorRegistry();
-	const state = createRuntimeState();
-	let webEditor: WebEditorServer | undefined;
-	let webEditorCwd: string | undefined;
-	let webEditorPreferredPort: number | undefined;
-	let toolPolicyBaseline: string[] | undefined;
-
-	function activeId(): string | undefined {
-		return state.active?.stack.id;
-	}
-
-	function selectedActiveId(): string | undefined {
-		return selectedActiveIdForState(state);
-	}
-
-	function persistActiveSelection(id: string): void {
-		if (id === state.lastPersistedActiveId) return;
-		pi.appendEntry(STATE_ENTRY_TYPE, { activeStackId: id });
-		state.lastPersistedActiveId = id;
-	}
-
-	function setActive(id: string | undefined, ctx?: ExtensionContext): boolean {
-		if (!id || isDisabledPromptStackId(id)) {
-			state.active = undefined;
-			if (id) persistActiveSelection("none");
-			if (ctx) updateStatus(ctx);
-			syncActiveToolPolicy(ctx);
-			return true;
-		}
-
-		const found = state.stacks.find((candidate) => candidate.stack.id === id);
-		if (!found) return false;
-		state.active = found;
-		persistActiveSelection(found.stack.id);
-		if (ctx) updateStatus(ctx);
-		syncActiveToolPolicy(ctx);
-		return true;
-	}
-
-	function reloadStacks(ctx: ExtensionContext, preferredId?: string): void {
-		if (!ctx.isProjectTrusted()) {
-			state.stacks = [];
-			state.active = undefined;
-			syncActiveToolPolicy(ctx);
-			ctx.ui.notify("pi-forge: project is not trusted; prompt stacks are disabled.", "warning");
-			updateStatus(ctx);
-			return;
-		}
-
-		state.stacks = loadPromptStacks(ctx.cwd);
-		state.active = chooseDefaultStack(state.stacks, preferredId);
-		updateStatus(ctx);
-		syncActiveToolPolicy(ctx);
-	}
-
-	function updateStatus(ctx: ExtensionContext): void {
-		if (state.active) {
-			ctx.ui.setStatus("pi-forge", ctx.ui.theme.fg("accent", "stack:" + state.active.stack.id));
-		} else {
-			ctx.ui.setStatus("pi-forge", undefined);
-			state.latestCompileDiagnostics = [];
-			ctx.ui.setStatus("pi-forge-diagnostics", undefined);
-		}
-	}
-
-	function syncActiveToolPolicy(ctx?: ExtensionContext): void {
-		const policy = state.active?.stack.tools;
-		if (!hasResourcePolicy(policy)) {
-			restoreToolPolicy(ctx);
-			return;
-		}
-
-		const baseline = toolPolicyBaseline ?? pi.getActiveTools();
-		toolPolicyBaseline ??= [...baseline];
-		const nextTools = applyResourcePolicy(filterKnownTools(baseline), policy);
-		pi.setActiveTools(nextTools);
-		if (ctx) {
-			const label = nextTools.length > 0 ? `tools:${nextTools.length}` : "tools:none";
-			ctx.ui.setStatus("pi-forge-tools", ctx.ui.theme.fg(nextTools.length > 0 ? "accent" : "warning", label));
-		}
-	}
-
-	function restoreToolPolicy(ctx?: ExtensionContext): void {
-		if (toolPolicyBaseline) {
-			pi.setActiveTools(filterKnownTools(toolPolicyBaseline));
-			toolPolicyBaseline = undefined;
-		}
-		if (ctx) ctx.ui.setStatus("pi-forge-tools", undefined);
-	}
-
-	function filterKnownTools(names: string[]): string[] {
-		const known = new Set(pi.getAllTools().map((tool) => tool.name));
-		if (known.size === 0) return names;
-		return names.filter((name) => known.has(name));
-	}
-
-	function notifyActivePreset(ctx: ExtensionContext, detail: string): void {
-		if (!state.active) return;
-		const errorCount = state.active.diagnostics.filter((d) => d.level === "error").length;
-		const warningCount = state.active.diagnostics.filter((d) => d.level === "warning").length;
-		const suffix = errorCount || warningCount ? " (" + errorCount + " errors, " + warningCount + " warnings)" : "";
-		ctx.ui.notify("pi-forge: active preset " + state.active.stack.id + suffix + " (" + detail + ")", errorCount ? "error" : "info");
-	}
-
-	function recordCompileDiagnostics(ctx: ExtensionContext, diagnostics: PromptStackDiagnostic[]): void {
-		state.latestCompileDiagnostics = diagnostics;
-		const errors = diagnostics.filter((d) => d.level === "error").length;
-		const warnings = diagnostics.filter((d) => d.level === "warning").length;
-		if (errors || warnings) {
-			ctx.ui.setStatus("pi-forge-diagnostics", ctx.ui.theme.fg(errors ? "error" : "warning", `forge:${errors}e/${warnings}w`));
-			return;
-		}
-		ctx.ui.setStatus("pi-forge-diagnostics", undefined);
-	}
-
-	function webHostRuntime(ctx: ExtensionCommandContext): WebHostRuntime {
-		return {
-			getStacks: () => state.stacks,
-			getActive: () => state.active,
-			getActiveId: activeId,
-			getSelectedActiveId: selectedActiveId,
-			setActive: (id) => setActive(id, ctx),
-			reloadStacks: (preferredId) => reloadStacks(ctx, preferredId),
-			buildPreview: (target) => buildPreview(ctx, target, state.sessionVariables, previewOptionsForStack(ctx, target.stack)),
-			getPolicyResources: () => getPolicyResources(ctx),
-			getPayload: () => ({ ok: true, ...webPayloadSnapshot(state) }),
-			armPayload: (savePath) => {
-				armPayloadIntercept(state, ctx, savePath, "web");
-				return { ok: true, ...webPayloadSnapshot(state) };
-			},
-			clearPayload: () => {
-				clearPayloadCapture(state, ctx);
-				return { ok: true, ...webPayloadSnapshot(state) };
-			},
-		};
-	}
-
-	function getPolicyResources(ctx: ExtensionCommandContext): WebEditorPolicyResources {
-		const options = ctx.getSystemPromptOptions();
-		const activeTools = new Set(pi.getActiveTools());
-		const snippets = options.toolSnippets ?? {};
-		const tools = pi.getAllTools()
-			.map((tool) => normalizeToolResource(tool, activeTools, snippets))
-			.filter(hasPolicyResourceName)
-			.sort(comparePolicyResource);
-		const skills = (options.skills ?? [])
-			.map(normalizeSkillResource)
-			.filter(hasPolicyResourceName)
-			.sort(comparePolicyResource);
-		return { tools, skills };
-	}
-
-	function previewOptionsForStack(ctx: ExtensionCommandContext, stack: PromptStack): BuildSystemPromptOptions {
-		const base = ctx.getSystemPromptOptions();
-		const baseSelectedTools = Array.isArray(base.selectedTools) ? base.selectedTools : pi.getActiveTools();
-		const policyActive = hasResourcePolicy(stack.tools);
-		const baselineTools = policyActive ? (toolPolicyBaseline ?? pi.getActiveTools()) : baseSelectedTools;
-		const selectedTools = policyActive
-			? applyResourcePolicy(filterKnownTools(baselineTools), stack.tools)
-			: baseSelectedTools;
-		const selectedToolSet = new Set(selectedTools);
-		const toolSnippets = filterToolSnippets(base.toolSnippets ?? {}, selectedToolSet);
-		const toolInfos = pi.getAllTools();
-		for (const tool of toolInfos) {
-			const name = stringValue((tool as { name?: unknown }).name);
-			if (!name || !selectedToolSet.has(name) || toolSnippets[name]) continue;
-			const snippet = stringValue((tool as { promptSnippet?: unknown }).promptSnippet);
-			if (snippet) toolSnippets[name] = snippet;
-		}
-
-		const mappedGuidelines = toolInfos
-			.filter((tool) => {
-				const name = stringValue((tool as { name?: unknown }).name);
-				return !!name && selectedToolSet.has(name);
-			})
-			.flatMap((tool) => stringArrayValue((tool as { promptGuidelines?: unknown }).promptGuidelines));
-		const promptGuidelines = policyActive && !sameStringSet(baseSelectedTools, selectedTools)
-			? mappedGuidelines
-			: (base.promptGuidelines ?? mappedGuidelines);
-
-		return { ...base, selectedTools, toolSnippets, promptGuidelines };
-	}
-
-	function filterToolSnippets(snippets: Record<string, string | undefined>, selectedTools: Set<string>): Record<string, string> {
-		const filtered: Record<string, string> = {};
-		for (const [name, snippet] of Object.entries(snippets)) {
-			if (selectedTools.has(name) && snippet) filtered[name] = snippet;
-		}
-		return filtered;
-	}
-
-	function normalizeToolResource(
-		tool: { name?: unknown; description?: unknown; promptSnippet?: unknown; sourceInfo?: unknown },
-		activeTools: Set<string>,
-		snippets: Record<string, string | undefined>,
-	): WebEditorPolicyResource {
-		const name = String(tool.name ?? "");
-		return {
-			name,
-			description: stringValue(tool.description) ?? stringValue(tool.promptSnippet) ?? snippets[name],
-			source: sourceLabel(tool.sourceInfo),
-			active: activeTools.has(name),
-		};
-	}
-
-	function normalizeSkillResource(skill: { name?: unknown; description?: unknown; filePath?: unknown; disableModelInvocation?: unknown }): WebEditorPolicyResource {
-		return {
-			name: String(skill.name ?? ""),
-			description: stringValue(skill.description),
-			source: stringValue(skill.filePath),
-			hidden: skill.disableModelInvocation === true,
-		};
-	}
-
-	function stringValue(value: unknown): string | undefined {
-		return typeof value === "string" && value.trim() ? value : undefined;
-	}
-
-	function stringArrayValue(value: unknown): string[] {
-		return Array.isArray(value) ? value.filter((item): item is string => typeof item === "string" && !!item.trim()) : [];
-	}
-
-	function sourceLabel(value: unknown): string | undefined {
-		if (!value || typeof value !== "object") return undefined;
-		const source = stringValue((value as { source?: unknown }).source);
-		const path = stringValue((value as { path?: unknown }).path);
-		if (source && path) return `${source}: ${path}`;
-		return source ?? path;
-	}
-
-	function comparePolicyResource(a: WebEditorPolicyResource, b: WebEditorPolicyResource): number {
-		return a.name.localeCompare(b.name);
-	}
-
-	function hasPolicyResourceName(resource: WebEditorPolicyResource): boolean {
-		return !!resource.name.trim();
-	}
-
-	function sameStringSet(a: string[], b: string[]): boolean {
-		if (a.length !== b.length) return false;
-		const bSet = new Set(b);
-		return a.every((value) => bSet.has(value));
-	}
-
-	function sharedWebEditorForCwd(cwd: string): SharedWebEditorState {
-		sharedWebEditors.byCwd[cwd] ??= {};
-		return sharedWebEditors.byCwd[cwd];
-	}
-
-	function syncWebEditorFromShared(cwd: string): void {
-		const shared = sharedWebEditorForCwd(cwd);
-		webEditor = shared.server;
-		webEditorCwd = shared.cwd;
-		webEditorPreferredPort = shared.preferredPort;
-	}
-
-	function rememberWebEditor(server: WebEditorServer, cwd: string, preferredPort: number | undefined): void {
-		const shared = sharedWebEditorForCwd(cwd);
-		webEditor = server;
-		webEditorCwd = cwd;
-		webEditorPreferredPort = preferredPort;
-		shared.server = server;
-		shared.cwd = cwd;
-		shared.preferredPort = preferredPort;
-	}
-
-	function clearWebEditor(server: WebEditorServer): void {
-		if (webEditor === server) {
-			webEditor = undefined;
-			webEditorCwd = undefined;
-			webEditorPreferredPort = undefined;
-		}
-		for (const [cwd, shared] of Object.entries(sharedWebEditors.byCwd)) {
-			if (shared?.server === server) delete sharedWebEditors.byCwd[cwd];
-		}
-	}
-
-	function refreshWebEditorHost(ctx: ExtensionContext): void {
-		syncWebEditorFromShared(ctx.cwd);
-		if (!webEditor) return;
-		const commandCtx = ctx as ExtensionCommandContext;
-		webEditor.updateHost(createWebEditorHost(commandCtx, webHostRuntime(commandCtx)));
-		rememberWebEditor(webEditor, ctx.cwd, webEditorPreferredPort);
-		ctx.ui.setStatus("pi-forge-editor", ctx.ui.theme.fg("accent", `editor:${webEditor.port}`));
-	}
-
-	async function openWebEditor(ctx: ExtensionCommandContext, mode: "open" | "restart" = "open"): Promise<void> {
-		syncWebEditorFromShared(ctx.cwd);
-		const settings = loadWebEditorSettings(ctx);
-		for (const warning of settings.warnings) ctx.ui.notify(warning, "warning");
-
-		if (webEditor && (mode === "restart" || webEditorPreferredPort !== settings.preferredPort)) {
-			const server = webEditor;
-			await server.close();
-			clearWebEditor(server);
-			ctx.ui.setStatus("pi-forge-editor", undefined);
-		}
-
-		if (!webEditor) {
-			try {
-				webEditor = await startWebEditorServer(createWebEditorHost(ctx, webHostRuntime(ctx)), { port: settings.preferredPort });
-			} catch (error) {
-				if (settings.preferredPort !== undefined) {
-					const detail = error instanceof Error ? error.message : String(error);
-					ctx.ui.notify(`pi-forge: preferred editor port 127.0.0.1:${settings.preferredPort} was unavailable (${detail}); using an available port instead.`, "warning");
-					try {
-						webEditor = await startWebEditorServer(createWebEditorHost(ctx, webHostRuntime(ctx)));
-					} catch (fallbackError) {
-						const fallbackDetail = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
-						ctx.ui.setStatus("pi-forge-editor", undefined);
-						ctx.ui.notify(`pi-forge: failed to start stack editor on an available localhost port: ${fallbackDetail}.`, "error");
-						return;
-					}
-				} else {
-					const detail = error instanceof Error ? error.message : String(error);
-					ctx.ui.setStatus("pi-forge-editor", undefined);
-					ctx.ui.notify(`pi-forge: failed to start stack editor on an available localhost port: ${detail}.`, "error");
-					return;
-				}
-			}
-			rememberWebEditor(webEditor, ctx.cwd, settings.preferredPort);
-			ctx.ui.setStatus("pi-forge-editor", ctx.ui.theme.fg("accent", `editor:${webEditor.port}`));
-			ctx.ui.notify(`pi-forge: stack editor running at ${webEditor.url}`, "info");
-		} else {
-			webEditor.updateHost(createWebEditorHost(ctx, webHostRuntime(ctx)));
-			rememberWebEditor(webEditor, ctx.cwd, settings.preferredPort);
-			ctx.ui.setStatus("pi-forge-editor", ctx.ui.theme.fg("accent", `editor:${webEditor.port}`));
-			ctx.ui.notify(`pi-forge: stack editor already running at ${webEditor.url}`, "info");
-		}
-
-		await showText(ctx, "pi-forge stack editor", `Open the local stack editor:\n\n${webEditor.url}\n\nServer bound to 127.0.0.1:${webEditor.port}\nOptional config: ${settings.configPath}\nProject: ${webEditorCwd}`);
-	}
-
-	async function stopWebEditor(ctx: ExtensionCommandContext): Promise<void> {
-		syncWebEditorFromShared(ctx.cwd);
-		if (!webEditor) {
-			ctx.ui.notify("pi-forge: stack editor is not running.", "info");
-			return;
-		}
-		const server = webEditor;
-		await server.close();
-		clearWebEditor(server);
-		ctx.ui.setStatus("pi-forge-editor", undefined);
-		ctx.ui.notify("pi-forge: stack editor stopped.", "info");
-	}
-
-	registerLifecycleHandlers(pi, state, {
-		reloadStacks,
-		refreshWebEditorHost,
-		notifyActivePreset,
-		syncActiveToolPolicy,
-		activeId,
-		persistActiveSelection,
-		recordCompileDiagnostics,
-	});
-	registerPayloadRequestHandler(pi, state, () => state.active);
-	registerPayloadCommands(pi, state);
-	registerPresetCommand(pi, state, {
-		selectedActiveId,
-		setActive,
-		reloadStacks,
-		openWebEditor,
-		stopWebEditor,
-	});
-}

package/src/lifecycle.ts

@@ -1,171 +0,0 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import {
-	compileMessages,
-	compileSystemPrompt,
-	createPromptVariableStore,
-	getLatestUserMessage,
-	markSessionVariablesClean,
-	resetTurnVariables,
-} from "./compiler.ts";
-import { applyFinalizeRegexRulesToMessage } from "./regex.ts";
-import { STATE_ENTRY_TYPE, VARIABLE_ENTRY_TYPE, type PiForgeRuntimeState } from "./runtime-state.ts";
-import type { PromptStackDiagnostic, PromptVariableStore, PromptVariableValue } from "./types.ts";
-
-export interface LifecycleDeps {
-	reloadStacks(ctx: ExtensionContext, preferredId?: string): void;
-	refreshWebEditorHost(ctx: ExtensionContext): void;
-	notifyActivePreset(ctx: ExtensionContext, detail: string): void;
-	syncActiveToolPolicy(ctx?: ExtensionContext): void;
-	activeId(): string | undefined;
-	persistActiveSelection(id: string): void;
-	recordCompileDiagnostics(ctx: ExtensionContext, diagnostics: PromptStackDiagnostic[]): void;
-}
-
-export function registerLifecycleHandlers(pi: ExtensionAPI, state: PiForgeRuntimeState, deps: LifecycleDeps): void {
-	pi.on("session_start", async (event, ctx) => {
-		restoreBranchScopedRuntime(ctx, state, deps);
-		deps.refreshWebEditorHost(ctx);
-		deps.notifyActivePreset(ctx, "after session " + event.reason);
-	});
-
-	pi.on("session_tree", async (_event, ctx) => {
-		restoreBranchScopedRuntime(ctx, state, deps);
-		deps.refreshWebEditorHost(ctx);
-		deps.notifyActivePreset(ctx, "after tree navigation");
-	});
-
-	pi.on("session_compact", async (_event, ctx) => {
-		restoreBranchScopedRuntime(ctx, state, deps);
-		deps.refreshWebEditorHost(ctx);
-		deps.notifyActivePreset(ctx, "after compaction");
-	});
-
-	pi.on("turn_start", async () => {
-		deps.syncActiveToolPolicy();
-		const id = deps.activeId();
-		if (id) deps.persistActiveSelection(id);
-	});
-
-	pi.on("before_agent_start", async (event, ctx) => {
-		state.currentSystemPromptOptions = event.systemPromptOptions;
-		state.currentLatestUserMessage = event.prompt;
-		state.currentVariableStore = createPromptVariableStore(state.sessionVariables);
-		resetTurnVariables(state.currentVariableStore);
-		state.contextRewritePending = true;
-
-		if (!state.active) return;
-
-		const result = compileSystemPrompt(
-			state.active.stack,
-			{ options: event.systemPromptOptions, ctx, latestUserMessage: event.prompt, now: new Date(), variables: state.currentVariableStore },
-			event.systemPrompt,
-		);
-		deps.recordCompileDiagnostics(ctx, result.diagnostics);
-		persistVariablesIfDirty(pi, state, state.currentVariableStore);
-
-		return { systemPrompt: result.systemPrompt };
-	});
-
-	pi.on("context", async (event, ctx) => {
-		if (!state.active || !state.currentSystemPromptOptions || !state.contextRewritePending) return;
-
-		// Rewrite the message layout only for the first provider request of a user-submitted prompt.
-		// Tool-result follow-up turns must receive Pi's natural context; otherwise post-history
-		// prompt blocks such as COT / {{lastUserMessage}} are re-appended after every tool call
-		// and the model restarts its planning instead of continuing from the tool result.
-		state.contextRewritePending = false;
-
-		if (!state.currentVariableStore) state.currentVariableStore = createPromptVariableStore(state.sessionVariables);
-		const latestUserMessage = getLatestUserMessage(event.messages) ?? state.currentLatestUserMessage;
-		const result = compileMessages(
-			state.active.stack,
-			{ options: state.currentSystemPromptOptions, ctx, latestUserMessage, now: new Date(), variables: state.currentVariableStore },
-			event.messages,
-		);
-		deps.recordCompileDiagnostics(ctx, [...state.latestCompileDiagnostics, ...result.diagnostics]);
-		persistVariablesIfDirty(pi, state, state.currentVariableStore);
-		return { messages: result.messages };
-	});
-
-	pi.on("message_end", async (event, ctx) => {
-		if (!state.active) return;
-		const diagnostics: PromptStackDiagnostic[] = [];
-		const message = applyFinalizeRegexRulesToMessage(state.active.stack, event.message, diagnostics);
-		if (diagnostics.length > 0) deps.recordCompileDiagnostics(ctx, [...state.latestCompileDiagnostics, ...diagnostics]);
-		if (!message) return;
-		return { message };
-	});
-
-	pi.on("agent_end", async () => {
-		persistVariablesIfDirty(pi, state, state.currentVariableStore);
-		state.currentSystemPromptOptions = undefined;
-		state.currentLatestUserMessage = undefined;
-		state.currentVariableStore = undefined;
-		state.contextRewritePending = false;
-	});
-}
-
-function restoreBranchScopedRuntime(ctx: ExtensionContext, state: PiForgeRuntimeState, deps: LifecycleDeps): void {
-	state.sessionVariables = getRestoredVariables(ctx);
-	state.currentVariableStore = undefined;
-	const restoredActiveId = getRestoredActiveId(ctx);
-	state.lastPersistedActiveId = restoredActiveId;
-	deps.reloadStacks(ctx, restoredActiveId);
-}
-
-function getCurrentBranchEntries(ctx: ExtensionContext): unknown[] {
-	const leafId = ctx.sessionManager.getLeafId();
-	if (leafId === null) return [];
-	const sessionManager = ctx.sessionManager as {
-		getBranch?: (fromId?: string) => unknown[];
-		getEntries: () => unknown[];
-	};
-	return sessionManager.getBranch ? sessionManager.getBranch(leafId ?? undefined) : sessionManager.getEntries();
-}
-
-function getRestoredActiveId(ctx: ExtensionContext): string | undefined {
-	const entries = getCurrentBranchEntries(ctx);
-	for (let i = entries.length - 1; i >= 0; i--) {
-		const entry = entries[i] as { type?: string; customType?: string; data?: { activeStackId?: unknown } };
-		if (entry.type === "custom" && entry.customType === STATE_ENTRY_TYPE) {
-			return typeof entry.data?.activeStackId === "string" ? entry.data.activeStackId : undefined;
-		}
-	}
-	return undefined;
-}
-
-function getRestoredVariables(ctx: ExtensionContext): Record<string, PromptVariableValue> {
-	const entries = getCurrentBranchEntries(ctx);
-	for (let i = entries.length - 1; i >= 0; i--) {
-		const entry = entries[i] as { type?: string; customType?: string; data?: { variables?: unknown } };
-		if (entry.type !== "custom" || entry.customType !== VARIABLE_ENTRY_TYPE) continue;
-		if (!entry.data || typeof entry.data.variables !== "object" || Array.isArray(entry.data.variables)) return {};
-		return normalizeVariableRecord(entry.data.variables as Record<string, unknown>);
-	}
-	return {};
-}
-
-function persistVariablesIfDirty(pi: ExtensionAPI, state: PiForgeRuntimeState, store: PromptVariableStore | undefined): void {
-	if (!store?.sessionDirty) return;
-	state.sessionVariables = { ...store.session };
-	pi.appendEntry(VARIABLE_ENTRY_TYPE, { variables: state.sessionVariables });
-	markSessionVariablesClean(store);
-}
-
-function normalizeVariableRecord(value: Record<string, unknown>): Record<string, PromptVariableValue> {
-	const result: Record<string, PromptVariableValue> = {};
-	for (const [key, raw] of Object.entries(value)) {
-		if (isPromptVariableValue(raw)) result[key] = raw;
-	}
-	return result;
-}
-
-function isPromptVariableValue(value: unknown): value is PromptVariableValue {
-	if (value === null) return true;
-	const type = typeof value;
-	if (type === "string" || type === "boolean") return true;
-	if (type === "number") return Number.isFinite(value);
-	if (Array.isArray(value)) return value.every(isPromptVariableValue);
-	if (!value || typeof value !== "object") return false;
-	return Object.values(value as Record<string, unknown>).every(isPromptVariableValue);
-}