@ottocode/server 0.1.259 → 0.1.261

package/src/routes/git/pull.ts

@@ -3,96 +3,198 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { gitPullSchema } from './schemas.ts';
 import { validateAndGetGitRoot } from './utils.ts';
+import { openApiRoute } from '../../openapi/route.ts';
 
 const execFileAsync = promisify(execFile);
 
 export function registerPullRoute(app: Hono) {
-	app.post('/v1/git/pull', async (c) => {
-		try {
-			let body = {};
+	openApiRoute(
+		app,
+		{
+			method: 'post',
+			path: '/v1/git/pull',
+			tags: ['git'],
+			operationId: 'pullChanges',
+			summary: 'Pull changes from remote',
+			description: 'Pulls changes from the configured remote repository',
+			requestBody: {
+				required: false,
+				content: {
+					'application/json': {
+						schema: {
+							type: 'object',
+							properties: {
+								project: {
+									type: 'string',
+								},
+							},
+						},
+					},
+				},
+			},
+			responses: {
+				'200': {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									status: {
+										type: 'string',
+										enum: ['ok'],
+									},
+									data: {
+										type: 'object',
+										properties: {
+											output: {
+												type: 'string',
+											},
+										},
+										required: ['output'],
+									},
+								},
+								required: ['status', 'data'],
+							},
+						},
+					},
+				},
+				'400': {
+					description: 'Error',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									status: {
+										type: 'string',
+										enum: ['error'],
+									},
+									error: {
+										type: 'string',
+									},
+									code: {
+										type: 'string',
+									},
+								},
+								required: ['status', 'error'],
+							},
+						},
+					},
+				},
+				'500': {
+					description: 'Error',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									status: {
+										type: 'string',
+										enum: ['error'],
+									},
+									error: {
+										type: 'string',
+									},
+									code: {
+										type: 'string',
+									},
+								},
+								required: ['status', 'error'],
+							},
+						},
+					},
+				},
+			},
+		},
+		async (c) => {
 			try {
-				body = await c.req.json();
-			} catch {
-				body = {};
-			}
-
-			const { project } = gitPullSchema.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,
-				);
-			}
+				let body = {};
+				try {
+					body = await c.req.json();
+				} catch {
+					body = {};
+				}
 
-			const { gitRoot } = validation;
+				const { project } = gitPullSchema.parse(body);
 
-			try {
-				const result = await execFileAsync('git', ['pull'], {
-					cwd: gitRoot,
-				});
-
-				return c.json({
-					status: 'ok',
-					data: {
-						output: result.stdout.trim() || result.stderr.trim(),
-					},
-				});
-			} catch (pullErr: unknown) {
-				const error = pullErr as {
-					message?: string;
-					stderr?: string;
-				};
-				const errorMessage = error.stderr || error.message || 'Failed to pull';
+				const requestedPath = project || process.cwd();
 
-				if (
-					errorMessage.includes('CONFLICT') ||
-					errorMessage.includes('merge conflict')
-				) {
+				const validation = await validateAndGetGitRoot(requestedPath);
+				if ('error' in validation) {
 					return c.json(
-						{
-							status: 'error',
-							error: 'Merge conflicts detected. Resolve conflicts manually',
-							details: errorMessage,
-						},
+						{ status: 'error', error: validation.error, code: validation.code },
 						400,
 					);
 				}
 
-				if (
-					errorMessage.includes('Permission denied') ||
-					errorMessage.includes('authentication')
-				) {
+				const { gitRoot } = validation;
+
+				try {
+					const result = await execFileAsync('git', ['pull'], {
+						cwd: gitRoot,
+					});
+
+					return c.json({
+						status: 'ok',
+						data: {
+							output: result.stdout.trim() || result.stderr.trim(),
+						},
+					});
+				} catch (pullErr: unknown) {
+					const error = pullErr as {
+						message?: string;
+						stderr?: string;
+					};
+					const errorMessage =
+						error.stderr || error.message || 'Failed to pull';
+
+					if (
+						errorMessage.includes('CONFLICT') ||
+						errorMessage.includes('merge conflict')
+					) {
+						return c.json(
+							{
+								status: 'error',
+								error: 'Merge conflicts detected. Resolve conflicts manually',
+								details: errorMessage,
+							},
+							400,
+						);
+					}
+
+					if (
+						errorMessage.includes('Permission denied') ||
+						errorMessage.includes('authentication')
+					) {
+						return c.json(
+							{
+								status: 'error',
+								error: 'Authentication failed. Check your git credentials',
+								details: errorMessage,
+							},
+							401,
+						);
+					}
+
 					return c.json(
 						{
 							status: 'error',
-							error: 'Authentication failed. Check your git credentials',
+							error: 'Failed to pull changes',
 							details: errorMessage,
 						},
-						401,
+						500,
 					);
 				}
-
+			} catch (error) {
 				return c.json(
 					{
 						status: 'error',
-						error: 'Failed to pull changes',
-						details: errorMessage,
+						error: error instanceof Error ? error.message : 'Failed to pull',
 					},
 					500,
 				);
 			}
-		} catch (error) {
-			return c.json(
-				{
-					status: 'error',
-					error: error instanceof Error ? error.message : 'Failed to pull',
-				},
-				500,
-			);
-		}
-	});
+		},
+	);
 }

