claude-task-master 0.1.6__tar.gz → 0.1.7__tar.gz

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-task-master
-Version: 0.1.6
+Version: 0.1.7
 Summary: Autonomous task orchestration system that keeps Claude working until a goal is achieved
 Author: Claude Task Master Team
 License-Expression: MIT

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "claude-task-master"
-version = "0.1.6"
+version = "0.1.7"
 description = "Autonomous task orchestration system that keeps Claude working until a goal is achieved"
 readme = "README.md"
 requires-python = ">=3.12"

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master/__init__.py

@@ -3,5 +3,5 @@
 Uses Claude Agent SDK to keep Claude working until a goal is achieved.
 """
 
-__version__ = "0.1.6"
+__version__ = "0.1.7"
 __all__ = ["__version__"]

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master/core/agent.py

@@ -189,6 +189,7 @@ class AgentWrapper:
         required_branch: str | None = None,
         create_pr: bool = True,
         pr_group_info: dict | None = None,
+        target_branch: str = "main",
     ) -> dict[str, Any]:
         """Run a work session with full tools.
 
@@ -201,6 +202,7 @@ class AgentWrapper:
             required_branch: Optional branch name the agent should be on.
             create_pr: If True, instruct agent to create PR. If False, commit only.
             pr_group_info: Optional dict with PR group context (name, completed_tasks, etc).
+            target_branch: The target branch for rebasing (default: "main").
 
         Returns:
             Dict with 'output', 'success', and 'model_used' keys.
@@ -215,6 +217,7 @@ class AgentWrapper:
             required_branch=required_branch,
             create_pr=create_pr,
             pr_group_info=pr_group_info,
+            target_branch=target_branch,
         )
 
     def verify_success_criteria(self, criteria: str, context: str = "") -> dict[str, Any]:

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master/core/agent_phases.py

@@ -151,6 +151,7 @@ class AgentPhaseExecutor:
         required_branch: str | None = None,
         create_pr: bool = True,
         pr_group_info: dict | None = None,
+        target_branch: str = "main",
     ) -> dict[str, Any]:
         """Run a work session with full tools.
 
@@ -163,6 +164,7 @@ class AgentPhaseExecutor:
             required_branch: Optional branch name the agent should be on.
             create_pr: If True, instruct agent to create PR. If False, commit only.
             pr_group_info: Optional dict with PR group context (name, completed_tasks, etc).
+            target_branch: The target branch for rebasing (default: "main").
 
         Returns:
             Dict with 'output', 'success', and 'model_used' keys.
@@ -175,6 +177,7 @@ class AgentPhaseExecutor:
             required_branch=required_branch,
             create_pr=create_pr,
             pr_group_info=pr_group_info,
+            target_branch=target_branch,
         )
 
         # Run async query with optional model override

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master/core/prompts_working.py

@@ -17,6 +17,7 @@ def build_work_prompt(
     required_branch: str | None = None,
     create_pr: bool = True,
     pr_group_info: dict | None = None,
+    target_branch: str = "main",
 ) -> str:
     """Build the work session prompt.
 
