Rename functions folder to tools.

AIClasses/BaseAIClass.ts

@@ -4,7 +4,7 @@ import type { IAIClass } from "AIClasses/IAIClass";
 import { type IStreamChunk } from "Services/StreamingService";
 import type { Conversation } from "Conversations/Conversation";
 import type { AIProvider } from "Enums/ApiProvider";
-import type { IAIToolDefinition } from "AIClasses/FunctionDefinitions/IAIToolDefinition";
+import type { IAIToolDefinition } from "AIClasses/ToolDefinitions/IAIToolDefinition";
 import type { ConversationContent } from "Conversations/ConversationContent";
 import type { Attachment } from "Conversations/Attachment";
 import type { SettingsService } from "Services/SettingsService";

AIClasses/Claude/Claude.ts

@@ -5,7 +5,7 @@ import type { Attachment } from "Conversations/Attachment";
 import { AIProvider, AIProviderURL } from "Enums/ApiProvider";
 import { AIToolCall } from "AIClasses/AIToolCall";
 import { fromString as aiToolFromString } from "Enums/AITool";
-import type { IAIToolDefinition } from "AIClasses/FunctionDefinitions/IAIToolDefinition";
+import type { IAIToolDefinition } from "AIClasses/ToolDefinitions/IAIToolDefinition";
 import type { ConversationContent } from "Conversations/ConversationContent";
 import { Role } from "Enums/Role";
 import type { RawMessageStreamEvent, ContentBlockParam, Tool, TextBlockParam, ToolUnion, WebSearchTool20250305 } from '@anthropic-ai/sdk/resources/messages';

AIClasses/Gemini/Gemini.ts

@@ -6,7 +6,7 @@ import { Role } from "Enums/Role";
 import { AIProvider, AIProviderURL } from "Enums/ApiProvider";
 import { AIToolCall } from "AIClasses/AIToolCall";
 import { fromString as aiToolFromString } from "Enums/AITool";
-import type { IAIToolDefinition } from "AIClasses/FunctionDefinitions/IAIToolDefinition";
+import type { IAIToolDefinition } from "AIClasses/ToolDefinitions/IAIToolDefinition";
 import type { ConversationContent } from "Conversations/ConversationContent";
 import type { Candidate, Part, FunctionDeclaration } from "@google/genai";
 import { FinishReason } from "@google/genai";

AIClasses/IAIClass.ts

@@ -1,7 +1,7 @@
 import type { IStreamChunk } from "Services/StreamingService";
 import type { Conversation } from "Conversations/Conversation";
 import type { Attachment } from "Conversations/Attachment";
-import type { IAIToolDefinition } from "./FunctionDefinitions/IAIToolDefinition";
+import type { IAIToolDefinition } from "./ToolDefinitions/IAIToolDefinition";
 import type { AIProvider } from "Enums/ApiProvider";
 import type { AgentType } from "Enums/AgentType";
 import type { AIToolUsageMode } from "Enums/AIToolUsageMode";

AIClasses/OpenAI/OpenAI.ts

@@ -6,7 +6,7 @@ import type { Attachment } from "Conversations/Attachment";
 import { AIProvider, AIProviderURL } from "Enums/ApiProvider";
 import { AIToolCall } from "AIClasses/AIToolCall";
 import { fromString as aiToolFromString } from "Enums/AITool";
-import type { IAIToolDefinition } from "AIClasses/FunctionDefinitions/IAIToolDefinition";
+import type { IAIToolDefinition } from "AIClasses/ToolDefinitions/IAIToolDefinition";
 import type { ResponseEvent, ResponseOutputTextDelta, ResponseOutputItemDone, ResponseErrorEvent, ResponseFailedEvent, OpenAIToolTool, ResponsesAPIInput } from "./OpenAITypes";
 import { Exception } from "Helpers/Exception";
 import { ApiError, ApiErrorType } from "Types/ApiError";

AIClasses/OpenAI/OpenAITypes.ts

