Skip to content

Commit 2c33922

Browse files
authored
refactor(acp): run ACP turns as interruptible effects (#52503)
1 parent 7e42a89 commit 2c33922

12 files changed

Lines changed: 1425 additions & 878 deletions

File tree

‎packages/cli/src/acp/agent.ts‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,26 @@ export const connect = Effect.fnUntraced(function* (client: OpenCodeClient, stre
100100
// `stopReason: "cancelled"`.
101101
request(
102102
"session/prompt",
103-
handle((service, ctx) => ACPPromise.promise(() => service.prompt(ctx.params, ctx.signal))),
103+
handle((service, ctx) => service.prompt(ctx.params, ctx.signal)),
104104
)
105105
notification(
106106
"session/cancel",
107-
handle((service, ctx) => ACPPromise.promise(() => service.cancel(ctx.params))),
107+
handle((service, ctx) => service.cancel(ctx.params)),
108108
)
109-
const connection = app.connect(stream)
110-
const promiseConnection = ACPConnection.promise(connection)
111-
const sessions = yield* ACPSessions.make({ client, connection: ACPConnection.make(connection), catalog })
109+
const agentConnection = app.connect(stream)
110+
const connection = ACPConnection.make(agentConnection)
111+
const sessions = yield* ACPSessions.make({ client, connection, catalog })
112112
const capabilities = yield* Ref.make({ childSessionUpdates: false })
113-
const turn = ACPTurn.make({ client, connection: promiseConnection, sessions, catalog, capabilities, run })
114-
yield* Deferred.succeed(
115-
ready,
116-
ACPService.make({ client, connection: promiseConnection, catalog, sessions, capabilities, turn }),
117-
)
118-
return connection
113+
const turn = yield* ACPTurn.make({
114+
client,
115+
connection,
116+
permissions: ACPConnection.promise(agentConnection),
117+
sessions,
118+
catalog,
119+
capabilities,
120+
})
121+
yield* Deferred.succeed(ready, ACPService.make({ client, connection, catalog, sessions, capabilities, turn }))
122+
return agentConnection
119123
})
120124

121125
const spanName = (method: string) => `cli.acp.${method.replaceAll("/", ".")}`

‎packages/cli/src/acp/connection.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ import { ACPPromise } from "./promise"
1313

1414
export interface Interface {
1515
readonly sessionUpdate: (params: SessionNotification) => Effect.Effect<void, ACPError.Error | RequestError>
16+
readonly extNotification: (
17+
method: string,
18+
params: Record<string, unknown>,
19+
) => Effect.Effect<void, ACPError.Error | RequestError>
1620
}
1721

1822
export class Service extends Context.Service<Service, Interface>()("@opencode/cli/acp/Connection") {}
@@ -21,24 +25,19 @@ export function make(connection: AgentConnection) {
2125
return Service.of({
2226
sessionUpdate: (params) =>
2327
ACPPromise.promise(() => connection.client.notify(methods.client.session.update, params)),
28+
extNotification: (method, params) => ACPPromise.promise(() => connection.client.notify(method, params)),
2429
})
2530
}
2631

2732
export type Connection = {
28-
readonly signal?: AbortSignal
29-
sessionUpdate(params: SessionNotification): Promise<void>
3033
requestPermission(params: RequestPermissionRequest, options?: SendRequestOptions): Promise<RequestPermissionResponse>
31-
extNotification?(method: string, params: Record<string, unknown>): Promise<void>
3234
}
3335

34-
/** Promise view for the turn, permission, and replay code until they run as effects. */
36+
/** Promise view for permission requests until they run as effects. */
3537
export function promise(connection: AgentConnection): Connection {
3638
return {
37-
signal: connection.signal,
38-
sessionUpdate: (params) => connection.client.notify(methods.client.session.update, params),
3939
requestPermission: (params, options) =>
4040
connection.client.request(methods.client.session.requestPermission, params, options),
41-
extNotification: (method, params) => connection.client.notify(method, params),
4241
}
4342
}
4443

0 commit comments

Comments
 (0)