feat: implement buildPromptHistory function and refactor related components to enhance message handling

Author: qorzj

packages/cli/src/tests/ui-utils.test.ts

@@ -1,7 +1,20 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import type { SessionEntry } from "@vegamo/deepcode-core";
-import { buildStatusLine, formatContextUsage, formatTokenCount } from "../ui/utils/index";
+import type { SessionEntry, SessionMessage } from "@vegamo/deepcode-core";
+import { buildPromptHistory, buildStatusLine, formatContextUsage, formatTokenCount } from "../ui/utils/index";
+
+test("buildPromptHistory includes only visible non-empty user messages", () => {
+  const messages = [
+    buildMessage("user", " first prompt ", true),
+    buildMessage("user", "internal image follow-up", false),
+    buildMessage("system", "system prompt", false),
+    buildMessage("assistant", "assistant reply", true),
+    buildMessage("user", "   ", true),
+    buildMessage("user", "second prompt", true),
+  ];
+
+  assert.deepEqual(buildPromptHistory(messages), ["first prompt", "second prompt"]);
+});
 
 test("formatTokenCount uses binary K/M units with at most one decimal", () => {
   assert.equal(formatTokenCount(0), "0");
@@ -86,3 +99,18 @@ test("buildStatusLine omits an empty model", () => {
     "status: pending"
   );
 });
+
+function buildMessage(role: SessionMessage["role"], content: string, visible: boolean): SessionMessage {
+  return {
+    id: `${role}-${content}`,
+    sessionId: "session-1",
+    role,
+    content,
+    contentParams: null,
+    messageParams: null,
+    compacted: false,
+    visible,
+    createTime: "2026-01-01T00:00:00.000Z",
+    updateTime: "2026-01-01T00:00:00.000Z",
+  };
+}

packages/cli/src/ui/utils/index.ts

@@ -48,6 +48,13 @@ export function buildSyntheticUserMessage(content: string, imageCount: number):
   };
 }
 
+export function buildPromptHistory(messages: SessionMessage[]): string[] {
+  return messages
+    .filter((message) => message.role === "user" && message.visible && typeof message.content === "string")
+    .map((message) => (message.content ?? "").trim())
+    .filter((content) => content.length > 0);
+}
+
 export function buildPromptDraftFromSessionMessage(message: SessionMessage, nonce: number): PromptDraft {
   return {
     nonce,

packages/cli/src/ui/views/App.tsx

@@ -26,6 +26,7 @@ import { RawMode, useRawModeContext } from "../contexts";
 import { renderMessageToStdout } from "../components/MessageView/utils";
 import {
   buildPromptDraftFromSessionMessage,
+  buildPromptHistory,
   buildStatusLine,
   buildSyntheticUserMessage,
   formatModelConfig,
@@ -832,12 +833,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
     };
   }, [sessionManager, projectRoot]);
   const statusLineSegments = useStatusLine(resolvedSettings.statusline, projectRoot, getSessionInfo);
-  const promptHistory = useMemo(() => {
-    return messages
-      .filter((message) => message.role === "user" && typeof message.content === "string")
-      .map((message) => (message.content ?? "").trim())
-      .filter((content) => content.length > 0);
-  }, [messages]);
+  const promptHistory = useMemo(() => buildPromptHistory(messages), [messages]);
   const expandedThinkingId = findExpandedThinkingId(messages);
   const pendingQuestion = useMemo(() => findPendingAskUserQuestion(messages, activeStatus), [activeStatus, messages]);
   const shouldShowQuestionPrompt = Boolean(pendingQuestion && !dismissedQuestionIds.has(pendingQuestion.messageId));

packages/core/src/common/permissions.ts

@@ -1,6 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import type { DeepcodingSettings, PermissionScope, PermissionSettings } from "../settings";
+import type { ToolExecutionFollowUpMessage } from "./tool-types";
 import { isAbsoluteFilePath, normalizeFilePath } from "./state";
 
 export type BashPermissionScope = Exclude<PermissionScope, "mcp"> | "unknown";
@@ -46,7 +47,7 @@ export type PermissionToolExecution = {
     error?: string;
     metadata?: Record<string, unknown>;
     awaitUserResponse?: boolean;
-    followUpMessages?: Array<{ role: "system"; content: string; contentParams?: unknown | null }>;
+    followUpMessages?: ToolExecutionFollowUpMessage[];
   };
 };
 

packages/core/src/common/tool-types.ts

@@ -97,9 +97,10 @@ export type ToolExecutionResult = {
 };
 
 export type ToolExecutionFollowUpMessage = {
-  role: "system";
+  role: "system" | "user";
   content: string;
   contentParams?: unknown | null;
+  visible?: boolean;
 };
 
 export type ToolHandler = (

packages/core/src/session.ts

@@ -27,6 +27,7 @@ import {
   type PluginRateLimitedTool,
   type ToolCallExecution,
   type ToolExecutionHooks,
+  type ToolExecutionFollowUpMessage,
   type ToolExecutionResult,
 } from "./tools/executor";
 import { McpManager } from "./mcp/mcp-manager";
@@ -2522,6 +2523,22 @@ ${agentInstructions}
     };
   }
 
