From df424eee68f8c34f7b6459fe65190b7f73bc0cc8 Mon Sep 17 00:00:00 2001 From: Andrew Beal Date: Sun, 15 Feb 2026 23:07:39 +0000 Subject: [PATCH] Rename functions folder to tools. --- AIClasses/BaseAIClass.ts | 2 +- AIClasses/Claude/Claude.ts | 2 +- AIClasses/Gemini/Gemini.ts | 2 +- AIClasses/IAIClass.ts | 2 +- AIClasses/OpenAI/OpenAI.ts | 2 +- AIClasses/OpenAI/OpenAITypes.ts | 2 +- .../AIToolDefinitions.ts | 30 +++++++++---------- .../AIToolResponse.ts | 0 .../IAIToolDefinition.ts | 0 .../Tools}/AskUserQuestionExecution.ts | 0 .../Tools}/AskUserQuestionPlanning.ts | 0 .../Tools}/CancelPlan.ts | 0 .../Tools}/CompletePlan.ts | 0 .../Tools}/CompleteStep.ts | 0 .../Tools}/CompleteTask.ts | 0 .../Tools}/ContinuePlanExecution.ts | 0 .../Tools}/DeleteVaultFiles.ts | 0 .../Tools}/ExecuteWorkflow.ts | 0 .../Tools}/ListVaultFiles.ts | 0 .../Tools}/MoveVaultFiles.ts | 0 .../Tools}/PatchVaultFile.ts | 0 .../Tools}/ReadVaultFiles.ts | 0 .../Tools}/Replan.ts | 0 .../Tools}/SearchVaultFiles.ts | 0 .../Tools}/SubmitPlan.ts | 0 .../Tools}/WriteVaultFile.ts | 0 AIPrompts/PlanningPrompt.ts | 2 +- Conversations/Conversation.ts | 2 +- Services/AIServices/AIToolService.ts | 2 +- Services/AIServices/ExecutionAgent.ts | 4 +-- Services/AIServices/MainAgent.ts | 4 +-- Services/AIServices/OrchestrationAgent.ts | 4 +-- Services/AIServices/PlanningAgent.ts | 4 +-- Services/VaultService.ts | 2 +- __tests__/AIClasses/Claude.test.ts | 2 +- __tests__/Conversations/Conversation.test.ts | 2 +- .../Services/AIControllerService.test.ts | 2 +- __tests__/Services/ExecutionAgent.test.ts | 2 +- .../Services/MultiAgentIntegration.test.ts | 2 +- __tests__/Services/OrchestrationAgent.test.ts | 2 +- __tests__/Services/PlanningAgent.test.ts | 2 +- 41 files changed, 40 insertions(+), 40 deletions(-) rename AIClasses/{FunctionDefinitions => ToolDefinitions}/AIToolDefinitions.ts (67%) rename AIClasses/{FunctionDefinitions => ToolDefinitions}/AIToolResponse.ts (100%) rename AIClasses/{FunctionDefinitions => ToolDefinitions}/IAIToolDefinition.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/AskUserQuestionExecution.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/AskUserQuestionPlanning.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/CancelPlan.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/CompletePlan.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/CompleteStep.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/CompleteTask.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/ContinuePlanExecution.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/DeleteVaultFiles.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/ExecuteWorkflow.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/ListVaultFiles.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/MoveVaultFiles.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/PatchVaultFile.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/ReadVaultFiles.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/Replan.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/SearchVaultFiles.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/SubmitPlan.ts (100%) rename AIClasses/{FunctionDefinitions/Functions => ToolDefinitions/Tools}/WriteVaultFile.ts (100%) diff --git a/AIClasses/BaseAIClass.ts b/AIClasses/BaseAIClass.ts index 292d4a0..34e356a 100644 --- a/AIClasses/BaseAIClass.ts +++ b/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"; diff --git a/AIClasses/Claude/Claude.ts b/AIClasses/Claude/Claude.ts index 0b4b4e4..5874d32 100644 --- a/AIClasses/Claude/Claude.ts +++ b/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'; diff --git a/AIClasses/Gemini/Gemini.ts b/AIClasses/Gemini/Gemini.ts index e810aa7..230c9a7 100644 --- a/AIClasses/Gemini/Gemini.ts +++ b/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"; diff --git a/AIClasses/IAIClass.ts b/AIClasses/IAIClass.ts index 4313942..45b2d60 100644 --- a/AIClasses/IAIClass.ts +++ b/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"; diff --git a/AIClasses/OpenAI/OpenAI.ts b/AIClasses/OpenAI/OpenAI.ts index 98d713f..d5f61e6 100644 --- a/AIClasses/OpenAI/OpenAI.ts +++ b/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"; diff --git a/AIClasses/OpenAI/OpenAITypes.ts b/AIClasses/OpenAI/OpenAITypes.ts index d2f6cff..f3dcee6 100644 --- a/AIClasses/OpenAI/OpenAITypes.ts +++ b/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 */ diff --git a/AIClasses/FunctionDefinitions/AIToolDefinitions.ts b/AIClasses/ToolDefinitions/AIToolDefinitions.ts similarity index 67% rename from AIClasses/FunctionDefinitions/AIToolDefinitions.ts rename to AIClasses/ToolDefinitions/AIToolDefinitions.ts index 3c7c2a6..2a67ed7 100644 --- a/AIClasses/FunctionDefinitions/AIToolDefinitions.ts +++ b/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 { diff --git a/AIClasses/FunctionDefinitions/AIToolResponse.ts b/AIClasses/ToolDefinitions/AIToolResponse.ts similarity index 100% rename from AIClasses/FunctionDefinitions/AIToolResponse.ts rename to AIClasses/ToolDefinitions/AIToolResponse.ts diff --git a/AIClasses/FunctionDefinitions/IAIToolDefinition.ts b/AIClasses/ToolDefinitions/IAIToolDefinition.ts similarity index 100% rename from AIClasses/FunctionDefinitions/IAIToolDefinition.ts rename to AIClasses/ToolDefinitions/IAIToolDefinition.ts diff --git a/AIClasses/FunctionDefinitions/Functions/AskUserQuestionExecution.ts b/AIClasses/ToolDefinitions/Tools/AskUserQuestionExecution.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/AskUserQuestionExecution.ts rename to AIClasses/ToolDefinitions/Tools/AskUserQuestionExecution.ts diff --git a/AIClasses/FunctionDefinitions/Functions/AskUserQuestionPlanning.ts b/AIClasses/ToolDefinitions/Tools/AskUserQuestionPlanning.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/AskUserQuestionPlanning.ts rename to AIClasses/ToolDefinitions/Tools/AskUserQuestionPlanning.ts diff --git a/AIClasses/FunctionDefinitions/Functions/CancelPlan.ts b/AIClasses/ToolDefinitions/Tools/CancelPlan.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/CancelPlan.ts rename to AIClasses/ToolDefinitions/Tools/CancelPlan.ts diff --git a/AIClasses/FunctionDefinitions/Functions/CompletePlan.ts b/AIClasses/ToolDefinitions/Tools/CompletePlan.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/CompletePlan.ts rename to AIClasses/ToolDefinitions/Tools/CompletePlan.ts diff --git a/AIClasses/FunctionDefinitions/Functions/CompleteStep.ts b/AIClasses/ToolDefinitions/Tools/CompleteStep.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/CompleteStep.ts rename to AIClasses/ToolDefinitions/Tools/CompleteStep.ts diff --git a/AIClasses/FunctionDefinitions/Functions/CompleteTask.ts b/AIClasses/ToolDefinitions/Tools/CompleteTask.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/CompleteTask.ts rename to AIClasses/ToolDefinitions/Tools/CompleteTask.ts diff --git a/AIClasses/FunctionDefinitions/Functions/ContinuePlanExecution.ts b/AIClasses/ToolDefinitions/Tools/ContinuePlanExecution.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/ContinuePlanExecution.ts rename to AIClasses/ToolDefinitions/Tools/ContinuePlanExecution.ts diff --git a/AIClasses/FunctionDefinitions/Functions/DeleteVaultFiles.ts b/AIClasses/ToolDefinitions/Tools/DeleteVaultFiles.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/DeleteVaultFiles.ts rename to AIClasses/ToolDefinitions/Tools/DeleteVaultFiles.ts diff --git a/AIClasses/FunctionDefinitions/Functions/ExecuteWorkflow.ts b/AIClasses/ToolDefinitions/Tools/ExecuteWorkflow.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/ExecuteWorkflow.ts rename to AIClasses/ToolDefinitions/Tools/ExecuteWorkflow.ts diff --git a/AIClasses/FunctionDefinitions/Functions/ListVaultFiles.ts b/AIClasses/ToolDefinitions/Tools/ListVaultFiles.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/ListVaultFiles.ts rename to AIClasses/ToolDefinitions/Tools/ListVaultFiles.ts diff --git a/AIClasses/FunctionDefinitions/Functions/MoveVaultFiles.ts b/AIClasses/ToolDefinitions/Tools/MoveVaultFiles.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/MoveVaultFiles.ts rename to AIClasses/ToolDefinitions/Tools/MoveVaultFiles.ts diff --git a/AIClasses/FunctionDefinitions/Functions/PatchVaultFile.ts b/AIClasses/ToolDefinitions/Tools/PatchVaultFile.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/PatchVaultFile.ts rename to AIClasses/ToolDefinitions/Tools/PatchVaultFile.ts diff --git a/AIClasses/FunctionDefinitions/Functions/ReadVaultFiles.ts b/AIClasses/ToolDefinitions/Tools/ReadVaultFiles.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/ReadVaultFiles.ts rename to AIClasses/ToolDefinitions/Tools/ReadVaultFiles.ts diff --git a/AIClasses/FunctionDefinitions/Functions/Replan.ts b/AIClasses/ToolDefinitions/Tools/Replan.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/Replan.ts rename to AIClasses/ToolDefinitions/Tools/Replan.ts diff --git a/AIClasses/FunctionDefinitions/Functions/SearchVaultFiles.ts b/AIClasses/ToolDefinitions/Tools/SearchVaultFiles.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/SearchVaultFiles.ts rename to AIClasses/ToolDefinitions/Tools/SearchVaultFiles.ts diff --git a/AIClasses/FunctionDefinitions/Functions/SubmitPlan.ts b/AIClasses/ToolDefinitions/Tools/SubmitPlan.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/SubmitPlan.ts rename to AIClasses/ToolDefinitions/Tools/SubmitPlan.ts diff --git a/AIClasses/FunctionDefinitions/Functions/WriteVaultFile.ts b/AIClasses/ToolDefinitions/Tools/WriteVaultFile.ts similarity index 100% rename from AIClasses/FunctionDefinitions/Functions/WriteVaultFile.ts rename to AIClasses/ToolDefinitions/Tools/WriteVaultFile.ts diff --git a/AIPrompts/PlanningPrompt.ts b/AIPrompts/PlanningPrompt.ts index e4d88ec..8bf659b 100644 --- a/AIPrompts/PlanningPrompt.ts +++ b/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 diff --git a/Conversations/Conversation.ts b/Conversations/Conversation.ts index 3c9384d..4bf3d04 100644 --- a/Conversations/Conversation.ts +++ b/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"; diff --git a/Services/AIServices/AIToolService.ts b/Services/AIServices/AIToolService.ts index a4eb1a4..e3914e3 100644 --- a/Services/AIServices/AIToolService.ts +++ b/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"; diff --git a/Services/AIServices/ExecutionAgent.ts b/Services/AIServices/ExecutionAgent.ts index b282fca..f216d59 100644 --- a/Services/AIServices/ExecutionAgent.ts +++ b/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"; diff --git a/Services/AIServices/MainAgent.ts b/Services/AIServices/MainAgent.ts index c961075..8c37eea 100644 --- a/Services/AIServices/MainAgent.ts +++ b/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"; diff --git a/Services/AIServices/OrchestrationAgent.ts b/Services/AIServices/OrchestrationAgent.ts index f42b2e4..70182b4 100644 --- a/Services/AIServices/OrchestrationAgent.ts +++ b/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"; diff --git a/Services/AIServices/PlanningAgent.ts b/Services/AIServices/PlanningAgent.ts index 60610b8..30f3a36 100644 --- a/Services/AIServices/PlanningAgent.ts +++ b/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"; diff --git a/Services/VaultService.ts b/Services/VaultService.ts index fcda6c4..5f73d01 100644 --- a/Services/VaultService.ts +++ b/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"; diff --git a/__tests__/AIClasses/Claude.test.ts b/__tests__/AIClasses/Claude.test.ts index 692f292..7c1f1ac 100644 --- a/__tests__/AIClasses/Claude.test.ts +++ b/__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'; diff --git a/__tests__/Conversations/Conversation.test.ts b/__tests__/Conversations/Conversation.test.ts index bad364d..3816458 100644 --- a/__tests__/Conversations/Conversation.test.ts +++ b/__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', () => { diff --git a/__tests__/Services/AIControllerService.test.ts b/__tests__/Services/AIControllerService.test.ts index e272bed..8bbf195 100644 --- a/__tests__/Services/AIControllerService.test.ts +++ b/__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 diff --git a/__tests__/Services/ExecutionAgent.test.ts b/__tests__/Services/ExecutionAgent.test.ts index 32cd9af..3c65bf8 100644 --- a/__tests__/Services/ExecutionAgent.test.ts +++ b/__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'; /** diff --git a/__tests__/Services/MultiAgentIntegration.test.ts b/__tests__/Services/MultiAgentIntegration.test.ts index 4783e2e..fab7ee8 100644 --- a/__tests__/Services/MultiAgentIntegration.test.ts +++ b/__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'; /** diff --git a/__tests__/Services/OrchestrationAgent.test.ts b/__tests__/Services/OrchestrationAgent.test.ts index 453f528..05be44e 100644 --- a/__tests__/Services/OrchestrationAgent.test.ts +++ b/__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 diff --git a/__tests__/Services/PlanningAgent.test.ts b/__tests__/Services/PlanningAgent.test.ts index e62acad..4b3ef2b 100644 --- a/__tests__/Services/PlanningAgent.test.ts +++ b/__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