Skip to content

Commit 849a6b4

Browse files
committed
fix(es-app): bound session activity reconciliation (anomalyco#146)
1 parent 67304e5 commit 849a6b4

6 files changed

Lines changed: 275 additions & 35 deletions

File tree

‎packages/es-app/src/session-activity.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ test("reconnect repairs missed requests and statuses without clearing disconnect
381381
ActivityEvents.current.onopen?.()
382382
expect(fetchSpy.mock.calls.length).toBe(calls + 12)
383383
await load(activity)
384-
expect(refreshes).toHaveLength(2)
384+
expect(refreshes).toHaveLength(1)
385385
expect(activity.pending("ses_parent")).toEqual([
386386
{ kind: "question", request: question("que_missed"), directory: grandchildDirectory },
387387
])

‎packages/es-app/src/session-activity.ts‎

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ type Request = { directory: string } & (
1818
| { kind: "question"; request: QuestionRequest }
1919
)
2020

21-
export const createSessionActivity = (sessions: () => GlobalSession[], refreshSessions: () => void) => {
21+
export const createSessionActivity = (
22+
sessions: () => GlobalSession[],
23+
refreshSessions: () => void,
24+
options?: { directories: () => string[]; sessionEvent: (event: Event, directory: string) => boolean },
25+
) => {
2226
const [snapshots, setSnapshots] = createSignal<Record<string, Snapshot>>({})
2327
const [connectionError, setConnectionError] = createSignal("")
2428
const index = createMemo(() => new Map(sessions().map((s) => [s.id, s])))
@@ -200,30 +204,48 @@ export const createSessionActivity = (sessions: () => GlobalSession[], refreshSe
200204
inflight.set(directory, { events, promise })
201205
return promise
202206
}
203-
const refresh = async (dirs = [...new Set([...sessions().map((s) => s.directory), ...Object.keys(snapshots())])]) => {
204-
// Avoid initializing every historical directory concurrently.
205-
for (let offset = 0; offset < dirs.length && !disposed; offset += 8) {
206-
await Promise.all(dirs.slice(offset, offset + 8).map((directory) => refreshDirectory(directory)))
207+
const relevant = () => [...new Set([
208+
...(options?.directories() ?? sessions().map((s) => s.directory)),
209+
...Object.entries(snapshots()).filter(([, snapshot]) =>
210+
snapshot.error || snapshot.permissions.length || snapshot.questions.length ||
211+
Object.values(snapshot.status).some((status) => status.type === "busy" || status.type === "retry"))
212+
.map(([directory]) => directory),
213+
])]
214+
const refresh = async (dirs = relevant()) => {
215+
for (let offset = 0; offset < dirs.length && !disposed; offset += 4) {
216+
await Promise.all(dirs.slice(offset, offset + 4).map((directory) => refreshDirectory(directory)))
207217
}
208218
}
219+
const initializing = new Set<string>()
209220
createEffect(() => {
210-
const dirs = [...new Set(sessions().map((s) => s.directory))]
221+
const dirs = relevant()
211222
untrack(() => {
212-
void refresh(dirs.filter((directory) => !snapshots()[directory]))
223+
const missing = dirs.filter((directory) => !snapshots()[directory] && !initializing.has(directory))
224+
missing.forEach((directory) => initializing.add(directory))
225+
void refresh(missing).finally(() => missing.forEach((directory) => initializing.delete(directory)))
213226
})
214227
})
215228
const source = createServerEvents("/oc/global/event")
229+
let opened = false
216230
let timer: ReturnType<typeof setTimeout> | undefined
231+
let lastSessionRefresh = 0
217232
const scheduleSessions = () => {
218233
if (timer) return
234+
const delay = Math.max(500, 15_000 - (Date.now() - lastSessionRefresh))
219235
timer = setTimeout(() => {
220236
timer = undefined
237+
lastSessionRefresh = Date.now()
221238
refreshSessions()
222-
}, 500)
239+
}, delay)
223240
}
224241
source.onopen = () => {
225242
if (disposed) return
226243
setConnectionError("")
244+
if (!opened) {
245+
opened = true
246+
return
247+
}
248+
lastSessionRefresh = Date.now()
227249
refreshSessions()
228250
void refresh()
229251
}
@@ -246,22 +268,34 @@ export const createSessionActivity = (sessions: () => GlobalSession[], refreshSe
246268
inflight.get(directory)?.events.push(event)
247269
apply(directory, event)
248270
}
249-
if (
250-
["session.created", "session.updated", "session.deleted", "permission.asked", "question.asked"].includes(
251-
event.type,
252-
)
253-
)
271+
if (["session.created", "session.updated", "session.deleted"].includes(event.type) &&
272+
!options?.sessionEvent(event, directory))
254273
scheduleSessions()
274+
if ((event.type === "permission.asked" || event.type === "question.asked") &&
275+
!index().has(event.properties.sessionID)) scheduleSessions()
255276
if (event.type.startsWith("permission.v2.") || event.type.startsWith("question.v2."))
256277
void refreshDirectory(directory)
257278
} catch {
258279
setConnectionError("Unable to read activity events. Refreshing requests and status.")
259280
void refresh()
260281
}
261282
}
283+
let relevantCursor = 0
284+
let backgroundCursor = 0
262285
const interval = setInterval(() => {
286+
lastSessionRefresh = Date.now()
263287
refreshSessions()
264-
void refresh()
288+
const dirs = relevant()
289+
const background = [...new Set(sessions().map((session) => session.directory))].filter((directory) => !dirs.includes(directory))
290+
// The global stream and dashboard notifications handle immediate attention;
291+
// scan historical directories slowly for missed events without polling all of them each tick.
292+
const next = [
293+
...Array.from({ length: Math.min(2, dirs.length) }, (_, i) => dirs[(relevantCursor + i) % dirs.length]!),
294+
...Array.from({ length: Math.min(4, background.length) }, (_, i) => background[(backgroundCursor + i) % background.length]!),
295+
]
296+
relevantCursor += 2
297+
backgroundCursor += 4
298+
void refresh(next)
265299
}, 30_000)
266300
onCleanup(() => {
267301
disposed = true

‎packages/es-app/src/state.tsx‎

Lines changed: 82 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import { createSessionActivity } from "./session-activity"
1717
import { createServerEvents } from "./event-source"
1818
import { resolveProjectName } from "./project-name"
1919
import type { GlobalSession } from "@opencode-ai/sdk/v2"
20+
import type { Event } from "@opencode-ai/sdk/v2"
21+
import { useLocation } from "@solidjs/router"
2022
export { linkUrl } from "./link-url"
2123

2224
export type DotState = "pending" | "busy" | "unread" | "idle"
@@ -63,6 +65,7 @@ type DashboardCtx = {
6365
const Ctx = createContext<DashboardCtx>()
6466

6567
export function DashboardProvider(props: ParentProps) {
68+
const route = useLocation()
6669
const [allProjects, setAllProjectsRaw] = createSignal(localStorage.getItem("es-app-all-projects") === "true")
6770
const setAllProjects = (value: boolean) => {
6871
localStorage.setItem("es-app-all-projects", String(value))
@@ -83,16 +86,91 @@ export function DashboardProvider(props: ParentProps) {
8386
(name) => es.state(name || undefined),
8487
)
8588
const [sessionsError, setSessionsError] = createSignal("")
86-
const [globalSessions, { refetch: refetchGlobal }] = createResource<GlobalSession[]>(async (_, info) => {
89+
let revision = 0
90+
const changed = new Map<string, { revision: number; session: GlobalSession | null }>()
91+
const merge = (sessions: GlobalSession[], updates: Iterable<[string, { session: GlobalSession | null }]>) => {
92+
const rows = new Map(sessions.map((session) => [session.id, session]))
93+
for (const [id, value] of updates) {
94+
if (value.session) rows.set(id, value.session)
95+
else rows.delete(id)
96+
}
97+
return [...rows.values()]
98+
}
99+
const [globalSessions, { refetch: refetchGlobal, mutate: mutateGlobal }] = createResource<GlobalSession[]>(async (_, info) => {
87100
setSessionsError("")
101+
const before = revision
88102
try {
89-
return await oc.allSessions(false)
103+
const sessions = await oc.allSessions(false)
104+
const updates = [...changed].filter(([, item]) => item.revision > before)
105+
for (const [id, item] of changed) if (item.revision <= before) changed.delete(id)
106+
return merge(sessions, updates)
90107
} catch {
91108
setSessionsError("Could not load session relationships. Subagent activity and requests may be incomplete. Retrying automatically.")
92-
return info.value ?? []
109+
return merge(info.value ?? [], changed)
93110
}
94111
})
95-
const activity = createSessionActivity(() => globalSessions() ?? [], refetchGlobal)
112+
const [visibleSessions, setVisibleSessions] = createSignal(new Set<string>())
113+
const PIN_KEY = "es-app-sidebar-pins"
114+
const pinKey = (s: Pick<SessionRow, "id" | "directory">) => JSON.stringify([s.directory, s.id])
115+
const loadPins = () => {
116+
try {
117+
const value: unknown = JSON.parse(localStorage.getItem(PIN_KEY) ?? "[]")
118+
return Array.isArray(value) ? [...new Set(value.filter((key): key is string => typeof key === "string"))] : []
119+
} catch {
120+
return []
121+
}
122+
}
123+
const [pins, setPins] = createSignal<string[]>(loadPins())
124+
const relevantDirectories = () => {
125+
const rows = globalSessions() ?? []
126+
const selected = /^\/session\/([^/]+)/.exec(route.pathname)?.[1]
127+
const ids = new Set([
128+
...visibleSessions(),
129+
...pins().flatMap((key) => rows.filter((row) => pinKey(row) === key).map((row) => row.id)),
130+
...(selected ? [selected] : []),
131+
...(state()?.attention ?? []).flatMap((item: { session?: string }) => item.session ? [item.session] : []),
132+
...(notificationState()?.notifications ?? []).map((item) => item.session),
133+
...(state()?.threads ?? []).flatMap((thread: { sessions?: { id: string; live?: string }[] }) =>
134+
(thread.sessions ?? []).filter((session) => session.live === "busy" || session.live === "retry").map((session) => session.id)),
135+
])
136+
// A visible root needs its descendants' requests even when they have no sidebar rows.
137+
const children = new Map<string, string[]>()
138+
for (const row of rows) {
139+
if (!row.parentID) continue
140+
children.set(row.parentID, [...(children.get(row.parentID) ?? []), row.id])
141+
}
142+
const queue = [...ids]
143+
for (const id of queue) for (const child of children.get(id) ?? []) {
144+
if (ids.has(child)) continue
145+
ids.add(child)
146+
queue.push(child)
147+
}
148+
const dirs = rows.filter((row) => ids.has(row.id)).map((row) => row.directory)
149+
const direct = new URLSearchParams(route.search).get("directory")
150+
if (selected && direct) dirs.push(direct)
151+
dirs.push(...(notificationState()?.notifications ?? []).map((item) => item.directory))
152+
return [...new Set(dirs.filter(Boolean))]
153+
}
154+
const sessionEvent = (event: Event, directory: string) => {
155+
if (event.type !== "session.created" && event.type !== "session.updated" && event.type !== "session.deleted") return false
156+
const info = event.properties.info
157+
if (!info || typeof info !== "object" || !("id" in info) || info.id !== event.properties.sessionID ||
158+
!("directory" in info) || info.directory !== directory || !info.id) return false
159+
const removed = event.type === "session.deleted"
160+
if (!removed && (!("title" in info) || typeof info.title !== "string" ||
161+
!("time" in info) || !info.time || typeof info.time.updated !== "number" ||
162+
!("projectID" in info) || typeof info.projectID !== "string" ||
163+
!("slug" in info) || typeof info.slug !== "string" ||
164+
!("version" in info) || typeof info.version !== "string")) return false
165+
const session = removed ? null : info as GlobalSession
166+
changed.set(info.id, { revision: ++revision, session })
167+
mutateGlobal((previous) => merge(previous ?? [], [[info.id, { session }]]))
168+
return true
169+
}
170+
const activity = createSessionActivity(() => globalSessions() ?? [], refetchGlobal, {
171+
directories: relevantDirectories,
172+
sessionEvent,
173+
})
96174

97175
// one SSE subscription per selected editspace
98176
createEffect(() => {
@@ -112,7 +190,6 @@ export function DashboardProvider(props: ParentProps) {
112190
const [viewed, setViewed] = createSignal<Record<string, number>>(
113191
JSON.parse(localStorage.getItem(VIEWED_KEY) ?? "{}"),
114192
)
115-
const [visibleSessions, setVisibleSessions] = createSignal(new Set<string>())
116193
const [idleSeen, setIdleSeen] = createSignal<Record<string, number>>(
117194
JSON.parse(localStorage.getItem("es-app-idle-seen") ?? "{}"),
118195
)
@@ -197,17 +274,6 @@ export function DashboardProvider(props: ParentProps) {
197274
.filter((s) => !archivedIds().has(s.id))
198275
.sort((a, b) => b.updated - a.updated),
199276
)
200-
const PIN_KEY = "es-app-sidebar-pins"
201-
const pinKey = (s: Pick<SessionRow, "id" | "directory">) => JSON.stringify([s.directory, s.id])
202-
const loadPins = () => {
203-
try {
204-
const value: unknown = JSON.parse(localStorage.getItem(PIN_KEY) ?? "[]")
205-
return Array.isArray(value) ? [...new Set(value.filter((key): key is string => typeof key === "string"))] : []
206-
} catch {
207-
return []
208-
}
209-
}
210-
const [pins, setPins] = createSignal<string[]>(loadPins())
211277
const isPinned = (s: Pick<SessionRow, "id" | "directory">) => pins().includes(pinKey(s))
212278
const togglePin = (s: Pick<SessionRow, "id" | "directory">) => {
213279
const key = pinKey(s)

‎packages/es-app/test/composer-fixture.mjs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ export const createFixture = async () => {
4949
children: new Map(),
5050
permissions: undefined,
5151
questions: [],
52+
permissionsByDirectory: undefined,
53+
questionsByDirectory: undefined,
54+
notifications: undefined,
5255
issue: undefined,
5356
archived: new Set(),
5457
deleted: new Set(),
@@ -176,7 +179,7 @@ export const createFixture = async () => {
176179
unattached_prs: [],
177180
sessions: fixture.sessionIDs.map(session),
178181
})
179-
if (url.pathname === "/api/notifications") return json({ notifications: [] })
182+
if (url.pathname === "/api/notifications") return json({ notifications: fixture.notifications ?? [] })
180183
if (url.pathname === "/api/session-insights") {
181184
if (!fixture.insights) return json({ detail: "Not Found" }, 404)
182185
const reply = fixture.insights(url.searchParams.get("session_id"), url.searchParams.get("directory"))
@@ -234,11 +237,11 @@ export const createFixture = async () => {
234237
])
235238
if (url.pathname === "/permission")
236239
return json(
237-
fixture.permissions ?? [
240+
fixture.permissionsByDirectory?.get(url.searchParams.get("directory")) ?? fixture.permissions ?? [
238241
{ id: "permission-1", sessionID: "ses_a", permission: "bash", patterns: ["fixture command"], metadata: {} },
239242
],
240243
)
241-
if (url.pathname === "/question") return json(fixture.questions)
244+
if (url.pathname === "/question") return json(fixture.questionsByDirectory?.get(url.searchParams.get("directory")) ?? fixture.questions)
242245
const match = /^\/session\/(ses_[\w-]+)(.*)$/.exec(url.pathname)
243246
if (match) {
244247
const [, id, action] = match

‎packages/es-app/test/composer-panel-preview.mjs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import net from "node:net"
33
import { fileURLToPath, pathToFileURL } from "node:url"
44
import { createFixture, directory } from "./composer-fixture.mjs"
55

6-
export const startPanelPreview = async () => {
6+
export const startPanelPreview = async (plugins = []) => {
77
const fixture = await createFixture()
88
fixture.permissions = []
99
fixture.messages = [
@@ -60,6 +60,7 @@ export const startPanelPreview = async () => {
6060
await new Promise((resolve) => probe.close(resolve))
6161
const vite = await createServer({
6262
root: fileURLToPath(new URL("..", import.meta.url)),
63+
plugins,
6364
server: { host: "127.0.0.1", port, strictPort: true },
6465
})
6566
await vite.listen()

0 commit comments

Comments
 (0)