@@ -1,4 +1,4 @@
-import type { IAIToolDefinition } from "AIClasses/FunctionDefinitions/IAIToolDefinition";
+import type { IAIToolDefinition } from "AIClasses/ToolDefinitions/IAIToolDefinition";
 
 /* SDK types are a bit complicated and verbose so define simpler interfaces */
 

AIClasses/ToolDefinitions/AIToolDefinitions.ts

@@ -1,19 +1,19 @@
 import type { IAIToolDefinition } from "./IAIToolDefinition";
-import { SearchVaultFiles } from "./Functions/SearchVaultFiles";
-import { ReadVaultFiles } from "./Functions/ReadVaultFiles";
-import { WriteVaultFile } from "./Functions/WriteVaultFile";
-import { DeleteVaultFiles } from "./Functions/DeleteVaultFiles";
-import { MoveVaultFiles } from "./Functions/MoveVaultFiles";
-import { ListVaultFiles } from "./Functions/ListVaultFiles";
-import { PatchVaultFile } from "./Functions/PatchVaultFile";
-import { Replan } from "./Functions/Replan";
-import { CompleteStep } from "./Functions/CompleteStep";
-import { SubmitPlan } from "./Functions/SubmitPlan";
-import { CancelPlan } from "./Functions/CancelPlan";
-import { AskUserQuestionPlanning } from "./Functions/AskUserQuestionPlanning";
-import { CompletePlan } from "./Functions/CompletePlan";
-import { CompleteTask } from "./Functions/CompleteTask";
-import { ExecuteWorkflow } from "./Functions/ExecuteWorkflow";
+import { SearchVaultFiles } from "./Tools/SearchVaultFiles";
+import { ReadVaultFiles } from "./Tools/ReadVaultFiles";
+import { WriteVaultFile } from "./Tools/WriteVaultFile";
+import { DeleteVaultFiles } from "./Tools/DeleteVaultFiles";
+import { MoveVaultFiles } from "./Tools/MoveVaultFiles";
+import { ListVaultFiles } from "./Tools/ListVaultFiles";
+import { PatchVaultFile } from "./Tools/PatchVaultFile";
+import { Replan } from "./Tools/Replan";
+import { CompleteStep } from "./Tools/CompleteStep";
+import { SubmitPlan } from "./Tools/SubmitPlan";
+import { CancelPlan } from "./Tools/CancelPlan";
+import { AskUserQuestionPlanning } from "./Tools/AskUserQuestionPlanning";
+import { CompletePlan } from "./Tools/CompletePlan";
+import { CompleteTask } from "./Tools/CompleteTask";
+import { ExecuteWorkflow } from "./Tools/ExecuteWorkflow";
 
 export abstract class AIToolDefinitions {
     

AIPrompts/PlanningPrompt.ts

@@ -1,4 +1,4 @@
-import { AIToolDefinitions } from "AIClasses/FunctionDefinitions/AIToolDefinitions";
+import { AIToolDefinitions } from "AIClasses/ToolDefinitions/AIToolDefinitions";
 
 export const PlanningPrompt: string = `
 # Obsidian Vault Planning Agent

Conversations/Conversation.ts

@@ -1,7 +1,7 @@
 import { StringTools } from "Helpers/StringTools";
 import { ConversationContent } from "./ConversationContent";
 import { Attachment } from "./Attachment";
-import type { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import type { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import { Role } from "Enums/Role";
 import { AITool } from "Enums/AITool";
 import { isTextFile, toFileType } from "Enums/FileType";

Services/AIServices/AIToolService.ts

@@ -2,7 +2,7 @@ import { Resolve } from "../DependencyService";
 import { Services } from "../Services";
 import type { FileSystemService } from "../FileSystemService";
 import { AITool, fromString } from "Enums/AITool";
-import { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import type { AIToolCall } from "AIClasses/AIToolCall";
 import type { ISearchMatch } from "../../Types/SearchTypes";
 import { AbortService } from "../AbortService";

Services/AIServices/ExecutionAgent.ts

@@ -7,9 +7,9 @@ import { ConversationContent } from "Conversations/ConversationContent";
 import { Role } from "Enums/Role";
 import { AITool, isAITool } from "Enums/AITool";
 import { CompleteTaskArgsSchema, type CompleteTaskArgs } from "AIClasses/Schemas/AIToolSchemas";
-import { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import { Exception } from "Helpers/Exception";
-import { AIToolDefinitions } from "AIClasses/FunctionDefinitions/AIToolDefinitions";
+import { AIToolDefinitions } from "AIClasses/ToolDefinitions/AIToolDefinitions";
 import { Copy, replaceCopy } from "Enums/Copy";
 import { DebugColor } from "Enums/DebugColor";
 import { AIToolUsageMode } from "Enums/AIToolUsageMode";

Services/AIServices/MainAgent.ts

@@ -1,12 +1,12 @@
 import type { Conversation } from "Conversations/Conversation";
 import type { IChatServiceCallbacks } from "../ChatService";
-import { AIToolDefinitions } from "AIClasses/FunctionDefinitions/AIToolDefinitions";
+import { AIToolDefinitions } from "AIClasses/ToolDefinitions/AIToolDefinitions";
 import { Exception } from "Helpers/Exception";
 import { AITool, isAITool } from "Enums/AITool";
 import { AgentType } from "Enums/AgentType";
 import { BaseAgent } from "./BaseAgent";
 import { ExecuteWorkflowArgsSchema, type ExecuteWorkflowArgs } from "AIClasses/Schemas/AIToolSchemas";
-import { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import type { AIToolCall } from "AIClasses/AIToolCall";
 import { OrchestrationAgent } from "./OrchestrationAgent";
 import { ConversationContent } from "Conversations/ConversationContent";

Services/AIServices/OrchestrationAgent.ts

@@ -8,11 +8,11 @@ import { Copy, replaceCopy } from "Enums/Copy";
 import { Conversation } from "Conversations/Conversation";
 import { PlanningAgent } from "./PlanningAgent";
 import { Exception } from "Helpers/Exception";
-import { AIToolDefinitions } from "AIClasses/FunctionDefinitions/AIToolDefinitions";
+import { AIToolDefinitions } from "AIClasses/ToolDefinitions/AIToolDefinitions";
 import { OrchestrationResult } from "Types/OrchestrationResult";
 import { AgentType } from "Enums/AgentType";
 import { AITool, isAITool } from "Enums/AITool";
-import { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import { DebugColor } from "Enums/DebugColor";
 import { AIToolUsageMode } from "Enums/AIToolUsageMode";
 

Services/AIServices/PlanningAgent.ts

@@ -5,9 +5,9 @@ import { Exception } from "Helpers/Exception";
 import type { IChatServiceCallbacks } from "Services/ChatService";
 import { AgentType } from "Enums/AgentType";
 import { AITool, isAITool } from "Enums/AITool";
-import { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import { ExecutionPlan } from "Types/ExecutionPlan";
-import { AIToolDefinitions } from "AIClasses/FunctionDefinitions/AIToolDefinitions";
+import { AIToolDefinitions } from "AIClasses/ToolDefinitions/AIToolDefinitions";
 import { Copy } from "Enums/Copy";
 import { ConversationContent } from "Conversations/ConversationContent";
 import { Role } from "Enums/Role";

Services/VaultService.ts

@@ -15,7 +15,7 @@ import { DiffService } from "./DiffService";
 import * as path from "path-browserify";
 import { Event } from "Enums/Event";
 import { AbortService } from "./AbortService";
-import { AIToolResponse } from "AIClasses/FunctionDefinitions/AIToolResponse";
+import { AIToolResponse } from "AIClasses/ToolDefinitions/AIToolResponse";
 import { FileType, isBinaryFile, isFileType } from "Enums/FileType";
 import { readPDF } from "Helpers/PDFHelper";
 

__tests__/AIClasses/Claude.test.ts

@@ -5,7 +5,7 @@ import { Services } from '../../Services/Services';
 import { StreamingService } from '../../Services/StreamingService';
 import type { IPrompt } from '../../AIPrompts/IPrompt';
 import type VaultkeeperAIPlugin from '../../main';
-import { AIToolDefinitions } from '../../AIClasses/FunctionDefinitions/AIToolDefinitions';
+import { AIToolDefinitions } from '../../AIClasses/ToolDefinitions/AIToolDefinitions';
 import { Conversation } from '../../Conversations/Conversation';
 import { ConversationContent } from '../../Conversations/ConversationContent';
 import { Role } from '../../Enums/Role';

__tests__/Conversations/Conversation.test.ts

@@ -2,7 +2,7 @@ import { describe, it, expect } from 'vitest';
 import { Conversation } from '../../Conversations/Conversation';
 import { ConversationContent } from '../../Conversations/ConversationContent';
 import { Role } from '../../Enums/Role';
-import { AIToolResponse } from '../../AIClasses/FunctionDefinitions/AIToolResponse';
+import { AIToolResponse } from '../../AIClasses/ToolDefinitions/AIToolResponse';
 import { AITool } from '../../Enums/AITool';
 
 describe('Conversation', () => {

__tests__/Services/AIControllerService.test.ts

@@ -7,7 +7,7 @@ import { ConversationContent } from '../../Conversations/ConversationContent';
 import { Role } from '../../Enums/Role';
 import { AITool } from '../../Enums/AITool';
 import { AIToolCall } from '../../AIClasses/AIToolCall';
-import { AIToolResponse } from '../../AIClasses/FunctionDefinitions/AIToolResponse';
+import { AIToolResponse } from '../../AIClasses/ToolDefinitions/AIToolResponse';
 
 /**
  * INTEGRATION TESTS - AIControllerService

__tests__/Services/ExecutionAgent.test.ts

@@ -4,7 +4,7 @@ import { RegisterSingleton, DeregisterAllServices } from '../../Services/Depende
 import { Services } from '../../Services/Services';
 import { AITool } from '../../Enums/AITool';
 import { AIToolCall } from '../../AIClasses/AIToolCall';
-import { AIToolResponse } from '../../AIClasses/FunctionDefinitions/AIToolResponse';
+import { AIToolResponse } from '../../AIClasses/ToolDefinitions/AIToolResponse';
 import type { ExecutionStep } from '../../Types/ExecutionStep';
 
 /**

__tests__/Services/MultiAgentIntegration.test.ts

@@ -10,7 +10,7 @@ import { ConversationContent } from '../../Conversations/ConversationContent';
 import { Role } from '../../Enums/Role';
 import { AITool } from '../../Enums/AITool';
 import { AIToolCall } from '../../AIClasses/AIToolCall';
-import { AIToolResponse } from '../../AIClasses/FunctionDefinitions/AIToolResponse';
+import { AIToolResponse } from '../../AIClasses/ToolDefinitions/AIToolResponse';
 import type { ExecutionStep } from '../../Types/ExecutionStep';
 
 /**

__tests__/Services/OrchestrationAgent.test.ts

@@ -3,7 +3,7 @@ import { OrchestrationAgent } from '../../Services/AIServices/OrchestrationAgent
 import { RegisterSingleton, DeregisterAllServices } from '../../Services/DependencyService';
 import { Services } from '../../Services/Services';
 import { AITool } from '../../Enums/AITool';
-import { AIToolResponse } from '../../AIClasses/FunctionDefinitions/AIToolResponse';
+import { AIToolResponse } from '../../AIClasses/ToolDefinitions/AIToolResponse';
 
 /**
  * UNIT TESTS - OrchestrationAgent

__tests__/Services/PlanningAgent.test.ts

@@ -7,7 +7,7 @@ import { ConversationContent } from '../../Conversations/ConversationContent';
 import { Role } from '../../Enums/Role';
 import { AITool } from '../../Enums/AITool';
 import { AIToolCall } from '../../AIClasses/AIToolCall';
-import { AIToolResponse } from '../../AIClasses/FunctionDefinitions/AIToolResponse';
+import { AIToolResponse } from '../../AIClasses/ToolDefinitions/AIToolResponse';
 
 /**
  * UNIT TESTS - PlanningAgent