Skip to content

Commit 5bda979

Browse files
committed
fix(opencode): complete idle child sessions
1 parent c5dc224 commit 5bda979

2 files changed

Lines changed: 47 additions & 7 deletions

File tree

‎apps/server/src/provider/Layers/OpenCodeAdapter.test.ts‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,16 +2157,24 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
21572157
runtimeMock.state.sessionStatus = "busy";
21582158
const busy = promiseWithResolvers<unknown>();
21592159
const childSession = promiseWithResolvers<unknown>();
2160+
const childIdle = promiseWithResolvers<unknown>();
21602161
const idle = promiseWithResolvers<unknown>();
2161-
runtimeMock.state.subscribedEvents = [busy.promise, childSession.promise, idle.promise];
2162+
runtimeMock.state.subscribedEvents = [
2163+
busy.promise,
2164+
childSession.promise,
2165+
childIdle.promise,
2166+
idle.promise,
2167+
];
21622168

21632169
const eventsFiber = yield* adapter.streamEvents.pipe(
21642170
Stream.filter(
21652171
(event) =>
21662172
event.threadId === threadId &&
2167-
(event.type === "task.started" || event.type === "turn.completed"),
2173+
(event.type === "task.started" ||
2174+
event.type === "task.completed" ||
2175+
event.type === "turn.completed"),
21682176
),
2169-
Stream.take(2),
2177+
Stream.take(3),
21702178
Stream.runCollect,
21712179
Effect.forkChild,
21722180
);
@@ -2206,6 +2214,12 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
22062214
});
22072215
yield* Effect.promise(() => requestOpened.promise);
22082216
yield* Effect.yieldNow;
2217+
childIdle.resolve({
2218+
id: "evt-child-ancestry-idle",
2219+
type: "session.status",
2220+
properties: { sessionID: "ses_child", status: { type: "idle" } },
2221+
});
2222+
yield* Effect.yieldNow;
22092223
runtimeMock.state.sessionStatus = "idle";
22102224
idle.resolve({
22112225
id: "evt-child-ancestry-idle",
@@ -2219,9 +2233,9 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
22192233
const events = Array.from(yield* Fiber.join(eventsFiber).pipe(Effect.timeout("1 second")));
22202234
NodeAssert.deepEqual(
22212235
events.map((event) => event.type),
2222-
["task.started", "turn.completed"],
2236+
["task.started", "task.completed", "turn.completed"],
22232237
);
2224-
const completed = events[1];
2238+
const completed = events[2];
22252239
if (completed?.type === "turn.completed") {
22262240
NodeAssert.deepEqual(completed.payload.tokenUsage, {
22272241
usageStatus: "unavailable",

‎apps/server/src/provider/Layers/OpenCodeAdapter.ts‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ function isOpenCodeChildSessionEvent(event: OpenCodeSubscribedEvent): boolean {
329329
return (
330330
event.type === "session.created" ||
331331
event.type === "session.updated" ||
332-
event.type === "session.deleted"
332+
event.type === "session.deleted" ||
333+
event.type === "session.status"
333334
);
334335
}
335336

@@ -2311,7 +2312,11 @@ export function makeOpenCodeAdapter(
23112312
!context.relatedSessionIds.has(payloadSessionId) &&
23122313
(isOpenCodeChildRequestEvent(event) || isOpenCodeChildSessionEvent(event))
23132314
) {
2314-
if (isOpenCodeChildSessionEvent(event)) {
2315+
if (
2316+
event.type === "session.created" ||
2317+
event.type === "session.updated" ||
2318+
event.type === "session.deleted"
2319+
) {
23152320
yield* scheduleChildSessionRelationRetry(context, event);
23162321
return;
23172322
} else if (event.type === "permission.asked") {
@@ -2725,6 +2730,27 @@ export function makeOpenCodeAdapter(
27252730
}
27262731

27272732
case "session.status": {
2733+
if (!isParentEvent) {
2734+
if (event.properties.status.type === "idle") {
2735+
const sessionId = event.properties.sessionID;
2736+
yield* emit({
2737+
...(yield* buildEventBase({
2738+
threadId: context.session.threadId,
2739+
turnId,
2740+
itemId: sessionId,
2741+
raw: event,
2742+
})),
2743+
type: "task.completed",
2744+
payload: {
2745+
taskId: sessionId,
2746+
taskType: "local_agent",
2747+
status: "completed",
2748+
summary: "Completed",
2749+
},
2750+
});
2751+
}
2752+
break;
2753+
}
27282754
if (event.properties.status.type === "busy" || event.properties.status.type === "retry") {
27292755
if (turnId === undefined) {
27302756
break;

0 commit comments

Comments
 (0)