@agi-cli/server 0.1.120 → 0.1.121

package/src/runtime/{provider.ts → provider/anthropic.ts}

@@ -1,80 +1,11 @@
-import type { AGIConfig, ProviderId } from '@agi-cli/sdk';
-import {
-	catalog,
-	createSolforgeModel,
-	createOpenAIOAuthModel,
-	getAuth,
-	refreshToken,
-	setAuth,
-} from '@agi-cli/sdk';
-import { openai, createOpenAI } from '@ai-sdk/openai';
+import type { AGIConfig } from '@agi-cli/sdk';
+import { getAuth, refreshToken, setAuth } from '@agi-cli/sdk';
 import { createAnthropic } from '@ai-sdk/anthropic';
-import { google, createGoogleGenerativeAI } from '@ai-sdk/google';
-import { createOpenRouter } from '@openrouter/ai-sdk-provider';
-import { toClaudeCodeName } from './tool-mapping.ts';
+import { toClaudeCodeName } from '../tools/mapping.ts';
 
-// Version to report in user-agent for Claude Code compatibility
 const CLAUDE_CLI_VERSION = '1.0.61';
-import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 
-export type ProviderName = ProviderId;
-
-async function getZaiInstance(cfg: AGIConfig, model: string) {
-	const auth = await getAuth('zai', cfg.projectRoot);
-	const entry = catalog.zai;
-
-	let apiKey = '';
-	const baseURL = entry?.api || 'https://api.z.ai/api/paas/v4';
-
-	if (auth?.type === 'api' && auth.key) {
-		apiKey = auth.key;
-	} else {
-		apiKey = process.env.ZAI_API_KEY || process.env.ZHIPU_API_KEY || '';
-	}
-
-	const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
-
-	const instance = createOpenAICompatible({
-		name: entry?.label ?? 'Z.AI',
-		baseURL,
-		headers,
-	});
-
-	return instance(model);
-}
-
-async function getZaiCodingInstance(cfg: AGIConfig, model: string) {
-	const auth =
-		(await getAuth('zai', cfg.projectRoot)) ||
-		(await getAuth('zai-coding', cfg.projectRoot));
-	const entry = catalog['zai-coding'];
-
-	let apiKey = '';
-	const baseURL = entry?.api || 'https://api.z.ai/api/coding/paas/v4';
-
-	if (auth?.type === 'api' && auth.key) {
-		apiKey = auth.key;
-	} else {
-		apiKey = process.env.ZAI_API_KEY || process.env.ZHIPU_API_KEY || '';
-	}
-
-	const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
-
-	const instance = createOpenAICompatible({
-		name: entry?.label ?? 'Z.AI Coding',
-		baseURL,
-		headers,
-	});
-
-	return instance(model);
-}
-
-function getOpenRouterInstance() {
-	const apiKey = process.env.OPENROUTER_API_KEY ?? '';
-	return createOpenRouter({ apiKey });
-}
-
-async function getAnthropicInstance(cfg: AGIConfig) {
+export async function getAnthropicInstance(cfg: AGIConfig) {
 	const auth = await getAuth('anthropic', cfg.projectRoot);
 
 	if (auth?.type === 'oauth') {
@@ -137,7 +68,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 				}
 			}
 
-			// Required Claude Code headers
 			headers.authorization = `Bearer ${currentAuth.access}`;
 			headers['anthropic-beta'] =
 				'claude-code-20250219,oauth-2025-04-20,interleaved-thinking-2025-05-14';
@@ -149,7 +79,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 			headers['content-type'] = 'application/json';
 			headers.accept = 'application/json';
 
-			// Stainless headers (fingerprinting)
 			headers['x-stainless-arch'] = process.arch === 'arm64' ? 'arm64' : 'x64';
 			headers['x-stainless-helper-method'] = 'stream';
 			headers['x-stainless-lang'] = 'js';
@@ -165,19 +94,16 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 			headers['x-stainless-runtime-version'] = process.version;
 			headers['x-stainless-timeout'] = '600';
 
-			// Add ?beta=true to URL
 			let url = typeof input === 'string' ? input : input.toString();
 			if (url.includes('/v1/messages') && !url.includes('beta=true')) {
 				url += url.includes('?') ? '&beta=true' : '?beta=true';
 			}
 
-			// Transform request body: tool names to PascalCase + apply caching
 			let body = init?.body;
 			if (body && typeof body === 'string') {
 				try {
 					const parsed = JSON.parse(body);
 
-					// Transform tool names
 					if (parsed.tools && Array.isArray(parsed.tools)) {
 						parsed.tools = parsed.tools.map(
 							(tool: { name: string; [key: string]: unknown }) => ({
@@ -187,16 +113,11 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 						);
 					}
 
-					// Apply ephemeral caching (max 4 cache breakpoints total)
-					// Adapter adds 2 tool cache blocks, so we can add 2 more:
-					// - 1 system block (the first one with tools description)
-					// - 1 message block (the last user message)
 					const MAX_SYSTEM_CACHE = 1;
 					const MAX_MESSAGE_CACHE = 1;
 					let systemCacheUsed = 0;
 					let messageCacheUsed = 0;
 
-					// Cache first system message only (contains agent instructions)
 					if (parsed.system && Array.isArray(parsed.system)) {
 						parsed.system = parsed.system.map(
 							(
@@ -217,7 +138,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 						);
 					}
 
-					// Transform tool names in messages and apply caching to last message only
 					if (parsed.messages && Array.isArray(parsed.messages)) {
 						const messageCount = parsed.messages.length;
 
@@ -230,7 +150,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 								},
 								msgIndex: number,
 							) => {
-								// Only cache the very last message
 								const isLast = msgIndex === messageCount - 1;
 
 								if (Array.isArray(msg.content)) {
@@ -245,7 +164,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 										) => {
 											let transformedBlock = block;
 
-											// Transform tool names
 											if (block.type === 'tool_use' && block.name) {
 												transformedBlock = {
 													...block,
@@ -259,7 +177,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 												};
 											}
 
-											// Add cache_control to last block of last message
 											if (
 												isLast &&
 												!transformedBlock.cache_control &&
@@ -279,7 +196,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 									return { ...msg, content };
 								}
 
-								// For string content, wrap in array with cache_control if last message
 								if (
 									isLast &&
 									messageCacheUsed < MAX_MESSAGE_CACHE &&
@@ -321,8 +237,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 		});
 	}
 
-	// For API key auth, also apply caching via customFetch
-	// This optimizes token usage even without OAuth
 	const customFetch = async (
 		input: string | URL | Request,
 		init?: RequestInit,
@@ -332,15 +246,11 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 			try {
 				const parsed = JSON.parse(body);
 
-				// Apply ephemeral caching (max 4 cache breakpoints total)
-				// Adapter adds 2 tool cache blocks, so we can add 2 more:
-				// - 1 system block + 1 message block = 2
 				const MAX_SYSTEM_CACHE = 1;
 				const MAX_MESSAGE_CACHE = 1;
 				let systemCacheUsed = 0;
 				let messageCacheUsed = 0;
 
-				// Cache first system message
 				if (parsed.system && Array.isArray(parsed.system)) {
 					parsed.system = parsed.system.map(
 						(
@@ -361,7 +271,6 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 					);
 				}
 
-				// Cache last message only
 				if (parsed.messages && Array.isArray(parsed.messages)) {
 					const messageCount = parsed.messages.length;
 					parsed.messages = parsed.messages.map(
@@ -432,127 +341,3 @@ async function getAnthropicInstance(cfg: AGIConfig) {
 		fetch: customFetch as typeof fetch,
 	});
 }
-
-export async function resolveModel(
-	provider: ProviderName,
-	model: string,
-	cfg: AGIConfig,
-	options?: { systemPrompt?: string },
-) {
-	if (provider === 'openai') {
-		const auth = await getAuth('openai', cfg.projectRoot);
-		if (auth?.type === 'oauth') {
-			const isCodexModel = model.toLowerCase().includes('codex');
-			return createOpenAIOAuthModel(model, {
-				oauth: auth,
-				projectRoot: cfg.projectRoot,
-				reasoningEffort: isCodexModel ? 'high' : 'medium',
-				reasoningSummary: 'auto',
-				instructions: options?.systemPrompt,
-			});
-		}
-		if (auth?.type === 'api' && auth.key) {
-			const instance = createOpenAI({ apiKey: auth.key });
-			return instance(model);
-		}
-		return openai(model);
-	}
-	if (provider === 'anthropic') {
-		const instance = await getAnthropicInstance(cfg);
-		return instance(model);
-	}
-	if (provider === 'google') {
-		const auth = await getAuth('google', cfg.projectRoot);
-		if (auth?.type === 'api' && auth.key) {
-			const instance = createGoogleGenerativeAI({ apiKey: auth.key });
-			return instance(model);
-		}
-		return google(model);
-	}
-	if (provider === 'openrouter') {
-		const openrouter = getOpenRouterInstance();
-		return openrouter.chat(model);
-	}
-	if (provider === 'opencode') {
-		const entry = catalog[provider];
-		const normalizedModel = normalizeModelIdentifier(provider, model);
-		const modelInfo =
-			entry?.models.find((m) => m.id === normalizedModel) ??
-			entry?.models.find((m) => m.id === model);
-		const resolvedModelId = modelInfo?.id ?? normalizedModel ?? model;
-		const binding = modelInfo?.provider?.npm ?? entry?.npm;
-		const apiKey = process.env.OPENCODE_API_KEY ?? '';
-		const baseURL =
-			modelInfo?.provider?.baseURL ||
-			modelInfo?.provider?.api ||
-			entry?.api ||
-			'https://opencode.ai/zen/v1';
-		const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
-		if (binding === '@ai-sdk/openai') {
-			const instance = createOpenAI({ apiKey, baseURL });
-			return instance(resolvedModelId);
-		}
-		if (binding === '@ai-sdk/anthropic') {
-			const instance = createAnthropic({ apiKey, baseURL });
-			return instance(resolvedModelId);
-		}
-		if (binding === '@ai-sdk/openai-compatible') {
-			const instance = createOpenAICompatible({
-				name: entry?.label ?? 'opencode',
-				baseURL,
-				headers,
-			});
-			return instance(resolvedModelId);
-		}
-
-		const ocOpenAI = createOpenAI({ apiKey, baseURL });
-		const ocAnthropic = createAnthropic({ apiKey, baseURL });
-		const ocCompat = createOpenAICompatible({
-			name: entry?.label ?? 'opencode',
-			baseURL,
-			headers,
-		});
-
-		const id = resolvedModelId.toLowerCase();
-		if (id.includes('claude')) return ocAnthropic(resolvedModelId);
-		if (
-			id.includes('qwen3-coder') ||
-			id.includes('grok-code') ||
-			id.includes('kimi-k2')
-		)
-			return ocCompat(resolvedModelId);
-		return ocOpenAI(resolvedModelId);
-	}
-	if (provider === 'solforge') {
-		const privateKey = process.env.SOLFORGE_PRIVATE_KEY ?? '';
-		if (!privateKey) {
-			throw new Error(
-				'Solforge provider requires SOLFORGE_PRIVATE_KEY (base58 Solana secret).',
-			);
-		}
-		const baseURL = process.env.SOLFORGE_BASE_URL;
-		const rpcURL = process.env.SOLFORGE_SOLANA_RPC_URL;
-		const topupAmount = process.env.SOLFORGE_TOPUP_MICRO_USDC;
-		return createSolforgeModel(
-			model,
-			{ privateKey },
-			{
-				baseURL,
-				rpcURL,
-				topupAmountMicroUsdc: topupAmount,
-			},
-		);
-	}
-	if (provider === 'zai') {
-		return getZaiInstance(cfg, model);
-	}
-	if (provider === 'zai-coding') {
-		return getZaiCodingInstance(cfg, model);
-	}
-	throw new Error(`Unsupported provider: ${provider}`);
-}
-
-function normalizeModelIdentifier(provider: ProviderId, model: string): string {
-	const prefix = `${provider}/`;
-	return model.startsWith(prefix) ? model.slice(prefix.length) : model;
-}

package/src/runtime/provider/google.ts

@@ -0,0 +1,12 @@
+import type { AGIConfig } from '@agi-cli/sdk';
+import { getAuth } from '@agi-cli/sdk';
+import { google, createGoogleGenerativeAI } from '@ai-sdk/google';
+
+export async function resolveGoogleModel(model: string, cfg: AGIConfig) {
+	const auth = await getAuth('google', cfg.projectRoot);
+	if (auth?.type === 'api' && auth.key) {
+		const instance = createGoogleGenerativeAI({ apiKey: auth.key });
+		return instance(model);
+	}
+	return google(model);
+}

package/src/runtime/provider/index.ts

@@ -0,0 +1,44 @@
+import type { AGIConfig, ProviderId } from '@agi-cli/sdk';
+import { getAnthropicInstance } from './anthropic.ts';
+import { resolveOpenAIModel } from './openai.ts';
+import { resolveGoogleModel } from './google.ts';
+import { resolveOpenRouterModel } from './openrouter.ts';
+import { resolveSolforgeModel } from './solforge.ts';
+import { getZaiInstance, getZaiCodingInstance } from './zai.ts';
+import { resolveOpencodeModel } from './opencode.ts';
+
+export type ProviderName = ProviderId;
+
+export async function resolveModel(
+	provider: ProviderName,
+	model: string,
+	cfg: AGIConfig,
+	options?: { systemPrompt?: string },
+) {
+	if (provider === 'openai') {
+		return resolveOpenAIModel(model, cfg, options);
+	}
+	if (provider === 'anthropic') {
+		const instance = await getAnthropicInstance(cfg);
+		return instance(model);
+	}
+	if (provider === 'google') {
+		return resolveGoogleModel(model, cfg);
+	}
+	if (provider === 'openrouter') {
+		return resolveOpenRouterModel(model);
+	}
+	if (provider === 'opencode') {
+		return resolveOpencodeModel(model, cfg);
+	}
+	if (provider === 'solforge') {
+		return resolveSolforgeModel(model);
+	}
+	if (provider === 'zai') {
+		return getZaiInstance(cfg, model);
+	}
+	if (provider === 'zai-coding') {
+		return getZaiCodingInstance(cfg, model);
+	}
+	throw new Error(`Unsupported provider: ${provider}`);
+}

package/src/runtime/provider/openai.ts

@@ -0,0 +1,26 @@
+import type { AGIConfig } from '@agi-cli/sdk';
+import { getAuth, createOpenAIOAuthModel } from '@agi-cli/sdk';
+import { openai, createOpenAI } from '@ai-sdk/openai';
+
+export async function resolveOpenAIModel(
+	model: string,
+	cfg: AGIConfig,
+	options?: { systemPrompt?: string },
+) {
+	const auth = await getAuth('openai', cfg.projectRoot);
+	if (auth?.type === 'oauth') {
+		const isCodexModel = model.toLowerCase().includes('codex');
+		return createOpenAIOAuthModel(model, {
+			oauth: auth,
+			projectRoot: cfg.projectRoot,
+			reasoningEffort: isCodexModel ? 'high' : 'medium',
+			reasoningSummary: 'auto',
+			instructions: options?.systemPrompt,
+		});
+	}
+	if (auth?.type === 'api' && auth.key) {
+		const instance = createOpenAI({ apiKey: auth.key });
+		return instance(model);
+	}
+	return openai(model);
+}

package/src/runtime/provider/opencode.ts

@@ -0,0 +1,61 @@
+import type { AGIConfig, ProviderId } from '@agi-cli/sdk';
+import { catalog } from '@agi-cli/sdk';
+import { createOpenAI } from '@ai-sdk/openai';
+import { createAnthropic } from '@ai-sdk/anthropic';
+import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
+
+function normalizeModelIdentifier(provider: ProviderId, model: string): string {
+	const prefix = `${provider}/`;
+	return model.startsWith(prefix) ? model.slice(prefix.length) : model;
+}
+
+export function resolveOpencodeModel(model: string, _cfg: AGIConfig) {
+	const entry = catalog.opencode;
+	const normalizedModel = normalizeModelIdentifier('opencode', model);
+	const modelInfo =
+		entry?.models.find((m) => m.id === normalizedModel) ??
+		entry?.models.find((m) => m.id === model);
+	const resolvedModelId = modelInfo?.id ?? normalizedModel ?? model;
+	const binding = modelInfo?.provider?.npm ?? entry?.npm;
+	const apiKey = process.env.OPENCODE_API_KEY ?? '';
+	const baseURL =
+		modelInfo?.provider?.baseURL ||
+		modelInfo?.provider?.api ||
+		entry?.api ||
+		'https://opencode.ai/zen/v1';
+	const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
+	if (binding === '@ai-sdk/openai') {
+		const instance = createOpenAI({ apiKey, baseURL });
+		return instance(resolvedModelId);
+	}
+	if (binding === '@ai-sdk/anthropic') {
+		const instance = createAnthropic({ apiKey, baseURL });
+		return instance(resolvedModelId);
+	}
+	if (binding === '@ai-sdk/openai-compatible') {
+		const instance = createOpenAICompatible({
+			name: entry?.label ?? 'opencode',
+			baseURL,
+			headers,
+		});
+		return instance(resolvedModelId);
+	}
+
+	const ocOpenAI = createOpenAI({ apiKey, baseURL });
+	const ocAnthropic = createAnthropic({ apiKey, baseURL });
+	const ocCompat = createOpenAICompatible({
+		name: entry?.label ?? 'opencode',
+		baseURL,
+		headers,
+	});
+
+	const id = resolvedModelId.toLowerCase();
+	if (id.includes('claude')) return ocAnthropic(resolvedModelId);
+	if (
+		id.includes('qwen3-coder') ||
+		id.includes('grok-code') ||
+		id.includes('kimi-k2')
+	)
+		return ocCompat(resolvedModelId);
+	return ocOpenAI(resolvedModelId);
+}

package/src/runtime/provider/openrouter.ts

@@ -0,0 +1,11 @@
+import { createOpenRouter } from '@openrouter/ai-sdk-provider';
+
+export function getOpenRouterInstance() {
+	const apiKey = process.env.OPENROUTER_API_KEY ?? '';
+	return createOpenRouter({ apiKey });
+}
+
+export function resolveOpenRouterModel(model: string) {
+	const openrouter = getOpenRouterInstance();
+	return openrouter.chat(model);
+}

package/src/runtime/provider/solforge.ts

@@ -0,0 +1,22 @@
+import { createSolforgeModel } from '@agi-cli/sdk';
+
+export function resolveSolforgeModel(model: string) {
+	const privateKey = process.env.SOLFORGE_PRIVATE_KEY ?? '';
+	if (!privateKey) {
+		throw new Error(
+			'Solforge provider requires SOLFORGE_PRIVATE_KEY (base58 Solana secret).',
+		);
+	}
+	const baseURL = process.env.SOLFORGE_BASE_URL;
+	const rpcURL = process.env.SOLFORGE_SOLANA_RPC_URL;
+	const topupAmount = process.env.SOLFORGE_TOPUP_MICRO_USDC;
+	return createSolforgeModel(
+		model,
+		{ privateKey },
+		{
+			baseURL,
+			rpcURL,
+			topupAmountMicroUsdc: topupAmount,
+		},
+	);
+}

package/src/runtime/provider/zai.ts

@@ -0,0 +1,53 @@
+import type { AGIConfig } from '@agi-cli/sdk';
+import { catalog, getAuth } from '@agi-cli/sdk';
+import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
+
+export async function getZaiInstance(cfg: AGIConfig, model: string) {
+	const auth = await getAuth('zai', cfg.projectRoot);
+	const entry = catalog.zai;
+
+	let apiKey = '';
+	const baseURL = entry?.api || 'https://api.z.ai/api/paas/v4';
+
+	if (auth?.type === 'api' && auth.key) {
+		apiKey = auth.key;
+	} else {
+		apiKey = process.env.ZAI_API_KEY || process.env.ZHIPU_API_KEY || '';
+	}
+
+	const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
+
+	const instance = createOpenAICompatible({
+		name: entry?.label ?? 'Z.AI',
+		baseURL,
+		headers,
+	});
+
+	return instance(model);
+}
+
+export async function getZaiCodingInstance(cfg: AGIConfig, model: string) {
+	const auth =
+		(await getAuth('zai', cfg.projectRoot)) ||
+		(await getAuth('zai-coding', cfg.projectRoot));
+	const entry = catalog['zai-coding'];
+
+	let apiKey = '';
+	const baseURL = entry?.api || 'https://api.z.ai/api/coding/paas/v4';
+
+	if (auth?.type === 'api' && auth.key) {
+		apiKey = auth.key;
+	} else {
+		apiKey = process.env.ZAI_API_KEY || process.env.ZHIPU_API_KEY || '';
+	}
+
+	const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
+
+	const instance = createOpenAICompatible({
+		name: entry?.label ?? 'Z.AI Coding',
+		baseURL,
+		headers,
+	});
+
+	return instance(model);
+}

package/src/runtime/{branch.ts → session/branch.ts}

@@ -1,7 +1,7 @@
 import { eq, asc } from 'drizzle-orm';
 import type { DB } from '@agi-cli/database';
 import { sessions, messages, messageParts } from '@agi-cli/database/schema';
-import { publish } from '../events/bus.ts';
+import { publish } from '../../events/bus.ts';
 import type { ProviderId } from '@agi-cli/sdk';
 
 type SessionRow = typeof sessions.$inferSelect;

package/src/runtime/{db-operations.ts → session/db-operations.ts}

@@ -1,7 +1,7 @@
 import type { getDb } from '@agi-cli/database';
 import { messages, messageParts, sessions } from '@agi-cli/database/schema';
 import { eq } from 'drizzle-orm';
-import type { RunOpts } from './session-queue.ts';
+import type { RunOpts } from './queue.ts';
 
 export type UsageData = {
 	inputTokens?: number;

package/src/runtime/{session-manager.ts → session/manager.ts}

@@ -8,7 +8,7 @@ import {
 	ensureProviderEnv,
 	type ProviderId,
 } from '@agi-cli/sdk';
-import { publish } from '../events/bus.ts';
+import { publish } from '../../events/bus.ts';
 
 type SessionRow = typeof sessions.$inferSelect;
 

package/src/runtime/{session-queue.ts → session/queue.ts}

@@ -1,5 +1,5 @@
-import type { ProviderName } from './provider.ts';
-import { publish } from '../events/bus.ts';
+import type { ProviderName } from '../provider/index.ts';
+import { publish } from '../../events/bus.ts';
 
 export type RunOpts = {
 	sessionId: string;

package/src/runtime/stream/abort-handler.ts

@@ -0,0 +1,65 @@
+import type { getDb } from '@agi-cli/database';
+import { messages, messageParts } from '@agi-cli/database/schema';
+import { eq } from 'drizzle-orm';
+import { publish } from '../../events/bus.ts';
+import type { RunOpts } from '../session/queue.ts';
+import type { ToolAdapterContext } from '../../tools/adapter.ts';
+import type { AbortEvent } from './types.ts';
+
+export function createAbortHandler(
+	opts: RunOpts,
+	db: Awaited<ReturnType<typeof getDb>>,
+	getStepIndex: () => number,
+	sharedCtx: ToolAdapterContext,
+) {
+	return async ({ steps }: AbortEvent) => {
+		const stepIndex = getStepIndex();
+
+		const abortPartId = crypto.randomUUID();
+		await db.insert(messageParts).values({
+			id: abortPartId,
+			messageId: opts.assistantMessageId,
+			index: await sharedCtx.nextIndex(),
+			stepIndex,
+			type: 'error',
+			content: JSON.stringify({
+				message: 'Generation stopped by user',
+				type: 'abort',
+				isAborted: true,
+				stepsCompleted: steps.length,
+			}),
+			agent: opts.agent,
+			provider: opts.provider,
+			model: opts.model,
+			startedAt: Date.now(),
+			completedAt: Date.now(),
+		});
+
+		await db
+			.update(messages)
+			.set({
+				status: 'error',
+				error: 'Generation stopped by user',
+				errorType: 'abort',
+				errorDetails: JSON.stringify({
+					stepsCompleted: steps.length,
+					abortedAt: Date.now(),
+				}),
+				isAborted: true,
+			})
+			.where(eq(messages.id, opts.assistantMessageId));
+
+		publish({
+			type: 'error',
+			sessionId: opts.sessionId,
+			payload: {
+				messageId: opts.assistantMessageId,
+				partId: abortPartId,
+				error: 'Generation stopped by user',
+				errorType: 'abort',
+				isAborted: true,
+				stepsCompleted: steps.length,
+			},
+		});
+	};
+}