refactor common module

Author: CTY-git

patchwork/steps/ResolveIssue/__init__.py …rk/common/multiturn_strategy/__init__.pypatchwork/steps/ResolveIssue/__init__.py renamed to patchwork/common/multiturn_strategy/__init__.py patchwork/steps/ResolveIssue/__init__.py renamed to patchwork/common/multiturn_strategy/__init__.py

@@ -10,10 +10,8 @@
 from openai.types.chat import ChatCompletionMessageParam
 
 from patchwork.common.client.llm.protocol import LlmClient
-from patchwork.steps.ResolveIssue.multiturn_strategy.multiturn_strategy import (
-    MultiturnStrategy,
-)
-from patchwork.steps.ResolveIssue.tools.tool import Tool
+from patchwork.common.multiturn_strategy.multiturn_strategy import MultiturnStrategy
+from patchwork.common.tools import Tool
 
 
 class STAGE(Enum):

…/multiturn_strategy/analyze_implement.py …/multiturn_strategy/analyze_implement.pypatchwork/steps/ResolveIssue/multiturn_strategy/analyze_implement.py renamed to patchwork/common/multiturn_strategy/analyze_implement.py patchwork/steps/ResolveIssue/multiturn_strategy/analyze_implement.py renamed to patchwork/common/multiturn_strategy/analyze_implement.py

@@ -10,7 +10,7 @@
 from openai.types.chat.chat_completion_message_param import ChatCompletionMessageParam
 from openai.types.chat.chat_completion_tool_param import ChatCompletionToolParam
 
-from patchwork.steps.ResolveIssue.tools.tool import Tool
+from patchwork.common.tools import Tool
 
 logger = logging.getLogger("patched")
 

…multiturn_strategy/multiturn_strategy.py …multiturn_strategy/multiturn_strategy.pypatchwork/steps/ResolveIssue/multiturn_strategy/multiturn_strategy.py renamed to patchwork/common/multiturn_strategy/multiturn_strategy.py patchwork/steps/ResolveIssue/multiturn_strategy/multiturn_strategy.py renamed to patchwork/common/multiturn_strategy/multiturn_strategy.py

@@ -0,0 +1,9 @@
+from patchwork.common.tools.bash_tool import BashTool
+from patchwork.common.tools.code_edit_tools import CodeEditTool
+from patchwork.common.tools.tool import Tool
+
+__all__ = [
+    "Tool",
+    "CodeEditTool",
+    "BashTool",
+]

patchwork/common/tools/__init__.py

@@ -3,7 +3,7 @@
 import subprocess
 from pathlib import Path
 
-from patchwork.steps.ResolveIssue.tools.tool import Tool
+from patchwork.common.tools import Tool
 
 
 class BashTool(Tool, tool_name="bash"):

…rk/steps/ResolveIssue/tools/bash_tool.py patchwork/common/tools/bash_tool.pypatchwork/steps/ResolveIssue/tools/bash_tool.py renamed to patchwork/common/tools/bash_tool.py patchwork/steps/ResolveIssue/tools/bash_tool.py renamed to patchwork/common/tools/bash_tool.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Literal
 
-from patchwork.steps.ResolveIssue.tools.tool import Tool
+from patchwork.common.tools import Tool
 
 
 class CodeEditTool(Tool, tool_name="code_edit_tool"):

…ps/ResolveIssue/tools/code_edit_tools.py patchwork/common/tools/code_edit_tools.pypatchwork/steps/ResolveIssue/tools/code_edit_tools.py renamed to patchwork/common/tools/code_edit_tools.py patchwork/steps/ResolveIssue/tools/code_edit_tools.py renamed to patchwork/common/tools/code_edit_tools.py

@@ -8,14 +8,13 @@
 from patchwork.common.client.llm.aio import AioLlmClient
 from patchwork.common.client.llm.protocol import LlmClient
 from patchwork.common.constants import TOKEN_URL
-from patchwork.step import Step
-from patchwork.steps.ResolveIssue.multiturn_strategy.analyze_implement import (
+from patchwork.common.multiturn_strategy.analyze_implement import (
     STAGE,
     AnalyzeImplementStrategy,
 )
-from patchwork.steps.ResolveIssue.tools.code_edit_tools import CodeEditTool
-from patchwork.steps.ResolveIssue.tools.tool import Tool
-from patchwork.steps.ResolveIssue.typed import ResolveIssueInputs, ResolveIssueOutputs
+from patchwork.common.tools import CodeEditTool, Tool
+from patchwork.step import Step
+from patchwork.steps.FixIssue.typed import FixIssueInputs, FixIssueOutputs
 
 
 class _ResolveIssue(AnalyzeImplementStrategy):
@@ -93,7 +92,7 @@ def is_stop(self, messages: list[ChatCompletionMessageParam]) -> bool:
         return "</DONE>" in last_message.get("content")
 
 
-class ResolveIssue(Step, input_class=ResolveIssueInputs, output_class=ResolveIssueOutputs):
+class FixIssue(Step, input_class=FixIssueInputs, output_class=FixIssueOutputs):
     def __init__(self, inputs):
         super().__init__(inputs)
         self.base_path = inputs.get("base_path")