Merge pull request #12 from llm-agents-php/feature/code-refactoring

Code refactoring

Author: butschster

app/src/Agents/AgentsCaller/AskAgentTool.php

@@ -4,11 +4,11 @@
 
 namespace App\Agents\AgentsCaller;
 
-use App\Domain\Tool\PhpTool;
 use LLM\Agents\AgentExecutor\ExecutorInterface;
 use LLM\Agents\LLM\Prompt\Chat\ToolCallResultMessage;
 use LLM\Agents\LLM\Response\ToolCalledResponse;
 use LLM\Agents\PromptGenerator\Context;
+use LLM\Agents\Tool\PhpTool;
 use LLM\Agents\Tool\ToolExecutor;
 
 /**

app/src/Agents/CodeReviewer/CodeReviewAgent.php

@@ -8,6 +8,7 @@
 use LLM\Agents\Agent\AgentAggregate;
 use LLM\Agents\OpenAI\Client\OpenAIModel;
 use LLM\Agents\OpenAI\Client\Option;
+use LLM\Agents\Solution\ContextSourceLink;
 use LLM\Agents\Solution\MetadataType;
 use LLM\Agents\Solution\Model;
 use LLM\Agents\Solution\SolutionMetadata;
@@ -21,7 +22,11 @@ public static function create(): self
             key: 'code_review',
             name: 'Code Reviewer',
             description: 'Agent can list files in project with given id and then open each file and review the code',
-            instruction: 'You are a code review assistant. Use the provided tools to list project files, read their contents, and submit a code review for each file.',
+            instruction: <<<'INSTRUCTION'
+You are a code review assistant in Spiral Framework.
+Use the provided tools to list project files, read their contents, and submit a code review for each file.
+INSTRUCTION
+            ,
         );
 
         $aggregate = new self($agent);
@@ -56,6 +61,8 @@ public static function create(): self
         $aggregate->addAssociation(new ToolLink(name: ReadFileTool::NAME));
         $aggregate->addAssociation(new ToolLink(name: ReviewTool::NAME));
 
+        $aggregate->addAssociation(new ContextSourceLink(name: 'spiral-docs'));
+
         return $aggregate;
     }
 }

app/src/Agents/CodeReviewer/ListProjectTool.php

@@ -4,7 +4,7 @@
 
 namespace App\Agents\CodeReviewer;
 
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 
 /**
  * @extends PhpTool<ListProjectInput>

app/src/Agents/CodeReviewer/ReadFileTool.php

@@ -4,7 +4,7 @@
 
 namespace App\Agents\CodeReviewer;
 
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 
 /**
  * @extends PhpTool<ReadFileInput>

app/src/Agents/CodeReviewer/ReviewTool.php

@@ -4,7 +4,7 @@
 
 namespace App\Agents\CodeReviewer;
 
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 
 /**
  * @extends  PhpTool<ReviewInput>

app/src/Agents/Delivery/DeliveryAgent.php

@@ -25,7 +25,11 @@ public static function create(): self
             key: self::NAME,
             name: 'Order Assistant',
             description: 'Helps customers with order-related questions.',
-            instruction: 'You are a helpful customer support assistant. Use the supplied tools to assist the user.',
+            instruction: <<<'INSTRUCTION'
+You are a helpful customer support assistant.
+Use the supplied tools to assist the user.
+INSTRUCTION
+,
         );
 
         $aggregate = new self($agent);

app/src/Agents/Delivery/GetDeliveryDateTool.php

@@ -4,11 +4,11 @@
 
 namespace App\Agents\Delivery;
 
-use App\Domain\Tool\PhpTool;
 use Carbon\Carbon;
+use LLM\Agents\Tool\PhpTool;
 
 /**
- * @extends  PhpTool<DeliveryDateInput>
+ * @extends PhpTool<DeliveryDateInput>
  */
 final class GetDeliveryDateTool extends PhpTool
 {

app/src/Agents/Delivery/GetOrderNumberTool.php

@@ -4,10 +4,10 @@
 
 namespace App\Agents\Delivery;
 
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 
 /**
- * @extends  PhpTool<OrderNumberInput>
+ * @extends PhpTool<OrderNumberInput>
  */
 final class GetOrderNumberTool extends PhpTool
 {

app/src/Agents/Delivery/GetProfileTool.php

@@ -4,10 +4,10 @@
 
 namespace App\Agents\Delivery;
 
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 
 /**
- * @extends  PhpTool<ProfileInput>
+ * @extends PhpTool<ProfileInput>
  */
 final class GetProfileTool extends PhpTool
 {

app/src/Agents/DynamicMemoryTool/DynamicMemoryTool.php

@@ -5,9 +5,9 @@
 namespace App\Agents\DynamicMemoryTool;
 
 use App\Application\Entity\Uuid;
-use App\Domain\Tool\PhpTool;
 use LLM\Agents\Solution\MetadataType;
 use LLM\Agents\Solution\SolutionMetadata;
+use LLM\Agents\Tool\PhpTool;
 
 final class DynamicMemoryTool extends PhpTool
 {

app/src/Agents/SmartHomeControl/SmartHomeControlAgentFactory.php

@@ -4,10 +4,10 @@
 
 namespace App\Agents\TaskSplitter;
 
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 
 /**
- * @extends  PhpTool<ProjectDescriptionInput>
+ * @extends PhpTool<ProjectDescriptionInput>
  */
 final class GetProjectDescription extends PhpTool
 {

app/src/Agents/TaskSplitter/GetProjectDescription.php

@@ -5,12 +5,12 @@
 namespace App\Agents\TaskSplitter;
 
 use App\Application\Entity\Uuid;
-use App\Domain\Tool\PhpTool;
+use LLM\Agents\Tool\PhpTool;
 use Spiral\Boot\DirectoriesInterface;
 use Spiral\Files\FilesInterface;
 
 /**
- * @extends  PhpTool<TaskCreateInput>
+ * @extends PhpTool<TaskCreateInput>
  */
 final class TaskCreateTool extends PhpTool
 {

app/src/Agents/TaskSplitter/TaskCreateTool.php

@@ -23,7 +23,12 @@ public static function create(): self
             key: self::NAME,
             name: 'Task Splitter',
             description: 'An agent that splits project descriptions into structured task lists.',
-            instruction: 'You are a task organization assistant. Your primary goal is to analyze project descriptions and break them down into well-structured task lists with subtasks.',
+            instruction: <<<'INSTRUCTION'
+You are a task organization assistant.
+
+Your primary goal is to analyze project descriptions and break them down into well-structured task lists with subtasks.
+INSTRUCTION
+            ,
         );
 
         $aggregate = new self($agent);

app/src/Agents/TaskSplitter/TaskSplitterAgent.php

@@ -79,4 +79,14 @@ public function getAgentName(): string
     {
         return $this->agentName;
     }
+
+    public function setDescription(string $description): void
+    {
+        $this->title = $description;
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->title;
+    }
 }

app/src/Domain/Chat/Session.php

@@ -25,4 +25,8 @@ public function findByUuid(UuidInterface $uuid): ?SessionInterface;
      * @throws SessionNotFoundException
      */
     public function getByUuid(UuidInterface $uuid): SessionInterface;
+
+    public function findOneLatest(): ?SessionInterface;
+
+    public function findAllLatest(int $limit = 3): iterable;
 }

app/src/Domain/Chat/SessionRepositoryInterface.php

@@ -63,7 +63,7 @@ public function startSession(UuidInterface $accountUuid, string $agentName): Uui
         );
 
         // Set the title of the session to the agent's description.
-        $session->title = $agent->getDescription();
+        $session->setDescription($agent->getDescription());
 
         $this->updateSession($session);
 
@@ -222,4 +222,14 @@ private function callTool(Session $session, ToolCall $tool): ToolCallResultMessa
             content: [$functionResult],
         );
     }
