Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): preserve turn ID for resumed auto selection (#3751)

Casey Gowrie8565550b7a54
diff --git a/.changeset/fix-auto-resume-turn-id.md b/.changeset/fix-auto-resume-turn-id.md
new file mode 100644
index 000000000..3262f8013
--- /dev/null
+++ b/.changeset/fix-auto-resume-turn-id.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Fix `auto()` model selection when a turn resumes after a question or tool approval.
diff --git a/e2e/fixtures/agent-evaluate/agent/agent.ts b/e2e/fixtures/agent-evaluate/agent/agent.ts
index 2e6c354ec..48ac09720 100644
--- a/e2e/fixtures/agent-evaluate/agent/agent.ts
+++ b/e2e/fixtures/agent-evaluate/agent/agent.ts
@@ -8,6 +8,25 @@ const { experimental } = e2eAgentConfig();
export default defineAgent({
experimental,
model: fixtureModel(async (request) => {
+ if (request.userMessages.some((text) => text.includes("auto-resume-question"))) {
+ const result = request.toolResults.find((entry) => entry.name === "ask_question");
+ if (result) return `Question answered: ${JSON.stringify(result.output)}`;
+ return {
+ toolCalls: [
+ {
+ id: "auto-resume-question-1",
+ name: "ask_question",
+ input: {
+ question: "Which environment should receive the release?",
+ options: [
+ { label: "Staging", description: "Deploy to staging first." },
+ { label: "Production", description: "Deploy directly to production." },
+ ],
+ },
+ },
+ ],
+ };
+ }
if (request.userMessages.some((text) => text.includes("automatic-review"))) {
const result = request.toolResults.find((entry) => entry.name === "automatic-review");
if (result) return JSON.stringify({ isError: result.isError, output: result.output });
diff --git a/e2e/fixtures/agent-evaluate/agent/tools/ask_question.ts b/e2e/fixtures/agent-evaluate/agent/tools/ask_question.ts
new file mode 100644
index 000000000..533cc8526
--- /dev/null
+++ b/e2e/fixtures/agent-evaluate/agent/tools/ask_question.ts
@@ -0,0 +1,3 @@
+import { askQuestion } from "eve/tools/ask_question";
+
+export default askQuestion();
diff --git a/e2e/fixtures/agent-evaluate/evals/auto-resume-question.eval.ts b/e2e/fixtures/agent-evaluate/evals/auto-resume-question.eval.ts
new file mode 100644
index 000000000..43b3c715b
--- /dev/null
+++ b/e2e/fixtures/agent-evaluate/evals/auto-resume-question.eval.ts
@@ -0,0 +1,31 @@
+import { defineEval } from "eve/evals";
+
+export default defineEval({
+ description: "auto() preserves model selection when a question resumes the current turn.",
+ async test(t) {
+ const parked = await t.send("Run the auto-resume-question flow for this routine request.");
+ parked.expectOk();
+ parked.calledTool("ask_question", { count: 1, status: "pending" });
+ const question = parked.session.requireInputRequest({
+ prompt: (prompt) => /Which environment/iu.test(prompt),
+ toolName: "ask_question",
+ });
+ const staging = question.options?.find((option) => option.label === "Staging");
+ if (staging === undefined) throw new Error("ask_question did not offer Staging.");
+
+ const resumed = await parked.session.respond([
+ { optionId: staging.id, requestId: question.requestId },
+ ]);
+
+ resumed.expectOk();
+ resumed.calledTool("ask_question", {
+ count: 1,
+ output: { answer: "Staging", status: "answered" },
+ status: "completed",
+ });
+ resumed.messageIncludes("Question answered");
+ resumed.notEvent("step.failed");
+ resumed.notEvent("turn.failed");
+ t.noFailedActions();
+ },
+});
diff --git a/packages/eve/src/harness/tool-loop.test.ts b/packages/eve/src/harness/tool-loop.test.ts
index 49944cb27..e85910954 100644
--- a/packages/eve/src/harness/tool-loop.test.ts
+++ b/packages/eve/src/harness/tool-loop.test.ts
@@ -6678,6 +6678,30 @@ describe("createToolLoopHarness", () => {
});
});
+ it("dispatches model selection with the active turn ID when a continuation has no turn input", async () => {
+ setupMockAgent({
+ finishReason: "stop",
+ response: { messages: [{ content: "Done", role: "assistant" }] },
+ text: "Done",
+ toolCalls: [],
+ toolResults: [],
+ });
+
+ const dispatchDynamicModelEvent = vi.fn();
+ const { emit } = createEventCollector();
+ const harness = createToolLoopHarness(
+ createTestConfig("conversation", emit, { dispatchDynamicModelEvent, tools: new Map() }),
+ );
+
+ await contextStorage.run(new ContextContainer(), () => harness(createTestSession()));
+
+ expect(dispatchDynamicModelEvent).toHaveBeenCalledWith(
+ expect.objectContaining({
+ event: expect.objectContaining({ data: expect.objectContaining({ turnId: "turn_0" }) }),
+ }),
+ );
+ });
+
it("persists the SDK's accumulated approval-resume messages into session history", async () => {
/*
* The real AI SDK contract is covered in
diff --git a/packages/eve/src/harness/tool-loop.ts b/packages/eve/src/harness/tool-loop.ts
index 4dd8652cf..7c6899d1f 100644
--- a/packages/eve/src/harness/tool-loop.ts
+++ b/packages/eve/src/harness/tool-loop.ts
@@ -1185,7 +1185,7 @@ export function createToolLoopHarness(config: ToolLoopHarnessConfig): StepFn {
data: {
sequence: emissionState.sequence,
stepIndex: emissionState.stepIndex,
- turnId: emissionState.turnId,
+ turnId: activeTurnId(emissionState),
},
type: "step.started",
} as UnstampedMessageStreamEvent,