titan-cli 0.1.5__tar.gz → 0.1.7__tar.gz

{titan_cli-0.1.5 → titan_cli-0.1.7}/PKG-INFO

@@ -1,14 +1,12 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: titan-cli
-Version: 0.1.5
+Version: 0.1.7
 Summary: Modular development tools orchestrator - Streamline your workflows with AI integration and intuitive terminal UI
+Home-page: https://github.com/masmovil/titan-cli
 License: MIT
-License-File: LICENSE
 Keywords: cli,workflow,orchestrator,automation,devtools,ai
-Author: finxo
-Author-email: finxeto@gmail.com
-Maintainer: r-pedraza
-Maintainer-email: raulpedrazaleon@gmail.com
+Author: MasOrange Apps Team
+Author-email: apps-management-stores@masorange.es
 Requires-Python: >=3.10,<4.0.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -19,8 +17,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: anthropic (>=0.75.0,<0.76.0)
 Requires-Dist: google-auth (>=2.43.0,<3.0.0)
 Requires-Dist: google-genai (>=1.58.0,<2.0.0)
@@ -36,7 +32,6 @@ Requires-Dist: tomli (>=2.0.0,<3.0.0)
 Requires-Dist: tomli-w (>=1.0.0,<2.0.0)
 Requires-Dist: typer (>=0.20.0,<1.0.0)
 Project-URL: Documentation, https://github.com/masmovil/titan-cli
-Project-URL: Homepage, https://github.com/masmovil/titan-cli
 Project-URL: Repository, https://github.com/masmovil/titan-cli
 Description-Content-Type: text/markdown
 

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/clients/git_client.py

@@ -109,6 +109,27 @@ class GitClient:
         """
         return self._run_command(["git", "rev-parse", "--abbrev-ref", "HEAD"])
 
+    def get_current_commit(self) -> str:
+        """
+        Get current commit SHA (HEAD)
+
+        Returns:
+            Full SHA of current commit
+        """
+        return self._run_command(["git", "rev-parse", "HEAD"])
+
+    def get_commit_sha(self, ref: str) -> str:
+        """
+        Get commit SHA for any git ref (branch, tag, remote branch, etc.)
+
+        Args:
+            ref: Git reference (e.g., "HEAD", "develop", "origin/main", "v1.0.0")
+
+        Returns:
+            Full SHA of the commit
+        """
+        return self._run_command(["git", "rev-parse", ref])
+
     def get_status(self) -> GitStatus:
         """
         Get repository status
@@ -282,7 +303,7 @@ class GitClient:
         """
         self._run_command(["git", "branch", branch_name, start_point])
 
-    def commit(self, message: str, all: bool = False, no_verify: bool = False) -> str:
+    def commit(self, message: str, all: bool = False, no_verify: bool = True) -> str:
         """
         Create a commit
 
@@ -390,12 +411,13 @@ class GitClient:
 
         self._run_command(args)
 
-    def fetch(self, remote: str = "origin", all: bool = False) -> None:
+    def fetch(self, remote: str = "origin", branch: Optional[str] = None, all: bool = False) -> None:
         """
         Fetch from remote
 
         Args:
             remote: Remote name
+            branch: Specific branch to fetch (optional)
             all: Fetch from all remotes
         """
         args = ["git", "fetch"]
@@ -404,6 +426,8 @@ class GitClient:
             args.append("--all")
         else:
             args.append(remote)
+            if branch:
+                args.append(branch)
 
         self._run_command(args)
 
@@ -736,6 +760,39 @@ class GitClient:
         except GitCommandError:
             return ""
 
