The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(desktop): never parse a free-text group name as a canonical key
Teknium415580450f41
diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-alias-scope.test.ts b/apps/desktop/src/plugins/hermes-bots/canonical-group-alias-scope.test.tsnew file mode 100644index 00000000000..c60e76ec7f2--- /dev/null+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-alias-scope.test.ts@@ -0,0 +1,49 @@+import { beforeEach, expect, it } from 'vitest'++import {+ $canonicalGroupBindings,+ canonicalGroupAliasKey,+ canonicalGroupBindingFor,+ canonicalGroupKeyRoute,+ publishCanonicalGroup+} from './canonical-group-registry'++// Independent review on #140972 (#140805): room names are free text (hosted_rooms+// has no pattern), so a room on connection B named like a `canonical:` key parsed+// as A's key and opened A's room. A NAME is never a key; a KEY keeps main's format.+const A = { connectionId: 'conn-A', profile: 'work' }+const B = { connectionId: 'conn-B', profile: 'work' }+const bind = (route: typeof A, roomId: string) => ({ ...route, roomId, roomName: 'Team' })++beforeEach(() => {+ $canonicalGroupBindings.set({})+})++it('a room NAME shaped like a canonical key is not treated as an identity on another connection', () => {+ const name = 'canonical:conn-A:work:ra'+ const bindings = { [name]: bind(A, 'ra') }+ expect(canonicalGroupKeyRoute(name, 'name')).toBeNull()+ expect(canonicalGroupBindingFor(bindings, B, name, 'name')).toBeUndefined()+})++it('a main-format key minted before this change still opens its room', () => {+ // A restored tab / a key minted by main or an older build: canonical:<conn>:<profile>:<room>.+ const key = 'canonical:conn-A:work:ra'+ expect(canonicalGroupKeyRoute(key, 'key')).toEqual({ ...A, roomId: 'ra' })+ expect(canonicalGroupBindingFor({ [key]: bind(A, 'ra') }, B, key, 'key')?.roomId).toBe('ra')+})++it('a canonical-shaped name resolved on B is published under B alias, never as a raw key', () => {+ const name = 'canonical:conn-A:work:ra'+ publishCanonicalGroup(B, name, { authority: B, room: { room_id: 'rb', name, members: [] } }, 'name')+ const bindings = $canonicalGroupBindings.get()+ expect(bindings[name]).toBeUndefined()+ expect(canonicalGroupBindingFor(bindings, B, name, 'name')?.roomId).toBe('rb')+ expect(canonicalGroupBindingFor(bindings, A, name, 'name')).toBeUndefined()+})++it('alias keys stay unambiguous when the name itself carries separators', () => {+ expect(canonicalGroupAliasKey({ connectionId: 'a', profile: 'b' }, 'c:d')).not.toBe(+ canonicalGroupAliasKey({ connectionId: 'a', profile: 'b:c' }, 'd')+ )+})diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-registry.tsx b/apps/desktop/src/plugins/hermes-bots/canonical-group-registry.tsxindex 345408c88aa..1318f9d2baf 100644--- a/apps/desktop/src/plugins/hermes-bots/canonical-group-registry.tsx+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-registry.tsx@@ -14,7 +14,22 @@ export function registerCanonicalGroup(route: CanonicalGroupRoute, room: Canonicreturn key}-/** The route a `canonical:<connection>:<profile>:<room_id>` key was minted on, or null for a name. */+/** Where a group string entered. Room and group names are free text (hosted_rooms+ * has no pattern), so a name can spell `canonical:<conn>:<profile>:<room>`+ * exactly; the string alone cannot tell the two apart, the caller can.+ * - 'key': minted by `registerCanonicalGroup`, or a persisted/restored tab+ * string. Parsed as main always parsed it, so pre-existing keys keep opening.+ * - 'name': a user-typed group name, a room record's name, a roster row. Never+ * parsed: it resolves only through the alias for the current source. */+export type CanonicalGroupOrigin = 'key' | 'name'++/** The route `group` names when it is a key: null for a name, whatever its shape. */+export function canonicalGroupKeyRoute(group: string, origin: CanonicalGroupOrigin): ReturnType<typeof parseCanonicalGroupKey> {+ return origin === 'name' ? null : parseCanonicalGroupKey(group)+}++/** The route a `canonical:<connection>:<profile>:<room_id>` key was minted on, or null for a name.+ * Format-only: callers holding a possible NAME go through `canonicalGroupKeyRoute`. */export function parseCanonicalGroupKey(key: string): (CanonicalGroupRoute & { roomId: string }) | null {const match = /^canonical:([^:]*):([^:]*):(.+)$/.exec(key)@@ -39,9 +54,10 @@ export function canonicalGroupAliasKey(route: CanonicalGroupRoute, group: stringexport function canonicalGroupBindingFor(bindings: Record<string, CanonicalGroupBinding>,route: CanonicalGroupRoute,- group: string+ group: string,+ origin: CanonicalGroupOrigin): CanonicalGroupBinding | undefined {- return parseCanonicalGroupKey(group) ? bindings[group] : bindings[canonicalGroupAliasKey(route, group)]+ return canonicalGroupKeyRoute(group, origin) ? bindings[group] : bindings[canonicalGroupAliasKey(route, group)]}/** #140805: bindings live in memory, so after a restart a group opened by name@@ -54,9 +70,10 @@ export function canonicalGroupBindingFor(* recently updated room (list order). */export async function resolveCanonicalGroup(route: CanonicalGroupRoute,- group: string+ group: string,+ origin: CanonicalGroupOrigin): Promise<{ authority: CanonicalGroupRoute; room: CanonicalRoom } | null> {- const parsed = parseCanonicalGroupKey(group)+ const parsed = canonicalGroupKeyRoute(group, origin)const authority = parsed ? { connectionId: parsed.connectionId, profile: parsed.profile } : routeconst { rooms } = await discoverCanonicalGroups(authority)const room = parsed ? rooms.find(r => r.room_id === parsed.roomId) : rooms.find(r => r.name === group)@@ -69,17 +86,18 @@ export async function resolveCanonicalGroup(export function publishCanonicalGroup(route: CanonicalGroupRoute,group: string,- resolved: { authority: CanonicalGroupRoute; room: CanonicalRoom }+ resolved: { authority: CanonicalGroupRoute; room: CanonicalRoom },+ origin: CanonicalGroupOrigin): void {const key = registerCanonicalGroup(resolved.authority, resolved.room)- if (key === group) {return}+ if (origin === 'key' && key === group) {return}const binding = { ...resolved.authority, roomId: resolved.room.room_id, roomName: resolved.room.name }- const alias = parseCanonicalGroupKey(group) ? group : canonicalGroupAliasKey(route, group)+ const alias = canonicalGroupKeyRoute(group, origin) ? group : canonicalGroupAliasKey(route, group)$canonicalGroupBindings.set({ ...$canonicalGroupBindings.get(), [alias]: binding })}-export function CanonicalGroupList({ onOpen }: { onOpen: (key: string) => void }) {+export function CanonicalGroupList({ onOpen }: { onOpen: (key: string, origin: CanonicalGroupOrigin) => void }) {const labels = useCanonicalGroupLabels()const connectionId = useValue(host.state.connectionId)const profile = useValue(host.state.profile)@@ -103,6 +121,6 @@ export function CanonicalGroupList({ onOpen }: { onOpen: (key: string) => void }return <div className="grid gap-1 px-2"><Button onClick={() => setRefresh(value => value + 1)} variant="ghost">{labels.refreshGroups}</Button>{error && <p role="alert">{error}</p>}- {rooms.map(room => <Button key={room.key} onClick={() => onOpen(room.key)} variant="ghost">{room.name}</Button>)}+ {rooms.map(room => <Button key={room.key} onClick={() => onOpen(room.key, 'key')} variant="ghost">{room.name}</Button>)}</div>}diff --git a/apps/desktop/src/plugins/hermes-bots/canonical-group-reopen-by-name.test.tsx b/apps/desktop/src/plugins/hermes-bots/canonical-group-reopen-by-name.test.tsxindex 7d42e51a613..c33f9b34f9d 100644--- a/apps/desktop/src/plugins/hermes-bots/canonical-group-reopen-by-name.test.tsx+++ b/apps/desktop/src/plugins/hermes-bots/canonical-group-reopen-by-name.test.tsx@@ -103,7 +103,7 @@ it('adopts the existing gateway room by name instead of minting a fork', async (it('adopts a restored canonical tab key whose binding was lost with the restart', async () => {gateway(() => ({ rooms: [original], next_offset: null }))- await act(async () => { render(<GroupChatWorkspace group="canonical:local:default:room-original" members={[]} />) })+ await act(async () => { render(<GroupChatWorkspace group="canonical:local:default:room-original" members={[]} origin="key" />) })expect(methods()).not.toContain('groups.create')expect(request.mock.calls.find(call => call[1] === 'groups.state')?.[2]).toMatchObject({ room_id: 'room-original' })})@@ -186,6 +186,27 @@ it('a late lookup from a superseded connection does not publish its room', asyncexpect(screen.getByRole('button', { name: 'Start gateway group' })).toBeTruthy()})+// Review on #140972 (F4): a room NAME spelled like another connection's key+// must resolve as a name on the current source, never open that room.+it('a roster name shaped like a canonical key resolves on the current connection, not the one it spells', async () => {+ routedGateway(route => ({ rooms: route.connectionId === 'remote' ? [{ room_id: 'room-b', name: 'canonical:local:default:room-original', members }] : [original], next_offset: null }))+ state.connectionId.set('remote')+ await act(async () => { render(<GroupChatWorkspace group="canonical:local:default:room-original" members={roster} />) })+ const lists = request.mock.calls.filter(call => call[1] === 'groups.list')+ expect(lists.map(call => call[0]?.connectionId)).toEqual(['remote'])+ const states = request.mock.calls.filter(call => call[1] === 'groups.state')+ expect(states.map(call => [call[0]?.connectionId, call[2]?.room_id])).toEqual([['remote', 'room-b']])+})++it('a main-format key restored from a tab minted before this change still opens its room', async () => {+ routedGateway(route => ({ rooms: [roomOn(route)], next_offset: null }))+ state.connectionId.set('remote')+ await act(async () => { render(<GroupChatWorkspace group="canonical:local:default:room-original" members={[]} origin="key" />) })+ expect(methods()).not.toContain('groups.create')+ const states = request.mock.calls.filter(call => call[1] === 'groups.state')+ expect(states.map(call => [call[0]?.connectionId, call[2]?.room_id])).toEqual([['local', 'room-original']])+})+it('renders the lookup states and Retry from the active catalog, not hardcoded English', async () => {catalog.patch = t => ({...t,@@ -195,7 +216,7 @@ it('renders the lookup states and Retry from the active catalog, not hardcoded Elet releaseList: (value: unknown) => void = () => undefinedlet fail = truegateway(() => fail ? Promise.reject(new Error('down')) : new Promise(resolve => { releaseList = resolve }))- await act(async () => { render(<GroupChatWorkspace group="canonical:local:default:gone" members={[]} />) })+ await act(async () => { render(<GroupChatWorkspace group="canonical:local:default:gone" members={[]} origin="key" />) })expect(screen.getByText('T:lookupFailed')).toBeTruthy()fail = falsediff --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 e28a3c67dc8..978085c5326 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@@ -147,7 +147,7 @@ it('reads back retry on the same authority and sends only through the group drivreturn {}})const group = registerCanonicalGroup({ connectionId: 'local', profile: 'default' }, { room_id: 'r', name: 'Room', members: [] })- render(<GroupChatWorkspace group={group} members={[]} />)+ render(<GroupChatWorkspace group={group} members={[]} origin="key" />)fireEvent.click(await screen.findByRole('button', { name: 'Retry' }))await waitFor(() => expect(request.mock.calls.filter(c => c[1] === 'groups.state').length).toBeGreaterThan(1))fireEvent.change(screen.getByRole('textbox'), { target: { value: 'Hello' } })diff --git a/apps/desktop/src/plugins/hermes-bots/cold-bot-switch-pending.test.ts b/apps/desktop/src/plugins/hermes-bots/cold-bot-switch-pending.test.tsindex c4d8f793641..225a50cc829 100644--- a/apps/desktop/src/plugins/hermes-bots/cold-bot-switch-pending.test.ts+++ b/apps/desktop/src/plugins/hermes-bots/cold-bot-switch-pending.test.ts@@ -127,7 +127,7 @@ describe('cold bot switch publishes its target after the fronted-tab miss', () =expect($pendingBotOpen.get()?.key).toBe('local::bravo')$groupChats.set({ Team: { log: [], sessions: {}, watermarks: {} } })- openGroupChat('Team')+ openGroupChat('Team', 'name')expect($pendingBotOpen.get()).toBeNull()gate.resolve()diff --git a/apps/desktop/src/plugins/hermes-bots/create-dialog.tsx b/apps/desktop/src/plugins/hermes-bots/create-dialog.tsxindex 83b3154a4ac..6c8093d7edf 100644--- a/apps/desktop/src/plugins/hermes-bots/create-dialog.tsx+++ b/apps/desktop/src/plugins/hermes-bots/create-dialog.tsx@@ -46,6 +46,7 @@ import { $selectedBot } from './bot-state'import { createCanonicalChat } from './canonical-chat'import { groupCreationSource, groupExecutionMode } from './canonical-group-capabilities'import { registerCanonicalGroup } from './canonical-group-registry'+import type { CanonicalGroupOrigin } from './canonical-group-registry'import { canonicalGroupRequest, captureCanonicalGroupRoute, createCanonicalGroup } from './canonical-groups'import { $botMeta, botHandle, botRosterKey, filterBots, ROSTER_KEY, saveBotMeta } from './data'import { labeled, ResizableFrame } from './dialog-parts'@@ -1136,7 +1137,7 @@ export function GroupDialog({ bot, onClose }: GroupDialogProps) {interface CreateGroupChatDialogProps {onClose: () => void- onCreated?: (group: string) => void+ onCreated?: (group: string, origin: CanonicalGroupOrigin) => voidopen: booleanroster: RosterRow[]}@@ -1207,7 +1208,7 @@ export function CreateGroupChatDialog({ open, roster, onClose, onCreated }: Creaif (!sourceCurrent()) {return}const key = registerCanonicalGroup(route, created.room)onClose()- onCreated?.(key)+ onCreated?.(key, 'key')return}@@ -1254,7 +1255,7 @@ export function CreateGroupChatDialog({ open, roster, onClose, onCreated }: Creamessage: `“${groupName}” created with ${selected.length} bots`})onClose()- onCreated?.(groupName)+ onCreated?.(groupName, 'name')} catch (error) {host.notify({ kind: 'error', message: error instanceof Error ? error.message : String(error) })} finally { creating.current = false }diff --git a/apps/desktop/src/plugins/hermes-bots/group-bot-handoff.test.ts b/apps/desktop/src/plugins/hermes-bots/group-bot-handoff.test.tsindex 40153bb120d..5fc986670d7 100644--- a/apps/desktop/src/plugins/hermes-bots/group-bot-handoff.test.ts+++ b/apps/desktop/src/plugins/hermes-bots/group-bot-handoff.test.ts@@ -92,7 +92,7 @@ function registerGroup(room: Room, group: string, timeline: string[]) {[group]: { log: [], sessions: {}, watermarks: {} }} as unknown as Record<string, GroupChat>)host.openWorkspace = (id: string) => () => timeline.push(`close:${id}`)- room.view.openGroupChat(group)+ room.view.openGroupChat(group, 'name')}beforeEach(() => {@@ -176,7 +176,7 @@ describe('a failed open must not steal the center', () => {Core: { log: [], roomId: 'r-core', sessions: {}, watermarks: {} }} as unknown as Record<string, GroupChat>)host.openWorkspace = () => () => undefined- room.view.openGroupChat('Core')+ room.view.openGroupChat('Core', 'name')openBotCanonicalChat.mockImplementation(async () => {const rooms = room.chat.$groupChats.get()room.chat.$groupChats.set({ Renamed: rooms.Core } as unknown as Record<string, GroupChat>)diff --git a/apps/desktop/src/plugins/hermes-bots/group-chat-view.test.ts b/apps/desktop/src/plugins/hermes-bots/group-chat-view.test.tsindex b4b73818821..e7a0d5ba8bf 100644--- a/apps/desktop/src/plugins/hermes-bots/group-chat-view.test.ts+++ b/apps/desktop/src/plugins/hermes-bots/group-chat-view.test.ts@@ -78,7 +78,7 @@ describe('opening a room', () => {return () => undefined}- room.view.openGroupChat(group)+ room.view.openGroupChat(group, 'key')expect(title).toBe('Incident response')})@@ -93,7 +93,7 @@ describe('opening a room', () => {return () => onClose()}- room.view.openGroupChat('Core')+ room.view.openGroupChat('Core', 'name')expect(room.chat.$groupChatWorkspace.get()).toBe('Core')// #89788: the main tab owns the room, so the pane keeps its roster.@@ -108,7 +108,7 @@ describe('opening a room', () => {it('keeps the in-pane fallback on older hosts and when the door throws', async () => {const older = await loadRoom()- older.view.openGroupChat('Core')+ older.view.openGroupChat('Core', 'name')expect(older.chat.$groupChatWorkspace.get()).toBe('Core')expect(older.panes.shouldRenderGroupChatInPane('Core')).toBe(true)@@ -119,7 +119,7 @@ describe('opening a room', () => {throw new Error('workspace unavailable')}- failed.view.openGroupChat('Ops')+ failed.view.openGroupChat('Ops', 'name')expect(failed.chat.$groupChatWorkspace.get()).toBe('Ops')expect(failed.panes.shouldRenderGroupChatInPane('Ops')).toBe(true)@@ -141,7 +141,7 @@ describe('opening a room', () => {host.openWorkspace = () => () => undefined- room.view.openGroupChat('Core')+ room.view.openGroupChat('Core', 'name')unsubscribe()expect(gateAtSelection).toBe(false)@@ -151,8 +151,8 @@ describe('opening a room', () => {const room = await loadRoom()host.openWorkspace = () => () => undefined- room.view.openGroupChat('Core')- room.view.openGroupChat('Ops')+ room.view.openGroupChat('Core', 'name')+ room.view.openGroupChat('Ops', 'name')room.panes.closeGroupChatMainTab('Core')expect(room.chat.$groupChatWorkspace.get()).toBe('Ops')diff --git a/apps/desktop/src/plugins/hermes-bots/group-chat-view.tsx b/apps/desktop/src/plugins/hermes-bots/group-chat-view.tsxindex ddce2b25343..ffce9562459 100644--- a/apps/desktop/src/plugins/hermes-bots/group-chat-view.tsx+++ b/apps/desktop/src/plugins/hermes-bots/group-chat-view.tsx@@ -42,10 +42,11 @@ import { avatarColor, botAppearance, BotFace } from './avatar'import { isBackfilledFacePng } from './avatar-image'import { groupCreationSource, groupExecutionMode } from './canonical-group-capabilities'import type { GroupExecutionMode } from './canonical-group-capabilities'+import type { CanonicalGroupOrigin } from './canonical-group-registry'import {$canonicalGroupBindings,canonicalGroupBindingFor,- parseCanonicalGroupKey,+ canonicalGroupKeyRoute,publishCanonicalGroup,registerCanonicalGroup,resolveCanonicalGroup@@ -109,6 +110,7 @@ import {groupComposerDraftSnapshot,migrateGroupComposerDraft,recordGroupMainTab,+ recordGroupOpenOrigin,restoreGroupComposerDraft,updateGroupComposerDraft} from './group-panes'@@ -371,7 +373,7 @@ export async function renameGroupChat(oldName: string, newName: string, members:if (groupChatMainTabs.has(oldName)) {closeGroupChatMainTab(oldName)- openGroupChat(next)+ openGroupChat(next, 'name')}// Same convergence as disband: drop the pre-rename roster snapshot so the@@ -575,6 +577,9 @@ function GroupChatSettingsDialog({interface GroupChatWorkspaceProps {group: string+ /** Where `group` came from (see CanonicalGroupOrigin). Defaults to 'name',+ * which fails closed: a name never parses as a `canonical:` key. */+ origin?: CanonicalGroupOriginmembers: GroupMember[]onBack?: () => voidvisible?: boolean@@ -584,7 +589,7 @@ export function GroupChatWorkspace(props: GroupChatWorkspaceProps) {const bindings = useValue($canonicalGroupBindings)const connectionId = useValue(host.state.connectionId)const profile = useValue(host.state.profile)- const binding = canonicalGroupBindingFor(bindings, { connectionId: connectionId ?? '', profile }, props.group)+ const binding = canonicalGroupBindingFor(bindings, { connectionId: connectionId ?? '', profile }, props.group, props.origin ?? 'name')if (binding) {return <CanonicalGroupWorkspace binding={binding} onBack={props.onBack} visible={props.visible} />}@@ -614,11 +619,12 @@ function GroupExecutionGate(props: GroupChatWorkspaceProps) {setLookup({ source, status: 'pending' })setError('')const route = { connectionId: connectionId ?? '', profile }- void resolveCanonicalGroup(route, props.group)+ const origin = props.origin ?? 'name'+ void resolveCanonicalGroup(route, props.group, origin).then(resolved => {if (cancelled) {return}- if (resolved) {publishCanonicalGroup(route, props.group, resolved)} else {setLookup({ source, status: 'missing' })}+ if (resolved) {publishCanonicalGroup(route, props.group, resolved, origin)} else {setLookup({ source, status: 'missing' })}}).catch(e => {if (!cancelled) {@@ -628,7 +634,7 @@ function GroupExecutionGate(props: GroupChatWorkspaceProps) {})return () => { cancelled = true }- }, [mode, source, props.group, lookupAttempt, connectionId, profile])+ }, [mode, source, props.group, props.origin, lookupAttempt, connectionId, profile])useEffect(() => {let cancelled = falsesetCapability(null)@@ -655,7 +661,7 @@ function GroupExecutionGate(props: GroupChatWorkspaceProps) {if (mode === 'legacy') {return <LegacyGroupChatWorkspace {...props} />}// A `canonical:` key names an existing room; it never seeds a new one.- const canCreate = mode === 'canonical' && lookupStatus === 'missing' && parseCanonicalGroupKey(props.group) === null+ const canCreate = mode === 'canonical' && lookupStatus === 'missing' && canonicalGroupKeyRoute(props.group, props.origin ?? 'name') === nullconst message = mode !== 'canonical'? mode === 'unavailable' ? b.canonical.driverUnavailable : 'Checking group driver…'@@ -684,7 +690,7 @@ function GroupExecutionGate(props: GroupChatWorkspaceProps) {setBusy(true)void createCanonicalGroup(route, props.group, props.members).then(({ room }) => {- if (sourceCurrent()) {openGroupChat(registerCanonicalGroup(route, room))}+ if (sourceCurrent()) {openGroupChat(registerCanonicalGroup(route, room), 'key')}}).catch(e => { if (sourceCurrent()) {setError(String(e))} }).finally(() => setBusy(false))}}>Start gateway group</Button>@@ -1703,9 +1709,10 @@ function LegacyGroupChatWorkspace({ group, members, onBack, visible = true }: Gr* visible edge to re-anchor its log to the bottom (#89835 follow-up). */interface GroupChatMainViewProps {group: string+ origin: CanonicalGroupOrigin}-function GroupChatMainView({ group }: GroupChatMainViewProps) {+function GroupChatMainView({ group, origin }: GroupChatMainViewProps) {const allMeta = useValue($botMeta)// Subscribe: membership changes ride bot meta AND the room record.useValue($groupChats)@@ -1725,7 +1732,7 @@ function GroupChatMainView({ group }: GroupChatMainViewProps) {const visible = useValue($visible)return (- <GroupChatWorkspace group={group} members={members} onBack={() => closeGroupChatMainTab(group)} visible={visible} />+ <GroupChatWorkspace group={group} members={members} onBack={() => closeGroupChatMainTab(group)} origin={origin} visible={visible} />)}@@ -1739,7 +1746,7 @@ function GroupChatMainView({ group }: GroupChatMainViewProps) {* in-pane fallback painted alongside the main tab, and because the map* write itself repaints nothing, the duplicate stuck until an unrelated* re-render. */-export function openGroupChat(group: string): void {+export function openGroupChat(group: string, origin: CanonicalGroupOrigin): void {// A room selection supersedes any bot-open transition still hydrating.// The in-flight host navigation may complete underneath this workspace,// but it may not later close or visually steal the room the user chose.@@ -1748,6 +1755,7 @@ export function openGroupChat(group: string): void {...$groupNeedsYou.get(),[group]: false})+ recordGroupOpenOrigin(group, origin)const ownerKey = groupWorkspaceOwnerKey(group)setBotsWorkspaceOwner(ownerKey, null, 'New group conversations start in the group composer.')// #93813: what reached the members' room sessions while nobody drove them@@ -1758,12 +1766,12 @@ export function openGroupChat(group: string): void {if (typeof host.openWorkspace === 'function') {try {const route = { connectionId: host.state.connectionId.get() ?? '', profile: host.state.profile.get() }- const title = canonicalGroupBindingFor($canonicalGroupBindings.get(), route, group)?.roomName || group+ const title = canonicalGroupBindingFor($canonicalGroupBindings.get(), route, group, origin)?.roomName || groupconst close = host.openWorkspace(`${ID}:group:${slugifyProfileName(group)}`, {title,minWidth: '24rem',- render: () => <GroupChatMainView group={group} />,+ render: () => <GroupChatMainView group={group} origin={origin} />,onClose: () => {dropGroupMainTab(group)diff --git a/apps/desktop/src/plugins/hermes-bots/group-external-writes.test.ts b/apps/desktop/src/plugins/hermes-bots/group-external-writes.test.tsindex 3cbb723c2b9..ca02e985aaf 100644--- a/apps/desktop/src/plugins/hermes-bots/group-external-writes.test.ts+++ b/apps/desktop/src/plugins/hermes-bots/group-external-writes.test.ts@@ -168,7 +168,7 @@ describe('external writes into a member session', () => {data.$lastRoster.set([{ name: 'research' }] as never)data.$botMeta.set({ research: { groups: ['Room'] } } as never)- view.openGroupChat('Room')+ view.openGroupChat('Room', 'name')await drain(() => texts(room).length < 6)expect(texts(room)).toEqual([diff --git a/apps/desktop/src/plugins/hermes-bots/group-panes.ts b/apps/desktop/src/plugins/hermes-bots/group-panes.tsindex 48ca27a936a..5c28d98d836 100644--- a/apps/desktop/src/plugins/hermes-bots/group-panes.ts+++ b/apps/desktop/src/plugins/hermes-bots/group-panes.ts@@ -9,6 +9,7 @@import { atom } from '@hermes/plugin-sdk'+import type { CanonicalGroupOrigin } from './canonical-group-registry'import { $groupChatWorkspace, groupChatRoomKey } from './group-chat'import type { GroupChatRoom } from './group-chat'import type { Attachment } from './types'@@ -126,6 +127,19 @@ export const groupChatMainTabs = new Map<string, () => void>()* rev bump re-evaluates the gate. */export const $groupMainTabsRev = atom(0)+/** The origin each group string was last opened with (see CanonicalGroupOrigin),+ * so the in-panel fallback renders the selected group the way it was opened.+ * Unknown strings are names: a name never parses as a `canonical:` key. */+const groupOpenOrigins = new Map<string, CanonicalGroupOrigin>()++export function recordGroupOpenOrigin(group: string, origin: CanonicalGroupOrigin) {+ groupOpenOrigins.set(group, origin)+}++export function groupOpenOrigin(group: string): CanonicalGroupOrigin {+ return groupOpenOrigins.get(group) ?? 'name'+}+export function recordGroupMainTab(group: string, close: () => void) {groupChatMainTabs.set(group, close)$groupMainTabsRev.set($groupMainTabsRev.get() + 1)diff --git a/apps/desktop/src/plugins/hermes-bots/roster-actions.ts b/apps/desktop/src/plugins/hermes-bots/roster-actions.tsindex 9045d86d79d..ab189ac5d2d 100644--- a/apps/desktop/src/plugins/hermes-bots/roster-actions.ts+++ b/apps/desktop/src/plugins/hermes-bots/roster-actions.ts@@ -23,7 +23,7 @@ import { $botMeta, botActivitySession, botRosterKey, botSelectionKey, newBotChatimport { $groupChats, $groupChatWorkspace } from './group-chat'import { openGroupChat } from './group-chat-view'import { liveGroupChatNames } from './group-membership'-import { closeGroupChatMainTab } from './group-panes'+import { closeGroupChatMainTab, groupOpenOrigin } from './group-panes'import { displayName } from './labels'import { botRosterMeta, botWorkspaceOwnerKey, setBotsWorkspaceOwner } from './routing'import { botCanonicalSessionId } from './row-helpers'@@ -268,7 +268,7 @@ export async function openRosterBot(bot: RosterRow): Promise<boolean> {return}- openGroupChat(currentGroup)+ openGroupChat(currentGroup, groupOpenOrigin(currentGroup))}// The persisted half of clear-on-open. The transient dot is retired bydiff --git a/apps/desktop/src/plugins/hermes-bots/roster-pane-dialogs.tsx b/apps/desktop/src/plugins/hermes-bots/roster-pane-dialogs.tsxindex 9d126a551eb..26a79a7af73 100644--- a/apps/desktop/src/plugins/hermes-bots/roster-pane-dialogs.tsx+++ b/apps/desktop/src/plugins/hermes-bots/roster-pane-dialogs.tsx@@ -67,7 +67,7 @@ export function renderRosterDialogs({/><CreateGroupChatDialogonClose={() => setGroupCreateOpen(false)}- onCreated={groupName => openGroupChat(groupName)}+ onCreated={(group, origin) => openGroupChat(group, origin)}open={groupCreateOpen} // Full multi-source roster: group chats can seat bots from other// registered connections — their turns route to their own machines.roster={roster}diff --git a/apps/desktop/src/plugins/hermes-bots/roster-pane.tsx b/apps/desktop/src/plugins/hermes-bots/roster-pane.tsxindex 067f3d1d4a6..84dda2bf3b8 100644--- a/apps/desktop/src/plugins/hermes-bots/roster-pane.tsx+++ b/apps/desktop/src/plugins/hermes-bots/roster-pane.tsx@@ -36,7 +36,7 @@ import {import { $groupChats, $groupChatWorkspace, $groupClarify, $groupNeedsYou } from './group-chat'import { GroupChatWorkspace, openGroupChat } from './group-chat-view'import { groupChatMemberBots } from './group-membership'-import { $groupMainTabsRev, shouldRenderGroupChatInPane } from './group-panes'+import { $groupMainTabsRev, groupOpenOrigin, shouldRenderGroupChatInPane } from './group-panes'import { $activeGroupMemberKeys } from './group-presence'import { $showHiddenBots, isBotHidden } from './hidden-bots'import { useBots } from './i18n'@@ -421,7 +421,7 @@ export function BotsPane() {const groupChatMembers = groupChatName ? groupChatMemberBots(groupChatName, roster, allMeta) : []if (shouldRenderGroupChatInPane(groupChatName) && groupChatMembers.length) {- return <GroupChatWorkspace group={groupChatName} members={groupChatMembers} />+ return <GroupChatWorkspace group={groupChatName} members={groupChatMembers} origin={groupOpenOrigin(groupChatName)} />}const renderBotRow = (bot: RosterRow, keyPrefix = '') => (@@ -448,7 +448,7 @@ export function BotsPane() {members={row.members}onDisband={setDeletingGroup}onNewSection={target => setSectionDialog({ group: target, mode: 'create' })}- onOpen={openGroupChat}+ onOpen={group => openGroupChat(group, 'name')}sortedGroupRows={sortedGroupRows}/>)