diff --git a/packages/server/src/server/agent/mcp-server.ts b/packages/server/src/server/agent/mcp-server.ts
index fc77e696b..aa157252a 100644
--- a/packages/server/src/server/agent/mcp-server.ts
+++ b/packages/server/src/server/agent/mcp-server.ts
@@ -195,6 +195,14 @@ export async function createAgentMcpServer(
       });
 
       if (initialPrompt) {
+        try {
+          agentManager.recordUserMessage(snapshot.id, initialPrompt);
+        } catch (error) {
+          console.error(
+            `[Agent MCP] Failed to record initial prompt for ${snapshot.id}:`,
+            error
+          );
+        }
         try {
           startAgentRun(agentManager, snapshot.id, initialPrompt);
         } catch (error) {
@@ -326,6 +334,15 @@ export async function createAgentMcpServer(
         await agentManager.setAgentMode(agentId, sessionMode);
       }
 
+      try {
+        agentManager.recordUserMessage(agentId, prompt);
+      } catch (error) {
+        console.error(
+          `[Agent MCP] Failed to record user message for ${agentId}:`,
+          error
+        );
+      }
+
       startAgentRun(agentManager, agentId, prompt);
       const snapshot = agentManager.getAgent(agentId);