@jskit-ai/assistant-core 0.2.17 → 0.2.19

package/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- The API driver's state note, which carries the current time, follows the conversation as its last message instead of ending the system prompt, so the provider's prompt cache keeps the whole history from one turn to the next instead of charging it uncached on each turn's first model call (`@jskit-ai/agent` `runLoop`).
 - Assistant failures that reach a person translate: 63 more undotted codes render from `jskit.errors.<code>`, and 98 sentences that share a code with others, or are sent without one, carry a `messageCode` (`assistant.claude.*`, `assistant.codex.*`, `assistant.opencode.*`, `assistant.conversation.*`, `assistant.turn.*`). The English messages are unchanged.
 - The OpenCode version mismatch, Claude control-request timeout and unreadable saved Claude conversation errors carry `params` for their catalog English.
 - The assistant settings resource sends its system prompt field messages in the coded `{ code, message, params }` form.

package/examples/conversation/package.json

@@ -8,14 +8,14 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@jskit-ai/assistant-core": "0.2.17",
-    "@jskit-ai/http-runtime": "0.2.7",
-    "@jskit-ai/kernel": "0.2.7",
+    "@jskit-ai/assistant-core": "0.2.19",
+    "@jskit-ai/http-runtime": "0.2.9",
+    "@jskit-ai/kernel": "0.2.9",
     "@mdi/js": "^7.4.47",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0",
-    "@jskit-ai/connectors-core": "0.2.8",
-    "@jskit-ai/connectors-catalog": "0.2.8"
+    "@jskit-ai/connectors-core": "0.2.10",
+    "@jskit-ai/connectors-catalog": "0.2.10"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.7",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/assistant-core",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "type": "module",
   "scripts": {
     "test": "node --test --test-concurrency=1"
@@ -50,9 +50,9 @@
     "@ai-sdk/perplexity": "^4.0.43",
     "@ai-sdk/togetherai": "^3.0.49",
     "@ai-sdk/xai": "^4.0.58",
-    "@jskit-ai/agent": "0.1.0",
-    "@jskit-ai/resource-core": "0.1.198",
-    "@jskit-ai/resource-crud-core": "0.1.198",
+    "@jskit-ai/agent": "0.1.1",
+    "@jskit-ai/resource-core": "0.1.200",
+    "@jskit-ai/resource-crud-core": "0.1.200",
     "@mdi/js": "^7.4.47",
     "@openrouter/ai-sdk-provider": "^3.0.0",
     "ai": "^7.0.152",
@@ -61,8 +61,8 @@
     "ws": "^8.20.1"
   },
   "peerDependencies": {
-    "@jskit-ai/http-runtime": "0.2.7",
-    "@jskit-ai/kernel": "0.2.7",
+    "@jskit-ai/http-runtime": "0.2.9",
+    "@jskit-ai/kernel": "0.2.9",
     "vue": "^3.5.13",
     "vuetify": "^4.0.0"
   },

package/src/server/conversation/codexNotificationObserver.js

