git-copilot-commit 0.5.7__py3-none-any.whl → 0.6.1__py3-none-any.whl

git_copilot_commit/cli.py

@@ -9,12 +9,10 @@ import re
 import sys
 from typing import Annotated, Sequence
 
-import rich
-import typer
+import cyclopts
 from rich.console import Console
 from rich.panel import Panel
-from rich.prompt import Confirm
-from typer.main import get_command
+from rich.prompt import Confirm, Prompt
 
 from .git import GitRepository, GitError, GitStatus, NotAGitRepositoryError
 from .split_commits import (
@@ -29,10 +27,12 @@ from .split_commits import (
 )
 from .settings import Settings
 from .version import __version__
-from . import github_copilot
+from .llms import copilot
+from .llms import core as llm
+from .llms import providers
 
 console = Console()
-app = typer.Typer(help=__doc__, add_completion=False)
+app = cyclopts.App(help=__doc__, version=lambda: f"git-copilot-commit {__version__}")
 
 COMMIT_MESSAGE_PROMPT_FILENAME = "commit-message-generator-prompt.md"
 SPLIT_COMMIT_PLANNER_PROMPT_FILENAME = "split-commit-planner-prompt.md"
@@ -55,22 +55,50 @@ NATIVE_TLS_HELP = (
 
 CaBundleOption = Annotated[
     str | None,
-    typer.Option("--ca-bundle", metavar="PATH", help=CA_BUNDLE_HELP),
+    cyclopts.Parameter(name="--ca-bundle", help=CA_BUNDLE_HELP),
 ]
 InsecureOption = Annotated[
     bool,
-    typer.Option("--insecure", help="Disable SSL certificate verification."),
+    cyclopts.Parameter(name="--insecure", help="Disable SSL certificate verification."),
 ]
 NativeTlsOption = Annotated[
     bool,
-    typer.Option("--native-tls/--no-native-tls", help=NATIVE_TLS_HELP),
+    cyclopts.Parameter(
+        name="--native-tls",
+        negative="--no-native-tls",
+        help=NATIVE_TLS_HELP,
+    ),
+]
+ProviderOption = Annotated[
+    str | None,
+    cyclopts.Parameter(
+        name="--provider",
+        help="LLM provider to use: copilot or openai.",
+    ),
+]
+BaseUrlOption = Annotated[
+    str | None,
+    cyclopts.Parameter(
+        name="--base-url",
+        help=(
+            "Base URL for an OpenAI-compatible provider, for example "
+            "http://127.0.0.1:11434/v1."
+        ),
+    ),
+]
+ApiKeyOption = Annotated[
+    str | None,
+    cyclopts.Parameter(
+        name="--api-key",
+        help="API key for an OpenAI-compatible provider. Omit when the server does not require one.",
+    ),
 ]
 
 
 SplitOption = Annotated[
     bool,
-    typer.Option(
-        "--split",
+    cyclopts.Parameter(
+        name="--split",
         help=(
             "Split staged hunks into multiple commits automatically. Pass "
             "`--split=N` to express a preference for N commits."
@@ -79,10 +107,10 @@ SplitOption = Annotated[
 ]
 SplitCountOption = Annotated[
     int | None,
-    typer.Option(
-        "--split-count",
-        hidden=True,
-        min=1,
+    cyclopts.Parameter(
+        name="--split-count",
+        show=False,
+        validator=cyclopts.validators.Number(gte=1),
     ),
 ]
 
@@ -198,39 +226,13 @@ def order_prepared_split_commits(
 def run(args: Sequence[str] | None = None) -> None:
     """Run the CLI entrypoint with argument normalization."""
     raw_args = list(args) if args is not None else sys.argv[1:]
-    command = get_command(app)
-    command.main(
-        args=preprocess_cli_args(raw_args),
-        prog_name=Path(sys.argv[0]).name,
-    )
+    app(preprocess_cli_args(raw_args))
 
 
-def version_callback(value: bool):
-    if value:
-        rich.print(f"git-copilot-commit [bold yellow]{__version__}[/]")
-        raise typer.Exit()
-
-
-@app.callback(invoke_without_command=True)
-def main(
-    ctx: typer.Context,
-    _: bool = typer.Option(
-        False, "--version", callback=version_callback, help="Show version and exit"
-    ),
-):
-    """
-    Automatically commit changes in the current git repository.
-    """
-    if ctx.invoked_subcommand is None:
-        # Show help when no command is provided
-        console.print(ctx.get_help())
-        raise typer.Exit()
-    else:
-        # Don't show version for print command to avoid interfering with pipes
-        if ctx.invoked_subcommand != "echo":
-            console.print(
-                f"[bold]{(__package__ or 'git_copilot_commit').replace('_', '-')}[/] - [bold green]v{__version__}[/]\n"
-            )
+def print_cli_banner() -> None:
+    """Render the CLI banner before command output."""
+    package_name = (__package__ or "git_copilot_commit").replace("_", "-")
+    console.print(f"[bold]{package_name}[/] - [bold green]v{__version__}[/]\n")
 
 
 def get_prompt_locations(filename: str):
@@ -253,7 +255,7 @@ def resolve_prompt_file() -> Path | None:
         console.print(
             f"[red]Configured default prompt file in {settings.config_file} is invalid.[/red]"
         )
-        raise typer.Exit(1)
+        raise SystemExit(1)
 
     if configured_prompt_file is None:
         return None
@@ -271,7 +273,7 @@ def load_system_prompt() -> str:
             console.print(
                 f"[red]Error reading prompt file {resolved_prompt_file}: {exc}[/red]"
             )
-            raise typer.Exit(1)
+            raise SystemExit(1)
 
     return load_named_prompt(COMMIT_MESSAGE_PROMPT_FILENAME)
 
@@ -285,7 +287,7 @@ def load_named_prompt(filename: str) -> str:
             continue
 
     console.print(f"[red]Error: Prompt file {filename} not found in any location[/red]")
-    raise typer.Exit(1)
+    raise SystemExit(1)
 
 
 def build_http_client_config(
@@ -293,29 +295,29 @@ def build_http_client_config(
     ca_bundle: str | None,
     insecure: bool,
     native_tls: bool,
-) -> github_copilot.HttpClientConfig:
+) -> llm.HttpClientConfig:
     if ca_bundle is not None:
         ca_bundle = os.path.expanduser(ca_bundle)
-    return github_copilot.HttpClientConfig(
+    return llm.HttpClientConfig(
         native_tls=native_tls,
         insecure=insecure,
         ca_bundle=ca_bundle,
     )
 
 
-def print_copilot_error(message: str, exc: github_copilot.CopilotError) -> None:
-    """Render Copilot errors, with rich formatting for model selection issues."""
-    if isinstance(exc, github_copilot.ModelSelectionError):
+def print_llm_error(message: str, exc: llm.LLMError) -> None:
+    """Render LLM errors, with rich formatting for model selection issues."""
+    if isinstance(exc, llm.ModelSelectionError):
         console.print(f"[red]{message}[/red]")
-        github_copilot.print_model_selection_error(exc)
+        llm.print_model_selection_error(exc)
         return
 
     console.print(f"[red]{message}: {exc}[/red]")
 
 
-def display_selected_model(model: github_copilot.CopilotModel) -> None:
-    """Show the resolved Copilot model for the current command."""
-    details = [github_copilot.infer_api_surface(model)]
+def display_selected_model(model: llm.Model) -> None:
+    """Show the resolved model for the current command."""
+    details = [llm.infer_api_surface(model)]
     if model.vendor:
         details.insert(0, model.vendor)
     console.print(f"[green]Using model:[/green] {model.id} ({', '.join(details)})")
@@ -330,7 +332,7 @@ def build_commit_message_prompt(
     """Build the prompt used to generate a commit message."""
     if not status.has_staged_changes:
         console.print("[red]No staged changes to commit.[/red]")
-        raise typer.Exit()
+        raise SystemExit()
 
     prompt_parts = [
         "`git status`:\n",
@@ -352,20 +354,26 @@ def build_commit_message_prompt(
 
 
 def normalize_model_name(model: str | None) -> str | None:
-    """Normalize model names accepted by the CLI to Copilot API model ids."""
-    if model is not None and model.startswith("github_copilot/"):
-        return model.replace("github_copilot/", "", 1)
+    """Normalize model names accepted by the CLI to provider model ids."""
+    if model is not None:
+        for prefix in (
+            "copilot/",
+            "openai-compatible/",
+        ):
+            if model.startswith(prefix):
+                return model.replace(prefix, "", 1)
     return model
 
 
-def ask_copilot_with_system_prompt(
+def ask_llm_with_system_prompt(
     system_prompt: str,
     prompt: str,
     model: str | None = None,
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> str:
-    """Send a prepared prompt to Copilot using the provided system prompt."""
-    return github_copilot.ask(
+    """Send a prepared prompt to the selected LLM provider."""
+    return providers.ask(
         f"""
 # System Prompt
 
@@ -375,6 +383,7 @@ def ask_copilot_with_system_prompt(
 
 {prompt}
             """,
+        provider_config=provider_config,
         model=normalize_model_name(model),
         http_client_config=http_client_config,
     )
@@ -383,20 +392,22 @@ def ask_copilot_with_system_prompt(
 def generate_commit_message_for_prompt(
     prompt: str,
     model: str | None = None,
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> str:
     """Generate a conventional commit message from a prepared prompt."""
-    return ask_copilot_with_system_prompt(
+    return ask_llm_with_system_prompt(
         load_system_prompt(),
         prompt,
         model=model,
+        provider_config=provider_config,
         http_client_config=http_client_config,
     )
 
 
-def should_retry_with_compact_prompt(exc: github_copilot.CopilotError) -> bool:
+def should_retry_with_compact_prompt(exc: llm.LLMError) -> bool:
     message_parts = [str(exc)]
-    if isinstance(exc, github_copilot.CopilotHttpError) and exc.detail:
+    if isinstance(exc, llm.LLMHttpError) and exc.detail:
         message_parts.append(exc.detail)
 
     haystack = " ".join(part.strip() for part in message_parts if part).lower()
@@ -422,7 +433,8 @@ def generate_commit_message_for_status(
     status: GitStatus,
     model: str | None = None,
     context: str = "",
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> str:
     """Generate a commit message for a staged status snapshot."""
     full_prompt = build_commit_message_prompt(status, context=context)
@@ -430,9 +442,10 @@ def generate_commit_message_for_status(
         return generate_commit_message_for_prompt(
             full_prompt,
             model=model,
+            provider_config=provider_config,
             http_client_config=http_client_config,
         )
-    except github_copilot.CopilotError as exc:
+    except llm.LLMError as exc:
         if not should_retry_with_compact_prompt(exc):
             raise
 
@@ -447,6 +460,7 @@ def generate_commit_message_for_status(
     return generate_commit_message_for_prompt(
         fallback_prompt,
         model=model,
+        provider_config=provider_config,
         http_client_config=http_client_config,
     )
 
@@ -466,35 +480,35 @@ def commit_with_retry_no_verify(
             "Retry commit with [bold]`-n`[/] (skip hooks) using the same commit message?",
             default=True,
         ):
-            raise typer.Exit(1)
+            raise SystemExit(1)
 
     try:
         return repo.commit(message, use_editor=use_editor, no_verify=True, env=env)
     except GitError as retry_error:
         console.print(f"[red]Commit with -n failed: {retry_error}[/red]")
-        raise typer.Exit(1)
+        raise SystemExit(1)
 
 
 def ensure_copilot_authentication(
-    http_client_config: github_copilot.HttpClientConfig,
+    http_client_config: llm.HttpClientConfig,
 ) -> None:
     """Authenticate if no cached Copilot credentials are available."""
     try:
-        existing_credentials = github_copilot.load_credentials()
-    except github_copilot.CopilotError:
+        existing_credentials = copilot.load_credentials()
+    except copilot.LLMError:
         existing_credentials = None
 
     if existing_credentials is not None:
         return
 
     try:
-        github_copilot.login(
+        copilot.login(
             force=True,
             http_client_config=http_client_config,
         )
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Authentication failed", exc)
-        raise typer.Exit(1)
+    except copilot.LLMError as exc:
+        print_llm_error("Authentication failed", exc)
+        raise SystemExit(1)
 
 
 def stage_changes_for_commit(
@@ -533,7 +547,8 @@ def request_commit_message(
     status: GitStatus,
     model: str | None = None,
     context: str = "",
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> str:
     """Request a commit message for the provided staged state."""
     try:
@@ -544,11 +559,12 @@ def request_commit_message(
                 status,
                 model=model,
                 context=context,
+                provider_config=provider_config,
                 http_client_config=http_client_config,
             )
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Could not generate a commit message", exc)
-        raise typer.Exit(1)
+    except llm.LLMError as exc:
+        print_llm_error("Could not generate a commit message", exc)
+        raise SystemExit(1)
 
 
 def request_split_commit_plan(
@@ -558,7 +574,8 @@ def request_split_commit_plan(
     preferred_commits: int | None = None,
     model: str | None = None,
     context: str = "",
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> SplitCommitPlan:
     """Request and validate a split-commit plan for the staged patch units."""
     planner_system_prompt = load_named_prompt(SPLIT_COMMIT_PLANNER_PROMPT_FILENAME)
@@ -573,16 +590,17 @@ def request_split_commit_plan(
         with console.status(
             "[yellow]Planning split commits from [bold]staged hunks[/] ...[/yellow]"
         ):
-            response = ask_copilot_with_system_prompt(
+            response = ask_llm_with_system_prompt(
                 planner_system_prompt,
                 planner_prompt,
                 model=model,
+                provider_config=provider_config,
                 http_client_config=http_client_config,
             )
-    except github_copilot.CopilotError as exc:
+    except llm.LLMError as exc:
         if not should_retry_with_compact_prompt(exc):
-            print_copilot_error("Could not generate a split commit plan", exc)
-            raise typer.Exit(1)
+            print_llm_error("Could not generate a split commit plan", exc)
+            raise SystemExit(1)
 
         console.print(
             "[yellow]Staged patch units exceeded the model context window; retrying split planning with summaries only.[/yellow]"
@@ -605,15 +623,16 @@ def request_split_commit_plan(
         with console.status(
             "[yellow]Planning split commits from [bold]patch summaries[/] ...[/yellow]"
         ):
-            response = ask_copilot_with_system_prompt(
+            response = ask_llm_with_system_prompt(
                 planner_system_prompt,
                 compact_planner_prompt,
                 model=model,
+                provider_config=provider_config,
                 http_client_config=http_client_config,
             )
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Could not generate a split commit plan", exc)
-        raise typer.Exit(1)
+    except llm.LLMError as exc:
+        print_llm_error("Could not generate a split commit plan", exc)
+        raise SystemExit(1)
 
     return parse_split_plan_response(
         response,
@@ -627,7 +646,8 @@ def request_split_commit_messages(
     *,
     model: str | None = None,
     context: str = "",
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> list[PreparedSplitCommit]:
     """Generate commit messages for each planned split-commit group."""
     try:
@@ -643,6 +663,7 @@ def request_split_commit_messages(
                     build_status_for_patch_units(unit_group),
                     model=model,
                     context=context,
+                    provider_config=provider_config,
                     http_client_config=http_client_config,
                 )
 
@@ -651,9 +672,9 @@ def request_split_commit_messages(
             )
 
         return prepared_commits
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Could not generate split commit messages", exc)
-        raise typer.Exit(1)
+    except llm.LLMError as exc:
+        print_llm_error("Could not generate split commit messages", exc)
+        raise SystemExit(1)
 
 
 def confirm_split_commit_count(
@@ -683,7 +704,7 @@ def confirm_split_commit_count(
         return plan
 
     console.print("Split commit plan cancelled.")
-    raise typer.Exit()
+    raise SystemExit()
 
 
 def display_commit_message(commit_message: str) -> None:
@@ -722,7 +743,7 @@ def execute_commit_action(
     if yes:
         return commit_with_retry_no_verify(repo, commit_message)
 
-    choice = typer.prompt(
+    choice = Prompt.ask(
         "Choose action: (c)ommit, (e)dit message, (q)uit",
         default="c",
         show_default=True,
@@ -730,7 +751,7 @@ def execute_commit_action(
 
     if choice == "q":
         console.print("Commit cancelled.")
-        raise typer.Exit()
+        raise SystemExit()
     if choice == "e":
         console.print("[cyan]Opening git editor...[/cyan]")
         return commit_with_retry_no_verify(repo, commit_message, use_editor=True)
@@ -738,7 +759,7 @@ def execute_commit_action(
         return commit_with_retry_no_verify(repo, commit_message)
 
     console.print("Invalid choice. Commit cancelled.")
-    raise typer.Exit()
+    raise SystemExit()
 
 
 def execute_split_commit_plan(
@@ -750,7 +771,7 @@ def execute_split_commit_plan(
     """Run the split-commit plan against temporary alternate indexes."""
     use_editor = False
     if not yes:
-        choice = typer.prompt(
+        choice = Prompt.ask(
             "Choose action: (c)ommit all, (e)dit each message, (q)uit",
             default="c",
             show_default=True,
@@ -758,12 +779,12 @@ def execute_split_commit_plan(
 
         if choice == "q":
             console.print("Commit cancelled.")
-            raise typer.Exit()
+            raise SystemExit()
         if choice == "e":
             use_editor = True
         elif choice != "c":
             console.print("Invalid choice. Commit cancelled.")
-            raise typer.Exit()
+            raise SystemExit()
 
     execution_state = SplitCommitExecutionState(
         original_head_sha=repo.get_head_sha() if repo.has_commit("HEAD") else None,
@@ -793,16 +814,19 @@ def execute_split_commit_plan(
                     console.print(
                         f"[red]Failed to apply the planned changes for commit {index}: {exc}[/red]"
                     )
-                    raise typer.Exit(1)
-
-                commit_shas.append(
-                    commit_with_retry_no_verify(
-                        repo,
-                        prepared_commit.message,
-                        use_editor=use_editor,
-                        env=alternate_index.env,
+                    raise SystemExit(1)
+
+                try:
+                    commit_shas.append(
+                        repo.create_commit_from_index(
+                            prepared_commit.message,
+                            index=alternate_index,
+                            use_editor=use_editor,
+                        )
                     )
-                )
+                except GitError as exc:
+                    console.print(f"[red]Failed to create commit {index}: {exc}[/red]")
+                    raise SystemExit(1)
     except BaseException:
         try:
             if execution_state.original_head_sha is not None:
@@ -832,13 +856,15 @@ def handle_single_commit_flow(
     model: str | None = None,
     yes: bool = False,
     context: str = "",
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> None:
     """Generate, display, and execute the single-commit flow."""
     commit_message = request_commit_message(
         status,
         model=model,
         context=context,
+        provider_config=provider_config,
         http_client_config=http_client_config,
     )
     display_commit_message(commit_message)
@@ -855,7 +881,8 @@ def handle_split_commit_flow(
     model: str | None = None,
     yes: bool = False,
     context: str = "",
-    http_client_config: github_copilot.HttpClientConfig | None = None,
+    provider_config: providers.ProviderConfig | None = None,
+    http_client_config: llm.HttpClientConfig | None = None,
 ) -> None:
     """Generate, display, and execute the split-commit flow."""
     patch_units = tuple(
@@ -872,6 +899,7 @@ def handle_split_commit_flow(
             model=model,
             yes=yes,
             context=context,
+            provider_config=provider_config,
             http_client_config=http_client_config,
         )
         return
@@ -886,6 +914,7 @@ def handle_split_commit_flow(
             model=model,
             yes=yes,
             context=context,
+            provider_config=provider_config,
             http_client_config=http_client_config,
         )
         return
@@ -907,6 +936,7 @@ def handle_split_commit_flow(
             preferred_commits=preferred_commits,
             model=model,
             context=context,
+            provider_config=provider_config,
             http_client_config=http_client_config,
         )
     except SplitPlanningError as exc:
@@ -920,6 +950,7 @@ def handle_split_commit_flow(
             model=model,
             yes=yes,
             context=context,
+            provider_config=provider_config,
             http_client_config=http_client_config,
         )
         return
@@ -936,6 +967,7 @@ def handle_split_commit_flow(
         patch_units,
         model=model,
         context=context,
+        provider_config=provider_config,
         http_client_config=http_client_config,
     )
     prepared_commits = order_prepared_split_commits(prepared_commits)
@@ -957,69 +989,94 @@ def handle_split_commit_flow(
         console.print(f"[green]{commit_sha[:8]}[/green] {prepared_commit.message}")
 
 
-@app.command("authenticate")
-@app.command("login", hidden=True)
+@app.command(name="authenticate")
+@app.command(name="login", show=False)
 def authenticate(
-    enterprise_domain: str | None = typer.Option(
-        None,
-        "--enterprise-domain",
-        help="GitHub Enterprise hostname. Omit for github.com.",
-    ),
-    force: bool = typer.Option(
-        False, "--force", help="Replace cached GitHub Copilot credentials"
-    ),
+    enterprise_domain: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            name="--enterprise-domain",
+            help="GitHub Enterprise hostname. Omit for github.com.",
+        ),
+    ] = None,
+    force: Annotated[
+        bool,
+        cyclopts.Parameter(
+            name="--force",
+            help="Replace cached GitHub Copilot credentials",
+        ),
+    ] = False,
     ca_bundle: CaBundleOption = None,
     insecure: InsecureOption = False,
     native_tls: NativeTlsOption = False,
 ):
     """Authenticate with GitHub Copilot and cache credentials locally."""
+    print_cli_banner()
     http_client_config = build_http_client_config(
         ca_bundle=ca_bundle,
         insecure=insecure,
         native_tls=native_tls,
     )
     try:
-        github_copilot.login(
+        copilot.login(
             enterprise_domain=enterprise_domain,
             force=force,
             http_client_config=http_client_config,
         )
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Authentication failed", exc)
-        raise typer.Exit(1)
+    except copilot.LLMError as exc:
+        print_llm_error("Authentication failed", exc)
+        raise SystemExit(1)
 
 
-@app.command("summary")
+@app.command(name="summary")
 def summary(
+    provider: ProviderOption = None,
+    base_url: BaseUrlOption = None,
+    api_key: ApiKeyOption = None,
     ca_bundle: CaBundleOption = None,
     insecure: InsecureOption = False,
     native_tls: NativeTlsOption = False,
 ):
-    """Show the current cached GitHub Copilot login summary."""
+    """Show the configured LLM provider summary."""
+    print_cli_banner()
     http_client_config = build_http_client_config(
         ca_bundle=ca_bundle,
         insecure=insecure,
         native_tls=native_tls,
     )
     try:
-        github_copilot.show_login_summary(http_client_config=http_client_config)
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Could not load login summary", exc)
-        raise typer.Exit(1)
+        provider_config = providers.resolve_provider_config(
+            provider=provider,
+            base_url=base_url,
+            api_key=api_key,
+        )
+        providers.show_summary(
+            provider_config=provider_config,
+            http_client_config=http_client_config,
+        )
+    except llm.LLMError as exc:
+        print_llm_error("Could not load provider summary", exc)
+        raise SystemExit(1)
 
 
-@app.command("models")
+@app.command(name="models")
 def models_command(
-    vendor: str | None = typer.Option(
-        None,
-        "--vendor",
-        help="Filter listed models by vendor: anthropic, gemini/google, or openai.",
-    ),
+    provider: ProviderOption = None,
+    base_url: BaseUrlOption = None,
+    api_key: ApiKeyOption = None,
+    vendor: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            name="--vendor",
+            help="Filter listed models by vendor: anthropic, gemini/google, or openai.",
+        ),
+    ] = None,
     ca_bundle: CaBundleOption = None,
     insecure: InsecureOption = False,
     native_tls: NativeTlsOption = False,
 ):
-    """List available Copilot models for the current account."""
+    """List available models for the configured LLM provider."""
+    print_cli_banner()
     http_client_config = build_http_client_config(
         ca_bundle=ca_bundle,
         insecure=insecure,
@@ -1027,42 +1084,64 @@ def models_command(
     )
 
     try:
-        credentials, models = github_copilot.get_available_models(
+        provider_config = providers.resolve_provider_config(
+            provider=provider,
+            base_url=base_url,
+            api_key=api_key,
+        )
+        inventory = providers.get_available_models(
+            provider_config=provider_config,
             vendor=vendor,
             http_client_config=http_client_config,
         )
 
-        console.print(f"[green]Copilot base URL:[/green] {credentials.base_url()}")
-        console.print(f"[green]Model count:[/green] {len(models)}")
-        github_copilot.print_model_table(models)
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Could not load models", exc)
-        raise typer.Exit(1)
+        console.print(f"[green]LLM provider:[/green] {provider_config.display_name}")
+        console.print(f"[green]Base URL:[/green] {inventory.base_url}")
+        console.print(f"[green]Model count:[/green] {len(inventory.models)}")
+        llm.print_model_table(
+            inventory.models,
+            title=f"Available {provider_config.display_name} Models",
+        )
+    except llm.LLMError as exc:
+        print_llm_error("Could not load models", exc)
+        raise SystemExit(1)
 
 
-@app.command()
+@app.command
 def commit(
-    all_files: bool = typer.Option(
-        False, "--all", "-a", help="Stage all files before committing"
-    ),
+    all_files: Annotated[
+        bool,
+        cyclopts.Parameter(
+            name=("--all", "-a"),
+            help="Stage all files before committing",
+        ),
+    ] = False,
     split: SplitOption = False,
     split_count: SplitCountOption = None,
-    model: str | None = typer.Option(
-        None,
-        "--model",
-        "-m",
-        metavar="MODEL_ID",
-        help="Model to use for generating commit message",
-    ),
-    yes: bool = typer.Option(
-        False, "--yes", "-y", help="Automatically accept the generated commit message"
-    ),
-    context: str = typer.Option(
-        "",
-        "--context",
-        "-c",
-        help="Optional user-provided context to guide commit message",
-    ),
+    model: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            name=("--model", "-m"),
+            help="Model to use for generating commit message",
+        ),
+    ] = None,
+    yes: Annotated[
+        bool,
+        cyclopts.Parameter(
+            name=("--yes", "-y"),
+            help="Automatically accept the generated commit message",
+        ),
+    ] = False,
+    context: Annotated[
+        str,
+        cyclopts.Parameter(
+            name=("--context", "-c"),
+            help="Optional user-provided context to guide commit message",
+        ),
+    ] = "",
+    provider: ProviderOption = None,
+    base_url: BaseUrlOption = None,
+    api_key: ApiKeyOption = None,
     ca_bundle: CaBundleOption = None,
     insecure: InsecureOption = False,
     native_tls: NativeTlsOption = False,
@@ -1070,25 +1149,37 @@ def commit(
     """
     Generate commit message based on changes in the current git repository and commit them.
     """
+    print_cli_banner()
     try:
         repo = GitRepository()
     except NotAGitRepositoryError:
         console.print("[red]Error: Not in a git repository[/red]")
-        raise typer.Exit(1)
+        raise SystemExit(1)
 
     http_client_config = build_http_client_config(
         ca_bundle=ca_bundle,
         insecure=insecure,
         native_tls=native_tls,
     )
-    ensure_copilot_authentication(http_client_config)
+    try:
+        provider_config = providers.resolve_provider_config(
+            provider=provider,
+            base_url=base_url,
+            api_key=api_key,
+        )
+    except llm.LLMError as exc:
+        print_llm_error("Could not resolve the LLM provider", exc)
+        raise SystemExit(1)
+
+    if provider_config.provider == "copilot":
+        ensure_copilot_authentication(http_client_config)
 
     # Get initial status
     status = repo.get_status()
 
     if not status.files:
         console.print("[yellow]No changes to commit.[/yellow]")
-        raise typer.Exit()
+        raise SystemExit()
 
     status = stage_changes_for_commit(repo, status, all_files=all_files)
 
@@ -1099,13 +1190,14 @@ def commit(
 
     normalized_model = normalize_model_name(model)
     try:
-        selected_model = github_copilot.ensure_auth_ready(
+        selected_model = providers.ensure_model_ready(
+            provider_config=provider_config,
             model=normalized_model,
             http_client_config=http_client_config,
         )
-    except github_copilot.CopilotError as exc:
-        print_copilot_error("Could not select a model", exc)
-        raise typer.Exit(1)
+    except llm.LLMError as exc:
+        print_llm_error("Could not select a model", exc)
+        raise SystemExit(1)
 
     display_selected_model(selected_model)
     model = selected_model.id
@@ -1118,6 +1210,7 @@ def commit(
             model=model,
             yes=yes,
             context=context,
+            provider_config=provider_config,
             http_client_config=http_client_config,
         )
         return
@@ -1128,6 +1221,7 @@ def commit(
         model=model,
         yes=yes,
         context=context,
+        provider_config=provider_config,
         http_client_config=http_client_config,
     )