Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions packages/agent/src/adapters/claude/claude-agent.refresh.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,29 @@ describe("ClaudeAcpAgent.extMethod refresh_session", () => {
);
});

it("recovers when interrupting the old query throws Operation aborted", async () => {
const agent = makeAgent();
const { session, oldQuery, endSpy } = installFakeSession(
agent,
"s-interrupt-throws",
);
oldQuery.interrupt.mockRejectedValue(new Error("Operation aborted"));

const result = await agent.extMethod(POSTHOG_METHODS.REFRESH_SESSION, {
mcpServers: freshMcpServers,
});

expect(result).toEqual({ refreshed: true });
expect(endSpy).toHaveBeenCalledTimes(1);
const updated = session as unknown as {
query: SdkQueryHandle;
abortController: AbortController;
};
expect(updated.query).toBe(createdQueries[0]);
expect(updated.query).not.toBe(oldQuery);
expect(updated.abortController.signal.aborted).toBe(false);
});

it("re-fetches MCP tool metadata for the new query", async () => {
const agent = makeAgent();
installFakeSession(agent, "s-metadata");
Expand Down
9 changes: 8 additions & 1 deletion packages/agent/src/adapters/claude/claude-agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,14 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
// We allocate a fresh controller for the new Query below so aborting
// the old one doesn't poison it.
prev.abortController.abort();
await prev.query.interrupt();
try {
await prev.query.interrupt();
} catch (error) {
this.logger.debug("Ignoring interrupt error during session refresh", {
sessionId: this.sessionId,
error: error instanceof Error ? error.message : String(error),
});
}
prev.input.end();

// Reuse every option from the running session; swap mcpServers, re-root
Expand Down
Loading