titan-cli 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

titan_plugin_git/steps/status_step.py

@@ -3,16 +3,20 @@ from titan_cli.engine import (
     WorkflowContext,
     WorkflowResult,
     Success,
-    Error
+    Error,
+    Exit
 )
 from titan_cli.messages import msg as global_msg
 from ..messages import msg
-from titan_cli.ui.tui.widgets import Panel
 
 def get_git_status_step(ctx: WorkflowContext) -> WorkflowResult:
     """
     Retrieves the current git status and saves it to the context.
 
+    Behavior:
+        - If there are uncommitted changes: Returns Success and continues workflow
+        - If working directory is clean: Returns Exit (stops workflow - nothing to commit)
+
     Requires:
         ctx.git: An initialized GitClient.
 
@@ -20,40 +24,43 @@ def get_git_status_step(ctx: WorkflowContext) -> WorkflowResult:
         git_status (GitStatus): The full git status object, which includes the `is_clean` flag.
 
     Returns:
-        Success: If the status was retrieved successfully.
+        Success: If there are changes to commit (workflow continues)
+        Exit: If working directory is clean (workflow stops - nothing to commit)
         Error: If the GitClient is not available or the git command fails.
     """
+    if not ctx.textual:
+        return Error("Textual UI context is not available for this step.")
+
     if not ctx.git:
         return Error(msg.Steps.Status.GIT_CLIENT_NOT_AVAILABLE)
 
+    # Begin step container
+    ctx.textual.begin_step("Check Git Status")
+
     try:
         status = ctx.git.get_status()
 
-        if not ctx.textual:
-            return Error("Textual UI context is not available for this step.")
-
-        # If there are uncommitted changes, show warning panel
+        # If there are uncommitted changes, continue with workflow
         if not status.is_clean:
-            ctx.textual.mount(
-                Panel(
-                    text=global_msg.Workflow.UNCOMMITTED_CHANGES_WARNING,
-                    panel_type="warning"
-                )
-            )
+            ctx.textual.warning_text(global_msg.Workflow.UNCOMMITTED_CHANGES_WARNING)
             message = msg.Steps.Status.STATUS_RETRIEVED_WITH_UNCOMMITTED
