fix: merge upstream/main + address review comments for PR #5141#23
Open
senamakel wants to merge 59 commits into
Open
fix: merge upstream/main + address review comments for PR #5141#23senamakel wants to merge 59 commits into
senamakel wants to merge 59 commits into
Conversation
…ble subagent sessions + persistent workflow proposals (tinyhumansai#5074)
…t resume, per-turn thinking hydration, seq envelope (tinyhumansai#5077)
…eature (tinyhumansai#5049) (tinyhumansai#5061) Co-authored-by: Steven Enamakel <31011319+senamakel@users.noreply.github.com>
…nscript (ChatThreadView) (tinyhumansai#5097)
…ansai#5091) Co-authored-by: Cursor <cursoragent@cursor.com>
…ai#4786) Co-authored-by: Sami Rusani <14844597+samrusani@users.noreply.github.com>
…inyhumansai#4772) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: binyangzhu000-sudo <224954946+binyangzhu000-sudo@users.noreply.github.com> Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…nsai#5103) Co-authored-by: Sami Rusani <14844597+samrusani@users.noreply.github.com>
…ting/http-server gates (tinyhumansai#5048) (tinyhumansai#5068)
…4929) (tinyhumansai#4998) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Steven Enamakel <31011319+senamakel@users.noreply.github.com> Co-authored-by: Cyrus Gray <144336577+graycyrus@users.noreply.github.com> Co-authored-by: oxoxDev <164490987+oxoxDev@users.noreply.github.com> Co-authored-by: YellowSnnowmann <167776381+YellowSnnowmann@users.noreply.github.com> Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai> Co-authored-by: CodeGhost21 <164498022+CodeGhost21@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: sanil-23 <sanil@tinyhumans.ai> Co-authored-by: M3gA-Mind <elvin@mahadao.com> Co-authored-by: oxoxDev <oxoxdev@users.noreply.github.com>
Co-authored-by: Sami Rusani <14844597+samrusani@users.noreply.github.com> Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…roval prompt (tinyhumansai#5094) Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…d profiling optimizations (tinyhumansai#5107)
…completes epic tinyhumansai#4795 (tinyhumansai#5029) Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…mpatible + redact API key from errors (tinyhumansai#5116) (tinyhumansai#5117)
- Resolved conflicts in Conversations.tsx:
- Kept supersededInterimIndexes import (used for backward-compat filtering)
- Removed unused buildThreadTimeline import
- Adopted upstream/main's ChatThreadView extraction (all agent insights
rendering already present in ChatThreadView)
- Added selectedInterruptedAssistant to hasLiveAgentActivity check
- ProcessingTranscriptView: fix div-in-span nesting for subagent blocks (CodeRabbit). Changed outer wrapper from <span> to <div> and inner subagent wrapper from <span> to <div>. - ProcessingTranscriptView: render raw tool result output for failed entries so tool output stays reachable in transcript mode (Codex). Matches the legacy row renderer's failure-only rule. - ChatThreadView: add supersededInterimIndexes filtering for backward- compat with old persisted interim narration messages. - payload_summarizer: add regression test for fall-through behaviour when no parent context is available, exercising the code path through invoke_with_events. Event contract (no TextDelta/ThinkingDelta) is pinned by invoke_with_events_emits_lifecycle_on_shared_sink in tinyagents crate.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes for tinyhumansai#5141:
Merge conflict resolution — merged upstream/main into the feature branch and resolved conflicts in Conversations.tsx (adopted upstream's ChatThreadView extraction).
ProcessingTranscriptView span nesting fix (CodeRabbit) — changed outer/inner spans to divs to fix invalid div-in-span nesting for subagent blocks.
Tool output reachability in transcript mode (Codex) — render raw tool result output for error entries in ProcessingTranscriptView's ToolRow.
payload_summarizer regression test (CodeRabbit) — added test for fall-through when no parent context available, exercising the invoke_with_events code path.
ChatThreadView backward-compat — added supersededInterimIndexes filtering for old persisted interim narration messages.