diffsage 1.2.1__tar.gz → 1.3.1__tar.gz

{diffsage-1.2.1/src/diffsage.egg-info → diffsage-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsage
-Version: 1.2.1
+Version: 1.3.1
 Summary: AI-powered Git workflow assistant
 Author: Gunitha Rathnayake
 License: MIT
@@ -116,6 +116,10 @@ Current capabilities include:
 - AI provider authentication and error handling
 - Layered architecture
 - Comprehensive automated test suite
+- Add AI-assisted PR generation
+- Interactive PR draft review/edit/regeneration
+- GitHub PR creation
+- Branch synchronization validation
 
 ---
 
@@ -313,6 +317,35 @@ Display AI suggestion
 [N] Cancel
 ```
 
+```bash
+diffsage pr 
+```
+
+PR workflow
+
+```text
+Generate PR draft
+       │
+       ▼
+Show base/head branches
+       │
+       ▼
+Display PR draft
+       │
+ ┌─────┼───────────┐
+ ▼     ▼           ▼
+Edit Regenerate   Cancel
+       │
+       ▼
+    Accept
+       │
+       ▼
+Create GitHub PR
+       │
+       ▼
+Display PR URL
+```
+
 Named credential profiles are also supported:
 
 ```bash
@@ -340,6 +373,8 @@ diffsage auth unset gemini
 |----------|-------------|
 | `diffsage doctor` | Validate the local DiffSage environment |
 | `diffsage commit` | Generate and manage AI-assisted commit messages |
+| `diffsage pr` | Generate, review, and create a GitHub pull request |
+| `diffsage pr <base-branch>` | Generate and create a pull request against a specific base branch |
 | `diffsage config list` | Display the current DiffSage configuration |
 | `diffsage config get` | Display the value of a configuration setting |
 | `diffsage config set` | Update a configuration setting |
@@ -350,7 +385,46 @@ diffsage auth unset gemini
 | `diffsage auth unset` | Remove a provider credential |
 | `diffsage ask` | Ask the configured AI provider a question |
 
-More commands will be introduced as the project evolves.
+---
+
+## Pull Request Workflow
+
+The `diffsage pr` command analyzes the current Git branch against a resolved base branch and generates a structured pull request draft.
+
+The workflow is interactive:
+
+```text
+Analyze Git repository
+        │
+        ▼
+Resolve base branch
+        │
+        ▼
+Generate PR draft
+        │
+        ▼
+Display base/head branches
+        │
+        ▼
+Review PR draft
+        │
+ ┌──────┼──────────────┐
+ ▼      ▼              ▼
+Edit  Regenerate      Cancel
+ │      │
+ └──────┴───────┐
+                ▼
+             Accept
+                │
+                ▼
+        Validate GitHub access
+                │
+                ▼
+        Create GitHub pull request
+                │
+                ▼
+        Display pull request URL
+```
 
 ---
 
@@ -368,15 +442,22 @@ Commands
 │
 ├── Authentication
 │
-▼
-Services
+├── Commit Workflow
 │
-├── Git
-├── AI
-├── Prompt Generation
-└── Credentials
-│
-▼
+└── Pull Request Workflow
+        │
+        ▼
+    Services
+        │
+        ├── Git
+        ├── GitHub
+        ├── AI
+        ├── Prompt Generation
+        ├── Pull Request Analysis
+        ├── Pull Request Parsing
+        └── Credentials
+        │
+        ▼
 Providers / Storage
 ```
 
@@ -402,6 +483,7 @@ src/
     ├── config/
     ├── exceptions/
     ├── git/
+    ├── github/
     ├── logging/
     ├── models/
     ├── parsers/
@@ -412,6 +494,18 @@ src/
     └── ui/
 
 tests/
+├── commands/
+├── config/
+├── git/
+├── github/
+├── integration/
+├── models/
+├── parsers/
+├── prompts/
+├── providers/
+├── services/
+├── storage/
+└── ui/
 
 docs/
 ```
@@ -460,6 +554,7 @@ Instead of requiring every automation tool or AI agent to implement Git workflow
 
 - Repository validation
 - Git operations
+- GitHub integration
 - AI integration
 - Workflow execution
 - Error handling

{diffsage-1.2.1 → diffsage-1.3.1}/README.md

@@ -77,6 +77,10 @@ Current capabilities include:
 - AI provider authentication and error handling
 - Layered architecture
 - Comprehensive automated test suite
+- Add AI-assisted PR generation
+- Interactive PR draft review/edit/regeneration
+- GitHub PR creation
+- Branch synchronization validation
 
 ---
 
@@ -274,6 +278,35 @@ Display AI suggestion
 [N] Cancel
 ```
 
+```bash
+diffsage pr 
+```
+
+PR workflow
+
+```text
+Generate PR draft
+       │
+       ▼
+Show base/head branches
+       │
+       ▼
+Display PR draft
+       │
+ ┌─────┼───────────┐
+ ▼     ▼           ▼
+Edit Regenerate   Cancel
+       │
+       ▼
+    Accept
+       │
+       ▼
+Create GitHub PR
+       │
+       ▼
+Display PR URL
+```
+
 Named credential profiles are also supported:
 
 ```bash
@@ -301,6 +334,8 @@ diffsage auth unset gemini
 |----------|-------------|
 | `diffsage doctor` | Validate the local DiffSage environment |
 | `diffsage commit` | Generate and manage AI-assisted commit messages |
+| `diffsage pr` | Generate, review, and create a GitHub pull request |
+| `diffsage pr <base-branch>` | Generate and create a pull request against a specific base branch |
 | `diffsage config list` | Display the current DiffSage configuration |
 | `diffsage config get` | Display the value of a configuration setting |
 | `diffsage config set` | Update a configuration setting |
@@ -311,7 +346,46 @@ diffsage auth unset gemini
 | `diffsage auth unset` | Remove a provider credential |
 | `diffsage ask` | Ask the configured AI provider a question |
 
-More commands will be introduced as the project evolves.
+---
+
+## Pull Request Workflow
+
+The `diffsage pr` command analyzes the current Git branch against a resolved base branch and generates a structured pull request draft.
+
+The workflow is interactive:
+
+```text
+Analyze Git repository
+        │
+        ▼
+Resolve base branch
+        │
+        ▼
+Generate PR draft
+        │
+        ▼
+Display base/head branches
+        │
+        ▼
+Review PR draft
+        │
+ ┌──────┼──────────────┐
+ ▼      ▼              ▼
+Edit  Regenerate      Cancel
+ │      │
+ └──────┴───────┐
+                ▼
+             Accept
+                │
+                ▼
+        Validate GitHub access
+                │
+                ▼
+        Create GitHub pull request
+                │
+                ▼
+        Display pull request URL
+```
 
 ---
 
@@ -329,15 +403,22 @@ Commands
 │
 ├── Authentication
 │
-▼
-Services
+├── Commit Workflow
 │
-├── Git
-├── AI
-├── Prompt Generation
-└── Credentials
-│
-▼
+└── Pull Request Workflow
+        │
+        ▼
+    Services
+        │
+        ├── Git
+        ├── GitHub
+        ├── AI
+        ├── Prompt Generation
+        ├── Pull Request Analysis
+        ├── Pull Request Parsing
+        └── Credentials
+        │
+        ▼
 Providers / Storage
 ```
 
@@ -363,6 +444,7 @@ src/
     ├── config/
     ├── exceptions/
     ├── git/
+    ├── github/
     ├── logging/
     ├── models/
     ├── parsers/
@@ -373,6 +455,18 @@ src/
     └── ui/
 
 tests/
+├── commands/
+├── config/
+├── git/
+├── github/
+├── integration/
+├── models/
+├── parsers/
+├── prompts/
+├── providers/
+├── services/
+├── storage/
+└── ui/
 
 docs/
 ```
@@ -421,6 +515,7 @@ Instead of requiring every automation tool or AI agent to implement Git workflow
 
 - Repository validation
 - Git operations
+- GitHub integration
 - AI integration
 - Workflow execution
 - Error handling

{diffsage-1.2.1 → diffsage-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "diffsage"
-version = "1.2.1"
+version = "1.3.1"
 description = "AI-powered Git workflow assistant"
 readme = "README.md"
 requires-python = ">=3.12,<3.13"

{diffsage-1.2.1 → diffsage-1.3.1}/src/diffsage/cli.py

@@ -1,4 +1,5 @@
 import logging
+from importlib.metadata import version
 
 import typer
 
@@ -7,14 +8,30 @@ from diffsage.commands.auth import app as auth_app
 from diffsage.commands.commit import commit
 from diffsage.commands.config import app as config_app
 from diffsage.commands.doctor import doctor
+from diffsage.commands.pr import pr
 from diffsage.config.loader import load_settings
 from diffsage.logging.logger import configure_logging
 
 app = typer.Typer(help="DiffSage: AI-aware Git workflow toolkit")
 
 
+def version_callback(value: bool) -> None:
+    if value:
+        typer.echo(version("diffsage"))
+        raise typer.Exit()
+
+
 @app.callback()
-def main() -> None:
+def main(
+    version: bool = typer.Option(
+        False,
+        "--version",
+        "-v",
+        callback=version_callback,
+        is_eager=True,
+        help="Show the Diffsage version.",
+    ),
+) -> None:
     """
     Initialize DiffSage.
     """
@@ -31,8 +48,13 @@ def main() -> None:
 app.command()(doctor)
 app.command()(ask)
 app.command()(commit)
+app.command()(pr)
+
 app.add_typer(
     config_app,
     name="config",
 )
-app.add_typer(auth_app, name="auth")
+app.add_typer(
+    auth_app,
+    name="auth",
+)

{diffsage-1.2.1 → diffsage-1.3.1}/src/diffsage/commands/commit.py

@@ -1,3 +1,5 @@
+from collections.abc import Callable
+
 from diffsage.config.loader import load_settings
 from diffsage.config.paths import get_credentials_path
 from diffsage.exceptions import (
@@ -22,8 +24,13 @@ from diffsage.ui.commit_view import CommitView
 logger = get_logger(__name__)
 
 
-def generate_message(commit_service: CommitService) -> str:
-    return commit_service.generate_commit_message()
+def generate_message(
+    commit_service: CommitService,
+    on_attempt: Callable[[int, int], None] | None = None,
+) -> str:
+    return commit_service.generate_commit_message(
+        on_attempt=on_attempt,
+    )
 
 
 def commit() -> None:
@@ -54,8 +61,13 @@ def commit() -> None:
             ai_service,
         )
 
-        with view.generating():
-            raw_message = generate_message(commit_service)
+        with view.generating() as status:
+            raw_message = generate_message(
+                commit_service,
+                on_attempt=lambda attempt, total: status.update(
+                    f"Generating commit message... Attempt {attempt}/{total}"
+                ),
+            )
             commit_message = CommitMessageParser.parse(raw_message)
 
         view.show_generated()
@@ -79,8 +91,13 @@ def commit() -> None:
 
             if choice == "r":
                 logger.info("User selected regenerate.")
-                with view.generating():
-                    raw_message = generate_message(commit_service)
+                with view.generating() as status:
+                    raw_message = generate_message(
+                        commit_service,
+                        on_attempt=lambda attempt, total: status.update(
+                            f"Generating commit message... Attempt {attempt}/{total}"
+                        ),
+                    )
                     commit_message = CommitMessageParser.parse(raw_message)
 
                 view.show_generated()

diffsage-1.3.1/src/diffsage/commands/pr.py

@@ -0,0 +1,220 @@
+import json
+
+import typer
+
+from diffsage.config.loader import load_settings
+from diffsage.config.paths import get_credentials_path
+from diffsage.exceptions import (
+    BaseBranchNotFoundError,
+    ConfigError,
+    CredentialNotFoundError,
+    DetachedHeadError,
+    GitHubAuthenticationError,
+    GitHubCLIUnavailableError,
+    InvalidPullRequestDraftError,
+    NotGitRepositoryError,
+    ProviderError,
+    RemoteBranchNotFoundError,
+    SameBranchError,
+    UnpushedChangesError,
+)
+from diffsage.git.client import GitClient
+from diffsage.github.client import GitHubClient
+from diffsage.logging.logger import get_logger
+from diffsage.parsers.pull_request_parser import PullRequestParser
+from diffsage.services.ai_service import AIService
+from diffsage.services.credentials_service import CredentialService
+from diffsage.services.editor_service import EditorService
+from diffsage.services.git_service import GitService
+from diffsage.services.github_service import GitHubService
+from diffsage.services.prompt_service import PromptService
+from diffsage.services.pull_request_analysis_service import (
+    PullRequestAnalysisService,
+)
+from diffsage.services.pull_request_service import PullRequestService
+from diffsage.storage.credentials_repository import CredentialsRepository
+from diffsage.ui.pull_request_view import PullRequestView
+
+logger = get_logger(__name__)
+
+
+def pr(
+    base_branch: str | None = typer.Argument(
+        None,
+        help="Base branch to compare against. If omitted, DiffSage resolves it automatically.",
+    ),
+) -> None:
+    """Generate a pull request draft"""
+
+    view = PullRequestView()
+
+    try:
+        git_client = GitClient()
+        github_client = GitHubClient()
+        settings = load_settings()
+
+        credential_path = get_credentials_path()
+        credential_repository = CredentialsRepository(credential_path)
+        credential_service = CredentialService(credential_repository)
+
+        git_service = GitService(git_client)
+        github_service = GitHubService(github_client)
+        analysis_service = PullRequestAnalysisService()
+        prompt_service = PromptService()
+        editor_service = EditorService()
+
+        ai_service = AIService(
+            settings,
+            credential_service,
+        )
+
+        parser = PullRequestParser()
+
+        pull_request_service = PullRequestService(
+            git_service=git_service,
+            analysis_service=analysis_service,
+            prompt_service=prompt_service,
+            ai_service=ai_service,
+            parser=parser,
+        )
+
+        resolved_base_branch = git_service.resolve_base_branch(base_branch)
+        head_branch = git_service.current_branch()
+
+        git_service.validate_remote_head(head_branch)
+        github_service.validate()
+
+        view.show_branches(
+            base_branch=resolved_base_branch,
+            head_branch=head_branch,
+        )
+
+        with view.generating() as status:
+            draft = pull_request_service.generate_draft(
+                resolved_base_branch,
+                on_attempt=lambda attempt, total: status.update(
+                    f"Generating pull request draft... Attempt {attempt}/{total}"
+                ),
+            )
+
+        view.show_generated(draft)
+
+        while True:
+            choice = view.prompt_action()
+
+            if choice in ("", "y"):
+                logger.info("User accepted pull request draft.")
+
+                with view.creating():
+                    pull_request_url = github_service.create_pull_request(
+                        draft=draft,
+                        base_branch=resolved_base_branch,
+                        head_branch=head_branch,
+                    )
+
+                view.show_created(pull_request_url)
+                break
+
+            if choice == "e":
+                logger.info("User selected edit.")
+
+                edited_content = editor_service.edit(
+                    json.dumps(
+                        draft.to_dict(),
+                        indent=2,
+                    )
+                )
+                try:
+                    draft = parser.parse(edited_content)
+                except InvalidPullRequestDraftError as e:
+                    view.show_error(str(e))
+                    continue
+
+                view.show_generated(draft)
+                continue
+
+            if choice == "r":
+                logger.info("User selected regenerate.")
+
+                with view.generating():
+                    draft = pull_request_service.generate_draft(
+                        resolved_base_branch,
+                        on_attempt=lambda attempt, total: status.update(
+                            f"Generating pull request draft... Attempt {attempt}/{total}"
+                        ),
+                    )
+
+                view.show_generated(draft)
+                continue
+
+            if choice == "n":
+                logger.info("User cancelled pull request generation.")
+                view.show_cancelled()
+                break
+
+            view.show_invalid_option()
+
+    except NotGitRepositoryError:
+        logger.info("Command aborted: not a Git repository.")
+        view.show_not_git_repository()
+        raise SystemExit(1) from None
+
+    except DetachedHeadError:
+        logger.info("Command aborted: detached HEAD.")
+        view.show_detached_head()
+        raise SystemExit(1) from None
+
+    except BaseBranchNotFoundError:
+        logger.info("Command aborted: base branch could not be determined.")
+        view.show_base_branch_not_found()
+        raise SystemExit(1) from None
+
+    except SameBranchError:
+        logger.info("Current branch and base branch are the same.")
+        view.show_same_branch()
+        raise SystemExit(1) from None
+
+    except RemoteBranchNotFoundError:
+        logger.info("Command aborted: remote branch does not exist.")
+        view.show_error("Remote branch does not exist on origin.")
+        raise SystemExit(1) from None
+
+    except UnpushedChangesError:
+        logger.info("Command aborted: branch contains unpushed commits.")
+        view.show_error("Your branch contains commits that have not been pushed to origin.")
+        raise SystemExit(1) from None
+
+    except ProviderError as e:
+        logger.warning(str(e))
+        view.show_error(str(e))
+        raise SystemExit(1) from None
+
+    except CredentialNotFoundError as e:
+        logger.warning(str(e))
+        view.show_error(str(e))
+        raise SystemExit(1) from None
+
+    except ConfigError as e:
+        logger.warning(str(e))
+        view.show_error(str(e))
+        raise SystemExit(1) from None
+
+    except InvalidPullRequestDraftError as e:
+        logger.warning(str(e))
+        view.show_error(str(e))
+        raise SystemExit(1) from None
+
+    except GitHubCLIUnavailableError as e:
+        logger.warning(str(e))
+        view.show_error(str(e))
+        raise SystemExit(1) from None
+
+    except GitHubAuthenticationError as e:
+        logger.warning(str(e))
+        view.show_error(str(e))
+        raise SystemExit(1) from None
+
+    except Exception:
+        logger.exception("Unexpected error while executing PR command.")
+        view.show_error("An unexpected error occurred. Please check the log file for more details.")
+        raise SystemExit(1) from None