Remove basedpyright and brew references for portability

Author: gretel

.pre-commit-config.yaml

@@ -16,10 +16,3 @@ repos:
         pass_filenames: false
         always_run: true
 
-      - id: basedpyright
-        name: basedpyright (Python)
-        description: Type-check Python with basedpyright (fail on errors only, show warnings)
-        entry: bash -c 'cd tools/block-schema-lint && out=$(uv run basedpyright scan_blocks.py 2>&1); echo "$out"; echo "$out" | tail -1 | grep -q "^0 errors" && exit 0 || exit 1'
-        language: system
-        files: ^tools/block-schema-lint/scan_blocks\.py$
-        pass_filenames: false

tools/block-schema-lint/CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 # ── clang scanner + validation ────────────────────────────────────
 find_program(UV uv)
 if(NOT UV)
-  message(STATUS "block-schema-lint: uv not found (install: brew install uv)")
+  message(STATUS "block-schema-lint: uv not found (install: pip install uv or see https://docs.astral.sh/uv/)")
   return()
 endif()
 message(STATUS "block-schema-lint: ${UV}")
@@ -57,5 +57,5 @@ if(CUE)
   message(STATUS "block-schema-lint: cue schemas at ${CMAKE_CURRENT_SOURCE_DIR}/schemas")
   message(STATUS "  Run \"cue vet -d BlockCatalog schemas/*.cue <input.json>\" to validate")
 else()
-  message(STATUS "block-schema-lint: cue not found (install: brew install cue-lang/tap/cue)")
+  message(STATUS "block-schema-lint: cue not found (see https://cuelang.org/docs/install/)")
 endif()

tools/block-schema-lint/README.md

@@ -78,12 +78,12 @@ uv sync --dev
 
 Installs dev tools into `.venv/`:
 
-- `basedpyright` — type checker
+- `n` — type checker
 
 ### Type checking
 
 ```bash
-uv run basedpyright scan_blocks.py
+uv run n scan_blocks.py
 ```
 
 The project defines TypedDicts (`MemberDict`, `BlockDict`, `IssueDict`, etc.)
@@ -97,9 +97,9 @@ suppressed to "warning" level.
 
 ### macOS notes
 
-The tool prefers brew's LLVM over Xcode's clang to avoid libclang/resource-dir
-version mismatch. It uses `-cxx-isystem /opt/homebrew/opt/llvm/include/c++/v1`
-to find libc++ headers.
+The tool dynamically discovers the LLVM installation from the detected libclang
+library path, avoiding libclang/resource-dir version mismatch. It uses
+`-cxx-isystem` with the discovered libc++ include path.
 
 ## Dependencies
 

tools/block-schema-lint/pyproject.toml

@@ -3,33 +3,6 @@ name = "block-schema-lint"
 version = "0.1.0"
 requires-python = ">=3.11"
 
-[dependency-groups]
-dev = ["basedpyright"]
-
-[tool.basedpyright]
-# clang.cindex is a C extension with incomplete stubs — its enum values
-# (CursorKind.STRUCT_DECL, CursorKind.CLASS_DECL, etc.) are dynamically
-# generated and missing from the .pyi file. Suppress false positives.
-# clang.cindex stub limitations — cannot fix without upstream changes
-reportAttributeAccessIssue = "warning"
-reportUnknownMemberType = "warning"
-reportExplicitAny = "warning"
-reportUnknownVariableType = "warning"
-reportUnknownArgumentType = "warning"
-reportUnknownParameterType = "warning"
-
-# Intentional Python patterns: implicit string concatenation for multi-line
-# strings, argparse.add_argument() return values, os.unlink() in finally blocks
-reportImplicitStringConcatenation = "none"
-reportUnusedCallResult = "none"
-reportUnusedFunction = "none"
-
-# Genuine errors we want to catch
-reportMissingTypeArgument = "error"
-reportPossiblyUnboundVariable = "error"
-reportMissingImports = false  # clang is a PEP 723 runtime dep, not installed in host Python
-reportMissingModuleSource = "none"  # clang stubs via typings/, not installed in .venv
-
 [tool.ruff]
 target-version = "py311"
 

tools/block-schema-lint/scan_blocks.py

