fixed openai system calls in history breaking anthropic calls

package.json

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

src/antrhopic.ts

@@ -21,10 +21,10 @@ export class Anthropic extends LLMProvider {
 				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});
+				if(textContent) messages.push({role: h.role, content: textContent, timestamp: timestamp});
 				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});
+						messages.push({role: 'tool', id: c.id, name: c.name, args: c.input, timestamp: c.timestamp, 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;
@@ -46,13 +46,16 @@ export class Anthropic extends LLMProvider {
 				i++;
 			}
 		}
-		return history.map(({timestamp, ...h}) => h);
+		return history;
 	}
 
 	ask(message: string, options: LLMRequest = {}): AbortablePromise<string | any> {
 		const controller = new AbortController();
 		return Object.assign(new Promise<any>(async (res) => {
-			let history = this.fromStandard([...options.history || [], {role: 'user', content: message, timestamp: Date.now()}]);
+			let history = this.fromStandard([
+				...(options.history || []).filter(h => h.role !== 'system'),
+				{role: 'user', content: message, timestamp: Date.now()}
+			]);
 			const tools = options.tools || this.ai.options.llm?.tools || [];
 			const requestParams: any = {
 				model: options.model || this.model,
@@ -83,8 +86,9 @@ export class Anthropic extends LLMProvider {
 				};
 			}
 
-			let resp: any, isFirstMessage = true;
+			let resp: any, hasStreamedText = false, terminal = false;
 			do {
+				requestParams.messages = history.map(({timestamp, ...m}) => m);
 				resp = await this.client.messages.create(requestParams).catch(err => {
 					err.message += `\n\nMessages:\n${JSON.stringify(history, null, 2)}`;
 					throw err;
@@ -92,8 +96,7 @@ export class Anthropic extends LLMProvider {
 
 				// Streaming mode
 				if(options.stream) {
-					if(!isFirstMessage) options.stream({text: '\n\n'});
+					if(hasStreamedText) options.stream({text: '\n\n'});
-					else isFirstMessage = false;
 					resp.content = [];
 					for await (const chunk of resp) {
 						if(controller.signal.aborted) break;
@@ -107,13 +110,13 @@ export class Anthropic extends LLMProvider {
 							if(chunk.delta.type === 'text_delta') {
 								const text = chunk.delta.text;
 								resp.content.at(-1).text += text;
-								options.stream({text});
+								if(text) { hasStreamedText = true; options.stream({text}); }
 							} else if(chunk.delta.type === 'input_json_delta') {
 								resp.content.at(-1).input += chunk.delta.partial_json;
 							}
 						} else if(chunk.type === 'content_block_stop') {
 							const last = resp.content.at(-1);
-							if(last.input != null) last.input = last.input ? JSONAttemptParse(last.input, {}) : {};
+							if(last?.input != null) last.input = last.input ? JSONAttemptParse(last.input, {}) : {};
 						} else if(chunk.type === 'message_stop') {
 							break;
 						}
@@ -123,31 +126,35 @@ export class Anthropic extends LLMProvider {
 				// Run tools
 				const toolCalls = resp.content.filter((c: any) => c.type === 'tool_use');
 				if(toolCalls.length && !controller.signal.aborted) {
-					history.push({role: 'assistant', content: resp.content});
+					history.push({role: 'assistant', content: resp.content, timestamp: Date.now()});
 					const results = await Promise.all(toolCalls.map(async (toolCall: any) => {
 						const tool = tools.find(findByProp('name', toolCall.name));
 						if(options.stream) options.stream({tool: toolCall.name});
 						if(!tool) return {tool_use_id: toolCall.id, is_error: true, content: 'Tool not found'};
 						try {
-							const result = await tool.fn(toolCall.input, options?.stream, this.ai);
+							// Wrap stream so a tool's `done` ends turn gracefully
+							const toolStream = options.stream && ((chunk: any) => {
+								if(chunk.done) { terminal = true; return; }
+								options.stream!(chunk);
+							});
+							const result = await tool.fn(toolCall.input, toolStream, this.ai);
 							return {type: 'tool_result', tool_use_id: toolCall.id, content: typeof result == 'object' ? JSONSanitize(result) : result};
 						} catch (err: any) {
 							return {type: 'tool_result', tool_use_id: toolCall.id, is_error: true, content: err?.message || err?.toString() || 'Unknown'};
 						}
 					}));
-					history.push({role: 'user', content: results});
+					history.push({role: 'user', content: results, timestamp: Date.now()});
 					requestParams.messages = history;
 				}
-			} while (!controller.signal.aborted && resp.content.some((c: any) => c.type === 'tool_use'));
+			} while (!terminal && !controller.signal.aborted && resp.content.some((c: any) => c.type === 'tool_use'));
 
-			const textContent = resp.content.filter((c: any) => c.type == 'text').map((c: any) => c.text).join('\n\n');
+			if(!terminal) {
-			history.push({role: 'assistant', content: textContent});
+				const textContent = resp.content.filter((c: any) => c.type == 'text').map((c: any) => c.text).join('\n\n');
+				history.push({role: 'assistant', content: textContent, timestamp: Date.now()});
+			}
 			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 finalContent = history.at(-1)?.content;
 			res(options.schema ? JSONAttemptParse(finalContent, finalContent) : finalContent);
 		}), {abort: () => controller.abort()});

src/index.ts

@@ -3,8 +3,6 @@ export * from './antrhopic';
 export * from './audio';
 export * from './llm';
 export * from './memory';
-export * from './memory-cache';
-export * from './memory-graph';
 export * from './open-ai';
 export * from './provider';
 export * from './tools';

src/llm.ts

@@ -1,17 +1,31 @@
+import {snakeCase} from '@ztimson/utils';
 import {AbortablePromise, Ai} from './ai.ts';
 import {Anthropic} from './antrhopic.ts';
-import {MemoryCache} from './memory-cache.ts';
 import {OpenAi} from './open-ai.ts';
 import {LLMProvider} from './provider.ts';
 import {AiTool, AiToolArg} from './tools.ts';
 import {fileURLToPath} from 'url';
 import {dirname, join} from 'path';
 import {spawn} from 'node:child_process';
-import {Memory, MemoryManager} from './memory.ts';
+import {Memory, MemoryCache, MemoryManager, MemoryOptions} from './memory.ts';
 
 export type AnthropicConfig = {proto: 'anthropic', token: string};
 export type OpenAiConfig = {proto: 'openai', host?: string, token: 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;
+	/** Explicit whitelist of agents this agent may delegate to. Default: none - must opt-in, self is always excluded */
+	agents?: string[] | null;
+}
+
 export type LLMMessage = {
 	/** Message originator */
 	role: 'assistant' | 'system' | 'user';
@@ -56,13 +70,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 = {
@@ -83,6 +101,7 @@ export type Skill = {
 	content: string;
 }
 
+const MAX_AGENT_DEPTH = 5;
 
 class LLM {
 	private memoryManager!: MemoryManager;
@@ -100,6 +119,60 @@ class LLM {
 		this.memoryManager = new MemoryManager(this);
 	}
 
+	/**
+	 * Wrap agents as tools. Nested delegation is opt-in only (empty by default, like
+	 * tools/skills/mcp) and an agent can never call itself even if explicitly whitelisted.
+	 * Delegate results are queued in `pending` and spliced into history by `ask()` after
+	 * the provider's own end-of-turn history sync has already run.
+	 */
+	private setupAgent(agents: Agent[] = [], allAgents: Agent[], pending: Map<string, {resp: string, subHistory: LLMMessage[]}[]>, aborts: (() => void)[], depth = 0): 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: {
+					context: {type: 'string', description: 'Summary of related messages, samples, files, etc...', required: true},
+					instructions: {type: 'string', description: 'Detailed instructions for subagent to complete', required: true},
+				},
+				fn: async (args: any, stream: any) => {
+					if(depth >= MAX_AGENT_DEPTH) return 'Max agent delegation depth exceeded';
+
+					const subHistory: LLMMessage[] = [];
+					// Opt-in only, self always excluded regardless of whitelist
+					const nested = (a.agents || [])
+						.map(name => allAgents.find(x => x.name === name))
+						.filter((x): x is Agent => !!x && x.name !== a.name);
+
+					const request = this.ask(`${args.instructions}${args.context ? `\n\n<context>${args.context}</context>` : ''}`, {
+						system: `You are a specialized subagent. ${a.delegate ? 'Your output streams directly to the user for the remainder of this turn.' : 'You are wrapped in a tool call that will be analysis by an LLM'}
+As a subagent, focus on executing your task completely using available tools and returning only the final result - no commentary, questions, or dialogue.
+
+${a.system}`,
+						model: a.model || undefined,
+						temperature: a.temperature,
+						stream: a.delegate ? stream : undefined,
+						history: subHistory,
+						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) {
+						if(!pending.has(toolName)) pending.set(toolName, []);
+						pending.get(toolName)!.push({resp, subHistory});
+						return '';
+					}
+					return resp;
+				}
+			};
+		});
+	}
+
 	private async setupMcp(servers: McpServer[] = []): Promise<{prompt: string, tools: AiTool[]}> {
 		if(!servers?.length) return {prompt: '', tools: []};
 		const allTools: AiTool[] = [];
@@ -170,9 +243,11 @@ class LLM {
 		if(!this.models[m]) throw new Error(`Model does not exist: ${m}`);
 		let request: AbortablePromise<string> | null = null;
 		let aborted = false;
+		const nestedAborts: (() => void)[] = [];
 		const abort = () => {
 			aborted = true;
 			request?.abort?.();
+			nestedAborts.forEach(a => a());
 		};
 
 		const promise = (async () => {
@@ -196,22 +271,46 @@ class LLM {
 				tools.push(...s.tools);
 			}
 
+			// Agents
+			const agents = options.agents || this.ai.options?.llm?.agents;
+			const pendingDelegates = new Map<string, {resp: string, subHistory: LLMMessage[]}[]>();
+			if(agents?.length) tools.push(...this.setupAgent(agents, agents, pendingDelegates, nestedAborts, options._agentDepth || 0));
+
 			// Memory
-			if (options.memory) {
+			const mem = MemoryManager.normalize(options.memory);
-				const mems = options.memory instanceof MemoryCache ? options.memory.memories : options.memory;
+			if(mem) {
+				const mems = mem.memory instanceof MemoryCache ? mem.memory.memories : mem.memory;
 				if(mems.length) {
-					const relevant = await this.memoryManager.recollect(message, options.memory, 5);
+					if(mem.inject) {
-					prompts.unshift(`You have access to the following memory files:
+						const pool = 15; // candidates considered, cheap since only refs are listed
-	${mems.map(m => `- ${m.name}: ${m.description}`).join('\n')}
+						const budget = mem.maxTokens ?? 2000; // actual content injected
-	${relevant.length ? `
+						const relevant = await this.memoryManager.recollect(message, mem.memory, pool);
-	Relevant memories have been preloaded:
+
-	${relevant.map(r => `
+						let used = 0;
-	**${r.name}**
+						const preloaded: typeof relevant = [];
-	${r.description}
+						const listed: typeof relevant = [];
-	${r.content}
+						for(const r of relevant) {
-	`).join('\n---\n')}
+							const t = this.estimateTokens(r.content);
-	` : ''}`.trim());
+							if(used + t <= budget || preloaded.length === 0) {
-					tools.push(this.memoryManager.tools.read(options.memory));
+								preloaded.push(r);
+								used += t;
+							} else listed.push(r);
+						}
+
+						prompts.unshift(`You have access to the following memory files:
+${mems.map(m => `- ${m.name}: ${m.description}`).join('\n')}
+${preloaded.length ? `
+Relevant memories have been preloaded:
+${preloaded.map(r => `
+**${r.name}**
+${r.description}
+${r.content}
+`).join('\n---\n')}
+` : ''}${listed.length ? `
+Also relevant but not preloaded (use \`memory_recall\`): ${listed.map(r => r.name).join(', ')}
+` : ''}`.trim());
+					}
+					if(mem.tool) tools.push(this.memoryManager.tools.read(mem.memory));
 				}
 			}
 
@@ -219,16 +318,33 @@ class LLM {
 
 			prompts.unshift(options.system || this.ai.options.llm?.system || '');
 			request = this.models[m].ask(message, {...options, tools, system: prompts.filter(Boolean).join('\n\n')});
-			const resp = await request;
+			let resp = await request;
+
+			// Spice delegated agents response into history
+			let lastDelegateResp: string | null = null;
+			if(pendingDelegates.size) {
+				for(let i = 0; i < history.length; i++) {
+					const h = history[i];
+					if(h.role !== 'tool' || h.content !== '') continue;
+					const queue = pendingDelegates.get(h.name);
+					if(!queue?.length) continue;
+					const {resp: delegateResp, subHistory} = queue.shift()!;
+					const insert: LLMMessage[] = [...subHistory.filter(sh => sh.role === 'tool'), {role: 'assistant', content: delegateResp, timestamp: Date.now()}];
+					history.splice(i + 1, 0, ...insert);
+					lastDelegateResp = delegateResp;
+					i += insert.length;
+				}
+			}
+
+			// If the orchestrator added no commentary of its own, its answer IS the delegate's answer
+			if(typeof resp === 'string' && !resp.trim() && lastDelegateResp !== null) resp = lastDelegateResp;
 
 			// Trim memory injections from history
-			if(options.memory) {
+			if(mem?.tool) history.splice(0, history.length, ...history.filter(h => h.role !== 'tool' || h.name !== 'memory_recall'));
-				history.splice(0, history.length, ...history.filter(h => h.role !== 'tool' || h.name !== 'recall'));
-			}
 
 			// Auto-memorize before compressing
 			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);
 			}
@@ -397,15 +513,33 @@ class LLM {
 	 * @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 v = vector(target);
+			const dp = Array.from({length: m + 1}, (_, i) => [i, ...Array(n).fill(0)]);
-		const similarities = searchTerms.map(t => vector(t)).map(refVector => this.cosineSimilarity(v, refVector));
+			for (let j = 0; j <= n; j++) dp[0][j] = j;
-		return {avg: similarities.reduce((acc, s) => acc + s, 0) / similarities.length, max: Math.max(...similarities), similarities};
+			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]);
+				}
+			}
+			return dp[m][n];
+		};
+		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
+		};
 	}
 
 	/**

src/memory-cache.ts

@@ -1,59 +0,0 @@
-import {KDPoint, KDTree} from './kd-tree.ts';
-import {Memory, MemoryRef} from './memory.ts';
-
-export class MemoryCache {
-	private tree: KDTree<MemoryRef>;
-	public memories: Memory[];
-
-	get length() { return this.memories.length; }
-
-	constructor(memories: Memory[]) {
-		this.memories = memories;
-		this.tree = this.buildTree();
-	}
-
-	private buildTree(): KDTree<MemoryRef> {
-		const embedded = this.memories.filter(m => m.embedding?.length);
-		if (!embedded.length) return new KDTree<MemoryRef>(0);
-
-		const dims = embedded[0].embedding.length;
-		const points: KDPoint<MemoryRef>[] = embedded.map(m => ({
-			vector: m.embedding,
-			payload: {name: m.name, description: m.description},
-		}));
-
-		return new KDTree<MemoryRef>(dims, 'cosine', points);
-	}
-
-	search(query: number[], limit: number): MemoryRef[] {
-		const results = this.tree.knn(query, limit);
-		return results.map(r => r.point.payload);
-	}
-
-	add(memory: Memory): void {
-		this.memories.push(memory);
-		this.rebuild();
-	}
-
-	update(memory: Memory): void {
-		const idx = this.memories.findIndex(m => m.name === memory.name);
-		if (idx !== -1) {
-			this.memories[idx] = memory;
-		} else {
-			this.memories.push(memory);
-		}
-		this.rebuild();
-	}
-
-	remove(name: string): void {
-		const idx = this.memories.findIndex(m => m.name === name);
-		if (idx !== -1) {
-			this.memories.splice(idx, 1);
-			this.rebuild();
-		}
-	}
-
-	rebuild(): void {
-		this.tree = this.buildTree();
-	}
-}

src/memory-graph.ts

@@ -1,69 +0,0 @@
-import {MemoryCache} from './memory-cache.ts';
-import {extractMetadata, Memory, MemoryNode} from './memory.ts';
-
-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>();
-
-	const nodes: MemoryNode[] = mems.map(m => {
-		const {links, backlinks} = extractMetadata(m.content);
-		return {
-			name: m.name,
-			missing: false,
-			links,
-			backlinks,
-		};
-	});
-
-	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) {
-	if (!nodes.length) return 'No memories yet.';
-
-	const groups = new Map();
-	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/memory.ts

@@ -1,6 +1,143 @@
 import {LLMRequest, LLMMessage} from './llm.ts';
-import {MemoryCache} from './memory-cache.ts';
 import {AiTool} from './tools.ts';
+import {KDPoint, KDTree} from './kd-tree.ts';
+
+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>();
+
+	const nodes: MemoryNode[] = mems.map(m => {
+		const {links, backlinks} = extractMetadata(m.content);
+		return {
+			name: m.name,
+			missing: false,
+			links,
+			backlinks,
+		};
+	});
+
+	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) {
+	if (!nodes.length) return 'No memories yet.';
+
+	const groups = new Map();
+	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();
+}
+
+export class MemoryCache {
+	private tree: KDTree<MemoryRef>;
+	public memories: Memory[];
+
+	get length() { return this.memories.length; }
+
+	constructor(memories: Memory[]) {
+		this.memories = memories;
+		this.tree = this.buildTree();
+	}
+
+	private buildTree(): KDTree<MemoryRef> {
+		const embedded = this.memories.filter(m => m.embedding?.length);
+		if (!embedded.length) return new KDTree<MemoryRef>(0);
+
+		const dims = embedded[0].embedding.length;
+		const points: KDPoint<MemoryRef>[] = embedded.map(m => ({
+			vector: m.embedding,
+			payload: {name: m.name, description: m.description},
+		}));
+
+		return new KDTree<MemoryRef>(dims, 'cosine', points);
+	}
+
+	search(query: number[], limit: number): MemoryRef[] {
+		const results = this.tree.knn(query, limit);
+		return results.map(r => r.point.payload);
+	}
+
+	add(memory: Memory): void {
+		this.memories.push(memory);
+		this.rebuild();
+	}
+
+	update(memory: Memory): void {
+		const idx = this.memories.findIndex(m => m.name === memory.name);
+		if (idx !== -1) {
+			this.memories[idx] = memory;
+		} else {
+			this.memories.push(memory);
+		}
+		this.rebuild();
+	}
+
+	remove(name: string): void {
+		const idx = this.memories.findIndex(m => m.name === name);
+		if (idx !== -1) {
+			this.memories.splice(idx, 1);
+			this.rebuild();
+		}
+	}
+
+	rebuild(): void {
+		this.tree = this.buildTree();
+	}
+}
+
+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 type Memory = {
 	name: string;
@@ -83,9 +220,9 @@ function getWeekSunday(monday: string): string {
 	return d.toISOString().slice(0, 10);
 }
 
-
-
 export class MemoryManager {
+	private recentlyTouched = new Map<string, number>();
+
 	private pendingMemorizations = new Map<string, {
 		memories: Memory[] | MemoryCache,
 		tempMemoryName: string,
@@ -109,6 +246,7 @@ export class MemoryManager {
 				const mems = memories instanceof MemoryCache ? memories.memories : memories;
 				const mem = mems.find(m => m.name === args.name);
 				if (!mem) return 'Document not found';
+				this.touch(mem.name);
 				return mem.content;
 			},
 		}),
@@ -128,6 +266,12 @@ export class MemoryManager {
 
 	constructor(private llm: any) {}
 
+	static normalize(m?: Memory[] | MemoryCache | MemoryOptions) {
+		if(!m) return null;
+		const raw = m instanceof MemoryCache || Array.isArray(m);
+		return raw ? {memory: <Memory[] | MemoryCache>m, inject: true, tool: true, update: true} : {inject: true, tool: true, update: true, ...m};
+	}
+
 	private async createTempMemory(conversation: string): Promise<Memory> {
 		const timestamp = Date.now();
 		const content = `---
@@ -151,6 +295,96 @@ ${conversation}`;
 		};
 	}
 
+	private applyHeader(content: string, header: string): string {
+		return `${header}\n\n${this.stripHeader(content)}`;
+	}
+
+	private async backgroundMemorization(conversation: string, memories: Memory[] | MemoryCache, options: LLMRequest, tempName: string): Promise<void> {
+		const mem = memories instanceof MemoryCache ? memories.memories : memories;
+		const monday = getWeekMonday();
+		const sunday = getWeekSunday(monday);
+		const buckets = await this.factAgent(conversation, mem, options, monday);
+		if(!buckets.length) return;
+		const jobs = [...buckets].map(({subject, facts}) => {
+			let node = mem.find(m => m.name === subject);
+			if(!node) {
+				node = {name: subject, description: '', content: '', embedding: [],};
+				mem.push(node);
+			}
+			const week = subject.startsWith('Journal/') ? {monday, sunday} : undefined;
+			return this.enqueue(node, facts, mem, options, tempName, week);
+		});
+		await Promise.all(jobs);
+	}
+
+	private buildHeader(node: Memory, week?: {monday: string, sunday: string}, links: string[] = [], backlinks: string[] = []): string {
+		const tags = node.name.split('/')[0]?.toLowerCase();
+		const lines = [
+			'---',
+			`name: ${node.name}`,
+			`description: ${node.description || ''}`,
+			tags ? `tags: [${tags}]` : '',
+			links.length ? `links: [${links.map(l => `"${l}"`).join(', ')}]` : 'links: []',
+			backlinks.length ? `backlinks: [${backlinks.map(l => `"${l}"`).join(', ')}]` : 'backlinks: []',
+			week ? `week: ${week.monday} – ${week.sunday}` : '',
+			`modified: ${new Date().toISOString()}`,
+			'---',
+		].filter(Boolean);
+		return lines.join('\n');
+	}
+
+	private cosineSearch(query: number[], memories: Memory[], limit: number): MemoryRef[] {
+		const scored = 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);
+		return scored.map(s => s.ref);
+	}
+
+	/**
+	 * Coalescing queue: if a doc is already compiling, abort the in-flight run, merge its
+	 * facts with the new ones and restart. Never blocks a pending update, never drops facts.
+	 */
+	private enqueue(node: Memory, facts: string[], memories: Memory[] | MemoryCache, options: LLMRequest, tempName: string, week?: {monday: string, sunday: string}): Promise<void> {
+		const key = node.name;
+		const existing = this.queues.get(key);
+		if (existing) {
+			existing.pending.push(...facts);
+			existing.request?.abort?.();
+			return existing.task;
+		}
+
+		const entry: {pending: string[], request: {abort?: () => void} | null, task: Promise<void>} = {pending: [...facts], request: null, task: Promise.resolve()};
+		this.queues.set(key, entry);
+		const m = memories instanceof MemoryCache ? memories.memories : memories;
+		entry.task = (async () => {
+			while (entry.pending.length) {
+				const batch = dedupeFacts(entry.pending.splice(0, entry.pending.length));
+				const written = await this.docAgent(node, batch, m, options, tempName, week, entry);
+				if (!written) entry.pending.unshift(...batch);
+			}
+		})().finally(() => {
+			this.queues.delete(key);
+			if(!this.queues.size && memories instanceof MemoryCache) memories.rebuild();
+		});
+		return entry.task;
+	}
+
+	private listNodes(memories: Memory[]): MemoryRef[] {
+		return memories.map(m => ({name: m.name, description: m.description}));
+	}
+
+	decay() {
+		for(const [name, ttl] of this.recentlyTouched) {
+			if(ttl <= 1) this.recentlyTouched.delete(name);
+			else this.recentlyTouched.set(name, ttl - 1);
+		}
+	}
+
 	forget(name: string, memories: Memory[] | MemoryCache): boolean {
 		const mem = memories instanceof MemoryCache ? memories.memories : memories;
 		const idx = mem.findIndex(m => m.name === name);
@@ -175,20 +409,43 @@ ${conversation}`;
 		return true;
 	}
 
-	private cosineSearch(query: number[], memories: Memory[], limit: number): MemoryRef[] {
+	getTouched(): string[] {
-		const scored = memories
+		return [...this.recentlyTouched.keys()];
-			.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);
-		return scored.map(s => s.ref);
 	}
 
-	private listNodes(memories: Memory[]): MemoryRef[] {
+	async memorize(history: LLMMessage[], memories: Memory[] | MemoryCache, options: LLMRequest): Promise<Memory[]> {
-		return memories.map(m => ({name: m.name, description: m.description}));
+		const conversation = history
+			.filter(h => h.role === 'user' || h.role === 'assistant')
+			.map(h => `[${h.role}]: ${h.content}`).join('\n\n').trim();
+		if(!conversation) return [];
+
+		const trackingId = `${Date.now()}_${Math.random()}`;
+		const tempMemory = await this.createTempMemory(conversation);
+		const mem = memories instanceof MemoryCache ? memories.memories : memories;
+		mem.push(tempMemory);
+		if (memories instanceof MemoryCache) memories.rebuild();
+		this.pendingMemorizations.set(trackingId, {
+			memories,
+			tempMemoryName: tempMemory.name,
+			timestamp: Date.now(),
+		});
+
+		try {
+			await this.backgroundMemorization(conversation, memories, options, tempMemory.name);
+			const finalMem = memories instanceof MemoryCache ? memories.memories : memories;
+			return finalMem.filter(m => !m.name.startsWith('_temp_'));
+		} finally {
+			const pending = this.pendingMemorizations.get(trackingId);
+			if (pending) {
+				const cleanMem = pending.memories instanceof MemoryCache
+					? pending.memories.memories
+					: pending.memories;
+				const idx = cleanMem.findIndex(m => m.name === pending.tempMemoryName);
+				if (idx !== -1) cleanMem.splice(idx, 1);
+				if (pending.memories instanceof MemoryCache) pending.memories.rebuild();
+			}
+			this.pendingMemorizations.delete(trackingId);
+		}
 	}
 
 	async recollect(query: string, memories: Memory[] | MemoryCache, limit = 5, graphDepth = 1): Promise<Memory[]> {
@@ -229,106 +486,8 @@ ${conversation}`;
 		return ordered.map(n => mem.find(m => m.name === n)!).filter(Boolean);
 	}
 
-	async memorize(history: LLMMessage[], memories: Memory[] | MemoryCache, options: LLMRequest): Promise<Memory[]> {
+	touch(name: string, ttl = 2) {
-		const conversation = history
+		this.recentlyTouched.set(name, ttl);
-			.filter(h => h.role === 'user' || h.role === 'assistant')
-			.map(h => `[${h.role}]: ${h.content}`).join('\n\n').trim();
-		if(!conversation) return [];
-
-		const trackingId = `${Date.now()}_${Math.random()}`;
-		const tempMemory = await this.createTempMemory(conversation);
-		const mem = memories instanceof MemoryCache ? memories.memories : memories;
-		mem.push(tempMemory);
-		if (memories instanceof MemoryCache) memories.rebuild();
-		this.pendingMemorizations.set(trackingId, {
-			memories,
-			tempMemoryName: tempMemory.name,
-			timestamp: Date.now(),
-		});
-
-		try {
-			await this._memorizeBackground(conversation, memories, options, tempMemory.name);
-			const finalMem = memories instanceof MemoryCache ? memories.memories : memories;
-			return finalMem.filter(m => !m.name.startsWith('_temp_'));
-		} finally {
-			const pending = this.pendingMemorizations.get(trackingId);
-			if (pending) {
-				const cleanMem = pending.memories instanceof MemoryCache
-					? pending.memories.memories
-					: pending.memories;
-				const idx = cleanMem.findIndex(m => m.name === pending.tempMemoryName);
-				if (idx !== -1) cleanMem.splice(idx, 1);
-				if (pending.memories instanceof MemoryCache) pending.memories.rebuild();
-			}
-			this.pendingMemorizations.delete(trackingId);
-		}
-	}
-
-	private async _memorizeBackground(conversation: string, memories: Memory[] | MemoryCache, options: LLMRequest, tempName: string): Promise<void> {
-		const mem = memories instanceof MemoryCache ? memories.memories : memories;
-		const monday = getWeekMonday();
-		const sunday = getWeekSunday(monday);
-		const buckets = await this.factAgent(conversation, mem, options, monday);
-		if(!buckets.length) return;
-		const jobs = [...buckets].map(({subject, facts}) => {
-			let node = mem.find(m => m.name === subject);
-			if(!node) {
-				node = {name: subject, description: '', content: '', embedding: [],};
-				mem.push(node);
-			}
-			const week = subject.startsWith('Journal/') ? {monday, sunday} : undefined;
-			return this.enqueue(node, facts, mem, options, tempName, week);
-		});
-		await Promise.all(jobs);
-	}
-
-	/**
-	 * Coalescing queue: if a doc is already compiling, abort the in-flight run, merge its
-	 * facts with the new ones and restart. Never blocks a pending update, never drops facts.
-	 */
-	private enqueue(node: Memory, facts: string[], memories: Memory[] | MemoryCache, options: LLMRequest, tempName: string, week?: {monday: string, sunday: string}): Promise<void> {
-		const key = node.name;
-		const existing = this.queues.get(key);
-		if (existing) {
-			existing.pending.push(...facts);
-			existing.request?.abort?.();
-			return existing.task;
-		}
-
-		const entry: {pending: string[], request: {abort?: () => void} | null, task: Promise<void>} = {pending: [...facts], request: null, task: Promise.resolve()};
-		this.queues.set(key, entry);
-		const m = memories instanceof MemoryCache ? memories.memories : memories;
-		entry.task = (async () => {
-			while (entry.pending.length) {
-				const batch = dedupeFacts(entry.pending.splice(0, entry.pending.length));
-				const written = await this.docAgent(node, batch, m, options, tempName, week, entry);
-				if (!written) entry.pending.unshift(...batch);
-			}
-		})().finally(() => {
-			this.queues.delete(key);
-			if(!this.queues.size && memories instanceof MemoryCache) memories.rebuild();
-		});
-		return entry.task;
-	}
-
-	private buildHeader(node: Memory, week?: {monday: string, sunday: string}, links: string[] = [], backlinks: string[] = []): string {
-		const tags = node.name.split('/')[0]?.toLowerCase();
-		const lines = [
-			'---',
-			`name: ${node.name}`,
-			`description: ${node.description || ''}`,
-			tags ? `tags: [${tags}]` : '',
-			links.length ? `links: [${links.map(l => `"${l}"`).join(', ')}]` : 'links: []',
-			backlinks.length ? `backlinks: [${backlinks.map(l => `"${l}"`).join(', ')}]` : 'backlinks: []',
-			week ? `week: ${week.monday} – ${week.sunday}` : '',
-			`modified: ${new Date().toISOString()}`,
-			'---',
-		].filter(Boolean);
-		return lines.join('\n');
-	}
-
-	private applyHeader(content: string, header: string): string {
-		return `${header}\n\n${this.stripHeader(content)}`;
 	}
 
 	private updateFrontmatter(content: string, updates: {links?: string[], backlinks?: string[]}): string {
@@ -430,7 +589,7 @@ ${currentBody}
 		}
 
 		const {backlinks} = extractMetadata(node.content);
-		node.description = update.description;
+		node.description = node.name !== 'Person/User' ? update.description : 'All information about the current user';
 		node.content = this.applyHeader(update.content, this.buildHeader(node, week, newLinks, backlinks));
 		const [e] = await this.llm.embedding(node.content);
 		if(e) node.embedding = e.embedding;
@@ -454,7 +613,7 @@ Rules:
 
 When extracting facts, you MUST also decide the exact destination path:
 - Use an existing node name if the facts clearly belong there
-- All information primary about the user should go under "Personal/..." (e.g., Personal/Info, Personal/Todos)
+- All information primary about the user should go under "People/User"
 - When required, create a new path following collection/subject format (e.g., People/Sarah, Projects/Oxide)
 - For journal entries, use "Journal"
 
@@ -470,8 +629,7 @@ ${this.listNodes(memories).filter(n => !n.name.includes('_temp_') && !n.name.inc
 				},
 				fn: (args: any) => {
 					const subject = args.destination.trim().toLowerCase() === 'journal'
-						? `Journal/${weekKey}`
+						? `Journal/${weekKey}` : args.destination.trim();
-						: args.destination.trim();
 					const facts = buckets.get(subject) ?? [];
 					facts.push(...dedupeFacts(String(args.facts).split(',')));
 					buckets.set(subject, facts);

src/open-ai.ts

@@ -29,11 +29,11 @@ export class OpenAi extends LLMProvider {
 				}));
 				history.splice(i, 1, ...tools);
 				i += tools.length - 1;
-			} else if(h.role === 'tool' && h.content) {
+			} else if(h.role === 'tool') {
 				const record = history.find(h2 => h.tool_call_id == h2.id);
 				if(record) {
-					if(h.content.includes('"error":')) record.error = h.content;
+					if(h.content?.includes('"error":')) record.error = h.content;
-					else record.content = h.content;
+					else record.content = h.content || '';
 				}
 				history.splice(i, 1);
 				i--;
@@ -51,15 +51,16 @@ export class OpenAi extends LLMProvider {
 					content: null,
 					tool_calls: [{ id: h.id, type: 'function', function: { name: h.name, arguments: JSON.stringify(h.args) } }],
 					refusal: null,
-					annotations: []
+					annotations: [],
+					timestamp: h.timestamp,
 				}, {
 					role: 'tool',
 					tool_call_id: h.id,
-					content: h.error || h.content
+					content: h.error || h.content,
+					timestamp: h.timestamp,
 				});
 			} else {
-				const {timestamp, ...rest} = h;
+				result.push(h);
-				result.push(rest);
 			}
 			return result;
 		}, [] as any[]);
@@ -68,11 +69,12 @@ export class OpenAi extends LLMProvider {
 	ask(message: string, options: LLMRequest = {}): AbortablePromise<string | any> {
 		const controller = new AbortController();
 		return Object.assign(new Promise<any>(async (res, rej) => {
-			if(options.system) {
+			const base = (options.history || []).filter(h => h.role !== 'system');
-				if(options.history?.[0]?.role != 'system') options.history?.splice(0, 0, {role: 'system', content: options.system, timestamp: Date.now()});
+			let history = this.fromStandard([
-				else options.history[0].content = options.system;
+				...(options.system ? [{role: <any>'system', content: options.system, timestamp: Date.now()}] : []),
-			}
+				...base,
-			let history = this.fromStandard([...options.history || [], {role: 'user', content: message, timestamp: Date.now()}]);
+				{role: 'user', content: message, timestamp: Date.now()}
+			]);
 			const tools = options.tools || this.ai.options.llm?.tools || [];
 			const requestParams: any = {
 				model: options.model || this.model,
@@ -106,24 +108,24 @@ export class OpenAi extends LLMProvider {
 				};
 			}
 
-			let resp: any, isFirstMessage = true;
+			let resp: any, hasStreamedText = false, terminal = false;
 			do {
+				requestParams.messages = history.map(({timestamp, ...m}) => m);
 				resp = await this.client.chat.completions.create(requestParams).catch(err => {
 					err.message += `\n\nMessages:\n${JSON.stringify(history, null, 2)}`;
 					throw err;
 				});
 
 				if(options.stream) {
-					if(!isFirstMessage) options.stream({text: '\n\n'});
+					if(hasStreamedText) options.stream({text: '\n\n'});
-					else isFirstMessage = false;
+					resp.choices = [{message: {role: 'assistant', content: '', tool_calls: [], timestamp: Date.now()}}];
-					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) {
-							resp.choices[0].message.content += chunk.choices[0].delta.content;
+							const text = chunk.choices[0].delta.content;
-							options.stream({text: chunk.choices[0].delta.content});
+							resp.choices[0].message.content += text;
+							if(text) { hasStreamedText = true; options.stream({text}); }
 						}
-
 						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);
@@ -158,28 +160,32 @@ export class OpenAi extends LLMProvider {
 					const results = await Promise.all(toolCalls.map(async (toolCall: any) => {
 						const tool = tools?.find(findByProp('name', toolCall.function.name));
 						if(options.stream) options.stream({tool: toolCall.function.name});
-						if(!tool) return {role: 'tool', tool_call_id: toolCall.id, content: '{"error": "Tool not found"}'};
+						if(!tool) return {role: 'tool', tool_call_id: toolCall.id, content: '{"error": "Tool not found"}', timestamp: Date.now()};
 						try {
 							const args = JSONAttemptParse(toolCall.function.arguments, {});
-							const result = await tool.fn(args, options.stream, this.ai);
+							// Wrap stream so a tool's `done` ends turn gracefully
-							return {role: 'tool', tool_call_id: toolCall.id, content: typeof result == 'object' ? JSONSanitize(result) : result};
+							const toolStream = options.stream && ((chunk: any) => {
+								if(chunk.done) { terminal = true; return; }
+								options.stream!(chunk);
+							});
+							const result = await tool.fn(args, toolStream, this.ai);
+							return {role: 'tool', tool_call_id: toolCall.id, content: typeof result == 'object' ? JSONSanitize(result) : result, timestamp: Date.now()};
 						} catch (err: any) {
-							return {role: 'tool', tool_call_id: toolCall.id, content: JSONSanitize({error: err?.message || err?.toString() || 'Unknown'})};
+							return {role: 'tool', tool_call_id: toolCall.id, content: JSONSanitize({error: err?.message || err?.toString() || 'Unknown'}), timestamp: Date.now()};
 						}
 					}));
 					history.push(...results);
 					requestParams.messages = history;
 				}
-			} while (!controller.signal.aborted && resp.choices?.[0]?.message?.tool_calls?.length);
+			} while (!terminal && !controller.signal.aborted && resp.choices?.[0]?.message?.tool_calls?.length);
 
-			const textContent = resp.choices[0].message.content?.trim() || '';
+			if(!terminal) {
-			history.push({role: 'assistant', content: textContent});
+				const textContent = resp.choices[0].message.content?.trim() || '';
+				history.push({role: 'assistant', content: textContent, timestamp: Date.now()});
+			}
 			history = this.toStandard(history);
-
+			if(options.history) options.history.splice(0, options.history.length, ...history.filter(h => h.role !== 'system'));
 			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 finalContent = history.at(-1)?.content;
 			res(options.schema ? JSONAttemptParse(finalContent, finalContent) : finalContent);
 		}), {abort: () => controller.abort()});

src/tools.ts

@@ -91,20 +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/UTC date/time',
+	description: 'Execute commonjs javascript',
 	args: {
-		timezone: {type: 'string', description: 'Which timezone to return, defaults to local', enum: ['local', 'utc'], default: 'local'}
+		code: {type: 'string', description: 'CommonJS javascript', required: true}
 	},
-	fn: ({timezone}) => new Date()[timezone === 'local' ? 'toString' : 'toUTCString']()
+	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 ExecPythonTool: AiTool = {
+	name: 'exec_python',
+	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 ExecTool: AiTool = {
@@ -118,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}`);
 			}
@@ -132,8 +145,483 @@ export const ExecTool: AiTool = {
 	}
 }
 
-export const FetchTool: AiTool = {
+export const FsDeleteTool = (whitelist: null | string[] = null): AiTool => {
-	name: 'net_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},
@@ -149,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',
-	args: {
+		description: 'Use a flaresolverr proxy to bypass cloudflare bot detection',
-		code: {type: 'string', description: 'CommonJS javascript', required: true}
+		args: {
-	},
+			url: {type: 'string', description: 'URL to fetch', required: true},
-	fn: async (args: {code: string}) => {
+			cmd: {type: 'string', description: 'Flaresolverr cmd', enum: ['request.get', 'request.post'], default: 'request.get'},
-		const c = consoleInterceptor(null);
+			maxTimeout: {type: 'number', description: 'Fetch time limit', default: 60_000},
-		const resp = await Fn<any>({console: c}, args.code, true).catch((err: any) => c.output.error.push(err));
+			postData: {type: 'object', description: 'Data to send during request.post requests'},
-		return {...c.output, return: resp, stdout: undefined, stderr: undefined};
+		},
+		fn: async ({url, cmd, maxTimeout, postData}) => {
+			function toFormUrlEncoded(obj, prefix = '') {
+				const pairs: any = [];
+				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_python',
+	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: 'net_read',
 	description: 'Extract clean content from webpages, or convert media/documents to accessible formats',
 	args: {
 		url: {type: 'string', description: 'URL to read', required: true},
@@ -276,7 +793,7 @@ export const ReadWebpageTool: AiTool = {
 };
 
 export const WebSearchTool: AiTool = {
-	name: 'net_search',
+	name: 'web_search',
 	description: 'Use duckduckgo (anonymous) to find find relevant online resources. Returns a list of URLs that works great with the `read_webpage` tool',
 	args: {
 		query: {type: 'string', description: 'Search string', required: true},
@@ -300,91 +817,3 @@ export const WebSearchTool: AiTool = {
 		return results;
 	}
 }
-
-export const WikipediaTool: 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'}
-	},
-	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');
-	}
-};