Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

feat(eve): stream resolved human input to clients (#2210)

vercel-gh-bot-4[bot]e1ebb53ea425
diff --git a/.changeset/tidy-input-history.md b/.changeset/tidy-input-history.md
new file mode 100644
index 000000000..b164d26a9
--- /dev/null
+++ b/.changeset/tidy-input-history.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Emit durable `input.resolved` stream events with server-accepted human-input outcomes and responses so clients can persist and replay HITL state.
diff --git a/docs/concepts/sessions-runs-and-streaming.md b/docs/concepts/sessions-runs-and-streaming.md
index f25fea304..5295165ff 100644
--- a/docs/concepts/sessions-runs-and-streaming.md
+++ b/docs/concepts/sessions-runs-and-streaming.md
@@ -53,6 +53,7 @@ The stream is newline-delimited JSON (NDJSON), one event per line:
| `action.partial` | A locally executed tool generator yielded a preliminary output snapshot. |
| `action.result` | A tool call returned. |
| `input.requested` | The run paused for human input ([HITL](/docs/human-in-the-loop) approval or `ask_question`); carries `requests`. |
+| `input.resolved` | The server accepted terminal human-input outcomes; carries `resolutions` with responses when provided. |
| `subagent.called` | A subagent was delegated; carries `childSessionId` to attach to. |
| `subagent.completed` | A delegated subagent finished. |
| `reasoning.appended` | A reasoning delta (incremental, with cumulative text so far). |
diff --git a/docs/guides/client/messages.mdx b/docs/guides/client/messages.mdx
index a78eab7d9..5cc804ec7 100644
--- a/docs/guides/client/messages.mdx
+++ b/docs/guides/client/messages.mdx
@@ -127,6 +127,8 @@ const resumed = await session.respond(
await resumed.result();
```
+After eve accepts the reply, the durable stream emits `input.resolved`. Its `resolutions` array includes each request's `requestId`, `kind`, terminal `outcome`, and the accepted `response` when the client provided one. Persist this authoritative event instead of relying on the submitting client's optimistic state when rebuilding message history.
+
`send(message, options)` and `respond(inputResponses, options)` are separate operations. Put `clientContext`, `outputSchema`, headers, or stream options in the second argument to either method.
## Single-use responses
diff --git a/docs/guides/client/streaming.mdx b/docs/guides/client/streaming.mdx
index 47d0ac931..e3a079507 100644
--- a/docs/guides/client/streaming.mdx
+++ b/docs/guides/client/streaming.mdx
@@ -107,6 +107,7 @@ The most common UI events are:
| `action.partial` | Update a generator tool's provisional output snapshot. |
| `action.result` | Show tool call results. |
| `input.requested` | Pause the UI for approval or a question answer. |
+| `input.resolved` | Record the server-accepted outcome and response for each human-input request. |
| `result.completed` | Read structured output from an [output schema](./output-schema). |
| `session.waiting` | Enable the composer; the same fixed session handle accepts the next message. |
| `session.completed` | Mark the conversation terminal. |
diff --git a/docs/guides/frontend/overview.mdx b/docs/guides/frontend/overview.mdx
index 927514a1f..5df252ae9 100644
--- a/docs/guides/frontend/overview.mdx
+++ b/docs/guides/frontend/overview.mdx
@@ -253,7 +253,7 @@ const agent = useEveAgent({ reducer: toolCounter });
// agent.data is ToolLog
```
-`reduce(data, event)` receives both authoritative eve stream events and client projection events (`client.message.submitted`, `client.message.failed`, `client.input.responded`). Handle the client events too if you want optimistic and HITL state in your projection. Otherwise, return `data` unchanged for them.
+`reduce(data, event)` receives both authoritative eve stream events and client projection events (`client.message.submitted`, `client.message.failed`, `client.input.responded`). `client.input.responded` updates the submitting UI immediately; the durable `input.resolved` event later confirms the server-accepted outcome and lets replayed history rebuild the same HITL state. Return `data` unchanged for events your reducer does not handle.
## Resumable sessions
diff --git a/packages/eve/extension-contracts/compatibility/channel/v2.ts b/packages/eve/extension-contracts/compatibility/channel/v2.ts
new file mode 100644
index 000000000..d61b4332b
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/channel/v2.ts
@@ -0,0 +1,10 @@
+import { defineChannel, POST } from "#public/channels/index.js";
+
+export default defineChannel({
+ routes: [POST("/events", async () => new Response("ok"))],
+ async receive(input, { from }) {
+ const sessionRef =
+ typeof input.target.sessionRef === "string" ? input.target.sessionRef : "default";
+ return from(sessionRef).send(input.message, { auth: input.auth });
+ },
+});
diff --git a/packages/eve/extension-contracts/compatibility/dynamicInstructions/v12.ts b/packages/eve/extension-contracts/compatibility/dynamicInstructions/v12.ts
new file mode 100644
index 000000000..02a61cf70
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/dynamicInstructions/v12.ts
@@ -0,0 +1,10 @@
+import { defineDynamic, defineInstructions } from "#public/instructions/index.js";
+
+export default defineDynamic({
+ events: {
+ "session.started": (_event, ctx) =>
+ defineInstructions({
+ markdown: `Use session ${ctx.session.id} when correlating evidence.`,
+ }),
+ },
+});
diff --git a/packages/eve/extension-contracts/compatibility/dynamicSkill/v11.ts b/packages/eve/extension-contracts/compatibility/dynamicSkill/v11.ts
new file mode 100644
index 000000000..3c6e1498e
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/dynamicSkill/v11.ts
@@ -0,0 +1,11 @@
+import { defineDynamic, defineSkill } from "#public/skills/index.js";
+
+export default defineDynamic({
+ events: {
+ "turn.started": (_event, ctx) =>
+ defineSkill({
+ description: `Review evidence for session ${ctx.session.id}.`,
+ markdown: "# Evidence review\n\nCheck every claim against its source.",
+ }),
+ },
+});
diff --git a/packages/eve/extension-contracts/compatibility/dynamicTool/v17.ts b/packages/eve/extension-contracts/compatibility/dynamicTool/v17.ts
new file mode 100644
index 000000000..76b54cd92
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/dynamicTool/v17.ts
@@ -0,0 +1,14 @@
+import { z as z3 } from "zod/v3";
+
+import { defineDynamic, defineTool } from "#public/tools/index.js";
+
+export default defineDynamic({
+ events: {
+ "session.started": (_event, ctx) =>
+ defineTool({
+ description: "Return the active session identifier.",
+ inputSchema: z3.object({ prefix: z3.string() }),
+ execute: ({ prefix }) => ({ sessionId: `${prefix}:${ctx.session.id}` }),
+ }),
+ },
+});
diff --git a/packages/eve/extension-contracts/compatibility/hook/v13.ts b/packages/eve/extension-contracts/compatibility/hook/v13.ts
new file mode 100644
index 000000000..38ecc7e06
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/hook/v13.ts
@@ -0,0 +1,13 @@
+import { defineHook } from "#public/hooks/index.js";
+
+export default defineHook({
+ events: {
+ "subagent.completed"(event, ctx) {
+ console.info("subagent completed", {
+ output: event.data.output,
+ sessionId: ctx.session.id,
+ subagentName: event.data.subagentName,
+ });
+ },
+ },
+});
diff --git a/packages/eve/extension-contracts/compatibility/schedule/v1.ts b/packages/eve/extension-contracts/compatibility/schedule/v1.ts
new file mode 100644
index 000000000..db7ba2eff
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/schedule/v1.ts
@@ -0,0 +1,6 @@
+import { defineSchedule } from "#public/schedules/index.js";
+
+export default defineSchedule({
+ cron: "0 0 * * *",
+ markdown: "Summarize yesterday's completed work.",
+});
diff --git a/packages/eve/extension-contracts/compatibility/subagent/v1.ts b/packages/eve/extension-contracts/compatibility/subagent/v1.ts
new file mode 100644
index 000000000..344e5db11
--- /dev/null
+++ b/packages/eve/extension-contracts/compatibility/subagent/v1.ts
@@ -0,0 +1,6 @@
+import { defineAgent } from "#public/index.js";
+
+export default defineAgent({
+ description: "Delegate research tasks.",
+ model: "anthropic/claude-sonnet-5",
+});
diff --git a/packages/eve/extension-contracts/reports/channel/v3.json b/packages/eve/extension-contracts/reports/channel/v3.json
new file mode 100644
index 000000000..20abbbf7e
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/channel/v3.json
@@ -0,0 +1,17 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "channel",
+ "epoch": 3,
+ "sha256": "df3d803f94e01c6f5d36010b03e5d624b61d9918beee6f6b05235b2756224573",
+ "exports": [
+ "DELETE",
+ "GET",
+ "PATCH",
+ "POST",
+ "PUT",
+ "WS",
+ "createWebSocketUpgradeServer",
+ "defineChannel",
+ "isChannel"
+ ]
+}
diff --git a/packages/eve/extension-contracts/reports/dynamicInstructions/v13.json b/packages/eve/extension-contracts/reports/dynamicInstructions/v13.json
new file mode 100644
index 000000000..59d98155b
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/dynamicInstructions/v13.json
@@ -0,0 +1,7 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "dynamicInstructions",
+ "epoch": 13,
+ "sha256": "fe254a668b545e118286ed8d3b530ded476e294ccc765a1a4ae513b328f61860",
+ "exports": ["defineDynamic"]
+}
diff --git a/packages/eve/extension-contracts/reports/dynamicSkill/v12.json b/packages/eve/extension-contracts/reports/dynamicSkill/v12.json
new file mode 100644
index 000000000..5c67263bc
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/dynamicSkill/v12.json
@@ -0,0 +1,7 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "dynamicSkill",
+ "epoch": 12,
+ "sha256": "abddf9b8ee6f4fd5d76613f9351025af74948d86b057bc891dc6c8dbc537dc05",
+ "exports": ["defineDynamic"]
+}
diff --git a/packages/eve/extension-contracts/reports/dynamicTool/v18.json b/packages/eve/extension-contracts/reports/dynamicTool/v18.json
new file mode 100644
index 000000000..b1d5e2988
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/dynamicTool/v18.json
@@ -0,0 +1,13 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "dynamicTool",
+ "epoch": 18,
+ "sha256": "43460d4edd27be399f02629ab3d5a4ea606e5485360aadfb328e12c039608418",
+ "exports": [
+ "DynamicToolEntry",
+ "DynamicToolEvents",
+ "DynamicToolResult",
+ "DynamicToolSet",
+ "defineDynamic"
+ ]
+}
diff --git a/packages/eve/extension-contracts/reports/hook/v14.json b/packages/eve/extension-contracts/reports/hook/v14.json
new file mode 100644
index 000000000..a18d5d138
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/hook/v14.json
@@ -0,0 +1,7 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "hook",
+ "epoch": 14,
+ "sha256": "d44b9e3c86ebce4e4026cc954ac315831eca4ee095f36bb3ee355f06a1533c2a",
+ "exports": ["defineHook"]
+}
diff --git a/packages/eve/extension-contracts/reports/schedule/v2.json b/packages/eve/extension-contracts/reports/schedule/v2.json
new file mode 100644
index 000000000..9c6964c46
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/schedule/v2.json
@@ -0,0 +1,14 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "schedule",
+ "epoch": 2,
+ "sha256": "e3779f6b2dfa301f1bc313cdbdd7386650c359b276cc3c49a33de53fa36c40fe",
+ "exports": [
+ "ScheduleDefinition",
+ "ScheduleHandlerArgs",
+ "ScheduleRunHandler",
+ "ScheduleToFn",
+ "TypedReceiveTarget",
+ "defineSchedule"
+ ]
+}
diff --git a/packages/eve/extension-contracts/reports/subagent/v2.json b/packages/eve/extension-contracts/reports/subagent/v2.json
new file mode 100644
index 000000000..646ca5a07
--- /dev/null
+++ b/packages/eve/extension-contracts/reports/subagent/v2.json
@@ -0,0 +1,20 @@
+{
+ "kind": "eve-extension-capability-contract",
+ "capability": "subagent",
+ "epoch": 2,
+ "sha256": "138916856d6a9ab207cb3088a97b9e4d87012a90187137436f97fa62ba378e59",
+ "exports": [
+ "AgentCompactionDefinition",
+ "AgentDefinition",
+ "AgentModelDefinition",
+ "AgentStaticModelDefinition",
+ "DefinedAgent",
+ "DynamicLocalSubagentDefinition",
+ "DynamicSubagentDefinition",
+ "RemoteAgentDefinition",
+ "RemoteAgentDefinitionInput",
+ "defineAgent",
+ "defineDynamic",
+ "defineRemoteAgent"
+ ]
+}
diff --git a/packages/eve/src/client/index.ts b/packages/eve/src/client/index.ts
index f65ab910c..4dbc3fb4f 100644
--- a/packages/eve/src/client/index.ts
+++ b/packages/eve/src/client/index.ts
@@ -104,6 +104,9 @@ export type {
AuthorizationRequiredStreamEvent,
HandleMessageStreamEvent,
MessageStreamEventMeta,
+ InputResolution,
+ InputResolutionOutcome,
+ InputResolvedStreamEvent,
InputRequestedStreamEvent,
MessageAppendedStreamEvent,
MessageCompletedStreamEvent,
diff --git a/packages/eve/src/client/message-reducer.test.ts b/packages/eve/src/client/message-reducer.test.ts
index 5582366b3..3a8981cae 100644
--- a/packages/eve/src/client/message-reducer.test.ts
+++ b/packages/eve/src/client/message-reducer.test.ts
@@ -8,6 +8,7 @@ import {
createActionsRequestedEvent,
createAuthorizationCompletedEvent,
createAuthorizationRequiredEvent,
+ createInputResolvedEvent,
createInputRequestedEvent,
createMessageAppendedEvent,
createMessageCompletedEvent,
@@ -569,6 +570,116 @@ describe("defaultMessageReducer", () => {
expect(findToolPart(data, "call_1")).toMatchObject({ state: "approval-responded" });
});
+ it("projects authoritative input resolutions from replayed server events", () => {
+ const reducer = defaultMessageReducer();
+ const data = reduceServerEvents(reducer, reducer.initial(), [
+ createInputRequestedEvent({
+ requests: [
+ {
+ action: {
+ callId: "call_1",
+ input: { command: "pwd" },
+ kind: "tool-call",
+ toolName: "bash",
+ },
+ display: "confirmation",
+ kind: "tool-approval",
+ options: [
+ { id: "approve", label: "Yes", style: "primary" },
+ { id: "cancel", label: "No", style: "danger" },
+ ],
+ prompt: "Approve tool call: bash",
+ requestId: "approval_1",
+ },
+ ],
+ sequence: 0,
+ stepIndex: 0,
+ turnId: "turn_1",
+ }),
+ createInputResolvedEvent({
+ resolutions: [
+ {
+ kind: "tool-approval",
+ outcome: "approved",
+ requestId: "approval_1",
+ response: { optionId: "approve", requestId: "approval_1" },
+ },
+ ],
+ sequence: 0,
+ stepIndex: 0,
+ turnId: "turn_1",
+ }),
+ ]);
+
+ expect(findToolPart(data, "call_1")).toMatchObject({
+ state: "approval-responded",
+ toolMetadata: {
+ eve: {
+ inputResponse: { optionId: "approve", requestId: "approval_1" },
+ },
+ },
+ });
+ });
+
+ it("closes replayed input requests that resolve without a response", () => {
+ const reducer = defaultMessageReducer();
+ const data = reduceServerEvents(reducer, reducer.initial(), [
+ createInputRequestedEvent({
+ requests: [
+ {
+ action: {
+ callId: "question_1",
+ input: { prompt: "Which environment?" },
+ kind: "tool-call",
+ toolName: "ask_question",
+ },
+ allowFreeform: true,
+ display: "text",
+ kind: "question",
+ prompt: "Which environment?",
+ requestId: "question_1",
+ },
+ {
+ action: {
+ callId: "question_2",
+ input: { prompt: "Which region?" },
+ kind: "tool-call",
+ toolName: "ask_question",
+ },
+ allowFreeform: true,
+ display: "text",
+ kind: "question",
+ prompt: "Which region?",
+ requestId: "question_2",
+ },
+ ],
+ sequence: 0,
+ stepIndex: 0,
+ turnId: "turn_1",
+ }),
+ createInputResolvedEvent({
+ resolutions: [
+ {
+ kind: "question",
+ outcome: "ignored",
+ requestId: "question_1",
+ },
+ ],
+ sequence: 0,
+ stepIndex: 0,
+ turnId: "turn_1",
+ }),
+ ]);
+
+ expect(findToolPart(data, "question_1")).toMatchObject({
+ output: { status: "ignored" },
+ state: "output-available",
+ });
+ expect(findToolPart(data, "question_2")).toMatchObject({
+ state: "approval-requested",
+ });
+ });
+
it("marks input requests as responded when the client submits a response", () => {
const reducer = defaultMessageReducer();
let data = reduceServerEvents(reducer, reducer.initial(), [
diff --git a/packages/eve/src/client/message-reducer.ts b/packages/eve/src/client/message-reducer.ts
index bab12af49..0c7616568 100644
--- a/packages/eve/src/client/message-reducer.ts
+++ b/packages/eve/src/client/message-reducer.ts
@@ -21,7 +21,11 @@ import {
toMessageInputRequest,
} from "#client/message-action-parts.js";
import type { InputResponse } from "#runtime/input/types.js";
-import type { AuthorizationCompletedStreamEvent, MessageReceivedPart } from "#protocol/message.js";
+import type {
+ AuthorizationCompletedStreamEvent,
+ InputResolution,
+ MessageReceivedPart,
+} from "#protocol/message.js";
export type {
EveAuthorizationChallenge,
@@ -89,6 +93,14 @@ function reduceMessageData(data: EveMessageData, event: EveAgentReducerEvent): E
return next;
}
+ case "input.resolved": {
+ let next = data;
+ for (const resolution of event.data.resolutions) {
+ next = resolveInputRequest(next, resolution);
+ }
+ return next;
+ }
+
case "message.received":
return upsertMessage(data, {
id: `${event.data.turnId}:user`,
@@ -355,9 +367,7 @@ function reduceMessageData(data: EveMessageData, event: EveAgentReducerEvent): E
function respondToInputRequest(data: EveMessageData, response: InputResponse): EveMessageData {
const existing = findToolPartByApprovalId(data, response.requestId);
- if (!existing) {
- return data;
- }
+ if (!existing) return data;
const approval: { id: string; reason?: string } = {
id: response.requestId,
@@ -384,6 +394,26 @@ function respondToInputRequest(data: EveMessageData, response: InputResponse): E
});
}
+function resolveInputRequest(data: EveMessageData, resolution: InputResolution): EveMessageData {
+ if (resolution.response !== undefined) {
+ return respondToInputRequest(data, resolution.response);
+ }
+
+ const existing = findToolPartByApprovalId(data, resolution.requestId);
+ if (!existing) return data;
+
+ return updateToolPart(data, existing.toolCallId, {
+ input: existing.input,
+ output: { status: resolution.outcome },
+ state: "output-available",
+ stepIndex: existing.stepIndex,
+ toolCallId: existing.toolCallId,
+ toolMetadata: existing.toolMetadata,
+ toolName: existing.toolName,
+ type: "dynamic-tool",
+ });
+}
+
function updateAssistantMessage(
data: EveMessageData,
turnId: string,
diff --git a/packages/eve/src/compiler/extension-compatibility.ts b/packages/eve/src/compiler/extension-compatibility.ts
index 38f1e9055..8cea6d598 100644
--- a/packages/eve/src/compiler/extension-compatibility.ts
+++ b/packages/eve/src/compiler/extension-compatibility.ts
@@ -23,17 +23,17 @@ const EXTENSION_CAPABILITY_CONTRACTS = {
extension: { current: 1, supported: [1], dropped: {} },
tool: { current: 13, supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13], dropped: {} },
dynamicTool: {
- current: 17,
- supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17],
+ current: 18,
+ supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18],
dropped: {},
},
- channel: { current: 2, supported: [1, 2], dropped: {} },
- schedule: { current: 1, supported: [1], dropped: {} },
- subagent: { current: 1, supported: [1], dropped: {} },
+ channel: { current: 3, supported: [1, 2, 3], dropped: {} },
+ schedule: { current: 2, supported: [1, 2], dropped: {} },
+ subagent: { current: 2, supported: [1, 2], dropped: {} },
connection: { current: 5, supported: [1, 2, 3, 4, 5], dropped: {} },
hook: {
- current: 13,
- supported: [10, 11, 12, 13],
+ current: 14,
+ supported: [10, 11, 12, 13, 14],
dropped: {
1: "Model identity moved from session.started runtime metadata to step.started call attribution.",
2: "Model identity moved from session.started runtime metadata to step.started call attribution.",
@@ -47,11 +47,11 @@ const EXTENSION_CAPABILITY_CONTRACTS = {
},
},
skill: { current: 1, supported: [1], dropped: {} },
- dynamicSkill: { current: 11, supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], dropped: {} },
+ dynamicSkill: { current: 12, supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], dropped: {} },
instructions: { current: 2, supported: [1, 2], dropped: {} },
dynamicInstructions: {
- current: 12,
- supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+ current: 13,
+ supported: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13],
dropped: {},
},
config: { current: 1, supported: [1], dropped: {} },
diff --git a/packages/eve/src/harness/tool-loop.test.ts b/packages/eve/src/harness/tool-loop.test.ts
index 9bd998911..0f61e2591 100644
--- a/packages/eve/src/harness/tool-loop.test.ts
+++ b/packages/eve/src/harness/tool-loop.test.ts
@@ -1797,7 +1797,7 @@ describe("createToolLoopHarness", () => {
toolResults: [],
usage: { inputTokens: 7, outputTokens: 3 },
});
- const { emit } = createEventCollector();
+ const { emit, events } = createEventCollector();
const runStep = createToolLoopHarness(createTestConfig("conversation", emit));
const parked = await runStep(createLimitReachedSession(), { message: "Hi again" });
@@ -1812,6 +1812,24 @@ describe("createToolLoopHarness", () => {
expect(getSessionTokenLimitViolation(resumed.session)).toBeNull();
// The parked user message survives into model history for the resumed call.
expect(resumed.session.history).toContainEqual({ content: "Hi again", role: "user" });
+ const resolutionIndex = events.findIndex((event) => event.type === "input.resolved");
+ expect(resolutionIndex).toBeGreaterThan(-1);
+ expect(events[resolutionIndex]).toMatchObject({
+ data: {
+ resolutions: [
+ {
+ kind: "session-limit",
+ outcome: "answered",
+ requestId: LIMIT_REQUEST_ID,
+ response: { optionId: "continue", requestId: LIMIT_REQUEST_ID },
+ },
+ ],
+ },
+ type: "input.resolved",
+ });
+ expect(
+ events.findIndex((event, index) => index > resolutionIndex && event.type === "step.started"),
+ ).toBeGreaterThan(resolutionIndex);
});
it("grants the budget when the user types the continue option as plain text", async () => {
diff --git a/packages/eve/src/harness/tool-loop.ts b/packages/eve/src/harness/tool-loop.ts
index b6b100c1e..d8099aa2b 100644
--- a/packages/eve/src/harness/tool-loop.ts
+++ b/packages/eve/src/harness/tool-loop.ts
@@ -60,6 +60,7 @@ import {
createCompactionCompletedEvent,
createCompactionRequestedEvent,
createContextClearedEvent,
+ createInputResolvedEvent,
createInputRequestedEvent,
createResultCompletedEvent,
createSessionWaitingEvent,
@@ -1035,13 +1036,33 @@ export function createToolLoopHarness(config: ToolLoopHarnessConfig): StepFn {
return { next: null, session: pending.session };
}
- if (config.instrumentation?.hooks !== undefined && pending.resolvedInputs !== undefined) {
+ if (pending.resolvedInputs !== undefined) {
for (const batch of pending.resolvedInputs) {
- await publishInputResolutions({
- batch,
- hooks: config.instrumentation.hooks,
- sessionId: session.sessionId,
- });
+ if (config.instrumentation?.hooks !== undefined) {
+ await publishInputResolutions({
+ batch,
+ hooks: config.instrumentation.hooks,
+ sessionId: session.sessionId,
+ });
+ }
+ if (emit) {
+ await emit(
+ createInputResolvedEvent({
+ resolutions: batch.inputs.map((resolved) => {
+ const resolution = {
+ kind: resolved.request.kind,
+ outcome: resolved.outcome,
+ requestId: resolved.request.requestId,
+ };
+ if (resolved.response === undefined) return resolution;
+ return { ...resolution, response: resolved.response };
+ }),
+ sequence: batch.event.sequence,
+ stepIndex: batch.event.stepIndex,
+ turnId: batch.event.turnId,
+ }),
+ );
+ }
}
}
diff --git a/packages/eve/src/protocol/message.test.ts b/packages/eve/src/protocol/message.test.ts
index b823d0d3c..513b225e9 100644
--- a/packages/eve/src/protocol/message.test.ts
+++ b/packages/eve/src/protocol/message.test.ts
@@ -10,6 +10,7 @@ import {
createAuthorizationCompletedEvent,
createAuthorizationRequiredEvent,
createContextClearedEvent,
+ createInputResolvedEvent,
createMessageReceivedEvent,
createResultCompletedEvent,
createSessionWaitingEvent,
@@ -24,7 +25,50 @@ import { createEveConnectionCallbackRoutePath } from "#protocol/routes.js";
describe("message stream protocol", () => {
it("pins the stream version for timed session events", () => {
- expect(EVE_MESSAGE_STREAM_VERSION).toBe("22");
+ expect(EVE_MESSAGE_STREAM_VERSION).toBe("23");
+ });
+
+ it("creates authoritative input resolution batches", () => {
+ expect(
+ createInputResolvedEvent({
+ resolutions: [
+ {
+ kind: "question",
+ outcome: "answered",
+ requestId: "request-1",
+ response: { requestId: "request-1", text: "Ship it" },
+ },
+ {
+ kind: "tool-approval",
+ outcome: "ignored",
+ requestId: "request-2",
+ },
+ ],
+ sequence: 1,
+ stepIndex: 2,
+ turnId: "turn-1",
+ }),
+ ).toEqual({
+ data: {
+ resolutions: [
+ {
+ kind: "question",
+ outcome: "answered",
+ requestId: "request-1",
+ response: { requestId: "request-1", text: "Ship it" },
+ },
+ {
+ kind: "tool-approval",
+ outcome: "ignored",
+ requestId: "request-2",
+ },
+ ],
+ sequence: 1,
+ stepIndex: 2,
+ turnId: "turn-1",
+ },
+ type: "input.resolved",
+ });
});
it("creates preliminary tool-result snapshots", () => {
diff --git a/packages/eve/src/protocol/message.ts b/packages/eve/src/protocol/message.ts
index 6557e1387..286602808 100644
--- a/packages/eve/src/protocol/message.ts
+++ b/packages/eve/src/protocol/message.ts
@@ -27,7 +27,7 @@ export const EVE_STREAM_TAIL_INDEX_HEADER = "x-eve-stream-tail-index";
export const EVE_STREAM_VERSION_HEADER = "x-eve-stream-version";
export const EVE_MESSAGE_STREAM_CONTENT_TYPE = "application/x-ndjson; charset=utf-8";
export const EVE_MESSAGE_STREAM_FORMAT = "ndjson";
-export const EVE_MESSAGE_STREAM_VERSION = "22";
+export const EVE_MESSAGE_STREAM_VERSION = "23";
/**
* eve-owned finish reason for one completed assistant step.
@@ -275,6 +275,31 @@ export interface InputRequestedStreamEvent {
type: "input.requested";
}
+/** Authoritative terminal outcome for one human-input request. */
+export type InputResolutionOutcome = "answered" | "approved" | "denied" | "ignored" | "invalid";
+
+/** One server-accepted resolution from a pending human-input batch. */
+export interface InputResolution {
+ readonly kind: InputRequest["kind"];
+ readonly outcome: InputResolutionOutcome;
+ readonly requestId: string;
+ readonly response?: InputResponse;
+}
+
+/**
+ * Stream event emitted after eve accepts a terminal resolution for one or more
+ * pending human-input requests.
+ */
+export interface InputResolvedStreamEvent {
+ data: {
+ resolutions: readonly InputResolution[];
+ sequence: number;
+ stepIndex: number;
+ turnId: string;
+ };
+ type: "input.resolved";
+}
+
/**
* Stream event emitted for each runtime action result projected back into the
* session loop.
@@ -712,6 +737,7 @@ export type UnstampedMessageStreamEvent =
| SubagentStartedStreamEvent
| ActionsRequestedStreamEvent
| InputRequestedStreamEvent
+ | InputResolvedStreamEvent
| ActionPartialStreamEvent
| ActionResultStreamEvent
| ReasoningCompletedStreamEvent
@@ -1174,6 +1200,24 @@ export function createInputRequestedEvent(input: {
};
}
+/** Creates the authoritative `input.resolved` event for one pending HITL batch. */
+export function createInputResolvedEvent(input: {
+ readonly resolutions: readonly InputResolution[];
+ readonly sequence: number;
+ readonly stepIndex: number;
+ readonly turnId: string;
+}): InputResolvedStreamEvent {
+ return {
+ data: {
+ resolutions: input.resolutions,
+ sequence: input.sequence,
+ stepIndex: input.stepIndex,
+ turnId: input.turnId,
+ },
+ type: "input.resolved",
+ };
+}
+
/**
* Creates the `action.result` event for one runtime action result.
*
diff --git a/packages/eve/src/public/definitions/hook.ts b/packages/eve/src/public/definitions/hook.ts
index b41693ba6..d2520f573 100644
--- a/packages/eve/src/public/definitions/hook.ts
+++ b/packages/eve/src/public/definitions/hook.ts
@@ -26,6 +26,7 @@ export interface HookEventMap {
readonly "compaction.requested": ProtocolEvent<"compaction.requested">;
readonly "context.cleared": ProtocolEvent<"context.cleared">;
readonly "input.requested": ProtocolEvent<"input.requested">;
+ readonly "input.resolved": ProtocolEvent<"input.resolved">;
readonly "message.appended": ProtocolEvent<"message.appended">;
readonly "message.completed": ProtocolEvent<"message.completed">;
readonly "message.received": ProtocolEvent<"message.received">;
diff --git a/packages/eve/test/scenarios/mounted-extension-installed.scenario.test.ts b/packages/eve/test/scenarios/mounted-extension-installed.scenario.test.ts
index daf997acc..88640a372 100644
--- a/packages/eve/test/scenarios/mounted-extension-installed.scenario.test.ts
+++ b/packages/eve/test/scenarios/mounted-extension-installed.scenario.test.ts
@@ -249,7 +249,7 @@ describe("mounted extension installed under node_modules", () => {
);
expect(
JSON.parse(extensionFiles[`node_modules/${PACKAGE_NAME}/dist/extension/_manifest.json`]!),
- ).toMatchObject({ requires: { channel: 2, schedule: 1, subagent: 1 } });
+ ).toMatchObject({ requires: { channel: 3, schedule: 2, subagent: 2 } });
const app = await scenarioApp({
name: "mounted-extension-installed",
installDependencies: true,