fix: 修复跨任务 wait_freezes 被错误打平的问题

Windsland52 · Windsland52 · commit 241fad4694be · 2026-04-18T19:55:08.000+08:00
- 当嵌套子任务仍处于活动状态时，让 wait_freezes 保持挂在当前同源的
- foreign pipeline/action 上下文下，而不是回退并打平到外层任务 action。
- 补充 reducer 和 parser 的回归测试，覆盖 SOSSelectNode/Click 嵌套流程场景。
diff --git a/packages/maa-log-parser/src/__tests__/parser.subTaskScope.test.ts b/packages/maa-log-parser/src/__tests__/parser.subTaskScope.test.ts
@@ -269,6 +269,114 @@ describe('LogParser sub task scoped node aggregation', () => {
     expect(nestedSubPipeline[0].item.status).toBe('success')
   })
 
+  it('nests outer-task wait_freezes into the active foreign pipeline flow', async () => {
+    const lines = [
+      makeEventLine(201, 'Tasker.Task.Starting', { task_id: 1, entry: 'MainTask', hash: 'h-main-3', uuid: 'u-main-3' }),
+      makeEventLine(202, 'Node.PipelineNode.Starting', { task_id: 1, node_id: 101, name: 'MainNode' }),
+      makeEventLine(203, 'Node.Action.Starting', { task_id: 1, action_id: 1001, name: 'SOSSelectNode' }),
+
+      makeEventLine(204, 'Node.PipelineNode.Starting', { task_id: 2, node_id: 201, name: 'Click' }),
+      makeEventLine(205, 'Node.NextList.Starting', {
+        task_id: 2,
+        name: 'Click',
+        list: [{ name: 'Click', anchor: false, jump_back: false }],
+      }),
+      makeEventLine(206, 'Node.Recognition.Starting', { task_id: 2, reco_id: 3001, name: 'Click' }),
+      makeEventLine(207, 'Node.Recognition.Succeeded', {
+        task_id: 2,
+        reco_id: 3001,
+        name: 'Click',
+        reco_details: {
+          reco_id: 3001,
+          algorithm: 'DirectHit',
+          box: [0, 0, 1280, 720],
+          detail: null,
+          name: 'Click',
+        },
+      }),
+      makeEventLine(208, 'Node.NextList.Succeeded', {
+        task_id: 2,
+        name: 'Click',
+        list: [{ name: 'Click', anchor: false, jump_back: false }],
+      }),
+      makeEventLine(209, 'Node.Action.Starting', { task_id: 2, action_id: 3002, name: 'Click' }),
+      makeEventLine(210, 'Node.Action.Succeeded', {
+        task_id: 2,
+        action_id: 3002,
+        name: 'Click',
+        action_details: {
+          action_id: 3002,
+          action: 'Click',
+          box: [0, 0, 1280, 720],
+          detail: {},
+          name: 'Click',
+          success: true,
+        },
+      }),
+      makeEventLine(211, 'Node.WaitFreezes.Starting', {
+        task_id: 1,
+        wf_id: 4001,
+        phase: 'post',
+        name: 'Click',
+      }),
+      makeEventLine(212, 'Node.WaitFreezes.Succeeded', {
+        task_id: 1,
+        wf_id: 4001,
+        phase: 'post',
+        name: 'Click',
+        elapsed: 33,
+      }),
+      makeEventLine(213, 'Node.PipelineNode.Succeeded', {
+        task_id: 2,
+        node_id: 201,
+        name: 'Click',
+      }),
+
+      makeEventLine(214, 'Node.Action.Succeeded', {
+        task_id: 1,
+        action_id: 1001,
+        name: 'SOSSelectNode',
+      }),
+      makeEventLine(215, 'Node.PipelineNode.Succeeded', { task_id: 1, node_id: 101, name: 'MainNode' }),
+      makeEventLine(216, 'Tasker.Task.Succeeded', { task_id: 1, entry: 'MainTask', hash: 'h-main-3', uuid: 'u-main-3' }),
+    ]
+
+    const parser = new LogParser()
+    await parser.parseFile(lines.join('\n'))
+    const tasks = parser.getTasksSnapshot()
+    const mainTask = tasks.find(item => item.task_id === 1)
+
+    expect(mainTask).toBeTruthy()
+    const mainNode = mainTask!.nodes[0]
+
+    const actionRoot = collectFlowItems(
+      mainNode.node_flow,
+      (item) => item.type === 'action' && item.action_id === 1001,
+    )[0]?.item
+    expect(actionRoot).toBeTruthy()
+
+    const nestedTask = collectFlowItems(
+      actionRoot?.children,
+      (item) => item.type === 'task' && item.task_id === 2,
+    )[0]?.item
+    expect(nestedTask).toBeTruthy()
+    expect(nestedTask?.children?.map((item) => item.type)).toEqual(['pipeline_node'])
+
+    const nestedPipeline = nestedTask?.children?.[0]
+    expect(nestedPipeline?.type).toBe('pipeline_node')
+    expect(nestedPipeline?.children?.map((item) => item.type)).toEqual([
+      'recognition',
+      'action',
+      'wait_freezes',
+    ])
+
+    const nestedWaitFreezes = nestedPipeline?.children?.[2]
+    expect(nestedWaitFreezes?.type).toBe('wait_freezes')
+    expect(nestedWaitFreezes?.task_id).toBe(1)
+    expect(nestedWaitFreezes?.node_id).toBe(201)
+    expect(nestedWaitFreezes?.wait_freezes_details?.wf_id).toBe(4001)
+  })
+
   it('tolerates malformed NextList payloads', async () => {
     const lines = [
       makeEventLine(151, 'Tasker.Task.Starting', { task_id: 31, entry: 'MainTask', hash: 'h-main-4', uuid: 'u-main-4' }),
diff --git a/packages/maa-log-parser/src/__tests__/traceReducer.test.ts b/packages/maa-log-parser/src/__tests__/traceReducer.test.ts
@@ -407,6 +407,241 @@ describe('TraceReducer', () => {
     expect(pipeline.children.map((item) => item.kind)).toEqual(['resource_loading'])
   })
 
+  it('parents outer-task wait_freezes under the active foreign pipeline scope from the same source', () => {
+    const events: ProtocolEvent[] = [
+      makeEvent({
+        kind: 'task',
+        seq: 1,
+        ts: '2026-04-08 00:00:01.000',
+        tsMs: 1,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 1 },
+        rawMessage: 'Tasker.Task.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 1, entry: 'Main' },
+        taskId: 1,
+        entry: 'Main',
+      }),
+      makeEvent({
+        kind: 'pipeline_node',
+        seq: 2,
+        ts: '2026-04-08 00:00:02.000',
+        tsMs: 2,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 2 },
+        rawMessage: 'Node.PipelineNode.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 1, node_id: 101, name: 'MainNode' },
+        taskId: 1,
+        nodeId: 101,
+        name: 'MainNode',
+      }),
+      makeEvent({
+        kind: 'action',
+        seq: 3,
+        ts: '2026-04-08 00:00:03.000',
+        tsMs: 3,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 3 },
+        rawMessage: 'Node.Action.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 1, action_id: 601, name: 'OuterAction' },
+        taskId: 1,
+        actionId: 601,
+        name: 'OuterAction',
+      }),
+      makeEvent({
+        kind: 'pipeline_node',
+        seq: 4,
+        ts: '2026-04-08 00:00:04.000',
+        tsMs: 4,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 4 },
+        rawMessage: 'Node.PipelineNode.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 2, node_id: 201, name: 'NestedClick' },
+        taskId: 2,
+        nodeId: 201,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'recognition',
+        seq: 5,
+        ts: '2026-04-08 00:00:05.000',
+        tsMs: 5,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 5 },
+        rawMessage: 'Node.Recognition.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 2, reco_id: 701, name: 'NestedClick' },
+        taskId: 2,
+        recoId: 701,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'recognition',
+        seq: 6,
+        ts: '2026-04-08 00:00:06.000',
+        tsMs: 6,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 6 },
+        rawMessage: 'Node.Recognition.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 2, reco_id: 701, name: 'NestedClick' },
+        taskId: 2,
+        recoId: 701,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'action',
+        seq: 7,
+        ts: '2026-04-08 00:00:07.000',
+        tsMs: 7,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 7 },
+        rawMessage: 'Node.Action.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 2, action_id: 702, name: 'NestedClick' },
+        taskId: 2,
+        actionId: 702,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'action',
+        seq: 8,
+        ts: '2026-04-08 00:00:08.000',
+        tsMs: 8,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 8 },
+        rawMessage: 'Node.Action.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 2, action_id: 702, name: 'NestedClick' },
+        taskId: 2,
+        actionId: 702,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'wait_freezes',
+        seq: 9,
+        ts: '2026-04-08 00:00:09.000',
+        tsMs: 9,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 9 },
+        rawMessage: 'Node.WaitFreezes.Starting',
+        phase: 'starting',
+        rawDetails: { task_id: 1, wf_id: 901, phase: 'post', name: 'NestedClick' },
+        taskId: 1,
+        wfId: 901,
+        waitPhase: 'post',
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'wait_freezes',
+        seq: 10,
+        ts: '2026-04-08 00:00:10.000',
+        tsMs: 10,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 10 },
+        rawMessage: 'Node.WaitFreezes.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 1, wf_id: 901, phase: 'post', name: 'NestedClick', elapsed: 15 },
+        taskId: 1,
+        wfId: 901,
+        waitPhase: 'post',
+        elapsed: 15,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'pipeline_node',
+        seq: 11,
+        ts: '2026-04-08 00:00:11.000',
+        tsMs: 11,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 11 },
+        rawMessage: 'Node.PipelineNode.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 2, node_id: 201, name: 'NestedClick' },
+        taskId: 2,
+        nodeId: 201,
+        name: 'NestedClick',
+      }),
+      makeEvent({
+        kind: 'action',
+        seq: 12,
+        ts: '2026-04-08 00:00:12.000',
+        tsMs: 12,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 12 },
+        rawMessage: 'Node.Action.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 1, action_id: 601, name: 'OuterAction' },
+        taskId: 1,
+        actionId: 601,
+        name: 'OuterAction',
+      }),
+      makeEvent({
+        kind: 'pipeline_node',
+        seq: 13,
+        ts: '2026-04-08 00:00:13.000',
+        tsMs: 13,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 13 },
+        rawMessage: 'Node.PipelineNode.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 1, node_id: 101, name: 'MainNode' },
+        taskId: 1,
+        nodeId: 101,
+        name: 'MainNode',
+      }),
+      makeEvent({
+        kind: 'task',
+        seq: 14,
+        ts: '2026-04-08 00:00:14.000',
+        tsMs: 14,
+        processId: 'Px1',
+        threadId: 'Tx1',
+        source: { sourceKey: 'maa.log', inputIndex: 0, line: 14 },
+        rawMessage: 'Tasker.Task.Succeeded',
+        phase: 'succeeded',
+        rawDetails: { task_id: 1, entry: 'Main' },
+        taskId: 1,
+        entry: 'Main',
+      }),
+    ]
+
+    const trace = buildTraceTree(events)
+
+    const task = trace.children[0]
+    const pipeline = task?.children[0]
+    const action = pipeline?.children[0]
+
+    expect(action?.kind).toBe('action')
+    expect(action?.children).toHaveLength(1)
+
+    const nestedPipeline = action?.children[0]
+    expect(nestedPipeline?.kind).toBe('pipeline_node')
+    expect(nestedPipeline?.taskId).toBe(2)
+    expect(nestedPipeline?.children.map((item) => item.kind)).toEqual([
+      'recognition',
+      'action',
+      'wait_freezes',
+    ])
+    expect(nestedPipeline?.children[2]?.taskId).toBe(1)
+  })
+
   it('parents taskless foreign scopes under the active business scope from the same source', () => {
     const events: ProtocolEvent[] = [
       makeEvent({
diff --git a/packages/maa-log-parser/src/trace/reducer.ts b/packages/maa-log-parser/src/trace/reducer.ts
