update

Author: observerw

.github/workflows/release-beta.yml

@@ -3,14 +3,14 @@ name: Create Beta Release
 on:
   push:
     tags:
-      - 'v*.*.*-beta.*'
-      - 'v*.*.*-rc.*'
-      - 'v*.*.*-a.*'
-      - 'v*.*.*-b.*'
+      - "v*.*.*-beta.*"
+      - "v*.*.*-rc.*"
+      - "v*.*.*-a.*"
+      - "v*.*.*-b.*"
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag to release (e.g., v0.1.0-beta.1)'
+        description: "Tag to release (e.g., v0.1.0-beta.1)"
         required: true
 
 permissions:
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      
+
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:

.github/workflows/release.yml

@@ -3,11 +3,11 @@ name: Create Release
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag to release'
+        description: "Tag to release"
         required: true
 
 permissions:
@@ -65,7 +65,7 @@ jobs:
       url: https://pypi.org/project/lsp-cli/
     steps:
       - uses: actions/checkout@v6
-      
+
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:

pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 [project.scripts]
-lsp = "lsp_cli.__main__:app"
+lsp = "lsp_cli.__main__:run"
 
 [build-system]
 requires = ["uv_build>=0.9.9,<0.10.0"]

src/lsp_cli/__main__.py

@@ -9,18 +9,18 @@
 from loguru import logger
 from lsap.definition import DefinitionCapability, DefinitionClient
 from lsap.hover import HoverCapability, HoverClient
+from lsap.outline import OutlineCapability, OutlineClient
 from lsap.reference import ReferenceCapability, ReferenceClient
 from lsap.search import SearchCapability, SearchClient
 from lsap.symbol import SymbolCapability, SymbolClient
-from lsap.symbol_outline import SymbolOutlineCapability, SymbolOutlineClient
 from lsap_schema.definition import DefinitionRequest
 from lsap_schema.hover import HoverRequest
 from lsap_schema.locate import LineScope, Locate, SymbolScope
 from lsap_schema.models import SymbolKind
+from lsap_schema.outline import OutlineRequest
 from lsap_schema.reference import ReferenceRequest
 from lsap_schema.search import SearchRequest
 from lsap_schema.symbol import SymbolRequest
-from lsap_schema.symbol_outline import SymbolOutlineRequest
 from lsp_client import Client
 from rich.console import Console
 from rich.markdown import Markdown
@@ -29,7 +29,7 @@
 from lsp_cli.manager import CreateClientRequest, CreateClientResponse
 from lsp_cli.manager.server import ManagerServer
 from lsp_cli.server import app as server_app
-from lsp_cli.server import get_client
+from lsp_cli.server import get_manager_client
 from lsp_cli.settings import settings
 from lsp_cli.utils.sync import cli_syncify
 
@@ -55,7 +55,7 @@ async def init_client(path: Path) -> AsyncGenerator[Client]:
         console.print(f"[red]Error:[/red] No LSP client for {path}")
         raise typer.Exit(1)
 
-    with get_client() as httpx:
+    with get_manager_client() as httpx:
         req = CreateClientRequest(path=path).model_dump(mode="json")
         resp = httpx.post("/create", json=req)
         json = resp.raise_for_status().json()
@@ -137,11 +137,13 @@ def main(
         console.print(
             "\n[dim]LSP CLI tool - Type [bold]--help[/bold] for more info[/dim]\n"
         )
+        console.print(ctx.get_help())
+        raise typer.Exit()
 
 
 @app.command(
     "definition",
-    help="Find the definition, declaration, or type definition of a symbol at a specific location. (alias: def)",
+    help="Find the definition (default), declaration (--decl), or type definition (--type) of a symbol. (alias: def)",
 )
 @app.command("def", hidden=True)
 @cli_syncify
@@ -156,10 +158,22 @@ async def get_definition(
         typer.Option(
             "--mode",
             "-m",
-            help="Search mode: 'definition' for symbol definition, 'declaration' for symbol declaration, or 'type_definition' for the type of the symbol.",
+            help="Search mode (default: definition).",
+            hidden=True,
         ),
     ] = "definition",
+    decl: bool = typer.Option(False, "--decl", help="Search for symbol declaration."),
+    type_def: bool = typer.Option(False, "--type", help="Search for type definition."),
 ):
+    if decl and type_def:
+        console.print("[red]Error:[/red] --decl and --type are mutually exclusive")
+        raise typer.Exit(1)
+
+    if decl:
+        mode = "declaration"
+    elif type_def:
+        mode = "type_definition"
+
     locate = create_locate(file_path, scope, find, marker)
 
     async with init_client(file_path) as client:
@@ -175,6 +189,8 @@ async def get_definition(
 
         if resp := await cap(req):
             print_resp(resp, ctx)
+        else:
+            console.print(f"[yellow]No {mode.replace('_', ' ')} found[/yellow]")
 
 
 @app.command(
@@ -201,11 +217,13 @@ async def get_hover(
 
         if resp := await cap(req):
             print_resp(resp, ctx)
+        else:
+            console.print("[yellow]No hover information found[/yellow]")
 
 
 @app.command(
     "reference",
-    help="Find references or implementations of a symbol at a specific location. (alias: ref)",
+    help="Find references (default) or implementations (--impl) of a symbol. (alias: ref)",
 )
 @app.command("ref", hidden=True)
 @cli_syncify
@@ -220,9 +238,12 @@ async def get_reference(
         typer.Option(
             "--mode",
             "-m",
-            help="Search mode: 'references' to find all usages, or 'implementations' to find concrete implementations.",
+            help="Search mode (default: references).",
+            hidden=True,
         ),
     ] = "references",
+    impl: bool = typer.Option(False, "--impl", help="Find concrete implementations."),
+    references: bool = typer.Option(False, "--ref", help="Find all usages."),
     context_lines: Annotated[
         int,
         typer.Option(
@@ -235,6 +256,15 @@ async def get_reference(
     start_index: op.StartIndexOpt = 0,
     pagination_id: op.PaginationIdOpt = None,
 ):
+    if impl and references:
+        console.print("[red]Error:[/red] --impl and --ref are mutually exclusive")
+        raise typer.Exit(1)
+
+    if impl:
+        mode = "implementations"
+    elif references:
+        mode = "references"
+
     locate = create_locate(file_path, scope, find, marker)
 
     async with init_client(file_path) as client:
@@ -254,6 +284,8 @@ async def get_reference(
 
         if resp := await cap(req):
             print_resp(resp, ctx)
+        else:
+            console.print(f"[yellow]No {mode} found[/yellow]")
 
 
 @app.command(
@@ -263,15 +295,18 @@ async def get_reference(
 @cli_syncify
 async def get_outline(ctx: typer.Context, file_path: op.FileArg):
     async with init_client(file_path) as client:
-        if not isinstance(client, SymbolOutlineClient):
+        if not isinstance(client, OutlineClient):
             console.print("[red]Error:[/red] Client does not support symbol outline")
             raise typer.Exit(1)
 
-        cap = SymbolOutlineCapability(client)
-        req = SymbolOutlineRequest(file_path=file_path)
+        cap = OutlineCapability(client)
+        req = OutlineRequest(file_path=file_path)
 
         if resp := await cap(req):
-            print_resp(resp, ctx)
+            if resp.items:
+                print_resp(resp, ctx)
+            else:
+                console.print("[yellow]No symbols found[/yellow]")
         else:
             console.print("[yellow]No symbols found[/yellow]")
 
@@ -303,6 +338,8 @@ async def get_symbol(
 
         if resp := await cap(req):
             print_resp(resp, ctx)
+        else:
+            console.print("[yellow]No symbol information found[/yellow]")
 
 
 @app.command(
@@ -316,7 +353,7 @@ async def search(
         str,
         typer.Argument(help="The name or partial name of the symbol to search for."),
     ],
-    path: op.FileArg,
+    workspace: op.WorkspaceOpt,
     kinds: Annotated[
         list[str] | None,
         typer.Option(
@@ -329,7 +366,7 @@ async def search(
     start_index: op.StartIndexOpt = 0,
     pagination_id: op.PaginationIdOpt = None,
 ):
-    async with init_client(path) as client:
+    async with init_client(workspace) as client:
         if not isinstance(client, SearchClient):
             console.print("[red]Error:[/red] Client does not support search")
             raise typer.Exit(1)
@@ -344,8 +381,29 @@ async def search(
         )
 
         if resp := await cap(req):
-            print_resp(resp, ctx)
+            if resp.items:
+                print_resp(resp, ctx)
+            else:
+                console.print("[yellow]No matches found[/yellow]")
+        else:
+            console.print("[yellow]No matches found[/yellow]")
+
+
+def run():
+    try:
+        app()
+    except Exception as e:
+        if settings.debug:
+            raise
+
+        def get_msg(err: Exception) -> str:
+            if isinstance(err, ExceptionGroup):
+                return "\n".join(get_msg(se) for se in err.exceptions)
+            return str(err)
+
+        console.print(f"[red]Error:[/red] {get_msg(e)}")
+        sys.exit(1)
 
 
 if __name__ == "__main__":
-    app()
+    run()

src/lsp_cli/manager/__init__.py

@@ -51,7 +51,7 @@ def get_manager(state: State) -> Manager:
 def connect_manager() -> httpx.Client:
     if not is_socket_alive(MANAGER_UDS_PATH):
         subprocess.Popen(
-            [sys.executable, "-m", "lsp_cli.manager"],
+            (sys.executable, "-m", "lsp_cli.manager"),
             stdin=subprocess.DEVNULL,
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,