tnega 0.3.0 → 0.4.1

package/dist/eval.js

@@ -8190,17 +8190,88 @@ function checkMonotonicSeq(events) {
   }
   return failures;
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null);
+}
+function isNonNegativeInteger(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
+function isJsonValue(value, ancestors = /* @__PURE__ */ new Set()) {
+  if (value === null || typeof value === "string" || typeof value === "boolean") return true;
+  if (typeof value === "number") return Number.isFinite(value);
+  if (typeof value !== "object" || ancestors.has(value)) return false;
+  if (!Array.isArray(value) && Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) return false;
+  ancestors.add(value);
+  const valid = (Array.isArray(value) ? Array.from(value) : Object.values(value)).every((member) => isJsonValue(member, ancestors));
+  ancestors.delete(value);
+  return valid;
+}
+function isStreamRecord(value) {
+  if (!isRecord(value) || !isNonNegativeInteger(value.time) || !isRecord(value.chunk)) return false;
+  const chunk = value.chunk;
+  if (chunk.type === "stream_error") {
+    return isRecord(chunk.error) && typeof chunk.error.message === "string" && (chunk.error.name === void 0 || typeof chunk.error.name === "string") && (chunk.error.stack === void 0 || typeof chunk.error.stack === "string");
+  }
+  if (typeof chunk.id !== "string") return false;
+  switch (chunk.type) {
+    case "message_start":
+      return chunk.model === void 0 || typeof chunk.model === "string";
+    case "message_delta":
+      return typeof chunk.delta === "string";
+    case "toolcall_start":
+    case "toolcall_end":
+      return isNonNegativeInteger(chunk.index) && typeof chunk.name === "string" && (chunk.type === "toolcall_start" || isJsonValue(chunk.arguments));
+    case "message_stop":
+      return chunk.finishReason === "stop" || chunk.finishReason === "tool_calls" || chunk.finishReason === "length" || chunk.finishReason === "max_turns" || chunk.finishReason === "max_steps" || chunk.finishReason === "error" || chunk.finishReason === "cancelled";
+    default:
+      return false;
+  }
+}
+function checkAssistantAttempts(events) {
+  const turns = /* @__PURE__ */ new Set();
+  const steps = /* @__PURE__ */ new Map();
+  const failures = [];
+  for (const event of events) {
+    if (event.type === "turn/start") turns.add(event.payload.turn);
+    if (event.type === "turn/end") {
+      turns.delete(event.payload.turn);
+      for (const [key, turn] of steps) {
+        if (turn === event.payload.turn) steps.delete(key);
+      }
+    }
+    if (event.type === "step/start" && turns.has(event.payload.turn)) {
+      steps.set(`${event.payload.turn}:${event.payload.step}`, event.payload.turn);
+    }
+    if (event.type === "step/end") steps.delete(`${event.payload.turn}:${event.payload.step}`);
+    if (event.type !== "assistant/attempt") continue;
+    const payload = event.payload;
+    if (!isRecord(payload) || !isNonNegativeInteger(payload.turn) || !isNonNegativeInteger(payload.step) || !turns.has(payload.turn) || !steps.has(`${payload.turn}:${payload.step}`)) {
+      failures.push({
+        name: "assistant/attempt-without-open-step",
+        detail: `assistant/attempt at seq ${event.seq} has no matching open turn and step`
+      });
+    }
+    if (!isRecord(payload) || !Array.isArray(payload.stream) || !payload.stream.every(isStreamRecord)) {
+      failures.push({
+        name: "assistant/attempt-invalid-stream",
+        detail: `assistant/attempt at seq ${event.seq} must contain an ordered array of normalized stream records`
+      });
+    }
+  }
+  return failures;
+}
 function checkSessionInvariants(events) {
   return [
     ...checkBalancedTurns(events),
     ...checkBalancedSteps(events),
     ...checkBalancedToolCalls(events),
-    ...checkMonotonicSeq(events)
+    ...checkMonotonicSeq(events),
+    ...checkAssistantAttempts(events)
   ];
 }
 
 // packages/session/src/index.ts
-var SESSION_FORMAT_VERSION = 7;
+var SESSION_FORMAT_VERSION = 10;
 var SessionFormatError = class extends Error {
   name = "SessionFormatError";
 };
@@ -8415,6 +8486,7 @@ function estimateEventTokens(event) {
       return Math.ceil(raw.length / 4);
     }
     case "plan":
+    case "assistant/attempt":
       return 0;
     case "checkpoint":
       return estimateMessageTokens(event.payload.messages);
@@ -8549,9 +8621,15 @@ function estimateContextUsage(messages, limit = DEFAULT_CONTEXT_LIMIT) {
   };
 }
 var SessionLog = class {
-  constructor(file, _broadcast) {
+  constructor(file, _broadcast, publicationContext) {
     this.file = file;
     this._broadcast = _broadcast;
+    if (!this._broadcast && publicationContext) {
+      this._broadcast = (type, payload) => {
+        if (type === "event") publicationContext.emit("session/event", payload);
+        else publicationContext.emit("session/flush", payload);
+      };
+    }
   }
   file;
   _broadcast;
@@ -8720,7 +8798,7 @@ var SessionLog = class {
           selected.push(clone(event));
           continue;
         }
-        if (event.type === "meta" || event.type === "llm/retry" || event.type === "llm/retry-started" || event.type.startsWith("turn/") || event.type.startsWith("step/")) {
+        if (event.type === "meta" || event.type === "llm/retry" || event.type === "llm/retry-started" || event.type === "assistant/attempt" || event.type.startsWith("turn/") || event.type.startsWith("step/")) {
           continue;
         }
         if (event.type === "checkpoint") {
@@ -11614,7 +11692,7 @@ function copyMessages(messages) {
       copy.tool_calls = message2.tool_calls.map((call) => ({
         id: call.id,
         name: call.name,
-        arguments: call.arguments
+        arguments: structuredClone(call.arguments)
       }));
     }
     return copy;
@@ -11645,6 +11723,75 @@ function copyCompletion(completion) {
   }
   return copy;
 }
+function canonicalMessages(messages) {
+  return JSON.stringify(messages.map((message2) => ({
+    role: message2.role,
+    content: message2.content,
+    ...message2.name ? { name: message2.name } : {},
+    ...message2.tool_call_id ? { tool_call_id: message2.tool_call_id } : {},
+    ...message2.tool_calls?.length ? { tool_calls: message2.tool_calls } : {},
+    ...message2.toolOk !== void 0 ? { toolOk: message2.toolOk } : {},
+    ...message2.toolError ? {
+      toolError: { name: message2.toolError.name, message: message2.toolError.message }
+    } : {}
+  })));
+}
+function freezeRequestData(data) {
+  const visited = /* @__PURE__ */ new Set();
+  const freeze = (value) => {
+    if (typeof value !== "object" || value === null || visited.has(value)) return;
+    visited.add(value);
+    for (const child of Object.values(value)) freeze(child);
+    Object.freeze(value);
+  };
+  freeze(data);
+}
+function lockStreamRequest(request) {
+  freezeRequestData(request.messages);
+  request.tools = Object.freeze(request.tools.map((tool) => {
+    const schema = structuredClone(tool.schema);
+    freezeRequestData(schema);
+    return Object.freeze({ ...tool, schema });
+  }));
+  Object.freeze(request.options);
+  Object.freeze(request);
+}
+function requestHeaderFor(request, input) {
+  const system = input.find((message2) => message2.role === "system")?.content;
+  const tools2 = request.tools.map((tool) => ({
+    name: tool.schema.name,
+    description: tool.schema.description,
+    ...tool.schema.parameters ? { parameters: tool.schema.parameters } : {}
+  }));
+  const config2 = {
+    ...request.options.provider ? { provider: request.options.provider } : {},
+    ...request.options.model ? { model: request.options.model } : {},
+    ...request.options.temperature !== void 0 ? { temperature: request.options.temperature } : {}
+  };
+  return {
+    ...Object.keys(config2).length ? { config: config2 } : {},
+    ...system !== void 0 ? { system } : {},
+    ...tools2.length ? { tools: tools2 } : {}
+  };
+}
+async function* completeAsStream(llm, messages, tools2, options) {
+  const id = randomUUID2();
+  yield { type: "message_start", id };
+  const completion = await llm.complete(messages, tools2, options);
+  if (completion.content) yield { type: "message_delta", id, delta: completion.content };
+  for (let index = 0; index < (completion.toolCalls?.length ?? 0); index += 1) {
+    const call = completion.toolCalls[index];
+    yield { type: "toolcall_start", id: call.id, index, name: call.name };
+    yield {
+      type: "toolcall_end",
+      id: call.id,
+      index,
+      name: call.name,
+      arguments: call.arguments
+    };
+  }
+  yield { type: "message_stop", id, finishReason: completion.finishReason };
+}
 function isCancelCause(value) {
   if (typeof value !== "object" || value === null) return false;
   const record3 = value;
@@ -11665,6 +11812,13 @@ function cancelCauseFromSignal(signal) {
   if (isCancelCause(reason)) return reason;
   return { type: "abort" };
 }
+function abortedToolError(signal) {
+  const cause = cancelCauseFromSignal(signal);
+  return {
+    name: "AbortError",
+    message: `tool call aborted: ${cause?.type ?? "abort"}`
+  };
+}
 function toTurnEndReason(fields) {
   const { cancelled, turnError, finishReason, cancelCause } = fields;
   if (cancelled || finishReason === "cancelled") {
@@ -11709,6 +11863,78 @@ async function cancellableDelay(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
+var AssistantStreamAttempt = class {
+  constructor(session2, turn, step, nextRevision) {
+    this.session = session2;
+    this.turn = turn;
+    this.step = step;
+    this.nextRevision = nextRevision;
+  }
+  session;
+  turn;
+  step;
+  nextRevision;
+  attemptId = randomUUID2();
+  records = [];
+  ended = false;
+  start() {
+    return { type: "assistant/stream", frame: {
+      type: "start",
+      attemptId: this.attemptId,
+      revision: this.nextRevision(),
+      turn: this.turn,
+      step: this.step
+    } };
+  }
+  push(chunk) {
+    if (this.ended) throw new AgentError("assistant attempt is already settled");
+    const record3 = { time: Date.now(), chunk: structuredClone(chunk) };
+    const index = this.records.length;
+    this.records.push(record3);
+    return { type: "assistant/stream", frame: {
+      type: "chunk",
+      attemptId: this.attemptId,
+      revision: this.nextRevision(),
+      index,
+      ...structuredClone(record3)
+    } };
+  }
+  async settle(message2) {
+    if (this.ended) throw new AgentError("assistant attempt is already settled");
+    const eventType = message2 ? "assistant/message" : "assistant/attempt";
+    let event;
+    try {
+      event = message2 ? await this.session.append("assistant/message", { ...message2, stream: this.records }) : await this.session.append("assistant/attempt", { turn: this.turn, step: this.step, stream: this.records });
+    } catch (cause) {
+      this.ended = true;
+      const frame = { type: "assistant/stream", frame: {
+        type: "end",
+        attemptId: this.attemptId,
+        revision: this.nextRevision(),
+        index: this.records.length,
+        outcome: { kind: "abandoned" }
+      } };
+      throw new AttemptSettlementError(cause, frame);
+    }
+    this.ended = true;
+    return { type: "assistant/stream", frame: {
+      type: "end",
+      attemptId: this.attemptId,
+      revision: this.nextRevision(),
+      index: this.records.length,
+      outcome: { kind: "committed", eventType, seq: event.seq }
+    } };
+  }
+};
+var AttemptSettlementError = class extends Error {
+  constructor(cause, frame) {
+    super("assistant attempt settlement failed");
+    this.cause = cause;
+    this.frame = frame;
+  }
+  cause;
+  frame;
+};
 var AgentService = class {
   constructor(ctx, config2 = {}) {
     this.ctx = ctx;
@@ -11717,9 +11943,24 @@ var AgentService = class {
   }
   ctx;
   config;
+  async *settleAttempt(attempt, message2) {
+    try {
+      yield await attempt.settle(message2);
+    } catch (error2) {
+      if (error2 instanceof AttemptSettlementError) {
+        yield error2.frame;
+        throw error2.cause;
+      }
+      throw error2;
+    }
+  }
   inbox;
   _seriesStarted = false;
   _persistedRequest = false;
+  _streamRevision = 0;
+  _attempt(session2, turn, step) {
+    return new AssistantStreamAttempt(session2, turn, step, () => ++this._streamRevision);
+  }
   /** Call when a request begins an explicit new model-message series. */
   startSeries() {
     this._seriesStarted = true;
@@ -11733,7 +11974,7 @@ var AgentService = class {
     return this._persistedRequest;
   }
   async run(input, options = {}) {
-    return consumeAgentStream(this._stream(input, options, false));
+    return consumeAgentStream(this._stream(input, options));
   }
   async *runStream(input, options = {}) {
     const iterator = this._stream(input, options)[Symbol.asyncIterator]();
@@ -11743,7 +11984,7 @@ var AgentService = class {
       yield next.value;
     }
   }
-  async *_stream(input, options = {}, useStream = true) {
+  async *_stream(input, options = {}) {
     const claimed = input ?? this.inbox.claim();
     if (!claimed) throw new AgentError("no agent input available");
     await this.config.hooks?.beforeRun?.(claimed, options);
@@ -11751,26 +11992,32 @@ var AgentService = class {
     const tools2 = this._tools();
     const llm = this._llm();
     if (!llm) throw new AgentError("no LLM adapter available");
+    const streamAdapter = llm.stream;
+    const persistChunks = streamAdapter !== void 0;
     const maxTurns = options.maxTurns ?? this.config.maxTurns ?? 64;
     const maxSteps = options.maxSteps ?? this.config.maxSteps ?? 64;
     const contextBudget = options.contextBudget ?? this.config.contextBudget;
     const injected = this.inbox.injected();
     this.ctx.emit("agent/start", { input: claimed, options, injected });
     let messages = await this._initialMessages(claimed);
+    let claimedMessages = messages.filter((message2) => message2.role === "user");
     const steps = [];
     let output = "";
     let finishReason = "stop";
+    let lengthReached = false;
     this.ctx.emit("agent/turn-start", {
       input: claimed,
       messages: copyMessages(messages),
       injected
     });
-    const turn = await session2.nextTurn();
-    await session2.append("turn/start", {
-      turn,
-      input: claimed.text ?? claimed,
-      reason: "user"
-    });
+    const turn = options.turn ?? await session2.nextTurn();
+    if (options.turn === void 0) {
+      await session2.append("turn/start", {
+        turn,
+        input: claimed.text ?? claimed,
+        reason: "user"
+      });
+    }
     let index = 0;
     let finalTurnGranted = false;
     let currentStepIndex;
@@ -11789,20 +12036,22 @@ var AgentService = class {
           messages = await this._enforceContextBudget(session2, contextBudget, messages);
         }
         const stepInput = copyMessages(messages);
-        const preStep = this.ctx.waterfall("agent/pre-step", {
+        const preStep = await this.ctx.waterfallAsync("agent/pre-step", {
           index,
           turn,
           step: index,
           messages: stepInput,
+          claimedMessages: copyMessages(claimedMessages),
           ...options.signal ? { signal: options.signal } : {}
         }, (payload) => payload);
-        if (!preStep || !Array.isArray(preStep.messages) || !preStep.messages.length) {
+        if (!preStep || preStep.admission === "reject" || !Array.isArray(preStep.messages) || !preStep.messages.length) {
           break;
         }
         if (preStep.startsRequestSeries) this._seriesStarted = true;
         await session2.append("step/start", { turn, step: index });
         currentStepIndex = index;
         const requestedInput = copyMessages(preStep.messages);
+        const admittedHistory = await session2.deriveMessages();
         this.ctx.emit("agent/step", {
           index,
           turn,
@@ -11814,93 +12063,85 @@ var AgentService = class {
           maxSteps: maxSteps - steps.length
         };
         if (options.signal) completeOptions.signal = options.signal;
-        const request = this.ctx.waterfall("agent/request", {
-          index,
-          messages: requestedInput,
-          tools: availableTools,
-          options: completeOptions
-        }, (payload) => payload);
-        if (!request || !request.options || !request.tools) {
-          throw new AgentError("agent/request must return a request payload");
-        }
         let llmMessages = copyMessages(requestedInput);
         let completion;
-        const streamMethod = useStream ? llm.stream : void 0;
+        let activeAttempt;
         let attempt = 0;
-        let persistedStepInput = false;
         while (true) {
           if (options.signal?.aborted) {
             finishReason = "cancelled";
             break;
           }
           const streamEvents = [];
+          activeAttempt = this._attempt(session2, turn, index);
+          yield activeAttempt.start();
+          const streamRequest = {
+            index,
+            messages: copyMessages(requestedInput),
+            tools: [...availableTools],
+            options: { ...completeOptions }
+          };
           try {
-            if (streamMethod) {
-              const streamRequest = {
-                index,
-                messages: llmMessages,
-                tools: request.tools,
-                options: request.options
-              };
-              const stream = await this.ctx.waterfallAsync(
-                "llm/stream",
-                streamRequest,
-                async (payload) => {
-                  if (!streamMethod) {
-                    throw new AgentError("llm.stream is required for streaming runs");
-                  }
-                  return streamMethod(payload.messages, payload.tools, payload.options);
-                }
-              );
-              if (!stream || typeof stream[Symbol.asyncIterator] !== "function") {
-                throw new AgentError("llm/stream must return an async iterable stream");
-              }
+            const request = await this.ctx.waterfallAsync("agent/request", {
+              index,
+              messages: copyMessages(requestedInput),
+              tools: streamRequest.tools,
+              options: streamRequest.options
+            }, (payload) => payload);
+            if (!request || !request.options || !request.tools) {
+              throw new AgentError("agent/request must return a request payload");
+            }
+            streamRequest.tools = request.tools;
+            streamRequest.options = request.options;
+            let preparation;
+            const prepareRequest = () => preparation ??= (async () => {
+              lockStreamRequest(streamRequest);
               llmMessages = copyMessages(streamRequest.messages);
-              if (!persistedStepInput) {
-                await this._persistStepInput(session2, request, llmMessages);
-                if (this.config.assertReplayable) {
-                  await this._assertReplayable(session2, llmMessages);
-                }
-                persistedStepInput = true;
-              }
-              let chunkIndex = 0;
-              for await (const event of stream) {
-                streamEvents.push(event);
-                if (event.type === "message_delta") {
-                  await session2.append("assistant/chunk", {
-                    id: event.id,
-                    content: event.delta,
-                    index: chunkIndex
-                  });
-                  chunkIndex += 1;
-                }
-                yield event;
-              }
-              completion = completionFromStreamEvents(streamEvents);
-            } else {
-              if (!persistedStepInput) {
-                await this._persistStepInput(session2, request, llmMessages);
-                if (this.config.assertReplayable) {
-                  await this._assertReplayable(session2, llmMessages);
-                }
-                persistedStepInput = true;
+              await this._persistStepInput(session2, streamRequest, llmMessages, admittedHistory);
+              await this._assertReplayable(session2, streamRequest, llmMessages);
+            })();
+            const stream = await this.ctx.waterfallAsync(
+              "llm/stream",
+              streamRequest,
+              (payload) => (async function* () {
+                await prepareRequest();
+                yield* streamAdapter ? streamAdapter.call(llm, payload.messages, payload.tools, payload.options) : completeAsStream(llm, payload.messages, payload.tools, payload.options);
+              })()
+            );
+            if (!stream || typeof stream[Symbol.asyncIterator] !== "function") {
+              throw new AgentError("llm/stream must return an async iterable stream");
+            }
+            await prepareRequest();
+            let chunkIndex = 0;
+            for await (const event of stream) {
+              streamEvents.push(structuredClone(event));
+              yield activeAttempt.push(event);
+              if (persistChunks && event.type === "message_delta") {
+                await session2.append("assistant/chunk", {
+                  id: event.id,
+                  content: event.delta,
+                  index: chunkIndex
+                });
+                chunkIndex += 1;
               }
-              completion = await llm.complete(llmMessages, request.tools, request.options);
+              yield event;
+            }
+            completion = completionFromStreamEvents(streamEvents);
+            if (completion.finishReason === "error" || completion.finishReason === "cancelled") {
+              const terminalReason = completion.finishReason;
+              completion = void 0;
+              throw new AgentError(`LLM stream finished with ${terminalReason}`);
             }
             break;
           } catch (error2) {
-            const content = partialStreamContent(streamEvents);
-            if (content) {
-              await session2.append("assistant/message", {
-                content,
-                interrupted: true
-              });
-              llmMessages = await session2.deriveMessages();
-            }
+            yield activeAttempt.push({ type: "stream_error", error: toToolError2(error2) });
             if (options.signal?.aborted) {
+              const content = partialStreamContent(streamEvents);
+              yield* this.settleAttempt(activeAttempt, content ? { content, interrupted: true } : void 0);
               finishReason = "cancelled";
               break;
             }
+            yield* this.settleAttempt(activeAttempt);
             attempt += 1;
             const failure = toToolError2(error2);
             const decision = await this.ctx.waterfallAsync(
@@ -11909,14 +12150,14 @@ var AgentService = class {
                 index,
                 turn,
                 step: index,
-                messages: copyMessages(llmMessages),
-                tools: request.tools,
-                options: request.options,
+                messages: copyMessages(streamRequest.messages),
+                tools: [...streamRequest.tools],
+                options: { ...streamRequest.options },
                 attempt,
                 error: error2,
                 failure,
-                ...request.options.provider ? { provider: request.options.provider } : {},
-                ...request.options.model ? { model: request.options.model } : {},
+                ...streamRequest.options.provider ? { provider: streamRequest.options.provider } : {},
+                ...streamRequest.options.model ? { model: streamRequest.options.model } : {},
                 ...options.signal ? { signal: options.signal } : {}
               },
               () => void 0
@@ -11941,16 +12182,30 @@ var AgentService = class {
             await session2.append("llm/retry-started", { retryId, retry: attempt });
           }
         }
-        if (options.signal?.aborted) break;
-        if (!completion) throw new AgentError("LLM adapter did not produce a completion");
+        if (!completion || !activeAttempt) {
+          if (options.signal?.aborted) {
+            finishReason = "cancelled";
+            break;
+          }
+          throw new AgentError("LLM adapter did not produce a completion");
+        }
         const toolCalls = completion.toolCalls ?? [];
-        if (finalTurnGranted && toolCalls.length) {
+        if (completion.finishReason === "length") lengthReached = true;
+        if (options.signal?.aborted && toolCalls.length === 0) {
+          yield activeAttempt.push({ type: "stream_error", error: { name: "AbortError", message: "stream aborted" } });
+          yield* this.settleAttempt(activeAttempt);
+          finishReason = "cancelled";
+          break;
+        }
+        if (finalTurnGranted && toolCalls.length && !options.signal?.aborted) {
+          yield activeAttempt.push({ type: "stream_error", error: { name: "AgentError", message: "maximum turns reached" } });
+          yield* this.settleAttempt(activeAttempt);
           finishReason = "max_turns";
           break;
         }
         const toolResults = [];
         if (toolCalls.length) {
-          await session2.append("assistant/message", {
+          yield* this.settleAttempt(activeAttempt, {
             content: completion.content ?? "",
             toolCalls: toolCalls.map((call) => ({
               id: call.id,
@@ -11971,18 +12226,30 @@ var AgentService = class {
           if (options.signal) toolOptions.signal = options.signal;
           const startedAt = Date.now();
           let result;
-          try {
-            result = await tools2.execute(call.name, call.arguments, toolOptions);
-          } catch (error2) {
+          if (options.signal?.aborted) {
             result = {
               ok: false,
               name: call.name,
               callId: call.id,
               input: call.arguments,
-              error: toToolError2(error2),
+              error: abortedToolError(options.signal),
               startedAt,
               durationMs: Date.now() - startedAt
             };
+          } else {
+            try {
+              result = await tools2.execute(call.name, call.arguments, toolOptions);
+            } catch (error2) {
+              result = {
+                ok: false,
+                name: call.name,
+                callId: call.id,
+                input: call.arguments,
+                error: toToolError2(error2),
+                startedAt,
+                durationMs: Date.now() - startedAt
+              };
+            }
           }
           toolResults.push(result);
           const toolResultPayload = {
@@ -12024,7 +12291,7 @@ var AgentService = class {
           output = completion.content;
         }
         if (!toolCalls.length) {
-          await session2.append("assistant/message", { content: completion.content ?? "" });
+          yield* this.settleAttempt(activeAttempt, { content: completion.content ?? "" });
         }
         await session2.append("step/end", {
           turn,
@@ -12035,19 +12302,19 @@ var AgentService = class {
         currentStepIndex = void 0;
         const nextMessages = this._extendMessages(llmMessages, completion, toolResults);
         const concludesTurn = toolResults.some((result) => result.concludesTurn === true);
-        if (concludesTurn) {
-          finishReason = "stop";
-          break;
-        }
-        if (toolCalls.length === 0) {
-          finishReason = completion.finishReason === "length" ? "length" : completion.finishReason === "error" ? "error" : "stop";
+        let nextStepMessages = await this._claimNextStepMessages();
+        if ((toolCalls.length === 0 || concludesTurn) && nextStepMessages.length === 0) {
+          finishReason = lengthReached ? "length" : completion.finishReason === "error" ? "error" : "stop";
           const keepGoing = await this.ctx.serial("agent/turn-stopping", {
             index,
             turn,
             steps: copySteps(steps),
             finishReason
           });
-          if (!keepGoing) break;
+          if (!keepGoing) {
+            nextStepMessages = await this._claimNextStepMessages();
+            if (nextStepMessages.length === 0) break;
+          }
         }
         if (index + 1 >= maxTurns && !finalTurnGranted) {
           finalTurnGranted = true;
@@ -12057,7 +12324,8 @@ var AgentService = class {
         }
         if (toolCalls.length) finishReason = "tool_calls";
         index += 1;
-        messages = nextMessages;
+        messages = [...nextMessages, ...nextStepMessages];
+        claimedMessages = nextStepMessages.filter((message2) => message2.role === "user");
       }
     } catch (error2) {
       turnError = error2;
@@ -12143,23 +12411,22 @@ var AgentService = class {
     });
     return compactMessages.map((message2) => copyMessages([message2])[0]);
   }
-  async _persistStepInput(session2, request, input) {
-    const system = input.find((message2) => message2.role === "system")?.content;
-    const tools2 = request.tools.map((tool) => ({
-      name: tool.schema.name,
-      description: tool.schema.description,
-      ...tool.schema.parameters ? { parameters: tool.schema.parameters } : {}
-    }));
-    const config2 = {
-      ...request.options.provider ? { provider: request.options.provider } : {},
-      ...request.options.model ? { model: request.options.model } : {},
-      ...request.options.temperature !== void 0 ? { temperature: request.options.temperature } : {}
-    };
-    const nextHeader = {
-      ...Object.keys(config2).length ? { config: config2 } : {},
-      ...system !== void 0 ? { system } : {},
-      ...tools2.length ? { tools: tools2 } : {}
-    };
+  async _persistStepInput(session2, request, input, admittedHistory) {
+    const surface = await session2.deriveMessages();
+    const owned = admittedHistory.filter((message2) => !isUserOrSystemMessage(message2));
+    let ownerIndex = 0;
+    for (const message2 of input) {
+      if (isUserOrSystemMessage(message2)) continue;
+      const actual = canonicalMessages([message2]);
+      while (ownerIndex < owned.length && canonicalMessages([owned[ownerIndex]]) !== actual) {
+        ownerIndex += 1;
+      }
+      if (ownerIndex === owned.length) {
+        throw new AgentError("request is not reconstructable from session log: unowned or reordered assistant/tool message");
+      }
+      ownerIndex += 1;
+    }
+    const nextHeader = requestHeaderFor(request, input);
     const previousHeader = session2.requestHeader();
     const isFirstRequest = !this._persistedRequest;
     const isResume = isFirstRequest && previousHeader !== void 0;
@@ -12189,19 +12456,23 @@ var AgentService = class {
       ...request.options.provider ? { provider: request.options.provider } : {},
       ...request.options.model ? { model: request.options.model } : {}
     };
+    if (request.options.contextWindow !== void 0) {
+      nextContext.contextWindow = request.options.contextWindow;
+    }
     const llmService = this.ctx.reflect.get("llm", false);
     const routeCapacity = llmService?.routeCapacity?.();
-    if (routeCapacity?.contextWindow !== void 0) {
+    if (nextContext.contextWindow === void 0 && routeCapacity?.contextWindow !== void 0) {
       nextContext.contextWindow = routeCapacity.contextWindow;
     }
     const previousContext = session2.requestContext();
     if (previousContext?.provider !== nextContext.provider || previousContext?.model !== nextContext.model || previousContext?.contextWindow !== nextContext.contextWindow || previousContext === void 0) {
       await session2.append("request/context", nextContext);
     }
-    const requested = input.filter(isUserOrSystemMessage);
-    const surface = await session2.deriveMessages();
-    const appendDurable = async (messages) => {
-      for (const message2 of messages) {
+    const isSurfacePrefix = (messages) => canonicalMessages(messages.slice(0, surface.length)) === canonicalMessages(surface);
+    const requested = surface.length > 0 && input[0]?.role === "system" && input[0].content === nextHeader.system && isSurfacePrefix(input.slice(1)) ? input.slice(1) : input;
+    const tail = requested.slice(surface.length);
+    if (isSurfacePrefix(requested) && tail.every(isUserOrSystemMessage)) {
+      for (const message2 of tail) {
         if (message2.role === "user") {
           await session2.append("user/message", {
             content: message2.content,
@@ -12214,45 +12485,37 @@ var AgentService = class {
           });
         }
       }
-    };
-    if (surface.length === 0) {
-      await appendDurable(requested);
       return;
     }
-    const durableUsers = surface.filter((message2) => message2.role === "user").length;
-    let seenUsers = 0;
-    const newTail = [];
-    for (const message2 of requested) {
-      if (message2.role === "user") seenUsers += 1;
-      if (seenUsers <= durableUsers) continue;
-      newTail.push(message2);
-    }
-    await appendDurable(newTail);
+    const nodes = await session2.surfaceEvents();
+    await session2.append("checkpoint", {
+      messages: copyMessages(requested),
+      surfaceOp: { op: "replace", start: nodes[0].seq, end: nodes.at(-1).seq }
+    });
   }
-  async _assertReplayable(session2, input) {
+  async _assertReplayable(session2, request, input) {
     const reconstructed = await session2.deriveMessages();
-    const canonical = (messages) => messages.filter((message2) => message2.role !== "system").map((message2) => ({
-      role: message2.role,
-      content: message2.content,
-      ...message2.tool_call_id ? { tool_call_id: message2.tool_call_id } : {},
-      ...message2.name ? { name: message2.name } : {},
-      ...message2.tool_calls?.length ? { tool_calls: message2.tool_calls.map((call) => ({
-        id: call.id,
-        name: call.name,
-        args: JSON.stringify(call.arguments ?? {})
-      })) } : {}
-    }));
-    const actual = canonical(input);
-    const replay = canonical(reconstructed);
-    if (JSON.stringify(actual) !== JSON.stringify(replay)) {
+    const actual = canonicalMessages(input);
+    const replay = canonicalMessages(reconstructed);
+    const header = session2.requestHeader();
+    const headerOwnsPrefix = input[0]?.role === "system" && input[0].content === header?.system && canonicalMessages(input.slice(1)) === replay;
+    if (actual !== replay && !headerOwnsPrefix) {
       throw new AgentError(
-        `request is not reconstructable from session log: actual=${JSON.stringify(actual)} replay=${JSON.stringify(replay)}`
+        `request is not reconstructable from session log: actual=${actual} replay=${replay}`
       );
     }
+    const expected = requestHeaderFor(request, input);
+    if (header?.system !== expected.system || JSON.stringify(header?.tools ?? []) !== JSON.stringify(expected.tools ?? []) || JSON.stringify(header?.config ?? {}) !== JSON.stringify(expected.config ?? {})) {
+      throw new AgentError("request envelope is not reconstructable from session log");
+    }
+  }
+  async _claimNextStepMessages() {
+    const inputs = await this.config.claimNextStep?.() ?? [];
+    return inputs.flatMap((input) => input.messages?.length ? copyMessages(input.messages) : input.text ? [{ role: "user", content: input.text }] : input.context !== void 0 ? [{ role: "user", content: stringify2(input.context) }] : []);
   }
   async _initialMessages(input) {
     const promptService = this.ctx.reflect.get("systemPrompt", false);
-    const assembled = promptService ? (await promptService.assemble()).text.trim() : void 0;
+    const assembled = promptService ? (await promptService.assemble({}, this.ctx)).text.trim() : void 0;
     const systemPrompt = assembled || this.inbox.injected().get("agentSystem");
     const systemMessage = typeof systemPrompt === "string" && systemPrompt ? [{ role: "system", content: systemPrompt }] : [];
     if (input.messages?.length) {
@@ -12277,7 +12540,7 @@ var AgentService = class {
         arguments: call.arguments
       }));
     }
-    next.push(assistant);
+    if (assistant.content || toolCalls.length) next.push(assistant);
     for (const call of toolCalls) {
       const result = toolResults.find((candidate) => candidate.callId === call.id);
       const content = result ? result.ok ? stringify2(result.output) : `error: ${result.error?.message ?? "unknown"}` : "error: missing tool result";
@@ -12307,7 +12570,8 @@ var AgentService = class {
     return session2;
   }
   _tools() {
-    const tools2 = this.ctx.tools;
+    const scoped = this.ctx.reflect.get("tools", false);
+    const tools2 = scoped ?? this.ctx.tools;
     if (!tools2) throw new AgentError("tools service is required");
     return tools2;
   }