Skip to content

Commit 75df496

Browse files
committed
fix(client): ignore foreign-session events until session is followed
1 parent 22e771f commit 75df496

3 files changed

Lines changed: 132 additions & 1 deletion

File tree

‎packages/client/src/solid/data.ts‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ export type CreateDataInput = {
7878
}
7979
/** Receives failed event-driven reads. Explicit reads still reject to their caller. */
8080
readonly onError?: (error: unknown) => void
81+
/** Predicate returning whether a session is followed and eligible to project live events. */
82+
readonly isFollowed?: (sessionID: string) => boolean
8183
}
8284

8385
const messageIDFromEvent = (eventID: string) => eventID.replace(/^evt_/, "msg_")
@@ -284,7 +286,20 @@ export function createData(config: CreateDataInput) {
284286
let activeUpdates: Map<string, DataSessionStatus | undefined> | undefined
285287
const pendingUpdates = new Map<string, Map<string, SessionInboxInfo | SessionInbox.Delivery | undefined>>()
286288

289+
function isFollowed(sessionID: string): boolean {
290+
if (config.isFollowed) {
291+
if (config.isFollowed(sessionID)) return true
292+
const root = resolveRoot(sessionID)
293+
if (root !== sessionID && config.isFollowed(root)) return true
294+
if (store.session.message[sessionID] !== undefined) return true
295+
if (root !== sessionID && store.session.message[root] !== undefined) return true
296+
return false
297+
}
298+
return true
299+
}
300+
287301
function setSessionActive(sessionID: string, status: DataSessionStatus) {
302+
if (!store.session.info[sessionID] && !isFollowed(sessionID)) return
288303
activeUpdates?.set(sessionID, status)
289304
setStore("session", "active", sessionID, status)
290305
}
@@ -448,10 +463,12 @@ export function createData(config: CreateDataInput) {
448463

449464
const message = {
450465
update(sessionID: string, fn: (messages: SessionMessageInfo[], index: Map<string, number>) => void) {
466+
if (!isFollowed(sessionID) && store.session.message[sessionID] === undefined) return
451467
setStore(
452468
"session",
453469
"message",
454470
produce((draft) => {
471+
if (!isFollowed(sessionID) && draft[sessionID] === undefined) return
455472
fn((draft[sessionID] ??= []), index(sessionID))
456473
}),
457474
)
@@ -668,7 +685,7 @@ export function createData(config: CreateDataInput) {
668685
case "project.updated":
669686
setStore("project", "info", event.data.id, reconcile(event.data))
670687
return
671-
case "session.created":
688+
case "session.created": {
672689
sessionOutbox.delete(event.data.sessionID)
673690
result.session.invalidate(event.data.sessionID)
674691
refresh(() => result.session.sync(event.data.sessionID))
@@ -679,6 +696,7 @@ export function createData(config: CreateDataInput) {
679696
sync.complete(`session.pending:${event.data.sessionID}`)
680697
sync.complete(`session.message:${event.data.sessionID}`)
681698
return
699+
}
682700
case "session.deleted":
683701
removeSession(event.data.sessionID)
684702
return
@@ -814,6 +832,7 @@ export function createData(config: CreateDataInput) {
814832
return
815833
}
816834
case "session.inbox.enqueued": {
835+
if (!isFollowed(event.data.sessionID)) return
817836
outbox.delete(event.data.inboxID)
818837
const item = {
819838
id: event.data.inboxID,
@@ -832,6 +851,7 @@ export function createData(config: CreateDataInput) {
832851
return
833852
}
834853
case "session.instructions.updated":
854+
if (!isFollowed(event.data.sessionID)) return
835855
// Mirror the projector: the initial baseline and empty-rendering deltas carry no text
836856
// and produce no transcript message.
837857
const updateText = event.data.text
@@ -846,6 +866,7 @@ export function createData(config: CreateDataInput) {
846866
})
847867
return
848868
case "session.synthetic":
869+
if (!isFollowed(event.data.sessionID)) return
849870
message.insert(event.data.sessionID, {
850871
id: messageIDFromEvent(event.id),
851872
type: "synthetic",
@@ -856,6 +877,7 @@ export function createData(config: CreateDataInput) {
856877
})
857878
return
858879
case "session.shell.started":
880+
if (!isFollowed(event.data.sessionID)) return
859881
message.insert(event.data.sessionID, {
860882
id: messageIDFromEvent(event.id),
861883
type: "shell",
@@ -869,6 +891,7 @@ export function createData(config: CreateDataInput) {
869891
})
870892
return
871893
case "session.shell.ended":
894+
if (!isFollowed(event.data.sessionID)) return
872895
message.update(event.data.sessionID, (draft) => {
873896
const match = message.shell(draft, event.data.shell.id)
874897
if (!match) return
@@ -879,6 +902,7 @@ export function createData(config: CreateDataInput) {
879902
})
880903
return
881904
case "session.step.started":
905+
if (!isFollowed(event.data.sessionID)) return
882906
message.update(event.data.sessionID, (draft, index) => {
883907
const position = index.get(event.data.assistantMessageID)
884908
const existing = position === undefined ? undefined : draft[position]
@@ -1053,6 +1077,7 @@ export function createData(config: CreateDataInput) {
10531077
setSessionActive(event.data.sessionID, "running")
10541078
return
10551079
case "session.compaction.started":
1080+
if (!isFollowed(event.data.sessionID)) return
10561081
if (event.data.inputID) removePending(event.data.sessionID, event.data.inputID)
10571082
message.insert(event.data.sessionID, {
10581083
id: event.data.inputID ?? messageIDFromEvent(event.id),
@@ -1069,6 +1094,7 @@ export function createData(config: CreateDataInput) {
10691094
case "session.execution.failed":
10701095
case "session.execution.interrupted":
10711096
setSessionActive(event.data.sessionID, "idle")
1097+
if (!isFollowed(event.data.sessionID) && !store.session.message[event.data.sessionID]) return
10721098
message.update(event.data.sessionID, (draft) => {
10731099
const currentAssistant = message.activeAssistant(draft)
10741100
if (currentAssistant) currentAssistant.retry = undefined
@@ -1136,12 +1162,14 @@ export function createData(config: CreateDataInput) {
11361162
})
11371163
return
11381164
case "session.compaction.delta":
1165+
if (!isFollowed(event.data.sessionID)) return
11391166
message.update(event.data.sessionID, (draft) => {
11401167
const current = message.compaction(draft)
11411168
if (current?.status === "running") current.summary += event.data.text
11421169
})
11431170
return
11441171
case "session.compaction.ended":
1172+
if (!isFollowed(event.data.sessionID)) return
11451173
message.update(event.data.sessionID, (draft, index) => {
11461174
const position = draft.findLastIndex((item) => item.type === "compaction" && item.status === "running")
11471175
const current = draft[position]
@@ -1176,6 +1204,7 @@ export function createData(config: CreateDataInput) {
11761204
})
11771205
return
11781206
case "session.compaction.failed":
1207+
if (!isFollowed(event.data.sessionID)) return
11791208
if (event.data.inputID) removePending(event.data.sessionID, event.data.inputID)
11801209
message.update(event.data.sessionID, (draft, index) => {
11811210
const position = draft.findLastIndex((item) => item.type === "compaction" && item.status === "running")
@@ -1204,6 +1233,7 @@ export function createData(config: CreateDataInput) {
12041233
return
12051234
case "permission.asked":
12061235
if (store.session.permission[event.data.sessionID]?.some((request) => request.id === event.data.id)) return
1236+
if (!store.session.info[event.data.sessionID] && !isFollowed(event.data.sessionID)) return
12071237
setStore("session", "permission", event.data.sessionID, [
12081238
...(store.session.permission[event.data.sessionID] ?? []),
12091239
event.data,
@@ -1249,6 +1279,8 @@ export function createData(config: CreateDataInput) {
12491279

12501280
if (!event.location) return
12511281
const location = event.location
1282+
const locKey = locationKey(location)
1283+
if (!store.location[locKey] && locKey !== locationKey(defaultLocation())) return
12521284
switch (event.type) {
12531285
case "provider.updated":
12541286
result.location.provider.invalidate(location)
@@ -1281,6 +1313,7 @@ export function createData(config: CreateDataInput) {
12811313
}))
12821314
break
12831315
case "form.created":
1316+
if (event.data.form.sessionID !== "global" && !store.session.info[event.data.form.sessionID] && !isFollowed(event.data.form.sessionID)) break
12841317
if (store.session.form[event.data.form.sessionID]?.some((form) => form.id === event.data.form.id)) break
12851318
setStore("session", "form", event.data.form.sessionID, [
12861319
...(store.session.form[event.data.form.sessionID] ?? []),

‎packages/client/test/solid-data.test.ts‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,3 +1245,93 @@ async function wait(check: () => boolean) {
12451245
await Bun.sleep(10)
12461246
}
12471247
}
1248+
1249+
test("ignores foreign session transcript events until followed while preserving subagent family events", async () => {
1250+
const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
1251+
const api = OpenCode.make({
1252+
baseUrl: "http://opencode.local",
1253+
fetch: async (input, init) => {
1254+
const request = input instanceof Request ? input : new Request(input, init)
1255+
const path = new URL(request.url).pathname
1256+
if (path === "/api/session/ses_child") {
1257+
return Response.json({ data: { ...session(0), id: "ses_child", parentID: "ses_active" } })
1258+
}
1259+
if (path === "/api/session/ses_foreign") {
1260+
return Response.json({ data: { ...session(0), id: "ses_foreign" } })
1261+
}
1262+
return Response.json([])
1263+
},
1264+
})
1265+
1266+
let activeSessionID = "ses_active"
1267+
const setup = createRoot((dispose) => ({
1268+
data: createData({
1269+
api: () => api,
1270+
directory: "/project",
1271+
isFollowed: (sessionID) => sessionID === activeSessionID,
1272+
event: {
1273+
on: () => () => {},
1274+
listen(handler) {
1275+
listeners.add(handler)
1276+
return () => listeners.delete(handler)
1277+
},
1278+
},
1279+
}),
1280+
emit: (details: OpenCodeEvent) => listeners.forEach((listener) => listener({ name: details.type, details })),
1281+
dispose,
1282+
}))
1283+
1284+
try {
1285+
// 1. Foreign session step/message event should NOT allocate message list or index
1286+
setup.emit({
1287+
type: "session.step.started",
1288+
id: "evt_foreign_step",
1289+
created: 1,
1290+
data: {
1291+
sessionID: "ses_foreign",
1292+
assistantMessageID: "msg_foreign_1",
1293+
started: 1,
1294+
agent: "build",
1295+
model: { providerID: "provider", id: "model" },
1296+
},
1297+
} as any)
1298+
expect(setup.data.session.message.list("ses_foreign")).toHaveLength(0)
1299+
1300+
// 2. Subagent child created under followed parent
1301+
setup.emit({
1302+
type: "session.created",
1303+
id: "evt_child_created",
1304+
created: 2,
1305+
data: { sessionID: "ses_child" },
1306+
} as any)
1307+
await wait(() => setup.data.session.get("ses_child")?.parentID === "ses_active")
1308+
expect(setup.data.session.root("ses_child")).toBe("ses_active")
1309+
1310+
// 3. Subagent child permission is preserved and visible
1311+
setup.emit({
1312+
type: "permission.asked",
1313+
id: "evt_child_perm",
1314+
created: 3,
1315+
data: {
1316+
id: "perm_1",
1317+
sessionID: "ses_child",
1318+
permission: "terminal.execute",
1319+
patterns: ["ls"],
1320+
metadata: {},
1321+
always: [],
1322+
},
1323+
} as any)
1324+
expect(setup.data.session.permission.list("ses_child")).toHaveLength(1)
1325+
1326+
// 4. Followed active session events project normally
1327+
setup.emit({
1328+
type: "session.execution.started",
1329+
id: "evt_active_started",
1330+
created: 4,
1331+
data: { sessionID: "ses_active" },
1332+
} as any)
1333+
expect(setup.data.session.status("ses_active")).toBe("running")
1334+
} finally {
1335+
setup.dispose()
1336+
}
1337+
})

‎packages/tui/src/context/data.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { Plugin } from "@opencode/plugin/tui"
44
import { createStore } from "solid-js/store"
55
import { createSimpleContext } from "./helper"
66
import { useClient } from "./client"
7+
import { useRoute } from "./route"
78

89
export { locationKey } from "@opencode/client/solid"
910
export type { FormWithLocation } from "@opencode/client/solid"
@@ -12,11 +13,18 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
1213
name: "Data",
1314
init: (props: { directory: string }) => {
1415
const client = useClient()
16+
let route: ReturnType<typeof useRoute> | undefined
17+
try {
18+
route = useRoute()
19+
} catch {
20+
// Allow mounting DataProvider outside RouteProvider in isolated unit tests
21+
}
1522
const data = createData({
1623
api: () => client.api,
1724
event: client.event,
1825
connection: client.connection,
1926
directory: props.directory,
27+
isFollowed: (sessionID) => (route ? route.data.type === "session" && route.data.sessionID === sessionID : true),
2028
})
2129
data satisfies Plugin.Context["data"]
2230
const [generatingTitles, setGeneratingTitles] = createStore<Record<string, boolean | undefined>>({})

0 commit comments

Comments
 (0)