ticket2pr 0.3.5__py2.py3-none-any.whl → 0.3.6__py2.py3-none-any.whl

src/agents/pre_commit_fixer.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
-from src.agents.base import extract_session_id, print_agent_message, run_agent_query
-from src.shell.pre_commit_runner import run_pre_commit
+from src.agents.base import print_agent_message, run_agent_query
 
 SYSTEM_PROMPT = """
 You are an expert Software Engineer specializing in fixing pre-commit hook failures.
@@ -13,6 +12,8 @@ Your role is to:
 4. Preserve the original functionality and purpose of the changes
 
 CRITICAL RULES:
+- You MUST address ALL pre-commit issues reported - do not miss any errors or warnings
+- Carefully parse the entire pre-commit output and fix every single issue mentioned
 - Only fix formatting, linting, type errors, and other pre-commit hook violations
 - DO NOT change the logic or functionality of the code
 - DO NOT add new features or remove existing functionality
@@ -45,37 +46,29 @@ Pre-commit output:
 """
 
 
-async def verify_pre_commit_and_fix(
-    workspace_path: Path, max_retries: int = 5, mcp_config_path: Path | None = None
-) -> bool:
+async def try_fix_pre_commit(
+    workspace_path: Path,
+    pre_commit_output: str,
+    max_retries: int = 5,
+    mcp_config_path: Path | None = None,
+) -> None:
     """
-    Verify pre-commit hooks pass on STAGED FILES ONLY, fixing issues if needed.
+    Attempt to fix pre-commit hook failures using AI.
 
-    This function:
-    1. Runs pre-commit hooks on staged files ONLY (never --all-files)
-    2. If successful, returns True
-    3. If failed, uses AI to fix the issues (AI will stage its own fixes and retry)
+    This function uses AI to analyze pre-commit failures and apply fixes.
+    The caller is responsible for running pre-commit before and after to verify.
 
     Args:
         workspace_path: Path to the workspace root
-        max_retries: Maximum number of retry attempts to tell the AI (default: 5)
+        pre_commit_output: The output from a failed pre-commit run
+        max_retries: Maximum number of retry attempts for the AI (default: 5)
         mcp_config_path: Optional path to MCP config file
-
-    Returns:
-        True if pre-commit passes, False otherwise
     """
-    result = run_pre_commit(workspace_path)
-
-    if result.success:
-        return True
-
     system_prompt = SYSTEM_PROMPT.format(max_retries=max_retries)
-
     prompt = PROMPT_TEMPLATE.format(
-        pre_commit_output=result.output,
+        pre_commit_output=pre_commit_output,
     )
 