@@ -31,6 +32,7 @@ def build_work_prompt(
             - name: PR group name
             - completed_tasks: List of completed task descriptions in this group
             - remaining_tasks: Number of tasks remaining after current
+        target_branch: The target branch for rebasing (default: "main").
 
     Returns:
         Complete work session prompt.
@@ -119,7 +121,7 @@ def build_work_prompt(
 
     # Execution guidelines - conditional based on create_pr flag
     if create_pr:
-        execution_content = _build_full_workflow_execution()
+        execution_content = _build_full_workflow_execution(target_branch=target_branch)
     else:
         execution_content = _build_commit_only_execution()
 
@@ -173,9 +175,13 @@ TASK COMPLETE
     return builder.build()
 
 
-def _build_full_workflow_execution() -> str:
-    """Build execution instructions for full workflow (commit + push + PR)."""
-    return """**1. Check git status first**
+def _build_full_workflow_execution(target_branch: str = "main") -> str:
+    """Build execution instructions for full workflow (commit + push + PR).
+
+    Args:
+        target_branch: The target branch to rebase onto (e.g., main, master, develop).
+    """
+    return f"""**1. Check git status first**
 ```bash
 git status
 ```
@@ -218,7 +224,32 @@ EOF
 **Note:** The `.claude-task-master/` directory is automatically gitignored - it contains
 orchestrator state files that should never be committed.
 
-**6. Push and Create PR** (REQUIRED - DO NOT SKIP!)
+**6. Rebase onto {target_branch} BEFORE pushing** (CRITICAL!)
+```bash
+git fetch origin {target_branch}
+git rebase origin/{target_branch}
+```
+
+⚠️ **This step prevents merge conflicts in the PR!** Other PRs may have been merged
+while you were working. You MUST rebase before pushing.
+
+**If rebase has conflicts:**
+1. Check which files have conflicts: `git status`
+2. For each conflicted file:
+   - Open the file and look for conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`)
+   - Resolve by keeping the correct code (often you need BOTH changes)
+   - Remove the conflict markers
+   - `git add <file>`
+3. Continue the rebase: `git rebase --continue`
+4. If you get stuck, you can abort and retry: `git rebase --abort` then try again
+5. After resolving all conflicts, run tests again to verify nothing broke
+
+**Common conflict resolution patterns:**
+- **mod.rs / index.ts imports**: Keep BOTH the new import from {target_branch} AND your import
+- **Package versions**: Usually take the newer version from {target_branch}
+- **Config files**: Merge both sets of changes carefully
+
+**7. Push and Create PR** (REQUIRED - DO NOT SKIP!)
 ```bash
 git push -u origin HEAD
 gh pr create --title "type: description" --body "..." --label "claudetm"
@@ -238,7 +269,7 @@ If label doesn't exist, create it and retry.
 
 **The orchestrator handles CI/reviews/merge automatically.**
 
-**7. Log File Best Practices**
+**8. Log File Best Practices**
 - For log/progress files, use APPEND mode (don't read entire file)
 - Example: `echo "message" >> progress.md` instead of Read + Write
 - This avoids context bloat from reading large log files"""

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master/core/task_runner.py

@@ -15,6 +15,7 @@ from typing import TYPE_CHECKING
 from . import console
 from .agent import ModelType
 from .agent_exceptions import AgentError
+from .config_loader import get_config
 from .console import clear_task_context, set_task_context
 from .task_group import (
     ParsedTask,
@@ -327,6 +328,9 @@ Please complete this task."""
         try:
             # Convert string model name to ModelType enum
             model_type = ModelType(target_model)
+            # Get target branch from config for rebase instructions
+            config = get_config()
+            target_branch = config.git.target_branch
             result = self.agent.run_work_session(
                 task_description=task_description,
                 context=context,
@@ -334,6 +338,7 @@ Please complete this task."""
                 required_branch=current_branch,
                 create_pr=should_create_pr,
                 pr_group_info=pr_group_info,
+                target_branch=target_branch,
             )
         except AgentError:
             if self.logger:

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master/core/workflow_stages.py

@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING
 
 from . import console
 from .agent import ModelType
+from .config_loader import get_config
 from .shutdown import interruptible_sleep
 
 if TYPE_CHECKING:
@@ -438,6 +439,10 @@ class WorkflowStageHandler:
             else ".claude-task-master/debugging/resolve-comments.json"
         )
 
+        # Get target branch from config for rebase instructions
+        config = get_config()
+        target_branch = config.git.target_branch
+
         # Build the appropriate task description based on what feedback exists
         if has_ci and has_comments:
             # Both CI failures and comments - handle together!
@@ -467,12 +472,24 @@ Use Glob to find all .txt files in both directories, then Read each one.
   - Make the requested change, OR
   - Explain why it's not needed
 
-## Step 4: Verify and Commit
+## Step 4: Verify, Commit, Rebase, and Push
 
 1. Run tests/lint locally to verify ALL passes
 2. Commit all fixes together with a descriptive message
-3. Push the fixes
-4. Create a resolution summary file at: `{resolve_json_path}`
+3. **Rebase onto {target_branch} before pushing** (CRITICAL - prevents merge conflicts!):
+   ```bash
+   git fetch origin {target_branch}
+   git rebase origin/{target_branch}
+   ```
+   If conflicts occur during rebase:
+   - Check `git status` to see conflicted files
+   - Open each file and resolve conflicts (look for `<<<<<<<` markers)
+   - Usually you need BOTH changes (yours AND from {target_branch})
+   - `git add <file>` after resolving each file
+   - `git rebase --continue` to proceed
+   - Run tests again after resolving conflicts
+4. Push the fixes: `git push --force-with-lease`
+5. Create a resolution summary file at: `{resolve_json_path}`
 
 **Resolution file format:**
 ```json
@@ -511,7 +528,14 @@ Please:
 2. Understand ALL error messages (lint, tests, types, etc.)
 3. Fix everything that's failing - don't skip anything
 4. Run tests/lint locally to verify ALL passes
-5. Commit and push the fixes
+5. Commit fixes with a descriptive message
+6. **Rebase onto {target_branch} before pushing** (CRITICAL - prevents merge conflicts!):
+   ```bash
+   git fetch origin {target_branch}
+   git rebase origin/{target_branch}
+   ```
+   If conflicts occur: resolve them, `git add`, `git rebase --continue`, run tests again.
+7. Push the fixes: `git push --force-with-lease`
 
 After fixing, end with: TASK COMPLETE"""
 
@@ -529,8 +553,15 @@ Please:
    - Make the requested change, OR
    - Explain why it's not needed
 3. Run tests to verify
-4. Commit and push the fixes
-5. Create a resolution summary file at: `{resolve_json_path}`
+4. Commit fixes with a descriptive message
+5. **Rebase onto {target_branch} before pushing** (CRITICAL - prevents merge conflicts!):
+   ```bash
+   git fetch origin {target_branch}
+   git rebase origin/{target_branch}
+   ```
+   If conflicts occur: resolve them, `git add`, `git rebase --continue`, run tests again.
+6. Push the fixes: `git push --force-with-lease`
+7. Create a resolution summary file at: `{resolve_json_path}`
 
 **Resolution file format:**
 ```json
@@ -669,6 +700,10 @@ After verifying, end with: TASK COMPLETE"""
             else ".claude-task-master/debugging/resolve-comments.json"
         )
 
+        # Get target branch from config for rebase instructions
+        config = get_config()
+        target_branch = config.git.target_branch
+
         task_description = f"""PR #{state.current_pr} has review comments to address.
 
 **Read the review comments from:** `{comments_path}`
@@ -681,8 +716,15 @@ Please:
    - Make the requested change, OR
    - Explain why it's not needed
 3. Run tests to verify
-4. Commit and push the fixes
-5. Create a resolution summary file at: `{resolve_json_path}`
+4. Commit fixes with a descriptive message
+5. **Rebase onto {target_branch} before pushing** (CRITICAL - prevents merge conflicts!):
+   ```bash
+   git fetch origin {target_branch}
+   git rebase origin/{target_branch}
+   ```
+   If conflicts occur: resolve them, `git add`, `git rebase --continue`, run tests again.
+6. Push the fixes: `git push --force-with-lease`
+7. Create a resolution summary file at: `{resolve_json_path}`
 
 **Resolution file format:**
 ```json

{claude_task_master-0.1.6 → claude_task_master-0.1.7}/src/claude_task_master.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-task-master
-Version: 0.1.6
+Version: 0.1.7
 Summary: Autonomous task orchestration system that keeps Claude working until a goal is achieved
 Author: Claude Task Master Team
 License-Expression: MIT