fix

Author: timothedelion

packages/gg_api_core/pyproject.toml

@@ -12,6 +12,7 @@ dependencies = [
     "mcp[cli]>=1.9.0",
     "python-dotenv>=1.0.0",
     "pydantic-settings>=2.0.0",
+    "jinja2>=3.1.0",
 ]
 
 [build-system]

packages/gg_api_core/src/gg_api_core/tools/remediate_secret_incidents.py

@@ -2,6 +2,7 @@
 from typing import Any
 import logging
 
+from jinja2 import Template
 from pydantic import BaseModel, Field, model_validator
 
 from gg_api_core.client import TagNames
@@ -11,7 +12,7 @@
 
 logger = logging.getLogger(__name__)
 
-REMEDIATION_PROMPT_PATH = Path("remediation_prompt.md")
+REMEDIATION_PROMPT_PATH = Path(__file__).parent / "remediation_prompt.md"
 
 
 class ListRepoOccurrencesParamsForRemediate(ListRepoOccurrencesParams):
@@ -25,6 +26,15 @@ class ListRepoOccurrencesParamsForRemediate(ListRepoOccurrencesParams):
 
 class RemediateSecretIncidentsParams(BaseModel):
     """Parameters for remediating secret incidents."""
+    repository_name: str | None = Field(
+        default=None,
+        description="The full repository name. For example, for https://github.com/GitGuardian/ggmcp.git the full name is GitGuardian/ggmcp. Pass the current repository name if not provided.",
+    )
+    source_id: str | int | None = Field(
+        default=None,
+        description="The source ID of the repository. Pass the current repository source ID if not provided.",
+    )
+    get_all: bool = Field(default=True, description="Whether to get all occurrences or just the first page")
     mine: bool = Field(
         default=False,
         description="If True, fetch only incidents assigned to the current user. Set to False to get all incidents.",
@@ -48,6 +58,13 @@ class RemediateSecretIncidentsParams(BaseModel):
         description="Parameters for listing repository occurrences",
     )
 
+    @model_validator(mode="after")
+    def validate_source_or_repository(self) -> "RemediateSecretIncidentsParams":
+        """Validate that either source_id or repository_name is provided."""
+        if not self.source_id and not self.repository_name:
+            raise ValueError("Either 'source_id' or 'repository_name' must be provided")
+        return self
+
 
 class RemediateSecretIncidentsResult(BaseModel):
     """Result from remediating secret incidents."""
@@ -108,17 +125,20 @@ async def remediate_secret_incidents(
 
         occurrences = occurrences_result.occurrences
         if params.mine:
-            occurrences = filter_mine(occurrences)
+            occurrences = await filter_mine(occurrences)
         occurrences_count = len(occurrences)
         occurrences_result.occurrences = await trim_occurrences_for_remediation(occurrences)
 
         if not occurrences:
             remediation_instructions = ("No secret occurrences found for this repository that match the criteria. "
                                         "Adjust 'list_repo_occurrences_params' to modify filtering.")
         else:
-            remediation_instructions = REMEDIATION_PROMPT_PATH.format(
+            # Load and render the Jinja2 template
+            template_content = REMEDIATION_PROMPT_PATH.read_text()
+            template = Template(template_content)
+            remediation_instructions = template.render(
                 add_to_env=params.add_to_env,
-                create_env_example=params.create_env_example,
+                env_example=params.create_env_example,
                 git_commands=params.git_commands,
             )
         return RemediateSecretIncidentsResult(