@@ -33,7 +33,7 @@ import {
3333 resumeSession,
3434 touchActiveSession,
3535 } from "../session/manager.ts";
36-import { buildToolSet } from "./tools.ts";
36+import { buildReadOnlyToolSet, buildToolSet } from "./tools.ts";
3737
3838 // ─── Git branch detection ─────────────────────────────────────────────────────
3939
@@ -240,6 +240,7 @@ export async function runAgent(opts: AgentOptions): Promise<void> {
240240
241241 // ── MCP: load persisted servers and connect them ───────────────────────────
242242 const tools: ToolDef[] = buildToolSet({ cwd, depth: 0, runSubagent });
243+ const mcpTools: ToolDef[] = [];
243244
244245 async function connectAndAddMcp(name: string): Promise<void> {
245246 const rows = listMcpServers();
@@ -255,6 +256,7 @@ export async function runAgent(opts: AgentOptions): Promise<void> {
255256 };
256257 const client = await connectMcpServer(cfg);
257258 tools.push(...client.tools);
259+ mcpTools.push(...client.tools);
258260 }
259261
260262 // Connect all persisted MCP servers at startup
@@ -396,8 +398,13 @@ export async function runAgent(opts: AgentOptions): Promise<void> {
396398 session.messages.push(userMsg);
397399 saveMessages(session.id, [userMsg], thisTurn);
398400
399- // Also push into coreHistory as a raw ModelMessage
400- coreHistory.push({ role: "user", content: resolvedText });
401+ // Also push into coreHistory as a raw ModelMessage.
402+ // In plan mode, append the system-message suffix so the model knows it
403+ // should only read/explore — not execute write operations.
404+ const coreContent = planMode
405+ ? `${resolvedText}\n\n<system-message>PLAN MODE ACTIVE: Help the user gather context for the plan -- READ ONLY</system-message>`
406+ : resolvedText;
407+ coreHistory.push({ role: "user", content: coreContent });
401408
402409 const llm = resolveModel(currentModel);
403410 const systemPrompt = buildSystemPrompt(cwd);
@@ -411,7 +418,7 @@ export async function runAgent(opts: AgentOptions): Promise<void> {
411418 const events = runTurn({
412419 model: llm,
413420 messages: coreHistory,
414- tools: planMode ? [] : tools,
421+ tools: planMode ? [...buildReadOnlyToolSet({ cwd }), ...mcpTools] : tools,
415422 systemPrompt,
416423 signal: abortController.signal,
417424 });