Changes before error encountered

Co-authored-by: notfolder <20558197+notfolder@users.noreply.github.com>

Author: Copilot

handlers/task_handler.py

@@ -313,8 +313,12 @@ def _process_command_field(self, task: Task, data: dict, error_state: dict) -> b
             output = self.mcp_clients[mcp_server].call_tool(tool_name, args)
             if error_state["last_tool"] == tool:
                 error_state["tool_error_count"] = 0
-        except* McpError as e:
-            error_detail = str(e.exceptions[0].exceptions[0])
+        except Exception as e:
+            # Handle both McpError and other exceptions
+            error_detail = str(e)
+            if hasattr(e, "exceptions") and hasattr(e.exceptions[0], "exceptions"):
+                # Handle ExceptionGroup structure
+                error_detail = str(e.exceptions[0].exceptions[0])
             self.logger.exception("ツール呼び出し失敗: %s", error_detail)
             task.comment(f"ツール呼び出しエラー: {error_detail}")
             output = f"error: {error_detail}"

tests/integration/test_workflow.py

@@ -231,7 +231,7 @@ def test_github_comment_workflow(self) -> None:
 
                 def mock_comment(text: str, *, mention: bool = False) -> object:
                     comments_posted.append({"text": text, "mention": mention})
-                    return original_comment(text, mention) if original_comment else None
+                    return original_comment(text, mention=mention) if original_comment else None
 
                 task.comment = mock_comment
 

tests/unit/test_github_tasks.py

@@ -16,12 +16,8 @@
 from tests.mocks.mock_mcp_client import MockMCPToolClient
 
 
-class TestTaskGitHubIssue(unittest.TestCase):
-    """Test TaskGitHubIssue functionality with mock data."""
-
-    # Test constants
-    TEST_ISSUE_NUMBER = 123
-    TEST_PR_NUMBER = 456
+class BaseTestCase(unittest.TestCase):
+    """Base test case with common helper methods."""
 
     def _verify_equal(self, actual: object, expected: object, msg: str = "") -> None:
         """Verify that actual equals expected."""
@@ -48,6 +44,14 @@ def _verify_isinstance(self, obj: object, cls: type, msg: str = "") -> None:
         if not isinstance(obj, cls):
             pytest.fail(f"Expected {obj} to be instance of {cls}. {msg}")
 
