@@ -6,7 +6,9 @@ import { getContextWindow, type ThinkingEffort } from "../llm-api/providers.ts";
66 import type { ToolDef } from "../llm-api/types.ts";
77 import { connectMcpServer } from "../mcp/client.ts";
88 import {
9+ getPreferredActiveAgent,
910 listMcpServers,
11+ setPreferredActiveAgent,
1012 setPreferredModel,
1113 setPreferredThinkingEffort,
1214 } from "../session/db/index.ts";
@@ -101,7 +103,18 @@ export async function runAgent(
101103 });
102104
103105 // Active primary agent state — name only; the system prompt is stored on runner.
104- let activeAgentName: string | null = null;
106+ let activeAgentName: string | null = getPreferredActiveAgent();
107+ if (opts.agentSystemPrompt) {
108+ activeAgentName = null;
109+ } else if (activeAgentName) {
110+ const agentCfg = agents.get(activeAgentName);
111+ if (agentCfg) {
112+ runner.extraSystemPrompt = agentCfg.systemPrompt;
113+ } else {
114+ activeAgentName = null;
115+ setPreferredActiveAgent(null);
116+ }
117+ }
105118
106119 const cmdCtx: CommandContext = {
107120 get currentModel() {
@@ -142,6 +155,7 @@ export async function runAgent(
142155 setActiveAgent: (name, systemPrompt?) => {
143156 activeAgentName = name;
144157 runner.extraSystemPrompt = systemPrompt;
158+ setPreferredActiveAgent(name);
145159 },
146160
147161 undoLastTurn: () =>