Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): steer active Web Chat turns (#2401)

Casey Gowrie673def262453
diff --git a/.changeset/steer-web-chat-responses.md b/.changeset/steer-web-chat-responses.md
new file mode 100644
index 000000000..7f9868d92
--- /dev/null
+++ b/.changeset/steer-web-chat-responses.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Allow `useEveAgent` message sends with `turnPolicy: "steer"` while a turn is active, keeping the local projection attached to the durable replacement stream. Generated web chats now keep the composer enabled during responses and steer by default when a follow-up is submitted. Cancelled turns preserve their accepted user input in durable history, so replacement turns retain the interrupted request as context.
diff --git a/apps/docs/registry/channel/web/app/_components/agent-chat.tsx b/apps/docs/registry/channel/web/app/_components/agent-chat.tsx
index 1a81ba9ee..ee3ec3db2 100644
--- a/apps/docs/registry/channel/web/app/_components/agent-chat.tsx
+++ b/apps/docs/registry/channel/web/app/_components/agent-chat.tsx
@@ -2,7 +2,7 @@
import type { UserContent } from "ai";
import { useEveAgent } from "eve/react";
-import { AlertCircleIcon, BrainIcon, PlusIcon } from "lucide-react";
+import { AlertCircleIcon, BrainIcon, PlusIcon, SquareIcon } from "lucide-react";
import { useState } from "react";
import {
Conversation,
@@ -12,6 +12,7 @@ import {
import { Message, MessageContent } from "@/components/ai-elements/message";
import {
PromptInput,
+ PromptInputButton,
type PromptInputMessage,
PromptInputSubmit,
PromptInputTextarea,
@@ -78,12 +79,13 @@ export function AgentChat({
const handleSubmit = async (message: PromptInputMessage) => {
const text = message.text.trim();
- if ((text.length === 0 && message.files.length === 0) || isBusy) return;
+ if ((text.length === 0 && message.files.length === 0) || isRestoring) return;
setCancellationError(undefined);
+ const options = isBusy ? { turnPolicy: "steer" as const } : undefined;
if (message.files.length === 0) {
- await agent.send(text);
+ await agent.send(text, options);
return;
}
@@ -100,17 +102,23 @@ export function AgentChat({
});
}
- await agent.send(parts);
+ await agent.send(parts, options);
};
const composer = (
<PromptInput onSubmit={handleSubmit}>
- <PromptInputTextarea disabled={isBusy || isRestoring} placeholder="Send a message…" />
- <PromptInputSubmit
- disabled={isRestoring}
- onStop={requestCancellation}
- status={isRestoring ? undefined : agent.status}
- />
+ <PromptInputTextarea disabled={isRestoring} placeholder="Send a message…" />
+ {isBusy && !isRestoring ? (
+ <PromptInputButton
+ aria-label="Stop"
+ className="absolute right-12 bottom-2.5 rounded-full"
+ onClick={requestCancellation}
+ variant="default"
+ >
+ <SquareIcon className="size-3 fill-current" />
+ </PromptInputButton>
+ ) : null}
+ <PromptInputSubmit disabled={isRestoring} status={isBusy ? undefined : agent.status} />
</PromptInput>
);
diff --git a/docs/concepts/sessions-runs-and-streaming.md b/docs/concepts/sessions-runs-and-streaming.md
index 5295165ff..eeb6c3705 100644
--- a/docs/concepts/sessions-runs-and-streaming.md
+++ b/docs/concepts/sessions-runs-and-streaming.md
@@ -86,7 +86,7 @@ Note: consider the privacy, confidentiality, and user-experience implications fo
A delegated subagent publishes progress on its own child-session stream. The parent only emits `subagent.called` with a `childSessionId`, which a client uses to attach.
-`step.failed` and `turn.failed` carry `{ code, message, details? }` for the failed fragment or turn, and `session.failed` is the terminal session-level variant. `turn.cancelled` is not a failure: the cancelled turn ends without any failure event, `session.waiting` follows, and the session accepts the next message normally — whatever the turn streamed before cancellation stays on the stream, while durable history keeps only what had already settled. When a turn requested an output schema, the finalized payload lands on `result.completed` as `data.result` before the turn boundary. `authorization.required` carries the sign-in challenge (`data.authorization` may include `url`, `userCode`, `expiresAt`, `instructions`), and `authorization.completed` carries `data.outcome` (`"authorized" | "declined" | "failed" | "timed-out"`).
+`step.failed` and `turn.failed` carry `{ code, message, details? }` for the failed fragment or turn, and `session.failed` is the terminal session-level variant. `turn.cancelled` is not a failure: the cancelled turn ends without any failure event, `session.waiting` follows, and the session accepts the next message normally. Whatever the turn streamed before cancellation stays on the stream. Durable history keeps the accepted user input and previously settled work, but discards incomplete assistant output and unfinished tool state. When a turn requested an output schema, the finalized payload lands on `result.completed` as `data.result` before the turn boundary. `authorization.required` carries the sign-in challenge (`data.authorization` may include `url`, `userCode`, `expiresAt`, `instructions`), and `authorization.completed` carries `data.outcome` (`"authorized" | "declined" | "failed" | "timed-out"`).
## The event envelope
diff --git a/docs/guides/frontend/overview.mdx b/docs/guides/frontend/overview.mdx
index fdeef6d83..0858ee3dd 100644
--- a/docs/guides/frontend/overview.mdx
+++ b/docs/guides/frontend/overview.mdx
@@ -26,7 +26,7 @@ For a public demo, use `none()` from `eve/channels/auth` to admit anonymous requ
## Basic chat (React)
-The hook lives in `eve/react`. Render `data.messages`, gate the composer on `status`, and send text with `send`:
+The hook lives in `eve/react`. Render `data.messages`, use `status` to steer follow-ups during an active turn, and send text with `send`:
```tsx
"use client";
@@ -44,7 +44,7 @@ export function Chat() {
const form = new FormData(event.currentTarget);
const message = String(form.get("message") ?? "").trim();
if (message.length > 0) {
- void agent.send(message);
+ void agent.send(message, isBusy ? { turnPolicy: "steer" } : undefined);
}
}}
>
@@ -56,10 +56,8 @@ export function Chat() {
)}
</article>
))}
- <input name="message" disabled={isBusy} />
- <button disabled={isBusy} type="submit">
- Send
- </button>
+ <input name="message" />
+ <button type="submit">Send</button>
</form>
);
}
@@ -106,7 +104,13 @@ await agent.send([
]);
```
-Assistant text, reasoning, tool calls, and tool results stream into `data` as they arrive, and `status` moves from `ready` to `submitted` to `streaming` and back. Call `cancel()` to stop the durable server-side turn, and `reset()` to clear local state so the next send starts a fresh durable session.
+Assistant text, reasoning, tool calls, and tool results stream into `data` as they arrive, and `status` moves from `ready` to `submitted` to `streaming` and back. To replace an active turn with a follow-up, send the message with `turnPolicy: "steer"`. eve accepts the message through the durable session, cancels the active turn, and keeps the hook attached through the replacement turn:
+
+```tsx
+await agent.send(message, { turnPolicy: "steer" });
+```
+
+Other message sends and HITL responses reject while the hook is processing a turn. Call `cancel()` to stop the durable server-side turn without replacing it, and `reset()` to clear local state so the next send starts a fresh durable session.
`cancel()` can be called as soon as `status` is `"submitted"`; the hook waits for the active response to identify its turn when necessary, sends one guarded cancellation request, and keeps the event stream attached. The promise resolves when eve accepts the request or reports that no turn is active, and rejects if the cancellation request fails. The turn then settles on the same stream as `turn.cancelled` followed by `session.waiting`, so the session is safe to continue.
diff --git a/packages/eve/src/client/eve-agent-store-helpers.ts b/packages/eve/src/client/eve-agent-store-helpers.ts
new file mode 100644
index 000000000..970cdbfbc
--- /dev/null
+++ b/packages/eve/src/client/eve-agent-store-helpers.ts
@@ -0,0 +1,79 @@
+import type { SendTurnPayload } from "#client/types.js";
+import { isCurrentTurnBoundaryEvent, type MessageStreamEvent } from "#protocol/message.js";
+import type { UserContent } from "ai";
+
+export function isSettledSessionTail(events: readonly MessageStreamEvent[]): boolean {
+ const tail = events.at(-1);
+ return (
+ tail !== undefined &&
+ isCurrentTurnBoundaryEvent(tail) &&
+ (tail.type !== "session.waiting" || collectPendingAuthorizations(events).size === 0)
+ );
+}
+
+export function collectPendingAuthorizations(events: readonly MessageStreamEvent[]): Set<string> {
+ const pending = new Set<string>();
+ for (const event of events) updatePendingAuthorizations(pending, event);
+ return pending;
+}
+
+export function updatePendingAuthorizations(pending: Set<string>, event: MessageStreamEvent): void {
+ if (event.type === "authorization.required" && event.data.webhookUrl !== undefined) {
+ pending.add(event.data.name);
+ } else if (event.type === "authorization.completed") {
+ pending.delete(event.data.name);
+ }
+}
+
+export function assertExclusiveTurnInput(input: SendTurnPayload): void {
+ const hasMessage = input.message !== undefined;
+ const hasResponses = input.inputResponses !== undefined;
+ if (hasMessage === hasResponses) {
+ throw new Error("A turn requires exactly one of message or inputResponses.");
+ }
+}
+
+let submissionSequence = 0;
+
+export function createSubmissionId(): string {
+ const randomUUID = globalThis.crypto?.randomUUID;
+ if (randomUUID !== undefined) {
+ return randomUUID.call(globalThis.crypto);
+ }
+
+ submissionSequence += 1;
+ return `submission_${submissionSequence.toString()}`;
+}
+
+export function createAbortSignal(
+ first: AbortSignal | undefined,
+ second: AbortSignal,
+): AbortSignal {
+ return first ? AbortSignal.any([first, second]) : second;
+}
+
+export function summarizeUserContent(message: string | UserContent): string {
+ if (typeof message === "string") return message;
+
+ const parts: string[] = [];
+ for (const part of message) {
+ if (part.type === "text") {
+ parts.push(part.text);
+ } else if (part.type === "file") {
+ parts.push(part.filename ? `[file: ${part.filename}]` : "[file]");
+ }
+ }
+ return parts.join("\n");
+}
+
+export function isAbortError(error: unknown): boolean {
+ return error instanceof Error && error.name === "AbortError";
+}
+
+export function toTerminalStreamFailureError(event: MessageStreamEvent): Error | undefined {
+ if (event.type !== "session.failed") return undefined;
+
+ const error = new Error(event.data.message);
+ error.name = event.data.code;
+ return error;
+}
diff --git a/packages/eve/src/client/eve-agent-store.test.ts b/packages/eve/src/client/eve-agent-store.test.ts
index 5fd3158e7..2b82b65d9 100644
--- a/packages/eve/src/client/eve-agent-store.test.ts
+++ b/packages/eve/src/client/eve-agent-store.test.ts
@@ -312,6 +312,86 @@ describe("EveAgentStore session resume", () => {
});
});
+describe("EveAgentStore steering", () => {
+ it("accepts an in-flight steer and follows its replacement turn", async () => {
+ const activeStream = controlledStreamResponse();
+ const replacementStream = controlledStreamResponse();
+ const [
+ firstReceived,
+ firstStarted,
+ firstCancelled,
+ firstWaiting,
+ secondReceived,
+ secondStarted,
+ secondCompleted,
+ secondWaiting,
+ ] = stampTestEvents([
+ createMessageReceivedEvent({ message: "First", sequence: 0, turnId: "turn_1" }),
+ createTurnStartedEvent({ sequence: 1, turnId: "turn_1" }),
+ createTurnCancelledEvent({ sequence: 2, turnId: "turn_1" }),
+ createSessionWaitingEvent(),
+ createMessageReceivedEvent({ message: "Instead", sequence: 0, turnId: "turn_2" }),
+ createTurnStartedEvent({ sequence: 1, turnId: "turn_2" }),
+ createMessageCompletedEvent({
+ finishReason: "stop",
+ message: "Replacement reply.",
+ sequence: 2,
+ stepIndex: 0,
+ turnId: "turn_2",
+ }),
+ createSessionWaitingEvent(),
+ ] as UnstampedMessageStreamEvent[]);
+ const fetchMock = vi
+ .spyOn(globalThis, "fetch")
+ .mockResolvedValueOnce(startedResponse())
+ .mockResolvedValueOnce(activeStream.response)
+ .mockResolvedValueOnce(startedResponse())
+ .mockResolvedValueOnce(replacementStream.response);
+ const store = new EveAgentStore({ reducer: defaultMessageReducer() });
+
+ const firstSend = store.send({ message: "First" });
+ await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2));
+ activeStream.emit(firstReceived!);
+ activeStream.emit(firstStarted!);
+
+ const steering = store.send({ message: "Instead", turnPolicy: "steer" });
+ await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(3));
+ expect(JSON.parse(String(fetchMock.mock.calls[2]?.[1]?.body))).toMatchObject({
+ message: "Instead",
+ turnPolicy: "steer",
+ });
+
+ activeStream.emit(firstCancelled!);
+ activeStream.emit(firstWaiting!);
+ activeStream.close();
+ await vi.waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(4));
+ replacementStream.emit(secondReceived!);
+ replacementStream.emit(secondStarted!);
+ replacementStream.emit(secondCompleted!);
+ replacementStream.emit(secondWaiting!);
+ replacementStream.close();
+
+ await Promise.all([firstSend, steering]);
+ expect(store.snapshot.status).toBe("ready");
+ expect(store.snapshot.events).toEqual([
+ firstReceived,
+ firstStarted,
+ firstCancelled,
+ firstWaiting,
+ secondReceived,
+ secondStarted,
+ secondCompleted,
+ secondWaiting,
+ ]);
+ expect(store.snapshot.data.messages.at(-1)?.parts).toContainEqual({
+ state: "done",
+ stepIndex: 0,
+ text: "Replacement reply.",
+ type: "text",
+ });
+ });
+});
+
describe("EveAgentStore terminal failure", () => {
it("publishes a live terminal failure with error status", async () => {
const failed = stampTestEvents([
diff --git a/packages/eve/src/client/eve-agent-store.ts b/packages/eve/src/client/eve-agent-store.ts
index f55af1970..1a6c2a441 100644
--- a/packages/eve/src/client/eve-agent-store.ts
+++ b/packages/eve/src/client/eve-agent-store.ts
@@ -4,6 +4,17 @@ import type { EveAgentReducer, EveAgentReducerEvent } from "#client/reducer.js";
import type { ClientSession } from "#client/session.js";
import { createEventDeduper } from "#protocol/event-dedupe.js";
import { isCurrentTurnBoundaryEvent, type MessageStreamEvent } from "#protocol/message.js";
+import {
+ assertExclusiveTurnInput,
+ collectPendingAuthorizations,
+ createAbortSignal,
+ createSubmissionId,
+ isAbortError,
+ isSettledSessionTail,
+ summarizeUserContent,
+ toTerminalStreamFailureError,
+ updatePendingAuthorizations,
+} from "#client/eve-agent-store-helpers.js";
import { toError } from "#shared/errors.js";
import type {
CancelSessionResult,
@@ -12,7 +23,6 @@ import type {
SendTurnPayload,
ClientSessionState,
} from "#client/types.js";
-import type { UserContent } from "ai";
/**
* Lifecycle state of an {@link EveAgentStore}: `ready` (idle), `submitted`
@@ -94,7 +104,13 @@ const detachStore = Symbol("detachEveAgentStore");
interface ActiveTurn {
readonly abortController: AbortController;
+ acceptedFollowUps: number;
readonly cancel: () => Promise<CancelSessionResult>;
+ readonly completion: Promise<void>;
+ readonly followUpDispatches: Set<Promise<void>>;
+ receivedFollowUps: number;
+ readonly resolveCompletion: () => void;
+ readonly response: Promise<MessageResponse | undefined>;
readonly resolveResponse: (response: MessageResponse | undefined) => void;
}
@@ -126,7 +142,7 @@ export class EveAgentStore<TData> {
#data: TData;
#error: Error | undefined;
#events: readonly MessageStreamEvent[];
- #pendingMessageSubmission: PendingMessageSubmission | undefined;
+ #pendingMessageSubmissions: readonly PendingMessageSubmission[] = [];
#projectionEvents: readonly EveAgentReducerEvent[];
#resumePromise: Promise<void> | undefined;
#session: ClientSession | undefined;
@@ -180,17 +196,28 @@ export class EveAgentStore<TData> {
}
async send<TOutput = unknown>(input: SendTurnPayload<TOutput>): Promise<void> {
- if (this.#status === "streaming" || this.#status === "submitted") {
- throw new Error("eve session is already processing a turn.");
+ if (this.#activeTurn !== undefined) {
+ return await this.#sendFollowUp(this.#activeTurn, input);
}
const response = Promise.withResolvers<MessageResponse | undefined>();
+ const completion = Promise.withResolvers<void>();
const turn: ActiveTurn = {
abortController: new AbortController(),
+ acceptedFollowUps: 0,
cancel: () =>
- response.promise.then((messageResponse) =>
- messageResponse === undefined ? { status: "no_active_turn" } : messageResponse.cancel(),
- ),
+ turn.acceptedFollowUps > 0 && this.#session !== undefined
+ ? this.#session.cancel()
+ : response.promise.then((messageResponse) =>
+ messageResponse === undefined
+ ? { status: "no_active_turn" }
+ : messageResponse.cancel(),
+ ),
+ completion: completion.promise,
+ followUpDispatches: new Set(),
+ receivedFollowUps: 0,
+ resolveCompletion: completion.resolve,
+ response: response.promise,
resolveResponse: response.resolve,
};
this.#activeTurn = turn;
@@ -228,6 +255,8 @@ export class EveAgentStore<TData> {
return;
}
+ await this.#followSteeredTurns(turn);
+ if (!this.#isActiveTurn(turn)) return;
this.#status = this.#error === undefined ? "ready" : "error";
} catch (error) {
if (!this.#isActiveTurn(turn)) {
@@ -250,6 +279,7 @@ export class EveAgentStore<TData> {
this.#callbacks.onSessionChange?.(this.#session?.state);
this.#publish();
this.#callbacks.onFinish?.(this.#snapshot);
+ turn.resolveCompletion();
}
}
}
@@ -276,13 +306,21 @@ export class EveAgentStore<TData> {
}
const response = Promise.withResolvers<MessageResponse | undefined>();
+ const completion = Promise.withResolvers<void>();
const session = this.#session;
const turn: ActiveTurn = {
abortController: new AbortController(),
+ acceptedFollowUps: 0,
cancel: () => session.cancel(),
+ completion: completion.promise,
+ followUpDispatches: new Set(),
+ receivedFollowUps: 0,
+ resolveCompletion: completion.resolve,
+ response: response.promise,
resolveResponse: response.resolve,
};
this.#activeTurn = turn;
+ turn.resolveResponse(undefined);
this.#error = undefined;
this.#status = "submitted";
this.#publish();
@@ -316,6 +354,7 @@ export class EveAgentStore<TData> {
}
}
+ await this.#followSteeredTurns(turn);
if (this.#isActiveTurn(turn)) {
this.#status = this.#error === undefined ? "ready" : "error";
}
@@ -335,6 +374,7 @@ export class EveAgentStore<TData> {
this.#callbacks.onSessionChange?.(session.state);
this.#publish();
this.#callbacks.onFinish?.(this.#snapshot);
+ turn.resolveCompletion();
}
}
}
@@ -359,11 +399,12 @@ export class EveAgentStore<TData> {
const turn = this.#activeTurn;
this.#activeTurn = undefined;
turn?.resolveResponse(undefined);
+ turn?.resolveCompletion();
turn?.abortController.abort();
if (!this.#externalSession) this.#session = undefined;
this.#events = [];
this.#seenEvents = createEventDeduper();
- this.#pendingMessageSubmission = undefined;
+ this.#pendingMessageSubmissions = [];
this.#projectionEvents = [];
this.#data = this.#reducer.initial();
this.#error = undefined;
@@ -372,6 +413,67 @@ export class EveAgentStore<TData> {
this.#publish();
}
+ async #sendFollowUp<TOutput>(turn: ActiveTurn, input: SendTurnPayload<TOutput>): Promise<void> {
+ if (input.message === undefined || input.turnPolicy !== "steer") {
+ throw new Error(
+ 'eve session is already processing a turn. Send a message with turnPolicy: "steer" to replace it.',
+ );
+ }
+
+ const preparedInput = (await this.#callbacks.prepareSend?.(input)) ?? input;
+ assertExclusiveTurnInput(preparedInput);
+ if (preparedInput.message === undefined || preparedInput.turnPolicy !== "steer") {
+ throw new Error('An in-flight follow-up requires a message with turnPolicy: "steer".');
+ }
+ if (!this.#isActiveTurn(turn)) return await this.send(preparedInput);
+
+ const submissionId = this.#projectOptimisticMessage(preparedInput);
+ this.#publish();
+
+ let dispatch!: Promise<void>;
+ dispatch = (async () => {
+ try {
+ await turn.response;
+ if (!this.#isActiveTurn(turn) || this.#session === undefined) {
+ throw new Error("The active eve turn ended before the follow-up could be sent.");
+ }
+ const { message, ...options } = preparedInput;
+ await this.#session.send(message, options);
+ turn.acceptedFollowUps += 1;
+ } catch (error) {
+ this.#failPendingMessageSubmission(toError(error), submissionId);
+ this.#publish();
+ throw error;
+ } finally {
+ turn.followUpDispatches.delete(dispatch);
+ }
+ })();
+ turn.followUpDispatches.add(dispatch);
+
+ await dispatch;
+ await turn.completion;
+ }
+
+ async #followSteeredTurns(turn: ActiveTurn): Promise<void> {
+ while (turn.followUpDispatches.size > 0) {
+ await Promise.allSettled(turn.followUpDispatches);
+ }
+ if (turn.receivedFollowUps >= turn.acceptedFollowUps || this.#session === undefined) return;
+
+ for await (const event of this.#session.stream({ signal: turn.abortController.signal })) {
+ if (!this.#isActiveTurn(turn)) return;
+ if (event.type === "message.received") turn.receivedFollowUps += 1;
+ this.#acceptServerEvent(event);
+
+ if (isCurrentTurnBoundaryEvent(event)) {
+ while (turn.followUpDispatches.size > 0) {
+ await Promise.allSettled(turn.followUpDispatches);
+ }
+ if (turn.receivedFollowUps >= turn.acceptedFollowUps) return;
+ }
+ }
+ }
+
async #createFirstTurn<TOutput>(
input: SendTurnPayload<TOutput>,
): Promise<Awaited<ReturnType<ClientSession["send"]>>> {
@@ -404,9 +506,9 @@ export class EveAgentStore<TData> {
return this.#activeTurn === turn;
}
- #projectOptimisticMessage(input: SendTurnPayload): void {
+ #projectOptimisticMessage(input: SendTurnPayload): string | undefined {
if (!this.#optimistic || input.message === undefined) {
- return;
+ return undefined;
}
const id = createSubmissionId();
@@ -415,7 +517,7 @@ export class EveAgentStore<TData> {
id,
message: summarizeUserContent(input.message),
};
- this.#pendingMessageSubmission = pending;
+ this.#pendingMessageSubmissions = [...this.#pendingMessageSubmissions, pending];
this.#appendProjectionEvent({
data: {
createdAt: pending.createdAt,
@@ -424,6 +526,7 @@ export class EveAgentStore<TData> {
},
type: "client.message.submitted",
});
+ return id;
}
#projectInputResponses(input: SendTurnPayload): void {
@@ -451,9 +554,10 @@ export class EveAgentStore<TData> {
}
#applyServerEvent(event: MessageStreamEvent): void {
- if (event.type === "message.received" && this.#pendingMessageSubmission !== undefined) {
- const submissionId = this.#pendingMessageSubmission.id;
- this.#pendingMessageSubmission = undefined;
+ const pendingSubmission = this.#pendingMessageSubmissions[0];
+ if (event.type === "message.received" && pendingSubmission !== undefined) {
+ const submissionId = pendingSubmission.id;
+ this.#pendingMessageSubmissions = this.#pendingMessageSubmissions.slice(1);
this.#replaceProjectionEvent(
(candidate) =>
candidate.type === "client.message.submitted" &&
@@ -481,13 +585,16 @@ export class EveAgentStore<TData> {
}
}
- #failPendingMessageSubmission(error: Error): void {
- const pending = this.#pendingMessageSubmission;
- if (pending === undefined) {
- return;
- }
+ #failPendingMessageSubmission(error: Error, submissionId?: string): void {
+ const pending =
+ submissionId === undefined
+ ? this.#pendingMessageSubmissions[0]
+ : this.#pendingMessageSubmissions.find((candidate) => candidate.id === submissionId);
+ if (pending === undefined) return;
- this.#pendingMessageSubmission = undefined;
+ this.#pendingMessageSubmissions = this.#pendingMessageSubmissions.filter(
+ (candidate) => candidate.id !== pending.id,
+ );
this.#replaceProjectionEvent(
(event) =>
event.type === "client.message.submitted" && event.data.submissionId === pending.id,
@@ -560,84 +667,3 @@ export class EveAgentStore<TData> {
export function detachEveAgentStore<TData>(store: EveAgentStore<TData>): void {
store[detachStore]();
}
-
-function isSettledSessionTail(events: readonly MessageStreamEvent[]): boolean {
- const tail = events.at(-1);
- return (
- tail !== undefined &&
- isCurrentTurnBoundaryEvent(tail) &&
- (tail.type !== "session.waiting" || collectPendingAuthorizations(events).size === 0)
- );
-}
-
-function collectPendingAuthorizations(events: readonly MessageStreamEvent[]): Set<string> {
- const pending = new Set<string>();
- for (const event of events) updatePendingAuthorizations(pending, event);
- return pending;
-}
-
-function updatePendingAuthorizations(pending: Set<string>, event: MessageStreamEvent): void {
- if (event.type === "authorization.required" && event.data.webhookUrl !== undefined) {
- pending.add(event.data.name);
- } else if (event.type === "authorization.completed") {
- pending.delete(event.data.name);
- }
-}
-
-function assertExclusiveTurnInput(input: SendTurnPayload): void {
- const hasMessage = input.message !== undefined;
- const hasResponses = input.inputResponses !== undefined;
- if (hasMessage === hasResponses) {
- throw new Error("A turn requires exactly one of message or inputResponses.");
- }
-}
-
-let submissionSequence = 0;
-
-function createSubmissionId(): string {
- const randomUUID = globalThis.crypto?.randomUUID;
- if (randomUUID !== undefined) {
- return randomUUID.call(globalThis.crypto);
- }
-
- submissionSequence += 1;
- return `submission_${submissionSequence.toString()}`;
-}
-
-function createAbortSignal(first: AbortSignal | undefined, second: AbortSignal): AbortSignal {
- return first ? AbortSignal.any([first, second]) : second;
-}
-
-function summarizeUserContent(message: string | UserContent): string {
- if (typeof message === "string") {
- return message;
- }
-
- const parts: string[] = [];
- for (const part of message) {
- if (part.type === "text") {
- parts.push(part.text);
- continue;
- }
-
- if (part.type === "file") {
- parts.push(part.filename ? `[file: ${part.filename}]` : "[file]");
- }
- }
-
- return parts.join("\n");
-}
-
-function isAbortError(error: unknown): boolean {
- return error instanceof Error && error.name === "AbortError";
-}
-
-function toTerminalStreamFailureError(event: MessageStreamEvent): Error | undefined {
- if (event.type !== "session.failed") {
- return undefined;
- }
-
- const error = new Error(event.data.message);
- error.name = event.data.code;
- return error;
-}
diff --git a/packages/eve/src/execution/cancel-descendant-turns-step.test.ts b/packages/eve/src/execution/cancel-descendant-turns-step.test.ts
index 1680d2fff..ab3460e55 100644
--- a/packages/eve/src/execution/cancel-descendant-turns-step.test.ts
+++ b/packages/eve/src/execution/cancel-descendant-turns-step.test.ts
@@ -167,7 +167,6 @@ describe("cancelDescendantTurnsStep", () => {
});
it("skips parked handles: an idle child has no turn to cancel", async () => {
- const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
const session = createSession({
[AGENT_HANDLES_STATE_KEY]: {
handles: [
@@ -188,10 +187,6 @@ describe("cancelDescendantTurnsStep", () => {
expect(requestWorkflowTurnCancellation).not.toHaveBeenCalled();
expect(cancelRemoteAgentTurn).not.toHaveBeenCalled();
- expect(warn).toHaveBeenCalledWith(
- "[eve:execution.cancel-descendant-turns] no running agent handles found while cancelling descendants; nothing to cancel",
- expect.objectContaining({ sessionId: expect.any(String) }),
- );
});
it("retries no-active-turn responses during the child adoption window", async () => {
@@ -271,8 +266,6 @@ describe("cancelDescendantTurnsStep", () => {
});
it("treats sessions without a handle store as having no descendants", async () => {
- const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
-
await cancelDescendantTurnsStep({
serializedContext: {},
sessionState: createDurableSessionState({ session: createSession() }),
@@ -281,11 +274,6 @@ describe("cancelDescendantTurnsStep", () => {
expect(requestWorkflowTurnCancellation).not.toHaveBeenCalled();
expect(cancelRemoteAgentTurn).not.toHaveBeenCalled();
expect(deserializeContext).not.toHaveBeenCalled();
- // The skipped cancellation is observable, not silent.
- expect(warn).toHaveBeenCalledWith(
- "[eve:execution.cancel-descendant-turns] no running agent handles found while cancelling descendants; nothing to cancel",
- expect.objectContaining({ sessionId: expect.any(String) }),
- );
});
});
diff --git a/packages/eve/src/execution/cancel-descendant-turns-step.ts b/packages/eve/src/execution/cancel-descendant-turns-step.ts
index 1aaedde7d..70730f243 100644
--- a/packages/eve/src/execution/cancel-descendant-turns-step.ts
+++ b/packages/eve/src/execution/cancel-descendant-turns-step.ts
@@ -44,12 +44,7 @@ export async function cancelDescendantTurnsStep(input: {
return;
}
- if (running.length === 0) {
- log.warn("no running agent handles found while cancelling descendants; nothing to cancel", {
- sessionId: input.sessionState.sessionId,
- });
- return;
- }
+ if (running.length === 0) return;
let remoteContext:
| Promise<{
diff --git a/packages/eve/src/execution/turn-workflow.test.ts b/packages/eve/src/execution/turn-workflow.test.ts
index 95d811704..24f21ace6 100644
--- a/packages/eve/src/execution/turn-workflow.test.ts
+++ b/packages/eve/src/execution/turn-workflow.test.ts
@@ -323,11 +323,12 @@ describe("turnWorkflow", () => {
it("reports a cancelled turn as a park with the cancelled marker", async () => {
const sessionState = createSessionState();
+ const cancelledState = createSessionState({ continuationToken: "cancelled-state" });
installInbox([]);
vi.mocked(turnStep).mockResolvedValueOnce({
action: "cancelled",
serializedContext: { state: "cancelled" },
- sessionState,
+ sessionState: cancelledState,
});
// Task mode on purpose: cancellation bypasses the `canPark` gate.
@@ -341,7 +342,7 @@ describe("turnWorkflow", () => {
expect(vi.mocked(turnStep).mock.calls[0]?.[0].abortSignal).toBeInstanceOf(AbortSignal);
expect(cancelDescendantTurnsStep).toHaveBeenCalledWith({
serializedContext: { state: "cancelled" },
- sessionState,
+ sessionState: cancelledState,
});
// The command inbox forwards cancellation to this turn-private hook.
expect(cancelHookTokens()).toEqual(["turn-token:cancel"]);
@@ -352,7 +353,7 @@ describe("turnWorkflow", () => {
cancelled: true,
kind: "park",
serializedContext: { state: "cancelled" },
- sessionState,
+ sessionState: cancelledState,
},
kind: "turn-result",
});
diff --git a/packages/eve/src/execution/turn-workflow.ts b/packages/eve/src/execution/turn-workflow.ts
index 05cf2986a..68738b026 100644
--- a/packages/eve/src/execution/turn-workflow.ts
+++ b/packages/eve/src/execution/turn-workflow.ts
@@ -128,10 +128,12 @@ async function runTurnOwnedWorkflow(input: TurnWorkflowInput): Promise<void> {
// runtime-action batches are exempt — their wait observes the signal.
if (result.action === "cancelled") {
// The cancelled step returns only the context carve-outs required by
- // the driver epilogue and later turns; adopt those before settling.
+ // the driver epilogue and later turns, plus the accepted user input in
+ // durable history. Adopt those before settling so a steered replacement
+ // keeps the interrupted request without committing partial model output.
await cursor.adopt({
serializedContext: result.serializedContext,
- sessionState: cursor.sessionState,
+ sessionState: result.backgroundTaskState ?? result.sessionState,
});
await finishCancelledTurn({ bufferedDeliveries, cancellation, cursor });
return;
diff --git a/packages/eve/src/execution/workflow-steps.test.ts b/packages/eve/src/execution/workflow-steps.test.ts
index 5d5d74596..e7a65c160 100644
--- a/packages/eve/src/execution/workflow-steps.test.ts
+++ b/packages/eve/src/execution/workflow-steps.test.ts
@@ -1798,6 +1798,9 @@ describe("turnStep", () => {
},
});
expect(result.serializedContext).not.toHaveProperty(ThreadKey.name);
+ expect(result.sessionState.snapshot?.session.history).toEqual([
+ { content: "thread=unset; user=cancel this turn", role: "user" },
+ ]);
});
it("rejects task completion while input requests remain pending", async () => {
diff --git a/packages/eve/src/execution/workflow-steps.ts b/packages/eve/src/execution/workflow-steps.ts
index ef05c9d37..94a68bfdc 100644
--- a/packages/eve/src/execution/workflow-steps.ts
+++ b/packages/eve/src/execution/workflow-steps.ts
@@ -51,7 +51,7 @@ import { isTurnCancellation, throwIfTurnAborted } from "#harness/turn-cancellati
import { setChannelContext } from "#execution/channel-context.js";
import { hasPendingInputBatch } from "#harness/input-requests.js";
import { activeTurnId } from "#harness/active-turn-id.js";
-import { coalesceTurnInputs } from "#harness/messages.js";
+import { coalesceTurnInputs, normalizeUserContent } from "#harness/messages.js";
import {
getRuntimeActionKeysFromWorkflowInterrupt,
isWorkflowRuntimeActionInterrupt,
@@ -101,6 +101,7 @@ import { createExecutionHistoryView } from "#execution/history-view.js";
import { resolveRuntimeCompiledArtifactsVersionedCacheKey } from "#runtime/cache-key.js";
import { createWorkflowRuntime } from "#execution/workflow-runtime.js";
import { isTaskToolAvailable, TASK_UPDATE_TOOL_NAME } from "#runtime/framework-tools/tasks.js";
+import { stageAttachmentsToSandbox } from "#harness/attachment-staging.js";
const TASK_DONE_WITH_PENDING_INPUT_ERROR_MESSAGE =
"Task mode cannot complete while input requests remain pending.";
@@ -523,14 +524,16 @@ export async function turnStep(rawInput: TurnStepInput): Promise<DurableStepResu
// again after this cancellation settles.
const interrupted = serializeContext(ctx);
const retained = readRetainedBackgroundToolResult(ctx);
+ const cancelledSession = await preserveCancelledTurnMessage(
+ retained?.backgroundTaskSession ?? initialSession,
+ resolved,
+ );
return {
action: "cancelled",
...(retained === undefined
? {}
: {
- backgroundTaskState: createDurableSessionState({
- session: retained.backgroundTaskSession,
- }),
+ backgroundTaskState: createDurableSessionState({ session: cancelledSession }),
backgroundTasks: retained.backgroundTasks,
}),
serializedContext: preserveSerializedInstrumentationState(
@@ -540,7 +543,7 @@ export async function turnStep(rawInput: TurnStepInput): Promise<DurableStepResu
),
interrupted,
),
- sessionState: input.sessionState,
+ sessionState: createDurableSessionState({ session: cancelledSession }),
};
}
@@ -651,6 +654,16 @@ export async function turnStep(rawInput: TurnStepInput): Promise<DurableStepResu
};
}
+async function preserveCancelledTurnMessage(
+ session: HarnessSession,
+ input: StepInput | undefined,
+): Promise<HarnessSession> {
+ const message = normalizeUserContent(input?.message);
+ if (message === undefined) return session;
+ const content = await stageAttachmentsToSandbox(message);
+ return { ...session, history: [...session.history, { content, role: "user" }] };
+}
+
/**
* Derives the pending-state fields the turn workflow needs to choose
* the right `NextDriverAction` arm at the park boundary.
diff --git a/packages/eve/src/react/use-eve-agent.ts b/packages/eve/src/react/use-eve-agent.ts
index f6e698be5..c20f42779 100644
--- a/packages/eve/src/react/use-eve-agent.ts
+++ b/packages/eve/src/react/use-eve-agent.ts
@@ -52,7 +52,7 @@ export interface UseEveAgentHelpers<TData> extends UseEveAgentSnapshot<TData> {
readonly resume: () => Promise<void>;
/** Resets the session: detaches any local stream, recreates the owned session, and clears events and projected data. */
readonly reset: () => void;
- /** Sends a message. Rejects if a turn is already in flight. */
+ /** Sends a message. While a turn is active, pass `turnPolicy: "steer"` to replace it. */
readonly send: <TOutput = unknown>(
message: string | UserContent,
options?: SendTurnOptions<TOutput>,
diff --git a/packages/eve/src/setup/scaffold/create/web-template.ts b/packages/eve/src/setup/scaffold/create/web-template.ts
index c047d1829..3110639f8 100644
--- a/packages/eve/src/setup/scaffold/create/web-template.ts
+++ b/packages/eve/src/setup/scaffold/create/web-template.ts
@@ -5,7 +5,7 @@ export const WEB_APP_TEMPLATE_FILES = {
"agent/channels/eve.ts":
'import { eveChannel } from "eve/channels/eve";\nimport { localDev, placeholderAuth, vercelOidc } from "eve/channels/auth";\n\nexport default eveChannel({\n auth: [\n // Lets the eve TUI and your Vercel deployments reach the deployed agent.\n vercelOidc(),\n // Open on localhost for `eve dev` and the REPL; ignored in production.\n localDev(),\n // This placeholder will not allow browser requests in production.\n // Replace it with your app\'s auth provider, like Auth.js or Clerk,\n // or use none() for a public demo.\n placeholderAuth(),\n ],\n});\n',
"app/_components/agent-chat.tsx":
- '"use client";\n\nimport type { UserContent } from "ai";\nimport { useEveAgent } from "eve/react";\nimport { AlertCircleIcon, BrainIcon, PlusIcon } from "lucide-react";\nimport { useState } from "react";\nimport {\n Conversation,\n ConversationContent,\n ConversationScrollButton,\n} from "@/components/ai-elements/conversation";\nimport { Message, MessageContent } from "@/components/ai-elements/message";\nimport {\n PromptInput,\n type PromptInputMessage,\n PromptInputSubmit,\n PromptInputTextarea,\n} from "@/components/ai-elements/prompt-input";\nimport { Shimmer } from "@/components/ai-elements/shimmer";\nimport { Button } from "@/components/ui/button";\nimport { cn } from "@/lib/utils";\nimport { AgentMessage } from "./agent-message";\n\nconst AGENT_NAME = "__EVE_INIT_APP_NAME__";\n\nexport function AgentChat({\n sessionId,\n sessionless = false,\n}: {\n readonly sessionId?: string;\n readonly sessionless?: boolean;\n}) {\n const [cancellationError, setCancellationError] = useState<string>();\n const agent = useEveAgent({\n initialSession:\n sessionId === undefined\n ? undefined\n : {\n sessionId,\n streamIndex: 0,\n },\n resume: sessionId !== undefined,\n onSessionChange(session) {\n if (sessionId === undefined && session !== undefined) {\n // Next patches window.history to navigate, which would detach the active stream.\n History.prototype.replaceState.call(\n window.history,\n window.history.state,\n "",\n `/s/${encodeURIComponent(session.sessionId)}`,\n );\n }\n },\n });\n\n const isBusy = agent.status === "submitted" || agent.status === "streaming";\n const isRestoring = sessionId !== undefined && agent.events.length === 0 && isBusy;\n const isEmpty = agent.data.messages.length === 0;\n const lastMessage = agent.data.messages.at(-1);\n const isPendingAssistantShell =\n lastMessage?.role === "assistant" &&\n lastMessage.parts.every((part) => part.type === "step-start");\n const showPendingThinking =\n isBusy &&\n (agent.status === "submitted" || lastMessage?.role !== "assistant" || isPendingAssistantShell);\n const turnFailure = isBusy ? undefined : getLatestTurnFailure(agent.events);\n const errorMessage = cancellationError ?? agent.error?.message ?? turnFailure;\n const hasConversationContent = sessionless || !isEmpty || errorMessage !== undefined;\n const showConversationLayout = isRestoring || hasConversationContent;\n const activeSessionId = sessionId ?? agent.session?.sessionId;\n\n const requestCancellation = () => {\n setCancellationError(undefined);\n void agent.cancel().catch((error: unknown) => {\n setCancellationError(toErrorMessage(error));\n });\n };\n\n const handleSubmit = async (message: PromptInputMessage) => {\n const text = message.text.trim();\n if ((text.length === 0 && message.files.length === 0) || isBusy) return;\n\n setCancellationError(undefined);\n\n if (message.files.length === 0) {\n await agent.send(text);\n return;\n }\n\n const parts: UserContent = [];\n if (text.length > 0) {\n parts.push({ text, type: "text" });\n }\n for (const file of message.files) {\n parts.push({\n data: file.url,\n filename: file.filename,\n mediaType: file.mediaType,\n type: "file",\n });\n }\n\n await agent.send(parts);\n };\n\n const composer = (\n <PromptInput onSubmit={handleSubmit}>\n <PromptInputTextarea disabled={isBusy || isRestoring} placeholder="Send a message…" />\n <PromptInputSubmit\n disabled={isRestoring}\n onStop={requestCancellation}\n status={isRestoring ? undefined : agent.status}\n />\n </PromptInput>\n );\n\n return (\n <main className="flex h-dvh flex-col overflow-hidden bg-background text-foreground">\n {showConversationLayout ? (\n <ChatHeader canStartNewChat={activeSessionId !== undefined} />\n ) : null}\n\n {showConversationLayout ? (\n <Conversation\n className="min-h-0 flex-1"\n initial={sessionId === undefined ? undefined : false}\n resize={activeSessionId === undefined ? "smooth" : "instant"}\n scrollRestorationKey={\n isEmpty || activeSessionId === undefined\n ? undefined\n : `eve:web-chat-scroll:${activeSessionId}`\n }\n >\n <ConversationContent className="mx-auto w-full max-w-3xl gap-6 px-4 pt-20 pb-36 sm:px-6">\n {agent.data.messages.map((message, index) =>\n showPendingThinking &&\n isPendingAssistantShell &&\n message.id === lastMessage.id ? null : (\n <AgentMessage\n canRespond={!isBusy}\n isStreaming={\n agent.status === "streaming" && index === agent.data.messages.length - 1\n }\n key={message.id}\n message={message}\n onInputResponses={(inputResponses) => {\n setCancellationError(undefined);\n return agent.respond(inputResponses);\n }}\n />\n ),\n )}\n {showPendingThinking ? <PendingThinking /> : null}\n {errorMessage ? <ErrorMessage message={errorMessage} /> : null}\n </ConversationContent>\n <ConversationScrollButton />\n </Conversation>\n ) : null}\n\n <div\n className={cn(\n "mx-auto w-full px-4 sm:px-6",\n showConversationLayout\n ? "fixed bottom-0 left-1/2 z-20 max-w-3xl -translate-x-1/2 bg-gradient-to-t from-background via-background to-transparent pt-4 pb-6"\n : "flex max-w-xl flex-1 flex-col items-center justify-center gap-8 pb-[10vh]",\n )}\n >\n {showConversationLayout ? null : (\n <div className="flex flex-col items-center gap-3 text-center">\n <h1 className="font-medium text-5xl tracking-tighter">{AGENT_NAME}</h1>\n </div>\n )}\n <div className="w-full">{composer}</div>\n </div>\n </main>\n );\n}\n\nfunction ErrorMessage({ message }: { readonly message: string }) {\n return (\n <Message className="max-w-full" from="assistant">\n <MessageContent>\n <div\n className="flex w-full items-start gap-3 rounded-lg border border-destructive/30 bg-destructive/5 px-3 py-2.5 text-sm"\n role="alert"\n >\n <AlertCircleIcon className="mt-0.5 size-4 shrink-0 text-destructive" />\n <div>\n <p className="font-medium">Request failed</p>\n <p className="mt-0.5 text-muted-foreground">{message}</p>\n </div>\n </div>\n </MessageContent>\n </Message>\n );\n}\n\nfunction ChatHeader({ canStartNewChat }: { readonly canStartNewChat: boolean }) {\n return (\n <header className="pointer-events-none fixed top-0 right-0 left-0 z-20 h-14">\n <div className="relative mx-auto flex h-full w-full max-w-3xl items-center justify-center bg-background px-24">\n <span className="truncate text-muted-foreground text-sm">{AGENT_NAME}</span>\n {canStartNewChat ? (\n <Button\n aria-label="Start a new chat"\n className="pointer-events-auto fixed top-2 right-6"\n onClick={() => window.location.assign("/s")}\n size="sm"\n type="button"\n variant="ghost"\n >\n <PlusIcon className="size-4" />\n <span className="hidden sm:inline">New chat</span>\n </Button>\n ) : null}\n </div>\n </header>\n );\n}\n\nfunction PendingThinking() {\n return (\n <Message aria-live="polite" from="assistant">\n <MessageContent>\n <div className="mb-4 flex w-full items-center gap-2 text-muted-foreground text-sm">\n <BrainIcon className="size-4" />\n <Shimmer duration={1}>Thinking</Shimmer>\n </div>\n </MessageContent>\n </Message>\n );\n}\n\nfunction toErrorMessage(error: unknown): string {\n return error instanceof Error ? error.message : "Unable to cancel the response.";\n}\n\nfunction getLatestTurnFailure(\n events: ReturnType<typeof useEveAgent>["events"],\n): string | undefined {\n for (let index = events.length - 1; index >= 0; index -= 1) {\n const event = events[index];\n\n if (event.type === "turn.failed") {\n return event.data.code === "MODEL_CALL_FAILED"\n ? "The model is temporarily unavailable. Please try again."\n : event.data.message;\n }\n\n if (event.type === "turn.completed" || event.type === "turn.cancelled") {\n return undefined;\n }\n\n if (event.type === "message.received") {\n return undefined;\n }\n }\n\n return undefined;\n}\n',
+ '"use client";\n\nimport type { UserContent } from "ai";\nimport { useEveAgent } from "eve/react";\nimport { AlertCircleIcon, BrainIcon, PlusIcon, SquareIcon } from "lucide-react";\nimport { useState } from "react";\nimport {\n Conversation,\n ConversationContent,\n ConversationScrollButton,\n} from "@/components/ai-elements/conversation";\nimport { Message, MessageContent } from "@/components/ai-elements/message";\nimport {\n PromptInput,\n PromptInputButton,\n type PromptInputMessage,\n PromptInputSubmit,\n PromptInputTextarea,\n} from "@/components/ai-elements/prompt-input";\nimport { Shimmer } from "@/components/ai-elements/shimmer";\nimport { Button } from "@/components/ui/button";\nimport { cn } from "@/lib/utils";\nimport { AgentMessage } from "./agent-message";\n\nconst AGENT_NAME = "__EVE_INIT_APP_NAME__";\n\nexport function AgentChat({\n sessionId,\n sessionless = false,\n}: {\n readonly sessionId?: string;\n readonly sessionless?: boolean;\n}) {\n const [cancellationError, setCancellationError] = useState<string>();\n const agent = useEveAgent({\n initialSession:\n sessionId === undefined\n ? undefined\n : {\n sessionId,\n streamIndex: 0,\n },\n resume: sessionId !== undefined,\n onSessionChange(session) {\n if (sessionId === undefined && session !== undefined) {\n // Next patches window.history to navigate, which would detach the active stream.\n History.prototype.replaceState.call(\n window.history,\n window.history.state,\n "",\n `/s/${encodeURIComponent(session.sessionId)}`,\n );\n }\n },\n });\n\n const isBusy = agent.status === "submitted" || agent.status === "streaming";\n const isRestoring = sessionId !== undefined && agent.events.length === 0 && isBusy;\n const isEmpty = agent.data.messages.length === 0;\n const lastMessage = agent.data.messages.at(-1);\n const isPendingAssistantShell =\n lastMessage?.role === "assistant" &&\n lastMessage.parts.every((part) => part.type === "step-start");\n const showPendingThinking =\n isBusy &&\n (agent.status === "submitted" || lastMessage?.role !== "assistant" || isPendingAssistantShell);\n const turnFailure = isBusy ? undefined : getLatestTurnFailure(agent.events);\n const errorMessage = cancellationError ?? agent.error?.message ?? turnFailure;\n const hasConversationContent = sessionless || !isEmpty || errorMessage !== undefined;\n const showConversationLayout = isRestoring || hasConversationContent;\n const activeSessionId = sessionId ?? agent.session?.sessionId;\n\n const requestCancellation = () => {\n setCancellationError(undefined);\n void agent.cancel().catch((error: unknown) => {\n setCancellationError(toErrorMessage(error));\n });\n };\n\n const handleSubmit = async (message: PromptInputMessage) => {\n const text = message.text.trim();\n if ((text.length === 0 && message.files.length === 0) || isRestoring) return;\n\n setCancellationError(undefined);\n const options = isBusy ? { turnPolicy: "steer" as const } : undefined;\n\n if (message.files.length === 0) {\n await agent.send(text, options);\n return;\n }\n\n const parts: UserContent = [];\n if (text.length > 0) {\n parts.push({ text, type: "text" });\n }\n for (const file of message.files) {\n parts.push({\n data: file.url,\n filename: file.filename,\n mediaType: file.mediaType,\n type: "file",\n });\n }\n\n await agent.send(parts, options);\n };\n\n const composer = (\n <PromptInput onSubmit={handleSubmit}>\n <PromptInputTextarea disabled={isRestoring} placeholder="Send a message…" />\n {isBusy && !isRestoring ? (\n <PromptInputButton\n aria-label="Stop"\n className="absolute right-12 bottom-2.5 rounded-full"\n onClick={requestCancellation}\n variant="default"\n >\n <SquareIcon className="size-3 fill-current" />\n </PromptInputButton>\n ) : null}\n <PromptInputSubmit disabled={isRestoring} status={isBusy ? undefined : agent.status} />\n </PromptInput>\n );\n\n return (\n <main className="flex h-dvh flex-col overflow-hidden bg-background text-foreground">\n {showConversationLayout ? (\n <ChatHeader canStartNewChat={activeSessionId !== undefined} />\n ) : null}\n\n {showConversationLayout ? (\n <Conversation\n className="min-h-0 flex-1"\n initial={sessionId === undefined ? undefined : false}\n resize={activeSessionId === undefined ? "smooth" : "instant"}\n scrollRestorationKey={\n isEmpty || activeSessionId === undefined\n ? undefined\n : `eve:web-chat-scroll:${activeSessionId}`\n }\n >\n <ConversationContent className="mx-auto w-full max-w-3xl gap-6 px-4 pt-20 pb-36 sm:px-6">\n {agent.data.messages.map((message, index) =>\n showPendingThinking &&\n isPendingAssistantShell &&\n message.id === lastMessage.id ? null : (\n <AgentMessage\n canRespond={!isBusy}\n isStreaming={\n agent.status === "streaming" && index === agent.data.messages.length - 1\n }\n key={message.id}\n message={message}\n onInputResponses={(inputResponses) => {\n setCancellationError(undefined);\n return agent.respond(inputResponses);\n }}\n />\n ),\n )}\n {showPendingThinking ? <PendingThinking /> : null}\n {errorMessage ? <ErrorMessage message={errorMessage} /> : null}\n </ConversationContent>\n <ConversationScrollButton />\n </Conversation>\n ) : null}\n\n <div\n className={cn(\n "mx-auto w-full px-4 sm:px-6",\n showConversationLayout\n ? "fixed bottom-0 left-1/2 z-20 max-w-3xl -translate-x-1/2 bg-gradient-to-t from-background via-background to-transparent pt-4 pb-6"\n : "flex max-w-xl flex-1 flex-col items-center justify-center gap-8 pb-[10vh]",\n )}\n >\n {showConversationLayout ? null : (\n <div className="flex flex-col items-center gap-3 text-center">\n <h1 className="font-medium text-5xl tracking-tighter">{AGENT_NAME}</h1>\n </div>\n )}\n <div className="w-full">{composer}</div>\n </div>\n </main>\n );\n}\n\nfunction ErrorMessage({ message }: { readonly message: string }) {\n return (\n <Message className="max-w-full" from="assistant">\n <MessageContent>\n <div\n className="flex w-full items-start gap-3 rounded-lg border border-destructive/30 bg-destructive/5 px-3 py-2.5 text-sm"\n role="alert"\n >\n <AlertCircleIcon className="mt-0.5 size-4 shrink-0 text-destructive" />\n <div>\n <p className="font-medium">Request failed</p>\n <p className="mt-0.5 text-muted-foreground">{message}</p>\n </div>\n </div>\n </MessageContent>\n </Message>\n );\n}\n\nfunction ChatHeader({ canStartNewChat }: { readonly canStartNewChat: boolean }) {\n return (\n <header className="pointer-events-none fixed top-0 right-0 left-0 z-20 h-14">\n <div className="relative mx-auto flex h-full w-full max-w-3xl items-center justify-center bg-background px-24">\n <span className="truncate text-muted-foreground text-sm">{AGENT_NAME}</span>\n {canStartNewChat ? (\n <Button\n aria-label="Start a new chat"\n className="pointer-events-auto fixed top-2 right-6"\n onClick={() => window.location.assign("/s")}\n size="sm"\n type="button"\n variant="ghost"\n >\n <PlusIcon className="size-4" />\n <span className="hidden sm:inline">New chat</span>\n </Button>\n ) : null}\n </div>\n </header>\n );\n}\n\nfunction PendingThinking() {\n return (\n <Message aria-live="polite" from="assistant">\n <MessageContent>\n <div className="mb-4 flex w-full items-center gap-2 text-muted-foreground text-sm">\n <BrainIcon className="size-4" />\n <Shimmer duration={1}>Thinking</Shimmer>\n </div>\n </MessageContent>\n </Message>\n );\n}\n\nfunction toErrorMessage(error: unknown): string {\n return error instanceof Error ? error.message : "Unable to cancel the response.";\n}\n\nfunction getLatestTurnFailure(\n events: ReturnType<typeof useEveAgent>["events"],\n): string | undefined {\n for (let index = events.length - 1; index >= 0; index -= 1) {\n const event = events[index];\n\n if (event.type === "turn.failed") {\n return event.data.code === "MODEL_CALL_FAILED"\n ? "The model is temporarily unavailable. Please try again."\n : event.data.message;\n }\n\n if (event.type === "turn.completed" || event.type === "turn.cancelled") {\n return undefined;\n }\n\n if (event.type === "message.received") {\n return undefined;\n }\n }\n\n return undefined;\n}\n',
"app/_components/agent-message.tsx":
'"use client";\n\nimport type {\n EveAuthorizationPart,\n EveDynamicToolPart,\n EveMessage,\n EveMessageInputRequest,\n EveMessagePart,\n} from "eve/react";\nimport {\n CheckCircleIcon,\n ExternalLinkIcon,\n FileIcon,\n ImageIcon,\n KeyRoundIcon,\n XCircleIcon,\n} from "lucide-react";\nimport { Message, MessageContent, MessageResponse } from "@/components/ai-elements/message";\nimport {\n Question,\n QuestionActions,\n QuestionDescription,\n QuestionInput,\n QuestionOption,\n QuestionOptions,\n QuestionPrompt,\n type QuestionResponse,\n QuestionSubmit,\n} from "@/components/ai-elements/question";\nimport { Reasoning, ReasoningContent, ReasoningTrigger } from "@/components/ai-elements/reasoning";\nimport {\n Tool,\n ToolContent,\n ToolHeader,\n ToolInput,\n ToolOutput,\n} from "@/components/ai-elements/tool";\nimport { Button } from "@/components/ui/button";\nimport { cn } from "@/lib/utils";\n\nexport type AgentInputResponse = {\n readonly optionId?: string;\n readonly requestId: string;\n readonly text?: string;\n};\n\ntype EveFilePart = Extract<EveMessagePart, { type: "file" }>;\n\nexport function AgentMessage({\n canRespond,\n isStreaming,\n message,\n onInputResponses,\n}: {\n readonly canRespond: boolean;\n readonly isStreaming: boolean;\n readonly message: EveMessage;\n readonly onInputResponses: (responses: readonly AgentInputResponse[]) => void | Promise<void>;\n}) {\n const lastTextIndex = message.parts.reduce(\n (last, part, index) => (part.type === "text" ? index : last),\n -1,\n );\n const hasAssistantText =\n message.role === "assistant" &&\n message.parts.some((part) => part.type === "text" && part.text.length > 0);\n\n return (\n <Message\n data-optimistic={message.metadata?.optimistic ? "true" : undefined}\n from={message.role}\n >\n <MessageContent>\n {message.parts.map((part, index) =>\n hasAssistantText && part.type === "reasoning" ? null : (\n <AgentMessagePart\n canRespond={canRespond}\n key={partKey(part, index)}\n onInputResponses={onInputResponses}\n part={part}\n showCaret={isStreaming && message.role === "assistant" && index === lastTextIndex}\n />\n ),\n )}\n </MessageContent>\n </Message>\n );\n}\n\nfunction AgentMessagePart({\n canRespond,\n onInputResponses,\n part,\n showCaret,\n}: {\n readonly canRespond: boolean;\n readonly onInputResponses: (responses: readonly AgentInputResponse[]) => void | Promise<void>;\n readonly part: EveMessagePart;\n readonly showCaret: boolean;\n}) {\n switch (part.type) {\n case "step-start":\n return null;\n case "text":\n return (\n <MessageResponse caret="block" isAnimating={showCaret}>\n {part.text}\n </MessageResponse>\n );\n case "reasoning":\n return (\n <Reasoning defaultOpen isStreaming={part.state === "streaming"}>\n <ReasoningTrigger />\n <ReasoningContent>{part.text}</ReasoningContent>\n </Reasoning>\n );\n case "file":\n return <AttachmentPart part={part} />;\n case "authorization":\n return <AuthorizationPrompt part={part} />;\n case "dynamic-tool": {\n const inputRequest = part.toolMetadata?.eve?.inputRequest;\n if (inputRequest?.kind === "question") {\n return (\n <QuestionRequest\n canRespond={canRespond}\n inputRequest={inputRequest}\n inputResponse={part.toolMetadata?.eve?.inputResponse}\n onInputResponses={onInputResponses}\n />\n );\n }\n\n return (\n <Tool\n defaultOpen={part.state === "approval-requested" || part.state === "approval-responded"}\n >\n <ToolHeader\n state={part.state}\n title={part.toolName}\n toolName={part.toolName}\n type="dynamic-tool"\n />\n <ToolContent>\n <ToolInput input={part.input} />\n <InputRequestActions\n canRespond={canRespond}\n part={part}\n onInputResponses={onInputResponses}\n />\n <ToolOutput errorText={part.errorText} output={part.output} />\n </ToolContent>\n </Tool>\n );\n }\n }\n}\n\nfunction QuestionRequest({\n canRespond,\n inputRequest,\n inputResponse,\n onInputResponses,\n}: {\n readonly canRespond: boolean;\n readonly inputRequest: EveMessageInputRequest;\n readonly inputResponse?: AgentInputResponse;\n readonly onInputResponses: (responses: readonly AgentInputResponse[]) => void | Promise<void>;\n}) {\n const selectedOption = inputRequest.options?.find(\n (option) => option.id === inputResponse?.optionId,\n );\n const hasOptions = (inputRequest.options?.length ?? 0) > 0;\n const acceptsFreeform = inputRequest.allowFreeform === true || !hasOptions;\n\n const submitResponse = ({ selectedValues, text }: QuestionResponse) =>\n onInputResponses([\n {\n optionId: selectedValues[0],\n requestId: inputRequest.requestId,\n text,\n },\n ]);\n\n return (\n <Question\n defaultValue={{\n selectedValues: inputResponse?.optionId ? [inputResponse.optionId] : [],\n text: inputResponse?.text ?? "",\n }}\n disabled={!canRespond || inputResponse !== undefined}\n onSubmit={submitResponse}\n >\n <QuestionPrompt>{inputRequest.prompt}</QuestionPrompt>\n {hasOptions ? (\n <QuestionOptions className="flex-col items-stretch" aria-label={inputRequest.prompt}>\n {inputRequest.options?.map((option) => (\n <QuestionOption className="justify-start text-left" key={option.id} value={option.id}>\n <span>\n <span className="block">{option.label}</span>\n {option.description ? (\n <span className="block font-normal text-xs opacity-70">{option.description}</span>\n ) : null}\n </span>\n </QuestionOption>\n ))}\n </QuestionOptions>\n ) : null}\n {acceptsFreeform ? (\n <QuestionInput aria-label="Answer" placeholder="Type your answer…" />\n ) : null}\n {inputResponse ? (\n <QuestionDescription>\n Responded: {selectedOption?.label ?? inputResponse.text ?? inputResponse.optionId}\n </QuestionDescription>\n ) : (\n <QuestionActions>\n <QuestionSubmit>Answer</QuestionSubmit>\n </QuestionActions>\n )}\n </Question>\n );\n}\n\nfunction AttachmentPart({ part }: { readonly part: EveFilePart }) {\n const label = part.filename ?? "Attachment";\n const detail = [part.mediaType, formatBytes(part.size)].filter(Boolean).join(" - ");\n const isImage = part.mediaType.startsWith("image/") && part.url !== undefined;\n const Icon = isImage ? ImageIcon : FileIcon;\n const body = (\n <span className="flex max-w-sm items-center gap-3 rounded-md border bg-background/60 p-2 text-sm">\n {isImage ? (\n <img alt={label} className="size-12 shrink-0 rounded-sm object-cover" src={part.url} />\n ) : (\n <span className="flex size-10 shrink-0 items-center justify-center rounded-sm bg-muted text-muted-foreground">\n <Icon className="size-4" />\n </span>\n )}\n <span className="min-w-0 flex-1">\n <span className="block truncate font-medium">{label}</span>\n {detail ? <span className="block truncate text-muted-foreground">{detail}</span> : null}\n </span>\n {part.url ? <ExternalLinkIcon className="size-4 shrink-0 text-muted-foreground" /> : null}\n </span>\n );\n\n return part.url ? (\n <a href={part.url} rel="noreferrer" target="_blank">\n {body}\n </a>\n ) : (\n body\n );\n}\n\nfunction AuthorizationPrompt({ part }: { readonly part: EveAuthorizationPart }) {\n const isAuthorized = part.state === "completed" && part.outcome === "authorized";\n const isCompleted = part.state === "completed";\n const Icon = isAuthorized ? CheckCircleIcon : isCompleted ? XCircleIcon : KeyRoundIcon;\n const instructions = part.authorization?.instructions;\n const shouldShowInstructions = instructions !== undefined && instructions !== part.description;\n\n return (\n <div\n className={cn(\n "space-y-3 rounded-md border p-3",\n isAuthorized\n ? "border-emerald-500/30 bg-emerald-500/5"\n : isCompleted\n ? "border-destructive/30 bg-destructive/5"\n : "border-blue-500/30 bg-blue-500/5",\n )}\n >\n <div className="flex items-start gap-3">\n <span\n className={cn(\n "mt-0.5 flex size-8 shrink-0 items-center justify-center rounded-full",\n isAuthorized\n ? "bg-emerald-500/10 text-emerald-700 dark:text-emerald-300"\n : isCompleted\n ? "bg-destructive/10 text-destructive"\n : "bg-blue-500/10 text-blue-700 dark:text-blue-300",\n )}\n >\n <Icon className="size-4" />\n </span>\n <div className="min-w-0 flex-1 space-y-2">\n <p className="font-medium text-sm">{authorizationTitle(part)}</p>\n <p className="text-muted-foreground text-sm">{authorizationDescription(part)}</p>\n {shouldShowInstructions ? (\n <p className="text-muted-foreground text-sm">{instructions}</p>\n ) : null}\n {part.state === "required" && part.authorization?.userCode ? (\n <div className="flex flex-wrap items-center gap-2 text-sm">\n <span className="text-muted-foreground">Code</span>\n <code className="rounded-md bg-background px-2 py-1 font-mono">\n {part.authorization.userCode}\n </code>\n </div>\n ) : null}\n {part.state === "required" && part.authorization?.url ? (\n <Button asChild size="sm">\n <a href={part.authorization.url} rel="noreferrer" target="_blank">\n <ExternalLinkIcon className="size-4" />\n Sign in with {part.displayName}\n </a>\n </Button>\n ) : null}\n </div>\n </div>\n </div>\n );\n}\n\nfunction authorizationTitle(part: EveAuthorizationPart): string {\n if (part.state === "required") {\n return `Connect ${part.displayName}`;\n }\n if (part.outcome === "authorized") {\n return `${part.displayName} connected`;\n }\n return `${part.displayName} authorization ${formatAuthorizationOutcome(part.outcome)}`;\n}\n\nfunction authorizationDescription(part: EveAuthorizationPart): string {\n if (part.state === "required") {\n return part.description;\n }\n if (part.outcome === "authorized") {\n return `${part.displayName} connected.`;\n }\n const tail = part.reason !== undefined ? ` (${part.reason})` : "";\n return `${part.displayName} authorization ${formatAuthorizationOutcome(part.outcome)}${tail}.`;\n}\n\nfunction formatAuthorizationOutcome(outcome: NonNullable<EveAuthorizationPart["outcome"]>): string {\n switch (outcome) {\n case "authorized":\n return "authorized";\n case "declined":\n return "declined";\n case "failed":\n return "failed";\n case "timed-out":\n return "timed out";\n }\n}\n\nfunction formatBytes(size: number | undefined): string | undefined {\n if (size === undefined) {\n return undefined;\n }\n if (size < 1024) {\n return `${size} B`;\n }\n if (size < 1024 * 1024) {\n return `${(size / 1024).toFixed(1)} KB`;\n }\n return `${(size / (1024 * 1024)).toFixed(1)} MB`;\n}\n\nfunction InputRequestActions({\n canRespond,\n onInputResponses,\n part,\n}: {\n readonly canRespond: boolean;\n readonly onInputResponses: (responses: readonly AgentInputResponse[]) => void | Promise<void>;\n readonly part: EveDynamicToolPart;\n}) {\n const inputRequest = part.toolMetadata?.eve?.inputRequest;\n if (!inputRequest) {\n return null;\n }\n\n const inputResponse = part.toolMetadata?.eve?.inputResponse;\n const selectedOption = inputRequest.options?.find(\n (option) => option.id === inputResponse?.optionId,\n );\n\n return (\n <div className="space-y-3 rounded-md border border-yellow-500/30 bg-yellow-500/5 p-3">\n <p className="text-muted-foreground text-sm">{inputRequest.prompt}</p>\n {inputResponse ? (\n <p className="font-medium text-sm">\n Responded: {selectedOption?.label ?? inputResponse.text ?? inputResponse.optionId}\n </p>\n ) : (\n <div className="flex flex-wrap gap-2">\n {inputRequest.options?.map((option) => (\n <Button\n disabled={!canRespond}\n key={option.id}\n onClick={() => {\n void onInputResponses([\n {\n optionId: option.id,\n requestId: inputRequest.requestId,\n },\n ]);\n }}\n size="sm"\n type="button"\n variant={option.style === "danger" ? "destructive" : "default"}\n >\n {option.label}\n </Button>\n ))}\n </div>\n )}\n </div>\n );\n}\n\nfunction partKey(part: EveMessagePart, index: number): string {\n switch (part.type) {\n case "authorization":\n return `authorization:${part.turnId}:${part.stepIndex}:${part.name}`;\n case "dynamic-tool":\n return part.toolCallId;\n default:\n return `${part.type}:${index}`;\n }\n}\n',
"app/globals.css":
diff --git a/packages/eve/src/setup/scaffold/index.integration.test.ts b/packages/eve/src/setup/scaffold/index.integration.test.ts
index 7ff7e814c..0c889e201 100644
--- a/packages/eve/src/setup/scaffold/index.integration.test.ts
+++ b/packages/eve/src/setup/scaffold/index.integration.test.ts
@@ -239,7 +239,8 @@ describe("ensureChannel", () => {
join(projectRoot, "app/_components/agent-chat.tsx"),
"utf8",
);
- expect(agentChatSource).toContain("disabled={isBusy || isRestoring}");
+ expect(agentChatSource).toContain("<PromptInputTextarea disabled={isRestoring}");
+ expect(agentChatSource).toContain('turnPolicy: "steer"');
expect(agentChatSource).toContain("{showPendingThinking ? <PendingThinking /> : null}");
expect(agentChatSource).not.toContain("StatusDot");
await expect(readFile(join(projectRoot, "next.config.ts"), "utf8")).resolves.toContain(