@noetaris/harness 0.10.0 → 0.11.0

package/README.md

@@ -140,6 +140,53 @@ h.store({
 
 The framework injects `ctx.sessionId` automatically on every run — no declaration in `Ctx` needed.
 
+### Turns and `requestId`
+
+With a session store, a session is a conversation thread. Each `agent.run()` on it is one
+**turn** (a request). A turn may span several runs — `run()`, then a `resume()` for each
+interrupt — and every run of a turn is saved with the turn's `requestId`.
+
+```ts
+// one turn per user message, on one thread
+await agent.run({ messages: [msg1] }, { sessionId: 'chat-1', requestId: 'msg-1' })
+await agent.run({ messages: [msg2] }, { sessionId: 'chat-1', requestId: 'msg-2' })
+```
+
+A new turn continues from the state the last turn left: each input field is merged with its
+`reduce` (or replaced when it has none), and the run starts again from the entry step.
+`$error`, `$interrupt` and `$interruptResponses` start fresh for each new turn.
+
+`requestId` is optional. It is the turn's idempotency key: a call with a `requestId` the
+session already ran does **not** run it again. What `agent.run(input, { sessionId, requestId })`
+does depends on the session's latest run:
+
+| Latest run | No `requestId`, or a new one | The latest run's `requestId` (a retry) |
+|---|---|---|
+| none | runs from the entry step | – |
+| completed | a new turn | returns its outcome, runs nothing |
+| paused on an interrupt | resolves `$error` with `SessionPendingInterruptError` | returns its outcome (`signal: '$interrupt'`), runs nothing |
+| paused by a stop or an unhandled error | merges the input and continues from where it paused | continues from where it paused, **without** merging the input again |
+
+A retry of an earlier request (not the latest) is found with the store's optional
+`findRequest` and its outcome is returned; it never runs again, since later turns have
+moved on from it. A store without `findRequest` only recognises the latest run's
+`requestId`, so a late retry of an earlier request runs as a new turn.
+
+Notes:
+- A retry returns the request's **current** outcome, not its first response: if the turn
+  paused and was then resumed to completion, the retry returns the completed outcome. A
+  retry that returns `signal: '$interrupt'` can be resumed from its handle.
+- A returned (not re-run) outcome fires no observer events and saves nothing; its
+  `handle.runId` has no stored run and no trace.
+- Without a `requestId`, every call is a new turn. For a session that serves one request,
+  pass `requestId: sessionId` to get "run once, then return the result".
+- Duplicate calls at the same time are safe only with a store that supports claims: the
+  second call resolves `$error` with `SessionBusyError` and its retry then returns the
+  outcome. Without claims, both calls may run.
+- Without a session store, `requestId` is ignored.
+- `sessionId` and `requestId` must be non-empty strings when given; otherwise `agent.run()`
+  throws `InvalidRunResourceError`.
+
 ### Interrupts
 
 A run can be stopped or resumed:
@@ -331,9 +378,13 @@ Some runs continue an earlier one. Their `RunContext` says which, so an observer
 |---|---|
 | the next run on a session that paused — on an interrupt, a stop, or an unhandled error — whether started by `agent.resume()`, `run.resume()` (with or without a store), or `agent.run()` on that session | `resumedFrom: { runId, carrier? }` — the run that paused |
 | the first run of a session created by `SessionStore.branch()` | `branchedFrom: { sessionId, runId, carrier? }` — the run it was branched from, in the source session |
+| a new turn on a session whose last run completed (see [Turns and `requestId`](#turns-and-requestid)) | `continuedFrom: { runId, carrier? }` — the previous turn's last run |
+
+A run has at most one of the three, only on its top-level context (never on a fork branch's). A
+call that returns a request's outcome without running has none: it has no run.
 
-A run has at most one of the two, only on its top-level context (never on a fork branch's), and a
-session that already completed runs nothing, so it has neither.
+Every context of a turn's runs (fork branches included) also carries `requestId` when the turn
+has one.
 
 `carrier` is what the earlier run's observer returned from `carry(ctx)`: core calls `carry` once,
 right after `onRunStart`, keeps its string values, and saves them as `StoredRun.carrier` (or on the
@@ -416,9 +467,9 @@ The harness never trusts a wrapper. `fn` always runs exactly once, and the calle
 | `required()` | Marks a provider slot as required at `createAgent()`. |
 | `runtime()` | Marks a provider slot as required at `agent.run()`. |
 | `composeObservers([a, b], onObserverError?)` | Merges multiple `Observer` instances into one fan-out observer; a throwing observer is isolated and reported to `onObserverError`. |
-| `SessionStore` | Interface for session persistence backends. |
-| `StoredRun` | Type for a persisted run snapshot. Includes `agentId`, `runId`, `sessionId`, `phase`, state, and optionally `carrier` (the run's `carry` result) and `branchedFrom` (on a branch seed). |
-| `RunRef` | `{ runId, carrier? }` — points at an earlier run; used by `RunContext.resumedFrom` and `branchedFrom` (which adds `sessionId`). |
+| `SessionStore` | Interface for session persistence backends. Optional extensions: `loadHistory`, `branch`, `claim` / `release` / `extendClaim`, and `findRequest` (the newest run of a request, for retries of earlier requests). |
+| `StoredRun` | Type for a persisted run snapshot. Includes `agentId`, `runId`, `sessionId`, `phase`, state, and optionally `requestId` (the run's turn), `carrier` (the run's `carry` result) and `branchedFrom` (on a branch seed). |
+| `RunRef` | `{ runId, carrier? }` — points at an earlier run; used by `RunContext.resumedFrom`, `continuedFrom` and `branchedFrom` (which adds `sessionId`). |
 | `RunCarrier` | `Readonly<Record<string, string>>` — the opaque map an observer's `carry` returns. |
 | `Observer` | Interface for telemetry hooks on run and step lifecycle events (see [Observers](#observers)). |
 | `StepSettledEvent` | Payload of `Observer.onStepSettled` — outcome, duration, update, signal, next, error, interrupt, fork. |
@@ -426,11 +477,12 @@ The harness never trusts a wrapper. `fn` always runs exactly once, and the calle
 | `ObserverAware` | Interface for provider objects that want per-step telemetry: the harness calls `withTelemetry(telemetry)` once per step and installs the returned view on `ctx`. |
 | `TelemetryContext` | What `withTelemetry` receives: `observer` (the run's observer, fault-isolated), `stepContext`, and `within(type, payload, fn)` bound to that step. |
 | `WrapScope` | What `Observer.wrap` is asked to enclose: `{ kind: 'step' }` or `{ kind: 'event', type, payload }`. |
-| `RunContext` | Context passed to run-level observer hooks — `agentId`, `sessionId`, `runId`, `parentRunId?`, `instanceId?`, `branchPath?`, `resumedFrom?`, `branchedFrom?` (see [Linking runs](#linking-runs)). |
+| `RunContext` | Context passed to run-level observer hooks — `agentId`, `sessionId`, `runId`, `parentRunId?`, `instanceId?`, `branchPath?`, `resumedFrom?`, `branchedFrom?`, `continuedFrom?`, `requestId?` (see [Linking runs](#linking-runs)). |
 | `StepContext` | Context passed to step-level observer hooks — `agentId`, `sessionId`, `runId`, `stepName`, `branchPath?`. |
+| `InvalidRunResourceError` | Thrown by `agent.run()` when `sessionId` or `requestId` is given but is not a non-empty string; `key` and `value` name it. |
 | `NoInterruptError` | Thrown when `resume()` is called but the session is not paused on a matching interrupt. |
 | `SessionInFlightError` | Thrown when a session is already running. |
-| `SessionPendingInterruptError` | Thrown when a session is paused on a pending interrupt — use `agent.resume()` instead of `agent.run()`. |
+| `SessionPendingInterruptError` | `agent.run()` on a session paused on a pending interrupt — use `agent.resume()` instead. With a session store, the run resolves with `signal: '$error'` and this error in `state.$error`; without one, `agent.run()` throws it. |
 | `StoreLoadError` | Thrown when the session store fails to load state. |
 
 ## Design Principles

package/dist/index.d.ts

@@ -133,7 +133,8 @@ interface RunContext {
     /**
      * The run this one continues: the run that paused the session (on an interrupt, a stop or
      * an unhandled error), with the carrier its observer produced. Present on a resumed
-     * top-level run only — never on a fork branch's context, never together with `branchedFrom`.
+     * top-level run only — never on a fork branch's context, never together with `branchedFrom` or
+     * `continuedFrom`.
      */
     readonly resumedFrom?: RunRef;
     /**
@@ -143,6 +144,18 @@ interface RunContext {
     readonly branchedFrom?: RunRef & {
         readonly sessionId: string;
     };
+    /**
+     * The previous turn's run, when this run starts a new turn on a session whose last run
+     * completed. Present on the top-level run only — never together with `resumedFrom` or
+     * `branchedFrom`.
+     */
+    readonly continuedFrom?: RunRef;
+    /**
+     * The request (turn) this run belongs to — the `requestId` passed to `agent.run()`, kept by
+     * every resume of that turn. Present on every context of the run, fork branches included.
+     * Absent for keyless turns and when the agent has no session store.
+     */
+    readonly requestId?: string;
 }
 /**
  * Identifies the agent, session, and current step for step-level observer callbacks.
@@ -321,7 +334,7 @@ interface Observer {
      * Called once per top-level run, right after `onRunStart` (never for a fork branch). Return
      * an opaque string map that lets a later run refer back to this one — e.g. the run's trace
      * context. Core saves it on the run's record and hands it back as `RunContext.resumedFrom.carrier`
-     * (or `branchedFrom.carrier`) to the run that continues or branches from it. Return
+     * (or `branchedFrom.carrier`, `continuedFrom.carrier`) to the run that continues or branches from it. Return
      * `undefined` for nothing. Only string values are kept; a throw is reported via
      * `onObserverError` (hook name `'carry'`) and counts as `undefined`.
      */
@@ -537,7 +550,7 @@ interface SessionStore {
      * no `step`, both states equal to the source run's `finalState`, and `branchedFrom` set to the
      * source session, `runId` and the source run's `carrier` (when it has one). When the source is
      * itself such a seed, copy its `branchedFrom` instead (or leave it out if it has none): a seed's
-     * own `runId` never ran. The seed has no `carrier` of its own.
+     * own `runId` never ran. The seed has no `carrier` and no `requestId` of its own.
      *
      * @throws {@link BranchNotFoundError} when `runId` is not found in history.
      */
@@ -574,6 +587,16 @@ interface SessionStore {
      * Optional — omit if your store does not support claim/release.
      */
     extendClaim?(lease: Lease, options: ClaimOptions): Promise<Lease>;
+    /**
+     * The newest run of the session whose `requestId` equals `requestId`, or `null` when there is none.
+     *
+     * Core calls it only from `agent.run()` with a `requestId` that the latest run does not carry,
+     * so a late retry of an earlier request is replayed instead of run again. Without it, core
+     * dedupes against the latest run only.
+     *
+     * Optional — omit if your store keeps no history.
+     */
+    findRequest?(agentId: string, sessionId: string, requestId: string): Promise<StoredRun | null>;
 }
 /**
  * Serializable snapshot of a single agent run, written to the store after
@@ -620,6 +643,12 @@ interface StoredRun {
     readonly branchedFrom?: RunRef & {
         readonly sessionId: string;
     };
+    /**
+     * The request (turn) this run belongs to: the `requestId` passed to `agent.run()`, inherited by
+     * every resume of that turn. Absent for keyless turns, branch seeds and runs saved before this
+     * field was added.
+     */
+    readonly requestId?: string;
 }
 /**
  * Discriminated union returned by {@link Agent.status} describing the lifecycle
@@ -1056,7 +1085,15 @@ interface Agent {
     /** The agent's unique identifier, as provided to createAgent(). */
     readonly id: string;
     /**
-     * Start a new run. Returns a RunHandle synchronously before execution begins.
+     * Start a run. Returns a RunHandle synchronously before execution begins.
+     *
+     * Reserved `resources` keys that shape the session:
+     * - `sessionId?: string` — the conversation thread; a random UUID when absent
+     * - `requestId?: string` — this turn and its idempotency key. With a session store, a call whose
+     *   `requestId` the session already ran returns that request's current outcome without running
+     *   it again; without one, every call is a new turn. Ignored when the agent has no session store
+     *
+     * Both must be non-empty strings when given; otherwise `run` throws `InvalidRunResourceError`.
      */
     run(initialState: Record<string, unknown>, resources: Record<string, unknown>): RunHandle;
     /**
@@ -1078,6 +1115,14 @@ interface Agent {
      */
     status(sessionId: string): Promise<SessionPhase>;
 }
+/** Thrown by `agent.run()` when `sessionId` or `requestId` is given but is not a non-empty string. */
+declare class InvalidRunResourceError extends Error {
+    /** The resource key that was rejected. */
+    readonly key: 'sessionId' | 'requestId';
+    /** The rejected value, as given. */
+    readonly value: unknown;
+    constructor(key: 'sessionId' | 'requestId', value: unknown);
+}
 /**
  * Instantiate an agent from a fully-configured {@link Harness}.
  *
@@ -1104,17 +1149,6 @@ interface Agent {
  */
 declare function createAgent<Ctx, State, Req extends keyof Ctx, Run extends keyof Ctx>(id: string, h: Harness<Ctx, State, Req, Run>, slots: Pick<Ctx, Req>, agentOptions?: AgentOptions): Agent;
 
-/**
- * Thrown by {@link RunHandle.resume} or {@link Agent.resume} when the session
- * is not currently paused on a matching interrupt.
- *
- * Common causes: the run has not yet settled, the session does not exist,
- * or the supplied `interruptId` does not match the pending interrupt.
- */
-declare class NoInterruptError extends Error {
-    constructor();
-}
-
 /**
  * Thrown by {@link Agent.run} or {@link Agent.resume} when the given session
  * is already executing a run in the same process.
@@ -1174,4 +1208,15 @@ declare class LeaseExpiredError extends Error {
     constructor(sessionId: string);
 }
 
-export { type Agent, type AgentOptions, type BranchCursor, type BranchDef, type ClaimOptions, type Cursor, type DeepWithMarkers, type FieldDefinition, type ForkCursor, type ForkDef, type FrameworkState, type Harness, type Lease, LeaseExpiredError, type LoopDefinition, type LoopNode, LoopNotDefinedError, NoInterruptError, type Observer, type ObserverAware, type ObserverErrorContext, type ObserverErrorSink, REQUIRED_TAG, RUNTIME_TAG, type RequiredMarker, type RouteFn, type RunCarrier, type RunContext, type RunFn, type RunRef, type RuntimeMarker, SessionBusyError, SessionInFlightError, SessionPendingInterruptError, type SessionStore, type SignalTransition, type StateFromSchema, type StepContext, type StepDef, type StepSettledEvent, type StepSettledNext, type StepState, StoreLoadError, type StoredRun, type StoredRunMetadata, type TelemetryContext, type TransitionTarget, type WrapScope, composeObservers, createAgent, createHarness, field, isForkCursor, isForkDef, isRequiredMarker, isRuntimeMarker, required, runtime };
+/**
+ * Thrown by {@link RunHandle.resume} or {@link Agent.resume} when the session
+ * is not currently paused on a matching interrupt.
+ *
+ * Common causes: the run has not yet settled, the session does not exist,
+ * or the supplied `interruptId` does not match the pending interrupt.
+ */
+declare class NoInterruptError extends Error {
+    constructor();
+}
+
+export { type Agent, type AgentOptions, type BranchCursor, type BranchDef, type ClaimOptions, type Cursor, type DeepWithMarkers, type FieldDefinition, type ForkCursor, type ForkDef, type FrameworkState, type Harness, InvalidRunResourceError, type Lease, LeaseExpiredError, type LoopDefinition, type LoopNode, LoopNotDefinedError, NoInterruptError, type Observer, type ObserverAware, type ObserverErrorContext, type ObserverErrorSink, REQUIRED_TAG, RUNTIME_TAG, type RequiredMarker, type RouteFn, type RunCarrier, type RunContext, type RunFn, type RunRef, type RuntimeMarker, SessionBusyError, SessionInFlightError, SessionPendingInterruptError, type SessionStore, type SignalTransition, type StateFromSchema, type StepContext, type StepDef, type StepSettledEvent, type StepSettledNext, type StepState, StoreLoadError, type StoredRun, type StoredRunMetadata, type TelemetryContext, type TransitionTarget, type WrapScope, composeObservers, createAgent, createHarness, field, isForkCursor, isForkDef, isRequiredMarker, isRuntimeMarker, required, runtime };

package/dist/index.js

@@ -745,11 +745,13 @@ async function runLoop(graph, state, ctx, schema, shouldStop, startCursor, callb
     sessionId: ctx.sessionId,
     runId: typeof callbacks?.runId === "string" ? callbacks.runId : "",
     ...typeof callbacks?.parentRunId === "string" ? { parentRunId: callbacks.parentRunId } : {},
+    ...typeof callbacks?.requestId === "string" ? { requestId: callbacks.requestId } : {},
     ...typeof ctx.instanceId === "string" ? { instanceId: ctx.instanceId } : {},
     ...isBranch ? { branchPath } : {},
     // Branch runLoops receive the outer callbacks by spread, so the refs are dropped here.
     ...!isBranch && callbacks?.resumedFrom !== void 0 ? { resumedFrom: callbacks.resumedFrom } : {},
-    ...!isBranch && callbacks?.branchedFrom !== void 0 ? { branchedFrom: callbacks.branchedFrom } : {}
+    ...!isBranch && callbacks?.branchedFrom !== void 0 ? { branchedFrom: callbacks.branchedFrom } : {},
+    ...!isBranch && callbacks?.continuedFrom !== void 0 ? { continuedFrom: callbacks.continuedFrom } : {}
   };
   safeInvoke("onRunStart", () => obs?.onRunStart?.(runCtx), onObserverError);
   const carrier = isBranch ? void 0 : normalizeCarrier(safeCall("carry", () => obs?.carry?.(runCtx), onObserverError));
@@ -1287,12 +1289,32 @@ async function querySessionPhase(store, agentId, sessionId) {
   return storedSessionToPhase(loaded);
 }
 function runRefsOf(loaded) {
-  if (loaded === null || loaded.phase !== "paused") return {};
-  if (loaded.step !== void 0) {
-    return { resumedFrom: { runId: loaded.runId, ...loaded.carrier !== void 0 ? { carrier: loaded.carrier } : {} } };
-  }
+  if (loaded === null) return {};
+  const ref = { runId: loaded.runId, ...loaded.carrier !== void 0 ? { carrier: loaded.carrier } : {} };
+  if (loaded.phase === "completed") return { continuedFrom: ref };
+  if (loaded.step !== void 0) return { resumedFrom: ref };
   return loaded.branchedFrom !== void 0 ? { branchedFrom: loaded.branchedFrom } : {};
 }
+function decideRun(args) {
+  const { loaded, older, mode, requestId, sessionId } = args;
+  if (loaded === null) return { action: "start" };
+  const pending = loaded.phase === "paused" && collectPendingInterrupts(loaded.step, loaded.finalState).length > 0;
+  if (mode === "resume") {
+    return loaded.phase === "completed" ? { action: "replay", row: loaded } : { action: "continue", mergeInput: false };
+  }
+  if (requestId !== void 0 && loaded.requestId === requestId) {
+    if (loaded.phase === "completed" || pending) return { action: "replay", row: loaded };
+    return { action: "continue", mergeInput: false };
+  }
+  if (older !== null) return { action: "replay", row: older };
+  if (loaded.phase === "completed") return { action: "new-turn" };
+  if (pending) return { action: "reject", error: new SessionPendingInterruptError(sessionId) };
+  return { action: "continue", mergeInput: true };
+}
+function withoutSystemFields(loaded) {
+  const { $error: _error, $interrupt: _interrupt, $interruptResponses: _responses, ...finalState } = loaded.finalState;
+  return { ...loaded, finalState };
+}
 async function runWithSession(store, agentId, sessionId, runId, graph, initialStateArg, schema, ctx, options) {
   const leaseRef = options?.leaseRef ?? { current: null };
   const keepAlive = createKeepAliveFn(leaseRef, store, options?.claimTtlMs ?? defaultClaimTtlMs());
@@ -1306,10 +1328,11 @@ async function runWithSession(store, agentId, sessionId, runId, graph, initialSt
     }
     return false;
   };
+  const { mode = "run", requestId: callerRequestId, ...loopOptions } = options ?? {};
   if (store === void 0) {
     const state2 = initializeState(null, initialStateArg, schema);
     const result2 = await runLoop(graph, state2, ctx, schema, composedShouldStop, void 0, {
-      ...options,
+      ...loopOptions,
       runId,
       ...options?.parentRunId !== void 0 ? { parentRunId: options.parentRunId } : {}
     });
@@ -1320,31 +1343,46 @@ async function runWithSession(store, agentId, sessionId, runId, graph, initialSt
     }
     return result2;
   }
+  const requestId = mode === "run" ? callerRequestId : void 0;
+  const fail = (error) => {
+    const failState = initializeState(null, initialStateArg, schema);
+    failState["$error"] = error;
+    return { state: failState, signal: "$error", paused: false, cursor: null };
+  };
   let loaded;
+  let older = null;
   try {
     loaded = await store.load(agentId, sessionId);
+    if (requestId !== void 0 && loaded !== null && loaded.requestId !== requestId && typeof store.findRequest === "function") {
+      older = await store.findRequest(agentId, sessionId, requestId);
+    }
   } catch (error) {
     const storeError = new StoreLoadError(error);
     options?.onStoreError?.(storeError, "load");
-    const failState = initializeState(null, initialStateArg, schema);
-    failState["$error"] = storeError;
-    return { state: failState, signal: "$error", paused: false, cursor: null };
+    return fail(storeError);
   }
-  if (loaded !== null && loaded.phase === "completed") {
+  const decision = decideRun({ loaded, older, mode, requestId, sessionId });
+  if (decision.action === "reject") return fail(decision.error);
+  if (decision.action === "replay") {
+    const { row } = decision;
     return {
-      state: loaded.finalState,
-      signal: loaded.signal ?? null,
-      cursor: null,
-      paused: false
+      state: row.finalState,
+      signal: row.signal ?? null,
+      cursor: row.step ?? null,
+      paused: row.phase === "paused"
     };
   }
-  const state = initializeState(loaded, initialStateArg, schema);
+  const segmentRequestId = mode === "run" ? requestId : loaded?.requestId;
+  const base = decision.action === "new-turn" && loaded !== null ? withoutSystemFields(loaded) : loaded;
+  const input = decision.action === "continue" && !decision.mergeInput ? {} : initialStateArg;
+  const state = initializeState(base, input, schema);
   const initialStateSnapshot = { ...state };
   const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const result = await runLoop(graph, state, ctx, schema, composedShouldStop, loaded?.step, {
-    ...options,
+    ...loopOptions,
     runId,
     ...options?.parentRunId !== void 0 ? { parentRunId: options.parentRunId } : {},
+    ...segmentRequestId !== void 0 ? { requestId: segmentRequestId } : {},
     ...runRefsOf(loaded)
   });
   if (leaseExpired) {
@@ -1370,7 +1408,8 @@ async function runWithSession(store, agentId, sessionId, runId, graph, initialSt
         step: result.cursor,
         ...result.signal !== null ? { signal: result.signal } : {},
         ...metadata !== void 0 ? { metadata } : {},
-        ...result.carrier !== void 0 ? { carrier: result.carrier } : {}
+        ...result.carrier !== void 0 ? { carrier: result.carrier } : {},
+        ...segmentRequestId !== void 0 ? { requestId: segmentRequestId } : {}
       };
       await store.save(agentId, sessionId, saved);
     } else {
@@ -1386,7 +1425,8 @@ async function runWithSession(store, agentId, sessionId, runId, graph, initialSt
         finalState: result.state,
         ...result.signal !== null ? { signal: result.signal } : {},
         ...metadata !== void 0 ? { metadata } : {},
-        ...result.carrier !== void 0 ? { carrier: result.carrier } : {}
+        ...result.carrier !== void 0 ? { carrier: result.carrier } : {},
+        ...segmentRequestId !== void 0 ? { requestId: segmentRequestId } : {}
       };
       await store.save(agentId, sessionId, saved);
     }
@@ -1510,7 +1550,8 @@ async function injectInterruptResponse(store, agentId, sessionId, interruptId, r
     ...loaded.signal !== void 0 ? { signal: loaded.signal } : {},
     ...loaded.metadata !== void 0 ? { metadata: loaded.metadata } : {},
     ...loaded.carrier !== void 0 ? { carrier: loaded.carrier } : {},
-    ...loaded.branchedFrom !== void 0 ? { branchedFrom: loaded.branchedFrom } : {}
+    ...loaded.branchedFrom !== void 0 ? { branchedFrom: loaded.branchedFrom } : {},
+    ...loaded.requestId !== void 0 ? { requestId: loaded.requestId } : {}
   };
   await store.save(agentId, sessionId, updated);
 }
@@ -1697,6 +1738,24 @@ var InvalidClaimOptionsError = class extends Error {
     this.ttlMs = ttlMs;
   }
 };
+var InvalidRunResourceError = class extends Error {
+  /** The resource key that was rejected. */
+  key;
+  /** The rejected value, as given. */
+  value;
+  constructor(key, value) {
+    super(`${key} must be a non-empty string \u2014 got ${describeValue(value)} in agent.run() resources`);
+    this.name = "InvalidRunResourceError";
+    this.key = key;
+    this.value = value;
+  }
+};
+function readIdResource(resources, key) {
+  const value = resources[key];
+  if (value === void 0) return void 0;
+  if (typeof value !== "string" || value.length === 0) throw new InvalidRunResourceError(key, value);
+  return value;
+}
 var _agentInternals = /* @__PURE__ */ Symbol("_agentInternals");
 function createAgent(id, h, slots, agentOptions) {
   const internals = getInternals(h);
@@ -1783,7 +1842,7 @@ function createAgent(id, h, slots, agentOptions) {
     runtimeKeys,
     requiredKeys
   };
-  const reservedRunKeys = /* @__PURE__ */ new Set(["sessionId", "signal", "events", "listeners", "observer", "onObserverError", "claimOptions", "parentRunId"]);
+  const reservedRunKeys = /* @__PURE__ */ new Set(["sessionId", "requestId", "signal", "events", "listeners", "observer", "onObserverError", "claimOptions", "parentRunId"]);
   const inFlightSessions = /* @__PURE__ */ new Set();
   const interruptPendingSessions = /* @__PURE__ */ new Set();
   const resumeFailState = () => initializeState(null, {}, agentInternals.stateSchema);
@@ -1842,6 +1901,7 @@ function createAgent(id, h, slots, agentOptions) {
                   agentInternals.stateSchema,
                   agentCtx,
                   {
+                    mode: "resume",
                     shouldStop: () => flag.stopped,
                     onBeforeStep: (n) => {
                       ref.current = n;
@@ -1855,7 +1915,6 @@ function createAgent(id, h, slots, agentOptions) {
                     ...parentRunId !== void 0 ? { parentRunId } : {}
                   }
                 );
-                if (r.signal === "$interrupt") interruptPendingSessions.add(sId);
                 return { state: r.state, signal: r.signal };
               }
             });
@@ -1894,10 +1953,11 @@ function createAgent(id, h, slots, agentOptions) {
           throw new MissingRuntimeSlotError(key);
         }
       }
-      const sessionId = typeof resources["sessionId"] === "string" ? resources["sessionId"] : randomUUID();
+      const sessionId = readIdResource(resources, "sessionId") ?? randomUUID();
+      const requestId = readIdResource(resources, "requestId");
       const runId = randomUUID();
       if (inFlightSessions.has(sessionId)) throw new SessionInFlightError(sessionId);
-      if (interruptPendingSessions.has(sessionId)) throw new SessionPendingInterruptError(sessionId);
+      if (capturedStore === void 0 && interruptPendingSessions.has(sessionId)) throw new SessionPendingInterruptError(sessionId);
       inFlightSessions.add(sessionId);
       let _stopped = false;
       const abortController = new AbortController();
@@ -1946,6 +2006,8 @@ function createAgent(id, h, slots, agentOptions) {
       const parentRunId = typeof resources["parentRunId"] === "string" ? resources["parentRunId"] : void 0;
       const claimOptions = parseClaimOptions(resources["claimOptions"], fallbackClaimOptions());
       const options = {
+        mode: "run",
+        ...requestId !== void 0 ? { requestId } : {},
         shouldStop: () => stopFlag.stopped,
         onBeforeStep: (name, state) => {
           stepRef.current = name;
@@ -1987,7 +2049,7 @@ function createAgent(id, h, slots, agentOptions) {
                 ctx,
                 { ...options, ...lease }
               );
-              if (r.signal === "$interrupt") interruptPendingSessions.add(sessionId);
+              if (capturedStore === void 0 && r.signal === "$interrupt") interruptPendingSessions.add(sessionId);
               lastResult = { state: r.state, cursor: r.cursor, runId, ...r.carrier !== void 0 ? { carrier: r.carrier } : {} };
               return { state: r.state, signal: r.signal };
             }
@@ -2051,6 +2113,7 @@ function createAgent(id, h, slots, agentOptions) {
                         agentInternals.stateSchema,
                         resumeCtx,
                         {
+                          mode: "resume",
                           shouldStop: () => resumeStopFlag.stopped,
                           onBeforeStep: (n, s) => {
                             resumeStepRef.current = n;
@@ -2070,7 +2133,6 @@ function createAgent(id, h, slots, agentOptions) {
                           ...lease
                         }
                       );
-                      if (r2.signal === "$interrupt") interruptPendingSessions.add(sessionId);
                       lastResult = { state: r2.state, cursor: r2.cursor, runId: resumeRunId, ...r2.carrier !== void 0 ? { carrier: r2.carrier } : {} };
                       return { state: r2.state, signal: r2.signal };
                     }
@@ -2144,6 +2206,7 @@ function createAgent(id, h, slots, agentOptions) {
   return agent;
 }
 export {
+  InvalidRunResourceError,
   LeaseExpiredError,
   LoopNotDefinedError,
   NoInterruptError,