-        else:
-            # Show success panel for clean working directory
-            ctx.textual.mount(
-                Panel(
-                    text=msg.Steps.Status.WORKING_DIRECTORY_IS_CLEAN,
-                    panel_type="success"
-                )
+            ctx.textual.end_step("success")
+
+            return Success(
+                message=message,
+                metadata={"git_status": status}
             )
-            message = msg.Steps.Status.WORKING_DIRECTORY_IS_CLEAN
+        else:
+            # Working directory is clean - exit workflow (nothing to commit)
+            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 Success(
-            message=message,
-            metadata={"git_status": status}
-        )
     except Exception as e:
+        # End step container with error
+        ctx.textual.end_step("error")
         return Error(msg.Steps.Status.FAILED_TO_GET_STATUS.format(e=e))

titan_plugin_git/workflows/commit-ai.yaml

@@ -5,13 +5,19 @@ hooks:
   - before_commit  # Hook for linting/testing
 
 steps:
-  - hook: before_commit  # This is where injected steps will run
-
+  # Check for changes FIRST - exits workflow if nothing to commit
   - id: git_status
     name: "Check Git Status"
     plugin: git
     step: get_status
 
+  - hook: before_commit  # This is where injected steps will run
+
+  - id: diff_summary
+    name: "Show Changes Summary"
+    plugin: git
+    step: show_uncommitted_diff_summary
+
   - id: ai_commit_message
     name: "AI Commit Message"
     plugin: git
@@ -21,7 +27,7 @@ steps:
     name: "Create Commit"
     plugin: git
     step: create_commit
-  
+
   - id: push
     name: "Push changes to remote"
     plugin: git

titan_plugin_github/agents/pr_agent.py

@@ -420,8 +420,9 @@ COMMIT_MESSAGE: <conventional commit message>"""
 ```
 
 ## CRITICAL Instructions
-1. **Title**: Follow conventional commits (type(scope): description), be clear and descriptive
-   - Examples: "feat(auth): add OAuth2 integration with Google provider", "fix(api): resolve race condition in cache invalidation"
+1. **Title**: Follow conventional commits (type(scope): Description), be clear and descriptive
+   - Start description with CAPITAL letter (imperative mood)
+   - Examples: "feat(auth): Add OAuth2 integration with Google provider", "fix(api): Resolve race condition in cache invalidation"
 
 2. **Description**: MUST follow the template structure above but keep it under {max_chars} characters total
    - Fill in the template sections (Summary, Type of Change, Changes Made, etc.)
@@ -460,6 +461,18 @@ DESCRIPTION:
         # Clean up title
         title = title.strip('"').strip("'")
 
+        # Ensure title subject starts with capital letter (conventional commits requirement)
+        # Format: type(scope): Description
+        if ':' in title:
+            parts = title.split(':', 1)
+            if len(parts) == 2:
+                prefix = parts[0]  # type(scope)
+                subject = parts[1].strip()  # description
+                # Capitalize first letter of subject
+                if subject and subject[0].islower():
+                    subject = subject[0].upper() + subject[1:]
+                title = f"{prefix}: {subject}"
+
         # Truncate description if needed (but not title)
         if len(description) > max_chars:
             description = description[:max_chars - 3] + "..."

titan_plugin_github/steps/ai_pr_step.py

@@ -6,7 +6,6 @@ Uses PRAgent to analyze branch context and generate PR content.
 """
 
 from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error, Skip
-from titan_cli.ui.tui.widgets import Panel
 
 from ..agents import PRAgent
 from ..messages import msg
@@ -43,33 +42,34 @@ def ai_suggest_pr_description_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("AI PR Description")
+
     # Check if AI is configured
     if not ctx.ai or not ctx.ai.is_available():
-        ctx.textual.mount(
-            Panel(
-                text=msg.GitHub.AI.AI_NOT_CONFIGURED,
-                panel_type="info"
-            )
-        )
+        ctx.textual.dim_text(msg.GitHub.AI.AI_NOT_CONFIGURED)
+        ctx.textual.end_step("skip")
         return Skip(msg.GitHub.AI.AI_NOT_CONFIGURED)
 
     # Get Git client
     if not ctx.git:
+        ctx.textual.end_step("error")
         return Error(msg.GitHub.AI.GIT_CLIENT_NOT_AVAILABLE)
 
     # Get branch info
     head_branch = ctx.get("pr_head_branch")
     if not head_branch:
+        ctx.textual.end_step("error")
         return Error(msg.GitHub.AI.MISSING_PR_HEAD_BRANCH)
 
     base_branch = ctx.git.main_branch
 
     try:
         # Show progress
-        ctx.textual.text(msg.GitHub.AI.ANALYZING_BRANCH_DIFF.format(
+        ctx.textual.dim_text(msg.GitHub.AI.ANALYZING_BRANCH_DIFF.format(
             head_branch=head_branch,
             base_branch=base_branch
-        ), markup="dim")
+        ))
 
         # Create PRAgent instance
         pr_agent = PRAgent(
@@ -88,73 +88,131 @@ def ai_suggest_pr_description_step(ctx: WorkflowContext) -> WorkflowResult:
 
         # Check if PR content was generated (need commits in branch)
         if not analysis.pr_title or not analysis.pr_body:
-            ctx.textual.mount(
-                Panel(
-                    text="No commits found in branch to generate PR description.",
-                    panel_type="info"
-                )
-            )
+            ctx.textual.dim_text("No commits found in branch to generate PR description.")
+            ctx.textual.end_step("skip")
             return Skip("No commits found for PR generation")
 
         # Show PR size info
         if analysis.pr_size:
-            ctx.textual.text(msg.GitHub.AI.PR_SIZE_INFO.format(
+            ctx.textual.dim_text(msg.GitHub.AI.PR_SIZE_INFO.format(
                 pr_size=analysis.pr_size,
                 files_changed=analysis.files_changed,
                 diff_lines=analysis.lines_changed,
                 max_chars="varies by size"
-            ), markup="dim")
+            ))
 
         # Show PR preview to user
         ctx.textual.text("")  # spacing
-        ctx.textual.text(msg.GitHub.AI.AI_GENERATED_PR_TITLE, markup="bold")
+        ctx.textual.bold_text(msg.GitHub.AI.AI_GENERATED_PR_TITLE)
         ctx.textual.text("")  # spacing
 
         # Show title
-        ctx.textual.text(msg.GitHub.AI.TITLE_LABEL, markup="bold")
-        ctx.textual.text(f"  {analysis.pr_title}", markup="cyan")
+        ctx.textual.bold_text(msg.GitHub.AI.TITLE_LABEL)
+        ctx.textual.primary_text(f"  {analysis.pr_title}")
 
         # Warn if title is too long
         if len(analysis.pr_title) > 72:
-            ctx.textual.text(msg.GitHub.AI.TITLE_TOO_LONG_WARNING.format(
+            ctx.textual.warning_text(msg.GitHub.AI.TITLE_TOO_LONG_WARNING.format(
                 length=len(analysis.pr_title)
-            ), markup="yellow")
+            ))
 
         ctx.textual.text("")  # spacing
 
         # Show description
-        ctx.textual.text(msg.GitHub.AI.DESCRIPTION_LABEL, markup="bold")
+        ctx.textual.bold_text(msg.GitHub.AI.DESCRIPTION_LABEL)
         # Render markdown in a scrollable container
         ctx.textual.markdown(analysis.pr_body)
 
+        # Scroll to show the choice buttons below
+        ctx.textual.scroll_to_end()
+
         ctx.textual.text("")  # spacing
 
-        # Single confirmation for both title and description
-        use_ai_pr = ctx.textual.ask_confirm(
-            msg.GitHub.AI.CONFIRM_USE_AI_PR,
-            default=True
+        # Ask user what to do with the AI suggestion
+        from titan_cli.ui.tui.widgets import ChoiceOption
+
+        options = [
+            ChoiceOption(value="use", label="Use as-is", variant="primary"),
+            ChoiceOption(value="edit", label="Edit", variant="default"),
+            ChoiceOption(value="reject", label="Reject", variant="error"),
+        ]
+
+        choice = ctx.textual.ask_choice(
+            "What would you like to do with this PR description?",
+            options
         )
 
-        if not use_ai_pr:
-            ctx.textual.text(msg.GitHub.AI.AI_SUGGESTION_REJECTED, markup="yellow")
+        # Handle user choice
+        if choice == "reject":
+            ctx.textual.warning_text(msg.GitHub.AI.AI_SUGGESTION_REJECTED)
+            ctx.textual.end_step("skip")
             return Skip("User rejected AI-generated PR")
 
-        # Show success panel
-        ctx.textual.mount(
-            Panel(
-                text="AI generated PR description successfully",
-                panel_type="success"
-            )
-        )
+        # Store initial values
+        pr_title = analysis.pr_title
+        pr_body = analysis.pr_body
+
+        if choice == "edit":
+            # Edit loop: allow user to edit until they confirm
+            while True:
+                ctx.textual.text("")
+                ctx.textual.dim_text("Edit the PR content below (first line = title, rest = description)")
+
+                # Combine title and body as markdown for editing
+                combined_markdown = f"{pr_title}\n\n{pr_body}"
+
+                # Ask user to edit
+                edited_content = ctx.textual.ask_multiline(
+                    "Edit PR content:",
+                    default=combined_markdown
+                )
+
+                # Scroll to show what comes next after editing
+                ctx.textual.scroll_to_end()
+
+                if not edited_content or not edited_content.strip():
+                    ctx.textual.warning_text("PR content cannot be empty")
+                    ctx.textual.end_step("skip")
+                    return Skip("Empty PR content")
+
+                # Parse: first line = title, rest = body
+                lines = edited_content.strip().split("\n", 1)
+                pr_title = lines[0].strip()
+                pr_body = lines[1].strip() if len(lines) > 1 else ""
+
+                # Show final preview
+                ctx.textual.text("")
+                ctx.textual.bold_text("Final Preview:")
+                ctx.textual.text("")
+                ctx.textual.bold_text("Title:")
+                ctx.textual.primary_text(f"  {pr_title}")
+                ctx.textual.text("")
+                ctx.textual.bold_text("Description:")
+                ctx.textual.markdown(pr_body)
+                ctx.textual.text("")
+
+                # Scroll to show the confirm question below
+                ctx.textual.scroll_to_end()
+
+                # Confirm
+                confirmed = ctx.textual.ask_confirm(
+                    "Use this PR content?",
+                    default=True
+                )
+
+                if confirmed:
+                    break
+                # If not confirmed, loop back to edit
 
         # Success - save to context
         metadata = {
             "ai_generated": True,
-            "pr_title": analysis.pr_title,
-            "pr_body": analysis.pr_body,
+            "pr_title": pr_title,
+            "pr_body": pr_body,
             "pr_size": analysis.pr_size
         }
 
+        ctx.textual.end_step("success")
         return Success(
             msg.GitHub.AI.AI_GENERATED_PR_DESCRIPTION_SUCCESS,
             metadata=metadata
@@ -162,9 +220,10 @@ def ai_suggest_pr_description_step(ctx: WorkflowContext) -> WorkflowResult:
 
     except Exception as e:
         # Don't fail the workflow, just skip AI and use manual prompts
-        ctx.textual.text(msg.GitHub.AI.AI_GENERATION_FAILED.format(e=e), markup="yellow")
-        ctx.textual.text(msg.GitHub.AI.FALLBACK_TO_MANUAL, markup="dim")
+        ctx.textual.warning_text(msg.GitHub.AI.AI_GENERATION_FAILED.format(e=e))
+        ctx.textual.dim_text(msg.GitHub.AI.FALLBACK_TO_MANUAL)
 
+        ctx.textual.end_step("skip")
         return Skip(msg.GitHub.AI.AI_GENERATION_FAILED.format(e=e))
 
 

titan_plugin_github/steps/create_pr_step.py

@@ -1,6 +1,5 @@
 # plugins/titan-plugin-github/titan_plugin_github/steps/create_pr_step.py
 from titan_cli.engine import WorkflowContext, WorkflowResult, Success, Error
-from titan_cli.ui.tui.widgets import Panel
 from ..exceptions import GitHubAPIError
 from ..messages import msg
 
@@ -33,10 +32,17 @@ def create_pr_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("Create Pull Request")
+
     # 1. Get GitHub client from context
     if not ctx.github:
+        ctx.textual.error_text("GitHub client is not available in the workflow context.")
+        ctx.textual.end_step("error")
         return Error("GitHub client is not available in the workflow context.")
     if not ctx.git:
+        ctx.textual.error_text("Git client is not available in the workflow context.")
+        ctx.textual.end_step("error")
         return Error("Git client is not available in the workflow context.")
 
     # 2. Get required data from context and client config
@@ -47,6 +53,8 @@ def create_pr_step(ctx: WorkflowContext) -> WorkflowResult:
     is_draft = ctx.get("pr_is_draft", False)  # Default to not a draft
 
     if not all([title, base, head]):
+        ctx.textual.error_text("Missing required context for creating a pull request: pr_title, pr_head_branch.")
+        ctx.textual.end_step("error")
         return Error(
             "Missing required context for creating a pull request: pr_title, pr_head_branch."
         )
@@ -59,28 +67,30 @@ def create_pr_step(ctx: WorkflowContext) -> WorkflowResult:
             assignees = [current_user]
         except GitHubAPIError as e:
             # Log warning but continue without assignee
-            ctx.textual.text(f"Could not get current user for auto-assign: {e}", markup="yellow")
+            ctx.textual.warning_text(f"Could not get current user for auto-assign: {e}")
 
     # 4. Call the client method
     try:
+        ctx.textual.dim_text(f"Creating pull request '{title}' from {head} to {base}...")
         pr = ctx.github.create_pull_request(
             title=title, body=body, base=base, head=head, draft=is_draft, assignees=assignees
         )
-        ctx.textual.mount(
-            Panel(
-                text=msg.GitHub.PR_CREATED.format(number=pr["number"], url=pr["url"]),
-                panel_type="success"
-            )
-        )
+        ctx.textual.text("")  # spacing
+        ctx.textual.success_text(msg.GitHub.PR_CREATED.format(number=pr["number"], url=pr["url"]))
 
         # 4. Return Success with PR info
+        ctx.textual.end_step("success")
         return Success(
             "Pull request created successfully.",
             metadata={"pr_number": pr["number"], "pr_url": pr["url"]},
         )
     except GitHubAPIError as e:
+        ctx.textual.error_text(f"Failed to create pull request: {e}")
+        ctx.textual.end_step("error")
         return Error(f"Failed to create pull request: {e}")
     except Exception as e:
+        ctx.textual.error_text(f"An unexpected error occurred while creating the pull request: {e}")
+        ctx.textual.end_step("error")
         return Error(
             f"An unexpected error occurred while creating the pull request: {e}"
         )

titan_plugin_github/steps/github_prompt_steps.py

@@ -23,18 +23,27 @@ def prompt_for_pr_title_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("Prompt for PR Title")
+
     # Skip if title already exists (e.g., from AI generation)
     if ctx.get("pr_title"):
+        ctx.textual.dim_text("PR title already provided, skipping manual prompt.")
+        ctx.textual.end_step("skip")
         return Skip("PR title already provided, skipping manual prompt.")
 
     try:
         title = ctx.textual.ask_text(msg.Prompts.ENTER_PR_TITLE)
         if not title:
+            ctx.textual.end_step("error")
             return Error("PR title cannot be empty.")
+        ctx.textual.end_step("success")
         return Success("PR title captured", metadata={"pr_title": title})
     except (KeyboardInterrupt, EOFError):
+        ctx.textual.end_step("error")
         return Error("User cancelled.")
     except Exception as e:
+        ctx.textual.end_step("error")
         return Error(f"Failed to prompt for PR title: {e}", exception=e)
 
 
@@ -57,17 +66,25 @@ def prompt_for_pr_body_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("Prompt for PR Body")
+
     # Skip if body already exists (e.g., from AI generation)
     if ctx.get("pr_body"):
+        ctx.textual.dim_text("PR body already provided, skipping manual prompt.")
+        ctx.textual.end_step("skip")
         return Skip("PR body already provided, skipping manual prompt.")
 
     try:
         body = ctx.textual.ask_multiline(msg.Prompts.ENTER_PR_BODY, default="")
         # Body can be empty
+        ctx.textual.end_step("success")
         return Success("PR body captured", metadata={"pr_body": body})
     except (KeyboardInterrupt, EOFError):
+        ctx.textual.end_step("error")
         return Error("User cancelled.")
     except Exception as e:
+        ctx.textual.end_step("error")
         return Error(f"Failed to prompt for PR body: {e}", exception=e)
 
 
@@ -90,17 +107,25 @@ def prompt_for_issue_body_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("Prompt for Issue Body")
+
     # Skip if body already exists (e.g., from AI generation)
     if ctx.get("issue_body"):
+        ctx.textual.dim_text("Issue body already provided, skipping manual prompt.")
+        ctx.textual.end_step("skip")
         return Skip("Issue body already provided, skipping manual prompt.")
 
     try:
         body = ctx.textual.ask_multiline(msg.Prompts.ENTER_ISSUE_BODY, default="")
         # Body can be empty
+        ctx.textual.end_step("success")
         return Success("Issue body captured", metadata={"issue_body": body})
     except (KeyboardInterrupt, EOFError):
+        ctx.textual.end_step("error")
         return Error("User cancelled.")
     except Exception as e:
+        ctx.textual.end_step("error")
         return Error(f"Failed to prompt for issue body: {e}", exception=e)
 
 
@@ -111,7 +136,12 @@ def prompt_for_self_assign_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("Assign Issue")
+
     if not ctx.github:
+        ctx.textual.error_text("GitHub client not available")
+        ctx.textual.end_step("error")
         return Error("GitHub client not available")
 
     try:
@@ -121,11 +151,18 @@ def prompt_for_self_assign_step(ctx: WorkflowContext) -> WorkflowResult:
             if current_user not in assignees:
                 assignees.append(current_user)
             ctx.set("assignees", assignees)
+            ctx.textual.success_text(f"Issue will be assigned to {current_user}")
+            ctx.textual.end_step("success")
             return Success(f"Issue will be assigned to {current_user}")
+        ctx.textual.dim_text("Issue will not be assigned to current user")
+        ctx.textual.end_step("success")
         return Success("Issue will not be assigned to current user")
     except (KeyboardInterrupt, EOFError):
+        ctx.textual.end_step("error")
         return Error("User cancelled.")
     except Exception as e:
+        ctx.textual.error_text(f"Failed to prompt for self-assign: {e}")
+        ctx.textual.end_step("error")
         return Error(f"Failed to prompt for self-assign: {e}", exception=e)
 
 
@@ -136,16 +173,23 @@ def prompt_for_labels_step(ctx: WorkflowContext) -> WorkflowResult:
     if not ctx.textual:
         return Error("Textual UI context is not available for this step.")
 
+    # Begin step container
+    ctx.textual.begin_step("Select Labels")
+
     if not ctx.github:
+        ctx.textual.error_text("GitHub client not available")
+        ctx.textual.end_step("error")
         return Error("GitHub client not available")
 
     try:
         available_labels = ctx.github.list_labels()
         if not available_labels:
+            ctx.textual.dim_text("No labels found in the repository.")
+            ctx.textual.end_step("skip")
             return Skip("No labels found in the repository.")
 
         # Show available labels
-        ctx.textual.text(f"Available labels: {', '.join(available_labels)}", markup="dim")
+        ctx.textual.dim_text(f"Available labels: {', '.join(available_labels)}")
 
         # Get default labels as comma-separated string
         existing_labels = ctx.get("labels", [])
@@ -164,8 +208,16 @@ def prompt_for_labels_step(ctx: WorkflowContext) -> WorkflowResult:
             selected_labels = []
 
         ctx.set("labels", selected_labels)
+        if selected_labels:
+            ctx.textual.success_text(f"Selected labels: {', '.join(selected_labels)}")
+        else:
+            ctx.textual.dim_text("No labels selected")
+        ctx.textual.end_step("success")
         return Success("Labels selected")
     except (KeyboardInterrupt, EOFError):
+        ctx.textual.end_step("error")
         return Error("User cancelled.")
     except Exception as e:
+        ctx.textual.error_text(f"Failed to prompt for labels: {e}")
+        ctx.textual.end_step("error")
         return Error(f"Failed to prompt for labels: {e}", exception=e)