+  private buildFollowUpMessage(sessionId: string, message: ToolExecutionFollowUpMessage): SessionMessage {
+    const now = new Date().toISOString();
+    return {
+      id: crypto.randomUUID(),
+      sessionId,
+      role: message.role,
+      content: message.content,
+      contentParams: message.contentParams ?? null,
+      messageParams: null,
+      compacted: false,
+      visible: message.visible ?? false,
+      createTime: now,
+      updateTime: now,
+    };
+  }
+
   private buildSkillMessage(sessionId: string, content: string, skill: SkillInfo): SessionMessage {
     const now = new Date().toISOString();
     return {
@@ -2724,12 +2741,7 @@ ${agentInstructions}
       this.onAssistantMessage(toolMessage, true);
 
       for (const followUpMessage of execution.result.followUpMessages ?? []) {
-        if (followUpMessage.role !== "system") {
-          continue;
-        }
-        followUpMessages.push(
-          this.buildSystemMessage(sessionId, followUpMessage.content, followUpMessage.contentParams ?? null)
-        );
+        followUpMessages.push(this.buildFollowUpMessage(sessionId, followUpMessage));
       }
     }
 

packages/core/src/tests/session.test.ts

@@ -63,7 +63,7 @@ test("getProjectCode shortens long project roots for Windows-compatible storage
   assert.notEqual(projectCode, longRoot.replace(/[\\/]/g, "-").replace(/:/g, ""));
 });
 
-test("SessionManager preserves structured system content when building OpenAI messages", () => {
+test("SessionManager preserves structured user content when building OpenAI messages", () => {
   const manager = new SessionManager({
     projectRoot: process.cwd(),
     createOpenAIClient: () => ({
@@ -78,9 +78,9 @@ test("SessionManager preserves structured system content when building OpenAI me
 
   const messages: SessionMessage[] = [
     {
-      id: "system-image",
+      id: "user-image",
       sessionId: "session-1",
-      role: "system",
+      role: "user",
       content: "The read tool has loaded `pixel.png`.",
       contentParams: [
         {
@@ -102,7 +102,7 @@ test("SessionManager preserves structured system content when building OpenAI me
   }>;
 
   assert.equal(openAIMessages.length, 1);
-  assert.equal(openAIMessages[0]?.role, "system");
+  assert.equal(openAIMessages[0]?.role, "user");
   assert.deepEqual(openAIMessages[0]?.content, [
     { type: "text", text: "The read tool has loaded `pixel.png`." },
     {
@@ -112,6 +112,32 @@ test("SessionManager preserves structured system content when building OpenAI me
   ]);
 });
 
+test("SessionManager builds hidden user messages for image follow-ups", () => {
+  const manager = new SessionManager({
+    projectRoot: process.cwd(),
+    createOpenAIClient: () => ({
+      client: null,
+      model: "test-model",
+      thinkingEnabled: false,
+    }),
+    getResolvedSettings: () => ({ model: "test-model" }),
+    renderMarkdown: (text) => text,
+    onAssistantMessage: () => {},
+  });
+
+  const message = (manager as any).buildFollowUpMessage("session-1", {
+    role: "user",
+    content: "The read tool has loaded `pixel.png`.",
+    contentParams: [{ type: "image_url", image_url: { url: "data:image/png;base64,abc123" } }],
+    visible: false,
+  });
+
+  assert.equal(message.role, "user");
+  assert.equal(message.visible, false);
+  assert.equal(message.meta, undefined);
+  assert.equal(message.checkpointHash, undefined);
+});
+
 test("non-interactive SessionManager removes AskUserQuestion docs from restored requests", () => {
   const manager = new SessionManager({
     projectRoot: process.cwd(),

packages/core/src/tests/tool-handlers.test.ts

@@ -1197,7 +1197,7 @@ test("Edit preserves CRLF line endings for existing files", async () => {
   assert.equal(fs.readFileSync(filePath, "utf8"), "alpha\r\ngamma\r\n");
 });
 
-test("Read returns an acknowledgement for images and attaches the image as a follow-up system message", async () => {
+test("Read returns an acknowledgement for images and attaches the image as a hidden user message", async () => {
   const workspace = createTempWorkspace();
   const filePath = path.join(workspace, "pixel.png");
   fs.writeFileSync(
@@ -1217,7 +1217,8 @@ test("Read returns an acknowledgement for images and attaches the image as a fol
   assert.equal(readResult.followUpMessages?.length, 1);
 
   const followUpMessage = readResult.followUpMessages?.[0];
-  assert.equal(followUpMessage?.role, "system");
+  assert.equal(followUpMessage?.role, "user");
+  assert.equal(followUpMessage?.visible, false);
   assert.match(followUpMessage?.content ?? "", /pixel\.png/);
   const contentParams = Array.isArray(followUpMessage?.contentParams) ? followUpMessage.contentParams : [];
   assert.equal(contentParams.length, 1);

packages/core/src/tools/read-handler.ts

@@ -459,7 +459,7 @@ function getImageMimeType(ext: string): string {
 function buildImageFollowUpMessage(filePath: string, mime: string, buffer: Buffer): ToolExecutionFollowUpMessage {
   const fileName = path.basename(filePath);
   return {
-    role: "system",
+    role: "user",
     content:
       `The read tool has loaded \`${fileName}\`. ` + "Use the attached image content to answer the original request.",
     contentParams: [
@@ -470,6 +470,7 @@ function buildImageFollowUpMessage(filePath: string, mime: string, buffer: Buffe
         },
       },
     ],
+    visible: false,
   };
 }