fix: revert env, add arg

Author: 1drturtle

Makefile

@@ -10,7 +10,7 @@ BUMP ?= patch
 
 install:
 	$(UV) sync --all-extras
-	$(UV) tool install --force --no-binary --no-cache --from . avrae-ls
+	$(UV) tool install --force --no-cache --from . avrae-ls
 
 lint:
 	$(UV) run ruff check $(PY_SOURCES)

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "avrae-ls"
-version = "0.6.3"
+version = "0.6.4"
 description = "Language server for Avrae draconic aliases"
 authors = [
   { name = "1drturtle" }

src/avrae_ls/__main__.py

@@ -42,6 +42,8 @@ def main(argv: list[str] | None = None) -> None:
         const=".",
         help="Run alias tests in PATH (defaults to current directory)",
     )
+    parser.add_argument("--token", help="Avrae API token (overrides config)")
+    parser.add_argument("--base-url", help="Avrae API base URL (overrides config)")
     parser.add_argument("--version", action="store_true", help="Print version and exit")
     args = parser.parse_args(argv)
 
@@ -56,12 +58,12 @@ def main(argv: list[str] | None = None) -> None:
             parser.error("--run-tests cannot be combined with --tcp")
         if args.analyze:
             parser.error("--run-tests cannot be combined with --analyze")
-        sys.exit(_run_alias_tests(Path(args.run_tests)))
+        sys.exit(_run_alias_tests(Path(args.run_tests), token_override=args.token, base_url_override=args.base_url))
 
     if args.analyze:
         if args.tcp:
             parser.error("--analyze cannot be combined with --tcp")
-        sys.exit(_run_analysis(Path(args.analyze)))
+        sys.exit(_run_analysis(Path(args.analyze), token_override=args.token, base_url_override=args.base_url))
 
     server = create_server()
     if args.tcp:
@@ -80,7 +82,7 @@ def _configure_logging(level: str) -> None:
     )
 
 
-def _run_analysis(path: Path) -> int:
+def _run_analysis(path: Path, *, token_override: str | None = None, base_url_override: str | None = None) -> int:
     if not path.exists():
         print(f"File not found: {path}", file=sys.stderr)
         return 2
@@ -90,6 +92,10 @@ def _run_analysis(path: Path) -> int:
     log.info("Analyzing %s (workspace root: %s)", path, workspace_root)
 
     config, warnings = load_config(workspace_root, default_enable_gvar_fetch=True)
+    if token_override:
+        config.service.token = token_override
+    if base_url_override:
+        config.service.base_url = base_url_override
     for warning in warnings:
         log.warning(warning)
 
@@ -104,7 +110,9 @@ def _run_analysis(path: Path) -> int:
     return 1 if results else 0
 
 
-def _run_alias_tests(target: Path) -> int:
+def _run_alias_tests(
+    target: Path, *, token_override: str | None = None, base_url_override: str | None = None
+) -> int:
     if not target.exists():
         print(f"Test path not found: {target}", file=sys.stderr)
         return 2
@@ -114,6 +122,10 @@ def _run_alias_tests(target: Path) -> int:
     log.info("Running alias tests in %s (workspace root: %s)", target, workspace_root)
 
     config, warnings = load_config(workspace_root, default_enable_gvar_fetch=True)
+    if token_override:
+        config.service.token = token_override
+    if base_url_override:
+        config.service.base_url = base_url_override
     for warning in warnings:
         log.warning(warning)
 

src/avrae_ls/config.py

@@ -393,9 +393,6 @@ def load_config(workspace_root: Path, *, default_enable_gvar_fetch: bool = False
     if not path.exists():
         cfg = AvraeLSConfig.default(workspace_root)
         cfg.enable_gvar_fetch = default_enable_gvar_fetch
-        env_token = _coerce_optional_str(os.environ.get("AVRAE_TOKEN"))
-        if env_token:
-            cfg.service.token = env_token
         return cfg, []
 
     try:
@@ -419,10 +416,9 @@ def load_config(workspace_root: Path, *, default_enable_gvar_fetch: bool = False
     enable_gvar_fetch = bool(raw.get("enableGvarFetch", default_enable_gvar_fetch))
 
     service_cfg = raw.get("avraeService") or {}
-    env_token = _coerce_optional_str(env.get("AVRAE_TOKEN"))
     service = AvraeServiceConfig(
         base_url=str(service_cfg.get("baseUrl") or AvraeServiceConfig.base_url),
-        token=_coerce_optional_str(service_cfg.get("token")) or env_token,
+        token=_coerce_optional_str(service_cfg.get("token")),
     )
 
     diag_cfg = raw.get("diagnostics") or {}

src/avrae_ls/context.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-import json
-import logging
 import asyncio
 import copy
+import json
+import logging
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Dict, Iterable
@@ -320,6 +320,7 @@ async def _do_request(session: httpx.AsyncClient) -> httpx.Response:
         return True
 
 
+
 def _read_json_file(path: Path) -> Dict[str, Any] | None:
     try:
         text = path.read_text()

uv.lock

@@ -2,7 +2,7 @@
   "name": "avrae-ls-client",
   "displayName": "Avrae Draconic Alias Language Server",
   "description": "VS Code client for avrae-ls (draconic alias diagnostics and mock execution).",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "engines": {
     "vscode": "^1.84.0"
   },