Skip to content
Open
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
38 changes: 23 additions & 15 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions examples/combined-app/src/client/hooks/useACPAgent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ import {
isFromAgent,
extractACPUserMessage,
} from "@runloop/remote-agents-sdk/acp";
import type { AuthMethod, ElicitationAction, SessionUpdate, ACPTimelineEvent, InitializeResponse } from "@runloop/remote-agents-sdk/acp";
import type {
AuthMethod,
CreateElicitationResponse,
SessionUpdate,
ACPTimelineEvent,
InitializeResponse,
} from "@runloop/remote-agents-sdk/acp";
import type { WsEvent } from "../../shared/ws-events.js";
import type {
TurnBlock,
Expand Down Expand Up @@ -101,7 +107,7 @@ export interface UseACPAgentReturn {
respondToPermission: (requestId: string, optionId: string) => Promise<void>;
cancelPermission: (requestId: string) => Promise<void>;
setAutoApprovePermissions: (enabled: boolean) => Promise<void>;
respondToElicitation: (requestId: string, action: ElicitationAction) => Promise<void>;
respondToElicitation: (requestId: string, response: CreateElicitationResponse) => Promise<void>;
shutdown: () => Promise<void>;
createNewSession: () => Promise<void>;
switchSession: (sessionId: string) => Promise<void>;
Expand Down Expand Up @@ -704,9 +710,9 @@ export function useACPAgent(agentId: string | null): UseACPAgentReturn {
}
}, [agentId]);

const respondToElicitation = useCallback(async (requestId: string, action: ElicitationAction) => {
const respondToElicitation = useCallback(async (requestId: string, response: CreateElicitationResponse) => {
dispatch({ type: "SET", patch: { pendingElicitation: null } });
try { await api("/api/elicitation-response", { agentId, requestId, action }); } catch (err) {
try { await api("/api/elicitation-response", { agentId, requestId, response }); } catch (err) {
dispatch({ type: "SET", patch: { error: err instanceof Error ? err.message : String(err) } });
}
}, [agentId]);
Expand Down
53 changes: 31 additions & 22 deletions examples/combined-app/src/server/acp-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type {
RequestPermissionRequest,
RequestPermissionResponse,
SessionNotification,
ElicitationRequest,
ElicitationResponse,
CreateElicitationRequest,
CreateElicitationResponse,
} from "@runloop/remote-agents-sdk/acp";
import { CLIENT_METHODS } from "@runloop/remote-agents-sdk/acp";
import type { BaseWsEvent } from "../shared/ws-events.ts";
Expand All @@ -25,7 +25,7 @@ export class NodeACPClient implements Client {
private pendingElicitations = new Map<
string,
{
resolve: (resp: ElicitationResponse) => void;
resolve: (resp: CreateElicitationResponse) => void;
reject: (err: Error) => void;
}
>();
Expand Down Expand Up @@ -56,7 +56,7 @@ export class NodeACPClient implements Client {
}
}

resolveElicitation(requestId: string, response: ElicitationResponse): void {
resolveElicitation(requestId: string, response: CreateElicitationResponse): void {
const pending = this.pendingElicitations.get(requestId);
if (pending) {
pending.resolve(response);
Expand Down Expand Up @@ -103,16 +103,34 @@ export class NodeACPClient implements Client {
"session/prompt",
]);

async unstable_completeElicitation(): Promise<void> {
for (const [id, pending] of this.pendingElicitations) {
pending.reject(new Error("Elicitation completed by agent"));
this.pendingElicitations.delete(id);
}
this.emit({ type: "elicitation_dismissed" });
}

async unstable_createElicitation(
request: CreateElicitationRequest,
): Promise<CreateElicitationResponse> {
const requestId = `elicit-${++this.elicitationCounter}`;

this.emit({ type: "elicitation_request", requestId, request });

return await new Promise<CreateElicitationResponse>(
(resolve, reject) => {
this.pendingElicitations.set(requestId, { resolve, reject });
},
);
}

async extNotification(
method: string,
params: Record<string, unknown>,
): Promise<void> {
if (method === CLIENT_METHODS.session_elicitation_complete) {
for (const [id, pending] of this.pendingElicitations) {
pending.reject(new Error("Elicitation completed by agent"));
this.pendingElicitations.delete(id);
}
this.emit({ type: "elicitation_dismissed" });
if (method === CLIENT_METHODS.elicitation_complete) {
await this.unstable_completeElicitation();
return;
}
if (NodeACPClient.IGNORED_NOTIFICATIONS.has(method)) return;
Expand All @@ -123,21 +141,12 @@ export class NodeACPClient implements Client {
method: string,
params: Record<string, unknown>,
): Promise<Record<string, unknown>> {
if (method === CLIENT_METHODS.session_elicitation) {
const request = params as unknown as ElicitationRequest;
const requestId = `elicit-${++this.elicitationCounter}`;

this.emit({ type: "elicitation_request", requestId, request });

const response = await new Promise<ElicitationResponse>(
(resolve, reject) => {
this.pendingElicitations.set(requestId, { resolve, reject });
},
if (method === CLIENT_METHODS.elicitation_create) {
const response = await this.unstable_createElicitation(
params as unknown as CreateElicitationRequest,
);

return response as unknown as Record<string, unknown>;
}

throw new Error(`Unknown ext method: ${method}`);
}

Expand Down
2 changes: 1 addition & 1 deletion examples/combined-app/src/server/routes/acp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function registerACPRoutes(app: Express, registry: AgentRegistry) {
}
entry
.acpManager!.requireClient()
.resolveElicitation(req.body.requestId, { action: req.body.action });
.resolveElicitation(req.body.requestId, req.body.response);
res.json({ ok: true });
}),
);
Expand Down
8 changes: 6 additions & 2 deletions examples/combined-app/src/shared/ws-events.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import type { ACPTimelineEvent, ElicitationRequest, RequestPermissionRequest } from "@runloop/remote-agents-sdk/acp";
import type {
ACPTimelineEvent,
CreateElicitationRequest,
RequestPermissionRequest,
} from "@runloop/remote-agents-sdk/acp";
import type { ClaudeTimelineEvent, SDKControlRequest } from "@runloop/remote-agents-sdk/claude";

export type BaseWsEvent =
Expand All @@ -8,7 +12,7 @@ export type BaseWsEvent =
| { type: "control_request"; controlRequest: SDKControlRequest }
| { type: "permission_request"; requestId: string; request: RequestPermissionRequest }
| { type: "permission_dismissed" }
| { type: "elicitation_request"; requestId: string; request: ElicitationRequest }
| { type: "elicitation_request"; requestId: string; request: CreateElicitationRequest }
| { type: "elicitation_dismissed" };

export type WsEvent = BaseWsEvent & { agentId: string };
2 changes: 1 addition & 1 deletion sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"docs": "typedoc"
},
"dependencies": {
"@agentclientprotocol/sdk": "0.18.0"
"@agentclientprotocol/sdk": "0.21.0"
},
"peerDependencies": {
"@anthropic-ai/claude-agent-sdk": ">=0.2.90",
Expand Down
4 changes: 2 additions & 2 deletions sdk/src/acp/axon-stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import type { AxonStreamOptions } from "./types.js";
* Set of event_types that are notifications (no request ID correlation).
* `session/update` is the main one -- the broker sends streaming chunks,
* tool calls, plan updates, etc. as session/update notifications.
* `session/elicitation/complete` signals elicitation finished (no response expected).
* `elicitation/complete` signals elicitation finished (no response expected).
*/
const NOTIFICATION_TYPES = new Set<string>([
CLIENT_METHODS.session_update,
CLIENT_METHODS.session_elicitation_complete,
CLIENT_METHODS.elicitation_complete,
]);

/**
Expand Down
Loading
Loading