refactor: Change git status to skip for unpushed commits check (#175)

Author: finxo

plugins/titan-plugin-git/tests/test_git_plugin.py

@@ -1,6 +1,6 @@
 # plugins/titan-plugin-git/tests/test_git_plugin.py
 from unittest.mock import MagicMock
-from titan_cli.engine import WorkflowContext, is_success, is_error, is_skip, is_exit, Skip
+from titan_cli.engine import WorkflowContext, is_success, is_error, is_skip, Skip
 from titan_cli.core.result import ClientSuccess, ClientError
 from titan_plugin_git.steps.status_step import get_git_status_step
 from titan_plugin_git.steps.commit_step import create_git_commit_step
@@ -40,9 +40,10 @@ def test_get_git_status_step_success():
     mock_git_client.get_status.assert_called_once()
 
 
-def test_get_git_status_step_exit_when_clean():
+def test_get_git_status_step_skip_when_clean():
     """
-    Test that get_git_status_step returns Exit when the working directory is clean.
+    Test that get_git_status_step returns Skip when the working directory is clean,
+    allowing the workflow to continue to the push step.
     """
     # 1. Arrange
     mock_git_client = MagicMock(spec=GitClient)
@@ -68,7 +69,7 @@ def test_get_git_status_step_exit_when_clean():
     result = get_git_status_step(mock_context)
 
     # 3. Assert
-    assert is_exit(result)
+    assert is_skip(result)
     assert "No changes to commit" in result.message
     assert result.metadata['git_status'] == mock_status
     mock_git_client.get_status.assert_called_once()

plugins/titan-plugin-git/titan_plugin_git/steps/push_step.py

@@ -1,5 +1,5 @@
 # plugins/titan-plugin-git/titan_plugin_git/steps/push_step.py
-from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error
+from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error, Exit
 from titan_cli.core.result import ClientSuccess, ClientError
 from titan_plugin_git.messages import msg
 
@@ -57,9 +57,24 @@ def create_git_push_step(ctx: WorkflowContext) -> WorkflowResult:
     exists_result = ctx.git.branch_exists_on_remote(branch=branch_to_use, remote=remote_to_use)
     match exists_result:
         case ClientSuccess(data=exists):
-            # The first push of a branch should set the upstream
             if not exists:
+                # The first push of a branch should set the upstream
                 set_upstream = True
+            else:
+                # Branch exists on remote — check if there's anything to push
+                unpushed_result = ctx.git.count_unpushed_commits(branch=branch_to_use, remote=remote_to_use)
+                match unpushed_result:
+                    case ClientSuccess(data=unpushed_count):
+                        if unpushed_count == 0:
+                            ctx.textual.success_text(f"Branch {branch_to_use} is already up to date with {remote_to_use}")
+                            ctx.textual.end_step("success")
+                            return Exit(
+                                "Branch already pushed",
+                                metadata={"pr_head_branch": branch_to_use}
+                            )
+                    case ClientError():
+                        # If we can't count, proceed with push anyway
+                        pass
         case ClientError(error_message=err):
             ctx.textual.end_step("error")
             return Error(f"Failed to check remote branch: {err}")

plugins/titan-plugin-git/titan_plugin_git/steps/status_step.py

@@ -4,7 +4,7 @@
     WorkflowResult,
     Success,
     Error,
-    Exit
+    Skip
 )
 from titan_cli.core.result import ClientSuccess, ClientError
 from titan_cli.messages import msg as global_msg
@@ -16,7 +16,8 @@ def get_git_status_step(ctx: WorkflowContext) -> WorkflowResult:
 
     Behavior:
         - If there are uncommitted changes: Returns Success and continues workflow
-        - If working directory is clean: Returns Exit (stops workflow - nothing to commit)
+        - If working directory is clean: Returns Skip so the workflow continues to
+          the push step, which decides whether to push unpushed commits or exit.
 
     Requires:
         ctx.git: An initialized GitClient.
@@ -26,7 +27,7 @@ def get_git_status_step(ctx: WorkflowContext) -> WorkflowResult:
 
     Returns:
         Success: If there are changes to commit (workflow continues)
-        Exit: If working directory is clean (workflow stops - nothing to commit)
+        Skip: If working directory is clean (workflow continues to push step)
         Error: If the GitClient is not available or the git command fails.
     """
     if not ctx.textual:
@@ -54,14 +55,11 @@ def get_git_status_step(ctx: WorkflowContext) -> WorkflowResult:
                     metadata={"git_status": status}
                 )
             else:
-                # Working directory is clean - exit workflow (nothing to commit)
+                # Working directory is clean - skip to push step to check for unpushed commits
                 ctx.textual.success_text(msg.Steps.Status.WORKING_DIRECTORY_IS_CLEAN)
-                ctx.textual.text("")
-                ctx.textual.dim_text("Nothing to commit. Skipping workflow.")
                 ctx.textual.end_step("success")
 
-                # Exit workflow early (not an error)
-                return Exit("No changes to commit", metadata={"git_status": status})
+                return Skip("No changes to commit", metadata={"git_status": status})
 
         case ClientError(error_message=err):
             # End step container with error