@ottocode/server 0.1.265 → 0.1.266

package/src/routes/git/commit-service.ts

@@ -0,0 +1,207 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { getDb } from '@ottocode/database';
+import { sessions } from '@ottocode/database/schema';
+import {
+	appendCoAuthorTrailer,
+	getAuth,
+	getFastModelForAuth,
+	getProviderDefinition,
+	loadConfig,
+	type ProviderId,
+} from '@ottocode/sdk';
+import { generateText, streamText } from 'ai';
+import { eq } from 'drizzle-orm';
+import type { Context } from 'hono';
+import {
+	detectOAuth,
+	adaptSimpleCall,
+} from '../../runtime/provider/oauth-adapter.ts';
+import { resolveModel } from '../../runtime/provider/index.ts';
+import { gitCommitSchema, gitGenerateCommitMessageSchema } from './schemas.ts';
+import { parseGitStatus, validateAndGetGitRoot } from './utils.ts';
+
+const execFileAsync = promisify(execFile);
+
+export async function handleCommitChanges(c: Context) {
+	try {
+		const body = await c.req.json();
+		const { message, project } = gitCommitSchema.parse(body);
+		const requestedPath = project || process.cwd();
+
+		const validation = await validateAndGetGitRoot(requestedPath);
+		if ('error' in validation) {
+			return c.json(
+				{ status: 'error', error: validation.error, code: validation.code },
+				400,
+			);
+		}
+
+		const fullMessage = appendCoAuthorTrailer(message);
+		const { stdout } = await execFileAsync(
+			'git',
+			['commit', '-m', fullMessage],
+			{
+				cwd: validation.gitRoot,
+			},
+		);
+
+		return c.json({
+			status: 'ok',
+			data: {
+				message: stdout.trim(),
+			},
+		});
+	} catch (error) {
+		return c.json(
+			{
+				status: 'error',
+				error: error instanceof Error ? error.message : 'Failed to commit',
+			},
+			500,
+		);
+	}
+}
+
+async function getSessionProviderModel(sessionId?: string) {
+	if (!sessionId) return {};
+	const db = await getDb();
+	const [session] = await db
+		.select({ provider: sessions.provider, model: sessions.model })
+		.from(sessions)
+		.where(eq(sessions.id, sessionId));
+	return {
+		provider: session?.provider as ProviderId | undefined,
+		model: session?.model ?? undefined,
+	};
+}
+
+function buildCommitPrompt(fileList: string, diff: string): string {
+	return `Generate a commit message for these git changes.
+
+Staged files:
+${fileList}
+
+Diff (first 4000 chars):
+${diff.slice(0, 4000)}
+
+Guidelines:
+- CAREFULLY READ the diff above - describe what ACTUALLY changed
+- Use conventional commits format: type(scope): description
+- First line under 72 characters
+- Add a blank line, then 2-4 short bullet points
+- Each bullet describes ONE specific change you see in the diff
+- Be ACCURATE - don't invent changes that aren't in the diff
+- Keep bullets short (under 80 chars each)
+- Do not include markdown code blocks or backticks
+- Return ONLY the commit message text, nothing else
+
+Example (for a diff that adds boolean returns to functions):
+refactor(auth): return success status from login functions
+
+- Add boolean return type to auth functions
+- Return false on user cancellation or failure
+- Check return value before proceeding with auth flow
+
+Commit message:`;
+}
+
+export async function handleGenerateCommitMessage(c: Context) {
+	try {
+		const body = await c.req.json();
+		const { project, sessionId } = gitGenerateCommitMessageSchema.parse(body);
+		const requestedPath = project || process.cwd();
+
+		const validation = await validateAndGetGitRoot(requestedPath);
+		if ('error' in validation) {
+			return c.json(
+				{ status: 'error', error: validation.error, code: validation.code },
+				400,
+			);
+		}
+
+		const { stdout: diff } = await execFileAsync('git', ['diff', '--cached'], {
+			cwd: validation.gitRoot,
+		});
+
+		if (!diff.trim()) {
+			return c.json(
+				{
+					status: 'error',
+					error: 'No staged changes to generate message from',
+				},
+				400,
+			);
+		}
+
+		const { stdout: statusOutput } = await execFileAsync(
+			'git',
+			['status', '--porcelain=v2'],
+			{ cwd: validation.gitRoot },
+		);
+		const { staged } = parseGitStatus(statusOutput, validation.gitRoot);
+		const fileList = staged.map((f) => `${f.status}: ${f.path}`).join('\n');
+		const config = await loadConfig();
+		const session = await getSessionProviderModel(sessionId);
+		const provider =
+			session.provider ??
+			((config.defaults?.provider || 'anthropic') as ProviderId);
+		const currentModel =
+			session.model ?? config.defaults?.model ?? 'claude-3-5-sonnet-20241022';
+		const auth = await getAuth(provider, config.projectRoot);
+		const oauth = detectOAuth(provider, auth);
+		const providerDefinition = getProviderDefinition(config, provider);
+		const modelId =
+			providerDefinition?.source === 'custom' ||
+			providerDefinition?.compatibility === 'ollama'
+				? currentModel
+				: (getFastModelForAuth(provider, auth?.type) ?? currentModel);
+		const model = await resolveModel(provider, modelId, config);
+
+		const adapted = adaptSimpleCall(oauth, {
+			instructions:
+				'You are a helpful assistant that generates accurate git commit messages based on the actual diff content.',
+			userContent: buildCommitPrompt(fileList, diff),
+			maxOutputTokens: 500,
+		});
+
+		if (adapted.forceStream) {
+			const result = streamText({
+				model,
+				system: adapted.system,
+				messages: adapted.messages,
+				providerOptions: adapted.providerOptions,
+			});
+			let text = '';
+			for await (const chunk of result.textStream) {
+				text += chunk;
+			}
+			return c.json({ status: 'ok', data: { message: text.trim() } });
+		}
+
+		const { text } = await generateText({
+			model,
+			system: adapted.system,
+			messages: adapted.messages,
+			maxOutputTokens: adapted.maxOutputTokens,
+		});
+
+		return c.json({
+			status: 'ok',
+			data: {
+				message: text.trim(),
+			},
+		});
+	} catch (error) {
+		return c.json(
+			{
+				status: 'error',
+				error:
+					error instanceof Error
+						? error.message
+						: 'Failed to generate commit message',
+			},
+			500,
+		);
+	}
+}

