ai-cr 3.1.0__tar.gz → 3.1.2__tar.gz

{ai_cr-3.1.0 → ai_cr-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ai-cr
-Version: 3.1.0
+Version: 3.1.2
 Summary: AI code review tool that works with any language model provider. It detects issues in GitHub pull requests or local changes—instantly, reliably, and without vendor lock-in.
 License: MIT
 Keywords: static code analysis,code review,code quality,ai,coding,assistant,llm,github,automation,devops,developer tools,github actions,workflows,git

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/cli.py

@@ -92,6 +92,7 @@ def cmd_review(
     out: str = arg_out()
 ):
     _what, _against = args_to_target(refs, what, against)
+    pr = pr or os.getenv("PR_NUMBER_FROM_WORKFLOW_DISPATCH")
     with get_repo_context(url, _what) as (repo, out_folder):
         asyncio.run(review(
             repo=repo,
@@ -100,6 +101,7 @@ def cmd_review(
             filters=filters,
             use_merge_base=merge_base,
             out_folder=out or out_folder,
+            pr=pr,
         ))
         if post_comment:
             try:
@@ -134,8 +136,13 @@ def cmd_answer(
         default=None,
         show_default=False
     ),
+    pr: int = typer.Option(
+        default=None,
+        help="GitHub Pull Request number"
+    ),
 ):
     _what, _against = args_to_target(refs, what, against)
+    pr = pr or os.getenv("PR_NUMBER_FROM_WORKFLOW_DISPATCH")
     if str(question).startswith("tpl:"):
         prompt_file = str(question)[4:]
         question = ""
@@ -149,6 +156,7 @@ def cmd_answer(
         use_merge_base=merge_base,
         prompt_file=prompt_file,
         use_pipeline=use_pipeline,
+        pr=pr,
     )
     if post_to == 'linear':
         logging.info("Posting answer to Linear...")

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/commands/deploy.py

@@ -1,16 +1,31 @@
+import logging
 from pathlib import Path
 
 import microcore as mc
 from microcore import ApiType, ui, utils
-from git import Repo
+from git import Repo, GitCommandError
+import typer
 
+from ..core import get_base_branch
 from ..utils import version, extract_gh_owner_repo
 from ..cli_base import app
+from ..gh_api import gh_api
 
 
 @app.command(name="deploy", help="Deploy Gito workflows to GitHub Actions")
 @app.command(name="init", hidden=True)
-def deploy(api_type: ApiType = None, commit: bool = None, rewrite: bool = False):
+def deploy(
+    api_type: ApiType = None,
+    commit: bool = None,
+    rewrite: bool = False,
+    to_branch: str = typer.Option(
+        default="gito_deploy",
+        help="Branch name for new PR containing with Gito workflows commit"
+    ),
+    token: str = typer.Option(
+        "", help="GitHub token (or set GITHUB_TOKEN env var)"
+    ),
+):
     repo = Repo(".")
     workflow_files = dict(
         code_review=Path(".github/workflows/gito-code-review.yml"),
@@ -77,16 +92,35 @@ def deploy(api_type: ApiType = None, commit: bool = None, rewrite: bool = False)
         "Do you want to commit and push created GitHub workflows to a new branch?"
     ):
         repo.git.add([str(file) for file in workflow_files.values()])
-        branch_name = "gito_deploy"
-        if not repo.active_branch.name.startswith(branch_name):
-            repo.git.checkout("-b", branch_name)
-        repo.git.commit("-m", "Deploy Gito workflows")
-        repo.git.push("origin", branch_name)
-        print(f"Changes pushed to {branch_name} branch.")
-        print(
-            f"Please create a PR from {branch_name} to your main branch and merge it:\n"
-            f"https://github.com/{owner}/{repo_name}/compare/gito_deploy?expand=1"
-        )
+        if not repo.active_branch.name.startswith(to_branch):
+            repo.git.checkout("-b", to_branch)
+        try:
+            repo.git.commit("-m", "Deploy Gito workflows")
+        except GitCommandError as e:
+            if "nothing added" in str(e):
+                ui.warning("Failed to commit changes: nothing was added")
+            else:
+                ui.error(f"Failed to commit changes: {e}")
+                return False
+
+        repo.git.push("origin", to_branch)
+        print(f"Changes pushed to {to_branch} branch.")
+        try:
+            api = gh_api(repo=repo)
+            base = get_base_branch(repo).split('/')[-1]
+            logging.info(f"Creating PR {ui.green(to_branch)} -> {ui.yellow(base)}...")
+            res = api.pulls.create(
+                head=to_branch,
+                base=base,
+                title="Deploy Gito workflows",
+            )
+            print(f"Pull request #{res.number} created successfully:\n{res.html_url}")
+        except Exception as e:
+            mc.ui.error(f"Failed to create pull request automatically: {e}")
+            print(
+                f"Please create a PR from '{to_branch}' to your main branch and merge it:\n"
+                f"https://github.com/{owner}/{repo_name}/compare/{to_branch}?expand=1"
+            )
     else:
         print(
             "Now you can commit and push created GitHub workflows to your main repository branch.\n"

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/commands/gh_react_to_comment.py

@@ -25,6 +25,30 @@ from ..utils import extract_gh_owner_repo
 from .fix import fix
 
 
+def cleanup_comment_addressed_to_gito(text):
+    if not text:
+        return text
+    patterns = [
+        r'^\s*gito\b',
+        r'^\s*ai\b',
+        r'^\s*bot\b',
+        r'^\s*@gito\b',
+        r'^\s*@ai\b',
+        r'^\s*@bot\b'
+    ]
+    result = text
+    # Remove each pattern from the beginning
+    for pattern in patterns:
+        result = re.sub(pattern, '', result, flags=re.IGNORECASE)
+
+    # Remove leading comma and spaces that may be left after prefix removal
+    result = re.sub(r'^\s*,\s*', '', result)
+
+    # Clean up extra whitespace
+    result = re.sub(r'\s+', ' ', result).strip()
+    return result
+
+
 @app.command(hidden=True)
 def react_to_comment(
     comment_id: int = typer.Argument(),
@@ -99,7 +123,8 @@ def react_to_comment(
         )
     else:
         if cfg.answer_github_comments:
-            response = answer(comment.body, repo=repo)
+            question = cleanup_comment_addressed_to_gito(comment.body)
+            response = answer(question, repo=repo, pr=pr)
             post_gh_comment(
                 gh_repository=f"{owner}/{repo_name}",
                 pr_or_issue_number=pr,

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/core.py

@@ -1,11 +1,12 @@
+import os
 import fnmatch
 import logging
-from os import PathLike
 from typing import Iterable
 from pathlib import Path
 from functools import partial
 
 import microcore as mc
+from gito.gh_api import gh_api
 from microcore import ui
 from git import Repo, Commit
 from git.exc import GitCommandError
@@ -66,16 +67,57 @@ def commit_in_branch(repo: Repo, commit: Commit, target_branch: str) -> bool:
     return False
 
 
+def get_base_branch(repo: Repo, pr: int | str = None):
+    if os.getenv('GITHUB_ACTIONS'):
+
+        # triggered from PR
+        if base_ref := os.getenv('GITHUB_BASE_REF'):
+            logging.info(f"Using GITHUB_BASE_REF:{base_ref} as base branch")
+            return f'origin/{base_ref}'
+        logging.info("GITHUB_BASE_REF is not available...")
+        if pr:
+            api = gh_api(repo=repo)
+            pr_obj = api.pulls.get(pr)
+            logging.info(
+                f"Using 'origin/{pr_obj.base.ref}' as base branch "
+                f"(received via GH API for PR#{pr})"
+            )
+            return f'origin/{pr_obj.base.ref}'
+
+    try:
+        logging.info(
+            "Trying to resolve base branch from repo.remotes.origin.refs.HEAD.reference.name..."
+        )
+        # 'origin/main', 'origin/master', etc
+        # Stopped working in github actions since 07/2025
+        return repo.remotes.origin.refs.HEAD.reference.name
+    except AttributeError:
+        try:
+            logging.info(
+                "Checking if repo has 'main' or 'master' branchs to use as --against branch..."
+            )
+            remote_refs = repo.remotes.origin.refs
+            for branch_name in ['main', 'master']:
+                if hasattr(remote_refs, branch_name):
+                    return f'origin/{branch_name}'
+        except Exception:
+            pass
+
+        logging.error("Could not determine default branch from remote refs.")
+        raise ValueError("No default branch found in the repository.")
+
+
 def get_diff(
     repo: Repo = None,
     what: str = None,
     against: str = None,
     use_merge_base: bool = True,
+    pr: str | int = None
 ) -> PatchSet | list[PatchedFile]:
     repo = repo or Repo(".")
     if not against:
         # 'origin/main', 'origin/master', etc
-        against = repo.remotes.origin.refs.HEAD.reference.name
+        against = get_base_branch(repo, pr=pr)
     if review_subject_is_index(what):
         what = None  # working copy
     if use_merge_base:
@@ -175,7 +217,7 @@ def get_diff(
         )
         if file_path == DEV_NULL:
             continue
-        if is_binary_file(repo, file_path.lstrip("b/")):
+        if is_binary_file(repo, file_path.removeprefix("b/")):
             logging.info(f"Skipping binary file: {patched_file.path}")
             continue
         non_binary_diff.append(patched_file)
@@ -251,11 +293,12 @@ def _prepare(
     against: str = None,
     filters: str | list[str] = "",
     use_merge_base: bool = True,
+    pr: str | int = None,
 ):
     repo = repo or Repo(".")
     cfg = ProjectConfig.load_for_repo(repo)
     diff = get_diff(
-        repo=repo, what=what, against=against, use_merge_base=use_merge_base
+        repo=repo, what=what, against=against, use_merge_base=use_merge_base, pr=pr,
     )
     diff = filter_diff(diff, filters)
     if not diff:
@@ -318,11 +361,17 @@ async def review(
     against: str = None,
     filters: str | list[str] = "",
     use_merge_base: bool = True,
-    out_folder: str | PathLike | None = None,
+    out_folder: str | os.PathLike | None = None,
+    pr: str | int = None
 ):
     try:
         repo, cfg, diff, lines = _prepare(
-            repo=repo, what=what, against=against, filters=filters, use_merge_base=use_merge_base
+            repo=repo,
+            what=what,
+            against=against,
+            filters=filters,
+            use_merge_base=use_merge_base,
+            pr=pr,
         )
     except NoChangesInContextError:
         logging.error("No changes to review")
@@ -378,10 +427,16 @@ def answer(
     use_merge_base: bool = True,
     use_pipeline: bool = True,
     prompt_file: str = None,
+    pr: str | int = None,
 ) -> str | None:
     try:
         repo, config, diff, lines = _prepare(
-            repo=repo, what=what, against=against, filters=filters, use_merge_base=use_merge_base
+            repo=repo,
+            what=what,
+            against=against,
+            filters=filters,
+            use_merge_base=use_merge_base,
+            pr=pr
         )
     except NoChangesInContextError:
         logging.error("No changes to review")

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/gh_api.py

@@ -2,7 +2,38 @@ import os
 import logging
 
 import requests
+import git
 from fastcore.basics import AttrDict  # objects returned by ghapi
+from ghapi.core import GhApi
+
+from .project_config import ProjectConfig
+from .utils import extract_gh_owner_repo
+
+
+def gh_api(
+    repo: git.Repo = None,  # used to resolve owner/repo
+    config: ProjectConfig | None = None,  # used to resolve owner/repo
+    token: str | None = None
+) -> GhApi:
+    if repo:
+        # resolve owner/repo from repo.remotes.origin.url
+        owner, repo_name = extract_gh_owner_repo(repo)
+    else:
+        if not config:
+            config = ProjectConfig.load()
+        # resolve owner/repo from github env vars (github actions)
+        gh_env = config.prompt_vars.get("github_env", {})
+        gh_repo = gh_env.get("github_repo")
+        if not gh_repo:
+            raise ValueError("GitHub repository not specified and not found in project config.")
+        parts = gh_repo.split('/')
+        if len(parts) != 2:
+            raise ValueError(f"Invalid GitHub repository format: {gh_repo}. Expected 'owner/repo'.")
+        owner, repo_name = parts
+
+    token = resolve_gh_token(token)
+    api = GhApi(owner, repo_name, token=token)
+    return api
 
 
 def resolve_gh_token(token_or_none: str | None = None) -> str | None:

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/tpl/github_workflows/components/env-vars.j2

@@ -7,4 +7,5 @@
         JIRA_URL: ${{ secrets.JIRA_URL }}
         JIRA_USER: ${{ secrets.JIRA_USER }}
         LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         {%- endraw %}

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/tpl/github_workflows/gito-code-review.yml.j2

@@ -22,8 +22,8 @@ jobs:
         {%- include("github_workflows/components/env-vars.j2") %}
         PR_NUMBER_FROM_WORKFLOW_DISPATCH: {% raw %}${{ github.event.inputs.pr_number }}{% endraw %}
       run: |{% raw %}
-        gito --verbose review ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref && format(' --against="origin/{0}"', github.event.pull_request.base.ref) || '' }}
-        gito github-comment --token ${{ secrets.GITHUB_TOKEN }}{% endraw %}
+        gito --verbose review
+        gito github-comment{% endraw %}
 
     - uses: actions/upload-artifact@v4
       with:

{ai_cr-3.1.0 → ai_cr-3.1.2}/gito/tpl/github_workflows/gito-react-to-comments.yml.j2

@@ -67,4 +67,4 @@ jobs:
         # Otherwise, use LLM_API_TYPE: none
         {%- include("github_workflows/components/env-vars.j2") %}
       run: |
-        {% raw %}gito react-to-comment ${{ github.event.comment.id }} --token ${{ secrets.GITHUB_TOKEN }}{%- endraw %}
+        {% raw %}gito react-to-comment ${{ github.event.comment.id }}{%- endraw %}

ai_cr-3.1.2/gito/tpl/questions/changes_summary.j2

@@ -0,0 +1,55 @@
+{{ self_id }}
+----TASK----
+
+## Subtask 1:
+Write a codebase changes summary clearly describing and explaining it for the engineering managers.
+- It is intended to be posted into bug tracker for estimating work done in the pull request.
+- Summary should be in a form of compact changelist where each change is described by one sentence.
+- Caption should be: ## PR Summary: <3-10 words>
+- Each change summary BP list item should start from effort estimation icon:
+- - ◆◇◇ (up to 2 hours)
+- - ◆◆◇ (half day)
+- - ◆◆◆ (1-2 days and more)
+
+Also include this estimation legend below as "Pure Codebase Work Estimation Legend".
+
+
+## Subtask 1 (Issue alignment sentence)
+Include one sentence about how the code changes address the requirements of the associated issue listed below.
+- Use ✅ or ⚠️ to indicate whether the implementation fully satisfies the issue requirements.
+- Put this sentence immediately below the PR Summary title
+Examples:
+
+If the implementation fully delivers the requested functionality:
+```
+✅  Implementation Satisfies [<ISSUE_KEY>](<ISSUE_URL>).
+```
+If there are concerns about how thoroughly the code covers the requirements and technical description from the associated issue:
+```
+⚠️ <Describe specific gap or concern>.
+⚠️ <Describe additional limitation or missing feature>.
+```
+
+## Subtask 3:
+Write release notes for public documentation.
+- Caption should be: ## Release Notes Proposal
+Summarize the following changes, focusing on what is new, improved, or fixed for the end user.
+Do not include internal or technical details.
+Structure release notes using clear sections: Added, Changed, Fixed.
+Avoid internal technical jargon or developer-specific details.
+
+----RELATED CODEBASE CHANGES----
+{% for part in diff %}{{ part }}\n{% endfor %}
+
+----FULL FILE CONTENT AFTER APPLYING CHANGES----
+{% for file, file_lines in all_file_lines.items() %}
+--FILE: {{ file }}--
+{{ file_lines }}
+{% endfor %}
+
+{%- if pipeline_out.associated_issue and pipeline_out.associated_issue.title %}
+----ASSOCIATED ISSUE----
+# {{ pipeline_out.associated_issue.title }}
+{{ pipeline_out.associated_issue.description }}
+URL: {{ pipeline_out.associated_issue.url }}
+{%- endif -%}{{ '\n' }}

ai_cr-3.1.2/gito/tpl/questions/testing_guide.j2

@@ -0,0 +1,23 @@
+{{ self_id }}
+----TASK----
+Create a concise comment for QA specialists that explains how to test the code-base changes.
+Include:
+- User journeys that could be disrupted by failures
+- Relevant security scenarios and edge cases
+- Potential risk areas introduced by the changes, with suggestions for focused testing to mitigate them
+
+----RELATED CODEBASE CHANGES----
+{% for part in diff %}{{ part }}\n{% endfor %}
+
+----FULL FILE CONTENT AFTER APPLYING CHANGES----
+{% for file, file_lines in all_file_lines.items() %}
+--FILE: {{ file }}--
+{{ file_lines }}
+{% endfor %}
+
+{%- if pipeline_out.associated_issue and pipeline_out.associated_issue.title %}
+----ASSOCIATED ISSUE----
+# {{ pipeline_out.associated_issue.title }}
+{{ pipeline_out.associated_issue.description }}
+URL: {{ pipeline_out.associated_issue.url }}
+{%- endif -%}{{ '\n' }}

{ai_cr-3.1.0 → ai_cr-3.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ai-cr"
-version = "3.1.0"
+version = "3.1.2"
 description = "AI code review tool that works with any language model provider. It detects issues in GitHub pull requests or local changes—instantly, reliably, and without vendor lock-in."
 authors = ["Nayjest <mail@vitaliy.in>"]
 readme = "README.md"