Memory refinement

README.md

@@ -186,7 +186,7 @@ console.log(chunks);
 
 // Manually compile history into memories at end of conversation
 // Happens automatically when coverstaions are compressed
-await ai.language.updateMemory(history, memory);
+await ai.language.memorize(history, memory);
 
 // Summarize text
 const summary = await ai.language.summarize(longText, 200);

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@ztimson/ai-utils",
-	"version": "1.0.6",
+	"version": "1.2.6",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@ztimson/ai-utils",
-			"version": "1.0.6",
+			"version": "1.2.6",
 			"license": "MIT",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.102.0",
@@ -57,34 +57,38 @@
 			}
 		},
 		"node_modules/@emnapi/core": {
-			"version": "1.11.1",
+			"version": "2.0.0-alpha.3",
-			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
+			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-2.0.0-alpha.3.tgz",
-			"integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
+			"integrity": "sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
+			"peer": true,
 			"dependencies": {
-				"@emnapi/wasi-threads": "1.2.2",
+				"@emnapi/wasi-threads": "2.0.1",
 				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/@emnapi/runtime": {
-			"version": "1.11.2",
+			"version": "2.0.0-alpha.3",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz",
+			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-2.0.0-alpha.3.tgz",
-			"integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==",
+			"integrity": "sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA==",
+			"dev": true,
 			"license": "MIT",
 			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/@emnapi/wasi-threads": {
-			"version": "1.2.2",
+			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-2.0.1.tgz",
-			"integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
+			"integrity": "sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"tslib": "^2.4.0"
 			}
@@ -573,6 +577,16 @@
 				"url": "https://opencollective.com/libvips"
 			}
 		},
+		"node_modules/@img/sharp-wasm32/node_modules/@emnapi/runtime": {
+			"version": "1.11.3",
+			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
+			"integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@img/sharp-win32-arm64": {
 			"version": "0.34.5",
 			"resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz",
@@ -681,22 +695,25 @@
 			}
 		},
 		"node_modules/@napi-rs/wasm-runtime": {
-			"version": "1.1.6",
+			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
+			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.2.0.tgz",
-			"integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
+			"integrity": "sha512-kDoONqMa+VnZ4vvvu/ZUurpJ4gkZU57e7g69qpNgWhYcZFPUHZM2CEMKm+cG6ufDVALbjMvfmMjFVqaK7uEMnA==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
 				"@tybys/wasm-util": "^0.10.3"
 			},
+			"engines": {
+				"node": "^20.19.0 || ^22.13.0 || >=23.5.0"
+			},
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/Brooooooklyn"
 			},
 			"peerDependencies": {
-				"@emnapi/core": "^1.7.1",
+				"@emnapi/core": "^2.0.0-alpha.3",
-				"@emnapi/runtime": "^1.7.1"
+				"@emnapi/runtime": "^2.0.0-alpha.3"
 			}
 		},
 		"node_modules/@oxc-project/types": {
@@ -1007,6 +1024,18 @@
 				"node": "^20.19.0 || >=22.12.0"
 			}
 		},
+		"node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
+			"integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@emnapi/wasi-threads": "1.2.2",
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": {
 			"version": "1.11.1",
 			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
@@ -1018,6 +1047,17 @@
 				"tslib": "^2.4.0"
 			}
 		},
+		"node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
+			"integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@rolldown/binding-win32-arm64-msvc": {
 			"version": "1.1.5",
 			"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.5.tgz",
@@ -1408,18 +1448,18 @@
 			"license": "MIT"
 		},
 		"node_modules/@ztimson/utils": {
-			"version": "0.29.5",
+			"version": "0.29.7",
-			"resolved": "https://registry.npmjs.org/@ztimson/utils/-/utils-0.29.5.tgz",
+			"resolved": "https://registry.npmjs.org/@ztimson/utils/-/utils-0.29.7.tgz",
-			"integrity": "sha512-8mUuhi//3agwrueR006emOvJu1JXxVEryJmD3nkEmK4yQ9qS24oZijdoaiLRid/6xc75j3Fk6YjmnYmjq61iPQ==",
+			"integrity": "sha512-cjQ9+RjC5X7gKNA/hJHDf7OtyYCa+5E0PDc76lIaATwNAxXCSx2IO9r2wHiHtZGV5bldjnFmw7aOV8Jmq7SgKQ==",
 			"license": "MIT",
 			"dependencies": {
 				"var-persist": "^1.0.1"
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.17.0",
+			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
-			"integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
+			"integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -1504,9 +1544,9 @@
 			"license": "MIT"
 		},
 		"node_modules/brace-expansion": {
-			"version": "2.1.2",
+			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.3.tgz",
-			"integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==",
+			"integrity": "sha512-DRdx5neNsG/QXbniLFWi2YmC/68oeOOmKz6zOjVk6ZS1ZLXgLIKqVEc6hWsmkjBbgii0SwaBTcJ5XKj5gzY/4A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2009,9 +2049,9 @@
 			"license": "MIT"
 		},
 		"node_modules/exsolve": {
-			"version": "1.1.0",
+			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.1.tgz",
-			"integrity": "sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==",
+			"integrity": "sha512-9U/jZUgjnSGyntRr6y5Muu1MJcwFl6kPu7k8qLF0IMNfLqvw0NZ4nnVDq0RVoZ0RvCyumib4Ez3KYrVfilrw+g==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -2382,9 +2422,9 @@
 			"license": "MIT"
 		},
 		"node_modules/lightningcss": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
-			"integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+			"integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
 			"dev": true,
 			"license": "MPL-2.0",
 			"dependencies": {
@@ -2398,23 +2438,23 @@
 				"url": "https://opencollective.com/parcel"
 			},
 			"optionalDependencies": {
-				"lightningcss-android-arm64": "1.32.0",
+				"lightningcss-android-arm64": "1.33.0",
-				"lightningcss-darwin-arm64": "1.32.0",
+				"lightningcss-darwin-arm64": "1.33.0",
-				"lightningcss-darwin-x64": "1.32.0",
+				"lightningcss-darwin-x64": "1.33.0",
-				"lightningcss-freebsd-x64": "1.32.0",
+				"lightningcss-freebsd-x64": "1.33.0",
-				"lightningcss-linux-arm-gnueabihf": "1.32.0",
+				"lightningcss-linux-arm-gnueabihf": "1.33.0",
-				"lightningcss-linux-arm64-gnu": "1.32.0",
+				"lightningcss-linux-arm64-gnu": "1.33.0",
-				"lightningcss-linux-arm64-musl": "1.32.0",
+				"lightningcss-linux-arm64-musl": "1.33.0",
-				"lightningcss-linux-x64-gnu": "1.32.0",
+				"lightningcss-linux-x64-gnu": "1.33.0",
-				"lightningcss-linux-x64-musl": "1.32.0",
+				"lightningcss-linux-x64-musl": "1.33.0",
-				"lightningcss-win32-arm64-msvc": "1.32.0",
+				"lightningcss-win32-arm64-msvc": "1.33.0",
-				"lightningcss-win32-x64-msvc": "1.32.0"
+				"lightningcss-win32-x64-msvc": "1.33.0"
 			}
 		},
 		"node_modules/lightningcss-android-arm64": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz",
-			"integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+			"integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
 			"cpu": [
 				"arm64"
 			],
@@ -2433,9 +2473,9 @@
 			}
 		},
 		"node_modules/lightningcss-darwin-arm64": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz",
-			"integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+			"integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
 			"cpu": [
 				"arm64"
 			],
@@ -2454,9 +2494,9 @@
 			}
 		},
 		"node_modules/lightningcss-darwin-x64": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz",
-			"integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
+			"integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
 			"cpu": [
 				"x64"
 			],
@@ -2475,9 +2515,9 @@
 			}
 		},
 		"node_modules/lightningcss-freebsd-x64": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz",
-			"integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
+			"integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
 			"cpu": [
 				"x64"
 			],
@@ -2496,9 +2536,9 @@
 			}
 		},
 		"node_modules/lightningcss-linux-arm-gnueabihf": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz",
-			"integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
+			"integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
 			"cpu": [
 				"arm"
 			],
@@ -2517,9 +2557,9 @@
 			}
 		},
 		"node_modules/lightningcss-linux-arm64-gnu": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz",
-			"integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
+			"integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
 			"cpu": [
 				"arm64"
 			],
@@ -2541,9 +2581,9 @@
 			}
 		},
 		"node_modules/lightningcss-linux-arm64-musl": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz",
-			"integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
+			"integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -2565,9 +2605,9 @@
 			}
 		},
 		"node_modules/lightningcss-linux-x64-gnu": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz",
-			"integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
+			"integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
 			"cpu": [
 				"x64"
 			],
@@ -2589,9 +2629,9 @@
 			}
 		},
 		"node_modules/lightningcss-linux-x64-musl": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz",
-			"integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
+			"integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
 			"cpu": [
 				"x64"
 			],
@@ -2613,9 +2653,9 @@
 			}
 		},
 		"node_modules/lightningcss-win32-arm64-msvc": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz",
-			"integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
+			"integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
 			"cpu": [
 				"arm64"
 			],
