Merge pull request #437 from Mng-dev-ai/feat/create-commit-action

Create Commit Action

Author: Mng-dev-ai

backend/app/api/endpoints/github.py

@@ -8,6 +8,8 @@
 from app.models.schemas.github import (
     CreatePullRequestRequest,
     CreatePullRequestResponse,
+    GenerateCommitMessageRequest,
+    GenerateCommitMessageResponse,
     GeneratePRDescriptionRequest,
     GeneratePRDescriptionResponse,
     GitHubCollaborator,
@@ -109,6 +111,32 @@ async def generate_pr_description(
     return GeneratePRDescriptionResponse(description=description)
 
 
+@router.post(
+    "/generate-commit-message",
+    response_model=GenerateCommitMessageResponse,
+)
+async def generate_commit_message(
+    request: GenerateCommitMessageRequest,
+    current_user: User = Depends(get_current_user),
+    ai_service: ClaudeAgentService = Depends(get_claude_agent_service),
+) -> GenerateCommitMessageResponse:
+    try:
+        message = await ai_service.generate_commit_message(
+            request.diff, request.model_id, current_user
+        )
+    except APIKeyValidationError as e:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(e),
+        ) from e
+    except ClaudeAgentException as e:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=str(e),
+        ) from e
+    return GenerateCommitMessageResponse(message=message)
+
+
 @router.get("/collaborators")
 async def list_collaborators(
     owner: str = Query(..., min_length=1),

backend/app/api/endpoints/sandbox.py

@@ -15,10 +15,11 @@
     GitBranchesResponse,
     GitCheckoutRequest,
     GitCheckoutResponse,
+    GitCommandResponse,
+    GitCommitRequest,
     GitCreateBranchRequest,
     GitCreateBranchResponse,
     GitDiffResponse,
-    GitPushPullResponse,
     GitRemoteUrlResponse,
     IDEUrlResponse,
     SandboxFilesMetadataResponse,
@@ -53,7 +54,7 @@ def _git_cd_prefix(cwd: str | None = None) -> str:
             status_code=status.HTTP_400_BAD_REQUEST,
             detail="Invalid cwd path",
         )
-    return f"cd '{cwd}'; "
+    return f"cd '{cwd}' && "
 
 
 @router.get("/{sandbox_id}/preview-links", response_model=PreviewLinksResponse)
@@ -482,50 +483,65 @@ async def checkout_git_branch(
         )
 
 
-async def _run_git_push_pull(
+async def _run_git_command(
     sandbox_id: str,
     command: str,
     sandbox_service: SandboxService,
     cwd: str | None = None,
-) -> GitPushPullResponse:
+) -> GitCommandResponse:
     try:
         cd_prefix = _git_cd_prefix(cwd)
         result = await sandbox_service.execute_command(
             sandbox_id,
             f"{cd_prefix}{command} 2>&1",
         )
         if result.exit_code != 0:
-            return GitPushPullResponse(
+            return GitCommandResponse(
                 success=False,
                 output="",
                 error=result.stdout.strip() or result.stderr.strip(),
             )
-        return GitPushPullResponse(success=True, output=result.stdout.strip())
+        return GitCommandResponse(success=True, output=result.stdout.strip())
     except SandboxException as e:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
             detail=str(e),
         )
 
 
-@router.post("/{sandbox_id}/git/push", response_model=GitPushPullResponse)
+@router.post("/{sandbox_id}/git/push", response_model=GitCommandResponse)
 async def git_push(
     sandbox_id: str = Depends(validate_sandbox_ownership),
     sandbox_service: SandboxService = Depends(get_sandbox_service),
     cwd: str | None = Query(None),
-) -> GitPushPullResponse:
-    return await _run_git_push_pull(
+) -> GitCommandResponse:
+    return await _run_git_command(
         sandbox_id, "git push -u origin HEAD", sandbox_service, cwd
     )
 
 
-@router.post("/{sandbox_id}/git/pull", response_model=GitPushPullResponse)
+@router.post("/{sandbox_id}/git/pull", response_model=GitCommandResponse)
 async def git_pull(
     sandbox_id: str = Depends(validate_sandbox_ownership),
     sandbox_service: SandboxService = Depends(get_sandbox_service),
     cwd: str | None = Query(None),
-) -> GitPushPullResponse:
-    return await _run_git_push_pull(sandbox_id, "git pull", sandbox_service, cwd)
+) -> GitCommandResponse:
+    return await _run_git_command(sandbox_id, "git pull", sandbox_service, cwd)
+
+
+@router.post("/{sandbox_id}/git/commit", response_model=GitCommandResponse)
+async def git_commit(
+    request: GitCommitRequest,
+    sandbox_id: str = Depends(validate_sandbox_ownership),
+    sandbox_service: SandboxService = Depends(get_sandbox_service),
+) -> GitCommandResponse:
+    msg = request.message.replace("'", "'\\''")
+    return await _run_git_command(
+        sandbox_id,
+        f"git add -A && git commit -m '{msg}'",
+        sandbox_service,
+        request.cwd,
+    )
 
 
 @router.post("/{sandbox_id}/git/create-branch", response_model=GitCreateBranchResponse)

