@economic/agents 2.10.5 → 2.10.6

package/README.md

@@ -7,7 +7,7 @@ React client: [`@economic/agents-react`](../react/README.md).
 ## The three classes
 
 - **`Agent`** — the core. Runs the agent loop and keeps message history. Drive it over a WebSocket or programmatically (schedule, alarm, RPC). Most agents stop here.
-- **`ChatAgent`** — `Agent` plus chat features: compaction and message feedback.
+- **`ChatAgent`** — `Agent` plus chat features: model-only compaction that preserves the client transcript, and message feedback.
 - **`Assistant`** — per-user shell over `ChatAgent`: create/list/delete chats, titles, summaries, retention.
 
 ```
@@ -188,7 +188,7 @@ You can also drive turns server-side — call `saveMessages` from a schedule or
 
 ## A chat agent
 
-For a chat UI, extend `ChatAgent` instead of `Agent`. It adds compaction and message feedback, and connects to a browser with [`useChat`](../react/README.md#usechat) — no `Assistant` required. The DO name is the chat; address one per user, ticket, or whatever fits.
+For a chat UI, extend `ChatAgent` instead of `Agent`. It adds model-only compaction (the stored/client transcript remains unchanged) and message feedback, and connects to a browser with [`useChat`](../react/README.md#usechat) — no `Assistant` required. The DO name is the chat; address one per user, ticket, or whatever fits.
 
 ```typescript
 import { openai } from "@ai-sdk/openai";
@@ -578,7 +578,7 @@ Imported from `@economic/agents` unless noted.
 | Export      | Description                                              |
 | ----------- | -------------------------------------------------------- |
 | `Agent`     | Core agent base. Implement `getModel`/`getSystemPrompt`. |
-| `ChatAgent` | `Agent` + compaction and message feedback.               |
+| `ChatAgent` | `Agent` + model-only compaction and message feedback.    |
 | `Assistant` | Per-user manager of `ChatAgent` chats.                   |
 
 ### Helpers and types

package/dist/index.d.mts

@@ -186,7 +186,7 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
    * @returns The remote skills to be loaded from SKILLS_BUCKET.
    */
   protected getRemoteSkills(): string[];
