@agi-cli/server 0.1.97 → 0.1.99

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agi-cli/server",
-	"version": "0.1.97",
+	"version": "0.1.99",
 	"description": "HTTP API server for AGI CLI",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -29,8 +29,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@agi-cli/sdk": "0.1.97",
-		"@agi-cli/database": "0.1.97",
+		"@agi-cli/sdk": "0.1.99",
+		"@agi-cli/database": "0.1.99",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",
 		"zod": "^4.1.8"

package/src/runtime/db-operations.ts

@@ -76,12 +76,15 @@ export async function updateSessionTokensIncremental(
 				: priorCachedMsg;
 
 	// Compute deltas for this step; clamp to 0 in case provider reports smaller values
+	// Cached tokens reduce the billable input, so we subtract them from the delta
 	const deltaInput = Math.max(0, cumPrompt - priorPromptMsg);
 	const deltaOutput = Math.max(0, cumCompletion - priorCompletionMsg);
 	const deltaCached = Math.max(0, cumCached - priorCachedMsg);
 	const deltaReasoning = Math.max(0, cumReasoning - priorReasoningMsg);
 
-	const nextInputSess = priorInputSess + deltaInput;
+	// Session input should only count non-cached tokens
+	// Total cached tokens are tracked separately for reference
+	const nextInputSess = priorInputSess + deltaInput - deltaCached;
 	const nextOutputSess = priorOutputSess + deltaOutput;
 	const nextCachedSess = priorCachedSess + deltaCached;
 	const nextReasoningSess = priorReasoningSess + deltaReasoning;

package/src/runtime/runner.ts

@@ -275,49 +275,9 @@ async function runAssistant(opts: RunOpts) {
 
 	const onFinish = createFinishHandler(opts, db, completeAssistantMessage);
 
-	// Apply optimizations: deduplication, pruning, cache control, and truncation
-	const { addCacheControl, truncateHistory } = await import(
-		'./cache-optimizer.ts'
-	);
-	const { optimizeContext } = await import('./context-optimizer.ts');
-
-	// 1. Optimize context (deduplicate file reads, prune old tool results)
-	const contextOptimized = optimizeContext(messagesWithSystemInstructions, {
-		deduplicateFiles: true,
-		maxToolResults: 30,
-	});
-
-	debugLog(
-		`[RUNNER] After optimizeContext: ${contextOptimized.length} messages`,
-	);
-
-	// 2. Truncate history
-	const truncatedMessages = truncateHistory(contextOptimized, 20);
-
-	debugLog(
-		`[RUNNER] After truncateHistory: ${truncatedMessages.length} messages`,
-	);
-	if (truncatedMessages.length > 0 && truncatedMessages[0].role === 'system') {
-		debugLog('[RUNNER] ✅ First message is system message');
-	} else if (truncatedMessages.length > 0) {
-		debugLog(
-			`[RUNNER] ⚠️ First message is NOT system (it's ${truncatedMessages[0].role})`,
-		);
-	}
-
-	// 3. Add cache control
-	const { system: cachedSystem, messages: optimizedMessages } = addCacheControl(
-		opts.provider,
-		system,
-		truncatedMessages,
-	);
-
-	debugLog(
-		`[RUNNER] Final optimizedMessages: ${optimizedMessages.length} messages`,
-	);
-	debugLog(
-		`[RUNNER] cachedSystem (spoof): ${typeof cachedSystem === 'string' ? cachedSystem.substring(0, 100) : JSON.stringify(cachedSystem).substring(0, 100)}`,
-	);
+	// Use messages directly without truncation or optimization
+	const optimizedMessages = messagesWithSystemInstructions;
+	const cachedSystem = system;
 
 	// Part tracking - will be created on first text-delta
 	let currentPartId: string | null = null;

package/src/tools/adapter.ts

@@ -10,13 +10,6 @@ import type {
 } from '../runtime/tool-context.ts';
 import { isToolError } from '@agi-cli/sdk/tools/error';
 
-function isSkippedToolCallError(error: unknown): boolean {
-	if (!isToolError(error)) return false;
-	const details = (error as { details?: unknown }).details;
-	if (!details || typeof details !== 'object') return false;
-	return 'skippedTool' in (details as Record<string, unknown>);
-}
-
 export type { ToolAdapterContext } from '../runtime/tool-context.ts';
 
 type ToolExecuteSignature = Tool['execute'] extends (
@@ -227,41 +220,7 @@ export function adaptTools(
 							stepIndex: ctx.stepIndex,
 						},
 					});
-					// Optionally persist in the background without blocking ordering
-					(async () => {
-						try {
-							const index = await ctx.nextIndex();
-							await ctx.db.insert(messageParts).values({
-								id: callPartId,
-								messageId: ctx.messageId,
-								index,
-								stepIndex: ctx.stepIndex,
-								type: 'tool_call',
-								content: JSON.stringify({ name, args, callId }),
-								agent: ctx.agent,
-								provider: ctx.provider,
-								model: ctx.model,
-								startedAt: startTs,
-								toolName: name,
-								toolCallId: callId,
-							});
-						} catch {}
-					})();
-					if (typeof base.onInputAvailable === 'function') {
-						// biome-ignore lint/suspicious/noExplicitAny: AI SDK types are complex
-						await base.onInputAvailable(options as any);
-					}
-					return;
-				}
-
-				// Publish promptly so UI shows the call header before results
-				publish({
-					type: 'tool.call',
-					sessionId: ctx.sessionId,
-					payload: { name, args, callId, stepIndex: ctx.stepIndex },
-				});
-				// Persist best-effort in the background to avoid delaying output
-				(async () => {
+					// Persist synchronously to maintain correct ordering
 					try {
 						const index = await ctx.nextIndex();
 						await ctx.db.insert(messageParts).values({
@@ -279,7 +238,37 @@ export function adaptTools(
 							toolCallId: callId,
 						});
 					} catch {}
-				})();
+					if (typeof base.onInputAvailable === 'function') {
+						// biome-ignore lint/suspicious/noExplicitAny: AI SDK types are complex
+						await base.onInputAvailable(options as any);
+					}
+					return;
+				}
+
+				// Publish promptly so UI shows the call header before results
+				publish({
+					type: 'tool.call',
+					sessionId: ctx.sessionId,
+					payload: { name, args, callId, stepIndex: ctx.stepIndex },
+				});
+				// Persist synchronously to maintain correct ordering
+				try {
+					const index = await ctx.nextIndex();
+					await ctx.db.insert(messageParts).values({
+						id: callPartId,
+						messageId: ctx.messageId,
+						index,
+						stepIndex: ctx.stepIndex,
+						type: 'tool_call',
+						content: JSON.stringify({ name, args, callId }),
+						agent: ctx.agent,
+						provider: ctx.provider,
+						model: ctx.model,
+						startedAt: startTs,
+						toolName: name,
+						toolCallId: callId,
+					});
+				} catch {}
 				if (typeof base.onInputAvailable === 'function') {
 					// biome-ignore lint/suspicious/noExplicitAny: AI SDK types are complex
 					await base.onInputAvailable(options as any);
@@ -310,23 +299,6 @@ export function adaptTools(
 
 				const executeWithGuards = async (): Promise<ToolExecuteReturn> => {
 					try {
-						if (failureState.active) {
-							const expectedTool = failureState.toolName;
-							if (!expectedTool || expectedTool !== name) {
-								const skipError = {
-									ok: false,
-									error: expectedTool
-										? `Cannot execute "${name}" because "${expectedTool}" failed earlier in this step. Retry "${expectedTool}" before using other tools.`
-										: `Cannot execute "${name}" because a previous tool call in this session failed. Retry that tool before continuing with "${name}".`,
-									details: {
-										skippedTool: name,
-										reason: 'previous_tool_failed',
-										expectedTool,
-									},
-								};
-								throw skipError;
-							}
-						}
 						// Handle session-relative paths and cwd tools
 						let res: ToolExecuteReturn | { cwd: string } | null | undefined;
 						const cwd = getCwd(ctx.sessionId);
@@ -396,6 +368,10 @@ export function adaptTools(
 
 						if (isToolError(result)) {
 							stepState.failed = true;
+							stepState.failedToolName = name;
+							failureState.active = true;
+							failureState.toolName = name;
+
 							await persistToolErrorResult(result, {
 								callId: callIdFromQueue,
 								startTs: startTsFromQueue,
@@ -403,7 +379,7 @@ export function adaptTools(
 								args: meta?.args,
 							});
 							processedToolErrors.add(result as object);
-							throw result;
+							return result as ToolExecuteReturn;
 						}
 
 						const resultPartId = crypto.randomUUID();
@@ -547,10 +523,6 @@ export function adaptTools(
 						}
 						return result as ToolExecuteReturn;
 					} catch (error) {
-						if (isSkippedToolCallError(error)) {
-							throw error;
-						}
-
 						stepState.failed = true;
 						stepState.failedToolName = name;
 						failureState.active = true;
@@ -589,8 +561,7 @@ export function adaptTools(
 							processedToolErrors.add(error as object);
 						}
 
-						// Re-throw so AI SDK can handle it
-						throw error;
+						return errorResult as ToolExecuteReturn;
 					}
 				};