fix(core): separate hook context from transcript display

packages/acp-bridge/src/transcript-replay.test.ts

@@ -193,6 +193,99 @@ describe('createTranscriptReplayMachine', () => {
     ]);
   });
 
+  it('uses clean user display metadata while preserving image parts', () => {
+    const machine = createTranscriptReplayMachine();
+    const projected = updates(
+      machine,
+      record('user-1', 'user', {
+        message: {
+          role: 'user',
+          parts: [
+            { text: 'expanded model prompt' },
+            {
+              inlineData: {
+                data: 'image-data',
+                mimeType: 'image/png',
+              },
+            },
+            {
+              text: [
+                '<qwen:user-prompt-submit-context>',
+                'hook-only context',
+                '</qwen:user-prompt-submit-context>',
+              ].join('\n'),
+            },
+          ],
+        },
+        systemPayload: {
+          displayText: 'raw @file prompt',
+          hookContext: 'hook-only context',
+        },
+      }),
+    );
+
+    expect(projected).toMatchObject([
+      {
+        sessionUpdate: 'user_message_chunk',
+        content: { type: 'text', text: 'raw @file prompt' },
+      },
+      {
+        sessionUpdate: 'user_message_chunk',
+        content: {
+          type: 'image',
+          data: 'image-data',
+          mimeType: 'image/png',
+        },
+      },
+    ]);
+  });
+
+  it('strips only a complete final tag-only context part', () => {
+    const projected = updates(
+      createTranscriptReplayMachine(),
+      record('user-1', 'user', {
+        message: {
+          role: 'user',
+          parts: [
+            { text: 'user prompt' },
+            {
+              text: [
+                '<qwen:user-prompt-submit-context>',
+                'hook-only context',
+                '</qwen:user-prompt-submit-context>',
+              ].join('\n'),
+            },
+          ],
+        },
+      }),
+    );
+
+    expect(projected).toHaveLength(1);
+    expect(projected[0]).toMatchObject({
+      content: { type: 'text', text: 'user prompt' },
+    });
+  });
+
+  it('preserves legacy bare hook context without a reliable boundary', () => {
+    const projected = updates(
+      createTranscriptReplayMachine(),
+      record('user-1', 'user', {
+        message: {
+          role: 'user',
+          parts: [
+            { text: 'user prompt' },
+            { text: 'legacy bare hook context' },
+          ],
+        },
+      }),
+    );
+
+    expect(projected).toMatchObject([
+      { content: { type: 'text', text: 'user prompt' } },
+      { content: { type: 'text', text: 'legacy bare hook context' } },
+    ]);
+  });
+
   it('projects ordered message parts with source metadata', () => {
     const machine = createTranscriptReplayMachine();
     const projected = updates(

packages/acp-bridge/src/transcript-replay.ts

@@ -15,6 +15,7 @@ import type {
   TranscriptRecordInput,
   TranscriptReplayGapInput,
 } from '@qwen-code/qwen-code-core/transcriptRecords';
+import { projectUserTranscriptForDisplay } from '@qwen-code/qwen-code-core/transcriptRecords';
 import {
   parseGoalSnapshotV2,
   parseGoalStateRecordPayloadV2,
@@ -473,29 +474,21 @@ class DefaultTranscriptReplayMachine implements TranscriptReplayMachine {
     emit: (update: SessionUpdate) => TranscriptReplayEmission,
     meta: UpdateMetaOptions,
   ): Iterable<TranscriptReplayEmission> {
-    if (
-      record.subtype === 'goal_runtime' ||
-      record.subtype === 'notification' ||
-      record.subtype === 'cron' ||
-      record.subtype === 'mid_turn_user_message'
-    ) {
-      const payload = isObjectRecord(record.systemPayload)
-        ? record.systemPayload
+    const projection = projectUserTranscriptForDisplay(record);
+    const payload = isObjectRecord(record.systemPayload)
+      ? record.systemPayload
+      : undefined;
+    const backgroundTask =
+      payload && isObjectRecord(payload['backgroundTask'])
+        ? payload['backgroundTask']
         : undefined;
-      const displayText =
-        payload && typeof payload['displayText'] === 'string'
-          ? payload['displayText']
-          : undefined;
-      const backgroundTask =
-        payload && isObjectRecord(payload['backgroundTask'])
-          ? payload['backgroundTask']
-          : undefined;
-      if (displayText) {
+    if (projection.displayText !== undefined) {
+      if (projection.displayText.length > 0) {
         const isNotification = record.subtype === 'notification';
         yield emit(
           createTranscriptMessageUpdate({
             role: 'user',
-            text: displayText,
+            text: projection.displayText,
             ...meta,
             ...(isNotification
               ? {
@@ -510,11 +503,34 @@ class DefaultTranscriptReplayMachine implements TranscriptReplayMachine {
                 : {}),
           }),
         );
-        return;
       }
+      yield* this.projectMessageParts(
+        record,
+        'user',
+        emit,
+        meta,
+        undefined,
+        projection.parts,
+      );
+      return;
+    }
+
+    if (
+      record.subtype === 'goal_runtime' ||
+      record.subtype === 'notification' ||
+      record.subtype === 'cron' ||
+      record.subtype === 'mid_turn_user_message'
+    ) {
       if (record.subtype !== 'mid_turn_user_message') return;
     }
-    yield* this.projectMessageParts(record, 'user', emit, meta);
+    yield* this.projectMessageParts(
+      record,
+      'user',
+      emit,
+      meta,
+      undefined,
+      projection.parts,
+    );
   }
 
   private *projectAssistantRecord(
@@ -549,8 +565,9 @@ class DefaultTranscriptReplayMachine implements TranscriptReplayMachine {
     emit: (update: SessionUpdate) => TranscriptReplayEmission,
     meta: UpdateMetaOptions,
     beforeToolCall?: () => SessionUpdate | undefined,
+    partsOverride?: readonly unknown[],
   ): Iterable<TranscriptReplayEmission> {
-    const parts = record.message?.parts;
+    const parts = partsOverride ?? record.message?.parts;
     if (!parts) return;
     for (let partIndex = 0; partIndex < parts.length; partIndex += 1) {
       const part = parts[partIndex];

packages/cli/src/services/insight/generators/DataProcessor.test.ts

@@ -112,6 +112,45 @@ describe('DataProcessor', () => {
       expect(result).toContain('[User]: Hello, world!');
     });
 
+    it('should analyze clean user display text instead of hook context', () => {
+      const records: ChatRecord[] = [
+        {
+          sessionId: 'test-session',
+          timestamp: new Date().toISOString(),
+          type: 'user',
+          message: {
+            role: 'user',
+            parts: [
+              { text: 'expanded model prompt' },
+              {
+                text: [
+                  '<qwen:user-prompt-submit-context>',
+                  'hook-only context',
+                  '</qwen:user-prompt-submit-context>',
+                ].join('\n'),
+              },
+            ],
+          },
+          systemPayload: {
+            displayText: 'raw @file prompt',
+            hookContext: 'hook-only context',
+          },
+          uuid: '',
+          parentUuid: null,
+          cwd: '',
+          version: '',
+        },
+      ];
+      const result = (
+        dataProcessor as unknown as {
+          formatRecordsForAnalysis(records: ChatRecord[]): string;
+        }
+      ).formatRecordsForAnalysis(records);
+
+      expect(result).toContain('[User]: raw @file prompt');
+      expect(result).not.toContain('hook-only context');
+    });
+
     it('should format assistant text messages correctly', () => {
       const records: ChatRecord[] = [
         {

packages/cli/src/services/insight/generators/DataProcessor.ts

@@ -32,6 +32,7 @@ import type {
 import {
   getInsightPrompt,
   runSideQuery,
+  projectUserTranscriptForDisplay,
   type Config,
   type ChatRecord,
 } from '@qwen-code/qwen-code-core';
@@ -217,10 +218,18 @@ export class DataProcessor {
 
     for (const record of records) {
       if (record.type === 'user') {
-        const text =
-          record.message?.parts
-            ?.map((p) => ('text' in p ? p.text : ''))
-            .join('') || '';
+        const projection = projectUserTranscriptForDisplay(record);
+        const fallbackText = projection.parts
+          .map((part: unknown) =>
+            typeof part === 'object' &&
+            part !== null &&
+            'text' in part &&
+            typeof part.text === 'string'
+              ? part.text
+              : '',
+          )
+          .join('');
+        const text = projection.displayText ?? fallbackText;
         output += `[User]: ${text}\n`;
       } else if (record.type === 'assistant') {
         if (record.message?.parts) {