feat(cli): adopt Goal v3 in ACP sessions

packages/acp-bridge/src/bridgeTypes.ts

@@ -6,6 +6,7 @@
 
 import type {
   ApprovalMode,
+  GoalSnapshotV2,
   SessionGroupPresetColor,
 } from '@qwen-code/qwen-code-core';
 import type {
@@ -601,16 +602,14 @@ export interface BridgeSessionSummary {
 }
 
 /**
- * A session's live `/goal` state, as reported by the `qwen --acp` child.
- *
- * Only the active goal crosses the bridge. The child also caches the most
- * recent goal that ended on its own, but nothing on this side reads it, so it
- * is not part of the wire shape — add it back alongside the first consumer.
+ * A session's live canonical Goal state, as reported by the `qwen --acp`
+ * child. `active` remains as a compatibility projection for existing hosts.
  */
 export interface BridgeSessionGoal {
+  snapshot: GoalSnapshotV2;
   active: {
     condition: string;
-    /** Judge turns completed so far; 0 before the first stop-hook evaluation. */
+    /** Canonical Goal turns completed so far. */
     iterations: number;
     setAt: number;
     /** The judge's verdict on the most recent turn, when it has run. */
@@ -1450,9 +1449,8 @@ export interface AcpSessionBridge {
   ): Promise<{ cleared: boolean; condition?: string }>;
 
   /**
-   * Read a live session's goal state. Throws `SessionNotFoundError` when the
-   * session is not resident — goals live in the child's memory, so a
-   * non-resident session has no goal to report.
+   * Read a live session's Goal state. Throws `SessionNotFoundError` when the
+   * session is not resident because this route addresses the selected runtime.
    */
   getSessionGoal(sessionId: string): Promise<BridgeSessionGoal>;
 

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

@@ -66,6 +66,16 @@ function goalStateRecord(
   });
 }
 
+function goalCardRecord(
+  uuid: string,
+  ...items: ReadonlyArray<Record<string, unknown>>
+): TranscriptRecordInput {
+  return record(uuid, 'system', {
+    subtype: 'slash_command',
+    systemPayload: { phase: 'result', outputHistoryItems: items },
+  });
+}
+
 describe('createTranscriptReplayMachine', () => {
   it('does not replay internal Goal runtime prompts as user messages', () => {
     expect(
@@ -112,6 +122,41 @@ describe('createTranscriptReplayMachine', () => {
     });
   });
 
+  it('replays a legacy paused goal card instead of leaving the set card newest', () => {
+    const machine = createTranscriptReplayMachine();
+    expect(
+      updates(
+        machine,
+        goalCardRecord('goal-set', {
+          type: 'goal_status',
+          kind: 'set',
+          condition: GOAL.objective,
+        }),
+      ),
+    ).toHaveLength(1);
+
+    const projected = updates(
+      machine,
+      goalCardRecord('goal-paused', {
+        type: 'goal_status',
+        kind: 'paused',
+        condition: GOAL.objective,
+        iterations: 4,
+        lastReason: 'paused by the user',
+      }),
+    );
+
+    expect(projected).toHaveLength(1);
+    expect(projected[0]?._meta).toMatchObject({
+      goalStatus: {
+        kind: 'paused',
+        condition: GOAL.objective,
+        iterations: 4,
+        lastReason: 'paused by the user',
+      },
+    });
+  });
+
   it('emits legacy goalTerminal metadata for a terminal goal_state', () => {
     const projected = updates(
       createTranscriptReplayMachine(),

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

@@ -155,6 +155,12 @@ const TRANSCRIPT_GOAL_STATUS_KINDS = new Set([
   'cleared',
   'failed',
   'aborted',
+  // A paused goal is not running, and dropping the card here is not neutral:
+  // the replay stream is what feeds the goal renderer, so the older `set` card
+  // stays newest and every surface keeps claiming autonomous work is under way.
+  // Kept in step with `GOAL_STATUS_KINDS`, which the daemon-side reader
+  // (`parseGoalStatusItem`) validates the same on-disk cards against.
+  'paused',
   'checking',
 ]);