Repository navigation
fix(chat): pass the chat user instructions to the Context Agent #709
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
marcelklehr
merged 2 commits into
nextcloud:main
from
vyacheslavhulyaev-glitch:fix/338-agent-user-instructions
Oct 22, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\Assistant\Tests\Unit\Service; | ||
|
|
||
| use OCA\Assistant\Db\ChattyLLM\Message; | ||
| use OCA\Assistant\Db\ChattyLLM\MessageMapper; | ||
| use OCA\Assistant\Db\ChattyLLM\Session; | ||
| use OCA\Assistant\Db\ChattyLLM\SessionMapper; | ||
| use OCA\Assistant\Service\ChatService; | ||
| use OCA\Assistant\Service\SessionSummaryService; | ||
| use OCP\AppFramework\Db\DoesNotExistException; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\DB\Exception; | ||
| use OCP\IAppConfig; | ||
| use OCP\IDBConnection; | ||
| use OCP\IL10N; | ||
| use OCP\IUserManager; | ||
| use OCP\TaskProcessing\IManager; | ||
| use OCP\TaskProcessing\Task; | ||
| use OCP\TaskProcessing\TaskTypes\ContextAgentInteraction; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
| use Psr\Log\LoggerInterface; | ||
| use Test\TestCase; | ||
|
|
||
| /** | ||
| * Passing the Chat User Instructions to the Context Agent (nextcloud/assistant#338) | ||
| */ | ||
| class ChatServiceAgencyTest extends TestCase { | ||
|
|
||
| private const USER_ID = 'agency_test_user'; | ||
| private const SESSION_ID = 42; | ||
| private const USER_INSTRUCTIONS = 'Always answer like a pirate.'; | ||
|
|
||
| private ChatService $service; | ||
| private MessageMapper&MockObject $messageMapper; | ||
| private IManager&MockObject $taskProcessingManager; | ||
| private ?Task $scheduledTask = null; | ||
|
|
||
| protected function setUp(): void { | ||
| parent::setUp(); | ||
|
|
||
| $sessionMapper = $this->createMock(SessionMapper::class); | ||
| $sessionMapper->method('exists')->willReturn(true); | ||
| $session = new Session(); | ||
| $session->setUserId(self::USER_ID); | ||
| $sessionMapper->method('getUserSession')->willReturn($session); | ||
|
|
||
| $humanMessage = new Message(); | ||
| $humanMessage->setSessionId(self::SESSION_ID); | ||
| $humanMessage->setRole(Message::ROLE_HUMAN); | ||
| $humanMessage->setContent('What is your name?'); | ||
| $humanMessage->setAttachments('[]'); | ||
| $this->messageMapper = $this->createMock(MessageMapper::class); | ||
| $this->messageMapper->method('getLastHumanMessage')->willReturn($humanMessage); | ||
|
|
||
| // only the classic Context Agent is available, no multimodal or audio agency | ||
| $this->taskProcessingManager = $this->createMock(IManager::class); | ||
| $this->taskProcessingManager->method('getAvailableTaskTypeIds')->willReturn([ContextAgentInteraction::ID]); | ||
| $this->taskProcessingManager->method('getUserTasksByApp')->willReturn([]); | ||
| $this->taskProcessingManager->method('scheduleTask')->willReturnCallback(function (Task $task): void { | ||
| $this->scheduledTask = $task; | ||
| }); | ||
|
|
||
| $this->service = new ChatService( | ||
| $this->createMock(IUserManager::class), | ||
| $this->createMock(IAppConfig::class), | ||
| $this->createMock(IL10N::class), | ||
| $sessionMapper, | ||
| $this->messageMapper, | ||
| $this->createMock(IDBConnection::class), | ||
| $this->createMock(SessionSummaryService::class), | ||
| $this->taskProcessingManager, | ||
| $this->createMock(LoggerInterface::class), | ||
| $this->createMock(ITimeFactory::class), | ||
| ); | ||
| } | ||
|
|
||
| private function setAgentOptionalInputs(array $optionalInputShape): void { | ||
| $this->taskProcessingManager->method('getAvailableTaskTypes')->willReturn([ | ||
| ContextAgentInteraction::ID => ['optionalInputShape' => $optionalInputShape], | ||
| ]); | ||
| } | ||
|
|
||
| private function systemMessage(string $content): Message { | ||
| $message = new Message(); | ||
| $message->setSessionId(self::SESSION_ID); | ||
| $message->setRole(Message::ROLE_SYSTEM); | ||
| $message->setContent($content); | ||
| return $message; | ||
| } | ||
|
|
||
| public function testUserInstructionsArePassedToTheAgent(): void { | ||
| $this->setAgentOptionalInputs(['user_instructions' => 'shape']); | ||
| $this->messageMapper->method('getFirstNMessages') | ||
| ->with(self::SESSION_ID, 1, Message::ROLE_SYSTEM) | ||
| ->willReturn($this->systemMessage(self::USER_INSTRUCTIONS)); | ||
|
|
||
| $this->service->scheduleMessageGeneration(self::USER_ID, self::SESSION_ID); | ||
|
|
||
| $this->assertNotNull($this->scheduledTask); | ||
| $this->assertSame(ContextAgentInteraction::ID, $this->scheduledTask->getTaskTypeId()); | ||
| $this->assertSame(self::USER_INSTRUCTIONS, $this->scheduledTask->getInput()['user_instructions'] ?? null); | ||
| } | ||
|
|
||
| public function testUserInstructionsAreNotSentWhenTheAgentDoesNotSupportThem(): void { | ||
| // e.g. an older Context Agent version that does not declare the optional input | ||
| $this->setAgentOptionalInputs([]); | ||
| $this->messageMapper->expects($this->never())->method('getFirstNMessages'); | ||
|
|
||
| $this->service->scheduleMessageGeneration(self::USER_ID, self::SESSION_ID); | ||
|
|
||
| $this->assertNotNull($this->scheduledTask); | ||
| $this->assertArrayNotHasKey('user_instructions', $this->scheduledTask->getInput()); | ||
| } | ||
|
|
||
| public function testUserInstructionsAreNotSentWhenTheSessionHasNoSystemMessage(): void { | ||
| $this->setAgentOptionalInputs(['user_instructions' => 'shape']); | ||
| $this->messageMapper->method('getFirstNMessages')->willThrowException(new DoesNotExistException('no system message')); | ||
|
|
||
| $this->service->scheduleMessageGeneration(self::USER_ID, self::SESSION_ID); | ||
|
|
||
| $this->assertNotNull($this->scheduledTask); | ||
| $this->assertArrayNotHasKey('user_instructions', $this->scheduledTask->getInput()); | ||
| } | ||
|
|
||
| public function testTheAgentRunsWithoutUserInstructionsWhenTheyCannotBeRead(): void { | ||
| $this->setAgentOptionalInputs(['user_instructions' => 'shape']); | ||
| $this->messageMapper->method('getFirstNMessages')->willThrowException(new Exception('database error')); | ||
|
|
||
| $this->service->scheduleMessageGeneration(self::USER_ID, self::SESSION_ID); | ||
|
|
||
| $this->assertNotNull($this->scheduledTask); | ||
| $this->assertArrayNotHasKey('user_instructions', $this->scheduledTask->getInput()); | ||
| } | ||
|
|
||
| public function testUserInstructionsAreNotSentForAssignmentRuns(): void { | ||
| // assignments run unattended, instructions like "ask for clarification" do not apply | ||
| $this->setAgentOptionalInputs(['user_instructions' => 'shape']); | ||
| $this->messageMapper->expects($this->never())->method('getFirstNMessages'); | ||
|
|
||
| $this->service->scheduleAssignmentMessageGeneration(self::USER_ID, self::SESSION_ID); | ||
|
|
||
| $this->assertNotNull($this->scheduledTask); | ||
| $this->assertSame(ContextAgentInteraction::ID, $this->scheduledTask->getTaskTypeId()); | ||
| $this->assertArrayNotHasKey('user_instructions', $this->scheduledTask->getInput()); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a nice unintrusive method 👍