Release 0.16.0

Author: derekhearst

module.json

@@ -2,7 +2,7 @@
 	"id": "foundry-ai",
 	"title": "FoundryAI",
 	"description": "AI-powered DM assistant with chat interface, RAG over journals/actors, session recaps, quest tracking, and more.",
-	"version": "0.15.0",
+	"version": "0.16.0",
 	"authors": [
 		{
 			"name": "Derek Hearst",
@@ -30,7 +30,7 @@
 	"socket": true,
 	"url": "https://github.com/derekhearst/FoundryAI",
 	"manifest": "https://github.com/derekhearst/FoundryAI/releases/latest/download/module.json",
-	"download": "https://github.com/derekhearst/FoundryAI/releases/download/0.15.0/foundry-ai.zip",
+	"download": "https://github.com/derekhearst/FoundryAI/releases/download/0.16.0/foundry-ai.zip",
 	"license": "MIT",
 	"readme": "https://github.com/derekhearst/FoundryAI/blob/main/README.md"
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "foundry-ai",
-	"version": "0.15.0",
+	"version": "0.16.0",
 	"description": "FoundryAI - AI-powered DM assistant for Foundry VTT",
 	"type": "module",
 	"scripts": {

src/core/openrouter-service.ts

@@ -168,7 +168,7 @@ export class OpenRouterService {
 
 	// ---- Chat Completions ----
 
-	async chatCompletion(request: ChatCompletionRequest): Promise<ChatCompletionResponse> {
+	async chatCompletion(request: ChatCompletionRequest, signal?: AbortSignal): Promise<ChatCompletionResponse> {
 		if (!this.apiKey) throw new Error('OpenRouter API key not configured')
 
 		const body: ChatCompletionRequest = {
@@ -185,6 +185,7 @@ export class OpenRouterService {
 			method: 'POST',
 			headers: this.headers,
 			body: JSON.stringify(body),
+			signal,
 		})
 
 		if (!response.ok) {
@@ -206,7 +207,11 @@ export class OpenRouterService {
 		return result
 	}
 
-	async chatCompletionStream(request: ChatCompletionRequest, onChunk: StreamCallback): Promise<void> {
+	async chatCompletionStream(
+		request: ChatCompletionRequest,
+		onChunk: StreamCallback,
+		signal?: AbortSignal,
+	): Promise<void> {
 		if (!this.apiKey) throw new Error('OpenRouter API key not configured')
 
 		const body: ChatCompletionRequest = {
@@ -223,6 +228,7 @@ export class OpenRouterService {
 			method: 'POST',
 			headers: this.headers,
 			body: JSON.stringify(body),
+			signal,
 		})
 
 		if (!response.ok) {

src/core/tool-system.ts

@@ -1079,21 +1079,69 @@ async function handleSearchJournals(query: string, maxResults?: number): Promise
 }
 
 async function handleSearchActors(query: string, maxResults?: number): Promise<string> {
-	const results = await embeddingService.search(query, maxResults || 5, { documentType: 'actor' })
+	const max = maxResults || 5
+	const queryLower = query.toLowerCase()
+	const results: Array<{ name: string; id: string; folder: string; relevance: number; excerpt: string }> = []
+	const allowed = getSetting('actorFolders') || []
+	
+	// Get actors from the configured folders (this handles folder resolution + access control)
+	const indexedActors = collectionReader.getActorsByFolders(allowed)
+	
+	// First pass: exact and partial name matches
+	const nameMatches: typeof results = []
+	for (const actor of indexedActors) {
+		const nameLower = actor.name.toLowerCase()
+		
+		if (nameLower === queryLower) {
+			// Exact match - highest priority
+			nameMatches.unshift({
+				name: actor.name,
+				id: actor.id,
+				folder: actor.folderName,
+				relevance: 1.0,
+				excerpt: actor.content.slice(0, 500),
+			})
+		} else if (nameLower.includes(queryLower)) {
+			// Partial match
+			nameMatches.push({
+				name: actor.name,
+				id: actor.id,
+				folder: actor.folderName,
+				relevance: 0.95,
+				excerpt: actor.content.slice(0, 500),
+			})
+		}
+		
+		if (nameMatches.length >= max) break
+	}
+	
+	results.push(...nameMatches.slice(0, max))
+	
+	// Second pass: embedding-based search if we need more results
+	if (results.length < max) {
+		const embeddingResults = await embeddingService.search(query, max - results.length, { documentType: 'actor' })
+		const existingIds = new Set(results.map(r => r.id))
+		
+		for (const r of embeddingResults) {
+			if (!existingIds.has(r.entry.documentId)) {
+				results.push({
+					name: r.entry.documentName,
+					id: r.entry.documentId,
+					folder: r.entry.folderName,
+					relevance: Math.round(r.score * 100) / 100,
+					excerpt: r.entry.text.slice(0, 500),
+				})
+				
+				if (results.length >= max) break
+			}
+		}
+	}
 
 	if (results.length === 0) {
 		return JSON.stringify({ results: [], message: 'No matching actors found.' })
 	}
 
-	return JSON.stringify({
-		results: results.map((r) => ({
-			documentId: r.entry.documentId,
-			documentName: r.entry.documentName,
-			folder: r.entry.folderName,
-			relevance: Math.round(r.score * 100) / 100,
-			excerpt: r.entry.text.slice(0, 500),
-		})),
-	})
+	return JSON.stringify({ results })
 }
 
 function handleGetJournal(journalId: string): string {
@@ -1887,6 +1935,7 @@ async function handleSearchCompendium(query: string, type?: string, maxResults?:
 	const results: Array<Record<string, any>> = []
 
 	for (const [packId, pack] of game.packs) {
+		if (!pack) continue
 		if (type && type !== 'all' && pack.documentName !== type) continue
 
 		// Ensure index is loaded

src/ui/components/ChatWindow.svelte

@@ -26,6 +26,7 @@
   let inputText = $state('');
   let isGenerating = $state(false);
   let streamingContent = $state('');
+  let abortController: AbortController | null = $state(null);
   let currentSessionId = $state<string | null>(null);
   let currentSessionName = $state('New Chat');
   let messagesEndEl: HTMLDivElement | undefined = $state();
@@ -250,6 +251,17 @@ Stay fully in character for the introduction, but present the dialogue hooks and
     viewMode = 'chat';
   }
 
+  // ---- Chat Control ----
+  function stopGeneration() {
+    if (abortController) {
+      abortController.abort();
+      abortController = null;
+      isGenerating = false;
+      streamingContent = '';
+      console.log('FoundryAI | Chat generation stopped by user');
+    }
+  }
+
   // ---- Message Sending ----
   async function sendMessage() {
     const text = inputText.trim();
@@ -268,6 +280,7 @@ Stay fully in character for the introduction, but present the dialogue hooks and
     inputText = '';
     isGenerating = true;
     streamingContent = '';
+    abortController = new AbortController();
 
     // Add user message
     const userMessage: LLMMessage = { role: 'user', content: text };
@@ -295,9 +308,9 @@ Stay fully in character for the introduction, but present the dialogue hooks and
       console.log(`FoundryAI | Sending message — model: ${model}, stream: ${stream}, tools: ${useTools}, messages: ${apiMessages.length}, actor: ${currentActorId || 'none'}`);
 
       if (stream) {
-        await handleStreamingResponse(apiMessages, model, temperature, maxTokens, useTools);
+        await handleStreamingResponse(apiMessages, model, temperature, maxTokens, useTools, abortController.signal);
       } else {
-        await handleNonStreamingResponse(apiMessages, model, temperature, maxTokens, useTools);
+        await handleNonStreamingResponse(apiMessages, model, temperature, maxTokens, useTools, abortController.signal);
       }
 
       // Save full conversation to session
@@ -310,15 +323,20 @@ Stay fully in character for the introduction, but present the dialogue hooks and
         console.log(`FoundryAI | Saved conversation to session ${currentSessionId} (${messages.length} messages)`);
       }
     } catch (error: any) {
-      console.error('FoundryAI | Chat error:', error);
-      const errorMsg: LLMMessage = {
-        role: 'assistant',
-        content: `⚠️ Error: ${error.message || 'Unknown error occurred'}`,
-      };
-      messages = [...messages, errorMsg];
+      if (error.name === 'AbortError') {
+        console.log('FoundryAI | Chat generation was stopped');
+      } else {
+        console.error('FoundryAI | Chat error:', error);
+        const errorMsg: LLMMessage = {
+          role: 'assistant',
+          content: `⚠️ Error: ${error.message || 'Unknown error occurred'}`,
+        };
+        messages = [...messages, errorMsg];
+      }
     } finally {
       isGenerating = false;
       streamingContent = '';
+      abortController = null;
     }
   }
 
@@ -371,6 +389,7 @@ Stay fully in character for the introduction, but present the dialogue hooks and
     temperature: number,
     maxTokens: number,
     useTools: boolean,
+    signal?: AbortSignal,
   ) {
     let fullContent = '';
 
@@ -425,6 +444,7 @@ Stay fully in character for the introduction, but present the dialogue hooks and
         tool_choice: useTools ? 'auto' : undefined,
       },
       onChunk,
+      signal,
     );
 
     if (accumulatedToolCalls.size > 0) {
@@ -457,15 +477,19 @@ Stay fully in character for the introduction, but present the dialogue hooks and
     temperature: number,
     maxTokens: number,
     useTools: boolean,
+    signal?: AbortSignal,
   ) {
-    const response = await openRouterService.chatCompletion({
-      model,
-      messages: apiMessages,
-      temperature,
-      max_tokens: maxTokens,
-      tools: useTools ? getEnabledTools() : undefined,
-      tool_choice: useTools ? 'auto' : undefined,
-    });
+    const response = await openRouterService.chatCompletion(
+      {
+        model,
+        messages: apiMessages,
+        temperature,
+        max_tokens: maxTokens,
+        tools: useTools ? getEnabledTools() : undefined,
+        tool_choice: useTools ? 'auto' : undefined,
+      },
+      signal,
+    );
 
     const assistantMessage = response.choices?.[0]?.message;
     console.log('FoundryAI | Non-streaming response:', {
@@ -911,6 +935,15 @@ Stay fully in character for the introduction, but present the dialogue hooks and
           <i class="fas fa-paper-plane"></i>
         {/if}
       </button>
+      {#if isGenerating}
+        <button
+          class="stop-btn"
+          onclick={stopGeneration}
+          title="Stop generation"
+        >
+          <i class="fas fa-stop"></i>
+        </button>
+      {/if}
     </div>
   {/if}
 </div>
@@ -1368,6 +1401,28 @@ Stay fully in character for the introduction, but present the dialogue hooks and
     cursor: not-allowed;
   }
 
+  .stop-btn {
+    background: #ef4444;
+    border: none;
+    color: #fff;
+    width: 38px;
+    height: 38px;
+    border-radius: 8px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 0.9em;
+    transition: all 0.15s;
+    flex-shrink: 0;
+    margin-left: 6px;
+  }
+
+  .stop-btn:hover {
+    background: #dc2626;
+    transform: scale(1.05);
+  }
+
   /* ---- Actor Picker ---- */
   .actor-picker {
     display: flex;