@@ -1,4 +1,4 @@
-import { codexAppServerTurnStatusIsActive, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, CODEX_APP_SERVER_AGENT_RUN_ID, CODEX_AGENT_PROVIDER, CODEX_APP_SERVER_RUN_STATE } from "./codexTurnState.js";
+import { codexAppServerTurnStatusIsActive, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerTurnKey, CODEX_APP_SERVER_AGENT_RUN_ID, CODEX_AGENT_PROVIDER, CODEX_APP_SERVER_RUN_STATE } from "./codexTurnState.js";
 import { codexAppServerProviderConnectionGeneration } from "./codexModelCatalog.js";
 import {
   codexAppServerAssistantItemText,
@@ -239,6 +239,8 @@ export function createCodexNotificationObserver({
         threadId: normalizedThreadId,
         turnId: codexAppServerNotificationTurnId(notification)
       };
+      // Anything Codex reports about a turn means it has started that turn.
+      journal.unstartedTurns.delete(codexAppServerTurnKey(normalizedThreadId, notificationContext.turnId));
       if (method === "thread/tokenUsage/updated") {
         notificationQueue.run(notificationContext, async () => {
           const store = await createStore(normalizedSessionId);

package/src/server/conversation/codexPromptDispatch.js

@@ -1,4 +1,4 @@
-import { codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerErrorMessage, codexAppServerSteerFailure, codexAppServerMessageRequiresNewTurn, codexAppServerMessageDeferred } from "./codexTurnState.js";
+import { codexAppServerTurnStatusIsComplete, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerErrorMessage, codexAppServerSteerFailure, codexAppServerMessageRequiresNewTurn, codexAppServerMessageDeferred, codexAppServerTurnKey } from "./codexTurnState.js";
 import { codexAppServerRequestIsInvalid } from "./codexProviderThreads.js";
 import { codexLocalImageInput, codexAppServerDeliveredTurn, sendCodexAppServerPrompt } from "./codexProviderTurns.js";
 import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
@@ -74,6 +74,10 @@ export function createCodexPromptDispatch({
     if (!deliveredTurnId) {
       throw new Error("Codex app-server accepted the prompt without returning a turn id.");
     }
+    // Codex answers turn/start before it starts the turn; its notifications about the turn say when it has.
+    if (!codexAppServerTurnStatusIsComplete(deliveredTurnStatus)) {
+      journal.unstartedTurns.add(codexAppServerTurnKey(threadId, deliveredTurnId));
+    }
     delivery.pendingUserMessage(promptSessionId, clientUserMessageId)?.onNativeReceipt();
     await recovery.markTurnActive(sessionId, {
       requireTrackedTurn: true,

package/src/server/conversation/codexRunJournal.js

@@ -88,6 +88,8 @@ export function createCodexRunJournal({
   isClosing
 }) {
   const codexAppServerCompletedTurns = new Set();
+  // Turns Codex accepted with turn/start but has not yet reported: until it does, its thread still reads idle.
+  const codexAppServerUnstartedTurns = new Set();
   const codexAppServerProcessedTurns = new Set();
   const codexAppServerActiveTimers = new Map();
   const codexAppServerFinalizingTimers = new Map();
@@ -637,6 +639,7 @@ export function createCodexRunJournal({
 
   return Object.freeze({
     completedTurns: codexAppServerCompletedTurns,
+    unstartedTurns: codexAppServerUnstartedTurns,
     processedTurns: codexAppServerProcessedTurns,
     activeTimers: codexAppServerActiveTimers,
     finalizingTimers: codexAppServerFinalizingTimers,

package/src/server/conversation/codexThreadStatus.js

@@ -1,4 +1,4 @@
-import { codexAppServerTurnStatusIsActive, codexAppServerTurnStatusIsComplete, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerThreadStatus, codexAppServerReadThreadStatus, codexAppServerAgentRun, codexAppServerTurnCanReceiveProviderCompletion, codexAppServerTurnCanAdoptSuccessor, codexAppServerErrorMessage } from "./codexTurnState.js";
+import { codexAppServerTurnStatusIsActive, codexAppServerTurnStatusIsComplete, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerThreadStatus, codexAppServerReadThreadStatus, codexAppServerAgentRun, codexAppServerTurnCanReceiveProviderCompletion, codexAppServerTurnCanAdoptSuccessor, codexAppServerErrorMessage, codexAppServerTurnKey } from "./codexTurnState.js";
 import { isRecord, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { codexAppServerStatusFromValue } from "./codexEvents.js";
 import { codexAppServerThreadRawValue, codexAppServerThreadTurnId, codexAppServerThreadError } from "./codexThreadSnapshot.js";
@@ -200,6 +200,27 @@ export function createCodexThreadStatus({ journal, settlement, recovery, output,
         turnId
       };
     }
+    // Codex has accepted the tracked turn but not started it. Until it does, its thread reads idle and lists the
+    // turn as interrupted, so only Codex's own report about the turn settles it.
+    if (
+      trackedProviderTurn?.state === "active" &&
+      !codexAppServerTurnStatusIsActive(status) &&
+      journal.unstartedTurns.has(codexAppServerTurnKey(trackedProviderTurn.threadId, trackedProviderTurn.turnId))
+    ) {
+      debugLog("appServerThread.reconcile.awaitingProviderStart", {
+        sessionId: normalizedSessionId,
+        source: normalizeText(source),
+        status,
+        threadId: trackedProviderTurn.threadId,
+        turnId: trackedProviderTurn.turnId
+      });
+      return {
+        ok: true,
+        reason: "provider_turn_not_started",
+        status: trackedProviderTurn.status || "inProgress",
+        turnId: trackedProviderTurn.turnId
+      };
+    }
     if (
       trackedProviderTurn &&
       turnId &&

package/src/server/conversation/codexTurnRecovery.js

@@ -1,4 +1,4 @@
-import { codexAppServerTurnStatusIsActive, codexAppServerTurnStatusIsComplete, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerThreadStatus, codexAppServerReadThreadStatus, codexAppServerAgentRun, codexAppServerPendingUserMessageOwnership, codexAppServerTurnCanAdoptSuccessor } from "./codexTurnState.js";
+import { codexAppServerTurnStatusIsActive, codexAppServerTurnStatusIsComplete, codexAppServerTurnStatusIsSuccessfulComplete, codexAppServerTurnStatusIsProviderFailure, codexAppServerThreadStatus, codexAppServerReadThreadStatus, codexAppServerAgentRun, codexAppServerPendingUserMessageOwnership, codexAppServerTurnCanAdoptSuccessor, codexAppServerTurnKey } from "./codexTurnState.js";
 import { codexAppServerProviderTurnForOperation, codexAppServerThreadTurnId, codexAppServerThreadError } from "./codexThreadSnapshot.js";
 import { createCodexTurnActivity } from "./codexTurnActivity.js";
 import { createCodexTurnEndings } from "./codexTurnEndings.js";
@@ -270,6 +270,17 @@ export function createCodexTurnRecovery({
     if (!codexAppServerTurnStatusIsComplete(status)) {
       return currentSession;
     }
+    if (journal.unstartedTurns.has(codexAppServerTurnKey(currentTurn.threadId, currentTurn.turnId))) {
+      // Codex has accepted this turn but not started it, and its thread reads idle until it does.
+      debugLog("appServerTurn.reconcile.awaitingProviderStart", {
+        sessionId,
+        status,
+        threadId: currentTurn.threadId,
+        turnId: currentTurn.turnId
+      });
+      scheduleCodexAppServerActiveRecovery(sessionId);
+      return currentSession;
+    }
     const completedTurnId = providerTurnId || currentTurn.turnId;
     debugLog("appServerTurn.reconcile.complete", {
       sessionId,

package/test/apiConversationDriver.test.js

@@ -6,7 +6,8 @@ import { createApiConversationDriver } from "../src/server/conversation/provider
 const CHECKS = checkTexts("the app");
 const frame = (delta, finish_reason) => `data: ${JSON.stringify({ choices: [{ index: 0, delta, finish_reason }] })}\n\n`;
 const schema = tool => ({ type: "function", function: { name: tool.name, parameters: tool.parameters } });
-const lastText = body => body.messages.at(-1).content;
+// The engine's state note ends every request's conversation; what the app sent last comes before it.
+const lastText = body => body.messages.at(-2).content;
 
 // One step of a streamed reply: words, an action call or both. Calls the engine
 // makes without streaming (accounts, checks, summaries) answer with `once`.
@@ -113,7 +114,10 @@ test("admission precedes every model call, the state note gives the time, and a
   await f.run("What day is it today?");
   assert.deepEqual(f.order, ["accept", "model"]);
   assert.deepEqual(f.executions, [], "No action runs before the model asks for one");
-  assert.match(f.requests[0].messages[0].content, /^Use the supplied actions\.\n\nCurrent state, from the system\. It is the truth; earlier messages may be out of date:\n- The time: .+ UTC\. The person may be in another time zone\.$/u);
+  assert.equal(f.requests[0].messages[0].content, "Use the supplied actions.", "The state note is not in the system prompt");
+  assert.equal(f.requests[0].messages.at(-1).role, "user");
+  assert.match(f.requests[0].messages.at(-1).content, /^Current state, from the system\. It is the truth; earlier messages may be out of date:\n- The time: .+ UTC\. The person may be in another time zone\.$/u,
+    "The state note follows the conversation, so the history before it stays in the provider's prompt cache");
   const denied = fixture({ authorize: () => { throw new Error("Connection access revoked"); } });
   await assert.rejects(denied.run(), /Connection access revoked/);
   assert.deepEqual(denied.requests, []);
@@ -223,7 +227,7 @@ test("a long history is compacted: the summary and its last turn are saved, and
   assert.ok(kept.length > 0 && kept.length < turns.length);
   const [request] = f.streamed;
   assert.match(request.messages[0].content, /Summary of the earlier part of this conversation[^]*The person asked six long questions\./u);
-  assert.deepEqual(request.messages.filter(message => message.role === "user").map(message => message.content),
+  assert.deepEqual(request.messages.slice(0, -1).filter(message => message.role === "user").map(message => message.content),
     [...kept.map(turn => turn.user.text), "Next question"]);
   assert.deepEqual(phases, ["compacting", "working"]);
 });
@@ -248,5 +252,5 @@ test("a short history is read whole with its stored summary, and nothing is save
   assert.deepEqual(saved, []);
   assert.equal(f.requests.length, 1);
   assert.match(f.requests[0].messages[0].content, /Summary of the earlier part of this conversation[^]*Earlier: hello\./u);
-  assert.deepEqual(f.requests[0].messages.slice(1).map(message => message.content), ["Hi", "Hello", "Next question"]);
+  assert.deepEqual(f.requests[0].messages.slice(1, -1).map(message => message.content), ["Hi", "Hello", "Next question"]);
 });

package/test/codexTurn.test.js

@@ -1910,6 +1910,51 @@ test("original dispatch steering preserves deferred versus new-turn recovery and
   }
 });
 
+// Codex answers turn/start before it starts the turn. Until its turn/started notification, codex-cli 0.163.0 reads
+// the thread as idle and lists the new turn as interrupted, so neither read means the turn ended. On 2026-11-06 the
+// starting watchdog's status read landed in that gap: the turn was marked finished 0.46 s after delivery, and Codex's
+// answer 33 s later was dropped behind "Codex finished, but Vibe64 could not recover its final response".
+for (const read of ["starting watchdog", "status check"]) {
+  test(`a delivered turn Codex has not started stays active through a ${read} and keeps its answer`, async t => {
+    const notices = [];
+    const f = await receiptFixture({
+      finalizingGraceMs: 30,
+      outcomeNotice(_runtime, _sessionId, _threadId, _turnId, outcome) { notices.push(outcome); }
+    });
+    t.after(() => f.owner.clearSessionRecoveryTimers(f.sessionId));
+    const context = dispatchContext(f);
+    let codexStatus = "idle";
+    f.run = { ...f.run, state: "starting", providerTurnId: "", providerStatus: "", outerTurnId: context.messageId };
+    f.provider.sendTurn = async () => ({ id: f.turnId, status: "inProgress" });
+    f.provider.readThreadStatus = async () => ({ raw: { status: { type: codexStatus } } });
+    f.history = [turn(f.turnId, "interrupted")];
+    f.observe();
+    assert.equal((await f.owner.startTurn(f.sessionId, {}, context)).providerFailure, "");
+    assert.equal(f.run.state, "active");
+    if (read === "starting watchdog") {
+      await f.owner.recoverActiveTurn(f.sessionId, { provider: f.provider, retryOnError: false });
+    } else {
+      await f.owner.reconcileThreadStatus(f.sessionId, f.provider, f.threadId, {
+        observeLatestTurn: true, source: "wellbeing"
+      });
+    }
+    await f.drain();
+    assert.equal(f.run.state, "active", "An idle read before turn/started does not end the turn");
+    assert.equal(f.run.providerTurnId, f.turnId);
+    codexStatus = "active";
+    f.history = [turn(f.turnId, "inProgress")];
+    f.emit({ method: "turn/started", params: { threadId: f.threadId, turn: { id: f.turnId, status: "inProgress" } } });
+    await f.drain();
+    codexStatus = "idle";
+    f.history = [turn(f.turnId, "completed", "The complete reply.")];
+    f.emit({ method: "turn/completed", params: { threadId: f.threadId, turn: { id: f.turnId, status: "completed" } } });
+    await f.drain();
+    assert.equal(f.run.state, "completed");
+    assert.deepEqual((await f.replies()).map(row => row.assistant.text), ["The complete reply."]);
+    assert.deepEqual(notices, []);
+  });
+}
+
 function controlContext(f, overrides = {}) {
   return {
     runtime: f.runtime,

package/test/conversationApiFacilities.test.js

@@ -65,7 +65,7 @@ test("an existing API client keeps opaque receipts path-safe and selected histor
   assert.deepEqual(requests[0][1], { role: "user", content: [
     { type: "text", text: "Selected prior context" }, { type: "text", text: "Authorized historical bytes" }
   ] });
-  assert.deepEqual(requests[0].at(-1), { role: "user", content: [
+  assert.deepEqual(requests[0].at(-2), { role: "user", content: [
     { type: "text", text: "Current question" }, { type: "text", text: "Authorized current bytes" }
   ] });
   const files = await readdir(directory);
@@ -84,8 +84,9 @@ test("an existing API client keeps opaque receipts path-safe and selected histor
   context.history = [];
   await conversation.send({ messageId: "empty-context", text: "No prior model context" });
   const last = await conversation.wait();
-  assert.match(requests[2][0].content, /^Existing instructions\n\nCurrent state, from the system\./u);
-  assert.deepEqual(requests[2].slice(1).map(message => message.content), ["No prior model context"]);
+  assert.equal(requests[2][0].content, "Existing instructions");
+  assert.deepEqual(requests[2].slice(1, -1).map(message => message.content), ["No prior model context"]);
+  assert.match(requests[2].at(-1).content, /^Current state, from the system\./u, "The engine's state note follows the conversation");
   assert.equal(last.conversationLog.length, 3, "Explicitly empty model context never removes saved conversation history");
   await assert.rejects(conversation.send({ messageId: "x".repeat(129), text: "Must not dispatch" }), { code: "conversation_invalid_message" });
   assert.equal(requests.length, 3);

package/test/conversationAttachments.test.js

@@ -147,7 +147,7 @@ test("authorized image bytes reach the API once and only safe receipts enter sto
   assert.equal(f.reads[0].context, context);
   assert.equal(f.reads[0].conversationId, "one");
   assert.deepEqual(f.reads[0].attachmentIds, [receipt.attachmentId]);
-  assert.deepEqual(f.requests[0].messages.at(-1).content, [
+  assert.deepEqual(f.requests[0].messages.at(-2).content, [
     { type: "text", text: input.text }, { type: "image_url", image_url: { url: `data:image/png;base64,${image.toString("base64")}` } }
   ]);
   assert.deepEqual(state.conversationLog[0].user.attachments, [receipt]);
@@ -174,7 +174,7 @@ test("API history and continuity reauthorize files after reopen and renewal", as
   await resumed.conversation.replace({ operationId: "renew", reason: "renewal", expectedSegmentId: first.segmentId });
   await resumed.conversation.send({ messageId: "third", text: "Look again" });
   await resumed.conversation.wait();
-  assert.equal(resumed.requests[1].messages.at(-1).content[1].type, "image_url");
+  assert.equal(resumed.requests[1].messages.at(-2).content[1].type, "image_url");
   allowed = false;
   await assert.rejects(resumed.conversation.send({ messageId: "denied", text: "Look again" }), /attachment access/);
   assert.equal(resumed.requests.length, 2);
@@ -185,8 +185,8 @@ test("an image-only request is accepted without invented user text", async t =>
   const f = await fixture(t);
   await f.conversation.send({ ...input, text: "" });
   const state = await f.conversation.wait();
-  assert.equal(f.requests[0].messages.at(-1).content.length, 1);
-  assert.equal(f.requests[0].messages.at(-1).content[0].type, "image_url");
+  assert.equal(f.requests[0].messages.at(-2).content.length, 1);
+  assert.equal(f.requests[0].messages.at(-2).content[0].type, "image_url");
   assert.equal(state.conversationLog[0].user.text, "");
 });
 

package/test/conversationReplacement.test.js

@@ -60,7 +60,7 @@ test("renewal preserves logical history and receipts while subsequent inference
   assert.equal(f.requests.length, 1, "Replacement itself does not perform inference");
   await f.say("Continue", "second");
   const sent = f.requests[1].messages;
-  assert.equal(sent.at(-1).content, "Continue");
+  assert.equal(sent.at(-2).content, "Continue", "The request comes last, before the engine's state note");
   assert.match(sent[1].content, /Retain the agreed colour: blue/);
   assert.match(sent[1].content, /Keep my context/);
   assert.match(sent[1].content, /Reply 1/);

package/test/conversationSession.test.js

@@ -82,9 +82,9 @@ test("saved history and current instructions use the existing authorized model c
   await f.conversation.configure({ systemPrompt: "Use the new instructions." });
   await f.conversation.send({ messageId: "two", text: "Continue" });
   await f.conversation.wait();
-  assert.match(f.requests[1].messages[0].content, /^Use the new instructions\.\n\nCurrent state, from the system\./u,
-    "The current instructions lead the system prompt, before the engine's state note");
-  assert.deepEqual(f.requests[1].messages.slice(1).map(message => message.content), ["Hello", "Hello there.", "Continue"]);
+  assert.equal(f.requests[1].messages[0].content, "Use the new instructions.", "The current instructions are the system prompt");
+  assert.deepEqual(f.requests[1].messages.slice(1, -1).map(message => message.content), ["Hello", "Hello there.", "Continue"]);
+  assert.match(f.requests[1].messages.at(-1).content, /^Current state, from the system\./u, "The engine's state note follows the conversation");
   f.state.modelAllowed = false;
   await assert.rejects(f.conversation.send({ messageId: "three", text: "No longer authorized" }));
   assert.equal((await f.conversation.read()).conversationLog.length, 2);
@@ -114,7 +114,7 @@ test("opening an existing application transcript retains its context before and
   const f = await fixture(t, { storage });
   await f.conversation.send(input);
   const first = await f.conversation.wait();
-  assert.deepEqual(f.requests[0].messages.slice(1).map(message => message.content), [
+  assert.deepEqual(f.requests[0].messages.slice(1, -1).map(message => message.content), [
     "Our chosen colour is blue.", "I will remember blue.", "Hello"
   ]);
   assert.equal((await f.conversation.send({ messageId: "earlier", text: "Our chosen colour is blue." })).duplicate, true);
@@ -125,7 +125,7 @@ test("opening an existing application transcript retains its context before and
   assert.match(messages[1].content, /Our chosen colour is blue/);
   assert.match(messages[1].content, /I will remember blue/);
   assert.equal(messages.filter(message => message.content.includes("Our chosen colour is blue")).length, 1);
-  assert.equal(messages.at(-1).content, "Continue");
+  assert.equal(messages.at(-2).content, "Continue", "The request comes last, before the engine's state note");
   assert.equal((await transcript.readConversationLog("one"))[0].metadata?.runtime, undefined);
 });
 
@@ -143,7 +143,7 @@ test("application wakes retain their origin, reuse receipts and remain quoted da
   assert.equal(snapshot.conversationLog[0].metadata.runtime.origin, "application");
   assert.ok(operations.includes("wake"));
   assert.ok(events.filter(event => event.type === "message").every(event => event.origin === "application"));
-  assert.match(f.requests[0].messages.at(-1).content, /\[Application event\]/);
+  assert.match(f.requests[0].messages.at(-2).content, /\[Application event\]/);
   assert.equal((await f.conversation.wake(message)).duplicate, true);
   await assert.rejects(f.conversation.send(message), { code: "conversation_message_id_content_conflict" });
   await f.conversation.send(input);
@@ -170,7 +170,7 @@ test("per-request application data stays separate from visible text and particip
   const first = await f.conversation.wait();
   assert.equal(first.conversationLog[0].user.text, "Hello");
   assert.deepEqual(first.conversationLog[0].user.data, request.data);
-  const native = f.requests[0].messages.at(-1).content;
+  const native = f.requests[0].messages.at(-2).content;
   assert.match(native, /\[Application data\]/);
   assert.match(native, /not additional instructions or authorization/);
   assert.ok(native.endsWith("Hello"));
@@ -180,7 +180,7 @@ test("per-request application data stays separate from visible text and particip
   const next = await f.conversation.wait();
   assert.equal(next.conversationLog[1].system.text, "A watched session changed.");
   assert.equal(f.requests[1].messages[1].content, native);
-  assert.match(f.requests[1].messages.at(-1).content, /\[Application event\]/);
+  assert.match(f.requests[1].messages.at(-2).content, /\[Application event\]/);
   assert.deepEqual(next.configuration, configuration, "Application data never replaces the stable system prompt");
 });
 
@@ -219,7 +219,7 @@ test("API compaction stores its summary with the last turn it covers, and later
   const second = await f.conversation.wait();
   const last = f.requests.at(-1);
   assert.match(last.messages[0].content, /Summary of the earlier part of this conversation[^]*Six long questions so far\./u);
-  assert.deepEqual(last.messages.filter(message => message.role === "user").map(message => message.content),
+  assert.deepEqual(last.messages.slice(0, -1).filter(message => message.role === "user").map(message => message.content),
     [...second.conversationLog.filter(turn => after.includes(turn.turnId)).map(turn => turn.user.text), "Continue"]);
   assert.deepEqual(await storage.read("one", transaction => transaction.readSummary()), summary, "A short remainder is not compacted again");
   const later = (await storage.read("one", transaction => transaction.readMetadata())).runtime.seen;
@@ -265,7 +265,8 @@ test("cancellation aborts inference and leaves another conversation usable", asy
   const started = Promise.withResolvers();
   let aborted = false;
   const f = await fixture(t, { fetch: (_url, init) => {
-    if (JSON.parse(init.body).messages.at(-1).content === "Other") return response();
+    // The request comes last, before the engine's state note.
+    if (JSON.parse(init.body).messages.at(-2).content === "Other") return response();
     started.resolve();
     return new Promise((_resolve, reject) => init.signal.addEventListener("abort", () => {
       aborted = true; reject(init.signal.reason);

package/test/conversationTools.test.js

@@ -87,7 +87,7 @@ test("split internal tags and tool arguments never become common answer deltas",
   await f.conversation.send(message);
   const result = await f.conversation.wait();
   assert.deepEqual(f.observed.executions, [{ left: 2, right: 3 }]);
-  assert.equal(f.observed.requests[1].messages.at(-1).content, checkTexts("the app").markup);
+  assert.equal(f.observed.requests[1].messages.at(-2).content, checkTexts("the app").markup, "The check comes last, before the engine's state note");
   assert.deepEqual(f.observed.events.filter(event => event.type === "message" && event.status !== "complete")
     .map(event => event.text), ["The search is complete."]);
   assert.equal(result.conversationLog[0].assistant.text, "The search is complete.");
@@ -101,7 +101,7 @@ test("text-encoded calls never run or reach the person, even when written again
   const result = await f.conversation.wait();
   assert.deepEqual(f.observed.executions, []);
   assert.equal(f.observed.requests.length, 2, "The check sends the reply back once");
-  assert.equal(f.observed.requests[1].messages.at(-1).content, checkTexts("the app").markup);
+  assert.equal(f.observed.requests[1].messages.at(-2).content, checkTexts("the app").markup, "The check comes last, before the engine's state note");
   assert.deepEqual(result.conversationLog[0].metadata.applicationTools, []);
   assert.equal(f.observed.events.some(event => event.type === "message" && /invoke|function_calls/u.test(event.text)), false);
 });