Skip to content

Commit 9cdbc5a

Browse files
committed
fix(effect-acp): honor advertised session delete capability
1 parent c8a606c commit 9cdbc5a

2 files changed

Lines changed: 105 additions & 9 deletions

File tree

‎packages/effect-acp/src/client.test.ts‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,99 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
10421042
}),
10431043
);
10441044

1045+
it.effect.each([
1046+
{ shape: "v1", deleteCapability: {} },
1047+
{ shape: "v2", deleteCapability: {} },
1048+
{ shape: "v2", deleteCapability: undefined },
1049+
{ shape: "v2", deleteCapability: null },
1050+
])(
1051+
"gates session/delete for $shape with delete=$deleteCapability",
1052+
({ shape, deleteCapability }) =>
1053+
Effect.gen(function* () {
1054+
const { stdio, input, output } = yield* makeInMemoryStdio();
1055+
const scope = yield* Scope.make();
1056+
const acp = yield* AcpClient.make(stdio).pipe(Effect.provideService(Scope.Scope, scope));
1057+
1058+
const initializeFiber = yield* acp.agent
1059+
.initialize({
1060+
protocolVersion: 1,
1061+
clientCapabilities: {
1062+
fs: { readTextFile: false, writeTextFile: false },
1063+
terminal: false,
1064+
},
1065+
clientInfo: { name: "effect-acp-test", version: "0.0.0" },
1066+
})
1067+
.pipe(Effect.forkScoped);
1068+
const initializeRequest = yield* Queue.take(output).pipe(
1069+
Effect.flatMap(Schema.decodeEffect(Schema.fromJsonString(InitializeRequestV1))),
1070+
);
1071+
yield* Queue.offer(
1072+
input,
1073+
shape === "v1"
1074+
? yield* encodeJsonl(InitializeResponseV1, {
1075+
jsonrpc: "2.0",
1076+
id: initializeRequest.id,
1077+
result: {
1078+
protocolVersion: 1,
1079+
agentInfo: { name: "kiro-acp", version: "0.0.0" },
1080+
agentCapabilities: {
1081+
sessionCapabilities: { list: {}, resume: {}, close: {}, delete: {} },
1082+
},
1083+
},
1084+
})
1085+
: yield* encodeJsonl(InitializeResponse, {
1086+
jsonrpc: "2.0",
1087+
id: initializeRequest.id,
1088+
result: {
1089+
protocolVersion: 2,
1090+
info: { name: "v2-agent", version: "0.0.0" },
1091+
capabilities: {
1092+
session: deleteCapability === undefined ? {} : { delete: deleteCapability },
1093+
},
1094+
},
1095+
}),
1096+
);
1097+
yield* Fiber.join(initializeFiber);
1098+
1099+
const deleteFailed = yield* Deferred.make<AcpError.AcpError>();
1100+
const deleteFiber = yield* acp.agent.deleteSession({ sessionId: "kiro-session-1" }).pipe(
1101+
Effect.tapError((error) => Deferred.succeed(deleteFailed, error)),
1102+
Effect.forkScoped,
1103+
);
1104+
const outcome = yield* Effect.raceFirst(
1105+
Queue.take(output).pipe(Effect.map((line) => ({ line }))),
1106+
Deferred.await(deleteFailed).pipe(Effect.map((error) => ({ error }))),
1107+
);
1108+
if ("error" in outcome) {
1109+
if (deleteCapability != null) {
1110+
return yield* outcome.error;
1111+
}
1112+
assert.equal(outcome.error._tag, "AcpRequestError");
1113+
assert.equal(
1114+
outcome.error._tag === "AcpRequestError" ? outcome.error.code : undefined,
1115+
-32601,
1116+
);
1117+
yield* Scope.close(scope, Exit.void);
1118+
return;
1119+
}
1120+
assert.exists(deleteCapability, "session/delete reached transport without its capability");
1121+
const deleteRequest = yield* Schema.decodeEffect(
1122+
Schema.fromJsonString(jsonRpcRequest("session/delete", AcpSchemaV1.DeleteSessionRequest)),
1123+
)(outcome.line);
1124+
assert.equal(deleteRequest.params.sessionId, "kiro-session-1");
1125+
yield* Queue.offer(
1126+
input,
1127+
yield* encodeJsonl(jsonRpcResponse(Schema.Unknown), {
1128+
jsonrpc: "2.0",
1129+
id: deleteRequest.id,
1130+
result: {},
1131+
}),
1132+
);
1133+
assert.deepEqual(yield* Fiber.join(deleteFiber), {});
1134+
yield* Scope.close(scope, Exit.void);
1135+
}),
1136+
);
1137+
10451138
it.effect("preserves exact ids for parallel requests with identical payloads", () =>
10461139
Effect.gen(function* () {
10471140
const { stdio, input, output } = yield* makeInMemoryStdio();

‎packages/effect-acp/src/client.ts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
782782
| ((method: string, params: unknown) => Effect.Effect<void, AcpError.AcpError>)
783783
| undefined;
784784
let negotiatedProtocolGeneration: 1 | 2 | undefined;
785+
let sessionDeleteSupported = false;
785786

786787
const runNotificationHandlers = <A>(
787788
registration: BufferedNotificationHandler<A>,
@@ -1081,12 +1082,14 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
10811082
// ACP v1 protocolVersion values were not generation identifiers in
10821083
// every shipped agent. Antigravity, for example, reports version 2
10831084
// with the v1 agentInfo/agentCapabilities response shape.
1084-
if (isV2InitializeResponse(response)) {
1085-
negotiatedProtocolGeneration = 2;
1086-
return normalizeInitializeResponse(response);
1087-
}
1088-
negotiatedProtocolGeneration = 1;
1089-
return response as AcpSchema.InitializeResponse;
1085+
const isV2 = isV2InitializeResponse(response);
1086+
negotiatedProtocolGeneration = isV2 ? 2 : 1;
1087+
const normalized = isV2
1088+
? normalizeInitializeResponse(response)
1089+
: (response as AcpSchema.InitializeResponse);
1090+
sessionDeleteSupported =
1091+
normalized.agentCapabilities?.sessionCapabilities?.delete != null;
1092+
return normalized;
10901093
}),
10911094
),
10921095
authenticate: (payload) =>
@@ -1182,9 +1185,9 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
11821185
Effect.map((response) => response as AcpSchema.CloseSessionResponse),
11831186
),
11841187
deleteSession: (payload) =>
1185-
negotiatedProtocolGeneration === 1
1186-
? Effect.fail(AcpError.AcpRequestError.methodNotFound(AGENT_METHODS.session_delete))
1187-
: callRpc(AGENT_METHODS.session_delete, rpc[AGENT_METHODS.session_delete](payload)),
1188+
sessionDeleteSupported
1189+
? callRpc(AGENT_METHODS.session_delete, rpc[AGENT_METHODS.session_delete](payload))
1190+
: Effect.fail(AcpError.AcpRequestError.methodNotFound(AGENT_METHODS.session_delete)),
11881191
listProviders: (payload) =>
11891192
negotiatedProtocolGeneration === 1
11901193
? Effect.fail(AcpError.AcpRequestError.methodNotFound(AGENT_METHODS.providers_list))

0 commit comments

Comments
 (0)