@agi-cli/server 0.1.101 → 0.1.102

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agi-cli/server",
-	"version": "0.1.101",
+	"version": "0.1.102",
 	"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.101",
-		"@agi-cli/database": "0.1.101",
+		"@agi-cli/sdk": "0.1.102",
+		"@agi-cli/database": "0.1.102",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",
 		"zod": "^4.1.8"

package/src/runtime/history-builder.ts

@@ -110,57 +110,50 @@ export async function buildHistoryMessages(
 				toolResults.map((result) => [result.callId, result]),
 			);
 
-			const hasIncompleteTools = toolCalls.some(
-				(call) => !toolResultsById.has(call.callId),
-			);
-
-			if (hasIncompleteTools) {
-				const pendingCalls = toolCalls
-					.filter((call) => !toolResultsById.has(call.callId))
-					.map((call) => `${call.name}#${call.callId}`)
-					.join(', ');
-				debugLog(
-					`[buildHistoryMessages] Incomplete tool calls for assistant message ${m.id}, skipping tool data (pending: ${pendingCalls || 'unknown'})`,
-				);
-				if (assistantParts.length) {
-					ui.push({ id: m.id, role: 'assistant', parts: assistantParts });
-				}
-				continue;
-			}
-
 			for (const call of toolCalls) {
 				// Skip finish tool from history - it's internal loop control
 				if (call.name === 'finish') continue;
 
 				const toolType = `tool-${call.name}` as `tool-${string}`;
-				const result = toolResultsById.get(call.callId);
-
-				if (result) {
-					const part = {
-						type: toolType,
-						state: 'output-available',
-						toolCallId: call.callId,
-						input: call.args,
-						output: (() => {
-							const r = result.result;
-							if (typeof r === 'string') return r;
-							try {
-								return JSON.stringify(r);
-							} catch {
-								return String(r);
-							}
-						})(),
+				let result = toolResultsById.get(call.callId);
+
+				if (!result) {
+					// Synthesize a result for incomplete tool calls to preserve history
+					debugLog(
+						`[buildHistoryMessages] Synthesizing error result for incomplete tool call ${call.name}#${call.callId}`,
+					);
+					result = {
+						name: call.name,
+						callId: call.callId,
+						result:
+							'Error: The tool execution was interrupted or failed to return a result. You may need to retry this operation.',
 					};
+				}
 
-					toolHistory.register(part, {
-						toolName: call.name,
-						callId: call.callId,
-						args: call.args,
-						result: result.result,
-					});
+				const part = {
+					type: toolType,
+					state: 'output-available',
+					toolCallId: call.callId,
+					input: call.args,
+					output: (() => {
+						const r = result.result;
+						if (typeof r === 'string') return r;
+						try {
+							return JSON.stringify(r);
+						} catch {
+							return String(r);
+						}
+					})(),
+				};
 
-					assistantParts.push(part as never);
-				}
+				toolHistory.register(part, {
+					toolName: call.name,
+					callId: call.callId,
+					args: call.args,
+					result: result.result,
+				});
+
+				assistantParts.push(part as never);
 			}
 
 			if (assistantParts.length) {

package/src/runtime/provider.ts

@@ -8,7 +8,7 @@ import {
 } from '@agi-cli/sdk';
 import { openai, createOpenAI } from '@ai-sdk/openai';
 import { anthropic, createAnthropic } from '@ai-sdk/anthropic';
-import { google } from '@ai-sdk/google';
+import { google, createGoogleGenerativeAI } from '@ai-sdk/google';
 import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 
@@ -110,7 +110,14 @@ export async function resolveModel(
 		const instance = await getAnthropicInstance(cfg);
 		return instance(model);
 	}
-	if (provider === 'google') return google(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);

package/src/runtime/runner.ts

@@ -178,11 +178,21 @@ async function runAssistant(opts: RunOpts) {
 
 	// FIX: For OAuth, ALWAYS prepend the system message because it's never in history
 	// For API key mode, only add on first message (when additionalSystemMessages is empty)
-	const messagesWithSystemInstructions = [
+	const messagesWithSystemInstructions: any[] = [
 		...additionalSystemMessages, // Always add for OAuth, empty for API key mode
 		...history,
 	];
 
+	// Inject a reminder for subsequent turns to prevent "abrupt stops"
+	// This reinforces the instruction to call finish and maintain context
+	if (!isFirstMessage) {
+		messagesWithSystemInstructions.push({
+			role: 'user',
+			content:
+				'SYSTEM REMINDER: You are continuing an existing session. When you have completed the task, you MUST stream a text summary of what you did to the user, and THEN call the `finish` tool. Do not call `finish` without a summary.',
+		});
+	}
+
 	debugLog(`[RUNNER] About to create model with provider: ${opts.provider}`);
 	debugLog(`[RUNNER] About to create model ID: ${opts.model}`);
 	debugLog(
@@ -285,7 +295,6 @@ async function runAssistant(opts: RunOpts) {
 	let stepIndex = 0;
 
 	try {
-		// @ts-expect-error this is fine 🔥
 		const result = streamText({
 			model,
 			tools: toolset,