@agi-cli/server 0.1.67 → 0.1.68

package/package.json

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

package/src/index.ts

@@ -230,3 +230,12 @@ export {
 	type BuiltinAgent,
 	type BuiltinTool,
 } from './presets.ts';
+
+// Export debug state management
+export {
+	setDebugEnabled,
+	isDebugEnabled,
+	setTraceEnabled,
+	isTraceEnabled,
+} from './runtime/debug-state.ts';
+export { logger } from './runtime/logger.ts';

package/src/routes/ask.ts

@@ -4,8 +4,10 @@ import type {
 	InjectableConfig,
 	InjectableCredentials,
 } from '../runtime/ask-service.ts';
-import { AskServiceError, handleAskRequest } from '../runtime/ask-service.ts';
+import { handleAskRequest } from '../runtime/ask-service.ts';
 import type { EmbeddedAppConfig } from '../index.ts';
+import { serializeError } from '../runtime/api-error.ts';
+import { logger } from '../runtime/logger.ts';
 
 export function registerAskRoutes(app: Hono) {
 	app.post('/v1/ask', async (c) => {
@@ -104,11 +106,9 @@ export function registerAskRoutes(app: Hono) {
 			const response = await handleAskRequest(request);
 			return c.json(response, 202);
 		} catch (err) {
-			if (err instanceof AskServiceError) {
-				return c.json({ error: err.message }, err.status as never);
-			}
-			const message = err instanceof Error ? err.message : String(err);
-			return c.json({ error: message }, 400);
+			logger.error('Ask request failed', err);
+			const errorResponse = serializeError(err);
+			return c.json(errorResponse, errorResponse.error.status || 400);
 		}
 	});
 }

package/src/routes/config.ts

@@ -5,6 +5,8 @@ import { readdir } from 'node:fs/promises';
 import { join, basename } from 'node:path';
 import type { EmbeddedAppConfig } from '../index.ts';
 import type { AGIConfig } from '@agi-cli/sdk';
