@@ -102,7 +102,20 @@ test("formatAskUserQuestionAnswers creates model-readable answer text", () => {
       "Which package manager?": "yarn",
       "Any notes?": "Use the existing lockfile",
     }),
-    'User has answered your questions: "Which package manager?"="yarn", "Any notes?"="Use the existing lockfile". You can now continue with the user\'s answers in mind.'
+    [
+      "Questions 2/2 answered",
+      " - `Which package manager?`",
+      "   answer: yarn",
+      " - `Any notes?`",
+      "   answer: Use the existing lockfile",
+    ].join("\n")
+  );
+});
+
+test("formatAskUserQuestionAnswers normalizes multiline answers and escapes question backticks", () => {
+  assert.equal(
+    formatAskUserQuestionAnswers({ "Which `mode`?": "Use fast\nmode" }),
+    ["Questions 1/1 answered", " - `Which \\`mode\\`?`", "   answer: Use fast mode"].join("\n")
   );
 });
 
 
@@ -47,10 +47,13 @@ export function findPendingAskUserQuestion(
 }
 
 export function formatAskUserQuestionAnswers(answers: AskUserQuestionAnswers): string {
-  const answersText = Object.entries(answers)
-    .map(([question, answer]) => `"${escapeAnswerPart(question)}"="${escapeAnswerPart(answer)}"`)
-    .join(", ");
-  return `User has answered your questions: ${answersText}. You can now continue with the user's answers in mind.`;
+  const entries = Object.entries(answers);
+  const lines = [`Questions ${entries.length}/${entries.length} answered`];
+  for (const [question, answer] of entries) {
+    lines.push(` - \`${formatQuestion(question)}\``);
+    lines.push(`   answer: ${formatAnswer(answer)}`);
+  }
+  return lines.join("\n");
 }
 
 export function formatAskUserQuestionDecline(): string {
@@ -128,6 +131,10 @@ function normalizeOption(raw: unknown): AskUserQuestionOption | null {
   };
 }
 
-function escapeAnswerPart(value: string): string {
-  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\s+/g, " ").trim();
+function formatQuestion(value: string): string {
+  return value.replace(/`/g, "\\`").replace(/\s+/g, " ").trim();
+}
+
+function formatAnswer(value: string): string {
+  return value.replace(/\s+/g, " ").trim();
 }
@@ -406,6 +406,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
         permissions: submission.permissions,
         alwaysAllows: submission.alwaysAllows,
         planMode: submission.planMode ?? planMode,
+        isAnswers: submission.isAnswers,
       };
       const activeSessionId = sessionManager.getActiveSessionId();
       const permissionReply =