backend/app/models/schemas/github.py

@@ -80,3 +80,12 @@ class GeneratePRDescriptionRequest(BaseModel):
 
 class GeneratePRDescriptionResponse(BaseModel):
     description: str
+
+
+class GenerateCommitMessageRequest(BaseModel):
+    diff: str = Field(min_length=1, max_length=200_000)
+    model_id: str = Field(max_length=128)
+
+
+class GenerateCommitMessageResponse(BaseModel):
+    message: str

backend/app/models/schemas/sandbox.py

@@ -105,7 +105,12 @@ class GitCreateBranchResponse(BaseModel):
     error: str | None = None
 
 
-class GitPushPullResponse(BaseModel):
+class GitCommitRequest(BaseModel):
+    message: str = Field(..., min_length=1, max_length=2000)
+    cwd: str | None = None
+
+
+class GitCommandResponse(BaseModel):
     success: bool
     output: str
     error: str | None = None

backend/app/prompts/generate_commit_message.py

@@ -0,0 +1,12 @@
+GENERATE_COMMIT_MESSAGE_SYSTEM_PROMPT = """You are a git commit message writer. Given a git diff, produce a clear, concise commit message following conventional commit style.
+
+Output ONLY the commit message with no preamble, explanation, or meta-commentary.
+
+<guidelines>
+- First line: a short summary (50 chars or less ideally, 72 max) in imperative mood (e.g., "Add user authentication", "Fix null pointer in parser")
+- If more detail is needed, add a blank line followed by a body with bullet points
+- Focus on the "what" and "why", not line-by-line details
+- Do not include generic text like "Update files" or "Make changes"
+- If the diff is too large or unclear, summarize at a high level based on file paths and change patterns
+- Do not wrap the message in quotes or backticks
+</guidelines>"""

backend/app/services/claude_agent.py

@@ -25,6 +25,9 @@
 from app.models.db_models.user import User, UserSettings
 from app.models.schemas.settings import ProviderType
 from app.prompts.enhance_prompt import ENHANCE_PROMPT
+from app.prompts.generate_commit_message import (
+    GENERATE_COMMIT_MESSAGE_SYSTEM_PROMPT,
+)
 from app.prompts.generate_pr_description import (
     GENERATE_PR_DESCRIPTION_SYSTEM_PROMPT,
     GENERATE_PR_DESCRIPTION_TITLE_PREFIX,
@@ -336,8 +339,13 @@ async def generate_title(self, prompt: str, user: User) -> str | None:
             logger.debug("Title generation SDK call failed for user %s", user.id)
             return None
 
-    async def generate_pr_description(
-        self, title: str, diff: str, model_id: str, user: User
+    async def _generate_with_ai(
+        self,
+        system_prompt: str,
+        user_message: str,
+        model_id: str,
+        user: User,
+        empty_error: str,
     ) -> str:
         user_settings = await UserService(
             session_factory=self.session_factory
@@ -347,29 +355,48 @@ async def generate_pr_description(
         env, _, actual_model_id = self._build_auth_env(model_id, user_settings)
 
         options = ClaudeAgentOptions(
-            system_prompt=GENERATE_PR_DESCRIPTION_SYSTEM_PROMPT,
+            system_prompt=system_prompt,
             permission_mode="default",
             model=actual_model_id,
             max_turns=1,
             env=env,
         )
 
         try:
-            description = ""
+            result = ""
             async with ClaudeSDKClient(options=options) as client:
-                user_message = (
-                    GENERATE_PR_DESCRIPTION_TITLE_PREFIX + title + "\n\n" + diff
-                )
                 await client.query(user_message)
                 async for message in client.receive_response():
                     if isinstance(message, ResultMessage) and message.result:
-                        description = message.result
+                        result = message.result
 
-            if not description:
-                raise ClaudeAgentException("AI returned an empty description")
-            return description
+            if not result:
+                raise ClaudeAgentException(empty_error)
+            return result
         except ClaudeSDKError as e:
-            raise ClaudeAgentException(f"Failed to generate PR description: {e}") from e
+            raise ClaudeAgentException(f"{empty_error}: {e}") from e
+
+    async def generate_pr_description(
+        self, title: str, diff: str, model_id: str, user: User
+    ) -> str:
+        return await self._generate_with_ai(
+            GENERATE_PR_DESCRIPTION_SYSTEM_PROMPT,
+            GENERATE_PR_DESCRIPTION_TITLE_PREFIX + title + "\n\n" + diff,
+            model_id,
+            user,
+            "AI returned an empty description",
+        )
+
+    async def generate_commit_message(
+        self, diff: str, model_id: str, user: User
+    ) -> str:
+        return await self._generate_with_ai(
+            GENERATE_COMMIT_MESSAGE_SYSTEM_PROMPT,
+            diff,
+            model_id,
+            user,
+            "AI returned an empty commit message",
+        )
 
     @staticmethod
     def _build_permission_server(