ai-cr 2.0.1__py3-none-any.whl → 2.0.3__py3-none-any.whl

{ai_cr-2.0.1.dist-info → ai_cr-2.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ai-cr
-Version: 2.0.1
+Version: 2.0.3
 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
@@ -32,7 +32,7 @@ Description-Content-Type: text/markdown
 <a href="https://pypi.org/project/gito.bot/" target="_blank"><img src="https://img.shields.io/pypi/v/gito.bot" alt="PYPI Release"></a>
 <a href="https://github.com/Nayjest/Gito/actions/workflows/code-style.yml" target="_blank"><img src="https://github.com/Nayjest/Gito/actions/workflows/code-style.yml/badge.svg" alt="PyLint"></a>
 <a href="https://github.com/Nayjest/Gito/actions/workflows/tests.yml" target="_blank"><img src="https://github.com/Nayjest/Gito/actions/workflows/tests.yml/badge.svg" alt="Tests"></a>
-<img src="https://github.com/Nayjest/Gito/blob/main/coverage.svg" alt="Code Coverage">
+<img src="https://raw.githubusercontent.com/Nayjest/Gito/main/coverage.svg" alt="Code Coverage">
 <a href="https://github.com/Nayjest/Gito/blob/main/LICENSE" target="_blank"><img src="https://img.shields.io/static/v1?label=license&message=MIT&color=d08aff" alt="License"></a>
 </p>
 
@@ -58,7 +58,7 @@ Get consistent, thorough code reviews in seconds—no waiting for human availabi
 - Open source projects maintaining high code quality at scale
 - CI/CD pipelines requiring automated quality gates
 
-✨ See [code review in action](https://github.com/Nayjest/Gito/pull/39#issuecomment-2906968729) ✨
+✨ See [code review in action](https://github.com/Nayjest/Gito/pull/99) ✨
 
 ## 🚀 Quickstart
 

ai_cr-2.0.3.dist-info/RECORD

@@ -0,0 +1,31 @@
+gito/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gito/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
+gito/bootstrap.py,sha256=vGI19asH0-GFj3_w_wqWucSAWPwgCP4-FkTgVuvyIGY,2517
+gito/cli.py,sha256=_OwUeOQr3seMVp6ZIOfHHvKBJIKWb3-kQic5nZ2tmgE,6563
+gito/commands/__init__.py,sha256=B2uUQsLMEsHfNT1N3lWYm38WSuQIHFmjiGs2tdBuDBA,55
+gito/commands/deploy.py,sha256=1199AisP3RIpz5v48JTPmQEcA7KIWqYF5lLkU2HEiJ4,3758
+gito/commands/fix.py,sha256=OS829xVrLMLQqlol9AoxJMZ9qaAWRCSbUkVNszK96ws,5305
+gito/commands/gh_post_review_comment.py,sha256=BTLcS5-pfmGtVjpQEG77jexFVvzme94_DMU51icaCpQ,3517
+gito/commands/gh_react_to_comment.py,sha256=Pu7T-rBB-jTJg1oUO34_FfpJsVgEIw-7rZRkTAL72tc,6396
+gito/commands/repl.py,sha256=wiM5vbGNIgAeyjOKt9QhrRdGYB13Md-QYx41dMIPvaU,544
+gito/config.toml,sha256=2gYU8R6UvYZg3ZniN4s2-kECmbC9k_K0nrk38-I1bKo,17596
+gito/constants.py,sha256=_G40SAMfuYjYsBzEVUIxKT8Vo0dAWIQqCWWxdaBAltY,766
+gito/core.py,sha256=tpPTMtjBCFtXuVshdbmL3fO6gc-bG-zlIPmnXCRdOhc,12648
+gito/gh_api.py,sha256=FlqENZo0nmdtAozaKYj582w05gfs3PpEevS48hyup3M,2925
+gito/issue_trackers.py,sha256=XYspyaIuf0ANQSvDUea5_oOdo9tQvpZZsapI5S9g78U,1551
+gito/pipeline.py,sha256=Nq5VUVrXVDXVVYX6nVSMX1CyhoWsNtSeTOQyNgQAsdE,2672
+gito/pipeline_steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gito/pipeline_steps/jira.py,sha256=cgRSHoU6j0lcK6hQfhg950PEmIu3uWLGMKZbW3-H3mg,1683
+gito/pipeline_steps/linear.py,sha256=6UDc8nGKGpwHruPq8VItE2QBWshWxaTapoMhu_qjN_g,2445
+gito/project_config.py,sha256=jOPVMgN01_krELlNXzZlrZOKmXZP-RLDS7iOgVSUyic,3182
+gito/report_struct.py,sha256=HuvetI4XWTNEm-afS9Fx2doTP0ybn0P22UbH-55ambs,4243
+gito/tpl/github_workflows/components/env-vars.jinja2,sha256=GPlIyhspqJFQLLjTAKz8yKeU563bsUs_n-Ao1MGmh_Y,355
+gito/tpl/github_workflows/components/installs.jinja2,sha256=fQJAici1KiF3C35leB8ovO7zAvwBvcZy9tSCHKyIdkI,186
+gito/tpl/github_workflows/gito-code-review.yml.jinja2,sha256=KpZdOsjINPT0TuL8FYA9TxK84hRqbGIkFjOI1XNew2g,1007
+gito/tpl/github_workflows/gito-react-to-comments.yml.jinja2,sha256=yPKa285eQZBHSbmSknmcQjfVqBzgUHR3SvBJg7u1Jsc,2173
+gito/utils.py,sha256=SOD89s5qpr0fToumUl7hYAPsOKfix_8MjoxeUks5s8I,6518
+ai_cr-2.0.3.dist-info/LICENSE,sha256=VbdF_GbbDK24JvdTfnsxa2M6jmhsxmRSFeHCx-lICGE,1075
+ai_cr-2.0.3.dist-info/METADATA,sha256=f6L-_hbYBYIdoYdigM_pdw4oUuzrgyMj_IGslT5-A-o,7989
+ai_cr-2.0.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+ai_cr-2.0.3.dist-info/entry_points.txt,sha256=Ua1DxkhJJ8TZuLgnH-IlWCkrre_0S0dq_GtYRaYupWk,38
+ai_cr-2.0.3.dist-info/RECORD,,

gito/bootstrap.py

@@ -1,12 +1,13 @@
 import logging
 import os
 from datetime import datetime
+from pathlib import Path
 
 import microcore as mc
 import typer
 
 from .utils import is_running_in_github_action
-from .constants import HOME_ENV_PATH, EXECUTABLE
+from .constants import HOME_ENV_PATH, EXECUTABLE, PROJECT_GITO_FOLDER
 
 
 def setup_logging():
@@ -36,6 +37,10 @@ def bootstrap():
             DOT_ENV_FILE=HOME_ENV_PATH,
             USE_LOGGING=True,
             EMBEDDING_DB_TYPE=mc.EmbeddingDbType.NONE,
+            PROMPT_TEMPLATES_PATH=[
+                PROJECT_GITO_FOLDER,
+                Path(__file__).parent / "tpl"
+            ],
         )
     except mc.LLMConfigError as e:
         msg = str(e)

gito/cli.py

@@ -15,7 +15,7 @@ from .bootstrap import bootstrap, app
 from .utils import no_subcommand, parse_refs_pair
 
 # Import fix command to register it
-from .commands import fix, gh_post_review_comment, gh_react_to_comment, repl  # noqa
+from .commands import fix, gh_post_review_comment, gh_react_to_comment, repl, deploy  # noqa
 
 
 app_no_subcommand = typer.Typer(pretty_exceptions_show_locals=False)

gito/commands/deploy.py

@@ -0,0 +1,101 @@
+from pathlib import Path
+
+import microcore as mc
+from microcore import ApiType, ui, utils
+from git import Repo
+
+from ..utils import version, extract_gh_owner_repo
+from ..bootstrap import app
+
+
+@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):
+    repo = Repo(".")
+    workflow_files = dict(
+        code_review=Path(".github/workflows/gito-code-review.yml"),
+        react_to_comments=Path(".github/workflows/gito-react-to-comments.yml")
+    )
+    for file in workflow_files.values():
+        if file.exists():
+            message = f"Gito workflow already exists at {utils.file_link(file)}."
+            if rewrite:
+                ui.warning(message)
+            else:
+                message += "\nUse --rewrite to overwrite it."
+                ui.error(message)
+                return False
+
+    api_types = [ApiType.ANTHROPIC, ApiType.OPEN_AI, ApiType.GOOGLE_AI_STUDIO]
+    default_models = {
+        ApiType.ANTHROPIC: "claude-sonnet-4-20250514",
+        ApiType.OPEN_AI: "gpt-4.1",
+        ApiType.GOOGLE_AI_STUDIO: "gemini-2.5-pro",
+    }
+    secret_names = {
+        ApiType.ANTHROPIC: "ANTHROPIC_API_KEY",
+        ApiType.OPEN_AI: "OPENAI_API_KEY",
+        ApiType.GOOGLE_AI_STUDIO: "GOOGLE_AI_API_KEY",
+    }
+    if not api_type:
+        api_type = mc.ui.ask_choose(
+            "Choose your LLM API type",
+            api_types,
+        )
+    elif api_type not in api_types:
+        mc.ui.error(f"Unsupported API type: {api_type}")
+        return False
+    major, minor, *_ = version().split(".")
+    template_vars = dict(
+        model=default_models[api_type],
+        api_type=api_type,
+        secret_name=secret_names[api_type],
+        major=major,
+        minor=minor,
+        ApiType=ApiType,
+        remove_indent=True,
+    )
+    gito_code_review_yml = mc.tpl(
+        "github_workflows/gito-code-review.yml.jinja2",
+        **template_vars
+    )
+    gito_react_to_comments_yml = mc.tpl(
+        "github_workflows/gito-react-to-comments.yml.jinja2",
+        **template_vars
+    )
+
+    workflow_files["code_review"].parent.mkdir(parents=True, exist_ok=True)
+    workflow_files["code_review"].write_text(gito_code_review_yml)
+    workflow_files["react_to_comments"].write_text(gito_react_to_comments_yml)
+    print(
+        mc.ui.green("Gito workflows have been created.\n")
+        + f"  - {mc.utils.file_link(workflow_files['code_review'])}\n"
+        + f"  - {mc.utils.file_link(workflow_files['react_to_comments'])}\n"
+    )
+    owner, repo_name = extract_gh_owner_repo(repo)
+    if commit is True or commit is None and mc.ui.ask_yn(
+        "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"
+        )
+    else:
+        print(
+            "Now you can commit and push created GitHub workflows to your main repository branch.\n"
+        )
+
+    print(
+        "(!IMPORTANT):\n"
+        f"Add {mc.ui.cyan(secret_names[api_type])} with actual API_KEY "
+        "to your repository secrets here:\n"
+        f"https://github.com/{owner}/{repo_name}/settings/secrets/actions"
+    )
+    return True

gito/commands/gh_post_review_comment.py

@@ -1,17 +1,24 @@
 import logging
 import os
+from time import sleep
 
 import typer
-from gito.bootstrap import app
-from gito.constants import GITHUB_MD_REPORT_FILE_NAME
-from gito.gh_api import post_gh_comment
-from gito.project_config import ProjectConfig
+from ghapi.core import GhApi
+
+from ..bootstrap import app
+from ..constants import GITHUB_MD_REPORT_FILE_NAME, HTML_CR_COMMENT_MARKER
+from ..gh_api import (
+    post_gh_comment,
+    resolve_gh_token,
+    hide_gh_comment,
+)
+from ..project_config import ProjectConfig
 
 
 @app.command(help="Leave a GitHub PR comment with the review.")
 def github_comment(
     token: str = typer.Option(
-        os.environ.get("GITHUB_TOKEN", ""), help="GitHub token (or set GITHUB_TOKEN env var)"
+        "", help="GitHub token (or set GITHUB_TOKEN env var)"
     ),
 ):
     """
@@ -25,13 +32,14 @@ def github_comment(
     with open(file, "r", encoding="utf-8") as f:
         body = f.read()
 
+    token = resolve_gh_token(token)
     if not token:
         print("GitHub token is required (--token or GITHUB_TOKEN env var).")
         raise typer.Exit(1)
-
-    github_env = ProjectConfig.load().prompt_vars["github_env"]
-    repo = github_env.get("github_repo", "")
-    pr_env_val = github_env.get("github_pr_number", "")
+    config = ProjectConfig.load()
+    gh_env = config.prompt_vars["github_env"]
+    gh_repo = gh_env.get("github_repo", "")
+    pr_env_val = gh_env.get("github_pr_number", "")
     logging.info(f"github_pr_number = {pr_env_val}")
 
     pr = None
@@ -59,5 +67,42 @@ def github_comment(
         logging.error("Could not resolve PR number from environment variables.")
         raise typer.Exit(3)
 
-    if not post_gh_comment(repo, pr, token, body):
+    if not post_gh_comment(gh_repo, pr, token, body):
         raise typer.Exit(5)
+
+    if config.collapse_previous_code_review_comments:
+        sleep(1)
+        collapse_gh_outdated_cr_comments(gh_repo, pr, token)
+
+
+def collapse_gh_outdated_cr_comments(
+    gh_repository: str,
+    pr_or_issue_number: int,
+    token: str = None
+):
+    """
+    Collapse outdated code review comments in a GitHub pull request or issue.
+    """
+    logging.info(f"Collapsing outdated comments in {gh_repository} #{pr_or_issue_number}...")
+
+    token = resolve_gh_token(token)
+    owner, repo = gh_repository.split('/')
+    api = GhApi(owner, repo, token=token)
+
+    comments = api.issues.list_comments(pr_or_issue_number)
+    review_marker = HTML_CR_COMMENT_MARKER
+    collapsed_title = "🗑️ Outdated Code Review by Gito"
+    collapsed_marker = f"<summary>{collapsed_title}</summary>"
+    outdated_comments = [
+        c for c in comments
+        if c.body and review_marker in c.body and collapsed_marker not in c.body
+    ][:-1]
+    if not outdated_comments:
+        logging.info("No outdated comments found")
+        return
+    for comment in outdated_comments:
+        logging.info(f"Collapsing comment {comment.id}...")
+        new_body = f"<details>\n<summary>{collapsed_title}</summary>\n\n{comment.body}\n</details>"
+        api.issues.update_comment(comment.id, new_body)
+        hide_gh_comment(comment.node_id, token)
+    logging.info("All outdated comments collapsed successfully.")

gito/commands/gh_react_to_comment.py

@@ -19,7 +19,7 @@ import git
 from ..bootstrap import app
 from ..constants import JSON_REPORT_FILE_NAME, HTML_TEXT_ICON
 from ..core import answer
-from ..gh_api import post_gh_comment
+from ..gh_api import post_gh_comment, resolve_gh_token
 from ..project_config import ProjectConfig
 from ..utils import extract_gh_owner_repo
 from .fix import fix
@@ -51,9 +51,7 @@ def react_to_comment(
     repo = git.Repo(".")  # Current directory
     owner, repo_name = extract_gh_owner_repo(repo)
     logging.info(f"Using repository: {ui.yellow}{owner}/{repo_name}{ui.reset}")
-    gh_token = (
-        gh_token or os.getenv("GITHUB_TOKEN", None) or os.getenv("GH_TOKEN", None)
-    )
+    gh_token = resolve_gh_token(gh_token)
     api = GhApi(owner=owner, repo=repo_name, token=gh_token)
     comment = api.issues.get_comment(comment_id=comment_id)
     logging.info(

gito/commands/repl.py

@@ -20,6 +20,7 @@ from ..cli import app
 from ..constants import *
 from ..core import *
 from ..utils import *
+from ..gh_api import *
 
 
 @app.command(help="python REPL")

gito/config.toml

@@ -3,6 +3,7 @@
 # Defines the keyword or mention tag that triggers bot actions when referenced in code review comments.
 # list of strings, case-insensitive
 mention_triggers = ["gito", "bot", "ai", "/fix"]
+collapse_previous_code_review_comments = true
 report_template_md = """
 <h2>{{ HTML_TEXT_ICON }}I've Reviewed the Code</h2>
 
@@ -36,7 +37,7 @@ report_template_md = """
     {%- endfor -%}
     {{ "\n" }}
 {%- endfor -%}
-
+{{- HTML_CR_COMMENT_MARKER -}}
 """
 report_template_cli = """
 {{ Back.BLUE }}  +  +  +  ---==<<[ CODE REVIEW{{Style.NORMAL}} ]>>==---  +  +  +  {{Style.RESET_ALL}}
@@ -134,18 +135,18 @@ Review the provided code diff carefully and identify *only* highly confident iss
 {{ requirements -}}
 {{ json_requirements }}
 
-Respond with a valid JSON array of issues in the following format:
+Respond with a valid JSON array of issues following this schema:
 [
     {
         "title": "<issue_title>",
         "details": "<issue_description>",
-        "tags": ["<issue_tag1>", "<issue_tag2>"],
-        "severity": <issue_severity>,
-        "confidence": <confidence_score>,
-        "affected_lines": [ // optional; list of affected lines
+        "tags": ["<issue_tag1>", "<issue_tag2>", ...],
+        "severity": <issue_severity:int>,
+        "confidence": <confidence_score:int>,
+        "affected_lines": [ // optional;
             {
-                "start_line": <start_line:int>,
-                "end_line": <end_line:int>,
+                "start_line": <int>,
+                "end_line": <int>,
                 "proposal": "<proposed code to replace the affected lines (optional)>"
             },
             ...
@@ -153,6 +154,10 @@ Respond with a valid JSON array of issues in the following format:
     },
     ...
 ]
+
+- if present, `proposal` blocks must match the indentation of the original code
+  and apply cleanly to lines `start_line`..`end_line`. It is designed for programmatical substitution.
+
 Available issue tags:
 - bug
 - security

gito/constants.py

@@ -10,3 +10,4 @@ GITHUB_MD_REPORT_FILE_NAME = "code-review-report.md"
 EXECUTABLE = "gito"
 TEXT_ICON_URL = 'https://raw.githubusercontent.com/Nayjest/Gito/main/press-kit/logo/gito-bot-1_64top.png'  # noqa: E501
 HTML_TEXT_ICON = f'<a href="https://github.com/Nayjest/Gito"><img src="{TEXT_ICON_URL}" align="left" width=64 height=50 /></a>'  # noqa: E501
+HTML_CR_COMMENT_MARKER = '<!-- GITO_COMMENT:CODE_REVIEW_REPORT -->'

gito/core.py

@@ -5,8 +5,9 @@ from typing import Iterable
 from pathlib import Path
 
 import microcore as mc
-from git import Repo
-from gito.pipeline import Pipeline
+from microcore import ui
+from git import Repo, Commit
+from git.exc import GitCommandError
 from unidiff import PatchSet, PatchedFile
 from unidiff.constants import DEV_NULL
 
@@ -14,6 +15,7 @@ from .project_config import ProjectConfig
 from .report_struct import Report
 from .constants import JSON_REPORT_FILE_NAME
 from .utils import stream_to_cli
+from .pipeline import Pipeline
 
 
 def review_subject_is_index(what):
@@ -51,6 +53,16 @@ def is_binary_file(repo: Repo, file_path: str) -> bool:
         return True  # Conservatively treat errors as binary to avoid issues
 
 
+def commit_in_branch(repo: Repo, commit: Commit, target_branch: str) -> bool:
+    try:
+        # exit code 0 if commit is ancestor of branch
+        repo.git.merge_base('--is-ancestor', commit.hexsha, target_branch)
+        return True
+    except GitCommandError:
+        pass
+    return False
+
+
 def get_diff(
     repo: Repo = None,
     what: str = None,
@@ -76,12 +88,56 @@ def get_diff(
         else:
             current_ref = what
         merge_base = repo.merge_base(current_ref or repo.active_branch.name, against)[0]
-        against = merge_base.hexsha
-        logging.info(
-            f"Using merge base: {mc.ui.cyan(merge_base.hexsha[:8])} ({merge_base.summary})"
-        )
+
+        # if branch is already an ancestor of "against", merge_base == branch ⇒ it’s been merged
+        if merge_base.hexsha == repo.commit(current_ref or repo.active_branch.name).hexsha:
+            # @todo: check case: reviewing working copy index in main branch #103
+            logging.info(
+                f"Branch is already merged. ({ui.green(current_ref)} vs {ui.yellow(against)})"
+            )
+            merge_sha = repo.git.log(
+                '--merges',
+                '--ancestry-path',
+                f'{current_ref}..{against}',
+                '-n',
+                '1',
+                '--pretty=format:%H'
+            ).strip()
+            if merge_sha:
+                merge_commit = repo.commit(merge_sha)
+
+                other_merge_parent = None
+                for parent in merge_commit.parents:
+                    if parent.hexsha == merge_base.hexsha:
+                        continue
+                    if not commit_in_branch(repo, parent, against):
+                        logging.warning(f"merge parent is not in {against}, skipping")
+                        continue
+                    other_merge_parent = parent
+                    break
+                if other_merge_parent:
+                    first_common_ancestor = repo.merge_base(other_merge_parent, merge_base)[0]
+                    logging.info(
+                        f"{what} will be compared to "
+                        f"first common ancestor of {what} and {against}: "
+                        f"{ui.cyan(first_common_ancestor.hexsha[:8])}"
+                    )
+                    against = first_common_ancestor.hexsha
+                else:
+                    logging.error(f"Can't find other merge parent for {merge_sha}")
+            else:
+                logging.error(
+                    f"No merge‐commit found for {current_ref!r}→{against!r}; "
+                    "falling back to merge‐base diff"
+                )
+        else:
+            # normal case: branch not yet merged
+            against = merge_base.hexsha
+            logging.info(
+                f"Using merge base: {ui.cyan(merge_base.hexsha[:8])} ({merge_base.summary})"
+            )
     logging.info(
-        f"Making diff: {mc.ui.green(what or 'INDEX')} vs {mc.ui.yellow(against)}"
+        f"Making diff: {ui.green(what or 'INDEX')} vs {ui.yellow(against)}"
     )
     diff_content = repo.git.diff(against, what)
     diff = PatchSet.from_string(diff_content)
@@ -197,6 +253,41 @@ def _prepare(
     return repo, cfg, diff, lines
 
 
+def get_affected_code_block(repo: Repo, file: str, start_line: int, end_line: int) -> str | None:
+    if not start_line or not end_line:
+        return None
+    try:
+        if isinstance(start_line, str):
+            start_line = int(start_line)
+        if isinstance(end_line, str):
+            end_line = int(end_line)
+        lines = file_lines(repo, file, max_tokens=None, use_local_files=True)
+        if lines:
+            lines = [""] + lines.splitlines()
+            return "\n".join(
+                lines[start_line: end_line + 1]
+            )
+    except Exception as e:
+        logging.error(
+            f"Error getting affected code block for {file} from {start_line} to {end_line}: {e}"
+        )
+    return None
+
+
+def provide_affected_code_blocks(issues: dict, repo: Repo):
+    for file, file_issues in issues.items():
+        for issue in file_issues:
+            for i in issue.get("affected_lines", []):
+                file_name = i.get("file", issue.get("file", file))
+                if block := get_affected_code_block(
+                    repo,
+                    file_name,
+                    i.get("start_line"),
+                    i.get("end_line")
+                ):
+                    i["affected_code"] = block
+
+
 async def review(
     repo: Repo = None,
     what: str = None,
@@ -226,14 +317,7 @@ async def review(
         parse_json=True,
     )
     issues = {file.path: issues for file, issues in zip(diff, responses) if issues}
-    for file, file_issues in issues.items():
-        for issue in file_issues:
-            for i in issue.get("affected_lines", []):
-                if lines[file]:
-                    f_lines = [""] + lines[file].splitlines()
-                    i["affected_code"] = "\n".join(
-                        f_lines[i["start_line"]: i["end_line"] + 1]
-                    )
+    provide_affected_code_blocks(issues, repo)
     exec(cfg.post_process, {"mc": mc, **locals()})
     out_folder = Path(out_folder or repo.working_tree_dir)
     out_folder.mkdir(parents=True, exist_ok=True)

gito/gh_api.py

@@ -1,6 +1,12 @@
+import os
 import logging
 
 import requests
+from fastcore.basics import AttrDict  # objects returned by ghapi
+
+
+def resolve_gh_token(token_or_none):
+    return token_or_none or os.getenv("GITHUB_TOKEN", None) or os.getenv("GH_TOKEN", None)
 
 
 def post_gh_comment(
@@ -33,3 +39,47 @@ def post_gh_comment(
     else:
         logging.error(f"Failed to post comment: {resp.status_code} {resp.reason}\n{resp.text}")
         return False
+
+
+def hide_gh_comment(
+    comment: dict | str,
+    token: str = None,
+    reason: str = "OUTDATED"
+) -> bool:
+    """
+    Hide a GitHub comment using GraphQL API with specified reason.
+    Args:
+        comment (dict | str):
+            The comment to hide,
+            either as a object returned from ghapi or a string node ID.
+            note: comment.id is not the same as node_id.
+        token (str): GitHub personal access token with permissions to minimize comments.
+        reason (str): The reason for hiding the comment, e.g., "OUTDATED".
+    """
+    comment_node_id = comment.node_id if isinstance(comment, AttrDict) else comment
+    token = resolve_gh_token(token)
+    mutation = """
+    mutation($commentId: ID!, $reason: ReportedContentClassifiers!) {
+        minimizeComment(input: {subjectId: $commentId, classifier: $reason}) {
+            minimizedComment { isMinimized }
+        }
+    }"""
+
+    response = requests.post(
+        "https://api.github.com/graphql",
+        headers={"Authorization": f"Bearer {token}"},
+        json={
+            "query": mutation,
+            "variables": {"commentId": comment_node_id, "reason": reason}
+        }
+    )
+    success = (
+        response.status_code == 200
+        and response.json().get("data", {}).get("minimizeComment") is not None
+    )
+    if not success:
+        logging.error(
+            f"Failed to hide comment {comment_node_id}: "
+            f"{response.status_code} {response.reason}\n{response.text}"
+        )
+    return success

gito/issue_trackers.py

@@ -15,9 +15,10 @@ class IssueTrackerIssue:
 
 
 def extract_issue_key(branch_name: str, min_len=2, max_len=10) -> str | None:
-    pattern = fr"\b[A-Z][A-Z0-9]{{{min_len - 1},{max_len - 1}}}-\d+\b"
+    boundary = r'\b|_|-|/|\\'
+    pattern = fr"(?:{boundary})([A-Z][A-Z0-9]{{{min_len - 1},{max_len - 1}}}-\d+)(?:{boundary})"
     match = re.search(pattern, branch_name)
-    return match.group(0) if match else None
+    return match.group(1) if match else None
 
 
 def get_branch(repo: git.Repo):

gito/pipeline_steps/linear.py

@@ -7,10 +7,11 @@ import git
 from gito.issue_trackers import IssueTrackerIssue, resolve_issue_key
 
 
-def fetch_issue(issue_key, api_key) -> IssueTrackerIssue | None:
+def fetch_issue(issue_key: str, api_key: str = None) -> IssueTrackerIssue | None:
     """
     Fetch a Linear issue using GraphQL API.
     """
+    api_key = api_key or os.getenv("LINEAR_API_KEY")
     try:
         url = "https://api.linear.app/graphql"
         headers = {
@@ -36,7 +37,7 @@ def fetch_issue(issue_key, api_key) -> IssueTrackerIssue | None:
             url,
             json={
                 "query": query,
-                "variables":  {'teamKey': team_key, 'issueNumber': int(issue_number)}
+                "variables": {'teamKey': team_key, 'issueNumber': int(issue_number)}
             },
             headers=headers
         )

gito/project_config.py

@@ -33,6 +33,11 @@ class ProjectConfig:
     when referenced in code review comments.
     """
     pipeline_steps: dict[str, dict | PipelineStep] = field(default_factory=dict)
+    collapse_previous_code_review_comments: bool = field(default=True)
+    """
+    If True, previously added code review comments in the pull request
+    will be collapsed automatically when a new comment is added.
+    """
 
     def __post_init__(self):
         self.pipeline_steps = {
@@ -61,10 +66,16 @@ class ProjectConfig:
             logging.info(
                 f"Loading project-specific configuration from {mc.utils.file_link(config_path)}...")
             default_prompt_vars = config["prompt_vars"]
+            default_pipeline_steps = config["pipeline_steps"]
             with open(config_path, "rb") as f:
                 config.update(tomllib.load(f))
             # overriding prompt_vars config section will not empty default values
             config["prompt_vars"] = default_prompt_vars | config["prompt_vars"]
+            # merge individual pipeline steps
+            for k, v in config["pipeline_steps"].items():
+                config["pipeline_steps"][k] = default_pipeline_steps.get(k, {}) | v
+            # merge pipeline steps dict
+            config["pipeline_steps"] = default_pipeline_steps | config["pipeline_steps"]
         else:
             logging.info(
                 f"No project config found at {ui.blue(config_path)}, using defaults"

gito/report_struct.py

@@ -10,7 +10,7 @@ from colorama import Fore, Style, Back
 from microcore.utils import file_link
 import textwrap
 
-from .constants import JSON_REPORT_FILE_NAME, HTML_TEXT_ICON
+from .constants import JSON_REPORT_FILE_NAME, HTML_TEXT_ICON, HTML_CR_COMMENT_MARKER
 from .project_config import ProjectConfig
 from .utils import syntax_hint, block_wrap_lr, max_line_len
 
@@ -125,6 +125,7 @@ class Report:
             block_wrap_lr=block_wrap_lr,
             max_line_len=max_line_len,
             HTML_TEXT_ICON=HTML_TEXT_ICON,
+            HTML_CR_COMMENT_MARKER=HTML_CR_COMMENT_MARKER,
             **config.prompt_vars
         )
 

gito/tpl/github_workflows/components/env-vars.jinja2

@@ -0,0 +1,10 @@
+
+        LLM_API_TYPE: {{ api_type }}
+        LLM_API_KEY: {{ "${{ secrets." + secret_name + "}}" }}
+        MODEL: {{ model }}
+        {% raw -%}
+        JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
+        JIRA_URL: ${{ secrets.JIRA_URL }}
+        JIRA_USER: ${{ secrets.JIRA_USER }}
+        LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
+        {%- endraw %}

gito/tpl/github_workflows/components/installs.jinja2

@@ -0,0 +1,8 @@
+
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with: { python-version: "3.13" }
+
+    - name: Install Gito
+      run: pip install gito.bot~={{ major }}.{{ minor }}

gito/tpl/github_workflows/gito-code-review.yml.jinja2

@@ -0,0 +1,33 @@
+name: "Gito: AI Code Reviewer"
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "Pull Request number"
+        required: true
+jobs:
+  review:
+    runs-on: ubuntu-latest
+    permissions: { contents: read, pull-requests: write } # 'write' for leaving the summary comment
+    steps:
+    - uses: actions/checkout@v4
+      with: { fetch-depth: 0 }
+
+    {%- include("github_workflows/components/installs.jinja2") %}
+
+    - name: Run AI code review
+      env:
+        {%- include("github_workflows/components/env-vars.jinja2") %}
+        PR_NUMBER_FROM_WORKFLOW_DISPATCH: {% raw %}${{ github.event.inputs.pr_number }}{% endraw %}
+      run: |
+        gito --verbose review
+        gito github-comment --token {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: gito-code-review-results
+        path: |
+          code-review-report.md
+          code-review-report.json

gito/tpl/github_workflows/gito-react-to-comments.yml.jinja2

@@ -0,0 +1,70 @@
+name: "Gito: React to GitHub comment"
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: write  # to make PR
+  issues: write
+  pull-requests: write
+  # read: to download the code review artifact
+  # write: to trigger other actions
+  actions: write
+
+jobs:
+  process-comment:
+    if: |
+      github.event.issue.pull_request &&
+      (
+        github.event.comment.author_association == 'OWNER' ||
+        github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'COLLABORATOR'
+      ) &&
+      (
+        startsWith(github.event.comment.body, '/') ||
+        startsWith(github.event.comment.body, 'gito') ||
+        startsWith(github.event.comment.body, 'ai') ||
+        startsWith(github.event.comment.body, 'bot') ||
+        contains(github.event.comment.body, '@gito') ||
+        contains(github.event.comment.body, '@ai') ||
+        contains(github.event.comment.body, '@bot')
+      )
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Get PR details
+      id: pr
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const pr = await github.rest.pulls.get({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            pull_number: context.issue.number
+          });
+          return {
+            head_ref: pr.data.head.ref,
+            head_sha: pr.data.head.sha,
+            base_ref: pr.data.base.ref
+          };
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        {% raw -%}
+        repository: ${{ github.repository }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+        ref: ${{ fromJson(steps.pr.outputs.result).head_ref }}
+        fetch-depth: 0
+        {%- endraw %}
+
+      {%- include("github_workflows/components/installs.jinja2") %}
+
+    - name: Run Gito react
+      env:
+        # LLM config is needed only if answer_github_comments = true in .gito/config.toml
+        # Otherwise, use LLM_API_TYPE: none
+        {%- include("github_workflows/components/env-vars.jinja2") %}
+      run: |
+        {% raw %}gito react-to-comment ${{ github.event.comment.id }} --token ${{ secrets.GITHUB_TOKEN }}{%- endraw %}

gito/utils.py

@@ -2,6 +2,7 @@ import re
 import sys
 import os
 from pathlib import Path
+import importlib.metadata
 
 import typer
 import git
@@ -224,3 +225,7 @@ def detect_github_env() -> dict:
 
 def stream_to_cli(text):
     print(ui.blue(text), end='')
+
+
+def version() -> str:
+    return importlib.metadata.version("gito.bot")

ai_cr-2.0.1.dist-info/RECORD

@@ -1,26 +0,0 @@
-gito/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gito/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
-gito/bootstrap.py,sha256=ceeoSCD8RX4xKxWri_n0xx00aTFS6xPUHhAs3rKVP5o,2337
-gito/cli.py,sha256=qFY1ObA0-Ep19bNSEcwjn6KIu2OOSWDj6QGe_o7Ujoc,6555
-gito/commands/__init__.py,sha256=B2uUQsLMEsHfNT1N3lWYm38WSuQIHFmjiGs2tdBuDBA,55
-gito/commands/fix.py,sha256=OS829xVrLMLQqlol9AoxJMZ9qaAWRCSbUkVNszK96ws,5305
-gito/commands/gh_post_review_comment.py,sha256=oZh3kSRBx3cSMozI2llDEOVZ2WeT_5msXMLLCiLina4,1984
-gito/commands/gh_react_to_comment.py,sha256=4uUb39FnM45DO-wESQq6pUlO5AFvh0FSluCCTxkl8_g,6442
-gito/commands/repl.py,sha256=wDHWl2VyRK32hLZHImrhqpQNkWV3u3358fwDiA6D3iA,521
-gito/config.toml,sha256=iK0CeP3mynTnWIEsCi_jA9Gtb_UdAqwLC5nWHSTc-zc,17367
-gito/constants.py,sha256=9G4sZbqLBg13FYieJqkq_hzek4-smmL4KKYF64tovQQ,698
-gito/core.py,sha256=tp-eB_FIsZ2wffTiMrRLc_9MaFaGIky_ExWHWTf1DTk,9341
-gito/gh_api.py,sha256=syhM8sbs_lLNG53bfRHQpusO818nwXCl4jDxVY__IK0,1204
-gito/issue_trackers.py,sha256=nfib6zhvmL_zjRDCdZ0d6rMT4ZFJ3PxO5UORaJzb6gk,1495
-gito/pipeline.py,sha256=Nq5VUVrXVDXVVYX6nVSMX1CyhoWsNtSeTOQyNgQAsdE,2672
-gito/pipeline_steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gito/pipeline_steps/jira.py,sha256=cgRSHoU6j0lcK6hQfhg950PEmIu3uWLGMKZbW3-H3mg,1683
-gito/pipeline_steps/linear.py,sha256=stCuTWgVF3SG1XNmIdNwelTDQzKE9PnJLIOS27wKavw,2376
-gito/project_config.py,sha256=XdpXsRDFWBNNpktbZDp9p-nbijyKjG_oD6UWzGZSLjM,2580
-gito/report_struct.py,sha256=tLhdmCPse3Jbo56y752vuGlndWY2f2g_mNFQ-BmJZGw,4160
-gito/utils.py,sha256=HpterYtjceVhklJe0w1n7PIQJk8MJFUYi4FiG-CzMqg,6418
-ai_cr-2.0.1.dist-info/LICENSE,sha256=VbdF_GbbDK24JvdTfnsxa2M6jmhsxmRSFeHCx-lICGE,1075
-ai_cr-2.0.1.dist-info/METADATA,sha256=0-kY4AU4Af24ElJj6n4bLLHVxfcpwmZpdbUFkpNur8w,8003
-ai_cr-2.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-ai_cr-2.0.1.dist-info/entry_points.txt,sha256=Ua1DxkhJJ8TZuLgnH-IlWCkrre_0S0dq_GtYRaYupWk,38
-ai_cr-2.0.1.dist-info/RECORD,,