@@ -902,6 +903,7 @@ function App({ projectRoot, initialPrompt, resumeSessionId, forkSessionId, onRes
       void handlePrompt({
         text: formatAskUserQuestionAnswers(answers),
         imageUrls: [],
+        isAnswers: true,
       });
     },
     [handlePrompt]
 
@@ -73,6 +73,7 @@ export type PromptSubmission = {
   permissions?: UserToolPermission[];
   alwaysAllows?: PermissionScope[];
   planMode?: boolean;
+  isAnswers?: boolean;
   command?: "new" | "resume" | "fork" | "continue" | "undo" | "mcp" | "exit";
 };
 
 
@@ -2,6 +2,9 @@ import type { ChatCompletionMessageParam, ChatCompletionContentPart } from "open
 import { supportsMultimodal, type MultimodalMode } from "./model-capabilities";
 import type { SessionMessage } from "../session";
 
+const ANSWERS_SYSTEM_MESSAGE =
+  "User has answered your questions. You can now continue with the user's answers in mind.";
+
 export type OpenAIMessageConverterOptions = {
   /** Optional callback to render the /init command prompt template. */
   renderInitPrompt?: () => string;
@@ -40,6 +43,11 @@ export class OpenAIMessageConverter {
       }
 
       openAIMessages.push(this.convertMessage(message, thinkingEnabled, model, multimodal));
+      if (message.role === "user" && message.meta?.isAnswers) {
+        openAIMessages.push(
+          this.convertMessage(this.buildAnswersSystemMessage(message), thinkingEnabled, model, multimodal)
+        );
+      }
 
       const toolCalls = this.getAssistantToolCalls(message);
       if (toolCalls.length === 0) {
@@ -148,6 +156,21 @@ export class OpenAIMessageConverter {
     return message.content ?? "";
   }
 
+  private buildAnswersSystemMessage(message: SessionMessage): SessionMessage {
+    return {
+      id: `${message.id}:answers`,
+      sessionId: message.sessionId,
+      role: "system",
+      content: ANSWERS_SYSTEM_MESSAGE,
+      contentParams: null,
+      messageParams: null,
+      compacted: false,
+      visible: false,
+      createTime: message.createTime,
+      updateTime: message.updateTime,
+    };
+  }
+
   private pairToolMessages(messages: SessionMessage[]): Map<string, number> {
     const pairings = new Map<string, number>();
     const usedToolMessageIndexes = new Set<number>();
 
@@ -294,6 +294,7 @@ export type MessageMeta = {
   paramsMd?: string;
   resultMd?: string;
   asThinking?: boolean;
+  isAnswers?: boolean;
   isSummary?: boolean;
   isModelChange?: boolean;
   skill?: SkillInfo;
@@ -331,6 +332,7 @@ export type UserPromptContent = {
   permissions?: UserToolPermission[];
   alwaysAllows?: PermissionScope[];
   planMode?: boolean;
+  isAnswers?: boolean;
 };
 
 type PersistedPromptImage = {
@@ -2487,7 +2489,10 @@ ${agentInstructions}
       visible: true,
       createTime: now,
       updateTime: now,
-      meta: { userPrompt: this.cloneUserPromptForMeta(prompt) },
+      meta: {
+        userPrompt: this.cloneUserPromptForMeta(prompt),
+        isAnswers: prompt.isAnswers,
+      },
       checkpointHash: this.getCurrentCheckpointHash(sessionId),
     };
   }
@@ -2917,6 +2922,7 @@ ${agentInstructions}
       permissions: prompt.permissions ? prompt.permissions.map((permission) => ({ ...permission })) : undefined,
       alwaysAllows: prompt.alwaysAllows ? [...prompt.alwaysAllows] : undefined,
       planMode: prompt.planMode,
+      isAnswers: prompt.isAnswers,
     };
   }
 
 
@@ -135,6 +135,48 @@ test("OpenAIMessageConverter multimodal config overrides model-based filtering",
   ]);
 });
 
+test("OpenAIMessageConverter appends an answers system message after tagged user messages", () => {
+  const c = converter();
+  const messages: SessionMessage[] = [
+    msg({
+      id: "answers-1",
+      role: "user",
+      content: "Questions 1/1 answered",
+      meta: { isAnswers: true },
+    }),
+  ];
+
+  const result = c.buildMessages(messages, false, "test-model") as Array<{ role: string; content: string }>;
+
+  assert.deepEqual(result, [
+    { role: "user", content: "Questions 1/1 answered" },
+    {
+      role: "system",
+      content: "User has answered your questions. You can now continue with the user's answers in mind.",
+    },
+  ]);
+  assert.equal(messages.length, 1);
+  assert.equal((c as any).buildAnswersSystemMessage(messages[0]).visible, false);
+});
+
+test("OpenAIMessageConverter does not append an answers system message for ordinary or compacted messages", () => {
+  const c = converter();
+  const messages: SessionMessage[] = [
+    msg({ id: "ordinary", role: "user", content: "hello" }),
+    msg({
+      id: "old-answers",
+      role: "user",
+      content: "Questions 1/1 answered",
+      compacted: true,
+      meta: { isAnswers: true },
+    }),
+  ];
+
+  const result = c.buildMessages(messages, false, "test-model") as Array<{ role: string; content: string }>;
+
+  assert.deepEqual(result, [{ role: "user", content: "hello" }]);
+});
+
 test("OpenAIMessageConverter injects reasoning_content in thinking mode", () => {
   const c = converter();
   const messages: SessionMessage[] = [msg({ role: "assistant", content: "Final answer", messageParams: null })];
 
@@ -622,6 +622,24 @@ test("SessionManager persists Plan Mode and appends prompts only on mode transit
   assert.equal(messages.filter((message) => message.content === PLAN_MODE_OFF_STATUS_MESSAGE).length, 1);
 });
 
+test("SessionManager tags AskUserQuestion answer messages", async () => {
+  const workspace = createTempDir("deepcode-answers-workspace-");
+  const home = createTempDir("deepcode-answers-home-");
+  setHomeDir(home);
+
+  const manager = createMockedClientSessionManager(workspace, [
+    createChatResponse("continued", { prompt_tokens: 1, completion_tokens: 1, total_tokens: 2 }),
+  ]);
+  const sessionId = await manager.createSession({
+    text: "Questions 1/1 answered\n - `Continue?`\n   answer: Yes",
+    isAnswers: true,
+  });
+  const message = manager.listSessionMessages(sessionId).find((item) => item.role === "user");
+
+  assert.equal(message?.meta?.isAnswers, true);
+  assert.equal(message?.meta?.userPrompt?.isAnswers, true);
+});
+
 test("SessionManager excludes the former bundled plan skill and defaults legacy sessions to Default mode", async () => {
   const workspace = createTempDir("deepcode-plan-legacy-workspace-");
   const home = createTempDir("deepcode-plan-legacy-home-");
 
@@ -541,7 +541,7 @@
       }
 
       function buildAskUserQuestionReply(questions, form) {
-        const lines = ["Answer to AskUserQuestion:"];
+        const lines = [`Questions ${questions.length}/${questions.length} answered`];
 
         for (let index = 0; index < questions.length; index += 1) {
           const question = questions[index];
@@ -558,14 +558,12 @@
             };
           }
 
-          lines.push("");
-          lines.push(`${index + 1}. ${question.question}`);
-          if (selectedOptions.length > 0) {
-            lines.push(`- Selected: ${selectedOptions.join(", ")}`);
-          }
+          const answers = [...selectedOptions];
           if (otherText) {
-            lines.push(`- Other: ${otherText}`);
+            answers.push(otherText);
           }
+          lines.push(` - \`${String(question.question || "").replace(/`/g, "\\`")}\``);
+          lines.push(`   answer: ${answers.join(", ")}`);
         }
 
         return {
@@ -680,7 +678,7 @@
           }
           errorMessage.textContent = "";
           setAskUserQuestionFormState(form, false);