package/src/routes/git/push.ts

@@ -3,158 +3,263 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { gitPushSchema } from './schemas.ts';
 import { validateAndGetGitRoot, getCurrentBranch } from './utils.ts';
+import { openApiRoute } from '../../openapi/route.ts';
 
 const execFileAsync = promisify(execFile);
 
 export function registerPushRoute(app: Hono) {
-	app.post('/v1/git/push', async (c) => {
-		try {
-			let body = {};
-			try {
-				body = await c.req.json();
-			} catch (jsonError) {
-				console.warn(
-					'Failed to parse JSON body for git push, using empty object:',
-					jsonError,
-				);
-			}
-
-			const { project } = gitPushSchema.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;
-
+	openApiRoute(
+		app,
+		{
+			method: 'post',
+			path: '/v1/git/push',
+			tags: ['git'],
+			operationId: 'pushCommits',
+			summary: 'Push commits to remote',
+			description: 'Pushes local commits to the configured remote repository',
+			requestBody: {
+				required: false,
+				content: {
+					'application/json': {
+						schema: {
+							type: 'object',
+							properties: {
+								project: {
+									type: 'string',
+								},
+							},
+						},
+					},
+				},
+			},
+			responses: {
+				'200': {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									status: {
+										type: 'string',
+										enum: ['ok'],
+									},
+									data: {
+										type: 'object',
+										properties: {
+											output: {
+												type: 'string',
+											},
+										},
+										required: ['output'],
+									},
+								},
+								required: ['status', 'data'],
+							},
+						},
+					},
+				},
+				'400': {
+					description: 'Error',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									status: {
+										type: 'string',
+										enum: ['error'],
+									},
+									error: {
+										type: 'string',
+									},
+									code: {
+										type: 'string',
+									},
+								},
+								required: ['status', 'error'],
+							},
+						},
+					},
+				},
+				'500': {
+					description: 'Error',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									status: {
+										type: 'string',
+										enum: ['error'],
+									},
+									error: {
+										type: 'string',
+									},
+									code: {
+										type: 'string',
+									},
+								},
+								required: ['status', 'error'],
+							},
+						},
+					},
+				},
+			},
+		},
+		async (c) => {
 			try {
-				const { stdout: remotes } = await execFileAsync('git', ['remote'], {
-					cwd: gitRoot,
-				});
-				if (!remotes.trim()) {
-					return c.json(
-						{ status: 'error', error: 'No remote repository configured' },
-						400,
+				let body = {};
+				try {
+					body = await c.req.json();
+				} catch (jsonError) {
+					console.warn(
+						'Failed to parse JSON body for git push, using empty object:',
+						jsonError,
 					);
 				}
-			} catch {
-				return c.json(
-					{ status: 'error', error: 'No remote repository configured' },
-					400,
-				);
-			}
 
-			const branch = await getCurrentBranch(gitRoot);
-			let hasUpstream = false;
-			try {
-				await execFileAsync(
-					'git',
-					['rev-parse', '--abbrev-ref', '@{upstream}'],
-					{
-						cwd: gitRoot,
-					},
-				);
-				hasUpstream = true;
-			} catch {}
+				const { project } = gitPushSchema.parse(body);
 
-			try {
-				let pushOutput: string;
-				let pushError: string;
+				const requestedPath = project || process.cwd();
 
-				if (hasUpstream) {
-					const result = await execFileAsync('git', ['push'], { cwd: gitRoot });
-					pushOutput = result.stdout;
-					pushError = result.stderr;
-				} else {
-					const result = await execFileAsync(
-						'git',
-						['push', '--set-upstream', 'origin', branch],
-						{ cwd: gitRoot },
+				const validation = await validateAndGetGitRoot(requestedPath);
+				if ('error' in validation) {
+					return c.json(
+						{ status: 'error', error: validation.error, code: validation.code },
+						400,
 					);
-					pushOutput = result.stdout;
-					pushError = result.stderr;
 				}
 
-				return c.json({
-					status: 'ok',
-					data: {
-						output: pushOutput.trim() || pushError.trim(),
-					},
-				});
-			} catch (pushErr: unknown) {
-				const error = pushErr as {
-					message?: string;
-					stderr?: string;
-					code?: number;
-				};
-				const errorMessage = error.stderr || error.message || 'Failed to push';
+				const { gitRoot } = validation;
 
-				if (
-					errorMessage.includes('failed to push') ||
-					errorMessage.includes('rejected')
-				) {
+				try {
+					const { stdout: remotes } = await execFileAsync('git', ['remote'], {
+						cwd: gitRoot,
+					});
+					if (!remotes.trim()) {
+						return c.json(
+							{ status: 'error', error: 'No remote repository configured' },
+							400,
+						);
+					}
+				} catch {
 					return c.json(
-						{
-							status: 'error',
-							error: 'Push rejected. Try pulling changes first with: git pull',
-							details: errorMessage,
-						},
+						{ status: 'error', error: 'No remote repository configured' },
 						400,
 					);
 				}
 
-				if (
-					errorMessage.includes('Permission denied') ||
-					errorMessage.includes('authentication') ||
-					errorMessage.includes('could not read')
-				) {
-					return c.json(
+				const branch = await getCurrentBranch(gitRoot);
+				let hasUpstream = false;
+				try {
+					await execFileAsync(
+						'git',
+						['rev-parse', '--abbrev-ref', '@{upstream}'],
 						{
-							status: 'error',
-							error: 'Authentication failed. Check your git credentials',
-							details: errorMessage,
+							cwd: gitRoot,
 						},
-						401,
 					);
-				}
+					hasUpstream = true;
+				} catch {}
+
+				try {
+					let pushOutput: string;
+					let pushError: string;
+
+					if (hasUpstream) {
+						const result = await execFileAsync('git', ['push'], {
+							cwd: gitRoot,
+						});
+						pushOutput = result.stdout;
+						pushError = result.stderr;
+					} else {
+						const result = await execFileAsync(
+							'git',
+							['push', '--set-upstream', 'origin', branch],
+							{ cwd: gitRoot },
+						);
+						pushOutput = result.stdout;
+						pushError = result.stderr;
+					}
+
+					return c.json({
+						status: 'ok',
+						data: {
+							output: pushOutput.trim() || pushError.trim(),
+						},
+					});
+				} catch (pushErr: unknown) {
+					const error = pushErr as {
+						message?: string;
+						stderr?: string;
+						code?: number;
+					};
+					const errorMessage =
+						error.stderr || error.message || 'Failed to push';
+
+					if (
+						errorMessage.includes('failed to push') ||
+						errorMessage.includes('rejected')
+					) {
+						return c.json(
+							{
+								status: 'error',
+								error:
+									'Push rejected. Try pulling changes first with: git pull',
+								details: errorMessage,
+							},
+							400,
+						);
+					}
+
+					if (
+						errorMessage.includes('Permission denied') ||
+						errorMessage.includes('authentication') ||
+						errorMessage.includes('could not read')
+					) {
+						return c.json(
+							{
+								status: 'error',
+								error: 'Authentication failed. Check your git credentials',
+								details: errorMessage,
+							},
+							401,
+						);
+					}
+
+					if (
+						errorMessage.includes('Could not resolve host') ||
+						errorMessage.includes('network')
+					) {
+						return c.json(
+							{
+								status: 'error',
+								error: 'Network error. Check your internet connection',
+								details: errorMessage,
+							},
+							503,
+						);
+					}
 
-				if (
-					errorMessage.includes('Could not resolve host') ||
-					errorMessage.includes('network')
-				) {
 					return c.json(
 						{
 							status: 'error',
-							error: 'Network error. Check your internet connection',
+							error: 'Failed to push commits',
 							details: errorMessage,
 						},
-						503,
+						500,
 					);
 				}
-
+			} catch (error) {
 				return c.json(
 					{
 						status: 'error',
-						error: 'Failed to push commits',
-						details: errorMessage,
+						error: error instanceof Error ? error.message : 'Failed to push',
 					},
 					500,
 				);
 			}
-		} catch (error) {
-			return c.json(
-				{
-					status: 'error',
-					error: error instanceof Error ? error.message : 'Failed to push',
-				},
-				500,
-			);
-		}
-	});
+		},
+	);
 }