-    session_id = None
     async for message in run_agent_query(
         prompt=prompt,
         system_prompt=system_prompt,
@@ -84,11 +77,4 @@ async def verify_pre_commit_and_fix(
         cwd=workspace_path,
         mcp_config_path=mcp_config_path,
     ):
-        if session_id is None:
-            session_id = extract_session_id(message)
-            if session_id:
-                continue
         print_agent_message(message)
-
-    final_result = run_pre_commit(workspace_path)
-    return final_result.success

src/agents/ticket_solver.py

@@ -59,14 +59,19 @@ You are an expert Software Engineer in the EXECUTION phase of implementing a Jir
 Your role in this phase is to implement the plan provided in the prompt:
 1. Follow the plan step-by-step to implement the solution
 2. Make the necessary code changes
-3. Git add all relevant files that were changed or created
+3. Git add ONLY the files that are part of the implementation (listed in the plan)
 
 CRITICAL RULES FOR THIS PHASE:
 - Follow the plan's file list and implementation steps
 - Only modify/create files that are listed in the plan
 - Maintain existing code style and patterns
 - Add appropriate error handling and validation if needed
-- After making changes, use `git add` to stage all files that were modified or created
+- Write code that conforms to the project's configured linters, formatters, and type checkers
+- DO NOT write new tests - a separate agent handles test writing if needed
+- After making changes, use `git add` to stage ONLY the files listed in the plan
+- DO NOT git add any temporary or helper files you created for your own use (e.g., JSON files
+  describing violations, test scripts for debugging, analysis files, scratch files, etc.)
+- If you create any temporary helper files, delete them before finishing
 
 You have full access to modify files, but stay within the scope of the plan.
 """
@@ -87,6 +92,52 @@ Plan:
 {plan_content}
 """
 
+TEST_WRITER_PHASE_SYSTEM_PROMPT = """
+You are an expert Software Engineer evaluating whether tests are needed for recent code changes.
+
+CRITICAL: In MOST cases, new tests are NOT needed. Only add tests in these rare situations:
+1. New complex or risky logic that doesn't have existing test coverage
+2. Entirely new modules or components with no tests
+
+DO NOT add tests for:
+- Simple changes, bug fixes, or refactors
+- Code that is already covered by existing tests
+- Configuration changes
+- Changes to existing well-tested code
+- Minor feature additions to tested modules
+
+Your role:
+1. Review the staged changes (git diff --cached)
+2. Check existing test coverage for the modified areas
+3. ONLY if one of the rare situations above applies, write minimal focused tests
+4. If you add tests, use `git add` to stage them
+
+CRITICAL RULES:
+- Default to NOT writing tests - most changes don't need them
+- If existing tests cover the changes, do nothing
+- If you write tests, keep them minimal and focused
+- Follow existing test patterns in the codebase
+- After writing tests, use `git add` to stage ONLY the test files you created
+- DO NOT git add any temporary or helper files you created for your own use
+- If you create any temporary helper files, delete them before finishing
+"""
+
+TEST_WRITER_PHASE_PROMPT_TEMPLATE = """
+Review the staged changes and determine if new tests are truly needed.
+
+Issue Key: {issue_key}
+Summary: {summary}
+
+Remember: Most changes do NOT need new tests. Only add tests for new complex/risky logic
+without existing coverage, or entirely new modules.
+
+Steps:
+1. Run `git diff --cached` to see what was changed
+2. Check if existing tests already cover these changes
+3. Only if truly needed (rare), write minimal tests
+4. Run `git add` to stage ONLY the test files you created
+"""
+
 
 async def plan_ticket(
     issue: JiraIssue, workspace_path: Path | None = None, mcp_config_path: Path | None = None
@@ -160,20 +211,55 @@ async def execute_plan(
         print_agent_message(message)
 
 
+async def write_tests_if_needed(
+    issue: JiraIssue,
+    session_id: str,
+    workspace_path: Path | None = None,
+    mcp_config_path: Path | None = None,
+) -> None:
+    """
+    Evaluate staged changes and add tests only if truly needed.
+
+    Tests are only added in rare cases:
+    - New complex/risky logic without existing test coverage
+    - Entirely new modules or components
+    """
+    issue_context = {
+        "issue_key": issue.key,
+        "summary": issue.summary,
+    }
+    test_writer_prompt = TEST_WRITER_PHASE_PROMPT_TEMPLATE.format(**issue_context)
+
+    async for message in run_agent_query(
+        prompt=test_writer_prompt,
+        system_prompt=TEST_WRITER_PHASE_SYSTEM_PROMPT,
+        allowed_tools=["Glob", "Bash", "Read", "Grep", "Write"],
+        cwd=workspace_path,
+        mcp_config_path=mcp_config_path,
+        session_id=session_id,
+    ):
+        print_agent_message(message)
+
+
 async def try_solve_ticket(
-    issue: JiraIssue, workspace_path: Path | None = None, mcp_config_path: Path | None = None
+    issue: JiraIssue,
+    workspace_path: Path | None = None,
+    mcp_config_path: Path | None = None,
+    enable_test_writer: bool = False,
 ) -> str:
     """
     Solve a Jira ticket using a Plan-Act workflow with Claude Agent SDK.
 
-    The workflow consists of two phases:
+    The workflow consists of phases:
     1. Planning Phase: Explore codebase and create PLAN.md with implementation details
-    2. Execution Phase: Implement the plan and run tests
+    2. Execution Phase: Implement the plan
+    3. Test Writing Phase (optional): Add tests only if truly needed (rare cases)
 
     Args:
         issue: The JiraIssue object containing all issue details
         workspace_path: Optional path to workspace root. Defaults to current directory.
         mcp_config_path: Optional path to mcp.json configuration file.
+        enable_test_writer: Whether to run the test writer phase. Defaults to False.
 
     Returns:
         The session_id from the conversation
@@ -183,4 +269,7 @@ async def try_solve_ticket(
         "Plan file created at - %s. Now running the executor agent to implement it.", str(plan_path)
     )
     await execute_plan(issue, session_id, plan_path, workspace_path, mcp_config_path)
+    if enable_test_writer:
+        logger.info("Evaluating if new tests are needed for the changes.")
+        await write_tests_if_needed(issue, session_id, workspace_path, mcp_config_path)
     return session_id

src/branch_creator.py

@@ -4,7 +4,6 @@ from datetime import datetime
 
 from src.clients.github_client import GitHubClient
 from src.clients.jira_client import JiraClient, JiraIssue
-from src.exceptions import GithubBranchAlreadyExistsError
 
 logger = logging.getLogger(__name__)
 
@@ -32,10 +31,15 @@ def generate_branch_name(
     if issue_type:
         branch_name = f"{issue_type.lower()}/{branch_name}"
 
-    if len(branch_name) > max_length:
-        branch_name = branch_name[:max_length].rstrip("-")
+    # Add timestamp suffix to ensure uniqueness and avoid an extra
+    # API call to check if branch exists
+    timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
+    suggested_branch_name = f"{branch_name}-{timestamp}"
+    if len(suggested_branch_name) > max_length:
+        chars_count_to_remove = len(suggested_branch_name) - max_length
+        branch_name = branch_name[:-chars_count_to_remove]
 
-    return branch_name
+    return f"{branch_name}-{timestamp}"
 
 
 def create_branch_from_jira_issue(
@@ -48,20 +52,7 @@ def create_branch_from_jira_issue(
     # TODO: Consider replacing the 2 next lines with local git client
     base_ref = github_client.get_base_branch_ref(base_branch)
 
-    try:
-        branch_url = github_client.create_branch(branch_name, base_ref)
-    except GithubBranchAlreadyExistsError:
-        # Branch already exists, add timestamp suffix and retry
-        original_branch_name = branch_name
-        timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
-        branch_name = f"{branch_name}-{timestamp}"
-        logger.info(
-            "Branch '%s' already exists. Retrying with new name: '%s'",
-            original_branch_name,
-            branch_name,
-        )
-        branch_url = github_client.create_branch(branch_name, base_ref)
-
+    branch_url = github_client.create_branch(branch_name, base_ref)
     jira_client.link_branch(jira_issue.key, branch_url, branch_name)
 
     return branch_name

src/cli.py

@@ -101,7 +101,9 @@ def _setup_workspace(
         if workspace_path is None:
             shared_temp_dir = Path(tempfile.gettempdir()) / "ticket2pr"
             shared_temp_dir.mkdir(exist_ok=True)
-            temp_dir = Path(tempfile.mkdtemp(dir=shared_temp_dir))
+            temp_dir = Path(
+                tempfile.mkdtemp(dir=shared_temp_dir, prefix=f"{github_client.repo.name}_")
+            )
             logger.info(
                 "No workspace path provided, cloning repository to temp directory: %s", temp_dir
             )

src/workflow.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from pydantic import BaseModel
 
 from src.agents.pr_generator import generate_commit_and_pr_body
-from src.agents.pre_commit_fixer import verify_pre_commit_and_fix
+from src.agents.pre_commit_fixer import try_fix_pre_commit as try_fix_pre_commit_agent
 from src.agents.ticket_solver import try_solve_ticket
 from src.branch_creator import create_branch_from_jira_issue
 from src.clients.github_client import GitHubClient
@@ -23,6 +23,48 @@ class WorkflowResult(BaseModel):
     jira_issue_permalink: str
 
 
+async def try_fix_pre_commit(
+    git: EnhancedGit, mcp_config_path: Path | None = None, retries: int = 3
+) -> bool:
+    """
+    Try to run pre-commit and fix any failures with retries.
+
+    Returns:
+        True if pre-commit passes, False if it still fails after all retries.
+    """
+    result = run_pre_commit(git.repo_path)
+
+    if result.success:
+        logger.info("pre-commit passed on first run")
+        return True
+
+    for attempt in range(1, retries + 1):
+        logger.info(
+            "pre-commit failed (attempt %d/%d). Trying to fix it (workspace: %s)",
+            attempt,
+            retries,
+            git.repo_path,
+        )
+        await try_fix_pre_commit_agent(
+            git.repo_path,
+            pre_commit_output=result.output,
+            mcp_config_path=mcp_config_path,
+        )
+
+        result = run_pre_commit(git.repo_path)
+        if result.success:
+            logger.info("pre-commit passed after fix attempt %d", attempt)
+            return True
+
+        logger.warning("pre-commit still failing after fix attempt %d/%d", attempt, retries)
+
+    logger.warning(
+        "pre-commit verification failed after %d fix attempts. Will commit with --no-verify",
+        retries,
+    )
+    return False
+
+
 async def workflow(
     github_client: GitHubClient,
     jira_client: JiraClient,
@@ -50,20 +92,8 @@ async def workflow(
     if commit_no_verify:
         logger.info("Skipping pre-commit verification: --commit-no-verify flag is set")
     elif is_pre_commit_installed():
-        logger.info("pre-commit is installed. Trying to run it")
-        result = run_pre_commit(git.repo_path)
-        if not result.success:
-            logger.info("pre-commit failed. trying to fix it (workspace: %s)", git.repo_path)
-            commit_no_verify = not await verify_pre_commit_and_fix(
-                git.repo_path, mcp_config_path=mcp_config_path
-            )
-            if commit_no_verify:
-                logger.warning(
-                    "pre-commit verification failed after fix attempts. "
-                    "Will commit with --no-verify"
-                )
-        else:
-            logger.info("Skipping pre-commit fix: pre-commit is is already passing")
+        logger.info("pre-commit is installed. Trying to run it and fix any failures.")
+        await try_fix_pre_commit(git, mcp_config_path=mcp_config_path)
     else:
         logger.info("Skipping pre-commit verification: pre-commit is not installed")
     logger.info("Generating commit message and PR body for branch: %s", branch_name)

{ticket2pr-0.3.5.dist-info → ticket2pr-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ticket2pr
-Version: 0.3.5
+Version: 0.3.6
 Summary: Automate Jira ticket to GitHub PR workflow
 Home-page: https://github.com/bengabay11/ticket2pr
 Author: Ben Gabay

{ticket2pr-0.3.5.dist-info → ticket2pr-0.3.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/branch_creator.py,sha256=8KqlIjP-VDnB8_qd_1NjiyimAs6yn5xJdr0o9OMtzsw,2230
-src/cli.py,sha256=4fL7R4-hbTJlN5OzdkRRk9bFDERuJUgNKQWWeBUxjzM,8215
+src/branch_creator.py,sha256=HViz7L7CxokrjKTQzt2wMuMeF5QZgq0V5Mpy6MkZa2g,1983
+src/cli.py,sha256=UXo0cBXae3dJpgKN3ftjW8TLFMsfBqFd9pCJG9iPTaY,8283
 src/console_utils.py,sha256=TbVl_WhiGi1Kq7txk_WpCIfs7gvTJ3qPrSNVBOZ_ZiQ,6928
 src/enhanced_git.py,sha256=WTgPK_kH2B57KSYpMtrAfkDzuGLT_zK8bCPmxRjS_Dw,5200
 src/exceptions.py,sha256=HVtaiVoX6Hw9NOW3z9k2tfirHZTBOeQzMp52mBw2S6Y,4704
@@ -10,13 +10,13 @@ src/pr_content.py,sha256=ValoIl20sNvh4QZS4-Lm0r3SzfzMMrXyq3S7FW_cFuw,407
 src/settings.py,sha256=lkuBarOVaCUTijAq9niE8KOEhk_4FXPpOvn_RBBPrU4,3741
 src/settings_init.py,sha256=MrcyWMF9HttSArzbUDSlSIbkeSVvhvRA38C_7ROYHX8,5781
 src/validators.py,sha256=3AWj99f2PsR7O51zd2uMuYj9fyKfsT3K8kB1iVCjEm8,1972
-src/workflow.py,sha256=23dLaI3UNNdWkpD6ENuFS0FysipbXLQBldtiael3Akg,3998
+src/workflow.py,sha256=cf56sGAjnqBrkSMw5DI1KMfhiRAGuek3gpzKp0Kbe7g,4733
 src/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 src/agents/base.py,sha256=pr0E2i0rdynJTTwiiOZ8WbDjK2wUa7yo8XkVGI7NWTM,6284
 src/agents/commit_message.py,sha256=D9AGDPzJjtnAdQb5fp67HcParesqL_pXu-fSYdTanBw,2555
 src/agents/pr_generator.py,sha256=keIFAQCGcM8lObpX7G1oUSjh9pV7eOkkGvpKUh7K9XE,4340
-src/agents/pre_commit_fixer.py,sha256=J8aqTZ40mJffANxoBu2T0-ch6t7IHe25nmr4jsgM6F0,3513
-src/agents/ticket_solver.py,sha256=9lPbYw_cQZkCnjlFPDmSdbrDDxRPQVLgi8qt8pO9ZiU,6320
+src/agents/pre_commit_fixer.py,sha256=LVaPe7WByGVTo10cQ8P1LOjawgz3j7wAc9rg9BDZ6_Q,3231
+src/agents/ticket_solver.py,sha256=le5yRFxy9u7UTelN6agVo4WhB3wafn5Iqspi5t10xbg,9866
 src/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 src/clients/github_client.py,sha256=6WwbVxLGtn97WRix7CdORiW_k7F1guJXsKmqXdReb9M,4234
 src/clients/jira_client.py,sha256=wdDRqiUSTOdBucrqIFkUkJlM7fDMk4DMfUiWCAG-c9U,2323
@@ -28,9 +28,9 @@ tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 tests/integration/test_find_first_toml.py,sha256=Wq4rDReqcWLC0CsgcDBDX62wtMljcsm8UHUDTLr4-_A,902
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_nothing.py,sha256=qRI0MSdLiBRklBNEsOAkr4jxfcrO2v2CuB2hHWePonU,103
-ticket2pr-0.3.5.dist-info/licenses/LICENSE,sha256=omgsokA67LJXOOKpXtf1wNH71Bfs35NWEAuLowNUMyM,1066
-ticket2pr-0.3.5.dist-info/METADATA,sha256=mTeZ1vOBHC5QKzvojptN8HgWFDH_Njgb5tVcgtXGDw4,3304
-ticket2pr-0.3.5.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
-ticket2pr-0.3.5.dist-info/entry_points.txt,sha256=DnWUjexpwtqVcRSICrpnveMIjGJA9_0K5IjZt10jVkM,47
-ticket2pr-0.3.5.dist-info/top_level.txt,sha256=KW3xgkz9NLMTcmmzgKvW8RFpCFkRIQ085qzq2diFf68,10
-ticket2pr-0.3.5.dist-info/RECORD,,
+ticket2pr-0.3.6.dist-info/licenses/LICENSE,sha256=omgsokA67LJXOOKpXtf1wNH71Bfs35NWEAuLowNUMyM,1066
+ticket2pr-0.3.6.dist-info/METADATA,sha256=GNRSmAb2pxhMT0Yy4w3aSufB6i3GYKZyDoIkAsHkoF0,3304
+ticket2pr-0.3.6.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+ticket2pr-0.3.6.dist-info/entry_points.txt,sha256=DnWUjexpwtqVcRSICrpnveMIjGJA9_0K5IjZt10jVkM,47
+ticket2pr-0.3.6.dist-info/top_level.txt,sha256=KW3xgkz9NLMTcmmzgKvW8RFpCFkRIQ085qzq2diFf68,10
+ticket2pr-0.3.6.dist-info/RECORD,,