@oh-my-pi/pi-coding-agent 12.19.2 → 13.0.0

package/src/internal-urls/{docs-protocol.ts → pi-protocol.ts}

@@ -1,23 +1,23 @@
 /**
- * Protocol handler for docs:// URLs.
+ * Protocol handler for pi:// URLs.
  *
  * Serves statically embedded documentation files bundled at build time.
  *
  * URL forms:
- * - docs:// - Lists all available documentation files
- * - docs://<file>.md - Reads a specific documentation file
+ * - pi:// - Lists all available documentation files
+ * - pi://<file>.md - Reads a specific documentation file
  */
 import * as path from "node:path";
 import { EMBEDDED_DOC_FILENAMES, EMBEDDED_DOCS } from "./docs-index.generated";
 import type { InternalResource, InternalUrl, ProtocolHandler } from "./types";
 
 /**
- * Handler for docs:// URLs.
+ * Handler for pi:// URLs.
  *
  * Resolves documentation file names to their content, or lists available docs.
  */
-export class DocsProtocolHandler implements ProtocolHandler {
-	readonly scheme = "docs";
+export class PiProtocolHandler implements ProtocolHandler {
+	readonly scheme = "pi";
 
 	async resolve(url: InternalUrl): Promise<InternalResource> {
 		// Extract filename from host + path
@@ -37,7 +37,7 @@ export class DocsProtocolHandler implements ProtocolHandler {
 			throw new Error("No documentation files found");
 		}
 
-		const listing = EMBEDDED_DOC_FILENAMES.map(f => `- [${f}](docs://${f})`).join("\n");
+		const listing = EMBEDDED_DOC_FILENAMES.map(f => `- [${f}](pi://${f})`).join("\n");
 		const content = `# Documentation\n\n${EMBEDDED_DOC_FILENAMES.length} files available:\n\n${listing}\n`;
 
 		return {
@@ -45,19 +45,19 @@ export class DocsProtocolHandler implements ProtocolHandler {
 			content,
 			contentType: "text/markdown",
 			size: Buffer.byteLength(content, "utf-8"),
-			sourcePath: "docs://",
+			sourcePath: "pi://",
 		};
 	}
 
 	async #readDoc(filename: string, url: InternalUrl): Promise<InternalResource> {
 		// Validate: no traversal, no absolute paths
 		if (path.isAbsolute(filename)) {
-			throw new Error("Absolute paths are not allowed in docs:// URLs");
+			throw new Error("Absolute paths are not allowed in pi:// URLs");
 		}
 
 		const normalized = path.posix.normalize(filename.replaceAll("\\", "/"));
 		if (normalized === ".." || normalized.startsWith("../") || normalized.includes("/../")) {
-			throw new Error("Path traversal (..) is not allowed in docs:// URLs");
+			throw new Error("Path traversal (..) is not allowed in pi:// URLs");
 		}
 
 		const content = EMBEDDED_DOCS[normalized];
@@ -69,7 +69,7 @@ export class DocsProtocolHandler implements ProtocolHandler {
 			const suffix =
 				suggestions.length > 0
 					? `\nDid you mean: ${suggestions.join(", ")}`
-					: "\nUse docs:// to list available files.";
+					: "\nUse pi:// to list available files.";
 			throw new Error(`Documentation file not found: ${filename}${suffix}`);
 		}
 
@@ -78,7 +78,7 @@ export class DocsProtocolHandler implements ProtocolHandler {
 			content,
 			contentType: "text/markdown",
 			size: Buffer.byteLength(content, "utf-8"),
-			sourcePath: `docs://${normalized}`,
+			sourcePath: `pi://${normalized}`,
 		};
 	}
 }

package/src/internal-urls/router.ts

@@ -1,5 +1,5 @@
 /**
- * Internal URL router for internal protocols (agent://, artifact://, plan://, memory://, skill://, rule://, docs://).
+ * Internal URL router for internal protocols (agent://, artifact://, memory://, skill://, rule://, pi://, local://).
  */
 import type { InternalResource, InternalUrl, ProtocolHandler } from "./types";
 

package/src/internal-urls/types.ts

@@ -1,7 +1,7 @@
 /**
  * Types for the internal URL routing system.
  *
- * Internal URLs (agent://, artifact://, plan://, memory://, skill://, rule://) are resolved by tools like fetch and read,
+ * Internal URLs (agent://, artifact://, memory://, skill://, rule://, pi://, local://) are resolved by tools like fetch and read,
  * providing access to agent outputs and skill files without exposing filesystem paths.
  */
 

package/src/ipy/executor.ts

@@ -39,8 +39,6 @@ export interface PythonExecutorOptions {
 	useSharedGateway?: boolean;
 	/** Session file path for accessing task outputs */
 	sessionFile?: string;
-	/** Artifacts directory for $ARTIFACTS env var and artifact storage */
-	artifactsDir?: string;
 	/** Artifact path/id for full output storage */
 	artifactPath?: string;
 	artifactId?: string;
@@ -311,16 +309,9 @@ async function createKernelSession(
 	cwd: string,
 	useSharedGateway?: boolean,
 	sessionFile?: string,
-	artifactsDir?: string,
 	isRetry?: boolean,
 ): Promise<KernelSession> {
-	const env: Record<string, string> | undefined =
-		sessionFile || artifactsDir
-			? {
-					...(sessionFile ? { PI_SESSION_FILE: sessionFile } : {}),
-					...(artifactsDir ? { ARTIFACTS: artifactsDir } : {}),
-				}
-			: undefined;
+	const env: Record<string, string> | undefined = sessionFile ? { PI_SESSION_FILE: sessionFile } : undefined;
 
 	let kernel: PythonKernel;
 	try {
@@ -330,7 +321,7 @@ async function createKernelSession(
 	} catch (err) {
 		if (!isRetry && isResourceExhaustionError(err)) {
 			await recoverFromResourceExhaustion();
-			return createKernelSession(sessionId, cwd, useSharedGateway, sessionFile, artifactsDir, true);
+			return createKernelSession(sessionId, cwd, useSharedGateway, sessionFile, true);
 		}
 		throw err;
 	}
@@ -359,7 +350,6 @@ async function restartKernelSession(
 	cwd: string,
 	useSharedGateway?: boolean,
 	sessionFile?: string,
-	artifactsDir?: string,
 ): Promise<void> {
 	session.restartCount += 1;
 	if (session.restartCount > 1) {
@@ -370,13 +360,7 @@ async function restartKernelSession(
 	} catch (err) {
 		logger.warn("Failed to shutdown crashed kernel", { error: err instanceof Error ? err.message : String(err) });
 	}
-	const env: Record<string, string> | undefined =
-		sessionFile || artifactsDir
-			? {
-					...(sessionFile ? { PI_SESSION_FILE: sessionFile } : {}),
-					...(artifactsDir ? { ARTIFACTS: artifactsDir } : {}),
-				}
-			: undefined;
+	const env: Record<string, string> | undefined = sessionFile ? { PI_SESSION_FILE: sessionFile } : undefined;
 	const kernel = await PythonKernel.start({ cwd, useSharedGateway, env });
 	session.kernel = kernel;
 	session.dead = false;
@@ -401,7 +385,6 @@ async function withKernelSession<T>(
 	handler: (kernel: PythonKernel) => Promise<T>,
 	useSharedGateway?: boolean,
 	sessionFile?: string,
-	artifactsDir?: string,
 ): Promise<T> {
 	let session = kernelSessions.get(sessionId);
 	if (!session) {
@@ -416,7 +399,6 @@ async function withKernelSession<T>(
 			cwd,
 			useSharedGateway,
 			sessionFile,
-			artifactsDir,
 		);
 		kernelSessions.set(sessionId, session);
 		startCleanupTimer();
@@ -432,7 +414,6 @@ async function withKernelSession<T>(
 				cwd,
 				useSharedGateway,
 				sessionFile,
-				artifactsDir,
 			);
 		}
 		try {
@@ -450,7 +431,6 @@ async function withKernelSession<T>(
 				cwd,
 				useSharedGateway,
 				sessionFile,
-				artifactsDir,
 			);
 			const result = await logger.timeAsync("kernel:postRestart:handler", handler, session!.kernel);
 			session!.restartCount = 0;
@@ -539,16 +519,9 @@ export async function executePython(code: string, options?: PythonExecutorOption
 	const kernelMode = options?.kernelMode ?? "session";
 	const useSharedGateway = options?.useSharedGateway;
 	const sessionFile = options?.sessionFile;
-	const artifactsDir = options?.artifactsDir;
 
 	if (kernelMode === "per-call") {
-		const env: Record<string, string> | undefined =
-			sessionFile || artifactsDir
-				? {
-						...(sessionFile ? { PI_SESSION_FILE: sessionFile } : {}),
-						...(artifactsDir ? { ARTIFACTS: artifactsDir } : {}),
-					}
-				: undefined;
+		const env: Record<string, string> | undefined = sessionFile ? { PI_SESSION_FILE: sessionFile } : undefined;
 		const kernel = await PythonKernel.start({ cwd, useSharedGateway, env });
 		try {
 			return await executeWithKernel(kernel, code, options);
@@ -570,6 +543,5 @@ export async function executePython(code: string, options?: PythonExecutorOption
 		async kernel => executeWithKernel(kernel, code, options),
 		useSharedGateway,
 		sessionFile,
-		artifactsDir,
 	);
 }

package/src/main.ts

@@ -538,7 +538,6 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 	const cwd = getProjectDir();
 	await logger.timeAsync("settings:init", () => Settings.init({ cwd }));
 	if (parsedArgs.noPty) {
-		settings.override("bash.virtualTerminal", "off");
 		Bun.env.PI_NO_PTY = "1";
 	}
 	const {

package/src/memories/index.ts

@@ -11,7 +11,7 @@ import { parseModelString } from "../config/model-resolver";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { Settings } from "../config/settings";
 import consolidationTemplate from "../prompts/memories/consolidation.md" with { type: "text" };
-import readPathTemplate from "../prompts/memories/read_path.md" with { type: "text" };
+import readPathTemplate from "../prompts/memories/read-path.md" with { type: "text" };
 import stageOneInputTemplate from "../prompts/memories/stage_one_input.md" with { type: "text" };
 import stageOneSystemTemplate from "../prompts/memories/stage_one_system.md" with { type: "text" };
 import type { AgentSession } from "../session/agent-session";

package/src/modes/components/settings-defs.ts

@@ -154,11 +154,6 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "tool-only", label: "tool-only", description: "Interrupt only on tool-call argument matches" },
 		{ value: "never", label: "never", description: "Never interrupt; inject warning after completion" },
 	],
-	// Virtual terminal
-	"bash.virtualTerminal": [
-		{ value: "on", label: "On", description: "PTY-backed interactive execution" },
-		{ value: "off", label: "Off", description: "Standard non-interactive execution" },
-	],
 	// Provider options
 	"providers.webSearch": [
 		{

package/src/modes/controllers/event-controller.ts

@@ -7,7 +7,7 @@ import { TodoReminderComponent } from "../../modes/components/todo-reminder";
 import { ToolExecutionComponent } from "../../modes/components/tool-execution";
 import { TtsrNotificationComponent } from "../../modes/components/ttsr-notification";
 import { getSymbolTheme, theme } from "../../modes/theme/theme";
-import type { InteractiveModeContext, TodoItem } from "../../modes/types";
+import type { InteractiveModeContext, TodoPhase } from "../../modes/types";
 import type { AgentSessionEvent } from "../../session/agent-session";
 import type { ExitPlanModeDetails } from "../../tools";
 
@@ -288,9 +288,9 @@ export class EventController {
 				}
 				// Update todo display when todo_write tool completes
 				if (event.toolName === "todo_write" && !event.isError) {
-					const details = event.result.details as { todos?: TodoItem[] } | undefined;
-					if (details?.todos) {
-						this.ctx.setTodos(details.todos);
+					const details = event.result.details as { phases?: TodoPhase[] } | undefined;
+					if (details?.phases) {
+						this.ctx.setTodos(details.phases);
 					}
 				} else if (event.toolName === "todo_write" && event.isError) {
 					const textContent = event.result.content.find(

package/src/modes/interactive-mode.ts

@@ -24,7 +24,8 @@ import { type Settings, settings } from "../config/settings";
 import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../extensibility/extensions";
 import type { CompactOptions } from "../extensibility/extensions/types";
 import { BUILTIN_SLASH_COMMANDS, loadSlashCommands } from "../extensibility/slash-commands";
-import { resolvePlanUrlToPath } from "../internal-urls";
+import { resolveLocalUrlToPath } from "../internal-urls";
+import { renameApprovedPlanFile } from "../plan-mode/approved-plan";
 import planModeApprovedPrompt from "../prompts/system/plan-mode-approved.md" with { type: "text" };
 import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import { HistoryStorage } from "../session/history-storage";
@@ -54,10 +55,9 @@ import { SSHCommandController } from "./controllers/ssh-command-controller";
 import { setMermaidRenderCallback } from "./theme/mermaid-cache";
 import type { Theme } from "./theme/theme";
 import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "./theme/theme";
-import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem } from "./types";
+import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem, TodoPhase } from "./types";
 import { UiHelpers } from "./utils/ui-helpers";
 
-const TODO_FILE_NAME = "todos.json";
 const EDITOR_MAX_HEIGHT_MIN = 6;
 const EDITOR_MAX_HEIGHT_MAX = 18;
 const EDITOR_RESERVED_ROWS = 12;
@@ -102,7 +102,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	planModeEnabled = false;
 	planModePaused = false;
 	planModePlanFilePath: string | undefined = undefined;
-	todoItems: TodoItem[] = [];
+	todoPhases: TodoPhase[] = [];
 	hideThinkingBlock = false;
 	pendingImages: ImageContent[] = [];
 	compactionQueuedMessages: CompactionQueuedMessage[] = [];
@@ -436,92 +436,82 @@ export class InteractiveMode implements InteractiveModeContext {
 
 	#formatTodoLine(todo: TodoItem, prefix: string): string {
 		const checkbox = theme.checkbox;
-		const label = todo.content;
 		switch (todo.status) {
 			case "completed":
 				return theme.fg("success", `${prefix}${checkbox.checked} ${chalk.strikethrough(todo.content)}`);
 			case "in_progress":
-				return theme.fg("accent", `${prefix}${checkbox.unchecked} ${label}`);
+				return theme.fg("accent", `${prefix}${checkbox.unchecked} ${todo.content}`);
+			case "abandoned":
+				return theme.fg("error", `${prefix}${checkbox.unchecked} ${chalk.strikethrough(todo.content)}`);
 			default:
-				return theme.fg("dim", `${prefix}${checkbox.unchecked} ${label}`);
+				return theme.fg("dim", `${prefix}${checkbox.unchecked} ${todo.content}`);
 		}
 	}
 
-	#getCollapsedTodos(todos: TodoItem[]): TodoItem[] {
-		let startIndex = 0;
-		for (let i = todos.length - 1; i >= 0; i -= 1) {
-			if (todos[i].status === "completed") {
-				startIndex = i;
-				break;
-			}
-		}
-		return todos.slice(startIndex, startIndex + 5);
+	#getActivePhase(phases: TodoPhase[]): TodoPhase | undefined {
+		const nonEmpty = phases.filter(phase => phase.tasks.length > 0);
+		const active = nonEmpty.find(phase =>
+			phase.tasks.some(task => task.status === "pending" || task.status === "in_progress"),
+		);
+		return active ?? nonEmpty[nonEmpty.length - 1];
 	}
 
 	#renderTodoList(): void {
 		this.todoContainer.clear();
-		if (this.todoItems.length === 0) {
+		const phases = this.todoPhases.filter(phase => phase.tasks.length > 0);
+		if (phases.length === 0) {
 			return;
 		}
 
-		const visibleTodos = this.todoExpanded ? this.todoItems : this.#getCollapsedTodos(this.todoItems);
 		const indent = "  ";
 		const hook = theme.tree.hook;
 		const lines = [indent + theme.bold(theme.fg("accent", "Todos"))];
 
-		visibleTodos.forEach((todo, index) => {
-			const prefix = `${indent}${index === 0 ? hook : " "} `;
-			lines.push(this.#formatTodoLine(todo, prefix));
-		});
+		if (!this.todoExpanded) {
+			const activePhase = this.#getActivePhase(phases);
+			if (!activePhase) return;
+			lines.push(`${indent}${theme.fg("accent", `${hook} ${activePhase.name}`)}`);
+			const visibleTasks = activePhase.tasks.slice(0, 5);
+			visibleTasks.forEach((todo, index) => {
+				const prefix = `${indent}${index === 0 ? hook : " "} `;
+				lines.push(this.#formatTodoLine(todo, prefix));
+			});
+			if (visibleTasks.length < activePhase.tasks.length) {
+				const remaining = activePhase.tasks.length - visibleTasks.length;
+				lines.push(theme.fg("muted", `${indent}  ${hook} +${remaining} more (Ctrl+T to expand)`));
+			}
+			this.todoContainer.addChild(new Text(lines.join("\n"), 1, 0));
+			return;
+		}
 
-		if (!this.todoExpanded && visibleTodos.length < this.todoItems.length) {
-			const remaining = this.todoItems.length - visibleTodos.length;
-			lines.push(theme.fg("muted", `${indent}  ${hook} +${remaining} more (Ctrl+T to expand)`));
+		for (const phase of phases) {
+			lines.push(`${indent}${theme.fg("accent", `${hook} ${phase.name}`)}`);
+			phase.tasks.forEach((todo, index) => {
+				const prefix = `${indent}${index === 0 ? hook : " "} `;
+				lines.push(this.#formatTodoLine(todo, prefix));
+			});
 		}
 
 		this.todoContainer.addChild(new Text(lines.join("\n"), 1, 0));
 	}
 
 	async #loadTodoList(): Promise<void> {
-		const sessionFile = this.sessionManager.getSessionFile() ?? null;
-		if (!sessionFile) {
-			this.todoItems = [];
-			this.#renderTodoList();
-			return;
-		}
-		const artifactsDir = sessionFile.slice(0, -6);
-		const todoPath = path.join(artifactsDir, TODO_FILE_NAME);
-		try {
-			const data = (await Bun.file(todoPath).json()) as { todos?: TodoItem[] };
-			if (data?.todos && Array.isArray(data.todos)) {
-				this.todoItems = data.todos;
-			} else {
-				this.todoItems = [];
-			}
-		} catch (error) {
-			if (isEnoent(error)) {
-				this.todoItems = [];
-				this.#renderTodoList();
-				return;
-			}
-			logger.warn("Failed to load todos", { path: todoPath, error: String(error) });
-		}
+		this.todoPhases = this.session.getTodoPhases();
 		this.#renderTodoList();
 	}
 
-	#getPlanFilePath(): string {
-		const sessionId = this.sessionManager.getSessionId();
-		return `plan://${sessionId}/plan.md`;
+	async #getPlanFilePath(): Promise<string> {
+		return "local://PLAN.md";
 	}
 
 	#resolvePlanFilePath(planFilePath: string): string {
-		if (planFilePath.startsWith("plan://")) {
-			return resolvePlanUrlToPath(planFilePath, {
-				getPlansDirectory: () => this.settings.getPlansDirectory(),
-				cwd: this.sessionManager.getCwd(),
+		if (planFilePath.startsWith("local://")) {
+			return resolveLocalUrlToPath(planFilePath, {
+				getArtifactsDir: () => this.sessionManager.getArtifactsDir(),
+				getSessionId: () => this.sessionManager.getSessionId(),
 			});
 		}
-		return planFilePath;
+		return path.resolve(this.sessionManager.getCwd(), planFilePath);
 	}
 
 	#updatePlanModeStatus(): void {
@@ -592,7 +582,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		this.planModePaused = false;
 
-		const planFilePath = options?.planFilePath ?? this.#getPlanFilePath();
+		const planFilePath = options?.planFilePath ?? (await this.#getPlanFilePath());
 		const previousTools = this.session.getActiveToolNames();
 		const hasExitTool = this.session.getToolByName("exit_plan_mode") !== undefined;
 		const planTools = hasExitTool ? [...previousTools, "exit_plan_mode"] : previousTools;
@@ -672,16 +662,29 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.requestRender();
 	}
 
-	async #approvePlan(planContent: string): Promise<void> {
+	async #approvePlan(
+		planContent: string,
+		options: { planFilePath: string; finalPlanFilePath: string },
+	): Promise<void> {
+		await renameApprovedPlanFile({
+			planFilePath: options.planFilePath,
+			finalPlanFilePath: options.finalPlanFilePath,
+			getArtifactsDir: () => this.sessionManager.getArtifactsDir(),
+			getSessionId: () => this.sessionManager.getSessionId(),
+		});
 		const previousTools = this.#planModePreviousTools ?? this.session.getActiveToolNames();
 		await this.#exitPlanMode({ silent: true, paused: false });
 		await this.handleClearCommand();
 		if (previousTools.length > 0) {
 			await this.session.setActiveToolsByName(previousTools);
 		}
+		this.session.setPlanReferencePath(options.finalPlanFilePath);
 		this.session.markPlanReferenceSent();
-		const prompt = renderPromptTemplate(planModeApprovedPrompt, { planContent });
-		await this.session.prompt(prompt);
+		const prompt = renderPromptTemplate(planModeApprovedPrompt, {
+			planContent,
+			finalPlanFilePath: options.finalPlanFilePath,
+		});
+		await this.session.prompt(prompt, { synthetic: true });
 	}
 
 	async handlePlanModeCommand(): Promise<void> {
@@ -703,7 +706,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 
-		const planFilePath = details.planFilePath || this.planModePlanFilePath || this.#getPlanFilePath();
+		const planFilePath = details.planFilePath || this.planModePlanFilePath || (await this.#getPlanFilePath());
 		this.planModePlanFilePath = planFilePath;
 		const planContent = await this.#readPlanFile(planFilePath);
 		if (!planContent) {
@@ -719,7 +722,14 @@ export class InteractiveMode implements InteractiveModeContext {
 		]);
 
 		if (choice === "Approve and execute") {
-			await this.#approvePlan(planContent);
+			const finalPlanFilePath = details.finalPlanFilePath || planFilePath;
+			try {
+				await this.#approvePlan(planContent, { planFilePath, finalPlanFilePath });
+			} catch (error) {
+				this.showError(
+					`Failed to finalize approved plan: ${error instanceof Error ? error.message : String(error)}`,
+				);
+			}
 			return;
 		}
 		if (choice === "Refine plan") {
@@ -1170,8 +1180,18 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.requestRender();
 	}
 
-	setTodos(todos: TodoItem[]): void {
-		this.todoItems = todos;
+	setTodos(todos: TodoItem[] | TodoPhase[]): void {
+		if (todos.length > 0 && "tasks" in todos[0]) {
+			this.todoPhases = todos as TodoPhase[];
+		} else {
+			this.todoPhases = [
+				{
+					id: "default",
+					name: "Todos",
+					tasks: todos as TodoItem[],
+				},
+			];
+		}
 		this.#renderTodoList();
 		this.ui.requestRender();
 	}

package/src/modes/types.ts

@@ -26,10 +26,18 @@ export type CompactionQueuedMessage = {
 	mode: "steer" | "followUp";
 };
 
+export type TodoStatus = "pending" | "in_progress" | "completed" | "abandoned";
+
 export type TodoItem = {
 	id: string;
 	content: string;
-	status: "pending" | "in_progress" | "completed";
+	status: TodoStatus;
+};
+
+export type TodoPhase = {
+	id: string;
+	name: string;
+	tasks: TodoItem[];
 };
 
 export interface InteractiveModeContext {
@@ -89,7 +97,7 @@ export interface InteractiveModeContext {
 	lastStatusText: Text | undefined;
 	fileSlashCommands: Set<string>;
 	skillCommands: Map<string, string>;
-	todoItems: TodoItem[];
+	todoPhases: TodoPhase[];
 
 	// Lifecycle
 	init(): Promise<void>;
@@ -130,7 +138,7 @@ export interface InteractiveModeContext {
 	updateEditorTopBorder(): void;
 	updateEditorBorderColor(): void;
 	rebuildChatFromMessages(): void;
-	setTodos(todos: TodoItem[]): void;
+	setTodos(todos: TodoItem[] | TodoPhase[]): void;
 	reloadTodos(): Promise<void>;
 	toggleTodoExpansion(): void;
 

package/src/modes/utils/ui-helpers.ts

@@ -171,12 +171,14 @@ export class UiHelpers {
 				}
 				break;
 			}
-			case "user": {
+			case "user":
+			case "developer": {
 				const textContent = this.ctx.getUserMessageText(message);
 				if (textContent) {
-					const userComponent = new UserMessageComponent(textContent, message.synthetic ?? false);
+					const isSynthetic = message.role === "developer" ? true : (message.synthetic ?? false);
+					const userComponent = new UserMessageComponent(textContent, isSynthetic);
 					this.ctx.chatContainer.addChild(userComponent);
-					if (options?.populateHistory && !message.synthetic) {
+					if (options?.populateHistory && message.role === "user" && !isSynthetic) {
 						this.ctx.editor.addToHistory(textContent);
 					}
 				}