@agi-cli/server 0.1.119 → 0.1.121

package/package.json

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

package/src/index.ts

@@ -14,7 +14,8 @@ import { registerFilesRoutes } from './routes/files.ts';
 import { registerGitRoutes } from './routes/git/index.ts';
 import { registerTerminalsRoutes } from './routes/terminals.ts';
 import { registerSessionFilesRoutes } from './routes/session-files.ts';
-import type { AgentConfigEntry } from './runtime/agent-registry.ts';
+import { registerBranchRoutes } from './routes/branch.ts';
+import type { AgentConfigEntry } from './runtime/agent/registry.ts';
 
 const globalTerminalManager = new TerminalManager();
 setTerminalManager(globalTerminalManager);
@@ -64,6 +65,7 @@ function initApp() {
 	registerGitRoutes(app);
 	registerTerminalsRoutes(app, globalTerminalManager);
 	registerSessionFilesRoutes(app);
+	registerBranchRoutes(app);
 
 	return app;
 }
@@ -130,6 +132,7 @@ export function createStandaloneApp(_config?: StandaloneAppConfig) {
 	registerGitRoutes(honoApp);
 	registerTerminalsRoutes(honoApp, globalTerminalManager);
 	registerSessionFilesRoutes(honoApp);
+	registerBranchRoutes(honoApp);
 
 	return honoApp;
 }
@@ -224,6 +227,7 @@ export function createEmbeddedApp(config: EmbeddedAppConfig = {}) {
 	registerGitRoutes(honoApp);
 	registerTerminalsRoutes(honoApp, globalTerminalManager);
 	registerSessionFilesRoutes(honoApp);
+	registerBranchRoutes(honoApp);
 
 	return honoApp;
 }
@@ -231,17 +235,17 @@ export function createEmbeddedApp(config: EmbeddedAppConfig = {}) {
 export {
 	resolveAgentConfig,
 	defaultToolsForAgent,
-} from './runtime/agent-registry.ts';
+} from './runtime/agent/registry.ts';
 export {
 	composeSystemPrompt,
 	type ComposedSystemPrompt,
-} from './runtime/prompt.ts';
+} from './runtime/prompt/builder.ts';
 export {
 	AskServiceError,
 	handleAskRequest,
 	deriveStatusFromMessage,
 	inferStatus,
-} from './runtime/ask-service.ts';
+} from './runtime/ask/service.ts';
 export { registerSessionsRoutes } from './routes/sessions.ts';
 export { registerAskRoutes } from './routes/ask.ts';
 export {
@@ -257,5 +261,5 @@ export {
 	isDebugEnabled,
 	setTraceEnabled,
 	isTraceEnabled,
-} from './runtime/debug-state.ts';
+} from './runtime/debug/state.ts';
 export { logger } from '@agi-cli/sdk';

package/src/openapi/paths/git.ts

@@ -268,6 +268,10 @@ export const gitPaths = {
 							type: 'object',
 							properties: {
 								project: { type: 'string' },
+								sessionId: {
+									type: 'string',
+									description: 'Session ID to use session provider',
+								},
 							},
 						},
 					},

package/src/routes/ask.ts

@@ -3,11 +3,11 @@ import type {
 	AskServerRequest,
 	InjectableConfig,
 	InjectableCredentials,
-} 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';
+} from '../runtime/ask/service.ts';
+import { handleAskRequest } from '../runtime/ask/service.ts';
+import { serializeError } from '../runtime/errors/api-error.ts';
 import { logger } from '@agi-cli/sdk';
