Repository navigation
fix(web): background work line reads "Running in background <name>" and quiets Stop #26656
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
Open
SunkenInTime
wants to merge
8
commits into
pingdotgg:main
Choose a base branch
from
SunkenInTime:t3/improve-bg-command-ui
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+130
−53
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
bedf95b
fix(web): background command line leads with its name and quiets Stop
SunkenInTime f9233a4
fix(web): a long background command name no longer hides its running …
SunkenInTime 0dd2985
fix(web): background work line reads "Running in background <name>"
SunkenInTime 0ec4974
fix(web): background work line sits right under the message
SunkenInTime 1e24c81
Merge remote-tracking branch 'origin/main' into t3/improve-bg-command-ui
SunkenInTime 0e77985
fix(web): message actions stay on the message when other messages wai…
SunkenInTime fc781a0
chore: merge main into background command ui
maria-rcks d08ed96
fix(web): place trailing response actions below background work
maria-rcks 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
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 | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -77,6 +77,7 @@ import { useAssistantCitationTarget } from "./useAssistantCitationTarget"; | |||||||||||||||||||||||||||||||||
| import { worktreeSetupAgentStarted } from "@t3tools/client-runtime/worktree-setup"; | ||||||||||||||||||||||||||||||||||
| import { resolveCitationPhase, type CitedHistory } from "./citationProcedure"; | ||||||||||||||||||||||||||||||||||
| import { | ||||||||||||||||||||||||||||||||||
| assistantMetaRow, | ||||||||||||||||||||||||||||||||||
| resolveTimelineIsAtEnd, | ||||||||||||||||||||||||||||||||||
| resolveTimelineMinimapHasPersistentGutter, | ||||||||||||||||||||||||||||||||||
| resolveTimelineMinimapCurrentIndex, | ||||||||||||||||||||||||||||||||||
|
|
@@ -238,6 +239,8 @@ interface MessagesTimelineProps { | |||||||||||||||||||||||||||||||||
| /** Which request is waiting, so a second one of the same kind is announced too. */ | ||||||||||||||||||||||||||||||||||
| awaitingRequestId?: string | null; | ||||||||||||||||||||||||||||||||||
| footer?: ReactNode; | ||||||||||||||||||||||||||||||||||
| /** The footer continues the last message, so that message's actions follow it. */ | ||||||||||||||||||||||||||||||||||
| footerContinuesMessage?: boolean; | ||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||
| listRef: React.RefObject<LegendListRef | null>; | ||||||||||||||||||||||||||||||||||
| timelineEntries: ReadonlyArray<TimelineEntry>; | ||||||||||||||||||||||||||||||||||
|
|
@@ -341,6 +344,7 @@ const ConversationTimeline = memo(function ConversationTimeline({ | |||||||||||||||||||||||||||||||||
| activeTurnStartedAt = null, | ||||||||||||||||||||||||||||||||||
| worktreeSetup = null, | ||||||||||||||||||||||||||||||||||
| footer = null, | ||||||||||||||||||||||||||||||||||
| footerContinuesMessage = false, | ||||||||||||||||||||||||||||||||||
| onCancelWorktreeSetup, | ||||||||||||||||||||||||||||||||||
| retryableWorkspacePreparationRunIds = EMPTY_RUN_IDS, | ||||||||||||||||||||||||||||||||||
| onRetryWorkspacePreparation, | ||||||||||||||||||||||||||||||||||
|
|
@@ -693,6 +697,26 @@ const ConversationTimeline = memo(function ConversationTimeline({ | |||||||||||||||||||||||||||||||||
| worktreeSetup, | ||||||||||||||||||||||||||||||||||
| }); | ||||||||||||||||||||||||||||||||||
| const rows = useStableRows(rawRows, listIdentityKey); | ||||||||||||||||||||||||||||||||||
| const lastRow = rows.at(-1); | ||||||||||||||||||||||||||||||||||
| // A message reserves an invisible hover row for its actions, which would hold the footer away. | ||||||||||||||||||||||||||||||||||
| const messageBeforeFooter = | ||||||||||||||||||||||||||||||||||
| footerContinuesMessage && | ||||||||||||||||||||||||||||||||||
| lastRow?.kind === "message" && | ||||||||||||||||||||||||||||||||||
| lastRow.message.role === "assistant" && | ||||||||||||||||||||||||||||||||||
| lastRow.showAssistantMeta | ||||||||||||||||||||||||||||||||||
| ? lastRow | ||||||||||||||||||||||||||||||||||
| : null; | ||||||||||||||||||||||||||||||||||
| const messageBeforeFooterRow = messageBeforeFooter && { | ||||||||||||||||||||||||||||||||||
| ...messageBeforeFooter, | ||||||||||||||||||||||||||||||||||
| showAssistantMeta: false, | ||||||||||||||||||||||||||||||||||
| showAssistantCopyButton: false, | ||||||||||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||||||||||
|
Comment on lines
+709
to
+713
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. Note 🤖 gpt-6.1-sol responding on behalf of vycdev Reuse the trailing
Suggested change
|
||||||||||||||||||||||||||||||||||
| const metaAfterFooter = | ||||||||||||||||||||||||||||||||||
| footerContinuesMessage && lastRow?.kind === "assistant-meta" | ||||||||||||||||||||||||||||||||||
| ? lastRow | ||||||||||||||||||||||||||||||||||
| : messageBeforeFooter | ||||||||||||||||||||||||||||||||||
| ? assistantMetaRow(messageBeforeFooter, messageBeforeFooter.message.updatedAt) | ||||||||||||||||||||||||||||||||||
| : null; | ||||||||||||||||||||||||||||||||||
| const matchedApprovalRequestIds = new Set<string>(); | ||||||||||||||||||||||||||||||||||
| for (const row of pendingApprovalRequestIds.size > 0 ? rows : []) { | ||||||||||||||||||||||||||||||||||
| const entries = | ||||||||||||||||||||||||||||||||||
|
|
@@ -1244,19 +1268,36 @@ const ConversationTimeline = memo(function ConversationTimeline({ | |||||||||||||||||||||||||||||||||
| data-timeline-root="true" | ||||||||||||||||||||||||||||||||||
| > | ||||||||||||||||||||||||||||||||||
| <AudioPreviewUnmountContext value={onAudioUnmount}> | ||||||||||||||||||||||||||||||||||
| <TimelineRowContent row={item} /> | ||||||||||||||||||||||||||||||||||
| {item.kind === "assistant-meta" && item.id === metaAfterFooter?.id ? null : ( | ||||||||||||||||||||||||||||||||||
| <TimelineRowContent | ||||||||||||||||||||||||||||||||||
| row={item.id === messageBeforeFooterRow?.id ? messageBeforeFooterRow : item} | ||||||||||||||||||||||||||||||||||
| /> | ||||||||||||||||||||||||||||||||||
| )} | ||||||||||||||||||||||||||||||||||
| </AudioPreviewUnmountContext> | ||||||||||||||||||||||||||||||||||
| </div> | ||||||||||||||||||||||||||||||||||
| </div> | ||||||||||||||||||||||||||||||||||
| </TimelineRowCtx> | ||||||||||||||||||||||||||||||||||
| ); | ||||||||||||||||||||||||||||||||||
| const listExtraData = { identity: listIdentityKey, rowCount: rows.length, sharedState }; | ||||||||||||||||||||||||||||||||||
| const listExtraData = { | ||||||||||||||||||||||||||||||||||
| identity: listIdentityKey, | ||||||||||||||||||||||||||||||||||
| rowCount: rows.length, | ||||||||||||||||||||||||||||||||||
| sharedState, | ||||||||||||||||||||||||||||||||||
| messageBeforeFooterRow, | ||||||||||||||||||||||||||||||||||
| metaAfterFooter, | ||||||||||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||||||||||
| const timelineListFooter = ( | ||||||||||||||||||||||||||||||||||
| <TimelineListFooter | ||||||||||||||||||||||||||||||||||
| composerInset={anchoredEndSpace ? 0 : contentInsetEndAdjustment} | ||||||||||||||||||||||||||||||||||
| onGrow={onFooterGrow} | ||||||||||||||||||||||||||||||||||
| > | ||||||||||||||||||||||||||||||||||
| {footer} | ||||||||||||||||||||||||||||||||||
| {metaAfterFooter ? ( | ||||||||||||||||||||||||||||||||||
| <TimelineRowCtx value={sharedState}> | ||||||||||||||||||||||||||||||||||
| <div className="chat-content-lane"> | ||||||||||||||||||||||||||||||||||
| <AssistantMetaTimelineRow row={metaAfterFooter} /> | ||||||||||||||||||||||||||||||||||
| </div> | ||||||||||||||||||||||||||||||||||
| </TimelineRowCtx> | ||||||||||||||||||||||||||||||||||
| ) : null} | ||||||||||||||||||||||||||||||||||
| {unmatchedPendingApprovals.length > 0 ? ( | ||||||||||||||||||||||||||||||||||
| <TimelineRowCtx value={sharedState}> | ||||||||||||||||||||||||||||||||||
| <div className="messages-timeline-row-frame"> | ||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||
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
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.
Uh oh!
There was an error while loading. Please reload this page.