diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67f012c..2e8bd3d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
           # This job executes repo code (cargo build/test); don't persist the
           # token in git config.
           persist-credentials: false
+          submodules: true
 
       - uses: dtolnay/rust-toolchain@stable
         with:
@@ -70,6 +71,7 @@ jobs:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
+          submodules: true
 
       - uses: dtolnay/rust-toolchain@stable
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 36afc6a..febccc8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,6 +31,7 @@ jobs:
       - uses: actions/checkout@v7
         with:
           fetch-depth: 0
+          submodules: true
 
       - uses: dtolnay/rust-toolchain@stable
         with:
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7905de8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/tinyagents"]
+	path = vendor/tinyagents
+	url = https://github.com/tinyhumansai/tinyagents.git
diff --git a/Cargo.lock b/Cargo.lock
index 4a7af3b..b6ea426 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1527,8 +1527,7 @@ dependencies = [
 
 [[package]]
 name = "tinyagents"
-version = "1.9.0"
-source = "git+https://github.com/senamakel/tinyagents?rev=8f75355#8f753557278e448c6c5bcf48ab8503505a47c663"
+version = "2.0.0"
 dependencies = [
  "async-trait",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 764944f..e581f61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,7 +63,9 @@ serde_json = "1"
 schemars = "1"
 sha2 = "0.10"
 thiserror = "2"
-tinyagents = { git = "https://github.com/senamakel/tinyagents", rev = "8f75355" }
+# Kept in lockstep with OpenHuman's vendored TinyAgents checkout. Initialize it
+# after cloning with `git submodule update --init vendor/tinyagents`.
+tinyagents = { version = "2", path = "vendor/tinyagents" }
 toml = "0.8"
 uuid = { version = "1", features = ["serde", "v4"] }
 walkdir = "2"
diff --git a/vendor/tinyagents b/vendor/tinyagents
new file mode 160000
index 0000000..674d89f
--- /dev/null
+++ b/vendor/tinyagents
@@ -0,0 +1 @@
+Subproject commit 674d89f3dd530c632ed6009afe6a610152fb3611