diff --git a/src/auto_commit_service/cli/__init__.py b/src/auto_commit_service/cli/__init__.py
index eadd863..b902bf3 100644
--- a/src/auto_commit_service/cli/__init__.py
+++ b/src/auto_commit_service/cli/__init__.py
@@ -34,10 +34,10 @@ def _get_oneshot_deps():
     from pathlib import Path
     from ..config import AutoCommitSettings
     from ..git import Repository, discover_git_repos, git_status
-    from ..llm import LlamaCommitClient
+    from ..llm import MultiModelLlamaClient
     from ..models import ProcessStatus
     from ..scheduler import CommitDaemon
-    return asyncio, Path, AutoCommitSettings, Repository, discover_git_repos, git_status, LlamaCommitClient, ProcessStatus, CommitDaemon
+    return asyncio, Path, AutoCommitSettings, Repository, discover_git_repos, git_status, MultiModelLlamaClient, ProcessStatus, CommitDaemon
 
 app = typer.Typer(
     name="commits",
@@ -839,7 +839,7 @@ def commit_oneshot(
     typer.echo()
 
     # Import dependencies lazily
-    asyncio_mod, Path, AutoCommitSettings, Repository, discover_git_repos, git_status, LlamaCommitClient, ProcessStatus, CommitDaemon = _get_oneshot_deps()
+    asyncio_mod, Path, AutoCommitSettings, Repository, discover_git_repos, git_status, MultiModelLlamaClient, ProcessStatus, CommitDaemon = _get_oneshot_deps()
 
     async def run_oneshot():
         # Build settings for one-shot mode
@@ -874,8 +874,7 @@ def commit_oneshot(
             raise typer.Exit(1)
 
         # Create LLM client
-        llm_client = LlamaCommitClient(
-            base_url=settings.llama_service_url,
+        llm_client = MultiModelLlamaClient(
             timeout=settings.llama_timeout,
         )