diff --git a/Cargo.lock b/Cargo.lock
index a7de0d5..be96ebf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,6 +32,8 @@ dependencies = [
  "tokio-util",
  "tower-cookies",
  "tower-http 0.5.2",
+ "tracing",
+ "tracing-subscriber",
  "uuid",
 ]
 
@@ -128,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.103"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "arbitrary"
@@ -140,9 +142,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
 [[package]]
 name = "arc-swap"
-version = "1.9.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
 dependencies = [
  "rustversion",
 ]
@@ -161,9 +163,9 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.7.8"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
+checksum = "f02882884d3e1bc524fb12c79f107f6ad0e1cfd498c536ffb494301740995dfe"
 
 [[package]]
 name = "async-stream"
@@ -554,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.66"
+version = "1.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
+checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -589,9 +591,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chacha20"
-version = "0.10.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
@@ -1422,9 +1424,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 5.3.0",
  "wasip2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -1434,11 +1438,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1602,9 +1604,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hybrid-array"
-version = "0.4.13"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
+checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da"
 dependencies = [
  "typenum",
 ]
@@ -1953,9 +1955,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.103"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -1994,9 +1996,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.18"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
+checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
 dependencies = [
  "libc",
 ]
@@ -2246,12 +2248,14 @@ dependencies = [
 
 [[package]]
 name = "omniference"
-version = "0.2.1"
+version = "0.3.0"
+source = "git+https://github.com/Henrik-3/omniference.git?rev=fd69edd438430d68f9b81b5570033b12d33a4fd2#fd69edd438430d68f9b81b5570033b12d33a4fd2"
 dependencies = [
  "anyhow",
  "async-stream",
  "async-trait",
  "axum 0.7.9",
+ "base64",
  "bytes",
  "dotenvy",
  "futures",
@@ -2454,7 +2458,7 @@ dependencies = [
  "hmac",
  "md-5",
  "memchr",
- "rand 0.10.2",
+ "rand 0.10.1",
  "sha2 0.11.0",
  "stringprep",
 ]
@@ -2611,15 +2615,14 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.16"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
+checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e"
 dependencies = [
  "bytes",
- "getrandom 0.4.3",
+ "getrandom 0.3.4",
  "lru-slab",
- "rand 0.10.2",
- "rand_pcg",
+ "rand 0.9.4",
  "ring",
  "rustc-hash",
  "rustls",
@@ -2633,16 +2636,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.15"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2679,15 +2682,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
- "rand_chacha",
+ "rand_chacha 0.3.1",
  "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "rand"
-version = "0.10.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
  "chacha20",
  "getrandom 0.4.3",
@@ -2704,6 +2717,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.5",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -2715,18 +2738,18 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.10.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+dependencies = [
+ "getrandom 0.3.4",
+]
 
 [[package]]
-name = "rand_pcg"
-version = "0.10.2"
+name = "rand_core"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
-dependencies = [
- "rand_core 0.10.1",
-]
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rand_xoshiro"
@@ -2965,9 +2988,9 @@ checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.3"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rustix"
@@ -3022,9 +3045,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.15.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
  "web-time",
  "zeroize",
@@ -3461,7 +3484,7 @@ dependencies = [
  "log",
  "md-5",
  "memchr",
- "rand 0.10.2",
+ "rand 0.10.1",
  "rust_decimal",
  "serde",
  "serde_json",
@@ -3688,9 +3711,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.53"
+version = "0.3.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
+checksum = "85c17d80feb7334b40c484e45ed1a5273dfd8bfda537c3be2e74a06a6686f327"
 dependencies = [
  "deranged",
  "num-conv",
@@ -3708,9 +3731,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.31"
+version = "0.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
+checksum = "dcef1a61bdb119096e153208ec5cbec23944ce8bca13be5c7f60c634f7403935"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4205,9 +4228,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.23.4"
+version = "1.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
+checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -4285,9 +4308,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.126"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4299,9 +4322,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.76"
+version = "0.4.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
+checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4309,9 +4332,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.126"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4319,9 +4342,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.126"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -4332,9 +4355,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.126"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
@@ -4718,9 +4741,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.103"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
+checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5219,3 +5242,7 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
+
+[[patch.unused]]
+name = "omniference"
+version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index 21166cd..e25fc3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ reqwest = { version = "0.12", default-features = false, features = [
     "multipart",
 ] }
 tower-http = { version = "0.5", features = ["cors"] }
-omniference = "0.2"
+omniference = { git = "https://github.com/Henrik-3/omniference.git", rev = "fd69edd438430d68f9b81b5570033b12d33a4fd2" }
 aes-gcm = "0.10"
 rand = "0.8"
 rust_decimal = { version = "1.39.0", features = ["db-postgres", "serde"] }
@@ -45,6 +45,8 @@ futures-util = "0.3.31"
 async-stream = "0.3.6"
 tokio-util = "0.7.17"
 extism = "1"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 sha2 = "0.10"
 base64 = "0.22"
 thiserror = "2"
diff --git a/frontend/components/AppSidebar.vue b/frontend/components/AppSidebar.vue
index 984d1bb..dc3c342 100644
--- a/frontend/components/AppSidebar.vue
+++ b/frontend/components/AppSidebar.vue
@@ -113,6 +113,7 @@ const store = useMainStore();
 const chatStore = useChatStore();
 const budgetStore = useBudgetStore();
 const router = useRouter();
+const route = useRoute();
 
 const showWorkspaceManager = ref(false);
 
@@ -122,6 +123,7 @@ const userInitials = computed(() => {
 });
 
 function goToSettings() {
+	store.settingsReturnPath = route.path.startsWith('/chats/') ? route.fullPath : '/';
 	router.push('/settings');
 }
 
diff --git a/frontend/components/chat/MessageItem.vue b/frontend/components/chat/MessageItem.vue
index 69f87bf..40f29da 100644
--- a/frontend/components/chat/MessageItem.vue
+++ b/frontend/components/chat/MessageItem.vue
@@ -11,7 +11,7 @@
 
 		<div class="flex flex-1 flex-col gap-2" :class="isUser ? 'items-end' : 'items-start'">
 			<div
-				v-if="!isUser && message.reasoning_content"
+				v-if="!isUser && !hasInterleavedParts && message.reasoning_content"
 				class="flex cursor-pointer items-center gap-2 text-primary transition-opacity hover:opacity-80 select-none"
 				@click="showReasoning = !showReasoning"
 			>
@@ -21,7 +21,7 @@
 			</div>
 
 			<Transition name="expand">
-				<div v-if="showReasoning && (message.reasoning_content || isStreamingReasoning)" class="w-full max-w-3xl rounded-xl bg-muted/50 border p-4">
+				<div v-if="!hasInterleavedParts && showReasoning && (message.reasoning_content || isStreamingReasoning)" class="w-full max-w-3xl rounded-xl bg-muted/50 border p-4">
 					<div class="prose prose-sm dark:prose-invert max-w-none opacity-80" v-html="renderedReasoning" @click="handleCodeBlockClick" />
 					<div v-if="isStreamingReasoning && !message.reasoning_content" class="flex items-center gap-1 py-1">
 						<span class="h-1.5 w-1.5 animate-bounce rounded-full bg-primary/50" />
@@ -31,7 +31,53 @@
 				</div>
 			</Transition>
 
-			<div v-if="!isUser && message.tool_calls && message.tool_calls.length > 0" class="flex flex-col gap-2 mt-2 w-full max-w-3xl">
+			<div v-if="!isUser && hasInterleavedParts" class="flex flex-col gap-2 mt-2 w-full max-w-3xl">
+				<template v-for="(part, idx) in orderedParts" :key="idx">
+					<div v-if="part.type === 'reasoning'" class="w-full max-w-3xl">
+						<div
+							class="flex cursor-pointer items-center gap-2 text-primary transition-opacity hover:opacity-80 select-none"
+							@click="toggleReasoning(idx)"
+						>
+							<Brain class="h-3.5 w-3.5 fill-current" />
+							<span class="text-[10px] font-bold uppercase tracking-widest">{{ store.getTranslation('chat.message_item.reasoning') }}</span>
+							<ChevronDown class="h-3 w-3 transition-transform" :class="isReasoningOpen(idx) ? 'rotate-180' : ''" />
+						</div>
+						<Transition name="expand">
+							<div v-if="isReasoningOpen(idx)" class="mt-2 rounded-xl bg-muted/50 border p-4">
+								<div class="prose prose-sm dark:prose-invert max-w-none opacity-80" v-html="part.html" @click="handleCodeBlockClick" />
+							</div>
+						</Transition>
+					</div>
+					<div
+						v-else-if="part.type === 'text'"
+						class="prose prose-sm md:prose-base dark:prose-invert max-w-3xl"
+						v-html="part.html"
+						@click="handleCodeBlockClick"
+					/>
+					<ToolExecutionDisplay
+						v-else-if="part.type === 'tool_call' && part.tool"
+						:id="part.tool.tool_call_id"
+						:name="part.tool.tool_name"
+						:args="part.tool.input_args"
+						:output="part.tool.output"
+						:error="part.tool.error || undefined"
+						:is-executing="!part.tool.output && !part.tool.error"
+					/>
+					<div
+						v-else-if="part.type === 'image'"
+						class="w-fit max-w-full overflow-hidden rounded-lg border border-border cursor-pointer hover:opacity-90 transition-opacity"
+						@click="openImagePreview(part.url, `${part.imageId}.png`)"
+					>
+						<img
+							:src="part.url"
+							class="max-h-96 max-w-full object-contain"
+							:alt="store.getTranslation('chat.tool_execution.generated_image')"
+						/>
+					</div>
+				</template>
+			</div>
+
+			<div v-else-if="!isUser && message.tool_calls && message.tool_calls.length > 0" class="flex flex-col gap-2 mt-2 w-full max-w-3xl">
 				<ToolExecutionDisplay
 					v-for="tool in message.tool_calls"
 					:key="tool.tool_call_id"
@@ -148,13 +194,13 @@
 
 			<!-- Assistant message content -->
 			<div
-				v-else-if="!isUser && (message.content || !isStreaming)"
+				v-else-if="!isUser && !hasInterleavedParts && (message.content || !isStreaming)"
 				class="prose prose-sm md:prose-base dark:prose-invert max-w-3xl"
 				v-html="renderedContent"
 				@click="handleCodeBlockClick"
 			/>
 
-			<div v-else-if="!isUser && isStreaming && !message.content" class="flex items-center gap-1 py-2">
+			<div v-else-if="!isUser && !hasInterleavedParts && isStreaming && !message.content" class="flex items-center gap-1 py-2">
 				<span class="h-2 w-2 animate-bounce rounded-full bg-muted-foreground/50" />
 				<span class="h-2 w-2 animate-bounce rounded-full bg-muted-foreground/50" style="animation-delay: 0.15s" />
 				<span class="h-2 w-2 animate-bounce rounded-full bg-muted-foreground/50" style="animation-delay: 0.3s" />
@@ -224,8 +270,8 @@ const attachedImages = computed(() => {
 		return [];
 	}
 	return props.message.content_parts
-		.filter((part: any) => part.type === 'image' && part.image_id)
-		.map((part: any) => ({
+		.filter(part => part.type === 'image')
+		.map(part => ({
 			image_id: part.image_id,
 			url: `/api/v1/images/${part.image_id}`,
 		}));
@@ -281,6 +327,55 @@ const renderedContent = computed(() => {
 	return renderComplete(props.message.content);
 });
 
+const hasInterleavedParts = computed(() => {
+	if (isUser.value) return false;
+	const parts = props.message.content_parts;
+	return Array.isArray(parts) && parts.some(p => p.type === 'tool_call');
+});
+
+const partHtmlCache = new Map<number, {text: string; streaming: boolean; html: string}>();
+
+const orderedParts = computed(() => {
+	const parts = props.message.content_parts;
+	if (!Array.isArray(parts)) return [];
+	return parts.filter(part => part.type !== 'tool_result').map((part, index) => {
+		if (part.type === 'tool_call') {
+			const tool = props.message.tool_calls?.find(tc => tc.tool_call_id === part.id);
+			return {type: 'tool_call' as const, tool};
+		}
+		if (part.type === 'image') {
+			return {
+				type: 'image' as const,
+				imageId: part.image_id,
+				url: `/api/v1/images/${encodeURIComponent(part.image_id)}`,
+			};
+		}
+		if (part.type === 'reasoning') {
+			const text = part.text;
+			const cached = partHtmlCache.get(index);
+			const html = cached?.text === text && cached.streaming === isStreaming.value ? cached.html : isStreaming.value ? renderStreaming(text) : renderComplete(text);
+			partHtmlCache.set(index, {text, streaming: isStreaming.value, html});
+			return {type: 'reasoning' as const, html};
+		}
+		const text = part.text;
+		const cached = partHtmlCache.get(index);
+		const html = cached?.text === text && cached.streaming === isStreaming.value ? cached.html : isStreaming.value ? renderStreaming(text) : renderComplete(text);
+		partHtmlCache.set(index, {text, streaming: isStreaming.value, html});
+		return {type: 'text' as const, html};
+	});
+});
+
+const reasoningToggles = ref<Record<number, boolean>>({});
+
+function isReasoningOpen(idx: number): boolean {
+	if (idx in reasoningToggles.value) return reasoningToggles.value[idx];
+	return isStreaming.value && idx === orderedParts.value.length - 1;
+}
+
+function toggleReasoning(idx: number) {
+	reasoningToggles.value[idx] = !isReasoningOpen(idx);
+}
+
 const renderedReasoning = computed(() => {
 	if (!props.message.reasoning_content) return '';
 
diff --git a/frontend/components/chat/ToolExecutionDisplay.vue b/frontend/components/chat/ToolExecutionDisplay.vue
index 1d407f8..f777255 100644
--- a/frontend/components/chat/ToolExecutionDisplay.vue
+++ b/frontend/components/chat/ToolExecutionDisplay.vue
@@ -131,6 +131,9 @@ function isValidImageProtocol(url: string): boolean {
 const imageUrl = computed(() => {
 	if (!props.output) return null;
 	const out = typeof props.output === 'string' ? tryParseJson(props.output) : props.output;
+	if (out?.image_id && typeof out.image_id === 'string' && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(out.image_id)) {
+		return `/api/v1/images/${encodeURIComponent(out.image_id)}`;
+	}
 	if (out?.image_url && isValidImageProtocol(out.image_url)) return out.image_url;
 	if (out?.image_reference && isValidImageProtocol(out.image_reference)) return out.image_reference;
 	if (out?.url && isImageUrl(out.url)) return out.url;
diff --git a/frontend/components/settings/DefaultModelPicker.vue b/frontend/components/settings/DefaultModelPicker.vue
index 3f1f5c7..a157cf9 100644
--- a/frontend/components/settings/DefaultModelPicker.vue
+++ b/frontend/components/settings/DefaultModelPicker.vue
@@ -3,7 +3,7 @@
 		<PopoverTrigger as-child>
 			<button
 				:disabled="disabled"
-				class="flex items-center gap-2 px-3 py-2 rounded-md border border-input bg-background hover:bg-accent transition-colors text-sm disabled:opacity-50 disabled:cursor-not-allowed w-full max-w-sm"
+				class="flex w-full items-center gap-2 rounded-md border border-input bg-background px-3 py-2 text-sm transition-colors hover:bg-accent disabled:cursor-not-allowed disabled:opacity-50"
 			>
 				<template v-if="selectedModel">
 					<img v-if="selectedModel.icon" :src="selectedModel.icon" class="h-4 w-4 rounded object-cover shrink-0" />
@@ -59,7 +59,7 @@
 								v-for="model in pickerModels"
 								:key="model.id"
 								class="px-3 py-2 hover:bg-accent/50 cursor-pointer transition-colors border-b border-border/50 last:border-0"
-								:class="model.model_id === modelValue ? 'bg-accent/30' : ''"
+				:class="modelValueFor(model) === modelValue ? 'bg-accent/30' : ''"
 								@click="selectModel(model)"
 							>
 								<div class="flex items-start gap-3">
@@ -81,7 +81,7 @@
 										<p class="text-xs text-muted-foreground mt-0.5 truncate">{{ model.model_id }}</p>
 									</div>
 
-									<Check v-if="model.model_id === modelValue" class="h-4 w-4 shrink-0 text-primary mt-0.5" />
+							<Check v-if="modelValueFor(model) === modelValue" class="h-4 w-4 shrink-0 text-primary mt-0.5" />
 								</div>
 							</div>
 
@@ -131,17 +131,23 @@ import {Bot, ChevronDown, Check, Loader2, Search, X} from 'lucide-vue-next';
 import {useMainStore} from '~/stores';
 import {useModelPicker} from '~/composables/useModelPicker';
 import {Popover, PopoverContent, PopoverTrigger} from '~/components/ui/popover';
-import type {ModelList} from '~/types/chat';
+import type {ModelList, PaginatedResponse} from '~/types/chat';
 
 const props = withDefaults(defineProps<{
 	modelValue: string | null;
 	endpoint?: string;
+	providerEndpoint?: string;
+	selectedModelEndpoint?: string;
 	disabled?: boolean;
 	placeholder?: string;
+	valueMode?: 'model_id' | 'uuid';
 }>(), {
 	endpoint: '/api/v1/models',
+	providerEndpoint: undefined,
+	selectedModelEndpoint: undefined,
 	disabled: false,
 	placeholder: undefined,
+	valueMode: 'model_id',
 });
 
 const emit = defineEmits<{
@@ -166,20 +172,42 @@ const {
 	onSearchInput: pickerOnSearch,
 	selectFilter: pickerSelectFilter,
 	init: pickerInit,
-} = useModelPicker({endpoint: props.endpoint});
+} = useModelPicker({endpoint: props.endpoint, providerEndpoint: props.providerEndpoint});
 
 const scrollContainer = ref<HTMLElement | null>(null);
 const sentinel = ref<HTMLElement | null>(null);
 let observer: IntersectionObserver | null = null;
-
-const selectedModel = computed<ModelList | null>(() => {
-	if (!props.modelValue) return null;
-	return pickerModels.value.find(m => m.model_id === props.modelValue) ?? null;
-});
+const selectedModel = ref<ModelList | null>(null);
+
+watch(
+	() => props.modelValue,
+	async value => {
+		if (!value) {
+			selectedModel.value = null;
+			return;
+		}
+		const loaded = pickerModels.value.find(model => modelValueFor(model) === value);
+		if (loaded) {
+			selectedModel.value = loaded;
+			return;
+		}
+		try {
+			const {$customFetch} = useNuxtApp();
+			const model = props.valueMode === 'uuid' && props.selectedModelEndpoint
+				? await $customFetch<ModelList>(`${props.selectedModelEndpoint}/${value}`)
+				: (await $customFetch<PaginatedResponse<ModelList>>(props.endpoint, {params: {query: value, size: '50'}})).items.find(item => modelValueFor(item) === value) ?? null;
+			if (props.modelValue === value) selectedModel.value = model;
+		} catch {
+			if (props.modelValue === value) selectedModel.value = null;
+		}
+	},
+	{immediate: true},
+);
 
 watch(isOpen, async open => {
 	if (open) {
 		await pickerInit();
+		if (props.modelValue) selectedModel.value = pickerModels.value.find(model => modelValueFor(model) === props.modelValue) ?? selectedModel.value;
 		setupObserver();
 	} else {
 		teardownObserver();
@@ -210,7 +238,11 @@ function teardownObserver() {
 onUnmounted(teardownObserver);
 
 function selectModel(model: ModelList | null) {
-	emit('update:modelValue', model?.model_id ?? null);
+	emit('update:modelValue', model ? modelValueFor(model) : null);
 	isOpen.value = false;
 }
+
+function modelValueFor(model: ModelList) {
+	return props.valueMode === 'uuid' ? model.id : model.model_id;
+}
 </script>
diff --git a/frontend/composables/useModelPicker.ts b/frontend/composables/useModelPicker.ts
index 88082ca..7ec733e 100644
--- a/frontend/composables/useModelPicker.ts
+++ b/frontend/composables/useModelPicker.ts
@@ -2,9 +2,10 @@ import type {ModelList, PaginatedResponse, ProviderTab} from '~/types/chat';
 
 export type ModelFilter = 'all' | 'favorites' | string;
 
-export function useModelPicker(options: {endpoint?: string} = {}) {
+export function useModelPicker(options: {endpoint?: string; providerEndpoint?: string} = {}) {
 	const {$customFetch} = useNuxtApp();
 	const endpoint = options.endpoint ?? '/api/v1/models';
+	const providerEndpoint = options.providerEndpoint ?? '/api/v1/providers';
 
 	const models = ref<ModelList[]>([]);
 	const providers = ref<ProviderTab[]>([]);
@@ -38,7 +39,7 @@ export function useModelPicker(options: {endpoint?: string} = {}) {
 
 	async function loadProviders() {
 		try {
-			const res = await $customFetch<ProviderTab[]>('/api/v1/providers');
+			const res = await $customFetch<ProviderTab[]>(providerEndpoint);
 			providers.value = res ?? [];
 		} catch (e) {
 			console.error('Failed to fetch model providers:', e);
diff --git a/frontend/pages/settings.vue b/frontend/pages/settings.vue
index 171353d..b745485 100644
--- a/frontend/pages/settings.vue
+++ b/frontend/pages/settings.vue
@@ -77,7 +77,9 @@ const activeTab = computed(() => {
 });
 
 function goBack() {
-	router.push('/');
+	const returnPath = store.settingsReturnPath;
+	store.settingsReturnPath = '/';
+	router.push(returnPath === '/' || returnPath.startsWith('/chats/') ? returnPath : '/');
 }
 
 onMounted(() => {
diff --git a/frontend/pages/settings/tools.vue b/frontend/pages/settings/tools.vue
index f38fb00..d01c4ee 100644
--- a/frontend/pages/settings/tools.vue
+++ b/frontend/pages/settings/tools.vue
@@ -239,6 +239,17 @@
 								<Input v-model="mcpConfig.tool_name" :placeholder="store.getTranslation('settings.tools.tool_name_placeholder')" />
 							</div>
 
+							<div class="space-y-2 pt-2 border-t border-border">
+								<Label for="tool-system-prompt" class="text-xs text-muted-foreground">{{ store.getTranslation('settings.tools.system_prompt') }}</Label>
+								<Textarea
+									id="tool-system-prompt"
+									v-model="toolForm.system_prompt"
+									:placeholder="store.getTranslation('settings.tools.system_prompt_placeholder')"
+									rows="3"
+								/>
+								<p class="text-xs text-muted-foreground">{{ store.getTranslation('settings.tools.system_prompt_hint') }}</p>
+							</div>
+
 							<div v-if="!isBuiltinTool" class="space-y-2 pt-2 border-t border-border">
 								<Label class="text-xs text-muted-foreground">{{ store.getTranslation('settings.tools.settings_schema') }}</Label>
 								<SchemaBuilder v-model="toolForm.settings_schema_json" :is-settings="true" />
@@ -326,21 +337,36 @@
 		</Dialog>
 
 		<Dialog v-model:open="settingsDialogOpen">
-			<DialogContent class="sm:max-w-[400px]">
+			<DialogContent class="sm:max-w-[440px]">
 				<DialogHeader>
 					<DialogTitle class="flex items-center gap-3">
-						<Key class="h-5 w-5 text-primary" />
-						<span>{{ store.getTranslation('settings.tools.settings') }}</span>
+						<Sparkles v-if="isImagegenSettings" class="h-5 w-5 text-primary" />
+						<Key v-else class="h-5 w-5 text-primary" />
+						<span>{{ isImagegenSettings ? imageModelTitle : store.getTranslation('settings.tools.settings') }}</span>
 					</DialogTitle>
-					<DialogDescription>{{
-						store.getTranslation('settings.tools.settings_description', {name: settingsTool?.display_name || settingsTool?.name})
-					}}</DialogDescription>
+					<DialogDescription>
+						{{
+							isImagegenSettings
+								? imageModelDescription
+								: store.getTranslation('settings.tools.settings_description', {name: settingsTool?.display_name || settingsTool?.name})
+						}}
+					</DialogDescription>
 				</DialogHeader>
 
 				<div class="space-y-4 py-4">
 					<div v-for="(field, key) in settingsFields" :key="key" class="space-y-2">
 						<Label :for="`setting-${key}`">{{ field.title || key }}</Label>
-						<template v-if="field.enum && field.enum.length > 0">
+						<template v-if="field.format === 'model-picker'">
+							<DefaultModelPicker
+								v-model="userSettings[key]"
+								endpoint="/api/v1/admin/image-models"
+								provider-endpoint="/api/v1/admin/image-model-providers"
+								selected-model-endpoint="/api/v1/admin/models"
+								value-mode="uuid"
+								:placeholder="imageModelPlaceholder"
+							/>
+						</template>
+						<template v-else-if="field.enum && field.enum.length > 0">
 							<ShadSelect v-model="userSettings[key]">
 								<ShadSelectTrigger :id="`setting-${key}`">
 									<ShadSelectValue :placeholder="field.description || store.getTranslation('settings.tools.select_placeholder')" />
@@ -381,6 +407,7 @@ import HeaderEditor from '@/components/settings/HeaderEditor.vue';
 import ToolTestDialog from '@/components/settings/ToolTestDialog.vue';
 import McpManagerDialog from '@/components/mcp/McpManagerDialog.vue';
 import McpServerEditDialog from '@/components/mcp/McpServerEditDialog.vue';
+import DefaultModelPicker from '@/components/settings/DefaultModelPicker.vue';
 import {useMainStore} from '@/stores';
 import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from '@/components/ui/dialog';
 import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
@@ -414,6 +441,7 @@ interface Tool {
 	functions: ToolFunction[];
 	settings_schema?: any;
 	is_enabled: boolean;
+	system_prompt?: string | null;
 	has_user_settings?: boolean;
 	mcp_server_id?: string | null;
 	mcp_server_name?: string | null;
@@ -473,7 +501,7 @@ const sourceKinds = [
 	{value: 'MCP', label: 'MCP', icon: Server, disabled: false},
 ];
 
-const builtinToolTemplates = [
+const builtinToolTemplates = computed(() => [
 	{
 		name: 'websearch',
 		display_name: 'Web Search',
@@ -522,30 +550,30 @@ const builtinToolTemplates = [
 	},
 	{
 		name: 'imagegen',
-		display_name: 'Image Generation',
-		description: 'Generate and edit images using OpenAI, Replicate, or Google APIs',
+		display_name: store.getTranslation('settings.tools.imagegen.display_name'),
+		description: store.getTranslation('settings.tools.imagegen.description'),
 		source_kind: 'BUILTIN',
 		icon: Sparkles,
 		source_config: {builtin_id: 'imagegen'},
 		functions: [
 			{
 				name: 'generate',
-				description: 'Generate an image from a text prompt',
+				description: store.getTranslation('settings.tools.imagegen.generate.description'),
 				input_schema: {
 					type: 'object',
 					properties: {
-						prompt: {type: 'string', description: 'The text prompt describing the image to generate'},
+						prompt: {type: 'string', description: store.getTranslation('settings.tools.imagegen.generate.prompt')},
 						size: {
 							type: 'string',
-							description: 'Image size',
+							description: store.getTranslation('settings.tools.imagegen.generate.size'),
 							enum: ['1024x1024', '1792x1024', '1024x1792', '512x512', '256x256'],
 							default: '1024x1024',
 						},
 						quality: {
 							type: 'string',
-							description: 'Image quality',
-							enum: ['standard', 'hd'],
-							default: 'standard',
+							description: store.getTranslation('settings.tools.imagegen.generate.quality'),
+							enum: ['auto', 'low', 'medium', 'high'],
+							default: 'auto',
 						},
 					},
 					required: ['prompt'],
@@ -553,37 +581,32 @@ const builtinToolTemplates = [
 			},
 			{
 				name: 'edit',
-				description: 'Edit an existing image using a text prompt',
+				description: store.getTranslation('settings.tools.imagegen.edit.description'),
 				input_schema: {
 					type: 'object',
 					properties: {
-						image_url: {type: 'string', description: 'URL of the image to edit'},
-						prompt: {type: 'string', description: 'The text prompt describing the desired edit'},
+						image_id: {type: 'string', description: store.getTranslation('settings.tools.imagegen.edit.image_id')},
+						image_url: {type: 'string', description: store.getTranslation('settings.tools.imagegen.edit.image_url')},
+						prompt: {type: 'string', description: store.getTranslation('settings.tools.imagegen.edit.prompt')},
 					},
-					required: ['image_url', 'prompt'],
+					required: ['prompt'],
 				},
 			},
 		],
 		settings_schema: {
 			type: 'object',
-			required: ['api_key', 'provider'],
+			required: ['image_model_id'],
 			properties: {
-				api_key: {type: 'string', title: 'API Key', secret: true, description: 'API key for the selected provider'},
-				provider: {
+				image_model_id: {
 					type: 'string',
-					title: 'Provider',
-					enum: ['openai', 'replicate', 'google'],
-					description: 'Image generation provider to use',
-				},
-				model: {
-					type: 'string',
-					title: 'Model',
-					description: 'Model to use (optional, defaults: dall-e-3, flux-schnell, imagen-3)',
+					title: store.getTranslation('settings.tools.image_model_title'),
+					format: 'model-picker',
+					description: store.getTranslation('settings.tools.imagegen.settings.description'),
 				},
 			},
 		},
 	},
-];
+]);
 
 interface McpServerGroup {
 	server_id: string;
@@ -624,7 +647,7 @@ const displayTools = computed(() => {
 	const regularTools = tools.value.filter(t => !t.mcp_server_id);
 	const result: any[] = [...regularTools];
 
-	for (const template of builtinToolTemplates) {
+	for (const template of builtinToolTemplates.value) {
 		const exists = tools.value.some(t => t.name === template.name);
 		if (!exists) {
 			result.push({
@@ -648,6 +671,7 @@ const toolForm = reactive({
 	functions: [] as {id?: string; name: string; description: string; input_schema_json: string; entrypoint: string}[],
 	settings_schema_json: '',
 	is_enabled: true,
+	system_prompt: '',
 });
 
 const httpConfig = reactive({
@@ -681,6 +705,17 @@ const settingsFields = computed(() => {
 	return settingsTool.value.settings_schema.properties;
 });
 
+const isImagegenSettings = computed(() => settingsTool.value?.source_config?.builtin_id === 'imagegen');
+
+function translatedOrFallback(key: string, fallback: string) {
+	const translation = store.getTranslation(key);
+	return translation === key ? fallback : translation;
+}
+
+const imageModelTitle = computed(() => translatedOrFallback('settings.tools.image_model_title', store.getTranslation('settings.tools.settings')));
+const imageModelDescription = computed(() => translatedOrFallback('settings.tools.image_model_description', ''));
+const imageModelPlaceholder = computed(() => translatedOrFallback('settings.tools.image_model_placeholder', store.getTranslation('settings.tools.select_placeholder')));
+
 async function handleWasmUpload(event: Event) {
 	const target = event.target as HTMLInputElement;
 	const file = target.files?.[0];
@@ -764,6 +799,7 @@ function openCreateDialog() {
 		],
 		settings_schema_json: '',
 		is_enabled: true,
+		system_prompt: '',
 	});
 	Object.assign(httpConfig, {method: 'GET', url: '', headers_json: '{}', body_template: ''});
 	activeFunctionIdx.value = 0;
@@ -836,6 +872,7 @@ function openEditDialog(tool: Tool) {
 		functions: funcs,
 		settings_schema_json: tool.settings_schema ? JSON.stringify(tool.settings_schema, null, 2) : '',
 		is_enabled: tool.is_enabled,
+		system_prompt: tool.system_prompt || '',
 	});
 
 	if (tool.source_kind === 'HTTP' && tool.source_config) {
@@ -934,6 +971,7 @@ async function saveTool() {
 			functions,
 			settings_schema: toolForm.settings_schema_json ? JSON.parse(toolForm.settings_schema_json) : null,
 			is_enabled: toolForm.is_enabled,
+			system_prompt: toolForm.system_prompt?.trim() ? toolForm.system_prompt.trim() : null,
 		};
 
 		if (editingTool.value) {
diff --git a/frontend/stores/chatStore.ts b/frontend/stores/chatStore.ts
index 7df8b12..780825e 100644
--- a/frontend/stores/chatStore.ts
+++ b/frontend/stores/chatStore.ts
@@ -442,22 +442,22 @@ export const useChatStore = defineStore('chat', {
 			}
 		},
 
-		setActiveChat(chat: Chat | null) {
+		async setActiveChat(chat: Chat | null) {
 			if (chat) {
 				this.fetchChat(chat.id);
 			} else {
 				this.messages = [];
 				this.setContextTokens(0);
 				this.activeChat = null;
-				this.resetComposerToDefaults();
+				if (this.initialized) await this.resetComposerToDefaults();
 			}
 		},
 
-		resetComposerToDefaults() {
+		async resetComposerToDefaults() {
 			const prefs = useMainStore().preferences;
 			const key = prefs?.effective_default_model_key;
-			const match = key ? this.models.find(m => m.model_id === key) : null;
-			this.setSelectedModel(match || this.models[0] || null);
+			const model = key ? await this.findModelByKey(key) : (this.models[0] ?? null);
+			this.setSelectedModel(model);
 			this.selectedProviderSlug = prefs?.default_provider_slug ?? null;
 			this.providerRoutingMode = 'prefer';
 			this.enabledTools = prefs?.default_tools ? [...prefs.default_tools] : [];
@@ -594,6 +594,7 @@ export const useChatStore = defineStore('chat', {
 					enabled_tools: [...this.enabledTools],
 				},
 				tool_calls: [],
+				content_parts: [],
 				created_at: new Date().toISOString(),
 				parent_id: null,
 				fork_index: 1,
@@ -676,12 +677,28 @@ export const useChatStore = defineStore('chat', {
 										}
 										break;
 									case 'text_delta':
-										if (msg) msg.content += data.content;
+										if (msg) {
+											msg.content += data.content;
+											if (!msg.content_parts) msg.content_parts = [];
+											const lastPart = msg.content_parts[msg.content_parts.length - 1];
+											if (lastPart && lastPart.type === 'text') {
+												lastPart.text = (lastPart.text || '') + data.content;
+											} else {
+												msg.content_parts.push({type: 'text', text: data.content});
+											}
+										}
 										break;
 									case 'reasoning_delta':
 										if (msg) {
 											if (msg.reasoning_content === null) msg.reasoning_content = '';
 											msg.reasoning_content += data.content;
+											if (!msg.content_parts) msg.content_parts = [];
+											const lastReasoningPart = msg.content_parts[msg.content_parts.length - 1];
+											if (lastReasoningPart && lastReasoningPart.type === 'reasoning') {
+												lastReasoningPart.text = (lastReasoningPart.text || '') + data.content;
+											} else {
+												msg.content_parts.push({type: 'reasoning', text: data.content});
+											}
 										}
 										break;
 									case 'tool_call_start':
@@ -692,6 +709,8 @@ export const useChatStore = defineStore('chat', {
 												input_args: '',
 											};
 											msg.tool_calls.push(toolCall as any);
+											if (!msg.content_parts) msg.content_parts = [];
+											msg.content_parts.push({type: 'tool_call', id: data.id, name: data.name, arguments: ''});
 										}
 										break;
 									case 'tool_call_delta': {
@@ -704,7 +723,13 @@ export const useChatStore = defineStore('chat', {
 												tool_name: data.name,
 												input_args: data.args_delta,
 											};
-											if (msg) msg.tool_calls.push(newToolCall as any);
+											if (msg) {
+												msg.tool_calls.push(newToolCall as any);
+												if (!msg.content_parts) msg.content_parts = [];
+												if (!msg.content_parts.some(p => p.type === 'tool_call' && p.id === data.id)) {
+													msg.content_parts.push({type: 'tool_call', id: data.id, name: data.name, arguments: data.args_delta ?? ''});
+												}
+											}
 										}
 
 										break;
@@ -718,6 +743,18 @@ export const useChatStore = defineStore('chat', {
 											toolCall.output = data.output ? JSON.stringify(data.output) : null;
 											toolCall.error = data.error || null;
 										}
+										const imageId = data.output?.image_id;
+										if (
+											msg &&
+											!data.error &&
+											['imagegen', 'imagegen_generate', 'imagegen_edit'].includes(data.tool_name) &&
+											typeof imageId === 'string'
+										) {
+											if (!msg.content_parts) msg.content_parts = [];
+											if (!msg.content_parts.some(part => part.type === 'image' && part.image_id === imageId)) {
+												msg.content_parts.push({type: 'image', image_id: imageId});
+											}
+										}
 										break;
 									}
 									case 'client_tool_call': {
@@ -833,22 +870,11 @@ export const useChatStore = defineStore('chat', {
 			this.modelsLoading = true;
 			try {
 				const {$customFetch} = useNuxtApp();
-				const mainStore = useMainStore();
 				const models = await $customFetch<PaginatedResponse<ModelList>>('/api/v1/models?size=100');
 				this.models = models.items;
 
 				if (!this.selectedModel && this.models.length > 0) {
-					const key = mainStore.preferences?.effective_default_model_key;
-					const match = key ? this.models.find(m => m.model_id === key) : null;
-					this.selectedModel = match || this.models[0] || null;
-
-					const prefs = mainStore.preferences;
-					if (prefs?.default_provider_slug) {
-						this.selectedProviderSlug = prefs.default_provider_slug;
-					}
-					if (prefs?.default_tools?.length) {
-						this.enabledTools = [...prefs.default_tools];
-					}
+					await this.resetComposerToDefaults();
 				}
 			} catch (e) {
 				console.error('Failed to fetch models:', e);
@@ -1083,6 +1109,7 @@ export const useChatStore = defineStore('chat', {
 			await this.fetchChats({workspace_id: this.activeWorkspaceId || undefined});
 			this.applyWorkspaceAccent();
 			await this.fetchModels();
+			if (!this.activeChat) await this.resetComposerToDefaults();
 			this.initialized = true;
 		},
 	},
diff --git a/frontend/stores/index.ts b/frontend/stores/index.ts
index a602e8a..21bde10 100644
--- a/frontend/stores/index.ts
+++ b/frontend/stores/index.ts
@@ -61,6 +61,7 @@ export const useMainStore = defineStore('main', {
 		bootState: BootState;
 		retryCount: number;
 		lastBootError: string | null;
+		settingsReturnPath: string;
 		preferences: UserPreferences | null;
 		auth: AuthState;
 	} => {
@@ -70,6 +71,7 @@ export const useMainStore = defineStore('main', {
 			bootState: 'idle',
 			retryCount: 0,
 			lastBootError: null,
+			settingsReturnPath: '/',
 			preferences: null,
 			auth: {
 				user: null,
diff --git a/frontend/types/chat.ts b/frontend/types/chat.ts
index f2767ad..367049d 100644
--- a/frontend/types/chat.ts
+++ b/frontend/types/chat.ts
@@ -127,6 +127,13 @@ export interface ChatMessageRequestSettings {
 	enabled_tools?: string[];
 }
 
+export type ChatMessageContentPart =
+	| {type: 'text'; text: string}
+	| {type: 'reasoning'; text: string}
+	| {type: 'image'; image_id: string}
+	| {type: 'tool_call'; id: string; name: string; arguments: string}
+	| {type: 'tool_result'; tool_call_id: string};
+
 export interface ChatMessage {
 	id: string;
 	client_id?: string;
@@ -135,7 +142,7 @@ export interface ChatMessage {
 	reasoning_content: string | null;
 	model_id: string | null;
 	model_key: string | null;
-	content_parts?: Array<{type: string; text?: string; image_id?: string}> | null;
+	content_parts?: ChatMessageContentPart[] | null;
 	cost_details: {
 		input: string | null;
 		output: string | null;
diff --git a/migrations/20260711000000_provider_backed_image_tool.sql b/migrations/20260711000000_provider_backed_image_tool.sql
new file mode 100644
index 0000000..8fd3664
--- /dev/null
+++ b/migrations/20260711000000_provider_backed_image_tool.sql
@@ -0,0 +1,138 @@
+UPDATE tools
+SET settings_schema = jsonb_build_object(
+	'type', 'object',
+	'required', jsonb_build_array('image_model_id'),
+	'properties', jsonb_build_object(
+		'image_model_id', jsonb_build_object(
+			'type', 'string',
+			'title', 'Image model',
+			'format', 'model-picker',
+			'description', 'Select an enabled provider-backed image model'
+		)
+	)
+)
+WHERE source_kind = 'BUILTIN' AND source_config->>'builtin_id' = 'imagegen';
+
+WITH candidate_models AS (
+	SELECT DISTINCT ON (uts.id)
+		uts.id AS settings_id,
+		m.id AS model_id
+	FROM user_tool_settings uts
+	JOIN tools t ON t.id = uts.tool_id
+	JOIN providers p ON (
+		(LOWER(COALESCE(uts.settings->>'provider', 'openai')) = 'openai' AND p.kind = 'OPENAI')
+		OR (LOWER(uts.settings->>'provider') = 'google' AND p.kind = 'GOOGLE')
+	)
+	JOIN models m ON m.provider_id = p.id
+		AND m.model_id = COALESCE(
+			uts.settings->>'model',
+			CASE LOWER(COALESCE(uts.settings->>'provider', 'openai'))
+				WHEN 'google' THEN 'imagen-3.0-generate-002'
+				ELSE 'dall-e-3'
+			END
+		)
+	WHERE t.source_kind = 'BUILTIN'
+		AND t.source_config->>'builtin_id' = 'imagegen'
+		AND NOT uts.settings ? 'image_model_id'
+		AND p.is_enabled = true
+		AND m.is_enabled = true
+		AND EXISTS (
+			SELECT 1
+			FROM jsonb_array_elements_text(COALESCE(m.output_modalities, '[]'::jsonb)) AS modality(value)
+			WHERE LOWER(modality.value) = 'image'
+		)
+	ORDER BY uts.id, p.id, m.id
+)
+UPDATE user_tool_settings uts
+SET settings = uts.settings || jsonb_build_object('image_model_id', candidate_models.model_id::text)
+FROM candidate_models
+WHERE uts.id = candidate_models.settings_id;
+
+DELETE FROM user_tool_settings uts
+USING tools t
+WHERE uts.tool_id = t.id
+	AND t.source_kind = 'BUILTIN'
+	AND t.source_config->>'builtin_id' = 'imagegen'
+	AND NOT uts.settings ? 'image_model_id';
+
+ALTER TABLE images ADD COLUMN IF NOT EXISTS caption TEXT;
+ALTER TABLE tools ADD COLUMN IF NOT EXISTS system_prompt TEXT;
+
+UPDATE tools
+SET system_prompt = 'Generated images are displayed to the user automatically by the interface. In your replies to the user, never write image URLs, markdown image tags (![...](...)), or <img> tags — refer to images in words only (for example, "I''ve generated the image above"). To edit or reference a previously generated image, never invent a URL: call imagegen_edit with the image_id shown for that image in the conversation.'
+WHERE source_kind = 'BUILTIN' AND source_config->>'builtin_id' = 'imagegen' AND system_prompt IS NULL;
+
+INSERT INTO i18n_translations (language, key_path, value)
+VALUES
+	('en', 'settings.tools.image_model_title', 'Image model'),
+	('en', 'settings.tools.image_model_description', 'Select the global image model used by this tool.'),
+	('en', 'settings.tools.image_model_placeholder', 'Select image model'),
+	('en', 'settings.tools.system_prompt', 'System prompt injection'),
+	('en', 'settings.tools.system_prompt_placeholder', 'Extra system instructions added when this tool is active'),
+	('en', 'settings.tools.system_prompt_hint', 'Prepended to the system prompt whenever this tool is enabled for a request. Use it to guide how the model uses the tool.'),
+	('en', 'settings.tools.imagegen.display_name', 'Image Generation'),
+	('en', 'settings.tools.imagegen.description', 'Generate and edit images using an admin-selected provider model'),
+	('en', 'settings.tools.imagegen.generate.description', 'Generate an image from a text prompt'),
+	('en', 'settings.tools.imagegen.generate.prompt', 'The text prompt describing the image to generate'),
+	('en', 'settings.tools.imagegen.generate.size', 'Image size'),
+	('en', 'settings.tools.imagegen.generate.quality', 'Image quality'),
+	('en', 'settings.tools.imagegen.edit.description', 'Edit a previously generated image using a text prompt'),
+	('en', 'settings.tools.imagegen.edit.image_id', 'The image ID of a previously generated image to edit. Preferred over an image URL.'),
+	('en', 'settings.tools.imagegen.edit.image_url', 'URL of an external image to edit. Only use when no image ID is available.'),
+	('en', 'settings.tools.imagegen.edit.prompt', 'The text prompt describing the desired edit'),
+	('en', 'settings.tools.imagegen.settings.description', 'Select an enabled image model'),
+	('de', 'settings.tools.image_model_title', 'Bildmodell'),
+	('de', 'settings.tools.image_model_description', 'Wählen Sie das globale Bildmodell aus, das dieses Tool verwendet.'),
+	('de', 'settings.tools.image_model_placeholder', 'Bildmodell auswählen'),
+	('de', 'settings.tools.system_prompt', 'System-Prompt-Einschub'),
+	('de', 'settings.tools.system_prompt_placeholder', 'Zusätzliche Systemanweisungen, wenn dieses Tool aktiv ist'),
+	('de', 'settings.tools.system_prompt_hint', 'Wird dem System-Prompt vorangestellt, sobald dieses Tool für eine Anfrage aktiviert ist. Damit steuern Sie, wie das Modell das Tool verwendet.'),
+	('de', 'settings.tools.imagegen.display_name', 'Bildgenerierung'),
+	('de', 'settings.tools.imagegen.description', 'Bilder mit einem von der Administration ausgewählten Anbietermodell erstellen und bearbeiten'),
+	('de', 'settings.tools.imagegen.generate.description', 'Ein Bild anhand einer Texteingabe erstellen'),
+	('de', 'settings.tools.imagegen.generate.prompt', 'Die Texteingabe, die das zu erstellende Bild beschreibt'),
+	('de', 'settings.tools.imagegen.generate.size', 'Bildgröße'),
+	('de', 'settings.tools.imagegen.generate.quality', 'Bildqualität'),
+	('de', 'settings.tools.imagegen.edit.description', 'Ein zuvor erstelltes Bild anhand einer Texteingabe bearbeiten'),
+	('de', 'settings.tools.imagegen.edit.image_id', 'Die Bild-ID eines zuvor erstellten Bildes. Diese wird gegenüber einer Bild-URL bevorzugt.'),
+	('de', 'settings.tools.imagegen.edit.image_url', 'URL eines externen Bildes. Nur verwenden, wenn keine Bild-ID verfügbar ist.'),
+	('de', 'settings.tools.imagegen.edit.prompt', 'Die Texteingabe, die die gewünschte Bearbeitung beschreibt'),
+	('de', 'settings.tools.imagegen.settings.description', 'Ein aktiviertes Bildmodell auswählen')
+ON CONFLICT (language, key_path) DO UPDATE SET value = EXCLUDED.value;
+
+UPDATE tool_functions tf
+SET input_schema = jsonb_build_object(
+	'type', 'object',
+	'required', jsonb_build_array('prompt'),
+	'properties', jsonb_build_object(
+		'image_id', jsonb_build_object(
+			'type', 'string',
+			'description', 'The image_id of a previously generated image to edit (shown in the conversation). Preferred over image_url.'
+		),
+		'image_url', jsonb_build_object(
+			'type', 'string',
+			'description', 'URL of an external image to edit. Only use when no image_id is available.'
+		),
+		'prompt', jsonb_build_object(
+			'type', 'string',
+			'description', 'The text prompt describing the desired edit'
+		)
+	)
+)
+FROM tools t
+WHERE tf.tool_id = t.id
+	AND t.source_kind = 'BUILTIN'
+	AND t.source_config->>'builtin_id' = 'imagegen'
+	AND tf.name = 'edit';
+
+UPDATE tool_functions tf
+SET input_schema = jsonb_set(
+	jsonb_set(tf.input_schema, '{properties,quality,enum}', '["auto", "low", "medium", "high"]'::jsonb, true),
+	'{properties,quality,default}', '"auto"'::jsonb, true
+)
+FROM tools t
+WHERE tf.tool_id = t.id
+	AND t.source_kind = 'BUILTIN'
+	AND t.source_config->>'builtin_id' = 'imagegen'
+	AND tf.name = 'generate'
+	AND tf.input_schema -> 'properties' ? 'quality';
diff --git a/src/jobs.rs b/src/jobs.rs
index 8e4426d..c3117ad 100644
--- a/src/jobs.rs
+++ b/src/jobs.rs
@@ -34,6 +34,30 @@ pub async fn start_job_scheduler(state: Arc<super::JobState>) {
 	}
 }
 
+/// Sync models for every enabled system provider once.
+pub async fn sync_provider_models_once(state: &super::JobState) {
+	match Provider::list_enabled_system(&state.db).await {
+		Ok(providers) => {
+			for provider in providers {
+				match sync_provider_models(&state.db, &provider).await {
+					Ok(summary) => {
+						tracing::info!(
+							"[JOBS] Synced provider '{}': +{}/~{}/-{} models",
+							provider.name, summary.models_added, summary.models_updated, summary.models_removed
+						);
+					}
+					Err(e) => {
+						tracing::error!("[JOBS] Failed to sync provider '{}': {e}", provider.name);
+					}
+				}
+			}
+		}
+		Err(e) => {
+			tracing::error!("[JOBS] Failed to list providers for sync: {e}");
+		}
+	}
+}
+
 /// Periodically close idle pooled MCP clients and refresh system server health.
 ///
 /// Reaping frees idle `stdio` subprocesses and stale remote connections while
@@ -98,29 +122,10 @@ async fn cleanup_expired_sessions(pool: &PgPool) -> Result<u64, sqlx::Error> {
 /// Runs every `PROVIDER_SYNC_INTERVAL_SECS` so newly released models
 /// (e.g. a new Claude Sonnet) become available without a manual sync.
 async fn provider_sync_job(state: Arc<super::JobState>) {
-	println!("[JOBS] Provider model sync job started");
+	tracing::info!("[JOBS] Provider model sync job started");
 
 	loop {
-		match Provider::list_enabled_system(&state.db).await {
-			Ok(providers) => {
-				for provider in providers {
-					match sync_provider_models(&state.db, &provider).await {
-						Ok(summary) => {
-							println!(
-								"[JOBS] Synced provider '{}': +{}/~{}/-{} models",
-								provider.name, summary.models_added, summary.models_updated, summary.models_removed
-							);
-						}
-						Err(e) => {
-							eprintln!("[JOBS] Failed to sync provider '{}': {e}", provider.name);
-						}
-					}
-				}
-			}
-			Err(e) => {
-				eprintln!("[JOBS] Failed to list providers for sync: {e}");
-			}
-		}
+		sync_provider_models_once(&state).await;
 		tokio::time::sleep(Duration::from_secs(PROVIDER_SYNC_INTERVAL_SECS)).await;
 	}
 }
diff --git a/src/main.rs b/src/main.rs
index cfa3e1e..83f9e84 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,10 @@ use std::sync::Arc;
 async fn main() {
 	dotenv::dotenv().ok();
 
+	let log_filter = tracing_subscriber::EnvFilter::try_from_default_env()
+		.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("info,omniference=debug"));
+	tracing_subscriber::fmt().with_env_filter(log_filter).with_target(true).init();
+
 	let db_host = std::env::var("POSTGRES_HOST").unwrap_or_else(|_| "localhost".to_string());
 	let db_port = std::env::var("POSTGRES_PORT").unwrap_or_else(|_| "5432".to_string());
 	let db_name = std::env::var("POSTGRES_DB").expect("POSTGRES_DB must be set");
diff --git a/src/routes/admin/models.rs b/src/routes/admin/models.rs
index ba66d26..5b48afc 100644
--- a/src/routes/admin/models.rs
+++ b/src/routes/admin/models.rs
@@ -78,6 +78,31 @@ pub async fn list_models(State(state): State<Arc<JobState>>, cookies: Cookies, Q
 	ResponseBuilder::new(ResponseBody::Json(models)).build()
 }
 
+pub async fn list_image_models(State(state): State<Arc<JobState>>, cookies: Cookies, Query(params): Query<ModelListParams>) -> impl IntoResponse {
+	let user = match get_current_user(&state.db, &cookies).await {
+		Some(user) => user,
+		None => return ErrorBuilder::new(ErrorCode::NotAuthenticated).build(),
+	};
+	if !user.has_permission(&state.db, ADMIN_MODELS_VIEW).await {
+		return ErrorBuilder::new(ErrorCode::InsufficientPermissions).build();
+	}
+	match Model::list_image_models_for_admin(
+		&state.db,
+		params.page.unwrap_or(1),
+		params.size.unwrap_or(0),
+		params.query,
+		params.provider_id,
+	)
+	.await
+	{
+		Ok(models) => ResponseBuilder::new(ResponseBody::Json(models)).build(),
+		Err(error) => {
+			tracing::error!("[ADMIN] Failed to list image models: {error}");
+			ErrorBuilder::new(ErrorCode::InternalError).build()
+		}
+	}
+}
+
 /// GET /api/v1/admin/models/:id
 pub async fn get_model(State(state): State<Arc<JobState>>, cookies: Cookies, Path(id): Path<Uuid>) -> impl IntoResponse {
 	let user = match get_current_user(&state.db, &cookies).await {
@@ -101,6 +126,23 @@ pub async fn get_model(State(state): State<Arc<JobState>>, cookies: Cookies, Pat
 	ResponseBuilder::new(ResponseBody::Json(row)).build()
 }
 
+pub async fn list_image_model_providers(State(state): State<Arc<JobState>>, cookies: Cookies) -> impl IntoResponse {
+	let user = match get_current_user(&state.db, &cookies).await {
+		Some(user) => user,
+		None => return ErrorBuilder::new(ErrorCode::NotAuthenticated).build(),
+	};
+	if !user.has_permission(&state.db, ADMIN_MODELS_VIEW).await {
+		return ErrorBuilder::new(ErrorCode::InsufficientPermissions).build();
+	}
+	match Model::list_image_providers_for_admin(&state.db).await {
+		Ok(providers) => ResponseBuilder::new(ResponseBody::Json(providers)).build(),
+		Err(error) => {
+			tracing::error!("[ADMIN] Failed to list image-model providers: {error}");
+			ErrorBuilder::new(ErrorCode::InternalError).build()
+		}
+	}
+}
+
 pub async fn get_model_pricing(State(state): State<Arc<JobState>>, cookies: Cookies, Path(id): Path<Uuid>) -> impl IntoResponse {
 	let user = match get_current_user(&state.db, &cookies).await {
 		Some(user) => user,
diff --git a/src/routes/admin/tools.rs b/src/routes/admin/tools.rs
index 41ad64f..1379c9d 100644
--- a/src/routes/admin/tools.rs
+++ b/src/routes/admin/tools.rs
@@ -130,83 +130,14 @@ pub async fn create_tool(State(state): State<Arc<JobState>>, cookies: Cookies, J
 		return ErrorBuilder::new(ErrorCode::InsufficientPermissions).build();
 	}
 
-	let legacy_schema = req.input_schema.clone().unwrap_or_else(|| serde_json::json!({"type": "object", "properties": {}}));
-
-	let tool = sqlx::query_as::<_, Tool>(
-		r#"
-        INSERT INTO tools (
-            owner_id, name, display_name, description, icon,
-            source_kind, source_config, input_schema, settings_schema,
-            is_enabled
-        )
-        VALUES (NULL, $1, $2, $3, $4, $5, $6, $7, $8, $9)
-        RETURNING *
-        "#,
-	)
-	.bind(&req.name)
-	.bind(&req.display_name)
-	.bind(&req.description)
-	.bind(&req.icon)
-	.bind(&req.source_kind)
-	.bind(&req.source_config)
-	.bind(&legacy_schema)
-	.bind(&req.settings_schema)
-	.bind(req.is_enabled)
-	.fetch_one(&state.db)
-	.await;
-
-	let tool = match tool {
-		Ok(t) => t,
+	let (tool, functions) = match Tool::create_system(&state.db, &req).await {
+		Ok(created) => created,
 		Err(e) => {
 			eprintln!("[TOOLS] Failed to create tool: {e}");
 			return ErrorBuilder::new(ErrorCode::InternalError).build();
 		}
 	};
 
-	let mut functions: Vec<ToolFunction> = vec![];
-
-	if !req.functions.is_empty() {
-		for (idx, func) in req.functions.iter().enumerate() {
-			let f = sqlx::query_as::<_, ToolFunction>(
-				r#"
-				INSERT INTO tool_functions (tool_id, name, description, input_schema, entrypoint, sort_order)
-				VALUES ($1, $2, $3, $4, $5, $6)
-				RETURNING *
-				"#,
-			)
-			.bind(tool.id)
-			.bind(&func.name)
-			.bind(&func.description)
-			.bind(&func.input_schema)
-			.bind(&func.entrypoint)
-			.bind(idx as i32)
-			.fetch_one(&state.db)
-			.await;
-
-			if let Ok(f) = f {
-				functions.push(f);
-			}
-		}
-	} else if req.input_schema.is_some() {
-		let f = sqlx::query_as::<_, ToolFunction>(
-			r#"
-			INSERT INTO tool_functions (tool_id, name, description, input_schema, entrypoint, sort_order)
-			VALUES ($1, $2, $3, $4, NULL, 0)
-			RETURNING *
-			"#,
-		)
-		.bind(tool.id)
-		.bind(&req.name) // Use tool name as function name
-		.bind(&req.description)
-		.bind(&legacy_schema)
-		.fetch_one(&state.db)
-		.await;
-
-		if let Ok(f) = f {
-			functions.push(f);
-		}
-	}
-
 	ResponseBuilder::new(ResponseBody::Json(ToolResponse::from_tool_with_functions(tool, functions)))
 		.status(StatusCode::CREATED)
 		.build()
@@ -222,117 +153,15 @@ pub async fn update_tool(State(state): State<Arc<JobState>>, cookies: Cookies, P
 		return ErrorBuilder::new(ErrorCode::InsufficientPermissions).build();
 	}
 
-	let existing = match sqlx::query_as::<_, Tool>("SELECT * FROM tools WHERE id = $1 AND owner_id IS NULL")
-		.bind(tool_id)
-		.fetch_optional(&state.db)
-		.await
-	{
-		Ok(existing) => existing,
-		Err(e) => {
-			eprintln!("[TOOLS] Failed to fetch tool for update: {e}");
-			return ErrorBuilder::new(ErrorCode::InternalError).build();
-		}
-	};
-	if existing.is_none() {
-		return ErrorBuilder::new(ErrorCode::NotFound).build();
-	}
-
-	let tool = sqlx::query_as::<_, Tool>(
-		r#"
-        UPDATE tools SET
-            name = COALESCE($2, name),
-            display_name = COALESCE($3, display_name),
-            description = COALESCE($4, description),
-            icon = COALESCE($5, icon),
-            source_config = COALESCE($6, source_config),
-            input_schema = COALESCE($7, input_schema),
-            settings_schema = COALESCE($8, settings_schema),
-            is_enabled = COALESCE($9, is_enabled),
-            updated_at = NOW()
-        WHERE id = $1 AND owner_id IS NULL
-        RETURNING *
-        "#,
-	)
-	.bind(tool_id)
-	.bind(&req.name)
-	.bind(&req.display_name)
-	.bind(&req.description)
-	.bind(&req.icon)
-	.bind(&req.source_config)
-	.bind(&req.input_schema)
-	.bind(&req.settings_schema)
-	.bind(req.is_enabled)
-	.fetch_one(&state.db)
-	.await;
-
-	let tool = match tool {
-		Ok(t) => t,
+	let (tool, functions) = match Tool::update_system(&state.db, &tool_id, &req).await {
+		Ok(Some(updated)) => updated,
+		Ok(None) => return ErrorBuilder::new(ErrorCode::NotFound).build(),
 		Err(e) => {
 			eprintln!("[TOOLS] Failed to update tool: {e}");
 			return ErrorBuilder::new(ErrorCode::InternalError).build();
 		}
 	};
 
-	if let Some(ref delete_ids) = req.delete_function_ids {
-		for func_id in delete_ids {
-			let _ = sqlx::query("DELETE FROM tool_functions WHERE id = $1 AND tool_id = $2")
-				.bind(func_id)
-				.bind(tool_id)
-				.execute(&state.db)
-				.await;
-		}
-	}
-
-	if let Some(ref funcs) = req.functions {
-		for (idx, func) in funcs.iter().enumerate() {
-			if let Some(func_id) = func.id {
-				// Update existing function
-				let _ = sqlx::query(
-					r#"
-					UPDATE tool_functions SET
-						name = $2,
-						description = $3,
-						input_schema = $4,
-						entrypoint = $5,
-						sort_order = $6
-					WHERE id = $1 AND tool_id = $7
-					"#,
-				)
-				.bind(func_id)
-				.bind(&func.name)
-				.bind(&func.description)
-				.bind(&func.input_schema)
-				.bind(&func.entrypoint)
-				.bind(idx as i32)
-				.bind(tool_id)
-				.execute(&state.db)
-				.await;
-			} else {
-				// Insert new function
-				let _ = sqlx::query(
-					r#"
-					INSERT INTO tool_functions (tool_id, name, description, input_schema, entrypoint, sort_order)
-					VALUES ($1, $2, $3, $4, $5, $6)
-					"#,
-				)
-				.bind(tool_id)
-				.bind(&func.name)
-				.bind(&func.description)
-				.bind(&func.input_schema)
-				.bind(&func.entrypoint)
-				.bind(idx as i32)
-				.execute(&state.db)
-				.await;
-			}
-		}
-	}
-
-	let functions = sqlx::query_as::<_, ToolFunction>("SELECT * FROM tool_functions WHERE tool_id = $1 ORDER BY sort_order, created_at")
-		.bind(tool_id)
-		.fetch_all(&state.db)
-		.await
-		.unwrap_or_default();
-
 	ResponseBuilder::new(ResponseBody::Json(ToolResponse::from_tool_with_functions(tool, functions))).build()
 }
 
@@ -402,33 +231,11 @@ pub async fn set_tool_settings(
 		return ErrorBuilder::new(ErrorCode::InsufficientPermissions).build();
 	}
 
-	let tool_exists: Option<Uuid> = sqlx::query_scalar("SELECT id FROM tools WHERE id = $1 AND owner_id IS NULL")
-		.bind(tool_id)
-		.fetch_optional(&state.db)
-		.await
-		.ok()
-		.flatten();
-
-	if tool_exists.is_none() {
-		return ErrorBuilder::new(ErrorCode::NotFound).build();
-	}
-
-	let result = sqlx::query(
-		r#"
-        INSERT INTO user_tool_settings (user_id, tool_id, settings)
-        VALUES (NULL, $1, $2)
-        ON CONFLICT (tool_id) WHERE user_id IS NULL
-        DO UPDATE SET settings = $2, updated_at = NOW()
-        "#,
-	)
-	.bind(tool_id)
-	.bind(&req.settings)
-	.execute(&state.db)
-	.await;
-
-	match result {
-		Ok(_) => (StatusCode::NO_CONTENT, "").into_response(),
-		Err(e) => {
+	match Tool::set_system_settings(&state.db, &tool_id, &req.settings).await {
+		Ok(()) => (StatusCode::NO_CONTENT, "").into_response(),
+		Err(ToolSettingsError::NotFound) => ErrorBuilder::new(ErrorCode::NotFound).build(),
+		Err(ToolSettingsError::Invalid) => ErrorBuilder::new(ErrorCode::ValidationFailed).build(),
+		Err(ToolSettingsError::Database(e)) => {
 			eprintln!("[TOOLS] Failed to save tool settings: {e}");
 			ErrorBuilder::new(ErrorCode::InternalError).build()
 		}
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 484c07e..6dbf966 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -82,6 +82,8 @@ pub fn build_router() -> Router<Arc<JobState>> {
 		.route("/api/v1/admin/users/{id}/password", put(admin::users::reset_password))
 		// Admin Models
 		.route("/api/v1/admin/models", get(admin::models::list_models))
+		.route("/api/v1/admin/image-models", get(admin::models::list_image_models))
+		.route("/api/v1/admin/image-model-providers", get(admin::models::list_image_model_providers))
 		.route("/api/v1/admin/models/{id}", get(admin::models::get_model))
 		.route("/api/v1/admin/models/{id}", patch(admin::models::patch_model))
 		.route("/api/v1/admin/models/{id}/pricing", get(admin::models::get_model_pricing))
diff --git a/src/routes/public/streaming.rs b/src/routes/public/streaming.rs
index e000151..d27ba5d 100644
--- a/src/routes/public/streaming.rs
+++ b/src/routes/public/streaming.rs
@@ -8,7 +8,7 @@ use crate::types::models::{Model, ModelPricing};
 use crate::types::models_configs::{ModelConfig, ModelConfigViewer};
 use crate::types::{
 	Budget, Chat, ChatMessageResponse, ClientToolResultRequest, Message, MessagePart, RequestSettings, StreamData, StreamRequest, StreamingAssistantMessageCreate,
-	StreamingUserMessageCreate, Tool, ToolExecution, ToolExecutionInternal, ToolFunction, UsageEvent, UsageEventRecord, UserToolSettings,
+	StreamingUserMessageCreate, Tool, ToolExecution, ToolExecutionInternal, ToolExecutionResponse, ToolFunction, UsageEvent, UsageEventRecord, UserToolSettings,
 };
 use crate::types::{CostDetails, JobState};
 use crate::utils::tools::{HttpExecutor, ToolContext, ToolExecutor, get_builtin_executor};
@@ -27,7 +27,7 @@ use omniference::{
 	types::{ChatRequestIR, ContentPart, Message as OmniMessage, Role, ToolChoice, ToolSpec},
 };
 use rust_decimal::{Decimal, prelude::FromPrimitive};
-use std::{collections::HashMap, convert::Infallible, sync::Arc, time::Instant};
+use std::{collections::{HashMap, HashSet}, convert::Infallible, sync::Arc, time::Instant};
 use tower_cookies::Cookies;
 use uuid::Uuid;
 
@@ -92,7 +92,7 @@ fn merge_sampling_with_priority(request_sampling: Option<&Sampling>, model_confi
 			.and_then(|s| s.max_tokens)
 			.or_else(|| config_sampling.as_ref().and_then(|s| s.max_tokens))
 			.or_else(|| model_config.and_then(|mc| mc.max_output_tokens.map(|t| t as u32)))
-			.or_else(|| model.max_tokens.map(|t| t as u32)),
+			.or_else(|| model.max_tokens.map(|tokens| tokens as u32)),
 		presence_penalty: priority_field!(presence_penalty),
 		frequency_penalty: priority_field!(frequency_penalty),
 		stop: request_sampling
@@ -140,20 +140,20 @@ fn merge_reasoning_with_priority(
 	}
 }
 
-async fn resolve_tools(db: &sqlx::PgPool, user_id: Uuid, enabled_tool_ids: &[String]) -> (Vec<ToolSpec>, ToolChoice) {
+async fn resolve_tools(db: &sqlx::PgPool, user_id: Uuid, enabled_tool_ids: &[String]) -> (Vec<ToolSpec>, ToolChoice, Vec<String>) {
 	if enabled_tool_ids.is_empty() {
-		return (vec![], ToolChoice::None);
+		return (vec![], ToolChoice::None, vec![]);
 	}
 
 	let tool_uuids: Vec<Uuid> = enabled_tool_ids.iter().filter_map(|id| Uuid::parse_str(id).ok()).collect();
 	if tool_uuids.is_empty() {
-		return (vec![], ToolChoice::None);
+		return (vec![], ToolChoice::None, vec![]);
 	}
 
 	let tools = Tool::find_enabled_for_user(db, &tool_uuids, &user_id).await.unwrap_or_default();
 
 	if tools.is_empty() {
-		return (vec![], ToolChoice::None);
+		return (vec![], ToolChoice::None, vec![]);
 	}
 
 	let tool_ids: Vec<Uuid> = tools.iter().map(|t| t.id).collect();
@@ -165,15 +165,20 @@ async fn resolve_tools(db: &sqlx::PgPool, user_id: Uuid, enabled_tool_ids: &[Str
 	}
 
 	let mut tool_specs: Vec<ToolSpec> = vec![];
+	let mut system_prompts: Vec<String> = vec![];
 	for tool in tools {
+		if let Some(prompt) = tool.system_prompt.as_ref().map(|p| p.trim()).filter(|p| !p.is_empty()) {
+			let label = if tool.display_name.trim().is_empty() { tool.name.as_str() } else { tool.display_name.trim() };
+			system_prompts.push(format!("Instructions for the \"{label}\" tool:\n{prompt}"));
+		}
 		let funcs = functions_by_tool.get(&tool.id).map(|v| v.as_slice()).unwrap_or(&[]);
 		tool_specs.extend(tool.to_tool_specs(funcs));
 	}
 
 	if tool_specs.is_empty() {
-		(vec![], ToolChoice::None)
+		(vec![], ToolChoice::None, system_prompts)
 	} else {
-		(tool_specs, ToolChoice::Auto)
+		(tool_specs, ToolChoice::Auto, system_prompts)
 	}
 }
 
@@ -352,42 +357,158 @@ async fn execute_mcp_tool(
 	}
 }
 
-async fn get_omni_messages(db: &sqlx::PgPool, messages: Vec<Message>) -> Vec<OmniMessage> {
+/// Hydrate a stored image into content parts. `generated` distinguishes an assistant-
+/// generated image (gets an editable `image_id` handle) from a user-uploaded one.
+async fn hydrate_image(db: &sqlx::PgPool, image_id: &str, vision: bool, generated: bool) -> Vec<ContentPart> {
+	let Ok(uuid) = uuid::Uuid::parse_str(image_id) else {
+		return Vec::new();
+	};
+	let mut parts = Vec::new();
+	if vision {
+		if let Ok(Some((data, mime))) = crate::utils::images::get_image(db, uuid).await {
+			use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
+			let data_uri = format!("data:{};base64,{}", mime, BASE64.encode(&data));
+			parts.push(ContentPart::ImageUrl { url: data_uri, mime: Some(mime) });
+		}
+		if generated {
+			parts.push(ContentPart::Text(format!(
+				"[The image above was generated earlier (image_id: {image_id}) and is already displayed to the user. To modify it, call imagegen_edit with image_id \"{image_id}\".]"
+			)));
+		}
+	} else if generated {
+		let caption = crate::utils::images::image_caption(db, uuid).await.ok().flatten();
+		let text = match caption {
+			Some(c) if !c.trim().is_empty() => format!(
+				"[An image was generated earlier (image_id: {image_id}) from the prompt: \"{}\". It is already displayed to the user. To modify it, call imagegen_edit with image_id \"{image_id}\".]",
+				c.trim()
+			),
+			_ => format!("[An image was generated earlier (image_id: {image_id}) and is already displayed to the user. To modify it, call imagegen_edit with image_id \"{image_id}\".]"),
+		};
+		parts.push(ContentPart::Text(text));
+	} else {
+		parts.push(ContentPart::Text(format!("[User-provided image {image_id} is not visible to this model.]")));
+	}
+	parts
+}
+
+/// Build the `tool` role message for a given tool call, pulling its result from the
+/// stored executions (or a placeholder if it was never recorded).
+fn tool_message(execs: Option<&Vec<ToolExecutionResponse>>, call_names: &HashMap<String, String>, call_id: &str) -> OmniMessage {
+	let exec = execs.and_then(|list| list.iter().find(|e| e.tool_call_id == call_id));
+	let content = match exec {
+		Some(e) if e.error.is_some() => format!("Error: {}", e.error.as_deref().unwrap_or_default()),
+		Some(e) => match &e.output {
+			Some(output) => serde_json::to_string(output).unwrap_or_else(|_| output.to_string()),
+			None => "{}".to_string(),
+		},
+		None => "{\"error\":\"tool result was not recorded\"}".to_string(),
+	};
+	let name = call_names.get(call_id).map(String::as_str).unwrap_or("tool");
+	OmniMessage {
+		role: Role::Tool,
+		parts: vec![ContentPart::Text(content)],
+		name: Some(tool_message_name(name, call_id)),
+	}
+}
+
+fn tool_message_name(tool_name: &str, call_id: &str) -> String {
+	format!("{tool_name}:{call_id}")
+}
+
+async fn get_omni_messages(db: &sqlx::PgPool, messages: Vec<Message>, vision: bool) -> Vec<OmniMessage> {
+	const MAX_HYDRATED_IMAGES: usize = 4;
+	let mut hydrated_image_ids = HashSet::with_capacity(MAX_HYDRATED_IMAGES);
+	if vision {
+		for message in messages.iter().rev() {
+			let Some(parts) = message
+				.content_parts
+				.as_ref()
+				.and_then(|value| serde_json::from_value::<Vec<MessagePart>>(value.clone()).ok())
+			else {
+				continue;
+			};
+			for part in parts.into_iter().rev() {
+				if let MessagePart::Image { image_id } = part {
+					hydrated_image_ids.insert(image_id);
+					if hydrated_image_ids.len() == MAX_HYDRATED_IMAGES {
+						break;
+					}
+				}
+			}
+			if hydrated_image_ids.len() == MAX_HYDRATED_IMAGES {
+				break;
+			}
+		}
+	}
+	let assistant_ids: Vec<uuid::Uuid> = messages.iter().filter(|m| m.role == "assistant").map(|m| m.id).collect();
+	let executions = Message::tool_executions_for_messages(db, &assistant_ids).await.unwrap_or_default();
+
 	let mut result = Vec::with_capacity(messages.len());
 	for m in messages.into_iter().filter(|m| m.role == "user" || m.role == "assistant") {
-		let parts = if let Some(content_parts_json) = m.content_parts {
-			if let Ok(stored_parts) = serde_json::from_value::<Vec<MessagePart>>(content_parts_json) {
-				let mut omni_parts = Vec::new();
-				for part in stored_parts {
-					match part {
-						MessagePart::Text { text } => {
-							omni_parts.push(ContentPart::Text(text));
-						}
-						MessagePart::Image { image_id } => {
-							if let Ok(uuid) = uuid::Uuid::parse_str(&image_id) {
-								if let Ok(Some((data, mime))) = crate::utils::images::get_image(db, uuid).await {
-									use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
-									let b64 = BASE64.encode(&data);
-									let data_uri = format!("data:{};base64,{}", mime, b64);
-									omni_parts.push(ContentPart::ImageUrl { url: data_uri, mime: Some(mime) });
-								}
-							}
-						}
+		let message_id = m.id;
+		let is_assistant = m.role == "assistant";
+
+		let Some(stored_parts) = m.content_parts.and_then(|json| serde_json::from_value::<Vec<MessagePart>>(json).ok()) else {
+			result.push(OmniMessage {
+				role: if is_assistant { Role::Assistant } else { Role::User },
+				parts: vec![ContentPart::Text(m.content)],
+				name: None,
+			});
+			continue;
+		};
+
+		if !is_assistant {
+			let mut parts = Vec::new();
+			for part in stored_parts {
+				match part {
+					MessagePart::Text { text } => parts.push(ContentPart::Text(text)),
+					MessagePart::Image { image_id } => parts.extend(hydrate_image(db, &image_id, vision && hydrated_image_ids.contains(&image_id), false).await),
+					_ => {}
+				}
+			}
+			if parts.is_empty() {
+				parts.push(ContentPart::Text(m.content));
+			}
+			result.push(OmniMessage { role: Role::User, parts, name: None });
+			continue;
+		}
+
+		// Assistant turn: walk parts in stored order and flush an assistant message at each
+		// tool-result boundary, so a sequence of retries (call -> error -> call -> success)
+		// replays as separate steps instead of collapsing into one parallel batch.
+		let execs = executions.get(&message_id);
+		let mut call_names: HashMap<String, String> = HashMap::new();
+		let mut unresolved_calls: Vec<String> = Vec::new();
+		let mut buffer: Vec<ContentPart> = Vec::new();
+
+		for part in stored_parts {
+			match part {
+				MessagePart::Text { text } => buffer.push(ContentPart::Text(text)),
+				MessagePart::Reasoning { .. } => {}
+				MessagePart::Image { image_id } => buffer.extend(hydrate_image(db, &image_id, vision && hydrated_image_ids.contains(&image_id), true).await),
+				MessagePart::ToolCall { id, name, arguments } => {
+					call_names.insert(id.clone(), name.clone());
+					unresolved_calls.push(id.clone());
+					buffer.push(ContentPart::ToolCall { id, name, arguments });
+				}
+				MessagePart::ToolResult { tool_call_id } => {
+					if !buffer.is_empty() {
+						result.push(OmniMessage { role: Role::Assistant, parts: std::mem::take(&mut buffer), name: None });
 					}
+					unresolved_calls.retain(|c| c != &tool_call_id);
+					result.push(tool_message(execs, &call_names, &tool_call_id));
 				}
-				omni_parts
-			} else {
-				vec![ContentPart::Text(m.content)]
 			}
-		} else {
-			vec![ContentPart::Text(m.content)]
-		};
+		}
 
-		result.push(OmniMessage {
-			role: if m.role == "user" { Role::User } else { Role::Assistant },
-			parts,
-			name: None,
-		});
+		if !buffer.is_empty() {
+			result.push(OmniMessage { role: Role::Assistant, parts: buffer, name: None });
+		}
+		// Legacy messages (saved before tool-result markers) and any call whose result marker
+		// is missing: emit their `tool` messages here so no assistant tool_call is left dangling.
+		for call_id in unresolved_calls {
+			result.push(tool_message(execs, &call_names, &call_id));
+		}
 	}
 	result
 }
@@ -594,7 +715,8 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 		}
 	};
 
-	let omni_messages = get_omni_messages(&state.db, messages).await;
+	let vision = omni_model.input_modalities.iter().any(|m| matches!(m, omniference::types::Modality::Image));
+	let omni_messages = get_omni_messages(&state.db, messages, vision).await;
 	eprintln!("[STREAM] Messages built");
 	let mut ir = ChatRequestIR::default();
 	ir.model.alias = omni_model.id.clone();
@@ -629,27 +751,33 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 		}
 	}
 
+	let mut tool_system_prompts: Vec<String> = Vec::new();
+	if let Some(ref enabled_tool_ids) = req.tools_enabled {
+		let (specs, choice, prompts) = resolve_tools(&state.db, user.id, enabled_tool_ids).await;
+		if !specs.is_empty() {
+			ir.tools = specs;
+			ir.tool_choice = choice;
+			tool_system_prompts = prompts;
+		}
+	}
+
+	let mut system_segments: Vec<String> = Vec::new();
 	let system_prompt_text = system_model_config.as_ref().and_then(|mc| mc.system_prompt.as_deref()).unwrap_or("");
 	if !system_prompt_text.is_empty() {
-		let interpolated = interpolate_system_prompt(system_prompt_text, &user, &model);
+		system_segments.push(interpolate_system_prompt(system_prompt_text, &user, &model));
+	}
+	system_segments.extend(tool_system_prompts);
+	if !system_segments.is_empty() {
 		ir.messages.insert(
 			0,
 			OmniMessage {
 				role: Role::System,
-				parts: vec![ContentPart::Text(interpolated)],
+				parts: vec![ContentPart::Text(system_segments.join("\n\n"))],
 				name: None,
 			},
 		);
 	}
 
-	if let Some(ref enabled_tool_ids) = req.tools_enabled {
-		let (specs, choice) = resolve_tools(&state.db, user.id, enabled_tool_ids).await;
-		if !specs.is_empty() {
-			ir.tools = specs;
-			ir.tool_choice = choice;
-		}
-	}
-
 	let omni_messages_for_stream = ir.messages.clone();
 	let ir_for_stream = ir.clone();
 
@@ -689,6 +817,7 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 	const MAX_ITERATIONS: usize = 10;
 
 	let mut all_tool_executions: Vec<ToolExecutionInternal> = Vec::new();
+	let mut assistant_message_parts: Vec<MessagePart> = Vec::new();
 	let request_settings = stream_request_settings;
 
 	let engine = ai::get();
@@ -715,6 +844,25 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 				base_ir.tools = tool_specs.clone();
 				base_ir.tool_choice = tool_choice.clone();
 
+				for (i, m) in base_ir.messages.iter().enumerate() {
+					let role = match m.role {
+						Role::System => "system",
+						Role::User => "user",
+						Role::Assistant => "assistant",
+						Role::Tool => "tool",
+						Role::Developer => "developer",
+					};
+					let tool_calls: Vec<&str> = m
+						.parts
+						.iter()
+						.filter_map(|p| match p {
+							ContentPart::ToolCall { id, .. } => Some(id.as_str()),
+							_ => None,
+						})
+						.collect();
+					tracing::debug!("[STREAM] msg[{i}] role={role} name={:?} tool_calls={:?}", m.name, tool_calls);
+				}
+
 				let engine_read = engine.read().await;
 				let stream_result = engine_read.chat(base_ir.clone()).await;
 				drop(engine_read);
@@ -738,6 +886,7 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 				let mut pending_tool_calls: HashMap<String, (String, String)> = HashMap::new();
 				let mut tool_results: Vec<ToolExecutionInternal> = Vec::new();
 				let mut iteration_content = String::new();
+				let mut iteration_reasoning = String::new();
 				let mut completed_tool_calls: Vec<(String, String, serde_json::Value)> = Vec::new();
 
 				let mut event_count = 0;
@@ -759,6 +908,7 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 								reasoning_start = Some(Instant::now());
 							}
 							reasoning_content.push_str(&content);
+							iteration_reasoning.push_str(&content);
 							yield Ok::<_, Infallible>(Event::default().data(
 								serde_json::to_string(&StreamData::ReasoningDelta { content }).unwrap_or_default()
 							));
@@ -917,11 +1067,25 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 									}
 								};
 
+									if !iteration_reasoning.is_empty() {
+										assistant_message_parts.push(MessagePart::Reasoning { text: iteration_reasoning.clone() });
+									}
+									if !iteration_content.is_empty() {
+										assistant_message_parts.push(MessagePart::Text { text: iteration_content.clone() });
+									}
+									let has_tool_calls = assistant_message_parts.iter().any(|p| matches!(p, MessagePart::ToolCall { .. }));
+									let content_parts_json = if has_tool_calls {
+										serde_json::to_value(&assistant_message_parts).ok()
+									} else {
+										None
+									};
+
 									let message = Message::create_streaming_assistant(
 										&db,
 										StreamingAssistantMessageCreate {
 											chat_id: &chat_id,
 											content: &full_content,
+											content_parts: content_parts_json.as_ref(),
 											reasoning_content: if reasoning_content.is_empty() { None } else { Some(&reasoning_content) },
 											model_id: &model.id,
 											reasoning_details: &reasoning_details,
@@ -993,14 +1157,23 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 								eprintln!("[STREAM] Continuing agentic loop with {} tool results", tool_results.len());
 
 								let mut assistant_parts: Vec<ContentPart> = Vec::new();
+								if !iteration_reasoning.is_empty() {
+									assistant_message_parts.push(MessagePart::Reasoning { text: iteration_reasoning.clone() });
+								}
 								if !iteration_content.is_empty() {
 									assistant_parts.push(ContentPart::Text(iteration_content.clone()));
+									assistant_message_parts.push(MessagePart::Text { text: iteration_content.clone() });
 								}
 								for (call_id, tool_name, args) in completed_tool_calls.drain(..) {
 									let arguments = match &args {
 										serde_json::Value::String(s) => s.clone(),
 										other => other.to_string(),
 									};
+									assistant_message_parts.push(MessagePart::ToolCall {
+										id: call_id.clone(),
+										name: tool_name.clone(),
+										arguments: arguments.clone(),
+									});
 									assistant_parts.push(ContentPart::ToolCall {
 										id: call_id,
 										name: tool_name,
@@ -1016,17 +1189,26 @@ pub async fn stream_completion(State(state): State<Arc<JobState>>, cookies: Cook
 								}
 
 								for exec in tool_results.drain(..) {
+									if matches!(exec.tool_name.as_str(), "imagegen" | "imagegen_generate" | "imagegen_edit")
+										&& exec.error.is_none()
+										&& let Some(image_id) = exec.output.get("image_id").and_then(serde_json::Value::as_str)
+										&& Uuid::parse_str(image_id).is_ok()
+									{
+										assistant_message_parts.push(MessagePart::Image { image_id: image_id.to_string() });
+									}
 									let result_text = if let Some(ref err) = exec.error {
 										format!("Error: {}", err)
 									} else {
 										serde_json::to_string(&exec.output).unwrap_or_else(|_| exec.output.to_string())
 									};
 
+									tracing::debug!("[STREAM] Tool result -> role=tool name=\"{}:{}\" ({} bytes)", exec.tool_name, exec.call_id, result_text.len());
 									current_messages.push(OmniMessage {
 										role: Role::Tool,
 										parts: vec![ContentPart::Text(result_text)],
-										name: Some(exec.call_id.clone()),
+										name: Some(tool_message_name(&exec.tool_name, &exec.call_id)),
 									});
+									assistant_message_parts.push(MessagePart::ToolResult { tool_call_id: exec.call_id.clone() });
 
 									all_tool_executions.push(exec);
 								}
diff --git a/src/routes/public/tools.rs b/src/routes/public/tools.rs
index 1064452..8d15288 100644
--- a/src/routes/public/tools.rs
+++ b/src/routes/public/tools.rs
@@ -43,7 +43,7 @@ pub async fn list_tools(State(state): State<Arc<JobState>>, cookies: Cookies) ->
 		.into_iter()
 		.map(|t| {
 			let funcs = functions_by_tool.remove(&t.id).unwrap_or_default();
-			ToolResponse::from_tool_with_functions(t, funcs)
+			ToolResponse::from_tool_with_functions(t, funcs).into_public()
 		})
 		.collect();
 
diff --git a/src/tests/models.rs b/src/tests/models.rs
index 9c5536c..c3fab70 100644
--- a/src/tests/models.rs
+++ b/src/tests/models.rs
@@ -1,8 +1,9 @@
 #[cfg(test)]
 mod tests {
-	use crate::types::models::{Model, ModelViewer};
+	use crate::types::models::{Model, ModelSyncInput, ModelViewer};
 	use crate::types::models_configs::ModelConfig;
 	use crate::types::teams::Team;
+	use serde_json::json;
 	use sqlx::PgPool;
 	use sqlx::types::Json;
 	use uuid::Uuid;
@@ -404,4 +405,32 @@ mod tests {
 		grant_model(&pool, team_id, model_id).await;
 		assert!(Model::can_user_use_model(&pool, &user_id, &model_id).await.unwrap());
 	}
+
+	#[sqlx::test(migrations = "./migrations")]
+	async fn sync_preserves_model_id_when_a_model_temporarily_disappears(pool: PgPool) {
+		let provider_id = create_provider(&pool, "Sync Provider", true).await;
+		let model_id = create_model(&pool, provider_id, "image-model", "Image Model", true).await;
+
+		let removed = Model::sync_provider_models(&pool, &provider_id, &[]).await.unwrap();
+		assert_eq!(removed.removed, 1);
+		let disabled = Model::find_by_id(&pool, &model_id).await.unwrap().unwrap();
+		assert!(!disabled.is_enabled);
+
+		let discovered = [ModelSyncInput {
+			provider_id,
+			model_id: "image-model".to_string(),
+			display_name: "Image Model".to_string(),
+			capabilities: json!(["IMAGE_GENERATION"]),
+			input_modalities: json!(["TEXT"]),
+			output_modalities: json!(["IMAGE"]),
+			context_length: None,
+			max_tokens: None,
+		}];
+		let restored = Model::sync_provider_models(&pool, &provider_id, &discovered).await.unwrap();
+		assert_eq!(restored.added, 0);
+
+		let reloaded = Model::find_by_id(&pool, &model_id).await.unwrap().unwrap();
+		assert_eq!(reloaded.id, model_id);
+		assert!(reloaded.is_enabled);
+	}
 }
diff --git a/src/types/chat/mod.rs b/src/types/chat/mod.rs
index f734809..3a855ca 100644
--- a/src/types/chat/mod.rs
+++ b/src/types/chat/mod.rs
@@ -212,6 +212,7 @@ pub struct StreamingUserMessageCreate<'a> {
 pub struct StreamingAssistantMessageCreate<'a> {
 	pub chat_id: &'a Uuid,
 	pub content: &'a str,
+	pub content_parts: Option<&'a serde_json::Value>,
 	pub reasoning_content: Option<&'a str>,
 	pub model_id: &'a Uuid,
 	pub reasoning_details: &'a ReasoningDetails,
diff --git a/src/types/chat/repository.rs b/src/types/chat/repository.rs
index 0c4b9a5..1f6e656 100644
--- a/src/types/chat/repository.rs
+++ b/src/types/chat/repository.rs
@@ -353,15 +353,16 @@ impl Message {
 		let message = sqlx::query_as::<_, Message>(
 			r#"
 			INSERT INTO messages (
-				chat_id, role, content, reasoning_content,
+				chat_id, role, content, content_parts, reasoning_content,
 				model_id, reasoning_details, usage_details, cost_details, request_settings, parent_id, fork_index, is_active_fork
 			)
-			VALUES ($1, 'assistant', $2, $3, $4, $5, $6, $7, $8, $9, $10, TRUE)
+			VALUES ($1, 'assistant', $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, TRUE)
 			RETURNING *
 			"#,
 		)
 		.bind(params.chat_id)
 		.bind(params.content)
+		.bind(params.content_parts)
 		.bind(params.reasoning_content)
 		.bind(params.model_id)
 		.bind(sqlx::types::Json(params.reasoning_details))
diff --git a/src/types/chat/requests.rs b/src/types/chat/requests.rs
index 452d8cd..7381a7a 100644
--- a/src/types/chat/requests.rs
+++ b/src/types/chat/requests.rs
@@ -141,7 +141,12 @@ pub struct BranchFromMessageRequest {
 #[serde(tag = "type", rename_all = "lowercase")]
 pub enum MessagePart {
 	Text { text: String },
+	Reasoning { text: String },
 	Image { image_id: String },
+	#[serde(rename = "tool_call")]
+	ToolCall { id: String, name: String, arguments: String },
+	#[serde(rename = "tool_result")]
+	ToolResult { tool_call_id: String },
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/src/types/models/repository.rs b/src/types/models/repository.rs
index a62ba74..895c2cf 100644
--- a/src/types/models/repository.rs
+++ b/src/types/models/repository.rs
@@ -12,6 +12,73 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use uuid::Uuid;
 
 impl Model {
+	pub async fn list_image_providers_for_admin(pool: &sqlx::PgPool) -> Result<Vec<ProviderTab>, sqlx::Error> {
+		sqlx::query_as::<_, ProviderTab>(
+			r#"
+			SELECT DISTINCT p.id, p.name
+			FROM providers p
+			JOIN models m ON m.provider_id = p.id
+			WHERE p.is_enabled = true
+			  AND p.kind IN ('OPENAI', 'OPENROUTER', 'GOOGLE')
+			  AND m.is_enabled = true
+			  AND EXISTS (
+				  SELECT 1
+				  FROM jsonb_array_elements_text(COALESCE(m.output_modalities, '[]'::jsonb)) AS modality(value)
+				  WHERE LOWER(modality.value) = 'image'
+			  )
+			ORDER BY p.name
+			"#,
+		)
+		.fetch_all(pool)
+		.await
+	}
+
+	pub async fn list_image_models_for_admin(
+		pool: &sqlx::PgPool,
+		page: i64,
+		size: i64,
+		search_query: Option<String>,
+		provider_id: Option<Uuid>,
+	) -> Result<PaginatedResponse<ModelListAdmin>, sqlx::Error> {
+		let pagination = Self::pagination(page, size);
+		let search = search_query
+			.as_deref()
+			.map(str::trim)
+			.filter(|value| !value.is_empty())
+			.map(|value| format!("%{}%", Self::escape_like_pattern(value)));
+		let rows = sqlx::query_as::<_, ModelListAdminRow>(
+			r#"
+			SELECT m.id, m.model_id, m.display_name,
+			       COALESCE(m.capabilities, '[]'::jsonb) AS capabilities,
+			       COALESCE(m.input_modalities, '[]'::jsonb) AS input_modalities,
+			       COALESCE(m.output_modalities, '[]'::jsonb) AS output_modalities,
+			       m.context_length, m.max_tokens, COALESCE(m.is_enabled, false) AS is_enabled,
+			       m.created_at, m.updated_at, p.id AS provider_id, p.name AS provider_name,
+			       p.kind AS provider_kind, NULL::text AS icon
+			FROM models m
+			JOIN providers p ON p.id = m.provider_id
+			WHERE m.is_enabled = true AND p.is_enabled = true
+			  AND EXISTS (
+				  SELECT 1
+				  FROM jsonb_array_elements_text(COALESCE(m.output_modalities, '[]'::jsonb)) AS modality(value)
+				  WHERE LOWER(modality.value) = 'image'
+			  )
+			  AND ($3::text IS NULL OR m.display_name ILIKE $3 ESCAPE '\' OR m.model_id ILIKE $3 ESCAPE '\' OR p.name ILIKE $3 ESCAPE '\')
+			  AND ($4::uuid IS NULL OR p.id = $4)
+			ORDER BY m.display_name, p.name
+			LIMIT $1 OFFSET $2
+			"#,
+		)
+		.bind(pagination.limit)
+		.bind(pagination.offset)
+		.bind(search)
+		.bind(provider_id)
+		.fetch_all(pool)
+		.await?;
+		let has_more = rows.len() > pagination.page_size;
+		let items = rows.into_iter().take(pagination.page_size).map(ModelListAdmin::from).collect();
+		Ok(PaginatedResponse { has_more, items })
+	}
 	fn escape_like_pattern(s: &str) -> String {
 		s.replace('\\', r"\\").replace('%', r"\%").replace('_', r"\_")
 	}
@@ -361,13 +428,14 @@ impl Model {
 	}
 
 	pub async fn sync_provider_models(pool: &sqlx::PgPool, provider_id: &Uuid, discovered: &[ModelSyncInput]) -> Result<ModelSyncSummary, sqlx::Error> {
-		let existing = Self::list_raw_by_provider(pool, provider_id).await?;
+		let mut transaction = pool.begin().await?;
+		let existing = Self::list_raw_by_provider(&mut *transaction, provider_id).await?;
 		let existing_map: BTreeMap<_, _> = existing.iter().map(|model| (model.model_id.as_str(), model)).collect();
 		let discovered_ids: HashSet<_> = discovered.iter().map(|model| model.model_id.as_str()).collect();
 
 		let mut to_insert = Vec::with_capacity(discovered.len());
 		let mut to_update = Vec::with_capacity(discovered.len());
-		let mut to_delete = Vec::with_capacity(existing.len());
+		let mut to_disable = Vec::with_capacity(existing.len());
 
 		for model in discovered {
 			if existing_map.contains_key(model.model_id.as_str()) {
@@ -379,18 +447,19 @@ impl Model {
 
 		for model in &existing {
 			if !discovered_ids.contains(model.model_id.as_str()) {
-				to_delete.push(model.id);
+				to_disable.push(model.id);
 			}
 		}
 
-		let added = Self::bulk_insert_sync_models(pool, &to_insert).await?;
-		let updated = Self::bulk_update_sync_models(pool, &to_update).await?;
-		let removed = Self::bulk_delete(pool, &to_delete).await?;
+		let added = Self::bulk_insert_sync_models(&mut *transaction, &to_insert).await?;
+		let updated = Self::bulk_update_sync_models(&mut *transaction, &to_update).await?;
+		let removed = Self::bulk_disable_sync_models(&mut *transaction, &to_disable).await?;
+		transaction.commit().await?;
 
 		Ok(ModelSyncSummary { added, updated, removed })
 	}
 
-	async fn list_raw_by_provider(pool: &sqlx::PgPool, provider_id: &Uuid) -> Result<Vec<Self>, sqlx::Error> {
+	async fn list_raw_by_provider(connection: &mut sqlx::PgConnection, provider_id: &Uuid) -> Result<Vec<Self>, sqlx::Error> {
 		sqlx::query_as::<_, Self>(
 			r#"
 			SELECT
@@ -411,11 +480,11 @@ impl Model {
 			"#,
 		)
 		.bind(provider_id)
-		.fetch_all(pool)
+		.fetch_all(connection)
 		.await
 	}
 
-	async fn bulk_insert_sync_models(pool: &sqlx::PgPool, items: &[&ModelSyncInput]) -> Result<usize, sqlx::Error> {
+	async fn bulk_insert_sync_models(connection: &mut sqlx::PgConnection, items: &[&ModelSyncInput]) -> Result<usize, sqlx::Error> {
 		if items.is_empty() {
 			return Ok(0);
 		}
@@ -436,11 +505,11 @@ impl Model {
 				.push_bind(item.max_tokens);
 		});
 
-		query_builder.build().execute(pool).await?;
+		query_builder.build().execute(connection).await?;
 		Ok(items.len())
 	}
 
-	async fn bulk_update_sync_models(pool: &sqlx::PgPool, items: &[&ModelSyncInput]) -> Result<usize, sqlx::Error> {
+	async fn bulk_update_sync_models(connection: &mut sqlx::PgConnection, items: &[&ModelSyncInput]) -> Result<usize, sqlx::Error> {
 		if items.is_empty() {
 			return Ok(0);
 		}
@@ -463,6 +532,7 @@ impl Model {
 				output_modalities = u.output_modalities,
 				context_length = u.context_length,
 				max_tokens = u.max_tokens,
+				is_enabled = true,
 				updated_at = NOW()
 			FROM (
 				SELECT * FROM UNNEST($1::uuid[], $2::text[], $3::text[], $4::jsonb[], $5::jsonb[], $6::jsonb[], $7::int[], $8::int[])
@@ -479,19 +549,22 @@ impl Model {
 		.bind(&output_modalities)
 		.bind(&context_lengths)
 		.bind(&max_tokens)
-		.execute(pool)
+		.execute(connection)
 		.await?;
 
 		Ok(items.len())
 	}
 
-	async fn bulk_delete(pool: &sqlx::PgPool, ids: &[Uuid]) -> Result<usize, sqlx::Error> {
+	async fn bulk_disable_sync_models(connection: &mut sqlx::PgConnection, ids: &[Uuid]) -> Result<usize, sqlx::Error> {
 		if ids.is_empty() {
 			return Ok(0);
 		}
 
-		sqlx::query("DELETE FROM models WHERE id = ANY($1)").bind(ids).execute(pool).await?;
-		Ok(ids.len())
+		let result = sqlx::query("UPDATE models SET is_enabled = false, updated_at = NOW() WHERE id = ANY($1) AND is_enabled = true")
+			.bind(ids)
+			.execute(connection)
+			.await?;
+		Ok(result.rows_affected() as usize)
 	}
 
 	pub async fn find_name_and_model_id<'e, E>(executor: E, id: &Uuid) -> Result<Option<(String, String)>, sqlx::Error>
diff --git a/src/types/models/rows.rs b/src/types/models/rows.rs
index ed9057e..b1ba0af 100644
--- a/src/types/models/rows.rs
+++ b/src/types/models/rows.rs
@@ -23,6 +23,7 @@ pub(super) struct ModelListPublicRow {
 	pub is_favorite: bool,
 }
 
+#[derive(sqlx::FromRow)]
 pub(super) struct ModelListAdminRow {
 	pub id: Uuid,
 	pub model_id: String,
diff --git a/src/types/tools/mod.rs b/src/types/tools/mod.rs
index 71d6c99..6b8d470 100644
--- a/src/types/tools/mod.rs
+++ b/src/types/tools/mod.rs
@@ -11,6 +11,17 @@ mod responses;
 pub use requests::*;
 pub use responses::*;
 
+#[derive(Debug, thiserror::Error)]
+/// Failures produced while loading or validating tool settings.
+pub enum ToolSettingsError {
+	#[error("tool not found")]
+	NotFound,
+	#[error("invalid tool settings")]
+	Invalid,
+	#[error("database error: {0}")]
+	Database(#[from] sqlx::Error),
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, sqlx::Type)]
 #[sqlx(type_name = "tool_source_kind", rename_all = "SCREAMING_SNAKE_CASE")]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
@@ -69,6 +80,7 @@ pub struct Tool {
 	pub input_schema: serde_json::Value,
 	pub settings_schema: serde_json::Value,
 	pub is_enabled: bool,
+	pub system_prompt: Option<String>,
 	pub created_at: DateTime<Utc>,
 	pub updated_at: DateTime<Utc>,
 }
diff --git a/src/types/tools/repository.rs b/src/types/tools/repository.rs
index a86a0d9..c095cbe 100644
--- a/src/types/tools/repository.rs
+++ b/src/types/tools/repository.rs
@@ -1,5 +1,6 @@
 use super::{
-	McpHttpConfig, McpServer, McpServerResponse, McpSourceConfig, McpStdioConfig, Tool, ToolExecution, ToolFunction, ToolSourceKind, UserToolSettings, WasmBlob,
+	CreateToolRequest, McpHttpConfig, McpServer, McpServerResponse, McpSourceConfig, McpStdioConfig, Tool, ToolExecution, ToolFunction, ToolSourceKind,
+	UpdateToolRequest, UserToolSettings, WasmBlob,
 };
 use crate::utils::tools::mcp::{McpToolInfo, McpUrlPolicy};
 use crate::utils::tools::{McpClient, McpConnectionPool, ToolError};
@@ -8,6 +9,246 @@ use std::sync::Arc;
 use uuid::Uuid;
 
 impl Tool {
+	/// Create a system tool and its functions atomically.
+	///
+	/// # Errors
+	///
+	/// Returns an error when the transaction or a database operation fails.
+	pub async fn create_system(pool: &sqlx::PgPool, request: &CreateToolRequest) -> Result<(Self, Vec<ToolFunction>), sqlx::Error> {
+		let mut tx = pool.begin().await?;
+		let legacy_schema = request
+			.input_schema
+			.clone()
+			.unwrap_or_else(|| serde_json::json!({"type": "object", "properties": {}}));
+		let tool = sqlx::query_as::<_, Tool>(
+			r#"
+			INSERT INTO tools (
+				owner_id, name, display_name, description, icon,
+				source_kind, source_config, input_schema, settings_schema,
+				is_enabled, system_prompt
+			)
+			VALUES (NULL, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+			RETURNING *
+			"#,
+		)
+		.bind(&request.name)
+		.bind(&request.display_name)
+		.bind(&request.description)
+		.bind(&request.icon)
+		.bind(&request.source_kind)
+		.bind(&request.source_config)
+		.bind(&legacy_schema)
+		.bind(&request.settings_schema)
+		.bind(request.is_enabled)
+		.bind(&request.system_prompt)
+		.fetch_one(&mut *tx)
+		.await?;
+
+		let function_count = if request.functions.is_empty() && request.input_schema.is_some() {
+			1
+		} else {
+			request.functions.len()
+		};
+		let mut functions = Vec::with_capacity(function_count);
+		for (index, function) in request.functions.iter().enumerate() {
+			let created = sqlx::query_as::<_, ToolFunction>(
+				r#"
+				INSERT INTO tool_functions (tool_id, name, description, input_schema, entrypoint, sort_order)
+				VALUES ($1, $2, $3, $4, $5, $6)
+				RETURNING *
+				"#,
+			)
+			.bind(tool.id)
+			.bind(&function.name)
+			.bind(&function.description)
+			.bind(&function.input_schema)
+			.bind(&function.entrypoint)
+			.bind(index as i32)
+			.fetch_one(&mut *tx)
+			.await?;
+			functions.push(created);
+		}
+		if request.functions.is_empty() && request.input_schema.is_some() {
+			let created = sqlx::query_as::<_, ToolFunction>(
+				r#"
+				INSERT INTO tool_functions (tool_id, name, description, input_schema, entrypoint, sort_order)
+				VALUES ($1, $2, $3, $4, NULL, 0)
+				RETURNING *
+				"#,
+			)
+			.bind(tool.id)
+			.bind(&request.name)
+			.bind(&request.description)
+			.bind(&legacy_schema)
+			.fetch_one(&mut *tx)
+			.await?;
+			functions.push(created);
+		}
+
+		tx.commit().await?;
+		Ok((tool, functions))
+	}
+
+	/// Update a system tool and its functions atomically.
+	///
+	/// # Errors
+	///
+	/// Returns an error when the transaction or a database operation fails.
+	pub async fn update_system(pool: &sqlx::PgPool, tool_id: &Uuid, request: &UpdateToolRequest) -> Result<Option<(Self, Vec<ToolFunction>)>, sqlx::Error> {
+		let mut tx = pool.begin().await?;
+		let tool = sqlx::query_as::<_, Tool>(
+			r#"
+			UPDATE tools SET
+				name = COALESCE($2, name),
+				display_name = COALESCE($3, display_name),
+				description = COALESCE($4, description),
+				icon = COALESCE($5, icon),
+				source_config = COALESCE($6, source_config),
+				input_schema = COALESCE($7, input_schema),
+				settings_schema = COALESCE($8, settings_schema),
+				is_enabled = COALESCE($9, is_enabled),
+				system_prompt = COALESCE($10, system_prompt),
+				updated_at = NOW()
+			WHERE id = $1 AND owner_id IS NULL
+			RETURNING *
+			"#,
+		)
+		.bind(tool_id)
+		.bind(&request.name)
+		.bind(&request.display_name)
+		.bind(&request.description)
+		.bind(&request.icon)
+		.bind(&request.source_config)
+		.bind(&request.input_schema)
+		.bind(&request.settings_schema)
+		.bind(request.is_enabled)
+		.bind(&request.system_prompt)
+		.fetch_optional(&mut *tx)
+		.await?;
+		let Some(tool) = tool else {
+			tx.rollback().await?;
+			return Ok(None);
+		};
+
+		if let Some(delete_ids) = request.delete_function_ids.as_deref().filter(|ids| !ids.is_empty()) {
+			sqlx::query("DELETE FROM tool_functions WHERE id = ANY($1) AND tool_id = $2")
+				.bind(delete_ids)
+				.bind(tool_id)
+				.execute(&mut *tx)
+				.await?;
+		}
+
+		if let Some(functions) = &request.functions {
+			for (index, function) in functions.iter().enumerate() {
+				if let Some(function_id) = function.id {
+					sqlx::query(
+						r#"
+						UPDATE tool_functions SET
+							name = $2,
+							description = $3,
+							input_schema = $4,
+							entrypoint = $5,
+							sort_order = $6
+						WHERE id = $1 AND tool_id = $7
+						"#,
+					)
+					.bind(function_id)
+					.bind(&function.name)
+					.bind(&function.description)
+					.bind(&function.input_schema)
+					.bind(&function.entrypoint)
+					.bind(index as i32)
+					.bind(tool_id)
+					.execute(&mut *tx)
+					.await?;
+				} else {
+					sqlx::query(
+						r#"
+						INSERT INTO tool_functions (tool_id, name, description, input_schema, entrypoint, sort_order)
+						VALUES ($1, $2, $3, $4, $5, $6)
+						"#,
+					)
+					.bind(tool_id)
+					.bind(&function.name)
+					.bind(&function.description)
+					.bind(&function.input_schema)
+					.bind(&function.entrypoint)
+					.bind(index as i32)
+					.execute(&mut *tx)
+					.await?;
+				}
+			}
+		}
+
+		let functions = sqlx::query_as::<_, ToolFunction>("SELECT * FROM tool_functions WHERE tool_id = $1 ORDER BY sort_order, created_at")
+			.bind(tool_id)
+			.fetch_all(&mut *tx)
+			.await?;
+		tx.commit().await?;
+		Ok(Some((tool, functions)))
+	}
+
+	/// Store validated settings for a system tool.
+	///
+	/// # Errors
+	///
+	/// Returns an error when the tool does not exist, image model settings are invalid, or a database operation fails.
+	pub async fn set_system_settings(pool: &sqlx::PgPool, tool_id: &Uuid, settings: &serde_json::Value) -> Result<(), super::ToolSettingsError> {
+		let mut tx = pool.begin().await?;
+		let tool = sqlx::query_as::<_, Tool>("SELECT * FROM tools WHERE id = $1 AND owner_id IS NULL")
+			.bind(tool_id)
+			.fetch_optional(&mut *tx)
+			.await?
+			.ok_or(super::ToolSettingsError::NotFound)?;
+
+		if tool.source_kind == ToolSourceKind::Builtin && tool.source_config.get("builtin_id").and_then(serde_json::Value::as_str) == Some("imagegen") {
+			let model_id = settings
+				.get("image_model_id")
+				.and_then(serde_json::Value::as_str)
+				.and_then(|value| Uuid::parse_str(value).ok())
+				.ok_or(super::ToolSettingsError::Invalid)?;
+			let valid = sqlx::query_scalar::<_, bool>(
+				r#"
+				SELECT EXISTS (
+					SELECT 1
+					FROM models m
+					JOIN providers p ON p.id = m.provider_id
+					WHERE m.id = $1
+					  AND m.is_enabled = true
+					  AND p.is_enabled = true
+					  AND p.kind IN ('OPENAI', 'OPENROUTER', 'GOOGLE')
+					  AND EXISTS (
+						  SELECT 1
+						  FROM jsonb_array_elements_text(COALESCE(m.output_modalities, '[]'::jsonb)) AS modality(value)
+						  WHERE LOWER(modality.value) = 'image'
+					  )
+				)
+				"#,
+			)
+			.bind(model_id)
+			.fetch_one(&mut *tx)
+			.await?;
+			if !valid {
+				return Err(super::ToolSettingsError::Invalid);
+			}
+		}
+
+		sqlx::query(
+			r#"
+			INSERT INTO user_tool_settings (user_id, tool_id, settings)
+			VALUES (NULL, $1, $2)
+			ON CONFLICT (tool_id) WHERE user_id IS NULL
+			DO UPDATE SET settings = EXCLUDED.settings, updated_at = NOW()
+			"#,
+		)
+		.bind(tool_id)
+		.bind(settings)
+		.execute(&mut *tx)
+		.await?;
+		tx.commit().await?;
+		Ok(())
+	}
+
 	#[deprecated(note = "Use to_tool_specs with functions instead")]
 	pub fn to_tool_spec(&self) -> omniference::types::ToolSpec {
 		omniference::types::ToolSpec::JsonSchema {
@@ -141,7 +382,7 @@ impl Tool {
 		sqlx::query_as::<_, Tool>(
 			r#"
 			SELECT id, owner_id, name, display_name, description, icon, source_kind,
-			       source_config, input_schema, settings_schema, is_enabled, created_at, updated_at
+			       source_config, input_schema, settings_schema, is_enabled, system_prompt, created_at, updated_at
 			FROM tools
 			WHERE id = ANY($1) AND is_enabled = true AND (owner_id = $2 OR owner_id IS NULL)
 			"#,
@@ -158,7 +399,7 @@ impl Tool {
 		sqlx::query_as::<_, Tool>(
 			r#"
 			SELECT id, owner_id, name, display_name, description, icon, source_kind,
-			       source_config, input_schema, settings_schema, is_enabled, created_at, updated_at
+			       source_config, input_schema, settings_schema, is_enabled, system_prompt, created_at, updated_at
 			FROM tools
 			WHERE name = $1 AND is_enabled = true AND (owner_id = $2 OR owner_id IS NULL)
 			ORDER BY owner_id NULLS LAST
@@ -189,7 +430,7 @@ impl Tool {
 		sqlx::query_as::<_, Tool>(
 			r#"
 			SELECT id, owner_id, name, display_name, description, icon, source_kind,
-			       source_config, input_schema, settings_schema, is_enabled, created_at, updated_at
+			       source_config, input_schema, settings_schema, is_enabled, system_prompt, created_at, updated_at
 			FROM tools
 			WHERE is_enabled = true AND (owner_id = $1 OR owner_id IS NULL)
 			ORDER BY created_at DESC
@@ -628,7 +869,7 @@ impl McpServer {
 				INSERT INTO tools (owner_id, name, display_name, description, icon,
 				                   source_kind, source_config, input_schema, settings_schema, is_enabled)
 				VALUES ($1, $2, $3, $4, NULL, 'MCP', $5, $6, '{}'::jsonb, true)
-				RETURNING id, owner_id, name, display_name, description, icon, source_kind, source_config, input_schema, settings_schema, is_enabled, created_at, updated_at
+				RETURNING id, owner_id, name, display_name, description, icon, source_kind, source_config, input_schema, settings_schema, is_enabled, system_prompt, created_at, updated_at
 				"#,
 			)
 			.bind(owner_id)
diff --git a/src/types/tools/requests.rs b/src/types/tools/requests.rs
index 81f5a91..46bdee3 100644
--- a/src/types/tools/requests.rs
+++ b/src/types/tools/requests.rs
@@ -26,6 +26,8 @@ pub struct CreateToolRequest {
 	pub settings_schema: serde_json::Value,
 	#[serde(default = "default_true")]
 	pub is_enabled: bool,
+	#[serde(default)]
+	pub system_prompt: Option<String>,
 }
 
 pub(super) fn default_true() -> bool {
@@ -53,6 +55,7 @@ pub struct UpdateToolRequest {
 	pub delete_function_ids: Option<Vec<Uuid>>,
 	pub settings_schema: Option<serde_json::Value>,
 	pub is_enabled: Option<bool>,
+	pub system_prompt: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/src/types/tools/responses.rs b/src/types/tools/responses.rs
index a489e84..7401bb5 100644
--- a/src/types/tools/responses.rs
+++ b/src/types/tools/responses.rs
@@ -39,6 +39,8 @@ pub struct ToolResponse {
 	pub functions: Vec<ToolFunctionResponse>,
 	pub settings_schema: serde_json::Value,
 	pub is_enabled: bool,
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub system_prompt: Option<String>,
 	pub has_user_settings: bool,
 	pub mcp_server_id: Option<Uuid>,
 	pub mcp_server_name: Option<String>,
@@ -47,6 +49,12 @@ pub struct ToolResponse {
 }
 
 impl ToolResponse {
+	#[must_use]
+	pub fn into_public(mut self) -> Self {
+		self.system_prompt = None;
+		self
+	}
+
 	pub fn from_tool_with_functions(t: Tool, functions: Vec<ToolFunction>) -> Self {
 		let mcp_server_id = super::McpSourceConfig::from_tool(&t).map(|c| c.mcp_server_id);
 		Self {
@@ -61,6 +69,7 @@ impl ToolResponse {
 			functions: functions.into_iter().map(ToolFunctionResponse::from).collect(),
 			settings_schema: t.settings_schema,
 			is_enabled: t.is_enabled,
+			system_prompt: t.system_prompt,
 			has_user_settings: false,
 			mcp_server_id,
 			mcp_server_name: None,
@@ -85,6 +94,7 @@ impl From<Tool> for ToolResponse {
 			functions: vec![],
 			settings_schema: t.settings_schema,
 			is_enabled: t.is_enabled,
+			system_prompt: t.system_prompt,
 			has_user_settings: false,
 			mcp_server_id,
 			mcp_server_name: None,
diff --git a/src/utils/images.rs b/src/utils/images.rs
index 92a4cf8..c9ce402 100644
--- a/src/utils/images.rs
+++ b/src/utils/images.rs
@@ -163,6 +163,37 @@ pub async fn get_image(db: &PgPool, id: Uuid) -> Result<Option<(Vec<u8>, String)
 	}
 }
 
+/// Store a caption (typically the generation prompt) for an image.
+///
+/// Used as a text stand-in when rehydrating history for non-vision models.
+///
+/// # Errors
+///
+/// Returns an error when the database update fails.
+pub async fn set_image_caption(db: &PgPool, id: Uuid, caption: &str) -> Result<(), String> {
+	sqlx::query("UPDATE images SET caption = $2 WHERE id = $1")
+		.bind(id)
+		.bind(caption)
+		.execute(db)
+		.await
+		.map_err(|e| format!("Failed to set image caption: {e}"))?;
+	Ok(())
+}
+
+/// Retrieve the stored caption for an image, if any.
+///
+/// # Errors
+///
+/// Returns an error when the database query fails.
+pub async fn image_caption(db: &PgPool, id: Uuid) -> Result<Option<String>, String> {
+	let row: Option<(Option<String>,)> = sqlx::query_as("SELECT caption FROM images WHERE id = $1")
+		.bind(id)
+		.fetch_optional(db)
+		.await
+		.map_err(|e| format!("Failed to fetch image caption: {e}"))?;
+	Ok(row.and_then(|r| r.0))
+}
+
 /// Parse a base64 data URI into (mime_type, decoded_bytes)
 pub(crate) fn parse_data_uri(data_uri: &str) -> Result<(String, Vec<u8>), String> {
 	if !data_uri.starts_with("data:") {
diff --git a/src/utils/tools/builtin/imagegen.rs b/src/utils/tools/builtin/imagegen.rs
index 13d3bb9..fcc8269 100644
--- a/src/utils/tools/builtin/imagegen.rs
+++ b/src/utils/tools/builtin/imagegen.rs
@@ -1,611 +1,236 @@
 use async_trait::async_trait;
 use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
-use reqwest::{Client, header::CONTENT_TYPE};
-use serde::{Deserialize, Serialize};
+use futures_util::StreamExt;
+use omniference::types::{ImageInput, ImageOperation, ImageOptions, ImageRequestIR, ImageResponse, ModelRef};
+use reqwest::{Client, Url, header::CONTENT_TYPE, redirect::Policy};
+use rust_decimal::{Decimal, prelude::FromPrimitive};
+use serde::Deserialize;
 use serde_json::{Value, json};
-use std::time::Duration;
+use std::{net::IpAddr, time::Duration};
+use uuid::Uuid;
 
 use super::super::executor::{ToolContext, ToolError, ToolExecutor};
-use crate::utils::images::{image_url, store_from_data_uri};
-
-const OPENAI_GENERATIONS_URL: &str = "https://api.openai.com/v1/images/generations";
-const OPENAI_EDITS_URL: &str = "https://api.openai.com/v1/images/edits";
-const REPLICATE_API_BASE: &str = "https://api.replicate.com/v1/models";
-const GOOGLE_GEMINI_GENERATIONS_URL: &str = "https://generativelanguage.googleapis.com/v1beta/openai/images/generations";
-const GOOGLE_GEMINI_CONTENT_URL: &str = "https://generativelanguage.googleapis.com/v1beta/models";
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct GenerateImageInput {
-	pub prompt: String,
-	#[serde(default = "default_size")]
-	pub size: String,
-	#[serde(default = "default_quality")]
-	pub quality: String,
-}
-
-fn default_size() -> String {
-	"1024x1024".to_string()
-}
-
-fn default_quality() -> String {
-	"standard".to_string()
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct EditImageInput {
-	pub image_url: String,
-	pub prompt: String,
-}
-
-#[derive(Debug, Serialize)]
-pub struct ImageResult {
-	pub success: bool,
-	pub image_url: Option<String>,
-	#[serde(skip_serializing_if = "Option::is_none")]
-	pub error: Option<String>,
-}
+use crate::ai::provider_to_config;
+use crate::types::budgets::Budget;
+use crate::types::models::{Model, ModelPricing};
+use crate::types::providers::{Provider, ProviderKind};
+use crate::types::usage::{UsageEvent, UsageEventRecord};
+use crate::utils::images::{safe_image_mime, store_image};
 
 #[derive(Debug, Deserialize)]
-struct OpenAIImageResponse {
-	data: Vec<OpenAIImageData>,
-}
-
-#[derive(Debug, Deserialize)]
-struct OpenAIImageData {
+struct GenerateImageInput {
+	prompt: String,
 	#[serde(default)]
-	url: Option<String>,
+	size: Option<String>,
 	#[serde(default)]
-	b64_json: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct ReplicateResponse {
-	output: Option<serde_json::Value>,
-	error: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct GeminiContentResponse {
-	candidates: Option<Vec<GeminiCandidate>>,
+	quality: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
-struct GeminiCandidate {
-	content: Option<GeminiContent>,
-	#[serde(rename = "finishReason")]
-	finish_reason: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct GeminiContent {
-	parts: Vec<GeminiPart>,
-}
-
-#[derive(Debug, Deserialize)]
-struct GeminiPart {
+struct EditImageInput {
+	#[serde(default)]
+	image_id: Option<String>,
 	#[serde(default)]
-	text: Option<String>,
-	#[serde(rename = "inlineData")]
-	inline_data: Option<GeminiInlineData>,
+	image_url: Option<String>,
+	prompt: String,
 }
 
-#[derive(Debug, Deserialize)]
-struct GeminiInlineData {
-	#[serde(rename = "mimeType")]
-	mime_type: String,
-	data: String,
-}
+const MAX_REMOTE_IMAGE_BYTES: usize = 20 * 1024 * 1024;
+
+pub struct ImageGenExecutor;
 
-pub struct ImageGenExecutor {
-	client: Client,
+fn is_blocked_address(address: IpAddr) -> bool {
+	match address {
+		IpAddr::V4(address) => address.is_private() || address.is_loopback() || address.is_link_local() || address.is_multicast() || address.is_unspecified() || address.is_broadcast(),
+		IpAddr::V6(address) => {
+			address.to_ipv4_mapped().is_some_and(|address| is_blocked_address(IpAddr::V4(address)))
+				|| address.is_unique_local()
+				|| address.is_loopback()
+				|| address.is_unicast_link_local()
+				|| address.is_multicast()
+				|| address.is_unspecified()
+		}
+	}
 }
 
 impl ImageGenExecutor {
 	pub fn new() -> Result<Self, ToolError> {
-		let client = Client::builder()
-			.timeout(Duration::from_secs(120))
-			.build()
-			.map_err(|e| ToolError::Internal(format!("Failed to create HTTP client: {e}")))?;
-
-		Ok(Self { client })
+		Ok(Self)
 	}
 
-	/// Process an image URL, uploading data URIs to CDN if database is available
-	async fn process_image_url(&self, url: String, ctx: &ToolContext) -> String {
-		if !url.starts_with("data:") {
-			return url;
-		}
-
-		let Some(db) = &ctx.db else {
-			return url;
-		};
-
-		match store_from_data_uri(db, &url, ctx.user_id, Some("imagegen")).await {
-			Ok(stored) => image_url(stored.id),
-			Err(e) => {
-				eprintln!("[IMAGEGEN] Failed to upload image to CDN: {}", e);
-				url // Return original on failure
-			}
-		}
-	}
-
-	async fn generate_openai(&self, input: &GenerateImageInput, api_key: &str, model: &str) -> Result<Value, ToolError> {
-		let payload = json!({
-			"model": model,
-			"prompt": input.prompt,
-			"n": 1,
-			"moderation": "low",
-		});
-
-		let response = self
-			.client
-			.post(OPENAI_GENERATIONS_URL)
-			.header("Authorization", format!("Bearer {api_key}"))
-			.header("Content-Type", "application/json")
-			.json(&payload)
-			.send()
-			.await
-			.map_err(|e| ToolError::HttpError(format!("OpenAI API request failed: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			let error_body = response.text().await.unwrap_or_default();
-			return Err(ToolError::HttpError(format!("OpenAI API error {status}: {error_body}")));
-		}
-
-		let openai_response: OpenAIImageResponse = response
-			.json()
+	async fn load_model(&self, model_id: &str, ctx: &ToolContext) -> Result<(Model, Provider), ToolError> {
+		let db = ctx.db.as_ref().ok_or_else(|| ToolError::Internal("Database not available".to_string()))?;
+		let id = Uuid::parse_str(model_id).map_err(|_| ToolError::InvalidInput("image_model_id must be a UUID".to_string()))?;
+		let model = Model::find_by_id(db, &id)
 			.await
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to parse OpenAI response: {e}")))?;
-
-		let image_url = openai_response
-			.data
-			.first()
-			.and_then(|d| d.url.clone().or_else(|| d.b64_json.clone().map(|b| format!("data:image/png;base64,{b}"))))
-			.ok_or_else(|| ToolError::ExecutionFailed("No image URL in response".to_string()))?;
-
-		Ok(json!(ImageResult {
-			success: true,
-			image_url: Some(image_url),
-			error: None,
-		}))
-	}
-
-	async fn edit_openai(&self, input: &EditImageInput, api_key: &str, model: &str, ctx: &ToolContext) -> Result<Value, ToolError> {
-		let (image_bytes, mime_type) = self.download_image(&input.image_url, ctx).await?;
-		let file_name = match mime_type.as_str() {
-			"image/png" => "image.png",
-			"image/jpeg" => "image.jpg",
-			"image/webp" => "image.webp",
-			"image/gif" => "image.gif",
-			_ => "image",
-		};
-		let mime_type = if reqwest::multipart::Part::bytes(Vec::new()).mime_str(&mime_type).is_ok() {
-			mime_type
-		} else {
-			"application/octet-stream".to_string()
-		};
-
-		let part = reqwest::multipart::Part::bytes(image_bytes)
-			.file_name(file_name)
-			.mime_str(&mime_type)
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to set mime type: {e}")))?;
-
-		let form = reqwest::multipart::Form::new()
-			.part("image", part)
-			.text("prompt", input.prompt.clone())
-			.text("model", model.to_string())
-			.text("n", "1");
-
-		let response = self
-			.client
-			.post(OPENAI_EDITS_URL)
-			.header("Authorization", format!("Bearer {api_key}"))
-			.multipart(form)
-			.send()
+			.map_err(|error| ToolError::Internal(format!("Failed to load image model: {error}")))?
+			.ok_or_else(|| ToolError::InvalidInput("Configured image model no longer exists".to_string()))?;
+		let provider = Provider::find_for_admin(db, &model.provider_id)
 			.await
-			.map_err(|e| ToolError::HttpError(format!("OpenAI API request failed: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			let error_body = response.text().await.unwrap_or_default();
-			return Err(ToolError::HttpError(format!("OpenAI API error {status}: {error_body}")));
+			.map_err(|error| ToolError::Internal(format!("Failed to load image provider: {error}")))?
+			.ok_or_else(|| ToolError::InvalidInput("Configured image provider no longer exists".to_string()))?;
+		if !model.is_enabled || !provider.is_enabled {
+			return Err(ToolError::ExecutionFailed("Configured image model is disabled".to_string()));
 		}
-
-		let openai_response: OpenAIImageResponse = response
-			.json()
-			.await
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to parse OpenAI response: {e}")))?;
-
-		let image_url = openai_response
-			.data
-			.first()
-			.and_then(|d| d.url.clone().or_else(|| d.b64_json.clone().map(|b| format!("data:image/png;base64,{b}"))))
-			.ok_or_else(|| ToolError::ExecutionFailed("No image URL in response".to_string()))?;
-
-		Ok(json!(ImageResult {
-			success: true,
-			image_url: Some(image_url),
-			error: None,
-		}))
-	}
-
-	async fn generate_replicate(&self, input: &GenerateImageInput, api_key: &str, model: &str) -> Result<Value, ToolError> {
-		let url = format!("{REPLICATE_API_BASE}/{model}/predictions");
-
-		let payload = json!({
-			"input": {
-				"prompt": input.prompt
-			}
-		});
-
-		let response = self
-			.client
-			.post(&url)
-			.header("Authorization", format!("Bearer {api_key}"))
-			.header("Content-Type", "application/json")
-			.header("Prefer", "wait=60")
-			.json(&payload)
-			.send()
-			.await
-			.map_err(|e| ToolError::HttpError(format!("Replicate API request failed: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			let error_body = response.text().await.unwrap_or_default();
-			return Err(ToolError::HttpError(format!("Replicate API error {status}: {error_body}")));
+		if !matches!(provider.kind, ProviderKind::Openai | ProviderKind::Openrouter | ProviderKind::Google) {
+			return Err(ToolError::ExecutionFailed("Configured provider does not support image generation".to_string()));
 		}
-
-		let replicate_response: ReplicateResponse = response
-			.json()
-			.await
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to parse Replicate response: {e}")))?;
-
-		if let Some(error) = replicate_response.error {
-			return Err(ToolError::ExecutionFailed(error));
+		if !model.output_modalities.0.iter().any(|modality| modality.eq_ignore_ascii_case("IMAGE")) {
+			return Err(ToolError::ExecutionFailed("Configured model does not support image generation".to_string()));
 		}
-
-		let image_url = match replicate_response.output {
-			Some(Value::Array(arr)) => arr.first().and_then(|v| v.as_str()).map(String::from),
-			Some(Value::String(s)) => Some(s),
-			_ => None,
-		};
-
-		let image_url = image_url.ok_or_else(|| ToolError::ExecutionFailed("No image URL in Replicate response".to_string()))?;
-
-		Ok(json!(ImageResult {
-			success: true,
-			image_url: Some(image_url),
-			error: None,
-		}))
+		Ok((model, provider))
 	}
 
-	async fn edit_replicate(&self, input: &EditImageInput, api_key: &str, model: &str, ctx: &ToolContext) -> Result<Value, ToolError> {
-		let url = format!("{REPLICATE_API_BASE}/{model}/predictions");
-
-		let (image_bytes, mime_type) = self.download_image(&input.image_url, ctx).await?;
-		let image_b64 = BASE64.encode(&image_bytes);
-		let image_data_uri = format!("data:{mime_type};base64,{image_b64}");
-
-		let image_param = get_replicate_image_param(model);
-
-		let payload = json!({
-			"input": {
-				"prompt": input.prompt,
-				image_param: image_data_uri
+	async fn input_image(&self, value: &str, ctx: &ToolContext) -> Result<ImageInput, ToolError> {
+		if let Some(data) = value.strip_prefix("data:") {
+			let (metadata, encoded) = data.split_once(',').ok_or_else(|| ToolError::InvalidInput("Invalid image data URL".to_string()))?;
+			if !metadata.split(';').any(|part| part.eq_ignore_ascii_case("base64")) {
+				return Err(ToolError::InvalidInput("Image data URL must use base64".to_string()));
 			}
-		});
-
-		let response = self
-			.client
-			.post(&url)
-			.header("Authorization", format!("Bearer {api_key}"))
-			.header("Content-Type", "application/json")
-			.header("Prefer", "wait=60")
-			.json(&payload)
-			.send()
-			.await
-			.map_err(|e| ToolError::HttpError(format!("Replicate API request failed: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			let error_body = response.text().await.unwrap_or_default();
-			return Err(ToolError::HttpError(format!("Replicate API error {status}: {error_body}")));
+			let mime = metadata.split(';').next().unwrap_or_default().to_string();
+			let bytes = BASE64.decode(encoded).map_err(|error| ToolError::InvalidInput(format!("Invalid image data: {error}")))?;
+			let media_type = safe_image_mime(&bytes, &mime).ok_or_else(|| ToolError::InvalidInput("Unsupported image content".to_string()))?;
+			return Ok(ImageInput { bytes, media_type: media_type.to_string() });
 		}
 
-		let replicate_response: ReplicateResponse = response
-			.json()
-			.await
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to parse Replicate response: {e}")))?;
-
-		if let Some(error) = replicate_response.error {
-			return Err(ToolError::ExecutionFailed(error));
+		if let Some(id) = value.strip_prefix("/api/v1/images/") {
+			let db = ctx.db.as_ref().ok_or_else(|| ToolError::Internal("Database not available".to_string()))?;
+			let id = Uuid::parse_str(id).map_err(|_| ToolError::InvalidInput("Invalid image ID".to_string()))?;
+			let (bytes, mime) = crate::utils::images::get_image(db, id).await.map_err(ToolError::Internal)?.ok_or_else(|| ToolError::InvalidInput("Image not found".to_string()))?;
+			let media_type = safe_image_mime(&bytes, &mime).ok_or_else(|| ToolError::InvalidInput("Unsupported image content".to_string()))?;
+			return Ok(ImageInput { bytes, media_type: media_type.to_string() });
 		}
 
-		let image_url = match replicate_response.output {
-			Some(Value::Array(arr)) => arr.first().and_then(|v| v.as_str()).map(String::from),
-			Some(Value::String(s)) => Some(s),
-			_ => None,
-		};
-
-		let image_url = image_url.ok_or_else(|| ToolError::ExecutionFailed("No image URL in Replicate response".to_string()))?;
-
-		Ok(json!(ImageResult {
-			success: true,
-			image_url: Some(image_url),
-			error: None,
-		}))
-	}
-
-	async fn generate_google(&self, input: &GenerateImageInput, api_key: &str, model: &str) -> Result<Value, ToolError> {
-		let payload = json!({
-			"prompt": input.prompt,
-			"model": model,
-			"response_format": "b64_json",
-			"n": 1
-		});
-
-		let url = GOOGLE_GEMINI_GENERATIONS_URL;
-
-		let response = self
-			.client
-			.post(url)
-			.header("x-goog-api-key", api_key)
-			.header("Content-Type", "application/json")
-			.json(&payload)
-			.send()
-			.await
-			.map_err(|e| ToolError::HttpError(format!("Google API request failed: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			let error_body = response.text().await.unwrap_or_default();
-			return Err(ToolError::HttpError(format!("Google API error {status}: {error_body}")));
+		let fetch_error = || ToolError::HttpError("Failed to fetch image".to_string());
+		let url = Url::parse(value).map_err(|_| fetch_error())?;
+		if !matches!(url.scheme(), "http" | "https") || !url.username().is_empty() || url.password().is_some() {
+			return Err(fetch_error());
 		}
-
-		let google_response: OpenAIImageResponse = response
-			.json()
-			.await
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to parse Google response: {e}")))?;
-
-		let image_url = google_response
-			.data
-			.first()
-			.and_then(|d| d.url.clone().or_else(|| d.b64_json.clone().map(|b| format!("data:image/png;base64,{b}"))))
-			.ok_or_else(|| ToolError::ExecutionFailed("No image data in response".to_string()))?;
-
-		Ok(json!(ImageResult {
-			success: true,
-			image_url: Some(image_url),
-			error: None,
-		}))
-	}
-
-	async fn edit_google(&self, input: &EditImageInput, api_key: &str, model: &str, ctx: &ToolContext) -> Result<Value, ToolError> {
-		let url = format!("{GOOGLE_GEMINI_CONTENT_URL}/{model}:generateContent");
-
-		let (image_bytes, mime_type) = self.download_image(&input.image_url, ctx).await?;
-		let image_b64 = BASE64.encode(&image_bytes);
-
-		let payload = json!({
-			"contents": [{
-				"parts": [
-					{ "text": input.prompt },
-					{
-						"inline_data": {
-							"mime_type": mime_type,
-							"data": image_b64
-						}
-					}
-				]
-			}]
-		});
-
-		let response = self
-			.client
-			.post(&url)
-			.header("x-goog-api-key", api_key)
-			.header("Content-Type", "application/json")
-			.json(&payload)
-			.send()
-			.await
-			.map_err(|e| ToolError::HttpError(format!("Google API request failed: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			let error_body = response.text().await.unwrap_or_default();
-			return Err(ToolError::HttpError(format!("Google API error {status}: {error_body}")));
+		let host = url.host_str().ok_or_else(fetch_error)?.to_string();
+		let port = url.port_or_known_default().ok_or_else(fetch_error)?;
+		let addresses: Vec<_> = tokio::net::lookup_host((host.as_str(), port)).await.map_err(|_| fetch_error())?.collect();
+		if addresses.is_empty() || addresses.iter().any(|address| is_blocked_address(address.ip())) {
+			return Err(fetch_error());
 		}
-
-		let gemini_response: GeminiContentResponse = response
-			.json()
-			.await
-			.map_err(|e| ToolError::ExecutionFailed(format!("Failed to parse Google response: {e}")))?;
-
-		let candidates = gemini_response
-			.candidates
-			.ok_or_else(|| ToolError::ExecutionFailed("No candidates in response".to_string()))?;
-
-		let candidate = candidates
-			.first()
-			.ok_or_else(|| ToolError::ExecutionFailed("No candidates in response".to_string()))?;
-
-		if candidate.content.is_none() {
-			let finish_reason = candidate.finish_reason.as_deref().unwrap_or("UNKNOWN");
-			return Err(ToolError::ExecutionFailed(match finish_reason {
-				"SAFETY" => "Image generation blocked by safety filters".to_string(),
-				"RECITATION" => "Image generation blocked due to potential copyright issues".to_string(),
-				"PROHIBITED_CONTENT" => "Image generation blocked due to prohibited content".to_string(),
-				_ => format!("Image generation failed: {finish_reason}"),
-			}));
+		let client = Client::builder()
+			.timeout(Duration::from_secs(120))
+			.redirect(Policy::none())
+			.resolve(&host, addresses[0])
+			.build()
+			.map_err(|_| fetch_error())?;
+		let response = client.get(url).send().await.map_err(|_| fetch_error())?;
+		if !response.status().is_success() || response.remote_addr().is_some_and(|address| is_blocked_address(address.ip())) {
+			return Err(fetch_error());
 		}
-
-		let content = candidate
-			.content
-			.as_ref()
-			.ok_or_else(|| ToolError::ExecutionFailed("No content in response".to_string()))?;
-		let image_data = content
-			.parts
-			.iter()
-			.find_map(|p| p.inline_data.as_ref())
-			.ok_or_else(|| ToolError::ExecutionFailed("No image data in response".to_string()))?;
-
-		let image_url = format!("data:{};base64,{}", image_data.mime_type, image_data.data);
-
-		Ok(json!(ImageResult {
-			success: true,
-			image_url: Some(image_url),
-			error: None,
-		}))
-	}
-
-	async fn download_image(&self, url: &str, ctx: &ToolContext) -> Result<(Vec<u8>, String), ToolError> {
-		if url.starts_with("data:") {
-			let mut parts = url.splitn(2, ',');
-			let meta = parts.next().unwrap_or_default();
-			let data_part = parts.next().ok_or_else(|| ToolError::InvalidInput("Invalid data URL format".to_string()))?;
-			let mime_type = meta
-				.strip_prefix("data:")
-				.and_then(|value| value.split(';').next())
-				.filter(|value| !value.is_empty())
-				.unwrap_or("application/octet-stream")
-				.to_string();
-			let bytes = BASE64
-				.decode(data_part)
-				.map_err(|e| ToolError::InvalidInput(format!("Failed to decode base64: {e}")))?;
-			return Ok((bytes, mime_type));
+		if response.content_length().is_some_and(|length| length > MAX_REMOTE_IMAGE_BYTES as u64) {
+			return Err(fetch_error());
 		}
-
-		if let Some(id_str) = url.strip_prefix("/api/v1/images/") {
-			let db = ctx.db.as_ref().ok_or_else(|| ToolError::Internal("Database not available".to_string()))?;
-			let id = uuid::Uuid::parse_str(id_str).map_err(|e| ToolError::InvalidInput(format!("Invalid image ID: {e}")))?;
-			let (data, mime) = crate::utils::images::get_image(db, id)
-				.await
-				.map_err(|e| ToolError::Internal(format!("Failed to fetch image: {e}")))?
-				.ok_or_else(|| ToolError::InvalidInput("Image not found".to_string()))?;
-			let mime_type = if mime.is_empty() { "application/octet-stream".to_string() } else { mime };
-			return Ok((data, mime_type));
+		let mime = response.headers().get(CONTENT_TYPE).and_then(|value| value.to_str().ok()).and_then(|value| value.split(';').next()).unwrap_or_default().to_string();
+		let mut bytes = Vec::with_capacity(response.content_length().unwrap_or(0).min(MAX_REMOTE_IMAGE_BYTES as u64) as usize);
+		let mut stream = response.bytes_stream();
+		while let Some(chunk) = stream.next().await {
+			let chunk = chunk.map_err(|_| fetch_error())?;
+			if bytes.len().saturating_add(chunk.len()) > MAX_REMOTE_IMAGE_BYTES {
+				return Err(fetch_error());
+			}
+			bytes.extend_from_slice(&chunk);
 		}
+		let media_type = safe_image_mime(&bytes, &mime).ok_or_else(fetch_error)?;
+		Ok(ImageInput { bytes, media_type: media_type.to_string() })
+	}
 
-		let response = self
-			.client
-			.get(url)
-			.send()
-			.await
-			.map_err(|e| ToolError::HttpError(format!("Failed to download image: {e}")))?;
-
-		let status = response.status();
-		if !status.is_success() {
-			return Err(ToolError::HttpError(format!("Failed to download image: HTTP {status}")));
+	async fn record_usage(&self, ctx: &ToolContext, model: &Model, usage: &omniference::types::ImageUsage) {
+		let Some(db) = ctx.db.as_ref() else { return };
+		let Some(user_id) = ctx.user_id else { return };
+		let input_tokens = usage.input_tokens.min(i32::MAX as u64) as i32;
+		let output_tokens = usage.output_tokens.min(i32::MAX as u64) as i32;
+		let cost_total = if let Some(cost) = usage.provider_cost {
+			Decimal::from_f64(cost).unwrap_or(Decimal::ZERO)
+		} else {
+			match ModelPricing::usage_cost(db, &model.id, input_tokens, output_tokens, 0).await {
+				Ok(Some(cost)) => cost,
+				_ => Decimal::ZERO,
+			}
+		};
+		let team_id = Budget::primary_team_id(db, &user_id).await.ok().flatten();
+		if let Err(error) = UsageEvent::record(
+			db,
+			UsageEventRecord {
+				user_id: &user_id,
+				team_id,
+				model_id: &model.id,
+				provider_id: &model.provider_id,
+				request_type: "image",
+				input_tokens,
+				output_tokens,
+				reasoning_tokens: 0,
+				cost_total,
+			},
+		)
+		.await
+		{
+			tracing::error!(%error, "Failed to record image generation usage event");
 		}
-
-		let header_mime = response
-			.headers()
-			.get(CONTENT_TYPE)
-			.and_then(|value| value.to_str().ok())
-			.and_then(|value| value.split(';').next())
-			.map(|value| value.to_string());
-
-		let bytes = response
-			.bytes()
-			.await
-			.map(|b| b.to_vec())
-			.map_err(|e| ToolError::HttpError(format!("Failed to read image bytes: {e}")))?;
-
-		let detected_mime = infer::get(&bytes).map(|kind| kind.mime_type().to_string());
-		let mime_type = header_mime.or(detected_mime).unwrap_or_else(|| "application/octet-stream".to_string());
-
-		Ok((bytes, mime_type))
 	}
-}
 
-fn get_replicate_image_param(model: &str) -> &'static str {
-	let model_lower = model.to_lowercase();
-	if model_lower.contains("nano-banana") {
-		"image_input"
-	} else if model_lower.contains("flux-redux") {
-		"redux_image"
-	} else if model_lower.contains("flux-kontext") {
-		"input_image"
-	} else {
-		"image"
+	async fn store_response(&self, response: ImageResponse, ctx: &ToolContext, caption: &str) -> Result<Value, ToolError> {
+		let db = ctx.db.as_ref().ok_or_else(|| ToolError::Internal("Database not available".to_string()))?;
+		let image = response.images.into_iter().next().ok_or_else(|| ToolError::ExecutionFailed("Image provider returned no images".to_string()))?;
+		let mime = safe_image_mime(&image.bytes, &image.media_type).ok_or_else(|| ToolError::ExecutionFailed("Image provider returned unsupported image content".to_string()))?;
+		let stored = store_image(db, &image.bytes, mime, ctx.user_id, Some("imagegen")).await.map_err(ToolError::Internal)?;
+		if !caption.is_empty() {
+			if let Err(error) = crate::utils::images::set_image_caption(db, stored.id, caption).await {
+				tracing::error!(image_id = %stored.id, %error, "Failed to store image caption");
+			}
+		}
+		Ok(json!({"success": true, "image_id": stored.id, "image_is_shown_to_user": true, "show_image_with_markdown_in_chat": false}))
 	}
 }
 
 #[async_trait]
 impl ToolExecutor for ImageGenExecutor {
 	async fn execute(&self, input: Value, ctx: &ToolContext) -> Result<Value, ToolError> {
-		let function = match ctx.function_name.as_deref() {
-			Some("generate") | Some("imagegen") | None => "generate",
-			Some("edit") => "edit",
-			Some(other) => return Err(ToolError::ExecutionFailed(format!("Unknown function: {other}"))),
+		let model_id = ctx.settings.get("image_model_id").and_then(Value::as_str).ok_or_else(|| ToolError::MissingSetting("image_model_id".to_string()))?;
+		let operation = match ctx.function_name.as_deref() {
+			None | Some("generate" | "imagegen") => ImageOperation::Generate,
+			Some("edit") => ImageOperation::Edit,
+			Some(other) => return Err(ToolError::InvalidInput(format!("Unknown image operation: {other}"))),
 		};
-
-		let api_key = ctx
-			.settings
-			.get("api_key")
-			.and_then(Value::as_str)
-			.ok_or_else(|| ToolError::MissingSetting("api_key".to_string()))?;
-
-		let provider = ctx.settings.get("provider").and_then(Value::as_str).unwrap_or("openai");
-
-		let model = ctx.settings.get("model").and_then(Value::as_str).unwrap_or_else(|| match provider {
-			"openai" => "dall-e-3",
-			"google" => "imagen-3.0-generate-002",
-			_ => "black-forest-labs/flux-schnell",
-		});
-
-		let result = match (function, provider) {
-			("generate", "openai") => {
-				let gen_input: GenerateImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.generate_openai(&gen_input, api_key, model).await?
-			}
-			("generate", "replicate") => {
-				let gen_input: GenerateImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.generate_replicate(&gen_input, api_key, model).await?
-			}
-			("generate", "google") => {
-				let gen_input: GenerateImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.generate_google(&gen_input, api_key, model).await?
-			}
-			("edit", "openai") => {
-				let edit_input: EditImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.edit_openai(&edit_input, api_key, model, ctx).await?
-			}
-			("edit", "replicate") => {
-				let edit_input: EditImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.edit_replicate(&edit_input, api_key, model, ctx).await?
-			}
-			("edit", "google") => {
-				let edit_input: EditImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.edit_google(&edit_input, api_key, model, ctx).await?
+		let (model, provider) = self.load_model(model_id, ctx).await?;
+		if operation == ImageOperation::Edit && !model.capabilities.0.iter().any(|capability| capability == "IMAGE_EDITING") {
+			return Err(ToolError::ExecutionFailed("Configured model does not support image editing".to_string()));
+		}
+		let (prompt, input_images, options) = match operation {
+			ImageOperation::Generate => {
+				let input: GenerateImageInput = serde_json::from_value(input).map_err(|error| ToolError::InvalidInput(error.to_string()))?;
+				(input.prompt, Vec::new(), ImageOptions { size: input.size, quality: input.quality, ..ImageOptions::default() })
 			}
-			_ => {
-				let gen_input: GenerateImageInput = serde_json::from_value(input).map_err(|e| ToolError::InvalidInput(format!("Invalid input: {e}")))?;
-				self.generate_openai(&gen_input, api_key, model).await?
+			ImageOperation::Edit => {
+				let input: EditImageInput = serde_json::from_value(input).map_err(|error| ToolError::InvalidInput(error.to_string()))?;
+				let reference = if let Some(id) = input.image_id.as_deref().map(str::trim).filter(|value| !value.is_empty()) {
+					format!("/api/v1/images/{id}")
+				} else if let Some(url) = input.image_url.as_deref().map(str::trim).filter(|value| !value.is_empty()) {
+					url.to_string()
+				} else {
+					return Err(ToolError::InvalidInput("Provide image_id (preferred) or image_url of the image to edit".to_string()));
+				};
+				(input.prompt, vec![self.input_image(&reference, ctx).await?], ImageOptions::default())
 			}
 		};
-
-		// Process image URLs in the result - upload data URIs to CDN
-		if let Some(image_url_val) = result.get("image_url").and_then(|v| v.as_str()) {
-			let processed_url = self.process_image_url(image_url_val.to_string(), ctx).await;
-			if let Some(mut result_obj) = result.as_object().cloned() {
-				result_obj.insert("image_url".to_string(), Value::String(processed_url.clone()));
-				result_obj.insert(
-					"message".to_string(),
-					Value::String(format!(
-						"Image was successfully generated and uploaded to the CDN, you can show the image by using the following markdown: ![]({}). No other action is needed.",
-						processed_url
-					)),
-				);
-				return Ok(Value::Object(result_obj));
-			}
-		}
-
-		Ok(result)
+		let caption = prompt.clone();
+		let request = ImageRequestIR {
+			model: ModelRef { alias: model.display_name.clone(), provider: provider_to_config(&provider), model_id: model.model_id.clone(), input_modalities: Vec::new(), output_modalities: Vec::new() },
+			operation,
+			prompt,
+			request_id: None,
+			input_images,
+			options,
+		};
+		let engine = crate::ai::get();
+		let response = engine.read().await.image(request).await.map_err(ToolError::ExecutionFailed)?;
+		self.record_usage(ctx, &model, &response.usage).await;
+		self.store_response(response, ctx, &caption).await
 	}
 
-	fn name(&self) -> &str {
-		"imagegen"
-	}
+	fn name(&self) -> &str { "imagegen" }
 }