Merge remote-tracking branch 'upstream/master' into fix/subprocess-password-scrub

2026-07-28 08:15:08 -07:00
parent f92389606e eb38a365dc
commit 8d77e5149c
628 changed files with 15274 additions and 6295 deletions
--- a/packages/ui/tui/src/chat/helpers.ts
+++ b/packages/ui/tui/src/chat/helpers.ts
@@ -99,7 +99,7 @@ export function activeToolCallIds(session: Session, active: ReadonlySet<number>)
  const ids = new Set<string>()
  for (const event of session.events) {
    if (event.type !== 'assistant/message' || !active.has(event.seq)) continue
-    for (const block of event.data.content) {
+    for (const block of event.data.message.content) {
      if (block.type === 'tool-call') ids.add(block.id)
    }
  }