diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md
index 14e711f7..97529b72 100644
--- a/packages/ai/CHANGELOG.md
+++ b/packages/ai/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Fixed
 
 - Set OpenAI Responses API requests to `store: false` by default to avoid server-side history logging ([#1308](https://github.com/badlogic/pi-mono/issues/1308))
+- Re-exported TypeBox `Type`, `Static`, and `TSchema` from `@mariozechner/pi-ai` to match documentation and avoid duplicate TypeBox type identity issues in pnpm setups ([#1338](https://github.com/badlogic/pi-mono/issues/1338))
 
 ## [0.52.6] - 2026-02-05
 
diff --git a/packages/ai/README.md b/packages/ai/README.md
index 9d982a23..b4a4a641 100644
--- a/packages/ai/README.md
+++ b/packages/ai/README.md
@@ -72,6 +72,8 @@ Unified LLM API with automatic model discovery, provider configuration, token an
 npm install @mariozechner/pi-ai
 ```
 
+TypeBox exports are re-exported from `@mariozechner/pi-ai`: `Type`, `Static`, and `TSchema`.
+
 ## Quick Start
 
 ```typescript
diff --git a/packages/ai/src/index.ts b/packages/ai/src/index.ts
index 46e1c470..48c74953 100644
--- a/packages/ai/src/index.ts
+++ b/packages/ai/src/index.ts
@@ -1,3 +1,6 @@
+export type { Static, TSchema } from "@sinclair/typebox";
+export { Type } from "@sinclair/typebox";
+
 export * from "./api-registry.js";
 export * from "./env-api-keys.js";
 export * from "./models.js";
diff --git a/packages/coding-agent/examples/extensions/hello.ts b/packages/coding-agent/examples/extensions/hello.ts
index 39ecf3f6..16f27b81 100644
--- a/packages/coding-agent/examples/extensions/hello.ts
+++ b/packages/coding-agent/examples/extensions/hello.ts
@@ -2,8 +2,8 @@
  * Hello Tool - Minimal custom tool example
  */
 
+import { Type } from "@mariozechner/pi-ai";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { Type } from "@sinclair/typebox";
 
 export default function (pi: ExtensionAPI) {
 	pi.registerTool({