@@ -2634,9 +2674,9 @@
 			}
 		},
 		"node_modules/lightningcss-win32-x64-msvc": {
-			"version": "1.32.0",
+			"version": "1.33.0",
-			"resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+			"resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
-			"integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
+			"integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
 			"cpu": [
 				"x64"
 			],
@@ -2794,9 +2834,9 @@
 			}
 		},
 		"node_modules/mdurl": {
-			"version": "2.0.0",
+			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.1.0.tgz",
-			"integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+			"integrity": "sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -2971,9 +3011,9 @@
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
-			"version": "3.3.15",
+			"version": "3.3.16",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
-			"integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+			"integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
 			"dev": true,
 			"funding": [
 				{
@@ -3092,9 +3132,9 @@
 			"license": "MIT"
 		},
 		"node_modules/openai": {
-			"version": "6.46.0",
+			"version": "6.49.0",
-			"resolved": "https://registry.npmjs.org/openai/-/openai-6.46.0.tgz",
+			"resolved": "https://registry.npmjs.org/openai/-/openai-6.49.0.tgz",
-			"integrity": "sha512-DFg6jEPT2RO+oAyXtddeUJU8zkGy1OQ1AjGzNIJUMQG03TTqvCpy9tBpQ+2VVVnvrl3E56F8GEin2JYtWpITtA==",
+			"integrity": "sha512-aYCc0C6L864eR6WSYIwQGyXriw/nIyZx0ObvhzOEVuk0zoBDpynjSbrionWI7q65B5H8jJX0DXR9snEzM6bfPg==",
 			"license": "Apache-2.0",
 			"peerDependencies": {
 				"@aws-sdk/credential-provider-node": ">=3.972.0 <4",
@@ -3232,9 +3272,9 @@
 			"license": "MIT"
 		},
 		"node_modules/postcss": {
-			"version": "8.5.17",
+			"version": "8.5.25",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.17.tgz",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz",
-			"integrity": "sha512-J7EF+8X+CzRPaJPOv9Ck2wNWJvGnnl3PcNPAdGg6GTLjyVpyQ0yATMSXRFRV01BviT/9Gwuc3rjEyJbDJG9a4w==",
+			"integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==",
 			"dev": true,
 			"funding": [
 				{
@@ -3252,7 +3292,7 @@
 			],
 			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.12",
+				"nanoid": "^3.3.16",
 				"picocolors": "^1.1.1",
 				"source-map-js": "^1.2.1"
 			},
@@ -3787,9 +3827,9 @@
 			"license": "MIT"
 		},
 		"node_modules/undici": {
-			"version": "7.28.0",
+			"version": "7.29.0",
-			"resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz",
+			"resolved": "https://registry.npmjs.org/undici/-/undici-7.29.0.tgz",
-			"integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==",
+			"integrity": "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=20.18.1"
@@ -3981,16 +4021,16 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "8.1.4",
+			"version": "8.1.5",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.4.tgz",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.5.tgz",
-			"integrity": "sha512-bTT9PsdWO+MQMNG9ZXIP/qM9wGh37DFxTV/sPq9cFpHr3w4jkgef032PkAL9jAqhk3Nz8NQw3O8n6/xFkqO4QQ==",
+			"integrity": "sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"lightningcss": "^1.32.0",
 				"picomatch": "^4.0.5",
-				"postcss": "^8.5.16",
+				"postcss": "^8.5.17",
-				"rolldown": "~1.1.4",
+				"rolldown": "~1.1.5",
 				"tinyglobby": "^0.2.17"
 			},
 			"bin": {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/ai-utils",
-	"version": "1.2.2",
+	"version": "1.4.5",
 	"description": "AI Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/antrhopic.ts

@@ -1,58 +1,52 @@
 import {Anthropic as anthropic} from '@anthropic-ai/sdk';
-import {findByProp, objectMap, JSONSanitize, JSONAttemptParse} from '@ztimson/utils';
+import {findByProp, objectMap, JSONSanitize, JSONAttemptParse, makeArray} from '@ztimson/utils';
 import {AbortablePromise, Ai} from './ai.ts';
 import {LLMMessage, LLMRequest} from './llm.ts';
 import {LLMProvider} from './provider.ts';
+import {TokenPool} from './token-pool.ts';
 import {convertSchema} from './tools.ts';
 
 export class Anthropic extends LLMProvider {
-	client!: anthropic;
+	private clients = new Map<string, anthropic>();
+	tokenPool!: TokenPool;
 
-	constructor(public readonly ai: Ai, public readonly apiToken: string, public model: string) {
+	constructor(public readonly ai: Ai, public readonly apiToken: string | string[], public model: string) {
 		super();
-		this.client = new anthropic({apiKey: apiToken});
+		this.tokenPool = new TokenPool(...makeArray(apiToken).filter(Boolean));
 	}
 
-	private toStandard(history: any[]): LLMMessage[] {
+	private getClient(token: string): anthropic {
-		const timestamp = Date.now();
+		let client = this.clients.get(token);
-		const messages: LLMMessage[] = [];
+		if(!client) {
-		for(let h of history) {
+			client = new anthropic({apiKey: token});
-			if(typeof h.content == 'string') {
+			this.clients.set(token, client);
-				messages.push(<any>{timestamp, ...h});
-			} else {
-				const textContent = h.content?.filter((c: any) => c.type == 'text').map((c: any) => c.text).join('\n\n');
-				if(textContent) messages.push({timestamp, role: h.role, content: textContent});
-				h.content.forEach((c: any) => {
-					if(c.type == 'tool_use') {
-						messages.push({timestamp, role: 'tool', id: c.id, name: c.name, args: c.input, content: undefined});
-					} else if(c.type == 'tool_result') {
-						const m: any = messages.findLast(m => (<any>m).id == c.tool_use_id);
-						if(m) m[c.is_error ? 'error' : 'content'] = c.content;
 		}
-				});
+		return client;
-			}
-		}
-		return messages;
 	}
 
-	private fromStandard(history: LLMMessage[]): any[] {
+	/** Convert standard history -> Anthropic wire format */
-		for(let i = 0; i < history.length; i++) {
+	private toWire(history: LLMMessage[]): any[] {
-			if(history[i].role == 'tool') {
+		const wire: any[] = [];
-				const h: any = history[i];
+		for(const h of history) {
-				history.splice(i, 1,
+			if(h.role === 'tool') {
+				wire.push(
 					{role: 'assistant', content: [{type: 'tool_use', id: h.id, name: h.name, input: h.args}]},
-					{role: 'user', content: [{type: 'tool_result', tool_use_id: h.id, is_error: !!h.error, content:  h.error || h.content}]}
+					{role: 'user', content: [{type: 'tool_result', tool_use_id: h.id, is_error: !!h.error, content: h.error || h.content || ''}]}
-				)
+				);
-				i++;
+			} else {
+				wire.push({role: h.role, content: h.content});
 			}
 		}
-		return history.map(({timestamp, ...h}) => h);
+		return wire;
 	}
 
 	ask(message: string, options: LLMRequest = {}): AbortablePromise<string | any> {
 		const controller = new AbortController();
-		return Object.assign(new Promise<any>(async (res) => {
+		return Object.assign(new Promise<any>(async (res, rej) => {
-			let history = this.fromStandard([...options.history || [], {role: 'user', content: message, timestamp: Date.now()}]);
+			if(!options.history) options.history = [];
+			const history = options.history;
+			if(message) history.push({role: 'user', content: message, timestamp: Date.now()});
+
 			const tools = options.tools || this.ai.options.llm?.tools || [];
 			const requestParams: any = {
 				model: options.model || this.model,
@@ -66,90 +60,97 @@ export class Anthropic extends LLMProvider {
 						type: 'object',
 						properties: t.args ? objectMap(t.args, (key, value) => ({...value, required: undefined})) : {},
 						required: t.args ? Object.entries(t.args).filter(t => t[1].required).map(t => t[0]) : []
-					},
+					}
-					fn: undefined
 				})),
-				messages: history,
 				stream: !!options.stream,
 			};
 
-			// Add structured output support
 			if(options.schema) {
-				requestParams.output_config = {
+				requestParams.output_config = {format: {type: 'json_schema', schema: convertSchema(options.schema)}};
-					format: {
-						type: 'json_schema',
-						schema: convertSchema(options.schema)
-					}
-				};
 			}
 
-			let resp: any, isFirstMessage = true;
+			try {
+				let terminal = false;
 				do {
-				resp = await this.client.messages.create(requestParams).catch(err => {
+					requestParams.messages = this.toWire(history.filter(h => h.role !== 'system'));
-					err.message += `\n\nMessages:\n${JSON.stringify(history, null, 2)}`;
+
+					const callStart = Date.now();
+					const resp: any = await this.tokenPool.run(token => this.getClient(token).messages.create(requestParams)).catch(err => {
+						err.message += `\n\nMessages:\n${JSON.stringify(requestParams.messages, null, 2)}`;
 						throw err;
 					});
 
-				// Streaming mode
+					let usage: any, content: any[] = [];
 					if(options.stream) {
-					if(!isFirstMessage) options.stream({text: '\n\n'});
-					else isFirstMessage = false;
-					resp.content = [];
 						for await (const chunk of resp) {
 							if(controller.signal.aborted) break;
 							if(chunk.type === 'content_block_start') {
-							if(chunk.content_block.type === 'text') {
+								if(chunk.content_block.type === 'text') content.push({type: 'text', text: ''});
-								resp.content.push({type: 'text', text: ''});
+								else if(chunk.content_block.type === 'tool_use') content.push({type: 'tool_use', id: chunk.content_block.id, name: chunk.content_block.name, input: ''});
-							} else if(chunk.content_block.type === 'tool_use') {
-								resp.content.push({type: 'tool_use', id: chunk.content_block.id, name: chunk.content_block.name, input: <any>''});
-							}
 							} else if(chunk.type === 'content_block_delta') {
 								if(chunk.delta.type === 'text_delta') {
-								const text = chunk.delta.text;
+									content.at(-1).text += chunk.delta.text;
-								resp.content.at(-1).text += text;
+									options.stream({text: chunk.delta.text});
-								options.stream({text});
 								} else if(chunk.delta.type === 'input_json_delta') {
-								resp.content.at(-1).input += chunk.delta.partial_json;
+									content.at(-1).input += chunk.delta.partial_json;
 								}
 							} else if(chunk.type === 'content_block_stop') {
-							const last = resp.content.at(-1);
+								const last = content.at(-1);
-							if(last.input != null) last.input = last.input ? JSONAttemptParse(last.input, {}) : {};
+								if(last?.type === 'tool_use') last.input = last.input ? JSONAttemptParse(last.input, {}) : {};
+							} else if(chunk.type === 'message_delta') {
+								if(chunk.usage) usage = chunk.usage;
 							} else if(chunk.type === 'message_stop') {
 								break;
 							}
 						}
+					} else {
+						usage = resp.usage;
+						content = resp.content;
 					}
+					const duration = Date.now() - callStart;
+					const tps = usage?.output_tokens && duration > 0 ? usage.output_tokens / (duration / 1000) : 0;
 
-				// Run tools
+					const toolCalls = content.filter((c: any) => c.type === 'tool_use');
-				const toolCalls = resp.content.filter((c: any) => c.type === 'tool_use');
 					if(toolCalls.length && !controller.signal.aborted) {
-					history.push({role: 'assistant', content: resp.content});
+						const text = content.filter((c: any) => c.type === 'text').map((c: any) => c.text).join('\n\n').trim();
-					const results = await Promise.all(toolCalls.map(async (toolCall: any) => {
+						if(text) history.push({role: 'assistant', content: text, timestamp: Date.now(), duration, tps});
-						const tool = tools.find(findByProp('name', toolCall.name));
+
-						if(options.stream) options.stream({tool: toolCall.name});
+						const entries = toolCalls.map((tc: any) => {
-						if(!tool) return {tool_use_id: toolCall.id, is_error: true, content: 'Tool not found'};
+							const entry: any = {role: 'tool', id: tc.id, name: tc.name, args: tc.input, content: undefined, timestamp: Date.now()};
+							history.push(entry);
+							return {tc, entry};
+						});
+
+						await Promise.all(entries.map(async ({tc, entry}: any) => {
+							const tool = tools.find(findByProp('name', tc.name));
+							if(options.stream) options.stream({tool: tc.name});
+							if(!tool) { entry.error = 'Tool not found'; return; }
 							try {
-							const result = await tool.fn(toolCall.input, options?.stream, this.ai);
+								const toolStream = options.stream && ((chunk: any) => {
-							return {type: 'tool_result', tool_use_id: toolCall.id, content: typeof result == 'object' ? JSONSanitize(result) : result};
+									if(chunk.done) { terminal = true; return; }
-						} catch (err: any) {
+									options.stream!(chunk);
-							return {type: 'tool_result', tool_use_id: toolCall.id, is_error: true, content: err?.message || err?.toString() || 'Unknown'};
+								});
+								const result = await tool.fn(entry.args, toolStream, this.ai, tc.id);
+								entry.content = typeof result === 'object' ? JSONSanitize(result) : result;
+							} catch(err: any) {
+								entry.error = err?.message || err?.toString() || 'Unknown';
 							}
 						}));
-					history.push({role: 'user', content: results});
+					} else {
-					requestParams.messages = history;
+						terminal = true;
+						const text = content.filter((c: any) => c.type === 'text').map((c: any) => c.text).join('\n\n').trim();
+						if(text) history.push({role: 'assistant', content: text, timestamp: Date.now(), duration, tps});
 					}
-			} while (!controller.signal.aborted && resp.content.some((c: any) => c.type === 'tool_use'));
+				} while(!terminal && !controller.signal.aborted);
-
-			const textContent = resp.content.filter((c: any) => c.type == 'text').map((c: any) => c.text).join('\n\n');
-			history.push({role: 'assistant', content: textContent});
-			history = this.toStandard(history);
 
 				if(options.stream) options.stream({done: true});
-			if(options.history) options.history.splice(0, options.history.length, ...history);
 
-			// Return parsed JSON if schema provided
+				const turnStart = history.map(h => h.role).lastIndexOf('user');
-			const finalContent = history.at(-1)?.content;
+				const finalContent = history.slice(turnStart + 1).reduce((str, h) => h.role === 'assistant' ? str + (h.content || '') : str, '').trim();
 				res(options.schema ? JSONAttemptParse(finalContent, finalContent) : finalContent);
+			} catch(err) {
+				rej(err);
+			}
 		}), {abort: () => controller.abort()});
 	}
 }

src/helpers.ts

@@ -0,0 +1,85 @@
+import {Memory, MemoryCache} from './memory.ts';
+
+export type MemoryNode = {
+	name: string;
+	missing: boolean;
+	links: string[];
+	backlinks: string[];
+}
+
+export function extractLinks(content: string): string[] {
+	if (!content) return [];
+	const matches = content.matchAll(/\[\[([^\]|]+)(?:\|[^\]]*)?\]\]/g);
+	return [...new Set([...matches].map(m => m[1].trim()))];
+}
+
+export function rebuildGraph(memories: Memory[] | MemoryCache): MemoryNode[] {
+	const mems = memories instanceof MemoryCache ? memories.memories : memories;
+	const nameSet = new Set(mems.map(m => m.name));
+
+	for (const m of mems) m.links = extractLinks(m.content).filter(l => l !== m.name);
+	for (const m of mems) m.backlinks = [];
+	for (const m of mems) {
+		for (const link of m.links) {
+			const target = mems.find(t => t.name === link);
+			if (target) target.backlinks.push(m.name);
+		}
+	}
+
+	const nodes: MemoryNode[] = mems.map(m => ({
+		name: m.name,
+		missing: false,
+		links: m.links,
+		backlinks: m.backlinks,
+	}));
+
+	const ghosts = new Set<string>();
+	for (const node of nodes) {
+		for (const link of node.links) {
+			if (!nameSet.has(link)) ghosts.add(link);
+		}
+	}
+
+	return [
+		...nodes,
+		...[...ghosts].map(name => ({
+			name,
+			missing: true,
+			links: [],
+			backlinks: nodes.filter(n => n.links.includes(name)).map(n => n.name),
+		})),
+	];
+}
+
+export function renderMemoryGraph(nodes: MemoryNode[]): string {
+	if (!nodes.length) return 'No memories yet.';
+
+	const groups = new Map<string, (MemoryNode & {label: string})[]>();
+	for (const node of nodes) {
+		const [prefix, ...rest] = node.name.split('/');
+		const group = rest.length ? prefix : 'Root';
+		const label = rest.length ? rest.join('/') : node.name;
+		if (!groups.has(group)) groups.set(group, []);
+		groups.get(group)!.push({...node, label});
+	}
+
+	const ghostCount = nodes.filter(n => n.missing).length;
+	const lines = [`Memory Graph (${nodes.length} nodes, ${ghostCount} ghost${ghostCount === 1 ? '' : 's'})`, ''];
+
+	for (const group of [...groups.keys()].sort()) {
+		const items = groups.get(group)!.sort((a, b) => a.label.localeCompare(b.label));
+		lines.push(`${group}/`);
+		items.forEach((n, i) => {
+			const last = i === items.length - 1;
+			const branch = last ? '└─' : '├─';
+			const pad = last ? '  ' : '│ ';
+			const tag = n.missing ? ' (ghost)' : '';
+			lines.push(`  ${branch} ${n.label}${tag}`);
+			if (n.links.length) lines.push(`  ${pad}   → ${n.links.join(', ')}`);
+			if (n.backlinks.length) lines.push(`  ${pad}   ← ${n.backlinks.join(', ')}`);
+		});
+		lines.push('');
+	}
+
+	return lines.join('\n').trimEnd();
+}

src/index.ts

@@ -1,9 +1,11 @@
 export * from './ai';
 export * from './antrhopic';
 export * from './audio';
+export * from './helpers';
 export * from './llm';
 export * from './memory';
 export * from './open-ai';
 export * from './provider';
+export * from './token-pool'
 export * from './tools';
 export * from './vision';

src/kd-tree.ts

@@ -103,9 +103,10 @@ class BoundedMaxHeap<T> {
 export class KDTree<T = unknown> {
 	private root: KDNode<T> | null = null;
 	private _size = 0;
-	private readonly dims: number;
 	private readonly distanceFn: (a: number[], b: number[]) => number;
 
+	readonly dims: number;
+
 	/**
 	 * @param dims           Dimensionality of all vectors (must be consistent).
 	 * @param metric         Distance metric to use. Default: "euclidean".

src/llm.ts

@@ -1,3 +1,4 @@
+import {clean, snakeCase} from '@ztimson/utils';
 import {AbortablePromise, Ai} from './ai.ts';
 import {Anthropic} from './antrhopic.ts';
 import {OpenAi} from './open-ai.ts';
@@ -6,10 +7,25 @@ import {AiTool, AiToolArg} from './tools.ts';
 import {fileURLToPath} from 'url';
 import {dirname, join} from 'path';
 import {spawn} from 'node:child_process';
-import {Memory, MemoryCache, MemoryManager} from './memory.ts';
+import {Memory, MemoryCache, MemoryManager, MemoryOptions} from './memory.ts';
 
-export type AnthropicConfig = {proto: 'anthropic', token: string};
+const MAX_AGENT_DEPTH = 5;
-export type OpenAiConfig = {proto: 'openai', host?: string, token: string};
+
+export type AnthropicConfig = {proto: 'anthropic', token: string | string[]};
+export type OpenAiConfig = {proto: 'openai', host?: string, token: string | string[]};
+
+export type Agent = {
+	name: string;
+	description?: string;
+	model?: string | null;
+	temperature?: number;
+	system: string;
+	delegate?: boolean;
+	skills?: Skill[] | null;
+	tools?: AiTool[] | null;
+	mcp?: McpServer[] | null;
+	agents?: string[] | null;
+}
 
 export type LLMMessage = {
 	/** Message originator */
@@ -18,6 +34,10 @@ export type LLMMessage = {
 	content: string | any;
 	/** Timestamp */
 	timestamp?: number;
+	/** Response duration in ms */
+	duration?: number;
+	/** Tokens per second */
+	tps?: number;
 } | {
 	/** Tool call */
 	role: 'tool';
@@ -33,6 +53,10 @@ export type LLMMessage = {
 	error?: undefined | string;
 	/** Timestamp */
 	timestamp?: number;
+	/** Response duration in ms */
+	duration?: number;
+	/** Tokens per second */
+	tps?: number;
 }
 
 export type LLMRequest = {
@@ -55,13 +79,17 @@ export type LLMRequest = {
 	/** Compress old messages in the chat to free up context */
 	compress?: {max: number; min: number};
 	/** User's memory documents - RAG injected automatically each turn */
-	memory?: Memory[] | MemoryCache;
+	memory?: Memory[] | MemoryCache | MemoryOptions;
 	/** Model to use for memory operations */
 	memoryModel?: string;
 	/** Skill documents the AI can browse and read on demand */
 	skills?: Skill[];
 	/** MCP servers to connect and expose as tools */
 	mcp?: McpServer[];
+	/** Subagents exposed as delegatable/wrapped tools */
+	agents?: Agent[];
+	/** @internal recursion guard for nested agent delegation */
+	_agentDepth?: number;
 }
 
 export type McpServer = {
@@ -82,7 +110,6 @@ export type Skill = {
 	content: string;
 }
 
-
 class LLM {
 	private memoryManager!: MemoryManager;
 
@@ -99,6 +126,54 @@ class LLM {
 		this.memoryManager = new MemoryManager(this);
 	}
 
+	private setupAgent(agents: Agent[] = [], allAgents: Agent[], history: LLMMessage[], aborts: (() => void)[], depth = 0, delegateState: {resp: string | null}): AiTool[] {
+		return agents.map(a => {
+			const toolName = `${a.delegate ? '' : 'sub'}agent_${snakeCase(a.name)}`;
+			return {
+				name: toolName,
+				description: `${a.delegate ? 'Delegate to ' : ''}Subagent: ${a.description || a.name}`,
+				args: clean<any>({
+					context: !a.delegate ? {type: 'string', description: 'Summary of related messages, samples, files, etc...', required: true} : undefined,
+					instructions: {type: 'string', description: 'Detailed instructions for subagent to complete', required: true},
+				}),
+				fn: async (args: any, stream: any, ai: any, id?: string) => {
+					if(depth >= MAX_AGENT_DEPTH) return 'Max agent delegation depth exceeded';
+
+					const nested = (a.agents || [])
+						.map(name => allAgents.find(x => x.name === name))
+						.filter((x): x is Agent => !!x && x.name !== a.name);
+
+					const q = a.delegate ? '' : `${args.instructions}${args.context ? `\n\n<context>${args.context}</context>` : ''}`;
+
+					const request = this.ask(q, {
+						system: `You are a specialized subagent being called from an orchestrator
+${a.delegate ? 'Your output streams directly to the user for the remainder of this turn. You are mid conversation' : 'You are wrapped in a tool call that will be analysis by an LLM'}
+Dispense with greetings and focus on your instructions using available tools and returning only the final result unless specifically instructed to converse
+
+${a.system}`,
+						model: a.model || undefined,
+						temperature: a.temperature,
+						stream: a.delegate ? stream : undefined,
+						history: a.delegate ? history : [],
+						mcp: a.mcp || undefined,
+						skills: a.skills || undefined,
+						tools: a.tools || undefined,
+						agents: nested,
+						_agentDepth: depth + 1,
+					} as any);
+					aborts.push(request.abort);
+					const resp = await request;
+
+					if(a.delegate) {
+						delegateState.resp = resp;
+						return '';
+					}
+					return resp;
+				}
+			};
+		});
+	}
+
 	private async setupMcp(servers: McpServer[] = []): Promise<{prompt: string, tools: AiTool[]}> {
 		if(!servers?.length) return {prompt: '', tools: []};
 		const allTools: AiTool[] = [];
@@ -141,9 +216,9 @@ class LLM {
 		if(!skills?.length) return {prompt: '', tools: []};
 		const list = skills.map(s => `- ${s.name}: ${s.description}`).join('\n');
 		return {
-			prompt: `You have access to the following skill documents, use \`read_skill\` to access them:\n${list}`,
+			prompt: `You have access to the following skill documents, whenever there is overlap between a question and a skill file, use \`skill_read\` to get instructions and background knowledge:\n${list}`,
 			tools: [{
-				name: 'read_skill',
+				name: 'skill_read',
 				description: 'Read the full content of a skill/knowledge document',
 				args: {
 					name: {type: 'string', description: 'Exact skill name', required: true}
@@ -157,6 +232,20 @@ class LLM {
 		}
 	}
 
+	private wrapToolTiming(tools: AiTool[], timings: Map<string, {duration: number, tps: number}>): AiTool[] {
+		return tools.map(t => ({
+			...t,
+			fn: async (args: any, stream: any, ai: any, id?: string) => {
+				const start = Date.now();
+				const result = await t.fn(args, stream, ai, id);
+				const duration = Date.now() - start;
+				const tps = duration > 0 ? this.estimateTokens(result) / (duration / 1000) : 0;
+				if(id) timings.set(id, {duration, tps});
+				return result;
+			}
+		}));
+	}
+
 	ask(message: string, options: LLMRequest = {}): AbortablePromise<string> {
 		options = <any>{
 			system: '',
@@ -167,11 +256,23 @@ class LLM {
 		}
 		const m = options.model || this.defaultModel;
 		if(!this.models[m]) throw new Error(`Model does not exist: ${m}`);
-		let abort = () => {};
+		let request: AbortablePromise<string> | null = null;
-		return Object.assign(new Promise<string>(async res => {
+		let aborted = false;
+		const nestedAborts: (() => void)[] = [];
+		const abort = () => {
+			aborted = true;
+			request?.abort?.();
+			nestedAborts.forEach(a => a());
+		};
+
+		let promise: any;
+		const requestStart = Date.now();
+
+		promise = (async () => {
 			let tools: AiTool[] = options.tools || this.ai.options.llm?.tools || [];
 			const prompts: string[] = [];
 			let history = options.history || [];
+			if(message) history.push({role: 'user', content: message, timestamp: Date.now()});
 
 			// MCP
 			const mcp = options.mcp || this.ai.options?.llm?.mcp;
@@ -189,48 +290,97 @@ class LLM {
 				tools.push(...s.tools);
 			}
 
+			// Agents
+			const agents = options.agents || this.ai.options?.llm?.agents;
+			const delegateState: {resp: string | null} = {resp: null};
+			if(agents?.length) tools.push(...this.setupAgent(agents, agents, history, nestedAborts, options._agentDepth || 0, delegateState));
+
 			// Memory
-			if (options.memory) {
+			const mem = MemoryManager.normalize(options.memory);
-				const mems = options.memory instanceof MemoryCache ? options.memory.memories : options.memory;
+			if(mem) {
-				const relevant = await this.memoryManager.recollect(message, options.memory, 5);
+				const mems = mem.memory instanceof MemoryCache ? mem.memory.memories : mem.memory;
-				prompts.unshift(`You have access to the following memory files:
+				if(mems.length) {
-${mems.map(m => `- ${m.name}: ${m.description}`).join('\n')}
+					if(mem.inject) {
-${relevant.length ? `
+						const pool = 15; // candidates considered, cheap since only refs are listed
-Relevant memories have been preloaded:
+						const budget = mem.maxTokens ?? 2000; // actual content injected
-${relevant.map(r => `
+						const relevant = await this.memoryManager.recollect(message, mem.memory, pool);
-**${r.name}**
+
-${r.description}
+						let used = 0;
-${r.content}
+						const preloaded: typeof relevant = [];
-`).join('\n---\n')}
+						const listed: typeof relevant = [];
-` : ''}`.trim());
+						for(const r of relevant) {
-				tools.push(this.memoryManager.tools.read(options.memory));
+							const t = this.estimateTokens(r.content);
+							if(used + t <= budget || preloaded.length === 0) {
+								preloaded.push(r);
+								used += t;
+							} else listed.push(r);
 						}
 
+						prompts.unshift(`You have a background memory process which has prefetched relevant information${mem.update ? ' and will create new memories from this conversation' : ''} for you
+Assume it is perfect and never mention this process to anyone ever
+Always use your memories to craft a personalized response, they contain links / [[wiki links]] which you use navigate between them
+${mem.tool ? `You can access memory files via the \`memory_search\` and \`memory_recall\` tools
+When you need information about the user, \`memory_recall\` \`People/User\` before asking (fetch if not included bellow)
+When you need information not provided, attempt 1-3 \`memory_search\` calls with unique queries before asking` : ''}
+
+${preloaded.length ? `
+Prefetched Memories (Most relevant first):
+
+${preloaded.map(r => `Memory: ${r.name}
+Description: ${r.description}
+Linked: ${[r.links, ...r.backlinks].join(', ')}
+\`\`\`
+${r.content}
+\`\`\``).join('\n\n')}` : ''}
+
+${mem.tool && listed.length ? listed.map(r => `Memory: ${r.name}
+Description: ${r.description}
+Linked: ${[r.links, ...r.backlinks].join(', ')}
+<!-- Truncated -->`).join('\n\n') : ''}
+
+${mem.tool ? `Full memory list:
+${mems.map(m => `- ${m.name}: ${m.description}`).join('\n')}` : ''}`.trim())
+					}
+					if(mem.tool) tools.push(this.memoryManager.tools.read(mem.memory));
+				}
+			}
+
+			if(aborted) throw Object.assign(new Error('Aborted'), {name: 'AbortError'});
+
+			const toolTimings = new Map<string, {duration: number, tps: number}>();
+			tools = this.wrapToolTiming(tools, toolTimings);
+
+			if(aborted) throw Object.assign(new Error('Aborted'), {name: 'AbortError'});
+
 			prompts.unshift(options.system || this.ai.options.llm?.system || '');
-			const resp = await this.models[m].ask(message, {...options, tools, system: prompts.filter(Boolean).join('\n\n')});
+			request = this.models[m].ask('', {...options, tools, system: prompts.filter(Boolean).join('\n\n')});
+			let resp = await request;
 
-			// Trim memory injections from history
+			// Capture meta (duration / tps)
-			if(options.memory) {
+			for(const h of history) {
-				history.splice(0, history.length, ...history.filter(h => h.role !== 'tool' || h.name !== 'recall'));
+				if(h.role === 'tool' && toolTimings.has(h.id)) Object.assign(h, toolTimings.get(h.id));
 			}
 
-			// Auto-memorize before compressing
+			if(typeof resp === 'string' && !resp.trim() && delegateState.resp !== null) resp = delegateState.resp;
+
+			if(mem?.tool) history.splice(0, history.length, ...history.filter(h => h.role !== 'tool' || h.name !== 'memory_recall'));
 			if(options.compress && this.estimateTokens(history) >= options.compress.max) {
-				if(options.memory) await this.memoryManager.memorize(history, options.memory, {model: options.memoryModel || this.defaultModel, ...options});
+				if(mem?.update) await this.memoryManager.memorize(history, mem.memory, {model: options.memoryModel || this.defaultModel, ...options});
 				const compressed = await this.compressHistory(history, options.compress.max, options.compress.min, options);
 				if(options.history) options.history.splice(0, options.history.length, ...compressed);
 			}
 
-			return res(resp);
+			const requestDuration = Date.now() - requestStart;
-		}), {abort});
+			const totalTokens = history
-	}
+				.filter((h: any) => h.role === 'assistant' && h.duration && h.tps)
+				.reduce((sum: number, h: any) => sum + h.tps * (h.duration / 1000), 0);
+			const requestTps = requestDuration > 0 ? totalTokens / (requestDuration / 1000) : 0;
+			Object.assign(promise, {duration: requestDuration, tps: requestTps});
 
-	/**
+			return resp;
-	 * Digest full conversation history into memory documents.
+		})();
-	 * Call on session end to persist the conversation.
+
-	 */
+		return Object.assign(promise, {abort});
-	async updateMemory(history: LLMMessage[], memories: Memory[] | MemoryCache, options: LLMRequest = {}): Promise<void> {
-		await this.memoryManager.memorize(history, memories, {model: this.defaultModel, ...options});
 	}
 
 	/**
@@ -383,15 +533,41 @@ ${r.content}
 	 * @param {string} searchTerms Multiple search terms to check against target
 	 * @returns {{avg: number, max: number, similarities: number[]}} Similarity values 0-1: 0 = unique, 1 = identical
 	 */
-	fuzzyMatch(target: string, ...searchTerms: string[]) {
+	fuzzyMatch(target, ...searchTerms) {
-		if(searchTerms.length < 2) throw new Error('Requires at least 2 strings to compare');
+		if (searchTerms.length < 2) throw new Error('Requires at least 2 strings to compare');
-		const vector = (text: string, dimensions: number = 10): number[] => {
+		const levenshtein = (a, b) => {
-			return text.toLowerCase().split('').map((char, index) =>
+			const m = a.length, n = b.length;
-				(char.charCodeAt(0) * (index + 1)) % dimensions / dimensions).slice(0, dimensions);
+			if (!m) return n;
+			if (!n) return m;
+			const dp = Array.from({length: m + 1}, (_, i) => [i, ...Array(n).fill(0)]);
+			for (let j = 0; j <= n; j++) dp[0][j] = j;
+			for (let i = 1; i <= m; i++) {
+				for (let j = 1; j <= n; j++) {
+					dp[i][j] = a[i - 1] === b[j - 1]
+						? dp[i - 1][j - 1]
+						: 1 + Math.min(dp[i - 1][j - 1], dp[i - 1][j], dp[i][j - 1]);
 				}
-		const v = vector(target);
+			}
-		const similarities = searchTerms.map(t => vector(t)).map(refVector => this.cosineSimilarity(v, refVector));
+			return dp[m][n];
-		return {avg: similarities.reduce((acc, s) => acc + s, 0) / similarities.length, max: Math.max(...similarities), similarities};
+		};
+		const similarity = (a, b) => {
+			a = a.toLowerCase(); b = b.toLowerCase();
+			return 1 - levenshtein(a, b) / Math.max(a.length, b.length, 1);
+		};
+		const similarities = searchTerms.map(t => similarity(target, t));
+		return {
+			avg: similarities.reduce((acc, s) => acc + s, 0) / similarities.length,
+			max: Math.max(...similarities),
+			similarities
+		};
+	}
+
+	/**
+	 * Digest full conversation history into memory documents.
+	 * Call on session end to persist the conversation.
+	 */
+	async memorize(history: LLMMessage[], memories: Memory[] | MemoryCache, options: LLMRequest = {}): Promise<Memory[]> {
+		return this.memoryManager.memorize(history, memories, {model: this.defaultModel, ...options});
 	}
 
 	/**

src/memory.ts

@@ -1,6 +1,17 @@
+import {MemoryNode, rebuildGraph} from './helpers.ts';
 import {LLMRequest, LLMMessage} from './llm.ts';
 import {AiTool} from './tools.ts';
-import {KDTree, KDPoint} from './kd-tree.ts';
+import {KDPoint, KDTree} from './kd-tree.ts';
+
+const FACTS_HEADING = '## Facts';
+
+const GENERIC_TEMPLATE = `# {{Title}}
+
+## Summary
+
+## Details
+
+## Related`;
 
 export type Memory = {
 	name: string;
@@ -20,59 +31,14 @@ type FactBucket = {
 	subject: string;
 	facts: string[];
 }
-// In memory.ts - replace findGhostNodes with this:
 
-export type MemoryNode = {
+function dedupeFacts(facts: string[]): string[] {
-	name: string;
+	const seen = new Map<string, string>();
-	missing: boolean;
+	for (const f of facts) {
-	links: string[];
+		const clean = f.trim();
-	backlinks: string[];
+		if (clean) seen.set(clean.toLowerCase(), clean);
-}
-
-export function buildMemoryGraph(memories: Memory[] | MemoryCache): MemoryNode[] {
-	const mems = memories instanceof MemoryCache ? memories.memories : memories;
-	const nameSet = new Set(mems.map(m => m.name));
-	const ghosts = new Set<string>();
-
-	// Collect all ghost references
-	for (const m of mems) {
-		for (const link of m.links) {
-			if (!nameSet.has(link)) ghosts.add(link);
-		}
-	}
-
-	// Build node list: real nodes + ghost nodes
-	return [
-		...mems.map(m => ({
-			name: m.name,
-			missing: false,
-			links: m.links,
-			backlinks: m.backlinks,
-		})),
-		...[...ghosts].map(name => ({
-			name,
-			missing: true,
-			links: [],
-			backlinks: mems
-				.filter(m => m.links.includes(name))
-				.map(m => m.name),
-		}))
-	];
-}
-
-function extractLinks(content: string): string[] {
-	const matches = content.matchAll(/\[\[([^\]]+)\]\]/g);
-	return [...new Set([...matches].map(m => m[1].trim()))];
-}
-
-function rebuildBacklinks(memories: Memory[]): void {
-	for (const m of memories) m.backlinks = [];
-	for (const m of memories) {
-		for (const link of m.links) {
-			const target = memories.find(t => t.name === link);
-			if (target) target.backlinks.push(m.name);
-		}
 	}
+	return [...seen.values()];
 }
 
 function cosineDistance(a: number[], b: number[]): number {
@@ -86,18 +52,30 @@ function cosineDistance(a: number[], b: number[]): number {
 	return denom === 0 ? 1 : 1 - dot / denom;
 }
 
+function cosineSearch(query: number[], memories: Memory[], limit: number): MemoryRef[] {
+	return memories
+		.filter(m => m.embedding?.length)
+		.map(m => ({ref: {name: m.name, description: m.description}, distance: cosineDistance(query, m.embedding)}))
+		.sort((a, b) => a.distance - b.distance)
+		.slice(0, limit)
+		.map(s => s.ref);
+}
+
 export class MemoryCache {
-	private tree: KDTree<MemoryRef>;
+	private tree!: KDTree<MemoryRef>;
 	public memories: Memory[];
+	public nodes: MemoryNode[] = [];
+
+	get length() { return this.memories.length; }
 
 	constructor(memories: Memory[]) {
 		this.memories = memories;
-		this.tree = this.buildTree();
+		this.rebuild();
 	}
 
 	private buildTree(): KDTree<MemoryRef> {
 		const embedded = this.memories.filter(m => m.embedding?.length);
-		if(!embedded.length) return new KDTree<MemoryRef>(0);
+		if (!embedded.length) return new KDTree<MemoryRef>(0);
 
 		const dims = embedded[0].embedding.length;
 		const points: KDPoint<MemoryRef>[] = embedded.map(m => ({
@@ -109,8 +87,8 @@ export class MemoryCache {
 	}
 
 	search(query: number[], limit: number): MemoryRef[] {
-		const results = this.tree.knn(query, limit);
+		if (!this.tree || this.tree.dims === 0) return [];
-		return results.map(r => r.point.payload);
+		return this.tree.knn(query, limit).map(r => r.point.payload);
 	}
 
 	add(memory: Memory): void {
@@ -120,301 +98,438 @@ export class MemoryCache {
 
 	update(memory: Memory): void {
 		const idx = this.memories.findIndex(m => m.name === memory.name);
-		if (idx !== -1) {
+		if (idx !== -1) this.memories[idx] = memory;
-			this.memories[idx] = memory;
+		else this.memories.push(memory);
-		} else {
-			this.memories.push(memory);
-		}
 		this.rebuild();
 	}
 
-	rebuild(): void {
+	remove(name: string): void {
-		this.tree = this.buildTree();
+		const idx = this.memories.findIndex(m => m.name === name);
+		if (idx !== -1) {
+			this.memories.splice(idx, 1);
+			this.rebuild();
+		}
 	}
 
-	rebuildLinks(): void {
+	rebuild(): void {
-		rebuildBacklinks(this.memories);
+		this.nodes = rebuildGraph(this.memories);
+		this.tree = this.buildTree();
 	}
 }
 
+class MemoryAccessor {
+	readonly list: Memory[];
+	private readonly cache: MemoryCache | null;
+
+	constructor(memories: Memory[] | MemoryCache) {
+		this.cache = memories instanceof MemoryCache ? memories : null;
+		this.list = this.cache ? this.cache.memories : <Memory[]>memories;
+	}
+
+	find(name: string): Memory | undefined {
+		return this.list.find(m => m.name === name);
+	}
+
+	commit(): MemoryNode[] {
+		if (this.cache) {
+			this.cache.rebuild();
+			return this.cache.nodes;
+		}
+		return rebuildGraph(this.list);
+	}
+
+	ghosts(): string[] {
+		const nodes = this.cache ? this.cache.nodes : rebuildGraph(this.list);
+		return nodes.filter(n => n.missing).map(n => n.name);
+	}
+
+	search(vector: number[], limit: number): MemoryRef[] {
+		return this.cache ? this.cache.search(vector, limit) : cosineSearch(vector, this.list, limit);
+	}
+
+	forget(name: string): boolean {
+		const idx = this.list.findIndex(m => m.name === name);
+		if (idx === -1) return false;
+		this.list.splice(idx, 1);
+		this.commit();
+		return true;
+	}
+
+	async backfillEmbeddings(llm: any): Promise<number> {
+		const missing = this.list.filter(m => !m.embedding?.length);
+		if (!missing.length) return 0;
+		await Promise.all(missing.map(async node => {
+			const [e] = await llm.embedding(node.content);
+			if (e) node.embedding = e.embedding;
+		}));
+		this.commit();
+		return missing.length;
+	}
+}
+
+export type MemoryOptions = {
+	/** Memory object */
+	memory: Memory[] | MemoryCache;
+	/** Inject N memories into the system prompt */
+	inject?: boolean;
+	/** expose recall tool to LLM */
+	tool?: boolean;
+	/** Update memory on compression */
+	update?: boolean;
+	/** Max context size of memories to inject to each call (removed immediately after use) */
+	maxTokens?: number;
+}
+
 export class MemoryManager {
+	private recentlyTouched = new Map<string, number>();
+
+	private queues = new Map<string, {
+		dirty: boolean,
+		request: {abort?: () => void} | null,
+		task: Promise<void>,
+	}>();
 
 	tools = {
+		forget: (memories: Memory[] | MemoryCache): AiTool => ({
+			name: 'memory_forget',
+			description: 'Permanently delete a memory document and clean up all references to it',
+			args: {
+				name: {type: 'string', description: 'Exact memory name to forget', required: true}
+			},
+			fn: (args: any) => {
+				const result = this.forget(args.name, memories);
+				return result ? `Forgotten: ${args.name}` : `Not found: ${args.name}`;
+			},
+		}),
+
 		read: (memories: Memory[] | MemoryCache): AiTool => ({
-			name: 'read_memory',
+			name: 'memory_recall',
 			description: 'Read the full content of a memory document',
 			args: {
 				name: {type: 'string', description: 'Exact memory name', required: true},
 			},
-			fn:(args: any) => {
+			fn: (args: any) => {
-				const mems = memories instanceof MemoryCache ? memories.memories : memories;
+				const mem = this.access(memories).find(args.name);
-				const mem = mems.find(m => m.name === args.name);
+				if (!mem) return 'Document not found';
-				if(!mem) return 'Document not found';
+				this.touch(mem.name);
-				return this.formatMemory(mem);
+				return mem.content;
-			}
+			},
+		}),
+
+		search: (memories: Memory[] | MemoryCache): AiTool => ({
+			name: 'memory_search',
+			description: 'Use embeddings to find the MOST relevant memories, even if NOT relevant',
+			args: {
+				query: {type: 'string', description: 'What to look for in the memories', required: true},
+				limit: {type: 'number', description: 'Number of memories to return', default: 1},
+			},
+			fn: async ({query, limit}) => {
+				const mem = await this.recollect(query, memories, limit)
+				return mem.map(m => `Memory: ${m.name}
+Description: ${m.description}
+Links: ${[...m.links, ...m.backlinks].join(', ')}
+\`\`\`
+${m.content}
+\`\`\``).join('\n\n');
+			},
 		}),
 	};
 
 	constructor(private llm: any) {}
 
-	private cosineSearch(query: number[], memories: Memory[], limit: number): MemoryRef[] {
+	static normalize(m?: Memory[] | MemoryCache | MemoryOptions) {
-		const scored = memories
+		if (!m) return null;
-			.filter(m => m.embedding?.length)
+		const raw = m instanceof MemoryCache || Array.isArray(m);
-			.map(m => ({
+		return raw ? {memory: <Memory[] | MemoryCache>m, inject: true, tool: true, update: true} : {inject: true, tool: true, update: true, ...m};
-				ref: {name: m.name, description: m.description},
-				distance: cosineDistance(query, m.embedding)
-			}))
-			.sort((a, b) => a.distance - b.distance)
-			.slice(0, limit);
-		return scored.map(s => s.ref);
 	}
 
-	private createNode(name: string, memories: Memory[]): Memory {
+	private access(memories: Memory[] | MemoryCache): MemoryAccessor {
-		const existing = memories.find(m => m.name === name);
+		return new MemoryAccessor(memories);
-		if(existing) return existing;
-		return {
-			name,
-			description: '',
-			content: '',
-			embedding: [],
-			links: [],
-			backlinks: [],
-		};
 	}
 
-	private formatMemory(mem: Memory): string {
+	private appendFacts(node: Memory, facts: string[]): void {
-		return [
+		this.ensureDoc(node);
-			`# ${mem.name}`,
+		const body = this.stripHeader(node.content);
-			mem.description ? `> ${mem.description}` : '',
+		const bullets = facts.map(f => `- ${f}`).join('\n');
-			mem.links.length ? `**Links:** ${mem.links.map(l => `[[${l}]]`).join(', ')}` : '',
+		const idx = body.indexOf(FACTS_HEADING);
-			mem.backlinks.length ? `**Referenced by:** ${mem.backlinks.map(l => `[[${l}]]`).join(', ')}` : '',
+		const newBody = idx === -1
-			'',
+			? `${body.trimEnd()}\n\n${FACTS_HEADING}\n${bullets}\n`
-			mem.content,
+			: `${body.slice(0, idx + FACTS_HEADING.length)}\n${bullets}${body.slice(idx + FACTS_HEADING.length)}`;
-		].filter(l => l !== undefined).join('\n');
+		node.content = this.touchHeader(node, newBody);
+	}
+
+	private ensureDoc(node: Memory): void {
+		if (node.content) return;
+		const title = node.name.split('/').pop() ?? node.name;
+		node.content = this.touchHeader(node, `# ${title}\n`);
+	}
+
+	private async factAgent(conversation: string, store: MemoryAccessor, options: LLMRequest, weekKey: string): Promise<FactBucket[]> {
+		const ghosts = store.ghosts();
+
+		const response = await this.llm.ask(conversation, {
+			model: options.model,
+			temperature: 0.2,
+			system: `You are a fact extractor to build obsidian knowledge vaults.
+Analyze this conversation and extract facts worth remembering long-term.
+
+Rules:
+- Always extract facts that the user explicitly told you to remember
+- ONLY extract current facts the USER explicitly stated about themselves, their work, projects or decisions that were MADE during this conversation
+- DO NOT extract greetings, pleasantries, or generic exchanges
+- DO NOT extract deltas or changes in facts; ONLY the end fact
+- DO NOT extract anything the AI/assistant itself said
+- If nothing worth remembering was said, return an empty buckets array
+
+When extracting facts, you MUST also decide the exact destination path:
+- Reuse node names (including ghost) as much as possible IF the facts belongs there
+- All information primarily about the user should go under "People/User"
+- When required, create a new path following collection/subject format (e.g., People/Sarah, Projects/Oxide) — you are not limited to any fixed list of collections, use whatever fits
+- For journal entries, use "Journal"
+
+Available nodes:
+- Journal
+${this.listNodes(store.list).filter(n => !n.name.includes('Journal')).map(n => `- ${n.name}: ${n.description}`).join('\n') || 'None yet.'}
+${ghosts.length ? `${ghosts.map(g => `- ${g}: (Ghost)`).join('\n')}` : ''}`,
+			schema: {
+				buckets: {type: 'array', description: 'Groups of facts to remember, each assigned to a different node. Return an empty array if there is nothing worth storing in an obsidian vault', items: {
+					type: 'object', items: {
+							subject: {type: 'string', description: 'Exact existing node name OR new path (e.g. "People/Sarah", "Projects/Oxide"), or "Journal"', required: true},
+							facts: {
+								type: 'array',
+								description: 'Facts to store at this destination',
+								items: {type: 'string', description: 'A single fact'},
+							},
+						},
+					},
+				},
+			},
+		});
+
+		const buckets = new Map<string, string[]>();
+		for(const bucket of response.buckets ?? []) {
+			const subject = bucket.subject.trim().toLowerCase() === 'journal'
+				? `Journal/${weekKey}` : bucket.subject.trim();
+			const facts = buckets.get(subject) ?? [];
+			facts.push(...dedupeFacts(bucket.facts));
+			buckets.set(subject, facts);
+		}
+
+		return buckets.entries().toArray().map(([subject, facts]) => ({subject, facts}));
+	}
+
+	private getWeekMonday(date: Date = new Date()): string {
+		const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
+		const day = d.getUTCDay();
+		const diff = day === 0 ? -6 : 1 - day;
+		d.setUTCDate(d.getUTCDate() + diff);
+		return d.toISOString().slice(0, 10);
 	}
 
 	private listNodes(memories: Memory[]): MemoryRef[] {
 		return memories.map(m => ({name: m.name, description: m.description}));
 	}
 
-	async recollect(query: string, memories: Memory[] | MemoryCache, limit = 5, graphDepth = 1): Promise<Memory[]> {
+	private reconcile(node: Memory, memories: Memory[] | MemoryCache, options: LLMRequest): Promise<void> {
-		const mem: Memory[] = memories instanceof MemoryCache ? memories.memories : memories;
+		const key = node.name;
-		if(!mem.length) return [];
+		const existing = this.queues.get(key);
-		const [e] = await this.llm.embedding(query);
+		if (existing) {
-		if(!e) return [];
+			existing.dirty = true;
+			existing.request?.abort?.();
+			return existing.task;
+		}
 
-		let vectorResults: MemoryRef[];
+		const entry = {dirty: false, request: null, task: Promise.resolve()};
-		if(memories instanceof MemoryCache) vectorResults = memories.search(e.embedding, limit);
+		this.queues.set(key, entry);
-		else vectorResults = this.cosineSearch(e.embedding, mem, limit);
+		const store = this.access(memories);
+		entry.task = (async () => {
+			do {
+				entry.dirty = false;
+				await this.docAgent(node, store.list, options, entry);
+			} while (entry.dirty);
+		})().finally(() => {
+			this.queues.delete(key);
+			store.commit();
+		});
+		return entry.task;
+	}
+
+	private async docAgent(node: Memory, memories: Memory[], options: LLMRequest, entry: {request: {abort?: () => void} | null}): Promise<void> {
+		const currentBody = this.stripHeader(node.content);
+		let update;
+		try {
+			for (let i = 0; i < 2 && !update?.content; i++) {
+				const request = this.llm.ask(currentBody, {
+					model: options.model,
+					temperature: 0.3,
+					schema: {
+						description: {type: 'string', description: 'One-line description of what this document covers, no formatting or emojis', required: true},
+						content: {type: 'string', description: 'Rewritten document body in markdown, without the frontmatter block', required: true},
+					},
+					system: `You are a knowledge base editor maintaining one document in an Obsidian-style vault.
+
+If the document has a "${FACTS_HEADING}" section, integrate every bullet under it into the appropriate part of the document, then remove the "${FACTS_HEADING}" section entirely. If there is no such section, just tidy the document per the rules below.
+
+Structure: follow this generic shape loosely, adapting section names/order to what the content actually needs (e.g. journal-style docs may want a timeline instead of "Details"):
+\`\`\`markdown
+${GENERIC_TEMPLATE}
+\`\`\`
+
+Formatting rules:
+- Use Obsidian-style markdown: # headings, **bold** for emphasis, bullet & numbered lists for grouped 1D data, tables for 2D data
+- Link related concepts with [[WikiLink]] notation using full paths like [[People/Sarah]] or [[Projects/Website]]
+- Create links for specific entities (person, place, project, program) and abstract concepts, but skip generics (car, red, dog)
+- Keep the document concise, factual, and human-readable
+- Resolve contradictions: newer facts always win — delete the outdated statement entirely, never keep both
+- Do not add frontmatter blocks, filler, preamble, or AI commentary
+
+Other nodes in the vault (link to these instead of duplicating their content):
+${this.listNodes(memories).filter(n => n.name !== node.name).map(n => n.name).join(', ') || 'none'}
+
+Current document:
+\`\`\`markdown
+${currentBody}
+\`\`\``,
+				});
+				entry.request = request;
+				update = await request;
+			}
+		} catch (err: any) {
+			if (err?.name === 'AbortError') return;
+			throw err;
+		} finally {
+			entry.request = null;
+		}
+
+		if (!update?.content) return;
+		node.description = node.name !== 'People/User' ? update.description : 'All information about the current user';
+		node.content = this.touchHeader(node, update.content);
+		const [e] = await this.llm.embedding(node.content);
+		if (e) node.embedding = e.embedding;
+	}
+
+	private parseFrontmatter(content: string): {fm: Map<string, string>, body: string} {
+		const match = content.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
+		if (!match) return {fm: new Map(), body: content};
+		const fm = new Map<string, string>();
+		for (const line of match[1].split('\n')) {
+			const i = line.indexOf(':');
+			if (i === -1) continue;
+			fm.set(line.slice(0, i).trim(), line.slice(i + 1).trim());
+		}
+		return {fm, body: match[2]};
+	}
+
+	private stripHeader(content: string): string {
+		return content.replace(/^---[\s\S]*?\n---\n?/, '').trimStart();
+	}
+
+	private touchHeader(node: Memory, body: string): string {
+		const {fm} = this.parseFrontmatter(node.content);
+		fm.set('name', node.name);
+		fm.set('description', node.description || '');
+		fm.set('modified', new Date().toISOString());
+		return this.writeFrontmatter(fm, body);
+	}
+
+	private writeFrontmatter(fm: Map<string, string>, body: string): string {
+		const lines = [...fm.entries()].map(([k, v]) => `${k}: ${v}`);
+		return `---\n${lines.join('\n')}\n---\n\n${body.trimStart()}`;
+	}
+
+	decay() {
+		for (const [name, ttl] of this.recentlyTouched) {
+			if (ttl <= 1) this.recentlyTouched.delete(name);
+			else this.recentlyTouched.set(name, ttl - 1);
+		}
+	}
+
+	touch(name: string, ttl = 2) {
+		this.recentlyTouched.set(name, ttl);
+	}
+
+	forget(name: string, memories: Memory[] | MemoryCache): boolean {
+		return this.access(memories).forget(name);
+	}
+
+	async recollect(query: string, memories: Memory[] | MemoryCache, limit = 5, graphDepth = 1): Promise<Memory[]> {
+		const store = this.access(memories);
+		if (!store.list.length) return [];
+
+		await store.backfillEmbeddings(this.llm);
+
+		const [e] = await this.llm.embedding(query);
+		if (!e) return [];
+
+		const vectorResults = store.search(e.embedding, limit);
 		const found = new Set<string>(vectorResults.map(r => r.name));
 
-		// Graph expansion
+		if (graphDepth > 0) {
-		if(graphDepth > 0) {
+			let frontier = [...found];
-			const frontier = [...found];
+			for (let depth = 0; depth < graphDepth && frontier.length; depth++) {
-			for(let depth = 0; depth < graphDepth; depth++) {
 				const next: string[] = [];
-				for(const name of frontier) {
+				for (const name of frontier) {
-					const node = mem.find(m => m.name === name);
+					const node = store.find(name);
-					if(!node) continue;
+					if (!node) continue;
-					for(const link of node.links) {
+					for (const link of node.links) {
-						if(!found.has(link) && mem.find(m => m.name === link)) {
+						if (!found.has(link) && store.find(link)) {
 							found.add(link);
 							next.push(link);
 						}
 					}
 				}
-				frontier.splice(0, frontier.length, ...next);
+				frontier = next;
-				if(!frontier.length) break;
 			}
 		}
 
 		const vectorOrder = vectorResults.map(r => r.name);
 		const graphExpansions = [...found].filter(n => !vectorOrder.includes(n));
-		const ordered = [...vectorOrder, ...graphExpansions];
+		return [...vectorOrder, ...graphExpansions].map(n => store.find(n)!).filter(Boolean);
-		return ordered.map(n => mem.find(m => m.name === n)!).filter(Boolean);
 	}
 
-	async memorize(history: LLMMessage[], memories: Memory[] | MemoryCache, options: LLMRequest): Promise<void> {
+	async memorize(history: LLMMessage[], memories: Memory[] | MemoryCache, options: LLMRequest): Promise<Memory[]> {
-		const mem = memories instanceof MemoryCache ? memories.memories : memories;
 		const conversation = history
 			.filter(h => h.role === 'user' || h.role === 'assistant')
 			.map(h => `[${h.role}]: ${h.content}`).join('\n\n').trim();
-		if(!conversation) return;
+		if (!conversation) return [];
 
-		const buckets = await this.factAgent(conversation, mem, options);
+		const uid = `${Date.now()}_${Math.random().toString(36).slice(2)}`;
-		if(!buckets.length) return;
+		const pending = {role: 'tool', name: 'memory_process', id: uid, content: conversation} as unknown as LLMMessage;
-		await Promise.all(buckets.map(async bucket => {
+		history.push(pending);
-			const node = await this.organizingAgent(bucket, mem, options);
-			if(!mem.find(m => m.name === node.name)) mem.push(node);
-			await this.docAgent(node, bucket, mem, options);
-		}));
 
-		// Rebuild indexes
+		const store = this.access(memories);
-		if (memories instanceof MemoryCache) {
+		const buckets = await this.factAgent(conversation, store, options, this.getWeekMonday());
-			memories.rebuildLinks();
+		const touched: Memory[] = [];
-			memories.rebuild();
+
-		} else {
+		for (const {subject, facts} of buckets) {
-			rebuildBacklinks(mem);
+			let node = store.find(subject);
+			if (!node) {
+				node = {name: subject, description: '', content: '', embedding: [], links: [], backlinks: []};
+				store.list.push(node);
 			}
-	}
+			this.appendFacts(node, facts);
-
+			const [e] = await this.llm.embedding(node.content);
-	private async docAgent(node: Memory, bucket: FactBucket, memories: Memory[], options: LLMRequest): Promise<void> {
-		let finalContent = node.content;
-
-		await this.llm.ask(
-			`New facts to integrate:\n${bucket.facts.map(f => `- ${f}`).join('\n')}`,
-			{
-				model: options.model,
-				temperature: 0.3,
-				system: `You are a knowledge base editor. Integrate the provided facts into the document below.
-
-Formatting rules:
-- Use Obsidian-style markdown: # headings, **bold** for key terms, bullet lists for facts
-- Link related concepts with [[WikiLink]] notation — only link things that are genuinely related
-- You may create links to nodes that don't exist yet if the concept is important
-- Keep the document concise, factual, and human-readable
-- Resolve any contradictions between old content and new facts (new facts win)
-- Do not add filler, preamble, or AI commentary — just clean knowledge documents
-
-All nodes:
-${this.listNodes(memories).map(n => n.name).join(', ') || 'none'}
-
-Current document:
-\`\`\`markdown
-${node.content || '(empty — this is a new document)'}
-\`\`\``,
-				tools: [{
-					name: 'update_document',
-					description: 'Write the complete updated document content',
-					args: {
-						description: {type: 'string', description: 'One-line description of what this document covers, no formatting or emojis', required: true},
-						content: {type: 'string', description: 'Fully updated document in markdown', required: true},
-					},
-					fn:(args: any) => {
-						node.description = args.description;
-						finalContent = args.content;
-						return 'Saved';
-					}
-				}]
-			}
-		);
-
-		node.content = finalContent;
-		node.links = extractLinks(finalContent);
-		const needsEmbed = !node.embedding?.length || node.description !== memories.find(m => m.name === node.name)?.description;
-		if (needsEmbed) {
-			const [e] = await this.llm.embedding(node.description);
 			if (e) node.embedding = e.embedding;
-		}
+			this.touch(node.name);
+			touched.push(node);
 		}
 
-	private async factAgent(conversation: string, memories: Memory[], options: LLMRequest): Promise<FactBucket[]> {
+		if (touched.length) {
-		const buckets: FactBucket[] = [];
+			store.commit();
-
+			(pending as any).content = `Saved to ${touched.map(n => `[[${n.name}]]`).join(', ')}`;
-		await this.llm.ask(conversation, {
+			await Promise.all(touched.map(node => this.reconcile(node, memories, options).catch(() => {})));
-			model: options.model,
+		} else {
-			temperature: 0.2,
+			(pending as any).content = 'Nothing worth remembering.';
-			system: `You are a fact extractor. Analyze this conversation and extract facts worth remembering long-term.
-
-Rules:
-- ONLY extract facts the USER explicitly stated about themselves, their work, or their projects
-- ONLY extract decisions that were MADE during this conversation
-- DO NOT extract anything the AI said, its capabilities, or meta-conversation about the AI
-- DO NOT extract greetings, pleasantries, or generic exchanges
-- If nothing worth remembering was said, do not call any tools
-
-Group facts by subject. For each group call \`extract_facts\` once.
-
-Known nodes (name: description):
-${this.listNodes(memories).map(n => `- ${n.name}: ${n.description}`).join('\n') || 'None yet.'}`,
-			tools: [{
-				name: 'extract_facts',
-				description: 'Submit a group of related facts for a specific subject',
-				args: {
-					subject: {type: 'string', description: 'Subject matter facts regard', required: true},
-					facts: {type: 'string', description: 'Comma-separated list of extracted facts', required: true},
-				},
-				fn: (args: any) => {
-					buckets.push({
-						subject: args.subject,
-						facts: args.facts.split(',').map((f: string) => f.trim()).filter(Boolean),
-					});
-					return 'Recorded';
-				}
-			}]
-		});
-
-		return buckets;
 		}
 
-	private async organizingAgent(bucket: FactBucket, memories: Memory[], options: LLMRequest): Promise<Memory> {
+		(touched as any).uid = uid;
-		let candidates = this.listNodes(memories);
+		return touched;
-		let attempts = 0;
+	}
-		const maxAttempts = 3;
 
-		while (attempts++ < maxAttempts) {
+	async reconcileVault(memories: Memory[] | MemoryCache, options: LLMRequest, scope: 'touched' | 'all' = 'touched'): Promise<void> {
-			let home = '', mode: string | null = null;
+		const store = this.access(memories);
-
+		const targets = scope === 'all' ? store.list : store.list.filter(m => m.content.includes(FACTS_HEADING));
-			const resp = await this.llm.ask(`Subject: ${bucket.subject}\n\nFacts:\n${bucket.facts.map(f => `- ${f}`).join('\n')}`, {
+		await Promise.all(targets.map(node => this.reconcile(node, memories, options)));
-				model: options.model,
+		store.commit();
-				temperature: 0.1,
-				system: `You are a knowledge organizer. Your job is to find the correct home for the supplied facts.
-
-1. Review the facts and the node list below. Pick the most likely match or decide if a new node is needed.
-2. If you picked an existing node, use \`read\` to verify it's the right place.
-- After reading, call either \`confirm\` (correct node) or \`mismatched\` (wrong node).
-3. If none of the nodes match, call \`create\` to make a new node.
-
-Available nodes:
-${candidates.map(n => `- ${n.name}: ${n.description}`).join('\n') || 'None — create a new node.'}`,
-				tools: [{
-					name: 'read',
-					description: 'Read a node file to verify it is the right home for these facts',
-					args: {name: {type: 'string', description: 'Exact node name', required: true}},
-					fn: ({name}) => {
-						const mem = memories.find(m => m.name === name);
-						if (!mem) return 'Node not found';
-						home = name;
-						return this.formatMemory(mem);
-					}
-				}, {
-					name: 'confirm',
-					description: 'Confirm this is the correct node for the facts',
-					args: {},
-					fn: () => {
-						mode = 'success';
-						resp.abort();
-					}
-				}, {
-					name: 'mismatched',
-					description: 'This is not the node you are looking for',
-					args: {},
-					fn: () => {
-						mode = 'failed';
-						resp.abort();
-					}
-				}, {
-					name: 'create',
-					description: 'No existing node fits — create a new one',
-					args: {name: {type: 'string', description: 'Canonical name for the new node', required: true}},
-					fn: ({name}) => {
-						home = name;
-						mode = 'create';
-						resp.abort();
-					}
-				}]
-			});
-
-			if(mode === 'create') {
-				return this.createNode(home, memories);
-			} else if (mode === 'failed') {
-				candidates = candidates.filter(c => c.name !== home);
-				if(!candidates.length) return this.createNode(bucket.subject, memories);
-			} else if (mode === 'success') {
-				const existing = memories.find(m => m.name === home);
-				return existing || this.createNode(home, memories);
-			}
-		}
-		return this.createNode(bucket.subject, memories);
 	}
 }

src/open-ai.ts

@@ -1,82 +1,62 @@
 import {OpenAI as openAI} from 'openai';
-import {findByProp, objectMap, JSONSanitize, JSONAttemptParse, clean} from '@ztimson/utils';
+import {findByProp, objectMap, JSONSanitize, JSONAttemptParse, clean, makeArray} from '@ztimson/utils';
 import {AbortablePromise, Ai} from './ai.ts';
 import {LLMMessage, LLMRequest} from './llm.ts';
 import {LLMProvider} from './provider.ts';
+import {TokenPool} from './token-pool.ts';
 import {convertSchema} from './tools.ts';
 
 export class OpenAi extends LLMProvider {
-	client!: openAI;
+	tokenPool!: TokenPool;
+	private clients = new Map<string, openAI>();
 
-	constructor(public readonly ai: Ai, public readonly host: string | null, public readonly token: string, public model: string) {
+	constructor(public readonly ai: Ai, public readonly host: string | null, public readonly token: string | string[], public model: string) {
 		super();
-		this.client = new openAI(clean({
+		const tokens = makeArray(token).filter(Boolean);
-			baseURL: host,
+		this.tokenPool = new TokenPool(...(tokens.length ? tokens : [host ? 'ignored' : '']));
-			apiKey: token || (host ? 'ignored' : undefined)
-		}));
 	}
 
-	private toStandard(history: any[]): LLMMessage[] {
+	private getClient(token: string): openAI {
-		for(let i = 0; i < history.length; i++) {
+		let client = this.clients.get(token);
-			const h = history[i];
+		if(!client) {
-			if(h.role === 'assistant' && h.tool_calls) {
+			client = new openAI(clean({baseURL: this.host, apiKey: token || undefined}));
-				const tools = h.tool_calls.map((tc: any) => ({
+			this.clients.set(token, client);
-					role: 'tool',
-					id: tc.id,
-					name: tc.function.name,
-					args: JSONAttemptParse(tc.function.arguments, {}),
-					timestamp: h.timestamp
-				}));
-				history.splice(i, 1, ...tools);
-				i += tools.length - 1;
-			} else if(h.role === 'tool' && h.content) {
-				const record = history.find(h2 => h.tool_call_id == h2.id);
-				if(record) {
-					if(h.content.includes('"error":')) record.error = h.content;
-					else record.content = h.content;
 		}
-				history.splice(i, 1);
+		return client;
-				i--;
-			}
-			if(!history[i]?.timestamp) history[i].timestamp = Date.now();
-		}
-		return history;
 	}
 
-	private fromStandard(history: LLMMessage[]): any[] {
+	/** Convert standard history -> OpenAI wire format */
-		return history.reduce((result, h) => {
+	private toWire(history: LLMMessage[], system?: string): any[] {
+		const wire: any[] = [];
+		if(system) wire.push({role: 'system', content: system});
+		for(const h of history) {
 			if(h.role === 'tool') {
-				result.push({
+				wire.push({
 					role: 'assistant',
 					content: null,
-					tool_calls: [{ id: h.id, type: 'function', function: { name: h.name, arguments: JSON.stringify(h.args) } }],
+					tool_calls: [{id: h.id, type: 'function', function: {name: h.name, arguments: JSON.stringify(h.args)}}],
-					refusal: null,
-					annotations: []
 				}, {
 					role: 'tool',
 					tool_call_id: h.id,
-					content: h.error || h.content
+					content: h.error || h.content || '',
 				});
 			} else {
-				const {timestamp, ...rest} = h;
+				wire.push({role: h.role, content: h.content});
-				result.push(rest);
 			}
-			return result;
+		}
-		}, [] as any[]);
+		return wire;
 	}
 
 	ask(message: string, options: LLMRequest = {}): AbortablePromise<string | any> {
 		const controller = new AbortController();
 		return Object.assign(new Promise<any>(async (res, rej) => {
-			if(options.system) {
+			if(!options.history) options.history = [];
-				if(options.history?.[0]?.role != 'system') options.history?.splice(0, 0, {role: 'system', content: options.system, timestamp: Date.now()});
+			const history = options.history;
-				else options.history[0].content = options.system;
+			if(message) history.push({role: 'user', content: message, timestamp: Date.now()});
-			}
+
-			let history = this.fromStandard([...options.history || [], {role: 'user', content: message, timestamp: Date.now()}]);
 			const tools = options.tools || this.ai.options.llm?.tools || [];
 			const requestParams: any = {
 				model: options.model || this.model,
-				messages: history,
 				stream: !!options.stream,
 				max_completion_tokens: options.max_tokens || this.ai.options.llm?.max_tokens || undefined,
 				temperature: options.temperature || this.ai.options.llm?.temperature || undefined,
@@ -96,92 +76,94 @@ export class OpenAi extends LLMProvider {
 
 			if(options.schema) {
 				const schema = convertSchema(options.schema);
-				requestParams.response_format = {
+				requestParams.response_format = {type: 'json_schema', json_schema: {name: 'response', strict: true, schema}};
-					type: 'json_schema',
-					json_schema: {
-						name: 'response',
-						strict: true,
-						schema
-					}
-				};
 			}
+			if(options.stream) requestParams.stream_options = {include_usage: true};
 
-			let resp: any, isFirstMessage = true;
+			try {
+				let terminal = false;
 				do {
-				resp = await this.client.chat.completions.create(requestParams).catch(err => {
+					requestParams.messages = this.toWire(history.filter(h => h.role !== 'system'), options.system);
-					err.message += `\n\nMessages:\n${JSON.stringify(history, null, 2)}`;
+
+					const callStart = Date.now();
+					const resp: any = await this.tokenPool.run(token => this.getClient(token).chat.completions.create(requestParams)).catch(err => {
+						err.message += `\n\nMessages:\n${JSON.stringify(requestParams.messages, null, 2)}`;
 						throw err;
 					});
 
+					let usage: any, msg: any = {content: '', tool_calls: []};
 					if(options.stream) {
-					if(!isFirstMessage) options.stream({text: '\n\n'});
-					else isFirstMessage = false;
-					resp.choices = [{message: {role: 'assistant', content: '', tool_calls: []}}];
 						for await (const chunk of resp) {
 							if(controller.signal.aborted) break;
-						if(chunk.choices[0].delta.content) {
+							if(chunk.usage) usage = chunk.usage;
-							resp.choices[0].message.content += chunk.choices[0].delta.content;
+							if(chunk.choices[0]?.delta?.content) {
+								msg.content += chunk.choices[0].delta.content;
 								options.stream({text: chunk.choices[0].delta.content});
 							}
-
+							if(chunk.choices[0]?.delta?.tool_calls) {
-						if(chunk.choices[0].delta.tool_calls) {
 								for(const deltaTC of chunk.choices[0].delta.tool_calls) {
-								const existing = resp.choices[0].message.tool_calls.find(tc => tc.index === deltaTC.index);
+									const existing = msg.tool_calls.find((tc: any) => tc.index === deltaTC.index);
 									if(existing) {
 										if(deltaTC.id) existing.id = deltaTC.id;
-									if(deltaTC.type) existing.type = deltaTC.type;
+										if(deltaTC.function?.name) existing.function.name = deltaTC.function.name;
-									if(deltaTC.function) {
+										if(deltaTC.function?.arguments) existing.function.arguments += deltaTC.function.arguments;
-										if(!existing.function) existing.function = {};
-										if(deltaTC.function.name) existing.function.name = deltaTC.function.name;
-										if(deltaTC.function.arguments) existing.function.arguments = (existing.function.arguments || '') + deltaTC.function.arguments;
-									}
 									} else {
-									resp.choices[0].message.tool_calls.push({
+										msg.tool_calls.push({
 											index: deltaTC.index,
 											id: deltaTC.id || '',
-										type: deltaTC.type || 'function',
+											function: {name: deltaTC.function?.name || '', arguments: deltaTC.function?.arguments || ''}
-										function: {
-											name: deltaTC.function?.name || '',
-											arguments: deltaTC.function?.arguments || ''
-										}
 										});
 									}
 								}
 							}
 						}
+					} else {
+						usage = resp.usage;
+						msg = resp.choices[0].message;
 					}
+					const duration = Date.now() - callStart;
+					const tps = usage?.completion_tokens && duration > 0 ? usage.completion_tokens / (duration / 1000) : 0;
 
-				if(resp.error) throw new Error(resp.error);
+					const toolCalls = msg.tool_calls || [];
-				const toolCalls = resp.choices[0].message.tool_calls || [];
 					if(toolCalls.length && !controller.signal.aborted) {
-					history.push(resp.choices[0].message);
+						if(msg.content?.trim()) history.push({role: 'assistant', content: msg.content.trim(), timestamp: Date.now(), duration, tps});
-					const results = await Promise.all(toolCalls.map(async (toolCall: any) => {
+
-						const tool = tools?.find(findByProp('name', toolCall.function.name));
+						const entries = toolCalls.map((tc: any) => {
-						if(options.stream) options.stream({tool: toolCall.function.name});
+							const entry: any = {role: 'tool', id: tc.id, name: tc.function.name, args: JSONAttemptParse(tc.function.arguments, {}), content: undefined, timestamp: Date.now()};
-						if(!tool) return {role: 'tool', tool_call_id: toolCall.id, content: '{"error": "Tool not found"}'};
+							history.push(entry);
+							return {tc, entry};
+						});
+
+						await Promise.all(entries.map(async ({tc, entry}: any) => {
+							const tool = tools.find(findByProp('name', tc.function.name));
+							if(options.stream) options.stream({tool: tc.function.name});
+							if(!tool) { entry.error = 'Tool not found'; return; }
 							try {
-							const args = JSONAttemptParse(toolCall.function.arguments, {});
+								const toolStream = options.stream && ((chunk: any) => {
-							const result = await tool.fn(args, options.stream, this.ai);
+									if(chunk.done) { terminal = true; return; }
-							return {role: 'tool', tool_call_id: toolCall.id, content: typeof result == 'object' ? JSONSanitize(result) : result};
+									options.stream!(chunk);
-						} catch (err: any) {
+								});
-							return {role: 'tool', tool_call_id: toolCall.id, content: JSONSanitize({error: err?.message || err?.toString() || 'Unknown'})};
+								const result = await tool.fn(entry.args, toolStream, this.ai, tc.id);
+								entry.content = typeof result === 'object' ? JSONSanitize(result) : result;
+							} catch(err: any) {
+								entry.error = err?.message || err?.toString() || 'Unknown';
 							}
 						}));
-					history.push(...results);
+					} else {
-					requestParams.messages = history;
+						terminal = true;
+						const text = (msg.content || '').trim();
+						if(text) history.push({role: 'assistant', content: text, timestamp: Date.now(), duration, tps});
 					}
-			} while (!controller.signal.aborted && resp.choices?.[0]?.message?.tool_calls?.length);
+				} while(!terminal && !controller.signal.aborted);
-
-			const textContent = resp.choices[0].message.content?.trim() || '';
-			history.push({role: 'assistant', content: textContent});
-			history = this.toStandard(history);
 
 				if(options.stream) options.stream({done: true});
-			if(options.history) options.history.splice(0, options.history.length, ...history);
 
-			// Return parsed JSON if schema provided
+				const turnStart = history.map(h => h.role).lastIndexOf('user');
-			const finalContent = history.at(-1)?.content;
+				const finalContent = history.slice(turnStart + 1).reduce((str, h) => h.role === 'assistant' ? str + (h.content || '') : str, '').trim();
 				res(options.schema ? JSONAttemptParse(finalContent, finalContent) : finalContent);
+			} catch(err) {
+				rej(err);
+			}
 		}), {abort: () => controller.abort()});
 	}
 }

src/provider.ts

@@ -1,5 +1,5 @@
 import {AbortablePromise} from './ai.ts';
-import {LLMMessage, LLMRequest} from './llm.ts';
+import {LLMRequest} from './llm.ts';
 
 export abstract class LLMProvider {
 	abstract ask(message: string, options: LLMRequest): AbortablePromise<string>;

src/token-pool.ts

@@ -0,0 +1,65 @@
+const DEFAULT_COOLDOWN = 15 * 60 * 1000;
+
+type TokenState = {
+	token: string;
+	cooldownUntil: number; // 0 = available now
+	lastError?: {code: number, message: string};
+};
+
+export class TokenPoolExhaustedError extends Error {
+	constructor(public tokens: Record<string, {code: number, message: string}>) {
+		super(`All tokens exhausted:\n${Object.entries(tokens).map(([t, e]) => `${t}: [${e.code}] ${e.message}`).join('\n')}`);
+		this.name = 'TokenPoolExhaustedError';
+	}
+}
+
+export class TokenPool {
+	private states: TokenState[];
+
+	constructor(...tokens: string[]) {
+		this.states = tokens.map(token => ({token, cooldownUntil: 0}));
+	}
+
+	private preview(token: string): string {
+		return token.length <= 8 ? '****' : `${token.slice(0, 4)}...${token.slice(-4)}`;
+	}
+
+	/** Anthropic & OpenAI SDKs both attach `status` to thrown errors */
+	private statusCode(err: any): number {
+		return err?.status ?? err?.response?.status ?? err?.statusCode;
+	}
+
+	private retryAfter(err: any): number {
+		const headers = err?.headers || err?.response?.headers;
+		const raw = headers?.get?.('retry-after') ?? headers?.['retry-after'];
+		if(raw) {
+			const seconds = Number(raw);
+			if(!isNaN(seconds)) return Date.now() + seconds * 1000;
+			const date = new Date(raw).getTime();
+			if(!isNaN(date)) return date;
+		}
+		return Date.now() + DEFAULT_COOLDOWN;
+	}
+
+	async run<T>(fn: (token: string) => Promise<T>): Promise<T> {
+		const now = Date.now();
+		for(const state of this.states) {
+			if(state.cooldownUntil > now) continue;
+			try {
+				const result = await fn(state.token);
+				state.cooldownUntil = 0;
+				state.lastError = undefined;
+				return result;
+			} catch(err: any) {
+				const code = this.statusCode(err);
+				if(![401, 403, 429].includes(code)) throw err;
+				state.cooldownUntil = code === 429 ? this.retryAfter(err) : Date.now() + DEFAULT_COOLDOWN;
+				state.lastError = {code, message: err?.message || 'Unknown error'};
+			}
+		}
+
+		const failures: Record<string, {code: number, message: string}> = {};
+		this.states.forEach(s => { if(s.lastError) failures[this.preview(s.token)] = s.lastError; });
+		throw new TokenPoolExhaustedError(failures);
+	}
+}

src/tools.ts

@@ -41,7 +41,7 @@ export type AiTool = {
 	/** Tool arguments */
 	args?: AiToolArg,
 	/** Callback function */
-	fn: (args: any, stream: LLMRequest['stream'], ai: Ai) => any | Promise<any>,
+	fn: (args: any, stream: LLMRequest['stream'], ai: Ai, toolId?: string) => any | Promise<any>,
 };
 
 export function convertSchema(schema: any): any {
@@ -91,25 +91,33 @@ export function convertSchema(schema: any): any {
 	};
 }
 
-export const CliTool: AiTool = {
+export const ExecCliTool: AiTool = {
 	name: 'cli',
 	description: 'Use the command line interface, returns any output',
 	args: {command: {type: 'string', description: 'Command to run', required: true}},
 	fn: (args: {command: string}) => $Sync`${args.command}`
 }
 
-export const DateTimeTool: AiTool = {
+export const ExecJSTool: AiTool = {
-	name: 'get_datetime',
+	name: 'exec_javascript',
-	description: 'Get local date / time',
+	description: 'Execute commonjs javascript',
-	args: {},
+	args: {
-	fn: async () => new Date().toString()
+		code: {type: 'string', description: 'CommonJS javascript', required: true}
+	},
+	fn: async (args: {code: string}) => {
+		const c = consoleInterceptor(null);
+		const resp = await Fn<any>({console: c}, args.code, true).catch((err: any) => c.output.error.push(err));
+		return {...c.output, return: resp, stdout: undefined, stderr: undefined};
+	}
 }
 
-export const DateTimeUTCTool: AiTool = {
+export const ExecPythonTool: AiTool = {
-	name: 'get_datetime_utc',
+	name: 'exec_python',
-	description: 'Get current UTC date / time',
+	description: 'Execute commonjs javascript',
-	args: {},
+	args: {
-	fn: async () => new Date().toUTCString()
+		code: {type: 'string', description: 'CommonJS javascript', required: true}
+	},
+	fn: async (args: {code: string}) => ({result: $Sync`python -c "${args.code}"`})
 }
 
 export const ExecTool: AiTool = {
@@ -123,11 +131,11 @@ export const ExecTool: AiTool = {
 		try {
 			switch(args.language) {
 				case 'cli':
-					return await CliTool.fn({command: args.code}, stream, ai);
+					return await ExecCliTool.fn({command: args.code}, stream, ai);
 				case 'node':
-					return await JSTool.fn({code: args.code}, stream, ai);
+					return await ExecJSTool.fn({code: args.code}, stream, ai);
 				case 'python':
-					return await PythonTool.fn({code: args.code}, stream, ai);
+					return await ExecPythonTool.fn({code: args.code}, stream, ai);
 				default:
 					throw new Error(`Unsupported language: ${args.language}`);
 			}
@@ -137,8 +145,483 @@ export const ExecTool: AiTool = {
 	}
 }
 
-export const FetchTool: AiTool = {
+export const FsDeleteTool = (whitelist: null | string[] = null): AiTool => {
-	name: 'fetch',
+	return {
+		name: 'fs_delete',
+		description: 'Delete a file or directory',
+		args: {
+			path: {type: 'string', description: 'Path to file or directory', required: true},
+			recursive: {type: 'boolean', description: 'Delete all children', required: false}
+		},
+		fn: async ({path, recursive = false}) => {
+			const {existsSync, rmSync} = await import('fs');
+			const normalizePath = p => p.replace(/\\/g, '/');
+
+			path = normalizePath(path);
+			if(whitelist && !whitelist.some(p => path.startsWith(p))) return {error: 'Permission denied'};
+			if(!existsSync(path)) return {error: 'Path does not exist'};
+
+			rmSync(path, {recursive, force: true});
+			return {success: true, path};
+		}
+	}
+}
+
+export const FsMoveTool = (whitelist: null | string[] = null): AiTool => {
+	return {
+		name: 'fs_move',
+		description: 'Move or rename a file or directory',
+		args: {
+			source: {type: 'string', description: 'Path to source file or directory', required: true},
+			destination: {type: 'string', description: 'Path to destination file or directory', required: true}
+		},
+		fn: async ({source, destination}) => {
+			const {existsSync, renameSync} = await import('fs');
+			const normalizePath = p => p.replace(/\\/g, '/');
+
+			source = normalizePath(source);
+			destination = normalizePath(destination);
+			if(whitelist && !whitelist.some(p => source.startsWith(p) && destination.startsWith(p))) return {error: 'Permission denied'};
+
+			if(!existsSync(source)) return {error: 'Source path does not exist'};
+			if(existsSync(destination)) return {error: 'Destination path already exists'};
+
+			renameSync(source, destination);
+			return {success: true, source, destination};
+		}
+	}
+}
+
+export const FsReadTool = (whitelist: null | string[] = null): AiTool => {
+	return {
+		name: 'fs_read',
+		description: 'Read the contents of a provided path. Works with files and directories',
+		args: {path: {type: 'string', description: 'Path to file or directory', required: true}},
+		fn: async ({path}) => {
+			const {existsSync, lstatSync, readdirSync, readFileSync} = await import('fs');
+			const {join} = await import('path');
+			const normalizePath = p => p.replace(/\\/g, '/');
+
+			path = normalizePath(path);
+			if(whitelist && !whitelist.some(p => path.startsWith(p))) return {error: 'Permission denied'};
+
+			if(!existsSync(path)) return {error: 'Path does not exist'};
+			const stats = lstatSync(path);
+			if(stats.isDirectory()) {
+				const children = readdirSync(path).map(name => {
+					const childPath = normalizePath(join(path, name));
+					const childStats = lstatSync(childPath);
+					return {name, type: childStats.isDirectory() ? 'directory' : 'file', size: childStats.size};
+				});
+				return {type: 'directory', children};
+			}
+			const content = readFileSync(path, 'utf-8');
+			return {type: 'file', content};
+		}
+	}
+}
+
+export const FsSearchTool = (whitelist: null | string[] = null): AiTool => {
+	return {
+		name: 'fs_search',
+		description: 'Scan a directory for matching glob patterns (e.g. "**/*.js", "src/**/*.test.ts")',
+		args: {
+			pattern: {type: 'string', description: 'Glob pattern to match against paths', required: true},
+			root: {type: 'string', description: 'Directory to search from', required: false, default: '.'}
+		},
+		fn: async ({pattern, root = '.'}) => {
+			const {existsSync, lstatSync, readdirSync} = await import('fs');
+			const {join, relative} = await import('path');
+			const normalizePath = p => p.replace(/\\/g, '/');
+
+			root = normalizePath(root);
+			if(!existsSync(root)) return {error: 'Root path does not exist'};
+			if(!lstatSync(root).isDirectory()) return {error: 'Root path is not a directory'};
+
+			if(whitelist && !whitelist.some(p => root.startsWith(p))) return {error: 'Permission denied'};
+
+			const globToRegex = (glob) => {
+				let re = '';
+				for(let i = 0; i < glob.length; i++) {
+					const c = glob[i];
+					if(c === '*') {
+						if(glob[i + 1] === '*') {
+							const isSlash = glob[i + 2] === '/';
+							re += '.*';
+							i += isSlash ? 2 : 1;
+						} else {
+							re += '[^/]*';
+						}
+					} else if(c === '?') {
+						re += '[^/]';
+					} else if('.+^$(){}|[]\\'.includes(c)) {
+						re += '\\' + c;
+					} else {
+						re += c;
+					}
+				}
+				return new RegExp('^' + re + '$');
+			};
+			const regex = globToRegex(pattern);
+
+			const results: any = [];
+			const walk = (dir) => {
+				for(const name of readdirSync(dir)) {
+					const fullPath = normalizePath(join(dir, name));
+					const stats = lstatSync(fullPath);
+					const relPath = normalizePath(relative(root, fullPath));
+					if(regex.test(relPath)) {
+						results.push({path: relPath, type: stats.isDirectory() ? 'directory' : 'file', size: stats.size});
+					}
+					if(stats.isDirectory()) walk(fullPath);
+				}
+			};
+			walk(root);
+
+			return results;
+		}
+	}
+}
+
+export const FsWriteTool = (whitelist: null | string[] = null): AiTool => {
+	return {
+		name: 'fs_write',
+		description: 'Create a directory, write content to a file or preform a find & replace',
+		args: {
+			path: {type: 'string', description: 'Path to file or directory', required: true},
+			content: {type: 'string', description: 'Content to write or replace (Omit to create a directory)'},
+			find: {type: 'string', description: 'Text or regex pattern to match (regex must match pattern: "/pattern/g")'}
+		},
+		fn: async ({path, content, find}) => {
+			const {existsSync, mkdirSync, readFileSync, writeFileSync} = await import('fs');
+			const {dirname} = await import('path');
+			const normalizePath = p => p.replace(/\\/g, '/');
+
+			path = normalizePath(path);
+			if(whitelist && !whitelist.some(p => path.startsWith(p))) return {error: 'Permission denied'};
+
+			if(content === undefined) {
+				mkdirSync(path, {recursive: true});
+				return {success: true, type: 'directory', path};
+			}
+
+			const dir = normalizePath(dirname(path));
+			if(!existsSync(dir)) mkdirSync(dir, {recursive: true});
+
+			if(find && existsSync(path)) {
+				const existing = readFileSync(path, 'utf-8');
+				const regexMatch = find.match(/^\/(.+)\/([gimuy]*)$/);
+				const pattern = regexMatch ? new RegExp(regexMatch[1], regexMatch[2]) : find;
+
+				if(!existing.match(pattern)) return {error: 'Find pattern not found in file'};
+
+				const updated = existing.replace(pattern, content);
+				writeFileSync(path, updated, 'utf-8');
+				return {success: true, type: 'file', path, replaced: true, content: updated};
+			}
+
+			writeFileSync(path, content, 'utf-8');
+			return {success: true, type: 'file', path, content};
+		}
+	}
+}
+
+export const GetPathsTool: AiTool = {
+	name: 'get_paths',
+	description: 'Get the current working directory, and paths to the users home directory',
+	fn: async () => {
+		return {
+			home: os.homedir(),
+			cwd: process.cwd()
+		};
+	}
+}
+
+export const GetDatetimeTool: AiTool = {
+	name: 'get_datetime',
+	description: 'Get local/UTC timestamp',
+	args: {
+		timezone: {type: 'string', description: 'Which timezone to return, defaults to local', enum: ['local', 'utc'], default: 'local'}
+	},
+	fn: ({timezone}) => new Date()[timezone === 'local' ? 'toString' : 'toUTCString']()
+}
+
+export const GetDevice: AiTool = {
+	name: 'get_device',
+	description: 'Get comprehensive system information including hostname, specs, load, storage, and network status',
+	args: {},
+	fn: async () => {
+		const platform = os.platform();
+		const hostname = os.hostname();
+
+		// CPU Info
+		const cpus = os.cpus();
+		const cpuModel = cpus[0].model;
+		const cpuCores = cpus.length;
+
+		// Memory Info
+		const totalMem: any = (os.totalmem() / 1024 / 1024 / 1024).toFixed(2);
+		const freeMem: any = (os.freemem() / 1024 / 1024 / 1024).toFixed(2);
+		const usedMem: any = (totalMem - freeMem).toFixed(2);
+		const memUsage: any = ((usedMem / totalMem) * 100).toFixed(1);
+
+		// Load Average (not available on Windows)
+		const loadAvg = platform === 'win32' ? ['N/A', 'N/A', 'N/A'] : os.loadavg().map(l => l.toFixed(2));
+
+		// Storage Usage
+		let storage = {};
+		if(platform === 'win32') {
+			const ps = $Sync`powershell "Get-PSDrive C | Select-Object Used,Free | ConvertTo-Json"`.trim();
+			const drive = JSON.parse(ps);
+			const used: any = (drive.Used / 1024 / 1024 / 1024).toFixed(2);
+			const free: any = (drive.Free / 1024 / 1024 / 1024).toFixed(2);
+			const total: any = (parseFloat(used) + parseFloat(free)).toFixed(2);
+			const usage: any = ((used / total) * 100).toFixed(1);
+			storage = {
+				filesystem: 'C:',
+				size: `${total} GB`,
+				used: `${used} GB`,
+				available: `${free} GB`,
+				usage: `${usage}%`
+			};
+		} else {
+			const df = $Sync`df -h / | tail -1`.trim();
+			const s = df.split(/\s+/);
+			storage = {
+				filesystem: s[0],
+				size: s[1],
+				used: s[2],
+				available: s[3],
+				usage: s[4]
+			};
+		}
+
+		// Network Status
+		const interfaces = os.networkInterfaces();
+		const activeIfaces = Object.entries(interfaces)
+			.filter(([name]) => name !== 'lo' && !name.includes('Loopback'))
+			.map(([name, addrs]) => {
+				const ipv4 = addrs?.find(a => a.family === 'IPv4');
+				return ipv4 ? {name, ip: ipv4.address} : null;
+			})
+			.filter(Boolean);
+
+		// Internet connectivity check
+		let internet = false;
+		try {
+			if(platform === 'win32') {
+				$Sync`powershell "Test-Connection -ComputerName 8.8.8.8 -Count 1 -Quiet"`;
+			} else {
+				$Sync`ping -c 1 -W 2 8.8.8.8 > /dev/null 2>&1`;
+			}
+			internet = true;
+		} catch {}
+
+		// Uptime
+		const uptime = os.uptime();
+		const days = Math.floor(uptime / 86400);
+		const hours = Math.floor((uptime % 86400) / 3600);
+		const minutes = Math.floor((uptime % 3600) / 60);
+
+		return {
+			hostname,
+			cpu: {
+				model: cpuModel,
+				cores: cpuCores
+			},
+			memory: {
+				total: `${totalMem} GB`,
+				used: `${usedMem} GB`,
+				free: `${freeMem} GB`,
+				usage: `${memUsage}%`
+			},
+			load: {
+				'1min': loadAvg[0],
+				'5min': loadAvg[1],
+				'15min': loadAvg[2]
+			},
+			storage,
+			network: {
+				interfaces: activeIfaces,
+				internet: internet ? 'connected' : 'disconnected'
+			},
+			uptime: `${days}d ${hours}h ${minutes}m`,
+			platform: `${os.type()} ${os.release()}`
+		};
+	}
+}
+
+export const GetWikipediaTool: AiTool = {
+	name: 'get_wikipedia',
+	description: 'Search Wikipedia for matching articles',
+	args: {
+		query: {type: 'string', description: 'Search term or article title', required: true},
+		mode: {type: 'string', description: 'search - look for articles, summary - intro of first found article (default), full - complete first found article', enum: ['search', 'summary', 'full'], default: 'summary'},
+		ua: {type: 'string', description: 'User Agent'},
+	},
+	fn: async ({query, mode, ua}) => {
+		class WikipediaClient {
+			useragent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)';
+
+			constructor(useragent: string) {
+				this.useragent = useragent;
+			}
+
+			async get(url) {
+				const resp = await fetch(url, {headers: {'User-Agent': this.useragent}});
+				return resp.json();
+			}
+
+			api(params) {
+				const qs = new URLSearchParams({...params, format: 'json', utf8: '1'}).toString();
+				return this.get(`https://en.wikipedia.org/w/api.php?${qs}`);
+			}
+
+			clean(text) {
+				const cutoffs = ['== See also ==', '== References ==', '== Bibliography ==', '== External links =='];
+				for (const marker of cutoffs) {
+					const idx = text.indexOf(marker);
+					if (idx !== -1) text = text.slice(0, idx);
+				}
+
+				return text
+					.replace(/^={4}\s*(.+?)\s*={4}$/gm, '#### $1')
+					.replace(/^={3}\s*(.+?)\s*={3}$/gm, '### $1')
+					.replace(/^={2}\s*(.+?)\s*={2}$/gm, '## $1')
+					.replace(/\n{3,}/g, '\n\n')
+					.replace(/ {2,}/g, ' ')
+					.replace(/\[\d+]/g, '')
+					.trim();
+			}
+
+			async searchTitles(query: string, limit = 6) {
+				const data = await this.api({action: 'query', list: 'search', srsearch: query, srlimit: limit, srprop: 'snippet'});
+				return data.query?.search || [];
+			}
+
+			async fetchExtract(title: string, introOnly = false) {
+				const params: any = {action: 'query', prop: 'extracts', titles: title, explaintext: 1, redirects: 1};
+				if(introOnly) params.exintro = 1;
+				const data = await this.api(params);
+				const page: any = Object.values(data.query?.pages || {})[0];
+				return this.clean(page?.extract || '');
+			}
+
+			pageUrl(title: string) {
+				return `https://en.wikipedia.org/wiki/${encodeURIComponent(title.replace(/ /g, '_'))}`;
+			}
+
+			stripHtml(text: string) {
+				return text.replace(/<[^>]+>/g, '');
+			}
+
+			async lookup(query: string, detail = 'summary') {
+				const results = await this.searchTitles(query, 6);
+				if(!results.length) return `❌ No Wikipedia articles found for "${query}"`;
+				const title = results[0].title;
+				const url = this.pageUrl(title);
+				const introOnly = detail !== 'full';
+				const content = await this.fetchExtract(title, introOnly);
+				return `## ${title}\n🔗 ${url}\n\n${content}`;
+			}
+
+			async search(query: string) {
+				const results = await this.searchTitles(query, 8);
+				if(!results.length) return `❌ No results for "${query}"`;
+				const lines = [`### Search results for "${query}"\n`];
+				for(let i = 0; i < results.length; i++) {
+					const r = results[i];
+					const snippet = this.stripHtml(r.snippet || '').trim();
+					lines.push(`**${i + 1}. ${r.title}**\n${snippet}\n${this.pageUrl(r.title)}`);
+				}
+				return lines.join('\n\n');
+			}
+		}
+
+		const wiki = new WikipediaClient(ua);
+		if(mode === 'search') return wiki.search(query);
+		return wiki.lookup(query, mode || 'summary');
+	}
+};
+
+export const GeoCodeTool: AiTool = {
+	name: 'geo_code',
+	description: 'Converts coordinates to address OR vice versa',
+	args: {
+		query: {type: 'string', description: 'Search query - coordinates (lat,lon) or address string', required: true},
+	},
+	fn: async ({query}) => {
+		const coordinates = /(-?\d+(?:\.\d+)?).*?,.*?(-?\d+(?:\.\d+)?)/.exec(query);
+		if(coordinates) { // Geolocate
+			const url = `https://nominatim.openstreetmap.org/reverse?format=json&lat=${encodeURIComponent(coordinates[1])}&lon=${encodeURIComponent(coordinates[2])}`;
+			const response = await fetch(url, {headers: {'User-Agent': 'OpenSight/1.0', 'Accept-Language': 'en'}});
+			const data = await response.json();
+			if(data.display_name) return {address: data.display_name, mode: 'geolocate'};
+		} else { // Geocode
+			const url = `https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(query)}`;
+			const response = await fetch(url, {headers: {'User-Agent': 'OpenSight/1.0'}});
+			const data = await response.json();
+			if(data[0]) return {latitude: parseFloat(data[0].lat), longitude: parseFloat(data[0].lon), mode: 'geocode'};
+		}
+		return {error: 'Not found'};
+	},
+}
+
+export const GeoWeatherTool: AiTool = {
+	name: 'geo_weather',
+	description: 'Gets weather and air quality info for a location and time',
+	args: {
+		query: {type: 'string', description: 'Location - address or place name', required: true},
+		day: {type: 'string', description: 'Date to retrieve (YYYY-MM-DD), defaults to today'},
+	},
+	fn: async ({query, day}) => {
+		day = day || new Date().toISOString().slice(0, 10);
+
+		const geoUrl = `https://nominatim.openstreetmap.org/search?format=json&q=${encodeURIComponent(query)}`;
+		const geoResponse = await fetch(geoUrl, {headers: {'User-Agent': 'OpenSight/1.0'}});
+		const geoData = await geoResponse.json();
+		if(!geoData[0]) return {error: 'Location not found'};
+
+		const lat = parseFloat(geoData[0].lat);
+		const lon = parseFloat(geoData[0].lon);
+
+		const weatherUrl = `https://api.open-meteo.com/v1/forecast?latitude=${lat}&longitude=${lon}&start_date=${day}&end_date=${day}&daily=weathercode,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,precipitation_sum,precipitation_probability_max,windspeed_10m_max,winddirection_10m_dominant,uv_index_max,sunrise,sunset&timezone=auto`;
+		const airUrl = `https://air-quality-api.open-meteo.com/v1/air-quality?latitude=${lat}&longitude=${lon}&start_date=${day}&end_date=${day}&hourly=us_aqi,european_aqi,pm10,pm2_5&timezone=auto`;
+
+		const [weatherResponse, airResponse] = await Promise.all([fetch(weatherUrl), fetch(airUrl)]);
+		const weatherData = await weatherResponse.json();
+		const airData = await airResponse.json();
+
+		const avg = arr => (arr && arr.length) ? arr.reduce((a, b) => a + b, 0) / arr.length : null;
+
+		return {
+			location: geoData[0].display_name,
+			latitude: lat,
+			longitude: lon,
+			elevation: weatherData.elevation,
+			date: day,
+			weatherCode: weatherData.daily?.weathercode?.[0],
+			tempMax: weatherData.daily?.temperature_2m_max?.[0],
+			tempMin: weatherData.daily?.temperature_2m_min?.[0],
+			feelsLikeMax: weatherData.daily?.apparent_temperature_max?.[0],
+			feelsLikeMin: weatherData.daily?.apparent_temperature_min?.[0],
+			precipitation: weatherData.daily?.precipitation_sum?.[0],
+			precipitationChance: weatherData.daily?.precipitation_probability_max?.[0],
+			windSpeedMax: weatherData.daily?.windspeed_10m_max?.[0],
+			windDirection: weatherData.daily?.winddirection_10m_dominant?.[0],
+			uvIndexMax: weatherData.daily?.uv_index_max?.[0],
+			sunrise: weatherData.daily?.sunrise?.[0],
+			sunset: weatherData.daily?.sunset?.[0],
+			usAqi: avg(airData.hourly?.us_aqi),
+			europeanAqi: avg(airData.hourly?.european_aqi),
+			pm10: avg(airData.hourly?.pm10),
+			pm2_5: avg(airData.hourly?.pm2_5),
+		};
+	},
+}
+
+export const WebFetchTool: AiTool = {
+	name: 'web_fetch',
 	description: 'Make HTTP request to URL',
 	args: {
 		url: {type: 'string', description: 'URL to fetch', required: true},
@@ -154,30 +637,59 @@ export const FetchTool: AiTool = {
 	}) => new Http({url: args.url, headers: args.headers}).request({method: args.method || 'GET', body: args.body})
 }
 
-export const JSTool: AiTool = {
+export const WebFlareSolverTool = (host: string) => {
-	name: 'exec_javascript',
+	return {
-	description: 'Execute commonjs javascript',
+		name: 'web_flaresolverr',
+		description: 'Use a flaresolverr proxy to bypass cloudflare bot detection',
 		args: {
-		code: {type: 'string', description: 'CommonJS javascript', required: true}
+			url: {type: 'string', description: 'URL to fetch', required: true},
+			cmd: {type: 'string', description: 'Flaresolverr cmd', enum: ['request.get', 'request.post'], default: 'request.get'},
+			maxTimeout: {type: 'number', description: 'Fetch time limit', default: 60_000},
+			postData: {type: 'object', description: 'Data to send during request.post requests'},
 		},
-	fn: async (args: {code: string}) => {
+		fn: async ({url, cmd, maxTimeout, postData}) => {
-		const c = consoleInterceptor(null);
+			function toFormUrlEncoded(obj, prefix = '') {
-		const resp = await Fn<any>({console: c}, args.code, true).catch((err: any) => c.output.error.push(err));
+				const pairs: any = [];
-		return {...c.output, return: resp, stdout: undefined, stderr: undefined};
+				for (const key in obj) {
+					if (!obj.hasOwnProperty(key)) continue;
+
+					const value = obj[key];
+					const encodedKey = prefix
+						? `${prefix}[${encodeURIComponent(key)}]`
+						: encodeURIComponent(key);
+
+					if (value === null || value === undefined) {
+						pairs.push(`${encodedKey}=`);
+					} else if (typeof value === 'object' && !Array.isArray(value)) {
+						pairs.push(toFormUrlEncoded(value, encodedKey));
+					} else if (Array.isArray(value)) {
+						value.forEach(item => {
+							pairs.push(`${encodedKey}[]=${encodeURIComponent(item)}`);
+						});
+					} else {
+						pairs.push(`${encodedKey}=${encodeURIComponent(value)}`);
+					}
+				}
+
+				return pairs.join('&');
+			}
+
+			const res = await fetch(host + '/v1', {
+				method: 'POST',
+				headers: {'Content-Type': 'application/json'},
+				body: JSON.stringify({cmd, url, maxTimeout, postData: postData ? toFormUrlEncoded(postData) : undefined}),
+			});
+
+			if(!res.ok) throw new Error(`FlareSolverr HTTP error: ${res.status} ${res.statusText}`);
+			const data = await res.json();
+			if(data.status !== 'ok') throw new Error(`FlareSolverr error: ${data.message ?? data.status}`);
+			return data.solution.response;
+		}
 	}
 }
 
-export const PythonTool: AiTool = {
+export const WebReadTool: AiTool = {
-	name: 'exec_javascript',
+	name: 'web_read',
-	description: 'Execute commonjs javascript',
-	args: {
-		code: {type: 'string', description: 'CommonJS javascript', required: true}
-	},
-	fn: async (args: {code: string}) => ({result: $Sync`python -c "${args.code}"`})
-}
-
-export const ReadWebpageTool: AiTool = {
-	name: 'read_webpage',
 	description: 'Extract clean content from webpages, or convert media/documents to accessible formats',
 	args: {
 		url: {type: 'string', description: 'URL to read', required: true},
@@ -305,91 +817,3 @@ export const WebSearchTool: AiTool = {
 		return results;
 	}
 }
-
-export const WikipediaTool: AiTool = {
-	name: 'wikipedia_search',
-	description: 'Search Wikipedia for matching articles',
-	args: {
-		query: {type: 'string', description: 'Search term or article title', required: true},
-		mode: {type: 'string', description: 'search - look for articles, summary - intro of first found article (default), full - complete first found article', enum: ['search', 'summary', 'full'], default: 'summary'}
-	},
-	fn: async (args: {query: string, mode: 'search' | 'summary' | 'full'}) => {
-		const UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)';
-
-		class WikipediaClient {
-			async get(url: string) {
-				const resp = await fetch(url, {headers: {'User-Agent': UA}});
-				return resp.json();
-			}
-
-			api(params: any) {
-				const qs = new URLSearchParams({...params, format: 'json', utf8: '1'}).toString();
-				return this.get(`https://en.wikipedia.org/w/api.php?${qs}`);
-			}
-
-			clean(text: string) {
-				const cutoffs = ['== See also ==', '== References ==', '== Bibliography ==', '== External links =='];
-				for (const marker of cutoffs) {
-					const idx = text.indexOf(marker);
-					if (idx !== -1) text = text.slice(0, idx);
-				}
-
-				return text
-					.replace(/^={4}\s*(.+?)\s*={4}$/gm, '#### $1')
-					.replace(/^={3}\s*(.+?)\s*={3}$/gm, '### $1')
-					.replace(/^={2}\s*(.+?)\s*={2}$/gm, '## $1')
-					.replace(/\n{3,}/g, '\n\n')
-					.replace(/ {2,}/g, ' ')
-					.replace(/\[\d+\]/g, '')
-					.trim();
-			}
-
-			async searchTitles(query: string, limit = 6) {
-				const data = await this.api({action: 'query', list: 'search', srsearch: query, srlimit: limit, srprop: 'snippet'});
-				return data.query?.search || [];
-			}
-
-			async fetchExtract(title: string, introOnly = false) {
-				const params: any = {action: 'query', prop: 'extracts', titles: title, explaintext: 1, redirects: 1};
-				if(introOnly) params.exintro = 1;
-				const data = await this.api(params);
-				const page: any = Object.values(data.query?.pages || {})[0];
-				return this.clean(page?.extract || '');
-			}
-
-			pageUrl(title: string) {
-				return `https://en.wikipedia.org/wiki/${encodeURIComponent(title.replace(/ /g, '_'))}`;
-			}
-
-			stripHtml(text: string) {
-				return text.replace(/<[^>]+>/g, '');
-			}
-
-			async lookup(query: string, detail = 'summary') {
-				const results = await this.searchTitles(query, 6);
-				if(!results.length) return `❌ No Wikipedia articles found for "${query}"`;
-				const title = results[0].title;
-				const url = this.pageUrl(title);
-				const introOnly = detail !== 'full';
-				const content = await this.fetchExtract(title, introOnly);
-				return `## ${title}\n🔗 ${url}\n\n${content}`;
-			}
-
-			async search(query: string) {
-				const results = await this.searchTitles(query, 8);
-				if(!results.length) return `❌ No results for "${query}"`;
-				const lines = [`### Search results for "${query}"\n`];
-				for(let i = 0; i < results.length; i++) {
-					const r = results[i];
-					const snippet = this.stripHtml(r.snippet || '').trim();
-					lines.push(`**${i + 1}. ${r.title}**\n${snippet}\n${this.pageUrl(r.title)}`);
-				}
-				return lines.join('\n\n');
-			}
-		}
-
-		const wiki = new WikipediaClient();
-		if(args.mode == 'search') return wiki.search(args.query);
-		return wiki.lookup(args.query, args.mode || 'summary');
-	}
-};