+    def get_uncommitted_diff_stat(self) -> str:
+        """
+        Get diff stat summary of uncommitted changes (git diff --stat HEAD).
+
+        Returns a summary showing files changed, insertions, and deletions.
+
+        Returns:
+            Diff stat output as string
+        """
+        try:
+            return self._run_command(["git", "diff", "--stat", "HEAD"], check=False)
+        except GitCommandError:
+            return ""
+
+    def get_branch_diff_stat(self, base_branch: str, head_branch: str) -> str:
+        """
+        Get diff stat summary between two branches.
+
+        Args:
+            base_branch: Base branch name
+            head_branch: Head branch name
+
+        Returns:
+            Diff stat output as string
+        """
+        try:
+            return self._run_command(
+                ["git", "diff", "--stat", f"{base_branch}...{head_branch}"],
+                check=False
+            )
+        except GitCommandError:
+            return ""
+
     def get_branch_commits(self, base_branch: str, head_branch: str) -> list[str]:
         """
         Get list of commits in head_branch that are not in base_branch.

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/plugin.py

@@ -101,6 +101,11 @@ class GitPlugin(TitanPlugin):
         from .steps.branch_steps import get_current_branch_step, get_base_branch_step
         from .steps.ai_commit_message_step import ai_generate_commit_message
         from .steps.diff_summary_step import show_uncommitted_diff_summary, show_branch_diff_summary
+        from .steps.save_current_branch_step import save_current_branch_step
+        from .steps.restore_original_branch_step import restore_original_branch_step
+        from .steps.checkout_step import checkout_branch_step
+        from .steps.pull_step import pull_step
+        from .steps.create_branch_step import create_branch_step
 
         return {
             "get_status": get_git_status_step,
@@ -111,6 +116,11 @@ class GitPlugin(TitanPlugin):
             "ai_generate_commit_message": ai_generate_commit_message,
             "show_uncommitted_diff_summary": show_uncommitted_diff_summary,
             "show_branch_diff_summary": show_branch_diff_summary,
+            "save_current_branch": save_current_branch_step,
+            "restore_original_branch": restore_original_branch_step,
+            "checkout": checkout_branch_step,
+            "pull": pull_step,
+            "create_branch": create_branch_step,
         }
 
     @property

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/steps/ai_commit_message_step.py

@@ -33,7 +33,7 @@ def ai_generate_commit_message(ctx: WorkflowContext) -> WorkflowResult:
 
     # Check if AI is configured
     if not ctx.ai or not ctx.ai.is_available():
-        ctx.textual.text(msg.Steps.AICommitMessage.AI_NOT_CONFIGURED, markup="dim")
+        ctx.textual.dim_text(msg.Steps.AICommitMessage.AI_NOT_CONFIGURED)
         ctx.textual.end_step("skip")
         return Skip(msg.Steps.AICommitMessage.AI_NOT_CONFIGURED)
 
@@ -45,13 +45,13 @@ def ai_generate_commit_message(ctx: WorkflowContext) -> WorkflowResult:
     # Get git status
     git_status = ctx.get('git_status')
     if not git_status or git_status.is_clean:
-        ctx.textual.text(msg.Steps.AICommitMessage.NO_CHANGES_TO_COMMIT, markup="dim")
+        ctx.textual.dim_text(msg.Steps.AICommitMessage.NO_CHANGES_TO_COMMIT)
         ctx.textual.end_step("skip")
         return Skip(msg.Steps.AICommitMessage.NO_CHANGES_TO_COMMIT)
 
     try:
         # Get diff of uncommitted changes
-        ctx.textual.text(msg.Steps.AICommitMessage.ANALYZING_CHANGES, markup="dim")
+        ctx.textual.dim_text(msg.Steps.AICommitMessage.ANALYZING_CHANGES)
 
         # Get diff of all uncommitted changes
         diff_text = ctx.git.get_uncommitted_diff()
@@ -125,12 +125,12 @@ Return ONLY the single-line commit message, absolutely nothing else."""
 
         # Show preview to user
         ctx.textual.text("")  # spacing
-        ctx.textual.text(msg.Steps.AICommitMessage.GENERATED_MESSAGE_TITLE, markup="bold")
-        ctx.textual.text(f"  {commit_message}", markup="bold cyan")
+        ctx.textual.bold_text(msg.Steps.AICommitMessage.GENERATED_MESSAGE_TITLE)
+        ctx.textual.bold_primary_text(f"  {commit_message}")
 
         # Warn if message is too long
         if len(commit_message) > 72:
-            ctx.textual.text(msg.Steps.AICommitMessage.MESSAGE_LENGTH_WARNING.format(length=len(commit_message)), markup="yellow")
+            ctx.textual.warning_text(msg.Steps.AICommitMessage.MESSAGE_LENGTH_WARNING.format(length=len(commit_message)))
 
         ctx.textual.text("")  # spacing
 
@@ -165,8 +165,8 @@ Return ONLY the single-line commit message, absolutely nothing else."""
         )
 
     except Exception as e:
-        ctx.textual.text(msg.Steps.AICommitMessage.GENERATION_FAILED.format(e=e), markup="yellow")
-        ctx.textual.text(msg.Steps.AICommitMessage.FALLBACK_TO_MANUAL, markup="dim")
+        ctx.textual.warning_text(msg.Steps.AICommitMessage.GENERATION_FAILED.format(e=e))
+        ctx.textual.dim_text(msg.Steps.AICommitMessage.FALLBACK_TO_MANUAL)
 
         ctx.textual.end_step("skip")
         return Skip(msg.Steps.AICommitMessage.GENERATION_FAILED.format(e=e))

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/steps/branch_steps.py

@@ -24,14 +24,14 @@ def get_current_branch_step(ctx: WorkflowContext) -> WorkflowResult:
 
     if not ctx.git:
         error_msg = msg.Steps.Status.GIT_CLIENT_NOT_AVAILABLE
-        ctx.textual.text(error_msg, markup="red")
+        ctx.textual.error_text(error_msg)
         ctx.textual.end_step("error")
         return Error(error_msg)
 
     try:
         current_branch = ctx.git.get_current_branch()
         success_msg = msg.Steps.Branch.GET_CURRENT_BRANCH_SUCCESS.format(branch=current_branch)
-        ctx.textual.text(success_msg, markup="green")
+        ctx.textual.success_text(success_msg)
         ctx.textual.end_step("success")
         return Success(
             success_msg,
@@ -39,7 +39,7 @@ def get_current_branch_step(ctx: WorkflowContext) -> WorkflowResult:
         )
     except Exception as e:
         error_msg = msg.Steps.Branch.GET_CURRENT_BRANCH_FAILED.format(e=e)
-        ctx.textual.text(error_msg, markup="red")
+        ctx.textual.error_text(error_msg)
         ctx.textual.end_step("error")
         return Error(error_msg, exception=e)
 
@@ -65,14 +65,14 @@ def get_base_branch_step(ctx: WorkflowContext) -> WorkflowResult:
 
     if not ctx.git:
         error_msg = msg.Steps.Status.GIT_CLIENT_NOT_AVAILABLE
-        ctx.textual.text(error_msg, markup="red")
+        ctx.textual.error_text(error_msg)
         ctx.textual.end_step("error")
         return Error(error_msg)
 
     try:
         base_branch = ctx.git.main_branch
         success_msg = msg.Steps.Branch.GET_BASE_BRANCH_SUCCESS.format(branch=base_branch)
-        ctx.textual.text(success_msg, markup="green")
+        ctx.textual.success_text(success_msg)
         ctx.textual.end_step("success")
         return Success(
             success_msg,
@@ -80,6 +80,6 @@ def get_base_branch_step(ctx: WorkflowContext) -> WorkflowResult:
         )
     except Exception as e:
         error_msg = msg.Steps.Branch.GET_BASE_BRANCH_FAILED.format(e=e)
-        ctx.textual.text(error_msg, markup="red")
+        ctx.textual.error_text(error_msg)
         ctx.textual.end_step("error")
         return Error(error_msg, exception=e)

titan_cli-0.1.7/plugins/titan-plugin-git/titan_plugin_git/steps/checkout_step.py

@@ -0,0 +1,66 @@
+"""
+Checkout a Git branch.
+"""
+
+from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error
+from titan_plugin_git.exceptions import GitError
+
+
+def checkout_branch_step(ctx: WorkflowContext) -> WorkflowResult:
+    """
+    Checkout a Git branch.
+
+    Inputs (from ctx.data):
+        branch (str): Branch name to checkout
+
+    Returns:
+        Success: Branch checked out successfully
+        Error: Git operation failed
+    """
+    if ctx.textual:
+        ctx.textual.begin_step("Checkout Branch")
+
+    if not ctx.textual:
+        return Error("Textual UI context is not available for this step.")
+
+    if not ctx.git:
+        ctx.textual.error_text("Git client not available in context")
+        ctx.textual.end_step("error")
+        return Error("Git client not available in context")
+
+    try:
+        # Get branch from params, or use main_branch from git config
+        branch = ctx.get("branch")
+        if not branch:
+            branch = ctx.git.main_branch
+            ctx.textual.dim_text(f"Using main branch from config: {branch}")
+
+        ctx.textual.text("")
+        ctx.textual.dim_text(f"Checking out: {branch}")
+
+        # Checkout branch
+        try:
+            ctx.git.checkout(branch)
+            ctx.textual.success_text(f"✓ Checked out {branch}")
+        except GitError as e:
+            ctx.textual.text("")
+            ctx.textual.error_text(f"Failed to checkout {branch}: {str(e)}")
+            ctx.textual.end_step("error")
+            return Error(f"Failed to checkout: {str(e)}")
+
+        ctx.textual.text("")
+        ctx.textual.end_step("success")
+        return Success(
+            f"Checked out {branch}",
+            metadata={"branch": branch}
+        )
+
+    except Exception as e:
+        ctx.textual.text("")
+        ctx.textual.error_text(f"Failed to checkout branch: {str(e)}")
+        ctx.textual.text("")
+        ctx.textual.end_step("error")
+        return Error(f"Failed to checkout: {str(e)}")
+
+
+__all__ = ["checkout_branch_step"]

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/steps/commit_step.py

@@ -37,7 +37,7 @@ def create_git_commit_step(ctx: WorkflowContext) -> WorkflowResult:
     # Skip if there's nothing to commit
     git_status = ctx.data.get("git_status")
     if git_status and git_status.is_clean:
-        ctx.textual.text(msg.Steps.Commit.WORKING_DIRECTORY_CLEAN, markup="dim")
+        ctx.textual.dim_text(msg.Steps.Commit.WORKING_DIRECTORY_CLEAN)
         ctx.textual.end_step("skip")
         return Skip(msg.Steps.Commit.WORKING_DIRECTORY_CLEAN)
 
@@ -47,7 +47,7 @@ def create_git_commit_step(ctx: WorkflowContext) -> WorkflowResult:
 
     commit_message = ctx.get('commit_message')
     if not commit_message:
-        ctx.textual.text(msg.Steps.Commit.NO_COMMIT_MESSAGE, markup="dim")
+        ctx.textual.dim_text(msg.Steps.Commit.NO_COMMIT_MESSAGE)
         ctx.textual.end_step("skip")
         return Skip(msg.Steps.Commit.NO_COMMIT_MESSAGE)
 
@@ -58,7 +58,7 @@ def create_git_commit_step(ctx: WorkflowContext) -> WorkflowResult:
         commit_hash = ctx.git.commit(message=commit_message, all=all_files, no_verify=no_verify)
 
         # Show success message
-        ctx.textual.text(f"Commit created: {commit_hash[:7]}", markup="green")
+        ctx.textual.success_text(f"Commit created: {commit_hash[:7]}")
 
         ctx.textual.end_step("success")
         return Success(

titan_cli-0.1.7/plugins/titan-plugin-git/titan_plugin_git/steps/create_branch_step.py

@@ -0,0 +1,131 @@
+"""
+Create a new Git branch.
+"""
+
+from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error
+from titan_plugin_git.exceptions import GitError
+
+
+def create_branch_step(ctx: WorkflowContext) -> WorkflowResult:
+    """
+    Create a new Git branch.
+
+    Inputs (from ctx.data):
+        new_branch (str): Name of the branch to create
+        start_point (str, optional): Starting point for the branch (defaults to HEAD)
+        delete_if_exists (bool, optional): Delete the branch if it already exists (default: False)
+        checkout (bool, optional): Checkout the new branch after creation (default: True)
+
+    Returns:
+        Success: Branch created successfully
+        Error: Git operation failed
+    """
+    if ctx.textual:
+        ctx.textual.begin_step("Create Branch")
+
+    if not ctx.textual:
+        return Error("Textual UI context is not available for this step.")
+
+    if not ctx.git:
+        ctx.textual.error_text("Git client not available in context")
+        ctx.textual.end_step("error")
+        return Error("Git client not available in context")
+
+    try:
+        # Get params from context
+        new_branch = ctx.get("new_branch")
+        if not new_branch:
+            ctx.textual.error_text("No branch name specified")
+            ctx.textual.dim_text("Set 'new_branch' in workflow params or previous step")
+            ctx.textual.end_step("error")
+            return Error("No branch name specified")
+
+        start_point = ctx.get("start_point", "HEAD")
+        delete_if_exists = ctx.get("delete_if_exists", False)
+        checkout = ctx.get("checkout", True)
+
+        ctx.textual.text("")
+        ctx.textual.dim_text(f"Creating branch: {new_branch}")
+        ctx.textual.dim_text(f"From: {start_point}")
+
+        # Check if branch exists
+        all_branches = ctx.git.get_branches()
+        branch_names = [b.name for b in all_branches]
+        branch_exists = new_branch in branch_names
+
+        # Delete if exists and requested
+        if branch_exists and delete_if_exists:
+            ctx.textual.text("")
+            ctx.textual.warning_text(f"Branch {new_branch} exists, deleting...")
+
+            # If we're on the branch, checkout another one first
+            current_branch = ctx.git.get_current_branch()
+            if current_branch == new_branch:
+                # Checkout main branch before deleting
+                main_branch = ctx.git.main_branch
+                if main_branch in branch_names and main_branch != new_branch:
+                    try:
+                        ctx.git.checkout(main_branch)
+                        ctx.textual.dim_text(f"Switched to {main_branch}")
+                    except GitError as e:
+                        ctx.textual.error_text(f"Failed to checkout {main_branch}: {str(e)}")
+                        ctx.textual.end_step("error")
+                        return Error(f"Cannot checkout {main_branch}: {str(e)}")
+                else:
+                    ctx.textual.error_text(f"Cannot delete current branch {new_branch}")
+                    ctx.textual.end_step("error")
+                    return Error("Cannot delete current branch")
+
+            # Delete the branch
+            try:
+                ctx.git.safe_delete_branch(new_branch, force=True)
+                ctx.textual.success_text(f"✓ Deleted existing branch {new_branch}")
+            except GitError as e:
+                ctx.textual.error_text(f"Failed to delete {new_branch}: {str(e)}")
+                ctx.textual.end_step("error")
+                return Error(f"Failed to delete branch: {str(e)}")
+
+        elif branch_exists:
+            ctx.textual.error_text(f"Branch {new_branch} already exists")
+            ctx.textual.dim_text("Set 'delete_if_exists: true' to recreate it")
+            ctx.textual.end_step("error")
+            return Error(f"Branch {new_branch} already exists")
+
+        # Create the branch
+        ctx.textual.text("")
+        try:
+            ctx.git.create_branch(new_branch, start_point=start_point)
+            ctx.textual.success_text(f"✓ Created branch {new_branch}")
+        except GitError as e:
+            ctx.textual.error_text(f"Failed to create {new_branch}: {str(e)}")
+            ctx.textual.end_step("error")
+            return Error(f"Failed to create branch: {str(e)}")
+
+        # Checkout if requested
+        if checkout:
+            try:
+                ctx.git.checkout(new_branch)
+                ctx.textual.success_text(f"✓ Checked out {new_branch}")
+            except GitError as e:
+                ctx.textual.warning_text(f"Branch created but failed to checkout: {str(e)}")
+
+        ctx.textual.text("")
+        ctx.textual.end_step("success")
+        return Success(
+            f"Created branch {new_branch}",
+            metadata={
+                "new_branch": new_branch,
+                "start_point": start_point,
+                "checked_out": checkout
+            }
+        )
+
+    except Exception as e:
+        ctx.textual.text("")
+        ctx.textual.error_text(f"Failed to create branch: {str(e)}")
+        ctx.textual.text("")
+        ctx.textual.end_step("error")
+        return Error(f"Failed to create branch: {str(e)}")
+
+
+__all__ = ["create_branch_step"]

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/steps/diff_summary_step.py

@@ -24,16 +24,16 @@ def show_uncommitted_diff_summary(ctx: WorkflowContext) -> WorkflowResult:
 
     try:
         # Get diff stat for uncommitted changes
-        stat_output = ctx.git._run_command(["git", "diff", "--stat", "HEAD"])
+        stat_output = ctx.git.get_uncommitted_diff_stat()
 
         if not stat_output or not stat_output.strip():
-            ctx.textual.text("No uncommitted changes to show", markup="dim")
+            ctx.textual.dim_text("No uncommitted changes to show")
             ctx.textual.end_step("success")
             return Success("No changes")
 
         # Show the stat summary with colors
         ctx.textual.text("")  # spacing
-        ctx.textual.text("Changes summary:", markup="bold")
+        ctx.textual.bold_text("Changes summary:")
         ctx.textual.text("")  # spacing
 
         # Parse lines to find max filename length for alignment
@@ -69,7 +69,7 @@ def show_uncommitted_diff_summary(ctx: WorkflowContext) -> WorkflowResult:
         for line in summary_lines:
             colored_line = line.replace('(+)', '[green](+)[/green]')
             colored_line = colored_line.replace('(-)', '[red](-)[/red]')
-            ctx.textual.text(f"  {colored_line}", markup="dim")
+            ctx.textual.dim_text(f"  {colored_line}")
 
         ctx.textual.text("")  # spacing
 
@@ -104,13 +104,13 @@ def show_branch_diff_summary(ctx: WorkflowContext) -> WorkflowResult:
     ctx.textual.begin_step("Show Branch Changes Summary")
 
     if not ctx.git:
-        ctx.textual.text(msg.Steps.Push.GIT_CLIENT_NOT_AVAILABLE, markup="red")
+        ctx.textual.error_text(msg.Steps.Push.GIT_CLIENT_NOT_AVAILABLE)
         ctx.textual.end_step("error")
         return Error(msg.Steps.Push.GIT_CLIENT_NOT_AVAILABLE)
 
     head_branch = ctx.get("pr_head_branch")
     if not head_branch:
-        ctx.textual.text("No head branch specified", markup="dim")
+        ctx.textual.dim_text("No head branch specified")
         ctx.textual.end_step("skip")
         return Skip("No head branch specified")
 
@@ -118,18 +118,16 @@ def show_branch_diff_summary(ctx: WorkflowContext) -> WorkflowResult:
 
     try:
         # Get diff stat between branches
-        stat_output = ctx.git._run_command([
-            "git", "diff", "--stat", f"{base_branch}...{head_branch}"
-        ])
+        stat_output = ctx.git.get_branch_diff_stat(base_branch, head_branch)
 
         if not stat_output or not stat_output.strip():
-            ctx.textual.text(f"No changes between {base_branch} and {head_branch}", markup="dim")
+            ctx.textual.dim_text(f"No changes between {base_branch} and {head_branch}")
             ctx.textual.end_step("success")
             return Success("No changes")
 
         # Show the stat summary with colors
         ctx.textual.text("")  # spacing
-        ctx.textual.text(f"Changes in {head_branch} vs {base_branch}:", markup="bold")
+        ctx.textual.bold_text(f"Changes in {head_branch} vs {base_branch}:")
         ctx.textual.text("")  # spacing
 
         # Parse lines to find max filename length for alignment
@@ -165,7 +163,7 @@ def show_branch_diff_summary(ctx: WorkflowContext) -> WorkflowResult:
         for line in summary_lines:
             colored_line = line.replace('(+)', '[green](+)[/green]')
             colored_line = colored_line.replace('(-)', '[red](-)[/red]')
-            ctx.textual.text(f"  {colored_line}", markup="dim")
+            ctx.textual.dim_text(f"  {colored_line}")
 
         ctx.textual.text("")  # spacing
 
@@ -174,7 +172,7 @@ def show_branch_diff_summary(ctx: WorkflowContext) -> WorkflowResult:
 
     except Exception as e:
         # Don't fail the workflow, just skip
-        ctx.textual.text(f"Could not show branch diff summary: {e}", markup="yellow")
+        ctx.textual.warning_text(f"Could not show branch diff summary: {e}")
         ctx.textual.end_step("skip")
         return Skip(f"Could not show branch diff summary: {e}")
 

titan_cli-0.1.7/plugins/titan-plugin-git/titan_plugin_git/steps/pull_step.py

@@ -0,0 +1,70 @@
+"""
+Pull from Git remote.
+"""
+
+from typing import Optional
+from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error
+from titan_plugin_git.exceptions import GitError
+
+
+def pull_step(ctx: WorkflowContext) -> WorkflowResult:
+    """
+    Pull from Git remote.
+
+    Inputs (from ctx.data):
+        remote (str, optional): Remote name (defaults to "origin")
+        branch (str, optional): Branch name (defaults to current branch)
+
+    Returns:
+        Success: Pull completed successfully
+        Error: Git operation failed
+    """
+    if ctx.textual:
+        ctx.textual.begin_step("Pull from Remote")
+
+    if not ctx.textual:
+        return Error("Textual UI context is not available for this step.")
+
+    if not ctx.git:
+        ctx.textual.error_text("Git client not available in context")
+        ctx.textual.end_step("error")
+        return Error("Git client not available in context")
+
+    try:
+        # Get params from context (optional)
+        remote = ctx.get("remote", "origin")
+        branch: Optional[str] = ctx.get("pull_branch")  # Optional, defaults to current
+
+        ctx.textual.text("")
+        if branch:
+            ctx.textual.dim_text(f"Pulling {remote}/{branch}...")
+        else:
+            ctx.textual.dim_text(f"Pulling from {remote}...")
+
+        # Pull
+        try:
+            with ctx.textual.loading("Pulling from remote..."):
+                ctx.git.pull(remote=remote, branch=branch)
+            ctx.textual.success_text(f"✓ Pulled from {remote}")
+        except GitError as e:
+            ctx.textual.text("")
+            ctx.textual.error_text(f"Failed to pull: {str(e)}")
+            ctx.textual.end_step("error")
+            return Error(f"Failed to pull: {str(e)}")
+
+        ctx.textual.text("")
+        ctx.textual.end_step("success")
+        return Success(
+            f"Pulled from {remote}",
+            metadata={"remote": remote, "branch": branch}
+        )
+
+    except Exception as e:
+        ctx.textual.text("")
+        ctx.textual.error_text(f"Failed to pull: {str(e)}")
+        ctx.textual.text("")
+        ctx.textual.end_step("error")
+        return Error(f"Failed to pull: {str(e)}")
+
+
+__all__ = ["pull_step"]

{titan_cli-0.1.5 → titan_cli-0.1.7}/plugins/titan-plugin-git/titan_plugin_git/steps/push_step.py

@@ -60,7 +60,7 @@ def create_git_push_step(ctx: WorkflowContext) -> WorkflowResult:
         if push_tags:
             success_msg += " (with tags)"
 
-        ctx.textual.text(success_msg, markup="green")
+        ctx.textual.success_text(success_msg)
 
         ctx.textual.end_step("success")
         return Success(
@@ -69,11 +69,11 @@ def create_git_push_step(ctx: WorkflowContext) -> WorkflowResult:
         )
     except GitCommandError as e:
         error_msg = msg.Steps.Push.PUSH_FAILED.format(e=e)
-        ctx.textual.text(error_msg, markup="red")
+        ctx.textual.error_text(error_msg)
         ctx.textual.end_step("error")
         return Error(error_msg)
     except Exception as e:
         error_msg = msg.Git.UNEXPECTED_ERROR.format(e=e)
-        ctx.textual.text(error_msg, markup="red")
+        ctx.textual.error_text(error_msg)
         ctx.textual.end_step("error")
         return Error(error_msg)