+
+class TestTaskGitHubIssue(BaseTestCase):
+    """Test TaskGitHubIssue functionality with mock data."""
+
+    # Test constants
+    TEST_ISSUE_NUMBER = 123
+    TEST_PR_NUMBER = 456
+
     def setUp(self) -> None:
         """Set up test environment."""
         self.config = {
@@ -199,7 +203,7 @@ def test_issue_with_malformed_repository_url(self) -> None:
             pass
 
 
-class TestTaskGetterFromGitHub(unittest.TestCase):
+class TestTaskGetterFromGitHub(BaseTestCase):
     """Test TaskGetterFromGitHub functionality."""
 
     def setUp(self) -> None:
@@ -296,7 +300,7 @@ def test_get_tasks_filters_by_label(self) -> None:
                 self._verify_in("coding agent", task.labels)
 
 
-class TestGitHubTaskKey(unittest.TestCase):
+class TestGitHubTaskKey(BaseTestCase):
     """Test GitHub task key functionality."""
 
     def test_github_issue_task_key_creation(self) -> None:
@@ -353,7 +357,7 @@ def test_task_key_equality(self) -> None:
         self._verify_equal(recreated.number, key1.number)
 
 
-class TestGitHubTaskFactory(unittest.TestCase):
+class TestGitHubTaskFactory(BaseTestCase):
     """Test GitHub task factory functionality."""
 
     def setUp(self) -> None:
@@ -377,7 +381,7 @@ def test_create_github_issue_task(self) -> None:
 
         # The factory has a bug - it doesn't pass github_client to TaskGitHubIssue
         # We'll patch TaskGitHubIssue to work around this
-        with patch("handlers.task_getter_github.TaskGitHubIssue") as mock_task_class:
+        with patch("handlers.task_factory.TaskGitHubIssue") as mock_task_class:
             task_key = GitHubIssueTaskKey("testorg", "testrepo", 1)
             factory.create_task(task_key)
 
@@ -396,7 +400,7 @@ def test_create_task_with_invalid_key_type(self) -> None:
             factory.create_task("invalid_key")
 
 
-class TestGitHubErrorHandling(unittest.TestCase):
+class TestGitHubErrorHandling(BaseTestCase):
     """Test error handling in GitHub components."""
 
     def setUp(self) -> None:

tests/unit/test_gitlab_tasks.py

@@ -18,14 +18,8 @@
 from tests.mocks.mock_mcp_client import MockMCPToolClient
 
 
-class TestTaskGitLabIssue(unittest.TestCase):
-    """Test TaskGitLabIssue functionality with mock data."""
-
-    # Test constants
-    TEST_PROJECT_ID = 123
-    TEST_ISSUE_IID = 1
-    TEST_TASK_KEY_ISSUE_IID = 123
-    TEST_TASK_KEY_MR_IID = 456
+class BaseTestCase(unittest.TestCase):
+    """Base test case with common helper methods."""
 
     def _verify_equal(self, actual: object, expected: object, msg: str = "") -> None:
         """Verify that actual equals expected."""
@@ -52,6 +46,16 @@ def _verify_isinstance(self, obj: object, cls: type, msg: str = "") -> None:
         if not isinstance(obj, cls):
             pytest.fail(f"Expected {obj} to be instance of {cls}. {msg}")
 
+
+class TestTaskGitLabIssue(BaseTestCase):
+    """Test TaskGitLabIssue functionality with mock data."""
+
+    # Test constants
+    TEST_PROJECT_ID = 123
+    TEST_ISSUE_IID = 1
+    TEST_TASK_KEY_ISSUE_IID = 123
+    TEST_TASK_KEY_MR_IID = 456
+
     def setUp(self) -> None:
         """Set up test environment."""
         self.config = {
@@ -215,7 +219,7 @@ def test_comment_creation(self) -> None:
             task.comment("This is a test comment")
 
 
-class TestTaskGetterFromGitLab(unittest.TestCase):
+class TestTaskGetterFromGitLab(BaseTestCase):
     """Test TaskGetterFromGitLab functionality."""
 
     def setUp(self) -> None:
@@ -316,9 +320,13 @@ def test_get_tasks_filters_by_label(self) -> None:
                 self._verify_in("coding agent", labels)
 
 
-class TestGitLabTaskKey(unittest.TestCase):
+class TestGitLabTaskKey(BaseTestCase):
     """Test GitLab task key functionality."""
 
+    # Test constants
+    TEST_TASK_KEY_ISSUE_IID = 123
+    TEST_TASK_KEY_MR_IID = 456
+
     def test_gitlab_issue_task_key_creation(self) -> None:
         """Test GitLab issue task key creation."""
         task_key = GitLabIssueTaskKey("test-group/test-project", self.TEST_TASK_KEY_ISSUE_IID)
@@ -367,7 +375,7 @@ def test_task_key_equality(self) -> None:
         self._verify_equal(recreated.issue_iid, key1.issue_iid)
 
 
-class TestGitLabTaskFactory(unittest.TestCase):
+class TestGitLabTaskFactory(BaseTestCase):
     """Test GitLab task factory functionality."""
 
     def setUp(self) -> None:
@@ -388,7 +396,7 @@ def test_create_gitlab_issue_task(self) -> None:
         )
 
         # Similar to GitHub factory, there might be parameter issues
-        with patch("handlers.task_getter_gitlab.TaskGitLabIssue") as mock_task_class:
+        with patch("handlers.task_factory.TaskGitLabIssue") as mock_task_class:
             task_key = GitLabIssueTaskKey(123, 1)
             factory.create_task(task_key)
 
@@ -406,7 +414,7 @@ def test_create_task_with_invalid_key_type(self) -> None:
             factory.create_task("invalid_key")
 
 
-class TestGitLabErrorHandling(unittest.TestCase):
+class TestGitLabErrorHandling(BaseTestCase):
     """Test error handling in GitLab components."""
 
     # Test constants
@@ -526,7 +534,7 @@ def slow_call_tool(tool: str, args: dict[str, Any]) -> object:
         self._verify_isinstance(prompt, str)
 
 
-class TestGitLabLabelManipulation(unittest.TestCase):
+class TestGitLabLabelManipulation(BaseTestCase):
     """Test label manipulation functionality."""
 
     def test_label_manipulation(self) -> None:

tests/unit/test_task_handler.py

@@ -9,8 +9,6 @@
 from typing import Any
 from unittest.mock import MagicMock
 
-from mcp import McpError
-
 # Add parent directory to path for imports
 sys.path.insert(0, str(Path(__file__).parent.parent.parent))
 
@@ -19,6 +17,7 @@
 sys.modules["mcp"].McpError = Exception
 
 import pytest  # noqa: E402
+from mcp import McpError  # noqa: E402
 
 from handlers.task_getter_github import TaskGitHubIssue  # noqa: E402
 from handlers.task_getter_gitlab import TaskGitLabIssue  # noqa: E402
@@ -121,7 +120,7 @@ def test_sanitize_arguments_invalid_json(self) -> None:
         )
 
         # Test with invalid JSON
-        with pytest.raises(ValueError, match="JSON decode error"):
+        with pytest.raises(ValueError, match="Invalid JSON string for arguments"):
             task_handler.sanitize_arguments('{"invalid": json}')
 
     def test_sanitize_arguments_invalid_type(self) -> None:
@@ -324,9 +323,11 @@ def failing_call_tool(tool: str, args: dict[str, Any]) -> dict[str, Any] | None:
             config=self.config,
         )
 
-        # Handle the task
-        with pytest.raises((OSError, RuntimeError), match="Tool call failed"):
-            task_handler.handle(self.github_task)
+        # Handle the task - should complete without crashing
+        task_handler.handle(self.github_task)
+
+        # Verify that tool was called multiple times due to retries
+        assert call_count >= MAX_TOOL_FAILURES  # noqa: S101
 
     def test_make_system_prompt(self) -> None:
         """Test system prompt generation."""