Skip to content

Commit 697f63d

Browse files
tellahonpub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w
andauthored
fix(sidebar): trim working badge label and name working agents in tooltip (#1408)
Signed-off-by: Taylor Ho <[email protected]> Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@sprout-oss.stage.blox.sqprod.co>
1 parent c444e34 commit 697f63d

6 files changed

Lines changed: 151 additions & 8 deletions

File tree

‎desktop/src/features/agents/activeAgentTurnsStore.test.mjs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,18 @@ describe("activeAgentTurnsStore", () => {
193193

194194
const summaries = getActiveTurnsByChannel();
195195
assert.deepEqual(
196-
summaries.map(({ channelId, agentCount }) => ({
196+
summaries.map(({ channelId, agentCount, agentPubkeys }) => ({
197197
channelId,
198198
agentCount,
199+
agentPubkeys,
199200
})),
200-
[{ channelId: "shared", agentCount: 2 }],
201+
[
202+
{
203+
channelId: "shared",
204+
agentCount: 2,
205+
agentPubkeys: [AGENT, AGENT_2],
206+
},
207+
],
201208
);
202209
assert.equal(
203210
summaries[0].anchorAt,

‎desktop/src/features/agents/activeAgentTurnsStore.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ export type ActiveChannelTurnSummary = {
4949
channelId: string;
5050
anchorAt: number;
5151
agentCount: number;
52+
agentPubkeys: string[];
53+
agentNames?: string[];
5254
};
5355

5456
// Module-level state: agentPubkey → turnId → ActiveTurn
@@ -478,6 +480,7 @@ export function getActiveTurnsByChannel(): ActiveChannelTurnSummary[] {
478480
channelId,
479481
anchorAt: summary.anchorAt,
480482
agentCount: summary.agentPubkeys.size,
483+
agentPubkeys: [...summary.agentPubkeys].sort(),
481484
}))
482485
.sort((a, b) => a.channelId.localeCompare(b.channelId));
483486
cachedChannelTurnSummaries = result;
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import assert from "node:assert/strict";
2+
import { describe, it } from "node:test";
3+
4+
import { resolveActiveWorkingChannelNames } from "./useActiveWorkingChannelsById.ts";
5+
6+
describe("resolveActiveWorkingChannelNames", () => {
7+
it("resolves active agent pubkeys to managed agent names", () => {
8+
const resolved = resolveActiveWorkingChannelNames(
9+
{
10+
channelId: "chan-1",
11+
anchorAt: 0,
12+
agentCount: 2,
13+
agentPubkeys: ["AAAA", "bbbb"],
14+
},
15+
[
16+
{ pubkey: "aaaa", name: "Ned" },
17+
{ pubkey: "BBBB", name: "Bart" },
18+
],
19+
);
20+
21+
assert.deepEqual(resolved.agentNames, ["Ned", "Bart"]);
22+
});
23+
24+
it("omits unresolved active agents from the resolved names", () => {
25+
const resolved = resolveActiveWorkingChannelNames(
26+
{
27+
channelId: "chan-1",
28+
anchorAt: 0,
29+
agentCount: 2,
30+
agentPubkeys: ["AAAA", "cccc"],
31+
},
32+
[{ pubkey: "aaaa", name: "Ned" }],
33+
);
34+
35+
assert.deepEqual(resolved.agentNames, ["Ned"]);
36+
});
37+
});

‎desktop/src/features/sidebar/lib/useActiveWorkingChannelsById.ts‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@ import {
77
} from "@/features/agents/activeAgentTurnsStore";
88
import { useManagedAgentsQuery } from "@/features/agents/hooks";
99
import { useManagedAgentObserverBridge } from "@/features/agents/observerRelayStore";
10+
import { normalizePubkey } from "@/shared/lib/pubkey";
11+
12+
export function resolveActiveWorkingChannelNames(
13+
summary: ActiveChannelTurnSummary,
14+
managedAgents: readonly { pubkey: string; name: string }[],
15+
): ActiveChannelTurnSummary {
16+
const namesByPubkey = new Map(
17+
managedAgents.map((agent) => [normalizePubkey(agent.pubkey), agent.name]),
18+
);
19+
20+
return {
21+
...summary,
22+
agentNames: summary.agentPubkeys.flatMap((pubkey) => {
23+
const name = namesByPubkey.get(normalizePubkey(pubkey));
24+
return name ? [name] : [];
25+
}),
26+
};
27+
}
1028

1129
export function useActiveWorkingChannelsById(): ReadonlyMap<
1230
string,
@@ -25,8 +43,14 @@ export function useActiveWorkingChannelsById(): ReadonlyMap<
2543
return React.useMemo(
2644
() =>
2745
new Map(
28-
activeWorkingChannels.map((summary) => [summary.channelId, summary]),
46+
activeWorkingChannels.map((summary) => {
47+
const resolvedSummary = resolveActiveWorkingChannelNames(
48+
summary,
49+
managedAgents,
50+
);
51+
return [resolvedSummary.channelId, resolvedSummary];
52+
}),
2953
),
30-
[activeWorkingChannels],
54+
[activeWorkingChannels, managedAgents],
3155
);
3256
}
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import assert from "node:assert/strict";
2+
import { describe, it } from "node:test";
3+
4+
import { formatWorkingTooltip } from "./SidebarSection.tsx";
5+
6+
function summary(agentNames, agentCount = agentNames.length) {
7+
return {
8+
channelId: "chan-1",
9+
anchorAt: 0,
10+
agentCount,
11+
agentPubkeys: Array.from(
12+
{ length: agentCount },
13+
(_, index) => `agent-${index}-pubkey`,
14+
),
15+
agentNames,
16+
};
17+
}
18+
19+
describe("formatWorkingTooltip", () => {
20+
it("names one known agent", () => {
21+
assert.equal(formatWorkingTooltip(summary(["Ned"])), "Ned working");
22+
});
23+
24+
it("names one known agent and counts one additional agent", () => {
25+
assert.equal(
26+
formatWorkingTooltip(summary(["Ned", "Bart"])),
27+
"Ned and 1 agent working",
28+
);
29+
});
30+
31+
it("names one known agent and counts multiple additional agents", () => {
32+
assert.equal(
33+
formatWorkingTooltip(summary(["Ned", "Bart", "Carl"])),
34+
"Ned and 2 agents working",
35+
);
36+
});
37+
38+
it("uses a singular count when all agents are unknown", () => {
39+
assert.equal(formatWorkingTooltip(summary([], 1)), "1 agent working");
40+
});
41+
42+
it("uses a plural count when all agents are unknown", () => {
43+
assert.equal(formatWorkingTooltip(summary([], 3)), "3 agents working");
44+
});
45+
46+
it("counts unknown agents with the named lead", () => {
47+
assert.equal(
48+
formatWorkingTooltip(summary(["Ned"], 3)),
49+
"Ned and 2 agents working",
50+
);
51+
});
52+
});

‎desktop/src/features/sidebar/ui/SidebarSection.tsx‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,27 @@ function UnreadDotBadge({
9999
);
100100
}
101101

102+
function formatAgentCount(count: number) {
103+
return `${count} ${count === 1 ? "agent" : "agents"}`;
104+
}
105+
106+
export function formatWorkingTooltip(
107+
summary: ActiveChannelTurnSummary,
108+
): string {
109+
const leadName = summary.agentNames?.[0];
110+
111+
if (!leadName) {
112+
return `${formatAgentCount(summary.agentCount)} working`;
113+
}
114+
115+
const remainingAgentCount = summary.agentCount - 1;
116+
if (remainingAgentCount <= 0) {
117+
return `${leadName} working`;
118+
}
119+
120+
return `${leadName} and ${formatAgentCount(remainingAgentCount)} working`;
121+
}
122+
102123
function ChannelWorkingBadge({
103124
channelName,
104125
isActive,
@@ -111,9 +132,8 @@ function ChannelWorkingBadge({
111132
const now = useNow(1000);
112133
const elapsed = formatElapsed(now - summary.anchorAt);
113134
const label =
114-
summary.agentCount > 1
115-
? `${summary.agentCount} working · ${elapsed}`
116-
: `Working · ${elapsed}`;
135+
summary.agentCount > 1 ? `${elapsed} (${summary.agentCount})` : elapsed;
136+
const title = formatWorkingTooltip(summary);
117137

118138
return (
119139
<span
@@ -124,7 +144,7 @@ function ChannelWorkingBadge({
124144
: "bg-primary/10 text-primary",
125145
)}
126146
data-testid={`channel-working-${channelName}`}
127-
title={label}
147+
title={title}
128148
>
129149
{label}
130150
</span>

0 commit comments

Comments
 (0)