+import type { EmbeddedAppConfig } from '../index.ts';
 
 export function registerAskRoutes(app: Hono) {
 	app.post('/v1/ask', async (c) => {
@@ -32,19 +32,18 @@ export function registerAskRoutes(app: Hono) {
 
 		if (embeddedConfig && Object.keys(embeddedConfig).length > 0) {
 			// Has embedded config - build injectable config from it
+			const defaults = embeddedConfig.defaults;
 			const hasDefaults =
-				embeddedConfig.defaults ||
+				defaults ||
 				embeddedConfig.provider ||
 				embeddedConfig.model ||
 				embeddedConfig.agent;
 
 			if (hasDefaults) {
 				injectableConfig = {
-					defaults: embeddedConfig.defaults || {
-						agent: embeddedConfig.agent,
-						provider: embeddedConfig.provider,
-						model: embeddedConfig.model,
-					},
+					provider: defaults?.provider ?? embeddedConfig.provider,
+					model: defaults?.model ?? embeddedConfig.model,
+					agent: defaults?.agent ?? embeddedConfig.agent,
 				};
 			}
 
@@ -52,12 +51,12 @@ export function registerAskRoutes(app: Hono) {
 			const hasAuth = embeddedConfig.auth || embeddedConfig.apiKey;
 			if (hasAuth) {
 				if (embeddedConfig.auth) {
-					injectableCredentials = {};
+					injectableCredentials = {} as InjectableCredentials;
 					for (const [provider, auth] of Object.entries(embeddedConfig.auth)) {
 						if ('apiKey' in auth) {
-							injectableCredentials[provider] = { apiKey: auth.apiKey };
-						} else {
-							injectableCredentials[provider] = auth;
+							(injectableCredentials as Record<string, { apiKey: string }>)[
+								provider
+							] = { apiKey: auth.apiKey };
 						}
 					}
 				} else if (embeddedConfig.apiKey && embeddedConfig.provider) {

package/src/routes/branch.ts

@@ -0,0 +1,106 @@
+import type { Hono } from 'hono';
+import { loadConfig } from '@agi-cli/sdk';
+import { getDb } from '@agi-cli/database';
+import { isProviderId, logger } from '@agi-cli/sdk';
+import {
+	createBranch,
+	listBranches,
+	getParentSession,
+} from '../runtime/session/branch.ts';
+import { serializeError } from '../runtime/errors/api-error.ts';
+
+export function registerBranchRoutes(app: Hono) {
+	app.post('/v1/sessions/:sessionId/branch', async (c) => {
+		try {
+			const sessionId = c.req.param('sessionId');
+			const projectRoot = c.req.query('project') || process.cwd();
+			const cfg = await loadConfig(projectRoot);
+			const db = await getDb(cfg.projectRoot);
+
+			const body = (await c.req.json().catch(() => ({}))) as Record<
+				string,
+				unknown
+			>;
+
+			const fromMessageId = body.fromMessageId;
+			if (typeof fromMessageId !== 'string' || !fromMessageId.trim()) {
+				return c.json({ error: 'fromMessageId is required' }, 400);
+			}
+
+			const provider =
+				typeof body.provider === 'string' && isProviderId(body.provider)
+					? body.provider
+					: undefined;
+
+			const model =
+				typeof body.model === 'string' && body.model.trim()
+					? body.model.trim()
+					: undefined;
+
+			const agent =
+				typeof body.agent === 'string' && body.agent.trim()
+					? body.agent.trim()
+					: undefined;
+
+			const title =
+				typeof body.title === 'string' && body.title.trim()
+					? body.title.trim()
+					: undefined;
+
+			const result = await createBranch({
+				db,
+				parentSessionId: sessionId,
+				fromMessageId: fromMessageId.trim(),
+				provider,
+				model,
+				agent,
+				title,
+				projectPath: cfg.projectRoot,
+			});
+
+			return c.json(result, 201);
+		} catch (err) {
+			logger.error('Failed to create branch', err);
+			const errorResponse = serializeError(err);
+			return c.json(errorResponse, errorResponse.error.status || 400);
+		}
+	});
+
+	app.get('/v1/sessions/:sessionId/branches', async (c) => {
+		try {
+			const sessionId = c.req.param('sessionId');
+			const projectRoot = c.req.query('project') || process.cwd();
+			const cfg = await loadConfig(projectRoot);
+			const db = await getDb(cfg.projectRoot);
+
+			const branches = await listBranches(db, sessionId, cfg.projectRoot);
+
+			return c.json({ branches });
+		} catch (err) {
+			logger.error('Failed to list branches', err);
+			const errorResponse = serializeError(err);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+
+	app.get('/v1/sessions/:sessionId/parent', async (c) => {
+		try {
+			const sessionId = c.req.param('sessionId');
+			const projectRoot = c.req.query('project') || process.cwd();
+			const cfg = await loadConfig(projectRoot);
+			const db = await getDb(cfg.projectRoot);
+
+			const parent = await getParentSession(db, sessionId, cfg.projectRoot);
+
+			if (!parent) {
+				return c.json({ parent: null });
+			}
+
+			return c.json({ parent });
+		} catch (err) {
+			logger.error('Failed to get parent session', err);
+			const errorResponse = serializeError(err);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+}

package/src/routes/config/agents.ts

@@ -2,7 +2,7 @@ import type { Hono } from 'hono';
 import { loadConfig } from '@agi-cli/sdk';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import { logger } from '@agi-cli/sdk';
-import { serializeError } from '../../runtime/api-error.ts';
+import { serializeError } from '../../runtime/errors/api-error.ts';
 import { discoverAllAgents, getDefault } from './utils.ts';
 
 export function registerAgentsRoute(app: Hono) {

package/src/routes/config/cwd.ts

@@ -1,7 +1,7 @@
 import type { Hono } from 'hono';
 import { basename } from 'node:path';
 import { logger } from '@agi-cli/sdk';
-import { serializeError } from '../../runtime/api-error.ts';
+import { serializeError } from '../../runtime/errors/api-error.ts';
 
 export function registerCwdRoute(app: Hono) {
 	app.get('/v1/config/cwd', (c) => {

package/src/routes/config/main.ts

@@ -2,7 +2,7 @@ import type { Hono } from 'hono';
 import { loadConfig } from '@agi-cli/sdk';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import { logger } from '@agi-cli/sdk';
-import { serializeError } from '../../runtime/api-error.ts';
+import { serializeError } from '../../runtime/errors/api-error.ts';
 import {
 	discoverAllAgents,
 	getAuthorizedProviders,

package/src/routes/config/models.ts

@@ -1,12 +1,18 @@
 import type { Hono } from 'hono';
-import { loadConfig, catalog, type ProviderId } from '@agi-cli/sdk';
+import {
+	loadConfig,
+	catalog,
+	type ProviderId,
+	filterModelsForAuthType,
+} from '@agi-cli/sdk';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import { logger } from '@agi-cli/sdk';
-import { serializeError } from '../../runtime/api-error.ts';
+import { serializeError } from '../../runtime/errors/api-error.ts';
 import {
 	isProviderAuthorizedHybrid,
 	getAuthorizedProviders,
 	getDefault,
+	getAuthTypeForProvider,
 } from './utils.ts';
 
 export function registerModelsRoutes(app: Hono) {
@@ -37,8 +43,19 @@ export function registerModelsRoutes(app: Hono) {
 				return c.json({ error: 'Provider not found' }, 404);
 			}
 
+			const authType = await getAuthTypeForProvider(
+				embeddedConfig,
+				provider,
+				projectRoot,
+			);
+			const filteredModels = filterModelsForAuthType(
+				provider,
+				providerCatalog.models,
+				authType,
+			);
+
 			return c.json({
-				models: providerCatalog.models.map((m) => ({
+				models: filteredModels.map((m) => ({
 					id: m.id,
 					label: m.label || m.id,
 					toolCall: m.toolCall,
@@ -88,9 +105,20 @@ export function registerModelsRoutes(app: Hono) {
 			for (const provider of authorizedProviders) {
 				const providerCatalog = catalog[provider];
 				if (providerCatalog) {
+					const authType = await getAuthTypeForProvider(
+						embeddedConfig,
+						provider,
+						projectRoot,
+					);
+					const filteredModels = filterModelsForAuthType(
+						provider,
+						providerCatalog.models,
+						authType,
+					);
 					modelsMap[provider] = {
 						label: providerCatalog.label || provider,
-						models: providerCatalog.models.map((m) => ({
+						authType,
+						models: filteredModels.map((m) => ({
 							id: m.id,
 							label: m.label || m.id,
 							toolCall: m.toolCall,

package/src/routes/config/providers.ts

@@ -3,7 +3,7 @@ import { loadConfig } from '@agi-cli/sdk';
 import type { ProviderId } from '@agi-cli/sdk';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import { logger } from '@agi-cli/sdk';
-import { serializeError } from '../../runtime/api-error.ts';
+import { serializeError } from '../../runtime/errors/api-error.ts';
 import { getAuthorizedProviders, getDefault } from './utils.ts';
 
 export function registerProvidersRoute(app: Hono) {

package/src/routes/config/utils.ts

@@ -3,13 +3,14 @@ import {
 	type ProviderId,
 	isProviderAuthorized,
 	getGlobalAgentsDir,
+	getAuth,
 } from '@agi-cli/sdk';
 import { readdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import type { AGIConfig } from '@agi-cli/sdk';
 import { logger } from '@agi-cli/sdk';
-import { loadAgentsConfig } from '../../runtime/agent-registry.ts';
+import { loadAgentsConfig } from '../../runtime/agent/registry.ts';
 
 export async function isProviderAuthorizedHybrid(
 	embeddedConfig: EmbeddedAppConfig | undefined,
@@ -56,6 +57,18 @@ export function getDefault<T>(
 	return embeddedValue ?? embeddedDefaultValue ?? fileValue;
 }
 
+export async function getAuthTypeForProvider(
+	embeddedConfig: EmbeddedAppConfig | undefined,
+	provider: ProviderId,
+	projectRoot: string,
+): Promise<'api' | 'oauth' | 'wallet' | undefined> {
+	if (embeddedConfig?.auth?.[provider]) {
+		return embeddedConfig.auth[provider].type as 'api' | 'oauth' | 'wallet';
+	}
+	const auth = await getAuth(provider, projectRoot);
+	return auth?.type as 'api' | 'oauth' | 'wallet' | undefined;
+}
+
 export async function discoverAllAgents(
 	projectRoot: string,
 ): Promise<string[]> {

package/src/routes/files.ts

@@ -3,7 +3,7 @@ import { readdir, readFile } from 'node:fs/promises';
 import { join, relative } from 'node:path';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
-import { serializeError } from '../runtime/api-error.ts';
+import { serializeError } from '../runtime/errors/api-error.ts';
 import { logger } from '@agi-cli/sdk';
 
 const execAsync = promisify(exec);

package/src/routes/git/commit.ts

@@ -2,12 +2,15 @@ import type { Hono } from 'hono';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { generateText } from 'ai';
+import { eq } from 'drizzle-orm';
 import type { ProviderId } from '@agi-cli/sdk';
-import { loadConfig, getAuth } from '@agi-cli/sdk';
+import { loadConfig, getAuth, getFastModelForAuth } from '@agi-cli/sdk';
+import { getDb } from '@agi-cli/database';
+import { sessions } from '@agi-cli/database/schema';
 import { gitCommitSchema, gitGenerateCommitMessageSchema } from './schemas.ts';
 import { validateAndGetGitRoot, parseGitStatus } from './utils.ts';
-import { resolveModel } from '../../runtime/provider.ts';
-import { getProviderSpoofPrompt } from '../../runtime/prompt.ts';
+import { resolveModel } from '../../runtime/provider/index.ts';
+import { getProviderSpoofPrompt } from '../../runtime/prompt/builder.ts';
 
 const execFileAsync = promisify(execFile);
 
@@ -53,7 +56,7 @@ export function registerCommitRoutes(app: Hono) {
 	app.post('/v1/git/generate-commit-message', async (c) => {
 		try {
 			const body = await c.req.json();
-			const { project } = gitGenerateCommitMessageSchema.parse(body);
+			const { project, sessionId } = gitGenerateCommitMessageSchema.parse(body);
 
 			const requestedPath = project || process.cwd();
 
@@ -95,8 +98,18 @@ export function registerCommitRoutes(app: Hono) {
 
 			const config = await loadConfig();
 
-			const provider = (config.defaults?.provider || 'anthropic') as ProviderId;
-			const modelId = config.defaults?.model || 'claude-3-5-sonnet-20241022';
+			let provider = (config.defaults?.provider || 'anthropic') as ProviderId;
+
+			if (sessionId) {
+				const db = getDb();
+				const [session] = await db
+					.select({ provider: sessions.provider })
+					.from(sessions)
+					.where(eq(sessions.id, sessionId));
+				if (session?.provider) {
+					provider = session.provider as ProviderId;
+				}
+			}
 
 			const auth = await getAuth(provider, config.projectRoot);
 			const needsSpoof = auth?.type === 'oauth';
@@ -104,6 +117,10 @@ export function registerCommitRoutes(app: Hono) {
 				? getProviderSpoofPrompt(provider)
 				: undefined;
 
+			const modelId =
+				getFastModelForAuth(provider, auth?.type) ??
+				config.defaults?.model ??
+				'claude-3-5-sonnet-20241022';
 			const model = await resolveModel(provider, modelId, config);
 
 			const userPrompt = `Generate a concise, conventional commit message for these git changes.

package/src/routes/git/schemas.ts

@@ -40,6 +40,7 @@ export const gitCommitSchema = z.object({
 
 export const gitGenerateCommitMessageSchema = z.object({
 	project: z.string().optional(),
+	sessionId: z.string().optional(),
 });
 
 export const gitPushSchema = z.object({

package/src/routes/session-files.ts

@@ -3,7 +3,7 @@ import { loadConfig } from '@agi-cli/sdk';
 import { getDb } from '@agi-cli/database';
 import { messages, messageParts, sessions } from '@agi-cli/database/schema';
 import { eq, and, inArray } from 'drizzle-orm';
-import { serializeError } from '../runtime/api-error.ts';
+import { serializeError } from '../runtime/errors/api-error.ts';
 import { logger } from '@agi-cli/sdk';
 
 const FILE_EDIT_TOOLS = [

package/src/routes/session-messages.ts

@@ -8,9 +8,9 @@ import {
 	isProviderAuthorized,
 	ensureProviderEnv,
 } from '@agi-cli/sdk';
-import { dispatchAssistantMessage } from '../runtime/message-service.ts';
+import { dispatchAssistantMessage } from '../runtime/message/service.ts';
 import { logger } from '@agi-cli/sdk';
-import { serializeError } from '../runtime/api-error.ts';
+import { serializeError } from '../runtime/errors/api-error.ts';
 
 type MessagePartRow = typeof messageParts.$inferSelect;
 type SessionRow = typeof sessions.$inferSelect;

package/src/routes/sessions.ts

@@ -5,9 +5,9 @@ import { sessions, messages, messageParts } from '@agi-cli/database/schema';
 import { desc, eq, and, inArray } from 'drizzle-orm';
 import type { ProviderId } from '@agi-cli/sdk';
 import { isProviderId, catalog } from '@agi-cli/sdk';
-import { resolveAgentConfig } from '../runtime/agent-registry.ts';
-import { createSession as createSessionRow } from '../runtime/session-manager.ts';
-import { serializeError } from '../runtime/api-error.ts';
+import { resolveAgentConfig } from '../runtime/agent/registry.ts';
+import { createSession as createSessionRow } from '../runtime/session/manager.ts';
+import { serializeError } from '../runtime/errors/api-error.ts';
 import { logger } from '@agi-cli/sdk';
 
 export function registerSessionsRoutes(app: Hono) {
@@ -202,7 +202,9 @@ export function registerSessionsRoutes(app: Hono) {
 			typeof body.messageId === 'string' ? body.messageId : undefined;
 		const clearQueue = body.clearQueue === true;
 
-		const { abortSession, abortMessage } = await import('../runtime/runner.ts');
+		const { abortSession, abortMessage } = await import(
+			'../runtime/agent/runner.ts'
+		);
 
 		if (messageId) {
 			const result = abortMessage(sessionId, messageId);
@@ -220,7 +222,7 @@ export function registerSessionsRoutes(app: Hono) {
 	// Get queue state for a session
 	app.get('/v1/sessions/:sessionId/queue', async (c) => {
 		const sessionId = c.req.param('sessionId');
-		const { getQueueState } = await import('../runtime/session-queue.ts');
+		const { getQueueState } = await import('../runtime/session/queue.ts');
 		const state = getQueueState(sessionId);
 		return c.json(
 			state ?? {
@@ -239,7 +241,7 @@ export function registerSessionsRoutes(app: Hono) {
 		const cfg = await loadConfig(projectRoot);
 		const db = await getDb(cfg.projectRoot);
 		const { removeFromQueue, abortMessage } = await import(
-			'../runtime/session-queue.ts'
+			'../runtime/session/queue.ts'
 		);
 
 		// First try to remove from queue (queued messages)