Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(acp): share turn-end prompt settlement

Browse Source
This commit is contained in:
Tianyi Cui
2026-06-19 01:45:21 +08:00
parent a9c36ad576
commit deeb3c9e6d
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/acp/src/index.ts
View File

@@ -59,7 +59,7 @@ import {
} from '@agentclientprotocol/sdk' } from '@agentclientprotocol/sdk'
import type { ContentBlock } from '@deepseek-ai/dsh-llm' import type { ContentBlock } from '@deepseek-ai/dsh-llm'
import type { Agent, AgentStatus } from '@deepseek-ai/dsh-agent' import type { Agent, AgentStatus } from '@deepseek-ai/dsh-agent'
import type { SessionEvent } from '@deepseek-ai/dsh-session' import type { SessionEvent, TurnEndReason } from '@deepseek-ai/dsh-session'
import type { ToolCallKind, ToolCallPresentation, ToolRegistry, ToolResultPresentation, ToolTerminal } from '@deepseek-ai/dsh-tools' import type { ToolCallKind, ToolCallPresentation, ToolRegistry, ToolResultPresentation, ToolTerminal } from '@deepseek-ai/dsh-tools'
// Side-effect type import: declaration-merges `ctx.sessionPersistence` onto // Side-effect type import: declaration-merges `ctx.sessionPersistence` onto
// Context (the bridge injects it and reads `list()` for load cwd validation). // Context (the bridge injects it and reads `list()` for load cwd validation).
@@ -282,6 +282,18 @@ export function apply(ctx: Context, config: AcpConfig): void {
inflight.resolve(reason) inflight.resolve(reason)
} }
/** Apply the single ACP prompt-settlement mapping for a completed turn. */
const settleFromTurnEnd = (
inflight: NonNullable<SessionRecord['inflight']>,
reason: TurnEndReason,
): void => {
if (reason.kind === 'error') {
inflight.reject(internalError(`turn failed: ${reason.message}`))
} else {
inflight.resolve(turnEndToStopReason(reason))
}
}
// --- Stream the harness event taxonomy to ACP session/update -------------- // --- Stream the harness event taxonomy to ACP session/update --------------
// All content streaming AND the prompt settle flow through `session/event`, // All content streaming AND the prompt settle flow through `session/event`,
@@ -327,12 +339,7 @@ export function apply(ctx: Context, config: AcpConfig): void {
// Settle only on the OWNING turn's end. // Settle only on the OWNING turn's end.
if (event.type !== 'turn/end' || inflight.turn !== event.data.turn) return if (event.type !== 'turn/end' || inflight.turn !== event.data.turn) return
rec.inflight = undefined rec.inflight = undefined
const reason = event.data.reason settleFromTurnEnd(inflight, event.data.reason)
if (reason.kind === 'error') {
inflight.reject(internalError(`turn failed: ${reason.message}`))
} else {
inflight.resolve(turnEndToStopReason(reason))
}
}) })
// Settle fallback: a `session/event` listener registered BEFORE ACP that // Settle fallback: a `session/event` listener registered BEFORE ACP that
@@ -373,12 +380,7 @@ export function apply(ctx: Context, config: AcpConfig): void {
inflight.resolve('cancelled') inflight.resolve('cancelled')
return return
} }
const reason = end.data.reason settleFromTurnEnd(inflight, end.data.reason)
if (reason.kind === 'error') {
inflight.reject(internalError(`turn failed: ${reason.message}`))
} else {
inflight.resolve(turnEndToStopReason(reason))
}
} }
// On a settle to idle/disposed, reconcile any still-pending prompt from the // On a settle to idle/disposed, reconcile any still-pending prompt from the