Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): preserve resumed parent turn identity (#2855)

vercel-gh-bot-2[bot]0172af9be57a
diff --git a/.changeset/calm-agents-resume.md b/.changeset/calm-agents-resume.md
new file mode 100644
index 000000000..e6f5996b8
--- /dev/null
+++ b/.changeset/calm-agents-resume.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Preserve parent turn identity when dispatching a subagent after a parked child resumes, preventing handle-store corruption and fatal session failures.
diff --git a/packages/eve/src/execution/dispatch-runtime-actions-shared.ts b/packages/eve/src/execution/dispatch-runtime-actions-shared.ts
index bb5552ec7..5b2ca3410 100644
--- a/packages/eve/src/execution/dispatch-runtime-actions-shared.ts
+++ b/packages/eve/src/execution/dispatch-runtime-actions-shared.ts
@@ -3,8 +3,8 @@
* `dispatchRuntimeActionsStep` (plain mode) and `dispatchTaskStep`
* (task mode). Both run the same preflight → plan → dispatch → emit
* skeleton over one pending batch and differ only in the per-entry
- * delegation lifecycle, so planning, subagent starts, and the
- * replay-safe `subagent.called` emission tail live here.
+ * delegation lifecycle, so planning and the replay-safe
+ * `subagent.called` emission tail live here.
*/
import { buildAdapterContext } from "#channel/adapter-context.js";
@@ -39,11 +39,12 @@ import {
} from "#execution/agent-handle-dispatch.js";
import { getAgentHandleStore } from "#harness/handles/store.js";
import { deriveRootTurnActivityWorkId } from "#execution/activity-work-id.js";
-import { readActionTraceContext } from "#tracing/agent-trace-context-store.js";
import {
assertUniqueRuntimeActionCallIds,
getPendingRuntimeActionBatch,
+ setPendingRuntimeActionBatch,
} from "#harness/runtime-actions.js";
+import { activeTurnId } from "#harness/active-turn-id.js";
import {
createSubagentCalledEvent,
encodeMessageStreamEvent,
@@ -62,14 +63,16 @@ import type {
PendingTaskControlAction,
PendingWorkflowToolAction,
} from "#shared/dispatch-action.js";
-import { type DurableSessionState, readDurableSession } from "#execution/durable-session-store.js";
+import {
+ createDurableSessionState,
+ type DurableSessionState,
+ readDurableSession,
+} from "#execution/durable-session-store.js";
import {
createRecursiveAgentRootOnlyResult,
createUnavailableDynamicSubagentResult,
getSubagentName,
} from "#execution/dispatch-action-failures.js";
-import { startLocalSubagent } from "#execution/subagent-start-local.js";
-import { startRemoteSubagent } from "#execution/subagent-start-remote.js";
import { hydrateDurableSession } from "#execution/session.js";
import { buildSubagentRunInput, type SubagentInputSource } from "#execution/subagent-tool.js";
import { workflowEntryReference } from "#execution/workflow-runtime.js";
@@ -82,11 +85,6 @@ import { isTaskControlAction } from "#execution/tasks/parent/dispatch.js";
import { isWorkflowToolAction } from "#execution/tool-run/dispatch.js";
import { isSubagentDelegationAction } from "#harness/subagent-depth.js";
import { resolvePreparedAgentAction } from "#execution/prepared-agent-action.js";
-import { normalizeChannelAudience } from "#shared/channel-audience.js";
-import {
- applyLiveDeliveryAudienceCeiling,
- readForwardedTraceAssertion,
-} from "#shared/forwarded-trace-policy.js";
const log = createLogger("execution.dispatch-runtime-actions");
@@ -186,6 +184,11 @@ export interface PreparedRuntimeActionDispatch {
readonly session: RuntimeSession;
}
+interface PreparedPendingRuntimeActionDispatch extends PreparedRuntimeActionDispatch {
+ /** Returns the durable baseline corresponding to `session`. */
+ readonly getBaselineSessionState: () => DurableSessionState;
+}
+
/**
* Runs every dispatch precondition that may throw — durable reads, context
* deserialization, handle-store validation, and batch planning — before
@@ -202,19 +205,38 @@ export async function prepareRuntimeActionDispatch(input: {
* those calls fail as unsupported batch actions.
*/
readonly taskControls: boolean;
-}): Promise<PreparedRuntimeActionDispatch | undefined> {
+}): Promise<PreparedPendingRuntimeActionDispatch | undefined> {
const durableSession = await readDurableSession(input.sessionState);
const batch = getPendingRuntimeActionBatch(durableSession.state);
if (batch === undefined || batch.actions.length === 0) return undefined;
+ const parentTurnId = batch.event.turnId || activeTurnId(input.sessionState.emissionState);
+ const sessionStateRepaired = batch.event.turnId !== parentTurnId;
+ const repairedBatch = sessionStateRepaired
+ ? { ...batch, event: { ...batch.event, turnId: parentTurnId } }
+ : batch;
const ctx = await deserializeContext(input.serializedContext);
- return await prepareActionDispatch({
- batch,
+ const prepared = await prepareActionDispatch({
+ batch: repairedBatch,
ctx,
durableSession,
serializedContext: input.serializedContext,
taskControls: input.taskControls,
});
+ if (!sessionStateRepaired) {
+ return { ...prepared, getBaselineSessionState: () => input.sessionState };
+ }
+
+ const session = setPendingRuntimeActionBatch({
+ ...repairedBatch,
+ session: prepared.session,
+ });
+
+ return {
+ ...prepared,
+ getBaselineSessionState: () => createDurableSessionState({ session }),
+ session,
+ };
}
export async function prepareAgentActionDispatch(input: {
@@ -605,96 +627,3 @@ function classifyFreshStart(input: {
}
}
}
-
-/** Starts one planned fresh child against its local or remote target. */
-export async function startSubagent(input: {
- readonly auth: Parameters<typeof buildSubagentRunInput>[0]["auth"];
- readonly batchEvent: { readonly sequence: number; readonly turnId: string };
- readonly bundle: CompiledBundle;
- readonly callbackBaseUrl: string | undefined;
- readonly capabilities: Parameters<typeof buildSubagentRunInput>[0]["capabilities"];
- readonly channelMetadata: Parameters<typeof buildSubagentRunInput>[0]["channelMetadata"];
- readonly currentSession: RuntimeSession;
- readonly fanoutSize: number;
- readonly initiatorAuth: Parameters<typeof buildSubagentRunInput>[0]["initiatorAuth"];
- readonly localDevRequest?: LocalDevRequestProvenance;
- readonly parentContinuationToken: string | undefined;
- readonly parentTraceContext: Parameters<typeof buildSubagentRunInput>[0]["parentTraceContext"];
- readonly activityObserver?: ActivityObserverConfig & {
- readonly workIdentity: ActivityWorkIdentityV1;
- };
- readonly sandboxSessionId: string;
- readonly serializedContext: Record<string, unknown>;
- readonly session: RuntimeSession;
- readonly taskOwned: boolean;
- readonly target: DispatchStartTarget;
-}): Promise<DispatchOutcome> {
- const storedParentTraceContext =
- readActionTraceContext(
- input.serializedContext,
- input.session.sessionId,
- input.batchEvent.turnId,
- input.target.action.callId,
- ) ?? input.parentTraceContext;
- const forwardedTracePolicy = readForwardedTraceAssertion(
- storedParentTraceContext?.forwardedTracePolicy,
- );
- const liveAudience = normalizeChannelAudience(input.channelMetadata?.metadata.audience);
- const parentTraceContext =
- storedParentTraceContext?.decision === undefined
- ? storedParentTraceContext
- : {
- ...storedParentTraceContext,
- decision: applyLiveDeliveryAudienceCeiling(
- storedParentTraceContext.decision,
- liveAudience,
- forwardedTracePolicy,
- ),
- };
-
- switch (input.target.kind) {
- case "local":
- return startLocalSubagent({
- action: input.target.action,
- auth: input.auth,
- batchEvent: input.batchEvent,
- bundle: input.bundle,
- capabilities: input.capabilities,
- channelMetadata: input.channelMetadata,
- currentSession: input.currentSession,
- dynamicSubagentAgentConfig: input.target.dynamicSubagentAgentConfig,
- fanoutSize: input.fanoutSize,
- initiatorAuth: input.initiatorAuth,
- localDevRequest: input.localDevRequest,
- parentContinuationToken: input.parentContinuationToken,
- parentTraceContext,
- activityObserver: input.activityObserver,
- sandboxSessionId: input.sandboxSessionId,
- selfAgent: input.target.selfAgent,
- session: input.session,
- source: input.target.source,
- taskOwned: input.taskOwned,
- });
- case "remote":
- return startRemoteSubagent({
- action: input.target.action,
- auth: input.auth,
- batchEvent: input.batchEvent,
- bundle: input.bundle,
- callbackBaseUrl: input.callbackBaseUrl,
- originAudience: forwardedTracePolicy?.originAudience ?? liveAudience,
- currentSession: input.currentSession,
- dynamicRemoteAgent: input.target.dynamicRemoteAgent,
- initiatorAuth: input.initiatorAuth,
- parentContinuationToken: input.parentContinuationToken,
- parentTraceContext,
- activityObserver: input.activityObserver,
- session: input.session,
- taskOwned: input.taskOwned,
- });
- default: {
- const _exhaustive: never = input.target;
- return _exhaustive;
- }
- }
-}
diff --git a/packages/eve/src/execution/dispatch-runtime-actions-start.ts b/packages/eve/src/execution/dispatch-runtime-actions-start.ts
new file mode 100644
index 000000000..6342531f8
--- /dev/null
+++ b/packages/eve/src/execution/dispatch-runtime-actions-start.ts
@@ -0,0 +1,108 @@
+import type { ActivityObserverConfig } from "#channel/types.js";
+import type { LocalDevRequestProvenance } from "#context/keys.js";
+import type { DispatchOutcome, RuntimeSession } from "#execution/agent-handle-dispatch.js";
+import type { DispatchStartTarget } from "#execution/dispatch-runtime-actions-shared.js";
+import { startLocalSubagent } from "#execution/subagent-start-local.js";
+import { startRemoteSubagent } from "#execution/subagent-start-remote.js";
+import { buildSubagentRunInput } from "#execution/subagent-tool.js";
+import type { ActivityWorkIdentityV1 } from "#protocol/activity.js";
+import type { CompiledBundle } from "#runtime/sessions/runtime-context-keys.js";
+import { normalizeChannelAudience } from "#shared/channel-audience.js";
+import {
+ applyLiveDeliveryAudienceCeiling,
+ readForwardedTraceAssertion,
+} from "#shared/forwarded-trace-policy.js";
+import { readActionTraceContext } from "#tracing/agent-trace-context-store.js";
+
+/** Starts one planned fresh child against its local or remote target. */
+export async function startSubagent(input: {
+ readonly auth: Parameters<typeof buildSubagentRunInput>[0]["auth"];
+ readonly batchEvent: { readonly sequence: number; readonly turnId: string };
+ readonly bundle: CompiledBundle;
+ readonly callbackBaseUrl: string | undefined;
+ readonly capabilities: Parameters<typeof buildSubagentRunInput>[0]["capabilities"];
+ readonly channelMetadata: Parameters<typeof buildSubagentRunInput>[0]["channelMetadata"];
+ readonly currentSession: RuntimeSession;
+ readonly fanoutSize: number;
+ readonly initiatorAuth: Parameters<typeof buildSubagentRunInput>[0]["initiatorAuth"];
+ readonly localDevRequest?: LocalDevRequestProvenance;
+ readonly parentContinuationToken: string | undefined;
+ readonly parentTraceContext: Parameters<typeof buildSubagentRunInput>[0]["parentTraceContext"];
+ readonly activityObserver?: ActivityObserverConfig & {
+ readonly workIdentity: ActivityWorkIdentityV1;
+ };
+ readonly sandboxSessionId: string;
+ readonly serializedContext: Record<string, unknown>;
+ readonly session: RuntimeSession;
+ readonly taskOwned: boolean;
+ readonly target: DispatchStartTarget;
+}): Promise<DispatchOutcome> {
+ const storedParentTraceContext =
+ readActionTraceContext(
+ input.serializedContext,
+ input.session.sessionId,
+ input.batchEvent.turnId,
+ input.target.action.callId,
+ ) ?? input.parentTraceContext;
+ const forwardedTracePolicy = readForwardedTraceAssertion(
+ storedParentTraceContext?.forwardedTracePolicy,
+ );
+ const liveAudience = normalizeChannelAudience(input.channelMetadata?.metadata.audience);
+ const parentTraceContext =
+ storedParentTraceContext?.decision === undefined
+ ? storedParentTraceContext
+ : {
+ ...storedParentTraceContext,
+ decision: applyLiveDeliveryAudienceCeiling(
+ storedParentTraceContext.decision,
+ liveAudience,
+ forwardedTracePolicy,
+ ),
+ };
+
+ switch (input.target.kind) {
+ case "local":
+ return startLocalSubagent({
+ action: input.target.action,
+ auth: input.auth,
+ batchEvent: input.batchEvent,
+ bundle: input.bundle,
+ capabilities: input.capabilities,
+ channelMetadata: input.channelMetadata,
+ currentSession: input.currentSession,
+ dynamicSubagentAgentConfig: input.target.dynamicSubagentAgentConfig,
+ fanoutSize: input.fanoutSize,
+ initiatorAuth: input.initiatorAuth,
+ localDevRequest: input.localDevRequest,
+ parentContinuationToken: input.parentContinuationToken,
+ parentTraceContext,
+ activityObserver: input.activityObserver,
+ sandboxSessionId: input.sandboxSessionId,
+ selfAgent: input.target.selfAgent,
+ session: input.session,
+ source: input.target.source,
+ taskOwned: input.taskOwned,
+ });
+ case "remote":
+ return startRemoteSubagent({
+ action: input.target.action,
+ auth: input.auth,
+ batchEvent: input.batchEvent,
+ bundle: input.bundle,
+ callbackBaseUrl: input.callbackBaseUrl,
+ originAudience: forwardedTracePolicy?.originAudience ?? liveAudience,
+ currentSession: input.currentSession,
+ dynamicRemoteAgent: input.target.dynamicRemoteAgent,
+ initiatorAuth: input.initiatorAuth,
+ parentContinuationToken: input.parentContinuationToken,
+ parentTraceContext,
+ activityObserver: input.activityObserver,
+ session: input.session,
+ taskOwned: input.taskOwned,
+ });
+ default: {
+ const _exhaustive: never = input.target;
+ return _exhaustive;
+ }
+ }
+}
diff --git a/packages/eve/src/execution/dispatch-runtime-actions-step.integration.test.ts b/packages/eve/src/execution/dispatch-runtime-actions-step.integration.test.ts
index abe3fa4b7..24f46663b 100644
--- a/packages/eve/src/execution/dispatch-runtime-actions-step.integration.test.ts
+++ b/packages/eve/src/execution/dispatch-runtime-actions-step.integration.test.ts
@@ -11,6 +11,7 @@ import { dispatchRuntimeActionsStep } from "#execution/dispatch-runtime-actions-
import { prepareAgentActionDispatch } from "#execution/dispatch-runtime-actions-shared.js";
import { dispatchTaskStep } from "#execution/tasks/parent/dispatch-task-step.js";
import {
+ getPendingRuntimeActionBatch,
resolvePendingRuntimeActions,
setPendingRuntimeActionBatch,
} from "#harness/runtime-actions.js";
@@ -347,6 +348,88 @@ describe("dispatchRuntimeActionsStep child starts", () => {
expect(mocks.createSession).toHaveBeenCalledOnce();
});
+ it("uses the active session turn when pending batch metadata has an empty turn id", async () => {
+ const session = createStartSession({
+ event: { sequence: 3, stepIndex: 2, turnId: "" },
+ kind: "local",
+ });
+ installContext(session, {
+ definition: { description: "Research", kind: "subagent" },
+ nodeId: "subagents/research",
+ });
+
+ const result = await dispatchRuntimeActionsStep({
+ parentContinuationToken: "turn-inbox",
+ parentWritable: createWritable(),
+ serializedContext: {},
+ sessionState: {
+ ...BASE_STATE,
+ emissionState: { sequence: 3, sessionStarted: true, stepIndex: 2, turnId: "" },
+ },
+ });
+
+ const resultState = readResultSessionState(result, session);
+ expect(getPendingRuntimeActionBatch(resultState)?.event.turnId).toBe("turn_3");
+ expect(getAgentHandleStore(resultState)).toMatchObject({
+ handles: [{ operation: { parentTurnId: "turn_3" } }],
+ });
+ });
+
+ it("persists the active turn when dispatch leaves agent handles unchanged", async () => {
+ const session = createStartSession({
+ event: { sequence: 3, stepIndex: 2, turnId: "" },
+ kind: "remote",
+ });
+ installContext(session, {
+ definition: REMOTE_REGISTRY_DEFINITION,
+ nodeId: "remote/research",
+ });
+
+ const result = await dispatchRuntimeActionsStep({
+ parentContinuationToken: "turn-inbox",
+ parentWritable: createWritable(),
+ serializedContext: {},
+ sessionState: {
+ ...BASE_STATE,
+ emissionState: { sequence: 3, sessionStarted: true, stepIndex: 2, turnId: "" },
+ },
+ });
+
+ const resultState = readResultSessionState(result, session);
+ expect(getAgentHandleStore(resultState)).toBeUndefined();
+ expect(getPendingRuntimeActionBatch(resultState)?.event.turnId).toBe("turn_3");
+ expect(mocks.createDurableSessionState).toHaveBeenCalledTimes(1);
+ });
+
+ it("uses the active session turn for task-mode dispatch", async () => {
+ const session = createStartSession({
+ event: { sequence: 3, stepIndex: 2, turnId: "" },
+ kind: "local",
+ });
+ installContext(
+ session,
+ { definition: { description: "Research", kind: "subagent" }, nodeId: "subagents/research" },
+ true,
+ );
+ vi.spyOn(taskRunControl, "sendTaskCommandToOwner").mockResolvedValue({ runId: "task-run-1" });
+
+ const result = await dispatchTaskStep({
+ parentContinuationToken: "turn-inbox",
+ parentWritable: createWritable(),
+ serializedContext: {},
+ sessionState: {
+ ...BASE_STATE,
+ emissionState: { sequence: 3, sessionStarted: true, stepIndex: 2, turnId: "" },
+ },
+ });
+
+ const resultState = readResultSessionState(result, session);
+ expect(getPendingRuntimeActionBatch(resultState)?.event.turnId).toBe("turn_3");
+ expect(getSessionTaskIndex(resultState)).toEqual([
+ expect.objectContaining({ createdByTurnId: "turn_3" }),
+ ]);
+ });
+
it("opens a shared parent sandbox with session context and durable backend tags", async () => {
const session = createStartSession({ kind: "local" });
const observedSessionIds: string[] = [];
diff --git a/packages/eve/src/execution/dispatch-runtime-actions-step.ts b/packages/eve/src/execution/dispatch-runtime-actions-step.ts
index 42472531e..6c9a7da8e 100644
--- a/packages/eve/src/execution/dispatch-runtime-actions-step.ts
+++ b/packages/eve/src/execution/dispatch-runtime-actions-step.ts
@@ -22,8 +22,8 @@ import {
prepareRuntimeActionDispatch,
type RuntimeActionDispatchInput,
type RuntimeActionDispatchResult,
- startSubagent,
} from "#execution/dispatch-runtime-actions-shared.js";
+import { startSubagent } from "#execution/dispatch-runtime-actions-start.js";
import { startWorkflowTool } from "#execution/tool-run/dispatch.js";
import { createDurableSessionState } from "#execution/durable-session-store.js";
import { deriveChildActivityObserverConfig } from "#execution/activity-work.js";
@@ -153,7 +153,7 @@ export async function dispatchRuntimeActionsStep(
results,
sessionState:
nextSession === session
- ? input.sessionState
+ ? prepared.getBaselineSessionState()
: createDurableSessionState({ session: nextSession }),
pendingTasks: [],
};
diff --git a/packages/eve/src/execution/tasks/parent/dispatch-task-step.ts b/packages/eve/src/execution/tasks/parent/dispatch-task-step.ts
index 4894a7f3e..425a2f95f 100644
--- a/packages/eve/src/execution/tasks/parent/dispatch-task-step.ts
+++ b/packages/eve/src/execution/tasks/parent/dispatch-task-step.ts
@@ -26,8 +26,8 @@ import {
prepareRuntimeActionDispatch,
type RuntimeActionDispatchInput,
type RuntimeActionDispatchResult,
- startSubagent,
} from "#execution/dispatch-runtime-actions-shared.js";
+import { startSubagent } from "#execution/dispatch-runtime-actions-start.js";
import { startWorkflowTool } from "#execution/tool-run/dispatch.js";
import { createDurableSessionState } from "#execution/durable-session-store.js";
import { deriveChildActivityObserverConfig } from "#execution/activity-work.js";
@@ -250,7 +250,7 @@ export async function dispatchTaskStep(
results,
sessionState:
nextSession === session
- ? input.sessionState
+ ? prepared.getBaselineSessionState()
: createDurableSessionState({ session: nextSession }),
pendingTasks,
};
diff --git a/packages/eve/src/execution/tools/subagent/local.ts b/packages/eve/src/execution/tools/subagent/local.ts
index 45767215b..31e08101a 100644
--- a/packages/eve/src/execution/tools/subagent/local.ts
+++ b/packages/eve/src/execution/tools/subagent/local.ts
@@ -8,10 +8,8 @@ import {
} from "#execution/agent-handle-dispatch.js";
import { createAgentContinuationBundle } from "#execution/agent-continuation-bundle.js";
import { deriveChildActivityObserverConfig } from "#execution/activity-work.js";
-import {
- prepareAgentActionDispatch,
- startSubagent,
-} from "#execution/dispatch-runtime-actions-shared.js";
+import { prepareAgentActionDispatch } from "#execution/dispatch-runtime-actions-shared.js";
+import { startSubagent } from "#execution/dispatch-runtime-actions-start.js";
import { createDurableSessionState } from "#execution/durable-session-store.js";
import {
checkTaskContinuationAvailability,