* fix(sidechat): split context injection from the first user message The first composer message rode the same user/message event as the side boundary prompt (+ parked snapshot), and the transcript dropped that whole row by its boundary prefix — swallowing the user's first question. Deliver first contact as TWO messages: the boundary+snapshot rides agent.inject (queued next-step context, claimed first at the opening step, no wake) stamped with source kind 'plugin', and the question is the follow-up that wakes the driver. The log records injection and question as separate events; the transcript maps injections (plugin-sourced, or the legacy boundary-prefix blob of pre-split threads) onto a collapsible injection row and renders genuine user messages — the first one included — as user rows. boundaryDelivered still recognizes the injection by its unchanged boundary-prefix opening. * feat(sidechat): codex-style collapsible rows and creating shimmer Tool calls, thinking and context injections now share one quiet single-line chrome (chevron + label + a one-line argument summary) that expands into an indented body on a hairline thread — no cards or fills. Streaming labels and the creating hero shimmer (shimmer = generating); failed tools go danger; reduced-motion stills every loop. * fix(sidebar): debounce subagent auto-open past the title frame The host delivers a new child's origin and title in separate frames, so a Side Chat thread's first visible frame lacks its 'Side: ' label and tripped the 0→N auto-open — every thread creation popped the task page. The trigger now rearms for 500ms and re-evaluates the original baseline against the live snapshot, by which time the title filter recognizes the thread. Genuine subagents still auto-open, half a second later. * fix(sidechat): render legacy threads' first message as its own bubble Threads created before the host split still log the boundary (+snapshot) and the question as ONE 'user' message; the transcript mapped that row wholly onto the injection row, so the user's first question only appeared inside the expansion. The boundary prompt is a known constant, so the legacy row now splits THERE: the injection row keeps the prompt, the remainder renders as the user's real message (a pre-split snapshot, when present, rides along — the common case is a pure question). Row React keys become kind:seq so the split's two rows never collide.
163 lines
8.2 KiB
TypeScript
163 lines
8.2 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import {
|
|
collectBranchIds, countSubagentDescendants, detectNewDirectSubagent,
|
|
directSubagentCount, rootAncestor,
|
|
} from '../src/client/subagent-detect.ts'
|
|
import type { SidebarSessionList, SidebarSubagentCatalog } from '../src/context-types.ts'
|
|
|
|
describe('subagent detection over the sessions list feed', () => {
|
|
/** A list snapshot carrying the given direct subagent children of `parent`. */
|
|
const list = (
|
|
parent: string,
|
|
childIds: string[],
|
|
running: string[] = [],
|
|
): SidebarSessionList => {
|
|
const byId: SidebarSessionList['byId'] = { [parent]: { id: parent, displayTitle: 'Parent' } }
|
|
for (const id of childIds) {
|
|
byId[id] = {
|
|
id,
|
|
displayTitle: `Child ${id}`,
|
|
origin: 'subagent',
|
|
parentId: parent,
|
|
running: running.includes(id),
|
|
}
|
|
}
|
|
return { current: parent, byId }
|
|
}
|
|
|
|
it('counts only the direct subagent children of the given session', () => {
|
|
const snapshot = list('p1', ['c1', 'c2'])
|
|
snapshot.byId['other'] = { id: 'other', displayTitle: 'Other', origin: 'subagent', parentId: 'p2' }
|
|
expect(directSubagentCount(snapshot.byId, 'p1')).toBe(2)
|
|
expect(directSubagentCount(snapshot.byId, 'p2')).toBe(1)
|
|
expect(directSubagentCount(snapshot.byId, 'p1-nobody')).toBe(0)
|
|
})
|
|
|
|
it('fires only on the 0 → N transition of the current session', () => {
|
|
const empty = list('p1', [])
|
|
const one = list('p1', ['c1'])
|
|
const two = list('p1', ['c1', 'c2'])
|
|
expect(detectNewDirectSubagent(empty, empty, 'p1')).toBe(false)
|
|
expect(detectNewDirectSubagent(empty, one, 'p1')).toBe(true)
|
|
// Already-present children never re-trigger (session switch, reload).
|
|
expect(detectNewDirectSubagent(one, two, 'p1')).toBe(false)
|
|
expect(detectNewDirectSubagent(two, one, 'p1')).toBe(false)
|
|
// A child arriving under ANOTHER session does not trigger this one.
|
|
expect(detectNewDirectSubagent(empty, list('p2', ['x']), 'p1')).toBe(false)
|
|
})
|
|
|
|
it('indexes descendants through uninterrupted subagent lineage', () => {
|
|
// p1 → c1 (subagent) → g1 (subagent child of c1).
|
|
const byId: SidebarSessionList['byId'] = {
|
|
p1: { id: 'p1', displayTitle: 'P1' },
|
|
c1: { id: 'c1', displayTitle: 'C1', origin: 'subagent', parentId: 'p1', running: true },
|
|
g1: { id: 'g1', displayTitle: 'G1', origin: 'subagent', parentId: 'c1' },
|
|
}
|
|
expect(countSubagentDescendants(byId, 'p1')).toEqual({ count: 2, runningCount: 1 })
|
|
expect(countSubagentDescendants(byId, 'c1')).toEqual({ count: 1, runningCount: 0 })
|
|
expect(countSubagentDescendants(byId, 'g1')).toEqual({ count: 0, runningCount: 0 })
|
|
// An ordinary fork between the parent and the subagent cuts that lineage:
|
|
// c2 is c1's sibling in origin but its parent `fork` is not a subagent,
|
|
// so it never reaches p1 (only c1 and g1 count under p1).
|
|
const forked: SidebarSessionList['byId'] = {
|
|
...byId,
|
|
fork: { id: 'fork', displayTitle: 'Fork', parentId: 'p1' },
|
|
c2: { id: 'c2', displayTitle: 'C2', origin: 'subagent', parentId: 'fork' },
|
|
}
|
|
expect(countSubagentDescendants(forked, 'p1')).toEqual({ count: 2, runningCount: 1 })
|
|
expect(countSubagentDescendants(forked, 'fork')).toEqual({ count: 1, runningCount: 0 })
|
|
// Cycles terminate (fail soft, never hang); both rows in a 2-cycle reach
|
|
// the queried node once each.
|
|
const cyclic: SidebarSessionList['byId'] = {
|
|
a: { id: 'a', displayTitle: 'A', origin: 'subagent', parentId: 'b' },
|
|
b: { id: 'b', displayTitle: 'B', origin: 'subagent', parentId: 'a' },
|
|
}
|
|
expect(countSubagentDescendants(cyclic, 'a')).toEqual({ count: 2, runningCount: 0 })
|
|
})
|
|
|
|
it('excludes Side Chat threads (subagent origin, "Side: " label) from counts', () => {
|
|
// Side threads ride the subagent origin for list hiding + the RPC fence
|
|
// but they are tab-strip conversations, never topology: they must not
|
|
// fire the auto-open trigger nor inflate the Subagent page totals.
|
|
const byId: SidebarSessionList['byId'] = {
|
|
p1: { id: 'p1', displayTitle: 'P1' },
|
|
c1: { id: 'c1', displayTitle: 'C1', origin: 'subagent', parentId: 'p1' },
|
|
s1: { id: 's1', displayTitle: 'Side: refactor plan', origin: 'subagent', parentId: 'p1', running: true },
|
|
}
|
|
expect(directSubagentCount(byId, 'p1')).toBe(1)
|
|
expect(countSubagentDescendants(byId, 'p1')).toEqual({ count: 1, runningCount: 0 })
|
|
// A side thread appearing under an empty session never trips 0 → N.
|
|
const before: SidebarSessionList = { current: 'p2', byId: { p2: { id: 'p2', displayTitle: 'P2' } } }
|
|
const after: SidebarSessionList = {
|
|
current: 'p2',
|
|
byId: {
|
|
p2: { id: 'p2', displayTitle: 'P2' },
|
|
s2: { id: 's2', displayTitle: 'Side: New thread', origin: 'subagent', parentId: 'p2' },
|
|
},
|
|
}
|
|
expect(detectNewDirectSubagent(before, after, 'p2')).toBe(false)
|
|
})
|
|
|
|
it('documents the title-frame race the Sidebar auto-open debounce absorbs', () => {
|
|
// The host delivers a new child's origin and title in SEPARATE frames:
|
|
// a Side Chat thread's FIRST visible frame still shows a fallback title
|
|
// (the cwd basename — no 'Side: ' prefix), so an immediate 0→N check
|
|
// misreads it as a genuine subagent. Sidebar.tsx therefore debounces
|
|
// AUTO_OPEN_DEBOUNCE_MS and re-evaluates the ORIGINAL baseline against
|
|
// the live snapshot; once the title frame has landed the same baseline
|
|
// yields no trigger. These two assertions pin exactly that dependency.
|
|
const baseline: SidebarSessionList = { current: 'p2', byId: { p2: { id: 'p2', displayTitle: 'P2' } } }
|
|
const firstFrame: SidebarSessionList = {
|
|
current: 'p2',
|
|
byId: {
|
|
p2: { id: 'p2', displayTitle: 'P2' },
|
|
s2: { id: 's2', displayTitle: 'DSH-better-sidebar', origin: 'subagent', parentId: 'p2' },
|
|
},
|
|
}
|
|
expect(detectNewDirectSubagent(baseline, firstFrame, 'p2')).toBe(true) // the race
|
|
const settled: SidebarSessionList = {
|
|
current: 'p2',
|
|
byId: {
|
|
p2: { id: 'p2', displayTitle: 'P2' },
|
|
s2: { id: 's2', displayTitle: 'Side: New thread', origin: 'subagent', parentId: 'p2' },
|
|
},
|
|
}
|
|
expect(detectNewDirectSubagent(baseline, settled, 'p2')).toBe(false) // after the debounce
|
|
})
|
|
|
|
it('resolves the main-agent root of the current session tree', () => {
|
|
const byId: SidebarSessionList['byId'] = {
|
|
main: { id: 'main', displayTitle: 'Main' },
|
|
child: { id: 'child', displayTitle: 'Child', origin: 'subagent', parentId: 'main' },
|
|
grand: { id: 'grand', displayTitle: 'Grand', origin: 'subagent', parentId: 'child' },
|
|
}
|
|
// An ordinary session is its own root; a deep subagent walks up to the main agent.
|
|
expect(rootAncestor(byId, 'main')).toBe('main')
|
|
expect(rootAncestor(byId, 'child')).toBe('main')
|
|
expect(rootAncestor(byId, 'grand')).toBe('main')
|
|
// A broken chain (parent not in the mirror) degrades to the session itself.
|
|
expect(rootAncestor(byId, 'orphan')).toBe('orphan')
|
|
// A hydrating session row degrades to the session itself.
|
|
expect(rootAncestor(byId, 'not-listed')).toBe('not-listed')
|
|
expect(rootAncestor(byId, undefined)).toBeUndefined()
|
|
})
|
|
|
|
it('collects every catalog branch of the topology, cycle-safe', () => {
|
|
const child = (id: string, hasChildren: boolean): SidebarSubagentCatalog['entries'][number] => ({
|
|
kind: 'child', id, activity: 'inactive', hasChildren, mode: 'one-shot',
|
|
})
|
|
const catalogs: Record<string, SidebarSubagentCatalog> = {
|
|
root: { entries: [child('a', true), child('b', false)], parentAvailable: true, state: 'ready', error: null },
|
|
a: { entries: [child('c', false)], parentAvailable: true, state: 'ready', error: null },
|
|
}
|
|
expect(collectBranchIds(catalogs, 'root')).toEqual(['a'])
|
|
expect(collectBranchIds(catalogs, undefined)).toEqual([])
|
|
// A cycle terminates (each branch id collected at most once, no hang).
|
|
const cyclic: Record<string, SidebarSubagentCatalog> = {
|
|
root: { entries: [child('a', true)], parentAvailable: true, state: 'ready', error: null },
|
|
a: { entries: [child('root', true)], parentAvailable: true, state: 'ready', error: null },
|
|
}
|
|
expect(collectBranchIds(cyclic, 'root')).toEqual(['a', 'root'])
|
|
})
|
|
})
|