The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(desktop): gateway group chats show which bot is working again
Teknium94fea0af0057
diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-activity.tsx b/apps/desktop/src/plugins/hermes-bots/canonical-group-activity.tsxnew file mode 100644index 00000000000..7c9f7ed9763--- /dev/null+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-activity.tsx@@ -0,0 +1,68 @@+import { GlyphSpinner } from '@hermes/plugin-sdk'++import type { CanonicalRoomMember } from './canonical-groups'++/** `groups.state` driver fields that say who is answering. */+export interface CanonicalDriverActivity {+ working?: boolean+ member_activity?: { member_id: string; status: string }[]+}++export type CanonicalMemberPhase = 'queued' | 'working'++interface ActivityLabels {+ groupWorking: string+ memberQueued: string+ memberWorking: string+}++const memberName = (member: CanonicalRoomMember) => member.display_name || member.handle || member.member_id++/** One phase per member: a running (or stopping) task outranks one still queued behind it. */+export function canonicalMemberPhases(driver?: CanonicalDriverActivity): Map<string, CanonicalMemberPhase> {+ const phases = new Map<string, CanonicalMemberPhase>()++ for (const { member_id, status } of driver?.member_activity ?? []) {+ if (status !== 'queued') {+ phases.set(member_id, 'working')+ } else if (!phases.has(member_id)) {+ phases.set(member_id, 'queued')+ }+ }++ return phases+}++export function CanonicalGroupRoster({ members = [], label, labels, phases }: {+ members?: CanonicalRoomMember[]; label: string; labels: ActivityLabels; phases: Map<string, CanonicalMemberPhase>+}) {+ if (!members.length) {return null}++ return <ul aria-label={label} className="flex flex-wrap gap-x-2 text-xs text-(--ui-text-tertiary)">+ {members.map(member => {+ const phase = phases.get(member.member_id)++ return <li className="inline-flex items-center gap-1" data-phase={phase ?? 'idle'} key={member.member_id}>+ {phase === 'working' && <GlyphSpinner ariaLabel={labels.memberWorking} className="text-(--ui-accent)" />}+ <span className={phase === 'working' ? 'text-(--ui-text-secondary)' : undefined}>{memberName(member)}</span>+ {phase === 'queued' && <span className="text-(--ui-text-quaternary)">· {labels.memberQueued}</span>}+ </li>+ })}+ </ul>+}++/** The room's live line under the log; older gateways without `member_activity` still say the group is working. */+export function CanonicalGroupWorkingLine({ driver, members = [], labels, phases }: {+ driver?: CanonicalDriverActivity; members?: CanonicalRoomMember[]; labels: ActivityLabels+ phases: Map<string, CanonicalMemberPhase>+}) {+ const working = members.filter(member => phases.get(member.member_id) === 'working').map(memberName)++ if (!working.length && !driver?.working) {return null}++ return <div className="flex items-center gap-1.5 px-2 py-1 text-[0.7rem] italic text-(--ui-text-quaternary)" role="status">+ {/* The line is the live region; the spinner's own status role would nest a second one. */}+ <span aria-hidden="true"><GlyphSpinner className="not-italic" /></span>+ <span>{working.length ? `${labels.memberWorking}: ${working.join(', ')}` : labels.groupWorking}</span>+ </div>+}diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-locales.ts b/apps/desktop/src/plugins/hermes-bots/canonical-group-locales.tsindex ac4d53fd5ca..1d653d1c597 100644--- a/apps/desktop/src/plugins/hermes-bots/canonical-group-locales.ts+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-locales.ts@@ -25,6 +25,9 @@ export interface CanonicalGroupMessages {attachFiles: stringremoveAttachment: stringuploadFailed: string+ memberWorking: string+ memberQueued: string+ groupWorking: string}export const CANONICAL_GROUP_LOCALES = {@@ -54,7 +57,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'Group message',attachFiles: 'Attach files',removeAttachment: 'Remove attachment',- uploadFailed: 'Upload failed'+ uploadFailed: 'Upload failed',+ memberWorking: 'Working',+ memberQueued: 'Queued',+ groupWorking: 'The group is working…'},ja: {roomStopped: 'グループが停止しました',@@ -82,7 +88,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'グループメッセージ',attachFiles: 'ファイルを添付',removeAttachment: '添付ファイルを削除',- uploadFailed: 'アップロードに失敗しました'+ uploadFailed: 'アップロードに失敗しました',+ memberWorking: '作業中',+ memberQueued: '待機中',+ groupWorking: 'グループが作業中です…'},zh: {roomStopped: '群组已停止',@@ -110,7 +119,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: '群组消息',attachFiles: '附加文件',removeAttachment: '移除附件',- uploadFailed: '上传失败'+ uploadFailed: '上传失败',+ memberWorking: '工作中',+ memberQueued: '排队中',+ groupWorking: '群组正在处理…'},'zh-hant': {roomStopped: '群組已停止',@@ -138,7 +150,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: '群組訊息',attachFiles: '附加檔案',removeAttachment: '移除附件',- uploadFailed: '上傳失敗'+ uploadFailed: '上傳失敗',+ memberWorking: '工作中',+ memberQueued: '排隊中',+ groupWorking: '群組正在處理…'},ar: {roomStopped: 'أُوقفت المجموعة',@@ -166,7 +181,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'رسالة المجموعة',attachFiles: 'إرفاق ملفات',removeAttachment: 'إزالة المرفق',- uploadFailed: 'فشل الرفع'+ uploadFailed: 'فشل الرفع',+ memberWorking: 'يعمل',+ memberQueued: 'في الانتظار',+ groupWorking: 'المجموعة تعمل…'},ru: {roomStopped: 'Группа остановлена',@@ -197,7 +215,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'Сообщение группе',attachFiles: 'Прикрепить файлы',removeAttachment: 'Удалить вложение',- uploadFailed: 'Не удалось загрузить файл'+ uploadFailed: 'Не удалось загрузить файл',+ memberWorking: 'Работает',+ memberQueued: 'В очереди',+ groupWorking: 'Группа работает…'},fr: {roomStopped: 'Groupe arrêté',@@ -227,7 +248,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'Message de groupe',attachFiles: 'Joindre des fichiers',removeAttachment: 'Retirer la pièce jointe',- uploadFailed: 'Échec du téléversement'+ uploadFailed: 'Échec du téléversement',+ memberWorking: 'En cours',+ memberQueued: 'En attente',+ groupWorking: 'Le groupe travaille…'},de: {roomStopped: 'Gruppe angehalten',@@ -258,7 +282,10 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'Gruppennachricht',attachFiles: 'Dateien anhängen',removeAttachment: 'Anhang entfernen',- uploadFailed: 'Hochladen fehlgeschlagen'+ uploadFailed: 'Hochladen fehlgeschlagen',+ memberWorking: 'Arbeitet',+ memberQueued: 'In der Warteschlange',+ groupWorking: 'Die Gruppe arbeitet…'},es: {roomStopped: 'Grupo detenido',@@ -288,6 +315,9 @@ export const CANONICAL_GROUP_LOCALES = {groupMessage: 'Mensaje de grupo',attachFiles: 'Adjuntar archivos',removeAttachment: 'Quitar adjunto',- uploadFailed: 'Error al subir'+ uploadFailed: 'Error al subir',+ memberWorking: 'Trabajando',+ memberQueued: 'En cola',+ groupWorking: 'El grupo está trabajando…'}} satisfies Record<string, CanonicalGroupMessages>diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.test.tsx b/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.test.tsxindex 978085c5326..3e8192386a7 100644--- a/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.test.tsx+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.test.tsx@@ -174,3 +174,29 @@ it('a Send that converges on another window\'s pending intent keeps this window\await waitFor(() => expect((screen.getByRole('textbox') as HTMLTextAreaElement).value).toBe('typed here'))expect((screen.getByRole('textbox') as HTMLTextAreaElement).disabled).toBe(false)})++it('shows which bots are working, and still says the group is working on a gateway without member activity', async () => {+ const members = [{ member_id: 'ops', profile: 'ops', handle: 'ops', display_name: 'Ops' },+ { member_id: 'qa', profile: 'qa', handle: 'qa', display_name: 'QA' }]++ let driver: Record<string, unknown> = { working: true, member_activity: [+ { member_id: 'qa', status: 'queued' }, { member_id: 'ops', status: 'running' }, { member_id: 'ops', status: 'queued' }] }++ request.mockImplementation(async (_route, method) => method === 'groups.state'+ ? { room: { name: 'Room', members }, driver_status: driver } : method === 'groups.log' ? { events: [] } : {})+ const view = render(<CanonicalGroupWorkspace binding={{ connectionId: 'local', profile: 'team', roomId: 'busy' }} />)+ await waitFor(() => expect(screen.getByRole('status').textContent).toBe('Working: Ops'))+ const phase = (name: string) => screen.getByText(name).closest('li')?.getAttribute('data-phase')+ expect([phase('Ops'), phase('QA')]).toEqual(['working', 'queued'])++ view.unmount()+ driver = { working: true }+ render(<CanonicalGroupWorkspace binding={{ connectionId: 'local', profile: 'team', roomId: 'older' }} />)+ await waitFor(() => expect(screen.getByRole('status').textContent).toBe('The group is working…'))++ cleanup()+ driver = { working: false, member_activity: [] }+ render(<CanonicalGroupWorkspace binding={{ connectionId: 'local', profile: 'team', roomId: 'idle' }} />)+ await waitFor(() => expect(screen.getByText('Ops').closest('li')?.getAttribute('data-phase')).toBe('idle'))+ expect(screen.queryByRole('status')).toBeNull()+})diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.tsx b/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.tsxindex 374f688adf5..ebd59872eac 100644--- a/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.tsx+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-workspace.tsx@@ -1,29 +1,22 @@import { Button, Textarea } from '@hermes/plugin-sdk'import { useEffect, useRef, useState } from 'react'+import { type CanonicalDriverActivity, CanonicalGroupRoster, CanonicalGroupWorkingLine, canonicalMemberPhases } from './canonical-group-activity'import { CanonicalGroupAttachments } from './canonical-group-attachments'import { type CanonicalGroupEvent, CanonicalGroupHistory } from './canonical-group-history'import { useCanonicalGroupLabels } from './canonical-group-labels'import { prepareCanonicalGroupSend, readCanonicalGroupSend, retireCanonicalGroupSend } from './canonical-group-send'import type { PreparedCanonicalGroupSend } from './canonical-group-send'import { actCanonicalGroup, canonicalGroupRequest } from './canonical-groups'-import type { CanonicalGroupBinding, CanonicalPendingAction, CanonicalRoom, CanonicalRoomMember } from './canonical-groups'+import type { CanonicalGroupBinding, CanonicalPendingAction, CanonicalRoom } from './canonical-groups'type RoomEvent = CanonicalGroupEventinterface Attachment { attachment_id?: string; event_id?: string; kind: string; name: string; mime: string; size?: number }-interface RoomState { room: CanonicalRoom; driver_status?: { pending_actions?: CanonicalPendingAction[] } }+interface RoomState { room: CanonicalRoom; driver_status?: CanonicalDriverActivity & { pending_actions?: CanonicalPendingAction[] } }const sameGroupPayload = (payload: Record<string, unknown>, text: string, attachments: Attachment[]) =>payload.text === text && JSON.stringify(payload.attachments ?? []) === JSON.stringify(attachments)-function CanonicalGroupRoster({ members = [], label }: { members?: CanonicalRoomMember[]; label: string }) {- if (!members.length) {return null}-- return <ul aria-label={label} className="flex flex-wrap gap-x-2 text-xs text-(--ui-text-tertiary)">- {members.map(member => <li key={member.member_id}>{member.display_name || member.handle || member.member_id}</li>)}- </ul>-}-export function CanonicalGroupWorkspace({ binding, visible = true, onBack }: {binding: CanonicalGroupBinding; visible?: boolean; onBack?: () => void}) {@@ -163,13 +156,14 @@ function CanonicalRoomView({ binding: initialBinding, visible, onBack }: {mutate(() => actCanonicalGroup(binding, action, choice))const composerLocked = !restored || busy || !!pending+ const phases = canonicalMemberPhases(state?.driver_status)return <section className="flex h-full min-h-0 flex-col gap-3 p-3"><header className="flex items-center gap-2">{onBack && <Button onClick={onBack}>{labels.back}</Button>}<div className="min-w-0"><h2 className="text-sm font-medium">{state?.room.name || labels.loadingGroup}</h2>- <CanonicalGroupRoster label={labels.members} members={state?.room.members} />+ <CanonicalGroupRoster label={labels.members} labels={labels} members={state?.room.members} phases={phases} /></div><Button disabled={busy || !state?.driver_status} onClick={() => void mutate(() => canonicalGroupRequest(binding, 'groups.stop', { room_id: binding.roomId, cancel_id: crypto.randomUUID() }))}>{labels.stop}</Button></header>@@ -178,6 +172,7 @@ function CanonicalRoomView({ binding: initialBinding, visible, onBack }: {{state && !state.driver_status && <p>{labels.driverUnavailable}</p>}<div className="min-h-0 flex-1 overflow-auto" role="log"><CanonicalGroupHistory binding={binding} disabled={!visible} events={events} members={state?.room.members} />+ <CanonicalGroupWorkingLine driver={state?.driver_status} labels={labels} members={state?.room.members} phases={phases} /></div>{(state?.driver_status?.pending_actions || []).map(action => <div className="flex items-center gap-2" key={`${action.kind}:${action.task_id}:${action.execution_generation}`}><span>{action.member_id}</span>diff --git a/apps/desktop/src/plugins/hermes-bots/group-test-utils.ts b/apps/desktop/src/plugins/hermes-bots/group-test-utils.tsindex 87a93201ae1..e0e45413f7f 100644--- a/apps/desktop/src/plugins/hermes-bots/group-test-utils.ts+++ b/apps/desktop/src/plugins/hermes-bots/group-test-utils.ts@@ -470,6 +470,7 @@ export async function pluginSdkMock(host: Record<string, unknown>) {computed: nanostores.computed,createBudgetedLoop: undefined,gatewayActivationEpoch: () => 0,+ GlyphSpinner: () => null,host,CapabilitiesView: undefined,MessageTextContent: undefined,