@@ -0,0 +1,11 @@
+---
+'@object-ui/plugin-chatbot': patch
+'@object-ui/app-shell': patch
+---
+
+fix(plugin-chatbot,app-shell): after 确认 or 取消 on the chat's confirm card, the follow-up sent to the model no longer shows as the person's own message
+
+Clause-②: no
+Metadata-protocol: none
+
+After the operator confirmed or cancelled an action on the chat's confirm card, the chat sent the model a short follow-up («[HITL pa_…] The operator approved the `update_record` call … Acknowledge the outcome …») through the ordinary user-message channel, so the person saw it as their own bubble, after a reload too, and the conversation list showed it as the conversation's preview. The model still receives that follow-up unchanged. What changed is who reads it as the person's words: the chat transcript draws no bubble for it (live, after a reload, and on a shared transcript), the conversation list previews the person's last ask instead, and the conversation-language probe no longer reads it as the person's latest turn, which turned a Chinese conversation's outbound text English when the action's result carried no Chinese. The follow-up is recognised by its leading `[HITL <id>]` tag, the one part of a stored message that survives a reload; `@object-ui/plugin-chatbot` exports the reader as `isHitlContinuation` (also from `./core`). An ordinary message is sent, drawn and previewed as before.
@@ -0,0 +1,118 @@
+// Copyright (c) 2026 ObjectStack. Licensed under the Apache-2.0 license.
+
+/**
+ * objectstack#30223 — the follow-up turn the chat sends the model after
+ * 确认 / 取消 is stored as an ordinary user message (the store keeps only the
+ * text). A reloaded conversation must not draw it as the person's bubble, and
+ * the conversation-language probe must not read it as the person's latest turn.
+ *
+ * The reload leg drives the real hydration path over stored rows, exactly as
+ * `recordWriteRehydration-3565` does, then draws the result with the real
+ * `ChatbotEnhanced`.
+ */
+
+import '@testing-library/jest-dom/vitest';
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { ChatbotEnhanced } from '@object-ui/plugin-chatbot';
+import { hydratedMessagesToChatMessages } from '../AiChatPage';
+import { detectConversationLanguage } from '../conversationLanguage';
+import {
+  aiMessageRowsToServerMessages,
+  toUIMessages,
+  type RawAiMessageRow,
+} from '../../../hooks/useChatConversation';
+
+const ASK = '把这条状态改成 Active';
+const CONTINUATION =
+  '[HITL pa_8cf40802-901e-44ae-9610-bcaac8935d3b] The operator approved the `update_record` call. ' +
+  'It executed successfully with result: {"status":"written","operation":"update","recordId":"vhGuAdkNThenRvKh"}. ' +
+  "Acknowledge the outcome concisely and continue the user's task.";
+const FOLLOW_UP = 'Also set the owner to Li Lei';
+
+function storedRows(extra: RawAiMessageRow[] = []): RawAiMessageRow[] {
+  return [
+    { id: 'u1', role: 'user', content: ASK },
+    {
+      id: 'a1',
+      role: 'assistant',
+      content: '请在上方卡片确认。',
+      tool_calls: JSON.stringify([
+        {
+          type: 'tool-call',
+          toolCallId: 'c1',
+          toolName: 'update_record',
+          input: { objectName: 'jpph_customer', recordId: 'vhGuAdkNThenRvKh', values: { status: 'Active' } },
+        },
+      ]),
+    },
+    {
+      id: 't1',
+      role: 'tool',
+      tool_call_id: 'c1',
+      content: JSON.stringify([
+        {
+          type: 'tool-result',
+          toolCallId: 'c1',
+          toolName: 'update_record',
+          output: {
+            type: 'text',
+            value: JSON.stringify({ status: 'pending_approval', pendingActionId: 'pa_8cf40802-901e-44ae-9610-bcaac8935d3b' }),
+          },
+        },
+      ]),
+    },
+    { id: 'u2', role: 'user', content: CONTINUATION },
+    { id: 'a2', role: 'assistant', content: '已将验收客户 R2 的状态改为 Active。' },
+    ...extra,
+  ];
+}
+
+function reload(rows: RawAiMessageRow[]) {
+  return hydratedMessagesToChatMessages(toUIMessages(aiMessageRowsToServerMessages(rows)));
+}
+
+describe('a reloaded conversation hides the HITL continuation (objectstack#30223)', () => {
+  it('hydrates the stored continuation and draws no bubble for it', () => {
+    const messages = reload(storedRows());
+    // Stored, and hydrated as a user message: the store has no other channel.
+    expect(messages.some((m) => m.role === 'user' && m.content === CONTINUATION)).toBe(true);
+
+    render(<ChatbotEnhanced messages={messages} />);
+    expect(screen.getByText(ASK)).toBeInTheDocument();
+    expect(screen.getByText('已将验收客户 R2 的状态改为 Active。')).toBeInTheDocument();
+    expect(screen.queryByText(/The operator approved/)).toBeNull();
+    expect(screen.queryByText(/\[HITL /)).toBeNull();
+  });
+
+  it('CONTROL: an ordinary stored user message still draws as the person\'s bubble', () => {
+    render(
+      <ChatbotEnhanced
+        messages={reload(storedRows([{ id: 'u3', role: 'user', content: FOLLOW_UP }]))}
+      />,
+    );
+    expect(screen.getByText(FOLLOW_UP)).toBeInTheDocument();
+    expect(screen.getByText(ASK)).toBeInTheDocument();
+  });
+});
+
+describe('the conversation-language probe reads past the HITL continuation (objectstack#30223)', () => {
+  it('a Chinese conversation stays Chinese after an English continuation', () => {
+    expect(
+      detectConversationLanguage([
+        { role: 'user', content: ASK },
+        { role: 'assistant', content: '请确认。' },
+        { role: 'user', content: CONTINUATION },
+      ]),
+    ).toBe('zh-CN');
+  });
+
+  it('CONTROL: an English turn the person typed still decides the language', () => {
+    expect(
+      detectConversationLanguage([
+        { role: 'user', content: ASK },
+        { role: 'user', content: FOLLOW_UP },
+      ]),
+    ).toBeUndefined();
+  });
+});
@@ -12,6 +12,8 @@
 // pack's translation of them becomes reachable (objectui#3837 removed the one
 // label that had drifted in here).
 
+import { isHitlContinuation } from '@object-ui/plugin-chatbot/core';
+
 /** A message shape both the floating panel and the full-page chat can supply. */
 interface LangProbeMessage {
   role?: string;
@@ -49,6 +51,11 @@ export function detectConversationLanguage(
     if (!m || m.role !== 'user') continue;
     const text = userText(m);
     if (!text.trim()) continue;
+    // objectstack#30223 — the English follow-up the chat sends the model after
+    // 确认 / 取消 is not the person's turn. Read as one, it turned a Chinese
+    // conversation's outbound text English whenever the action's result
+    // carried no Chinese.
+    if (isHitlContinuation(text)) continue;
     return /[一-鿿]/.test(text) ? 'zh-CN' : undefined;
   }
   return undefined;
 
@@ -0,0 +1,87 @@
+// Copyright (c) 2026 ObjectStack. Licensed under the Apache-2.0 license.
+
+/**
+ * objectstack#30223 — the conversation list (`/_console/ai/build/…` left rail)
+ * previews the latest user message. The follow-up turn the chat sends the model
+ * after 确认 / 取消 is stored as one, so the preview showed 「[HITL pa_…] The
+ * operator approved …」. The preview now reads past it to what the person asked.
+ */
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { renderHook, waitFor } from '@testing-library/react';
+
+import { useConversationList } from '../useConversationList';
+
+const API_BASE = 'http://ai.test/api/v1/ai';
+const ASK = '把这条状态改成 Active';
+const CONTINUATION =
+  '[HITL pa_8cf40802-901e-44ae-9610-bcaac8935d3b] The operator approved the `update_record` call. ' +
+  'It executed successfully with result: {"statu';
+
+function jsonResponse(body: unknown): Response {
+  return new Response(JSON.stringify(body), {
+    status: 200,
+    headers: { 'Content-Type': 'application/json' },
+  });
+}
+
+describe('useConversationList — the preview skips the HITL continuation (objectstack#30223)', () => {
+  let fetchMock: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    fetchMock = vi.fn();
+    vi.stubGlobal('fetch', fetchMock);
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it('previews the person\'s last ask, not the continuation stored after it; an ordinary row is unchanged', async () => {
+    fetchMock.mockResolvedValueOnce(
+      jsonResponse({
+        conversations: [
+          {
+            id: 'conv-confirmed',
+            title: '修改客户状态',
+            updatedAt: '2026-11-05T03:00:00.000Z',
+            messages: [
+              { role: 'user', content: ASK },
+              { role: 'assistant', content: [{ type: 'text', text: '请在上方卡片确认。' }] },
+              { role: 'user', content: CONTINUATION },
+              { role: 'assistant', content: '已将状态改为 Active。' },
+            ],
+          },
+          {
+            // CONTROL: no confirm in this conversation.
+            id: 'conv-plain',
+            title: '查询',
+            updatedAt: '2026-11-05T02:00:00.000Z',
+            messages: [
+              { role: 'user', content: 'How many leads?' },
+              { role: 'assistant', content: '12' },
+              { role: 'user', content: [{ type: 'text', text: 'And how many are open?' }] },
+            ],
+          },
+          {
+            // Only a continuation and no typed ask to fall back to: no preview,
+            // rather than the continuation.
+            id: 'conv-only-continuation',
+            title: '旧对话',
+            updatedAt: '2026-11-05T01:00:00.000Z',
+            messages: [{ role: 'user', content: CONTINUATION }],
+            preview: CONTINUATION,
+          },
+        ],
+      }),
+    );
+
+    const { result } = renderHook(() => useConversationList({ userId: 'u1', apiBase: API_BASE }));
+    await waitFor(() => expect(result.current.conversations).toHaveLength(3));
+
+    const byId = new Map(result.current.conversations.map((c) => [c.id, c]));
+    expect(byId.get('conv-confirmed')?.preview).toBe(ASK);
+    expect(byId.get('conv-plain')?.preview).toBe('And how many are open?');
+    expect(byId.get('conv-only-continuation')?.preview).toBeUndefined();
+  });
+});
@@ -10,6 +10,7 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { publishPlanApprovalPending } from '../assistant/assistantBus.js';
+import { isHitlContinuation } from '@object-ui/plugin-chatbot/core';
 
 /**
  * One row of the conversation-history list.
@@ -76,15 +77,19 @@ function extractPreview(row: ServerConversation): string | undefined {
   const messages = row.messages;
   if (!messages || messages.length === 0) return undefined;
   // Prefer the most recent user message, fall back to last message.
+  // objectstack#30223 — a HITL continuation (the turn the chat sends the model
+  // after 确认 / 取消) is stored as a user message but is not the person's
+  // words, so the preview reads past it to what they actually asked.
   for (let i = messages.length - 1; i >= 0; i--) {
     const m = messages[i];
     if (m.role === 'user') {
       const text = stringifyContent(m.content);
-      if (text) return text;
+      if (text && !isHitlContinuation(text)) return text;
     }
   }
   const last = messages[messages.length - 1];
-  return stringifyContent(last?.content);
+  const fallback = stringifyContent(last?.content);
+  return isHitlContinuation(fallback) ? undefined : fallback;
 }
 
 function stringifyContent(content: unknown): string | undefined {
@@ -122,7 +127,8 @@ function stringifyContent(content: unknown): string | undefined {
 
 function normalize(row: ServerConversation): ConversationListItem {
   const title = row.title?.trim();
-  const preview = extractPreview(row) ?? stringifyContent(row.preview);
+  const served = stringifyContent(row.preview);
+  const preview = extractPreview(row) ?? (isHitlContinuation(served) ? undefined : served);
   return {
     id: row.id,
     title: isPlaceholderTitle(title) ? undefined : title,
 
@@ -48,6 +48,7 @@ import {
   type MessageProps,
 } from './elements/message';
 import { RecordLinkContext } from './recordLink';
+import { isHitlContinuation } from './hitlContinuation';
 import type { PublishHealth, PublishOutcome } from './publishHealth';
 import {
   PromptInput,
@@ -4533,6 +4534,11 @@ const ChatbotEnhanced = React.forwardRef<HTMLDivElement, ChatbotEnhancedProps>(
             ) : (
               messages.map((message) => {
                 const isUser = message.role === 'user';
+                // objectstack#30223 — the follow-up turn `useHitlInChat` sends
+                // the model after 确认 / 取消 is not the person's words, so it
+                // draws no bubble: live, after a reload, or on a shared
+                // transcript. The model still received it.
+                if (isUser && isHitlContinuation(message.content)) return null;
                 const tools = message.toolInvocations ?? [];
                 const reasoning = message.reasoning?.trim();
                 const sources = message.sources ?? [];