revert: keep lib/ at src/agentex/lib (Option X); pyright can't see split namespace

Pyright fails reportMissingImports on intra-lib `agentex.lib.*` imports when
lib/ lives in a sibling source tree (adk/src/agentex/lib/) because pyright
analyzes statically and doesn't run pkgutil.extend_path. Even pointing
pyright at the editable-install venv doesn't help — the static module
resolver picks `src/agentex/` (which has __init__.py) and stops; it never
discovers adk/src/agentex/lib/.

This kills the file-move (Option Y) direction. Disabling reportMissingImports
for lib loses meaningful static analysis; PEP-420 namespace (drop __init__.py)
breaks `from agentex import Agentex`.

Switching to Option X: lib/ stays at src/agentex/lib/ as it originally was.
The two packages share the source tree:
- Root pyproject's wheel target adds `exclude = ["src/agentex/lib/**"]` so
  the slim wheel doesn't ship lib code.
- adk/pyproject.toml uses hatchling `force-include "../src/agentex/lib" =
  "agentex/lib"` to pull lib/* into the heavy wheel from the parent dir.
- src/agentex/__init__.py reverts to its Stainless-natural form; no
  pkgutil.extend_path needed (single source tree, no namespace merge).

Files reverted:
- 350 lib files: adk/src/agentex/lib → src/agentex/lib
- Test files moved earlier: adk/tests → tests (lib tests back at tests/lib)
- Pytest config: testpaths back to ["tests"]; dropped --import-mode=importlib
- Pyright config: removed extraPaths/include; restored exec-env root to
  src/agentex/lib; dropped adk/tests exec env
- Mypy config: dropped mypy_path; removed adk/tests from exclude
- Ruff per-file-ignores: removed adk/tests pattern
- src/agentex/__init__.py: removed pkgutil.extend_path

Kept:
- Two-package structure (slim agentex-sdk-client at root, heavy agentex-sdk
  at adk/) — the install-time win
- rye workspace so `rye sync` installs both packages' deps in the dev venv
- bin/publish-pypi dual-build, release-please two-package mode, CI dual-build

Verified locally:
- pyright on src/agentex/lib/adk/__init__.py → 0 errors
- pytest --collect-only → 2204 tests collect cleanly
- Build slim → wheel excludes agentex/lib/ correctly
- Build heavy → wheel contains only agentex/lib/* (347 files)
- Dual install: from agentex import Agentex AND from agentex.lib.* both work
- Single editable install (pip install -e . + pip install -e ./adk):
  heavy deps installed (ddtrace, temporalio, fastapi, etc.); imports work

Trade-off documented in PR body: root pyproject's wheel `exclude` is a
hand-edit to Stainless's emitted file that must survive 3-way merge. Manual
edits to `dependencies = [...]` have survived historically; we're betting
the same holds for `[tool.hatch.build.targets.wheel].exclude`. If Stainless
clobbers it during a regen, options are (a) re-add manually, (b) move the
exclude to `keep_files`-protected file via dashboard config, or (c) pivot
back to file-move with pyright workarounds.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: max-parke-scale

adk/pyproject.toml

@@ -81,30 +81,20 @@ agentex = "agentex.lib.cli.commands.main:app"
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-# Ship only agentex/lib/*. The rest of agentex.* (the Stainless-generated
-# client) ships from the sibling agentex-sdk-client package, which this
-# package pins as a runtime dep.
+# Ship only agentex/lib/*, pulled in from the parent repo's `src/agentex/lib`
+# tree. The rest of agentex.* (the Stainless-generated client) ships from the
+# sibling agentex-sdk-client package, which this package pins as a runtime dep.
+# Stainless explicitly preserves `src/agentex/lib/` across codegen (per
+# CONTRIBUTING.md), so it's safe to keep the source where it is.
 [tool.hatch.build.targets.wheel]
-only-include = ["src/agentex/lib"]
-sources = ["src"]
-# Don't ship internal test files in the wheel; CLI Jinja templates
-# (test_agent.py.j2 etc.) are preserved because they don't match these globs.
-exclude = [
-  "src/agentex/lib/**/tests/**",
-  "src/agentex/lib/**/test_*.py",
-  "src/agentex/lib/**/conftest.py",
-  "src/agentex/lib/**/pytest.ini",
-]
+bypass-selection = true
+
+[tool.hatch.build.targets.wheel.force-include]
+"../src/agentex/lib" = "agentex/lib"
 
 [tool.hatch.build.targets.sdist]
 include = [
   "/pyproject.toml",
   "/README.md",
-  "/src/agentex/lib/**",
-]
-exclude = [
-  "/src/agentex/lib/**/tests/**",
-  "/src/agentex/lib/**/test_*.py",
-  "/src/agentex/lib/**/conftest.py",
-  "/src/agentex/lib/**/pytest.ini",
+  "/../src/agentex/lib/**",
 ]

adk/tests/lib/core/tracing/processors/__init__.py