-  private _pruneTurnMessages;
+  protected pruneTurnMessages(messages: ModelMessage[]): ModelMessage[];
   private _getTurnSystemPrompt;
   private _prepareTools;
   /**

package/dist/index.mjs

@@ -4,8 +4,8 @@ import { Output, convertToModelMessages, generateText, jsonSchema, pruneMessages
 import { createRemoteJWKSet, decodeJwt, errors, jwtVerify } from "jose";
 import { BasicTracerProvider, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
 import { genericObservability } from "agents/observability";
+import { createCompactFunction, estimateMessageTokens, estimateStringTokens, sanitizeToolPairs, truncateOlderMessages } from "agents/experimental/memory/utils";
 import { nanoid } from "nanoid";
-import { createCompactFunction } from "agents/experimental/memory/utils";
 //#region src/server/features/auth/index.ts
 function createJwtAuthConfig(config) {
 	return config;
@@ -1058,7 +1058,7 @@ var Agent = class extends Think {
 		return {
 			system: this._getTurnSystemPrompt(),
 			model: this.getModel(this._turn.context),
-			messages: this._pruneTurnMessages(ctx.messages),
+			messages: this.pruneTurnMessages(ctx.messages),
 			tools: this._withTurnContextFallback(tools),
 			activeTools,
 			experimental_transform: buildSourcesTransform(),
@@ -1165,7 +1165,7 @@ var Agent = class extends Think {
 				tools: withFallbackToolContext(tools, () => snapshotContext),
 				activeTools,
 				frameworkToolNames: Object.keys(frameworkTools),
-				messages: this._pruneTurnMessages(messages)
+				messages: this.pruneTurnMessages(messages)
 			};
 		} finally {
 			this._turn = previousTurn;
@@ -1183,7 +1183,7 @@ var Agent = class extends Think {
 	getRemoteSkills() {
 		return [];
 	}
-	_pruneTurnMessages(messages) {
+	pruneTurnMessages(messages) {
 		return pruneMessages({
 			messages,
 			toolCalls: [{
@@ -1978,15 +1978,130 @@ var Assistant = class extends Agent$1 {
 		agentClass: this.constructor.name
 	}) });
 };
-//#endregion
-//#region src/server/features/messages.ts
-const COMPACTION_TOKEN_THRESHOLD = 1e5;
 const COMPACTION_MAX_OUTPUT_TOKENS = 2e3;
-const createCompactFn = (model) => createCompactFunction({ summarize: (prompt) => generateText({
-	model,
-	prompt,
-	maxOutputTokens: COMPACTION_MAX_OUTPUT_TOKENS
-}).then((result) => result.text) });
+const createCompactFn = (model) => createCompactFunction({
+	protectHead: 2,
+	minTailMessages: 1,
+	summarize: (prompt) => generateText({
+		model,
+		prompt,
+		maxOutputTokens: COMPACTION_MAX_OUTPUT_TOKENS
+	}).then((result) => result.text)
+});
+const MODEL_COMPACTION_MESSAGE_ID = "compaction_model_context";
+/**
+* Model compaction is deliberately stored separately from assistant_messages.
+* The transcript remains exact for clients; only model input uses the summary.
+*/
+function ensureModelCompactionTable(sql) {
+	sql`CREATE TABLE IF NOT EXISTS economic_chat_model_compaction (
+      id                  INTEGER PRIMARY KEY CHECK (id = 1),
+      summary             TEXT NOT NULL,
+      from_message_id     TEXT NOT NULL,
+      to_message_id       TEXT NOT NULL,
+      updated_at          INTEGER NOT NULL
+    )`;
+}
+function getModelCompaction(sql) {
+	const row = sql`SELECT summary, from_message_id, to_message_id
+    FROM economic_chat_model_compaction
+    WHERE id = 1`[0];
+	return row ? {
+		summary: row.summary,
+		fromMessageId: row.from_message_id,
+		toMessageId: row.to_message_id
+	} : null;
+}
+function setModelCompaction(sql, state) {
+	sql`INSERT INTO economic_chat_model_compaction (
+      id, summary, from_message_id, to_message_id, updated_at
+    ) VALUES (
+      1, ${state.summary}, ${state.fromMessageId}, ${state.toMessageId}, ${Date.now()}
+    ) ON CONFLICT (id) DO UPDATE SET
+      summary = excluded.summary,
+      from_message_id = excluded.from_message_id,
+      to_message_id = excluded.to_message_id,
+      updated_at = excluded.updated_at`;
+}
+function clearModelCompaction(sql) {
+	sql`DELETE FROM economic_chat_model_compaction WHERE id = 1`;
+}
+/**
+* Move summaries created by the old Session overlay implementation into the
+* model-only store, then remove the overlays. Session retained the original
+* rows, so removing an overlay restores the exact transcript.
+*/
+function migrateSessionCompaction(sql) {
+	const legacy = sql`SELECT
+      summary, from_message_id, to_message_id
+    FROM assistant_compactions
+    WHERE session_id = ''
+    ORDER BY created_at DESC, rowid DESC
+    LIMIT 1`[0];
+	if (!legacy) return false;
+	if (!getModelCompaction(sql)) setModelCompaction(sql, {
+		summary: legacy.summary,
+		fromMessageId: legacy.from_message_id,
+		toMessageId: legacy.to_message_id
+	});
+	sql`DELETE FROM assistant_compactions WHERE session_id = ''`;
+	return true;
+}
+function applyModelCompaction(messages, state) {
+	const fromIndex = messages.findIndex((message) => message.id === state.fromMessageId);
+	const toIndex = messages.findIndex((message) => message.id === state.toMessageId);
+	if (fromIndex === -1 || toIndex < fromIndex) return null;
+	return [
+		...messages.slice(0, fromIndex),
+		{
+			id: MODEL_COMPACTION_MESSAGE_ID,
+			role: "assistant",
+			parts: [{
+				type: "text",
+				text: state.summary
+			}]
+		},
+		...messages.slice(toIndex + 1)
+	];
+}
+/** Build the compacted projection used only for the next model call. */
+async function prepareModelHistory(messages, existingState, compact, systemPrompt = "") {
+	let state = existingState;
+	let projected = state ? applyModelCompaction(messages, state) : messages;
+	let stateChanged = false;
+	if (!projected) {
+		state = null;
+		projected = messages;
+		stateChanged = true;
+	}
+	if (estimateMessageTokens(projected) + estimateStringTokens(systemPrompt) <= 1e5) return {
+		messages: projected,
+		state,
+		stateChanged
+	};
+	const result = await compact(projected);
+	if (!result) return {
+		messages: projected,
+		state,
+		stateChanged
+	};
+	const nextState = {
+		summary: result.summary,
+		fromMessageId: state?.fromMessageId ?? result.fromMessageId,
+		toMessageId: result.toMessageId
+	};
+	const nextProjection = applyModelCompaction(messages, nextState);
+	if (!nextProjection) return {
+		messages: projected,
+		state,
+		stateChanged
+	};
+	return {
+		messages: nextProjection,
+		state: nextState,
+		stateChanged: true
+	};
+}
 /**
 * Ensures that the feedback table exists.
 * @param sql - The SQL function to use to execute the query.
@@ -2191,14 +2306,38 @@ var ChatAgent = class extends Agent {
 	async onStart() {
 		await super.onStart();
 		ensureFeedbackTableExists(this.sql.bind(this));
+		ensureModelCompactionTable(this.sql.bind(this));
+		if (migrateSessionCompaction(this.sql.bind(this))) await this.syncMessagesFromStorage();
 	}
 	configureSession(session) {
-		return super.configureSession(session).onCompaction(createCompactFn(this.getModel())).compactAfter(COMPACTION_TOKEN_THRESHOLD);
+		return super.configureSession(session);
 	}
 	async beforeTurn(ctx) {
 		const parent = await this.getParentAgent();
 		if (parent?.registerChat) await parent.registerChat(this.name);
-		return super.beforeTurn(ctx);
+		const config = await super.beforeTurn(ctx) ?? {};
+		try {
+			const prepared = await prepareModelHistory(this.messages, getModelCompaction(this.sql.bind(this)), createCompactFn(config.model ?? ctx.model), config.system ?? ctx.system);
+			if (prepared.stateChanged) if (prepared.state) setModelCompaction(this.sql.bind(this), prepared.state);
+			else clearModelCompaction(this.sql.bind(this));
+			if (prepared.state) {
+				const tools = config.tools ? {
+					...ctx.tools,
+					...config.tools
+				} : ctx.tools;
+				const modelMessages = await convertToModelMessages(truncateOlderMessages(sanitizeToolPairs(prepared.messages)), {
+					tools,
+					ignoreIncompleteToolCalls: true
+				});
+				return {
+					...config,
+					messages: this.pruneTurnMessages(modelMessages)
+				};
+			}
+		} catch (error) {
+			console.error("[ChatAgent] Failed to prepare model-only compaction", error);
+		}
+		return config;
 	}
 	async onChatResponse(result) {
 		recordTurnCompletedAnalytics(this.env.AGENTS_ANALYTICS, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "2.10.5",
+  "version": "2.10.6",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "files": [