@agi-cli/server 0.1.63 → 0.1.65

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agi-cli/server",
-	"version": "0.1.63",
+	"version": "0.1.65",
 	"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.63",
-		"@agi-cli/database": "0.1.63",
+		"@agi-cli/sdk": "0.1.65",
+		"@agi-cli/database": "0.1.65",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9"
 	},

package/src/runtime/agent-registry.ts

@@ -122,7 +122,6 @@ const defaultToolExtras: Record<string, string[]> = {
 		'glob',
 		'ripgrep',
 		'git_status',
-		'git_diff',
 		'apply_patch',
 		'websearch',
 	],

package/src/runtime/cache-optimizer.ts

@@ -4,18 +4,29 @@ import type { ModelMessage } from 'ai';
  * Adds cache control to messages for prompt caching optimization.
  * Anthropic supports caching for system messages, tools, and long context.
  */
+type CachedSystemValue =
+	| string
+	| undefined
+	| Array<{
+			type: 'text';
+			text: string;
+			cache_control?: { type: 'ephemeral' };
+	  }>;
+
+type TextContentPartWithProviderOptions = {
+	providerOptions?: {
+		anthropic?: { cacheControl?: { type: 'ephemeral' } };
+		[key: string]: unknown;
+	};
+	[key: string]: unknown;
+};
+
 export function addCacheControl(
 	provider: string,
 	system: string | undefined,
 	messages: ModelMessage[],
 ): {
-	system?:
-		| string
-		| Array<{
-				type: 'text';
-				text: string;
-				cache_control?: { type: 'ephemeral' };
-		  }>;
+	system?: CachedSystemValue;
 	messages: ModelMessage[];
 } {
 	// Only Anthropic supports prompt caching currently
@@ -24,7 +35,7 @@ export function addCacheControl(
 	}
 
 	// Convert system to cacheable format if it's long enough
-	let cachedSystem: any = system;
+	let cachedSystem: CachedSystemValue = system;
 	if (system && system.length > 1024) {
 		// Anthropic requires 1024+ tokens for Claude Sonnet/Opus
 		cachedSystem = [
@@ -60,8 +71,16 @@ export function addCacheControl(
 			if (Array.isArray(targetMsg.content)) {
 				// Add cache control to the last content part of that message
 				const lastPart = targetMsg.content[targetMsg.content.length - 1];
-				if (lastPart && typeof lastPart === 'object' && 'type' in lastPart) {
-					(lastPart as any).providerOptions = {
+				if (
+					lastPart &&
+					typeof lastPart === 'object' &&
+					'type' in lastPart &&
+					lastPart.type === 'text'
+				) {
+					const textPart =
+						lastPart as unknown as TextContentPartWithProviderOptions;
+					textPart.providerOptions = {
+						...textPart.providerOptions,
 						anthropic: { cacheControl: { type: 'ephemeral' } },
 					};
 				}

package/src/runtime/db-operations.ts

@@ -3,7 +3,7 @@ import { messages, messageParts, sessions } from '@agi-cli/database/schema';
 import { eq } from 'drizzle-orm';
 import type { RunOpts } from './session-queue.ts';
 
-type UsageData = {
+export type UsageData = {
 	inputTokens?: number;
 	outputTokens?: number;
 	totalTokens?: number;
@@ -11,13 +11,20 @@ type UsageData = {
 	reasoningTokens?: number;
 };
 
+export type ProviderMetadata = Record<string, unknown> & {
+	openai?: {
+		cachedPromptTokens?: number;
+		[key: string]: unknown;
+	};
+};
+
 /**
  * Updates session token counts incrementally after each step.
  * Note: onStepFinish.usage is CUMULATIVE per message, so we compute DELTA and add to session.
  */
 export async function updateSessionTokensIncremental(
 	usage: UsageData,
-	providerMetadata: Record<string, any> | undefined,
+	providerMetadata: ProviderMetadata | undefined,
 	opts: RunOpts,
 	db: Awaited<ReturnType<typeof getDb>>,
 ) {
@@ -129,7 +136,7 @@ export async function updateSessionTokens(
  */
 export async function updateMessageTokensIncremental(
 	usage: UsageData,
-	providerMetadata: Record<string, any> | undefined,
+	providerMetadata: ProviderMetadata | undefined,
 	opts: RunOpts,
 	db: Awaited<ReturnType<typeof getDb>>,
 ) {
@@ -187,7 +194,7 @@ export async function updateMessageTokensIncremental(
  * Token usage is tracked incrementally via updateMessageTokensIncremental().
  */
 export async function completeAssistantMessage(
-	fin: {
+	_fin: {
 		usage?: {
 			inputTokens?: number;
 			outputTokens?: number;

package/src/runtime/runner.ts

@@ -262,7 +262,7 @@ async function runAssistant(opts: RunOpts) {
 
 	// 3. Add cache control
 	const { system: cachedSystem, messages: optimizedMessages } = addCacheControl(
-		opts.provider as any,
+		opts.provider,
 		system,
 		truncatedMessages,
 	);

package/src/runtime/stream-handlers.ts

@@ -7,26 +7,17 @@ import { estimateModelCostUsd } from '@agi-cli/sdk';
 import { toErrorPayload } from './error-handling.ts';
 import type { RunOpts } from './session-queue.ts';
 import type { ToolAdapterContext } from '../tools/adapter.ts';
+import type { ProviderMetadata, UsageData } from './db-operations.ts';
 
 type StepFinishEvent = {
-	usage?: {
-		inputTokens?: number;
-		outputTokens?: number;
-		totalTokens?: number;
-		cachedInputTokens?: number;
-		reasoningTokens?: number;
-	};
+	usage?: UsageData;
 	finishReason?: string;
 	response?: unknown;
-	experimental_providerMetadata?: Record<string, any>;
+	experimental_providerMetadata?: ProviderMetadata;
 };
 
 type FinishEvent = {
-	usage?: {
-		inputTokens?: number;
-		outputTokens?: number;
-		totalTokens?: number;
-	};
+	usage?: Pick<UsageData, 'inputTokens' | 'outputTokens' | 'totalTokens'>;
 	finishReason?: string;
 };
 
@@ -47,14 +38,14 @@ export function createStepFinishHandler(
 	updateAccumulated: (text: string) => void,
 	incrementStepIndex: () => number,
 	updateSessionTokensIncrementalFn: (
-		usage: any,
-		providerMetadata: Record<string, any> | undefined,
+		usage: UsageData,
+		providerMetadata: ProviderMetadata | undefined,
 		opts: RunOpts,
 		db: Awaited<ReturnType<typeof getDb>>,
 	) => Promise<void>,
 	updateMessageTokensIncrementalFn: (
-		usage: any,
-		providerMetadata: Record<string, any> | undefined,
+		usage: UsageData,
+		providerMetadata: ProviderMetadata | undefined,
 		opts: RunOpts,
 		db: Awaited<ReturnType<typeof getDb>>,
 	) => Promise<void>,