+import { logger } from '../runtime/logger.ts';
+import { serializeError } from '../runtime/api-error.ts';
 
 /**
  * Check if a provider is authorized in either embedded config or file-based config
@@ -65,190 +67,225 @@ function getDefault<T>(
 export function registerConfigRoutes(app: Hono) {
 	// Get working directory info
 	app.get('/v1/config/cwd', (c) => {
-		const cwd = process.cwd();
-		const dirName = basename(cwd);
-		return c.json({
-			cwd,
-			dirName,
-		});
+		try {
+			const cwd = process.cwd();
+			const dirName = basename(cwd);
+			return c.json({
+				cwd,
+				dirName,
+			});
+		} catch (error) {
+			logger.error('Failed to get current working directory', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
 	});
 
 	// Get full config (agents, providers, models, defaults)
 	app.get('/v1/config', async (c) => {
-		const projectRoot = c.req.query('project') || process.cwd();
-		const embeddedConfig = c.get('embeddedConfig') as
-			| EmbeddedAppConfig
-			| undefined;
-
-		// Always load file config as base/fallback
-		const cfg = await loadConfig(projectRoot);
-
-		// Hybrid mode: Merge embedded config with file config
-		const builtInAgents = ['general', 'build', 'plan'];
-		let customAgents: string[] = [];
-
 		try {
-			const customAgentsPath = join(cfg.projectRoot, '.agi', 'agents');
-			const files = await readdir(customAgentsPath).catch(() => []);
-			customAgents = files
-				.filter((f) => f.endsWith('.txt'))
-				.map((f) => f.replace('.txt', ''));
-		} catch {}
-
-		// Agents: Embedded custom agents + file-based agents
-		const fileAgents = [...builtInAgents, ...customAgents];
-		const embeddedAgents = embeddedConfig?.agents
-			? Object.keys(embeddedConfig.agents)
-			: [];
-		const allAgents = Array.from(new Set([...embeddedAgents, ...fileAgents]));
-
-		// Providers: Check both embedded and file-based auth
-		const authorizedProviders = await getAuthorizedProviders(
-			embeddedConfig,
-			cfg,
-		);
-
-		// Defaults: Embedded overrides file config
-		const defaults = {
-			agent: getDefault(
-				embeddedConfig?.agent,
-				embeddedConfig?.defaults?.agent,
-				cfg.defaults.agent,
-			),
-			provider: getDefault(
-				embeddedConfig?.provider,
-				embeddedConfig?.defaults?.provider,
-				cfg.defaults.provider,
-			),
-			model: getDefault(
-				embeddedConfig?.model,
-				embeddedConfig?.defaults?.model,
-				cfg.defaults.model,
-			),
-		};
-
-		return c.json({
-			agents: allAgents,
-			providers: authorizedProviders,
-			defaults,
-		});
-	});
-
-	// Get available agents
-	app.get('/v1/config/agents', async (c) => {
-		const embeddedConfig = c.get('embeddedConfig') as
-			| EmbeddedAppConfig
-			| undefined;
-
-		if (embeddedConfig) {
-			const agents = embeddedConfig.agents
+			const projectRoot = c.req.query('project') || process.cwd();
+			const embeddedConfig = c.get('embeddedConfig') as
+				| EmbeddedAppConfig
+				| undefined;
+
+			// Always load file config as base/fallback
+			const cfg = await loadConfig(projectRoot);
+
+			// Hybrid mode: Merge embedded config with file config
+			const builtInAgents = ['general', 'build', 'plan'];
+			let customAgents: string[] = [];
+
+			try {
+				const customAgentsPath = join(cfg.projectRoot, '.agi', 'agents');
+				const files = await readdir(customAgentsPath).catch(() => []);
+				customAgents = files
+					.filter((f) => f.endsWith('.txt'))
+					.map((f) => f.replace('.txt', ''));
+			} catch (err) {
+				logger.debug('Failed to read custom agents directory', err);
+			}
+
+			// Agents: Embedded custom agents + file-based agents
+			const fileAgents = [...builtInAgents, ...customAgents];
+			const embeddedAgents = embeddedConfig?.agents
 				? Object.keys(embeddedConfig.agents)
-				: ['general', 'build', 'plan'];
-			return c.json({
-				agents,
-				default: getDefault(
-					embeddedConfig.agent,
-					embeddedConfig.defaults?.agent,
-					'general',
+				: [];
+			const allAgents = Array.from(new Set([...embeddedAgents, ...fileAgents]));
+
+			// Providers: Check both embedded and file-based auth
+			const authorizedProviders = await getAuthorizedProviders(
+				embeddedConfig,
+				cfg,
+			);
+
+			// Defaults: Embedded overrides file config
+			const defaults = {
+				agent: getDefault(
+					embeddedConfig?.agent,
+					embeddedConfig?.defaults?.agent,
+					cfg.defaults.agent,
 				),
+				provider: getDefault(
+					embeddedConfig?.provider,
+					embeddedConfig?.defaults?.provider,
+					cfg.defaults.provider,
+				),
+				model: getDefault(
+					embeddedConfig?.model,
+					embeddedConfig?.defaults?.model,
+					cfg.defaults.model,
+				),
+			};
+
+			return c.json({
+				agents: allAgents,
+				providers: authorizedProviders,
+				defaults,
 			});
+		} catch (error) {
+			logger.error('Failed to load config', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
 		}
+	});
 
-		const projectRoot = c.req.query('project') || process.cwd();
-		const cfg = await loadConfig(projectRoot);
-
-		const builtInAgents = ['general', 'build', 'plan'];
-
+	// Get available agents
+	app.get('/v1/config/agents', async (c) => {
 		try {
-			const customAgentsPath = join(cfg.projectRoot, '.agi', 'agents');
-			const files = await readdir(customAgentsPath).catch(() => []);
-			const customAgents = files
-				.filter((f) => f.endsWith('.txt'))
-				.map((f) => f.replace('.txt', ''));
-
-			return c.json({
-				agents: [...builtInAgents, ...customAgents],
-				default: cfg.defaults.agent,
-			});
-		} catch {
-			return c.json({
-				agents: builtInAgents,
-				default: cfg.defaults.agent,
-			});
+			const embeddedConfig = c.get('embeddedConfig') as
+				| EmbeddedAppConfig
+				| undefined;
+
+			if (embeddedConfig) {
+				const agents = embeddedConfig.agents
+					? Object.keys(embeddedConfig.agents)
+					: ['general', 'build', 'plan'];
+				return c.json({
+					agents,
+					default: getDefault(
+						embeddedConfig.agent,
+						embeddedConfig.defaults?.agent,
+						'general',
+					),
+				});
+			}
+
+			const projectRoot = c.req.query('project') || process.cwd();
+			const cfg = await loadConfig(projectRoot);
+
+			const builtInAgents = ['general', 'build', 'plan'];
+
+			try {
+				const customAgentsPath = join(cfg.projectRoot, '.agi', 'agents');
+				const files = await readdir(customAgentsPath).catch(() => []);
+				const customAgents = files
+					.filter((f) => f.endsWith('.txt'))
+					.map((f) => f.replace('.txt', ''));
+
+				return c.json({
+					agents: [...builtInAgents, ...customAgents],
+					default: cfg.defaults.agent,
+				});
+			} catch (err) {
+				logger.debug('Failed to read custom agents directory', err);
+				return c.json({
+					agents: builtInAgents,
+					default: cfg.defaults.agent,
+				});
+			}
+		} catch (error) {
+			logger.error('Failed to get agents', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
 		}
 	});
 
 	// Get available providers (only authorized ones)
 	app.get('/v1/config/providers', async (c) => {
-		const embeddedConfig = c.get('embeddedConfig') as
-			| EmbeddedAppConfig
-			| undefined;
-
-		if (embeddedConfig) {
-			const providers = embeddedConfig.auth
-				? (Object.keys(embeddedConfig.auth) as ProviderId[])
-				: [embeddedConfig.provider];
+		try {
+			const embeddedConfig = c.get('embeddedConfig') as
+				| EmbeddedAppConfig
+				| undefined;
+
+			if (embeddedConfig) {
+				const providers = embeddedConfig.auth
+					? (Object.keys(embeddedConfig.auth) as ProviderId[])
+					: [embeddedConfig.provider];
+
+				return c.json({
+					providers,
+					default: getDefault(
+						embeddedConfig.provider,
+						embeddedConfig.defaults?.provider,
+						undefined,
+					),
+				});
+			}
+
+			const projectRoot = c.req.query('project') || process.cwd();
+			const cfg = await loadConfig(projectRoot);
+
+			const authorizedProviders = await getAuthorizedProviders(undefined, cfg);
 
 			return c.json({
-				providers,
-				default: getDefault(
-					embeddedConfig.provider,
-					embeddedConfig.defaults?.provider,
-					undefined,
-				),
+				providers: authorizedProviders,
+				default: cfg.defaults.provider,
 			});
+		} catch (error) {
+			logger.error('Failed to get providers', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
 		}
-
-		const projectRoot = c.req.query('project') || process.cwd();
-		const cfg = await loadConfig(projectRoot);
-
-		const authorizedProviders = await getAuthorizedProviders(undefined, cfg);
-
-		return c.json({
-			providers: authorizedProviders,
-			default: cfg.defaults.provider,
-		});
 	});
 
 	// Get available models for a provider
 	app.get('/v1/config/providers/:provider/models', async (c) => {
-		const embeddedConfig = c.get('embeddedConfig') as
-			| EmbeddedAppConfig
-			| undefined;
-		const provider = c.req.param('provider') as ProviderId;
-
-		// Always load file config for fallback auth check
-		const projectRoot = c.req.query('project') || process.cwd();
-		const cfg = await loadConfig(projectRoot);
-
-		// Check if provider is authorized (hybrid: embedded OR file-based)
-		const authorized = await isProviderAuthorizedHybrid(
-			embeddedConfig,
-			cfg,
-			provider,
-		);
-
-		if (!authorized) {
-			return c.json({ error: 'Provider not authorized' }, 403);
-		}
+		try {
+			const embeddedConfig = c.get('embeddedConfig') as
+				| EmbeddedAppConfig
+				| undefined;
+			const provider = c.req.param('provider') as ProviderId;
+
+			// Always load file config for fallback auth check
+			const projectRoot = c.req.query('project') || process.cwd();
+			const cfg = await loadConfig(projectRoot);
+
+			// Check if provider is authorized (hybrid: embedded OR file-based)
+			const authorized = await isProviderAuthorizedHybrid(
+				embeddedConfig,
+				cfg,
+				provider,
+			);
+
+			if (!authorized) {
+				logger.warn('Provider not authorized', { provider });
+				return c.json({ error: 'Provider not authorized' }, 403);
+			}
+
+			const providerCatalog = catalog[provider];
+			if (!providerCatalog) {
+				logger.warn('Provider not found in catalog', { provider });
+				return c.json({ error: 'Provider not found' }, 404);
+			}
 
-		const providerCatalog = catalog[provider];
-		if (!providerCatalog) {
-			return c.json({ error: 'Provider not found' }, 404);
+			return c.json({
+				models: providerCatalog.models.map((m) => ({
+					id: m.id,
+					label: m.label || m.id,
+					toolCall: m.toolCall,
+					reasoning: m.reasoning,
+				})),
+				default: getDefault(
+					embeddedConfig?.model,
+					embeddedConfig?.defaults?.model,
+					cfg.defaults.model,
+				),
+			});
+		} catch (error) {
+			logger.error('Failed to get provider models', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
 		}
-
-		return c.json({
-			models: providerCatalog.models.map((m) => ({
-				id: m.id,
-				label: m.label || m.id,
-				toolCall: m.toolCall,
-				reasoning: m.reasoning,
-			})),
-			default: getDefault(
-				embeddedConfig?.model,
-				embeddedConfig?.defaults?.model,
-				cfg.defaults.model,
-			),
-		});
 	});
 }

package/src/routes/git.ts

@@ -4,8 +4,11 @@ import { extname, join } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { promisify } from 'node:util';
 import { z } from 'zod';
-import { generateText, resolveModel, type ProviderId } from '@agi-cli/sdk';
-import { loadConfig } from '@agi-cli/sdk';
+import { generateText } from 'ai';
+import type { ProviderId } from '@agi-cli/sdk';
+import { loadConfig, getAuth } from '@agi-cli/sdk';
+import { resolveModel } from '../runtime/provider.ts';
+import { getProviderSpoofPrompt } from '../runtime/prompt.ts';
 
 const execFileAsync = promisify(execFile);
 
@@ -233,7 +236,7 @@ function parseGitStatus(
 	return { staged, unstaged, untracked };
 }
 
-function getStatusFromCode(code: string): GitFile['status'] {
+function _getStatusFromCode(code: string): GitFile['status'] {
 	switch (code) {
 		case 'M':
 			return 'modified';
@@ -678,16 +681,22 @@ export function registerGitRoutes(app: Hono) {
 			// Load config to get provider settings
 			const config = await loadConfig();
 
-			// Use a simple model for quick commit message generation
-			const provider = config.defaults?.provider || 'anthropic';
-			const model = await resolveModel(
-				provider as ProviderId,
-				config.defaults?.model,
-				undefined,
-			);
+			// Use the default provider and model for quick commit message generation
+			const provider = (config.defaults?.provider || 'anthropic') as ProviderId;
+			const modelId = config.defaults?.model || 'claude-3-5-sonnet-20241022';
+
+			// Check if we need OAuth spoof prompt (same as runner)
+			const auth = await getAuth(provider, config.projectRoot);
+			const needsSpoof = auth?.type === 'oauth';
+			const spoofPrompt = needsSpoof
+				? getProviderSpoofPrompt(provider)
+				: undefined;
+
+			// Resolve model with proper authentication (3-level fallback: OAuth, API key, env var)
+			const model = await resolveModel(provider, modelId, config);
 
 			// Generate commit message using AI
-			const prompt = `Generate a concise, conventional commit message for these git changes.
+			const userPrompt = `Generate a concise, conventional commit message for these git changes.
 
 Staged files:
 ${fileList}
@@ -705,12 +714,15 @@ Guidelines:
 
 Commit message:`;
 
+			// Use spoof prompt as system if OAuth, otherwise use normal system prompt
+			const systemPrompt = spoofPrompt
+				? spoofPrompt
+				: 'You are a helpful assistant that generates git commit messages.';
+
 			const { text } = await generateText({
-				provider: provider as ProviderId,
-				model: model.id,
-				systemPrompt:
-					'You are a helpful assistant that generates git commit messages.',
-				prompt,
+				model,
+				system: systemPrompt,
+				prompt: userPrompt,
 				maxTokens: 200,
 			});