@@ -57,9 +57,8 @@ dev = [
 
 [tool.rye.workspace]
 # `rye sync` from the root installs both this slim package and the ADK
-# overlay editably. The two contribute disjoint files to the same agentex.*
-# namespace — see the pkgutil.extend_path call in src/agentex/__init__.py
-# which merges their __path__ entries at import time.
+# overlay editably. `src/agentex/lib/` is shared source: the slim wheel
+# excludes it; the heavy wheel includes it via hatchling force-include.
 members = ["adk"]
 
 [tool.rye]
@@ -128,6 +127,12 @@ include = [
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/agentex"]
+# agentex/lib/* ships from the sibling agentex-sdk package (see adk/pyproject.toml).
+# Excluding it here keeps the slim wheel disjoint from the heavy wheel so both
+# can install into the same site-packages/agentex/ without file conflicts.
+exclude = [
+  "src/agentex/lib/**",
+]
 
 [tool.hatch.build.targets.sdist]
 # Basically everything except hidden files/directories (such as .github, .devcontainers, .python-version, etc)
@@ -156,14 +161,8 @@ pattern = '\[(.+?)\]\(((?!https?://)\S+?)\)'
 replacement = '[\1](https://github.com/scaleapi/scale-agentex-python/tree/main/\g<2>)'
 
 [tool.pytest.ini_options]
-# Both `tests/` (client) and `adk/tests/` (ADK overlay) are collected; the ADK
-# tests resolve `agentex.lib.*` via the sibling agentex-sdk package installed
-# editably by scripts/bootstrap.
-testpaths = ["tests", "adk/tests"]
-# importlib mode avoids the "duplicate package name" collision that classic
-# import mode hits when both tests/ and adk/tests/ have __init__.py making
-# them both look like a top-level `tests` package.
-addopts = "--tb=short -n auto --import-mode=importlib"
+testpaths = ["tests"]
+addopts = "--tb=short -n auto"
 xfail_strict = true
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "session"
@@ -177,12 +176,6 @@ filterwarnings = [
 typeCheckingMode = "basic"
 pythonVersion = "3.12"
 
-# Both src/ (slim client) and adk/src/ (ADK overlay) contribute to the
-# agentex.* namespace. Pyright needs both as roots so cross-package imports
-# (e.g. agentex.lib.* code referencing agentex.types.*) resolve.
-include = ["src", "adk/src", "tests", "adk/tests", "examples", "scripts", "bin"]
-extraPaths = ["src", "adk/src"]
-
 exclude = [
     "_dev",
     ".venv",
@@ -210,34 +203,24 @@ reportUnknownVariableType = false
 
 # Enable strict type checking only for hand-written code
 [[tool.pyright.executionEnvironments]]
-root = "adk/src/agentex/lib"
+root = "src/agentex/lib"
 typeCheckingMode = "strict"
-extraPaths = ["src", "adk/src"]
 # But allow some flexibility in OpenAI module for complex type boundaries
 reportArgumentType = false
 
 [[tool.pyright.executionEnvironments]]
 root = "examples"
 typeCheckingMode = "strict"
-extraPaths = ["src", "adk/src"]
 # Allow type ignores in tutorials for readability
 reportUnnecessaryTypeIgnoreComment = false
 
 [[tool.pyright.executionEnvironments]]
 root = "tests"
 typeCheckingMode = "basic"
-extraPaths = ["src", "adk/src"]
 # Be loose on typing in tests unless testing types specifically
 reportOptionalMemberAccess = false
 reportArgumentType = false
 
-[[tool.pyright.executionEnvironments]]
-root = "adk/tests"
-typeCheckingMode = "basic"
-extraPaths = ["src", "adk/src"]
-reportOptionalMemberAccess = false
-reportArgumentType = false
-
 [tool.mypy]
 pretty = true
 show_error_codes = true
@@ -248,8 +231,7 @@ show_error_codes = true
 #
 # We also exclude our `tests` as mypy doesn't always infer
 # types correctly and Pyright will still catch any type errors.
-exclude = ['src/agentex/_files.py', '_dev/.*.py', 'tests/.*', 'adk/tests/.*', 'examples/tutorials/.*']
-mypy_path = "src:adk/src"
+exclude = ['src/agentex/_files.py', '_dev/.*.py', 'tests/.*', 'examples/tutorials/.*']
 
 strict_equality = true
 implicit_reexport = true
@@ -351,7 +333,6 @@ known-first-party = ["agentex", "tests"]
 "bin/**.py" = ["T201", "T203"]
 "scripts/**.py" = ["T201", "T203"]
 "tests/**.py" = ["T201", "T203", "ARG001", "ARG002", "ARG005"]
-"adk/tests/**.py" = ["T201", "T203", "ARG001", "ARG002", "ARG005"]
 "examples/**.py" = ["T201", "T203"]
 "examples/**.ipynb" = ["T201", "T203"]
 "examples/tutorials/**.py" = ["T201", "T203"]

pyproject.toml

@@ -1,14 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-# Make `agentex` a "split" package: the slim agentex-sdk-client ships this
-# __init__.py + the Stainless surface (resources/, types/, _*.py), while the
-# sibling agentex-sdk package ships agentex/lib/*. Both installs land in
-# site-packages/agentex/ in production (wheel install), but editable installs
-# split across two source trees — extend_path tells Python to merge them.
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)
-
 import typing as _t
 
 from . import types