package/src/routes/git/commit.ts

@@ -1,28 +1,9 @@
 import type { Hono } from 'hono';
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { generateText, streamText } from 'ai';
-import { eq } from 'drizzle-orm';
-import type { ProviderId } from '@ottocode/sdk';
-import {
-	loadConfig,
-	getAuth,
-	getFastModelForAuth,
-	getProviderDefinition,
-} from '@ottocode/sdk';
-import { getDb } from '@ottocode/database';
-import { sessions } from '@ottocode/database/schema';
-import { gitCommitSchema, gitGenerateCommitMessageSchema } from './schemas.ts';
-import { validateAndGetGitRoot, parseGitStatus } from './utils.ts';
-import { resolveModel } from '../../runtime/provider/index.ts';
-import {
-	detectOAuth,
-	adaptSimpleCall,
-} from '../../runtime/provider/oauth-adapter.ts';
-import { appendCoAuthorTrailer } from '@ottocode/sdk';
 import { openApiRoute } from '../../openapi/route.ts';
-
-const execFileAsync = promisify(execFile);
+import {
+	handleCommitChanges,
+	handleGenerateCommitMessage,
+} from './commit-service.ts';
 
 export function registerCommitRoutes(app: Hono) {
 	openApiRoute(
@@ -122,48 +103,7 @@ export function registerCommitRoutes(app: Hono) {
 				},
 			},
 		},
-		async (c) => {
-			try {
-				const body = await c.req.json();
-				const { message, project } = gitCommitSchema.parse(body);
-
-				const requestedPath = project || process.cwd();
-
-				const validation = await validateAndGetGitRoot(requestedPath);
-				if ('error' in validation) {
-					return c.json(
-						{ status: 'error', error: validation.error, code: validation.code },
-						400,
-					);
-				}
-
-				const { gitRoot } = validation;
-
-				const fullMessage = appendCoAuthorTrailer(message);
-				const { stdout } = await execFileAsync(
-					'git',
-					['commit', '-m', fullMessage],
-					{
-						cwd: gitRoot,
-					},
-				);
-
-				return c.json({
-					status: 'ok',
-					data: {
-						message: stdout.trim(),
-					},
-				});
-			} catch (error) {
-				return c.json(
-					{
-						status: 'error',
-						error: error instanceof Error ? error.message : 'Failed to commit',
-					},
-					500,
-				);
-			}
-		},
+		handleCommitChanges,
 	);
 
 	openApiRoute(
@@ -270,160 +210,6 @@ export function registerCommitRoutes(app: Hono) {
 				},
 			},
 		},
-		async (c) => {
-			try {
-				const body = await c.req.json();
-				const { project, sessionId } =
-					gitGenerateCommitMessageSchema.parse(body);
-
-				const requestedPath = project || process.cwd();
-
-				const validation = await validateAndGetGitRoot(requestedPath);
-				if ('error' in validation) {
-					return c.json(
-						{ status: 'error', error: validation.error, code: validation.code },
-						400,
-					);
-				}
-
-				const { gitRoot } = validation;
-
-				const { stdout: diff } = await execFileAsync(
-					'git',
-					['diff', '--cached'],
-					{
-						cwd: gitRoot,
-					},
-				);
-
-				if (!diff.trim()) {
-					return c.json(
-						{
-							status: 'error',
-							error: 'No staged changes to generate message from',
-						},
-						400,
-					);
-				}
-
-				const { stdout: statusOutput } = await execFileAsync(
-					'git',
-					['status', '--porcelain=v2'],
-					{ cwd: gitRoot },
-				);
-				const { staged } = parseGitStatus(statusOutput, gitRoot);
-				const fileList = staged.map((f) => `${f.status}: ${f.path}`).join('\n');
-
-				const config = await loadConfig();
-
-				let provider = (config.defaults?.provider || 'anthropic') as ProviderId;
-				let currentModel =
-					config.defaults?.model ?? 'claude-3-5-sonnet-20241022';
-
-				if (sessionId) {
-					const db = await getDb();
-					const [session] = await db
-						.select({ provider: sessions.provider, model: sessions.model })
-						.from(sessions)
-						.where(eq(sessions.id, sessionId));
-					if (session?.provider) {
-						provider = session.provider as ProviderId;
-					}
-					if (session?.model) {
-						currentModel = session.model;
-					}
-				}
-
-				const auth = await getAuth(provider, config.projectRoot);
-				const oauth = detectOAuth(provider, auth);
-				const providerDefinition = getProviderDefinition(config, provider);
-
-				const modelId =
-					providerDefinition?.source === 'custom' ||
-					providerDefinition?.compatibility === 'ollama'
-						? currentModel
-						: (getFastModelForAuth(provider, auth?.type) ?? currentModel);
-				const model = await resolveModel(provider, modelId, config);
-
-				const userPrompt = `Generate a commit message for these git changes.
-
-Staged files:
-${fileList}
-
-Diff (first 4000 chars):
-${diff.slice(0, 4000)}
-
-Guidelines:
-- CAREFULLY READ the diff above - describe what ACTUALLY changed
-- Use conventional commits format: type(scope): description
-- First line under 72 characters
-- Add a blank line, then 2-4 short bullet points
-- Each bullet describes ONE specific change you see in the diff
-- Be ACCURATE - don't invent changes that aren't in the diff
-- Keep bullets short (under 80 chars each)
-- Do not include markdown code blocks or backticks
-- Return ONLY the commit message text, nothing else
-
-Example (for a diff that adds boolean returns to functions):
-refactor(auth): return success status from login functions
-
-- Add boolean return type to auth functions
-- Return false on user cancellation or failure
-- Check return value before proceeding with auth flow
-
-Commit message:`;
-
-				const commitInstructions =
-					'You are a helpful assistant that generates accurate git commit messages based on the actual diff content.';
-
-				const adapted = adaptSimpleCall(oauth, {
-					instructions: commitInstructions,
-					userContent: userPrompt,
-					maxOutputTokens: 500,
-				});
-
-				if (adapted.forceStream) {
-					const result = streamText({
-						model,
-						system: adapted.system,
-						messages: adapted.messages,
-						providerOptions: adapted.providerOptions,
-					});
-					let text = '';
-					for await (const chunk of result.textStream) {
-						text += chunk;
-					}
-					const message = text.trim();
-					return c.json({ status: 'ok', data: { message } });
-				}
-
-				const { text } = await generateText({
-					model,
-					system: adapted.system,
-					messages: adapted.messages,
-					maxOutputTokens: adapted.maxOutputTokens,
-				});
-
-				const message = text.trim();
-
-				return c.json({
-					status: 'ok',
-					data: {
-						message,
-					},
-				});
-			} catch (error) {
-				return c.json(
-					{
-						status: 'error',
-						error:
-							error instanceof Error
-								? error.message
-								: 'Failed to generate commit message',
-					},
-					500,
-				);
-			}
-		},
+		handleGenerateCommitMessage,
 	);
 }

