-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Re-add markdown streaming #2029
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
6889a10
Revert "Revert "Streaming markdown (#1920)" (#1981)"
easong-openai eb6f811
better tests, approval UI fix
easong-openai e906e35
tests
easong-openai fd87fc1
fixtures, working pretty well
easong-openai 8f2ef81
fmt, clippy
easong-openai 44a7e01
cleanup
easong-openai b080dc9
refactor
easong-openai 39b04d7
pulling things out of chatwidget
easong-openai 8f187ed
cleanup
easong-openai ba3f13f
fmt, clippy
easong-openai 7ba2eda
merge
easong-openai eb29dd6
refactor?
easong-openai 194e735
cleanup?
easong-openai ffbab2b
tui tests: fix vt100_replay_binary_size_session_from_log\n- Use asser…
easong-openai 2c6c0a8
fix cutoff
easong-openai f170ed5
tui tests: fix clippy uninlined_format_args in chatwidget tests
easong-openai d855226
clippy
easong-openai 437709e
fmt
easong-openai 50be6fa
fmt
easong-openai 86d5e6a
fix ordering
easong-openai 4fca777
fmt
easong-openai 3b554c4
merge
easong-openai b689f2d
merge
easong-openai 7654edf
codespell
easong-openai 76c5d01
cleanup
easong-openai 79b4a2c
tui: make binary_size_transcript_matches_ideal_fixture robust to CI p…
easong-openai c984b13
cleanup
easong-openai 719de21
clippy
easong-openai 2e24c90
merge
easong-openai 5323cc7
windows
easong-openai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[codespell] | ||
# Ref: https://github.com/codespell-project/codespell#using-a-config-file | ||
skip = .git*,vendor,*-lock.yaml,*.lock,.codespellrc,*test.ts | ||
skip = .git*,vendor,*-lock.yaml,*.lock,.codespellrc,*test.ts,*.jsonl | ||
check-hidden = true | ||
ignore-regex = ^\s*"image/\S+": ".*|\b(afterAll)\b | ||
ignore-words-list = ratatui,ser |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,9 +90,11 @@ pub async fn wait_for_event_with_timeout<F>( | |
where | ||
F: FnMut(&codex_core::protocol::EventMsg) -> bool, | ||
{ | ||
use tokio::time::Duration; | ||
use tokio::time::timeout; | ||
loop { | ||
let ev = timeout(wait_time, codex.next_event()) | ||
// Allow a bit more time to accommodate async startup work (e.g. config IO, tool discovery) | ||
let ev = timeout(wait_time.max(Duration::from_secs(5)), codex.next_event()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we up the default above? |
||
.await | ||
.expect("timeout waiting for event") | ||
.expect("stream ended unexpectedly"); | ||
|
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
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
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
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
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
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
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
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
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this because we get multiple reasoning sections is a row?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or just because we don't want to track content_part -> Thinking transition?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need a way to affirmatively break between different parts of the summary presently so that we can make sure they get newlines. I also want it so that we can just show thinking headers in the UI, similar to how we show a summarized command view - this will be important for the next part of the UI overhaul.