@@ -134,23 +134,12 @@ def _find_resource_dir() -> str:
     """Find clang resource directory.
 
     1. LLVM_RESOURCE_DIR env var
-    2. On macOS, prefer brew's clang over Xcode's (avoids libclang/resource-dir mismatch)
-    3. `clang -print-resource-dir` fallback
+    2. `clang -print-resource-dir` via PATH or common LLVM installation directories
     """
     env = os.environ.get("LLVM_RESOURCE_DIR")
     if env:
         return env
 
-    # On macOS, prefer brew's clang to match brew's libclang
-    brew_clang = "/opt/homebrew/opt/llvm/bin/clang"
-    if IS_MACOS and os.path.isfile(brew_clang):
-        try:
-            result = subprocess.check_output([brew_clang, "-print-resource-dir"], text=True).strip()
-            if result:
-                return result
-        except Exception:
-            pass
-
     clang_path = shutil.which("clang") or next(
         (shutil.which(f"clang-{v}") for v in range(99, 10, -1)),
         None,
@@ -198,8 +187,24 @@ def _find_libclang() -> str:
     candidates: list[str] = []
 
     if IS_MACOS:
-        candidates = [
-            "/opt/homebrew/opt/llvm/lib/libclang.dylib",
+        # Try llvm-config --libdir first (find any version with glob)
+        llvm_config = shutil.which("llvm-config")
+        if not llvm_config:
+            for v in range(99, 10, -1):
+                p = shutil.which(f"llvm-config-{v}")
+                if p:
+                    llvm_config = p
+                    break
+        if llvm_config:
+            try:
+                libdir = subprocess.check_output([llvm_config, "--libdir"], text=True).strip()
+                libdir_p = Path(libdir)
+                if libdir_p.is_dir():
+                    for f in sorted(libdir_p.glob("libclang*.dylib"), reverse=True):
+                        candidates.append(str(f))
+            except Exception:
+                pass
+        candidates += [
             "/usr/local/opt/llvm/lib/libclang.dylib",
             "/Library/Developer/CommandLineTools/usr/lib/libclang.dylib",
             "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib",
@@ -251,7 +256,7 @@ def _find_libclang() -> str:
 
 import clang.cindex as ci  # noqa: E402  # runtime dep from uv, not system
 
-# Point clang at brew's libclang (or env-overridden path)
+# Point clang at libclang (env var CLANG_LIBRARY_PATH overrides auto-detection)
 ci.Config.set_library_file(LIBCLANG_PATH)
 
 _INDEX = ci.Index.create()
@@ -339,6 +344,20 @@ def discover_project_includes(project_root: str) -> list[str]:
 # ── parsing ────────────────────────────────────────────────────────
 
 
+def _find_libcxx_include() -> str | None:
+    """Find libc++ include dir alongside the detected libclang path."""
+    try:
+        libclang = Path(LIBCLANG_PATH).resolve()
+    except Exception:
+        return None
+    # Walk up from libclang path looking for include/c++/v1
+    for parent in libclang.parents:
+        candidate = parent / "include" / "c++" / "v1"
+        if candidate.is_dir():
+            return str(candidate)
+    return None
+
+
 def _build_clang_args(
     extra_includes: list[str] | None = None,
 ) -> list[str]:
@@ -354,12 +373,12 @@ def _build_clang_args(
         "-x",
         "c++",
     ]
-    # On macOS, ensure brew's libc++ headers are found (libclang may not
+    # On macOS, ensure libc++ headers are found (libclang may not
     # auto-detect the SDK the same way the clang driver does).
     if IS_MACOS:
-        _brew_cxx = "/opt/homebrew/opt/llvm/include/c++/v1"
-        if os.path.isdir(_brew_cxx):
-            args.extend(["-cxx-isystem", _brew_cxx])
+        _llvm_cxx = _find_libcxx_include()
+        if _llvm_cxx:
+            args.extend(["-cxx-isystem", _llvm_cxx])
     for inc in itertools.chain(
         GR4_INCLUDE_PATHS, PROJECT_INCLUDE_PATHS, extra_includes or []
     ):
@@ -1473,7 +1492,7 @@ def main() -> int:
                                 print(f"  {line}", file=sys.stderr)
                 except FileNotFoundError:
                     print(
-                        "cue not found (install: brew install cue-lang/tap/cue)",
+                        "cue not found (see https://cuelang.org/docs/install/)",
                         file=sys.stderr,
                     )
                 finally: