jerry/claude-agent-acp
1
0
Fork 0
mirror of https://github.com/agentclientprotocol/claude-agent-acp.git synced 2026-10-27 12:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use idle session state as end of turn (#463)

Browse Source 
According to the type docs, this should be a more reliable indicator of
turn end:

> Mirrors notifySessionStateChanged. 'idle' fires after heldBackResult
  flushes and the bg-agent do-while exits — authoritative turn-over
  signal.
This commit is contained in:
Ben Brandt
2026-03-25 22:50:01 +01:00
committed by GitHub
parent 3500b6c16e
commit 7f1c6c2078
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/acp-agent.ts
View File

@@ -557,6 +557,12 @@ export class ClaudeAcpAgent implements Agent {
promptReplayed = true;
break;
}
case "session_state_changed": {
if (message.state === "idle") {
return { stopReason: "end_turn", usage: sessionUsage(session) };
}
break;
}
case "hook_started":
case "hook_progress":
case "hook_response":
@@ -566,7 +572,6 @@ export class ClaudeAcpAgent implements Agent {
case "task_progress":
case "elicitation_complete":
case "api_retry":
case "session_state_changed":
// Todo: process via status api: https://docs.claude.com/en/docs/claude-code/hooks#hook-output
break;
default:
@@ -619,17 +624,7 @@ export class ClaudeAcpAgent implements Agent {
}
// Build the usage response
const usage: PromptResponse["usage"] = {
inputTokens: session.accumulatedUsage.inputTokens,
outputTokens: session.accumulatedUsage.outputTokens,
cachedReadTokens: session.accumulatedUsage.cachedReadTokens,
cachedWriteTokens: session.accumulatedUsage.cachedWriteTokens,
totalTokens:
session.accumulatedUsage.inputTokens +
session.accumulatedUsage.outputTokens +
session.accumulatedUsage.cachedReadTokens +
session.accumulatedUsage.cachedWriteTokens,
};
const usage = sessionUsage(session);
switch (message.subtype) {
case "success": {
@@ -656,9 +651,9 @@ export class ClaudeAcpAgent implements Agent {
await this.client.sessionUpdate(notification);
}
}
return { stopReason: "end_turn", usage };
break;
}
case "error_during_execution":
case "error_during_execution": {
if (message.stop_reason === "max_tokens") {
return { stopReason: "max_tokens", usage };
}
@@ -668,7 +663,8 @@ export class ClaudeAcpAgent implements Agent {
message.errors.join(", ") || message.subtype,
);
}
return { stopReason: "end_turn", usage };
break;
}
case "error_max_budget_usd":
case "error_max_turns":
case "error_max_structured_output_retries":
@@ -715,6 +711,7 @@ export class ClaudeAcpAgent implements Agent {
promptReplayed = true;
break;
}
const pending = session.pendingMessages.get(message.uuid as string);
if (pending) {
pending.resolve(false);
@@ -722,7 +719,7 @@ export class ClaudeAcpAgent implements Agent {
handedOff = true;
// the current loop stops with end_turn,
// the loop of the next prompt continues running
return { stopReason: "end_turn" };
return { stopReason: "end_turn", usage: sessionUsage(session) };
}
if ("isReplay" in message && message.isReplay) {
// not pending or unrelated replay message
@@ -1350,6 +1347,8 @@ export class ClaudeAcpAgent implements Agent {
...process.env,
...userProvidedOptions?.env,
...createEnvForGateway(this.gatewayAuthMeta),
// Opt-in to session state events like when the agent is idle
CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: "1",
},
// Override certain fields that must be controlled by ACP
cwd: params.cwd,
@@ -1515,6 +1514,20 @@ export class ClaudeAcpAgent implements Agent {
}
}
function sessionUsage(session: Session) {
return {
inputTokens: session.accumulatedUsage.inputTokens,
outputTokens: session.accumulatedUsage.outputTokens,
cachedReadTokens: session.accumulatedUsage.cachedReadTokens,
cachedWriteTokens: session.accumulatedUsage.cachedWriteTokens,
totalTokens:
session.accumulatedUsage.inputTokens +
session.accumulatedUsage.outputTokens +
session.accumulatedUsage.cachedReadTokens +
session.accumulatedUsage.cachedWriteTokens,
};
}
function createEnvForGateway(gatewayMeta?: GatewayAuthMeta) {
if (!gatewayMeta) {
return {};