feat: Add general PR comments support and refactor review creation (#179)

Author: finxo

plugins/titan-plugin-github/tests/services/test_review_service.py

@@ -251,3 +251,51 @@ def test_resolve_review_thread_api_error(review_service, mock_graphql_network):
 
     assert isinstance(result, ClientError)
     assert result.error_code == "API_ERROR"
+
+
+def test_create_draft_review_success(review_service, mock_gh_network):
+    """Test successful draft review creation via GHNetwork (not raw subprocess)."""
+    payload = {
+        "commit_id": "abc123",
+        "body": "Review body",
+        "event": "COMMENT",
+        "comments": []
+    }
+    mock_gh_network.run_command.return_value = json.dumps({"id": 42})
+    mock_gh_network.get_repo_string.return_value = "owner/repo"
+
+    result = review_service.create_draft_review(pr_number=1, payload=payload)
+
+    assert isinstance(result, ClientSuccess)
+    assert result.data == 42
+
+    # Verify it went through GHNetwork, not raw subprocess
+    call_args = mock_gh_network.run_command.call_args
+    args = call_args[0][0]
+    assert "--method" in args
+    assert "POST" in args
+    assert "/pulls/1/reviews" in " ".join(args)
+    # Payload passed as stdin_input, not via subprocess directly
+    assert call_args[1].get("stdin_input") or call_args[0][1]
+
+
+def test_create_draft_review_parse_error(review_service, mock_gh_network):
+    """Test handling invalid JSON response from gh CLI."""
+    mock_gh_network.run_command.return_value = "not-valid-json"
+    mock_gh_network.get_repo_string.return_value = "owner/repo"
+
+    result = review_service.create_draft_review(pr_number=1, payload={})
+
+    assert isinstance(result, ClientError)
+    assert result.error_code == "PARSE_ERROR"
+
+
+def test_create_draft_review_api_error(review_service, mock_gh_network):
+    """Test handling gh CLI failure during draft review creation."""
+    mock_gh_network.run_command.side_effect = GitHubAPIError("Unauthorized")
+    mock_gh_network.get_repo_string.return_value = "owner/repo"
+
+    result = review_service.create_draft_review(pr_number=1, payload={})
+
+    assert isinstance(result, ClientError)
+    assert result.error_code == "API_ERROR"

plugins/titan-plugin-github/tests/unit/test_comment_operations.py

@@ -9,6 +9,7 @@
 from titan_cli.core.result import ClientSuccess, ClientError
 from titan_plugin_github.operations.comment_operations import (
     build_ai_review_context,
+    build_ai_review_prompt,
     find_ai_response_file,
     create_commit_message,
     reply_to_comment_batch,
@@ -61,6 +62,40 @@ def test_handles_missing_diff_hunk(self, sample_ui_comment_thread):
 
 
 
+@pytest.mark.unit
+class TestBuildAIReviewPrompt:
+    """Test AI review prompt building"""
+
+    def test_includes_response_file_path(self):
+        """Test that response_file path appears in the prompt"""
+        prompt = build_ai_review_prompt("/tmp/titan-ai-response-comment-123.txt")
+
+        assert "/tmp/titan-ai-response-comment-123.txt" in prompt
+
+    def test_preserves_context_placeholder(self):
+        """Test that {context} placeholder is preserved for later substitution"""
+        prompt = build_ai_review_prompt("/tmp/response.txt")
+
+        assert "{context}" in prompt
+
+    def test_different_paths_produce_different_prompts(self):
+        """Test that different response file paths produce different prompts"""
+        prompt_a = build_ai_review_prompt("/tmp/response-111.txt")
+        prompt_b = build_ai_review_prompt("/tmp/response-222.txt")
+
+        assert prompt_a != prompt_b
+        assert "/tmp/response-111.txt" in prompt_a
+        assert "/tmp/response-222.txt" in prompt_b
+
+    def test_prompt_contains_key_instructions(self):
+        """Test that the prompt includes the core task instructions"""
+        prompt = build_ai_review_prompt("/tmp/response.txt")
+
+        assert "Your Task" in prompt
+        assert "code changes" in prompt
+        assert "Ctrl+C" in prompt
+
+
 @pytest.mark.unit
 class TestFindAIResponseFile:
     """Test AI response file finding"""

plugins/titan-plugin-github/titan_plugin_github/clients/github_client.py

@@ -215,6 +215,10 @@ def reply_to_comment(
         """Reply to a PR comment."""
         return self._review_service.reply_to_comment(pr_number, comment_id, body)
 
+    def get_pr_general_comments(self, pr_number: int) -> ClientResult[List[UICommentThread]]:
+        """Get general PR comments (not attached to code lines)."""
+        return self._review_service.get_pr_general_comments(pr_number)
+
     def add_issue_comment(self, pr_number: int, body: str) -> ClientResult[None]:
         """Add a general comment to PR (issue comment)."""
         return self._review_service.add_issue_comment(pr_number, body)

plugins/titan-plugin-github/titan_plugin_github/clients/network/graphql_queries.py

@@ -44,6 +44,29 @@
 }
 '''
 
+GET_PR_ISSUE_COMMENTS = '''
+query($owner: String!, $repo: String!, $prNumber: Int!) {
+  repository(owner: $owner, name: $repo) {
+    pullRequest(number: $prNumber) {
+      comments(first: 100) {
+        nodes {
+          databaseId
+          body
+          author {
+            login
+            ... on User {
+              name
+            }
+          }
+          createdAt
+          updatedAt
+        }
+      }
+    }
+  }
+}
+'''
+
 GET_PR_NODE_ID = '''
 query($owner: String!, $repo: String!, $prNumber: Int!) {
   repository(owner: $owner, name: $repo) {

plugins/titan-plugin-github/titan_plugin_github/clients/services/review_service.py

@@ -6,14 +6,13 @@
 Uses GraphQL for complex operations (threads, comments, resolve).
 """
 import json
-import subprocess
 from typing import List, Optional, Dict, Any
 
 from titan_cli.core.result import ClientResult, ClientSuccess, ClientError
 from titan_cli.core.logging import log_client_operation
 from ..network import GHNetwork, GraphQLNetwork, graphql_queries
 from ...models.network.rest import NetworkReview
-from ...models.network.graphql import GraphQLPullRequestReviewThread
+from ...models.network.graphql import GraphQLPullRequestReviewThread, GraphQLIssueComment
 from ...models.view import UICommentThread, UIReview
 from ...models.mappers import from_graphql_review_thread, from_network_review
 from ...exceptions import GitHubAPIError
@@ -106,6 +105,66 @@ def get_pr_review_threads(
         except GitHubAPIError as e:
             return ClientError(error_message=str(e), error_code="API_ERROR")
 
+    @log_client_operation()
+    def get_pr_general_comments(
+        self, pr_number: int
+    ) -> ClientResult[List[UICommentThread]]:
+        """
+        Get general PR comments (not attached to code lines).
+
+        Uses GraphQL to fetch top-level PR comments and wraps each one as
+        a pseudo-thread (thread_id = "general_{id}") for uniform rendering.
+
+        Args:
+            pr_number: PR number
+
+        Returns:
+            ClientResult[List[UICommentThread]]
+        """
+        try:
+            repo_string = self.gh.get_repo_string()
+            owner, repo = repo_string.split('/')
+
+            variables = {
+                "owner": owner,
+                "repo": repo,
+                "prNumber": pr_number
+            }
+
+            response = self.graphql.run_query(
+                graphql_queries.GET_PR_ISSUE_COMMENTS,
+                variables
+            )
+
+            comments_data = (
+                response.get("data", {})
+                .get("repository", {})
+                .get("pullRequest", {})
+                .get("comments", {})
+                .get("nodes", [])
+            )
+
+            network_comments = [
+                GraphQLIssueComment.from_graphql(c) for c in comments_data
+            ]
+
+            ui_threads = [
+                UICommentThread.from_issue_comment(c) for c in network_comments
+            ]
+
+            return ClientSuccess(
+                data=ui_threads,
+                message=f"Found {len(ui_threads)} general comments"
+            )
+
+        except (KeyError, ValueError) as e:
+            return ClientError(
+                error_message=f"Failed to parse general comments: {e}",
+                error_code="PARSE_ERROR"
+            )
+        except GitHubAPIError as e:
+            return ClientError(error_message=str(e), error_code="API_ERROR")
+
     @log_client_operation()
     def resolve_review_thread(self, thread_node_id: str) -> ClientResult[None]:
         """
@@ -191,16 +250,9 @@ def create_draft_review(
                 "--input", "-",
             ]
 
-            # Run with JSON payload via stdin
-            result = subprocess.run(
-                ["gh"] + args,
-                input=json.dumps(payload),
-                capture_output=True,
-                text=True,
-                check=True,
-            )
+            result = self.gh.run_command(args, stdin_input=json.dumps(payload))
 
-            response = json.loads(result.stdout)
+            response = json.loads(result)
             review_id = response["id"]
 
             return ClientSuccess(
@@ -213,11 +265,6 @@ def create_draft_review(
                 error_message=f"Failed to parse review response: {e}",
                 error_code="PARSE_ERROR"
             )
-        except subprocess.CalledProcessError as e:
-            return ClientError(
-                error_message=f"Failed to create draft review: gh API returned exit code {e.returncode}",
-                error_code="API_ERROR"
-            )
         except GitHubAPIError as e:
             return ClientError(error_message=str(e), error_code="API_ERROR")
 

plugins/titan-plugin-github/titan_plugin_github/models/view.py

@@ -94,6 +94,36 @@ def from_review_thread(cls, thread: 'Any') -> 'UICommentThread':
         from .mappers import from_graphql_review_thread
         return from_graphql_review_thread(thread)
 
+    @classmethod
+    def from_issue_comment(cls, comment: 'Any') -> 'UICommentThread':
+        """
+        Wrap a GraphQLIssueComment as a pseudo-thread for uniform rendering.
+
+        General PR comments have no thread concept, so they are wrapped in a
+        UICommentThread with a synthetic thread_id ("general_{id}") that
+        downstream code uses to distinguish them from review threads.
+
+        Args:
+            comment: GraphQLIssueComment instance from GraphQL
+
+        Returns:
+            UICommentThread with thread_id="general_{id}", no replies, not resolved
+        """
+        from .mappers import from_graphql_issue_comment
+        ui_comment = from_graphql_issue_comment(comment)
+        return cls(
+            thread_id=f"general_{comment.databaseId}",
+            main_comment=ui_comment,
+            replies=[],
+            is_resolved=False,
+            is_outdated=False
+        )
+
+    @property
+    def is_general_comment(self) -> bool:
+        """True if this thread wraps a general PR comment (not an inline review thread)."""
+        return self.thread_id.startswith("general_")
+
 
 @dataclass
 class UIPullRequest:

plugins/titan-plugin-github/titan_plugin_github/operations/__init__.py

@@ -14,6 +14,7 @@
 
 from .comment_operations import (
     build_ai_review_context,
+    build_ai_review_prompt,
     find_ai_response_file,
     create_commit_message,
     reply_to_comment_batch,
@@ -22,6 +23,7 @@
 
 from .pr_operations import (
     fetch_pr_threads,
+    fetch_pr_general_comments,
 )
 
 from .worktree_operations import (
@@ -44,13 +46,15 @@
 __all__ = [
     # Comment operations
     "build_ai_review_context",
+    "build_ai_review_prompt",
     "find_ai_response_file",
     "create_commit_message",
     "reply_to_comment_batch",
     "prepare_replies_for_sending",
 
     # PR operations
     "fetch_pr_threads",
+    "fetch_pr_general_comments",
 
     # Worktree operations
     "setup_worktree",