diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a8eeb06
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,8 @@
+[submodule "vendor/tinyinference"]
+	path = vendor/tinyinference
+	url = https://github.com/tinyhumansai/tinyinference.git
+	branch = main
+[submodule "vendor/tinymemory"]
+	path = vendor/tinymemory
+	url = https://github.com/tinyhumansai/tinymemory.git
+	branch = main
diff --git a/Cargo.lock b/Cargo.lock
index c60b1ff..4eaea5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1675,8 +1675,7 @@ dependencies = [
 
 [[package]]
 name = "tinyinference-core"
-version = "0.2.1"
-source = "git+https://github.com/tinyhumansai/tinyinference?rev=bb0f820#bb0f820a246874dff7fff2569d8679303d354fb0"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "httpdate",
@@ -1685,10 +1684,11 @@ dependencies = [
 
 [[package]]
 name = "tinyinference-embeddings"
-version = "0.2.1"
-source = "git+https://github.com/tinyhumansai/tinyinference?rev=bb0f820#bb0f820a246874dff7fff2569d8679303d354fb0"
+version = "0.3.0"
 dependencies = [
  "async-trait",
+ "once_cell",
+ "regex",
  "reqwest",
  "serde",
  "serde_json",
@@ -1701,8 +1701,7 @@ dependencies = [
 
 [[package]]
 name = "tinyinference-llm"
-version = "0.2.1"
-source = "git+https://github.com/tinyhumansai/tinyinference?rev=bb0f820#bb0f820a246874dff7fff2569d8679303d354fb0"
+version = "0.3.0"
 dependencies = [
  "async-trait",
  "bytes",
@@ -1711,25 +1710,37 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.11.0",
+ "tempfile",
  "thiserror",
  "tinyinference-core",
+ "tinytools-agent",
  "tokio",
  "tracing",
- "url",
 ]
 
 [[package]]
 name = "tinymemory-api"
 version = "0.1.1"
-source = "git+https://github.com/tinyhumansai/tinymemory?rev=4549cda222de3891b95e2fa58e2565bb2c194328#4549cda222de3891b95e2fa58e2565bb2c194328"
 dependencies = [
  "anyhow",
  "async-trait",
- "chrono",
  "log",
  "schemars",
  "serde",
  "serde_json",
+ "tinymemory-bus",
+ "tokio",
+ "toml",
+]
+
+[[package]]
+name = "tinymemory-bus"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "serde",
+ "serde_json",
  "sha2 0.11.0",
  "thiserror",
  "uuid",
@@ -1755,6 +1766,28 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "tinytools"
+version = "0.3.0"
+source = "git+https://github.com/tinyhumansai/tinytools?rev=a5d04a7f3af0abc1dd748f87f94871b36ae9fe71#a5d04a7f3af0abc1dd748f87f94871b36ae9fe71"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tinytools-agent"
+version = "0.3.0"
+source = "git+https://github.com/tinyhumansai/tinytools?rev=a5d04a7f3af0abc1dd748f87f94871b36ae9fe71#a5d04a7f3af0abc1dd748f87f94871b36ae9fe71"
+dependencies = [
+ "regex",
+ "serde",
+ "serde_json",
+ "tinytools",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.12.0"
diff --git a/Cargo.toml b/Cargo.toml
index a7766b4..a8742c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,60 @@
 # The engine crate is also the workspace root so `api/` is never an orphan
 # package: `cargo fmt --all`, `cargo check`, and `cargo test` from this
-# directory cover the stable-contract crate too. `vendor/` is excluded so the
-# vendored dependencies are not pulled in as implicit members.
+# directory cover the stable-contract crate too. The vendored TinyInference
+# crates are explicit members because their manifests inherit shared metadata
+# from their upstream workspace.
 [workspace]
-members = [".", "api"]
-# `default-members` would otherwise fall back to the root package alone (this is
-# a root-package workspace, not a virtual one), so a bare `cargo test` here
-# would silently skip `api/`. Naming both members keeps the contract crate in
-# every default build/test.
+members = [
+    ".",
+    "api",
+    "vendor/tinyinference/crates/tinyinference-core",
+    "vendor/tinyinference/crates/tinyinference-embeddings",
+    "vendor/tinyinference/crates/tinyinference-llm",
+    "vendor/tinymemory/crates/tinymemory-api",
+    "vendor/tinymemory/crates/tinymemory-bus",
+]
 default-members = [".", "api"]
-exclude = ["vendor"]
+
+[workspace.package]
+version = "0.3.0"
+edition = "2024"
+rust-version = "1.88"
+license = "GPL-3.0-only"
+repository = "https://github.com/tinyhumansai/tinyinference"
+
+[workspace.dependencies]
+anyhow = "1"
+async-trait = "0.1"
+bytes = "1"
+futures = "0.3"
+httpdate = "1"
+once_cell = "1"
+regex = "1"
+reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "stream"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+sha2 = "0.11"
+thiserror = "2"
+tempfile = "3"
+tokio = { version = "1", features = ["macros", "process", "rt-multi-thread", "sync", "time"] }
+tracing = "0.1"
+url = "2"
+
+[workspace.lints.rust]
+unsafe_code = "forbid"
+missing_docs = "warn"
+missing_debug_implementations = "warn"
+unreachable_pub = "warn"
+rust_2018_idioms = { level = "warn", priority = -1 }
+
+[workspace.lints.clippy]
+all = { level = "warn", priority = -1 }
+todo = "warn"
+unimplemented = "warn"
+
+[workspace.lints.rustdoc]
+broken_intra_doc_links = "warn"
+private_intra_doc_links = "warn"
 
 [package]
 name = "tinycortex"
@@ -124,12 +169,11 @@ serde_json = "1"
 schemars = "1"
 sha2 = "0.10"
 thiserror = "2"
-# Provider-neutral inference contracts. Pinned until TinyInference is
-# published; embedding hosts may patch this exact git source so the host and
-# TinyCortex share one `EmbeddingModel` trait identity without pulling in an
-# agent runtime.
-tinyinference-embeddings = { git = "https://github.com/tinyhumansai/tinyinference", rev = "bb0f820" }
-tinyinference-llm = { git = "https://github.com/tinyhumansai/tinyinference", rev = "bb0f820" }
+# Provider-neutral inference contracts. TinyInference is vendored as a
+# submodule so TinyCortex and embedding hosts resolve the same local trait
+# definitions without a direct Git dependency.
+tinyinference-embeddings = { path = "vendor/tinyinference/crates/tinyinference-embeddings" }
+tinyinference-llm = { path = "vendor/tinyinference/crates/tinyinference-llm" }
 # The stable contract crate (value types, error enum, `Memory` trait). Declared
 # as a path dependency, not a registry requirement, so embedding hosts resolve
 # it through this checkout without needing their own `[patch.crates-io]` entry.
diff --git a/api/Cargo.toml b/api/Cargo.toml
index 2f1ab9b..c8f4fbf 100644
--- a/api/Cargo.toml
+++ b/api/Cargo.toml
@@ -36,18 +36,6 @@ description = "Stable public contracts for the TinyCortex memory system"
 # `tinymemory_api::types::MemoryEntry` are one type rather than two that a
 # conversion layer has to keep in step (tinymemory#18 §A1).
 #
-# By git rather than by version because neither crate is published, and pinned
-# by `rev` because bumping the contract is a deliberate act that should be a
-# reviewable line in a diff rather than whatever the default branch happened to
-# be on the day someone rebuilt.
-#
-# A host that vendors both crates must patch this entry to its own checkout, or
-# cargo resolves the git copy alongside the path copy and the two
-# `MemoryEntry`s are different types. That needs a git-URL patch table — a
-# `[patch.crates-io]` entry cannot override a git dependency:
-#
-#   [patch."https://github.com/tinyhumansai/tinymemory"]
-#   tinymemory-api = { path = "api" }
-#
-# tinymemory's own workspace root carries exactly that.
-tinymemory-api = { git = "https://github.com/tinyhumansai/tinymemory", rev = "4549cda222de3891b95e2fa58e2565bb2c194328" }
+# Vendored as a submodule so this re-export and any local TinyMemory consumer
+# resolve exactly one set of contract types, without a direct Git dependency.
+tinymemory-api = { path = "../vendor/tinymemory/crates/tinymemory-api" }
diff --git a/vendor/tinyinference b/vendor/tinyinference
new file mode 160000
index 0000000..92445ea
--- /dev/null
+++ b/vendor/tinyinference
@@ -0,0 +1 @@
+Subproject commit 92445ea582c9b1c5dc78891ebbff4a817f9e8fa9
diff --git a/vendor/tinymemory b/vendor/tinymemory
new file mode 160000
index 0000000..1a03a00
--- /dev/null
+++ b/vendor/tinymemory
@@ -0,0 +1 @@
+Subproject commit 1a03a00c11f68beea63a743bb369d947f98fcde1