More memory fixes

src/llm.ts

@@ -1,12 +1,13 @@
 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, MemoryCache, MemoryManager} from './memory.ts';
+import {Memory, MemoryManager} from './memory.ts';
 
 export type AnthropicConfig = {proto: 'anthropic', token: string};
 export type OpenAiConfig = {proto: 'openai', host?: string, token: string};
@@ -143,7 +144,7 @@ class LLM {
 		return {
 			prompt: `You have access to the following skill documents, use \`read_skill\` to access them:\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}
@@ -167,8 +168,14 @@ class LLM {
 		}
 		const m = options.model || this.defaultModel;
 		if(!this.models[m]) throw new Error(`Model does not exist: ${m}`);
-		let abort = () => {};
-		return Object.assign(new Promise<string>(async res => {
+		let request: AbortablePromise<string> | null = null;
+		let aborted = false;
+		const abort = () => {
+			aborted = true;
+			request?.abort?.();
+		};
+
+		const promise = (async () => {
 			let tools: AiTool[] = options.tools || this.ai.options.llm?.tools || [];
 			const prompts: string[] = [];
 			let history = options.history || [];
@@ -192,22 +199,27 @@ class LLM {
 			// Memory
 			if (options.memory) {
 				const mems = options.memory instanceof MemoryCache ? options.memory.memories : options.memory;
-				const relevant = await this.memoryManager.recollect(message, options.memory, 5);
-				prompts.unshift(`You have access to the following memory files:
-${mems.map(m => `- ${m.name}: ${m.description}`).join('\n')}
-${relevant.length ? `
-Relevant memories have been preloaded:
-${relevant.map(r => `
-**${r.name}**
-${r.description}
-${r.content}
-`).join('\n---\n')}
-` : ''}`.trim());
-				tools.push(this.memoryManager.tools.read(options.memory));
+				if(mems.length) {
+					const relevant = await this.memoryManager.recollect(message, options.memory, 5);
+					prompts.unshift(`You have access to the following memory files:
+	${mems.map(m => `- ${m.name}: ${m.description}`).join('\n')}
+	${relevant.length ? `
+	Relevant memories have been preloaded:
+	${relevant.map(r => `
+	**${r.name}**
+	${r.description}
+	${r.content}
+	`).join('\n---\n')}
+	` : ''}`.trim());
+					tools.push(this.memoryManager.tools.read(options.memory));
+				}
 			}
 
+			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(message, {...options, tools, system: prompts.filter(Boolean).join('\n\n')});
+			const resp = await request;
 
 			// Trim memory injections from history
 			if(options.memory) {
@@ -221,8 +233,10 @@ ${r.content}
 				if(options.history) options.history.splice(0, options.history.length, ...compressed);
 			}
 
-			return res(resp);
-		}), {abort});
+			return resp;
+		})();
+
+		return Object.assign(promise, {abort});
 	}
 
 	/**