+
+    public function getLatestSession(): ?SessionInterface
+    {
+        return $this->sessions->findOneLatest();
+    }
+
+    public function getLatestSessions(int $limit = 3): array
+    {
+        return \iterator_to_array($this->sessions->findAllLatest($limit));
+    }
 }

app/src/Domain/Chat/SimpleChatService.php

@@ -11,6 +11,7 @@
 use LLM\Agents\Tool\ToolRegistryInterface;
 use Ramsey\Uuid\Uuid;
 use Spiral\Console\Attribute\AsCommand;
+use Spiral\Console\Attribute\Option;
 use Spiral\Console\Command;
 use Spiral\Console\Console;
 use Symfony\Component\Console\Cursor;
@@ -21,6 +22,9 @@
 )]
 final class ChatCommand extends Command
 {
+    #[Option(name: 'latest', shortcut: 'l', description: 'Open latest chat session')]
+    public bool $openLatest = false;
+
     public function __invoke(
         AgentRegistryInterface $agents,
         ChatServiceInterface $chat,
@@ -41,6 +45,11 @@ public function __invoke(
             tools: $tools,
         );
 
-        $chat->run(accountUuid: Uuid::fromString('00000000-0000-0000-0000-000000000000'));
+        $chat->run(
+            accountUuid: Uuid::fromString('00000000-0000-0000-0000-000000000000'),
+            openLatest: $this->openLatest,
+        );
+
+        return self::SUCCESS;
     }
 }

app/src/Domain/Tool/PhpTool.php

@@ -19,7 +19,7 @@
 final class ChatWindowCommand extends Command
 {
     #[Argument(name: 'session_uuid')]
-    public string $sessionUuid;
+    public ?string $sessionUuid = null;
 
     public function __invoke(
         ChatHistoryRepositoryInterface $chatHistory,
@@ -32,7 +32,9 @@ public function __invoke(
             chat: $chatService,
         );
 
-        $chatWindow->run(Uuid::fromString($this->sessionUuid));
+        $chatWindow->run(
+            sessionUuid: $this->sessionUuid ? Uuid::fromString($this->sessionUuid) : null,
+        );
 
         return self::SUCCESS;
     }