diff --git a/aider_gitea/__init__.py b/aider_gitea/__init__.py
index 4f356a5..2df0e46 100644
--- a/aider_gitea/__init__.py
+++ b/aider_gitea/__init__.py
@@ -103,7 +103,11 @@ class RepositoryConfig:
 class IssueResolution:
     success: bool
     pull_request_url: str | None = None
-    pull_request_id: str | None = None
+    pull_request_id: int | None = None
+
+    def __post_init__(self):
+        assert self.pull_request_id is None or isinstance(self.pull_request_id, int)
+        assert self.pull_request_url is None or isinstance(self.pull_request_url, str)
 
 
 def generate_branch_name(issue_number: str, issue_title: str) -> str:
@@ -283,8 +287,8 @@ def push_changes(
     # Extract PR number and URL if available
     return IssueResolution(
         True,
-        str(pr_response.get('number')),
         pr_response.get('html_url'),
+        int(pr_response.get('number')),
     )
 
 
@@ -542,7 +546,7 @@ def solve_issues_in_repository(
 
 def handle_pr_comments(
     repository_config,
-    pr_number,
+    pr_number: int,
     branch_name,
     repository_path,
     client,
diff --git a/aider_gitea/gitea_client.py b/aider_gitea/gitea_client.py
index 4133096..89e9498 100644
--- a/aider_gitea/gitea_client.py
+++ b/aider_gitea/gitea_client.py
@@ -187,11 +187,12 @@ class GiteaClient:
         self,
         owner: str,
         repo: str,
-        pr_number: str,
+        pr_number: int,
     ) -> list[dict]:
         """
         Fetch comments for a pull request.
         """
+        assert isinstance(pr_number, int)
         url = f'{self.gitea_url}/repos/{owner}/{repo}/pulls/{pr_number}/comments'
         response = self.session.get(url)
         response.raise_for_status()