merge: reconcile latest main changes

This commit is contained in:
inman
2026-09-03 11:11:58 +08:00
parent 04320ddfd4
commit cdbc262802
10 changed files with 200 additions and 31 deletions

View File

@@ -811,7 +811,7 @@ test('hidden Conversation badge ignores process failures until interaction or ta
await emitCodingEvent(page, 'patch-batch', {
type: 'patch-batch',
conversationId: 'conversation-pi-second',
workerGeneration: 0,
workerGeneration: 1,
fromSeq: 1,
toSeq: 3,
items: [
@@ -864,7 +864,7 @@ test('hidden Conversation badge ignores process failures until interaction or ta
await emitCodingEvent(page, 'patch-batch', {
type: 'patch-batch',
conversationId: 'conversation-pi-second',
workerGeneration: 0,
workerGeneration: 1,
fromSeq: 4,
toSeq: 4,
items: [{
@@ -895,7 +895,7 @@ test('hidden Conversation badge ignores process failures until interaction or ta
await emitCodingEvent(page, 'patch-batch', {
type: 'patch-batch',
conversationId: 'conversation-pi-second',
workerGeneration: 0,
workerGeneration: 1,
fromSeq: 5,
toSeq: 5,
items: [{
@@ -913,7 +913,7 @@ test('hidden Conversation badge ignores process failures until interaction or ta
await emitCodingEvent(page, 'patch-batch', {
type: 'patch-batch',
conversationId: 'conversation-pi-second',
workerGeneration: 0,
workerGeneration: 1,
fromSeq: 6,
toSeq: 6,
items: [{