package/src/routes/git/remote-service.ts

@@ -0,0 +1,116 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import type { Context } from 'hono';
+import { gitRemoteAddSchema, gitRemoteRemoveSchema } from './schemas.ts';
+import { validateAndGetGitRoot } from './utils.ts';
+
+const execFileAsync = promisify(execFile);
+
+type GitRemote = { name: string; url: string; type: string };
+
+function parseRemoteOutput(output: string): GitRemote[] {
+	const remotes: GitRemote[] = [];
+	const seen = new Set<string>();
+	for (const line of output.trim().split('\n').filter(Boolean)) {
+		const match = line.match(/^(\S+)\s+(\S+)\s+\((\w+)\)$/);
+		if (!match) continue;
+		const [, name, url, type] = match;
+		const key = `${name}:${type}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		remotes.push({ name, url, type });
+	}
+	return remotes;
+}
+
+export async function handleGetGitRemotes(c: Context) {
+	try {
+		const project = c.req.query('project');
+		const requestedPath = project || process.cwd();
+
+		const validation = await validateAndGetGitRoot(requestedPath);
+		if ('error' in validation) {
+			return c.json(
+				{ status: 'error', error: validation.error, code: validation.code },
+				400,
+			);
+		}
+
+		const { stdout } = await execFileAsync('git', ['remote', '-v'], {
+			cwd: validation.gitRoot,
+		});
+
+		return c.json({
+			status: 'ok',
+			data: { remotes: parseRemoteOutput(stdout) },
+		});
+	} catch (error) {
+		return c.json(
+			{
+				status: 'error',
+				error:
+					error instanceof Error ? error.message : 'Failed to list remotes',
+			},
+			500,
+		);
+	}
+}
+
+export async function handleAddGitRemote(c: Context) {
+	try {
+		const body = await c.req.json().catch(() => ({}));
+		const { project, name, url } = gitRemoteAddSchema.parse(body);
+		const requestedPath = project || process.cwd();
+
+		const validation = await validateAndGetGitRoot(requestedPath);
+		if ('error' in validation) {
+			return c.json(
+				{ status: 'error', error: validation.error, code: validation.code },
+				400,
+			);
+		}
+
+		await execFileAsync('git', ['remote', 'add', name, url], {
+			cwd: validation.gitRoot,
+		});
+
+		return c.json({
+			status: 'ok',
+			data: { name, url },
+		});
+	} catch (error) {
+		const message =
+			error instanceof Error ? error.message : 'Failed to add remote';
+		const status = message.includes('already exists') ? 400 : 500;
+		return c.json({ status: 'error', error: message }, status);
+	}
+}
+
+export async function handleRemoveGitRemote(c: Context) {
+	try {
+		const body = await c.req.json().catch(() => ({}));
+		const { project, name } = gitRemoteRemoveSchema.parse(body);
+		const requestedPath = project || process.cwd();
+
+		const validation = await validateAndGetGitRoot(requestedPath);
+		if ('error' in validation) {
+			return c.json(
+				{ status: 'error', error: validation.error, code: validation.code },
+				400,
+			);
+		}
+
+		await execFileAsync('git', ['remote', 'remove', name], {
+			cwd: validation.gitRoot,
+		});
+
+		return c.json({
+			status: 'ok',
+			data: { removed: name },
+		});
+	} catch (error) {
+		const message =
+			error instanceof Error ? error.message : 'Failed to remove remote';
+		return c.json({ status: 'error', error: message }, 500);
+	}
+}

package/src/routes/git/remote.ts

@@ -1,11 +1,10 @@
 import type { Hono } from 'hono';
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { gitRemoteAddSchema, gitRemoteRemoveSchema } from './schemas.ts';
-import { validateAndGetGitRoot } from './utils.ts';
 import { openApiRoute } from '../../openapi/route.ts';
-
-const execFileAsync = promisify(execFile);
+import {
+	handleAddGitRemote,
+	handleGetGitRemotes,
+	handleRemoveGitRemote,
+} from './remote-service.ts';
 
 export function registerRemoteRoutes(app: Hono) {
 	openApiRoute(
@@ -118,54 +117,7 @@ export function registerRemoteRoutes(app: Hono) {
 				},
 			},
 		},
-		async (c) => {
-			try {
-				const project = c.req.query('project');
-				const requestedPath = project || process.cwd();
-
-				const validation = await validateAndGetGitRoot(requestedPath);
-				if ('error' in validation) {
-					return c.json(
-						{ status: 'error', error: validation.error, code: validation.code },
-						400,
-					);
-				}
-
-				const { gitRoot } = validation;
-
-				const { stdout } = await execFileAsync('git', ['remote', '-v'], {
-					cwd: gitRoot,
-				});
-
-				const remotes: { name: string; url: string; type: string }[] = [];
-				const seen = new Set<string>();
-				for (const line of stdout.trim().split('\n').filter(Boolean)) {
-					const match = line.match(/^(\S+)\s+(\S+)\s+\((\w+)\)$/);
-					if (match) {
-						const key = `${match[1]}:${match[3]}`;
-						if (!seen.has(key)) {
-							seen.add(key);
-							remotes.push({
-								name: match[1],
-								url: match[2],
-								type: match[3],
-							});
-						}
-					}
-				}
-
-				return c.json({ status: 'ok', data: { remotes } });
-			} catch (error) {
-				return c.json(
-					{
-						status: 'error',
-						error:
-							error instanceof Error ? error.message : 'Failed to list remotes',
-					},
-					500,
-				);
-			}
-		},
+		handleGetGitRemotes,
 	);
 
 	openApiRoute(
@@ -276,37 +228,7 @@ export function registerRemoteRoutes(app: Hono) {
 				},
 			},
 		},
-		async (c) => {
-			try {
-				const body = await c.req.json().catch(() => ({}));
-				const { project, name, url } = gitRemoteAddSchema.parse(body);
-				const requestedPath = project || process.cwd();
-
-				const validation = await validateAndGetGitRoot(requestedPath);
-				if ('error' in validation) {
-					return c.json(
-						{ status: 'error', error: validation.error, code: validation.code },
-						400,
-					);
-				}
-
-				const { gitRoot } = validation;
-
-				await execFileAsync('git', ['remote', 'add', name, url], {
-					cwd: gitRoot,
-				});
-
-				return c.json({
-					status: 'ok',
-					data: { name, url },
-				});
-			} catch (error) {
-				const message =
-					error instanceof Error ? error.message : 'Failed to add remote';
-				const status = message.includes('already exists') ? 400 : 500;
-				return c.json({ status: 'error', error: message }, status);
-			}
-		},
+		handleAddGitRemote,
 	);
 
 	openApiRoute(
@@ -388,35 +310,6 @@ export function registerRemoteRoutes(app: Hono) {
 				},
 			},
 		},
-		async (c) => {
-			try {
-				const body = await c.req.json().catch(() => ({}));
-				const { project, name } = gitRemoteRemoveSchema.parse(body);
-				const requestedPath = project || process.cwd();
-
-				const validation = await validateAndGetGitRoot(requestedPath);
-				if ('error' in validation) {
-					return c.json(
-						{ status: 'error', error: validation.error, code: validation.code },
-						400,
-					);
-				}
-
-				const { gitRoot } = validation;
-
-				await execFileAsync('git', ['remote', 'remove', name], {
-					cwd: gitRoot,
-				});
-
-				return c.json({
-					status: 'ok',
-					data: { removed: name },
-				});
-			} catch (error) {
-				const message =
-					error instanceof Error ? error.message : 'Failed to remove remote';
-				return c.json({ status: 'error', error: message }, 500);
-			}
-		},
+		handleRemoveGitRemote,
 	);
 }