agent-cli 0.61.5__tar.gz → 0.62.0__tar.gz

{agent_cli-0.61.5 → agent_cli-0.62.0}/.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.11"
+    rev: "v0.14.13"
     hooks:
       - id: ruff
         args: ["--fix"]

{agent_cli-0.61.5 → agent_cli-0.62.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.61.5
+Version: 0.62.0
 Summary: A suite of AI-powered command-line tools for text correction, audio transcription, and voice assistance.
 Project-URL: Homepage, https://github.com/basnijholt/agent-cli
 Author-email: Bas Nijholt <bas@nijho.lt>
@@ -128,7 +128,7 @@ Since then I have expanded the tool with many more features, all focused on loca
 - **[`memory`](docs/commands/memory.md)**: Long-term memory system with `memory proxy` and `memory add`.
 - **[`rag-proxy`](docs/commands/rag-proxy.md)**: RAG proxy server for chatting with your documents.
 - **[`dev`](docs/commands/dev.md)**: Parallel development with git worktrees and AI coding agents.
-- **[`server`](docs/commands/server.md)**: Local ASR and TTS servers with dual-protocol (Wyoming & OpenAI), TTL-based memory management, and multi-platform acceleration. Whisper uses MLX on Apple Silicon or Faster Whisper on Linux/CUDA. TTS supports Kokoro (GPU) or Piper (CPU).
+- **[`server`](docs/commands/server/index.md)**: Local ASR and TTS servers with dual-protocol (Wyoming & OpenAI), TTL-based memory management, and multi-platform acceleration. Whisper uses MLX on Apple Silicon or Faster Whisper on Linux/CUDA. TTS supports Kokoro (GPU) or Piper (CPU).
 - **[`transcribe-daemon`](docs/commands/transcribe-daemon.md)**: Continuous background transcription with VAD. Install with `uv tool install "agent-cli[vad]"`.
 
 ## Quick Start
@@ -389,7 +389,7 @@ Our installation scripts automatically handle all dependencies:
 |---------|---------|-----------------|
 | **[Ollama](https://ollama.ai/)** | Local LLM for text processing | ✅ Yes, with default model |
 | **[Wyoming Faster Whisper](https://github.com/rhasspy/wyoming-faster-whisper)** | Speech-to-text | ✅ Yes, via `uvx` |
-| **[`agent-cli server whisper`](docs/commands/server.md#whisper)** | Speech-to-text (alternative) | ✅ Built-in, `pip install "agent-cli[whisper]"` |
+| **[`agent-cli server whisper`](docs/commands/server/whisper.md)** | Speech-to-text (alternative) | ✅ Built-in, `pip install "agent-cli[whisper]"` |
 | **[Wyoming Piper](https://github.com/rhasspy/wyoming-piper)** | Text-to-speech | ✅ Yes, via `uvx` |
 | **[Kokoro-FastAPI](https://github.com/remsky/Kokoro-FastAPI)** | Premium TTS (optional) | ⚙️ Can be added later |
 | **[Wyoming openWakeWord](https://github.com/rhasspy/wyoming-openwakeword)** | Wake word detection | ✅ Yes, for `assistant` |

{agent_cli-0.61.5 → agent_cli-0.62.0}/README.md

@@ -48,7 +48,7 @@ Since then I have expanded the tool with many more features, all focused on loca
 - **[`memory`](docs/commands/memory.md)**: Long-term memory system with `memory proxy` and `memory add`.
 - **[`rag-proxy`](docs/commands/rag-proxy.md)**: RAG proxy server for chatting with your documents.
 - **[`dev`](docs/commands/dev.md)**: Parallel development with git worktrees and AI coding agents.
-- **[`server`](docs/commands/server.md)**: Local ASR and TTS servers with dual-protocol (Wyoming & OpenAI), TTL-based memory management, and multi-platform acceleration. Whisper uses MLX on Apple Silicon or Faster Whisper on Linux/CUDA. TTS supports Kokoro (GPU) or Piper (CPU).
+- **[`server`](docs/commands/server/index.md)**: Local ASR and TTS servers with dual-protocol (Wyoming & OpenAI), TTL-based memory management, and multi-platform acceleration. Whisper uses MLX on Apple Silicon or Faster Whisper on Linux/CUDA. TTS supports Kokoro (GPU) or Piper (CPU).
 - **[`transcribe-daemon`](docs/commands/transcribe-daemon.md)**: Continuous background transcription with VAD. Install with `uv tool install "agent-cli[vad]"`.
 
 ## Quick Start
@@ -309,7 +309,7 @@ Our installation scripts automatically handle all dependencies:
 |---------|---------|-----------------|
 | **[Ollama](https://ollama.ai/)** | Local LLM for text processing | ✅ Yes, with default model |
 | **[Wyoming Faster Whisper](https://github.com/rhasspy/wyoming-faster-whisper)** | Speech-to-text | ✅ Yes, via `uvx` |
-| **[`agent-cli server whisper`](docs/commands/server.md#whisper)** | Speech-to-text (alternative) | ✅ Built-in, `pip install "agent-cli[whisper]"` |
+| **[`agent-cli server whisper`](docs/commands/server/whisper.md)** | Speech-to-text (alternative) | ✅ Built-in, `pip install "agent-cli[whisper]"` |
 | **[Wyoming Piper](https://github.com/rhasspy/wyoming-piper)** | Text-to-speech | ✅ Yes, via `uvx` |
 | **[Kokoro-FastAPI](https://github.com/remsky/Kokoro-FastAPI)** | Premium TTS (optional) | ⚙️ Can be added later |
 | **[Wyoming openWakeWord](https://github.com/rhasspy/wyoming-openwakeword)** | Wake word detection | ✅ Yes, for `assistant` |

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/assistant.py

@@ -253,7 +253,7 @@ async def _async_main(
                 print_with_style("✨ Ready for next command...", style="green")
 
 
-@app.command("assistant")
+@app.command("assistant", rich_help_panel="Voice Commands")
 def assistant(
     *,
     # --- Provider Selection ---

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/autocorrect.py

@@ -208,7 +208,7 @@ async def _async_autocorrect(
         sys.exit(1)
 
 
-@app.command("autocorrect")
+@app.command("autocorrect", rich_help_panel="Text Commands")
 def autocorrect(
     *,
     text: str | None = typer.Argument(

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/chat.py

@@ -373,7 +373,7 @@ async def _async_main(
         raise
 
 
-@app.command("chat")
+@app.command("chat", rich_help_panel="Voice Commands")
 def chat(
     *,
     # --- Provider Selection ---

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/memory/__init__.py

@@ -14,7 +14,7 @@ memory_app = typer.Typer(
     no_args_is_help=True,
 )
 
-app.add_typer(memory_app, name="memory")
+app.add_typer(memory_app, name="memory", rich_help_panel="Servers")
 
 
 @memory_app.callback()

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/rag_proxy.py

@@ -17,7 +17,7 @@ from agent_cli.core.utils import (
 )
 
 
-@app.command("rag-proxy")
+@app.command("rag-proxy", rich_help_panel="Servers")
 def rag_proxy(
     docs_folder: Path = typer.Option(  # noqa: B008
         "./rag_docs",

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/speak.py

@@ -79,7 +79,7 @@ async def _async_main(
     return text
 
 
-@app.command("speak")
+@app.command("speak", rich_help_panel="Text Commands")
 def speak(
     *,
     text: str | None = typer.Argument(

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/transcribe.py

@@ -460,7 +460,7 @@ async def _async_main(  # noqa: PLR0912, PLR0915, C901
     )
 
 
-@app.command("transcribe")
+@app.command("transcribe", rich_help_panel="Voice Commands")
 def transcribe(  # noqa: PLR0912
     *,
     extra_instructions: str | None = typer.Option(

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/transcribe_daemon.py

@@ -286,7 +286,7 @@ async def _daemon_loop(cfg: DaemonConfig) -> None:  # noqa: PLR0912, PLR0915
                     await asyncio.wait(background_tasks, timeout=2.0)
 
 
-@app.command("transcribe-daemon")
+@app.command("transcribe-daemon", rich_help_panel="Voice Commands")
 def transcribe_daemon(  # noqa: PLR0912
     *,
     # Daemon-specific options

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/agents/voice_edit.py

@@ -172,7 +172,7 @@ async def _async_main(
         )
 
 
-@app.command("voice-edit")
+@app.command("voice-edit", rich_help_panel="Voice Commands")
 def voice_edit(
     *,
     # --- Provider Selection ---

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/dev/cli.py

@@ -122,7 +122,7 @@ app = typer.Typer(
     rich_markup_mode="markdown",
     no_args_is_help=True,
 )
-main_app.add_typer(app, name="dev")
+main_app.add_typer(app, name="dev", rich_help_panel="Development")
 
 
 @app.callback()

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/dev/worktree.py

@@ -55,6 +55,15 @@ def is_git_repo(path: Path | None = None) -> bool:
         return False
 
 
+def has_origin_remote(path: Path | None = None) -> bool:
+    """Check if the repository has an 'origin' remote configured."""
+    try:
+        result = _run_git("remote", "get-url", "origin", cwd=path, check=False)
+        return result.returncode == 0
+    except Exception:
+        return False
+
+
 def get_repo_root(path: Path | None = None) -> Path | None:
     """Get the root directory of the git repository."""
     try:
@@ -461,6 +470,35 @@ def _init_submodules(
     )
 
 
+def _pull_lfs(
+    worktree_path: Path,
+    *,
+    on_log: Callable[[str], None] | None = None,
+    capture_output: bool = True,
+) -> None:
+    """Pull Git LFS files in a worktree if LFS is used.
+
+    Evidence: https://git-lfs.com/ - `git lfs pull` fetches LFS objects.
+    This is a no-op if LFS is not used or files are already present.
+    """
+    # Check if .gitattributes contains LFS filters
+    gitattributes = worktree_path / ".gitattributes"
+    if not gitattributes.exists():
+        return
+
+    if "filter=lfs" not in gitattributes.read_text():
+        return
+
+    # Check if git-lfs is installed
+    if not shutil.which("git-lfs"):
+        return
+
+    if on_log:
+        on_log("Pulling Git LFS files...")
+
+    _run_git("lfs", "pull", cwd=worktree_path, check=False, capture_output=capture_output)
+
+
 def _add_worktree(
     branch_name: str,
     worktree_path: Path,
@@ -586,8 +624,11 @@ def create_worktree(
     # Create base directory if needed
     base_dir.mkdir(parents=True, exist_ok=True)
 
-    # Fetch latest refs
-    if fetch:
+    # Check if origin remote exists
+    origin_exists = has_origin_remote(repo_root)
+
+    # Fetch latest refs (only if origin exists)
+    if fetch and origin_exists:
         if on_log:
             on_log("Running: git fetch origin")
         _run_git("fetch", "origin", cwd=repo_root, check=False, capture_output=capture_output)
@@ -596,10 +637,10 @@ def create_worktree(
     from_ref_explicit = from_ref is not None
 
     # Determine the reference to create from
-    # Use origin/{branch} to ensure we're using the freshly-fetched remote ref,
-    # not a potentially stale local branch
+    # Use origin/{branch} if origin exists, otherwise use local branch
     if from_ref is None:
-        from_ref = f"origin/{get_default_branch(repo_root)}"
+        default_branch = get_default_branch(repo_root)
+        from_ref = f"origin/{default_branch}" if origin_exists else default_branch
 
     # Check if branch exists remotely or locally
     remote_exists, local_exists = _check_branch_exists(branch_name, repo_root)
@@ -634,6 +675,13 @@ def create_worktree(
             capture_output=capture_output,
         )
 
+        # Pull Git LFS files if the repo uses LFS
+        _pull_lfs(
+            worktree_path,
+            on_log=on_log,
+            capture_output=capture_output,
+        )
+
         return CreateWorktreeResult(
             success=True,
             path=worktree_path,

{agent_cli-0.61.5 → agent_cli-0.62.0}/agent_cli/server/cli.py

@@ -34,7 +34,7 @@ app = typer.Typer(
     rich_markup_mode="markdown",
     no_args_is_help=True,
 )
-main_app.add_typer(app, name="server")
+main_app.add_typer(app, name="server", rich_help_panel="Servers")
 
 
 @app.callback()

{agent_cli-0.61.5 → agent_cli-0.62.0}/docs/commands/dev.md

@@ -495,6 +495,16 @@ git submodule update --init --recursive
 
 This ensures all submodule dependencies are available in the worktree.
 
+### Git LFS
+
+If the repository uses Git LFS (detected via `filter=lfs` in `.gitattributes`), LFS files are automatically pulled:
+
+```bash
+git lfs pull
+```
+
+This ensures large files tracked by LFS are available in the worktree.
+
 ### Environment Files
 
 The following files are automatically copied to new dev environments:

{agent_cli-0.61.5 → agent_cli-0.62.0}/docs/configuration.md

@@ -235,7 +235,7 @@ Now just run `agent-cli transcribe` - it automatically uses your local server.
 
 > [!TIP]
 > **OpenAI SDK users:** The server also exposes an OpenAI-compatible API on port 10301.
-> See [server whisper docs](commands/server.md#whisper) for all options.
+> See [server whisper docs](commands/server/whisper.md) for all options.
 
 ## Audio Device Configuration
 

{agent_cli-0.61.5 → agent_cli-0.62.0}/docs/getting-started.md

@@ -43,7 +43,7 @@ For a complete local setup with all AI services:
 > pip install "agent-cli[whisper-mlx]"
 > agent-cli server whisper --backend mlx
 > ```
-> See [Local Whisper Server](commands/server.md#whisper) for details.
+> See [Local Whisper Server](commands/server/whisper.md) for details.
 
 === "Using CLI Commands"
 

{agent_cli-0.61.5 → agent_cli-0.62.0}/docs/index.md

@@ -64,7 +64,7 @@ Since then I have expanded the tool with many more features, all focused on loca
 | [`rag-proxy`](commands/rag-proxy.md) | Chat with your documents via RAG |
 | [`memory`](commands/memory.md) | Long-term memory system for conversations |
 | [`dev`](commands/dev.md) | Parallel development with git worktrees and AI coding agents |
-| [`server`](commands/server.md) | Local ASR & TTS servers with dual-protocol (Wyoming & OpenAI), TTL-based memory, and multi-platform acceleration (MLX/CUDA) |
+| [`server`](commands/server/index.md) | Local ASR & TTS servers with dual-protocol (Wyoming & OpenAI), TTL-based memory, and multi-platform acceleration (MLX/CUDA) |
 
 ## Quick Start
 

{agent_cli-0.61.5 → agent_cli-0.62.0}/tests/dev/test_worktree.py

@@ -11,9 +11,11 @@ from agent_cli.dev.worktree import (
     CreateWorktreeResult,
     WorktreeInfo,
     _parse_git_config_regexp,
+    _pull_lfs,
     create_worktree,
     find_worktree_by_name,
     get_main_repo_root,
+    has_origin_remote,
     list_worktrees,
     resolve_worktree_base_dir,
     sanitize_branch_name,
@@ -444,6 +446,7 @@ class TestCreateWorktreeFromRefWarning:
             patch("agent_cli.dev.worktree._check_branch_exists", return_value=(False, True)),
             patch("agent_cli.dev.worktree._add_worktree"),
             patch("agent_cli.dev.worktree._init_submodules"),
+            patch("agent_cli.dev.worktree._pull_lfs"),
             patch("pathlib.Path.exists", return_value=False),
             patch("pathlib.Path.mkdir"),
         ):
@@ -475,6 +478,7 @@ class TestCreateWorktreeFromRefWarning:
             patch("agent_cli.dev.worktree._check_branch_exists", return_value=(True, False)),
             patch("agent_cli.dev.worktree._add_worktree"),
             patch("agent_cli.dev.worktree._init_submodules"),
+            patch("agent_cli.dev.worktree._pull_lfs"),
             patch("pathlib.Path.exists", return_value=False),
             patch("pathlib.Path.mkdir"),
         ):
@@ -533,6 +537,7 @@ class TestCreateWorktreeFromRefWarning:
             patch("agent_cli.dev.worktree._check_branch_exists", return_value=(False, False)),
             patch("agent_cli.dev.worktree._add_worktree"),
             patch("agent_cli.dev.worktree._init_submodules"),
+            patch("agent_cli.dev.worktree._pull_lfs"),
             patch("pathlib.Path.exists", return_value=False),
             patch("pathlib.Path.mkdir"),
         ):
@@ -548,3 +553,211 @@ class TestCreateWorktreeFromRefWarning:
 
             assert result.success is True
             assert result.warning is None  # No warning since branch is new
+
+
+class TestPullLfs:
+    """Tests for _pull_lfs function.
+
+    Evidence: https://git-lfs.com/ - Git LFS stores large files outside the repo
+    and replaces them with pointers. `git lfs pull` fetches the actual content.
+    """
+
+    def test_no_gitattributes(self, tmp_path: Path) -> None:
+        """Skip LFS pull when .gitattributes doesn't exist."""
+        # No .gitattributes file
+        logged: list[str] = []
+        _pull_lfs(tmp_path, on_log=logged.append)
+        assert logged == []  # No log means no action taken
+
+    def test_no_lfs_filter_in_gitattributes(self, tmp_path: Path) -> None:
+        """Skip LFS pull when .gitattributes doesn't contain filter=lfs."""
+        (tmp_path / ".gitattributes").write_text("*.txt text\n")
+        logged: list[str] = []
+        _pull_lfs(tmp_path, on_log=logged.append)
+        assert logged == []  # No log means no action taken
+
+    def test_lfs_pull_when_filter_present(self, tmp_path: Path) -> None:
+        """Run git lfs pull when filter=lfs is in .gitattributes."""
+        (tmp_path / ".gitattributes").write_text("*.bin filter=lfs diff=lfs merge=lfs -text\n")
+
+        with (
+            patch("agent_cli.dev.worktree.shutil.which", return_value="/usr/bin/git-lfs"),
+            patch("agent_cli.dev.worktree._run_git") as mock_run,
+        ):
+            mock_run.return_value.returncode = 0
+            logged: list[str] = []
+            _pull_lfs(tmp_path, on_log=logged.append)
+
+            assert "Pulling Git LFS files..." in logged
+            mock_run.assert_called_once()
+            call_args = mock_run.call_args
+            assert call_args[0] == ("lfs", "pull")
+
+    def test_skip_when_git_lfs_not_installed(self, tmp_path: Path) -> None:
+        """Skip LFS pull when git-lfs is not installed."""
+        (tmp_path / ".gitattributes").write_text("*.bin filter=lfs diff=lfs merge=lfs -text\n")
+
+        with patch("agent_cli.dev.worktree.shutil.which", return_value=None):
+            logged: list[str] = []
+            _pull_lfs(tmp_path, on_log=logged.append)
+            assert logged == []  # No log means no action taken
+
+
+class TestHasOriginRemote:
+    """Tests for has_origin_remote function.
+
+    Validates detection of origin remote presence using `git remote get-url origin`.
+    """
+
+    def test_origin_exists(self) -> None:
+        """Return True when origin remote is configured."""
+        mock_run = MagicMock()
+        mock_run.return_value.returncode = 0
+        mock_run.return_value.stdout = "https://github.com/user/repo.git"
+
+        with patch("agent_cli.dev.worktree._run_git", mock_run):
+            assert has_origin_remote(Path("/repo")) is True
+
+        mock_run.assert_called_once_with(
+            "remote",
+            "get-url",
+            "origin",
+            cwd=Path("/repo"),
+            check=False,
+        )
+
+    def test_origin_not_exists(self) -> None:
+        """Return False when origin remote is not configured."""
+        mock_run = MagicMock()
+        mock_run.return_value.returncode = 2  # git returns non-zero when remote doesn't exist
+        mock_run.return_value.stdout = ""
+
+        with patch("agent_cli.dev.worktree._run_git", mock_run):
+            assert has_origin_remote(Path("/repo")) is False
+
+    def test_git_command_fails(self) -> None:
+        """Return False when git command raises exception."""
+        with patch(
+            "agent_cli.dev.worktree._run_git",
+            side_effect=Exception("git not found"),
+        ):
+            assert has_origin_remote(Path("/repo")) is False
+
+
+class TestCreateWorktreeNoOrigin:
+    """Tests for create_worktree when repository has no origin remote.
+
+    Bug fix: When a repository has no origin remote configured,
+    `dev new` would fail with "fatal: invalid reference: origin/main"
+    because it tried to create the worktree from origin/{branch}.
+
+    The fix:
+    1. Skip `git fetch origin` when no origin exists
+    2. Use the local default branch instead of origin/{branch} as the base ref
+    """
+
+    def test_uses_local_branch_when_no_origin(self) -> None:
+        """Use local branch as from_ref when no origin remote exists."""
+        with (
+            patch("agent_cli.dev.worktree.get_main_repo_root", return_value=Path("/repo")),
+            patch(
+                "agent_cli.dev.worktree.resolve_worktree_base_dir",
+                return_value=Path("/worktrees"),
+            ),
+            patch("agent_cli.dev.worktree._run_git") as mock_run,
+            patch("agent_cli.dev.worktree._check_branch_exists", return_value=(False, False)),
+            patch("agent_cli.dev.worktree._add_worktree") as mock_add_worktree,
+            patch("agent_cli.dev.worktree._init_submodules"),
+            patch("agent_cli.dev.worktree.get_default_branch", return_value="main"),
+            patch("agent_cli.dev.worktree.has_origin_remote", return_value=False),
+            patch("pathlib.Path.exists", return_value=False),
+            patch("pathlib.Path.mkdir"),
+        ):
+            mock_run.return_value.returncode = 0
+            mock_run.return_value.stdout = ""
+
+            result = create_worktree(
+                "new-branch",
+                repo_path=Path("/repo"),
+                from_ref=None,  # Auto-determine
+                fetch=True,
+            )
+
+            assert result.success is True
+            # Verify that _add_worktree was called with local "main" branch, not "origin/main"
+            mock_add_worktree.assert_called_once()
+            call_args = mock_add_worktree.call_args
+            from_ref_used = call_args[0][3]  # 4th positional arg is from_ref
+            assert from_ref_used == "main", f"Expected 'main', got '{from_ref_used}'"
+            assert "origin" not in from_ref_used
+
+    def test_skips_fetch_when_no_origin(self) -> None:
+        """Skip git fetch when no origin remote exists."""
+        fetch_called: list[tuple[str, ...]] = []
+
+        def mock_run_git(*args: str, **_kwargs: object) -> MagicMock:
+            if args[0] == "fetch":
+                fetch_called.append(args)
+            result = MagicMock()
+            result.returncode = 0
+            result.stdout = ""
+            return result
+
+        with (
+            patch("agent_cli.dev.worktree.get_main_repo_root", return_value=Path("/repo")),
+            patch(
+                "agent_cli.dev.worktree.resolve_worktree_base_dir",
+                return_value=Path("/worktrees"),
+            ),
+            patch("agent_cli.dev.worktree._run_git", side_effect=mock_run_git),
+            patch("agent_cli.dev.worktree._check_branch_exists", return_value=(False, False)),
+            patch("agent_cli.dev.worktree._add_worktree"),
+            patch("agent_cli.dev.worktree._init_submodules"),
+            patch("agent_cli.dev.worktree.get_default_branch", return_value="main"),
+            patch("agent_cli.dev.worktree.has_origin_remote", return_value=False),
+            patch("pathlib.Path.exists", return_value=False),
+            patch("pathlib.Path.mkdir"),
+        ):
+            result = create_worktree(
+                "new-branch",
+                repo_path=Path("/repo"),
+                from_ref=None,
+                fetch=True,  # Fetch is requested but should be skipped
+            )
+
+            assert result.success is True
+            assert len(fetch_called) == 0, "git fetch should not be called when no origin"
+
+    def test_uses_origin_when_available(self) -> None:
+        """Use origin/{branch} as from_ref when origin remote exists."""
+        with (
+            patch("agent_cli.dev.worktree.get_main_repo_root", return_value=Path("/repo")),
+            patch(
+                "agent_cli.dev.worktree.resolve_worktree_base_dir",
+                return_value=Path("/worktrees"),
+            ),
+            patch("agent_cli.dev.worktree._run_git") as mock_run,
+            patch("agent_cli.dev.worktree._check_branch_exists", return_value=(False, False)),
+            patch("agent_cli.dev.worktree._add_worktree") as mock_add_worktree,
+            patch("agent_cli.dev.worktree._init_submodules"),
+            patch("agent_cli.dev.worktree.get_default_branch", return_value="main"),
+            patch("agent_cli.dev.worktree.has_origin_remote", return_value=True),
+            patch("pathlib.Path.exists", return_value=False),
+            patch("pathlib.Path.mkdir"),
+        ):
+            mock_run.return_value.returncode = 0
+            mock_run.return_value.stdout = ""
+
+            result = create_worktree(
+                "new-branch",
+                repo_path=Path("/repo"),
+                from_ref=None,  # Auto-determine
+                fetch=True,
+            )
+
+            assert result.success is True
+            # Verify that _add_worktree was called with "origin/main"
+            mock_add_worktree.assert_called_once()
+            call_args = mock_add_worktree.call_args
+            from_ref_used = call_args[0][3]  # 4th positional arg is from_ref
+            assert from_ref_used == "origin/main", f"Expected 'origin/main', got '{from_ref_used}'"