Skip to content

feat: adjust order of agent status and text box #2447

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.

Sign up for GitHub

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

Closed
alexhancock wants to merge 2 commits into from
+60 −67
Closed

feat: adjust order of agent status and text box #2447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5690062
feat: adjust order of agent status and text box
alexhancock Jul 22, 2026
86716b3
fix(desktop): realign composer overlay masks and E2E after status reo…
alexhancock Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 32 additions & 33 deletions desktop/src/features/channels/ui/ChannelPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ export const ChannelPane = React.memo(function ChannelPane({
isSending;
const knownAgentPubkeys = React.useMemo(() => {
const pubkeys = new Set<string>();

for (const pubkey of agentPubkeys ?? []) {
pubkeys.add(pubkey.toLowerCase());
}
Expand All @@ -332,14 +331,12 @@ export const ChannelPane = React.memo(function ChannelPane({
for (const agent of activityAgents) {
pubkeys.add(agent.pubkey.toLowerCase());
}

return pubkeys;
}, [activityAgents, agentPubkeys, agentSessionAgents]);
const completeWelcomeComposerBanner = React.useCallback(() => {
if (!activeChannelId || !isActiveWelcomeChannel) {
return;
}

clearWelcomeComposerDismissTimer();
completedWelcomeBannerChannelIdsRef.current.add(activeChannelId);
setWelcomeComposerBannerState("complete");
Expand Down Expand Up @@ -748,11 +745,42 @@ export const ChannelPane = React.memo(function ChannelPane({
/>
</div>
) : null}
{hasComposerBotActivity || hasTypingActivity ? (
<div
className="min-h-8 overflow-visible bg-background px-5 pb-0 pt-1.5"
data-testid="channel-composer-activity-row"
>
<div className="flex h-full w-full items-center gap-2 overflow-visible">
{hasComposerBotActivity ? (
<div className="flex min-w-0 flex-1 overflow-visible">
<BotActivityComposerAction
agents={activityAgents}
channelId={activeChannel?.id ?? null}
onOpenAgentSession={onOpenAgentSession}
openAgentSessionPubkey={openAgentSessionPubkey}
profiles={profiles}
workingBotPubkeys={composerWorkingBotPubkeys}
variant="inline"
/>
</div>
) : null}
{hasTypingActivity ? (
<TypingIndicatorRow
channel={activeChannel}
className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
currentPubkey={currentPubkey}
profiles={profiles}
typingPubkeys={typingPubkeys}
/>
) : null}
</div>
</div>
) : null}
<MessageComposer
channelId={activeChannel?.id ?? null}
channelName={activeChannel?.name ?? "channel"}
channelType={activeChannel?.channelType ?? null}
containerClassName="px-5"
containerClassName="px-5 pb-5"
disabled={isComposerDisabled}
editTarget={mainEditTarget}
autoSubmitDraftKey={autoSendDraftKey}
Expand Down Expand Up @@ -787,35 +815,6 @@ export const ChannelPane = React.memo(function ChannelPane({
}
showTopBorder={false}
/>
<div
className="min-h-8 overflow-visible bg-background px-5 pb-1.5 pt-0"
data-testid="channel-composer-activity-row"
>
<div className="flex h-full w-full items-center gap-2 overflow-visible">
{hasComposerBotActivity ? (
<div className="flex min-w-0 flex-1 overflow-visible">
<BotActivityComposerAction
agents={activityAgents}
channelId={activeChannel?.id ?? null}
onOpenAgentSession={onOpenAgentSession}
openAgentSessionPubkey={openAgentSessionPubkey}
profiles={profiles}
workingBotPubkeys={composerWorkingBotPubkeys}
variant="inline"
/>
</div>
) : null}
{hasTypingActivity ? (
<TypingIndicatorRow
channel={activeChannel}
className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
currentPubkey={currentPubkey}
profiles={profiles}
typingPubkeys={typingPubkeys}
/>
) : null}
</div>
</div>
</div>
</div>
)}
Expand Down
52 changes: 27 additions & 25 deletions desktop/src/features/messages/ui/MessageThreadPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,32 @@ export function MessageThreadPanel({
hasConstrainedColumn ? { maxWidth: columnMaxWidthPx } : undefined
}
>
{toolbarExtraActions || threadTypingPubkeys.length > 0 ? (
<div
className={cn(
"min-h-8 bg-background pb-0 pt-1.5",
THREAD_PANEL_COMPOSER_GUTTER_CLASS,
)}
>
<div className="mx-auto flex h-full w-full max-w-4xl items-center gap-2 overflow-visible">
{toolbarExtraActions ? (
<div className="flex min-w-0 flex-1 overflow-visible">
{toolbarExtraActions}
</div>
) : null}
{threadTypingPubkeys.length > 0 ? (
<TypingIndicatorRow
channel={channel}
className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
currentPubkey={currentPubkey}
profiles={profiles}
typingPubkeys={threadTypingPubkeys}
variant="activity"
/>
) : null}
</div>
</div>
) : null}
<MessageComposer
audienceContext={{
type: "thread",
Expand All @@ -832,7 +858,7 @@ export function MessageThreadPanel({
channelId={channelId}
channelName={channelName}
channelType={channel?.channelType ?? null}
containerClassName={THREAD_PANEL_COMPOSER_GUTTER_CLASS}
containerClassName={cn(THREAD_PANEL_COMPOSER_GUTTER_CLASS, "pb-5")}
disabled={disabled || isSending || !channelId}
draftKey={`thread:${threadHead.id}`}
autoSubmitDraftKey={autoSendDraftKey}
Expand All @@ -851,30 +877,6 @@ export function MessageThreadPanel({
typingParentEventId={threadHead.id}
typingRootEventId={threadHead.rootId}
/>
<div
className={cn(
"min-h-8 bg-background pb-1.5 pt-0",
THREAD_PANEL_COMPOSER_GUTTER_CLASS,
)}
>
<div className="mx-auto flex h-full w-full max-w-4xl items-center gap-2 overflow-visible">
{toolbarExtraActions ? (
<div className="flex min-w-0 flex-1 overflow-visible">
{toolbarExtraActions}
</div>
) : null}
{threadTypingPubkeys.length > 0 ? (
<TypingIndicatorRow
channel={channel}
className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
currentPubkey={currentPubkey}
profiles={profiles}
typingPubkeys={threadTypingPubkeys}
variant="activity"
/>
) : null}
</div>
</div>
</div>
</div>
</>
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/shared/styles/globals/composer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.composer-overlay-corner-masks::before,
.composer-overlay-corner-masks::after {
position: absolute;
bottom: 2.5rem;
bottom: 1.25rem;
z-index: 0;
width: 1rem;
height: 1rem;
Expand Down
8 changes: 0 additions & 8 deletions desktop/tests/e2e/channels.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1740,14 +1740,6 @@ test("channel date divider keeps the date sticky while the separator rule scroll
"backdrop-filter",
"none",
);
const composerActivityRow = composerOverlay.getByTestId(
"channel-composer-activity-row",
);
await expect(composerActivityRow).toHaveCSS("backdrop-filter", "none");
await expect(composerActivityRow).not.toHaveCSS(
"background-color",
"rgba(0, 0, 0, 0)",
);
await expect
.poll(async () => {
const composerOverlayZIndex = await page
Expand Down
Loading