intercreate · JPHutchins · Aug 28, 2026 · Aug 28, 2026 · Aug 28, 2026 · Aug 28, 2026
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -97,5 +97,4 @@ jobs:
 
       - name: Build and deploy documentation
         run: |
-          uv run --group doc python docs/_generate_requests_docstrings.py
           uv run --group doc mike deploy --push --update-aliases ${GIT_TAG} latest
diff --git a/.github/workflows/test-docs.yaml b/.github/workflows/test-docs.yaml
@@ -17,5 +17,4 @@ jobs:
 
       - name: Build docs
         run: |
-          uv run --group doc python docs/_generate_requests_docstrings.py
           uv run --group doc mkdocs build
diff --git a/docs/_generate_requests_docstrings.py b/docs/_generate_requests_docstrings.py
diff --git a/docs/file_management.md b/docs/file_management.md
diff --git a/docs/image_management.md b/docs/image_management.md
diff --git a/docs/os_management.md b/docs/os_management.md
diff --git a/docs/requests.md b/docs/requests.md
@@ -1,6 +1,45 @@
-# Requests Helpers
+# Requests and Responses
 
-Refer to the [smp documentation](https://jphutchins.github.io/smp/latest/) for a
-complete description of each SMP Request and Response.
+Every SMP Request and Response is defined by
+[smp](https://jphutchins.github.io/smp/latest/), and each Request carries the
+`Response`, `ErrorV1`, and `ErrorV2` it may provoke. `SMPClient.request()` therefore
+returns a union that narrows exhaustively:
 
-::: smpclient.generics
+```python
+response = await client.request(EchoWriteRequest(d="Hello, World!"))
+
+if success(response):
+    print(response.r)
+elif error_v1(response):
+    print(response.rc)
+elif error_v2(response):
+    print(response.err.rc)
+else:
+    assert_never(response)
+```
+
+## Groups
+
+Construct requests directly from `smp`:
+
+| Group | Reference |
+| --- | --- |
+| Enumeration Management | [smp.enumeration_management](https://jphutchins.github.io/smp/latest/enumeration_management/) |
+| File Management | [smp.file_management](https://jphutchins.github.io/smp/latest/file_management/) |
+| Image Management | [smp.image_management](https://jphutchins.github.io/smp/latest/image_management/) |
+| OS Management | [smp.os_management](https://jphutchins.github.io/smp/latest/os_management/) |
+| Settings Management | [smp.settings_management](https://jphutchins.github.io/smp/latest/settings_management/) |
+| Shell Management | [smp.shell_management](https://jphutchins.github.io/smp/latest/shell_management/) |
+| Statistics Management | [smp.statistics_management](https://jphutchins.github.io/smp/latest/statistics_management/) |
+| Zephyr Management | [smp.zephyr_management](https://jphutchins.github.io/smp/latest/zephyr_management/) |
+| Intercreate (user) | [smp.user.intercreate](https://jphutchins.github.io/smp/latest/user/intercreate/) |
+
+## Narrowing helpers
+
+::: smpclient.success
+
+::: smpclient.error
+
+::: smpclient.error_v1
+
+::: smpclient.error_v2
diff --git a/docs/settings_management.md b/docs/settings_management.md
diff --git a/docs/shell_management.md b/docs/shell_management.md
diff --git a/docs/statistics_management.md b/docs/statistics_management.md
diff --git a/docs/user/intercreate.md b/docs/user/intercreate.md
@@ -3,4 +3,4 @@
 Refer to the [smp Intercreate documentation](https://jphutchins.github.io/smp/latest/user/intercreate)
 for a complete description of each Request and Response.
 
-::: smpclient.requests.user.intercreate
+::: smpclient.extensions.intercreate
diff --git a/docs/zephyr_management.md b/docs/zephyr_management.md
diff --git a/examples/ble/helloworld.py b/examples/ble/helloworld.py
@@ -3,9 +3,9 @@
 import asyncio
 from typing import Final
 
-from smpclient import SMPClient
-from smpclient.generics import error, success
-from smpclient.requests.os_management import EchoWrite
+from smp.os_management import EchoWriteRequest
+
+from smpclient import SMPClient, error, success
 from smpclient.transport.ble import SMPBLETransport
 
 
@@ -20,7 +20,7 @@ async def main() -> None:
         print("OK")
 
         print("Sending request...", end="", flush=True)
-        response: Final = await client.request(EchoWrite(d="Hello, World!"))
+        response: Final = await client.request(EchoWriteRequest(d="Hello, World!"))
         print("OK")
 
         if success(response):

diff --git a/examples/ble/imagestate.py b/examples/ble/imagestate.py
@@ -3,9 +3,9 @@
 import asyncio
 from typing import Final
 
-from smpclient import SMPClient
-from smpclient.generics import error, success
-from smpclient.requests.image_management import ImageStatesRead
+from smp.image_management import ImageStatesReadRequest
+
+from smpclient import SMPClient, error, success
 from smpclient.transport.ble import SMPBLETransport
 
 
@@ -20,7 +20,7 @@ async def main() -> None:
         print("OK")
 
         print("Sending request...", end="", flush=True)
-        response: Final = await client.request(ImageStatesRead())
+        response: Final = await client.request(ImageStatesReadRequest())
         print("OK")
 
         if success(response):

diff --git a/examples/ble/mcumgrparameters.py b/examples/ble/mcumgrparameters.py
@@ -3,9 +3,9 @@
 import asyncio
 from typing import Final
 
-from smpclient import SMPClient
-from smpclient.generics import error, success
-from smpclient.requests.os_management import MCUMgrParametersRead
+from smp.os_management import MCUMgrParametersReadRequest
+
+from smpclient import SMPClient, error, success
 from smpclient.transport.ble import SMPBLETransport
 
 
@@ -22,7 +22,7 @@ async def main() -> None:
         print(f"Client max unencoded size is {client._transport.max_unencoded_size}B")
 
         print("Sending request...", end="", flush=True)
-        response: Final = await client.request(MCUMgrParametersRead())
+        response: Final = await client.request(MCUMgrParametersReadRequest())
         print("OK")
 
         if success(response):