@agi-cli/server 0.1.78 → 0.1.80

package/package.json

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

package/src/runtime/history-builder.ts

@@ -109,6 +109,9 @@ export async function buildHistoryMessages(
 			}
 
 			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 = toolResults.find((r) => r.callId === call.callId);
 

package/src/runtime/runner.ts

@@ -76,33 +76,6 @@ async function processQueue(sessionId: string) {
 	cleanupSession(sessionId);
 }
 
-/**
- * Ensures the finish tool is called if not already observed.
- */
-async function ensureFinishToolCalled(
-	finishObserved: boolean,
-	toolset: ReturnType<typeof adaptTools>,
-	sharedCtx: RunnerToolContext,
-	stepIndex: number,
-) {
-	if (finishObserved || !toolset?.finish?.execute) return;
-
-	const finishInput = {} as const;
-	const callOptions = { input: finishInput } as const;
-
-	sharedCtx.stepIndex = stepIndex;
-
-	try {
-		await toolset.finish.onInputStart?.(callOptions as never);
-	} catch {}
-
-	try {
-		await toolset.finish.onInputAvailable?.(callOptions as never);
-	} catch {}
-
-	await toolset.finish.execute(finishInput, {} as never);
-}
-
 /**
  * Main function to run the assistant for a given request.
  */
@@ -290,12 +263,7 @@ async function runAssistant(opts: RunOpts) {
 
 	const onAbort = createAbortHandler(opts, db, getStepIndex, sharedCtx);
 
-	const onFinish = createFinishHandler(
-		opts,
-		db,
-		() => ensureFinishToolCalled(finishObserved, toolset, sharedCtx, stepIndex),
-		completeAssistantMessage,
-	);
+	const onFinish = createFinishHandler(opts, db, completeAssistantMessage);
 
 	// Apply optimizations: deduplication, pruning, cache control, and truncation
 	const { addCacheControl, truncateHistory } = await import(

package/src/runtime/stream-handlers.ts

@@ -264,7 +264,6 @@ export function createAbortHandler(
 export function createFinishHandler(
 	opts: RunOpts,
 	db: Awaited<ReturnType<typeof getDb>>,
-	ensureFinishToolCalled: () => Promise<void>,
 	completeAssistantMessageFn: (
 		fin: FinishEvent,
 		opts: RunOpts,
@@ -272,10 +271,6 @@ export function createFinishHandler(
 	) => Promise<void>,
 ) {
 	return async (fin: FinishEvent) => {
-		try {
-			await ensureFinishToolCalled();
-		} catch {}
-
 		// Note: Token updates are handled incrementally in onStepFinish
 		// Do NOT add fin.usage here as it would cause double-counting
 

package/src/tools/adapter.ts

@@ -5,6 +5,7 @@ import { publish } from '../events/bus.ts';
 import type { DiscoveredTool } from '@agi-cli/sdk';
 import { getCwd, setCwd, joinRelative } from '../runtime/cwd.ts';
 import type { ToolAdapterContext } from '../runtime/tool-context.ts';
+import { isToolError } from '@agi-cli/sdk/tools/error';
 
 export type { ToolAdapterContext } from '../runtime/tool-context.ts';
 
@@ -403,7 +404,8 @@ export function adaptTools(
 					}
 					return result;
 				} catch (error) {
-					// Tool execution failed - save error to database as tool_result
+					// Tool execution failed
+					// Check if the error is already a structured tool error response
 					const resultPartId = crypto.randomUUID();
 					const callId = callIdFromQueue;
 					const startTs = startTsFromQueue;
@@ -411,15 +413,21 @@ export function adaptTools(
 					const dur =
 						typeof startTs === 'number' ? Math.max(0, endTs - startTs) : null;
 
-					const errorMessage =
-						error instanceof Error ? error.message : String(error);
-					const errorStack = error instanceof Error ? error.stack : undefined;
-
-					const errorResult = {
-						ok: false,
-						error: errorMessage,
-						stack: errorStack,
-					};
+					// If the tool returned a structured error response, use it directly
+					// Otherwise, wrap the thrown error in our standard format
+					let errorResult: unknown;
+					if (isToolError(error)) {
+						errorResult = error;
+					} else {
+						const errorMessage =
+							error instanceof Error ? error.message : String(error);
+						const errorStack = error instanceof Error ? error.stack : undefined;
+						errorResult = {
+							ok: false,
+							error: errorMessage,
+							stack: errorStack,
+						};
+					}
 
 					const contentObj = {
 						name,