-          sendUserPromptText(reply.text);
+          sendUserPromptText(reply.text, undefined, [], { isAnswers: true });
         });
 
         wrapper.appendChild(form);
@@ -1997,6 +1995,7 @@
         const normalizedImages = Array.isArray(imageUrls) ? imageUrls.filter(Boolean) : [];
         const permissions = Array.isArray(options.permissions) ? options.permissions : undefined;
         const alwaysAllows = Array.isArray(options.alwaysAllows) ? options.alwaysAllows : undefined;
+        const isAnswers = options.isAnswers === true;
         const hasPermissionPayload = Boolean(
           (permissions && permissions.length > 0) || (alwaysAllows && alwaysAllows.length > 0)
         );
@@ -2014,7 +2013,8 @@
           skills: skills && skills.length > 0 ? skills : undefined,
           images: normalizedImages.length > 0 ? normalizedImages : undefined,
           permissions,
-          alwaysAllows
+          alwaysAllows,
+          isAnswers: isAnswers || undefined
         });
         return true;
       }
 
@@ -86,6 +86,7 @@ export async function handleWebviewMessage(message: unknown, deps: ProviderDeps)
     await handlePrompt(prompt, skills, images, sessionManager, postMessage, renderMarkdown, {
       permissions: permissions.length > 0 ? permissions : undefined,
       alwaysAllows: alwaysAllows.length > 0 ? alwaysAllows : undefined,
+      isAnswers: msg.isAnswers === true ? true : undefined,
     });
     return true;
   }
@@ -238,7 +239,7 @@ async function handlePrompt(
   sessionManager: ProviderDeps["sessionManager"],
   postMessage: PostMessageFn,
   renderMarkdown: (text: string) => string,
-  options: { permissions?: UserToolPermission[]; alwaysAllows?: PermissionScope[] } = {}
+  options: { permissions?: UserToolPermission[]; alwaysAllows?: PermissionScope[]; isAnswers?: boolean } = {}
 ): Promise<void> {
   const normalizedImages = imageUrls.filter(Boolean);
   const displayPrompt = prompt || (normalizedImages.length > 0 ? "粘贴的图像" : "");
@@ -260,6 +261,7 @@ async function handlePrompt(
       imageUrls: normalizedImages,
       permissions: options.permissions,
       alwaysAllows: options.alwaysAllows,
+      isAnswers: options.isAnswers,
     });
     await sendSkillsList(sessionManager, postMessage);